Version in base suite: 3.0.21-0+deb12u1 Base version: vlc_3.0.21-0+deb12u1 Target version: vlc_3.0.22-0+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/v/vlc/vlc_3.0.21-0+deb12u1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/v/vlc/vlc_3.0.22-0+deb12u1.dsc /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ach.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/af.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/am.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/am_ET.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/an.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ar.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/as.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/as_IN.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ast.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/be.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/bg.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/bn.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/bn_IN.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/br.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/brx.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/bs.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ca.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ca@valencia.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/co.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/cs.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/cy.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/da.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/de.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/el.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/en_GB.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/eo.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/es.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/es_MX.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/et.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/eu.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/fa.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ff.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/fi.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/fr.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/fur.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/fy.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ga.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/gd.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/gl.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/gu.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/he.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/hi.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/hr.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/hu.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/hy.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/id.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ie.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/is.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/it.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ja.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ka.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/kab.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/kk.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/km.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/kn.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ko.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ks_IN.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ku_IQ.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ky.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/lg.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/lt.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/lv.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/mai.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ml.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/mn.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/mr.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ms.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/nb.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ne.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/nl.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/nn.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/oc.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/pa.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/pl.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ps.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/pt_BR.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/pt_PT.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ro.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ru.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/si.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/sk.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/sl.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/sq.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/sr.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/sv.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ta.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/te.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/th.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/tr.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/tt.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ug.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/uk.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/uz.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/vi.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/wa.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/zh_CN.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/zh_TW.gmo |binary /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/zu.gmo |binary vlc-3.0.22/Makefile.am | 11 vlc-3.0.22/Makefile.in | 125 vlc-3.0.22/NEWS | 108 vlc-3.0.22/aclocal.m4 | 189 vlc-3.0.22/autotools/compile | 6 vlc-3.0.22/autotools/config.guess | 1502 vlc-3.0.22/autotools/config.sub | 2617 vlc-3.0.22/autotools/depcomp | 2 vlc-3.0.22/autotools/install-sh | 161 vlc-3.0.22/autotools/ltmain.sh | 827 vlc-3.0.22/autotools/missing | 2 vlc-3.0.22/autotools/test-driver | 19 vlc-3.0.22/autotools/ylwrap | 2 vlc-3.0.22/bin/Makefile.in | 15 vlc-3.0.22/bin/breakpad.cpp | 15 vlc-3.0.22/bin/winvlc.c | 11 vlc-3.0.22/compat/Makefile.am | 17 vlc-3.0.22/compat/Makefile.in | 164 vlc-3.0.22/compat/dummy.c | 2 vlc-3.0.22/compat/recvmsg.c | 42 vlc-3.0.22/compat/sendmsg.c | 42 vlc-3.0.22/compat/stdckdint/stdckdint.h | 136 vlc-3.0.22/compat/strverscmp.c | 6 vlc-3.0.22/compat/test/ckd.c | 115 vlc-3.0.22/config.h.in | 131 vlc-3.0.22/configure |28249 ++++----- vlc-3.0.22/configure.ac | 227 vlc-3.0.22/contrib/bootstrap | 9 vlc-3.0.22/contrib/src/README.md | 119 vlc-3.0.22/contrib/src/SDL_image/rules.mak | 2 vlc-3.0.22/contrib/src/a52/rules.mak | 5 vlc-3.0.22/contrib/src/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch | 47 vlc-3.0.22/contrib/src/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch | 34 vlc-3.0.22/contrib/src/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch | 29 vlc-3.0.22/contrib/src/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch | 52 vlc-3.0.22/contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch | 18 vlc-3.0.22/contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch | 35 vlc-3.0.22/contrib/src/amf/0002-Fix-const-on-return-by-value-Variant-values.patch | 49 vlc-3.0.22/contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch | 65 vlc-3.0.22/contrib/src/amf/SHA512SUMS | 2 vlc-3.0.22/contrib/src/amf/rules.mak | 41 vlc-3.0.22/contrib/src/aom/0002-cmake-win-fix-asm-flag-appending.patch | 29 vlc-3.0.22/contrib/src/aom/rules.mak | 13 vlc-3.0.22/contrib/src/aribb24/rules.mak | 2 vlc-3.0.22/contrib/src/aribb25/rules.mak | 6 vlc-3.0.22/contrib/src/asdcplib/rules.mak | 7 vlc-3.0.22/contrib/src/ass/0001-aarch64-Set-the-right-intended-alignment-for-constan.patch | 70 vlc-3.0.22/contrib/src/ass/SHA512SUMS | 2 vlc-3.0.22/contrib/src/ass/rules.mak | 8 vlc-3.0.22/contrib/src/basu/SHA512SUMS | 1 vlc-3.0.22/contrib/src/basu/rules.mak | 41 vlc-3.0.22/contrib/src/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch | 30 vlc-3.0.22/contrib/src/bluray/0001-install-bdjo_data-header.patch | 37 vlc-3.0.22/contrib/src/bluray/SHA512SUMS | 2 vlc-3.0.22/contrib/src/bluray/rules.mak | 37 vlc-3.0.22/contrib/src/breakpad/rules.mak | 18 vlc-3.0.22/contrib/src/breakpad/windows-arm64.patch | 28 vlc-3.0.22/contrib/src/caca/0001-win32-don-t-for-_WIN32_WINNT-to-Win2K.patch | 27 vlc-3.0.22/contrib/src/caca/0002-win32-don-t-redefine-GetCurrentConsoleFont-with-ming.patch | 27 vlc-3.0.22/contrib/src/caca/0003-win32-use-ANSI-calls-explicitly.patch | 26 vlc-3.0.22/contrib/src/caca/0004-win32-use-CreateFile2-when-compiling-for-Win8.patch | 49 vlc-3.0.22/contrib/src/caca/0005-canvas-use-GetCurrentProcessId-on-Windows.patch | 43 vlc-3.0.22/contrib/src/caca/rules.mak | 7 vlc-3.0.22/contrib/src/cargo/SHA512SUMS | 1 vlc-3.0.22/contrib/src/cargo/rules.mak | 40 vlc-3.0.22/contrib/src/cddb/cddb-gcc14-getsockoptfix.patch | 55 vlc-3.0.22/contrib/src/cddb/rules.mak | 8 vlc-3.0.22/contrib/src/chromaprint/0001-contribs-chromaprint-more-fixes-for-.pc-file.patch | 49 vlc-3.0.22/contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch | 25 vlc-3.0.22/contrib/src/chromaprint/linklibs.patch | 42 vlc-3.0.22/contrib/src/chromaprint/rules.mak | 11 vlc-3.0.22/contrib/src/d3d11/SHA512SUMS | 17 vlc-3.0.22/contrib/src/d3d11/dxgi12.patch | 109 vlc-3.0.22/contrib/src/d3d11/dxgi1_3.idl | 242 vlc-3.0.22/contrib/src/d3d11/dxgi1_4.idl | 109 vlc-3.0.22/contrib/src/d3d11/dxgi1_5.idl | 67 vlc-3.0.22/contrib/src/d3d11/dxgi1_6.idl | 72 vlc-3.0.22/contrib/src/d3d11/dxgidebug.patch | 51 vlc-3.0.22/contrib/src/d3d11/processor_format.patch | 21 vlc-3.0.22/contrib/src/d3d11/rules.mak | 175 vlc-3.0.22/contrib/src/d3d9/SHA512SUMS | 6 vlc-3.0.22/contrib/src/d3d9/d3d9caps.patch | 17 vlc-3.0.22/contrib/src/d3d9/dxva2api.patch | 379 vlc-3.0.22/contrib/src/d3d9/rules.mak | 37 vlc-3.0.22/contrib/src/daala/rules.mak | 7 vlc-3.0.22/contrib/src/dav1d/SHA512SUMS | 2 vlc-3.0.22/contrib/src/dav1d/rules.mak | 8 vlc-3.0.22/contrib/src/dca/rules.mak | 4 vlc-3.0.22/contrib/src/decklink/rules.mak | 38 vlc-3.0.22/contrib/src/dvbpsi/0001-dvbpsi_packet_push-compute-sizes-using-pointer-to-en.patch | 52 vlc-3.0.22/contrib/src/dvbpsi/0002-dvbpsi_packet_push-check-adaptation-field-length.patch | 28 vlc-3.0.22/contrib/src/dvbpsi/0003-dvbpsi_packet_push-check-section-pointers-field.patch | 25 vlc-3.0.22/contrib/src/dvbpsi/0004-dvbpsi_packet_push-check-section-length.patch | 35 vlc-3.0.22/contrib/src/dvbpsi/rules.mak | 6 vlc-3.0.22/contrib/src/dvdcss/rules.mak | 7 vlc-3.0.22/contrib/src/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch | 29 vlc-3.0.22/contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch | 30 vlc-3.0.22/contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch | 30 vlc-3.0.22/contrib/src/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch | 27 vlc-3.0.22/contrib/src/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch | 30 vlc-3.0.22/contrib/src/dvdnav/rules.mak | 9 vlc-3.0.22/contrib/src/dvdread/rules.mak | 6 vlc-3.0.22/contrib/src/ebml/0001-EbmlMaster-fix-leak-when-reading-upper-level-element.patch | 40 vlc-3.0.22/contrib/src/ebml/0001-EbmlString-ReadFully-use-automatic-memory-management.patch | 54 vlc-3.0.22/contrib/src/ebml/0002-EbmlUnicodeString-use-std-string-when-reading-instea.patch | 50 vlc-3.0.22/contrib/src/ebml/rules.mak | 9 vlc-3.0.22/contrib/src/faad2/rules.mak | 7 vlc-3.0.22/contrib/src/ffi/rules.mak | 2 vlc-3.0.22/contrib/src/ffmpeg/0001-Replace-all-occurences-of-av_mallocz_array-by-av_cal.patch | 29 vlc-3.0.22/contrib/src/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch | 25 vlc-3.0.22/contrib/src/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch | 29 vlc-3.0.22/contrib/src/ffmpeg/0001-vulkan-Fix-win-i386-calling-convention.patch | 43 vlc-3.0.22/contrib/src/ffmpeg/0001-w32pthread-fix-signature-of-WinRT-version-of-thread-.patch | 34 vlc-3.0.22/contrib/src/ffmpeg/0002-compat-w32dlfcn.h-Remove-MAX_PATH-limit-and-replace-.patch | 171 vlc-3.0.22/contrib/src/ffmpeg/0002-lavu-vulkan-fix-handle-type-for-32-bit-targets.patch | 50 vlc-3.0.22/contrib/src/ffmpeg/SHA512SUMS | 2 vlc-3.0.22/contrib/src/ffmpeg/rules.mak | 19 vlc-3.0.22/contrib/src/flac/0001-Fixed-compilation-of-get_utf8_argv-for-Windows-UWP.patch | 148 vlc-3.0.22/contrib/src/flac/rules.mak | 10 vlc-3.0.22/contrib/src/fluid/rules.mak | 6 vlc-3.0.22/contrib/src/fluidlite/rules.mak | 7 vlc-3.0.22/contrib/src/fontconfig/rules.mak | 15 vlc-3.0.22/contrib/src/freetype2/SHA512SUMS | 2 vlc-3.0.22/contrib/src/freetype2/rules.mak | 15 vlc-3.0.22/contrib/src/fribidi/rules.mak | 6 vlc-3.0.22/contrib/src/fxc2/0001-make-Vn-argument-as-optional-and-provide-default-var.patch | 81 vlc-3.0.22/contrib/src/fxc2/0002-accept-windows-style-flags-and-splitted-argument-val.patch | 261 vlc-3.0.22/contrib/src/fxc2/0004-Revert-Fix-narrowing-conversion-from-int-to-BYTE.patch | 35 vlc-3.0.22/contrib/src/fxc2/rules.mak | 46 vlc-3.0.22/contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch | 43 vlc-3.0.22/contrib/src/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch | 207 vlc-3.0.22/contrib/src/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch | 44 vlc-3.0.22/contrib/src/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch | 44 vlc-3.0.22/contrib/src/gcrypt/64bits-relocation.patch | 20 vlc-3.0.22/contrib/src/gcrypt/SHA512SUMS | 2 vlc-3.0.22/contrib/src/gcrypt/clang-mips64.patch | 12 vlc-3.0.22/contrib/src/gcrypt/disable-tests-compilation.patch | 20 vlc-3.0.22/contrib/src/gcrypt/fix-pthread-detection.patch | 24 vlc-3.0.22/contrib/src/gcrypt/rules.mak | 40 vlc-3.0.22/contrib/src/gen-cmake-toolchain.py | 61 vlc-3.0.22/contrib/src/gen-meson-crossfile.py | 8 vlc-3.0.22/contrib/src/gen-meson-machinefile.py | 113 vlc-3.0.22/contrib/src/gettext/0001-libasprintf-On-mingw-really-use-our-vasprintf-functi.patch | 105 vlc-3.0.22/contrib/src/gettext/0002-libasprintf-Avoid-compilation-error-on-mingw-with-D_.patch | 43 vlc-3.0.22/contrib/src/gettext/SHA512SUMS | 2 vlc-3.0.22/contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch | 29 vlc-3.0.22/contrib/src/gettext/gettext-0.22.5-gnulib-rename-real-openat.patch | 13 vlc-3.0.22/contrib/src/gettext/rules.mak | 69 vlc-3.0.22/contrib/src/glad/SHA512SUMS | 1 vlc-3.0.22/contrib/src/glad/rules.mak | 17 vlc-3.0.22/contrib/src/glew/SHA512SUMS | 2 vlc-3.0.22/contrib/src/glew/rules.mak | 23 vlc-3.0.22/contrib/src/glew/win32.patch | 110 vlc-3.0.22/contrib/src/glib/rules.mak | 2 vlc-3.0.22/contrib/src/glslang/SHA512SUMS | 1 vlc-3.0.22/contrib/src/glslang/glslang-win32.patch | 13 vlc-3.0.22/contrib/src/glslang/rules.mak | 37 vlc-3.0.22/contrib/src/gme/0001-don-t-skip-negative-fixes-14088.patch | 26 vlc-3.0.22/contrib/src/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch | 23 vlc-3.0.22/contrib/src/gme/SHA512SUMS | 2 vlc-3.0.22/contrib/src/gme/add-libm.patch | 8 vlc-3.0.22/contrib/src/gme/mac-use-c-stdlib.patch | 8 vlc-3.0.22/contrib/src/gme/rules.mak | 25 vlc-3.0.22/contrib/src/gme/skip-underrun.patch | 11 vlc-3.0.22/contrib/src/gmp/SHA512SUMS | 2 vlc-3.0.22/contrib/src/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch | 32 vlc-3.0.22/contrib/src/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch | 28 vlc-3.0.22/contrib/src/gmp/ppc64.patch | 26 vlc-3.0.22/contrib/src/gmp/rules.mak | 27 vlc-3.0.22/contrib/src/gmp/win-arm64.patch | 55 vlc-3.0.22/contrib/src/gnutls/0001-Don-t-assume-that-UNICODE-is-not-defined.patch | 111 vlc-3.0.22/contrib/src/gnutls/0001-explicit_bzero-Do-not-call-SecureZeroMemory-on-UWP-b.patch | 43 vlc-3.0.22/contrib/src/gnutls/0001-fix-mingw64-detection.patch | 36 vlc-3.0.22/contrib/src/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch | 67 vlc-3.0.22/contrib/src/gnutls/0001-windows-Avoid-Wint-conversion-errors.patch | 60 vlc-3.0.22/contrib/src/gnutls/SHA512SUMS | 2 vlc-3.0.22/contrib/src/gnutls/__faccessat-darwin.patch | 17 vlc-3.0.22/contrib/src/gnutls/gnutls-fix-aarch64-compilation-appleos.patch | 12 vlc-3.0.22/contrib/src/gnutls/gnutls-fix-mangling.patch | 11 vlc-3.0.22/contrib/src/gnutls/rules.mak | 68 vlc-3.0.22/contrib/src/goom/rules.mak | 3 vlc-3.0.22/contrib/src/gpg-error/darwin-triplet.patch | 41 vlc-3.0.22/contrib/src/gpg-error/rules.mak | 45 vlc-3.0.22/contrib/src/growl/rules.mak | 3 vlc-3.0.22/contrib/src/gsm/rules.mak | 2 vlc-3.0.22/contrib/src/harfbuzz/0001-freetype-Fix-function-signatures-to-match-without-ca.patch | 67 vlc-3.0.22/contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch | 30 vlc-3.0.22/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch | 25 vlc-3.0.22/contrib/src/harfbuzz/SHA512SUMS | 2 vlc-3.0.22/contrib/src/harfbuzz/rules.mak | 11 vlc-3.0.22/contrib/src/iconv/0001-Use-CreateFile2-in-UWP-builds.patch | 20 vlc-3.0.22/contrib/src/iconv/0001-do-not-call-GetHandleInformation-in-Winstore-apps.patch | 41 vlc-3.0.22/contrib/src/iconv/SHA512SUMS | 2 vlc-3.0.22/contrib/src/iconv/bins.patch | 39 vlc-3.0.22/contrib/src/iconv/libiconv-win64.patch | 1534 vlc-3.0.22/contrib/src/iconv/rules.mak | 19 vlc-3.0.22/contrib/src/iconv/win32.patch | 17 vlc-3.0.22/contrib/src/jack/rules.mak | 2 vlc-3.0.22/contrib/src/jinja/SHA512SUMS | 1 vlc-3.0.22/contrib/src/jinja/rules.mak | 17 vlc-3.0.22/contrib/src/jpeg/rules.mak | 2 vlc-3.0.22/contrib/src/kate/rules.mak | 11 vlc-3.0.22/contrib/src/lame/rules.mak | 8 vlc-3.0.22/contrib/src/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch | 39 vlc-3.0.22/contrib/src/libarchive/0001-zstd-use-GetNativeSystemInfo-to-get-the-number-of-th.patch | 72 vlc-3.0.22/contrib/src/libarchive/SHA512SUMS | 2 vlc-3.0.22/contrib/src/libarchive/android.patch | 19 vlc-3.0.22/contrib/src/libarchive/rules.mak | 53 vlc-3.0.22/contrib/src/libarchive/winrt.patch | 531 vlc-3.0.22/contrib/src/libaribcaption/SHA512SUMS | 1 vlc-3.0.22/contrib/src/libaribcaption/rules.mak | 60 vlc-3.0.22/contrib/src/libdsm/rules.mak | 8 vlc-3.0.22/contrib/src/libebur128/SHA512SUMS | 1 vlc-3.0.22/contrib/src/libebur128/rules.mak | 28 vlc-3.0.22/contrib/src/libmpeg2/rules.mak | 12 vlc-3.0.22/contrib/src/libplacebo/0001-meson-allow-forcing-the-path-to-look-for-libraries.patch | 60 vlc-3.0.22/contrib/src/libplacebo/0001-meson-allow-overriding-python3-path.patch | 37 vlc-3.0.22/contrib/src/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch | 42 vlc-3.0.22/contrib/src/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch | 43 vlc-3.0.22/contrib/src/librist/SHA512SUMS | 1 vlc-3.0.22/contrib/src/librist/librist-fix-libcjson-meson.patch | 13 vlc-3.0.22/contrib/src/librist/rules.mak | 44 vlc-3.0.22/contrib/src/librist/win32-timing.patch | 11 vlc-3.0.22/contrib/src/libtasn1/0001-Use-CreateFile2-in-UWP-builds.patch | 75 vlc-3.0.22/contrib/src/libtasn1/rules.mak | 7 vlc-3.0.22/contrib/src/libxml2/rules.mak | 2 vlc-3.0.22/contrib/src/live555/android-no-ifaddrs.patch | 13 vlc-3.0.22/contrib/src/live555/live555-formatmessage.patch | 31 vlc-3.0.22/contrib/src/live555/rules.mak | 6 vlc-3.0.22/contrib/src/lua/0004-Fix-stack-overflow-in-vararg-functions.patch | 21 vlc-3.0.22/contrib/src/lua/Add-EXE_EXT-to-allow-specifying-binary-extension.patch | 36 vlc-3.0.22/contrib/src/lua/Add-a-Makefile-variable-to-override-the-strip-tool.patch | 33 vlc-3.0.22/contrib/src/lua/Add-version-to-library-name.patch | 39 vlc-3.0.22/contrib/src/lua/Avoid-usage-of-localeconv.patch | 241 vlc-3.0.22/contrib/src/lua/Create-an-import-library-needed-for-lld.patch | 48 vlc-3.0.22/contrib/src/lua/Create-and-install-a-.pc-file.patch | 87 vlc-3.0.22/contrib/src/lua/Disable-dynamic-library-loading-support.patch | 44 vlc-3.0.22/contrib/src/lua/Disable-system-and-popen-for-windows-store-builds.patch | 67 vlc-3.0.22/contrib/src/lua/Do-not-use-large-file-offsets-with-too-old-Android-A.patch | 30 vlc-3.0.22/contrib/src/lua/Do-not-use-log2f-with-too-old-Android-API-level.patch | 25 vlc-3.0.22/contrib/src/lua/Enforce-always-using-64bit-integers-floats.patch | 68 vlc-3.0.22/contrib/src/lua/SHA512SUMS | 2 vlc-3.0.22/contrib/src/lua/rules.mak | 23 vlc-3.0.22/contrib/src/mad/rules.mak | 19 vlc-3.0.22/contrib/src/main-rust.mak | 117 vlc-3.0.22/contrib/src/main.mak | 145 vlc-3.0.22/contrib/src/markupsafe/SHA512SUMS | 1 vlc-3.0.22/contrib/src/markupsafe/rules.mak | 15 vlc-3.0.22/contrib/src/matroska/SHA512SUMS | 2 vlc-3.0.22/contrib/src/matroska/rules.mak | 8 vlc-3.0.22/contrib/src/medialibrary/SHA512SUMS | 1 vlc-3.0.22/contrib/src/medialibrary/rules.mak | 25 vlc-3.0.22/contrib/src/meson-machinefile/rules.mak | 31 vlc-3.0.22/contrib/src/mfx/0001-Add-missing-mfx_dispatcher_uwp.h-.cpp.patch | 279 vlc-3.0.22/contrib/src/mfx/0001-fix-UWP-build-in-ming-w64.patch | 32 vlc-3.0.22/contrib/src/mfx/0002-fix-UWP-build-in-ming-w64.patch | 45 vlc-3.0.22/contrib/src/mfx/SHA512SUMS | 1 vlc-3.0.22/contrib/src/mfx/rules.mak | 5 vlc-3.0.22/contrib/src/microdns/rules.mak | 6 vlc-3.0.22/contrib/src/mingw64/0001-headers-allow-CryptAcquireContext-in-Win10-RS4-UWP-b.patch | 33 vlc-3.0.22/contrib/src/mingw64/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch | 30 vlc-3.0.22/contrib/src/mingw64/0001-include-process-fix-bare-DllMain-_CRT_INIT-signature.patch | 33 vlc-3.0.22/contrib/src/mingw64/0002-headers-allow-CryptGenRandom-in-Win10-19H1-UWP-build.patch | 27 vlc-3.0.22/contrib/src/mingw64/0002-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch | 39 vlc-3.0.22/contrib/src/mingw64/0003-headers-allow-more-wincrypt-API-s-in-Win10-RS4-UWP-b.patch | 94 vlc-3.0.22/contrib/src/mingw64/0003-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch | 41 vlc-3.0.22/contrib/src/mingw64/0004-headers-allow-more-wincrypt-API-s-in-Win10-19H1-UWP-.patch | 60 vlc-3.0.22/contrib/src/mingw64/0004-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch | 34 vlc-3.0.22/contrib/src/mingw64/0005-crt-use-wincrypt-API-from-windowsapp-in-Windows-10.patch | 108 vlc-3.0.22/contrib/src/mingw64/0005-headers-enable-CreateHardLinkW-in-Win10-19H1-UWP-bui.patch | 42 vlc-3.0.22/contrib/src/mingw64/0006-headers-enable-more-module-API-in-Win10-19H1-UWP-bui.patch | 118 vlc-3.0.22/contrib/src/mingw64/0007-crt-add-api-ms-core-registry-def-files.patch | 145 vlc-3.0.22/contrib/src/mingw64/0008-headers-enable-some-Registry-API-calls-in-Win10-19H1.patch | 188 vlc-3.0.22/contrib/src/mingw64/0009-headers-only-enable-GetFileInformationByHandle-for-1.patch | 31 vlc-3.0.22/contrib/src/mingw64/0010-headers-allow-Get-SetHandleInformation-in-Win10-19H1.patch | 62 vlc-3.0.22/contrib/src/mingw64/0011-crt-add-missing-api-ms-win-core-heap-l1-1-0.patch | 113 vlc-3.0.22/contrib/src/mingw64/0012-headers-Allow-some-Heap-API-in-Win10-19H1-UWP-builds.patch | 39 vlc-3.0.22/contrib/src/mingw64/0013-headers-enable-FindResourceW-in-Win10-19H1-UWP-build.patch | 93 vlc-3.0.22/contrib/src/mingw64/0014-headers-check-which-version-of-UWP-Windows-contains-.patch | 42 vlc-3.0.22/contrib/src/mingw64/0015-headers-enabled-LoadLibraryEx-flags-in-Win10-19H1-UW.patch | 80 vlc-3.0.22/contrib/src/mingw64/0016-headers-Allow-SetDllDirectoryW-A-API-in-Win10-19H1-U.patch | 48 vlc-3.0.22/contrib/src/mingw64/0017-headers-allow-FORMAT_MESSAGE_ALLOCATE_BUFFER-in-UWP.patch | 36 vlc-3.0.22/contrib/src/mingw64/0018-headers-allow-RtlSecureZeroMemory-in-all-targets.patch | 67 vlc-3.0.22/contrib/src/mingw64/0019-headers-use-inline-version-of-RtlSecureZeroMemory-fo.patch | 46 vlc-3.0.22/contrib/src/mingw64/SHA512SUMS | 1 vlc-3.0.22/contrib/src/mingw64/rules.mak | 198 vlc-3.0.22/contrib/src/modplug/rules.mak | 6 vlc-3.0.22/contrib/src/mpcdec/0006-adapted-patch-0001-shared.patch-from-buildroot.patch | 10 vlc-3.0.22/contrib/src/mpcdec/0007-only-build-libmpcdec.patch | 24 vlc-3.0.22/contrib/src/mpcdec/musepack-asinh-msvc.patch | 22 vlc-3.0.22/contrib/src/mpcdec/musepack-no-binaries.patch | 21 vlc-3.0.22/contrib/src/mpcdec/musepack-no-cflags-clobber.patch | 21 vlc-3.0.22/contrib/src/mpcdec/rules.mak | 33 vlc-3.0.22/contrib/src/mpg123/rules.mak | 7 vlc-3.0.22/contrib/src/mysofa/rules.mak | 9 vlc-3.0.22/contrib/src/ncurses/ncurses-win32.patch | 11 vlc-3.0.22/contrib/src/ncurses/rules.mak | 1 vlc-3.0.22/contrib/src/nettle/rules.mak | 2 vlc-3.0.22/contrib/src/nfs/rules.mak | 6 vlc-3.0.22/contrib/src/nvcodec/SHA512SUMS | 1 vlc-3.0.22/contrib/src/nvcodec/rules.mak | 25 vlc-3.0.22/contrib/src/ogg/SHA512SUMS | 2 vlc-3.0.22/contrib/src/ogg/libogg-configure.patch | 56 vlc-3.0.22/contrib/src/ogg/libogg-disable-check.patch | 11 vlc-3.0.22/contrib/src/ogg/rules.mak | 19 vlc-3.0.22/contrib/src/openjpeg/SHA512SUMS | 2 vlc-3.0.22/contrib/src/openjpeg/install.patch | 23 vlc-3.0.22/contrib/src/openjpeg/msvc.patch | 11 vlc-3.0.22/contrib/src/openjpeg/openjp2_pthread.patch | 20 vlc-3.0.22/contrib/src/openjpeg/pic.patch | 10 vlc-3.0.22/contrib/src/openjpeg/rules.mak | 26 vlc-3.0.22/contrib/src/opus/0001-meson-arm64.patch | 36 vlc-3.0.22/contrib/src/opus/rules.mak | 2 vlc-3.0.22/contrib/src/orc/0001-Fix-usage-of-pthread_jit_write_protect_np-on-macOS-a.patch | 129 vlc-3.0.22/contrib/src/orc/SHA512SUMS | 2 vlc-3.0.22/contrib/src/orc/rules.mak | 23 vlc-3.0.22/contrib/src/orc/use-proper-func-detection.patch | 70 vlc-3.0.22/contrib/src/pkg-rewrite-absolute.py | 144 vlc-3.0.22/contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch | 8 vlc-3.0.22/contrib/src/png/SHA512SUMS | 2 vlc-3.0.22/contrib/src/png/automake.patch | 11 vlc-3.0.22/contrib/src/png/bins.patch | 18 vlc-3.0.22/contrib/src/png/rules.mak | 43 vlc-3.0.22/contrib/src/png/winrt.patch | 14 vlc-3.0.22/contrib/src/postproc/rules.mak | 137 vlc-3.0.22/contrib/src/postproc/win-pic.patch | 20 vlc-3.0.22/contrib/src/projectM/rules.mak | 22 vlc-3.0.22/contrib/src/protobuf/protobuf-no-mingw-pthread.patch | 13 vlc-3.0.22/contrib/src/protobuf/rules.mak | 6 vlc-3.0.22/contrib/src/pthread-stubs/SHA512SUMS | 1 vlc-3.0.22/contrib/src/pthread-stubs/rules.mak | 19 vlc-3.0.22/contrib/src/pthreads/0001-add-api-ms-core-registry-def-files.patch | 164 vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-CreateHardLinkW-in-Win10-UWP-builds.patch | 36 vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch | 32 vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch | 28 vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch | 39 vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch | 37 vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-more-module-API-in-Win10-UWP-builds.patch | 113 vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-some-Registry-API-calls-in-UWP-8.1-bu.patch | 179 vlc-3.0.22/contrib/src/pthreads/SHA512SUMS | 2 vlc-3.0.22/contrib/src/pthreads/rules.mak | 63 vlc-3.0.22/contrib/src/qt/0001-disable-qt_random_cpu.patch | 22 vlc-3.0.22/contrib/src/qt/0002-Windows-QPA-Disable-systray-notification-sounds.patch | 27 vlc-3.0.22/contrib/src/qt/0003-allow-cross-compilation-of-angle-with-wine.patch | 76 vlc-3.0.22/contrib/src/qt/0007-ANGLE-remove-static-assert-that-can-t-be-evaluated-b.patch | 28 vlc-3.0.22/contrib/src/qt/0008-ANGLE-disable-ANGLE_STD_ASYNC_WORKERS-when-compiling.patch | 27 vlc-3.0.22/contrib/src/qt/0009-Add-KHRONOS_STATIC-to-allow-static-linking-on-Windows.patch | 47 vlc-3.0.22/contrib/src/qt/add-includedir-to-pc-file.patch | 41 vlc-3.0.22/contrib/src/qt/configure-env.py | 23 vlc-3.0.22/contrib/src/qt/force-pkgconfg-replace.patch | 26 vlc-3.0.22/contrib/src/qt/install_wrapper.sh | 33 vlc-3.0.22/contrib/src/qt/qt-fix-gcc11-build.patch | 10 vlc-3.0.22/contrib/src/qt/rules.mak | 15 vlc-3.0.22/contrib/src/qt/set-mkspecs-properties.patch | 22 vlc-3.0.22/contrib/src/qt/set-mkspecs-version.patch | 26 vlc-3.0.22/contrib/src/qtdeclarative/0001-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch | 84 vlc-3.0.22/contrib/src/qtdeclarative/0002-Implement-accessibility-for-QQuickWidget.patch | 565 vlc-3.0.22/contrib/src/qtdeclarative/SHA512SUMS | 1 vlc-3.0.22/contrib/src/qtdeclarative/rules.mak | 42 vlc-3.0.22/contrib/src/qtgraphicaleffects/SHA512SUMS | 1 vlc-3.0.22/contrib/src/qtgraphicaleffects/rules.mak | 31 vlc-3.0.22/contrib/src/qtquickcontrols2/SHA512SUMS | 1 vlc-3.0.22/contrib/src/qtquickcontrols2/rules.mak | 43 vlc-3.0.22/contrib/src/qtsvg/rules.mak | 4 vlc-3.0.22/contrib/src/qtwayland/SHA512SUMS | 1 vlc-3.0.22/contrib/src/qtwayland/rules.mak | 28 vlc-3.0.22/contrib/src/qtx11extras/SHA512SUMS | 1 vlc-3.0.22/contrib/src/qtx11extras/rules.mak | 24 vlc-3.0.22/contrib/src/rav1e-vendor/SHA512SUMS | 1 vlc-3.0.22/contrib/src/rav1e-vendor/rules.mak | 6 vlc-3.0.22/contrib/src/rav1e/SHA512SUMS | 1 vlc-3.0.22/contrib/src/rav1e/rules.mak | 42 vlc-3.0.22/contrib/src/rav1e/unwind-resume-stub.patch | 55 vlc-3.0.22/contrib/src/regex/rules.mak | 2 vlc-3.0.22/contrib/src/rnnoise/rules.mak | 34 vlc-3.0.22/contrib/src/salsa/rules.mak | 56 vlc-3.0.22/contrib/src/salsa/salsa-cast-fix.patch | 29 vlc-3.0.22/contrib/src/samplerate/rules.mak | 3 vlc-3.0.22/contrib/src/schroedinger/rules.mak | 9 vlc-3.0.22/contrib/src/schroedinger/schroedinger-disable-orcc.patch | 11 vlc-3.0.22/contrib/src/sdl/rules.mak | 2 vlc-3.0.22/contrib/src/shout/0001-Favor-GetCurrentProcessId-on-Windows.patch | 33 vlc-3.0.22/contrib/src/shout/add-missing-stdlib-stdio.patch | 22 vlc-3.0.22/contrib/src/shout/rules.mak | 12 vlc-3.0.22/contrib/src/sidplay2/rules.mak | 5 vlc-3.0.22/contrib/src/sidplay2/sidplay-fix-ln-s.patch | 11 vlc-3.0.22/contrib/src/sidplay2/sidplay2-char-cast.patch | 13 vlc-3.0.22/contrib/src/sidplay2/sidplay2-cxxtest.patch | 11 vlc-3.0.22/contrib/src/sidplay2/sidplay2-resid-dependency.patch | 11 vlc-3.0.22/contrib/src/smb2/rules.mak | 7 vlc-3.0.22/contrib/src/soxr/rules.mak | 14 vlc-3.0.22/contrib/src/soxr/soxr-check-function.patch | 11 vlc-3.0.22/contrib/src/sparkle/rules.mak | 11 vlc-3.0.22/contrib/src/spatialaudio/rules.mak | 9 vlc-3.0.22/contrib/src/speex/rules.mak | 9 vlc-3.0.22/contrib/src/speexdsp/missing-stdint-for-aarch.patch | 29 vlc-3.0.22/contrib/src/speexdsp/rules.mak | 6 vlc-3.0.22/contrib/src/sqlite/SHA512SUMS | 1 vlc-3.0.22/contrib/src/sqlite/rules.mak | 24 vlc-3.0.22/contrib/src/srt/0001-build-fix-implicit-libraries-set-using-Wl-l-libname..patch | 33 vlc-3.0.22/contrib/src/srt/0001-core-ifdef-MSG_TRUNC-nixes-fix.patch | 32 vlc-3.0.22/contrib/src/srt/SHA512SUMS | 2 vlc-3.0.22/contrib/src/srt/rules.mak | 26 vlc-3.0.22/contrib/src/ssh2/rules.mak | 7 vlc-3.0.22/contrib/src/taglib/SHA512SUMS | 2 vlc-3.0.22/contrib/src/taglib/rules.mak | 15 vlc-3.0.22/contrib/src/theora/rules.mak | 8 vlc-3.0.22/contrib/src/tiff/rules.mak | 5 vlc-3.0.22/contrib/src/tiff/tiff-winstore.patch | 41 vlc-3.0.22/contrib/src/tiger/rules.mak | 7 vlc-3.0.22/contrib/src/tremor/rules.mak | 5 vlc-3.0.22/contrib/src/twolame/rules.mak | 8 vlc-3.0.22/contrib/src/upnp/libtool-nostdlib-workaround.patch | 50 vlc-3.0.22/contrib/src/upnp/rules.mak | 4 vlc-3.0.22/contrib/src/vncclient/cross-ar.patch | 24 vlc-3.0.22/contrib/src/vncclient/rules.mak | 11 vlc-3.0.22/contrib/src/vorbis/rules.mak | 8 vlc-3.0.22/contrib/src/vpx/0001-force-detection-of-pthread-on-Windows.patch | 27 vlc-3.0.22/contrib/src/vpx/SHA512SUMS | 2 vlc-3.0.22/contrib/src/vpx/libvpx-darwin-aarch64.patch | 8 vlc-3.0.22/contrib/src/vpx/libvpx-ios.patch | 10 vlc-3.0.22/contrib/src/vpx/libvpx-remove-bitcode.patch | 6 vlc-3.0.22/contrib/src/vpx/rules.mak | 51 vlc-3.0.22/contrib/src/vulkan-headers/SHA512SUMS | 1 vlc-3.0.22/contrib/src/vulkan-headers/rules.mak | 20 vlc-3.0.22/contrib/src/vulkan-loader/002-proper-def-files-for-32bit.patch | 96 vlc-3.0.22/contrib/src/vulkan-loader/004-disable-suffix-in-static-lib.patch | 11 vlc-3.0.22/contrib/src/vulkan-loader/SHA512SUMS | 1 vlc-3.0.22/contrib/src/vulkan-loader/libvulkan-32.def | 216 vlc-3.0.22/contrib/src/vulkan-loader/rules.mak | 69 vlc-3.0.22/contrib/src/wine-headers/SHA512SUMS | 1 vlc-3.0.22/contrib/src/wine-headers/rules.mak | 43 vlc-3.0.22/contrib/src/wix/SHA512SUMS | 2 vlc-3.0.22/contrib/src/wix/rules.mak | 7 vlc-3.0.22/contrib/src/wixlzx/rules.mak | 2 vlc-3.0.22/contrib/src/x262/rules.mak | 17 vlc-3.0.22/contrib/src/x264/0001-configure-set-_FILE_OFFSET_BITS-to-detect-fseeko.patch | 26 vlc-3.0.22/contrib/src/x264/SHA512SUMS | 1 vlc-3.0.22/contrib/src/x264/rules.mak | 91 vlc-3.0.22/contrib/src/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch | 31 vlc-3.0.22/contrib/src/x265/0001-api-use-LoadLibraryExA-instead-of-LoadLibraryA.patch | 47 vlc-3.0.22/contrib/src/x265/0001-fix-ldl-linking-error-of-x265.patch | 26 vlc-3.0.22/contrib/src/x265/0001-threadpool-disable-group-affinity-in-UWP-builds.patch | 109 vlc-3.0.22/contrib/src/x265/0002-do-not-copy-.pdb-files-that-don-t-exist.patch | 25 vlc-3.0.22/contrib/src/x265/0003-add-patch-to-enable-detect512.patch | 40 vlc-3.0.22/contrib/src/x265/rules.mak | 15 vlc-3.0.22/contrib/src/x265/x265-enable-detect512.patch | 26 vlc-3.0.22/contrib/src/x265/x265-ldl-linking.patch | 11 vlc-3.0.22/contrib/src/x265/x265-no-pdb-install.patch | 11 vlc-3.0.22/contrib/src/xau/rules.mak | 6 vlc-3.0.22/contrib/src/xcb-proto/rules.mak | 2 vlc-3.0.22/contrib/src/xcb/rules.mak | 8 vlc-3.0.22/contrib/src/xorg-macros/rules.mak | 2 vlc-3.0.22/contrib/src/xproto/rules.mak | 6 vlc-3.0.22/contrib/src/zlib/0001-CMakeList.txt-force-static-library-name-to-z.patch | 34 vlc-3.0.22/contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch | 30 vlc-3.0.22/contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch | 38 vlc-3.0.22/contrib/src/zlib/SHA512SUMS | 2 vlc-3.0.22/contrib/src/zlib/no-shared.patch | 12 vlc-3.0.22/contrib/src/zlib/rules.mak | 38 vlc-3.0.22/contrib/src/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch | 30 vlc-3.0.22/contrib/src/zvbi/rules.mak | 20 vlc-3.0.22/contrib/src/zvbi/zvbi-va_copy.patch | 13 vlc-3.0.22/debian/changelog | 7 vlc-3.0.22/debian/rules | 3 vlc-3.0.22/debian/vlc-plugin-video-output.install | 8 vlc-3.0.22/doc/ChangeLog-2004 | 7 vlc-3.0.22/doc/ChangeLog-2005 | 19 vlc-3.0.22/doc/ChangeLog-2007 | 18 vlc-3.0.22/doc/ChangeLog-2008 | 176 vlc-3.0.22/doc/ChangeLog-2009 | 86 vlc-3.0.22/doc/ChangeLog-2010 | 55 vlc-3.0.22/doc/ChangeLog-2013 | 20 vlc-3.0.22/doc/ChangeLog-2014 | 66 vlc-3.0.22/doc/ChangeLog-2015 | 10 vlc-3.0.22/doc/ChangeLog-2016 | 134 vlc-3.0.22/doc/ChangeLog-2017 | 24 vlc-3.0.22/doc/ChangeLog-2018 | 15 vlc-3.0.22/doc/ChangeLog-2024 | 4482 + vlc-3.0.22/doc/ChangeLog-2025 | 7323 ++ vlc-3.0.22/doc/Makefile.am | 1 vlc-3.0.22/doc/Makefile.in | 14 vlc-3.0.22/doc/libvlc/win_player.c | 8 vlc-3.0.22/doc/release-howto.txt | 1 vlc-3.0.22/extras/package/macosx/build.sh | 22 vlc-3.0.22/extras/package/macosx/configure.sh | 2 vlc-3.0.22/extras/package/npapi.am | 6 vlc-3.0.22/extras/package/win32/NSIS/vlc.win32.nsi.in | 5 vlc-3.0.22/extras/package/win32/configure.sh | 1 vlc-3.0.22/extras/package/win32/msi.mak | 44 vlc-3.0.22/extras/package/win32/msi/config.wxi.in | 15 vlc-3.0.22/extras/package/win32/package.mak | 27 vlc-3.0.22/extras/tools/SHA512SUMS | 8 vlc-3.0.22/extras/tools/bison-macOS-7df04f9.patch | 48 vlc-3.0.22/extras/tools/bison-macOS-c41f233c.patch | 45 vlc-3.0.22/extras/tools/bootstrap | 8 vlc-3.0.22/extras/tools/packages.mak | 29 vlc-3.0.22/extras/tools/ragel-6.8-javacodegen.patch | 11 vlc-3.0.22/extras/tools/tools.mak | 140 vlc-3.0.22/include/vlc_common.h | 8 vlc-3.0.22/include/vlc_fixups.h | 4 vlc-3.0.22/include/vlc_fourcc.h | 4 vlc-3.0.22/include/vlc_mtime.h | 60 vlc-3.0.22/include/vlc_strings.h | 2 vlc-3.0.22/lib/Makefile.in | 21 vlc-3.0.22/lib/video.c | 1 vlc-3.0.22/m4/Makefile.in | 13 vlc-3.0.22/m4/libtool.m4 | 229 vlc-3.0.22/m4/ltoptions.m4 | 4 vlc-3.0.22/m4/ltsugar.m4 | 2 vlc-3.0.22/m4/ltversion.m4 | 13 vlc-3.0.22/m4/lt~obsolete.m4 | 4 vlc-3.0.22/modules/Makefile.am | 1 vlc-3.0.22/modules/Makefile.in | 662 vlc-3.0.22/modules/access/Makefile.am | 2 vlc-3.0.22/modules/access/bluray.c | 14 vlc-3.0.22/modules/access/dcp/dcp.cpp | 2 vlc-3.0.22/modules/access/decklink.cpp | 1 vlc-3.0.22/modules/access/dtv/bdagraph.cpp | 4 vlc-3.0.22/modules/access/dvb/linux_dvb.c | 2 vlc-3.0.22/modules/access/dvdnav.c | 4 vlc-3.0.22/modules/access/dvdread.c | 12 vlc-3.0.22/modules/access/http/message.h | 2 vlc-3.0.22/modules/access/live555.cpp | 8 vlc-3.0.22/modules/access/mms/mmstu.c | 90 vlc-3.0.22/modules/access/mms/mmstu.h | 6 vlc-3.0.22/modules/access/nfs.c | 9 vlc-3.0.22/modules/access/sftp.c | 2 vlc-3.0.22/modules/access/smb2.c | 2 vlc-3.0.22/modules/access/v4l2/demux.c | 4 vlc-3.0.22/modules/access_output/livehttp.c | 4 vlc-3.0.22/modules/access_output/udp.c | 4 vlc-3.0.22/modules/audio_filter/audiobargraph_a.c | 8 vlc-3.0.22/modules/audio_filter/channel_mixer/spatialaudio.cpp | 2 vlc-3.0.22/modules/audio_output/Makefile.am | 4 vlc-3.0.22/modules/audio_output/waveout.c | 2 vlc-3.0.22/modules/codec/Makefile.am | 2 vlc-3.0.22/modules/codec/a52.c | 2 vlc-3.0.22/modules/codec/aes3.c | 3 vlc-3.0.22/modules/codec/aom.c | 41 vlc-3.0.22/modules/codec/avcodec/audio.c | 82 vlc-3.0.22/modules/codec/avcodec/avcommon.h | 4 vlc-3.0.22/modules/codec/avcodec/avcommon_compat.h | 34 vlc-3.0.22/modules/codec/avcodec/chroma.c | 15 vlc-3.0.22/modules/codec/avcodec/d3d11va.c | 8 vlc-3.0.22/modules/codec/avcodec/directx_va.c | 14 vlc-3.0.22/modules/codec/avcodec/dxva2.c | 4 vlc-3.0.22/modules/codec/avcodec/encoder.c | 186 vlc-3.0.22/modules/codec/avcodec/fourcc.c | 18 vlc-3.0.22/modules/codec/avcodec/subtitle.c | 4 vlc-3.0.22/modules/codec/avcodec/va.c | 2 vlc-3.0.22/modules/codec/avcodec/vaapi.c | 38 vlc-3.0.22/modules/codec/avcodec/video.c | 46 vlc-3.0.22/modules/codec/cc.h | 10 vlc-3.0.22/modules/codec/cea708.c | 52 vlc-3.0.22/modules/codec/cvdsub.c | 12 vlc-3.0.22/modules/codec/daala.c | 3 vlc-3.0.22/modules/codec/dav1d.c | 63 vlc-3.0.22/modules/codec/dca.c | 2 vlc-3.0.22/modules/codec/dvbsub.c | 6 vlc-3.0.22/modules/codec/kate.c | 7 vlc-3.0.22/modules/codec/libass.c | 8 vlc-3.0.22/modules/codec/libmpeg2.c | 3 vlc-3.0.22/modules/codec/lpcm.c | 3 vlc-3.0.22/modules/codec/mft.c | 10 vlc-3.0.22/modules/codec/oggspots.c | 9 vlc-3.0.22/modules/codec/omxil/mediacodec.c | 44 vlc-3.0.22/modules/codec/omxil/mediacodec.h | 30 vlc-3.0.22/modules/codec/omxil/mediacodec_jni.c | 4 vlc-3.0.22/modules/codec/omxil/mediacodec_ndk.c | 5 vlc-3.0.22/modules/codec/opus_header.c | 2 vlc-3.0.22/modules/codec/rawvideo.c | 3 vlc-3.0.22/modules/codec/speex.c | 3 vlc-3.0.22/modules/codec/spudec/parse.c | 58 vlc-3.0.22/modules/codec/spudec/spudec.c | 3 vlc-3.0.22/modules/codec/substx3g.c | 19 vlc-3.0.22/modules/codec/svcdsub.c | 6 vlc-3.0.22/modules/codec/textst.c | 2 vlc-3.0.22/modules/codec/theora.c | 4 vlc-3.0.22/modules/codec/ttml/ttml.c | 2 vlc-3.0.22/modules/codec/videotoolbox.m | 5 vlc-3.0.22/modules/codec/vorbis.c | 4 vlc-3.0.22/modules/codec/webvtt/CSSGrammar.c | 1713 vlc-3.0.22/modules/codec/webvtt/CSSGrammar.h | 86 vlc-3.0.22/modules/codec/webvtt/CSSGrammar.y | 20 vlc-3.0.22/modules/codec/webvtt/CSSLexer.c | 82 vlc-3.0.22/modules/codec/webvtt/css_parser.c | 14 vlc-3.0.22/modules/codec/webvtt/css_style.c | 5 vlc-3.0.22/modules/codec/webvtt/subsvtt.c | 188 vlc-3.0.22/modules/codec/webvtt/webvtt.c | 8 vlc-3.0.22/modules/codec/x265.c | 19 vlc-3.0.22/modules/control/dbus/dbus.c | 4 vlc-3.0.22/modules/control/ntservice.c | 17 vlc-3.0.22/modules/demux/Makefile.am | 8 vlc-3.0.22/modules/demux/adaptive/PlaylistManager.cpp | 22 vlc-3.0.22/modules/demux/adaptive/SegmentTracker.cpp | 6 vlc-3.0.22/modules/demux/adaptive/Streams.cpp | 5 vlc-3.0.22/modules/demux/adaptive/http/Chunk.cpp | 16 vlc-3.0.22/modules/demux/adaptive/http/Chunk.h | 10 vlc-3.0.22/modules/demux/adaptive/http/ConnectionParams.cpp | 4 vlc-3.0.22/modules/demux/adaptive/http/HTTPConnectionManager.cpp | 6 vlc-3.0.22/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp | 4 vlc-3.0.22/modules/demux/adaptive/logic/AbstractAdaptationLogic.h | 3 vlc-3.0.22/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h | 1 vlc-3.0.22/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp | 1 vlc-3.0.22/modules/demux/adaptive/logic/BufferingLogic.cpp | 50 vlc-3.0.22/modules/demux/adaptive/logic/BufferingLogic.hpp | 6 vlc-3.0.22/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp | 4 vlc-3.0.22/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp | 4 vlc-3.0.22/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp | 4 vlc-3.0.22/modules/demux/adaptive/playlist/BaseAdaptationSet.h | 6 vlc-3.0.22/modules/demux/adaptive/playlist/BasePeriod.cpp | 8 vlc-3.0.22/modules/demux/adaptive/playlist/BasePeriod.h | 5 vlc-3.0.22/modules/demux/adaptive/playlist/BasePlaylist.cpp | 20 vlc-3.0.22/modules/demux/adaptive/playlist/BasePlaylist.hpp | 19 vlc-3.0.22/modules/demux/adaptive/playlist/BaseRepresentation.cpp | 14 vlc-3.0.22/modules/demux/adaptive/playlist/CommonAttributesElements.h | 1 vlc-3.0.22/modules/demux/adaptive/playlist/Segment.cpp | 10 vlc-3.0.22/modules/demux/adaptive/playlist/Segment.h | 5 vlc-3.0.22/modules/demux/adaptive/playlist/SegmentBase.cpp | 6 vlc-3.0.22/modules/demux/adaptive/playlist/SegmentBaseType.cpp | 16 vlc-3.0.22/modules/demux/adaptive/playlist/SegmentInformation.cpp | 16 vlc-3.0.22/modules/demux/adaptive/playlist/SegmentInformation.hpp | 3 vlc-3.0.22/modules/demux/adaptive/playlist/SegmentList.cpp | 16 vlc-3.0.22/modules/demux/adaptive/playlist/SegmentTemplate.cpp | 14 vlc-3.0.22/modules/demux/adaptive/playlist/SegmentTemplate.h | 1 vlc-3.0.22/modules/demux/adaptive/playlist/Templates.hpp | 18 vlc-3.0.22/modules/demux/adaptive/test/SegmentTracker.cpp | 28 vlc-3.0.22/modules/demux/adaptive/test/logic/BufferingLogic.cpp | 4 vlc-3.0.22/modules/demux/adaptive/test/playlist/M3U8.cpp | 55 vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentBase.cpp | 2 vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentList.cpp | 54 vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentTemplate.cpp | 8 vlc-3.0.22/modules/demux/adaptive/test/plumbing/CommandsQueue.cpp | 2 vlc-3.0.22/modules/demux/adaptive/test/tools/Conversions.cpp | 2 vlc-3.0.22/modules/demux/adaptive/tools/Compatibility.hpp | 214 vlc-3.0.22/modules/demux/adaptive/tools/Properties.hpp | 37 vlc-3.0.22/modules/demux/adaptive/xml/Node.cpp | 3 vlc-3.0.22/modules/demux/asf/asf.c | 44 vlc-3.0.22/modules/demux/asf/asfpacket.c | 64 vlc-3.0.22/modules/demux/asf/asfpacket.h | 4 vlc-3.0.22/modules/demux/asf/libasf.c | 26 vlc-3.0.22/modules/demux/asf/libasf.h | 2 vlc-3.0.22/modules/demux/avformat/demux.c | 85 vlc-3.0.22/modules/demux/avformat/mux.c | 43 vlc-3.0.22/modules/demux/avi/avi.c | 101 vlc-3.0.22/modules/demux/avi/libavi.c | 6 vlc-3.0.22/modules/demux/avi/libavi.h | 3 vlc-3.0.22/modules/demux/caf.c | 2 vlc-3.0.22/modules/demux/dash/DASHManager.cpp | 22 vlc-3.0.22/modules/demux/dash/mpd/IsoffMainParser.cpp | 57 vlc-3.0.22/modules/demux/dash/mpd/MPD.cpp | 6 vlc-3.0.22/modules/demux/dash/mpd/MPD.h | 2 vlc-3.0.22/modules/demux/dmxmus.c | 408 vlc-3.0.22/modules/demux/flac.c | 2 vlc-3.0.22/modules/demux/gme.c | 6 vlc-3.0.22/modules/demux/hls/playlist/HLSRepresentation.cpp | 18 vlc-3.0.22/modules/demux/hls/playlist/M3U8.cpp | 2 vlc-3.0.22/modules/demux/hls/playlist/Parser.cpp | 46 vlc-3.0.22/modules/demux/hls/playlist/Tags.cpp | 16 vlc-3.0.22/modules/demux/hls/playlist/Tags.hpp | 5 vlc-3.0.22/modules/demux/image.c | 12 vlc-3.0.22/modules/demux/mjpeg.c | 22 vlc-3.0.22/modules/demux/mkv/demux.cpp | 29 vlc-3.0.22/modules/demux/mkv/matroska_segment.cpp | 57 vlc-3.0.22/modules/demux/mkv/matroska_segment.hpp | 3 vlc-3.0.22/modules/demux/mkv/matroska_segment_parse.cpp | 126 vlc-3.0.22/modules/demux/mkv/matroska_segment_seeker.cpp | 33 vlc-3.0.22/modules/demux/mkv/mkv.cpp | 8 vlc-3.0.22/modules/demux/mkv/mkv.hpp | 18 vlc-3.0.22/modules/demux/mkv/util.cpp | 2 vlc-3.0.22/modules/demux/mp4/essetup.c | 48 vlc-3.0.22/modules/demux/mp4/libmp4.c | 117 vlc-3.0.22/modules/demux/mp4/libmp4.h | 32 vlc-3.0.22/modules/demux/mp4/mp4.c | 105 vlc-3.0.22/modules/demux/mp4/mp4.h | 2 vlc-3.0.22/modules/demux/mpeg/es.c | 2 vlc-3.0.22/modules/demux/mpeg/pes.h | 34 vlc-3.0.22/modules/demux/mpeg/ps.c | 24 vlc-3.0.22/modules/demux/mpeg/ps.h | 78 vlc-3.0.22/modules/demux/mpeg/timestamps.h | 25 vlc-3.0.22/modules/demux/mpeg/ts.c | 578 vlc-3.0.22/modules/demux/mpeg/ts_arib.c | 1 vlc-3.0.22/modules/demux/mpeg/ts_hotfixes.c | 10 vlc-3.0.22/modules/demux/mpeg/ts_pes.c | 306 vlc-3.0.22/modules/demux/mpeg/ts_pes.h | 40 vlc-3.0.22/modules/demux/mpeg/ts_pid.c | 1 vlc-3.0.22/modules/demux/mpeg/ts_psi.c | 7 vlc-3.0.22/modules/demux/mpeg/ts_psip.c | 1 vlc-3.0.22/modules/demux/mpeg/ts_scte.c | 9 vlc-3.0.22/modules/demux/mpeg/ts_streams.c | 9 vlc-3.0.22/modules/demux/mpeg/ts_streams_private.h | 7 vlc-3.0.22/modules/demux/nsv.c | 3 vlc-3.0.22/modules/demux/ogg.c | 11 vlc-3.0.22/modules/demux/playlist/asx.c | 8 vlc-3.0.22/modules/demux/playlist/xspf.c | 2 vlc-3.0.22/modules/demux/pva.c | 51 vlc-3.0.22/modules/demux/real.c | 2 vlc-3.0.22/modules/demux/smooth/SmoothManager.cpp | 4 vlc-3.0.22/modules/demux/smooth/playlist/ForgedInitSegment.cpp | 6 vlc-3.0.22/modules/demux/smooth/playlist/Manifest.cpp | 2 vlc-3.0.22/modules/demux/smooth/playlist/QualityLevel.cpp | 4 vlc-3.0.22/modules/demux/smooth/playlist/SmoothParser.cpp | 12 vlc-3.0.22/modules/demux/smooth/playlist/SmoothSegment.cpp | 4 vlc-3.0.22/modules/demux/subtitle.c | 360 vlc-3.0.22/modules/demux/ttml.c | 4 vlc-3.0.22/modules/demux/ty.c | 195 vlc-3.0.22/modules/demux/vobsub.c | 13 vlc-3.0.22/modules/demux/voc.c | 17 vlc-3.0.22/modules/demux/wav.c | 42 vlc-3.0.22/modules/demux/webvtt.c | 26 vlc-3.0.22/modules/demux/xiph_metadata.c | 54 vlc-3.0.22/modules/gui/eject.c | 10 vlc-3.0.22/modules/gui/macosx/Makefile.am | 2 vlc-3.0.22/modules/gui/macosx/VLCMain.m | 2 vlc-3.0.22/modules/gui/macosx/VLCPLItem.m | 1 vlc-3.0.22/modules/gui/macosx/VLCSlider.m | 7 vlc-3.0.22/modules/gui/qt/Makefile.am | 2 vlc-3.0.22/modules/gui/qt/actions_manager.cpp | 2 vlc-3.0.22/modules/gui/qt/adapters/chromaprint.cpp | 1 vlc-3.0.22/modules/gui/qt/components/complete_preferences.cpp | 6 vlc-3.0.22/modules/gui/qt/components/controller.cpp | 79 vlc-3.0.22/modules/gui/qt/components/controller.hpp | 4 vlc-3.0.22/modules/gui/qt/components/controller_widget.cpp | 2 vlc-3.0.22/modules/gui/qt/components/epg/EPGChannels.cpp | 8 vlc-3.0.22/modules/gui/qt/components/epg/EPGChannels.hpp | 2 vlc-3.0.22/modules/gui/qt/components/epg/EPGItem.cpp | 5 vlc-3.0.22/modules/gui/qt/components/epg/EPGItem.hpp | 12 vlc-3.0.22/modules/gui/qt/components/epg/EPGProgram.cpp | 6 vlc-3.0.22/modules/gui/qt/components/epg/EPGRuler.hpp | 2 vlc-3.0.22/modules/gui/qt/components/epg/EPGView.cpp | 11 vlc-3.0.22/modules/gui/qt/components/epg/EPGView.hpp | 1 vlc-3.0.22/modules/gui/qt/components/epg/EPGWidget.cpp | 8 vlc-3.0.22/modules/gui/qt/components/epg/EPGWidget.hpp | 3 vlc-3.0.22/modules/gui/qt/components/extended_panels.cpp | 44 vlc-3.0.22/modules/gui/qt/components/extended_panels.hpp | 12 vlc-3.0.22/modules/gui/qt/components/info_panels.cpp | 20 vlc-3.0.22/modules/gui/qt/components/info_panels.hpp | 2 vlc-3.0.22/modules/gui/qt/components/info_widgets.cpp | 2 vlc-3.0.22/modules/gui/qt/components/info_widgets.hpp | 1 vlc-3.0.22/modules/gui/qt/components/interface_widgets.cpp | 55 vlc-3.0.22/modules/gui/qt/components/interface_widgets.hpp | 14 vlc-3.0.22/modules/gui/qt/components/open_panels.cpp | 48 vlc-3.0.22/modules/gui/qt/components/open_panels.hpp | 4 vlc-3.0.22/modules/gui/qt/components/playlist/playlist.cpp | 2 vlc-3.0.22/modules/gui/qt/components/playlist/playlist_model.cpp | 5 vlc-3.0.22/modules/gui/qt/components/playlist/playlist_model.hpp | 1 vlc-3.0.22/modules/gui/qt/components/playlist/selector.cpp | 19 vlc-3.0.22/modules/gui/qt/components/playlist/selector.hpp | 6 vlc-3.0.22/modules/gui/qt/components/playlist/sorting.h | 22 vlc-3.0.22/modules/gui/qt/components/playlist/standardpanel.cpp | 5 vlc-3.0.22/modules/gui/qt/components/playlist/views.cpp | 2 vlc-3.0.22/modules/gui/qt/components/playlist/vlc_model.cpp | 6 vlc-3.0.22/modules/gui/qt/components/preferences_widgets.cpp | 34 vlc-3.0.22/modules/gui/qt/components/preferences_widgets.hpp | 16 vlc-3.0.22/modules/gui/qt/components/simple_preferences.cpp | 75 vlc-3.0.22/modules/gui/qt/components/sout/profile_selector.cpp | 12 vlc-3.0.22/modules/gui/qt/components/sout/sout_widgets.cpp | 7 vlc-3.0.22/modules/gui/qt/dialogs/bookmarks.cpp | 12 vlc-3.0.22/modules/gui/qt/dialogs/convert.cpp | 4 vlc-3.0.22/modules/gui/qt/dialogs/convert.hpp | 2 vlc-3.0.22/modules/gui/qt/dialogs/epg.cpp | 7 vlc-3.0.22/modules/gui/qt/dialogs/epg.hpp | 2 vlc-3.0.22/modules/gui/qt/dialogs/extended.cpp | 2 vlc-3.0.22/modules/gui/qt/dialogs/extensions.cpp | 1 vlc-3.0.22/modules/gui/qt/dialogs/extensions.hpp | 6 vlc-3.0.22/modules/gui/qt/dialogs/external.cpp | 4 vlc-3.0.22/modules/gui/qt/dialogs/fingerprintdialog.cpp | 2 vlc-3.0.22/modules/gui/qt/dialogs/fingerprintdialog.hpp | 1 vlc-3.0.22/modules/gui/qt/dialogs/firstrun.cpp | 2 vlc-3.0.22/modules/gui/qt/dialogs/firstrun.hpp | 6 vlc-3.0.22/modules/gui/qt/dialogs/gototime.cpp | 3 vlc-3.0.22/modules/gui/qt/dialogs/gototime.hpp | 4 vlc-3.0.22/modules/gui/qt/dialogs/help.cpp | 47 vlc-3.0.22/modules/gui/qt/dialogs/help.hpp | 4 vlc-3.0.22/modules/gui/qt/dialogs/mediainfo.hpp | 2 vlc-3.0.22/modules/gui/qt/dialogs/messages.cpp | 5 vlc-3.0.22/modules/gui/qt/dialogs/messages.hpp | 6 vlc-3.0.22/modules/gui/qt/dialogs/open.cpp | 9 vlc-3.0.22/modules/gui/qt/dialogs/openurl.cpp | 5 vlc-3.0.22/modules/gui/qt/dialogs/openurl.hpp | 4 vlc-3.0.22/modules/gui/qt/dialogs/plugins.cpp | 13 vlc-3.0.22/modules/gui/qt/dialogs/plugins.hpp | 2 vlc-3.0.22/modules/gui/qt/dialogs/preferences.cpp | 8 vlc-3.0.22/modules/gui/qt/dialogs/sout.cpp | 6 vlc-3.0.22/modules/gui/qt/dialogs/toolbar.cpp | 8 vlc-3.0.22/modules/gui/qt/dialogs/vlm.cpp | 35 vlc-3.0.22/modules/gui/qt/dialogs/vlm.hpp | 2 vlc-3.0.22/modules/gui/qt/dialogs_provider.hpp | 2 vlc-3.0.22/modules/gui/qt/extensions_manager.cpp | 2 vlc-3.0.22/modules/gui/qt/extensions_manager.hpp | 5 vlc-3.0.22/modules/gui/qt/main_interface.cpp | 69 vlc-3.0.22/modules/gui/qt/main_interface.hpp | 2 vlc-3.0.22/modules/gui/qt/main_interface_win32.cpp | 15 vlc-3.0.22/modules/gui/qt/main_interface_win32.hpp | 11 vlc-3.0.22/modules/gui/qt/menus.cpp | 17 vlc-3.0.22/modules/gui/qt/qt.cpp | 65 vlc-3.0.22/modules/gui/qt/qt.hpp | 4 vlc-3.0.22/modules/gui/qt/recents.cpp | 8 vlc-3.0.22/modules/gui/qt/recents.hpp | 4 vlc-3.0.22/modules/gui/qt/ui/about.ui | 7 vlc-3.0.22/modules/gui/qt/ui/open.ui | 6 vlc-3.0.22/modules/gui/qt/ui/podcast_configuration.ui | 2 vlc-3.0.22/modules/gui/qt/ui/sprefs_audio.ui | 2 vlc-3.0.22/modules/gui/qt/ui/sprefs_interface.ui | 7 vlc-3.0.22/modules/gui/qt/util/animators.cpp | 4 vlc-3.0.22/modules/gui/qt/util/animators.hpp | 1 vlc-3.0.22/modules/gui/qt/util/customwidgets.cpp | 112 vlc-3.0.22/modules/gui/qt/util/customwidgets.hpp | 52 vlc-3.0.22/modules/gui/qt/util/input_slider.cpp | 80 vlc-3.0.22/modules/gui/qt/util/input_slider.hpp | 11 vlc-3.0.22/modules/gui/qt/util/pictureflow.cpp | 22 vlc-3.0.22/modules/gui/qt/util/qvlcapp.hpp | 1 vlc-3.0.22/modules/gui/qt/util/qvlcframe.hpp | 65 vlc-3.0.22/modules/gui/qt/util/searchlineedit.cpp | 29 vlc-3.0.22/modules/gui/qt/util/timetooltip.cpp | 13 vlc-3.0.22/modules/gui/qt/util/validators.hpp | 4 vlc-3.0.22/modules/gui/skins2/controls/ctrl_generic.cpp | 2 vlc-3.0.22/modules/gui/skins2/src/vlcproc.cpp | 2 vlc-3.0.22/modules/gui/skins2/win32/win32_factory.cpp | 2 vlc-3.0.22/modules/gui/skins2/win32/win32_graphics.cpp | 2 vlc-3.0.22/modules/gui/skins2/x11/x11_window.cpp | 4 vlc-3.0.22/modules/hw/amf/amf_helper.c | 6 vlc-3.0.22/modules/hw/amf/amf_helper.h | 1 vlc-3.0.22/modules/hw/d3d11/Makefile.am | 16 vlc-3.0.22/modules/hw/d3d11/d3d11_deinterlace.c | 5 vlc-3.0.22/modules/hw/d3d11/d3d11_filters.c | 20 vlc-3.0.22/modules/hw/d3d11/d3d11_filters.h | 2 vlc-3.0.22/modules/hw/d3d11/d3d11_instance.c | 6 vlc-3.0.22/modules/hw/mmal/Makefile.in | 20 vlc-3.0.22/modules/hw/vdpau/Makefile.am | 5 vlc-3.0.22/modules/keystore/kwallet.c | 2 vlc-3.0.22/modules/lua/extension.c | 14 vlc-3.0.22/modules/lua/extension_thread.c | 37 vlc-3.0.22/modules/meta_engine/ID3Pictures.h | 78 vlc-3.0.22/modules/meta_engine/Makefile.am | 2 vlc-3.0.22/modules/meta_engine/taglib.cpp | 532 vlc-3.0.22/modules/misc/gnutls.c | 3 vlc-3.0.22/modules/misc/webservices/musicbrainz.c | 4 vlc-3.0.22/modules/packetizer/a52.c | 3 vlc-3.0.22/modules/packetizer/av1.c | 7 vlc-3.0.22/modules/packetizer/avparser.c | 5 vlc-3.0.22/modules/packetizer/dirac.c | 3 vlc-3.0.22/modules/packetizer/dts.c | 25 vlc-3.0.22/modules/packetizer/dts_header.c | 1 vlc-3.0.22/modules/packetizer/flac.c | 3 vlc-3.0.22/modules/packetizer/flac.h | 24 vlc-3.0.22/modules/packetizer/h264.c | 12 vlc-3.0.22/modules/packetizer/h264_nal.c | 9 vlc-3.0.22/modules/packetizer/h264_nal.h | 1 vlc-3.0.22/modules/packetizer/h264_slice.c | 9 vlc-3.0.22/modules/packetizer/hevc.c | 12 vlc-3.0.22/modules/packetizer/hevc_nal.c | 2 vlc-3.0.22/modules/packetizer/hxxx_common.c | 15 vlc-3.0.22/modules/packetizer/hxxx_common.h | 7 vlc-3.0.22/modules/packetizer/mlp.c | 3 vlc-3.0.22/modules/packetizer/mpeg4audio.c | 3 vlc-3.0.22/modules/packetizer/mpeg4video.c | 3 vlc-3.0.22/modules/packetizer/mpegaudio.c | 3 vlc-3.0.22/modules/packetizer/mpegvideo.c | 3 vlc-3.0.22/modules/packetizer/vc1.c | 3 vlc-3.0.22/modules/services_discovery/mtp.c | 2 vlc-3.0.22/modules/services_discovery/upnp.cpp | 127 vlc-3.0.22/modules/services_discovery/windrive.c | 6 vlc-3.0.22/modules/spu/logo.c | 4 vlc-3.0.22/modules/stream_extractor/archive.c | 25 vlc-3.0.22/modules/stream_filter/aribcam.c | 2 vlc-3.0.22/modules/stream_filter/hds/hds.c | 4 vlc-3.0.22/modules/stream_out/bridge.c | 4 vlc-3.0.22/modules/stream_out/chromecast/chromecast_demux.cpp | 2 vlc-3.0.22/modules/stream_out/delay.c | 2 vlc-3.0.22/modules/stream_out/es.c | 4 vlc-3.0.22/modules/stream_out/rtp.c | 2 vlc-3.0.22/modules/stream_out/transcode/video.c | 19 vlc-3.0.22/modules/text_renderer/freetype/fonts/win32.c | 9 vlc-3.0.22/modules/text_renderer/freetype/platform_fonts.c | 6 vlc-3.0.22/modules/text_renderer/svg.c | 8 vlc-3.0.22/modules/video_chroma/d3d11_fmt.c | 41 vlc-3.0.22/modules/video_chroma/d3d11_fmt.h | 5 vlc-3.0.22/modules/video_filter/amf_frc.c | 342 vlc-3.0.22/modules/video_filter/amf_vqenhancer.c | 12 vlc-3.0.22/modules/video_filter/canvas.c | 2 vlc-3.0.22/modules/video_filter/magnify.c | 10 vlc-3.0.22/modules/video_filter/opencv_wrapper.c | 13 vlc-3.0.22/modules/video_output/Makefile.am | 4 vlc-3.0.22/modules/video_output/android/display.c | 48 vlc-3.0.22/modules/video_output/android/utils.c | 21 vlc-3.0.22/modules/video_output/android/utils.h | 10 vlc-3.0.22/modules/video_output/opengl/converter_vaapi.c | 76 vlc-3.0.22/modules/video_output/win32/d3d11_quad.c | 2 vlc-3.0.22/modules/video_output/win32/d3d11_scaler.cpp | 41 vlc-3.0.22/modules/video_output/win32/d3d11_tonemap.cpp | 1 vlc-3.0.22/modules/video_output/win32/direct3d11.c | 171 vlc-3.0.22/modules/video_output/win32/direct3d9.c | 6 vlc-3.0.22/modules/video_output/win32/inhibit.c | 38 vlc-3.0.22/modules/video_output/win32/win32touch.h | 2 vlc-3.0.22/modules/video_output/win32/wingdi.c | 2 vlc-3.0.22/modules/visualization/glspectrum.c | 17 vlc-3.0.22/modules/visualization/visual/effects.c | 16 vlc-3.0.22/modules/visualization/visual/fft.h | 4 vlc-3.0.22/po/LINGUAS | 2 vlc-3.0.22/po/POTFILES.in | 3 vlc-3.0.22/po/ach.po | 1620 vlc-3.0.22/po/af.po | 1652 vlc-3.0.22/po/am.po | 1620 vlc-3.0.22/po/am_ET.po | 1623 vlc-3.0.22/po/an.po | 1662 vlc-3.0.22/po/ar.po | 2403 vlc-3.0.22/po/as.po |29571 ++++++++++ vlc-3.0.22/po/as_IN.po |29560 --------- vlc-3.0.22/po/ast.po | 1693 vlc-3.0.22/po/be.po | 4952 - vlc-3.0.22/po/bg.po | 1686 vlc-3.0.22/po/bn.po | 1771 vlc-3.0.22/po/bn_IN.po | 1676 vlc-3.0.22/po/br.po | 1703 vlc-3.0.22/po/brx.po | 1683 vlc-3.0.22/po/bs.po | 9759 +-- vlc-3.0.22/po/ca.po | 1745 vlc-3.0.22/po/ca@valencia.po | 1660 vlc-3.0.22/po/cgg.po | 1871 vlc-3.0.22/po/co.po | 3858 - vlc-3.0.22/po/cs.po | 1765 vlc-3.0.22/po/cy.po | 1658 vlc-3.0.22/po/da.po | 1705 vlc-3.0.22/po/de.po | 1740 vlc-3.0.22/po/el.po | 1744 vlc-3.0.22/po/en_GB.po | 3575 - vlc-3.0.22/po/eo.po | 4553 - vlc-3.0.22/po/es.po | 1701 vlc-3.0.22/po/es_MX.po | 1701 vlc-3.0.22/po/et.po | 1877 vlc-3.0.22/po/eu.po | 1675 vlc-3.0.22/po/fa.po | 1673 vlc-3.0.22/po/ff.po | 1629 vlc-3.0.22/po/fi.po | 6869 +- vlc-3.0.22/po/fr.po | 1813 vlc-3.0.22/po/fur.po | 1701 vlc-3.0.22/po/fy.po | 1676 vlc-3.0.22/po/ga.po | 1637 vlc-3.0.22/po/gd.po | 1661 vlc-3.0.22/po/gl.po | 1667 vlc-3.0.22/po/gu.po | 1683 vlc-3.0.22/po/he.po | 2426 vlc-3.0.22/po/hi.po | 1715 vlc-3.0.22/po/hr.po | 1867 vlc-3.0.22/po/hu.po | 1788 vlc-3.0.22/po/hy.po | 1623 vlc-3.0.22/po/id.po | 1840 vlc-3.0.22/po/ie.po | 1626 vlc-3.0.22/po/is.po | 1761 vlc-3.0.22/po/it.po | 1736 vlc-3.0.22/po/ja.po | 1737 vlc-3.0.22/po/ka.po | 2089 vlc-3.0.22/po/kab.po | 1623 vlc-3.0.22/po/kk.po | 1675 vlc-3.0.22/po/km.po | 1667 vlc-3.0.22/po/kn.po | 1653 vlc-3.0.22/po/ko.po | 2747 vlc-3.0.22/po/ks_IN.po | 1692 vlc-3.0.22/po/ku_IQ.po | 1826 vlc-3.0.22/po/ky.po | 1614 vlc-3.0.22/po/lg.po | 1620 vlc-3.0.22/po/lo.po | 1806 vlc-3.0.22/po/lt.po | 1660 vlc-3.0.22/po/lv.po | 1741 vlc-3.0.22/po/mai.po | 1659 vlc-3.0.22/po/mk.po | 1754 vlc-3.0.22/po/ml.po | 2033 vlc-3.0.22/po/mn.po | 1662 vlc-3.0.22/po/mr.po | 1787 vlc-3.0.22/po/ms.po | 1790 vlc-3.0.22/po/my.po | 1813 vlc-3.0.22/po/nb.po | 1817 vlc-3.0.22/po/ne.po | 1666 vlc-3.0.22/po/nl.po | 1748 vlc-3.0.22/po/nn.po | 1772 vlc-3.0.22/po/oc.po | 1707 vlc-3.0.22/po/or_IN.po | 1763 vlc-3.0.22/po/pa.po | 1632 vlc-3.0.22/po/pl.po | 1702 vlc-3.0.22/po/ps.po | 1617 vlc-3.0.22/po/pt_BR.po | 1721 vlc-3.0.22/po/pt_PT.po | 2109 vlc-3.0.22/po/ro.po | 1688 vlc-3.0.22/po/ru.po | 1679 vlc-3.0.22/po/si.po | 1674 vlc-3.0.22/po/sk.po | 1949 vlc-3.0.22/po/sl.po | 1848 vlc-3.0.22/po/sm.po | 1799 vlc-3.0.22/po/sq.po | 1642 vlc-3.0.22/po/sr.po | 1689 vlc-3.0.22/po/sv.po | 4462 - vlc-3.0.22/po/sw.po | 1870 vlc-3.0.22/po/ta.po | 1652 vlc-3.0.22/po/te.po | 1661 vlc-3.0.22/po/th.po | 1781 vlc-3.0.22/po/tr.po | 1870 vlc-3.0.22/po/tt.po | 1664 vlc-3.0.22/po/ug.po |12602 ++-- vlc-3.0.22/po/uk.po | 1729 vlc-3.0.22/po/uz.po | 1659 vlc-3.0.22/po/vi.po | 6170 +- vlc-3.0.22/po/vlc.pot | 1599 vlc-3.0.22/po/wa.po | 1673 vlc-3.0.22/po/zh_CN.po | 1682 vlc-3.0.22/po/zh_TW.po | 1632 vlc-3.0.22/po/zu.po | 1620 vlc-3.0.22/share/Makefile.am | 11 vlc-3.0.22/share/Makefile.in | 30 vlc-3.0.22/share/org.videolan.vlc.appdata.xml.in.in | 42 vlc-3.0.22/share/vlc.appdata.xml.in.in | 41 vlc-3.0.22/src/Makefile.am | 5 vlc-3.0.22/src/Makefile.in | 90 vlc-3.0.22/src/input/es_out_timeshift.c | 10 vlc-3.0.22/src/input/mrl_helpers.h | 15 vlc-3.0.22/src/input/stream_extractor.c | 5 vlc-3.0.22/src/input/vlmshell.c | 4 vlc-3.0.22/src/misc/fourcc.c | 4 vlc-3.0.22/src/misc/fourcc_list.h | 5 vlc-3.0.22/src/misc/subpicture.c | 16 vlc-3.0.22/src/playlist/fetcher.c | 2 vlc-3.0.22/src/revision.c | 2 vlc-3.0.22/src/revision.txt | 2 vlc-3.0.22/src/stream_output/stream_output.c | 2 vlc-3.0.22/src/test/mrl_helpers.c | 5 vlc-3.0.22/src/test/picture_pool.c | 1 vlc-3.0.22/src/text/memstream.c | 33 vlc-3.0.22/src/text/url.c | 2 vlc-3.0.22/src/video_output/video_output.c | 2 vlc-3.0.22/src/win32/dirs.c | 21 vlc-3.0.22/src/win32/filesystem.c | 105 vlc-3.0.22/test/Makefile.am | 7 vlc-3.0.22/test/Makefile.in | 115 vlc-3.0.22/test/check_POTFILES.sh | 6 vlc-3.0.22/test/modules/demux/timestamps.c | 96 vlc-3.0.22/test/modules/demux/ts_pes.c | 271 vlc-3.0.22/test/src/input/demux-run.c | 2 1136 files changed, 185098 insertions(+), 175060 deletions(-) diff -Nru vlc-3.0.21/Makefile.am vlc-3.0.22/Makefile.am --- vlc-3.0.21/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -21,21 +21,19 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) -SUFFIXES = +SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ - --disable-a52 \ --disable-alsa \ --disable-avcodec --disable-avformat \ --disable-postproc --disable-swscale \ --disable-dbus \ - --disable-mad --disable-libmpeg2 \ + --disable-mad \ --disable-faad --disable-skins2 \ --disable-live555 \ --disable-lua \ --disable-fribidi \ - --disable-mkv \ --with-kde-solid='$${datadir}/kde4/apps' ACLOCAL_AMFLAGS = -I m4 @@ -62,13 +60,10 @@ extras/tools/tools.mak \ extras/tools/SHA512SUMS \ extras/tools/automake-clang.patch \ - extras/tools/bison-macOS-7df04f9.patch \ - extras/tools/bison-macOS-c41f233c.patch \ extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch \ extras/tools/libtool-2.4.7-bitcode.patch \ extras/tools/libtool-2.4.7-clang-libs.patch \ - extras/tools/libtool-2.4.7-response-files.patch \ - extras/tools/ragel-6.8-javacodegen.patch + extras/tools/libtool-2.4.7-response-files.patch ############################################################################### # Various utilities ( editor syntax files, D-Bus controller ... ) diff -Nru vlc-3.0.21/Makefile.in vlc-3.0.22/Makefile.in --- vlc-3.0.21/Makefile.in 2024-06-05 16:02:16.000000000 +0000 +++ vlc-3.0.22/Makefile.in 2025-11-24 23:10:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -195,8 +195,8 @@ AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope check recheck distdir distdir-am dist dist-all \ distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ - config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -213,6 +213,9 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -368,7 +371,6 @@ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` -AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) TEST_SUITE_LOG = test-suite.log TEST_EXTENSIONS = @EXEEXT@ .test @@ -409,9 +411,8 @@ $(top_srcdir)/share/Info.plist.in ABOUT-NLS AUTHORS COPYING \ COPYING.LIB ChangeLog INSTALL NEWS README THANKS \ autotools/compile autotools/config.guess \ - autotools/config.rpath autotools/config.sub autotools/depcomp \ - autotools/install-sh autotools/ltmain.sh autotools/missing \ - autotools/ylwrap + autotools/config.rpath autotools/config.sub \ + autotools/install-sh autotools/ltmain.sh autotools/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -450,8 +451,6 @@ GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.xz DIST_TARGETS = dist-xz -# Exists only to be overridden by the user if desired. -AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -646,8 +645,6 @@ CPPFLAGS_vpx = @CPPFLAGS_vpx@ CPPFLAGS_x265 = @CPPFLAGS_x265@ CPPFLAGS_xml = @CPPFLAGS_xml@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -691,14 +688,12 @@ EGL_CFLAGS = @EGL_CFLAGS@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ -ETAGS = @ETAGS@ EVAS_CFLAGS = @EVAS_CFLAGS@ EVAS_LIBS = @EVAS_LIBS@ EXEEXT = @EXEEXT@ FDKAAC_CFLAGS = @FDKAAC_CFLAGS@ FDKAAC_LIBS = @FDKAAC_LIBS@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@ FLAC_CFLAGS = @FLAC_CFLAGS@ @@ -771,6 +766,7 @@ LIBCDDB_LIBS = @LIBCDDB_LIBS@ LIBCOM = @LIBCOM@ LIBDL = @LIBDL@ +LIBEXECINFO = @LIBEXECINFO@ LIBEXT = @LIBEXT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -1061,6 +1057,7 @@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DIR = @PACKAGE_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -1172,9 +1169,11 @@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ WAYLAND_PROTOCOLS = @WAYLAND_PROTOCOLS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ +WIN32_PATH_CMD = @WIN32_PATH_CMD@ WINDOWS_ARCH = @WINDOWS_ARCH@ WINDRES = @WINDRES@ WINE_SDK_PATH = @WINE_SDK_PATH@ +WIXPATH = @WIXPATH@ X262_CFLAGS = @X262_CFLAGS@ X262_LIBS = @X262_LIBS@ X26410b_CFLAGS = @X26410b_CFLAGS@ @@ -1304,13 +1303,10 @@ extras/tools/bootstrap extras/tools/packages.mak \ extras/tools/tools.mak extras/tools/SHA512SUMS \ extras/tools/automake-clang.patch \ - extras/tools/bison-macOS-7df04f9.patch \ - extras/tools/bison-macOS-c41f233c.patch \ extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch \ extras/tools/libtool-2.4.7-bitcode.patch \ extras/tools/libtool-2.4.7-clang-libs.patch \ extras/tools/libtool-2.4.7-response-files.patch \ - extras/tools/ragel-6.8-javacodegen.patch \ extras/analyser/zsh_completion.sh extras/analyser/zsh.cpp \ extras/analyser/emacs.init extras/analyser/vlc.vim \ extras/analyser/valgrind.suppressions \ @@ -1391,17 +1387,15 @@ SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ - --disable-a52 \ --disable-alsa \ --disable-avcodec --disable-avformat \ --disable-postproc --disable-swscale \ --disable-dbus \ - --disable-mad --disable-libmpeg2 \ + --disable-mad \ --disable-faad --disable-skins2 \ --disable-live555 \ --disable-lua \ --disable-fribidi \ - --disable-mkv \ --with-kde-solid='$${datadir}/kde4/apps' ACLOCAL_AMFLAGS = -I m4 @@ -1430,25 +1424,24 @@ @BUILD_VLC_TRUE@noinst_SCRIPTS = vlc$(EXEEXT) TESTS = test/run_vlc.sh @HAVE_DARWIN_TRUE@noinst_DATA = pseudo-bundle -win32_destdir = $(top_builddir)/vlc-$(VERSION) +win32_destdir = @PACKAGE_DIR@ win32_debugdir = $(abs_top_builddir)/symbols-$(VERSION) win32_xpi_destdir = $(abs_top_builddir)/vlc-plugin-$(VERSION) 7Z_OPTS = -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -@ENABLE_PDB_TRUE@@HAVE_WIN32_TRUE@ENABLE_PDB_OPTION := --enable-pdb -@HAVE_WIN64_FALSE@WINVERSION = vlc-$(VERSION)-win32 -@HAVE_WIN64_TRUE@WINVERSION = vlc-$(VERSION)-win64 -WIXPATH = `wine winepath -u 'C:\\Program Files (x86)\\Windows Installer XML v3.5\\bin'` -HEAT = wine "$(WIXPATH)/heat.exe" -CANDLE = wine "$(WIXPATH)/candle.exe" -LIGHT = wine "$(WIXPATH)/light.exe" -VLCDIR = `wine winepath -s \`wine winepath -w '$(abs_top_builddir)/vlc-$(VERSION)'\`` +@HAVE_ARM64_FALSE@@HAVE_WIN64_FALSE@WINVERSION = vlc-$(VERSION)-win32 +@HAVE_ARM64_FALSE@@HAVE_WIN64_TRUE@WINVERSION = vlc-$(VERSION)-win64 +@HAVE_ARM64_TRUE@WINVERSION = vlc-$(VERSION)-winarm64 +HEAT = $(MSIDIR)/msi-heat.py +CANDLE = wine "@WIXPATH@/candle.exe" +LIGHT = wine "@WIXPATH@/light.exe" +VLCDIR = @PACKAGE_DIR@ MSIDIR = $(abs_srcdir)/extras/package/win32/msi -W_MSIDIR = `wine winepath -w '$(MSIDIR)'` +W_MSIDIR = `$(WIN32_PATH_CMD) -w '$(MSIDIR)'` MSIBUILDDIR = $(abs_top_builddir)/extras/package/win32/msi -W_MSIBUILDDIR = `wine winepath -w '$(MSIBUILDDIR)'` -@HAVE_WIN64_FALSE@MSIOUTFILE = vlc-$(VERSION)-win32.msi -@HAVE_WIN64_TRUE@MSIOUTFILE = vlc-$(VERSION)-win64.msi -WINE_C = `wine winepath c:` +W_MSIBUILDDIR = `$(WIN32_PATH_CMD) -w '$(MSIBUILDDIR)'` +@HAVE_ARM64_FALSE@@HAVE_WIN64_FALSE@MSIOUTFILE = vlc-$(VERSION)-win32.msi +@HAVE_ARM64_FALSE@@HAVE_WIN64_TRUE@MSIOUTFILE = vlc-$(VERSION)-win64.msi +@HAVE_ARM64_TRUE@MSIOUTFILE = vlc-$(VERSION)-winarm64.msi all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1769,7 +1762,7 @@ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1824,6 +1817,7 @@ @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -1912,10 +1906,6 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) -dist-zstd: distdir - tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst - $(am__post_remove_distdir) - dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -1958,8 +1948,6 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ - *.tar.zst*) \ - zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -1975,7 +1963,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -2038,8 +2026,7 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive +install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -2149,14 +2136,14 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(am__recursive_targets) all check check-am install install-am \ - install-exec install-exec-am install-strip uninstall-am + install-exec-am install-strip uninstall-am .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--refresh check check-TESTS check-am clean clean-cscope \ clean-generic clean-libtool cscope cscopelist-am ctags \ ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \ - dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \ - distclean distclean-generic distclean-hdr distclean-libtool \ + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binSCRIPTS install-data install-data-am install-dvi \ @@ -2391,6 +2378,10 @@ @HAVE_WIN32_TRUE@ $(SHELL) ./autogen.sh @HAVE_WIN32_TRUE@ touch $@ +# if ENABLE_PDB +# ENABLE_PDB_OPTION = --enable-pdb +# endif + @HAVE_WIN32_TRUE@npapi-vlc/Makefile: npapi-vlc/configure @HAVE_WIN32_TRUE@ cd npapi-vlc && \ @HAVE_WIN32_TRUE@ $(SHELL) ./configure \ @@ -2509,15 +2500,16 @@ @HAVE_WIN64_FALSE@ $(CC) $^ -D_WIN32_IE=0x0601 -shared -o $@ -lole32 -static-libgcc -D_UNICODE=1 -DUNICODE=1 @HAVE_WIN64_FALSE@ $(STRIP) $@ -package-win32-exe: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll extras/package/win32/NSIS/vlc.win32.nsi +package-win32-src: package-win-strip # Script installer cp $(top_builddir)/extras/package/win32/NSIS/vlc.win32.nsi "$(win32_destdir)/" cp $(top_builddir)/extras/package/win32/NSIS/spad.nsi "$(win32_destdir)/" - cp -r $(srcdir)/extras/package/win32/NSIS/languages "$(win32_destdir)/" - cp -r $(srcdir)/extras/package/win32/NSIS/helpers "$(win32_destdir)/" + cp -r $(srcdir)/extras/package/win32/NSIS/languages "$(win32_destdir)/" + cp -r $(srcdir)/extras/package/win32/NSIS/helpers "$(win32_destdir)/" cp "$(top_srcdir)/extras/package/win32/NSIS/nsProcess.nsh" "$(win32_destdir)/NSIS/" cp "$(top_srcdir)/extras/package/win32/NSIS/vlc_branding.bmp" "$(win32_destdir)/NSIS/" +package-win32-exe: package-win32-src $(win32_destdir)/NSIS/nsProcess.dll extras/package/win32/NSIS/vlc.win32.nsi # Create package if makensis -VERSION >/dev/null 2>&1; then \ MAKENSIS="makensis"; \ @@ -2555,14 +2547,7 @@ package-win32-debug: package-win32-debug-zip package-win32-debug-7zip -package-win32-release: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll package-win-sdk - cp $(top_builddir)/extras/package/win32/NSIS/vlc.win32.nsi "$(win32_destdir)/" - cp $(top_builddir)/extras/package/win32/NSIS/spad.nsi "$(win32_destdir)/" - cp -r $(srcdir)/extras/package/win32/NSIS/languages "$(win32_destdir)/" - cp -r $(srcdir)/extras/package/win32/NSIS/helpers "$(win32_destdir)/" - cp "$(top_srcdir)/extras/package/win32/NSIS/nsProcess.nsh" "$(win32_destdir)/NSIS/" - cp "$(top_srcdir)/extras/package/win32/NSIS/vlc_branding.bmp" "$(win32_destdir)/NSIS/" - +package-win32-release: package-win32-src $(win32_destdir)/NSIS/nsProcess.dll package-win-sdk mkdir -p "$(win32_destdir)/msi/" cp $(top_builddir)/extras/package/win32/msi/config.wxi "$(win32_destdir)/msi/" cp $(top_srcdir)/extras/package/win32/msi/axvlc.wxs "$(win32_destdir)/msi/" @@ -2580,24 +2565,22 @@ rm -f -- vlc-$(VERSION)-wince.zip zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION) -.PHONY: package-win-install package-win-common package-win-strip package-win32-webplugin-common package-win32-xpi package-win32-crx package-win32-exe package-win32-zip package-win32-debug-zip package-win32-7zip package-win32-debug-7zip package-win32-cleanup package-win32 package-win32-debug package-wince +.PHONY: package-win-install package-win-common package-win-strip package-win32-webplugin-common package-win32-xpi package-win32-crx package-win32-src package-win32-exe package-win32-zip package-win32-debug-zip package-win32-7zip package-win32-debug-7zip package-win32-cleanup package-win32 package-win32-debug package-wince heat: package-win-strip - $(HEAT) dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs - $(HEAT) dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Locale.fragment.wxs - $(HEAT) dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Lua.fragment.wxs - $(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Skins.fragment.wxs + $(HEAT) --dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Plugins.fragment.wxs + $(HEAT) --dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Locale.fragment.wxs +@BUILD_LUA_TRUE@ $(HEAT) --dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Lua.fragment.wxs +@BUILD_SKINS_TRUE@ $(HEAT) --dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Skins.fragment.wxs candle: heat - $(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)\\product.wxs $(W_MSIDIR)\\axvlc.wxs $(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs + $(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)/product.wxs $(W_MSIDIR)/axvlc.wxs $(W_MSIDIR)/extensions.wxs $(W_MSIBUILDDIR)/*.fragment.wxs -light: candle - test ! -d "$(WINE_C)/v" -o ! -f "$(WINE_C)/v" - ln -Tsf "$(abs_top_builddir)/vlc-$(VERSION)" "$(WINE_C)"/v - $(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b $(W_MSIDIR) -b C:/v/plugins -b C:/v/locale -b C:/v/lua -b C:/v/skins $(W_MSIBUILDDIR)\\product.wixobj $(W_MSIBUILDDIR)\\axvlc.wixobj $(W_MSIBUILDDIR)\\extensions.wixobj $(W_MSIBUILDDIR)\\*.fragment.wixobj -o $(MSIOUTFILE) - chmod 644 $(MSIOUTFILE) +$(MSIOUTFILE): candle + $(AM_V_GEN)cd vlc-@VERSION@ && $(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b $(W_MSIDIR) $(W_MSIBUILDDIR)/product.wixobj $(W_MSIBUILDDIR)/axvlc.wixobj $(W_MSIBUILDDIR)/extensions.wixobj $(W_MSIBUILDDIR)/*.fragment.wixobj -o ../$@ + chmod 644 $@ -package-msi: light +package-msi: $(MSIOUTFILE) cleanmsi: -rm -f $(MSIBUILDDIR)/*.wixobj @@ -2607,7 +2590,7 @@ distcleanmsi: cleanmsi -rm -f $(MSIOUTFILE) -.PHONY: heat candle light cleanmsi distcleanmsi package-msi +.PHONY: heat candle cleanmsi distcleanmsi package-msi ############################################################################### # OS Packaging rules diff -Nru vlc-3.0.21/NEWS vlc-3.0.22/NEWS --- vlc-3.0.21/NEWS 2024-06-05 15:57:55.000000000 +0000 +++ vlc-3.0.22/NEWS 2025-11-24 23:00:36.000000000 +0000 @@ -1,3 +1,111 @@ +Changes between 3.0.21 and 3.0.22: +---------------------------------- + +Core: + * Assume subpictures are in SDR by default + +Windows: + * Add Windows ARM64 builds (Minimum Windows 10 RS5 17763 / 1809) + * Fix support for Windows XP SP3 + * Allow renaming/moving/deleting of playing file on Windows + * Restrict SystemParametersInfo calls to Windows XP + +Decoders: + * Fix Opus channel mapping + * Fix hardware decoding with VideoToolbox of XVID MPEG-4 video + * Add dav1d-all-layers option + * Fix DVD CEA-608 captions parsing + * Fix ProRes 4:4:4:4 + * Disable decoding using libdca, libmpeg2 and liba52 by default in favor of libavcodec + +Demuxers: + * Add support for DMX audio music (MUS) files + * Handle mkv-use-chapter-codec option + * Add A_ATRAC/AT1 support in matroska + * Prevent FLAC seeking logic get stuck + * Handle pictures in FLAC + * Fix VOB/AOB LPCM/MLP detection failing occasionally + * Cut QNap title on first invalid character + * Fix display of certain JPEG files + * Fix playback of very short ASF files (duration less than 1s) + * Multiple fixes in MPEG-TS + * Fix crashes in multiple demuxers (reported by rub.de, oss-fuzz and others) + +Input: + * Fix SFTP seeking for large files on 32-bit OS + +Interface: + * Qt: Add option to use dark palette + * Qt: Add compilation support for newer versions of Qt5 + * Qt: Fix scrolling on volume slider + * macOS: fix crashes when drag'n drop items in the playlist + * KDE: fix MPRIS state when started from file + +Service Discovery: + * UPnP: remove SAT>IP channel list fallback + +Video Output: + * Use a better stretch mode in wingdi + * Fetch missing device information when running in UWP + +Video Filter: + * Add AMD GPU Frame Rate Doubler (Direct3D11) + * Improve visualization of low frequencies in spectrogram + +Contrib: + * Update amf to 1.4.34 + * Update dav1d to 1.5.1 + * Update FFmpeg to 4.4.5 + * Update freetype to 2.13.1 + * Update gettext to 0.22.5 + * Update gcrypt to 1.10.1 + * Update glew to 2.1.0 + * Update gmp to 6.3.0 + * Udpate gnutls to 3.8.10 + * Update harfbuzz to 11.5.0 + * Update iconv to 1.17 + * Update libarchive to 3.8.0 including support for RAR 5.0 + * Update libass to 0.17.3 + * Update libbluray to 1.4.0 + * Update libmatroska to 1.7.0 + * Update libogg to 1.3.6 + * Update libpng to 1.6.50 + * Update libvpx to 1.15.2 + * Update lua to 5.1.5 + * Update openjpeg to 2.5.0 + * Update orc to 0.4.33 + * Update srt to 1.5.3 + * Update taglib to 1.13.1 + * Update zlib to 1.3.1 + * and more 3rd party updates + * libmpeg2, libdca and liba52 are no longer build by default + * build ragel inside harfbuzz if necessary + +Misc: + * gnutls: remove manual DH prime bits setting + * Avoid very large fonts in portrait mode + * Update of most translations + +Many thanks to the Sovereign Tech Agency (https://www.sovereign.tech/), and +especially their Sovereign Tech Fund program, for helping VLC sustainability and safety. +Thanks to oss-fuzz as well for their help and resources to find issues. +Thanks to their support, 3.0.22 becomes the VLC release with the most security fixes ever! + +Security: + * Heap Buffer Overflow READ in TY, NSV, CVDsub, SPU, Subrip, TX3G, MPJEG demuxers and decoders + * Heap Buffer Overflow Write in RLE, MP4, TX3G demuxers and decoders + * Assert failure in AVI, MP4 demuxers and Core + * Null dereferences in CSS, Flac and VTT modules + * Use-after Free in SVG decoder + * Crash in Subtitles core, in jpeg2 inside TS + * Multiple crashes and OOB in CEA-708 subtitles + * OOB read on Oggspot, MP4 + * Multiple leaks in MKV, ASF/WMV, CAF and PS demuxers, Ogg, Theora, Vorbis, + WebVTT and SVCD decoders + * Busy loop in WebVTT + (The list above is not exhaustive) + + Changes between 3.0.20 and 3.0.21: ---------------------------------- diff -Nru vlc-3.0.21/aclocal.m4 vlc-3.0.22/aclocal.m4 --- vlc-3.0.21/aclocal.m4 2024-06-05 16:02:14.000000000 +0000 +++ vlc-3.0.22/aclocal.m4 2025-11-24 23:10:27.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.5 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,15 +14,15 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, -[m4_warning([this file was generated for autoconf 2.71. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. 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 use pkg-config. -*- Autoconf -*- -# serial 12 (pkg-config-0.29.2) - +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -63,7 +63,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.2]) +[m4_define([PKG_MACROS_VERSION], [0.29]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -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 occurrence in configure.ac, so if the first place +dnl only at the first occurence 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], @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $2]) +AC_MSG_CHECKING([for $1]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,17 +174,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + 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` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --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` 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 @@ -195,8 +195,8 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + AC_MSG_RESULT([no]) + 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,75 +296,7 @@ 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. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -379,7 +311,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.5], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -395,14 +327,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.5])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -422,7 +354,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -474,7 +406,7 @@ # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2021 Free Software Foundation, Inc. +# Copyright (C) 2008-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -511,7 +443,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -542,7 +474,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -733,7 +665,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -772,9 +704,7 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. If GNU make was not used, consider - re-running the configure script with MAKE="gmake" (or whatever is - necessary). You can also try re-running configure with the + for automatic dependency tracking. Try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -801,7 +731,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -829,10 +759,6 @@ # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl -m4_ifdef([_$0_ALREADY_INIT], - [m4_fatal([$0 expanded multiple times -]m4_defn([_$0_ALREADY_INIT]))], - [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -869,7 +795,7 @@ [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -921,20 +847,6 @@ [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -# Variables for tags utilities; see am/tags.am -if test -z "$CTAGS"; then - CTAGS=ctags -fi -AC_SUBST([CTAGS]) -if test -z "$ETAGS"; then - ETAGS=etags -fi -AC_SUBST([ETAGS]) -if test -z "$CSCOPE"; then - CSCOPE=cscope -fi -AC_SUBST([CSCOPE]) - AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -1016,7 +928,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1037,7 +949,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2021 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1059,7 +971,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1094,7 +1006,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1137,7 +1049,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1158,7 +1070,12 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - MISSING="\${SHELL} '$am_aux_dir/missing'" + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -1171,7 +1088,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1200,7 +1117,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1247,7 +1164,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1266,7 +1183,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1347,7 +1264,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2021 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1407,7 +1324,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1435,7 +1352,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2021 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1454,7 +1371,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2021 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru vlc-3.0.21/autotools/compile vlc-3.0.22/autotools/compile --- vlc-3.0.21/autotools/compile 2022-08-03 11:11:43.000000000 +0000 +++ vlc-3.0.22/autotools/compile 2025-11-24 23:10:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN* | MSYS*) + CYGWIN*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) + cygwin/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Nru vlc-3.0.21/autotools/config.guess vlc-3.0.22/autotools/config.guess --- vlc-3.0.21/autotools/config.guess 2022-08-03 11:11:43.000000000 +0000 +++ vlc-3.0.22/autotools/config.guess 2025-11-24 23:10:32.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -# shellcheck disable=SC2006,SC2268 # see below for rationale - -timestamp='2022-01-09' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -29,19 +27,11 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . -# The "shellcheck disable" line above the timestamp inhibits complaints -# about features and limitations of the classic Bourne shell that were -# superseded or lifted in POSIX. However, this script identifies a wide -# variety of pre-POSIX systems that do not have POSIX shells at all, and -# even some reasonably current systems (Solaris 10 as case-in-point) still -# have a pre-POSIX /bin/sh. - - me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -60,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -94,8 +84,7 @@ exit 1 fi -# Just in case it came from the environment. -GUESS= +trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -107,90 +96,73 @@ # Portable tmp directory creation inspired by the Autoconf team. -tmp= -# shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 - -set_cc_for_build() { - # prevent multiple calls if $tmp is already set - test "$tmp" && return 0 - : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039,SC3028 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } - dummy=$tmp/dummy - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do - if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD=$driver - break - fi - done - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac -} +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > "$dummy.c" ; + for c in cc gcc c89 c99 ; do + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if test -f /.attbin/uname ; then +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case $UNAME_SYSTEM in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - LIBC=unknown + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu - set_cc_for_build + eval "$set_cc_for_build" cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #elif defined(__GLIBC__) - LIBC=gnu #else - #include - /* First heuristic to detect musl libc. */ - #ifdef __DEFINED_va_list - LIBC=musl - #endif + LIBC=gnu #endif EOF - cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` - eval "$cc_set_libc" + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - # Second heuristic to detect musl libc. - if [ "$LIBC" = unknown ] && - command -v ldd >/dev/null && - ldd --version 2>&1 | grep -q ^musl; then - LIBC=musl - fi - - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - if [ "$LIBC" = unknown ]; then - LIBC=gnu + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl fi ;; esac # Note: order is significant - the case branches are not exclusive. -case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -202,12 +174,12 @@ # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ - /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case $UNAME_MACHINE_ARCH in - aarch64eb) machine=aarch64_be-unknown ;; + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -216,18 +188,18 @@ earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + machine="${arch}${endian}"-unknown ;; - *) machine=$UNAME_MACHINE_ARCH-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case $UNAME_MACHINE_ARCH in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -243,7 +215,7 @@ ;; esac # Determine ABI tags. - case $UNAME_MACHINE_ARCH in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -254,7 +226,7 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case $UNAME_VERSION in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; @@ -265,57 +237,45 @@ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - GUESS=$machine-${os}${release}${abi-} - ;; + echo "$machine-${os}${release}${abi}" + exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE - ;; - *:SecBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; *:MidnightBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" + exit ;; *:ekkoBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" + exit ;; *:SolidBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE - ;; - *:OS108:*:*) - GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) - GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE - ;; + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:MirBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:Sortix:*:*) - GUESS=$UNAME_MACHINE-unknown-sortix - ;; - *:Twizzler:*:*) - GUESS=$UNAME_MACHINE-unknown-twizzler - ;; + echo "$UNAME_MACHINE"-unknown-sortix + exit ;; *:Redox:*:*) - GUESS=$UNAME_MACHINE-unknown-redox - ;; + echo "$UNAME_MACHINE"-unknown-redox + exit ;; mips:OSF1:*.*) - GUESS=mips-dec-osf1 - ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -329,7 +289,7 @@ # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case $ALPHA_CPU_TYPE in + case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -366,121 +326,117 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - GUESS=$UNAME_MACHINE-dec-osf$OSF_REL - ;; + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Amiga*:UNIX_System_V:4.0:*) - GUESS=m68k-unknown-sysv4 - ;; + echo m68k-unknown-sysv4 + exit ;; *:[Aa]miga[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-amigaos - ;; + echo "$UNAME_MACHINE"-unknown-amigaos + exit ;; *:[Mm]orph[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-morphos - ;; + echo "$UNAME_MACHINE"-unknown-morphos + exit ;; *:OS/390:*:*) - GUESS=i370-ibm-openedition - ;; + echo i370-ibm-openedition + exit ;; *:z/VM:*:*) - GUESS=s390-ibm-zvmoe - ;; + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) - GUESS=powerpc-ibm-os400 - ;; + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - GUESS=arm-acorn-riscix$UNAME_RELEASE - ;; + echo arm-acorn-riscix"$UNAME_RELEASE" + exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - GUESS=arm-unknown-riscos - ;; + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - GUESS=hppa1.1-hitachi-hiuxmpp - ;; + echo hppa1.1-hitachi-hiuxmpp + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - case `(/bin/universe) 2>/dev/null` in - att) GUESS=pyramid-pyramid-sysv3 ;; - *) GUESS=pyramid-pyramid-bsd ;; - esac - ;; + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; NILE*:*:*:dcosx) - GUESS=pyramid-pyramid-svr4 - ;; + echo pyramid-pyramid-svr4 + exit ;; DRS?6000:unix:4.0:6*) - GUESS=sparc-icl-nx6 - ;; + echo sparc-icl-nx6 + exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) GUESS=sparc-icl-nx7 ;; - esac - ;; + sparc) echo sparc-icl-nx7; exit ;; + esac ;; s390x:SunOS:*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL - ;; + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + exit ;; sun4H:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-hal-solaris2$SUN_REL - ;; + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris2$SUN_REL - ;; + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - GUESS=i386-pc-auroraux$UNAME_RELEASE - ;; + echo i386-pc-auroraux"$UNAME_RELEASE" + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - set_cc_for_build + eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if test "$CC_FOR_BUILD" != no_compiler_found; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$SUN_ARCH-pc-solaris2$SUN_REL - ;; + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris3$SUN_REL - ;; + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:*:*) - case `/usr/bin/arch -k` in + case "`/usr/bin/arch -k`" in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` - GUESS=sparc-sun-sunos$SUN_REL - ;; + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + exit ;; sun3*:SunOS:*:*) - GUESS=m68k-sun-sunos$UNAME_RELEASE - ;; + echo m68k-sun-sunos"$UNAME_RELEASE" + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case `/bin/arch` in + case "`/bin/arch`" in sun3) - GUESS=m68k-sun-sunos$UNAME_RELEASE + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - GUESS=sparc-sun-sunos$UNAME_RELEASE + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac - ;; + exit ;; aushp:SunOS:*:*) - GUESS=sparc-auspex-sunos$UNAME_RELEASE - ;; + echo sparc-auspex-sunos"$UNAME_RELEASE" + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -490,43 +446,43 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - GUESS=m68k-milan-mint$UNAME_RELEASE - ;; + echo m68k-milan-mint"$UNAME_RELEASE" + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - GUESS=m68k-hades-mint$UNAME_RELEASE - ;; + echo m68k-hades-mint"$UNAME_RELEASE" + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - GUESS=m68k-unknown-mint$UNAME_RELEASE - ;; + echo m68k-unknown-mint"$UNAME_RELEASE" + exit ;; m68k:machten:*:*) - GUESS=m68k-apple-machten$UNAME_RELEASE - ;; + echo m68k-apple-machten"$UNAME_RELEASE" + exit ;; powerpc:machten:*:*) - GUESS=powerpc-apple-machten$UNAME_RELEASE - ;; + echo powerpc-apple-machten"$UNAME_RELEASE" + exit ;; RISC*:Mach:*:*) - GUESS=mips-dec-mach_bsd4.3 - ;; + echo mips-dec-mach_bsd4.3 + exit ;; RISC*:ULTRIX:*:*) - GUESS=mips-dec-ultrix$UNAME_RELEASE - ;; + echo mips-dec-ultrix"$UNAME_RELEASE" + exit ;; VAX*:ULTRIX*:*:*) - GUESS=vax-dec-ultrix$UNAME_RELEASE - ;; + echo vax-dec-ultrix"$UNAME_RELEASE" + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - GUESS=clipper-intergraph-clix$UNAME_RELEASE - ;; + echo clipper-intergraph-clix"$UNAME_RELEASE" + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -552,79 +508,78 @@ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - GUESS=mips-mips-riscos$UNAME_RELEASE - ;; + echo mips-mips-riscos"$UNAME_RELEASE" + exit ;; Motorola:PowerMAX_OS:*:*) - GUESS=powerpc-motorola-powermax - ;; + echo powerpc-motorola-powermax + exit ;; Motorola:*:4.3:PL8-*) - GUESS=powerpc-harris-powermax - ;; + echo powerpc-harris-powermax + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - GUESS=powerpc-harris-powermax - ;; + echo powerpc-harris-powermax + exit ;; Night_Hawk:Power_UNIX:*:*) - GUESS=powerpc-harris-powerunix - ;; + echo powerpc-harris-powerunix + exit ;; m88k:CX/UX:7*:*) - GUESS=m88k-harris-cxux7 - ;; + echo m88k-harris-cxux7 + exit ;; m88k:*:4*:R4*) - GUESS=m88k-motorola-sysv4 - ;; + echo m88k-motorola-sysv4 + exit ;; m88k:*:3*:R3*) - GUESS=m88k-motorola-sysv3 - ;; + echo m88k-motorola-sysv3 + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ - test "$TARGET_BINARY_INTERFACE"x = x + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - GUESS=m88k-dg-dgux$UNAME_RELEASE + echo m88k-dg-dgux"$UNAME_RELEASE" else - GUESS=m88k-dg-dguxbcs$UNAME_RELEASE + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - GUESS=i586-dg-dgux$UNAME_RELEASE + echo i586-dg-dgux"$UNAME_RELEASE" fi - ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - GUESS=m88k-dolphin-sysv3 - ;; + echo m88k-dolphin-sysv3 + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - GUESS=m88k-motorola-sysv3 - ;; + echo m88k-motorola-sysv3 + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - GUESS=m88k-tektronix-sysv3 - ;; + echo m88k-tektronix-sysv3 + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - GUESS=m68k-tektronix-bsd - ;; + echo m68k-tektronix-bsd + exit ;; *:IRIX*:*:*) - IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` - GUESS=mips-sgi-irix$IRIX_REL - ;; + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id - ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - GUESS=i386-ibm-aix - ;; + echo i386-ibm-aix + exit ;; ia64:AIX:*:*) - if test -x /usr/bin/oslevel ; then + if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV - ;; + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include @@ -638,16 +593,16 @@ EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - GUESS=$SYSTEM_NAME + echo "$SYSTEM_NAME" else - GUESS=rs6000-ibm-aix3.2.5 + echo rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - GUESS=rs6000-ibm-aix3.2.4 + echo rs6000-ibm-aix3.2.4 else - GUESS=rs6000-ibm-aix3.2 + echo rs6000-ibm-aix3.2 fi - ;; + exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -655,57 +610,57 @@ else IBM_ARCH=powerpc fi - if test -x /usr/bin/lslpp ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - GUESS=$IBM_ARCH-ibm-aix$IBM_REV - ;; + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" + exit ;; *:AIX:*:*) - GUESS=rs6000-ibm-aix - ;; + echo rs6000-ibm-aix + exit ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - GUESS=romp-ibm-bsd4.4 - ;; + echo romp-ibm-bsd4.4 + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to - ;; # report: romp-ibm BSD 4.3 + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - GUESS=rs6000-bull-bosx - ;; + echo rs6000-bull-bosx + exit ;; DPX/2?00:B.O.S.:*:*) - GUESS=m68k-bull-sysv3 - ;; + echo m68k-bull-sysv3 + exit ;; 9000/[34]??:4.3bsd:1.*:*) - GUESS=m68k-hp-bsd - ;; + echo m68k-hp-bsd + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - GUESS=m68k-hp-bsd4.4 - ;; + echo m68k-hp-bsd4.4 + exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - case $UNAME_MACHINE in + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if test -x /usr/bin/getconf; then + if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case $sc_cpu_version in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case $sc_kernel_bits in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if test "$HP_ARCH" = ""; then - set_cc_for_build + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -743,9 +698,9 @@ test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if test "$HP_ARCH" = hppa2.0w + if [ "$HP_ARCH" = hppa2.0w ] then - set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -764,14 +719,14 @@ HP_ARCH=hppa64 fi fi - GUESS=$HP_ARCH-hp-hpux$HPUX_REV - ;; + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" + exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - GUESS=ia64-hp-hpux$HPUX_REV - ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" + exit ;; 3050*:HI-UX:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include int @@ -799,36 +754,36 @@ EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - GUESS=unknown-hitachi-hiuxwe2 - ;; + echo unknown-hitachi-hiuxwe2 + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - GUESS=hppa1.1-hp-bsd - ;; + echo hppa1.1-hp-bsd + exit ;; 9000/8??:4.3bsd:*:*) - GUESS=hppa1.0-hp-bsd - ;; + echo hppa1.0-hp-bsd + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - GUESS=hppa1.0-hp-mpeix - ;; + echo hppa1.0-hp-mpeix + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - GUESS=hppa1.1-hp-osf - ;; + echo hppa1.1-hp-osf + exit ;; hp8??:OSF1:*:*) - GUESS=hppa1.0-hp-osf - ;; + echo hppa1.0-hp-osf + exit ;; i*86:OSF1:*:*) - if test -x /usr/sbin/sysversion ; then - GUESS=$UNAME_MACHINE-unknown-osf1mk + if [ -x /usr/sbin/sysversion ] ; then + echo "$UNAME_MACHINE"-unknown-osf1mk else - GUESS=$UNAME_MACHINE-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi - ;; + exit ;; parisc*:Lites*:*:*) - GUESS=hppa1.1-hp-lites - ;; + echo hppa1.1-hp-lites + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - GUESS=c1-convex-bsd - ;; + echo c1-convex-bsd + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -836,18 +791,17 @@ fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - GUESS=c34-convex-bsd - ;; + echo c34-convex-bsd + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - GUESS=c38-convex-bsd - ;; + echo c38-convex-bsd + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - GUESS=c4-convex-bsd - ;; + echo c4-convex-bsd + exit ;; CRAY*Y-MP:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=ymp-cray-unicos$CRAY_REL - ;; + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -855,129 +809,103 @@ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=t90-cray-unicos$CRAY_REL - ;; + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*T3E:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=alphaev5-cray-unicosmk$CRAY_REL - ;; + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*SV1:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=sv1-cray-unicos$CRAY_REL - ;; + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; *:UNICOS/mp:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=craynv-cray-unicosmp$CRAY_REL - ;; + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" + exit ;; sparc*:BSD/OS:*:*) - GUESS=sparc-unknown-bsdi$UNAME_RELEASE - ;; + echo sparc-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:BSD/OS:*:*) - GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE - ;; - arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - set_cc_for_build - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi - else - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf - fi - ;; + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case $UNAME_PROCESSOR in + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL - ;; + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + exit ;; i*:CYGWIN*:*) - GUESS=$UNAME_MACHINE-pc-cygwin - ;; + echo "$UNAME_MACHINE"-pc-cygwin + exit ;; *:MINGW64*:*) - GUESS=$UNAME_MACHINE-pc-mingw64 - ;; + echo "$UNAME_MACHINE"-pc-mingw64 + exit ;; *:MINGW*:*) - GUESS=$UNAME_MACHINE-pc-mingw32 - ;; + echo "$UNAME_MACHINE"-pc-mingw32 + exit ;; *:MSYS*:*) - GUESS=$UNAME_MACHINE-pc-msys - ;; + echo "$UNAME_MACHINE"-pc-msys + exit ;; i*:PW*:*) - GUESS=$UNAME_MACHINE-pc-pw32 - ;; - *:SerenityOS:*:*) - GUESS=$UNAME_MACHINE-pc-serenity - ;; + echo "$UNAME_MACHINE"-pc-pw32 + exit ;; *:Interix*:*) - case $UNAME_MACHINE in + case "$UNAME_MACHINE" in x86) - GUESS=i586-pc-interix$UNAME_RELEASE - ;; + echo i586-pc-interix"$UNAME_RELEASE" + exit ;; authenticamd | genuineintel | EM64T) - GUESS=x86_64-unknown-interix$UNAME_RELEASE - ;; + echo x86_64-unknown-interix"$UNAME_RELEASE" + exit ;; IA64) - GUESS=ia64-unknown-interix$UNAME_RELEASE - ;; + echo ia64-unknown-interix"$UNAME_RELEASE" + exit ;; esac ;; i*:UWIN*:*) - GUESS=$UNAME_MACHINE-pc-uwin - ;; + echo "$UNAME_MACHINE"-pc-uwin + exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - GUESS=x86_64-pc-cygwin - ;; + echo x86_64-unknown-cygwin + exit ;; prep*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=powerpcle-unknown-solaris2$SUN_REL - ;; + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; *:GNU:*:*) # the GNU system - GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` - GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL - ;; + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC - ;; - *:Minix:*:*) - GUESS=$UNAME_MACHINE-unknown-minix - ;; + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + exit ;; + i*86:Minix:*:*) + echo "$UNAME_MACHINE"-pc-minix + exit ;; aarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -988,225 +916,187 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; arm*:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi - ;; + exit ;; avr32*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; cris:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; crisv32:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; e2k:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; frv:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; hexagon:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:Linux:*:*) - GUESS=$UNAME_MACHINE-pc-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + exit ;; ia64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; k1om:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m68*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; mips:Linux:*:* | mips64:Linux:*:*) - set_cc_for_build - IS_GLIBC=0 - test x"${LIBC}" = xgnu && IS_GLIBC=1 + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef mips - #undef mipsel - #undef mips64 - #undef mips64el - #if ${IS_GLIBC} && defined(_ABI64) - LIBCABI=gnuabi64 - #else - #if ${IS_GLIBC} && defined(_ABIN32) - LIBCABI=gnuabin32 - #else - LIBCABI=${LIBC} - #endif - #endif - - #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa64r6 - #else - #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa32r6 - #else - #if defined(__mips64) - CPU=mips64 - #else - CPU=mips - #endif - #endif - #endif - + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - MIPS_ENDIAN=el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - MIPS_ENDIAN= + CPU=${UNAME_MACHINE} #else - MIPS_ENDIAN= + CPU= #endif #endif EOF - cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` - eval "$cc_set_vars" - test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; openrisc*:Linux:*:*) - GUESS=or1k-unknown-linux-$LIBC - ;; + echo or1k-unknown-linux-"$LIBC" + exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; padre:Linux:*:*) - GUESS=sparc-unknown-linux-$LIBC - ;; + echo sparc-unknown-linux-"$LIBC" + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - GUESS=hppa64-unknown-linux-$LIBC - ;; + echo hppa64-unknown-linux-"$LIBC" + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; - PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; - *) GUESS=hppa-unknown-linux-$LIBC ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac - ;; + exit ;; ppc64:Linux:*:*) - GUESS=powerpc64-unknown-linux-$LIBC - ;; + echo powerpc64-unknown-linux-"$LIBC" + exit ;; ppc:Linux:*:*) - GUESS=powerpc-unknown-linux-$LIBC - ;; + echo powerpc-unknown-linux-"$LIBC" + exit ;; ppc64le:Linux:*:*) - GUESS=powerpc64le-unknown-linux-$LIBC - ;; + echo powerpc64le-unknown-linux-"$LIBC" + exit ;; ppcle:Linux:*:*) - GUESS=powerpcle-unknown-linux-$LIBC - ;; - riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - GUESS=$UNAME_MACHINE-ibm-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" + exit ;; sh64*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sh*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; tile*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; vax:Linux:*:*) - GUESS=$UNAME_MACHINE-dec-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" + exit ;; x86_64:Linux:*:*) - set_cc_for_build - LIBCABI=$LIBC - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI - ;; + exit ;; xtensa*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - GUESS=i386-sequent-sysv4 - ;; + echo i386-sequent-sysv4 + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION - ;; + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - GUESS=$UNAME_MACHINE-pc-os2-emx - ;; + echo "$UNAME_MACHINE"-pc-os2-emx + exit ;; i*86:XTS-300:*:STOP) - GUESS=$UNAME_MACHINE-unknown-stop - ;; + echo "$UNAME_MACHINE"-unknown-stop + exit ;; i*86:atheos:*:*) - GUESS=$UNAME_MACHINE-unknown-atheos - ;; + echo "$UNAME_MACHINE"-unknown-atheos + exit ;; i*86:syllable:*:*) - GUESS=$UNAME_MACHINE-pc-syllable - ;; + echo "$UNAME_MACHINE"-pc-syllable + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - GUESS=i386-unknown-lynxos$UNAME_RELEASE - ;; + echo i386-unknown-lynxos"$UNAME_RELEASE" + exit ;; i*86:*DOS:*:*) - GUESS=$UNAME_MACHINE-pc-msdosdjgpp - ;; + echo "$UNAME_MACHINE"-pc-msdosdjgpp + exit ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi - ;; + exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1214,12 +1104,12 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - ;; + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1229,11 +1119,11 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - GUESS=$UNAME_MACHINE-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi - ;; + exit ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1241,31 +1131,31 @@ # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - GUESS=i586-pc-msdosdjgpp - ;; + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) - GUESS=i386-pc-mach3 - ;; + echo i386-pc-mach3 + exit ;; paragon:*:*:*) - GUESS=i860-intel-osf1 - ;; + echo i860-intel-osf1 + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi - ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" - GUESS=m68010-convergent-sysv - ;; + echo m68010-convergent-sysv + exit ;; mc68k:UNIX:SYSTEM5:3.51m) - GUESS=m68k-convergent-sysv - ;; + echo m68k-convergent-sysv + exit ;; M680?0:D-NIX:5.3:*) - GUESS=m68k-diab-dnix - ;; + echo m68k-diab-dnix + exit ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1290,404 +1180,249 @@ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - GUESS=m68k-unknown-lynxos$UNAME_RELEASE - ;; + echo m68k-unknown-lynxos"$UNAME_RELEASE" + exit ;; mc68030:UNIX_System_V:4.*:*) - GUESS=m68k-atari-sysv4 - ;; + echo m68k-atari-sysv4 + exit ;; TSUNAMI:LynxOS:2.*:*) - GUESS=sparc-unknown-lynxos$UNAME_RELEASE - ;; + echo sparc-unknown-lynxos"$UNAME_RELEASE" + exit ;; rs6000:LynxOS:2.*:*) - GUESS=rs6000-unknown-lynxos$UNAME_RELEASE - ;; + echo rs6000-unknown-lynxos"$UNAME_RELEASE" + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - GUESS=powerpc-unknown-lynxos$UNAME_RELEASE - ;; + echo powerpc-unknown-lynxos"$UNAME_RELEASE" + exit ;; SM[BE]S:UNIX_SV:*:*) - GUESS=mips-dde-sysv$UNAME_RELEASE - ;; + echo mips-dde-sysv"$UNAME_RELEASE" + exit ;; RM*:ReliantUNIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; + echo mips-sni-sysv4 + exit ;; RM*:SINIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; + echo mips-sni-sysv4 + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - GUESS=$UNAME_MACHINE-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else - GUESS=ns32k-sni-sysv + echo ns32k-sni-sysv fi - ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - GUESS=i586-unisys-sysv4 - ;; + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - GUESS=hppa1.1-stratus-sysv4 - ;; + echo hppa1.1-stratus-sysv4 + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - GUESS=i860-stratus-sysv4 - ;; + echo i860-stratus-sysv4 + exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - GUESS=$UNAME_MACHINE-stratus-vos - ;; + echo "$UNAME_MACHINE"-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. - GUESS=hppa1.1-stratus-vos - ;; + echo hppa1.1-stratus-vos + exit ;; mc68*:A/UX:*:*) - GUESS=m68k-apple-aux$UNAME_RELEASE - ;; + echo m68k-apple-aux"$UNAME_RELEASE" + exit ;; news*:NEWS-OS:6*:*) - GUESS=mips-sony-newsos6 - ;; + echo mips-sony-newsos6 + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if test -d /usr/nec; then - GUESS=mips-nec-sysv$UNAME_RELEASE + if [ -d /usr/nec ]; then + echo mips-nec-sysv"$UNAME_RELEASE" else - GUESS=mips-unknown-sysv$UNAME_RELEASE + echo mips-unknown-sysv"$UNAME_RELEASE" fi - ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - GUESS=powerpc-be-beos - ;; + echo powerpc-be-beos + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - GUESS=powerpc-apple-beos - ;; + echo powerpc-apple-beos + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - GUESS=i586-pc-beos - ;; + echo i586-pc-beos + exit ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - GUESS=i586-pc-haiku - ;; + echo i586-pc-haiku + exit ;; x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku - ;; + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) - GUESS=sx4-nec-superux$UNAME_RELEASE - ;; + echo sx4-nec-superux"$UNAME_RELEASE" + exit ;; SX-5:SUPER-UX:*:*) - GUESS=sx5-nec-superux$UNAME_RELEASE - ;; + echo sx5-nec-superux"$UNAME_RELEASE" + exit ;; SX-6:SUPER-UX:*:*) - GUESS=sx6-nec-superux$UNAME_RELEASE - ;; + echo sx6-nec-superux"$UNAME_RELEASE" + exit ;; SX-7:SUPER-UX:*:*) - GUESS=sx7-nec-superux$UNAME_RELEASE - ;; + echo sx7-nec-superux"$UNAME_RELEASE" + exit ;; SX-8:SUPER-UX:*:*) - GUESS=sx8-nec-superux$UNAME_RELEASE - ;; + echo sx8-nec-superux"$UNAME_RELEASE" + exit ;; SX-8R:SUPER-UX:*:*) - GUESS=sx8r-nec-superux$UNAME_RELEASE - ;; + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; SX-ACE:SUPER-UX:*:*) - GUESS=sxace-nec-superux$UNAME_RELEASE - ;; + echo sxace-nec-superux"$UNAME_RELEASE" + exit ;; Power*:Rhapsody:*:*) - GUESS=powerpc-apple-rhapsody$UNAME_RELEASE - ;; + echo powerpc-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Rhapsody:*:*) - GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE - ;; - arm64:Darwin:*:*) - GUESS=aarch64-apple-darwin$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - if command -v xcode-select > /dev/null 2> /dev/null && \ - ! xcode-select --print-path > /dev/null 2> /dev/null ; then - # Avoid executing cc if there is no toolchain installed as - # cc will be a stub that puts up a graphical alert - # prompting the user to install developer tools. - CC_FOR_BUILD=no_compiler_found - else - set_cc_for_build - fi - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval "$set_cc_for_build" + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then - # uname -m returns i386 or x86_64 - UNAME_PROCESSOR=$UNAME_MACHINE + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi - GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE - ;; + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE - ;; + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" + exit ;; *:QNX:*:4*) - GUESS=i386-pc-qnx - ;; + echo i386-pc-qnx + exit ;; NEO-*:NONSTOP_KERNEL:*:*) - GUESS=neo-tandem-nsk$UNAME_RELEASE - ;; + echo neo-tandem-nsk"$UNAME_RELEASE" + exit ;; NSE-*:NONSTOP_KERNEL:*:*) - GUESS=nse-tandem-nsk$UNAME_RELEASE - ;; + echo nse-tandem-nsk"$UNAME_RELEASE" + exit ;; NSR-*:NONSTOP_KERNEL:*:*) - GUESS=nsr-tandem-nsk$UNAME_RELEASE - ;; + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; NSV-*:NONSTOP_KERNEL:*:*) - GUESS=nsv-tandem-nsk$UNAME_RELEASE - ;; + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; NSX-*:NONSTOP_KERNEL:*:*) - GUESS=nsx-tandem-nsk$UNAME_RELEASE - ;; + echo nsx-tandem-nsk"$UNAME_RELEASE" + exit ;; *:NonStop-UX:*:*) - GUESS=mips-compaq-nonstopux - ;; + echo mips-compaq-nonstopux + exit ;; BS2000:POSIX*:*:*) - GUESS=bs2000-siemens-sysv - ;; + echo bs2000-siemens-sysv + exit ;; DS/*:UNIX_System_V:*:*) - GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "${cputype-}" = 386; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 - elif test "x${cputype-}" != x; then - UNAME_MACHINE=$cputype + else + UNAME_MACHINE="$cputype" fi - GUESS=$UNAME_MACHINE-unknown-plan9 - ;; + echo "$UNAME_MACHINE"-unknown-plan9 + exit ;; *:TOPS-10:*:*) - GUESS=pdp10-unknown-tops10 - ;; + echo pdp10-unknown-tops10 + exit ;; *:TENEX:*:*) - GUESS=pdp10-unknown-tenex - ;; + echo pdp10-unknown-tenex + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - GUESS=pdp10-dec-tops20 - ;; + echo pdp10-dec-tops20 + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - GUESS=pdp10-xkl-tops20 - ;; + echo pdp10-xkl-tops20 + exit ;; *:TOPS-20:*:*) - GUESS=pdp10-unknown-tops20 - ;; + echo pdp10-unknown-tops20 + exit ;; *:ITS:*:*) - GUESS=pdp10-unknown-its - ;; + echo pdp10-unknown-its + exit ;; SEI:*:*:SEIUX) - GUESS=mips-sei-seiux$UNAME_RELEASE - ;; + echo mips-sei-seiux"$UNAME_RELEASE" + exit ;; *:DragonFly:*:*) - DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL - ;; + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case $UNAME_MACHINE in - A*) GUESS=alpha-dec-vms ;; - I*) GUESS=ia64-dec-vms ;; - V*) GUESS=vax-dec-vms ;; + case "$UNAME_MACHINE" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) - GUESS=i386-pc-xenix - ;; + echo i386-pc-xenix + exit ;; i*86:skyos:*:*) - SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` - GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL - ;; + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + exit ;; i*86:rdos:*:*) - GUESS=$UNAME_MACHINE-pc-rdos - ;; - i*86:Fiwix:*:*) - GUESS=$UNAME_MACHINE-pc-fiwix - ;; - *:AROS:*:*) - GUESS=$UNAME_MACHINE-unknown-aros - ;; + echo "$UNAME_MACHINE"-pc-rdos + exit ;; + i*86:AROS:*:*) + echo "$UNAME_MACHINE"-pc-aros + exit ;; x86_64:VMkernel:*:*) - GUESS=$UNAME_MACHINE-unknown-esx - ;; + echo "$UNAME_MACHINE"-unknown-esx + exit ;; amd64:Isilon\ OneFS:*:*) - GUESS=x86_64-unknown-onefs - ;; - *:Unleashed:*:*) - GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE - ;; + echo x86_64-unknown-onefs + exit ;; esac -# Do we have a guess based on uname results? -if test "x$GUESS" != x; then - echo "$GUESS" - exit -fi - -# No uname command or uname output not recognized. -set_cc_for_build -cat > "$dummy.c" < -#include -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#include -#if defined(_SIZE_T_) || defined(SIGLOST) -#include -#endif -#endif -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); -#endif - -#if defined (vax) -#if !defined (ultrix) -#include -#if defined (BSD) -#if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -#else -#if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#endif -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#else -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname un; - uname (&un); - printf ("vax-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif -#endif -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname *un; - uname (&un); - printf ("mips-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("mips-dec-ultrix\n"); exit (0); -#endif -#endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. -test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } - echo "$0: unable to guess system type" >&2 -case $UNAME_MACHINE:$UNAME_SYSTEM in +case "$UNAME_MACHINE:$UNAME_SYSTEM" in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 <&2 + echo "$me: invalid option $1$help" exit 1 ;; *local*) @@ -119,1186 +110,1223 @@ exit 1;; esac -# Split fields of configuration type -# shellcheck disable=SC2162 -saved_IFS=$IFS -IFS="-" read field1 field2 field3 field4 <&2 - exit 1 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. ;; - *-*-*-*) - basic_machine=$field1-$field2 - basic_os=$field3-$field4 + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *-*-*) - # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two - # parts - maybe_os=$field2-$field3 - case $maybe_os in - nto-qnx* | linux-* | uclinux-uclibc* \ - | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ - | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) - basic_machine=$field1 - basic_os=$maybe_os - ;; - android-linux) - basic_machine=$field1-unknown - basic_os=linux-android - ;; - *) - basic_machine=$field1-$field2 - basic_os=$field3 - ;; - esac + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *-*) - # A lone config we happen to match not fitting any pattern - case $field1-$field2 in - decstation-3100) - basic_machine=mips-dec - basic_os= - ;; - *-*) - # Second component is usually, but not always the OS - case $field2 in - # Prevent following clause from handling this valid os - sun*os*) - basic_machine=$field1 - basic_os=$field2 - ;; - zephyr*) - basic_machine=$field1-unknown - basic_os=$field2 - ;; - # Manufacturers - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ - | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ - | unicom* | ibm* | next | hp | isi* | apollo | altos* \ - | convergent* | ncr* | news | 32* | 3600* | 3100* \ - | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ - | ultra | tti* | harris | dolphin | highlevel | gould \ - | cbm | ns | masscomp | apple | axis | knuth | cray \ - | microblaze* | sim | cisco \ - | oki | wec | wrs | winbond) - basic_machine=$field1-$field2 - basic_os= - ;; - *) - basic_machine=$field1 - basic_os=$field2 - ;; - esac - ;; - esac + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *) - # Convert single-component short-hands not valid as part of - # multi-component configurations. - case $field1 in - 386bsd) - basic_machine=i386-pc - basic_os=bsd - ;; - a29khif) - basic_machine=a29k-amd - basic_os=udi - ;; - adobe68k) - basic_machine=m68010-adobe - basic_os=scout - ;; - alliant) - basic_machine=fx80-alliant - basic_os= - ;; - altos | altos3068) - basic_machine=m68k-altos - basic_os= - ;; - am29k) - basic_machine=a29k-none - basic_os=bsd - ;; - amdahl) - basic_machine=580-amdahl - basic_os=sysv - ;; - amiga) - basic_machine=m68k-unknown - basic_os= - ;; - amigaos | amigados) - basic_machine=m68k-unknown - basic_os=amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - basic_os=sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - basic_os=sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - basic_os=bsd - ;; - aros) - basic_machine=i386-pc - basic_os=aros - ;; - aux) - basic_machine=m68k-apple - basic_os=aux - ;; - balance) - basic_machine=ns32k-sequent - basic_os=dynix - ;; - blackfin) - basic_machine=bfin-unknown - basic_os=linux - ;; - cegcc) - basic_machine=arm-unknown - basic_os=cegcc - ;; - convex-c1) - basic_machine=c1-convex - basic_os=bsd - ;; - convex-c2) - basic_machine=c2-convex - basic_os=bsd - ;; - convex-c32) - basic_machine=c32-convex - basic_os=bsd - ;; - convex-c34) - basic_machine=c34-convex - basic_os=bsd - ;; - convex-c38) - basic_machine=c38-convex - basic_os=bsd - ;; - cray) - basic_machine=j90-cray - basic_os=unicos - ;; - crds | unos) - basic_machine=m68k-crds - basic_os= - ;; - da30) - basic_machine=m68k-da30 - basic_os= - ;; - decstation | pmax | pmin | dec3100 | decstatn) - basic_machine=mips-dec - basic_os= - ;; - delta88) - basic_machine=m88k-motorola - basic_os=sysv3 - ;; - dicos) - basic_machine=i686-pc - basic_os=dicos - ;; - djgpp) - basic_machine=i586-pc - basic_os=msdosdjgpp - ;; - ebmon29k) - basic_machine=a29k-amd - basic_os=ebmon - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - basic_os=ose - ;; - gmicro) - basic_machine=tron-gmicro - basic_os=sysv - ;; - go32) - basic_machine=i386-pc - basic_os=go32 - ;; - h8300hms) - basic_machine=h8300-hitachi - basic_os=hms - ;; - h8300xray) - basic_machine=h8300-hitachi - basic_os=xray - ;; - h8500hms) - basic_machine=h8500-hitachi - basic_os=hms - ;; - harris) - basic_machine=m88k-harris - basic_os=sysv3 - ;; - hp300 | hp300hpux) - basic_machine=m68k-hp - basic_os=hpux - ;; - hp300bsd) - basic_machine=m68k-hp - basic_os=bsd - ;; - hppaosf) - basic_machine=hppa1.1-hp - basic_os=osf - ;; - hppro) - basic_machine=hppa1.1-hp - basic_os=proelf - ;; - i386mach) - basic_machine=i386-mach - basic_os=mach - ;; - isi68 | isi) - basic_machine=m68k-isi - basic_os=sysv - ;; - m68knommu) - basic_machine=m68k-unknown - basic_os=linux - ;; - magnum | m3230) - basic_machine=mips-mips - basic_os=sysv - ;; - merlin) - basic_machine=ns32k-utek - basic_os=sysv - ;; - mingw64) - basic_machine=x86_64-pc - basic_os=mingw64 - ;; - mingw32) - basic_machine=i686-pc - basic_os=mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - basic_os=mingw32ce - ;; - monitor) - basic_machine=m68k-rom68k - basic_os=coff - ;; - morphos) - basic_machine=powerpc-unknown - basic_os=morphos - ;; - moxiebox) - basic_machine=moxie-unknown - basic_os=moxiebox - ;; - msdos) - basic_machine=i386-pc - basic_os=msdos - ;; - msys) - basic_machine=i686-pc - basic_os=msys - ;; - mvs) - basic_machine=i370-ibm - basic_os=mvs - ;; - nacl) - basic_machine=le32-unknown - basic_os=nacl - ;; - ncr3000) - basic_machine=i486-ncr - basic_os=sysv4 - ;; - netbsd386) - basic_machine=i386-pc - basic_os=netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - basic_os=linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - basic_os=newsos - ;; - news1000) - basic_machine=m68030-sony - basic_os=newsos - ;; - necv70) - basic_machine=v70-nec - basic_os=sysv - ;; - nh3000) - basic_machine=m68k-harris - basic_os=cxux - ;; - nh[45]000) - basic_machine=m88k-harris - basic_os=cxux - ;; - nindy960) - basic_machine=i960-intel - basic_os=nindy - ;; - mon960) - basic_machine=i960-intel - basic_os=mon960 - ;; - nonstopux) - basic_machine=mips-compaq - basic_os=nonstopux - ;; - os400) - basic_machine=powerpc-ibm - basic_os=os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - basic_os=ose - ;; - os68k) - basic_machine=m68k-none - basic_os=os68k - ;; - paragon) - basic_machine=i860-intel - basic_os=osf - ;; - parisc) - basic_machine=hppa-unknown - basic_os=linux - ;; - psp) - basic_machine=mipsallegrexel-sony - basic_os=psp - ;; - pw32) - basic_machine=i586-unknown - basic_os=pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - basic_os=rdos - ;; - rdos32) - basic_machine=i386-pc - basic_os=rdos - ;; - rom68k) - basic_machine=m68k-rom68k - basic_os=coff - ;; - sa29200) - basic_machine=a29k-amd - basic_os=udi - ;; - sei) - basic_machine=mips-sei - basic_os=seiux - ;; - sequent) - basic_machine=i386-sequent - basic_os= - ;; - sps7) - basic_machine=m68k-bull - basic_os=sysv2 - ;; - st2000) - basic_machine=m68k-tandem - basic_os= - ;; - stratus) - basic_machine=i860-stratus - basic_os=sysv4 - ;; - sun2) - basic_machine=m68000-sun - basic_os= - ;; - sun2os3) - basic_machine=m68000-sun - basic_os=sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - basic_os=sunos4 - ;; - sun3) - basic_machine=m68k-sun - basic_os= - ;; - sun3os3) - basic_machine=m68k-sun - basic_os=sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - basic_os=sunos4 - ;; - sun4) - basic_machine=sparc-sun - basic_os= - ;; - sun4os3) - basic_machine=sparc-sun - basic_os=sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - basic_os=sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - basic_os=solaris2 - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - basic_os= - ;; - sv1) - basic_machine=sv1-cray - basic_os=unicos - ;; - symmetry) - basic_machine=i386-sequent - basic_os=dynix - ;; - t3e) - basic_machine=alphaev5-cray - basic_os=unicos - ;; - t90) - basic_machine=t90-cray - basic_os=unicos - ;; - toad1) - basic_machine=pdp10-xkl - basic_os=tops20 - ;; - tpf) - basic_machine=s390x-ibm - basic_os=tpf - ;; - udi29k) - basic_machine=a29k-amd - basic_os=udi - ;; - ultra3) - basic_machine=a29k-nyu - basic_os=sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - basic_os=none - ;; - vaxv) - basic_machine=vax-dec - basic_os=sysv - ;; - vms) - basic_machine=vax-dec - basic_os=vms - ;; - vsta) - basic_machine=i386-pc - basic_os=vsta - ;; - vxworks960) - basic_machine=i960-wrs - basic_os=vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - basic_os=vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - basic_os=vxworks - ;; - xbox) - basic_machine=i686-pc - basic_os=mingw32 - ;; - ymp) - basic_machine=ymp-cray - basic_os=unicos - ;; - *) - basic_machine=$1 - basic_os= - ;; - esac + -sco*) + os=-sco3.2v2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint ;; esac -# Decode 1-component or ad-hoc basic machines +# Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in - # Here we handle the default manufacturer of certain CPU types. It is in - # some cases the only manufacturer, in others, it is the most popular. - w89k) - cpu=hppa1.1 - vendor=winbond + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown ;; - op50n) - cpu=hppa1.1 - vendor=oki + c54x) + basic_machine=tic54x-unknown ;; - op60c) - cpu=hppa1.1 - vendor=oki + c55x) + basic_machine=tic55x-unknown ;; - ibm*) - cpu=i370 - vendor=ibm + c6x) + basic_machine=tic6x-unknown ;; - orion105) - cpu=clipper - vendor=highlevel + leon|leon[3-9]) + basic_machine=sparc-$basic_machine ;; - mac | mpw | mac-mpw) - cpu=m68k - vendor=apple + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none ;; - pmac | pmac-mpw) - cpu=powerpc - vendor=apple + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown ;; + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-pc + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - cpu=m68000 - vendor=att + basic_machine=m68000-att ;; 3b*) - cpu=we32k - vendor=att + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; bluegene*) - cpu=powerpc - vendor=ibm - basic_os=cnk + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec ;; decsystem10* | dec10*) - cpu=pdp10 - vendor=dec - basic_os=tops10 + basic_machine=pdp10-dec + os=-tops10 ;; decsystem20* | dec20*) - cpu=pdp10 - vendor=dec - basic_os=tops20 + basic_machine=pdp10-dec + os=-tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - cpu=m68k - vendor=motorola + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx ;; dpx2*) - cpu=m68k - vendor=bull - basic_os=sysv3 + basic_machine=m68k-bull + os=-sysv3 ;; - encore | umax | mmax) - cpu=ns32k - vendor=encore + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon ;; elxsi) - cpu=elxsi - vendor=elxsi - basic_os=${basic_os:-bsd} + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose ;; fx2800) - cpu=i860 - vendor=alliant + basic_machine=i860-alliant ;; genix) - cpu=ns32k - vendor=ns + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 ;; h3050r* | hiux*) - cpu=hppa1.1 - vendor=hitachi - basic_os=hiuxwe2 + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - cpu=m68000 - vendor=hp + basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) - cpu=m68k - vendor=hp + basic_machine=m68k-hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - basic_os=sysv32 + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - basic_os=sysv4 + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - basic_os=sysv + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - basic_os=solaris2 - ;; - j90 | j90-cray) - cpu=j90 - vendor=cray - basic_os=${basic_os:-unicos} + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + vsta) + basic_machine=i386-unknown + os=-vsta ;; iris | iris4d) - cpu=mips - vendor=sgi - case $basic_os in - irix*) + basic_machine=mips-sgi + case $os in + -irix*) ;; *) - basic_os=irix4 + os=-irix4 ;; esac ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) - cpu=m68000 - vendor=convergent + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint ;; - *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) - cpu=m68k - vendor=atari - basic_os=mint + mips3*-*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos ;; news-3600 | risc-news) - cpu=mips - vendor=sony - basic_os=newsos + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv ;; next | m*-next) - cpu=m68k - vendor=next - case $basic_os in - openstep*) - ;; - nextstep*) + basic_machine=m68k-next + case $os in + -nextstep* ) ;; - ns2*) - basic_os=nextstep2 + -ns2*) + os=-nextstep2 ;; *) - basic_os=nextstep3 + os=-nextstep3 ;; esac ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) - cpu=np1 - vendor=gould + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem ;; op50n-* | op60c-*) - cpu=hppa1.1 - vendor=oki - basic_os=proelf + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k ;; pa-hitachi) - cpu=hppa1.1 - vendor=hitachi - basic_os=hiuxwe2 + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; pbd) - cpu=sparc - vendor=tti + basic_machine=sparc-tti ;; pbb) - cpu=m68k - vendor=tti + basic_machine=m68k-tti ;; - pc532) - cpu=ns32k - vendor=pc532 + pc532 | pc532-*) + basic_machine=ns32k-pc532 ;; - pn) - cpu=pn - vendor=gould + pc98) + basic_machine=i386-pc ;; - power) - cpu=power - vendor=ibm + pc98-*) + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ps2) - cpu=i386 - vendor=ibm + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc ;; - rm[46]00) - cpu=mips - vendor=siemens + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc ;; - rtpc | rtpc-*) - cpu=romp - vendor=ibm - ;; - sde) - cpu=mipsisa32 - vendor=sde - basic_os=${basic_os:-elf} + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc ;; - simso-wrs) - cpu=sparclite - vendor=wrs - basic_os=vxworks + pentium4) + basic_machine=i786-pc ;; - tower | tower-32) - cpu=m68k - vendor=ncr + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - vpp*|vx|vx-*) - cpu=f301 - vendor=fujitsu + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - w65) - cpu=w65 - vendor=wdc + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - w89k-*) - cpu=hppa1.1 - vendor=winbond - basic_os=proelf + pentium4-*) + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - none) - cpu=none - vendor=none + pn) + basic_machine=pn-gould ;; - leon|leon[3-9]) - cpu=sparc - vendor=$basic_machine + power) basic_machine=power-ibm ;; - leon-*|leon[3-9]-*) - cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + ppc | ppcbe) basic_machine=powerpc-unknown ;; - - *-*) - # shellcheck disable=SC2162 - saved_IFS=$IFS - IFS="-" read cpu vendor <&2 - exit 1 - ;; - esac + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 ;; esac # Here we canonicalize certain aliases for manufacturers. -case $vendor in - digital*) - vendor=dec +case $basic_machine in + *-digital*) + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; - commodore*) - vendor=cbm + *-commodore*) + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1306,215 +1334,203 @@ # Decode manufacturer-specific aliases for certain operating systems. -if test x$basic_os != x +if [ x"$os" != x"" ] then - -# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just -# set os. -case $basic_os in - gnu/linux*) - kernel=linux - os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` - ;; - os2-emx) - kernel=os2 - os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` - ;; - nto-qnx*) - kernel=nto - os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` - ;; - *-*) - # shellcheck disable=SC2162 - saved_IFS=$IFS - IFS="-" read kernel os <&2 + exit 1 ;; esac - else # Here we handle the default operating systems that come with various machines. @@ -1527,363 +1543,258 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -kernel= -case $cpu-$vendor in +case $basic_machine in score-*) - os=elf + os=-elf ;; spu-*) - os=elf + os=-elf ;; *-acorn) - os=riscix1.2 + os=-riscix1.2 ;; arm*-rebel) - kernel=linux - os=gnu + os=-linux ;; arm*-semi) - os=aout + os=-aout ;; c4x-* | tic4x-*) - os=coff + os=-coff ;; c8051-*) - os=elf - ;; - clipper-intergraph) - os=clix + os=-elf ;; hexagon-*) - os=elf + os=-elf ;; tic54x-*) - os=coff + os=-coff ;; tic55x-*) - os=coff + os=-coff ;; tic6x-*) - os=coff + os=-coff ;; # This must come before the *-dec entry. pdp10-*) - os=tops20 + os=-tops20 ;; pdp11-*) - os=none + os=-none ;; *-dec | vax-*) - os=ultrix4.2 + os=-ultrix4.2 ;; m68*-apollo) - os=domain + os=-domain ;; i386-sun) - os=sunos4.0.2 + os=-sunos4.0.2 ;; m68000-sun) - os=sunos3 + os=-sunos3 ;; m68*-cisco) - os=aout + os=-aout ;; mep-*) - os=elf + os=-elf ;; mips*-cisco) - os=elf + os=-elf ;; mips*-*) - os=elf + os=-elf ;; or32-*) - os=coff + os=-coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=sysv3 + os=-sysv3 ;; sparc-* | *-sun) - os=sunos4.1.1 + os=-sunos4.1.1 ;; pru-*) - os=elf + os=-elf ;; *-be) - os=beos + os=-beos ;; *-ibm) - os=aix + os=-aix ;; *-knuth) - os=mmixware + os=-mmixware ;; *-wec) - os=proelf + os=-proelf ;; *-winbond) - os=proelf + os=-proelf ;; *-oki) - os=proelf + os=-proelf ;; *-hp) - os=hpux + os=-hpux ;; *-hitachi) - os=hiux + os=-hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=sysv + os=-sysv ;; *-cbm) - os=amigaos + os=-amigaos ;; *-dg) - os=dgux + os=-dgux ;; *-dolphin) - os=sysv3 + os=-sysv3 ;; m68k-ccur) - os=rtu + os=-rtu ;; m88k-omron*) - os=luna + os=-luna ;; *-next) - os=nextstep + os=-nextstep ;; *-sequent) - os=ptx + os=-ptx ;; *-crds) - os=unos + os=-unos ;; *-ns) - os=genix + os=-genix ;; i370-*) - os=mvs + os=-mvs ;; *-gould) - os=sysv + os=-sysv ;; *-highlevel) - os=bsd + os=-bsd ;; *-encore) - os=bsd + os=-bsd ;; *-sgi) - os=irix + os=-irix ;; *-siemens) - os=sysv4 + os=-sysv4 ;; *-masscomp) - os=rtu + os=-rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=uxpv + os=-uxpv ;; *-rom68k) - os=coff + os=-coff ;; *-*bug) - os=coff + os=-coff ;; *-apple) - os=macos + os=-macos ;; *-atari*) - os=mint - ;; - *-wrs) - os=vxworks + os=-mint ;; *) - os=none + os=-none ;; esac - fi -# Now, validate our (potentially fixed-up) OS. -case $os in - # Sometimes we do "kernel-libc", so those need to count as OSes. - musl* | newlib* | relibc* | uclibc*) - ;; - # Likewise for "kernel-abi" - eabi* | gnueabi*) - ;; - # VxWorks passes extra cpu info in the 4th filed. - simlinux | simwindows | spe) - ;; - # Now accept the basic system types. - # The portable systems comes first. - # Each alternative MUST end in a * to match a version number. - gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ - | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ - | hiux* | abug | nacl* | netware* | windows* \ - | os9* | macos* | osx* | ios* \ - | mpw* | magic* | mmixware* | mon960* | lnews* \ - | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* | twizzler* \ - | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ - | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ - | mirbsd* | netbsd* | dicos* | openedition* | ose* \ - | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ - | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ - | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ - | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ - | udi* | lites* | ieee* | go32* | aux* | hcos* \ - | chorusrdb* | cegcc* | glidix* | serenity* \ - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ - | midipix* | mingw32* | mingw64* | mint* \ - | uxpv* | beos* | mpeix* | udk* | moxiebox* \ - | interix* | uwin* | mks* | rhapsody* | darwin* \ - | openstep* | oskit* | conix* | pw32* | nonstopux* \ - | storm-chaos* | tops10* | tenex* | tops20* | its* \ - | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ - | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ - | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* ) - ;; - # This one is extra strict with allowed versions - sco3.2v2 | sco3.2v[4-9]* | sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - ;; - none) - ;; - *) - echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 - exit 1 - ;; -esac - -# As a final step for OS-related things, validate the OS-kernel combination -# (given a valid OS), if there is a kernel. -case $kernel-$os in - linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) - ;; - uclinux-uclibc* ) - ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) - # These are just libc implementations, not actual OSes, and thus - # require a kernel. - echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 - exit 1 - ;; - kfreebsd*-gnu* | kopensolaris*-gnu*) - ;; - vxworks-simlinux | vxworks-simwindows | vxworks-spe) - ;; - nto-qnx*) - ;; - os2-emx) - ;; - *-eabi* | *-gnueabi*) - ;; - -*) - # Blank kernel with real OS is always fine. - ;; - *-*) - echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 - exit 1 - ;; -esac - # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -case $vendor in - unknown) - case $cpu-$os in - *-riscix*) +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) vendor=acorn ;; - *-sunos*) + -sunos*) vendor=sun ;; - *-cnk* | *-aix*) + -cnk*|-aix*) vendor=ibm ;; - *-beos*) + -beos*) vendor=be ;; - *-hpux*) + -hpux*) vendor=hp ;; - *-mpeix*) + -mpeix*) vendor=hp ;; - *-hiux*) + -hiux*) vendor=hitachi ;; - *-unos*) + -unos*) vendor=crds ;; - *-dgux*) + -dgux*) vendor=dg ;; - *-luna*) + -luna*) vendor=omron ;; - *-genix*) + -genix*) vendor=ns ;; - *-clix*) - vendor=intergraph - ;; - *-mvs* | *-opened*) - vendor=ibm - ;; - *-os400*) + -mvs* | -opened*) vendor=ibm ;; - s390-* | s390x-*) + -os400*) vendor=ibm ;; - *-ptx*) + -ptx*) vendor=sequent ;; - *-tpf*) + -tpf*) vendor=ibm ;; - *-vxsim* | *-vxworks* | *-windiss*) + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; - *-aux*) + -aux*) vendor=apple ;; - *-hms*) + -hms*) vendor=hitachi ;; - *-mpw* | *-macos*) + -mpw* | -macos*) vendor=apple ;; - *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; - *-vos*) + -vos*) vendor=stratus ;; esac + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$cpu-$vendor-${kernel:+$kernel-}$os" +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru vlc-3.0.21/autotools/depcomp vlc-3.0.22/autotools/depcomp --- vlc-3.0.21/autotools/depcomp 2022-08-03 11:11:46.000000000 +0000 +++ vlc-3.0.22/autotools/depcomp 2025-11-24 23:10:36.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru vlc-3.0.21/autotools/install-sh vlc-3.0.22/autotools/install-sh --- vlc-3.0.21/autotools/install-sh 2022-08-03 11:11:43.000000000 +0000 +++ vlc-3.0.22/autotools/install-sh 2025-11-24 23:10:32.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2020-11-14.01; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,11 +69,6 @@ # Desired mode of installed file. mode=0755 -# Create dirs (including intermediate dirs) using mode 755. -# This is like GNU 'install' as of coreutils 8.32 (2020). -mkdir_umask=22 - -backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -104,28 +99,18 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve data modification time) + -C install only if different (preserve the last data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. - -p pass -p to $cpprog. -s $stripprog installed files. - -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG - -By default, rm is invoked with -f; when overridden with RMPROG, -it's up to you to specify -f if you want it. - -If -S is not specified, no backups are attempted. - -Email bug reports to bug-automake@gnu.org. -Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -152,13 +137,8 @@ -o) chowncmd="$chownprog $2" shift;; - -p) cpprog="$cpprog -p";; - -s) stripcmd=$stripprog;; - -S) backupsuffix="$2" - shift;; - -t) is_target_a_directory=always dst_arg=$2 @@ -275,10 +255,6 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? - # Don't chown directories that already exist. - if test $dstdir_status = 0; then - chowncmd="" - fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -325,6 +301,22 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -334,49 +326,52 @@ fi posix_mkdir=false - # The $RANDOM variable is not portable (e.g., dash). Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap ' - ret=$? - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null - exit $ret - ' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p'. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if @@ -387,7 +382,7 @@ then : else - # mkdir does not conform to POSIX, + # The umask is ridiculous, or mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -416,7 +411,7 @@ prefixes= else if $posix_mkdir; then - (umask $mkdir_umask && + (umask=$mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -456,18 +451,7 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && - { test -z "$stripcmd" || { - # Create $dsttmp read-write so that cp doesn't create it read-only, - # which would cause strip to fail. - if test -z "$doit"; then - : >"$dsttmp" # No need to fork-exec 'touch'. - else - $doit touch "$dsttmp" - fi - } - } && - $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -493,13 +477,6 @@ then rm -f "$dsttmp" else - # If $backupsuffix is set, and the file being installed - # already exists, attempt a backup. Don't worry if it fails, - # e.g., if mv doesn't support -f. - if test -n "$backupsuffix" && test -f "$dst"; then - $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null - fi - # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -514,9 +491,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd "$dst" 2>/dev/null || + $doit $rmcmd -f "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -Nru vlc-3.0.21/autotools/ltmain.sh vlc-3.0.22/autotools/ltmain.sh --- vlc-3.0.21/autotools/ltmain.sh 2022-08-03 11:11:36.000000000 +0000 +++ vlc-3.0.22/autotools/ltmain.sh 2025-11-24 23:10:22.000000000 +0000 @@ -1,12 +1,12 @@ -#! /usr/bin/env sh +#! /bin/sh ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2019-02-19.15 +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.7 +# libtool (GNU libtool) 2.4.6 # Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.7 Debian-2.4.7-4" -package_revision=2.4.7 +VERSION="2.4.6 Debian-2.4.6-13" +package_revision=2.4.6 ## ------ ## @@ -64,25 +64,34 @@ # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2019-02-19.15; # UTC +scriptversion=2015-01-20.17; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# This is free software. There is NO warranty; not even for -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Copyright (C) 2004-2019, 2021 Bootstrap Authors -# -# This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later -# . You must apply one of -# these licenses when using or redistributing this software or any of -# the files within it. See the URLs above, or the file `LICENSE` -# included in the Bootstrap distribution for the full license texts. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# Please report bugs or propose patches to: -# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. ## ------ ## @@ -130,12 +139,9 @@ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -# These NLS vars are set unconditionally (bootstrap issue #24). Unset those -# in case the environment reset is needed later and the $save_* variant is not -# defined (see the code above). -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Make sure IFS has a sensible default sp=' ' @@ -153,26 +159,6 @@ fi -# func_unset VAR -# -------------- -# Portably unset VAR. -# In some shells, an 'unset VAR' statement leaves a non-zero return -# status if VAR is already unset, which might be problematic if the -# statement is used at the end of a function (thus poisoning its return -# value) or when 'set -e' is active (causing even a spurious abort of -# the script in this case). -func_unset () -{ - { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } -} - - -# Make sure CDPATH doesn't cause `cd` commands to output the target dir. -func_unset CDPATH - -# Make sure ${,E,F}GREP behave sanely. -func_unset GREP_OPTIONS - ## ------------------------- ## ## Locate command utilities. ## @@ -273,7 +259,7 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin rm -f conftest.sed SED=$func_path_progs_result } @@ -309,7 +295,7 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin GREP=$func_path_progs_result } @@ -374,35 +360,6 @@ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g s/\n//g" -# require_check_ifs_backslash -# --------------------------- -# Check if we can use backslash as IFS='\' separator, and set -# $check_ifs_backshlash_broken to ':' or 'false'. -require_check_ifs_backslash=func_require_check_ifs_backslash -func_require_check_ifs_backslash () -{ - _G_save_IFS=$IFS - IFS='\' - _G_check_ifs_backshlash='a\\b' - for _G_i in $_G_check_ifs_backshlash - do - case $_G_i in - a) - check_ifs_backshlash_broken=false - ;; - '') - break - ;; - *) - check_ifs_backshlash_broken=: - break - ;; - esac - done - IFS=$_G_save_IFS - require_check_ifs_backslash=: -} - ## ----------------- ## ## Global variables. ## @@ -623,16 +580,16 @@ { $debug_cmd - func_quote_arg pretty "$2" - eval "$1+=\\ \$func_quote_arg_result" + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" }' else func_append_quoted () { $debug_cmd - func_quote_arg pretty "$2" - eval "$1=\$$1\\ \$func_quote_arg_result" + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" } fi @@ -1134,203 +1091,85 @@ } -# func_quote_portable EVAL ARG -# ---------------------------- -# Internal function to portably implement func_quote_arg. Note that we still -# keep attention to performance here so we as much as possible try to avoid -# calling sed binary (so far O(N) complexity as long as func_append is O(1)). -func_quote_portable () +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () { $debug_cmd - $require_check_ifs_backslash - - func_quote_portable_result=$2 - - # one-time-loop (easy break) - while true - do - if $1; then - func_quote_portable_result=`$ECHO "$2" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` - break - fi - - # Quote for eval. - case $func_quote_portable_result in + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in *[\\\`\"\$]*) - # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string - # contains the shell wildcard characters. - case $check_ifs_backshlash_broken$func_quote_portable_result in - :*|*[\[\*\?]*) - func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ - | $SED "$sed_quote_subst"` - break - ;; - esac + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi - func_quote_portable_old_IFS=$IFS - for _G_char in '\' '`' '"' '$' - do - # STATE($1) PREV($2) SEPARATOR($3) - set start "" "" - func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy - IFS=$_G_char - for _G_part in $func_quote_portable_result - do - case $1 in - quote) - func_append func_quote_portable_result "$3$2" - set quote "$_G_part" "\\$_G_char" - ;; - start) - set first "" "" - func_quote_portable_result= - ;; - first) - set quote "$_G_part" "" - ;; - esac - done - done - IFS=$func_quote_portable_old_IFS + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" ;; - *) ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; esac - break - done - func_quote_portable_unquoted_result=$func_quote_portable_result - case $func_quote_portable_result in - # double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # many bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_portable_result=\"$func_quote_portable_result\" - ;; - esac + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done } -# func_quotefast_eval ARG -# ----------------------- -# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', -# but optimized for speed. Result is stored in $func_quotefast_eval. -if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then - printf -v _GL_test_printf_tilde %q '~' - if test '\~' = "$_GL_test_printf_tilde"; then - func_quotefast_eval () - { - printf -v func_quotefast_eval_result %q "$1" - } - else - # Broken older Bash implementations. Make those faster too if possible. - func_quotefast_eval () - { - case $1 in - '~'*) - func_quote_portable false "$1" - func_quotefast_eval_result=$func_quote_portable_result - ;; - *) - printf -v func_quotefast_eval_result %q "$1" - ;; - esac - } - fi -else - func_quotefast_eval () - { - func_quote_portable false "$1" - func_quotefast_eval_result=$func_quote_portable_result - } -fi - +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd -# func_quote_arg MODEs ARG -# ------------------------ -# Quote one ARG to be evaled later. MODEs argument may contain zero or more -# specifiers listed below separated by ',' character. This function returns two -# values: -# i) func_quote_arg_result -# double-quoted (when needed), suitable for a subsequent eval -# ii) func_quote_arg_unquoted_result -# has all characters that are still active within double -# quotes backslashified. Available only if 'unquoted' is specified. -# -# Available modes: -# ---------------- -# 'eval' (default) -# - escape shell special characters -# 'expand' -# - the same as 'eval'; but do not quote variable references -# 'pretty' -# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might -# be used later in func_quote to get output like: 'echo "a b"' instead -# of 'echo a\ b'. This is slower than default on some shells. -# 'unquoted' -# - produce also $func_quote_arg_unquoted_result which does not contain -# wrapping double-quotes. -# -# Examples for 'func_quote_arg pretty,unquoted string': -# -# string | *_result | *_unquoted_result -# ------------+-----------------------+------------------- -# " | \" | \" -# a b | "a b" | a b -# "a b" | "\"a b\"" | \"a b\" -# * | "*" | * -# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" -# -# Examples for 'func_quote_arg pretty,unquoted,expand string': -# -# string | *_result | *_unquoted_result -# --------------+---------------------+-------------------- -# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" -func_quote_arg () -{ - _G_quote_expand=false - case ,$1, in - *,expand,*) - _G_quote_expand=: - ;; + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; esac - case ,$1, in - *,pretty,*|*,expand,*|*,unquoted,*) - func_quote_portable $_G_quote_expand "$2" - func_quote_arg_result=$func_quote_portable_result - func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result - ;; - *) - # Faster quote-for-eval for some shells. - func_quotefast_eval "$2" - func_quote_arg_result=$func_quotefast_eval_result + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" ;; esac -} - -# func_quote MODEs ARGs... -# ------------------------ -# Quote all ARGs to be evaled later and join them into single command. See -# func_quote_arg's description for more info. -func_quote () -{ - $debug_cmd - _G_func_quote_mode=$1 ; shift - func_quote_result= - while test 0 -lt $#; do - func_quote_arg "$_G_func_quote_mode" "$1" - if test -n "$func_quote_result"; then - func_append func_quote_result " $func_quote_arg_result" - else - func_append func_quote_result "$func_quote_arg_result" - fi - shift - done + func_quote_for_expand_result=$_G_arg } @@ -1376,8 +1215,8 @@ _G_cmd=$1 _G_fail_exp=${2-':'} - func_quote_arg pretty,expand "$_G_cmd" - eval "func_notquiet $func_quote_arg_result" + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" $opt_dry_run || { eval "$_G_cmd" @@ -1402,8 +1241,8 @@ _G_fail_exp=${2-':'} $opt_quiet || { - func_quote_arg expand,pretty "$_G_cmd" - eval "func_echo $func_quote_arg_result" + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" } $opt_dry_run || { @@ -1530,26 +1369,30 @@ # End: #! /bin/sh +# Set a version string for this script. +scriptversion=2015-10-07.11; # UTC + # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 -# This is free software. There is NO warranty; not even for -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Copyright (C) 2010-2019, 2021 Bootstrap Authors -# -# This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later -# . You must apply one of -# these licenses when using or redistributing this software or any of -# the files within it. See the URLs above, or the file `LICENSE` -# included in the Bootstrap distribution for the full license texts. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. -# Please report bugs or propose patches to: -# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -# Set a version string for this script. -scriptversion=2019-02-19.15; # UTC +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. ## ------ ## @@ -1572,7 +1415,7 @@ # # In order for the '--version' option to work, you will need to have a # suitably formatted comment like the one at the top of this file -# starting with '# Written by ' and ending with '# Copyright'. +# starting with '# Written by ' and ending with '# warranty; '. # # For '-h' and '--help' to work, you will also need a one line # description of your script's purpose in a comment directly above the @@ -1584,7 +1427,7 @@ # to display verbose messages only when your user has specified # '--verbose'. # -# After sourcing this file, you can plug in processing for additional +# After sourcing this file, you can plug processing for additional # options by amending the variables from the 'Configuration' section # below, and following the instructions in the 'Option parsing' # section further down. @@ -1633,8 +1476,8 @@ ## ------------------------- ## # This section contains functions for adding, removing, and running hooks -# in the main code. A hook is just a list of function names that can be -# run in order later on. +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. # func_hookable FUNC_NAME # ----------------------- @@ -1667,8 +1510,7 @@ # func_remove_hook FUNC_NAME HOOK_FUNC # ------------------------------------ -# Remove HOOK_FUNC from the list of hook functions to be called by -# FUNC_NAME. +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. func_remove_hook () { $debug_cmd @@ -1677,28 +1519,10 @@ } -# func_propagate_result FUNC_NAME_A FUNC_NAME_B -# --------------------------------------------- -# If the *_result variable of FUNC_NAME_A _is set_, assign its value to -# *_result variable of FUNC_NAME_B. -func_propagate_result () -{ - $debug_cmd - - func_propagate_result_result=: - if eval "test \"\${${1}_result+set}\" = set" - then - eval "${2}_result=\$${1}_result" - else - func_propagate_result_result=false - fi -} - - # func_run_hooks FUNC_NAME [ARG]... # --------------------------------- # Run all hook functions registered to FUNC_NAME. -# It's assumed that the list of hook functions contains nothing more +# It is assumed that the list of hook functions contains nothing more # than a whitespace-delimited list of legal shell function names, and # no effort is wasted trying to catch shell meta-characters or preserve # whitespace. @@ -1710,19 +1534,22 @@ case " $hookable_fns " in *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook functions." ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; esac eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - func_unset "${_G_hook}_result" - eval $_G_hook '${1+"$@"}' - func_propagate_result $_G_hook func_run_hooks - if $func_propagate_result_result; then - eval set dummy "$func_run_hooks_result"; shift + if eval $_G_hook '"$@"'; then + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + _G_rc_run_hooks=: fi done + + $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result } @@ -1732,16 +1559,14 @@ ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list from your hook function. You may remove -# or edit any options that you action, and then pass back the remaining -# unprocessed options in '_result', escaped -# suitably for 'eval'. -# -# The '_result' variable is automatically unset -# before your hook gets called; for best performance, only set the -# *_result variable when necessary (i.e. don't call the 'func_quote' -# function unnecessarily because it can be an expensive operation on some -# machines). +# full positional parameter list in your hook function, you may remove/edit +# any options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. In this case you also must return $EXIT_SUCCESS to let the +# hook's caller know that it should pay attention to +# '_result'. Returning $EXIT_FAILURE signalizes that +# arguments are left untouched by the hook and therefore caller will ignore the +# result variable. # # Like this: # @@ -1753,8 +1578,11 @@ # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# # No change in '$@' (ignored completely by this hook). Leave -# # my_options_prep_result variable intact. +# # No change in '$@' (ignored completely by this hook). There is +# # no need to do the equivalent (but slower) action: +# # func_quote_for_eval ${1+"$@"} +# # my_options_prep_result=$func_quote_for_eval_result +# false # } # func_add_hook func_options_prep my_options_prep # @@ -1765,7 +1593,7 @@ # # args_changed=false # -# # Note that, for efficiency, we parse as many options as we can +# # Note that for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do @@ -1782,17 +1610,18 @@ # args_changed=: # ;; # *) # Make sure the first unrecognised option "$_G_opt" -# # is added back to "$@" in case we need it later, -# # if $args_changed was set to 'true'. +# # is added back to "$@", we could need that later +# # if $args_changed is true. # set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # -# # Only call 'func_quote' here if we processed at least one argument. # if $args_changed; then -# func_quote eval ${1+"$@"} -# my_silent_option_result=$func_quote_result +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result # fi +# +# $args_changed # } # func_add_hook func_parse_options my_silent_option # @@ -1803,6 +1632,8 @@ # # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." +# +# false # } # func_add_hook func_validate_options my_option_validation # @@ -1818,8 +1649,13 @@ { $debug_cmd - func_run_hooks func_options ${1+"$@"} - func_propagate_result func_run_hooks func_options_finish + _G_func_options_finish_exit=false + if func_run_hooks func_options ${1+"$@"}; then + func_options_finish_result=$func_run_hooks_result + _G_func_options_finish_exit=: + fi + + $_G_func_options_finish_exit } @@ -1832,27 +1668,28 @@ { $debug_cmd - _G_options_quoted=false + _G_rc_options=false for my_func in options_prep parse_options validate_options options_finish do - func_unset func_${my_func}_result - func_unset func_run_hooks_result - eval func_$my_func '${1+"$@"}' - func_propagate_result func_$my_func func_options - if $func_propagate_result_result; then - eval set dummy "$func_options_result"; shift - _G_options_quoted=: + if eval func_$my_func '${1+"$@"}'; then + eval _G_res_var='$'"func_${my_func}_result" + eval set dummy "$_G_res_var" ; shift + _G_rc_options=: fi done - $_G_options_quoted || { - # As we (func_options) are top-level options-parser function and - # nobody quoted "$@" for us yet, we need to do it explicitly for - # caller. - func_quote eval ${1+"$@"} - func_options_result=$func_quote_result - } + # Save modified positional parameters for caller. As a top-level + # options-parser function we always need to set the 'func_options_result' + # variable (regardless the $_G_rc_options value). + if $_G_rc_options; then + func_options_result=$_G_res_var + else + func_quote_for_eval ${1+"$@"} + func_options_result=$func_quote_for_eval_result + fi + + $_G_rc_options } @@ -1862,7 +1699,8 @@ # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and # needs to propagate that back to rest of this script, then the complete -# modified list must be put in 'func_run_hooks_result' before returning. +# modified list must be put in 'func_run_hooks_result' before +# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). func_hookable func_options_prep func_options_prep () { @@ -1872,8 +1710,14 @@ opt_verbose=false opt_warning_types= - func_run_hooks func_options_prep ${1+"$@"} - func_propagate_result func_run_hooks func_options_prep + _G_rc_options_prep=false + if func_run_hooks func_options_prep ${1+"$@"}; then + _G_rc_options_prep=: + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result + fi + + $_G_rc_options_prep } @@ -1885,32 +1729,27 @@ { $debug_cmd - _G_parse_options_requote=false + func_parse_options_result= + + _G_rc_parse_options=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. - func_run_hooks func_parse_options ${1+"$@"} - func_propagate_result func_run_hooks func_parse_options - if $func_propagate_result_result; then - eval set dummy "$func_parse_options_result"; shift - # Even though we may have changed "$@", we passed the "$@" array - # down into the hook and it quoted it for us (because we are in - # this if-branch). No need to quote it again. - _G_parse_options_requote=false + if func_run_hooks func_parse_options ${1+"$@"}; then + eval set dummy "$func_run_hooks_result"; shift + _G_rc_parse_options=: fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break - # We expect that one of the options parsed in this function matches - # and thus we remove _G_opt from "$@" and need to re-quote. _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in --debug|-x) debug_cmd='set -x' - func_echo "enabling shell trace mode" >&2 + func_echo "enabling shell trace mode" $debug_cmd ;; @@ -1921,7 +1760,7 @@ --warnings|--warning|-W) if test $# = 0 && func_missing_arg $_G_opt; then - _G_parse_options_requote=: + _G_rc_parse_options=: break fi case " $warning_categories $1" in @@ -1976,7 +1815,7 @@ shift ;; - --) _G_parse_options_requote=: ; break ;; + --) _G_rc_parse_options=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; *) set dummy "$_G_opt" ${1+"$@"}; shift _G_match_parse_options=false @@ -1984,16 +1823,17 @@ ;; esac - if $_G_match_parse_options; then - _G_parse_options_requote=: - fi + $_G_match_parse_options && _G_rc_parse_options=: done - if $_G_parse_options_requote; then + + if $_G_rc_parse_options; then # save modified positional parameters for caller - func_quote eval ${1+"$@"} - func_parse_options_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result fi + + $_G_rc_parse_options } @@ -2006,14 +1846,21 @@ { $debug_cmd + _G_rc_validate_options=false + # Display all warnings if -W was not given. test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - func_run_hooks func_validate_options ${1+"$@"} - func_propagate_result func_run_hooks func_validate_options + if func_run_hooks func_validate_options ${1+"$@"}; then + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result + _G_rc_validate_options=: + fi # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE + + $_G_rc_validate_options } @@ -2069,8 +1916,8 @@ # func_split_equals STRING # ------------------------ -# Set func_split_equals_lhs and func_split_equals_rhs shell variables -# after splitting STRING at the '=' sign. +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. test -z "$_G_HAVE_XSI_OPS" \ && (eval 'x=a/b/c; test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ @@ -2085,9 +1932,8 @@ func_split_equals_lhs=${1%%=*} func_split_equals_rhs=${1#*=} - if test "x$func_split_equals_lhs" = "x$1"; then - func_split_equals_rhs= - fi + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= }' else # ...otherwise fall back to using expr, which is often a shell builtin. @@ -2097,7 +1943,7 @@ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` func_split_equals_rhs= - test "x$func_split_equals_lhs=" = "x$1" \ + test "x$func_split_equals_lhs" = "x$1" \ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` } fi #func_split_equals @@ -2123,7 +1969,7 @@ { $debug_cmd - func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` } fi #func_split_short_opt @@ -2165,44 +2011,31 @@ # func_version # ------------ # Echo version message to standard output and exit. -# The version message is extracted from the calling file's header -# comments, with leading '# ' stripped: -# 1. First display the progname and version -# 2. Followed by the header comment line matching /^# Written by / -# 3. Then a blank line followed by the first following line matching -# /^# Copyright / -# 4. Immediately followed by any lines between the previous matches, -# except lines preceding the intervening completely blank line. -# For example, see the header comments of this file. func_version () { $debug_cmd printf '%s\n' "$progname $scriptversion" $SED -n ' - /^# Written by /!b - s|^# ||; p; n - - :fwd2blnk - /./ { - n - b fwd2blnk + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more } - p; n - - :holdwrnt - s|^# || - s|^# *$|| - /^Copyright /!{ - /./H - n - b holdwrnt + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p } - - s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| - G - s|\(\n\)\n*|\1|g - p; q' < "$progpath" + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" exit $? } @@ -2212,12 +2045,12 @@ # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" # time-stamp-time-zone: "UTC" # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.7' +scriptversion='(GNU libtool) 2.4.6' # func_echo ARG... @@ -2308,7 +2141,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.7-4 + version: $progname $scriptversion Debian-2.4.6-13 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2364,7 +2197,7 @@ # a configuration failure hint, and exit. func_fatal_configuration () { - func_fatal_error ${1+"$@"} \ + func__fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2512,8 +2345,6 @@ _G_rc_lt_options_prep=: - _G_rc_lt_options_prep=: - # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2544,9 +2375,11 @@ if $_G_rc_lt_options_prep; then # Pass back the list of options. - func_quote eval ${1+"$@"} - libtool_options_prep_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result fi + + $_G_rc_lt_options_prep } func_add_hook func_options_prep libtool_options_prep @@ -2649,9 +2482,11 @@ if $_G_rc_lt_parse_options; then # save modified positional parameters for caller - func_quote eval ${1+"$@"} - libtool_parse_options_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result fi + + $_G_rc_lt_parse_options } func_add_hook func_parse_options libtool_parse_options @@ -2708,8 +2543,8 @@ } # Pass back the unparsed argument list - func_quote eval ${1+"$@"} - libtool_validate_options_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } func_add_hook func_validate_options libtool_validate_options @@ -3675,8 +3510,8 @@ esac done - func_quote_arg pretty "$libobj" - test "X$libobj" != "X$func_quote_arg_result" \ + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" @@ -3749,8 +3584,8 @@ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_arg pretty "$srcfile" - qsrcfile=$func_quote_arg_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. if test yes = "$build_libtool_libs"; then @@ -3905,8 +3740,7 @@ -prefer-non-pic try to build non-PIC objects only -shared do not build a '.o' file suitable for static linking -static only build a '.o' file suitable for static linking - -Wc,FLAG - -Xcompiler FLAG pass FLAG directly to the compiler + -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. @@ -4012,8 +3846,6 @@ -weak LIBNAME declare that the target provides the LIBNAME interface -Wc,FLAG -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wa,FLAG - -Xassembler FLAG pass linker-specific FLAG directly to the assembler -Wl,FLAG -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) @@ -4356,8 +4188,8 @@ case $nonopt in *shtool*) :;; *) false;; esac then # Aesthetically quote it. - func_quote_arg pretty "$nonopt" - install_prog="$func_quote_arg_result " + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " arg=$1 shift else @@ -4367,8 +4199,8 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_arg pretty "$arg" - func_append install_prog "$func_quote_arg_result" + func_quote_for_eval "$arg" + func_append install_prog "$func_quote_for_eval_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -4425,12 +4257,12 @@ esac # Aesthetically quote the argument. - func_quote_arg pretty "$arg" - func_append install_prog " $func_quote_arg_result" + func_quote_for_eval "$arg" + func_append install_prog " $func_quote_for_eval_result" if test -n "$arg2"; then - func_quote_arg pretty "$arg2" + func_quote_for_eval "$arg2" fi - func_append install_shared_prog " $func_quote_arg_result" + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -4441,8 +4273,8 @@ if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_arg pretty "$install_override_mode" - func_append install_shared_prog " -m $func_quote_arg_result" + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" fi fi @@ -4738,8 +4570,8 @@ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_quiet || { - func_quote_arg expand,pretty "$relink_command" - eval "func_echo $func_quote_arg_result" + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else @@ -5518,8 +5350,7 @@ if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - func_quote_arg pretty "$ECHO" - qECHO=$func_quote_arg_result + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -5529,7 +5360,7 @@ \$1 _LTECHO_EOF' } - ECHO=$qECHO + ECHO=\"$qECHO\" fi # Very basic option parsing. These options are (a) specific to @@ -6872,9 +6703,9 @@ while test "$#" -gt 0; do arg=$1 shift - func_quote_arg pretty,unquoted "$arg" - qarg=$func_quote_arg_unquoted_result - func_append libtool_args " $func_quote_arg_result" + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -7110,13 +6941,6 @@ prev= continue ;; - xassembler) - func_append compiler_flags " -Xassembler $qarg" - prev= - func_append compile_command " -Xassembler $qarg" - func_append finalize_command " -Xassembler $qarg" - continue - ;; xcclinker) func_append linker_flags " $qarg" func_append compiler_flags " $qarg" @@ -7287,7 +7111,7 @@ # These systems don't actually have a C library (as such) test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. test X-lc = "X$arg" && continue ;; @@ -7307,7 +7131,7 @@ esac elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7337,20 +7161,8 @@ prev=xcompiler continue ;; - # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199. - -pthread) - case $host in - *solaris2*) ;; - *) - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - ;; - esac - continue - ;; - -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" @@ -7491,9 +7303,9 @@ save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_arg pretty "$flag" - func_append arg " $func_quote_arg_result" - func_append compiler_flags " $func_quote_arg_result" + func_quote_for_eval "$flag" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7507,21 +7319,16 @@ save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_arg pretty "$flag" - func_append arg " $wl$func_quote_arg_result" - func_append compiler_flags " $wl$func_quote_arg_result" - func_append linker_flags " $func_quote_arg_result" + func_quote_for_eval "$flag" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; - -Xassembler) - prev=xassembler - continue - ;; - -Xcompiler) prev=xcompiler continue @@ -7539,8 +7346,8 @@ # -msg_* for osf cc -msg_*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -7563,13 +7370,12 @@ # -fuse-ld=* Linker select flags for GCC # -static-* direct GCC to link specific libraries statically # -fcilkplus Cilk Plus language extension features for C/C++ - # -Wa,* Pass flags directly to the assembler -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Wa,*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -7590,15 +7396,15 @@ continue else # Otherwise treat like 'Some other compiler flag' below - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result fi ;; # Some other compiler flag. -* | +*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -7718,8 +7524,8 @@ *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result ;; esac # arg @@ -8927,7 +8733,7 @@ test CXX = "$tagname" && { case $host_os in linux*) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 func_suncc_cstd_abi @@ -9100,7 +8906,7 @@ # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age=$number_minor @@ -9194,7 +9000,7 @@ versuffix=.$current.$revision ;; - freebsd-elf | midnightbsd-elf) + freebsd-elf) func_arith $current - $age major=.$func_arith_result versuffix=$major.$age.$revision @@ -9420,7 +9226,7 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -10231,8 +10037,8 @@ for cmd in $concat_cmds; do IFS=$save_ifs $opt_quiet || { - func_quote_arg expand,pretty "$cmd" - eval "func_echo $func_quote_arg_result" + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10325,8 +10131,8 @@ eval cmd=\"$cmd\" IFS=$save_ifs $opt_quiet || { - func_quote_arg expand,pretty "$cmd" - eval "func_echo $func_quote_arg_result" + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10800,13 +10606,12 @@ elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_arg pretty "$var_value" - relink_command="$var=$func_quote_arg_result; export $var; $relink_command" + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi done - func_quote eval cd "`pwd`" - func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" - relink_command=$func_quote_arg_unquoted_result + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -11046,15 +10851,13 @@ elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_arg pretty,unquoted "$var_value" - relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi done # Quote the link command for shipping. - func_quote eval cd "`pwd`" - relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - func_quote_arg pretty,unquoted "$relink_command" - relink_command=$func_quote_arg_unquoted_result + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test yes = "$hardcode_automatic"; then relink_command= fi diff -Nru vlc-3.0.21/autotools/missing vlc-3.0.22/autotools/missing --- vlc-3.0.21/autotools/missing 2022-08-03 11:11:43.000000000 +0000 +++ vlc-3.0.22/autotools/missing 2025-11-24 23:10:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru vlc-3.0.21/autotools/test-driver vlc-3.0.22/autotools/test-driver --- vlc-3.0.21/autotools/test-driver 2022-08-03 11:11:46.000000000 +0000 +++ vlc-3.0.22/autotools/test-driver 2025-11-24 23:10:36.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2021 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,13 +42,11 @@ { cat <"$log_file" -"$@" >>"$log_file" 2>&1 +# Test script is run here. +"$@" >$log_file 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -131,7 +126,7 @@ # know whether the test passed or failed simply by looking at the '.log' # file, without the need of also peaking into the corresponding '.trs' # file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>"$log_file" +echo "$res $test_name (exit status: $estatus)" >>$log_file # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -Nru vlc-3.0.21/autotools/ylwrap vlc-3.0.22/autotools/ylwrap --- vlc-3.0.21/autotools/ylwrap 2022-08-03 11:11:45.000000000 +0000 +++ vlc-3.0.22/autotools/ylwrap 2025-11-24 23:10:35.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # Written by Tom Tromey . # diff -Nru vlc-3.0.21/bin/Makefile.in vlc-3.0.22/bin/Makefile.in --- vlc-3.0.21/bin/Makefile.in 2024-06-05 16:02:16.000000000 +0000 +++ vlc-3.0.22/bin/Makefile.in 2025-11-24 23:10:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -307,6 +307,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/autotools/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -500,8 +502,6 @@ CPPFLAGS_vpx = @CPPFLAGS_vpx@ CPPFLAGS_x265 = @CPPFLAGS_x265@ CPPFLAGS_xml = @CPPFLAGS_xml@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -545,14 +545,12 @@ EGL_CFLAGS = @EGL_CFLAGS@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ -ETAGS = @ETAGS@ EVAS_CFLAGS = @EVAS_CFLAGS@ EVAS_LIBS = @EVAS_LIBS@ EXEEXT = @EXEEXT@ FDKAAC_CFLAGS = @FDKAAC_CFLAGS@ FDKAAC_LIBS = @FDKAAC_LIBS@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@ FLAC_CFLAGS = @FLAC_CFLAGS@ @@ -625,6 +623,7 @@ LIBCDDB_LIBS = @LIBCDDB_LIBS@ LIBCOM = @LIBCOM@ LIBDL = @LIBDL@ +LIBEXECINFO = @LIBEXECINFO@ LIBEXT = @LIBEXT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -915,6 +914,7 @@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DIR = @PACKAGE_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -1026,9 +1026,11 @@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ WAYLAND_PROTOCOLS = @WAYLAND_PROTOCOLS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ +WIN32_PATH_CMD = @WIN32_PATH_CMD@ WINDOWS_ARCH = @WINDOWS_ARCH@ WINDRES = @WINDRES@ WINE_SDK_PATH = @WINE_SDK_PATH@ +WIXPATH = @WIXPATH@ X262_CFLAGS = @X262_CFLAGS@ X262_LIBS = @X262_LIBS@ X26410b_CFLAGS = @X26410b_CFLAGS@ @@ -1639,6 +1641,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -Nru vlc-3.0.21/bin/breakpad.cpp vlc-3.0.22/bin/breakpad.cpp --- vlc-3.0.21/bin/breakpad.cpp 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/bin/breakpad.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -30,6 +30,7 @@ #include #include #include +#include using google_breakpad::ExceptionHandler; @@ -47,10 +48,10 @@ void CheckCrashDump( const wchar_t* path ) { - wchar_t pattern[MAX_PATH]; + std::wstringstream pattern; WIN32_FIND_DATAW data; - _snwprintf( pattern, MAX_PATH, L"%s/*.dmp", path ); - HANDLE h = FindFirstFileW( pattern, &data ); + pattern << path << L"/*.dmp"; + HANDLE h = FindFirstFileW( pattern.str().c_str(), &data ); if (h == INVALID_HANDLE_VALUE) return; int answer = MessageBoxW( NULL, L"Ooops: VLC media player just crashed.\n" \ @@ -61,17 +62,17 @@ params[L"ver"] = WIDEN(PACKAGE_VERSION); do { - wchar_t fullPath[MAX_PATH]; - _snwprintf( fullPath, MAX_PATH, L"%s/%s", path, data.cFileName ); + std::wstringstream fullPath; + fullPath << path << L'/' << data.cFileName; if( answer == IDYES ) { std::map files; - files[L"upload_file_minidump"] = fullPath; + files[L"upload_file_minidump"] = fullPath.str(); google_breakpad::HTTPUpload::SendRequest( WIDEN( BREAKPAD_URL "/reports" ), params, files, NULL, NULL, NULL ); } - DeleteFileW( fullPath ); + DeleteFileW( fullPath.str().c_str() ); } while ( FindNextFileW( h, &data ) ); FindClose(h); } diff -Nru vlc-3.0.21/bin/winvlc.c vlc-3.0.22/bin/winvlc.c --- vlc-3.0.21/bin/winvlc.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/bin/winvlc.c 2025-11-13 22:17:54.000000000 +0000 @@ -217,10 +217,15 @@ if( S_OK != SHGetFolderPathW( NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, path ) ) fprintf( stderr, "Can't open the vlc conf PATH\n" ); - else if ( !wcscat_s( path, MAX_PATH, L"\\vlc\\crashdump" ) ) + else { - CheckCrashDump( path ); - eh = InstallCrashHandler( path ); + size_t pathlen = wcslen(path); + if ( pathlen + 1 + wcslen(L"\\vlc\\crashdump" ) <= MAX_PATH ) + { + wcscpy( &path[pathlen], L"\\vlc\\crashdump" ); + CheckCrashDump( path ); + eh = InstallCrashHandler( path ); + } } } #else diff -Nru vlc-3.0.21/compat/Makefile.am vlc-3.0.22/compat/Makefile.am --- vlc-3.0.21/compat/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/compat/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -1,3 +1,4 @@ +noinst_HEADERS = stdckdint/stdckdint.h pkglib_LTLIBRARIES = libcompat.la libcompat_la_SOURCES = dummy.c libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT) $(LIBM) @@ -13,9 +14,23 @@ check_PROGRAMS = \ - test_strnstr + test_strnstr \ + test_ckd_ckd \ + test_ckd_builtin \ + test_ckd_compat \ + $(NULL) TESTS = $(check_PROGRAMS) test_strnstr_SOURCES = test/strnstr.c test_strnstr_LDADD = libcompat.la + +test_ckd_ckd_SOURCES = test/ckd.c +test_ckd_ckd_CFLAGS = -DTEST_CKD +if HAVE_STDCKDINT +test_ckd_ckd_CFLAGS += -DHAVE_CKD +endif +test_ckd_builtin_SOURCES = $(test_ckd_ckd_SOURCES) +test_ckd_builtin_CFLAGS = -DTEST_BUILTIN +test_ckd_compat_SOURCES = $(test_ckd_ckd_SOURCES) +test_ckd_compat_CFLAGS = -DTEST_COMPAT diff -Nru vlc-3.0.21/compat/Makefile.in vlc-3.0.22/compat/Makefile.in --- vlc-3.0.21/compat/Makefile.in 2024-06-05 16:02:16.000000000 +0000 +++ vlc-3.0.22/compat/Makefile.in 2025-11-24 23:10:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -88,7 +89,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = test_strnstr$(EXEEXT) +check_PROGRAMS = test_strnstr$(EXEEXT) test_ckd_ckd$(EXEEXT) \ + test_ckd_builtin$(EXEEXT) test_ckd_compat$(EXEEXT) +@HAVE_STDCKDINT_TRUE@am__append_1 = -DHAVE_CKD subdir = compat ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ @@ -107,7 +110,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -154,6 +158,28 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libcompat_la_LDFLAGS) $(LDFLAGS) -o $@ am__dirstamp = $(am__leading_dot)dirstamp +am__objects_1 = test/ckd_builtin-ckd.$(OBJEXT) +am_test_ckd_builtin_OBJECTS = $(am__objects_1) +test_ckd_builtin_OBJECTS = $(am_test_ckd_builtin_OBJECTS) +test_ckd_builtin_LDADD = $(LDADD) +test_ckd_builtin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(test_ckd_builtin_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +am_test_ckd_ckd_OBJECTS = test/ckd_ckd-ckd.$(OBJEXT) +test_ckd_ckd_OBJECTS = $(am_test_ckd_ckd_OBJECTS) +test_ckd_ckd_LDADD = $(LDADD) +test_ckd_ckd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_ckd_ckd_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +am__objects_2 = test/ckd_compat-ckd.$(OBJEXT) +am_test_ckd_compat_OBJECTS = $(am__objects_2) +test_ckd_compat_OBJECTS = $(am_test_ckd_compat_OBJECTS) +test_ckd_compat_LDADD = $(LDADD) +test_ckd_compat_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(test_ckd_compat_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ am_test_strnstr_OBJECTS = test/strnstr.$(OBJEXT) test_strnstr_OBJECTS = $(am_test_strnstr_OBJECTS) test_strnstr_DEPENDENCIES = libcompat.la @@ -196,6 +222,8 @@ $(DEPDIR)/swab.Plo $(DEPDIR)/tdestroy.Plo $(DEPDIR)/tfind.Plo \ $(DEPDIR)/timegm.Plo $(DEPDIR)/timespec_get.Plo \ $(DEPDIR)/vasprintf.Plo ./$(DEPDIR)/dummy.Plo \ + test/$(DEPDIR)/ckd_builtin-ckd.Po \ + test/$(DEPDIR)/ckd_ckd-ckd.Po test/$(DEPDIR)/ckd_compat-ckd.Po \ test/$(DEPDIR)/strnstr.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -212,13 +240,18 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libcompat_la_SOURCES) $(test_strnstr_SOURCES) -DIST_SOURCES = $(libcompat_la_SOURCES) $(test_strnstr_SOURCES) +SOURCES = $(libcompat_la_SOURCES) $(test_ckd_builtin_SOURCES) \ + $(test_ckd_ckd_SOURCES) $(test_ckd_compat_SOURCES) \ + $(test_strnstr_SOURCES) +DIST_SOURCES = $(libcompat_la_SOURCES) $(test_ckd_builtin_SOURCES) \ + $(test_ckd_ckd_SOURCES) $(test_ckd_compat_SOURCES) \ + $(test_strnstr_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +HEADERS = $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -236,6 +269,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -391,7 +426,6 @@ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` -AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -617,8 +651,6 @@ CPPFLAGS_vpx = @CPPFLAGS_vpx@ CPPFLAGS_x265 = @CPPFLAGS_x265@ CPPFLAGS_xml = @CPPFLAGS_xml@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -662,14 +694,12 @@ EGL_CFLAGS = @EGL_CFLAGS@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ -ETAGS = @ETAGS@ EVAS_CFLAGS = @EVAS_CFLAGS@ EVAS_LIBS = @EVAS_LIBS@ EXEEXT = @EXEEXT@ FDKAAC_CFLAGS = @FDKAAC_CFLAGS@ FDKAAC_LIBS = @FDKAAC_LIBS@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@ FLAC_CFLAGS = @FLAC_CFLAGS@ @@ -742,6 +772,7 @@ LIBCDDB_LIBS = @LIBCDDB_LIBS@ LIBCOM = @LIBCOM@ LIBDL = @LIBDL@ +LIBEXECINFO = @LIBEXECINFO@ LIBEXT = @LIBEXT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -1032,6 +1063,7 @@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DIR = @PACKAGE_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -1143,9 +1175,11 @@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ WAYLAND_PROTOCOLS = @WAYLAND_PROTOCOLS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ +WIN32_PATH_CMD = @WIN32_PATH_CMD@ WINDOWS_ARCH = @WINDOWS_ARCH@ WINDRES = @WINDRES@ WINE_SDK_PATH = @WINE_SDK_PATH@ +WIXPATH = @WIXPATH@ X262_CFLAGS = @X262_CFLAGS@ X262_LIBS = @X262_LIBS@ X26410b_CFLAGS = @X26410b_CFLAGS@ @@ -1247,6 +1281,7 @@ top_srcdir = @top_srcdir@ vlcdatadir = @vlcdatadir@ vlclibdir = @vlclibdir@ +noinst_HEADERS = stdckdint/stdckdint.h pkglib_LTLIBRARIES = libcompat.la libcompat_la_SOURCES = dummy.c libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT) $(LIBM) @@ -1257,6 +1292,12 @@ TESTS = $(check_PROGRAMS) test_strnstr_SOURCES = test/strnstr.c test_strnstr_LDADD = libcompat.la +test_ckd_ckd_SOURCES = test/ckd.c +test_ckd_ckd_CFLAGS = -DTEST_CKD $(am__append_1) +test_ckd_builtin_SOURCES = $(test_ckd_ckd_SOURCES) +test_ckd_builtin_CFLAGS = -DTEST_BUILTIN +test_ckd_compat_SOURCES = $(test_ckd_ckd_SOURCES) +test_ckd_compat_CFLAGS = -DTEST_COMPAT all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1344,6 +1385,24 @@ test/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) test/$(DEPDIR) @: > test/$(DEPDIR)/$(am__dirstamp) +test/ckd_builtin-ckd.$(OBJEXT): test/$(am__dirstamp) \ + test/$(DEPDIR)/$(am__dirstamp) + +test_ckd_builtin$(EXEEXT): $(test_ckd_builtin_OBJECTS) $(test_ckd_builtin_DEPENDENCIES) $(EXTRA_test_ckd_builtin_DEPENDENCIES) + @rm -f test_ckd_builtin$(EXEEXT) + $(AM_V_CCLD)$(test_ckd_builtin_LINK) $(test_ckd_builtin_OBJECTS) $(test_ckd_builtin_LDADD) $(LIBS) +test/ckd_ckd-ckd.$(OBJEXT): test/$(am__dirstamp) \ + test/$(DEPDIR)/$(am__dirstamp) + +test_ckd_ckd$(EXEEXT): $(test_ckd_ckd_OBJECTS) $(test_ckd_ckd_DEPENDENCIES) $(EXTRA_test_ckd_ckd_DEPENDENCIES) + @rm -f test_ckd_ckd$(EXEEXT) + $(AM_V_CCLD)$(test_ckd_ckd_LINK) $(test_ckd_ckd_OBJECTS) $(test_ckd_ckd_LDADD) $(LIBS) +test/ckd_compat-ckd.$(OBJEXT): test/$(am__dirstamp) \ + test/$(DEPDIR)/$(am__dirstamp) + +test_ckd_compat$(EXEEXT): $(test_ckd_compat_OBJECTS) $(test_ckd_compat_DEPENDENCIES) $(EXTRA_test_ckd_compat_DEPENDENCIES) + @rm -f test_ckd_compat$(EXEEXT) + $(AM_V_CCLD)$(test_ckd_compat_LINK) $(test_ckd_compat_OBJECTS) $(test_ckd_compat_LDADD) $(LIBS) test/strnstr.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) @@ -1407,6 +1466,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/timespec_get.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/ckd_builtin-ckd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/ckd_ckd-ckd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/ckd_compat-ckd.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/strnstr.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @@ -1439,6 +1501,48 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +test/ckd_builtin-ckd.o: test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_builtin_CFLAGS) $(CFLAGS) -MT test/ckd_builtin-ckd.o -MD -MP -MF test/$(DEPDIR)/ckd_builtin-ckd.Tpo -c -o test/ckd_builtin-ckd.o `test -f 'test/ckd.c' || echo '$(srcdir)/'`test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/ckd_builtin-ckd.Tpo test/$(DEPDIR)/ckd_builtin-ckd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test/ckd.c' object='test/ckd_builtin-ckd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_builtin_CFLAGS) $(CFLAGS) -c -o test/ckd_builtin-ckd.o `test -f 'test/ckd.c' || echo '$(srcdir)/'`test/ckd.c + +test/ckd_builtin-ckd.obj: test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_builtin_CFLAGS) $(CFLAGS) -MT test/ckd_builtin-ckd.obj -MD -MP -MF test/$(DEPDIR)/ckd_builtin-ckd.Tpo -c -o test/ckd_builtin-ckd.obj `if test -f 'test/ckd.c'; then $(CYGPATH_W) 'test/ckd.c'; else $(CYGPATH_W) '$(srcdir)/test/ckd.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/ckd_builtin-ckd.Tpo test/$(DEPDIR)/ckd_builtin-ckd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test/ckd.c' object='test/ckd_builtin-ckd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_builtin_CFLAGS) $(CFLAGS) -c -o test/ckd_builtin-ckd.obj `if test -f 'test/ckd.c'; then $(CYGPATH_W) 'test/ckd.c'; else $(CYGPATH_W) '$(srcdir)/test/ckd.c'; fi` + +test/ckd_ckd-ckd.o: test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_ckd_CFLAGS) $(CFLAGS) -MT test/ckd_ckd-ckd.o -MD -MP -MF test/$(DEPDIR)/ckd_ckd-ckd.Tpo -c -o test/ckd_ckd-ckd.o `test -f 'test/ckd.c' || echo '$(srcdir)/'`test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/ckd_ckd-ckd.Tpo test/$(DEPDIR)/ckd_ckd-ckd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test/ckd.c' object='test/ckd_ckd-ckd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_ckd_CFLAGS) $(CFLAGS) -c -o test/ckd_ckd-ckd.o `test -f 'test/ckd.c' || echo '$(srcdir)/'`test/ckd.c + +test/ckd_ckd-ckd.obj: test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_ckd_CFLAGS) $(CFLAGS) -MT test/ckd_ckd-ckd.obj -MD -MP -MF test/$(DEPDIR)/ckd_ckd-ckd.Tpo -c -o test/ckd_ckd-ckd.obj `if test -f 'test/ckd.c'; then $(CYGPATH_W) 'test/ckd.c'; else $(CYGPATH_W) '$(srcdir)/test/ckd.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/ckd_ckd-ckd.Tpo test/$(DEPDIR)/ckd_ckd-ckd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test/ckd.c' object='test/ckd_ckd-ckd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_ckd_CFLAGS) $(CFLAGS) -c -o test/ckd_ckd-ckd.obj `if test -f 'test/ckd.c'; then $(CYGPATH_W) 'test/ckd.c'; else $(CYGPATH_W) '$(srcdir)/test/ckd.c'; fi` + +test/ckd_compat-ckd.o: test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_compat_CFLAGS) $(CFLAGS) -MT test/ckd_compat-ckd.o -MD -MP -MF test/$(DEPDIR)/ckd_compat-ckd.Tpo -c -o test/ckd_compat-ckd.o `test -f 'test/ckd.c' || echo '$(srcdir)/'`test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/ckd_compat-ckd.Tpo test/$(DEPDIR)/ckd_compat-ckd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test/ckd.c' object='test/ckd_compat-ckd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_compat_CFLAGS) $(CFLAGS) -c -o test/ckd_compat-ckd.o `test -f 'test/ckd.c' || echo '$(srcdir)/'`test/ckd.c + +test/ckd_compat-ckd.obj: test/ckd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_compat_CFLAGS) $(CFLAGS) -MT test/ckd_compat-ckd.obj -MD -MP -MF test/$(DEPDIR)/ckd_compat-ckd.Tpo -c -o test/ckd_compat-ckd.obj `if test -f 'test/ckd.c'; then $(CYGPATH_W) 'test/ckd.c'; else $(CYGPATH_W) '$(srcdir)/test/ckd.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/ckd_compat-ckd.Tpo test/$(DEPDIR)/ckd_compat-ckd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test/ckd.c' object='test/ckd_compat-ckd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ckd_compat_CFLAGS) $(CFLAGS) -c -o test/ckd_compat-ckd.obj `if test -f 'test/ckd.c'; then $(CYGPATH_W) 'test/ckd.c'; else $(CYGPATH_W) '$(srcdir)/test/ckd.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -1604,7 +1708,7 @@ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1645,6 +1749,27 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test_ckd_ckd.log: test_ckd_ckd$(EXEEXT) + @p='test_ckd_ckd$(EXEEXT)'; \ + b='test_ckd_ckd'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test_ckd_builtin.log: test_ckd_builtin$(EXEEXT) + @p='test_ckd_builtin$(EXEEXT)'; \ + b='test_ckd_builtin'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test_ckd_compat.log: test_ckd_compat$(EXEEXT) + @p='test_ckd_compat$(EXEEXT)'; \ + b='test_ckd_compat'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ @@ -1659,6 +1784,7 @@ @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -1697,15 +1823,14 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(pkglibdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-exec-am +install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1796,6 +1921,9 @@ -rm -f $(DEPDIR)/timespec_get.Plo -rm -f $(DEPDIR)/vasprintf.Plo -rm -f ./$(DEPDIR)/dummy.Plo + -rm -f test/$(DEPDIR)/ckd_builtin-ckd.Po + -rm -f test/$(DEPDIR)/ckd_ckd-ckd.Po + -rm -f test/$(DEPDIR)/ckd_compat-ckd.Po -rm -f test/$(DEPDIR)/strnstr.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -1891,6 +2019,9 @@ -rm -f $(DEPDIR)/timespec_get.Plo -rm -f $(DEPDIR)/vasprintf.Plo -rm -f ./$(DEPDIR)/dummy.Plo + -rm -f test/$(DEPDIR)/ckd_builtin-ckd.Po + -rm -f test/$(DEPDIR)/ckd_ckd-ckd.Po + -rm -f test/$(DEPDIR)/ckd_compat-ckd.Po -rm -f test/$(DEPDIR)/strnstr.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1910,8 +2041,7 @@ uninstall-am: uninstall-pkglibLTLIBRARIES -.MAKE: all check check-am install install-am install-exec \ - install-strip +.MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ check-am clean clean-checkPROGRAMS clean-generic clean-libtool \ diff -Nru vlc-3.0.21/compat/dummy.c vlc-3.0.22/compat/dummy.c --- vlc-3.0.21/compat/dummy.c 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/compat/dummy.c 2025-11-24 23:11:16.000000000 +0000 @@ -1 +1 @@ -/* Intentionally left empty */ +/* Automatically generated */ diff -Nru vlc-3.0.21/compat/recvmsg.c vlc-3.0.22/compat/recvmsg.c --- vlc-3.0.21/compat/recvmsg.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/compat/recvmsg.c 2025-11-13 22:17:54.000000000 +0000 @@ -74,11 +74,51 @@ return rcvd; } - switch (WSAGetLastError()) + int err = WSAGetLastError(); + switch (err) { case WSAEWOULDBLOCK: errno = EAGAIN; break; + case WSA_NOT_ENOUGH_MEMORY: + errno = ENOMEM; + break; + case WSAEAFNOSUPPORT: + errno = EAFNOSUPPORT; + break; + case WSAENOBUFS: + errno = ENOBUFS; + break; + case WSAEINPROGRESS: + errno = EINPROGRESS; + break; + case WSAEINTR: + errno = EINTR; + break; + case WSAEBADF: + errno = EBADF; + break; + case WSAEACCES: + errno = EACCES; + break; + case WSAEFAULT: + errno = EFAULT; + break; + case WSAEINVAL: + errno = EINVAL; + break; + case WSAEMFILE: + errno = EMFILE; + break; + case WSAEALREADY: + errno = EALREADY; + break; + case WSAECONNRESET: + errno = ECONNRESET; + break; + default: + errno = err; + break; } return -1; } diff -Nru vlc-3.0.21/compat/sendmsg.c vlc-3.0.22/compat/sendmsg.c --- vlc-3.0.21/compat/sendmsg.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/compat/sendmsg.c 2025-11-13 22:17:54.000000000 +0000 @@ -64,11 +64,51 @@ if (ret == 0) return sent; - switch (WSAGetLastError()) + int err = WSAGetLastError(); + switch (err) { case WSAEWOULDBLOCK: errno = EAGAIN; break; + case WSA_NOT_ENOUGH_MEMORY: + errno = ENOMEM; + break; + case WSAEAFNOSUPPORT: + errno = EAFNOSUPPORT; + break; + case WSAENOBUFS: + errno = ENOBUFS; + break; + case WSAEINPROGRESS: + errno = EINPROGRESS; + break; + case WSAEINTR: + errno = EINTR; + break; + case WSAEBADF: + errno = EBADF; + break; + case WSAEACCES: + errno = EACCES; + break; + case WSAEFAULT: + errno = EFAULT; + break; + case WSAEINVAL: + errno = EINVAL; + break; + case WSAEMFILE: + errno = EMFILE; + break; + case WSAEALREADY: + errno = EALREADY; + break; + case WSAECONNRESET: + errno = ECONNRESET; + break; + default: + errno = err; + break; } return -1; } diff -Nru vlc-3.0.21/compat/stdckdint/stdckdint.h vlc-3.0.22/compat/stdckdint/stdckdint.h --- vlc-3.0.21/compat/stdckdint/stdckdint.h 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/compat/stdckdint/stdckdint.h 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2024 Rémi Denis-Courmont + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + */ + +#ifndef __STDC_VERSION_STDCKDINT_H__ +# define __STDC_VERSION_STDCKDINT_H__ 202311L + +# if defined(__GNUC__) || defined(__clang__) +# define ckd_add(r, a, b) __builtin_add_overflow(a, b, r) +# define ckd_sub(r, a, b) __builtin_sub_overflow(a, b, r) +# define ckd_mul(r, a, b) __builtin_mul_overflow(a, b, r) +# else +# include + +# define __ckd_unsigned(suffix, type, MAX) \ +static inline _Bool __ckd_add_##suffix(type *r, type a, type b) \ +{ \ + *r = a + b; \ + return ((type)(a + b)) < a; \ +} \ +\ +static inline _Bool __ckd_sub_##suffix(type *r, type a, type b) \ +{ \ + *r = a - b; \ + return a < b; \ +} \ +\ +static inline _Bool __ckd_mul_##suffix(type *r, type a, type b) \ +{ \ + *r = a * b; \ + return b > 0 && a > (MAX / b); \ +} + +# define __ckd_signed_common(suffix, type, MIN, MAX) \ +static inline _Bool __ckd_add_##suffix(type *r, type a, type b) \ +{ \ + union suffix ua = { .v = a }; \ + union suffix ub = { .v = b }; \ + union suffix ur = { .uv = ua.uv + ub.uv }; \ + *r = ur.v; \ + if ((b > 0 && a > (MAX - b)) || (b < 0 && a < (MIN - b))) \ + return 1; \ + return 0; \ +} \ +\ +static inline _Bool __ckd_sub_##suffix(type *r, type a, type b) \ +{ \ + union suffix ua = { .v = a }; \ + union suffix ub = { .v = b }; \ + union suffix ur = { .uv = ua.uv - ub.uv }; \ + *r = ur.v; \ + if ((b < 0 && a > (MAX + b)) || (b > 0 && a < (MIN + b))) \ + return 1; \ + return 0; \ +} \ +\ +static inline _Bool __ckd_mul_##suffix(type *r, type a, type b) \ +{ \ + union suffix ua = { .v = a }; \ + union suffix ub = { .v = b }; \ + union suffix ur = { .uv = ua.uv * ub.uv }; \ + *r = ur.v; \ + if (a > 0) { \ + if (b > 0) { \ + if (a > (MAX / b)) return 1; \ + } else if (b < 0) { \ + if (b < (MIN / a)) return 1; \ + } \ + } else if (a < 0) { \ + if (b > 0) { \ + if (a < (MIN / b)) return 1; \ + } else if (b < 0) { \ + if (b < (MAX / a)) return 1; \ + } \ + } \ + return 0; \ +} + +# define __ckd_signed(suffix, type, MIN, MAX) \ +union suffix { \ + unsigned type uv; \ + type v; \ +}; \ +__ckd_signed_common(suffix, type, MIN, MAX) + +# define __ckd_signed_forced(suffix, type, MIN, MAX) \ +union suffix { \ + unsigned type uv; \ + signed type v; \ +}; \ +__ckd_signed_common(suffix, signed type, MIN, MAX) + +# define __ckd_func(op, r, a, b) \ + _Generic (*(r), \ + signed char: __ckd_##op##_sc((signed char *)(r), a, b), \ + short: __ckd_##op##_ss((short *)(r), a, b), \ + int: __ckd_##op##_si((int *)(r), a, b), \ + long: __ckd_##op##_sl((long *)(r), a, b), \ + long long: __ckd_##op##_sll((long long *)(r), a, b), \ + unsigned char: __ckd_##op##_uc((unsigned char *)(r), a, b), \ + unsigned short: __ckd_##op##_us((unsigned short *)(r), a, b), \ + unsigned int: __ckd_##op##_ui((unsigned int *)(r), a, b), \ + unsigned long: __ckd_##op##_ul((unsigned long *)(r), a, b), \ + unsigned long long: __ckd_##op##_ull((unsigned long long *)(r), a, b)) + +__ckd_unsigned(uc, unsigned char, UCHAR_MAX) +__ckd_unsigned(us, unsigned short, USHRT_MAX) +__ckd_unsigned(ui, unsigned int, UINT_MAX) +__ckd_unsigned(ul, unsigned long, ULONG_MAX) +__ckd_unsigned(ull, unsigned long long, ULLONG_MAX) + +__ckd_signed_forced(sc, char, SCHAR_MIN, SCHAR_MAX) +__ckd_signed(ss, short, SHRT_MIN, SHRT_MAX) +__ckd_signed(si, int, INT_MIN, INT_MAX) +__ckd_signed(sl, long, LONG_MIN, LONG_MAX) +__ckd_signed(sll, long long, LLONG_MIN, LLONG_MAX) + +# define ckd_add(r, a, b) __ckd_func(add, r, a, b) +# define ckd_sub(r, a, b) __ckd_func(sub, r, a, b) +# define ckd_mul(r, a, b) __ckd_func(mul, r, a, b) +# endif +#endif /* __STDC_VERSION_STDCKDINT_H__ */ diff -Nru vlc-3.0.21/compat/strverscmp.c vlc-3.0.22/compat/strverscmp.c --- vlc-3.0.21/compat/strverscmp.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/compat/strverscmp.c 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ /* Compare strings while treating digits characters numerically. Copyright (C) 1997, 2002, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Jean-Franois Bignolles , 1997. + Contributed by Jean-François Bignolles , 1997. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -18,6 +18,10 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include diff -Nru vlc-3.0.21/compat/test/ckd.c vlc-3.0.22/compat/test/ckd.c --- vlc-3.0.21/compat/test/ckd.c 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/compat/test/ckd.c 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,115 @@ +/***************************************************************************** + * stdckdint.h test case + ***************************************************************************** + * Copyright © 2025 VideoLabs, VLC authors and VideoLAN + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#undef NDEBUG +#include + +#if defined (TEST_CKD) +# ifdef HAVE_CKD +# include "../include/stdckdint.h" /* Force include on the compiler path */ +# else +# define SKIP /* can't test it */ +# endif +#elif defined (TEST_BUILTIN) +# if defined(__GNUC__) || defined(__clang__) +# undef __STDC_VERSION_STDCKDINT_H__ +# include "../stdckdint/stdckdint.h" /* Force include on the compat path */ +# else +# define SKIP /* can't test it */ +# endif +#elif defined (TEST_COMPAT) +# undef __STDC_VERSION_STDCKDINT_H__ +# undef __GNUC__ +# undef __clang__ +# include "../stdckdint/stdckdint.h" +#else +# error TEST_ not defined +#endif + +int main(void) +{ +#ifdef SKIP + return 77; +#else + unsigned long long ures; + long long res; + + /* multiplication */ + + /* zero */ + assert(!ckd_mul(&ures, 0, 0) && ures == 0); + assert(!ckd_mul(&ures, 0, 1) && ures == 0); + assert(!ckd_mul(&ures, 1, 0) && ures == 0); + + /* small cases */ + assert(!ckd_mul(&ures, 2, 3) && ures == 6); + assert(!ckd_mul(&res, -3, 3) && res == -9); + assert(!ckd_mul(&res, -3, -3) && res == 9); + + /* near positive overflow */ + assert(!ckd_mul(&res, LLONG_MAX, 1) && res == LLONG_MAX); + assert(!ckd_mul(&res, LLONG_MAX / 2, 2) && res == LLONG_MAX / 2 * 2); + assert(ckd_mul(&res, LLONG_MAX, 2) && res == -2); + assert(!ckd_mul(&res, LLONG_MAX, -1) && res == -LLONG_MAX); + + /* near negative overflow */ + assert(!ckd_mul(&res, LLONG_MIN, 1) && res == LLONG_MIN); + assert(ckd_mul(&res, LLONG_MIN, -1) && res == LLONG_MIN); + + /* additions */ + + /* small cases */ + assert(!ckd_add(&ures, 0, 0) && ures == 0); + assert(!ckd_add(&ures, 0, 1) && ures == 1); + assert(!ckd_add(&ures, 1, 0) && ures == 1); + assert(!ckd_add(&ures, 1, 1) && ures == 2); + + /* big edge cases */ + assert(!ckd_add(&ures, ULLONG_MAX, 0ULL) && ures == ULLONG_MAX); + assert(!ckd_add(&ures, ULLONG_MAX - 1ULL, 1ULL) && ures == ULLONG_MAX); + assert(ckd_add(&ures, ULLONG_MAX, 1ULL) && ures == 0); + assert(ckd_add(&res, LLONG_MAX, 1ULL) && res == LLONG_MIN); + + /* subtractions */ + + /* small cases */ + assert(!ckd_sub(&ures, 0, 0) && ures == 0); + assert(!ckd_sub(&ures, 1, 0) && ures == 1); + assert(!ckd_sub(&ures, 1, 1) && ures == 0); + + /* 0 - 1 */ + assert(ckd_sub(&ures, 0, 1) && ures == ULLONG_MAX); + assert(!ckd_sub(&res, 0, 1) && res == -1); + + /* edge cases: */ + assert(!ckd_sub(&ures, ULLONG_MAX, 0) && ures == ULLONG_MAX); + assert(!ckd_sub(&ures, ULLONG_MAX, 1) && ures == ULLONG_MAX - 1ULL); + assert(ckd_sub(&ures, 0ULL, ULLONG_MAX) && ures == 1); + assert(ckd_sub(&ures, 2, 3) && ures == ULLONG_MAX); + assert(ckd_sub(&res, LLONG_MIN, 1) && res == LLONG_MAX); + + return 0; +#endif +} diff -Nru vlc-3.0.21/config.h.in vlc-3.0.22/config.h.in --- vlc-3.0.21/config.h.in 2024-06-05 16:02:46.000000000 +0000 +++ vlc-3.0.22/config.h.in 2025-11-24 23:10:30.000000000 +0000 @@ -94,6 +94,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ALTIVEC_H +/* Define to 1 if you have the header file. */ +#undef HAVE_AMF_COMPONENTS_FRC_H + /* Define to 1 if you have the header file. */ #undef HAVE_AMF_COMPONENTS_HQSCALER_H @@ -106,6 +109,9 @@ /* AMD VQ Enhancer supported */ #undef HAVE_AMF_ENHANCER +/* AMD Frame Rate Conversion supported */ +#undef HAVE_AMF_FRC + /* AMD HQScaler supported */ #undef HAVE_AMF_SCALER @@ -222,7 +228,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FEATURES_H -/* Define to 1 if you have the `ffsll' function. */ +/* Define to 1 if you have ffsll function */ #undef HAVE_FFSLL /* Define to 1 if you have the `flock' function. */ @@ -234,9 +240,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FLUIDLITE_H -/* Define to 1 if you have the header file. */ -#undef HAVE_FONTCONFIG_FONTCONFIG_H - /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -342,9 +345,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBAVCODEC_DXVA2_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBAVCODEC_VAAPI_H - /* Define to 1 if you have the header file. */ #undef HAVE_LIBAVFORMAT_AVFORMAT_H @@ -375,9 +375,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBSWSCALE_SWSCALE_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBTAR_H - /* Define to 1 if you have the libvorbis */ #undef HAVE_LIBVORBIS @@ -417,12 +414,12 @@ /* Define to 1 if you have the `memalign' function. */ #undef HAVE_MEMALIGN +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + /* Define to 1 if you have the `memrchr' function. */ #undef HAVE_MEMRCHR -/* Define to 1 if you have the header file. */ -#undef HAVE_MINIX_CONFIG_H - /* Define to 1 if you have the `mkostemp' function. */ #undef HAVE_MKOSTEMP @@ -553,9 +550,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_STDIO_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -626,7 +620,7 @@ /* Define to 1 if you have the `strverscmp' function. */ #undef HAVE_STRVERSCMP -/* Define to 1 if you have the `swab' function. */ +/* Define to 1 if you have swab function */ #undef HAVE_SWAB /* Define to 1 if you have the header file. */ @@ -707,9 +701,6 @@ /* Define to 1 if you have the `vmsplice' function. */ #undef HAVE_VMSPLICE -/* Define to 1 if you have the header file. */ -#undef HAVE_WCHAR_H - /* Define to 1 if you have the header file. */ #undef HAVE_X11_XLIB_H @@ -773,9 +764,7 @@ /* version revision number */ #undef PACKAGE_VERSION_REVISION -/* Define to 1 if all of the C90 standard headers exist (not just the ones - required in a freestanding environment). This macro is provided for - backward compatibility; new code need not use it. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Define to 1 for Unicode (Wide Chars) APIs. */ @@ -785,87 +774,21 @@ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif -/* Enable general extensions on macOS. */ -#ifndef _DARWIN_C_SOURCE -# undef _DARWIN_C_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable X/Open compliant socket functions that do not require linking - with -lxnet on HP-UX 11.11. */ -#ifndef _HPUX_ALT_XOPEN_SOCKET_API -# undef _HPUX_ALT_XOPEN_SOCKET_API -#endif -/* Identify the host operating system as Minix. - This macro does not affect the system headers' behavior. - A future release of Autoconf may stop defining this macro. */ -#ifndef _MINIX -# undef _MINIX -#endif -/* Enable general extensions on NetBSD. - Enable NetBSD compatibility extensions on Minix. */ -#ifndef _NETBSD_SOURCE -# undef _NETBSD_SOURCE -#endif -/* Enable OpenBSD compatibility extensions on NetBSD. - Oddly enough, this does nothing on OpenBSD. */ -#ifndef _OPENBSD_SOURCE -# undef _OPENBSD_SOURCE -#endif -/* Define to 1 if needed for POSIX-compatible behavior. */ -#ifndef _POSIX_SOURCE -# undef _POSIX_SOURCE -#endif -/* Define to 2 if needed for POSIX-compatible behavior. */ -#ifndef _POSIX_1_SOURCE -# undef _POSIX_1_SOURCE -#endif -/* Enable POSIX-compatible threading on Solaris. */ +/* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif -/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ -#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ -# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ -#endif -/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ -#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ -# undef __STDC_WANT_IEC_60559_BFP_EXT__ -#endif -/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ -#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ -# undef __STDC_WANT_IEC_60559_DFP_EXT__ -#endif -/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ -#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ -# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ -#endif -/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ -#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ -# undef __STDC_WANT_IEC_60559_TYPES_EXT__ -#endif -/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ -#ifndef __STDC_WANT_LIB_EXT2__ -# undef __STDC_WANT_LIB_EXT2__ -#endif -/* Enable extensions specified by ISO/IEC 24747:2009. */ -#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ -# undef __STDC_WANT_MATH_SPEC_FUNCS__ -#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable X/Open extensions. Define to 500 only if necessary - to make mbstate_t available. */ -#ifndef _XOPEN_SOURCE -# undef _XOPEN_SOURCE +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ #endif @@ -927,6 +850,13 @@ /* Extensions to ISO C89 from ISO C99. */ #undef _ISOC99_SOURCE +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + /* IEEE Std 1003.1. */ #undef _POSIX_C_SOURCE @@ -971,15 +901,14 @@ /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is - supported only directly. */ + supported directly. */ #undef restrict -/* Work around a bug in older versions of Sun C++, which did not - #define __restrict__ or support _Restrict or __restrict__ - even though the corresponding Sun C compiler ended up with - "#define restrict _Restrict" or "#define restrict __restrict__" - in the previous line. This workaround can be removed once - we assume Oracle Developer Studio 12.5 (2016) or later. */ -#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ +#if defined __SUNPRO_CC && !defined __RESTRICT # define _Restrict # define __restrict__ #endif diff -Nru vlc-3.0.21/configure vlc-3.0.22/configure --- vlc-3.0.21/configure 2024-06-05 16:02:21.000000000 +0000 +++ vlc-3.0.22/configure 2025-11-24 23:10:29.000000000 +0000 @@ -1,12 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for vlc 3.0.21. +# Generated by GNU Autoconf 2.69 for vlc 3.0.22. # -# Copyright 1999-2024 VLC authors and VideoLAN +# Copyright 1999-2025 VLC authors and VideoLAN # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -17,16 +16,14 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -36,46 +33,46 @@ fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -84,6 +81,13 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -92,12 +96,8 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -109,10 +109,30 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -134,22 +154,20 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop +else case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -169,15 +187,12 @@ as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ) -then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -else \$as_nop +else exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 -blah=\$(echo \$(echo blah)) -test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO @@ -192,38 +207,30 @@ PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null -then : + if (eval "$as_required") 2>/dev/null; then : as_have_required=yes -else $as_nop +else as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null -then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -else $as_nop +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir$as_base + as_shell=$as_dir/$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : CONFIG_SHELL=$as_shell as_have_required=yes - if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -then : + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : break 2 fi fi @@ -231,21 +238,14 @@ esac as_found=false done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : CONFIG_SHELL=$SHELL as_have_required=yes -fi -fi +fi; } +IFS=$as_save_IFS - if test "x$CONFIG_SHELL" != x -then : + if test "x$CONFIG_SHELL" != x; then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -263,19 +263,18 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno -then : - printf "%s\n" "$0: This script requires a shell more modern than all" - printf "%s\n" "$0: the shells that I found on your system." - if test ${ZSH_VERSION+y} ; then - printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" - printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -302,7 +301,6 @@ } as_unset=as_fn_unset - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -320,14 +318,6 @@ as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -342,7 +332,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -351,7 +341,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -390,13 +380,12 @@ # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -408,27 +397,18 @@ # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -440,9 +420,9 @@ as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -469,7 +449,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -513,7 +493,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -527,10 +507,6 @@ exit } - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -544,13 +520,6 @@ ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -620,8 +589,8 @@ # Identity of this package. PACKAGE_NAME='vlc' PACKAGE_TARNAME='vlc' -PACKAGE_VERSION='3.0.21' -PACKAGE_STRING='vlc 3.0.21' +PACKAGE_VERSION='3.0.22' +PACKAGE_STRING='vlc 3.0.22' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -629,36 +598,40 @@ ac_config_libobj_dir=compat # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_STDIO_H -# include +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include #endif -#ifdef HAVE_STDLIB_H +#ifdef STDC_HEADERS # include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif #endif #ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif #ifdef HAVE_UNISTD_H # include #endif" -ac_header_c_list= gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE @@ -915,6 +888,11 @@ LTLIBsvg HAVE_SAPI_FALSE HAVE_SAPI_TRUE +LIBS_libass +CPPFLAGS_libass +LTLIBlibass +LIBASS_LIBS +LIBASS_CFLAGS HAVE_HARFBUZZ_FALSE HAVE_HARFBUZZ_TRUE HAVE_FRIBIDI_FALSE @@ -1014,11 +992,6 @@ LTLIBaribsub ARIBB24_LIBS ARIBB24_CFLAGS -LIBS_libass -CPPFLAGS_libass -LTLIBlibass -LIBASS_LIBS -LIBASS_CFLAGS LTLIBtelx LTLIBzvbi ZVBI_LIBS @@ -1321,6 +1294,8 @@ HAVE_DECKLINK_TRUE CPPFLAGS_decklinkoutput CPPFLAGS_decklink +HAVE_AMF_FRC_FALSE +HAVE_AMF_FRC_TRUE HAVE_AMF_ENHANCER_FALSE HAVE_AMF_ENHANCER_TRUE HAVE_AMF_SCALER_FALSE @@ -1439,6 +1414,9 @@ HAVE_MMXEXT_TRUE HAVE_MMX_FALSE HAVE_MMX_TRUE +LIBEXECINFO +WIXPATH +WIN32_PATH_CMD SYMBOLIC_LDFLAGS SOCKET_LIBS HAVE_SYSTEMD_FALSE @@ -1463,6 +1441,8 @@ PKG_CONFIG_PATH HAVE_SYSLOG_FALSE HAVE_SYSLOG_TRUE +HAVE_STDCKDINT_FALSE +HAVE_STDCKDINT_TRUE LIBRT LIBPTHREAD LIBDL @@ -1506,7 +1486,6 @@ RANLIB ac_ct_AR AR -FILECMD LN_S NM ac_ct_DUMPBIN @@ -1555,6 +1534,7 @@ PROGRAMFILES WINDOWS_ARCH U2D +PACKAGE_DIR OBJCOPY WINDRES LIBS_libvlccore @@ -1573,21 +1553,21 @@ CCASDEPMODE CCASFLAGS CCAS -EGREP -GREP am__fastdepOBJC_FALSE am__fastdepOBJC_TRUE OBJCDEPMODE ac_ct_OBJC OBJCFLAGS OBJC -CPP am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE ac_ct_CXX CXXFLAGS CXX +EGREP +GREP +CPP am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -1613,9 +1593,6 @@ AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -CSCOPE -ETAGS -CTAGS am__untar am__tar AMTAR @@ -1697,6 +1674,7 @@ with_binary_version with_macosx_sdk with_macosx_version_min +with_packagedir enable_winstore_app enable_pdb with_contrib @@ -1720,6 +1698,7 @@ enable_coverage with_sanitizer enable_optimizations +with_wix enable_mmx enable_sse enable_neon @@ -1748,6 +1727,7 @@ enable_v4l2 enable_amf_scaler enable_amf_enhancer +enable_amf_frc enable_decklink with_decklink_sdk enable_vcd @@ -1816,7 +1796,6 @@ enable_fluidlite enable_zvbi enable_telx -enable_libass enable_aribsub enable_aribb25 enable_kate @@ -1837,6 +1816,7 @@ with_default_monospace_font with_default_font_family with_default_monospace_font_family +enable_libass enable_svg enable_svgdec enable_directx @@ -1860,7 +1840,6 @@ enable_chromecast enable_qt enable_skins2 -enable_libtar enable_macosx enable_sparkle with_breakpad @@ -1897,10 +1876,10 @@ LDFLAGS LIBS CPPFLAGS +CPP CXX CXXFLAGS CCC -CPP OBJC OBJCFLAGS CCAS @@ -2051,8 +2030,6 @@ FLUIDLITE_LIBS ZVBI_CFLAGS ZVBI_LIBS -LIBASS_CFLAGS -LIBASS_LIBS ARIBB24_CFLAGS ARIBB24_LIBS ARIBB25_CFLAGS @@ -2098,6 +2075,8 @@ FRIBIDI_LIBS HARFBUZZ_CFLAGS HARFBUZZ_LIBS +LIBASS_CFLAGS +LIBASS_LIBS SVG_CFLAGS SVG_LIBS SVGDEC_CFLAGS @@ -2238,6 +2217,8 @@ *) ac_optarg=yes ;; esac + # Accept the important Cygnus configure options, so we can diagnose typos. + case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -2278,9 +2259,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -2304,9 +2285,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -2517,9 +2498,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -2533,9 +2514,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -2579,9 +2560,9 @@ *) # FIXME: should be removed in autoconf 3.0. - printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -2597,7 +2578,7 @@ case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -2661,7 +2642,7 @@ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_myself" | +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -2718,7 +2699,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.21 to adapt to many kinds of systems. +\`configure' configures vlc 3.0.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2793,7 +2774,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vlc 3.0.21:";; + short | recursive ) echo "Configuration of vlc 3.0.22:";; esac cat <<\_ACEOF @@ -2818,6 +2799,8 @@ --with-macosx-sdk=DIR compile using the SDK in DIR --with-macosx-version-min=VERSION compile for Mac OS X VERSION and above + --with-packagedir=DIR output the packaged VLC files in DIR (default + vlc-$PACKAGE_VERSION) --enable-winstore-app Build targetted for Windows Store apps (default disabled) --enable-pdb Build PDB files for windows targets (default off) @@ -2855,6 +2838,8 @@ --with-sanitizer=(address/memory/undefined/thread) build with sanitizer flags (default disabled) --disable-optimizations disable compiler optimizations (default enabled) + --with-wix=DIR location of WIX binary (default: contribs) + --disable-mmx disable MMX optimizations (default auto) --disable-sse disable SSE (1-4) optimizations (default auto) --disable-neon disable NEON optimizations (default auto) @@ -2890,6 +2875,7 @@ --disable-v4l2 disable Video4Linux version 2 (default auto) --disable-amf-scaler disable AMD Scaler API (default auto) --disable-amf-enhancer disable AMD Enhancer API (default auto) + --disable-amf-frc disable AMD FRC (default auto) --disable-decklink disable Blackmagic DeckLink SDI input (default auto) --with-decklink-sdk=DIR, location of Blackmagic DeckLink SDI SDK) @@ -2937,12 +2923,12 @@ --enable-vpx libvpx VP8/VP9 encoder and decoder (default auto) --enable-twolame MPEG Audio Layer 2 encoder [default=auto] --enable-fdkaac FDK-AAC encoder [default=disabled] - --enable-a52 A/52 support with liba52 (default enabled) + --enable-a52 A/52 support with liba52 (default disabled) --with-a52=PATH a52 headers and libraries --enable-dca DTS Coherent Acoustics support with libdca - [default=auto] + [default=disabled] --enable-flac libflac decoder/encoder support [default=auto] - --enable-libmpeg2 libmpeg2 decoder support [default=auto] + --enable-libmpeg2 libmpeg2 decoder support [default=disabled] --enable-vorbis Vorbis decoder and encoder [default=auto] --enable-tremor Tremor decoder support (default disabled) --enable-speex Speex support [default=auto] @@ -2969,7 +2955,6 @@ (default enabled) --enable-telx Teletext decoding module (conflicting with zvbi) (default enabled if zvbi is absent) - --enable-libass Subtitle support using libass (default enabled) --enable-aribsub ARIB Subtitles support (default enabled) --enable-aribb25 ARIB STD-B25 [default=auto] --enable-kate kate codec [default=auto] @@ -2995,6 +2980,7 @@ Path to the default font family --with-default-monospace-font-family=NAME Path to the default font family + --enable-libass Subtitle support using libass (default enabled) --enable-svg SVG rendering library [default=auto] --enable-svgdec SVG image decoder library [default=auto] --enable-directx Microsoft DirectX support (default enabled on @@ -3029,7 +3015,6 @@ --disable-qt Qt UI support (default enabled) --enable-skins2 skins interface module (default auto) - --enable-libtar libtar support for skins2 (default auto) --enable-macosx Mac OS X gui support (default enabled on Mac OS X) --enable-sparkle Sparkle update support for OS X (default enabled on Mac OS X) --with-breakpad=URL Enable Breakpad reporter using given URL @@ -3071,9 +3056,9 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags - CPP C preprocessor OBJC Objective C compiler command OBJCFLAGS Objective C compiler flags CCAS assembler compiler command (defaults to CC) @@ -3309,9 +3294,6 @@ linker flags for FLUIDLITE, overriding pkg-config ZVBI_CFLAGS C compiler flags for ZVBI, overriding pkg-config ZVBI_LIBS linker flags for ZVBI, overriding pkg-config - LIBASS_CFLAGS - C compiler flags for LIBASS, overriding pkg-config - LIBASS_LIBS linker flags for LIBASS, overriding pkg-config ARIBB24_CFLAGS C compiler flags for ARIBB24, overriding pkg-config ARIBB24_LIBS @@ -3388,6 +3370,9 @@ C compiler flags for HARFBUZZ, overriding pkg-config HARFBUZZ_LIBS linker flags for HARFBUZZ, overriding pkg-config + LIBASS_CFLAGS + C compiler flags for LIBASS, overriding pkg-config + LIBASS_LIBS linker flags for LIBASS, overriding pkg-config SVG_CFLAGS C compiler flags for SVG, overriding pkg-config SVG_LIBS linker flags for SVG, overriding pkg-config SVGDEC_CFLAGS @@ -3511,9 +3496,9 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -3541,8 +3526,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. + # Check for guested configure. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -3550,7 +3534,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -3559,14 +3543,14 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vlc configure 3.0.21 -generated by GNU Autoconf 2.71 +vlc configure 3.0.22 +generated by GNU Autoconf 2.69 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 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-2024 VLC authors and VideoLAN +Copyright 1999-2025 VLC authors and VideoLAN _ACEOF exit fi @@ -3581,14 +3565,14 @@ ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3596,15 +3580,14 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3614,6 +3597,172 @@ } # ac_fn_c_try_compile +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -3621,28 +3770,26 @@ ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -3653,14 +3800,14 @@ ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3668,15 +3815,14 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3686,58 +3832,20 @@ } # ac_fn_cxx_try_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - } -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - # ac_fn_objc_try_compile LINENO # ----------------------------- # Try to compile conftest.$ac_ext, and return whether this succeeded. ac_fn_objc_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3745,15 +3853,14 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_objc_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3769,14 +3876,14 @@ ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + rm -f conftest.$ac_objext conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3784,18 +3891,17 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3816,12 +3922,11 @@ ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -3829,9 +3934,16 @@ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif -#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -3849,25 +3961,24 @@ #endif int -main (void) +main () { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -3884,7 +3995,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3892,15 +4003,14 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3916,14 +4026,14 @@ ac_fn_cxx_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + rm -f conftest.$ac_objext conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3931,18 +4041,17 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3957,71 +4066,25 @@ } # ac_fn_cxx_try_link -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that -# executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR -# ------------------------------------------------------------------ +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. -ac_fn_check_decl () +# accordingly. +ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -printf %s "checking whether $as_decl_name is declared... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - eval ac_save_FLAGS=\$$6 - as_fn_append $6 " $5" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { #ifndef $as_decl_name #ifdef __cplusplus @@ -4035,22 +4098,19 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - eval $6=\$ac_save_FLAGS - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_check_decl +} # ac_fn_c_check_decl # ac_fn_c_check_type LINENO TYPE VAR INCLUDES # ------------------------------------------- @@ -4059,18 +4119,17 @@ ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof ($2)) return 0; @@ -4078,13 +4137,12 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof (($2))) return 0; @@ -4092,55 +4150,108 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type -# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES +# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES # --------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_cxx_check_header_compile () +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_cxx_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - eval "$3=yes" -else $as_nop - eval "$3=no" +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_cxx_check_header_compile +} # ac_fn_cxx_check_header_mongrel # ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES # --------------------------------------------- @@ -4149,18 +4260,17 @@ ac_fn_cxx_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof ($2)) return 0; @@ -4168,13 +4278,12 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof (($2))) return 0; @@ -4182,50 +4291,29 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : -else $as_nop +else eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_type -ac_configure_args_raw= -for ac_arg -do - case $ac_arg in - *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_configure_args_raw " '$ac_arg'" -done - -case $ac_configure_args_raw in - *$as_nl*) - ac_safe_unquote= ;; - *) - ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. - ac_unsafe_a="$ac_unsafe_z#~" - ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" - ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; -esac - cat >config.log <<_ACEOF 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.21, which was -generated by GNU Autoconf 2.71. Invocation command line was +It was created by vlc $as_me 3.0.22, which was +generated by GNU Autoconf 2.69. Invocation command line was - $ $0$ac_configure_args_raw + $ $0 $@ _ACEOF exec 5>>config.log @@ -4258,12 +4346,8 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - printf "%s\n" "PATH: $as_dir" + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -4298,7 +4382,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -4333,13 +4417,11 @@ # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? - # Sanitize IFS. - IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - printf "%s\n" "## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -4350,8 +4432,8 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -4375,7 +4457,7 @@ ) echo - printf "%s\n" "## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -4383,14 +4465,14 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - printf "%s\n" "## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -4398,15 +4480,15 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - printf "%s\n" "## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -4414,8 +4496,8 @@ echo fi test "$ac_signal" != 0 && - printf "%s\n" "$as_me: caught signal $ac_signal" - printf "%s\n" "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -4429,48 +4511,63 @@ # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -printf "%s\n" "/* confdefs.h */" > confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF -printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_files="$CONFIG_SITE" + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then - ac_site_files="$prefix/share/config.site $prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi - -for ac_site_file in $ac_site_files +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - case $ac_site_file in #( - */*) : - ;; #( - *) : - ac_site_file=./$ac_site_file ;; -esac - if test -f "$ac_site_file" && test -r "$ac_site_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -4480,653 +4577,20 @@ # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Test code for whether the C compiler supports C89 (global declarations) -ac_c_conftest_c89_globals=' -/* Does the compiler advertise C89 conformance? - Do not test the value of __STDC__, because some compilers set it to 0 - while being otherwise adequately conformant. */ -#if !defined __STDC__ -# error "Compiler does not advertise C89 conformance" -#endif - -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ -struct buf { int x; }; -struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not \xHH hex character constants. - These do not provoke an error unfortunately, instead are silently treated - as an "x". The following induces an error, until -std is added to get - proper ANSI mode. Curiously \x00 != x always comes out true, for an - array size at least. It is necessary to write \x00 == 0 to get something - that is true only with -std. */ -int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) '\''x'\'' -int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), - int, int);' - -# Test code for whether the C compiler supports C89 (body of main). -ac_c_conftest_c89_main=' -ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); -' - -# Test code for whether the C compiler supports C99 (global declarations) -ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L -# error "Compiler does not advertise C99 conformance" -#endif - -#include -extern int puts (const char *); -extern int printf (const char *, ...); -extern int dprintf (int, const char *, ...); -extern void *malloc (size_t); - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -// dprintf is used instead of fprintf to avoid needing to declare -// FILE and stderr. -#define debug(...) dprintf (2, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - #error "your preprocessor is broken" -#endif -#if BIG_OK -#else - #error "your preprocessor is broken" -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static bool -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str = ""; - int number = 0; - float fnumber = 0; - - while (*format) - { - switch (*format++) - { - case '\''s'\'': // string - str = va_arg (args_copy, const char *); - break; - case '\''d'\'': // int - number = va_arg (args_copy, int); - break; - case '\''f'\'': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); - - return *str && number && fnumber; -} -' - -# Test code for whether the C compiler supports C99 (body of main). -ac_c_conftest_c99_main=' - // Check bool. - _Bool success = false; - success |= (argc != 0); - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[0] = argv[0][0]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || dynamic_array[ni.number - 1] != 543); -' - -# Test code for whether the C compiler supports C11 (global declarations) -ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L -# error "Compiler does not advertise C11 conformance" -#endif - -// Check _Alignas. -char _Alignas (double) aligned_as_double; -char _Alignas (0) no_special_alignment; -extern char aligned_as_int; -char _Alignas (0) _Alignas (int) aligned_as_int; - -// Check _Alignof. -enum -{ - int_alignment = _Alignof (int), - int_array_alignment = _Alignof (int[100]), - char_alignment = _Alignof (char) -}; -_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); - -// Check _Noreturn. -int _Noreturn does_not_return (void) { for (;;) continue; } - -// Check _Static_assert. -struct test_static_assert -{ - int x; - _Static_assert (sizeof (int) <= sizeof (long int), - "_Static_assert does not work in struct"); - long int y; -}; - -// Check UTF-8 literals. -#define u8 syntax error! -char const utf8_literal[] = u8"happens to be ASCII" "another string"; - -// Check duplicate typedefs. -typedef long *long_ptr; -typedef long int *long_ptr; -typedef long_ptr long_ptr; - -// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. -struct anonymous -{ - union { - struct { int i; int j; }; - struct { int k; long int l; } w; - }; - int m; -} v1; -' - -# Test code for whether the C compiler supports C11 (body of main). -ac_c_conftest_c11_main=' - _Static_assert ((offsetof (struct anonymous, i) - == offsetof (struct anonymous, w.k)), - "Anonymous union alignment botch"); - v1.i = 2; - v1.w.k = 5; - ok |= v1.i != 5; -' - -# Test code for whether the C compiler supports C11 (complete). -ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} -${ac_c_conftest_c11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - ${ac_c_conftest_c11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C99 (complete). -ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - return ok; -} -" - -# Test code for whether the C compiler supports C89 (complete). -ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - return ok; -} -" - -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" -as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" -as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" -as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" -as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" -as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" -as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" -as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" -as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" -as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" -as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" -# Test code for whether the C++ compiler supports C++98 (global declarations) -ac_cxx_conftest_cxx98_globals=' -// Does the compiler advertise C++98 conformance? -#if !defined __cplusplus || __cplusplus < 199711L -# error "Compiler does not advertise C++98 conformance" -#endif - -// These inclusions are to reject old compilers that -// lack the unsuffixed header files. -#include -#include - -// and are *not* freestanding headers in C++98. -extern void assert (int); -namespace std { - extern int strcmp (const char *, const char *); -} - -// Namespaces, exceptions, and templates were all added after "C++ 2.0". -using std::exception; -using std::strcmp; - -namespace { - -void test_exception_syntax() -{ - try { - throw "test"; - } catch (const char *s) { - // Extra parentheses suppress a warning when building autoconf itself, - // due to lint rules shared with more typical C programs. - assert (!(strcmp) (s, "test")); - } -} - -template struct test_template -{ - T const val; - explicit test_template(T t) : val(t) {} - template T add(U u) { return static_cast(u) + val; } -}; - -} // anonymous namespace -' - -# Test code for whether the C++ compiler supports C++98 (body of main) -ac_cxx_conftest_cxx98_main=' - assert (argc); - assert (! argv[0]); -{ - test_exception_syntax (); - test_template tt (2.0); - assert (tt.add (4) == 6.0); - assert (true && !false); -} -' - -# Test code for whether the C++ compiler supports C++11 (global declarations) -ac_cxx_conftest_cxx11_globals=' -// Does the compiler advertise C++ 2011 conformance? -#if !defined __cplusplus || __cplusplus < 201103L -# error "Compiler does not advertise C++11 conformance" -#endif - -namespace cxx11test -{ - constexpr int get_val() { return 20; } - - struct testinit - { - int i; - double d; - }; - - class delegate - { - public: - delegate(int n) : n(n) {} - delegate(): delegate(2354) {} - - virtual int getval() { return this->n; }; - protected: - int n; - }; - - class overridden : public delegate - { - public: - overridden(int n): delegate(n) {} - virtual int getval() override final { return this->n * 2; } - }; - - class nocopy - { - public: - nocopy(int i): i(i) {} - nocopy() = default; - nocopy(const nocopy&) = delete; - nocopy & operator=(const nocopy&) = delete; - private: - int i; - }; - - // for testing lambda expressions - template Ret eval(Fn f, Ret v) - { - return f(v); - } - - // for testing variadic templates and trailing return types - template auto sum(V first) -> V - { - return first; - } - template auto sum(V first, Args... rest) -> V - { - return first + sum(rest...); - } -} -' - -# Test code for whether the C++ compiler supports C++11 (body of main) -ac_cxx_conftest_cxx11_main=' -{ - // Test auto and decltype - auto a1 = 6538; - auto a2 = 48573953.4; - auto a3 = "String literal"; - - int total = 0; - for (auto i = a3; *i; ++i) { total += *i; } - - decltype(a2) a4 = 34895.034; -} -{ - // Test constexpr - short sa[cxx11test::get_val()] = { 0 }; -} -{ - // Test initializer lists - cxx11test::testinit il = { 4323, 435234.23544 }; -} -{ - // Test range-based for - int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, - 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; - for (auto &x : array) { x += 23; } -} -{ - // Test lambda expressions - using cxx11test::eval; - assert (eval ([](int x) { return x*2; }, 21) == 42); - double d = 2.0; - assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); - assert (d == 5.0); - assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); - assert (d == 5.0); -} -{ - // Test use of variadic templates - using cxx11test::sum; - auto a = sum(1); - auto b = sum(1, 2); - auto c = sum(1.0, 2.0, 3.0); -} -{ - // Test constructor delegation - cxx11test::delegate d1; - cxx11test::delegate d2(); - cxx11test::delegate d3(45); -} -{ - // Test override and final - cxx11test::overridden o1(55464); -} -{ - // Test nullptr - char *c = nullptr; -} -{ - // Test template brackets - test_template<::test_template> v(test_template(12)); -} -{ - // Unicode literals - char const *utf8 = u8"UTF-8 string \u2500"; - char16_t const *utf16 = u"UTF-8 string \u2500"; - char32_t const *utf32 = U"UTF-32 string \u2500"; -} -' - -# Test code for whether the C compiler supports C++11 (complete). -ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} -${ac_cxx_conftest_cxx11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - ${ac_cxx_conftest_cxx11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C++98 (complete). -ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - return ok; -} -" - gt_needs="$gt_needs need-formatstring-macros" - -# Auxiliary files required by this configure script. -ac_aux_files="config.rpath ltmain.sh compile missing install-sh config.guess config.sub" - -# Locations in which to look for auxiliary files. -ac_aux_dir_candidates="${srcdir}/autotools" - -# Search for a directory containing all of the required auxiliary files, -# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. -# If we don't find one directory that contains all the files we need, -# we report the set of missing files from the *first* directory in -# $ac_aux_dir_candidates and give up. -ac_missing_aux_files="" -ac_first_candidate=: -printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in $ac_aux_dir_candidates -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: - - printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 - ac_aux_dir_found=yes - ac_install_sh= - for ac_aux in $ac_aux_files - do - # As a special case, if "install-sh" is required, that requirement - # can be satisfied by any of "install-sh", "install.sh", or "shtool", - # and $ac_install_sh is set appropriately for whichever one is found. - if test x"$ac_aux" = x"install-sh" - then - if test -f "${as_dir}install-sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 - ac_install_sh="${as_dir}install-sh -c" - elif test -f "${as_dir}install.sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 - ac_install_sh="${as_dir}install.sh -c" - elif test -f "${as_dir}shtool"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 - ac_install_sh="${as_dir}shtool install -c" - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} install-sh" - else - break - fi - fi - else - if test -f "${as_dir}${ac_aux}"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" - else - break - fi - fi - fi - done - if test "$ac_aux_dir_found" = yes; then - ac_aux_dir="$as_dir" - break - fi - ac_first_candidate=false - - as_found=false -done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 -fi - - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -if test -f "${ac_aux_dir}config.guess"; then - ac_config_guess="$SHELL ${ac_aux_dir}config.guess" -fi -if test -f "${ac_aux_dir}config.sub"; then - ac_config_sub="$SHELL ${ac_aux_dir}config.sub" -fi -if test -f "$ac_aux_dir/configure"; then - ac_configure="$SHELL ${ac_aux_dir}configure" -fi - # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -5137,12 +4601,12 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -5151,24 +4615,24 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -5178,12 +4642,11 @@ fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' - and start over" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -5198,7 +4661,7 @@ VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=21 +VERSION_REVISION=22 VERSION_EXTRA=0 VERSION_DEV= @@ -5207,36 +4670,60 @@ CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Vetinari" -COPYRIGHT_YEARS="1996-2024" - +COPYRIGHT_YEARS="1996-2025" +ac_aux_dir= +for ac_dir in autotools "$srcdir"/autotools; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5 +fi +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # Make sure we can run config.sub. -$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -printf %s "checking build system type... " >&6; } -if test ${ac_cv_build+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf "%s\n" "$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -5255,22 +4742,21 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -printf %s "checking host system type... " >&6; } -if test ${ac_cv_host+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf "%s\n" "$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -5295,8 +4781,7 @@ am__api_version='1.16' - - # Find a good install program. We prefer a C program (faster), +# Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -5310,25 +4795,20 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -printf %s "checking for a BSD-compatible install... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test ${ac_cv_path_install+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - # Account for fact that we put trailing slashes in our PATH walk. -case $as_dir in #(( - ./ | /[cC]/* | \ + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -5338,13 +4818,13 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -5352,12 +4832,12 @@ echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -5373,7 +4853,7 @@ rm -rf conftest.one conftest.two conftest.dir fi - if test ${ac_cv_path_install+y}; then + if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -5383,8 +4863,8 @@ INSTALL=$ac_install_sh fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -printf "%s\n" "$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -5394,8 +4874,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -printf %s "checking whether build environment is sane... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -5449,8 +4929,8 @@ as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -5469,23 +4949,26 @@ # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` - +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # Expand $ac_aux_dir to an absolute path. am_aux_dir=`cd "$ac_aux_dir" && pwd` - - if test x"${MISSING+set}" != xset; then - MISSING="\${SHELL} '$am_aux_dir/missing'" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then am_missing_run="$MISSING " else am_missing_run= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh+set}" != xset; then @@ -5505,12 +4988,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -5518,15 +5000,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5537,11 +5015,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5550,12 +5028,11 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -5563,15 +5040,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5582,11 +5055,11 @@ fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -5594,8 +5067,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -5607,31 +5080,25 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 -printf %s "checking for a race-free mkdir -p... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test ${ac_cv_path_mkdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue - case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir ('*'coreutils) '* | \ - 'BusyBox '* | \ + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext break 3;; esac done @@ -5642,7 +5109,7 @@ fi test -d ./--version && rmdir ./--version - if test ${ac_cv_path_mkdir+y}; then + if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -5652,19 +5119,18 @@ MKDIR_P="$ac_install_sh -d" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -printf "%s\n" "$MKDIR_P" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AWK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -5672,15 +5138,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5691,25 +5153,24 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -n "$AWK" && break done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval test \${ac_cv_prog_make_${ac_make}_set+y} -then : - printf %s "(cached) " >&6 -else $as_nop +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -5725,12 +5186,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -5744,8 +5205,7 @@ rmdir .tst 2>/dev/null # Check whether --enable-silent-rules was given. -if test ${enable_silent_rules+y} -then : +if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi @@ -5755,13 +5215,12 @@ *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -printf %s "checking whether $am_make supports nested variables... " >&6; } -if test ${am_cv_make_support_nested_variables+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if printf "%s\n" 'TRUE=$(BAR$(V)) +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -5773,8 +5232,8 @@ am_cv_make_support_nested_variables=no fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -5806,13 +5265,17 @@ # Define the identity of the package. PACKAGE='vlc' - VERSION='3.0.21' + VERSION='3.0.22' -printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF -printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF # Some tools Automake needs. @@ -5858,29 +5321,29 @@ # (that is, avoid stderr redirection). am_uid=`id -u || echo unknown` am_gid=`id -g || echo unknown` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 -printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } if test $am_uid -le $am_max_uid; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } _am_tools=none fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 -printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } if test $am_gid -le $am_max_gid; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } _am_tools=none fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -printf %s "checking how to create a ustar tar archive... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } # Go ahead even if we have the value already cached. We do so because we # need to set the values for the 'am__tar' and 'am__untar' variables. @@ -5955,34 +5418,19 @@ done rm -rf conftest.dir - if test ${am_cv_prog_tar_ustar+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_prog_tar_ustar=$_am_tool fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 -printf "%s\n" "$am_cv_prog_tar_ustar" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } -# Variables for tags utilities; see am/tags.am -if test -z "$CTAGS"; then - CTAGS=ctags -fi - -if test -z "$ETAGS"; then - ETAGS=etags -fi - -if test -z "$CSCOPE"; then - CSCOPE=cscope -fi - - # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -6030,8 +5478,7 @@ # Check whether --enable-silent-rules was given. -if test ${enable_silent_rules+y} -then : +if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi @@ -6041,13 +5488,12 @@ *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -printf %s "checking whether $am_make supports nested variables... " >&6; } -if test ${am_cv_make_support_nested_variables+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if printf "%s\n" 'TRUE=$(BAR$(V)) +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -6059,8 +5505,8 @@ am_cv_make_support_nested_variables=no fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -6071,18 +5517,17 @@ AM_BACKSLASH='\' -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test ${enable_maintainer_mode+y} -then : +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else $as_nop +else USE_MAINTAINER_MODE=yes fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -printf "%s\n" "$USE_MAINTAINER_MODE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -6100,15 +5545,6 @@ vlclibdir="\${libdir}/\${PKGDIR}" - - - - - - - - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6117,12 +5553,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -6130,15 +5565,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6149,11 +5580,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6162,12 +5593,11 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -6175,15 +5605,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6194,11 +5620,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -6206,8 +5632,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -6220,12 +5646,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -6233,15 +5658,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6252,11 +5673,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6265,12 +5686,11 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -6279,19 +5699,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6307,18 +5723,18 @@ # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6329,12 +5745,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -6342,15 +5757,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6361,11 +5772,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6378,12 +5789,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -6391,15 +5801,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6410,11 +5816,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6426,138 +5832,34 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. -set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "clang", so it can be a program name with args. -set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi -else - CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion -version; do +for ac_option in --version -v -V -qversion; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -6567,7 +5869,7 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -6575,7 +5877,7 @@ /* end confdefs.h. */ int -main (void) +main () { ; @@ -6587,9 +5889,9 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -printf %s "checking whether the C compiler works... " >&6; } -ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -6610,12 +5912,11 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -6632,7 +5933,7 @@ # certainly right. break;; *.* ) - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -6648,46 +5949,44 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop +else ac_file='' fi -if test -z "$ac_file" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -printf "%s\n" "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&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_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -printf %s "checking for C compiler default output file name... " >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -printf "%s\n" "$ac_file" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -printf %s "checking for suffix of executables... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -6701,15 +6000,15 @@ * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf "%s\n" "$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -6718,7 +6017,7 @@ /* end confdefs.h. */ #include int -main (void) +main () { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -6730,8 +6029,8 @@ ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -6739,10 +6038,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -6750,40 +6049,39 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { 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 77 "cannot run C compiled programs. + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -printf %s "checking for suffix of object files... " >&6; } -if test ${ac_cv_objext+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -6797,12 +6095,11 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -6811,32 +6108,31 @@ break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&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_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf "%s\n" "$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 -printf %s "checking whether the compiler supports GNU C... " >&6; } -if test ${ac_cv_c_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -6846,33 +6142,29 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+y} +ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -printf %s "checking whether $CC accepts -g... " >&6; } -if test ${ac_cv_prog_cc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -6881,60 +6173,57 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else $as_nop +else CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf "%s\n" "$ac_cv_prog_cc_g" >&6; } -if test $ac_test_CFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -6949,144 +6238,94 @@ CFLAGS= fi fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 -printf %s "checking for $CC option to enable C11 features... " >&6; } -if test ${ac_cv_prog_cc_c11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c11_program -_ACEOF -for ac_arg in '' -std=gnu11 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c11" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 -printf %s "checking for $CC option to enable C99 features... " >&6; } -if test ${ac_cv_prog_cc_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c99_program -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 -printf %s "checking for $CC option to enable C89 features... " >&6; } -if test ${ac_cv_prog_cc_c89+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c89_program +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext conftest.beam +rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC -fi -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + fi ac_ext=c @@ -7095,23 +6334,21 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_ext=c +ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -printf %s "checking whether $CC understands -c and -o together... " >&6; } -if test ${am_cv_prog_cc_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -7139,8 +6376,8 @@ rm -f core conftest* unset am_i fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -7159,8 +6396,8 @@ ac_config_commands="$ac_config_commands depfiles" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } cat > confinc.mk << 'END' am__doit: @echo this is the am__doit target >confinc.out @@ -7196,12 +6433,11 @@ fi done rm -f confinc.* confmf.* -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -printf "%s\n" "${_am_result}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. -if test ${enable_dependency_tracking+y} -then : +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -7222,12 +6458,11 @@ depcc="$CC" am_compiler_list= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_CC_dependencies_compiler_type+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -7334,8 +6569,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -7350,188 +6585,475 @@ -ac_header= ac_cache= -for ac_item in $ac_header_c_list +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + done + ac_cv_prog_CPP=$CPP +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test ${ac_cv_safe_to_define___extensions__+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#include +#include +#include -# define __EXTENSIONS__ 1 - $ac_includes_default int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_safe_to_define___extensions__=yes -else $as_nop - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 -printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } -if test ${ac_cv_should_define__xopen_source+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_should_define__xopen_source=no - if test $ac_cv_header_wchar_h = yes -then : +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include - #include - mbstate_t x; -int -main (void) -{ +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include - ; - return 0; -} _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* -else $as_nop +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif - #define _XOPEN_SOURCE 500 - #include - mbstate_t x; +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int -main (void) +main () { - - ; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_should_define__xopen_source=yes +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 -printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then - printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h +$as_echo "#define STDC_HEADERS 1" >>confdefs.h - printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h +fi - printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h +fi - printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h +done - printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h - printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +if test "x$ac_cv_header_minix_config_h" = xyes; then : + MINIX=yes +else + MINIX= +fi - printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + if test "$MINIX" = yes; then - printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h - printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h +$as_echo "#define _MINIX 1" >>confdefs.h - if test $ac_cv_header_minix_config_h = yes -then : - MINIX=yes - printf "%s\n" "#define _MINIX 1" >>confdefs.h + fi - printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h - printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if ${ac_cv_safe_to_define___extensions__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -else $as_nop - MINIX= -fi - if test $ac_cv_safe_to_define___extensions__ = yes -then : - printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_safe_to_define___extensions__=yes +else + ac_cv_safe_to_define___extensions__=no fi - if test $ac_cv_should_define__xopen_source = yes -then : - printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + test $ac_cv_safe_to_define___extensions__ = yes && + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h + + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h + for opt in "" -std=gnu11 -std=c11 -c11 do - cachevar=`printf "%s\n" "ax_cv_c_compile_c11_$opt" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC $opt supports C11" >&5 -printf %s "checking whether $CC $opt supports C11... " >&6; } -if eval test \${$cachevar+y} -then : - printf %s "(cached) " >&6 -else $as_nop + cachevar=`$as_echo "ax_cv_c_compile_c11_$opt" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC $opt supports C11" >&5 +$as_echo_n "checking whether $CC $opt supports C11... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else CFLAGS_save="$CFLAGS" CFLAGS="$CFLAGS $opt" @@ -7548,23 +7070,22 @@ const int varname = _Generic(1, int: 1, default: 0); _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval $cachevar="yes" -else $as_nop +else eval $cachevar="no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$CFLAGS_save" fi eval ac_res=\$$cachevar - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } if eval test "\$$cachevar" = "yes" then CFLAGS="$CFLAGS $opt" @@ -7573,26 +7094,20 @@ done -printf "%s\n" "#define _FORTIFY_SOURCE 2" >>confdefs.h - - -printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h - +$as_echo "#define _FORTIFY_SOURCE 2" >>confdefs.h -printf "%s\n" "#define _THREAD_SAFE /**/" >>confdefs.h +$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h -printf "%s\n" "#define __LIBVLC__ /**/" >>confdefs.h - - -printf "%s\n" "#define WIN32_LEAN_AND_MEAN /**/" >>confdefs.h - +$as_echo "#define _THREAD_SAFE /**/" >>confdefs.h +$as_echo "#define __LIBVLC__ /**/" >>confdefs.h +$as_echo "#define WIN32_LEAN_AND_MEAN /**/" >>confdefs.h @@ -7606,16 +7121,15 @@ CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -7623,15 +7137,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7642,11 +7152,11 @@ fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf "%s\n" "$CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7655,16 +7165,15 @@ fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -7672,15 +7181,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7691,11 +7196,11 @@ fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -printf "%s\n" "$ac_ct_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7707,8 +7212,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -7718,7 +7223,7 @@ fi fi # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -7728,7 +7233,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -7738,21 +7243,20 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 -printf %s "checking whether the compiler supports GNU C++... " >&6; } -if test ${ac_cv_cxx_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -7762,33 +7266,29 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+y} +ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -printf %s "checking whether $CXX accepts -g... " >&6; } -if test ${ac_cv_prog_cxx_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -7797,60 +7297,57 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else $as_nop +else CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : -else $as_nop +else ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } -if test $ac_test_CXXFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -7865,100 +7362,6 @@ CXXFLAGS= fi fi -ac_prog_cxx_stdcxx=no -if test x$ac_prog_cxx_stdcxx = xno -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_cxx11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_cxx11=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx11_program -_ACEOF -for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx11" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 -fi -fi -if test x$ac_prog_cxx_stdcxx = xno -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_cxx98+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_cxx98=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx98_program -_ACEOF -for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx98=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx98" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx98" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx98" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 - ac_prog_cxx_stdcxx=cxx98 -fi -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7967,12 +7370,11 @@ depcc="$CXX" am_compiler_list= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_CXX_dependencies_compiler_type+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -8079,8 +7481,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type if @@ -8099,36 +7501,40 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -printf %s "checking how to run the C preprocessor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test ${ac_cv_prog_CPP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CC needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" do ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -8140,11 +7546,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -8154,8 +7559,7 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : break fi @@ -8167,24 +7571,29 @@ else ac_cv_prog_CPP=$CPP fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -printf "%s\n" "$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -8196,11 +7605,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -8210,12 +7618,11 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -8232,16 +7639,15 @@ ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_objc_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gcc objcc objc cc CC clang + for ac_prog in gcc objcc objc cc CC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OBJC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OBJC"; then ac_cv_prog_OBJC="$OBJC" # Let the user override the test. else @@ -8249,15 +7655,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8268,11 +7670,11 @@ fi OBJC=$ac_cv_prog_OBJC if test -n "$OBJC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJC" >&5 -printf "%s\n" "$OBJC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJC" >&5 +$as_echo "$OBJC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8281,16 +7683,15 @@ fi if test -z "$OBJC"; then ac_ct_OBJC=$OBJC - for ac_prog in gcc objcc objc cc CC clang + for ac_prog in gcc objcc objc cc CC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OBJC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OBJC"; then ac_cv_prog_ac_ct_OBJC="$ac_ct_OBJC" # Let the user override the test. else @@ -8298,15 +7699,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8317,11 +7714,11 @@ fi ac_ct_OBJC=$ac_cv_prog_ac_ct_OBJC if test -n "$ac_ct_OBJC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJC" >&5 -printf "%s\n" "$ac_ct_OBJC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJC" >&5 +$as_echo "$ac_ct_OBJC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8333,8 +7730,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJC=$ac_ct_OBJC @@ -8342,7 +7739,7 @@ fi # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -8352,7 +7749,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -8362,21 +7759,20 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Objective C" >&5 -printf %s "checking whether the compiler supports GNU Objective C... " >&6; } -if test ${ac_cv_objc_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 +$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } +if ${ac_cv_objc_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -8386,33 +7782,29 @@ return 0; } _ACEOF -if ac_fn_objc_try_compile "$LINENO" -then : +if ac_fn_objc_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_objc_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_objc_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_objc_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5 +$as_echo "$ac_cv_objc_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GOBJC=yes else GOBJC= fi -ac_test_OBJCFLAGS=${OBJCFLAGS+y} +ac_test_OBJCFLAGS=${OBJCFLAGS+set} ac_save_OBJCFLAGS=$OBJCFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 -printf %s "checking whether $OBJC accepts -g... " >&6; } -if test ${ac_cv_prog_objc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 +$as_echo_n "checking whether $OBJC accepts -g... " >&6; } +if ${ac_cv_prog_objc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_objc_werror_flag=$ac_objc_werror_flag ac_objc_werror_flag=yes ac_cv_prog_objc_g=no @@ -8421,60 +7813,57 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_objc_try_compile "$LINENO" -then : +if ac_fn_objc_try_compile "$LINENO"; then : ac_cv_prog_objc_g=yes -else $as_nop +else OBJCFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_objc_try_compile "$LINENO" -then : +if ac_fn_objc_try_compile "$LINENO"; then : -else $as_nop +else ac_objc_werror_flag=$ac_save_objc_werror_flag OBJCFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_objc_try_compile "$LINENO" -then : +if ac_fn_objc_try_compile "$LINENO"; then : ac_cv_prog_objc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_objc_werror_flag=$ac_save_objc_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5 -printf "%s\n" "$ac_cv_prog_objc_g" >&6; } -if test $ac_test_OBJCFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5 +$as_echo "$ac_cv_prog_objc_g" >&6; } +if test "$ac_test_OBJCFLAGS" = set; then OBJCFLAGS=$ac_save_OBJCFLAGS elif test $ac_cv_prog_objc_g = yes; then if test "$GOBJC" = yes; then @@ -8497,12 +7886,11 @@ depcc="$OBJC" am_compiler_list='gcc3 gcc' -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_OBJC_dependencies_compiler_type+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_OBJC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -8607,8 +7995,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_OBJC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; } OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type if @@ -8622,81 +8010,11 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } -if test ${ac_cv_path_GREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in grep ggrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_cv_path_GREP=$GREP -fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } -if test ${ac_cv_path_EGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -8707,15 +8025,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in egrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -8724,13 +8037,13 @@ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -8759,19 +8072,18 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval test \${ac_cv_prog_make_${ac_make}_set+y} -then : - printf %s "(cached) " >&6 -else $as_nop +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -8787,12 +8099,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -8806,12 +8118,11 @@ depcc="$CCAS" am_compiler_list= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_CCAS_dependencies_compiler_type+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -8916,8 +8227,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_CCAS_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type if @@ -8935,12 +8246,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_LEX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LEX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else @@ -8948,15 +8258,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LEX="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8967,11 +8273,11 @@ fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 -printf "%s\n" "$LEX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +$as_echo "$LEX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8979,26 +8285,15 @@ done test -n "$LEX" || LEX=":" - if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF -%{ -#ifdef __cplusplus -extern "C" -#endif -int yywrap(void); -%} +if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF %% a { ECHO; } b { REJECT; } c { yymore (); } d { yyless (1); } e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ -#ifdef __cplusplus - yyless ((yyinput () != 0)); -#else - yyless ((input () != 0)); -#endif - } + yyless ((input () != 0)); } f { unput (yytext[0]); } . { BEGIN INITIAL; } %% @@ -9006,144 +8301,101 @@ extern char *yytext; #endif int -yywrap (void) -{ - return 1; -} -int main (void) { - return ! yylex (); + return ! yylex () + ! yywrap (); } _ACEOF -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex output file root" >&5 -printf %s "checking for lex output file root... " >&6; } -if test ${ac_cv_prog_lex_root+y} -then : - printf %s "(cached) " >&6 -else $as_nop - -ac_cv_prog_lex_root=unknown { { ac_try="$LEX conftest.l" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$LEX conftest.l") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 +$as_echo_n "checking lex output file root... " >&6; } +if ${ac_cv_prog_lex_root+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -f lex.yy.c; then ac_cv_prog_lex_root=lex.yy elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy +else + as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 -printf "%s\n" "$ac_cv_prog_lex_root" >&6; } -if test "$ac_cv_prog_lex_root" = unknown -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find output from $LEX; giving up on $LEX" >&5 -printf "%s\n" "$as_me: WARNING: cannot find output from $LEX; giving up on $LEX" >&2;} - LEX=: LEXLIB= -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +$as_echo "$ac_cv_prog_lex_root" >&6; } LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -if test ${LEXLIB+y} -then : - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5 -printf %s "checking for lex library... " >&6; } -if test ${ac_cv_lib_lex+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - ac_save_LIBS="$LIBS" - ac_found=false - for ac_cv_lib_lex in 'none needed' -lfl -ll 'not found'; do - case $ac_cv_lib_lex in #( - 'none needed') : - ;; #( - 'not found') : - break ;; #( - *) : - LIBS="$ac_cv_lib_lex $ac_save_LIBS" ;; #( - *) : - ;; -esac +if test -z "${LEXLIB+set}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 +$as_echo_n "checking lex library... " >&6; } +if ${ac_cv_lib_lex+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_LIBS=$LIBS + ac_cv_lib_lex='none needed' + for ac_lib in '' -lfl -ll; do + LIBS="$ac_lib $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_found=: +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lex=$ac_lib fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if $ac_found; then - break - fi + test "$ac_cv_lib_lex" != 'none needed' && break done - LIBS="$ac_save_LIBS" + LIBS=$ac_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 -printf "%s\n" "$ac_cv_lib_lex" >&6; } - if test "$ac_cv_lib_lex" = 'not found' -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: required lex library not found; giving up on $LEX" >&5 -printf "%s\n" "$as_me: WARNING: required lex library not found; giving up on $LEX" >&2;} - LEX=: LEXLIB= -elif test "$ac_cv_lib_lex" = 'none needed' -then : - LEXLIB='' -else $as_nop - LEXLIB=$ac_cv_lib_lex -fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +$as_echo "$ac_cv_lib_lex" >&6; } + test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex fi -if test "$LEX" != : -then : - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 -printf %s "checking whether yytext is a pointer... " >&6; } -if test ${ac_cv_prog_lex_yytext_pointer+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +$as_echo_n "checking whether yytext is a pointer... " >&6; } +if ${ac_cv_prog_lex_yytext_pointer+:} false; then : + $as_echo_n "(cached) " >&6 +else # POSIX says lex can declare yytext either as a pointer or an array; the # default is implementation-dependent. Figure out which it is, since # not all implementations provide the %pointer and %array declarations. ac_cv_prog_lex_yytext_pointer=no +ac_save_LIBS=$LIBS +LIBS="$LEXLIB $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_prog_lex_yytext_pointer=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 -printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } if test $ac_cv_prog_lex_yytext_pointer = yes; then -printf "%s\n" "#define YYTEXT_POINTER 1" >>confdefs.h - -fi +$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h fi rm -f conftest.l $LEX_OUTPUT_ROOT.c @@ -9153,12 +8405,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_YACC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_YACC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else @@ -9166,15 +8417,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9185,11 +8432,11 @@ fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -printf "%s\n" "$YACC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +$as_echo "$YACC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9203,12 +8450,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DESKTOP_FILE_VALIDATE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DESKTOP_FILE_VALIDATE+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DESKTOP_FILE_VALIDATE"; then ac_cv_prog_DESKTOP_FILE_VALIDATE="$DESKTOP_FILE_VALIDATE" # Let the user override the test. else @@ -9216,15 +8462,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DESKTOP_FILE_VALIDATE="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9235,11 +8477,11 @@ fi DESKTOP_FILE_VALIDATE=$ac_cv_prog_DESKTOP_FILE_VALIDATE if test -n "$DESKTOP_FILE_VALIDATE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DESKTOP_FILE_VALIDATE" >&5 -printf "%s\n" "$DESKTOP_FILE_VALIDATE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DESKTOP_FILE_VALIDATE" >&5 +$as_echo "$DESKTOP_FILE_VALIDATE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9252,12 +8494,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_BUILDCC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_BUILDCC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$BUILDCC"; then ac_cv_prog_BUILDCC="$BUILDCC" # Let the user override the test. else @@ -9265,15 +8506,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_BUILDCC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9284,11 +8521,11 @@ fi BUILDCC=$ac_cv_prog_BUILDCC if test -n "$BUILDCC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILDCC" >&5 -printf "%s\n" "$BUILDCC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILDCC" >&5 +$as_echo "$BUILDCC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9296,24 +8533,22 @@ done test -n "$BUILDCC" || BUILDCC="false" -if test "$BUILDCC" = "false" -then : +if test "$BUILDCC" = "false"; then : as_fn_error $? "Cannot find native C99 compiler: please define BUILDCC." "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -printf %s "checking for an ANSI C-conforming const... " >&6; } -if test ${ac_cv_c_const+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __cplusplus @@ -9326,7 +8561,7 @@ /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; - /* IBM XL C 1.02.0.0 rejects this. + /* AIX XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant expression */ @@ -9354,7 +8589,7 @@ iptr p = 0; ++p; } - { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ struct s { int j; const int *ap[3]; } bx; struct s *b = &bx; b->j = 5; @@ -9370,50 +8605,47 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes -else $as_nop +else ac_cv_c_const=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -printf "%s\n" "$ac_cv_c_const" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -printf "%s\n" "#define const /**/" >>confdefs.h +$as_echo "#define const /**/" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -printf %s "checking for inline... " >&6; } -if test ${ac_cv_c_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo (void) {return 0; } -$ac_kw foo_t foo (void) {return 0; } +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -printf "%s\n" "$ac_cv_c_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -9430,53 +8662,49 @@ ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 -printf %s "checking for C/C++ restrict keyword... " >&6; } -if test ${ac_cv_c_restrict+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 +$as_echo_n "checking for C/C++ restrict keyword... " >&6; } +if ${ac_cv_c_restrict+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_restrict=no - # Put '__restrict__' first, to avoid problems with glibc and non-GCC; see: - # https://lists.gnu.org/archive/html/bug-autoconf/2016-02/msg00006.html - # Put 'restrict' last, because C++ lacks it. - for ac_kw in __restrict__ __restrict _Restrict restrict; do + # The order here caters to the fact that C++ does not require restrict. + for ac_kw in __restrict __restrict__ _Restrict restrict; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -typedef int *int_ptr; - int foo (int_ptr $ac_kw ip) { return ip[0]; } - int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ - int bar (int ip[$ac_kw]) { return ip[0]; } - +typedef int * int_ptr; + int foo (int_ptr $ac_kw ip) { + return ip[0]; + } int -main (void) +main () { int s[1]; - int *$ac_kw t = s; - t[0] = 0; - return foo (t) + bar (t); - + int * $ac_kw t = s; + t[0] = 0; + return foo(t) ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_restrict=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_restrict" != no && break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 -printf "%s\n" "$ac_cv_c_restrict" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 +$as_echo "$ac_cv_c_restrict" >&6; } case $ac_cv_c_restrict in restrict) ;; - no) printf "%s\n" "#define restrict /**/" >>confdefs.h + no) $as_echo "#define restrict /**/" >>confdefs.h ;; - *) printf "%s\n" "#define restrict $ac_cv_c_restrict" >>confdefs.h + *) cat >>confdefs.h <<_ACEOF +#define restrict $ac_cv_c_restrict +_ACEOF ;; esac @@ -9488,12 +8716,11 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_success=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 -printf %s "checking whether $CXX supports C++11 features by default... " >&6; } -if test ${ax_cv_cxx_compile_cxx11+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 +$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; } +if ${ax_cv_cxx_compile_cxx11+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9551,16 +8778,15 @@ constexpr size_t constant_align = alignof (std::max_align_t); _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_cxx_compile_cxx11=yes -else $as_nop +else ax_cv_cxx_compile_cxx11=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 -printf "%s\n" "$ax_cv_cxx_compile_cxx11" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 +$as_echo "$ax_cv_cxx_compile_cxx11" >&6; } if test x$ax_cv_cxx_compile_cxx11 = xyes; then ac_success=yes fi @@ -9569,13 +8795,12 @@ if test x$ac_success = xno; then for switch in -std=c++11 -std=c++0x; do - cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 -printf %s "checking whether $CXX supports C++11 features with $switch... " >&6; } -if eval test \${$cachevar+y} -then : - printf %s "(cached) " >&6 -else $as_nop + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $switch" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9635,18 +8860,17 @@ constexpr size_t constant_align = alignof (std::max_align_t); _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : eval $cachevar=yes -else $as_nop +else eval $cachevar=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$ac_save_CXXFLAGS" fi eval ac_res=\$$cachevar - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } if eval test x\$$cachevar = xyes; then CXXFLAGS="$CXXFLAGS $switch" ac_success=yes @@ -9667,12 +8891,12 @@ else if test x$ac_success = xno; then HAVE_CXX11=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 -printf "%s\n" "$as_me: No compiler with C++11 support was found" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +$as_echo "$as_me: No compiler with C++11 support was found" >&6;} else HAVE_CXX11=1 -printf "%s\n" "#define HAVE_CXX11 1" >>confdefs.h +$as_echo "#define HAVE_CXX11 1" >>confdefs.h fi @@ -9684,16 +8908,16 @@ # Check whether --with-binary-version was given. -if test ${with_binary_version+y} -then : +if test "${with_binary_version+set}" = set; then : withval=$with_binary_version; fi -if test -n "${with_binary_version}" -then : +if test -n "${with_binary_version}"; then : -printf "%s\n" "#define DISTRO_VERSION \"${with_binary_version}\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define DISTRO_VERSION "${with_binary_version}" +_ACEOF fi @@ -9703,13 +8927,12 @@ for flag in -Werror=unknown-warning-option -Werror=invalid-command-line-argument; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -9717,61 +8940,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -9782,13 +9002,12 @@ for flag in -Werror=unknown-warning-option -Werror=invalid-command-line-argument; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -9796,61 +9015,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 (: CXXFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -9897,8 +9113,8 @@ OBJCFLAGS="${OBJCFLAGS} -fno-stack-check" ARCH_flag="" - case "${host}" in - i?86*) + case "${host_cpu}" in + i?86) ARCH_flag="-arch i386" ;; ppc64*) @@ -9907,7 +9123,7 @@ ppc*) ARCH_flag="-arch ppc" ;; - x86_64*) + x86_64) ARCH_flag="-arch x86_64" ;; arm*) @@ -9939,8 +9155,7 @@ - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #import #if TARGET_OS_IPHONE @@ -9948,13 +9163,12 @@ #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : HAVE_IOS="1" -else $as_nop +else HAVE_OSX="1" fi -rm -rf conftest* +rm -f conftest* cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9965,20 +9179,18 @@ #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : HAVE_TVOS="1" HAVE_IOS="0" HAVE_OSX="0" fi -rm -rf conftest* +rm -f conftest* # Check whether --with-macosx-sdk was given. -if test ${with_macosx_sdk+y} -then : +if test "${with_macosx_sdk+set}" = set; then : withval=$with_macosx_sdk; fi @@ -9988,12 +9200,12 @@ CC="${CC} -isysroot ${with_macosx_sdk}" CXX="${CXX} -isysroot ${with_macosx_sdk}" OBJC="${OBJC} -isysroot ${with_macosx_sdk}" + CCAS="${CCAS} -isysroot ${with_macosx_sdk}" LD="${LD} -syslibroot ${with_macosx_sdk}" fi # Check whether --with-macosx-version-min was given. -if test ${with_macosx_version_min+y} -then : +if test "${with_macosx_version_min+set}" = set; then : withval=$with_macosx_version_min; fi @@ -10002,20 +9214,106 @@ CC="${CC} -mmacosx-version-min=${with_macosx_version_min}" CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}" OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}" + CCAS="${CCAS} -mmacosx-version-min=${with_macosx_version_min}" LD="${LD} -mmacosx_version_min=${with_macosx_version_min}" fi ;; *mingw32* | *cygwin* | *wince* | *mingwce*) - CXXFLAGS="${CXXFLAGS} -static-libgcc" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + + +for flag in -static-libgcc; do + as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags_-Werror_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5 +$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -Werror $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXXFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${CXXFLAGS+:} false; then : + + case " $CXXFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + (: CXXFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CXXFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + CXXFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_WINDRES+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_WINDRES+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. else @@ -10023,15 +9321,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10042,11 +9336,11 @@ fi WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 -printf "%s\n" "$WINDRES" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 +$as_echo "$WINDRES" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10055,12 +9349,11 @@ ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_WINDRES+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_WINDRES+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_WINDRES"; then ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. else @@ -10068,15 +9361,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_WINDRES="windres" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10087,11 +9376,11 @@ fi ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES if test -n "$ac_ct_WINDRES"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 -printf "%s\n" "$ac_ct_WINDRES" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 +$as_echo "$ac_ct_WINDRES" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_WINDRES" = x; then @@ -10099,8 +9388,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac WINDRES=$ac_ct_WINDRES @@ -10112,12 +9401,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ac_tool_prefix}objcopy; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OBJCOPY+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJCOPY+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OBJCOPY"; then ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. else @@ -10125,15 +9413,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10144,11 +9428,11 @@ fi OBJCOPY=$ac_cv_prog_OBJCOPY if test -n "$OBJCOPY"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5 -printf "%s\n" "$OBJCOPY" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5 +$as_echo "$OBJCOPY" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10157,12 +9441,11 @@ ac_ct_OBJCOPY=$OBJCOPY # Extract the first word of "objcopy", so it can be a program name with args. set dummy objcopy; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OBJCOPY+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OBJCOPY"; then ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test. else @@ -10170,15 +9453,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJCOPY="objcopy" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10189,11 +9468,11 @@ fi ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY if test -n "$ac_ct_OBJCOPY"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5 -printf "%s\n" "$ac_ct_OBJCOPY" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5 +$as_echo "$ac_ct_OBJCOPY" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OBJCOPY" = x; then @@ -10201,8 +9480,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJCOPY=$ac_ct_OBJCOPY @@ -10223,7 +9502,7 @@ #endif int -main (void) +main () { ; ; @@ -10231,17 +9510,16 @@ } _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : -printf "%s\n" "#define _WIN32_WINNT 0x0502" >>confdefs.h +$as_echo "#define _WIN32_WINNT 0x0502" >>confdefs.h fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libsynchronization is needed" >&5 -printf %s "checking if libsynchronization is needed... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libsynchronization is needed" >&5 +$as_echo_n "checking if libsynchronization is needed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if _WIN32_WINNT >= 0x0602 @@ -10249,7 +9527,7 @@ #endif int -main (void) +main () { ; ; @@ -10257,16 +9535,15 @@ } _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } eval "LIBS_libvlccore="'"'"-lsynchronization "'$'"{LIBS_libvlccore}"'"' @@ -10277,37 +9554,62 @@ fi rm -f conftest.err conftest.i conftest.$ac_ext -printf "%s\n" "#define _WIN32_IE 0x0600" >>confdefs.h +$as_echo "#define _WIN32_IE 0x0600" >>confdefs.h + + +$as_echo "#define _UNICODE 1" >>confdefs.h + + +$as_echo "#define UNICODE 1" >>confdefs.h -printf "%s\n" "#define _UNICODE 1" >>confdefs.h +$as_echo "#define _ISOC99_SOURCE 1" >>confdefs.h -printf "%s\n" "#define UNICODE 1" >>confdefs.h +$as_echo "#define _ISOC11_SOURCE 1" >>confdefs.h -printf "%s\n" "#define _ISOC99_SOURCE 1" >>confdefs.h +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h -printf "%s\n" "#define _ISOC11_SOURCE 1" >>confdefs.h +$as_echo "#define _POSIX_C_SOURCE 200809L" >>confdefs.h -printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h +$as_echo "#define _XOPEN_SOURCE 700" >>confdefs.h -printf "%s\n" "#define _POSIX_C_SOURCE 200809L" >>confdefs.h +$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h -printf "%s\n" "#define _XOPEN_SOURCE 700" >>confdefs.h +$as_echo "#define _BSD_SOURCE 1" >>confdefs.h -printf "%s\n" "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h +$as_echo "#define _SVID_SOURCE 1" >>confdefs.h -printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h +# Check whether --with-packagedir was given. +if test "${with_packagedir+set}" = set; then : + withval=$with_packagedir; +fi + + if test "${with_packagedir}" != ""; then : + + if test -d "${with_packagedir}"; then : + + PACKAGE_DIR=`cd "${with_packagedir}" && pwd -P` -printf "%s\n" "#define _SVID_SOURCE 1" >>confdefs.h +else + + PACKAGE_DIR="${with_packagedir}" + +fi + +else + + PACKAGE_DIR=`pwd -P`"/vlc-${PACKAGE_VERSION}" + +fi case "${host_os}" in @@ -10322,13 +9624,12 @@ #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : SYS=mingw32 -else $as_nop +else as_fn_error $? "VLC requires -mno-cygwin" "$LINENO" 5 fi -rm -rf conftest* +rm -f conftest* ;; esac @@ -10341,12 +9642,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_U2D+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_U2D+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$U2D"; then ac_cv_prog_U2D="$U2D" # Let the user override the test. else @@ -10354,15 +9654,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_U2D="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10373,11 +9669,11 @@ fi U2D=$ac_cv_prog_U2D if test -n "$U2D"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $U2D" >&5 -printf "%s\n" "$U2D" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $U2D" >&5 +$as_echo "$U2D" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10388,16 +9684,61 @@ ac_default_prefix="`pwd`/_win32" DESTDIR="`pwd`/_win32/" - case "${host}" in - amd64*|x86_64*) + case "${host_cpu}" in + aarch64) + HAVE_WIN64="1" + WINDOWS_ARCH="arm64" + PROGRAMFILES="PROGRAMFILES64" + LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000" + ;; + amd64|x86_64) HAVE_WIN64="1" WINDOWS_ARCH="x64" PROGRAMFILES="PROGRAMFILES64" LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000" ;; - *) + armv7) + WINDOWS_ARCH="arm" + PROGRAMFILES="PROGRAMFILES" + ;; + i?86) WINDOWS_ARCH="x86" PROGRAMFILES="PROGRAMFILES" + +if ${LDFLAGS+:} false; then : + + case " $LDFLAGS " in #( + *" -Wl,--large-address-aware "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -Wl,--large-address-aware"; } >&5 + (: LDFLAGS already contains -Wl,--large-address-aware) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append LDFLAGS " -Wl,--large-address-aware" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + LDFLAGS=-Wl,--large-address-aware + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + + ;; + *) + as_fn_error $? "Unsupported Windows architecture ${host_cpu}" "$LINENO" 5 ;; esac @@ -10429,18 +9770,22 @@ ;; esac - ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex" -if test "x$ac_cv_func_if_nametoindex" = xyes -then : - printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h + for ac_func in if_nametoindex +do : + ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex" +if test "x$ac_cv_func_if_nametoindex" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IF_NAMETOINDEX 1 +_ACEOF fi +done ;; *nacl*) SYS=nacl -printf "%s\n" "#define _XOPEN_SOURCE 700" >>confdefs.h +$as_echo "#define _XOPEN_SOURCE 700" >>confdefs.h case " $LIBOBJS " in *" sigwait.$ac_objext "* ) ;; @@ -10467,119 +9812,209 @@ esac # Check whether --enable-winstore_app was given. -if test ${enable_winstore_app+y} -then : +if test "${enable_winstore_app+set}" = set; then : enableval=$enable_winstore_app; fi vlc_winstore_app=0 -if test "${SYS}" = "mingw32" -then : +if test "${SYS}" = "mingw32"; then : LIBCOM="-lole32" - if test "${enable_winstore_app}" = "yes" -then : + if test "${enable_winstore_app}" = "yes"; then : vlc_winstore_app=1 LIBCOM="" +if ${CFLAGS+:} false; then : - eval "LIBS_libvlccore="'"'"-lruntimeobject "'$'"{LIBS_libvlccore}"'"' + case " $CFLAGS " in #( + *" -DWINSTORECOMPAT "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -DWINSTORECOMPAT"; } >&5 + (: CFLAGS already contains -DWINSTORECOMPAT) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CFLAGS " -DWINSTORECOMPAT" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac +else + CFLAGS=-DWINSTORECOMPAT + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } - case " $LIBOBJS " in - *" gai_strerror.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS gai_strerror.$ac_objext" - ;; +fi + + +if ${CPPFLAGS+:} false; then : + + case " $CPPFLAGS " in #( + *" -DWINSTORECOMPAT "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS already contains -DWINSTORECOMPAT"; } >&5 + (: CPPFLAGS already contains -DWINSTORECOMPAT) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CPPFLAGS " -DWINSTORECOMPAT" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS\""; } >&5 + (: CPPFLAGS="$CPPFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; esac +else + + CPPFLAGS=-DWINSTORECOMPAT + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS\""; } >&5 + (: CPPFLAGS="$CPPFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } fi -fi +if ${CXXFLAGS+:} false; then : -printf "%s\n" "#define VLC_WINSTORE_APP ${vlc_winstore_app}" >>confdefs.h + case " $CXXFLAGS " in #( + *" -DWINSTORECOMPAT "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -DWINSTORECOMPAT"; } >&5 + (: CXXFLAGS already contains -DWINSTORECOMPAT) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + as_fn_append CXXFLAGS " -DWINSTORECOMPAT" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac -vlc_build_pdb=0 -# Check whether --enable-pdb was given. -if test ${enable_pdb+y} -then : - enableval=$enable_pdb; -fi +else -if test "${SYS}" = "mingw32" -then : + CXXFLAGS=-DWINSTORECOMPAT + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + (: CXXFLAGS="$CXXFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } - if test "${enable_pdb}" = "yes" -then : +fi - vlc_build_pdb=1 -if test ${CFLAGS+y} -then : +if ${LDFLAGS+:} false; then : - case " $CFLAGS " in #( - *" -g -gcodeview "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -g -gcodeview"; } >&5 - (: CFLAGS already contains -g -gcodeview) 2>&5 + case " $LDFLAGS " in #( + *" -lwinstorecompat "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -lwinstorecompat"; } >&5 + (: LDFLAGS already contains -lwinstorecompat) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : - as_fn_append CFLAGS " -g -gcodeview" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 - (: CFLAGS="$CFLAGS") 2>&5 + as_fn_append LDFLAGS " -lwinstorecompat" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else - CFLAGS=-g -gcodeview - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 - (: CFLAGS="$CFLAGS") 2>&5 + LDFLAGS=-lwinstorecompat + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + (: LDFLAGS="$LDFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${CXXFLAGS+y} -then : - case " $CXXFLAGS " in #( + eval "LIBS_libvlccore="'"'"-lruntimeobject "'$'"{LIBS_libvlccore}"'"' + + + + case " $LIBOBJS " in + *" gai_strerror.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS gai_strerror.$ac_objext" + ;; +esac + + +fi + + +fi + +cat >>confdefs.h <<_ACEOF +#define VLC_WINSTORE_APP ${vlc_winstore_app} +_ACEOF + + +vlc_build_pdb=0 +# Check whether --enable-pdb was given. +if test "${enable_pdb+set}" = set; then : + enableval=$enable_pdb; +fi + +if test "${SYS}" = "mingw32"; then : + + if test "${enable_pdb}" = "yes"; then : + + vlc_build_pdb=1 + +if ${CPPFLAGS+:} false; then : + + case " $CPPFLAGS " in #( *" -g -gcodeview "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -g -gcodeview"; } >&5 - (: CXXFLAGS already contains -g -gcodeview) 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS already contains -g -gcodeview"; } >&5 + (: CPPFLAGS already contains -g -gcodeview) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : - as_fn_append CXXFLAGS " -g -gcodeview" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 - (: CXXFLAGS="$CXXFLAGS") 2>&5 + as_fn_append CPPFLAGS " -g -gcodeview" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS\""; } >&5 + (: CPPFLAGS="$CPPFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else - CXXFLAGS=-g -gcodeview - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 - (: CXXFLAGS="$CXXFLAGS") 2>&5 + CPPFLAGS=-g -gcodeview + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS\""; } >&5 + (: CPPFLAGS="$CPPFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi @@ -10710,11 +10145,10 @@ esac -if test "$SYS" = linux -then : +if test "$SYS" = linux; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an Android system" >&5 -printf %s "checking for an Android system... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an Android system" >&5 +$as_echo_n "checking for an Android system... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __ANDROID__ @@ -10722,7 +10156,7 @@ #endif int -main (void) +main () { ; ; @@ -10730,17 +10164,16 @@ } _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : HAVE_ANDROID="1" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -10755,17 +10188,16 @@ fi -if test "$SYS" = linux -then : +if test "$SYS" = linux; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Tizen" >&5 -printf %s "checking for Tizen... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tizen" >&5 +$as_echo_n "checking for Tizen... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { ; ; @@ -10773,20 +10205,19 @@ } _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : HAVE_TIZEN="1" -printf "%s\n" "#define HAVE_TIZEN_SDK 1" >>confdefs.h +$as_echo "#define HAVE_TIZEN_SDK 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -10803,74 +10234,66 @@ # Check whether --with-contrib was given. -if test ${with_contrib+y} -then : +if test "${with_contrib+set}" = set; then : withval=$with_contrib; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 3rd party libraries path" >&5 -printf %s "checking for 3rd party libraries path... " >&6; } -if test -z "${with_contrib}" || test "${with_contrib}" = "yes" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3rd party libraries path" >&5 +$as_echo_n "checking for 3rd party libraries path... " >&6; } +if test -z "${with_contrib}" || test "${with_contrib}" = "yes"; then : CONTRIB_DIR="${srcdir}/contrib/${host}" - if test ! -d "${CONTRIB_DIR}" -then : + if test ! -d "${CONTRIB_DIR}"; then : echo "${CONTRIB_DIR} not found" >&5 CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`" - if test ! -d "${CONTRIB_DIR}" -then : + if test ! -d "${CONTRIB_DIR}"; then : echo "${CONTRIB_DIR} not found" >&5 CONTRIB_DIR="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } fi fi -else $as_nop +else - if test "${with_contrib}" != "no" -then : + if test "${with_contrib}" != "no"; then : CONTRIB_DIR="${with_contrib}" -else $as_nop +else CONTRIB_DIR="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf "%s\n" "disabled" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } fi fi -if test -n "${CONTRIB_DIR}" -then : +if test -n "${CONTRIB_DIR}"; then : - if test -d "${CONTRIB_DIR}/lib" -then : + if test -d "${CONTRIB_DIR}/lib"; then : CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd` -else $as_nop +else echo "${CONTRIB_DIR}/lib not found" >&5 CONTRIB_DIR="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -printf "%s\n" "not usable" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +$as_echo "not usable" >&6; } fi fi -if test -n "${CONTRIB_DIR}" -then : +if test -n "${CONTRIB_DIR}"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${CONTRIB_DIR}" >&5 -printf "%s\n" "${CONTRIB_DIR}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CONTRIB_DIR}" >&5 +$as_echo "${CONTRIB_DIR}" >&6; } CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include" CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include" @@ -10878,18 +10301,15 @@ export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH" LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib" - if test -z "$LUAC" -then : + if test -z "$LUAC"; then : - if test -x "${CONTRIB_DIR}/bin/luac${BUILDEXEEXT}" -then : + if test -x "${CONTRIB_DIR}/bin/luac${BUILDEXEEXT}"; then : LUAC="${CONTRIB_DIR}/bin/luac${BUILDEXEEXT}" fi - if test -x "${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}" -then : + if test -x "${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}"; then : LUAC="${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}" @@ -10897,18 +10317,16 @@ fi - if test "${SYS}" = "darwin" -then : + if test "${SYS}" = "darwin"; then : export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH" export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH" fi -else $as_nop +else - if test -n "${with_contrib}" && test "${with_contrib}" != "no" -then : + if test -n "${with_contrib}" && test "${with_contrib}" != "no"; then : as_fn_error $? "Third party libraries not found!" "$LINENO" 5 @@ -10918,8 +10336,7 @@ TOOLS_DIR="${srcdir}/extras/tools/build/bin" -if test -d "${TOOLS_DIR}" -then : +if test -d "${TOOLS_DIR}"; then : TOOLS_DIR=`cd "${TOOLS_DIR}" && pwd` export PATH="${TOOLS_DIR}":$PATH @@ -10927,25 +10344,23 @@ fi -if test ${lt_cv_deplibs_check_method+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_deplibs_check_method=pass_all fi case `pwd` in *\ * | *\ *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.4.7' -macro_revision='2.4.7' - +macro_version='2.4.6' +macro_revision='2.4.6' @@ -10982,8 +10397,8 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -printf %s "checking how to print strings... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -11009,12 +10424,12 @@ } case $ECHO in - printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -printf "%s\n" "printf" >&6; } ;; - print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -printf "%s\n" "print -r" >&6; } ;; - *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -printf "%s\n" "cat" >&6; } ;; + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; esac @@ -11030,12 +10445,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -printf %s "checking for a sed that does not truncate output... " >&6; } -if test ${ac_cv_path_SED+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -11049,15 +10463,10 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in sed gsed - do + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -11066,13 +10475,13 @@ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" '' >> "conftest.nl" + $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -11100,8 +10509,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -printf "%s\n" "$ac_cv_path_SED" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -11118,12 +10527,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -printf %s "checking for fgrep... " >&6; } -if test ${ac_cv_path_FGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -11134,15 +10542,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in fgrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -11151,13 +10554,13 @@ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'FGREP' >> "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -11186,8 +10589,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -printf "%s\n" "$ac_cv_path_FGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -11212,18 +10615,17 @@ # Check whether --with-gnu-ld was given. -if test ${with_gnu_ld+y} -then : +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else $as_nop +else with_gnu_ld=no fi ac_prog=ld if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -printf %s "checking for ld used by $CC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return, which upsets mingw @@ -11252,16 +10654,15 @@ ;; esac elif test yes = "$with_gnu_ld"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -printf %s "checking for GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -printf %s "checking for non-GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test ${lt_cv_path_LD+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -11290,19 +10691,18 @@ LD=$lt_cv_path_LD if test -n "$LD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -printf "%s\n" "$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -printf %s "checking if the linker ($LD) is GNU ld... " >&6; } -if test ${lt_cv_prog_gnu_ld+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 -printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -11325,12 +10725,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test ${lt_cv_path_NM+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM=$NM @@ -11355,13 +10754,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -11380,8 +10779,8 @@ : ${lt_cv_path_NM=no} fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -printf "%s\n" "$lt_cv_path_NM" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } if test no != "$lt_cv_path_NM"; then NM=$lt_cv_path_NM else @@ -11394,12 +10793,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DUMPBIN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -11407,15 +10805,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11426,11 +10820,11 @@ fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -printf "%s\n" "$DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11443,12 +10837,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DUMPBIN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -11456,15 +10849,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11475,11 +10864,11 @@ fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -printf "%s\n" "$ac_ct_DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11491,15 +10880,15 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -11520,12 +10909,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -printf %s "checking the name lister ($NM) interface... " >&6; } -if test ${lt_cv_nm_interface+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) @@ -11541,27 +10929,26 @@ fi rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -printf "%s\n" "$lt_cv_nm_interface" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -printf %s "checking whether ln -s works... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -printf "%s\n" "no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -printf %s "checking the maximum length of command line arguments... " >&6; } -if test ${lt_cv_sys_max_cmd_len+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else i=0 teststring=ABCD @@ -11603,7 +10990,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -11646,7 +11033,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -11688,11 +11075,11 @@ fi if test -n "$lt_cv_sys_max_cmd_len"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -11736,12 +11123,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -printf %s "checking how to convert $build file names to $host format... " >&6; } -if test ${lt_cv_to_host_file_cmd+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else case $host in *-*-mingw* ) case $build in @@ -11777,19 +11163,18 @@ fi to_host_file_cmd=$lt_cv_to_host_file_cmd -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -printf %s "checking how to convert $build file names to toolchain format... " >&6; } -if test ${lt_cv_to_tool_file_cmd+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in @@ -11805,23 +11190,22 @@ fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -printf %s "checking for $LD option to reload object files... " >&6; } -if test ${lt_cv_ld_reload_flag+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ld_reload_flag='-r' fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -11852,122 +11236,13 @@ if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. -set dummy ${ac_tool_prefix}file; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_FILECMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$FILECMD"; then - ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_FILECMD="${ac_tool_prefix}file" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -FILECMD=$ac_cv_prog_FILECMD -if test -n "$FILECMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 -printf "%s\n" "$FILECMD" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_FILECMD"; then - ac_ct_FILECMD=$FILECMD - # Extract the first word of "file", so it can be a program name with args. -set dummy file; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_FILECMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_FILECMD"; then - ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_FILECMD="file" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD -if test -n "$ac_ct_FILECMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 -printf "%s\n" "$ac_ct_FILECMD" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_FILECMD" = x; then - FILECMD=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - FILECMD=$ac_ct_FILECMD - fi -else - FILECMD="$ac_cv_prog_FILECMD" -fi - - - - - - - -if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -11975,15 +11250,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11994,11 +11265,11 @@ fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -printf "%s\n" "$OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12007,12 +11278,11 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -12020,15 +11290,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12039,11 +11305,11 @@ fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -printf "%s\n" "$ac_ct_OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -12051,8 +11317,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -12068,12 +11334,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -printf %s "checking how to recognize dependent libraries... " >&6; } -if test ${lt_cv_deplibs_check_method+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -12099,7 +11364,7 @@ bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='$FILECMD -L' + lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -12133,14 +11398,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -12154,7 +11419,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -12201,7 +11466,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -12269,8 +11534,8 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_glob= want_nocaseglob=no @@ -12314,12 +11579,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DLLTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -12327,15 +11591,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12346,11 +11606,11 @@ fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -printf "%s\n" "$DLLTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12359,12 +11619,11 @@ ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DLLTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -12372,15 +11631,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12391,11 +11646,11 @@ fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -printf "%s\n" "$ac_ct_DLLTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -12403,8 +11658,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -12421,12 +11676,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -printf %s "checking how to associate runtime and link libraries... " >&6; } -if test ${lt_cv_sharedlib_from_linklib_cmd+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in @@ -12449,8 +11703,8 @@ esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -12465,12 +11719,11 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -12478,15 +11731,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12497,11 +11746,11 @@ fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -printf "%s\n" "$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12514,12 +11763,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -12527,15 +11775,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12546,11 +11790,11 @@ fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -printf "%s\n" "$ac_ct_AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12562,8 +11806,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -12571,60 +11815,42 @@ fi : ${AR=ar} +: ${AR_FLAGS=cr} -# Use ARFLAGS variable as AR's operation code to sync the variable naming with -# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have -# higher priority because thats what people were doing historically (setting -# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS -# variable obsoleted/removed. - -test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} -lt_ar_flags=$AR_FLAGS - - - - -# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override -# by AR_FLAGS because that was never working and AR_FLAGS is about to die. - - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -printf %s "checking for archiver @FILE support... " >&6; } -if test ${lt_cv_ar_at_file+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. @@ -12632,7 +11858,7 @@ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ @@ -12641,11 +11867,11 @@ rm -f conftest.* libconftest.a fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -printf "%s\n" "$lt_cv_ar_at_file" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= @@ -12662,12 +11888,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -12675,15 +11900,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12694,11 +11915,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12707,12 +11928,11 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -12720,15 +11940,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12739,11 +11955,11 @@ fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -12751,8 +11967,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -12771,12 +11987,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -12784,15 +11999,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12803,11 +12014,11 @@ fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -printf "%s\n" "$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -12816,12 +12027,11 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -12829,15 +12039,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12848,11 +12054,11 @@ fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -printf "%s\n" "$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -12860,8 +12066,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -12950,12 +12156,11 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -printf %s "checking command to parse $NM output from $compiler object... " >&6; } -if test ${lt_cv_sys_global_symbol_pipe+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -13010,7 +12215,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -13028,20 +12233,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -13065,7 +12270,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++ or ICC, + # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -13083,9 +12288,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -13107,7 +12312,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm @@ -13180,7 +12385,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi @@ -13215,11 +12420,11 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -printf "%s\n" "failed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf "%s\n" "ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi # Response file support. @@ -13265,14 +12470,13 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -printf %s "checking for sysroot... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test ${with_sysroot+y} -then : +if test "${with_sysroot+set}" = set; then : withval=$with_sysroot; -else $as_nop +else with_sysroot=no fi @@ -13285,30 +12489,29 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ;; #( no|'') ;; #( *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 -printf "%s\n" "$with_sysroot" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -printf "%s\n" "${lt_sysroot:-no}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 -printf %s "checking for a working dd... " >&6; } -if test ${ac_cv_path_lt_DD+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i : ${lt_DD:=$DD} @@ -13319,15 +12522,10 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in dd - do + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext" + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_lt_DD" || continue if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then cmp -s conftest.i conftest.out \ @@ -13347,16 +12545,15 @@ rm -f conftest.i conftest2.i conftest.out fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 -printf "%s\n" "$ac_cv_path_lt_DD" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 -printf %s "checking how to truncate binary pipes... " >&6; } -if test ${lt_cv_truncate_bin+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i lt_cv_truncate_bin= @@ -13367,8 +12564,8 @@ rm -f conftest.i conftest2.i conftest.out test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 -printf "%s\n" "$lt_cv_truncate_bin" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } @@ -13391,8 +12588,7 @@ } # Check whether --enable-libtool-lock was given. -if test ${enable_libtool_lock+y} -then : +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -13408,9 +12604,9 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -13428,10 +12624,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -13443,7 +12639,7 @@ ;; esac else - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -13466,10 +12662,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -13477,7 +12673,7 @@ emul="${emul}64" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -13485,7 +12681,7 @@ emul="${emul}ltsmip" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -13507,16 +12703,16 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -13570,12 +12766,11 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -printf %s "checking whether the C compiler needs -belf... " >&6; } -if test ${lt_cv_cc_needs_belf+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -13586,20 +12781,19 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes -else $as_nop +else lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -13608,8 +12802,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS=$SAVE_CFLAGS @@ -13622,9 +12816,9 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -13659,12 +12853,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_MANIFEST_TOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else @@ -13672,15 +12865,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13691,11 +12880,11 @@ fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -printf "%s\n" "$MANIFEST_TOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -13704,12 +12893,11 @@ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL # Extract the first word of "mt", so it can be a program name with args. set dummy mt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else @@ -13717,15 +12905,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13736,11 +12920,11 @@ fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -13748,8 +12932,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -13759,12 +12943,11 @@ fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if test ${lt_cv_path_mainfest_tool+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out @@ -13774,8 +12957,8 @@ fi rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -13790,12 +12973,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DSYMUTIL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -13803,15 +12985,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13822,11 +13000,11 @@ fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -printf "%s\n" "$DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -13835,12 +13013,11 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -13848,15 +13025,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13867,11 +13040,11 @@ fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -13879,8 +13052,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -13892,12 +13065,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_NMEDIT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -13905,15 +13077,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13924,11 +13092,11 @@ fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -printf "%s\n" "$NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -13937,12 +13105,11 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_NMEDIT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -13950,15 +13117,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13969,11 +13132,11 @@ fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -printf "%s\n" "$ac_ct_NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -13981,8 +13144,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -13994,12 +13157,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_LIPO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -14007,15 +13169,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14026,11 +13184,11 @@ fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -printf "%s\n" "$LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -14039,12 +13197,11 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_LIPO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -14052,15 +13209,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14071,11 +13224,11 @@ fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -printf "%s\n" "$ac_ct_LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -14083,8 +13236,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -14096,12 +13249,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -14109,15 +13261,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14128,11 +13276,11 @@ fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -printf "%s\n" "$OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -14141,12 +13289,11 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -14154,15 +13301,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14173,11 +13316,11 @@ fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -printf "%s\n" "$ac_ct_OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -14185,8 +13328,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -14198,12 +13341,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OTOOL64+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -14211,15 +13353,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14230,11 +13368,11 @@ fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -printf "%s\n" "$OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -14243,12 +13381,11 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OTOOL64+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -14256,15 +13393,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14275,11 +13408,11 @@ fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -printf "%s\n" "$ac_ct_OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -14287,8 +13420,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -14323,12 +13456,11 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -printf %s "checking for -single_module linker flag... " >&6; } -if test ${lt_cv_apple_cc_single_mod+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_apple_cc_single_mod=no if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override @@ -14357,15 +13489,14 @@ rm -f conftest.* fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -printf %s "checking for -exported_symbols_list linker flag... " >&6; } -if test ${lt_cv_ld_exported_symbols_list+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym @@ -14374,41 +13505,39 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes -else $as_nop +else lt_cv_ld_exported_symbols_list=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -printf %s "checking for -force_load linker flag... " >&6; } -if test ${lt_cv_ld_force_load+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 - $AR $AR_FLAGS libconftest.a conftest.o 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -14428,19 +13557,24 @@ rm -rf conftest.dSYM fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -printf "%s\n" "$lt_cv_ld_force_load" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) - case $MACOSX_DEPLOYMENT_TARGET,$host in - 10.[012],*|,*powerpc*-darwin[5-8]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - *) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -14495,14 +13629,19 @@ esac } -ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes -then : - printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF fi +done + func_stripname_cnf () @@ -14526,12 +13665,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AS+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AS+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else @@ -14539,15 +13677,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AS="${ac_tool_prefix}as" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14558,11 +13692,11 @@ fi AS=$ac_cv_prog_AS if test -n "$AS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -printf "%s\n" "$AS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +$as_echo "$AS" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -14571,12 +13705,11 @@ ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_AS+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AS+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_AS"; then ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. else @@ -14584,15 +13717,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AS="as" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14603,11 +13732,11 @@ fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 -printf "%s\n" "$ac_ct_AS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +$as_echo "$ac_ct_AS" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_AS" = x; then @@ -14615,8 +13744,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AS=$ac_ct_AS @@ -14628,12 +13757,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DLLTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -14641,15 +13769,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14660,11 +13784,11 @@ fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -printf "%s\n" "$DLLTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -14673,12 +13797,11 @@ ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DLLTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -14686,15 +13809,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14705,11 +13824,11 @@ fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -printf "%s\n" "$ac_ct_DLLTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -14717,8 +13836,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -14730,12 +13849,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -14743,15 +13861,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14762,11 +13876,11 @@ fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -printf "%s\n" "$OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -14775,12 +13889,11 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -14788,15 +13901,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14807,11 +13916,11 @@ fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -printf "%s\n" "$ac_ct_OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -14819,8 +13928,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -14850,8 +13959,7 @@ # Check whether --enable-shared was given. -if test ${enable_shared+y} -then : +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -14869,7 +13977,7 @@ IFS=$lt_save_ifs ;; esac -else $as_nop +else enable_shared=yes fi @@ -14880,8 +13988,7 @@ # Check whether --enable-static was given. -if test ${enable_static+y} -then : +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -14899,7 +14006,7 @@ IFS=$lt_save_ifs ;; esac -else $as_nop +else enable_static=no fi @@ -14918,8 +14025,7 @@ # Check whether --with-pic was given. -if test ${with_pic+y} -then : +if test "${with_pic+set}" = set; then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -14936,7 +14042,7 @@ IFS=$lt_save_ifs ;; esac -else $as_nop +else pic_mode=default fi @@ -14948,8 +14054,7 @@ # Check whether --enable-fast-install was given. -if test ${enable_fast_install+y} -then : +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -14967,7 +14072,7 @@ IFS=$lt_save_ifs ;; esac -else $as_nop +else enable_fast_install=yes fi @@ -14981,12 +14086,11 @@ shared_archive_member_spec= case $host,$enable_shared in power*-*-aix[5-9]*,yes) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 -printf %s "checking which variant of shared library versioning to provide... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } # Check whether --with-aix-soname was given. -if test ${with_aix_soname+y} -then : +if test "${with_aix_soname+set}" = set; then : withval=$with_aix_soname; case $withval in aix|svr4|both) ;; @@ -14995,19 +14099,18 @@ ;; esac lt_cv_with_aix_soname=$with_aix_soname -else $as_nop - if test ${lt_cv_with_aix_soname+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_with_aix_soname=aix fi with_aix_soname=$lt_cv_with_aix_soname fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 -printf "%s\n" "$with_aix_soname" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } if test aix != "$with_aix_soname"; then # For the AIX way of multilib, we name the shared archive member # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', @@ -15089,12 +14192,11 @@ setopt NO_GLOB_SUBST fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -printf %s "checking for objdir... " >&6; } -if test ${lt_cv_objdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -15105,15 +14207,17 @@ fi rmdir .libs 2>/dev/null fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -printf "%s\n" "$lt_cv_objdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF @@ -15134,8 +14238,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC and -# ICC, which need '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -15159,12 +14263,11 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -printf %s "checking for ${ac_tool_prefix}file... " >&6; } -if test ${lt_cv_path_MAGIC_CMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. @@ -15213,11 +14316,11 @@ MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -printf "%s\n" "$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15226,12 +14329,11 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -printf %s "checking for file... " >&6; } -if test ${lt_cv_path_MAGIC_CMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. @@ -15280,11 +14382,11 @@ MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -printf "%s\n" "$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15369,12 +14471,11 @@ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test ${lt_cv_prog_compiler_rtti_exceptions+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -15405,8 +14506,8 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -15653,7 +14754,7 @@ lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -15769,28 +14870,26 @@ ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -printf %s "checking for $compiler option to produce PIC... " >&6; } -if test ${lt_cv_prog_compiler_pic+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test ${lt_cv_prog_compiler_pic_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -15821,8 +14920,8 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in @@ -15850,12 +14949,11 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test ${lt_cv_prog_compiler_static_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_static_works=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -15879,8 +14977,8 @@ LDFLAGS=$save_LDFLAGS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test yes = "$lt_cv_prog_compiler_static_works"; then : @@ -15894,12 +14992,11 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test ${lt_cv_prog_compiler_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -15942,20 +15039,19 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test ${lt_cv_prog_compiler_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -15998,8 +15094,8 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -16007,19 +15103,19 @@ hard_links=nottested if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -printf %s "checking if we can lock with hard links... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -printf "%s\n" "$hard_links" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test no = "$hard_links"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -16031,8 +15127,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -16076,15 +15172,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time + # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -16139,7 +15235,7 @@ whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -16251,7 +15347,6 @@ emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes - file_list_spec='@' ;; interix[3-9]*) @@ -16266,7 +15361,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -16309,7 +15404,7 @@ compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -16321,14 +15416,13 @@ if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -16338,7 +15432,7 @@ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -16470,7 +15564,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -16592,23 +15686,21 @@ if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if test ${lt_cv_aix_libpath_+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -16623,7 +15715,7 @@ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib @@ -16647,23 +15739,21 @@ if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if test ${lt_cv_aix_libpath_+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -16678,7 +15768,7 @@ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib @@ -16741,12 +15831,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl* | icl*) - # Native MSVC or ICC + cl*) + # Native MSVC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -16787,7 +15877,7 @@ fi' ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -16828,8 +15918,8 @@ output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -16863,7 +15953,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -16929,12 +16019,11 @@ # Older versions of the 11.00 compiler do not understand -b yet # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -printf %s "checking if $CC understands -b... " >&6; } -if test ${lt_cv_prog_compiler__b+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler__b=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" @@ -16958,8 +16047,8 @@ LDFLAGS=$save_LDFLAGS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } if test yes = "$lt_cv_prog_compiler__b"; then archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -16999,30 +16088,28 @@ # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if test ${lt_cv_irix_exported_symbol+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_cv_irix_exported_symbol=yes -else $as_nop +else lt_cv_irix_exported_symbol=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi @@ -17044,7 +16131,6 @@ # Fabrice Bellard et al's Tiny C Compiler ld_shlibs=yes archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ;; esac ;; @@ -17116,7 +16202,6 @@ emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes - file_list_spec='@' ;; osf3*) @@ -17305,8 +16390,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -printf "%s\n" "$ld_shlibs" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -17342,19 +16427,18 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -printf %s "checking whether -lc should be explicitly linked in... " >&6; } -if test ${lt_cv_archive_cmds_need_lc+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -17372,7 +16456,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no @@ -17386,8 +16470,8 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -17546,8 +16630,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -printf %s "checking dynamic linker characteristics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } if test yes = "$GCC"; then case $host_os in @@ -17809,7 +16893,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -17819,14 +16903,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl* | *,icl*) - # Native MSVC or ICC + *,cl*) + # Native MSVC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -17845,7 +16929,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -17882,7 +16966,7 @@ ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -17915,7 +16999,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -18108,10 +17192,9 @@ shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if test ${lt_cv_shlibpath_overrides_runpath+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -18121,21 +17204,19 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null -then : +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -18379,8 +17460,8 @@ dynamic_linker=no ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -printf "%s\n" "$dynamic_linker" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -18501,8 +17582,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -printf %s "checking how to hardcode library paths into programs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -18526,8 +17607,8 @@ # directories. hardcode_action=unsupported fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -printf "%s\n" "$hardcode_action" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } if test relink = "$hardcode_action" || test yes = "$inherit_rpath"; then @@ -18571,12 +17652,11 @@ darwin*) # if libdl is installed we need to link against it - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -printf %s "checking for dlopen in -ldl... " >&6; } -if test ${ac_cv_lib_dl_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18585,31 +17665,32 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes -else $as_nop +else ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else $as_nop +else lt_cv_dlopen=dyld lt_cv_dlopen_libs= @@ -18629,16 +17710,14 @@ *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes -then : +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen=shl_load -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -printf %s "checking for shl_load in -ldld... " >&6; } -if test ${ac_cv_lib_dld_shl_load+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18647,42 +17726,41 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char shl_load (); int -main (void) +main () { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes -else $as_nop +else ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld -else $as_nop +else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes -then : +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen=dlopen -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -printf %s "checking for dlopen in -ldl... " >&6; } -if test ${ac_cv_lib_dl_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18691,37 +17769,37 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes -else $as_nop +else ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -printf %s "checking for dlopen in -lsvld... " >&6; } -if test ${ac_cv_lib_svld_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18730,37 +17808,37 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes -else $as_nop +else ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -printf %s "checking for dld_link in -ldld... " >&6; } -if test ${ac_cv_lib_dld_dld_link+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18769,29 +17847,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char dld_link (); int -main (void) +main () { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes -else $as_nop +else ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -18830,12 +17909,11 @@ save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -printf %s "checking whether a program can dlopen itself... " >&6; } -if test ${lt_cv_dlopen_self+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else @@ -18914,7 +17992,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -18932,17 +18010,16 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -printf "%s\n" "$lt_cv_dlopen_self" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -printf %s "checking whether a statically linked program can dlopen itself... " >&6; } -if test ${lt_cv_dlopen_self_static+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else @@ -19021,7 +18098,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -19039,8 +18116,8 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS=$save_CPPFLAGS @@ -19078,43 +18155,32 @@ striplib= old_striplib= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -printf %s "checking whether stripping libraries is possible... " >&6; } -if test -z "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -else - if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - else - case $host_os in - darwin*) - # FIXME - insert some real tests, host_os isn't really good enough +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - ;; - freebsd*) - if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - fi - ;; - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - ;; - esac - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac fi @@ -19129,13 +18195,13 @@ # Report what library types will actually be built - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -printf %s "checking if libtool supports shared libraries... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -printf "%s\n" "$can_build_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -printf %s "checking whether to build shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -19159,15 +18225,15 @@ fi ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -printf "%s\n" "$enable_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -printf %s "checking whether to build static libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test yes = "$enable_shared" || enable_static=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -printf "%s\n" "$enable_static" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } @@ -19189,32 +18255,36 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -printf %s "checking how to run the C++ preprocessor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test ${ac_cv_prog_CXXCPP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CXX needs to be expanded - for CXXCPP in "$CXX -E" cpp /lib/cpp + if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" do ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -19226,11 +18296,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -19240,8 +18309,7 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : break fi @@ -19253,24 +18321,29 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -printf "%s\n" "$CXXCPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -19282,11 +18355,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -19296,12 +18368,11 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -19437,18 +18508,17 @@ # Check whether --with-gnu-ld was given. -if test ${with_gnu_ld+y} -then : +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else $as_nop +else with_gnu_ld=no fi ac_prog=ld if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -printf %s "checking for ld used by $CC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return, which upsets mingw @@ -19477,16 +18547,15 @@ ;; esac elif test yes = "$with_gnu_ld"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -printf %s "checking for GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -printf %s "checking for non-GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test ${lt_cv_path_LD+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -19515,19 +18584,18 @@ LD=$lt_cv_path_LD if test -n "$LD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -printf "%s\n" "$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -printf %s "checking if the linker ($LD) is GNU ld... " >&6; } -if test ${lt_cv_prog_gnu_ld+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 -printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -19593,8 +18661,8 @@ fi # PORTME: fill in a description of your system's C++ link characteristics - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -19732,23 +18800,21 @@ if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if test ${lt_cv_aix_libpath__CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -19763,7 +18829,7 @@ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then lt_cv_aix_libpath__CXX=/usr/lib:/lib @@ -19788,23 +18854,21 @@ if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if test ${lt_cv_aix_libpath__CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -19819,7 +18883,7 @@ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then lt_cv_aix_libpath__CXX=/usr/lib:/lib @@ -19884,8 +18948,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl* | ,icl* | no,icl*) - # Native MSVC or ICC + ,cl* | no,cl*) + # Native MSVC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec_CXX=' ' @@ -19976,11 +19040,11 @@ output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds_CXX="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" if test yes != "$lt_cv_apple_cc_single_mod"; then archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -20015,7 +19079,6 @@ emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes_CXX=yes - file_list_spec_CXX='@' ;; dgux*) @@ -20046,7 +19109,7 @@ archive_cmds_need_lc_CXX=no ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -20183,7 +19246,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -20323,13 +19386,13 @@ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' @@ -20671,8 +19734,8 @@ ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -printf "%s\n" "$ld_shlibs_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } test no = "$ld_shlibs_CXX" && can_build_shared=no GCC_CXX=$GXX @@ -20710,7 +19773,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -20986,7 +20049,7 @@ ;; esac ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -21069,7 +20132,7 @@ lt_prog_compiler_static_CXX='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 lt_prog_compiler_pic_CXX='-KPIC' @@ -21191,28 +20254,26 @@ ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -printf %s "checking for $compiler option to produce PIC... " >&6; } -if test ${lt_cv_prog_compiler_pic_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test ${lt_cv_prog_compiler_pic_works_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -21243,8 +20304,8 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in @@ -21266,12 +20327,11 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test ${lt_cv_prog_compiler_static_works_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -21295,8 +20355,8 @@ LDFLAGS=$save_LDFLAGS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : @@ -21307,12 +20367,11 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test ${lt_cv_prog_compiler_c_o_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_c_o_CXX=no $RM -r conftest 2>/dev/null mkdir conftest @@ -21355,17 +20414,16 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test ${lt_cv_prog_compiler_c_o_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_c_o_CXX=no $RM -r conftest 2>/dev/null mkdir conftest @@ -21408,8 +20466,8 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } @@ -21417,19 +20475,19 @@ hard_links=nottested if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -printf %s "checking if we can lock with hard links... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -printf "%s\n" "$hard_links" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test no = "$hard_links"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -21438,8 +20496,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' @@ -21456,7 +20514,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -21464,7 +20522,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl* | icl*) + cl*) exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -21481,8 +20539,8 @@ ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -printf "%s\n" "$ld_shlibs_CXX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -21509,19 +20567,18 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -printf %s "checking whether -lc should be explicitly linked in... " >&6; } -if test ${lt_cv_archive_cmds_need_lc_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -21539,7 +20596,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc_CXX=no @@ -21553,8 +20610,8 @@ $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -printf "%s\n" "$lt_cv_archive_cmds_need_lc_CXX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac @@ -21623,8 +20680,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -printf %s "checking dynamic linker characteristics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' @@ -21815,7 +20872,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) @@ -21824,14 +20881,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl* | *,icl*) - # Native MSVC or ICC + *,cl*) + # Native MSVC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -21850,7 +20907,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -21887,7 +20944,7 @@ ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -21919,7 +20976,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -22112,10 +21169,9 @@ shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if test ${lt_cv_shlibpath_overrides_runpath+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -22125,21 +21181,19 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null -then : +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -22383,8 +21437,8 @@ dynamic_linker=no ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -printf "%s\n" "$dynamic_linker" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -22448,8 +21502,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -printf %s "checking how to hardcode library paths into programs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || @@ -22473,8 +21527,8 @@ # directories. hardcode_action_CXX=unsupported fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -printf "%s\n" "$hardcode_action_CXX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +$as_echo "$hardcode_action_CXX" >&6; } if test relink = "$hardcode_action_CXX" || test yes = "$inherit_rpath_CXX"; then @@ -22538,12 +21592,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_RC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$RC"; then ac_cv_prog_RC="$RC" # Let the user override the test. else @@ -22551,15 +21604,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RC="${ac_tool_prefix}windres" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22570,11 +21619,11 @@ fi RC=$ac_cv_prog_RC if test -n "$RC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RC" >&5 -printf "%s\n" "$RC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5 +$as_echo "$RC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22583,12 +21632,11 @@ ac_ct_RC=$RC # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_RC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_RC"; then ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test. else @@ -22596,15 +21644,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RC="windres" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22615,11 +21659,11 @@ fi ac_ct_RC=$ac_cv_prog_ac_ct_RC if test -n "$ac_ct_RC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5 -printf "%s\n" "$ac_ct_RC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5 +$as_echo "$ac_ct_RC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RC" = x; then @@ -22627,8 +21671,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RC=$ac_ct_RC @@ -22722,12 +21766,11 @@ # Josh Triplett # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_DOLT_BASH+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DOLT_BASH+:} false; then : + $as_echo_n "(cached) " >&6 +else case $DOLT_BASH in [\\/]* | ?:[\\/]*) ac_cv_path_DOLT_BASH="$DOLT_BASH" # Let the user override the test with a path. @@ -22737,15 +21780,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_DOLT_BASH="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DOLT_BASH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22757,23 +21796,21 @@ fi DOLT_BASH=$ac_cv_path_DOLT_BASH if test -n "$DOLT_BASH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOLT_BASH" >&5 -printf "%s\n" "$DOLT_BASH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOLT_BASH" >&5 +$as_echo "$DOLT_BASH" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dolt supports this host" >&5 -printf %s "checking if dolt supports this host... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dolt supports this host" >&5 +$as_echo_n "checking if dolt supports this host... " >&6; } dolt_supported=yes -if test x$DOLT_BASH = x -then : +if test x$DOLT_BASH = x; then : dolt_supported=no fi -if test x$GCC != xyes -then : +if test x$GCC != xyes; then : dolt_supported=no fi @@ -22789,19 +21826,18 @@ dolt_supported=no ;; esac -if test x$dolt_supported = xno -then : +if test x$dolt_supported = xno; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, falling back to libtool" >&5 -printf "%s\n" "no, falling back to libtool" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, falling back to libtool" >&5 +$as_echo "no, falling back to libtool" >&6; } LTCOMPILE='$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' LTCXXCOMPILE='$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, replacing libtool" >&5 -printf "%s\n" "yes, replacing libtool" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, replacing libtool" >&5 +$as_echo "yes, replacing libtool" >&6; } cat <<__DOLTCOMPILE__EOF__ >doltcompile #!$DOLT_BASH @@ -22941,8 +21977,7 @@ lt_cv_deplibs_check_method=pass_all -if test "${enable_shared}" = "no" -a "${enable_vlc}" != "no" -then : +if test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"; then : as_fn_error $? "VLC is based on plugins. Shared libraries cannot be disabled." "$LINENO" 5 @@ -22950,18 +21985,17 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -printf %s "checking whether NLS is requested... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test ${enable_nls+y} -then : +if test "${enable_nls+set}" = set; then : enableval=$enable_nls; USE_NLS=$enableval -else $as_nop +else USE_NLS=yes fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -printf "%s\n" "$USE_NLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } @@ -23000,12 +22034,11 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MSGFMT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$MSGFMT" in [\\/]* | ?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. @@ -23033,21 +22066,20 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -printf "%s\n" "$MSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GMSGFMT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GMSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. @@ -23057,15 +22089,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -23078,11 +22106,11 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -printf "%s\n" "$GMSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -23128,12 +22156,11 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_XGETTEXT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XGETTEXT+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$XGETTEXT" in [\\/]* | ?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. @@ -23161,11 +22188,11 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -printf "%s\n" "$XGETTEXT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f messages.po @@ -23206,12 +22233,11 @@ # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MSGMERGE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGMERGE+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$MSGMERGE" in [\\/]* | ?:[\\/]*) ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. @@ -23238,11 +22264,11 @@ fi MSGMERGE="$ac_cv_path_MSGMERGE" if test "$MSGMERGE" != ":"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -printf "%s\n" "$MSGMERGE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -23274,10 +22300,9 @@ # Check whether --with-gnu-ld was given. -if test ${with_gnu_ld+y} -then : +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else $as_nop +else with_gnu_ld=no fi @@ -23297,8 +22322,8 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -printf %s "checking for ld used by $CC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -23327,16 +22352,15 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -printf %s "checking for GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -printf %s "checking for non-GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test ${acl_cv_path_LD+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${acl_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$LD"; then acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -23365,19 +22389,18 @@ LD="$acl_cv_path_LD" if test -n "$LD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -printf "%s\n" "$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -printf %s "checking if the linker ($LD) is GNU ld... " >&6; } -if test ${acl_cv_prog_gnu_ld+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${acl_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 -printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 +$as_echo "$acl_cv_prog_gnu_ld" >&6; } with_gnu_ld=$acl_cv_prog_gnu_ld - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 -printf %s "checking for shared library run path origin... " >&6; } -if test ${acl_cv_rpath+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 +$as_echo_n "checking for shared library run path origin... " >&6; } +if ${acl_cv_rpath+:} false; then : + $as_echo_n "(cached) " >&6 +else CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh @@ -23410,8 +22431,8 @@ acl_cv_rpath=done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 -printf "%s\n" "$acl_cv_rpath" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 +$as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" acl_libext="$acl_cv_libext" acl_shlibext="$acl_cv_shlibext" @@ -23422,10 +22443,9 @@ acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. -if test ${enable_rpath+y} -then : +if test "${enable_rpath+set}" = set; then : enableval=$enable_rpath; : -else $as_nop +else enable_rpath=yes fi @@ -23436,12 +22456,11 @@ acl_libdirstem2= case "$host_os" in solaris*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 -printf %s "checking for 64-bit host... " >&6; } -if test ${gl_cv_solaris_64bit+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if ${gl_cv_solaris_64bit+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23451,18 +22470,17 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "sixtyfour bits" >/dev/null 2>&1 -then : + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : gl_cv_solaris_64bit=yes -else $as_nop +else gl_cv_solaris_64bit=no fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 -printf "%s\n" "$gl_cv_solaris_64bit" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$gl_cv_solaris_64bit" >&6; } if test $gl_cv_solaris_64bit = yes; then acl_libdirstem=lib/64 case "$host_cpu" in @@ -23521,8 +22539,7 @@ # Check whether --with-libiconv-prefix was given. -if test ${with_libiconv_prefix+y} -then : +if test "${with_libiconv_prefix+set}" = set; then : withval=$with_libiconv_prefix; if test "X$withval" = "Xno"; then use_additional=no @@ -23986,76 +23003,72 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 -printf %s "checking for CFPreferencesCopyAppValue... " >&6; } -if test ${gt_cv_func_CFPreferencesCopyAppValue+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { CFPreferencesCopyAppValue(NULL, NULL) ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_CFPreferencesCopyAppValue=yes -else $as_nop +else gt_cv_func_CFPreferencesCopyAppValue=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$gt_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then -printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 -printf %s "checking for CFLocaleCopyCurrent... " >&6; } -if test ${gt_cv_func_CFLocaleCopyCurrent+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { CFLocaleCopyCurrent(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_CFLocaleCopyCurrent=yes -else $as_nop +else gt_cv_func_CFLocaleCopyCurrent=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$gt_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 -printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } if test $gt_cv_func_CFLocaleCopyCurrent = yes; then -printf "%s\n" "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h fi INTL_MACOSX_LIBS= @@ -24100,12 +23113,11 @@ gt_expression_test_code= fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 -printf %s "checking for GNU gettext in libc... " >&6; } -if eval test \${$gt_func_gnugettext_libc+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if eval \${$gt_func_gnugettext_libc+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24120,7 +23132,7 @@ $gt_revision_test_code int -main (void) +main () { bindtextdomain ("", ""); @@ -24130,18 +23142,17 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$gt_func_gnugettext_libc=yes" -else $as_nop +else eval "$gt_func_gnugettext_libc=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$gt_func_gnugettext_libc - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then @@ -24174,12 +23185,11 @@ done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -printf %s "checking for iconv... " >&6; } -if test ${am_cv_func_iconv+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no @@ -24190,7 +23200,7 @@ #include int -main (void) +main () { iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); @@ -24199,11 +23209,10 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : am_cv_func_iconv=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" @@ -24215,7 +23224,7 @@ #include int -main (void) +main () { iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); @@ -24224,26 +23233,24 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : am_cv_lib_iconv=yes am_cv_func_iconv=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -printf "%s\n" "$am_cv_func_iconv" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 -printf %s "checking for working iconv... " >&6; } -if test ${am_cv_func_iconv_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then @@ -24251,13 +23258,12 @@ fi am_cv_func_iconv_works=no for ac_iconv_const in '' 'const'; do - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24269,7 +23275,7 @@ #endif int -main (void) +main () { int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful @@ -24371,8 +23377,7 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -24384,8 +23389,8 @@ LIBS="$am_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 -printf "%s\n" "$am_cv_func_iconv_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; *) am_func_iconv=yes ;; @@ -24395,14 +23400,14 @@ fi if test "$am_func_iconv" = yes; then -printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h +$as_echo "#define HAVE_ICONV 1" >>confdefs.h fi if test "$am_cv_lib_iconv" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -printf %s "checking how to link with libiconv... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -printf "%s\n" "$LIBICONV" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } else CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= @@ -24434,8 +23439,7 @@ # Check whether --with-libintl-prefix was given. -if test ${with_libintl_prefix+y} -then : +if test "${with_libintl_prefix+set}" = set; then : withval=$with_libintl_prefix; if test "X$withval" = "Xno"; then use_additional=no @@ -24874,12 +23878,11 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 -printf %s "checking for GNU gettext in libintl... " >&6; } -if eval test \${$gt_func_gnugettext_libintl+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if eval \${$gt_func_gnugettext_libintl+:} false; then : + $as_echo_n "(cached) " >&6 +else gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" @@ -24902,7 +23905,7 @@ $gt_revision_test_code int -main (void) +main () { bindtextdomain ("", ""); @@ -24912,13 +23915,12 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$gt_func_gnugettext_libintl=yes" -else $as_nop +else eval "$gt_func_gnugettext_libintl=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" @@ -24940,7 +23942,7 @@ $gt_revision_test_code int -main (void) +main () { bindtextdomain ("", ""); @@ -24950,22 +23952,21 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" eval "$gt_func_gnugettext_libintl=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi eval ac_res=\$$gt_func_gnugettext_libintl - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ @@ -24992,20 +23993,20 @@ if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then -printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h +$as_echo "#define ENABLE_NLS 1" >>confdefs.h else USE_NLS=no fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 -printf %s "checking whether to use NLS... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -printf "%s\n" "$USE_NLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } if test "$USE_NLS" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 -printf %s "checking where the gettext function comes from... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +$as_echo_n "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" @@ -25015,18 +24016,18 @@ else gt_source="included intl directory" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 -printf "%s\n" "$gt_source" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$gt_source" >&6; } fi if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 -printf %s "checking how to link with libintl... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 -printf "%s\n" "$LIBINTL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$LIBINTL" >&6; } for element in $INCINTL; do haveit= @@ -25053,10 +24054,10 @@ fi -printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h -printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h fi @@ -25103,12 +24104,11 @@ done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -printf %s "checking for iconv... " >&6; } -if test ${am_cv_func_iconv+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no @@ -25119,7 +24119,7 @@ #include int -main (void) +main () { iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); @@ -25128,11 +24128,10 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : am_cv_func_iconv=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" @@ -25144,7 +24143,7 @@ #include int -main (void) +main () { iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); @@ -25153,26 +24152,24 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : am_cv_lib_iconv=yes am_cv_func_iconv=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -printf "%s\n" "$am_cv_func_iconv" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 -printf %s "checking for working iconv... " >&6; } -if test ${am_cv_func_iconv_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then @@ -25180,13 +24177,12 @@ fi am_cv_func_iconv_works=no for ac_iconv_const in '' 'const'; do - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25198,7 +24194,7 @@ #endif int -main (void) +main () { int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful @@ -25300,8 +24296,7 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -25313,8 +24308,8 @@ LIBS="$am_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 -printf "%s\n" "$am_cv_func_iconv_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; *) am_func_iconv=yes ;; @@ -25324,14 +24319,14 @@ fi if test "$am_func_iconv" = yes; then -printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h +$as_echo "#define HAVE_ICONV 1" >>confdefs.h fi if test "$am_cv_lib_iconv" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -printf %s "checking how to link with libiconv... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -printf "%s\n" "$LIBICONV" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } else CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= @@ -25341,12 +24336,11 @@ if test "$am_cv_func_iconv" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -printf %s "checking for iconv declaration... " >&6; } - if test ${am_cv_proto_iconv+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 +$as_echo_n "checking for iconv declaration... " >&6; } + if ${am_cv_proto_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25364,37 +24358,37 @@ #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : am_cv_proto_iconv_arg1="" -else $as_nop +else am_cv_proto_iconv_arg1="const" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" fi am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_proto_iconv" >&5 -printf "%s\n" " +$as_echo " $am_cv_proto_iconv" >&6; } -printf "%s\n" "#define ICONV_CONST $am_cv_proto_iconv_arg1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define ICONV_CONST $am_cv_proto_iconv_arg1 +_ACEOF fi -if test "${SYS}" = "mingw32" -then : +if test "${SYS}" = "mingw32"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -25405,12 +24399,11 @@ #endif _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken mingw-runtime" >&5 -printf %s "checking for broken mingw-runtime... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken mingw-runtime" >&5 +$as_echo_n "checking for broken mingw-runtime... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25424,16 +24417,15 @@ #endif _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf "%s\n" "ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: present" >&5 -printf "%s\n" "present" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: present" >&5 +$as_echo "present" >&6; } as_fn_error $? "LibVLC requires mingw-runtime version 3.15 or higher, or mingw-w64 version 3.0 or higher!" "$LINENO" 5 fi @@ -25449,12 +24441,11 @@ LDFLAGS_save="${LDFLAGS}" LIBS_save="${LIBS}" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opendir in -lmingwex" >&5 -printf %s "checking for opendir in -lmingwex... " >&6; } -if test ${ac_cv_lib_mingwex_opendir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opendir in -lmingwex" >&5 +$as_echo_n "checking for opendir in -lmingwex... " >&6; } +if ${ac_cv_lib_mingwex_opendir+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lmingwex $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -25463,35 +24454,35 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char opendir (); int -main (void) +main () { return opendir (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_mingwex_opendir=yes -else $as_nop +else ac_cv_lib_mingwex_opendir=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mingwex_opendir" >&5 -printf "%s\n" "$ac_cv_lib_mingwex_opendir" >&6; } -if test "x$ac_cv_lib_mingwex_opendir" = xyes -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opendir in -lmingw32" >&5 -printf %s "checking for opendir in -lmingw32... " >&6; } -if test ${ac_cv_lib_mingw32_opendir+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mingwex_opendir" >&5 +$as_echo "$ac_cv_lib_mingwex_opendir" >&6; } +if test "x$ac_cv_lib_mingwex_opendir" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opendir in -lmingw32" >&5 +$as_echo_n "checking for opendir in -lmingw32... " >&6; } +if ${ac_cv_lib_mingw32_opendir+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lmingw32 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -25500,34 +24491,37 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char opendir (); int -main (void) +main () { return opendir (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_mingw32_opendir=yes -else $as_nop +else ac_cv_lib_mingw32_opendir=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mingw32_opendir" >&5 -printf "%s\n" "$ac_cv_lib_mingw32_opendir" >&6; } -if test "x$ac_cv_lib_mingw32_opendir" = xyes -then : - printf "%s\n" "#define HAVE_LIBMINGW32 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mingw32_opendir" >&5 +$as_echo "$ac_cv_lib_mingw32_opendir" >&6; } +if test "x$ac_cv_lib_mingw32_opendir" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBMINGW32 1 +_ACEOF LIBS="-lmingw32 $LIBS" -else $as_nop +else eval "LIBS_libvlccore="'"'"-lmingwex "'$'"{LIBS_libvlccore}"'"' @@ -25548,20 +24542,19 @@ LIBS="${LIBS_save}" -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Not compiling with mingw" >&5 -printf "%s\n" "Not compiling with mingw" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not compiling with mingw" >&5 +$as_echo "Not compiling with mingw" >&6; } fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mms-bitfields" >&5 -printf %s "checking whether C compiler accepts -mms-bitfields... " >&6; } -if test ${ax_cv_check_cflags___mms_bitfields+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mms-bitfields" >&5 +$as_echo_n "checking whether C compiler accepts -mms-bitfields... " >&6; } +if ${ax_cv_check_cflags___mms_bitfields+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS -mms-bitfields" @@ -25569,89 +24562,85 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ax_cv_check_cflags___mms_bitfields=yes -else $as_nop +else ax_cv_check_cflags___mms_bitfields=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mms_bitfields" >&5 -printf "%s\n" "$ax_cv_check_cflags___mms_bitfields" >&6; } -if test "x$ax_cv_check_cflags___mms_bitfields" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mms_bitfields" >&5 +$as_echo "$ax_cv_check_cflags___mms_bitfields" >&6; } +if test "x$ax_cv_check_cflags___mms_bitfields" = xyes; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" -mms-bitfields "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -mms-bitfields"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -mms-bitfields"; } >&5 (: CFLAGS already contains -mms-bitfields) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " -mms-bitfields" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=-mms-bitfields - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" -mms-bitfields "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -mms-bitfields"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -mms-bitfields"; } >&5 (: CXXFLAGS already contains -mms-bitfields) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " -mms-bitfields" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=-mms-bitfields - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi @@ -25659,12 +24648,11 @@ # Check for the warning flag without "-Wno-", GCC accepts # -Wno- for unsupported warnings, which can trigger # other warnings instead. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wincompatible-ms-struct" >&5 -printf %s "checking whether C compiler accepts -Wincompatible-ms-struct... " >&6; } -if test ${ax_cv_check_cflags___Wincompatible_ms_struct+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wincompatible-ms-struct" >&5 +$as_echo_n "checking whether C compiler accepts -Wincompatible-ms-struct... " >&6; } +if ${ax_cv_check_cflags___Wincompatible_ms_struct+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS -Wincompatible-ms-struct" @@ -25672,107 +24660,102 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ax_cv_check_cflags___Wincompatible_ms_struct=yes -else $as_nop +else ax_cv_check_cflags___Wincompatible_ms_struct=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wincompatible_ms_struct" >&5 -printf "%s\n" "$ax_cv_check_cflags___Wincompatible_ms_struct" >&6; } -if test "x$ax_cv_check_cflags___Wincompatible_ms_struct" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wincompatible_ms_struct" >&5 +$as_echo "$ax_cv_check_cflags___Wincompatible_ms_struct" >&6; } +if test "x$ax_cv_check_cflags___Wincompatible_ms_struct" = xyes; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" -Wno-incompatible-ms-struct "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -Wno-incompatible-ms-struct"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -Wno-incompatible-ms-struct"; } >&5 (: CFLAGS already contains -Wno-incompatible-ms-struct) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " -Wno-incompatible-ms-struct" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=-Wno-incompatible-ms-struct - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" -Wno-incompatible-ms-struct "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -Wno-incompatible-ms-struct"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -Wno-incompatible-ms-struct"; } >&5 (: CXXFLAGS already contains -Wno-incompatible-ms-struct) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " -Wno-incompatible-ms-struct" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=-Wno-incompatible-ms-struct - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fnative-struct" >&5 -printf %s "checking whether C compiler accepts -fnative-struct... " >&6; } -if test ${ax_cv_check_cflags___fnative_struct+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fnative-struct" >&5 +$as_echo_n "checking whether C compiler accepts -fnative-struct... " >&6; } +if ${ax_cv_check_cflags___fnative_struct+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS -fnative-struct" @@ -25780,95 +24763,91 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ax_cv_check_cflags___fnative_struct=yes -else $as_nop +else ax_cv_check_cflags___fnative_struct=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fnative_struct" >&5 -printf "%s\n" "$ax_cv_check_cflags___fnative_struct" >&6; } -if test "x$ax_cv_check_cflags___fnative_struct" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fnative_struct" >&5 +$as_echo "$ax_cv_check_cflags___fnative_struct" >&6; } +if test "x$ax_cv_check_cflags___fnative_struct" = xyes; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" -fnative-struct "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -fnative-struct"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -fnative-struct"; } >&5 (: CFLAGS already contains -fnative-struct) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " -fnative-struct" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=-fnative-struct - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" -fnative-struct "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -fnative-struct"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -fnative-struct"; } >&5 (: CXXFLAGS already contains -fnative-struct) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " -fnative-struct" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=-fnative-struct - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -25879,8 +24858,8 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for buggy GNU/libc versions" >&5 -printf %s "checking for buggy GNU/libc versions... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for buggy GNU/libc versions" >&5 +$as_echo_n "checking for buggy GNU/libc versions... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25891,18 +24870,16 @@ #endif _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not present" >&5 -printf "%s\n" "not present" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5 +$as_echo "not present" >&6; } -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -printf "%s\n" "found" >&6; } - if test "x${enable_nls}" != "xno" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } + if test "x${enable_nls}" != "xno"; then : as_fn_error $? "Buggy GNU/libc (version 2.5 - 2.7) present. VLC would crash; there is no viable work-around for this. Check with your distribution vendor on how to update the @@ -25915,8 +24892,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared objects suffix" >&5 -printf %s "checking for shared objects suffix... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared objects suffix" >&5 +$as_echo_n "checking for shared objects suffix... " >&6; } case "${host_os}" in darwin*) LIBEXT=".dylib" @@ -25931,184 +24908,34 @@ LIBEXT=".so" ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LIBEXT}" >&5 -printf "%s\n" "${LIBEXT}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBEXT}" >&5 +$as_echo "${LIBEXT}" >&6; } -printf "%s\n" "#define LIBEXT \"${LIBEXT}\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LIBEXT "${LIBEXT}" +_ACEOF need_libc=false -ac_fn_c_check_func "$LINENO" "accept4" "ac_cv_func_accept4" -if test "x$ac_cv_func_accept4" = xyes -then : - printf "%s\n" "#define HAVE_ACCEPT4 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "daemon" "ac_cv_func_daemon" -if test "x$ac_cv_func_daemon" = xyes -then : - printf "%s\n" "#define HAVE_DAEMON 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl" -if test "x$ac_cv_func_fcntl" = xyes -then : - printf "%s\n" "#define HAVE_FCNTL 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock" -if test "x$ac_cv_func_flock" = xyes -then : - printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "fstatvfs" "ac_cv_func_fstatvfs" -if test "x$ac_cv_func_fstatvfs" = xyes -then : - printf "%s\n" "#define HAVE_FSTATVFS 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork" -if test "x$ac_cv_func_fork" = xyes -then : - printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "getenv" "ac_cv_func_getenv" -if test "x$ac_cv_func_getenv" = xyes -then : - printf "%s\n" "#define HAVE_GETENV 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "getmntent_r" "ac_cv_func_getmntent_r" -if test "x$ac_cv_func_getmntent_r" = xyes -then : - printf "%s\n" "#define HAVE_GETMNTENT_R 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r" -if test "x$ac_cv_func_getpwuid_r" = xyes -then : - printf "%s\n" "#define HAVE_GETPWUID_R 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "isatty" "ac_cv_func_isatty" -if test "x$ac_cv_func_isatty" = xyes -then : - printf "%s\n" "#define HAVE_ISATTY 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "lstat" "ac_cv_func_lstat" -if test "x$ac_cv_func_lstat" = xyes -then : - printf "%s\n" "#define HAVE_LSTAT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "memalign" "ac_cv_func_memalign" -if test "x$ac_cv_func_memalign" = xyes -then : - printf "%s\n" "#define HAVE_MEMALIGN 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "mkostemp" "ac_cv_func_mkostemp" -if test "x$ac_cv_func_mkostemp" = xyes -then : - printf "%s\n" "#define HAVE_MKOSTEMP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" -if test "x$ac_cv_func_mmap" = xyes -then : - printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "newlocale" "ac_cv_func_newlocale" -if test "x$ac_cv_func_newlocale" = xyes -then : - printf "%s\n" "#define HAVE_NEWLOCALE 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "open_memstream" "ac_cv_func_open_memstream" -if test "x$ac_cv_func_open_memstream" = xyes -then : - printf "%s\n" "#define HAVE_OPEN_MEMSTREAM 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "openat" "ac_cv_func_openat" -if test "x$ac_cv_func_openat" = xyes -then : - printf "%s\n" "#define HAVE_OPENAT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2" -if test "x$ac_cv_func_pipe2" = xyes -then : - printf "%s\n" "#define HAVE_PIPE2 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread" -if test "x$ac_cv_func_pread" = xyes -then : - printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "posix_fadvise" "ac_cv_func_posix_fadvise" -if test "x$ac_cv_func_posix_fadvise" = xyes -then : - printf "%s\n" "#define HAVE_POSIX_FADVISE 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "posix_madvise" "ac_cv_func_posix_madvise" -if test "x$ac_cv_func_posix_madvise" = xyes -then : - printf "%s\n" "#define HAVE_POSIX_MADVISE 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign" -if test "x$ac_cv_func_posix_memalign" = xyes -then : - printf "%s\n" "#define HAVE_POSIX_MEMALIGN 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" -if test "x$ac_cv_func_setlocale" = xyes -then : - printf "%s\n" "#define HAVE_SETLOCALE 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "stricmp" "ac_cv_func_stricmp" -if test "x$ac_cv_func_stricmp" = xyes -then : - printf "%s\n" "#define HAVE_STRICMP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strnicmp" "ac_cv_func_strnicmp" -if test "x$ac_cv_func_strnicmp" = xyes -then : - printf "%s\n" "#define HAVE_STRNICMP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime" -if test "x$ac_cv_func_strptime" = xyes -then : - printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "uselocale" "ac_cv_func_uselocale" -if test "x$ac_cv_func_uselocale" = xyes -then : - printf "%s\n" "#define HAVE_USELOCALE 1" >>confdefs.h +for ac_func in accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi +done ac_fn_c_check_func "$LINENO" "aligned_alloc" "ac_cv_func_aligned_alloc" -if test "x$ac_cv_func_aligned_alloc" = xyes -then : - printf "%s\n" "#define HAVE_ALIGNED_ALLOC 1" >>confdefs.h +if test "x$ac_cv_func_aligned_alloc" = xyes; then : + $as_echo "#define HAVE_ALIGNED_ALLOC 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" aligned_alloc.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS aligned_alloc.$ac_objext" @@ -26116,12 +24943,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "atof" "ac_cv_func_atof" -if test "x$ac_cv_func_atof" = xyes -then : - printf "%s\n" "#define HAVE_ATOF 1" >>confdefs.h +if test "x$ac_cv_func_atof" = xyes; then : + $as_echo "#define HAVE_ATOF 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" atof.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS atof.$ac_objext" @@ -26129,12 +24956,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "atoll" "ac_cv_func_atoll" -if test "x$ac_cv_func_atoll" = xyes -then : - printf "%s\n" "#define HAVE_ATOLL 1" >>confdefs.h +if test "x$ac_cv_func_atoll" = xyes; then : + $as_echo "#define HAVE_ATOLL 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" atoll.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS atoll.$ac_objext" @@ -26142,12 +24969,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd" -if test "x$ac_cv_func_dirfd" = xyes -then : - printf "%s\n" "#define HAVE_DIRFD 1" >>confdefs.h +if test "x$ac_cv_func_dirfd" = xyes; then : + $as_echo "#define HAVE_DIRFD 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" dirfd.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS dirfd.$ac_objext" @@ -26155,12 +24982,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "fdopendir" "ac_cv_func_fdopendir" -if test "x$ac_cv_func_fdopendir" = xyes -then : - printf "%s\n" "#define HAVE_FDOPENDIR 1" >>confdefs.h +if test "x$ac_cv_func_fdopendir" = xyes; then : + $as_echo "#define HAVE_FDOPENDIR 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" fdopendir.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS fdopendir.$ac_objext" @@ -26168,25 +24995,12 @@ esac fi -ac_fn_c_check_func "$LINENO" "ffsll" "ac_cv_func_ffsll" -if test "x$ac_cv_func_ffsll" = xyes -then : - printf "%s\n" "#define HAVE_FFSLL 1" >>confdefs.h - -else $as_nop - case " $LIBOBJS " in - *" ffsll.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS ffsll.$ac_objext" - ;; -esac -fi ac_fn_c_check_func "$LINENO" "flockfile" "ac_cv_func_flockfile" -if test "x$ac_cv_func_flockfile" = xyes -then : - printf "%s\n" "#define HAVE_FLOCKFILE 1" >>confdefs.h +if test "x$ac_cv_func_flockfile" = xyes; then : + $as_echo "#define HAVE_FLOCKFILE 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" flockfile.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS flockfile.$ac_objext" @@ -26194,12 +25008,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "fsync" "ac_cv_func_fsync" -if test "x$ac_cv_func_fsync" = xyes -then : - printf "%s\n" "#define HAVE_FSYNC 1" >>confdefs.h +if test "x$ac_cv_func_fsync" = xyes; then : + $as_echo "#define HAVE_FSYNC 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" fsync.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS fsync.$ac_objext" @@ -26207,12 +25021,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "getdelim" "ac_cv_func_getdelim" -if test "x$ac_cv_func_getdelim" = xyes -then : - printf "%s\n" "#define HAVE_GETDELIM 1" >>confdefs.h +if test "x$ac_cv_func_getdelim" = xyes; then : + $as_echo "#define HAVE_GETDELIM 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" getdelim.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS getdelim.$ac_objext" @@ -26220,12 +25034,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid" -if test "x$ac_cv_func_getpid" = xyes -then : - printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h +if test "x$ac_cv_func_getpid" = xyes; then : + $as_echo "#define HAVE_GETPID 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" getpid.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS getpid.$ac_objext" @@ -26233,12 +25047,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "lfind" "ac_cv_func_lfind" -if test "x$ac_cv_func_lfind" = xyes -then : - printf "%s\n" "#define HAVE_LFIND 1" >>confdefs.h +if test "x$ac_cv_func_lfind" = xyes; then : + $as_echo "#define HAVE_LFIND 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" lfind.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS lfind.$ac_objext" @@ -26246,12 +25060,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "lldiv" "ac_cv_func_lldiv" -if test "x$ac_cv_func_lldiv" = xyes -then : - printf "%s\n" "#define HAVE_LLDIV 1" >>confdefs.h +if test "x$ac_cv_func_lldiv" = xyes; then : + $as_echo "#define HAVE_LLDIV 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" lldiv.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS lldiv.$ac_objext" @@ -26259,12 +25073,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr" -if test "x$ac_cv_func_memrchr" = xyes -then : - printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h +if test "x$ac_cv_func_memrchr" = xyes; then : + $as_echo "#define HAVE_MEMRCHR 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" memrchr.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS memrchr.$ac_objext" @@ -26272,12 +25086,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "nrand48" "ac_cv_func_nrand48" -if test "x$ac_cv_func_nrand48" = xyes -then : - printf "%s\n" "#define HAVE_NRAND48 1" >>confdefs.h +if test "x$ac_cv_func_nrand48" = xyes; then : + $as_echo "#define HAVE_NRAND48 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" nrand48.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS nrand48.$ac_objext" @@ -26285,12 +25099,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" -if test "x$ac_cv_func_poll" = xyes -then : - printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h +if test "x$ac_cv_func_poll" = xyes; then : + $as_echo "#define HAVE_POLL 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" poll.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS poll.$ac_objext" @@ -26298,12 +25112,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "recvmsg" "ac_cv_func_recvmsg" -if test "x$ac_cv_func_recvmsg" = xyes -then : - printf "%s\n" "#define HAVE_RECVMSG 1" >>confdefs.h +if test "x$ac_cv_func_recvmsg" = xyes; then : + $as_echo "#define HAVE_RECVMSG 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" recvmsg.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS recvmsg.$ac_objext" @@ -26311,12 +25125,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "rewind" "ac_cv_func_rewind" -if test "x$ac_cv_func_rewind" = xyes -then : - printf "%s\n" "#define HAVE_REWIND 1" >>confdefs.h +if test "x$ac_cv_func_rewind" = xyes; then : + $as_echo "#define HAVE_REWIND 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" rewind.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS rewind.$ac_objext" @@ -26324,12 +25138,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "sendmsg" "ac_cv_func_sendmsg" -if test "x$ac_cv_func_sendmsg" = xyes -then : - printf "%s\n" "#define HAVE_SENDMSG 1" >>confdefs.h +if test "x$ac_cv_func_sendmsg" = xyes; then : + $as_echo "#define HAVE_SENDMSG 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" sendmsg.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS sendmsg.$ac_objext" @@ -26337,12 +25151,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" -if test "x$ac_cv_func_setenv" = xyes -then : - printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h +if test "x$ac_cv_func_setenv" = xyes; then : + $as_echo "#define HAVE_SETENV 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" setenv.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS setenv.$ac_objext" @@ -26350,12 +25164,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes -then : - printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h +if test "x$ac_cv_func_strcasecmp" = xyes; then : + $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strcasecmp.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" @@ -26363,12 +25177,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" -if test "x$ac_cv_func_strcasestr" = xyes -then : - printf "%s\n" "#define HAVE_STRCASESTR 1" >>confdefs.h +if test "x$ac_cv_func_strcasestr" = xyes; then : + $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strcasestr.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strcasestr.$ac_objext" @@ -26376,12 +25190,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup" -if test "x$ac_cv_func_strdup" = xyes -then : - printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h +if test "x$ac_cv_func_strdup" = xyes; then : + $as_echo "#define HAVE_STRDUP 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strdup.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strdup.$ac_objext" @@ -26389,12 +25203,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" -if test "x$ac_cv_func_strlcpy" = xyes -then : - printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h +if test "x$ac_cv_func_strlcpy" = xyes; then : + $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strlcpy.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext" @@ -26402,12 +25216,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup" -if test "x$ac_cv_func_strndup" = xyes -then : - printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h +if test "x$ac_cv_func_strndup" = xyes; then : + $as_echo "#define HAVE_STRNDUP 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strndup.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strndup.$ac_objext" @@ -26415,12 +25229,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" -if test "x$ac_cv_func_strnlen" = xyes -then : - printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h +if test "x$ac_cv_func_strnlen" = xyes; then : + $as_echo "#define HAVE_STRNLEN 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strnlen.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strnlen.$ac_objext" @@ -26428,12 +25242,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strnstr" "ac_cv_func_strnstr" -if test "x$ac_cv_func_strnstr" = xyes -then : - printf "%s\n" "#define HAVE_STRNSTR 1" >>confdefs.h +if test "x$ac_cv_func_strnstr" = xyes; then : + $as_echo "#define HAVE_STRNSTR 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strnstr.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strnstr.$ac_objext" @@ -26441,12 +25255,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep" -if test "x$ac_cv_func_strsep" = xyes -then : - printf "%s\n" "#define HAVE_STRSEP 1" >>confdefs.h +if test "x$ac_cv_func_strsep" = xyes; then : + $as_echo "#define HAVE_STRSEP 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strsep.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strsep.$ac_objext" @@ -26454,12 +25268,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strtof" "ac_cv_func_strtof" -if test "x$ac_cv_func_strtof" = xyes -then : - printf "%s\n" "#define HAVE_STRTOF 1" >>confdefs.h +if test "x$ac_cv_func_strtof" = xyes; then : + $as_echo "#define HAVE_STRTOF 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strtof.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strtof.$ac_objext" @@ -26467,12 +25281,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r" -if test "x$ac_cv_func_strtok_r" = xyes -then : - printf "%s\n" "#define HAVE_STRTOK_R 1" >>confdefs.h +if test "x$ac_cv_func_strtok_r" = xyes; then : + $as_echo "#define HAVE_STRTOK_R 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strtok_r.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strtok_r.$ac_objext" @@ -26480,12 +25294,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll" -if test "x$ac_cv_func_strtoll" = xyes -then : - printf "%s\n" "#define HAVE_STRTOLL 1" >>confdefs.h +if test "x$ac_cv_func_strtoll" = xyes; then : + $as_echo "#define HAVE_STRTOLL 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strtoll.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strtoll.$ac_objext" @@ -26493,12 +25307,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "swab" "ac_cv_func_swab" -if test "x$ac_cv_func_swab" = xyes -then : - printf "%s\n" "#define HAVE_SWAB 1" >>confdefs.h +if test "x$ac_cv_func_swab" = xyes; then : + $as_echo "#define HAVE_SWAB 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" swab.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS swab.$ac_objext" @@ -26506,12 +25320,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "tdestroy" "ac_cv_func_tdestroy" -if test "x$ac_cv_func_tdestroy" = xyes -then : - printf "%s\n" "#define HAVE_TDESTROY 1" >>confdefs.h +if test "x$ac_cv_func_tdestroy" = xyes; then : + $as_echo "#define HAVE_TDESTROY 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" tdestroy.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS tdestroy.$ac_objext" @@ -26519,12 +25333,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "tfind" "ac_cv_func_tfind" -if test "x$ac_cv_func_tfind" = xyes -then : - printf "%s\n" "#define HAVE_TFIND 1" >>confdefs.h +if test "x$ac_cv_func_tfind" = xyes; then : + $as_echo "#define HAVE_TFIND 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" tfind.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS tfind.$ac_objext" @@ -26532,12 +25346,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm" -if test "x$ac_cv_func_timegm" = xyes -then : - printf "%s\n" "#define HAVE_TIMEGM 1" >>confdefs.h +if test "x$ac_cv_func_timegm" = xyes; then : + $as_echo "#define HAVE_TIMEGM 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" timegm.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS timegm.$ac_objext" @@ -26545,12 +25359,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "timespec_get" "ac_cv_func_timespec_get" -if test "x$ac_cv_func_timespec_get" = xyes -then : - printf "%s\n" "#define HAVE_TIMESPEC_GET 1" >>confdefs.h +if test "x$ac_cv_func_timespec_get" = xyes; then : + $as_echo "#define HAVE_TIMESPEC_GET 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" timespec_get.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS timespec_get.$ac_objext" @@ -26558,12 +25372,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "strverscmp" "ac_cv_func_strverscmp" -if test "x$ac_cv_func_strverscmp" = xyes -then : - printf "%s\n" "#define HAVE_STRVERSCMP 1" >>confdefs.h +if test "x$ac_cv_func_strverscmp" = xyes; then : + $as_echo "#define HAVE_STRVERSCMP 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" strverscmp.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strverscmp.$ac_objext" @@ -26571,12 +25385,12 @@ esac fi + ac_fn_c_check_func "$LINENO" "pathconf" "ac_cv_func_pathconf" -if test "x$ac_cv_func_pathconf" = xyes -then : - printf "%s\n" "#define HAVE_PATHCONF 1" >>confdefs.h +if test "x$ac_cv_func_pathconf" = xyes; then : + $as_echo "#define HAVE_PATHCONF 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" pathconf.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS pathconf.$ac_objext" @@ -26585,12 +25399,12 @@ fi + ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = xyes -then : - printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h +if test "x$ac_cv_func_gettimeofday" = xyes; then : + $as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" gettimeofday.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS gettimeofday.$ac_objext" @@ -26599,123 +25413,41 @@ fi + ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync" -if test "x$ac_cv_func_fdatasync" = xyes -then : +if test "x$ac_cv_func_fdatasync" = xyes; then : -else $as_nop +else -printf "%s\n" "#define fdatasync fsync" >>confdefs.h +$as_echo "#define fdatasync fsync" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 -printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } -if test ${ac_cv_c_undeclared_builtin_options+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_save_CFLAGS=$CFLAGS - ac_cv_c_undeclared_builtin_options='cannot detect' - for ac_arg in '' -fno-builtin; do - CFLAGS="$ac_save_CFLAGS $ac_arg" - # This test program should *not* compile successfully. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -(void) strchr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - -else $as_nop - # This test program should compile successfully. - # No library function is consistently available on - # freestanding implementations, so test against a dummy - # declaration. Include always-available headers on the - # off chance that they somehow elicit warnings. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -extern void ac_decl (int, char *); - -int -main (void) -{ -(void) ac_decl (0, (char *) 0); - (void) ac_decl; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - if test x"$ac_arg" = x -then : - ac_cv_c_undeclared_builtin_options='none needed' -else $as_nop - ac_cv_c_undeclared_builtin_options=$ac_arg -fi - break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - done - CFLAGS=$ac_save_CFLAGS - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 -printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } - case $ac_cv_c_undeclared_builtin_options in #( - 'cannot detect') : - { { 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 $? "cannot make $CC report undeclared builtins -See \`config.log' for more details" "$LINENO" 5; } ;; #( - 'none needed') : - ac_c_undeclared_builtin_options='' ;; #( - *) : - ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; -esac + if ${vlc_cv_replace_decl_realpath+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test ${vlc_cv_replace_decl_realpath+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - ac_fn_check_decl "$LINENO" "realpath" "ac_cv_have_decl_realpath" "#include + ac_fn_c_check_decl "$LINENO" "realpath" "ac_cv_have_decl_realpath" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_realpath" = xyes -then : +" +if test "x$ac_cv_have_decl_realpath" = xyes; then : vlc_cv_replace_decl_realpath=yes -else $as_nop +else vlc_cv_replace_decl_realpath=no fi + fi - if test x"$vlc_cv_replace_decl_realpath" = xyes -then : + if test x"$vlc_cv_replace_decl_realpath" = xyes; then : -printf "%s\n" "#define HAVE_REALPATH 1" >>confdefs.h +$as_echo "#define HAVE_REALPATH 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" realpath.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS realpath.$ac_objext" @@ -26728,29 +25460,27 @@ - if test ${vlc_cv_replace_decl_asprintf+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - ac_fn_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "#include - -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_asprintf" = xyes -then : + if ${vlc_cv_replace_decl_asprintf+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "#include + +" +if test "x$ac_cv_have_decl_asprintf" = xyes; then : vlc_cv_replace_decl_asprintf=yes -else $as_nop +else vlc_cv_replace_decl_asprintf=no fi + fi - if test x"$vlc_cv_replace_decl_asprintf" = xyes -then : + if test x"$vlc_cv_replace_decl_asprintf" = xyes; then : -printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h +$as_echo "#define HAVE_ASPRINTF 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" asprintf.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS asprintf.$ac_objext" @@ -26762,29 +25492,27 @@ - if test ${vlc_cv_replace_decl_vasprintf+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - ac_fn_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "#include - -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_vasprintf" = xyes -then : + if ${vlc_cv_replace_decl_vasprintf+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "#include + +" +if test "x$ac_cv_have_decl_vasprintf" = xyes; then : vlc_cv_replace_decl_vasprintf=yes -else $as_nop +else vlc_cv_replace_decl_vasprintf=no fi + fi - if test x"$vlc_cv_replace_decl_vasprintf" = xyes -then : + if test x"$vlc_cv_replace_decl_vasprintf" = xyes; then : -printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h +$as_echo "#define HAVE_VASPRINTF 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" vasprintf.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext" @@ -26796,29 +25524,27 @@ - if test ${vlc_cv_replace_decl_gmtime_r+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - ac_fn_check_decl "$LINENO" "gmtime_r" "ac_cv_have_decl_gmtime_r" "#include - -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_gmtime_r" = xyes -then : + if ${vlc_cv_replace_decl_gmtime_r+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_fn_c_check_decl "$LINENO" "gmtime_r" "ac_cv_have_decl_gmtime_r" "#include + +" +if test "x$ac_cv_have_decl_gmtime_r" = xyes; then : vlc_cv_replace_decl_gmtime_r=yes -else $as_nop +else vlc_cv_replace_decl_gmtime_r=no fi + fi - if test x"$vlc_cv_replace_decl_gmtime_r" = xyes -then : + if test x"$vlc_cv_replace_decl_gmtime_r" = xyes; then : -printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h +$as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" gmtime_r.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS gmtime_r.$ac_objext" @@ -26830,29 +25556,27 @@ - if test ${vlc_cv_replace_decl_localtime_r+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - ac_fn_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include - -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_localtime_r" = xyes -then : + if ${vlc_cv_replace_decl_localtime_r+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include + +" +if test "x$ac_cv_have_decl_localtime_r" = xyes; then : vlc_cv_replace_decl_localtime_r=yes -else $as_nop +else vlc_cv_replace_decl_localtime_r=no fi + fi - if test x"$vlc_cv_replace_decl_localtime_r" = xyes -then : + if test x"$vlc_cv_replace_decl_localtime_r" = xyes; then : -printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h +$as_echo "#define HAVE_LOCALTIME_R 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" localtime_r.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS localtime_r.$ac_objext" @@ -26863,13 +25587,78 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for static_assert in assert.h" >&5 -printf %s "checking for static_assert in assert.h... " >&6; } + + + if ${vlc_cv_replace_decl_swab+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_fn_c_check_decl "$LINENO" "swab" "ac_cv_have_decl_swab" "#include + +" +if test "x$ac_cv_have_decl_swab" = xyes; then : + vlc_cv_replace_decl_swab=yes +else + vlc_cv_replace_decl_swab=no +fi + + +fi + + if test x"$vlc_cv_replace_decl_swab" = xyes; then : + +$as_echo "#define HAVE_SWAB 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" swab.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS swab.$ac_objext" + ;; +esac + +fi + + + + + if ${vlc_cv_replace_decl_ffsll+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_fn_c_check_decl "$LINENO" "ffsll" "ac_cv_have_decl_ffsll" "#include + +" +if test "x$ac_cv_have_decl_ffsll" = xyes; then : + vlc_cv_replace_decl_ffsll=yes +else + vlc_cv_replace_decl_ffsll=no +fi + + +fi + + if test x"$vlc_cv_replace_decl_ffsll" = xyes; then : + +$as_echo "#define HAVE_FFSLL 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" ffsll.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS ffsll.$ac_objext" + ;; +esac + +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for static_assert in assert.h" >&5 +$as_echo_n "checking for static_assert in assert.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { static_assert(1, "The impossible happened."); @@ -26878,45 +25667,37 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -printf "%s\n" "#define HAVE_STATIC_ASSERT 1" >>confdefs.h +$as_echo "#define HAVE_STATIC_ASSERT 1" >>confdefs.h -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext # Windows CE does not have strcoll() -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5 -printf %s "checking for working strcoll... " >&6; } -if test ${ac_cv_func_strcoll_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : - case "$host_os" in # (( - # Guess yes on glibc systems. - *-gnu*) ac_cv_func_strcoll_works=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_strcoll_works=no ;; - esac -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5 +$as_echo_n "checking for working strcoll... " >&6; } +if ${ac_cv_func_strcoll_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_strcoll_works=no +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main (void) +main () { return (strcoll ("abc", "def") >= 0 || strcoll ("ABC", "DEF") >= 0 || @@ -26925,10 +25706,9 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_strcoll_works=yes -else $as_nop +else ac_cv_func_strcoll_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -26936,50 +25716,41 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5 -printf "%s\n" "$ac_cv_func_strcoll_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5 +$as_echo "$ac_cv_func_strcoll_works" >&6; } if test $ac_cv_func_strcoll_works = yes; then -printf "%s\n" "#define HAVE_STRCOLL 1" >>confdefs.h +$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h fi case "$SYS" in "linux") - ac_fn_c_check_func "$LINENO" "eventfd" "ac_cv_func_eventfd" -if test "x$ac_cv_func_eventfd" = xyes -then : - printf "%s\n" "#define HAVE_EVENTFD 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "vmsplice" "ac_cv_func_vmsplice" -if test "x$ac_cv_func_vmsplice" = xyes -then : - printf "%s\n" "#define HAVE_VMSPLICE 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "sched_getaffinity" "ac_cv_func_sched_getaffinity" -if test "x$ac_cv_func_sched_getaffinity" = xyes -then : - printf "%s\n" "#define HAVE_SCHED_GETAFFINITY 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "recvmmsg" "ac_cv_func_recvmmsg" -if test "x$ac_cv_func_recvmmsg" = xyes -then : - printf "%s\n" "#define HAVE_RECVMMSG 1" >>confdefs.h + for ac_func in eventfd vmsplice sched_getaffinity recvmmsg +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi +done ;; "mingw32") - ac_fn_c_check_func "$LINENO" "_lock_file" "ac_cv_func__lock_file" -if test "x$ac_cv_func__lock_file" = xyes -then : - printf "%s\n" "#define HAVE__LOCK_FILE 1" >>confdefs.h + for ac_func in _lock_file +do : + ac_fn_c_check_func "$LINENO" "_lock_file" "ac_cv_func__lock_file" +if test "x$ac_cv_func__lock_file" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__LOCK_FILE 1 +_ACEOF fi +done ;; esac @@ -26994,10 +25765,11 @@ #endif " -if test "x$ac_cv_type_struct_pollfd" = xyes -then : +if test "x$ac_cv_type_struct_pollfd" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_POLLFD 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_POLLFD 1 +_ACEOF fi @@ -27005,10 +25777,11 @@ ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#include " -if test "x$ac_cv_type_struct_timespec" = xyes -then : +if test "x$ac_cv_type_struct_timespec" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TIMESPEC 1 +_ACEOF fi @@ -27016,22 +25789,22 @@ ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include " -if test "x$ac_cv_type_max_align_t" = xyes -then : +if test "x$ac_cv_type_max_align_t" = xyes; then : -printf "%s\n" "#define HAVE_MAX_ALIGN_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_MAX_ALIGN_T 1 +_ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socklen_t in sys/socket.h" >&5 -printf %s "checking for socklen_t in sys/socket.h... " >&6; } -if test ${ac_cv_type_socklen_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t in sys/socket.h" >&5 +$as_echo_n "checking for socklen_t in sys/socket.h... " >&6; } +if ${ac_cv_type_socklen_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27043,35 +25816,32 @@ # include #endif int -main (void) +main () { socklen_t len; len = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_type_socklen_t=yes -else $as_nop +else ac_cv_type_socklen_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_socklen_t" >&5 -printf "%s\n" "$ac_cv_type_socklen_t" >&6; } -if test "$ac_cv_type_socklen_t" = no -then : - printf "%s\n" "#define socklen_t int" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_socklen_t" >&5 +$as_echo "$ac_cv_type_socklen_t" >&6; } +if test "$ac_cv_type_socklen_t" = no; then : + $as_echo "#define socklen_t int" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 -printf %s "checking for struct sockaddr_storage... " >&6; } -if test ${ac_cv_struct_sockaddr_storage+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 +$as_echo_n "checking for struct sockaddr_storage... " >&6; } +if ${ac_cv_struct_sockaddr_storage+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -27081,46 +25851,42 @@ # include #endif int -main (void) +main () { struct sockaddr_storage addr; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_struct_sockaddr_storage=yes -else $as_nop +else ac_cv_struct_sockaddr_storage=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_storage" >&5 -printf "%s\n" "$ac_cv_struct_sockaddr_storage" >&6; } -if test "${ac_cv_struct_sockaddr_storage}" = no -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_storage" >&5 +$as_echo "$ac_cv_struct_sockaddr_storage" >&6; } +if test "${ac_cv_struct_sockaddr_storage}" = no; then : - printf "%s\n" "#define sockaddr_storage sockaddr" >>confdefs.h + $as_echo "#define sockaddr_storage sockaddr" >>confdefs.h - printf "%s\n" "#define ss_family sa_family" >>confdefs.h + $as_echo "#define ss_family sa_family" >>confdefs.h fi GNUGETOPT_LIBS="" ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long" -if test "x$ac_cv_func_getopt_long" = xyes -then : +if test "x$ac_cv_func_getopt_long" = xyes; then : -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getopt_long in -lgnugetopt" >&5 -printf %s "checking for getopt_long in -lgnugetopt... " >&6; } -if test ${ac_cv_lib_gnugetopt_getopt_long+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getopt_long in -lgnugetopt" >&5 +$as_echo_n "checking for getopt_long in -lgnugetopt... " >&6; } +if ${ac_cv_lib_gnugetopt_getopt_long+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnugetopt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27129,29 +25895,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char getopt_long (); int -main (void) +main () { return getopt_long (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_gnugetopt_getopt_long=yes -else $as_nop +else ac_cv_lib_gnugetopt_getopt_long=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnugetopt_getopt_long" >&5 -printf "%s\n" "$ac_cv_lib_gnugetopt_getopt_long" >&6; } -if test "x$ac_cv_lib_gnugetopt_getopt_long" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnugetopt_getopt_long" >&5 +$as_echo "$ac_cv_lib_gnugetopt_getopt_long" >&6; } +if test "x$ac_cv_lib_gnugetopt_getopt_long" = xyes; then : GNUGETOPT_LIBS="-lgnugetopt" @@ -27162,12 +25929,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 -printf %s "checking for cos in -lm... " >&6; } -if test ${ac_cv_lib_m_cos+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 +$as_echo_n "checking for cos in -lm... " >&6; } +if ${ac_cv_lib_m_cos+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27176,33 +25942,34 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char cos (); int -main (void) +main () { return cos (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_cos=yes -else $as_nop +else ac_cv_lib_m_cos=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 -printf "%s\n" "$ac_cv_lib_m_cos" >&6; } -if test "x$ac_cv_lib_m_cos" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 +$as_echo "$ac_cv_lib_m_cos" >&6; } +if test "x$ac_cv_lib_m_cos" = xyes; then : LIBM="-lm" -else $as_nop +else LIBM="" @@ -27210,12 +25977,11 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lrintf in -lm" >&5 -printf %s "checking for lrintf in -lm... " >&6; } -if test ${ac_cv_lib_m_lrintf+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrintf in -lm" >&5 +$as_echo_n "checking for lrintf in -lm... " >&6; } +if ${ac_cv_lib_m_lrintf+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27224,32 +25990,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char lrintf (); int -main (void) +main () { return lrintf (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_lrintf=yes -else $as_nop +else ac_cv_lib_m_lrintf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_lrintf" >&5 -printf "%s\n" "$ac_cv_lib_m_lrintf" >&6; } -if test "x$ac_cv_lib_m_lrintf" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_lrintf" >&5 +$as_echo "$ac_cv_lib_m_lrintf" >&6; } +if test "x$ac_cv_lib_m_lrintf" = xyes; then : -printf "%s\n" "#define HAVE_LRINTF 1" >>confdefs.h +$as_echo "#define HAVE_LRINTF 1" >>confdefs.h @@ -27260,12 +26027,11 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanf in -lm" >&5 -printf %s "checking for nanf in -lm... " >&6; } -if test ${ac_cv_lib_m_nanf+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanf in -lm" >&5 +$as_echo_n "checking for nanf in -lm... " >&6; } +if ${ac_cv_lib_m_nanf+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27274,41 +26040,41 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char nanf (); int -main (void) +main () { return nanf (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_nanf=yes -else $as_nop +else ac_cv_lib_m_nanf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_nanf" >&5 -printf "%s\n" "$ac_cv_lib_m_nanf" >&6; } -if test "x$ac_cv_lib_m_nanf" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_nanf" >&5 +$as_echo "$ac_cv_lib_m_nanf" >&6; } +if test "x$ac_cv_lib_m_nanf" = xyes; then : -printf "%s\n" "#define HAVE_NANF 1" >>confdefs.h +$as_echo "#define HAVE_NANF 1" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sincos in -lm" >&5 -printf %s "checking for sincos in -lm... " >&6; } -if test ${ac_cv_lib_m_sincos+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincos in -lm" >&5 +$as_echo_n "checking for sincos in -lm... " >&6; } +if ${ac_cv_lib_m_sincos+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27317,35 +26083,36 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char sincos (); int -main (void) +main () { return sincos (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_sincos=yes -else $as_nop +else ac_cv_lib_m_sincos=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sincos" >&5 -printf "%s\n" "$ac_cv_lib_m_sincos" >&6; } -if test "x$ac_cv_lib_m_sincos" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sincos" >&5 +$as_echo "$ac_cv_lib_m_sincos" >&6; } +if test "x$ac_cv_lib_m_sincos" = xyes; then : -printf "%s\n" "#define HAVE_SINCOS 1" >>confdefs.h +$as_echo "#define HAVE_SINCOS 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" sincos.$ac_objext "* ) ;; @@ -27357,42 +26124,45 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking _Thread_local support" >&5 -printf %s "checking _Thread_local support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking _Thread_local support" >&5 +$as_echo_n "checking _Thread_local support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _Thread_local int foo = 0; int main() {} _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf "%s\n" "ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } -printf "%s\n" "#define HAVE_THREAD_LOCAL 1" >>confdefs.h +$as_echo "#define HAVE_THREAD_LOCAL 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_fn_c_check_header_compile "$LINENO" "threads.h" "ac_cv_header_threads_h" "$ac_includes_default" -if test "x$ac_cv_header_threads_h" = xyes -then : - printf "%s\n" "#define HAVE_THREADS_H 1" >>confdefs.h +for ac_header in threads.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "threads.h" "ac_cv_header_threads_h" "$ac_includes_default" +if test "x$ac_cv_header_threads_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_THREADS_H 1 +_ACEOF fi +done + -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo_a in -lanl" >&5 -printf %s "checking for getaddrinfo_a in -lanl... " >&6; } -if test ${ac_cv_lib_anl_getaddrinfo_a+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo_a in -lanl" >&5 +$as_echo_n "checking for getaddrinfo_a in -lanl... " >&6; } +if ${ac_cv_lib_anl_getaddrinfo_a+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lanl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27401,32 +26171,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char getaddrinfo_a (); int -main (void) +main () { return getaddrinfo_a (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_anl_getaddrinfo_a=yes -else $as_nop +else ac_cv_lib_anl_getaddrinfo_a=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_anl_getaddrinfo_a" >&5 -printf "%s\n" "$ac_cv_lib_anl_getaddrinfo_a" >&6; } -if test "x$ac_cv_lib_anl_getaddrinfo_a" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_anl_getaddrinfo_a" >&5 +$as_echo "$ac_cv_lib_anl_getaddrinfo_a" >&6; } +if test "x$ac_cv_lib_anl_getaddrinfo_a" = xyes; then : -printf "%s\n" "#define HAVE_LIBANL 1" >>confdefs.h +$as_echo "#define HAVE_LIBANL 1" >>confdefs.h fi @@ -27442,12 +26213,11 @@ LDFLAGS_save="${LDFLAGS}" LIBS_save="${LIBS}" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5 -printf %s "checking for library containing dlsym... " >&6; } -if test ${ac_cv_search_dlsym+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5 +$as_echo_n "checking for library containing dlsym... " >&6; } +if ${ac_cv_search_dlsym+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27455,52 +26225,49 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char dlsym (); int -main (void) +main () { return dlsym (); ; return 0; } _ACEOF -for ac_lib in '' dl svld -do +for ac_lib in '' dl svld; 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 : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_dlsym=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_dlsym+y} -then : + if ${ac_cv_search_dlsym+:} false; then : break fi done -if test ${ac_cv_search_dlsym+y} -then : +if ${ac_cv_search_dlsym+:} false; then : -else $as_nop +else ac_cv_search_dlsym=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_dlsym" >&5 -printf "%s\n" "$ac_cv_search_dlsym" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlsym" >&5 +$as_echo "$ac_cv_search_dlsym" >&6; } ac_res=$ac_cv_search_dlsym -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - if test "$ac_cv_search_dlsym" != "none required" -then : + if test "$ac_cv_search_dlsym" != "none required"; then : LIBDL="$ac_cv_search_dlsym" @@ -27519,8 +26286,7 @@ # Windows -if test "${SYS}" = "mingw32" -then : +if test "${SYS}" = "mingw32"; then : LIBDL="" have_dynamic_objects="yes" #assume we can use shared objects @@ -27529,17 +26295,15 @@ # Check whether --with-libfuzzer was given. -if test ${with_libfuzzer+y} -then : +if test "${with_libfuzzer+set}" = set; then : withval=$with_libfuzzer; -else $as_nop +else with_libfuzzer=no fi -if test "x$with_libfuzzer" = xno -then : +if test "x$with_libfuzzer" = xno; then : -else $as_nop +else enable_shared=no enable_static=yes @@ -27555,8 +26319,7 @@ fi -if test "${enable_shared}" = "no" -then : +if test "${enable_shared}" = "no"; then : have_dynamic_objects=no @@ -27573,8 +26336,7 @@ LIBPTHREAD="" -if test "${SYS}" != "mingw32" -then : +if test "${SYS}" != "mingw32"; then : CPPFLAGS_save="${CPPFLAGS}" @@ -27585,12 +26347,11 @@ LIBS_save="${LIBS}" LIBS="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_rwlock_init" >&5 -printf %s "checking for library containing pthread_rwlock_init... " >&6; } -if test ${ac_cv_search_pthread_rwlock_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_rwlock_init" >&5 +$as_echo_n "checking for library containing pthread_rwlock_init... " >&6; } +if ${ac_cv_search_pthread_rwlock_init+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27598,52 +26359,49 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_rwlock_init (); int -main (void) +main () { return pthread_rwlock_init (); ; return 0; } _ACEOF -for ac_lib in '' pthread pthreads c_r -do +for ac_lib in '' pthread pthreads c_r; 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 : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_pthread_rwlock_init=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_pthread_rwlock_init+y} -then : + if ${ac_cv_search_pthread_rwlock_init+:} false; then : break fi done -if test ${ac_cv_search_pthread_rwlock_init+y} -then : +if ${ac_cv_search_pthread_rwlock_init+:} false; then : -else $as_nop +else ac_cv_search_pthread_rwlock_init=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_pthread_rwlock_init" >&5 -printf "%s\n" "$ac_cv_search_pthread_rwlock_init" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_rwlock_init" >&5 +$as_echo "$ac_cv_search_pthread_rwlock_init" >&6; } ac_res=$ac_cv_search_pthread_rwlock_init -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - if test "$ac_cv_search_pthread_rwlock_init" != "none required" -then : + if test "$ac_cv_search_pthread_rwlock_init" != "none required"; then : LIBPTHREAD="$ac_cv_search_pthread_rwlock_init" @@ -27663,12 +26421,11 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_nanosleep" >&5 -printf %s "checking for library containing clock_nanosleep... " >&6; } -if test ${ac_cv_search_clock_nanosleep+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_nanosleep" >&5 +$as_echo_n "checking for library containing clock_nanosleep... " >&6; } +if ${ac_cv_search_clock_nanosleep+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27676,65 +26433,61 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char clock_nanosleep (); int -main (void) +main () { return clock_nanosleep (); ; return 0; } _ACEOF -for ac_lib in '' rt pthread -do +for ac_lib in '' rt pthread; 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 : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_clock_nanosleep=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_clock_nanosleep+y} -then : + if ${ac_cv_search_clock_nanosleep+:} false; then : break fi done -if test ${ac_cv_search_clock_nanosleep+y} -then : +if ${ac_cv_search_clock_nanosleep+:} false; then : -else $as_nop +else ac_cv_search_clock_nanosleep=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_clock_nanosleep" >&5 -printf "%s\n" "$ac_cv_search_clock_nanosleep" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_nanosleep" >&5 +$as_echo "$ac_cv_search_clock_nanosleep" >&6; } ac_res=$ac_cv_search_clock_nanosleep -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - if test "$ac_cv_search_clock_nanosleep" != "none required" -then : + if test "$ac_cv_search_clock_nanosleep" != "none required"; then : LIBRT="$ac_cv_search_clock_nanosleep" fi -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 -printf %s "checking for library containing nanosleep... " >&6; } -if test ${ac_cv_search_nanosleep+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 +$as_echo_n "checking for library containing nanosleep... " >&6; } +if ${ac_cv_search_nanosleep+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27742,52 +26495,49 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char nanosleep (); int -main (void) +main () { return nanosleep (); ; return 0; } _ACEOF -for ac_lib in '' rt pthread posix4 -do +for ac_lib in '' rt pthread posix4; 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 : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_nanosleep=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_nanosleep+y} -then : + if ${ac_cv_search_nanosleep+:} false; then : break fi done -if test ${ac_cv_search_nanosleep+y} -then : +if ${ac_cv_search_nanosleep+:} false; then : -else $as_nop +else ac_cv_search_nanosleep=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_nanosleep" >&5 -printf "%s\n" "$ac_cv_search_nanosleep" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5 +$as_echo "$ac_cv_search_nanosleep" >&6; } ac_res=$ac_cv_search_nanosleep -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - if test "$ac_cv_search_nanosleep" != "none required" -then : + if test "$ac_cv_search_nanosleep" != "none required"; then : LIBRT="$ac_cv_search_nanosleep" @@ -27801,62 +26551,65 @@ -ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" -if test "x$ac_cv_header_arpa_inet_h" = xyes -then : - printf "%s\n" "#define HAVE_ARPA_INET_H 1" >>confdefs.h +have_stdckdint="no" +ac_fn_c_check_header_mongrel "$LINENO" "stdckdint.h" "ac_cv_header_stdckdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdckdint_h" = xyes; then : -fi -ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" -if test "x$ac_cv_header_pthread_h" = xyes -then : - printf "%s\n" "#define HAVE_PTHREAD_H 1" >>confdefs.h + have_stdckdint="yes" -fi -ac_fn_c_check_header_compile "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default" -if test "x$ac_cv_header_search_h" = xyes -then : - printf "%s\n" "#define HAVE_SEARCH_H 1" >>confdefs.h +else -fi -ac_fn_c_check_header_compile "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_shm_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_SHM_H 1" >>confdefs.h + CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)/compat/stdckdint" fi -ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_socket_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h + + if test "${have_stdckdint}" = "yes"; then + HAVE_STDCKDINT_TRUE= + HAVE_STDCKDINT_FALSE='#' +else + HAVE_STDCKDINT_TRUE='#' + HAVE_STDCKDINT_FALSE= fi -ac_fn_c_check_header_compile "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_uio_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_UIO_H 1" >>confdefs.h + + +for ac_header in arpa/inet.h pthread.h search.h sys/shm.h sys/socket.h sys/uio.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " +done + +for ac_header in net/if.h +do : + ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " #include #include " -if test "x$ac_cv_header_net_if_h" = xyes -then : - printf "%s\n" "#define HAVE_NET_IF_H 1" >>confdefs.h +if test "x$ac_cv_header_net_if_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NET_IF_H 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default" -if test "x$ac_cv_header_syslog_h" = xyes -then : +done + +ac_fn_c_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default" +if test "x$ac_cv_header_syslog_h" = xyes; then : have_syslog="yes" -else $as_nop +else have_syslog="no" fi + if test "$have_syslog" = "yes"; then HAVE_SYSLOG_TRUE= HAVE_SYSLOG_FALSE='#' @@ -27866,70 +26619,45 @@ fi -ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "$ac_includes_default" -if test "x$ac_cv_header_netinet_tcp_h" = xyes -then : - printf "%s\n" "#define HAVE_NETINET_TCP_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "netinet/udplite.h" "ac_cv_header_netinet_udplite_h" "$ac_includes_default" -if test "x$ac_cv_header_netinet_udplite_h" = xyes -then : - printf "%s\n" "#define HAVE_NETINET_UDPLITE_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_param_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h +for ac_header in netinet/tcp.h netinet/udplite.h sys/param.h sys/mount.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mount_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h -fi +done -ac_fn_c_check_header_compile "$LINENO" "features.h" "ac_cv_header_features_h" "$ac_includes_default" -if test "x$ac_cv_header_features_h" = xyes -then : - printf "%s\n" "#define HAVE_FEATURES_H 1" >>confdefs.h +for ac_header in features.h getopt.h linux/dccp.h linux/magic.h sys/eventfd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" -if test "x$ac_cv_header_getopt_h" = xyes -then : - printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "linux/dccp.h" "ac_cv_header_linux_dccp_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_dccp_h" = xyes -then : - printf "%s\n" "#define HAVE_LINUX_DCCP_H 1" >>confdefs.h +done -fi -ac_fn_c_check_header_compile "$LINENO" "linux/magic.h" "ac_cv_header_linux_magic_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_magic_h" = xyes -then : - printf "%s\n" "#define HAVE_LINUX_MAGIC_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/eventfd.h" "ac_cv_header_sys_eventfd_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_eventfd_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_EVENTFD_H 1" >>confdefs.h +for ac_header in xlocale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "xlocale.h" "ac_cv_header_xlocale_h" "$ac_includes_default" +if test "x$ac_cv_header_xlocale_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_XLOCALE_H 1 +_ACEOF fi - -ac_fn_c_check_header_compile "$LINENO" "xlocale.h" "ac_cv_header_xlocale_h" "$ac_includes_default" -if test "x$ac_cv_header_xlocale_h" = xyes -then : - printf "%s\n" "#define HAVE_XLOCALE_H 1" >>confdefs.h - -fi +done ac_ext=cpp @@ -27938,35 +26666,33 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if C++ headers define locale_t" >&5 -printf %s "checking if C++ headers define locale_t... " >&6; } -if test ${ac_cv_cxx_locale_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ headers define locale_t" >&5 +$as_echo_n "checking if C++ headers define locale_t... " >&6; } +if ${ac_cv_cxx_locale_t+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_cxx_locale_t=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { locale_t loc; ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_cxx_locale_t=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_locale_t" >&5 -printf "%s\n" "$ac_cv_cxx_locale_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_locale_t" >&5 +$as_echo "$ac_cv_cxx_locale_t" >&6; } if test "${ac_cv_cxx_locale_t}" != "no"; then -printf "%s\n" "#define HAVE_CXX_LOCALE_T 1" >>confdefs.h +$as_echo "#define HAVE_CXX_LOCALE_T 1" >>confdefs.h fi ac_ext=c @@ -27977,12 +26703,11 @@ ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -if test "x$ac_cv_type_ssize_t" = xyes -then : +if test "x$ac_cv_type_ssize_t" = xyes; then : -else $as_nop +else - printf "%s\n" "#define ssize_t int" >>confdefs.h + $as_echo "#define ssize_t int" >>confdefs.h fi @@ -28000,12 +26725,11 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -28015,15 +26739,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28035,11 +26755,11 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf "%s\n" "$PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -28048,12 +26768,11 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -28063,15 +26782,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28083,11 +26798,11 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -28095,8 +26810,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -28108,23 +26823,21 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } PKG_CONFIG="" fi fi -if test -n "${PKG_CONFIG}" -then : +if test -n "${PKG_CONFIG}" ; then : - if test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" -then : + if test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ; then : PKG_CONFIG="${PKG_CONFIG} --static" @@ -28133,18 +26846,20 @@ fi - for ac_header in zlib.h +for ac_header in zlib.h do : - ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = xyes -then : - printf "%s\n" "#define HAVE_ZLIB_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ZLIB_H 1 +_ACEOF have_zlib=yes -else $as_nop +else have_zlib=no fi done + if test "${have_zlib}" = "yes" ; then HAVE_ZLIB_TRUE= HAVE_ZLIB_FALSE='#' @@ -28163,17 +26878,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for minizip " >&5 -printf %s "checking for minizip ... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MINIZIP" >&5 +$as_echo_n "checking for MINIZIP... " >&6; } if test -n "$MINIZIP_CFLAGS"; then pkg_cv_MINIZIP_CFLAGS="$MINIZIP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"minizip \""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"minizip \""; } >&5 ($PKG_CONFIG --exists --print-errors "minizip ") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MINIZIP_CFLAGS=`$PKG_CONFIG --cflags "minizip " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28187,10 +26902,10 @@ pkg_cv_MINIZIP_LIBS="$MINIZIP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"minizip \""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"minizip \""; } >&5 ($PKG_CONFIG --exists --print-errors "minizip ") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MINIZIP_LIBS=`$PKG_CONFIG --libs "minizip " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28204,8 +26919,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28213,25 +26928,26 @@ _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 + for ac_header in unzip.h do : - ac_fn_c_check_header_compile "$LINENO" "unzip.h" "ac_cv_header_unzip_h" "$ac_includes_default" -if test "x$ac_cv_header_unzip_h" = xyes -then : - printf "%s\n" "#define HAVE_UNZIP_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "unzip.h" "ac_cv_header_unzip_h" "$ac_includes_default" +if test "x$ac_cv_header_unzip_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UNZIP_H 1 +_ACEOF have_minizip=yes MINIZIP_LIBS="-lminizip -lz" -else $as_nop +else have_minizip=no @@ -28239,21 +26955,23 @@ done + elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - for ac_header in unzip.h + for ac_header in unzip.h do : - ac_fn_c_check_header_compile "$LINENO" "unzip.h" "ac_cv_header_unzip_h" "$ac_includes_default" -if test "x$ac_cv_header_unzip_h" = xyes -then : - printf "%s\n" "#define HAVE_UNZIP_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "unzip.h" "ac_cv_header_unzip_h" "$ac_includes_default" +if test "x$ac_cv_header_unzip_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UNZIP_H 1 +_ACEOF have_minizip=yes MINIZIP_LIBS="-lminizip -lz" -else $as_nop +else have_minizip=no @@ -28261,12 +26979,13 @@ done + else - 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 + MINIZIP_CFLAGS=$pkg_cv_MINIZIP_CFLAGS + MINIZIP_LIBS=$pkg_cv_MINIZIP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_minizip=yes fi fi if test "${have_minizip}" = "yes" ; then @@ -28281,17 +27000,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libidn" >&5 -printf %s "checking for libidn... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IDN" >&5 +$as_echo_n "checking for IDN... " >&6; } if test -n "$IDN_CFLAGS"; then pkg_cv_IDN_CFLAGS="$IDN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn\""; } >&5 ($PKG_CONFIG --exists --print-errors "libidn") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_IDN_CFLAGS=`$PKG_CONFIG --cflags "libidn" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28305,10 +27024,10 @@ pkg_cv_IDN_LIBS="$IDN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn\""; } >&5 ($PKG_CONFIG --exists --print-errors "libidn") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_IDN_LIBS=`$PKG_CONFIG --libs "libidn" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28322,8 +27041,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28331,59 +27050,57 @@ _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" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } have_libidn="no" else - 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; } + IDN_CFLAGS=$pkg_cv_IDN_CFLAGS + IDN_LIBS=$pkg_cv_IDN_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_libidn="yes" -printf "%s\n" "#define HAVE_IDN 1" >>confdefs.h +$as_echo "#define HAVE_IDN 1" >>confdefs.h fi # Check whether --enable-dbus was given. -if test ${enable_dbus+y} -then : +if test "${enable_dbus+set}" = set; then : enableval=$enable_dbus; fi have_dbus="no" -if test "${enable_dbus}" != "no" -then : +if test "${enable_dbus}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 1.6.0" >&5 -printf %s "checking for dbus-1 >= 1.6.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 +$as_echo_n "checking for DBUS... " >&6; } if test -n "$DBUS_CFLAGS"; then pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.6.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.6.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.6.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.6.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28397,10 +27114,10 @@ pkg_cv_DBUS_LIBS="$DBUS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.6.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.6.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.6.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.6.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28414,8 +27131,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28423,47 +27140,45 @@ _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}" -then : + if test -n "${enable_dbus}"; then : as_fn_error $? "${DBUS_PKG_ERRORS}." "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${DBUS_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${DBUS_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${DBUS_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${DBUS_PKG_ERRORS}." >&2;} fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_dbus}" -then : + if test -n "${enable_dbus}"; then : as_fn_error $? "${DBUS_PKG_ERRORS}." "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${DBUS_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${DBUS_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${DBUS_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${DBUS_PKG_ERRORS}." >&2;} fi else - 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; } + DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS + DBUS_LIBS=$pkg_cv_DBUS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_dbus="yes" @@ -28482,17 +27197,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5 -printf %s "checking for libsystemd... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 +$as_echo_n "checking for SYSTEMD... " >&6; } if test -n "$SYSTEMD_CFLAGS"; then pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28506,10 +27221,10 @@ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28523,8 +27238,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28532,29 +27247,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${SYSTEMD_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SYSTEMD_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${SYSTEMD_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SYSTEMD_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${SYSTEMD_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SYSTEMD_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${SYSTEMD_PKG_ERRORS}." >&2;} else - 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; } + SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS + SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_systemd="yes" @@ -28576,13 +27291,12 @@ for flag in -Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -28590,61 +27304,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -28655,13 +27366,12 @@ for flag in -Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -28669,61 +27379,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 (: CXXFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -28735,13 +27442,12 @@ for flag in -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Werror-implicit-function-declaration -Winit-self -Wlogical-op -Wshadow=local; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -28749,61 +27455,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -28814,13 +27517,12 @@ for flag in -pipe; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -28828,61 +27530,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -28898,12 +27597,11 @@ LIBS_save="${LIBS}" SOCKET_LIBS="" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing connect" >&5 -printf %s "checking for library containing connect... " >&6; } -if test ${ac_cv_search_connect+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing connect" >&5 +$as_echo_n "checking for library containing connect... " >&6; } +if ${ac_cv_search_connect+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28911,61 +27609,57 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char connect (); int -main (void) +main () { return connect (); ; return 0; } _ACEOF -for ac_lib in '' socket -do +for ac_lib in '' socket; 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 : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_connect=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_connect+y} -then : + if ${ac_cv_search_connect+:} false; then : break fi done -if test ${ac_cv_search_connect+y} -then : +if ${ac_cv_search_connect+:} false; then : -else $as_nop +else ac_cv_search_connect=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_connect" >&5 -printf "%s\n" "$ac_cv_search_connect" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_connect" >&5 +$as_echo "$ac_cv_search_connect" >&6; } ac_res=$ac_cv_search_connect -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - if test "$ac_cv_search_connect" != "none required" -then : + if test "$ac_cv_search_connect" != "none required"; then : SOCKET_LIBS="$ac_cv_search_connect" fi -else $as_nop +else - if test "${SYS}" = "mingw32" -then : + if test "${SYS}" = "mingw32"; then : SOCKET_LIBS="-lws2_32 -liphlpapi" @@ -28974,12 +27668,11 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_pton" >&5 -printf %s "checking for library containing inet_pton... " >&6; } -if test ${ac_cv_search_inet_pton+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_pton" >&5 +$as_echo_n "checking for library containing inet_pton... " >&6; } +if ${ac_cv_search_inet_pton+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28987,52 +27680,49 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char inet_pton (); int -main (void) +main () { return inet_pton (); ; return 0; } _ACEOF -for ac_lib in '' nsl -do +for ac_lib in '' nsl; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib ${SOCKET_LIBS} $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_inet_pton=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_inet_pton+y} -then : + if ${ac_cv_search_inet_pton+:} false; then : break fi done -if test ${ac_cv_search_inet_pton+y} -then : +if ${ac_cv_search_inet_pton+:} false; then : -else $as_nop +else ac_cv_search_inet_pton=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_inet_pton" >&5 -printf "%s\n" "$ac_cv_search_inet_pton" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_pton" >&5 +$as_echo "$ac_cv_search_inet_pton" >&6; } ac_res=$ac_cv_search_inet_pton -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - if test "$ac_cv_search_inet_pton" != "none required" -then : + if test "$ac_cv_search_inet_pton" != "none required"; then : SOCKET_LIBS="$ac_cv_search_inet_pton $SOCKET_LIBS" @@ -29057,7 +27747,7 @@ #include #endif int -main (void) +main () { char dst[sizeof(struct in_addr)]; @@ -29067,12 +27757,11 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : -printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h +$as_echo "#define HAVE_INET_PTON 1" >>confdefs.h -else $as_nop +else case " $LIBOBJS " in *" inet_pton.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS inet_pton.$ac_objext" @@ -29080,7 +27769,7 @@ esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29093,7 +27782,7 @@ #include #endif int -main (void) +main () { if_nametoindex(""); @@ -29102,30 +27791,34 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : -printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h +$as_echo "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_fn_c_check_type "$LINENO" "struct if_nameindex" "ac_cv_type_struct_if_nameindex" "#include " -if test "x$ac_cv_type_struct_if_nameindex" = xyes -then : +if test "x$ac_cv_type_struct_if_nameindex" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_IF_NAMEINDEX 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_IF_NAMEINDEX 1 +_ACEOF fi -ac_fn_c_check_func "$LINENO" "if_nameindex" "ac_cv_func_if_nameindex" -if test "x$ac_cv_func_if_nameindex" = xyes -then : - printf "%s\n" "#define HAVE_IF_NAMEINDEX 1" >>confdefs.h +for ac_func in if_nameindex +do : + ac_fn_c_check_func "$LINENO" "if_nameindex" "ac_cv_func_if_nameindex" +if test "x$ac_cv_func_if_nameindex" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IF_NAMEINDEX 1 +_ACEOF fi +done CPPFLAGS="${CPPFLAGS_save}" @@ -29138,42 +27831,43 @@ # Check whether --enable-debug was given. -if test ${enable_debug+y} -then : +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; -else $as_nop +else enable_debug="no" fi -if test "${enable_debug}" != "no" -then : +if test "${enable_debug}" != "no"; then : - ac_fn_c_check_header_compile "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default" -if test "x$ac_cv_header_valgrind_valgrind_h" = xyes -then : - printf "%s\n" "#define HAVE_VALGRIND_VALGRIND_H 1" >>confdefs.h + for ac_header in valgrind/valgrind.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default" +if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VALGRIND_VALGRIND_H 1 +_ACEOF fi +done + -else $as_nop +else - printf "%s\n" "#define NDEBUG 1" >>confdefs.h + $as_echo "#define NDEBUG 1" >>confdefs.h fi # Check whether --enable-gprof was given. -if test ${enable_gprof+y} -then : +if test "${enable_gprof+set}" = set; then : enableval=$enable_gprof; -else $as_nop +else enable_gprof="no" fi -if test "${enable_gprof}" != "no" -then : +if test "${enable_gprof}" != "no"; then : CFLAGS="${CFLAGS} -pg" CXXFLAGS="${CXXFLAGS} -pg" @@ -29183,15 +27877,13 @@ fi # Check whether --enable-cprof was given. -if test ${enable_cprof+y} -then : +if test "${enable_cprof+set}" = set; then : enableval=$enable_cprof; -else $as_nop +else enable_cprof="no" fi -if test "${enable_gprof}" != "no" -then : +if test "${enable_gprof}" != "no"; then : CFLAGS="${CFLAGS} -finstrument-functions" CXXFLAGS="${CXXFLAGS} -finstrument-functions" @@ -29201,15 +27893,13 @@ fi # Check whether --enable-coverage was given. -if test ${enable_coverage+y} -then : +if test "${enable_coverage+set}" = set; then : enableval=$enable_coverage; -else $as_nop +else enable_coverage="no" fi -if test "${enable_coverage}" != "no" -then : +if test "${enable_coverage}" != "no"; then : CFLAGS="-fprofile-arcs -ftest-coverage ${CFLAGS}" CXXFLAGS="-fprofile-arcs -ftest-coverage ${CXXFLAGS}" @@ -29217,8 +27907,7 @@ fi -if test "${SYS}" != "mingw32" -a "${SYS}" != "os2" -then : +if test "${SYS}" != "mingw32" -a "${SYS}" != "os2"; then : CPPFLAGS_save="${CPPFLAGS}" @@ -29231,41 +27920,38 @@ CFLAGS="${CFLAGS} -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" OBJCFLAGS="${OBJCFLAGS} -fvisibility=hidden" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fvisibility=hidden" >&5 -printf %s "checking if $CC accepts -fvisibility=hidden... " >&6; } -if test ${ac_cv_c_visibility_hidden+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fvisibility=hidden" >&5 +$as_echo_n "checking if $CC accepts -fvisibility=hidden... " >&6; } +if ${ac_cv_c_visibility_hidden+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_visibility_hidden=yes -else $as_nop +else ac_cv_c_visibility_hidden=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_visibility_hidden" >&5 -printf "%s\n" "$ac_cv_c_visibility_hidden" >&6; } - if test "${ac_cv_c_visibility_hidden}" = "no" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_visibility_hidden" >&5 +$as_echo "$ac_cv_c_visibility_hidden" >&6; } + if test "${ac_cv_c_visibility_hidden}" = "no"; then : CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -29280,26 +27966,23 @@ # Check whether --with-sanitizer was given. -if test ${with_sanitizer+y} -then : +if test "${with_sanitizer+set}" = set; then : withval=$with_sanitizer; -else $as_nop +else with_sanitizer=no fi -if test "x$with_sanitizer" = xno -then : +if test "x$with_sanitizer" = xno; then : -else $as_nop +else - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__-fsanitize=${with_sanitizer}" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=${with_sanitizer}" >&5 -printf %s "checking whether C compiler accepts -fsanitize=${with_sanitizer}... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__-fsanitize=${with_sanitizer}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=${with_sanitizer}" >&5 +$as_echo_n "checking whether C compiler accepts -fsanitize=${with_sanitizer}... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS -fsanitize=${with_sanitizer}" @@ -29307,216 +27990,207 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" -fsanitize=${with_sanitizer} "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -fsanitize=\${with_sanitizer}"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -fsanitize=\${with_sanitizer}"; } >&5 (: CFLAGS already contains -fsanitize=${with_sanitizer}) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " -fsanitize=${with_sanitizer}" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=-fsanitize=${with_sanitizer} - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" -fsanitize=${with_sanitizer} "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -fsanitize=\${with_sanitizer}"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -fsanitize=\${with_sanitizer}"; } >&5 (: CXXFLAGS already contains -fsanitize=${with_sanitizer}) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " -fsanitize=${with_sanitizer}" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=-fsanitize=${with_sanitizer} - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${LDFLAGS+y} -then : +if ${LDFLAGS+:} false; then : case " $LDFLAGS " in #( *" -fsanitize=${with_sanitizer} "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -fsanitize=\${with_sanitizer}"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains -fsanitize=\${with_sanitizer}"; } >&5 (: LDFLAGS already contains -fsanitize=${with_sanitizer}) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append LDFLAGS " -fsanitize=${with_sanitizer}" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 (: LDFLAGS="$LDFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else LDFLAGS=-fsanitize=${with_sanitizer} - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5 (: LDFLAGS="$LDFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else as_fn_error $? "\"-fsanitize=${with_sanitizer} not supported!\"" "$LINENO" 5 fi -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" -g "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -g"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -g"; } >&5 (: CFLAGS already contains -g) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " -g" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=-g - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" -g "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -g"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -g"; } >&5 (: CXXFLAGS already contains -g) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " -g" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=-g - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi - if test -z "${with_sanitizer##*address*}" -then : + if test -z "${with_sanitizer##*address*}" ; then : for flag in -fsanitize-address-use-after-scope -fno-omit-frame-pointer; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -29524,61 +28198,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -29589,13 +28260,12 @@ for flag in -fsanitize-address-use-after-scope -fno-omit-frame-pointer; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -29603,61 +28273,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 (: CXXFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -29665,21 +28332,19 @@ fi - if test -z "${with_sanitizer##*memory*}" -then : + if test -z "${with_sanitizer##*memory*}" ; then : for flag in -fPIE -pie; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -29687,61 +28352,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -29752,13 +28414,12 @@ for flag in -fPIE -pie; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -29766,61 +28427,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 (: CXXFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -29828,21 +28486,19 @@ fi - if test -z "${with_sanitizer##*thread*}" -then : + if test -z "${with_sanitizer##*thread*}" ; then : for flag in -fPIE -pie; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -29850,61 +28506,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -29915,13 +28568,12 @@ for flag in -fPIE -pie; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -29929,61 +28581,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 (: CXXFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -29995,20 +28644,17 @@ fi # Check whether --enable-optimizations was given. -if test ${enable_optimizations+y} -then : +if test "${enable_optimizations+set}" = set; then : enableval=$enable_optimizations; -else $as_nop +else enable_optimizations="yes" fi -if test "${enable_optimizations}" != "no" -then : +if test "${enable_optimizations}" != "no"; then : - if test "${enable_debug}" = "no" -then : + if test "${enable_debug}" = "no"; then : CPPFLAGS_save="${CPPFLAGS}" @@ -30021,41 +28667,38 @@ CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" OBJCFLAGS="${OBJCFLAGS} -O3" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -O3" >&5 -printf %s "checking if $CC accepts -O3... " >&6; } -if test ${ac_cv_c_o3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -O3" >&5 +$as_echo_n "checking if $CC accepts -O3... " >&6; } +if ${ac_cv_c_o3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_o3=yes -else $as_nop +else ac_cv_c_o3=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_o3" >&5 -printf "%s\n" "$ac_cv_c_o3" >&6; } - if test "${ac_cv_c_o3}" = "no" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_o3" >&5 +$as_echo "$ac_cv_c_o3" >&6; } + if test "${ac_cv_c_o3}" = "no"; then : CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -30073,13 +28716,12 @@ for flag in -fno-math-errno -funsafe-math-optimizations -fno-rounding-math -fno-signaling-nans -fcx-limited-range; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -30087,61 +28729,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -30152,13 +28791,12 @@ for flag in -fno-math-errno -funsafe-math-optimizations -fno-rounding-math -fno-signaling-nans -fcx-limited-range; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -30166,61 +28804,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 (: CXXFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -30240,41 +28875,38 @@ CFLAGS="${CFLAGS} -funroll-loops" CXXFLAGS="${CXXFLAGS} -funroll-loops" OBJCFLAGS="${OBJCFLAGS} -funroll-loops" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -funroll-loops" >&5 -printf %s "checking if $CC accepts -funroll-loops... " >&6; } -if test ${ac_cv_c_unroll_loops+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -funroll-loops" >&5 +$as_echo_n "checking if $CC accepts -funroll-loops... " >&6; } +if ${ac_cv_c_unroll_loops+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_unroll_loops=yes -else $as_nop +else ac_cv_c_unroll_loops=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_unroll_loops" >&5 -printf "%s\n" "$ac_cv_c_unroll_loops" >&6; } - if test "${ac_cv_c_unroll_loops}" = "no" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_unroll_loops" >&5 +$as_echo "$ac_cv_c_unroll_loops" >&6; } + if test "${ac_cv_c_unroll_loops}" = "no"; then : CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -30285,8 +28917,7 @@ fi - if test "$enable_debug" = "no" -then : + if test "$enable_debug" = "no"; then : CPPFLAGS_save="${CPPFLAGS}" @@ -30299,41 +28930,38 @@ CFLAGS="${CFLAGS} -fomit-frame-pointer" CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer" OBJCFLAGS="${OBJCFLAGS} -fomit-frame-pointer" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fomit-frame-pointer" >&5 -printf %s "checking if $CC accepts -fomit-frame-pointer... " >&6; } -if test ${ac_cv_c_omit_frame_pointer+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fomit-frame-pointer" >&5 +$as_echo_n "checking if $CC accepts -fomit-frame-pointer... " >&6; } +if ${ac_cv_c_omit_frame_pointer+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_omit_frame_pointer=yes -else $as_nop +else ac_cv_c_omit_frame_pointer=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_omit_frame_pointer" >&5 -printf "%s\n" "$ac_cv_c_omit_frame_pointer" >&6; } - if test "${ac_cv_c_omit_frame_pointer}" = "no" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_omit_frame_pointer" >&5 +$as_echo "$ac_cv_c_omit_frame_pointer" >&6; } + if test "${ac_cv_c_omit_frame_pointer}" = "no"; then : CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -30351,13 +28979,12 @@ for flag in -fstack-protector-strong; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -30365,61 +28992,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -30430,13 +29054,12 @@ for flag in -fstack-protector-strong; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -30444,72 +29067,67 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 (: CXXFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi done - if test "${SYS}" = "mingw32" -then : + if test "${SYS}" = "mingw32"; then : LDFLAGS="${LDFLAGS} -lssp" - if test "${vlc_winstore_app}" != 1 -then : + if test "${vlc_winstore_app}" != 1; then : LDFLAGS="${LDFLAGS} -ladvapi32" fi @@ -30526,40 +29144,38 @@ LIBS_save="${LIBS}" LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if linker supports -Bsymbolic" >&5 -printf %s "checking if linker supports -Bsymbolic... " >&6; } -if test ${ac_cv_ld_bsymbolic+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if linker supports -Bsymbolic" >&5 +$as_echo_n "checking if linker supports -Bsymbolic... " >&6; } +if ${ac_cv_ld_bsymbolic+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_ld_bsymbolic="-Wl,-Bsymbolic" -else $as_nop +else ac_cv_ld_bsymbolic="" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_bsymbolic" >&5 -printf "%s\n" "$ac_cv_ld_bsymbolic" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_bsymbolic" >&5 +$as_echo "$ac_cv_ld_bsymbolic" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -30580,42 +29196,39 @@ LIBS_save="${LIBS}" LDFLAGS="${LDFLAGS} -Wl,-z,defs" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if linker supports -z,defs" >&5 -printf %s "checking if linker supports -z,defs... " >&6; } -if test ${ac_cv_ld_z_defs+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if linker supports -z,defs" >&5 +$as_echo_n "checking if linker supports -z,defs... " >&6; } +if ${ac_cv_ld_z_defs+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_ld_z_defs="yes" -else $as_nop +else ac_cv_ld_z_defs="no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_z_defs" >&5 -printf "%s\n" "$ac_cv_ld_z_defs" >&6; } -if test "${ac_cv_ld_z_defs}" = "no" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_z_defs" >&5 +$as_echo "$ac_cv_ld_z_defs" >&6; } +if test "${ac_cv_ld_z_defs}" = "no"; then : CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -30626,38 +29239,91 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((packed))" >&5 -printf %s "checking for __attribute__((packed))... " >&6; } -if test ${ac_cv_c_attribute_packed+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((packed))" >&5 +$as_echo_n "checking for __attribute__((packed))... " >&6; } +if ${ac_cv_c_attribute_packed+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_attribute_packed=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { struct __attribute__((__packed__)) foo { int a; } b; (void)b; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_attribute_packed=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_attribute_packed" >&5 -printf "%s\n" "$ac_cv_c_attribute_packed" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_attribute_packed" >&5 +$as_echo "$ac_cv_c_attribute_packed" >&6; } if test "${ac_cv_c_attribute_packed}" != "no"; then -printf "%s\n" "#define HAVE_ATTRIBUTE_PACKED 1" >>confdefs.h +$as_echo "#define HAVE_ATTRIBUTE_PACKED 1" >>confdefs.h fi +WIN32_PATH_CMD= +if test "${SYS}" = "mingw32"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to transform windows pathes" >&5 +$as_echo_n "checking how to transform windows pathes... " >&6; } + win32_path_cmd=no + for win_path in "cygpath" "wslpath" "wine winepath" + do + ac_try="$win_path -u c: >/dev/null" + (eval "$ac_try") 2>&5 + ac_status=$? + if test $ac_status = 0; then + win32_path_cmd=$win_path + break + fi + done + if test "${win32_path_cmd}" != "no"; then : + + WIN32_PATH_CMD=${win32_path_cmd} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using '${win32_path_cmd}'" >&5 +$as_echo "using '${win32_path_cmd}'" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not possible" >&5 +$as_echo "not possible" >&6; } + +fi + +fi + + + + +# Check whether --with-wix was given. +if test "${with_wix+set}" = set; then : + withval=$with_wix; +fi + +if test -z "${with_wix}"; then : + + if test -n "${CONTRIB_DIR}"; then : + + with_wix="${CONTRIB_DIR}/bin" + +fi + +fi +if test "${with_wix}" != "no"; then : + + WIXPATH="${with_wix}" + +fi + + case "${host_cpu}" in "") ARCH=unknown @@ -30671,29 +29337,83 @@ ;; esac -ac_fn_c_check_header_compile "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" -if test "x$ac_cv_header_execinfo_h" = xyes -then : - printf "%s\n" "#define HAVE_EXECINFO_H 1" >>confdefs.h +for ac_header in execinfo.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_execinfo_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_EXECINFO_H 1 +_ACEOF + +fi + +done + +for ac_func in backtrace +do : + ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace" +if test "x$ac_cv_func_backtrace" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BACKTRACE 1 +_ACEOF + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lexecinfo" >&5 +$as_echo_n "checking for backtrace in -lexecinfo... " >&6; } +if ${ac_cv_lib_execinfo_backtrace+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lexecinfo $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. */ +#ifdef __cplusplus +extern "C" +#endif +char backtrace (); +int +main () +{ +return backtrace (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_execinfo_backtrace=yes +else + ac_cv_lib_execinfo_backtrace=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_execinfo_backtrace" >&5 +$as_echo "$ac_cv_lib_execinfo_backtrace" >&6; } +if test "x$ac_cv_lib_execinfo_backtrace" = xyes; then : + LIBEXECINFO="-lexecinfo" fi -ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace" -if test "x$ac_cv_func_backtrace" = xyes -then : - printf "%s\n" "#define HAVE_BACKTRACE 1" >>confdefs.h fi +done + + ALIASES="${ALIASES} cvlc rvlc" # Check whether --enable-mmx was given. -if test ${enable_mmx+y} -then : +if test "${enable_mmx+set}" = set; then : enableval=$enable_mmx; -else $as_nop +else case "${host_cpu}" in i?86|x86_64) @@ -30708,8 +29428,7 @@ have_mmx="no" have_mmxext="no" -if test "${enable_mmx}" != "no" -then : +if test "${enable_mmx}" != "no"; then : ARCH="${ARCH} mmx" @@ -30721,12 +29440,11 @@ LIBS_save="${LIBS}" CFLAGS="${CFLAGS} -mmmx" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks MMX intrinsics" >&5 -printf %s "checking if $CC groks MMX intrinsics... " >&6; } -if test ${ac_cv_c_mmx_intrinsics+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks MMX intrinsics" >&5 +$as_echo_n "checking if $CC groks MMX intrinsics... " >&6; } +if ${ac_cv_c_mmx_intrinsics+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30735,7 +29453,7 @@ #include uint64_t frobzor; int -main (void) +main () { __m64 a, b, c; @@ -30751,21 +29469,20 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_mmx_intrinsics=yes -else $as_nop +else ac_cv_c_mmx_intrinsics=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_mmx_intrinsics" >&5 -printf "%s\n" "$ac_cv_c_mmx_intrinsics" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_mmx_intrinsics" >&5 +$as_echo "$ac_cv_c_mmx_intrinsics" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -30774,11 +29491,10 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" - if test "${ac_cv_c_mmx_intrinsics}" != "no" -then : + if test "${ac_cv_c_mmx_intrinsics}" != "no"; then : -printf "%s\n" "#define HAVE_MMX_INTRINSICS 1" >>confdefs.h +$as_echo "#define HAVE_MMX_INTRINSICS 1" >>confdefs.h fi @@ -30792,18 +29508,17 @@ LIBS_save="${LIBS}" CFLAGS="${CFLAGS} -mmmx" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks MMX inline assembly" >&5 -printf %s "checking if $CC groks MMX inline assembly... " >&6; } -if test ${ac_cv_mmx_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks MMX inline assembly" >&5 +$as_echo_n "checking if $CC groks MMX inline assembly... " >&6; } +if ${ac_cv_mmx_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -30814,43 +29529,40 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_mmx_inline=yes -else $as_nop +else ac_cv_mmx_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mmx_inline" >&5 -printf "%s\n" "$ac_cv_mmx_inline" >&6; } - if test "${ac_cv_mmx_inline}" != "no" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mmx_inline" >&5 +$as_echo "$ac_cv_mmx_inline" >&6; } + if test "${ac_cv_mmx_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_MMX 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_MMX 1" >>confdefs.h have_mmx="yes" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks MMX EXT inline assembly" >&5 -printf %s "checking if $CC groks MMX EXT inline assembly... " >&6; } -if test ${ac_cv_mmxext_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks MMX EXT inline assembly" >&5 +$as_echo_n "checking if $CC groks MMX EXT inline assembly... " >&6; } +if ${ac_cv_mmxext_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -30861,21 +29573,20 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_mmxext_inline=yes -else $as_nop +else ac_cv_mmxext_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mmxext_inline" >&5 -printf "%s\n" "$ac_cv_mmxext_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mmxext_inline" >&5 +$as_echo "$ac_cv_mmxext_inline" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -30884,11 +29595,10 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" - if test "${ac_cv_mmxext_inline}" != "no" -then : + if test "${ac_cv_mmxext_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_MMXEXT 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_MMXEXT 1" >>confdefs.h have_mmxext="yes" @@ -30913,10 +29623,9 @@ # Check whether --enable-sse was given. -if test ${enable_sse+y} -then : +if test "${enable_sse+set}" = set; then : enableval=$enable_sse; -else $as_nop +else case "${host_cpu}" in i?86|x86_64) @@ -30930,8 +29639,7 @@ fi have_sse2="no" -if test "${enable_sse}" != "no" -then : +if test "${enable_sse}" != "no"; then : ARCH="${ARCH} sse sse2" @@ -30944,12 +29652,11 @@ LIBS_save="${LIBS}" CFLAGS="${CFLAGS} -msse2" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE2 intrinsics" >&5 -printf %s "checking if $CC groks SSE2 intrinsics... " >&6; } -if test ${ac_cv_c_sse2_intrinsics+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE2 intrinsics" >&5 +$as_echo_n "checking if $CC groks SSE2 intrinsics... " >&6; } +if ${ac_cv_c_sse2_intrinsics+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30958,7 +29665,7 @@ #include uint64_t frobzor; int -main (void) +main () { __m128i a, b, c; @@ -30974,21 +29681,20 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_sse2_intrinsics=yes -else $as_nop +else ac_cv_c_sse2_intrinsics=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_sse2_intrinsics" >&5 -printf "%s\n" "$ac_cv_c_sse2_intrinsics" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_sse2_intrinsics" >&5 +$as_echo "$ac_cv_c_sse2_intrinsics" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -30997,11 +29703,10 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" - if test "${ac_cv_c_sse2_intrinsics}" != "no" -then : + if test "${ac_cv_c_sse2_intrinsics}" != "no"; then : -printf "%s\n" "#define HAVE_SSE2_INTRINSICS 1" >>confdefs.h +$as_echo "#define HAVE_SSE2_INTRINSICS 1" >>confdefs.h fi @@ -31015,18 +29720,17 @@ LIBS_save="${LIBS}" CFLAGS="${CFLAGS} -msse" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE inline assembly" >&5 -printf %s "checking if $CC groks SSE inline assembly... " >&6; } -if test ${ac_cv_sse_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE inline assembly" >&5 +$as_echo_n "checking if $CC groks SSE inline assembly... " >&6; } +if ${ac_cv_sse_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -31037,43 +29741,40 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sse_inline=yes -else $as_nop +else ac_cv_sse_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse_inline" >&5 -printf "%s\n" "$ac_cv_sse_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse_inline" >&5 +$as_echo "$ac_cv_sse_inline" >&6; } - if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris" -then : + if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"; then : -printf "%s\n" "#define CAN_COMPILE_SSE 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_SSE 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE2 inline assembly" >&5 -printf %s "checking if $CC groks SSE2 inline assembly... " >&6; } -if test ${ac_cv_sse2_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE2 inline assembly" >&5 +$as_echo_n "checking if $CC groks SSE2 inline assembly... " >&6; } +if ${ac_cv_sse2_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -31084,44 +29785,41 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sse2_inline=yes -else $as_nop +else ac_cv_sse2_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse2_inline" >&5 -printf "%s\n" "$ac_cv_sse2_inline" >&6; } - if test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris" -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse2_inline" >&5 +$as_echo "$ac_cv_sse2_inline" >&6; } + if test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"; then : -printf "%s\n" "#define CAN_COMPILE_SSE2 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_SSE2 1" >>confdefs.h have_sse2="yes" fi # SSE3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE3 inline assembly" >&5 -printf %s "checking if $CC groks SSE3 inline assembly... " >&6; } -if test ${ac_cv_sse3_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE3 inline assembly" >&5 +$as_echo_n "checking if $CC groks SSE3 inline assembly... " >&6; } +if ${ac_cv_sse3_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -31132,42 +29830,39 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sse3_inline=yes -else $as_nop +else ac_cv_sse3_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse3_inline" >&5 -printf "%s\n" "$ac_cv_sse3_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse3_inline" >&5 +$as_echo "$ac_cv_sse3_inline" >&6; } - if test "${ac_cv_sse3_inline}" != "no" -then : + if test "${ac_cv_sse3_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_SSE3 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_SSE3 1" >>confdefs.h fi # SSSE3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSSE3 inline assembly" >&5 -printf %s "checking if $CC groks SSSE3 inline assembly... " >&6; } -if test ${ac_cv_ssse3_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSSE3 inline assembly" >&5 +$as_echo_n "checking if $CC groks SSSE3 inline assembly... " >&6; } +if ${ac_cv_ssse3_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -31178,43 +29873,40 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_ssse3_inline=yes -else $as_nop +else ac_cv_ssse3_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ssse3_inline" >&5 -printf "%s\n" "$ac_cv_ssse3_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ssse3_inline" >&5 +$as_echo "$ac_cv_ssse3_inline" >&6; } - if test "${ac_cv_ssse3_inline}" != "no" -then : + if test "${ac_cv_ssse3_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_SSSE3 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_SSSE3 1" >>confdefs.h fi # SSE4.1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE4.1 inline assembly" >&5 -printf %s "checking if $CC groks SSE4.1 inline assembly... " >&6; } -if test ${ac_cv_sse4_1_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE4.1 inline assembly" >&5 +$as_echo_n "checking if $CC groks SSE4.1 inline assembly... " >&6; } +if ${ac_cv_sse4_1_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -31225,43 +29917,40 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sse4_1_inline=yes -else $as_nop +else ac_cv_sse4_1_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse4_1_inline" >&5 -printf "%s\n" "$ac_cv_sse4_1_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse4_1_inline" >&5 +$as_echo "$ac_cv_sse4_1_inline" >&6; } - if test "${ac_cv_sse4_1_inline}" != "no" -then : + if test "${ac_cv_sse4_1_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_SSE4_1 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_SSE4_1 1" >>confdefs.h fi # SSE4.2 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE4.2 inline assembly" >&5 -printf %s "checking if $CC groks SSE4.2 inline assembly... " >&6; } -if test ${ac_cv_sse4_2_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE4.2 inline assembly" >&5 +$as_echo_n "checking if $CC groks SSE4.2 inline assembly... " >&6; } +if ${ac_cv_sse4_2_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -31272,43 +29961,40 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sse4_2_inline=yes -else $as_nop +else ac_cv_sse4_2_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse4_2_inline" >&5 -printf "%s\n" "$ac_cv_sse4_2_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse4_2_inline" >&5 +$as_echo "$ac_cv_sse4_2_inline" >&6; } - if test "${ac_cv_sse4_2_inline}" != "no" -then : + if test "${ac_cv_sse4_2_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_SSE4_2 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_SSE4_2 1" >>confdefs.h fi # SSE4A - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE4A inline assembly" >&5 -printf %s "checking if $CC groks SSE4A inline assembly... " >&6; } -if test ${ac_cv_sse4a_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks SSE4A inline assembly" >&5 +$as_echo_n "checking if $CC groks SSE4A inline assembly... " >&6; } +if ${ac_cv_sse4a_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -31319,21 +30005,20 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sse4a_inline=yes -else $as_nop +else ac_cv_sse4a_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse4a_inline" >&5 -printf "%s\n" "$ac_cv_sse4a_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse4a_inline" >&5 +$as_echo "$ac_cv_sse4a_inline" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -31342,11 +30027,10 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" - if test "${ac_cv_sse4a_inline}" != "no" -then : + if test "${ac_cv_sse4a_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_SSE4A 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_SSE4A 1" >>confdefs.h fi @@ -31370,18 +30054,17 @@ CFLAGS="${CFLAGS} -mmmx" have_3dnow="no" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks 3D Now! inline assembly" >&5 -printf %s "checking if $CC groks 3D Now! inline assembly... " >&6; } -if test ${ac_cv_3dnow_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks 3D Now! inline assembly" >&5 +$as_echo_n "checking if $CC groks 3D Now! inline assembly... " >&6; } +if ${ac_cv_3dnow_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { void *p; @@ -31392,21 +30075,20 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_3dnow_inline=yes -else $as_nop +else ac_cv_3dnow_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3dnow_inline" >&5 -printf "%s\n" "$ac_cv_3dnow_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3dnow_inline" >&5 +$as_echo "$ac_cv_3dnow_inline" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -31415,11 +30097,10 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" -if test "${ac_cv_3dnow_inline}" != "no" -then : +if test "${ac_cv_3dnow_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_3DNOW 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_3DNOW 1" >>confdefs.h have_3dnow="yes" @@ -31435,22 +30116,19 @@ # Check whether --enable-neon was given. -if test ${enable_neon+y} -then : +if test "${enable_neon+set}" = set; then : enableval=$enable_neon; -else $as_nop +else - if test "${host_cpu}" = "arm" -then : + if test "${host_cpu}" = "arm"; then : enable_neon="yes" -else $as_nop +else enable_neon="no" fi fi -if test "${enable_neon}" != "no" -then : +if test "${enable_neon}" != "no"; then : CPPFLAGS_save="${CPPFLAGS}" @@ -31461,19 +30139,18 @@ LIBS_save="${LIBS}" CFLAGS="${CFLAGS} -mfpu=neon -mhard-float" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CCAS groks ARM NEON assembly" >&5 -printf %s "checking if $CCAS groks ARM NEON assembly... " >&6; } -if test ${ac_cv_arm_neon+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CCAS groks ARM NEON assembly" >&5 +$as_echo_n "checking if $CCAS groks ARM NEON assembly... " >&6; } +if ${ac_cv_arm_neon+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { asm volatile("vqmovun.s64 d0, q1":::"d0"); @@ -31483,21 +30160,20 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_arm_neon="yes" -else $as_nop +else ac_cv_arm_neon="no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_arm_neon" >&5 -printf "%s\n" "$ac_cv_arm_neon" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_arm_neon" >&5 +$as_echo "$ac_cv_arm_neon" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -31518,36 +30194,32 @@ # Check whether --enable-arm64 was given. -if test ${enable_arm64+y} -then : +if test "${enable_arm64+set}" = set; then : enableval=$enable_arm64; -else $as_nop +else - if test "${host_cpu}" = "aarch64" -then : + if test "${host_cpu}" = "aarch64"; then : enable_arm64="yes" -else $as_nop +else enable_arm64="no" fi fi -if test "${enable_arm64}" != "no" -then : +if test "${enable_arm64}" != "no"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CCAS groks ARM 64 SIMD assembly" >&5 -printf %s "checking if $CCAS groks ARM 64 SIMD assembly... " >&6; } -if test ${ac_cv_arm64+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CCAS groks ARM 64 SIMD assembly" >&5 +$as_echo_n "checking if $CCAS groks ARM 64 SIMD assembly... " >&6; } +if ${ac_cv_arm64+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { asm volatile("uhadd v0.8b, v0.8b, v1.8b":::"v0"); @@ -31557,21 +30229,20 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_arm64="yes" -else $as_nop +else ac_cv_arm64="no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_arm64" >&5 -printf "%s\n" "$ac_cv_arm64" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_arm64" >&5 +$as_echo "$ac_cv_arm64" >&6; } fi if test "${ac_cv_arm64}" = "yes"; then @@ -31585,10 +30256,9 @@ # Check whether --enable-altivec was given. -if test ${enable_altivec+y} -then : +if test "${enable_altivec+set}" = set; then : enableval=$enable_altivec; -else $as_nop +else case "${host_cpu}" in #( powerpc*) : @@ -31600,8 +30270,7 @@ fi have_altivec="no" -if test "${enable_altivec}" = "yes" -then : +if test "${enable_altivec}" = "yes"; then : ARCH="${ARCH} altivec"; @@ -31612,54 +30281,51 @@ LDFLAGS_save="${LDFLAGS}" LIBS_save="${LIBS}" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC groks AltiVec inline assembly" >&5 -printf %s "checking if $CC groks AltiVec inline assembly... " >&6; } -if test ${ac_cv_altivec_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC groks AltiVec inline assembly" >&5 +$as_echo_n "checking if $CC groks AltiVec inline assembly... " >&6; } +if ${ac_cv_altivec_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { asm volatile("vperm 0,1,2,3"); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_altivec_inline="yes" -else $as_nop +else CFLAGS="${CFLAGS} -Wa,-maltivec" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { asm volatile("vperm 0,1,2,3"); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_altivec_inline="-Wa,-maltivec" -else $as_nop +else ac_cv_altivec_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_altivec_inline" >&5 -printf "%s\n" "$ac_cv_altivec_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_altivec_inline" >&5 +$as_echo "$ac_cv_altivec_inline" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -31668,11 +30334,10 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" - if test "${ac_cv_altivec_inline}" != "no" -then : + if test "${ac_cv_altivec_inline}" != "no"; then : -printf "%s\n" "#define CAN_COMPILE_ALTIVEC 1" >>confdefs.h +$as_echo "#define CAN_COMPILE_ALTIVEC 1" >>confdefs.h fi @@ -31685,12 +30350,11 @@ LDFLAGS_save="${LDFLAGS}" LIBS_save="${LIBS}" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if \$CC groks AltiVec C extensions" >&5 -printf %s "checking if \$CC groks AltiVec C extensions... " >&6; } -if test ${ac_cv_c_altivec+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \$CC groks AltiVec C extensions" >&5 +$as_echo_n "checking if \$CC groks AltiVec C extensions... " >&6; } +if ${ac_cv_c_altivec+:} false; then : + $as_echo_n "(cached) " >&6 +else CFLAGS="${CFLAGS} -maltivec" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -31698,7 +30362,7 @@ #include int -main (void) +main () { vec_ld(0, (unsigned char *)0); @@ -31706,21 +30370,20 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_altivec="-maltivec" -else $as_nop +else ac_cv_c_altivec="no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_altivec" >&5 -printf "%s\n" "$ac_cv_c_altivec" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_altivec" >&5 +$as_echo "$ac_cv_c_altivec" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -31729,19 +30392,23 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" - if test "${ac_cv_c_altivec}" != "no" -then : + if test "${ac_cv_c_altivec}" != "no"; then : have_altivec="yes" fi - ac_fn_c_check_header_compile "$LINENO" "altivec.h" "ac_cv_header_altivec_h" "$ac_includes_default" -if test "x$ac_cv_header_altivec_h" = xyes -then : - printf "%s\n" "#define HAVE_ALTIVEC_H 1" >>confdefs.h + for ac_header in altivec.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "altivec.h" "ac_cv_header_altivec_h" "$ac_includes_default" +if test "x$ac_cv_header_altivec_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ALTIVEC_H 1 +_ACEOF fi +done + CPPFLAGS_save="${CPPFLAGS}" @@ -31752,34 +30419,32 @@ LIBS_save="${LIBS}" LDFLAGS="${LDFLAGS} -Wl,-framework,vecLib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if linker needs -framework vecLib" >&5 -printf %s "checking if linker needs -framework vecLib... " >&6; } -if test ${ac_cv_ld_altivec+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if linker needs -framework vecLib" >&5 +$as_echo_n "checking if linker needs -framework vecLib... " >&6; } +if ${ac_cv_ld_altivec+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_ld_altivec=yes -else $as_nop +else ac_cv_ld_altivec=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_altivec" >&5 -printf "%s\n" "$ac_cv_ld_altivec" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_altivec" >&5 +$as_echo "$ac_cv_ld_altivec" >&6; } CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -31788,8 +30453,7 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" - if test "${ac_cv_ld_altivec}" != "no" -then : + if test "${ac_cv_ld_altivec}" != "no"; then : @@ -31811,43 +30475,38 @@ # Check whether --enable-optimize-memory was given. -if test ${enable_optimize_memory+y} -then : +if test "${enable_optimize_memory+set}" = set; then : enableval=$enable_optimize_memory; fi if test "${enable_optimize_memory}" = "yes"; then -printf "%s\n" "#define OPTIMIZE_MEMORY 1" >>confdefs.h +$as_echo "#define OPTIMIZE_MEMORY 1" >>confdefs.h fi # Check whether --enable-run-as-root was given. -if test ${enable_run_as_root+y} -then : +if test "${enable_run_as_root+set}" = set; then : enableval=$enable_run_as_root; fi -if test "${enable_run_as_root}" = "yes" -then : +if test "${enable_run_as_root}" = "yes"; then : -printf "%s\n" "#define ALLOW_RUN_AS_ROOT 1" >>confdefs.h +$as_echo "#define ALLOW_RUN_AS_ROOT 1" >>confdefs.h fi # Check whether --enable-sout was given. -if test ${enable_sout+y} -then : +if test "${enable_sout+set}" = set; then : enableval=$enable_sout; fi -if test "${enable_sout}" != "no" -then : +if test "${enable_sout}" != "no"; then : -printf "%s\n" "#define ENABLE_SOUT 1" >>confdefs.h +$as_echo "#define ENABLE_SOUT 1" >>confdefs.h fi @@ -31861,8 +30520,7 @@ # Check whether --enable-lua was given. -if test ${enable_lua+y} -then : +if test "${enable_lua+set}" = set; then : enableval=$enable_lua; fi @@ -31870,17 +30528,17 @@ then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lua5.2" >&5 -printf %s "checking for lua5.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua5.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31894,10 +30552,10 @@ pkg_cv_LUA_LIBS="$LUA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua5.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31911,8 +30569,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -31920,30 +30578,30 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua 5.1 instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua 5.1 instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua 5.1 instead" >&2;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lua5.1" >&5 -printf %s "checking for lua5.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31957,10 +30615,10 @@ pkg_cv_LUA_LIBS="$LUA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31974,8 +30632,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -31983,29 +30641,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&2;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lua >= 5.1" >&5 -printf %s "checking for lua >= 5.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32019,10 +30677,10 @@ pkg_cv_LUA_LIBS="$LUA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32036,8 +30694,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -32045,39 +30703,38 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} have_lua=yes - for ac_header in lua.h lauxlib.h lualib.h + for ac_header in lua.h lauxlib.h lualib.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else $as_nop +else have_lua=no fi done - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.2 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 -printf %s "checking for luaL_newstate in -llua5.2 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32086,39 +30743,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.2" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.1 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 -printf %s "checking for luaL_newstate in -llua5.1 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32127,39 +30784,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.1" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua51 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 -printf %s "checking for luaL_newstate in -llua51 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 +$as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua51 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32168,39 +30825,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua51" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 -printf %s "checking for luaL_newstate in -llua ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 +$as_echo_n "checking for luaL_newstate in -llua ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32209,32 +30866,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua" -else $as_nop +else have_lua=no fi @@ -32248,34 +30906,33 @@ elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} have_lua=yes - for ac_header in lua.h lauxlib.h lualib.h + for ac_header in lua.h lauxlib.h lualib.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else $as_nop +else have_lua=no fi done - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.2 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 -printf %s "checking for luaL_newstate in -llua5.2 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32284,39 +30941,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.2" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.1 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 -printf %s "checking for luaL_newstate in -llua5.1 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32325,39 +30982,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.1" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua51 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 -printf %s "checking for luaL_newstate in -llua51 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 +$as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua51 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32366,39 +31023,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua51" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 -printf %s "checking for luaL_newstate in -llua ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 +$as_echo_n "checking for luaL_newstate in -llua ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32407,32 +31064,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua" -else $as_nop +else have_lua=no fi @@ -32446,32 +31104,32 @@ else - 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 + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lua=yes fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&5 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&2;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lua >= 5.1" >&5 -printf %s "checking for lua >= 5.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32485,10 +31143,10 @@ pkg_cv_LUA_LIBS="$LUA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32502,8 +31160,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -32511,39 +31169,38 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} have_lua=yes - for ac_header in lua.h lauxlib.h lualib.h + for ac_header in lua.h lauxlib.h lualib.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else $as_nop +else have_lua=no fi done - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.2 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 -printf %s "checking for luaL_newstate in -llua5.2 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32552,39 +31209,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.2" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.1 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 -printf %s "checking for luaL_newstate in -llua5.1 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32593,39 +31250,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.1" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua51 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 -printf %s "checking for luaL_newstate in -llua51 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 +$as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua51 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32634,39 +31291,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua51" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 -printf %s "checking for luaL_newstate in -llua ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 +$as_echo_n "checking for luaL_newstate in -llua ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32675,32 +31332,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua" -else $as_nop +else have_lua=no fi @@ -32714,34 +31372,33 @@ elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} have_lua=yes - for ac_header in lua.h lauxlib.h lualib.h + for ac_header in lua.h lauxlib.h lualib.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else $as_nop +else have_lua=no fi done - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.2 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 -printf %s "checking for luaL_newstate in -llua5.2 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32750,39 +31407,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.2" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.1 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 -printf %s "checking for luaL_newstate in -llua5.1 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32791,39 +31448,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.1" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua51 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 -printf %s "checking for luaL_newstate in -llua51 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 +$as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua51 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32832,39 +31489,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua51" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 -printf %s "checking for luaL_newstate in -llua ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 +$as_echo_n "checking for luaL_newstate in -llua ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -32873,32 +31530,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua" -else $as_nop +else have_lua=no fi @@ -32912,41 +31570,41 @@ else - 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 + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lua=yes fi else - 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 + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lua=yes fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua 5.1 instead" >&5 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua 5.1 instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua 5.1 instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua 5.1 instead" >&2;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lua5.1" >&5 -printf %s "checking for lua5.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32960,10 +31618,10 @@ pkg_cv_LUA_LIBS="$LUA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32977,8 +31635,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -32986,29 +31644,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&2;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lua >= 5.1" >&5 -printf %s "checking for lua >= 5.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33022,10 +31680,10 @@ pkg_cv_LUA_LIBS="$LUA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33039,8 +31697,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -33048,39 +31706,38 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} have_lua=yes - for ac_header in lua.h lauxlib.h lualib.h + for ac_header in lua.h lauxlib.h lualib.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else $as_nop +else have_lua=no fi done - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.2 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 -printf %s "checking for luaL_newstate in -llua5.2 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33089,39 +31746,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.2" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.1 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 -printf %s "checking for luaL_newstate in -llua5.1 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33130,39 +31787,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.1" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua51 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 -printf %s "checking for luaL_newstate in -llua51 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 +$as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua51 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33171,39 +31828,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua51" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 -printf %s "checking for luaL_newstate in -llua ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 +$as_echo_n "checking for luaL_newstate in -llua ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33212,32 +31869,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua" -else $as_nop +else have_lua=no fi @@ -33251,34 +31909,33 @@ elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} have_lua=yes - for ac_header in lua.h lauxlib.h lualib.h + for ac_header in lua.h lauxlib.h lualib.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else $as_nop +else have_lua=no fi done - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.2 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 -printf %s "checking for luaL_newstate in -llua5.2 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33287,39 +31944,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.2" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.1 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 -printf %s "checking for luaL_newstate in -llua5.1 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33328,39 +31985,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.1" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua51 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 -printf %s "checking for luaL_newstate in -llua51 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 +$as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua51 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33369,39 +32026,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua51" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 -printf %s "checking for luaL_newstate in -llua ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 +$as_echo_n "checking for luaL_newstate in -llua ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33410,32 +32067,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua" -else $as_nop +else have_lua=no fi @@ -33449,32 +32107,32 @@ else - 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 + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lua=yes fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&5 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying lua >= 5.1 instead" >&2;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lua >= 5.1" >&5 -printf %s "checking for lua >= 5.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 +$as_echo_n "checking for LUA... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33488,10 +32146,10 @@ pkg_cv_LUA_LIBS="$LUA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33505,8 +32163,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -33514,39 +32172,38 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} have_lua=yes - for ac_header in lua.h lauxlib.h lualib.h + for ac_header in lua.h lauxlib.h lualib.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else $as_nop +else have_lua=no fi done - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.2 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 -printf %s "checking for luaL_newstate in -llua5.2 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33555,39 +32212,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.2" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.1 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 -printf %s "checking for luaL_newstate in -llua5.1 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33596,39 +32253,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.1" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua51 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 -printf %s "checking for luaL_newstate in -llua51 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 +$as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua51 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33637,39 +32294,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua51" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 -printf %s "checking for luaL_newstate in -llua ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 +$as_echo_n "checking for luaL_newstate in -llua ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33678,32 +32335,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua" -else $as_nop +else have_lua=no fi @@ -33717,34 +32375,33 @@ elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 -printf "%s\n" "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&5 +$as_echo "$as_me: WARNING: ${LUA_PKG_ERRORS}, trying manual detection instead" >&2;} have_lua=yes - for ac_header in lua.h lauxlib.h lualib.h + for ac_header in lua.h lauxlib.h lualib.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else $as_nop +else have_lua=no fi done - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.2 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 -printf %s "checking for luaL_newstate in -llua5.2 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33753,39 +32410,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.2" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua5.1 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 -printf %s "checking for luaL_newstate in -llua5.1 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33794,39 +32451,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua5.1" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua51 ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 -printf %s "checking for luaL_newstate in -llua51 ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua51 ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua51 " >&5 +$as_echo_n "checking for luaL_newstate in -llua51 ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua51 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33835,39 +32492,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua51" -else $as_nop - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua ""_luaL_newstate" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 -printf %s "checking for luaL_newstate in -llua ... " >&6; } -if eval test \${$as_ac_Lib+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + as_ac_Lib=`$as_echo "ac_cv_lib_lua ''_luaL_newstate" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua " >&5 +$as_echo_n "checking for luaL_newstate in -llua ... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llua -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33876,32 +32533,33 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char luaL_newstate (); int -main (void) +main () { return luaL_newstate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" -else $as_nop +else eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LUA_LIBS="-llua" -else $as_nop +else have_lua=no fi @@ -33915,44 +32573,42 @@ else - 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 + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lua=yes fi else - 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 + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lua=yes fi else - 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 + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + 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 fi - if test -z "$LUAC" -then : + if test -z "$LUAC"; then : if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}luac", so it can be a program name with args. set dummy ${ac_tool_prefix}luac; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_LUAC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LUAC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$LUAC"; then ac_cv_prog_LUAC="$LUAC" # Let the user override the test. else @@ -33960,15 +32616,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LUAC="${ac_tool_prefix}luac" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -33979,11 +32631,11 @@ fi LUAC=$ac_cv_prog_LUAC if test -n "$LUAC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LUAC" >&5 -printf "%s\n" "$LUAC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LUAC" >&5 +$as_echo "$LUAC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -33992,12 +32644,11 @@ ac_ct_LUAC=$LUAC # Extract the first word of "luac", so it can be a program name with args. set dummy luac; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_LUAC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LUAC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_LUAC"; then ac_cv_prog_ac_ct_LUAC="$ac_ct_LUAC" # Let the user override the test. else @@ -34005,15 +32656,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LUAC="luac" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -34024,11 +32671,11 @@ fi ac_ct_LUAC=$ac_cv_prog_ac_ct_LUAC if test -n "$ac_ct_LUAC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LUAC" >&5 -printf "%s\n" "$ac_ct_LUAC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LUAC" >&5 +$as_echo "$ac_ct_LUAC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_LUAC" = x; then @@ -34036,8 +32683,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LUAC=$ac_ct_LUAC @@ -34048,14 +32695,12 @@ fi - if test "${LUAC}" = "false" -then : + if test "${LUAC}" = "false"; then : as_fn_error $? "Could not find the LUA byte compiler." "$LINENO" 5 fi - if test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}/lib/liblua.a" -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|tr -s ' '|cut -d' ' -f2` != 0404 -then : + if test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}/lib/liblua.a" -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|tr -s ' '|cut -d' ' -f2` != 0404; then : as_fn_error $? "You need 32-bits luac when using lua from contrib." "$LINENO" 5 @@ -34072,24 +32717,21 @@ # Check whether --enable-vlm was given. -if test ${enable_vlm+y} -then : +if test "${enable_vlm+set}" = set; then : enableval=$enable_vlm; -else $as_nop +else enable_vlm="${enable_sout}" fi -if test "${enable_vlm}" != "no" -then : +if test "${enable_vlm}" != "no"; then : - if test "${enable_sout}" = "no" -then : + if test "${enable_sout}" = "no"; then : as_fn_error $? "VLM requires the stream output. Do not use --disable-sout." "$LINENO" 5 fi -printf "%s\n" "#define ENABLE_VLM 1" >>confdefs.h +$as_echo "#define ENABLE_VLM 1" >>confdefs.h fi @@ -34104,15 +32746,14 @@ # Check whether --enable-addonmanagermodules was given. -if test ${enable_addonmanagermodules+y} -then : +if test "${enable_addonmanagermodules+set}" = set; then : enableval=$enable_addonmanagermodules; fi if test "${enable_addonmanagermodules}" != "no" then -printf "%s\n" "#define ENABLE_ADDONMANAGERMODULES 1" >>confdefs.h +$as_echo "#define ENABLE_ADDONMANAGERMODULES 1" >>confdefs.h fi if test "${enable_addonmanagermodules}" != "no"; then @@ -34145,10 +32786,9 @@ # Check whether --enable-archive was given. -if test ${enable_archive+y} -then : +if test "${enable_archive+set}" = set; then : enableval=$enable_archive; -else $as_nop +else enable_archive=auto fi @@ -34157,17 +32797,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libarchive >= 3.1.0" >&5 -printf %s "checking for libarchive >= 3.1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARCHIVE" >&5 +$as_echo_n "checking for ARCHIVE... " >&6; } if test -n "$ARCHIVE_CFLAGS"; then pkg_cv_ARCHIVE_CFLAGS="$ARCHIVE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libarchive >= 3.1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libarchive >= 3.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libarchive >= 3.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARCHIVE_CFLAGS=`$PKG_CONFIG --cflags "libarchive >= 3.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34181,10 +32821,10 @@ pkg_cv_ARCHIVE_LIBS="$ARCHIVE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libarchive >= 3.1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libarchive >= 3.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libarchive >= 3.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARCHIVE_LIBS=`$PKG_CONFIG --libs "libarchive >= 3.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34198,8 +32838,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -34207,38 +32847,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&5 +$as_echo "$as_me: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&5 +$as_echo "$as_me: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&2;} fi else - 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 + ARCHIVE_CFLAGS=$pkg_cv_ARCHIVE_CFLAGS + ARCHIVE_LIBS=$pkg_cv_ARCHIVE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBarchive=libarchive_plugin.la @@ -34259,17 +32897,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libarchive >= 3.1.0" >&5 -printf %s "checking for libarchive >= 3.1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARCHIVE" >&5 +$as_echo_n "checking for ARCHIVE... " >&6; } if test -n "$ARCHIVE_CFLAGS"; then pkg_cv_ARCHIVE_CFLAGS="$ARCHIVE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libarchive >= 3.1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libarchive >= 3.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libarchive >= 3.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARCHIVE_CFLAGS=`$PKG_CONFIG --cflags "libarchive >= 3.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34283,10 +32921,10 @@ pkg_cv_ARCHIVE_LIBS="$ARCHIVE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libarchive >= 3.1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libarchive >= 3.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libarchive >= 3.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARCHIVE_LIBS=`$PKG_CONFIG --libs "libarchive >= 3.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34300,8 +32938,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -34309,40 +32947,38 @@ _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 - if test x"$enable_archive" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&5 +$as_echo "$as_me: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&2;} fi 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 - if test x"$enable_archive" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&5 +$as_echo "$as_me: WARNING: Library libarchive >= 3.1.0 needed for archive was not found" >&2;} fi else - 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 + ARCHIVE_CFLAGS=$pkg_cv_ARCHIVE_CFLAGS + ARCHIVE_LIBS=$pkg_cv_ARCHIVE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_archive=yes LTLIBarchive=libarchive_plugin.la @@ -34379,29 +33015,27 @@ # Check whether --enable-live555 was given. -if test ${enable_live555+y} -then : +if test "${enable_live555+set}" = set; then : enableval=$enable_live555; fi -if test "${enable_live555}" != "no" -a -n "${CXX}" -then : +if test "${enable_live555}" != "no" -a -n "${CXX}"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for live555" >&5 -printf %s "checking for live555... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIVE555" >&5 +$as_echo_n "checking for LIVE555... " >&6; } if test -n "$LIVE555_CFLAGS"; then pkg_cv_LIVE555_CFLAGS="$LIVE555_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"live555\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"live555\""; } >&5 ($PKG_CONFIG --exists --print-errors "live555") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIVE555_CFLAGS=`$PKG_CONFIG --cflags "live555" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34415,10 +33049,10 @@ pkg_cv_LIVE555_LIBS="$LIVE555_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"live555\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"live555\""; } >&5 ($PKG_CONFIG --exists --print-errors "live555") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIVE555_LIBS=`$PKG_CONFIG --libs "live555" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -34432,8 +33066,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -34441,16 +33075,16 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LIVE555_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIVE555_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIVE555_PKG_ERRORS}." >&2;} ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -34467,20 +33101,18 @@ LIBS_save="${LIBS}" - if test -f "${CONTRIB_DIR}/include/UsageEnvironment/UsageEnvironment.hh" -then : + if test -f "${CONTRIB_DIR}/include/UsageEnvironment/UsageEnvironment.hh"; then : CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" -else $as_nop +else - if test "${SYS}" != "os2" -then : + if test "${SYS}" != "os2"; then : LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"} CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia -I${LIVE555_PREFIX}/include/groupsock -I${LIVE555_PREFIX}/include/BasicUsageEnvironment -I${LIVE555_PREFIX}/include/UsageEnvironment" -else $as_nop +else LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"} CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include" @@ -34490,8 +33122,7 @@ fi - if test "${SYS}" = "solaris" -then : + if test "${SYS}" = "solaris"; then : CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" @@ -34499,12 +33130,11 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for live555 version 1324598400 or later" >&5 -printf %s "checking for live555 version 1324598400 or later... " >&6; } -if test ${ac_cv_live555+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for live555 version 1324598400 or later" >&5 +$as_echo_n "checking for live555 version 1324598400 or later... " >&6; } +if ${ac_cv_live555+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34514,7 +33144,7 @@ # error BOOM #endif int -main (void) +main () { ; @@ -34522,12 +33152,11 @@ } _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : ac_cv_live555="yes" -else $as_nop +else ac_cv_live555="no" @@ -34535,31 +33164,28 @@ rm -f conftest.err conftest.i conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_live555" >&5 -printf "%s\n" "$ac_cv_live555" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_live555" >&5 +$as_echo "$ac_cv_live555" >&6; } - if test "$ac_cv_live555" = "no" -then : + if test "$ac_cv_live555" = "no"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: live555 is missing or its installed version is too old: + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: live555 is missing or its installed version is too old: Version 2011.12.23 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia ." >&5 -printf "%s\n" "$as_me: WARNING: live555 is missing or its installed version is too old: +$as_echo "$as_me: WARNING: live555 is missing or its installed version is too old: Version 2011.12.23 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia ." >&2;} - if test -n "${enable_live555}" -then : + if test -n "${enable_live555}"; then : as_fn_error $? "Update live555 or pass --disable-live555 to disable RTSP input support." "$LINENO" 5 fi -else $as_nop +else other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" - if test "${SYS}" = "mingw32" -then : + if test "${SYS}" = "mingw32"; then : # add ws2_32 for closesocket, select, recv other_libs="$other_libs -lws2_32" @@ -34578,42 +33204,37 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lliveMedia_pic" >&5 -printf %s "checking for main in -lliveMedia_pic... " >&6; } -if test ${ac_cv_lib_liveMedia_pic_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lliveMedia_pic" >&5 +$as_echo_n "checking for main in -lliveMedia_pic... " >&6; } +if ${ac_cv_lib_liveMedia_pic_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lliveMedia_pic ${other_libs_pic} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_liveMedia_pic_main=yes -else $as_nop +else ac_cv_lib_liveMedia_pic_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_liveMedia_pic_main" >&5 -printf "%s\n" "$ac_cv_lib_liveMedia_pic_main" >&6; } -if test "x$ac_cv_lib_liveMedia_pic_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_liveMedia_pic_main" >&5 +$as_echo "$ac_cv_lib_liveMedia_pic_main" >&6; } +if test "x$ac_cv_lib_liveMedia_pic_main" = xyes; then : @@ -34628,44 +33249,39 @@ -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lliveMedia" >&5 -printf %s "checking for main in -lliveMedia... " >&6; } -if test ${ac_cv_lib_liveMedia_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lliveMedia" >&5 +$as_echo_n "checking for main in -lliveMedia... " >&6; } +if ${ac_cv_lib_liveMedia_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lliveMedia ${other_libs} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_liveMedia_main=yes -else $as_nop +else ac_cv_lib_liveMedia_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_liveMedia_main" >&5 -printf "%s\n" "$ac_cv_lib_liveMedia_main" >&6; } -if test "x$ac_cv_lib_liveMedia_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_liveMedia_main" >&5 +$as_echo "$ac_cv_lib_liveMedia_main" >&6; } +if test "x$ac_cv_lib_liveMedia_main" = xyes; then : @@ -34703,11 +33319,11 @@ elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIVE555_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIVE555_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIVE555_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIVE555_PKG_ERRORS}." >&2;} ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -34724,20 +33340,18 @@ LIBS_save="${LIBS}" - if test -f "${CONTRIB_DIR}/include/UsageEnvironment/UsageEnvironment.hh" -then : + if test -f "${CONTRIB_DIR}/include/UsageEnvironment/UsageEnvironment.hh"; then : CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" -else $as_nop +else - if test "${SYS}" != "os2" -then : + if test "${SYS}" != "os2"; then : LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"} CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia -I${LIVE555_PREFIX}/include/groupsock -I${LIVE555_PREFIX}/include/BasicUsageEnvironment -I${LIVE555_PREFIX}/include/UsageEnvironment" -else $as_nop +else LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"} CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include" @@ -34747,8 +33361,7 @@ fi - if test "${SYS}" = "solaris" -then : + if test "${SYS}" = "solaris"; then : CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" @@ -34756,12 +33369,11 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for live555 version 1324598400 or later" >&5 -printf %s "checking for live555 version 1324598400 or later... " >&6; } -if test ${ac_cv_live555+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for live555 version 1324598400 or later" >&5 +$as_echo_n "checking for live555 version 1324598400 or later... " >&6; } +if ${ac_cv_live555+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34771,7 +33383,7 @@ # error BOOM #endif int -main (void) +main () { ; @@ -34779,12 +33391,11 @@ } _ACEOF -if ac_fn_cxx_try_cpp "$LINENO" -then : +if ac_fn_cxx_try_cpp "$LINENO"; then : ac_cv_live555="yes" -else $as_nop +else ac_cv_live555="no" @@ -34792,31 +33403,28 @@ rm -f conftest.err conftest.i conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_live555" >&5 -printf "%s\n" "$ac_cv_live555" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_live555" >&5 +$as_echo "$ac_cv_live555" >&6; } - if test "$ac_cv_live555" = "no" -then : + if test "$ac_cv_live555" = "no"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: live555 is missing or its installed version is too old: + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: live555 is missing or its installed version is too old: Version 2011.12.23 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia ." >&5 -printf "%s\n" "$as_me: WARNING: live555 is missing or its installed version is too old: +$as_echo "$as_me: WARNING: live555 is missing or its installed version is too old: Version 2011.12.23 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia ." >&2;} - if test -n "${enable_live555}" -then : + if test -n "${enable_live555}"; then : as_fn_error $? "Update live555 or pass --disable-live555 to disable RTSP input support." "$LINENO" 5 fi -else $as_nop +else other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" - if test "${SYS}" = "mingw32" -then : + if test "${SYS}" = "mingw32"; then : # add ws2_32 for closesocket, select, recv other_libs="$other_libs -lws2_32" @@ -34835,42 +33443,37 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lliveMedia_pic" >&5 -printf %s "checking for main in -lliveMedia_pic... " >&6; } -if test ${ac_cv_lib_liveMedia_pic_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lliveMedia_pic" >&5 +$as_echo_n "checking for main in -lliveMedia_pic... " >&6; } +if ${ac_cv_lib_liveMedia_pic_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lliveMedia_pic ${other_libs_pic} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_liveMedia_pic_main=yes -else $as_nop +else ac_cv_lib_liveMedia_pic_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_liveMedia_pic_main" >&5 -printf "%s\n" "$ac_cv_lib_liveMedia_pic_main" >&6; } -if test "x$ac_cv_lib_liveMedia_pic_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_liveMedia_pic_main" >&5 +$as_echo "$ac_cv_lib_liveMedia_pic_main" >&6; } +if test "x$ac_cv_lib_liveMedia_pic_main" = xyes; then : @@ -34885,44 +33488,39 @@ -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lliveMedia" >&5 -printf %s "checking for main in -lliveMedia... " >&6; } -if test ${ac_cv_lib_liveMedia_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lliveMedia" >&5 +$as_echo_n "checking for main in -lliveMedia... " >&6; } +if ${ac_cv_lib_liveMedia_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lliveMedia ${other_libs} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -namespace conftest { - extern "C" int main (); -} + int -main (void) +main () { -return conftest::main (); +return main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO" -then : +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_liveMedia_main=yes -else $as_nop +else ac_cv_lib_liveMedia_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_liveMedia_main" >&5 -printf "%s\n" "$ac_cv_lib_liveMedia_main" >&6; } -if test "x$ac_cv_lib_liveMedia_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_liveMedia_main" >&5 +$as_echo "$ac_cv_lib_liveMedia_main" >&6; } +if test "x$ac_cv_lib_liveMedia_main" = xyes; then : @@ -34960,10 +33558,10 @@ else - 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; } + LIVE555_CFLAGS=$pkg_cv_LIVE555_CFLAGS + LIVE555_LIBS=$pkg_cv_LIVE555_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -35005,10 +33603,9 @@ # Check whether --enable-dc1394 was given. -if test ${enable_dc1394+y} -then : +if test "${enable_dc1394+set}" = set; then : enableval=$enable_dc1394; -else $as_nop +else enable_dc1394=auto fi @@ -35017,17 +33614,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdc1394-2 >= 2.1.0" >&5 -printf %s "checking for libdc1394-2 >= 2.1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DC1394" >&5 +$as_echo_n "checking for DC1394... " >&6; } if test -n "$DC1394_CFLAGS"; then pkg_cv_DC1394_CFLAGS="$DC1394_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdc1394-2 >= 2.1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdc1394-2 >= 2.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdc1394-2 >= 2.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DC1394_CFLAGS=`$PKG_CONFIG --cflags "libdc1394-2 >= 2.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35041,10 +33638,10 @@ pkg_cv_DC1394_LIBS="$DC1394_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdc1394-2 >= 2.1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdc1394-2 >= 2.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdc1394-2 >= 2.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DC1394_LIBS=`$PKG_CONFIG --libs "libdc1394-2 >= 2.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35058,8 +33655,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35067,38 +33664,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5 +$as_echo "$as_me: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5 +$as_echo "$as_me: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;} fi else - 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 + DC1394_CFLAGS=$pkg_cv_DC1394_CFLAGS + DC1394_LIBS=$pkg_cv_DC1394_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBdc1394=libdc1394_plugin.la @@ -35119,17 +33714,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdc1394-2 >= 2.1.0" >&5 -printf %s "checking for libdc1394-2 >= 2.1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DC1394" >&5 +$as_echo_n "checking for DC1394... " >&6; } if test -n "$DC1394_CFLAGS"; then pkg_cv_DC1394_CFLAGS="$DC1394_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdc1394-2 >= 2.1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdc1394-2 >= 2.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdc1394-2 >= 2.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DC1394_CFLAGS=`$PKG_CONFIG --cflags "libdc1394-2 >= 2.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35143,10 +33738,10 @@ pkg_cv_DC1394_LIBS="$DC1394_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdc1394-2 >= 2.1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdc1394-2 >= 2.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdc1394-2 >= 2.1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DC1394_LIBS=`$PKG_CONFIG --libs "libdc1394-2 >= 2.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35160,8 +33755,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35169,40 +33764,38 @@ _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 - if test x"$enable_dc1394" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5 +$as_echo "$as_me: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;} fi 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 - if test x"$enable_dc1394" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&5 +$as_echo "$as_me: WARNING: Library libdc1394-2 >= 2.1.0 needed for dc1394 was not found" >&2;} fi else - 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 + DC1394_CFLAGS=$pkg_cv_DC1394_CFLAGS + DC1394_LIBS=$pkg_cv_DC1394_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_dc1394=yes LTLIBdc1394=libdc1394_plugin.la @@ -35254,10 +33847,9 @@ # Check whether --enable-dv1394 was given. -if test ${enable_dv1394+y} -then : +if test "${enable_dv1394+set}" = set; then : enableval=$enable_dv1394; -else $as_nop +else enable_dv1394=auto fi @@ -35266,17 +33858,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" >&5 -printf %s "checking for libraw1394 >= 2.0.1 libavc1394 >= 0.5.3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DV1394" >&5 +$as_echo_n "checking for DV1394... " >&6; } if test -n "$DV1394_CFLAGS"; then pkg_cv_DV1394_CFLAGS="$DV1394_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DV1394_CFLAGS=`$PKG_CONFIG --cflags "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35290,10 +33882,10 @@ pkg_cv_DV1394_LIBS="$DV1394_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DV1394_LIBS=`$PKG_CONFIG --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35307,8 +33899,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35316,38 +33908,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&5 +$as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&5 +$as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&2;} fi else - 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 + DV1394_CFLAGS=$pkg_cv_DV1394_CFLAGS + DV1394_LIBS=$pkg_cv_DV1394_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBdv1394=libdv1394_plugin.la @@ -35368,17 +33958,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" >&5 -printf %s "checking for libraw1394 >= 2.0.1 libavc1394 >= 0.5.3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DV1394" >&5 +$as_echo_n "checking for DV1394... " >&6; } if test -n "$DV1394_CFLAGS"; then pkg_cv_DV1394_CFLAGS="$DV1394_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DV1394_CFLAGS=`$PKG_CONFIG --cflags "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35392,10 +33982,10 @@ pkg_cv_DV1394_LIBS="$DV1394_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw1394 >= 2.0.1 libavc1394 >= 0.5.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DV1394_LIBS=`$PKG_CONFIG --libs "libraw1394 >= 2.0.1 libavc1394 >= 0.5.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35409,8 +33999,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35418,40 +34008,38 @@ _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 - if test x"$enable_dv1394" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&5 +$as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&2;} fi 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 - if test x"$enable_dv1394" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&5 +$as_echo "$as_me: WARNING: Library libraw1394 >= 2.0.1 libavc1394 >= 0.5.3 needed for dv1394 was not found" >&2;} fi else - 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 + DV1394_CFLAGS=$pkg_cv_DV1394_CFLAGS + DV1394_LIBS=$pkg_cv_DV1394_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_dv1394=yes LTLIBdv1394=libdv1394_plugin.la @@ -35488,13 +34076,11 @@ # Check whether --enable-linsys was given. -if test ${enable_linsys+y} -then : +if test "${enable_linsys+set}" = set; then : enableval=$enable_linsys; fi -if test "$SYS" = "linux" -a "${enable_linsys}" != "no" -then : +if test "$SYS" = "linux" -a "${enable_linsys}" != "no"; then : @@ -35504,17 +34090,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zvbi-0.2 >= 0.2.28" >&5 -printf %s "checking for zvbi-0.2 >= 0.2.28... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LINSYS_SDI" >&5 +$as_echo_n "checking for LINSYS_SDI... " >&6; } if test -n "$LINSYS_SDI_CFLAGS"; then pkg_cv_LINSYS_SDI_CFLAGS="$LINSYS_SDI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5 ($PKG_CONFIG --exists --print-errors "zvbi-0.2 >= 0.2.28") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LINSYS_SDI_CFLAGS=`$PKG_CONFIG --cflags "zvbi-0.2 >= 0.2.28" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35528,10 +34114,10 @@ pkg_cv_LINSYS_SDI_LIBS="$LINSYS_SDI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5 ($PKG_CONFIG --exists --print-errors "zvbi-0.2 >= 0.2.28") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LINSYS_SDI_LIBS=`$PKG_CONFIG --libs "zvbi-0.2 >= 0.2.28" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35545,8 +34131,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35554,29 +34140,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LINSYS_SDI_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LINSYS_SDI_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LINSYS_SDI_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LINSYS_SDI_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LINSYS_SDI_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LINSYS_SDI_PKG_ERRORS}." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + LINSYS_SDI_CFLAGS=$pkg_cv_LINSYS_SDI_CFLAGS + LINSYS_SDI_LIBS=$pkg_cv_LINSYS_SDI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -35606,10 +34192,9 @@ # Check whether --enable-dvdread was given. -if test ${enable_dvdread+y} -then : +if test "${enable_dvdread+set}" = set; then : enableval=$enable_dvdread; -else $as_nop +else enable_dvdread=auto fi @@ -35618,17 +34203,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dvdread > 4.9.0" >&5 -printf %s "checking for dvdread > 4.9.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DVDREAD" >&5 +$as_echo_n "checking for DVDREAD... " >&6; } if test -n "$DVDREAD_CFLAGS"; then pkg_cv_DVDREAD_CFLAGS="$DVDREAD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdread > 4.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdread > 4.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dvdread > 4.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVDREAD_CFLAGS=`$PKG_CONFIG --cflags "dvdread > 4.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35642,10 +34227,10 @@ pkg_cv_DVDREAD_LIBS="$DVDREAD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdread > 4.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdread > 4.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dvdread > 4.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVDREAD_LIBS=`$PKG_CONFIG --libs "dvdread > 4.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35659,8 +34244,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35668,38 +34253,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&5 +$as_echo "$as_me: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&5 +$as_echo "$as_me: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&2;} fi else - 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 + DVDREAD_CFLAGS=$pkg_cv_DVDREAD_CFLAGS + DVDREAD_LIBS=$pkg_cv_DVDREAD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBdvdread=libdvdread_plugin.la @@ -35720,17 +34303,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dvdread > 4.9.0" >&5 -printf %s "checking for dvdread > 4.9.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DVDREAD" >&5 +$as_echo_n "checking for DVDREAD... " >&6; } if test -n "$DVDREAD_CFLAGS"; then pkg_cv_DVDREAD_CFLAGS="$DVDREAD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdread > 4.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdread > 4.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dvdread > 4.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVDREAD_CFLAGS=`$PKG_CONFIG --cflags "dvdread > 4.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35744,10 +34327,10 @@ pkg_cv_DVDREAD_LIBS="$DVDREAD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdread > 4.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdread > 4.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dvdread > 4.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVDREAD_LIBS=`$PKG_CONFIG --libs "dvdread > 4.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35761,8 +34344,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35770,40 +34353,38 @@ _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 - if test x"$enable_dvdread" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&5 +$as_echo "$as_me: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&2;} fi 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 - if test x"$enable_dvdread" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&5 +$as_echo "$as_me: WARNING: Library dvdread > 4.9.0 needed for dvdread was not found" >&2;} fi else - 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 + DVDREAD_CFLAGS=$pkg_cv_DVDREAD_CFLAGS + DVDREAD_LIBS=$pkg_cv_DVDREAD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_dvdread=yes LTLIBdvdread=libdvdread_plugin.la @@ -35856,10 +34437,9 @@ # Check whether --enable-dvdnav was given. -if test ${enable_dvdnav+y} -then : +if test "${enable_dvdnav+set}" = set; then : enableval=$enable_dvdnav; -else $as_nop +else enable_dvdnav=auto fi @@ -35868,17 +34448,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dvdnav > 4.9.0" >&5 -printf %s "checking for dvdnav > 4.9.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DVDNAV" >&5 +$as_echo_n "checking for DVDNAV... " >&6; } if test -n "$DVDNAV_CFLAGS"; then pkg_cv_DVDNAV_CFLAGS="$DVDNAV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdnav > 4.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdnav > 4.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dvdnav > 4.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVDNAV_CFLAGS=`$PKG_CONFIG --cflags "dvdnav > 4.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35892,10 +34472,10 @@ pkg_cv_DVDNAV_LIBS="$DVDNAV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdnav > 4.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdnav > 4.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dvdnav > 4.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVDNAV_LIBS=`$PKG_CONFIG --libs "dvdnav > 4.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35909,8 +34489,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35918,38 +34498,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&5 +$as_echo "$as_me: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&5 +$as_echo "$as_me: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&2;} fi else - 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 + DVDNAV_CFLAGS=$pkg_cv_DVDNAV_CFLAGS + DVDNAV_LIBS=$pkg_cv_DVDNAV_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBdvdnav=libdvdnav_plugin.la @@ -35970,17 +34548,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dvdnav > 4.9.0" >&5 -printf %s "checking for dvdnav > 4.9.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DVDNAV" >&5 +$as_echo_n "checking for DVDNAV... " >&6; } if test -n "$DVDNAV_CFLAGS"; then pkg_cv_DVDNAV_CFLAGS="$DVDNAV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdnav > 4.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdnav > 4.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dvdnav > 4.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVDNAV_CFLAGS=`$PKG_CONFIG --cflags "dvdnav > 4.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35994,10 +34572,10 @@ pkg_cv_DVDNAV_LIBS="$DVDNAV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdnav > 4.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dvdnav > 4.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "dvdnav > 4.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVDNAV_LIBS=`$PKG_CONFIG --libs "dvdnav > 4.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36011,8 +34589,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36020,40 +34598,38 @@ _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 - if test x"$enable_dvdnav" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&5 +$as_echo "$as_me: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&2;} fi 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 - if test x"$enable_dvdnav" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&5 +$as_echo "$as_me: WARNING: Library dvdnav > 4.9.0 needed for dvdnav was not found" >&2;} fi else - 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 + DVDNAV_CFLAGS=$pkg_cv_DVDNAV_CFLAGS + DVDNAV_LIBS=$pkg_cv_DVDNAV_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_dvdnav=yes LTLIBdvdnav=libdvdnav_plugin.la @@ -36088,33 +34664,31 @@ -if test "${enable_dvdnav}" != "no" -then : +if test "${enable_dvdnav}" != "no"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dvdnav_stream_cb in dvdnav/dvdnav.h" >&5 -printf %s "checking for dvdnav_stream_cb in dvdnav/dvdnav.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dvdnav_stream_cb in dvdnav/dvdnav.h" >&5 +$as_echo_n "checking for dvdnav_stream_cb in dvdnav/dvdnav.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "dvdnav_stream_cb" >/dev/null 2>&1 -then : + $EGREP "dvdnav_stream_cb" >/dev/null 2>&1; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -printf "%s\n" "#define HAVE_STREAM_CB_IN_DVDNAV_H 1" >>confdefs.h +$as_echo "#define HAVE_STREAM_CB_IN_DVDNAV_H 1" >>confdefs.h -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest* +rm -f conftest* fi @@ -36136,10 +34710,9 @@ # Check whether --enable-bluray was given. -if test ${enable_bluray+y} -then : +if test "${enable_bluray+set}" = set; then : enableval=$enable_bluray; -else $as_nop +else enable_bluray=auto fi @@ -36148,17 +34721,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbluray >= 0.6.2" >&5 -printf %s "checking for libbluray >= 0.6.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLURAY" >&5 +$as_echo_n "checking for BLURAY... " >&6; } if test -n "$BLURAY_CFLAGS"; then pkg_cv_BLURAY_CFLAGS="$BLURAY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbluray >= 0.6.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbluray >= 0.6.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libbluray >= 0.6.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BLURAY_CFLAGS=`$PKG_CONFIG --cflags "libbluray >= 0.6.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36172,10 +34745,10 @@ pkg_cv_BLURAY_LIBS="$BLURAY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbluray >= 0.6.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbluray >= 0.6.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libbluray >= 0.6.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BLURAY_LIBS=`$PKG_CONFIG --libs "libbluray >= 0.6.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36189,8 +34762,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36198,38 +34771,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&5 +$as_echo "$as_me: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&5 +$as_echo "$as_me: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&2;} fi else - 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 + BLURAY_CFLAGS=$pkg_cv_BLURAY_CFLAGS + BLURAY_LIBS=$pkg_cv_BLURAY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBlibbluray=liblibbluray_plugin.la @@ -36250,17 +34821,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbluray >= 0.6.2" >&5 -printf %s "checking for libbluray >= 0.6.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLURAY" >&5 +$as_echo_n "checking for BLURAY... " >&6; } if test -n "$BLURAY_CFLAGS"; then pkg_cv_BLURAY_CFLAGS="$BLURAY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbluray >= 0.6.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbluray >= 0.6.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libbluray >= 0.6.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BLURAY_CFLAGS=`$PKG_CONFIG --cflags "libbluray >= 0.6.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36274,10 +34845,10 @@ pkg_cv_BLURAY_LIBS="$BLURAY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbluray >= 0.6.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbluray >= 0.6.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libbluray >= 0.6.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BLURAY_LIBS=`$PKG_CONFIG --libs "libbluray >= 0.6.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36291,8 +34862,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36300,40 +34871,38 @@ _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 - if test x"$enable_bluray" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&5 +$as_echo "$as_me: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&2;} fi 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 - if test x"$enable_bluray" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&5 +$as_echo "$as_me: WARNING: Library libbluray >= 0.6.2 needed for bluray was not found" >&2;} fi else - 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 + BLURAY_CFLAGS=$pkg_cv_BLURAY_CFLAGS + BLURAY_LIBS=$pkg_cv_BLURAY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_bluray=yes LTLIBlibbluray=liblibbluray_plugin.la @@ -36386,10 +34955,9 @@ # Check whether --enable-opencv was given. -if test ${enable_opencv+y} -then : +if test "${enable_opencv+set}" = set; then : enableval=$enable_opencv; -else $as_nop +else enable_opencv=auto fi @@ -36398,17 +34966,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opencv > 2.0" >&5 -printf %s "checking for opencv > 2.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENCV" >&5 +$as_echo_n "checking for OPENCV... " >&6; } if test -n "$OPENCV_CFLAGS"; then pkg_cv_OPENCV_CFLAGS="$OPENCV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv > 2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv > 2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "opencv > 2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENCV_CFLAGS=`$PKG_CONFIG --cflags "opencv > 2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36422,10 +34990,10 @@ pkg_cv_OPENCV_LIBS="$OPENCV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv > 2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv > 2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "opencv > 2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENCV_LIBS=`$PKG_CONFIG --libs "opencv > 2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36439,8 +35007,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36448,38 +35016,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv > 2.0 needed for opencv was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library opencv > 2.0 needed for opencv was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv > 2.0 needed for opencv was not found" >&5 +$as_echo "$as_me: WARNING: Library opencv > 2.0 needed for opencv was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv > 2.0 needed for opencv was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library opencv > 2.0 needed for opencv was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv > 2.0 needed for opencv was not found" >&5 +$as_echo "$as_me: WARNING: Library opencv > 2.0 needed for opencv was not found" >&2;} fi else - 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 + OPENCV_CFLAGS=$pkg_cv_OPENCV_CFLAGS + OPENCV_LIBS=$pkg_cv_OPENCV_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBopencv_example=libopencv_example_plugin.la LTLIBopencv_wrapper=libopencv_wrapper_plugin.la @@ -36509,17 +35075,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opencv > 2.0" >&5 -printf %s "checking for opencv > 2.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENCV" >&5 +$as_echo_n "checking for OPENCV... " >&6; } if test -n "$OPENCV_CFLAGS"; then pkg_cv_OPENCV_CFLAGS="$OPENCV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv > 2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv > 2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "opencv > 2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENCV_CFLAGS=`$PKG_CONFIG --cflags "opencv > 2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36533,10 +35099,10 @@ pkg_cv_OPENCV_LIBS="$OPENCV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv > 2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv > 2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "opencv > 2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENCV_LIBS=`$PKG_CONFIG --libs "opencv > 2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36550,8 +35116,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36559,40 +35125,38 @@ _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 - if test x"$enable_opencv" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv > 2.0 needed for opencv was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library opencv > 2.0 needed for opencv was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv > 2.0 needed for opencv was not found" >&5 +$as_echo "$as_me: WARNING: Library opencv > 2.0 needed for opencv was not found" >&2;} fi 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 - if test x"$enable_opencv" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv > 2.0 needed for opencv was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library opencv > 2.0 needed for opencv was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library opencv > 2.0 needed for opencv was not found" >&5 +$as_echo "$as_me: WARNING: Library opencv > 2.0 needed for opencv was not found" >&2;} fi else - 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 + OPENCV_CFLAGS=$pkg_cv_OPENCV_CFLAGS + OPENCV_LIBS=$pkg_cv_OPENCV_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_opencv=yes LTLIBopencv_example=libopencv_example_plugin.la @@ -36655,10 +35219,9 @@ # Check whether --enable-smbclient was given. -if test ${enable_smbclient+y} -then : +if test "${enable_smbclient+set}" = set; then : enableval=$enable_smbclient; -else $as_nop +else enable_smbclient=auto fi @@ -36667,17 +35230,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for smbclient" >&5 -printf %s "checking for smbclient... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMBCLIENT" >&5 +$as_echo_n "checking for SMBCLIENT... " >&6; } if test -n "$SMBCLIENT_CFLAGS"; then pkg_cv_SMBCLIENT_CFLAGS="$SMBCLIENT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"smbclient\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"smbclient\""; } >&5 ($PKG_CONFIG --exists --print-errors "smbclient") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMBCLIENT_CFLAGS=`$PKG_CONFIG --cflags "smbclient" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36691,10 +35254,10 @@ pkg_cv_SMBCLIENT_LIBS="$SMBCLIENT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"smbclient\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"smbclient\""; } >&5 ($PKG_CONFIG --exists --print-errors "smbclient") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMBCLIENT_LIBS=`$PKG_CONFIG --libs "smbclient" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36708,8 +35271,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36717,38 +35280,36 @@ _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" -then : + if test x"$enable_smbclient" = "xyes"; then : as_fn_error $? "Library smbclient needed for smbclient was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library smbclient needed for smbclient was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library smbclient needed for smbclient was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library smbclient needed for smbclient was not found" >&5 +$as_echo "$as_me: WARNING: Library smbclient needed for smbclient was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_smbclient" = "xyes"; then : as_fn_error $? "Library smbclient needed for smbclient was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library smbclient needed for smbclient was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library smbclient needed for smbclient was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library smbclient needed for smbclient was not found" >&5 +$as_echo "$as_me: WARNING: Library smbclient needed for smbclient was not found" >&2;} fi else - 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 + SMBCLIENT_CFLAGS=$pkg_cv_SMBCLIENT_CFLAGS + SMBCLIENT_LIBS=$pkg_cv_SMBCLIENT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBsmb=libsmb_plugin.la @@ -36769,17 +35330,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for smbclient" >&5 -printf %s "checking for smbclient... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMBCLIENT" >&5 +$as_echo_n "checking for SMBCLIENT... " >&6; } if test -n "$SMBCLIENT_CFLAGS"; then pkg_cv_SMBCLIENT_CFLAGS="$SMBCLIENT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"smbclient\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"smbclient\""; } >&5 ($PKG_CONFIG --exists --print-errors "smbclient") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMBCLIENT_CFLAGS=`$PKG_CONFIG --cflags "smbclient" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36793,10 +35354,10 @@ pkg_cv_SMBCLIENT_LIBS="$SMBCLIENT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"smbclient\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"smbclient\""; } >&5 ($PKG_CONFIG --exists --print-errors "smbclient") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMBCLIENT_LIBS=`$PKG_CONFIG --libs "smbclient" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36810,8 +35371,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36819,40 +35380,38 @@ _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 - if test x"$enable_smbclient" = "xyes" -then : + enable_smbclient=no + if test x"$enable_smbclient" = "xyes"; then : as_fn_error $? "Library smbclient needed for smbclient was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library smbclient needed for smbclient was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library smbclient needed for smbclient was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library smbclient needed for smbclient was not found" >&5 +$as_echo "$as_me: WARNING: Library smbclient needed for smbclient was not found" >&2;} fi 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 - if test x"$enable_smbclient" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_smbclient=no + if test x"$enable_smbclient" = "xyes"; then : as_fn_error $? "Library smbclient needed for smbclient was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library smbclient needed for smbclient was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library smbclient needed for smbclient was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library smbclient needed for smbclient was not found" >&5 +$as_echo "$as_me: WARNING: Library smbclient needed for smbclient was not found" >&2;} fi else - 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 + SMBCLIENT_CFLAGS=$pkg_cv_SMBCLIENT_CFLAGS + SMBCLIENT_LIBS=$pkg_cv_SMBCLIENT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_smbclient=yes LTLIBsmb=libsmb_plugin.la @@ -36887,8 +35446,7 @@ -if test "${SYS}" = "mingw32" -a "${enable_winstore_app}" != "yes" -then : +if test "${SYS}" = "mingw32" -a "${enable_winstore_app}" != "yes"; then : LTLIBsmb=libsmb_plugin.la @@ -36918,10 +35476,9 @@ # Check whether --enable-dsm was given. -if test ${enable_dsm+y} -then : +if test "${enable_dsm+set}" = set; then : enableval=$enable_dsm; -else $as_nop +else enable_dsm=auto fi @@ -36930,17 +35487,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdsm >= 0.2.0" >&5 -printf %s "checking for libdsm >= 0.2.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DSM" >&5 +$as_echo_n "checking for DSM... " >&6; } if test -n "$DSM_CFLAGS"; then pkg_cv_DSM_CFLAGS="$DSM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdsm >= 0.2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdsm >= 0.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdsm >= 0.2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DSM_CFLAGS=`$PKG_CONFIG --cflags "libdsm >= 0.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36954,10 +35511,10 @@ pkg_cv_DSM_LIBS="$DSM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdsm >= 0.2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdsm >= 0.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdsm >= 0.2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DSM_LIBS=`$PKG_CONFIG --libs "libdsm >= 0.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36971,8 +35528,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36980,14 +35537,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 @@ -36998,10 +35555,10 @@ and DSM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -37013,10 +35570,10 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + DSM_CFLAGS=$pkg_cv_DSM_CFLAGS + DSM_LIBS=$pkg_cv_DSM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } LTLIBdsm=libdsm_plugin.la @@ -37041,17 +35598,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdsm >= 0.2.0" >&5 -printf %s "checking for libdsm >= 0.2.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DSM" >&5 +$as_echo_n "checking for DSM... " >&6; } if test -n "$DSM_CFLAGS"; then pkg_cv_DSM_CFLAGS="$DSM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdsm >= 0.2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdsm >= 0.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdsm >= 0.2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DSM_CFLAGS=`$PKG_CONFIG --cflags "libdsm >= 0.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37065,10 +35622,10 @@ pkg_cv_DSM_LIBS="$DSM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdsm >= 0.2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdsm >= 0.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdsm >= 0.2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DSM_LIBS=`$PKG_CONFIG --libs "libdsm >= 0.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37082,8 +35639,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37091,26 +35648,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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_dsm=no else - 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 + DSM_CFLAGS=$pkg_cv_DSM_CFLAGS + DSM_LIBS=$pkg_cv_DSM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_dsm=yes @@ -37168,10 +35725,9 @@ # Check whether --enable-sftp was given. -if test ${enable_sftp+y} -then : +if test "${enable_sftp+set}" = set; then : enableval=$enable_sftp; -else $as_nop +else enable_sftp=auto fi @@ -37180,17 +35736,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libssh2" >&5 -printf %s "checking for libssh2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SFTP" >&5 +$as_echo_n "checking for SFTP... " >&6; } if test -n "$SFTP_CFLAGS"; then pkg_cv_SFTP_CFLAGS="$SFTP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libssh2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SFTP_CFLAGS=`$PKG_CONFIG --cflags "libssh2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37204,10 +35760,10 @@ pkg_cv_SFTP_LIBS="$SFTP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libssh2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SFTP_LIBS=`$PKG_CONFIG --libs "libssh2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37221,8 +35777,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37230,38 +35786,36 @@ _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" -then : + if test x"$enable_sftp" = "xyes"; then : as_fn_error $? "Library libssh2 needed for sftp was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libssh2 needed for sftp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libssh2 needed for sftp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libssh2 needed for sftp was not found" >&5 +$as_echo "$as_me: WARNING: Library libssh2 needed for sftp was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_sftp" = "xyes"; then : as_fn_error $? "Library libssh2 needed for sftp was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libssh2 needed for sftp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libssh2 needed for sftp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libssh2 needed for sftp was not found" >&5 +$as_echo "$as_me: WARNING: Library libssh2 needed for sftp was not found" >&2;} fi else - 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 + SFTP_CFLAGS=$pkg_cv_SFTP_CFLAGS + SFTP_LIBS=$pkg_cv_SFTP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBsftp=libsftp_plugin.la @@ -37282,17 +35836,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libssh2" >&5 -printf %s "checking for libssh2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SFTP" >&5 +$as_echo_n "checking for SFTP... " >&6; } if test -n "$SFTP_CFLAGS"; then pkg_cv_SFTP_CFLAGS="$SFTP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libssh2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SFTP_CFLAGS=`$PKG_CONFIG --cflags "libssh2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37306,10 +35860,10 @@ pkg_cv_SFTP_LIBS="$SFTP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libssh2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SFTP_LIBS=`$PKG_CONFIG --libs "libssh2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37323,8 +35877,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37332,40 +35886,38 @@ _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 - if test x"$enable_sftp" = "xyes" -then : + enable_sftp=no + if test x"$enable_sftp" = "xyes"; then : as_fn_error $? "Library libssh2 needed for sftp was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libssh2 needed for sftp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libssh2 needed for sftp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libssh2 needed for sftp was not found" >&5 +$as_echo "$as_me: WARNING: Library libssh2 needed for sftp was not found" >&2;} fi 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 - if test x"$enable_sftp" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_sftp=no + if test x"$enable_sftp" = "xyes"; then : as_fn_error $? "Library libssh2 needed for sftp was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libssh2 needed for sftp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libssh2 needed for sftp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libssh2 needed for sftp was not found" >&5 +$as_echo "$as_me: WARNING: Library libssh2 needed for sftp was not found" >&2;} fi else - 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 + SFTP_CFLAGS=$pkg_cv_SFTP_CFLAGS + SFTP_LIBS=$pkg_cv_SFTP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_sftp=yes LTLIBsftp=libsftp_plugin.la @@ -37418,10 +35970,9 @@ # Check whether --enable-nfs was given. -if test ${enable_nfs+y} -then : +if test "${enable_nfs+set}" = set; then : enableval=$enable_nfs; -else $as_nop +else enable_nfs=auto fi @@ -37430,17 +35981,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnfs >= 1.10.0" >&5 -printf %s "checking for libnfs >= 1.10.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NFS" >&5 +$as_echo_n "checking for NFS... " >&6; } if test -n "$NFS_CFLAGS"; then pkg_cv_NFS_CFLAGS="$NFS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfs >= 1.10.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfs >= 1.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnfs >= 1.10.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NFS_CFLAGS=`$PKG_CONFIG --cflags "libnfs >= 1.10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37454,10 +36005,10 @@ pkg_cv_NFS_LIBS="$NFS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfs >= 1.10.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfs >= 1.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnfs >= 1.10.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NFS_LIBS=`$PKG_CONFIG --libs "libnfs >= 1.10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37471,8 +36022,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37480,38 +36031,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&5 +$as_echo "$as_me: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&5 +$as_echo "$as_me: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&2;} fi else - 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 + NFS_CFLAGS=$pkg_cv_NFS_CFLAGS + NFS_LIBS=$pkg_cv_NFS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBnfs=libnfs_plugin.la @@ -37532,17 +36081,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnfs >= 1.10.0" >&5 -printf %s "checking for libnfs >= 1.10.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NFS" >&5 +$as_echo_n "checking for NFS... " >&6; } if test -n "$NFS_CFLAGS"; then pkg_cv_NFS_CFLAGS="$NFS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfs >= 1.10.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfs >= 1.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnfs >= 1.10.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NFS_CFLAGS=`$PKG_CONFIG --cflags "libnfs >= 1.10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37556,10 +36105,10 @@ pkg_cv_NFS_LIBS="$NFS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfs >= 1.10.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfs >= 1.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnfs >= 1.10.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NFS_LIBS=`$PKG_CONFIG --libs "libnfs >= 1.10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37573,8 +36122,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37582,40 +36131,38 @@ _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 - if test x"$enable_nfs" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&5 +$as_echo "$as_me: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&2;} fi 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 - if test x"$enable_nfs" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&5 +$as_echo "$as_me: WARNING: Library libnfs >= 1.10.0 needed for nfs was not found" >&2;} fi else - 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 + NFS_CFLAGS=$pkg_cv_NFS_CFLAGS + NFS_LIBS=$pkg_cv_NFS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_nfs=yes LTLIBnfs=libnfs_plugin.la @@ -37668,10 +36215,9 @@ # Check whether --enable-smb2 was given. -if test ${enable_smb2+y} -then : +if test "${enable_smb2+set}" = set; then : enableval=$enable_smb2; -else $as_nop +else enable_smb2=disabled fi @@ -37680,17 +36226,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsmb2 >= 3.0.0" >&5 -printf %s "checking for libsmb2 >= 3.0.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMB2" >&5 +$as_echo_n "checking for SMB2... " >&6; } if test -n "$SMB2_CFLAGS"; then pkg_cv_SMB2_CFLAGS="$SMB2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsmb2 >= 3.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsmb2 >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsmb2 >= 3.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMB2_CFLAGS=`$PKG_CONFIG --cflags "libsmb2 >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37704,10 +36250,10 @@ pkg_cv_SMB2_LIBS="$SMB2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsmb2 >= 3.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsmb2 >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsmb2 >= 3.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMB2_LIBS=`$PKG_CONFIG --libs "libsmb2 >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37721,8 +36267,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37730,38 +36276,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&2;} fi else - 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 + SMB2_CFLAGS=$pkg_cv_SMB2_CFLAGS + SMB2_LIBS=$pkg_cv_SMB2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBsmb2=libsmb2_plugin.la @@ -37782,17 +36326,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsmb2 >= 3.0.0" >&5 -printf %s "checking for libsmb2 >= 3.0.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMB2" >&5 +$as_echo_n "checking for SMB2... " >&6; } if test -n "$SMB2_CFLAGS"; then pkg_cv_SMB2_CFLAGS="$SMB2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsmb2 >= 3.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsmb2 >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsmb2 >= 3.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMB2_CFLAGS=`$PKG_CONFIG --cflags "libsmb2 >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37806,10 +36350,10 @@ pkg_cv_SMB2_LIBS="$SMB2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsmb2 >= 3.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsmb2 >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsmb2 >= 3.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMB2_LIBS=`$PKG_CONFIG --libs "libsmb2 >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37823,8 +36367,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37832,40 +36376,38 @@ _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 - if test x"$enable_smb2" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&2;} fi 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 - if test x"$enable_smb2" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libsmb2 >= 3.0.0 needed for smb2 was not found" >&2;} fi else - 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 + SMB2_CFLAGS=$pkg_cv_SMB2_CFLAGS + SMB2_LIBS=$pkg_cv_SMB2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_smb2=yes LTLIBsmb2=libsmb2_plugin.la @@ -37902,23 +36444,20 @@ # Check whether --enable-v4l2 was given. -if test ${enable_v4l2+y} -then : +if test "${enable_v4l2+set}" = set; then : enableval=$enable_v4l2; fi have_v4l2="no" -if test "$enable_v4l2" != "no" -then : +if test "$enable_v4l2" != "no"; then : - for ac_header in linux/videodev2.h sys/videoio.h + for ac_header in linux/videodev2.h sys/videoio.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF have_v4l2="yes" @@ -37927,6 +36466,7 @@ done + fi if test "${have_v4l2}" != "no"; then HAVE_V4L2_TRUE= @@ -37938,34 +36478,32 @@ # Check whether --enable-amf-scaler was given. -if test ${enable_amf_scaler+y} -then : +if test "${enable_amf_scaler+set}" = set; then : enableval=$enable_amf_scaler; fi have_amf_scaler="no" -if test "$enable_amf_scaler" != "no" -then : +if test "$enable_amf_scaler" != "no"; then : - for ac_header in AMF/core/PropertyStorage.h AMF/components/HQScaler.h + for ac_header in AMF/core/PropertyStorage.h AMF/components/HQScaler.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF have_amf_scaler="yes" -printf "%s\n" "#define HAVE_AMF_SCALER 1" >>confdefs.h +$as_echo "#define HAVE_AMF_SCALER 1" >>confdefs.h fi done + fi if test "${have_amf_scaler}" != "no"; then HAVE_AMF_SCALER_TRUE= @@ -37977,34 +36515,32 @@ # Check whether --enable-amf-enhancer was given. -if test ${enable_amf_enhancer+y} -then : +if test "${enable_amf_enhancer+set}" = set; then : enableval=$enable_amf_enhancer; fi have_amf_enhancer="no" -if test "$enable_amf_enhancer" != "no" -then : +if test "$enable_amf_enhancer" != "no"; then : - for ac_header in AMF/core/PropertyStorage.h AMF/components/VQEnhancer.h + for ac_header in AMF/core/PropertyStorage.h AMF/components/VQEnhancer.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF have_amf_enhancer="yes" -printf "%s\n" "#define HAVE_AMF_ENHANCER 1" >>confdefs.h +$as_echo "#define HAVE_AMF_ENHANCER 1" >>confdefs.h fi done + fi if test "${have_amf_enhancer}" != "no"; then HAVE_AMF_ENHANCER_TRUE= @@ -38015,16 +36551,51 @@ fi +# Check whether --enable-amf-frc was given. +if test "${enable_amf_frc+set}" = set; then : + enableval=$enable_amf_frc; +fi + +have_amf_frc="no" +if test "$enable_amf_frc" != "no"; then : + + for ac_header in AMF/core/PropertyStorage.h AMF/components/FRC.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + have_amf_frc="yes" + +$as_echo "#define HAVE_AMF_FRC 1" >>confdefs.h + + +fi + +done + + +fi + if test "${have_amf_frc}" != "no"; then + HAVE_AMF_FRC_TRUE= + HAVE_AMF_FRC_FALSE='#' +else + HAVE_AMF_FRC_TRUE='#' + HAVE_AMF_FRC_FALSE= +fi + + # Check whether --enable-decklink was given. -if test ${enable_decklink+y} -then : +if test "${enable_decklink+set}" = set; then : enableval=$enable_decklink; fi # Check whether --with-decklink_sdk was given. -if test ${with_decklink_sdk+y} -then : +if test "${with_decklink_sdk+set}" = set; then : withval=$with_decklink_sdk; fi @@ -38058,23 +36629,25 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - for ac_header in DeckLinkAPIDispatch.cpp + for ac_header in DeckLinkAPIDispatch.cpp do : - ac_fn_cxx_check_header_compile "$LINENO" "DeckLinkAPIDispatch.cpp" "ac_cv_header_DeckLinkAPIDispatch_cpp" "$ac_includes_default" -if test "x$ac_cv_header_DeckLinkAPIDispatch_cpp" = xyes -then : - printf "%s\n" "#define HAVE_DECKLINKAPIDISPATCH_CPP 1" >>confdefs.h + ac_fn_cxx_check_header_mongrel "$LINENO" "DeckLinkAPIDispatch.cpp" "ac_cv_header_DeckLinkAPIDispatch_cpp" "$ac_includes_default" +if test "x$ac_cv_header_DeckLinkAPIDispatch_cpp" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DECKLINKAPIDISPATCH_CPP 1 +_ACEOF have_decklink=yes -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Blackmagic DeckLink SDI include files not found" >&5 -printf "%s\n" "$as_me: WARNING: Blackmagic DeckLink SDI include files not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Blackmagic DeckLink SDI include files not found" >&5 +$as_echo "$as_me: WARNING: Blackmagic DeckLink SDI include files not found" >&2;} fi done + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -38101,34 +36674,31 @@ # Check whether --enable-vcd was given. -if test ${enable_vcd+y} -then : +if test "${enable_vcd+set}" = set; then : enableval=$enable_vcd; fi # Check whether --enable-libcddb was given. -if test ${enable_libcddb+y} -then : +if test "${enable_libcddb+set}" = set; then : enableval=$enable_libcddb; fi if test "${enable_vcd}" != "no" then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cdrom_msf0 in linux/cdrom.h" >&5 -printf %s "checking for cdrom_msf0 in linux/cdrom.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cdrom_msf0 in linux/cdrom.h" >&5 +$as_echo_n "checking for cdrom_msf0 in linux/cdrom.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "cdrom_msf0" >/dev/null 2>&1 -then : + $EGREP "cdrom_msf0" >/dev/null 2>&1; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } LTLIBvcd=libvcd_plugin.la @@ -38139,28 +36709,27 @@ -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest* +rm -f conftest* - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for scsireq in sys/scsiio.h" >&5 -printf %s "checking for scsireq in sys/scsiio.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for scsireq in sys/scsiio.h" >&5 +$as_echo_n "checking for scsireq in sys/scsiio.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "scsireq" >/dev/null 2>&1 -then : + $EGREP "scsireq" >/dev/null 2>&1; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } LTLIBvcd=libvcd_plugin.la @@ -38171,31 +36740,30 @@ -printf "%s\n" "#define HAVE_SCSIREQ_IN_SYS_SCSIIO_H 1" >>confdefs.h +$as_echo "#define HAVE_SCSIREQ_IN_SYS_SCSIIO_H 1" >>confdefs.h -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest* +rm -f conftest* - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ioc_toc_header in sys/cdio.h" >&5 -printf %s "checking for ioc_toc_header in sys/cdio.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ioc_toc_header in sys/cdio.h" >&5 +$as_echo_n "checking for ioc_toc_header in sys/cdio.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "ioc_toc_header " >/dev/null 2>&1 -then : + $EGREP "ioc_toc_header " >/dev/null 2>&1; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } LTLIBvcd=libvcd_plugin.la @@ -38206,16 +36774,16 @@ -printf "%s\n" "#define HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H 1" >>confdefs.h +$as_echo "#define HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H 1" >>confdefs.h -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest* +rm -f conftest* if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" -o "${SYS}" = "os2" -o "${SYS}" = "darwin" @@ -38234,17 +36802,17 @@ if test "$enable_libcddb" != "no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcddb >= 0.9.5" >&5 -printf %s "checking for libcddb >= 0.9.5... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCDDB" >&5 +$as_echo_n "checking for LIBCDDB... " >&6; } if test -n "$LIBCDDB_CFLAGS"; then pkg_cv_LIBCDDB_CFLAGS="$LIBCDDB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 0.9.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 0.9.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcddb >= 0.9.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBCDDB_CFLAGS=`$PKG_CONFIG --cflags "libcddb >= 0.9.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38258,10 +36826,10 @@ pkg_cv_LIBCDDB_LIBS="$LIBCDDB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 0.9.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 0.9.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcddb >= 0.9.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBCDDB_LIBS=`$PKG_CONFIG --libs "libcddb >= 0.9.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38275,8 +36843,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38284,33 +36852,33 @@ _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;} + : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBCDDB_PKG_ERRORS}: CDDB access disabled." >&5 +$as_echo "$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;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBCDDB_PKG_ERRORS}: CDDB access disabled." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + LIBCDDB_CFLAGS=$pkg_cv_LIBCDDB_CFLAGS + LIBCDDB_LIBS=$pkg_cv_LIBCDDB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } HAVE_LIBCDDB=yes -printf "%s\n" "#define HAVE_LIBCDDB 1" >>confdefs.h +$as_echo "#define HAVE_LIBCDDB 1" >>confdefs.h @@ -38329,12 +36897,11 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Linux DVB version 5.1" >&5 -printf %s "checking for Linux DVB version 5.1... " >&6; } -if test ${ac_cv_linux_dvb_5_1+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux DVB version 5.1" >&5 +$as_echo_n "checking for Linux DVB version 5.1... " >&6; } +if ${ac_cv_linux_dvb_5_1+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38348,27 +36915,26 @@ #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : ac_cv_linux_dvb_5_1=yes -else $as_nop +else ac_cv_linux_dvb_5_1=no fi rm -f conftest.err conftest.i conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_linux_dvb_5_1" >&5 -printf "%s\n" "$ac_cv_linux_dvb_5_1" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_linux_dvb_5_1" >&5 +$as_echo "$ac_cv_linux_dvb_5_1" >&6; } if test "$ac_cv_linux_dvb_5_1" = "yes"; then HAVE_LINUX_DVB_TRUE= HAVE_LINUX_DVB_FALSE='#' @@ -38379,19 +36945,19 @@ # Check whether --enable-screen was given. -if test ${enable_screen+y} -then : +if test "${enable_screen+set}" = set; then : enableval=$enable_screen; fi if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then - for ac_header in ApplicationServices/ApplicationServices.h + for ac_header in ApplicationServices/ApplicationServices.h do : - ac_fn_c_check_header_compile "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" -if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes -then : - printf "%s\n" "#define HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" +if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H 1 +_ACEOF @@ -38403,6 +36969,7 @@ fi done + fi fi if test "${SYS}" = "darwin" -a "x${enable_screen}" != "xno"; then @@ -38431,10 +36998,9 @@ # Check whether --enable-vnc was given. -if test ${enable_vnc+y} -then : +if test "${enable_vnc+set}" = set; then : enableval=$enable_vnc; -else $as_nop +else enable_vnc=auto fi @@ -38443,17 +37009,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libvncclient >= 0.9.9" >&5 -printf %s "checking for libvncclient >= 0.9.9... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VNC" >&5 +$as_echo_n "checking for VNC... " >&6; } if test -n "$VNC_CFLAGS"; then pkg_cv_VNC_CFLAGS="$VNC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvncclient >= 0.9.9\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvncclient >= 0.9.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvncclient >= 0.9.9") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VNC_CFLAGS=`$PKG_CONFIG --cflags "libvncclient >= 0.9.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38467,10 +37033,10 @@ pkg_cv_VNC_LIBS="$VNC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvncclient >= 0.9.9\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvncclient >= 0.9.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvncclient >= 0.9.9") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VNC_LIBS=`$PKG_CONFIG --libs "libvncclient >= 0.9.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38484,8 +37050,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38493,38 +37059,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&5 +$as_echo "$as_me: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&5 +$as_echo "$as_me: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&2;} fi else - 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 + VNC_CFLAGS=$pkg_cv_VNC_CFLAGS + VNC_LIBS=$pkg_cv_VNC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBvnc=libvnc_plugin.la @@ -38545,17 +37109,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libvncclient >= 0.9.9" >&5 -printf %s "checking for libvncclient >= 0.9.9... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VNC" >&5 +$as_echo_n "checking for VNC... " >&6; } if test -n "$VNC_CFLAGS"; then pkg_cv_VNC_CFLAGS="$VNC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvncclient >= 0.9.9\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvncclient >= 0.9.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvncclient >= 0.9.9") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VNC_CFLAGS=`$PKG_CONFIG --cflags "libvncclient >= 0.9.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38569,10 +37133,10 @@ pkg_cv_VNC_LIBS="$VNC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvncclient >= 0.9.9\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvncclient >= 0.9.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvncclient >= 0.9.9") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VNC_LIBS=`$PKG_CONFIG --libs "libvncclient >= 0.9.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38586,8 +37150,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38595,40 +37159,38 @@ _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 - if test x"$enable_vnc" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&5 +$as_echo "$as_me: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&2;} fi 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 - if test x"$enable_vnc" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&5 +$as_echo "$as_me: WARNING: Library libvncclient >= 0.9.9 needed for vnc was not found" >&2;} fi else - 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 + VNC_CFLAGS=$pkg_cv_VNC_CFLAGS + VNC_LIBS=$pkg_cv_VNC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_vnc=yes LTLIBvnc=libvnc_plugin.la @@ -38681,10 +37243,9 @@ # Check whether --enable-freerdp was given. -if test ${enable_freerdp+y} -then : +if test "${enable_freerdp+set}" = set; then : enableval=$enable_freerdp; -else $as_nop +else enable_freerdp=auto fi @@ -38693,17 +37254,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freerdp >= 1.0.1" >&5 -printf %s "checking for freerdp >= 1.0.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREERDP" >&5 +$as_echo_n "checking for FREERDP... " >&6; } if test -n "$FREERDP_CFLAGS"; then pkg_cv_FREERDP_CFLAGS="$FREERDP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "freerdp >= 1.0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREERDP_CFLAGS=`$PKG_CONFIG --cflags "freerdp >= 1.0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38717,10 +37278,10 @@ pkg_cv_FREERDP_LIBS="$FREERDP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "freerdp >= 1.0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREERDP_LIBS=`$PKG_CONFIG --libs "freerdp >= 1.0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38734,8 +37295,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38743,38 +37304,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&5 +$as_echo "$as_me: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&5 +$as_echo "$as_me: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&2;} fi else - 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 + FREERDP_CFLAGS=$pkg_cv_FREERDP_CFLAGS + FREERDP_LIBS=$pkg_cv_FREERDP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBrdp=librdp_plugin.la @@ -38795,17 +37354,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freerdp >= 1.0.1" >&5 -printf %s "checking for freerdp >= 1.0.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREERDP" >&5 +$as_echo_n "checking for FREERDP... " >&6; } if test -n "$FREERDP_CFLAGS"; then pkg_cv_FREERDP_CFLAGS="$FREERDP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "freerdp >= 1.0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREERDP_CFLAGS=`$PKG_CONFIG --cflags "freerdp >= 1.0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38819,10 +37378,10 @@ pkg_cv_FREERDP_LIBS="$FREERDP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "freerdp >= 1.0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREERDP_LIBS=`$PKG_CONFIG --libs "freerdp >= 1.0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -38836,8 +37395,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -38845,40 +37404,38 @@ _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 - if test x"$enable_freerdp" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&5 +$as_echo "$as_me: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&2;} fi 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 - if test x"$enable_freerdp" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&5 +$as_echo "$as_me: WARNING: Library freerdp >= 1.0.1 needed for freerdp was not found" >&2;} fi else - 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 + FREERDP_CFLAGS=$pkg_cv_FREERDP_CFLAGS + FREERDP_LIBS=$pkg_cv_FREERDP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_freerdp=yes LTLIBrdp=librdp_plugin.la @@ -38915,8 +37472,7 @@ # Check whether --enable-realrtsp was given. -if test ${enable_realrtsp+y} -then : +if test "${enable_realrtsp+set}" = set; then : enableval=$enable_realrtsp; fi @@ -38932,8 +37488,7 @@ have_avfoundation="no" # Check whether --enable-macosx-avfoundation was given. -if test ${enable_macosx_avfoundation+y} -then : +if test "${enable_macosx_avfoundation+set}" = set; then : enableval=$enable_macosx_avfoundation; fi @@ -38946,20 +37501,19 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : have_avfoundation=yes -else $as_nop +else have_avfoundation=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="${SAVED_LIBS}" if test "${have_avfoundation}" != "no" @@ -38994,10 +37548,9 @@ # Check whether --enable-asdcp was given. -if test ${enable_asdcp+y} -then : +if test "${enable_asdcp+set}" = set; then : enableval=$enable_asdcp; -else $as_nop +else enable_asdcp=auto fi @@ -39006,17 +37559,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for asdcplib" >&5 -printf %s "checking for asdcplib... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ASDCP" >&5 +$as_echo_n "checking for ASDCP... " >&6; } if test -n "$ASDCP_CFLAGS"; then pkg_cv_ASDCP_CFLAGS="$ASDCP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"asdcplib\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"asdcplib\""; } >&5 ($PKG_CONFIG --exists --print-errors "asdcplib") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ASDCP_CFLAGS=`$PKG_CONFIG --cflags "asdcplib" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39030,10 +37583,10 @@ pkg_cv_ASDCP_LIBS="$ASDCP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"asdcplib\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"asdcplib\""; } >&5 ($PKG_CONFIG --exists --print-errors "asdcplib") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ASDCP_LIBS=`$PKG_CONFIG --libs "asdcplib" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39047,8 +37600,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39056,14 +37609,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 @@ -39074,10 +37627,10 @@ and ASDCP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -39089,26 +37642,26 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - have_asdcp="yes" + ASDCP_CFLAGS=$pkg_cv_ASDCP_CFLAGS + ASDCP_LIBS=$pkg_cv_ASDCP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_asdcp="yes" fi ;; #( auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for asdcplib" >&5 -printf %s "checking for asdcplib... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ASDCP" >&5 +$as_echo_n "checking for ASDCP... " >&6; } if test -n "$ASDCP_CFLAGS"; then pkg_cv_ASDCP_CFLAGS="$ASDCP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"asdcplib\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"asdcplib\""; } >&5 ($PKG_CONFIG --exists --print-errors "asdcplib") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ASDCP_CFLAGS=`$PKG_CONFIG --cflags "asdcplib" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39122,10 +37675,10 @@ pkg_cv_ASDCP_LIBS="$ASDCP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"asdcplib\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"asdcplib\""; } >&5 ($PKG_CONFIG --exists --print-errors "asdcplib") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ASDCP_LIBS=`$PKG_CONFIG --libs "asdcplib" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39139,8 +37692,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39148,26 +37701,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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_asdcp=no else - 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 + ASDCP_CFLAGS=$pkg_cv_ASDCP_CFLAGS + ASDCP_LIBS=$pkg_cv_ASDCP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_asdcp=yes have_asdcp="yes" fi ;; #( *) : @@ -39205,10 +37758,9 @@ # Check whether --enable-dvbpsi was given. -if test ${enable_dvbpsi+y} -then : +if test "${enable_dvbpsi+set}" = set; then : enableval=$enable_dvbpsi; -else $as_nop +else enable_dvbpsi=auto fi @@ -39217,17 +37769,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdvbpsi >= 1.2.0" >&5 -printf %s "checking for libdvbpsi >= 1.2.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DVBPSI" >&5 +$as_echo_n "checking for DVBPSI... " >&6; } if test -n "$DVBPSI_CFLAGS"; then pkg_cv_DVBPSI_CFLAGS="$DVBPSI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdvbpsi >= 1.2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdvbpsi >= 1.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdvbpsi >= 1.2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVBPSI_CFLAGS=`$PKG_CONFIG --cflags "libdvbpsi >= 1.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39241,10 +37793,10 @@ pkg_cv_DVBPSI_LIBS="$DVBPSI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdvbpsi >= 1.2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdvbpsi >= 1.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdvbpsi >= 1.2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVBPSI_LIBS=`$PKG_CONFIG --libs "libdvbpsi >= 1.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39258,8 +37810,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39267,14 +37819,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 @@ -39285,10 +37837,10 @@ and DVBPSI_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -39300,26 +37852,26 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - have_dvbpsi="yes" + DVBPSI_CFLAGS=$pkg_cv_DVBPSI_CFLAGS + DVBPSI_LIBS=$pkg_cv_DVBPSI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_dvbpsi="yes" fi ;; #( auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdvbpsi >= 1.2.0" >&5 -printf %s "checking for libdvbpsi >= 1.2.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DVBPSI" >&5 +$as_echo_n "checking for DVBPSI... " >&6; } if test -n "$DVBPSI_CFLAGS"; then pkg_cv_DVBPSI_CFLAGS="$DVBPSI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdvbpsi >= 1.2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdvbpsi >= 1.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdvbpsi >= 1.2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVBPSI_CFLAGS=`$PKG_CONFIG --cflags "libdvbpsi >= 1.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39333,10 +37885,10 @@ pkg_cv_DVBPSI_LIBS="$DVBPSI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdvbpsi >= 1.2.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdvbpsi >= 1.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdvbpsi >= 1.2.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DVBPSI_LIBS=`$PKG_CONFIG --libs "libdvbpsi >= 1.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39350,8 +37902,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39359,26 +37911,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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_dvbpsi=no else - 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 + DVBPSI_CFLAGS=$pkg_cv_DVBPSI_CFLAGS + DVBPSI_LIBS=$pkg_cv_DVBPSI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_dvbpsi=yes have_dvbpsi="yes" fi ;; #( *) : @@ -39417,10 +37969,9 @@ # Check whether --enable-gme was given. -if test ${enable_gme+y} -then : +if test "${enable_gme+set}" = set; then : enableval=$enable_gme; -else $as_nop +else enable_gme=auto fi @@ -39429,17 +37980,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgme" >&5 -printf %s "checking for libgme... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GME" >&5 +$as_echo_n "checking for GME... " >&6; } if test -n "$GME_CFLAGS"; then pkg_cv_GME_CFLAGS="$GME_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgme\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgme\""; } >&5 ($PKG_CONFIG --exists --print-errors "libgme") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GME_CFLAGS=`$PKG_CONFIG --cflags "libgme" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39453,10 +38004,10 @@ pkg_cv_GME_LIBS="$GME_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgme\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgme\""; } >&5 ($PKG_CONFIG --exists --print-errors "libgme") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GME_LIBS=`$PKG_CONFIG --libs "libgme" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39470,8 +38021,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39479,38 +38030,36 @@ _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" -then : + if test x"$enable_gme" = "xyes"; then : as_fn_error $? "Library libgme needed for gme was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libgme needed for gme was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libgme needed for gme was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgme needed for gme was not found" >&5 +$as_echo "$as_me: WARNING: Library libgme needed for gme was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_gme" = "xyes"; then : as_fn_error $? "Library libgme needed for gme was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libgme needed for gme was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libgme needed for gme was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgme needed for gme was not found" >&5 +$as_echo "$as_me: WARNING: Library libgme needed for gme was not found" >&2;} fi else - 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 + GME_CFLAGS=$pkg_cv_GME_CFLAGS + GME_LIBS=$pkg_cv_GME_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBgme=libgme_plugin.la @@ -39531,17 +38080,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgme" >&5 -printf %s "checking for libgme... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GME" >&5 +$as_echo_n "checking for GME... " >&6; } if test -n "$GME_CFLAGS"; then pkg_cv_GME_CFLAGS="$GME_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgme\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgme\""; } >&5 ($PKG_CONFIG --exists --print-errors "libgme") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GME_CFLAGS=`$PKG_CONFIG --cflags "libgme" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39555,10 +38104,10 @@ pkg_cv_GME_LIBS="$GME_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgme\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgme\""; } >&5 ($PKG_CONFIG --exists --print-errors "libgme") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GME_LIBS=`$PKG_CONFIG --libs "libgme" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39572,8 +38121,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39581,40 +38130,38 @@ _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 - if test x"$enable_gme" = "xyes" -then : + enable_gme=no + if test x"$enable_gme" = "xyes"; then : as_fn_error $? "Library libgme needed for gme was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libgme needed for gme was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libgme needed for gme was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgme needed for gme was not found" >&5 +$as_echo "$as_me: WARNING: Library libgme needed for gme was not found" >&2;} fi 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 - if test x"$enable_gme" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_gme=no + if test x"$enable_gme" = "xyes"; then : as_fn_error $? "Library libgme needed for gme was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libgme needed for gme was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libgme needed for gme was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgme needed for gme was not found" >&5 +$as_echo "$as_me: WARNING: Library libgme needed for gme was not found" >&2;} fi else - 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 + GME_CFLAGS=$pkg_cv_GME_CFLAGS + GME_LIBS=$pkg_cv_GME_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_gme=yes LTLIBgme=libgme_plugin.la @@ -39652,27 +38199,25 @@ # Check whether --enable-sid was given. -if test ${enable_sid+y} -then : +if test "${enable_sid+set}" = set; then : enableval=$enable_sid; fi -if test "${enable_sid}" != "no" -then : +if test "${enable_sid}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsidplay2" >&5 -printf %s "checking for libsidplay2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SID" >&5 +$as_echo_n "checking for SID... " >&6; } if test -n "$SID_CFLAGS"; then pkg_cv_SID_CFLAGS="$SID_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplay2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplay2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsidplay2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SID_CFLAGS=`$PKG_CONFIG --cflags "libsidplay2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39686,10 +38231,10 @@ pkg_cv_SID_LIBS="$SID_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplay2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplay2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsidplay2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SID_LIBS=`$PKG_CONFIG --libs "libsidplay2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39703,8 +38248,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39712,41 +38257,39 @@ _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" -then : + if test "x${enable_sid}" = "xyes"; then : as_fn_error $? "${SID_PKG_ERRORS} (required for sid)." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&5 -printf "%s\n" "$as_me: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&5 +$as_echo "$as_me: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&2;} fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "x${enable_sid}" = "xyes" -then : + if test "x${enable_sid}" = "xyes"; then : as_fn_error $? "${SID_PKG_ERRORS} (required for sid)." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&5 -printf "%s\n" "$as_me: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&5 +$as_echo "$as_me: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&2;} fi else - 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; } + SID_CFLAGS=$pkg_cv_SID_CFLAGS + SID_LIBS=$pkg_cv_SID_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -39756,9 +38299,8 @@ oldCPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $SID_CFLAGS" - ac_fn_cxx_check_header_compile "$LINENO" "sidplay/builders/resid.h" "ac_cv_header_sidplay_builders_resid_h" "$ac_includes_default" -if test "x$ac_cv_header_sidplay_builders_resid_h" = xyes -then : + ac_fn_cxx_check_header_mongrel "$LINENO" "sidplay/builders/resid.h" "ac_cv_header_sidplay_builders_resid_h" "$ac_includes_default" +if test "x$ac_cv_header_sidplay_builders_resid_h" = xyes; then : @@ -39779,19 +38321,19 @@ -else $as_nop +else - if test -n "${enable_sid}" -then : + if test -n "${enable_sid}"; then : as_fn_error $? "${SID_PKG_ERRORS} (required for sid)." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&5 -printf "%s\n" "$as_me: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&5 +$as_echo "$as_me: WARNING: ${SID_PKG_ERRORS} (required for sid)." >&2;} fi fi + CPPFLAGS="$oldCPPFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -39822,10 +38364,9 @@ # Check whether --enable-ogg was given. -if test ${enable_ogg+y} -then : +if test "${enable_ogg+set}" = set; then : enableval=$enable_ogg; -else $as_nop +else enable_ogg=auto fi @@ -39834,17 +38375,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg >= 1.0" >&5 -printf %s "checking for ogg >= 1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5 +$as_echo_n "checking for OGG... " >&6; } if test -n "$OGG_CFLAGS"; then pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39858,10 +38399,10 @@ pkg_cv_OGG_LIBS="$OGG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39875,8 +38416,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39884,38 +38425,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} fi else - 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 + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBmux_ogg=libmux_ogg_plugin.la @@ -39936,17 +38475,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg >= 1.0" >&5 -printf %s "checking for ogg >= 1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5 +$as_echo_n "checking for OGG... " >&6; } if test -n "$OGG_CFLAGS"; then pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39960,10 +38499,10 @@ pkg_cv_OGG_LIBS="$OGG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -39977,8 +38516,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -39986,40 +38525,38 @@ _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 - if test x"$enable_ogg" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} fi 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 - if test x"$enable_ogg" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} fi else - 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 + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_ogg=yes LTLIBmux_ogg=libmux_ogg_plugin.la @@ -40056,17 +38593,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vorbis >= 1.1" >&5 -printf %s "checking for vorbis >= 1.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVORBIS" >&5 +$as_echo_n "checking for LIBVORBIS... " >&6; } if test -n "$LIBVORBIS_CFLAGS"; then pkg_cv_LIBVORBIS_CFLAGS="$LIBVORBIS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbis >= 1.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbis >= 1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "vorbis >= 1.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVORBIS_CFLAGS=`$PKG_CONFIG --cflags "vorbis >= 1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40080,10 +38617,10 @@ pkg_cv_LIBVORBIS_LIBS="$LIBVORBIS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbis >= 1.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbis >= 1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "vorbis >= 1.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVORBIS_LIBS=`$PKG_CONFIG --libs "vorbis >= 1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40097,8 +38634,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40106,26 +38643,26 @@ _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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + true else - 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; } + LIBVORBIS_CFLAGS=$pkg_cv_LIBVORBIS_CFLAGS + LIBVORBIS_LIBS=$pkg_cv_LIBVORBIS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -printf "%s\n" "#define HAVE_LIBVORBIS 1" >>confdefs.h +$as_echo "#define HAVE_LIBVORBIS 1" >>confdefs.h fi @@ -40146,10 +38683,9 @@ # Check whether --enable-ogg was given. -if test ${enable_ogg+y} -then : +if test "${enable_ogg+set}" = set; then : enableval=$enable_ogg; -else $as_nop +else enable_ogg=auto fi @@ -40158,17 +38694,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg >= 1.0" >&5 -printf %s "checking for ogg >= 1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5 +$as_echo_n "checking for OGG... " >&6; } if test -n "$OGG_CFLAGS"; then pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40182,10 +38718,10 @@ pkg_cv_OGG_LIBS="$OGG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40199,8 +38735,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40208,38 +38744,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} fi else - 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 + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBogg=libogg_plugin.la @@ -40260,17 +38794,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg >= 1.0" >&5 -printf %s "checking for ogg >= 1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5 +$as_echo_n "checking for OGG... " >&6; } if test -n "$OGG_CFLAGS"; then pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40284,10 +38818,10 @@ pkg_cv_OGG_LIBS="$OGG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40301,8 +38835,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40310,40 +38844,38 @@ _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 - if test x"$enable_ogg" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} fi 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 - if test x"$enable_ogg" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg >= 1.0 needed for ogg was not found" >&2;} fi else - 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 + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_ogg=yes LTLIBogg=libogg_plugin.la @@ -40396,10 +38928,9 @@ # Check whether --enable-shout was given. -if test ${enable_shout+y} -then : +if test "${enable_shout+set}" = set; then : enableval=$enable_shout; -else $as_nop +else enable_shout=auto fi @@ -40408,17 +38939,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shout >= 2.1" >&5 -printf %s "checking for shout >= 2.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHOUT" >&5 +$as_echo_n "checking for SHOUT... " >&6; } if test -n "$SHOUT_CFLAGS"; then pkg_cv_SHOUT_CFLAGS="$SHOUT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "shout >= 2.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SHOUT_CFLAGS=`$PKG_CONFIG --cflags "shout >= 2.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40432,10 +38963,10 @@ pkg_cv_SHOUT_LIBS="$SHOUT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "shout >= 2.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SHOUT_LIBS=`$PKG_CONFIG --libs "shout >= 2.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40449,8 +38980,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40458,38 +38989,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5 +$as_echo "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5 +$as_echo "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;} fi else - 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 + SHOUT_CFLAGS=$pkg_cv_SHOUT_CFLAGS + SHOUT_LIBS=$pkg_cv_SHOUT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBaccess_output_shout=libaccess_output_shout_plugin.la @@ -40510,17 +39039,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shout >= 2.1" >&5 -printf %s "checking for shout >= 2.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHOUT" >&5 +$as_echo_n "checking for SHOUT... " >&6; } if test -n "$SHOUT_CFLAGS"; then pkg_cv_SHOUT_CFLAGS="$SHOUT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "shout >= 2.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SHOUT_CFLAGS=`$PKG_CONFIG --cflags "shout >= 2.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40534,10 +39063,10 @@ pkg_cv_SHOUT_LIBS="$SHOUT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shout >= 2.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "shout >= 2.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SHOUT_LIBS=`$PKG_CONFIG --libs "shout >= 2.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40551,8 +39080,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40560,40 +39089,38 @@ _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 - if test x"$enable_shout" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5 +$as_echo "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;} fi 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 - if test x"$enable_shout" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shout >= 2.1 needed for shout was not found" >&5 +$as_echo "$as_me: WARNING: Library shout >= 2.1 needed for shout was not found" >&2;} fi else - 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 + SHOUT_CFLAGS=$pkg_cv_SHOUT_CFLAGS + SHOUT_LIBS=$pkg_cv_SHOUT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_shout=yes LTLIBaccess_output_shout=libaccess_output_shout_plugin.la @@ -40647,10 +39174,9 @@ # Check whether --enable-matroska was given. -if test ${enable_matroska+y} -then : +if test "${enable_matroska+set}" = set; then : enableval=$enable_matroska; -else $as_nop +else enable_matroska=auto fi @@ -40659,17 +39185,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libebml >= 1.3.6 libmatroska" >&5 -printf %s "checking for libebml >= 1.3.6 libmatroska... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MATROSKA" >&5 +$as_echo_n "checking for MATROSKA... " >&6; } if test -n "$MATROSKA_CFLAGS"; then pkg_cv_MATROSKA_CFLAGS="$MATROSKA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebml >= 1.3.6 libmatroska\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebml >= 1.3.6 libmatroska\""; } >&5 ($PKG_CONFIG --exists --print-errors "libebml >= 1.3.6 libmatroska") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MATROSKA_CFLAGS=`$PKG_CONFIG --cflags "libebml >= 1.3.6 libmatroska" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40683,10 +39209,10 @@ pkg_cv_MATROSKA_LIBS="$MATROSKA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebml >= 1.3.6 libmatroska\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebml >= 1.3.6 libmatroska\""; } >&5 ($PKG_CONFIG --exists --print-errors "libebml >= 1.3.6 libmatroska") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MATROSKA_LIBS=`$PKG_CONFIG --libs "libebml >= 1.3.6 libmatroska" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40700,8 +39226,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40709,38 +39235,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&5 +$as_echo "$as_me: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&5 +$as_echo "$as_me: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&2;} fi else - 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 + MATROSKA_CFLAGS=$pkg_cv_MATROSKA_CFLAGS + MATROSKA_LIBS=$pkg_cv_MATROSKA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBmkv=libmkv_plugin.la @@ -40761,17 +39285,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libebml >= 1.3.6 libmatroska" >&5 -printf %s "checking for libebml >= 1.3.6 libmatroska... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MATROSKA" >&5 +$as_echo_n "checking for MATROSKA... " >&6; } if test -n "$MATROSKA_CFLAGS"; then pkg_cv_MATROSKA_CFLAGS="$MATROSKA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebml >= 1.3.6 libmatroska\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebml >= 1.3.6 libmatroska\""; } >&5 ($PKG_CONFIG --exists --print-errors "libebml >= 1.3.6 libmatroska") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MATROSKA_CFLAGS=`$PKG_CONFIG --cflags "libebml >= 1.3.6 libmatroska" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40785,10 +39309,10 @@ pkg_cv_MATROSKA_LIBS="$MATROSKA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebml >= 1.3.6 libmatroska\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebml >= 1.3.6 libmatroska\""; } >&5 ($PKG_CONFIG --exists --print-errors "libebml >= 1.3.6 libmatroska") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MATROSKA_LIBS=`$PKG_CONFIG --libs "libebml >= 1.3.6 libmatroska" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40802,8 +39326,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40811,40 +39335,38 @@ _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 - if test x"$enable_matroska" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&5 +$as_echo "$as_me: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&2;} fi 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 - if test x"$enable_matroska" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&5 +$as_echo "$as_me: WARNING: Library libebml >= 1.3.6 libmatroska needed for matroska was not found" >&2;} fi else - 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 + MATROSKA_CFLAGS=$pkg_cv_MATROSKA_CFLAGS + MATROSKA_LIBS=$pkg_cv_MATROSKA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_matroska=yes LTLIBmkv=libmkv_plugin.la @@ -40881,25 +39403,24 @@ # Check whether --enable-mod was given. -if test ${enable_mod+y} -then : +if test "${enable_mod+set}" = set; then : enableval=$enable_mod; fi if test "${enable_mod}" != "no" ; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmodplug >= 0.8.9.0" >&5 -printf %s "checking for libmodplug >= 0.8.9.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMODPLUG" >&5 +$as_echo_n "checking for LIBMODPLUG... " >&6; } if test -n "$LIBMODPLUG_CFLAGS"; then pkg_cv_LIBMODPLUG_CFLAGS="$LIBMODPLUG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug >= 0.8.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug >= 0.8.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmodplug >= 0.8.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBMODPLUG_CFLAGS=`$PKG_CONFIG --cflags "libmodplug >= 0.8.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40913,10 +39434,10 @@ pkg_cv_LIBMODPLUG_LIBS="$LIBMODPLUG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug >= 0.8.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug >= 0.8.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmodplug >= 0.8.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBMODPLUG_LIBS=`$PKG_CONFIG --libs "libmodplug >= 0.8.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40930,8 +39451,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40939,39 +39460,37 @@ _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}" -then : + if test -n "${enable_mod}"; then : as_fn_error $? "${LIBMODPLUG_PKG_ERRORS}." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBMODPLUG_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBMODPLUG_PKG_ERRORS}." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBMODPLUG_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBMODPLUG_PKG_ERRORS}." >&2;} fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_mod}" -then : + if test -n "${enable_mod}"; then : as_fn_error $? "${LIBMODPLUG_PKG_ERRORS}." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBMODPLUG_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBMODPLUG_PKG_ERRORS}." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBMODPLUG_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBMODPLUG_PKG_ERRORS}." >&2;} fi else - 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; } + LIBMODPLUG_CFLAGS=$pkg_cv_LIBMODPLUG_CFLAGS + LIBMODPLUG_LIBS=$pkg_cv_LIBMODPLUG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -41002,19 +39521,19 @@ fi # Check whether --enable-mpc was given. -if test ${enable_mpc+y} -then : +if test "${enable_mpc+set}" = set; then : enableval=$enable_mpc; fi if test "${enable_mpc}" != "no" then - for ac_header in mpc/mpcdec.h + for ac_header in mpc/mpcdec.h do : - ac_fn_c_check_header_compile "$LINENO" "mpc/mpcdec.h" "ac_cv_header_mpc_mpcdec_h" "$ac_includes_default" -if test "x$ac_cv_header_mpc_mpcdec_h" = xyes -then : - printf "%s\n" "#define HAVE_MPC_MPCDEC_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "mpc/mpcdec.h" "ac_cv_header_mpc_mpcdec_h" "$ac_includes_default" +if test "x$ac_cv_header_mpc_mpcdec_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MPC_MPCDEC_H 1 +_ACEOF @@ -41028,13 +39547,14 @@ -else $as_nop - for ac_header in mpcdec/mpcdec.h +else + for ac_header in mpcdec/mpcdec.h do : - ac_fn_c_check_header_compile "$LINENO" "mpcdec/mpcdec.h" "ac_cv_header_mpcdec_mpcdec_h" "$ac_includes_default" -if test "x$ac_cv_header_mpcdec_mpcdec_h" = xyes -then : - printf "%s\n" "#define HAVE_MPCDEC_MPCDEC_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "mpcdec/mpcdec.h" "ac_cv_header_mpcdec_mpcdec_h" "$ac_includes_default" +if test "x$ac_cv_header_mpcdec_mpcdec_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MPCDEC_MPCDEC_H 1 +_ACEOF @@ -41051,17 +39571,18 @@ fi done + fi done + fi # Check whether --enable-wma-fixed was given. -if test ${enable_wma_fixed+y} -then : +if test "${enable_wma_fixed+set}" = set; then : enableval=$enable_wma_fixed; fi @@ -41092,10 +39613,9 @@ # Check whether --enable-shine was given. -if test ${enable_shine+y} -then : +if test "${enable_shine+set}" = set; then : enableval=$enable_shine; -else $as_nop +else enable_shine=auto fi @@ -41104,17 +39624,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shine >= 3.0.0" >&5 -printf %s "checking for shine >= 3.0.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHINE" >&5 +$as_echo_n "checking for SHINE... " >&6; } if test -n "$SHINE_CFLAGS"; then pkg_cv_SHINE_CFLAGS="$SHINE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shine >= 3.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shine >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "shine >= 3.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SHINE_CFLAGS=`$PKG_CONFIG --cflags "shine >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41128,10 +39648,10 @@ pkg_cv_SHINE_LIBS="$SHINE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shine >= 3.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shine >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "shine >= 3.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SHINE_LIBS=`$PKG_CONFIG --libs "shine >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41145,8 +39665,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41154,38 +39674,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&5 +$as_echo "$as_me: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&5 +$as_echo "$as_me: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&2;} fi else - 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 + SHINE_CFLAGS=$pkg_cv_SHINE_CFLAGS + SHINE_LIBS=$pkg_cv_SHINE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBshine=libshine_plugin.la @@ -41206,17 +39724,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shine >= 3.0.0" >&5 -printf %s "checking for shine >= 3.0.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHINE" >&5 +$as_echo_n "checking for SHINE... " >&6; } if test -n "$SHINE_CFLAGS"; then pkg_cv_SHINE_CFLAGS="$SHINE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shine >= 3.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shine >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "shine >= 3.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SHINE_CFLAGS=`$PKG_CONFIG --cflags "shine >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41230,10 +39748,10 @@ pkg_cv_SHINE_LIBS="$SHINE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shine >= 3.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shine >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "shine >= 3.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SHINE_LIBS=`$PKG_CONFIG --libs "shine >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41247,8 +39765,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41256,40 +39774,38 @@ _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 - if test x"$enable_shine" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&5 +$as_echo "$as_me: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&2;} fi 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 - if test x"$enable_shine" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&5 +$as_echo "$as_me: WARNING: Library shine >= 3.0.0 needed for shine was not found" >&2;} fi else - 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 + SHINE_CFLAGS=$pkg_cv_SHINE_CFLAGS + SHINE_LIBS=$pkg_cv_SHINE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_shine=yes LTLIBshine=libshine_plugin.la @@ -41327,8 +39843,7 @@ # Check whether --enable-omxil was given. -if test ${enable_omxil+y} -then : +if test "${enable_omxil+set}" = set; then : enableval=$enable_omxil; fi @@ -41343,8 +39858,7 @@ fi # Check whether --enable-omxil-vout was given. -if test ${enable_omxil_vout+y} -then : +if test "${enable_omxil_vout+set}" = set; then : enableval=$enable_omxil_vout; fi @@ -41359,8 +39873,7 @@ fi # Check whether --enable-rpi-omxil was given. -if test ${enable_rpi_omxil+y} -then : +if test "${enable_rpi_omxil+set}" = set; then : enableval=$enable_rpi_omxil; fi @@ -41387,8 +39900,7 @@ fi # Check whether --enable-crystalhd was given. -if test ${enable_crystalhd+y} -then : +if test "${enable_crystalhd+set}" = set; then : enableval=$enable_crystalhd; fi @@ -41397,8 +39909,7 @@ #include " -if test "x$ac_cv_header_libcrystalhd_libcrystalhd_if_h" = xyes -then : +if test "x$ac_cv_header_libcrystalhd_libcrystalhd_if_h" = xyes; then : @@ -41413,18 +39924,19 @@ -else $as_nop +else if test "${SYS}" = "mingw32" ; then - for ac_header in libcrystalhd/bc_dts_defs.h + for ac_header in libcrystalhd/bc_dts_defs.h do : ac_fn_c_check_header_compile "$LINENO" "libcrystalhd/bc_dts_defs.h" "ac_cv_header_libcrystalhd_bc_dts_defs_h" "#define __LINUX_USER__ #include " -if test "x$ac_cv_header_libcrystalhd_bc_dts_defs_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBCRYSTALHD_BC_DTS_DEFS_H 1" >>confdefs.h +if test "x$ac_cv_header_libcrystalhd_bc_dts_defs_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCRYSTALHD_BC_DTS_DEFS_H 1 +_ACEOF @@ -41432,12 +39944,13 @@ - for ac_header in libcrystalhd/bc_drv_if.h + for ac_header in libcrystalhd/bc_drv_if.h do : - ac_fn_c_check_header_compile "$LINENO" "libcrystalhd/bc_drv_if.h" "ac_cv_header_libcrystalhd_bc_drv_if_h" "$ac_includes_default" -if test "x$ac_cv_header_libcrystalhd_bc_drv_if_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBCRYSTALHD_BC_DRV_IF_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "libcrystalhd/bc_drv_if.h" "ac_cv_header_libcrystalhd_bc_drv_if_h" "$ac_includes_default" +if test "x$ac_cv_header_libcrystalhd_bc_drv_if_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCRYSTALHD_BC_DRV_IF_H 1 +_ACEOF @@ -41450,23 +39963,25 @@ done -else $as_nop - if test x"${enable_crystalhd}" = "xyes" -then : +else + + if test x"${enable_crystalhd}" = "xyes"; then : as_fn_error $? "\"Could not find CrystalHD development headers\"" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Could not find CrystalHD development headers\"" >&5 -printf "%s\n" "$as_me: WARNING: \"Could not find CrystalHD development headers\"" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Could not find CrystalHD development headers\"" >&5 +$as_echo "$as_me: WARNING: \"Could not find CrystalHD development headers\"" >&2;} fi fi done + fi fi + fi have_mad="no" @@ -41475,19 +39990,17 @@ # Check whether --with-mad was given. -if test ${with_mad+y} -then : +if test "${with_mad+set}" = set; then : withval=$with_mad; enable_mad="yes" -else $as_nop +else with_mad="no" fi -if test "${with_mad}" != "no" -then : +if test "${with_mad}" != "no"; then : MAD_CFLAGS="-I${with_mad}/include" MAD_LIBS="-L${with_mad}/lib" @@ -41495,13 +40008,11 @@ fi # Check whether --enable-mad was given. -if test ${enable_mad+y} -then : +if test "${enable_mad+set}" = set; then : enableval=$enable_mad; fi -if test "${enable_mad}" != "no" -then : +if test "${enable_mad}" != "no"; then : CPPFLAGS_save="${CPPFLAGS}" @@ -41513,19 +40024,19 @@ CPPFLAGS="${CPPFLAGS} ${MAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${MAD_LIBS}" - for ac_header in mad.h + for ac_header in mad.h do : - ac_fn_c_check_header_compile "$LINENO" "mad.h" "ac_cv_header_mad_h" "$ac_includes_default" -if test "x$ac_cv_header_mad_h" = xyes -then : - printf "%s\n" "#define HAVE_MAD_H 1" >>confdefs.h - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mad_bit_init in -lmad" >&5 -printf %s "checking for mad_bit_init in -lmad... " >&6; } -if test ${ac_cv_lib_mad_mad_bit_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop + ac_fn_c_check_header_mongrel "$LINENO" "mad.h" "ac_cv_header_mad_h" "$ac_includes_default" +if test "x$ac_cv_header_mad_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MAD_H 1 +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mad_bit_init in -lmad" >&5 +$as_echo_n "checking for mad_bit_init in -lmad... " >&6; } +if ${ac_cv_lib_mad_mad_bit_init+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lmad $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -41534,29 +40045,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char mad_bit_init (); int -main (void) +main () { return mad_bit_init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_mad_mad_bit_init=yes -else $as_nop +else ac_cv_lib_mad_mad_bit_init=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mad_mad_bit_init" >&5 -printf "%s\n" "$ac_cv_lib_mad_mad_bit_init" >&6; } -if test "x$ac_cv_lib_mad_mad_bit_init" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mad_mad_bit_init" >&5 +$as_echo "$ac_cv_lib_mad_mad_bit_init" >&6; } +if test "x$ac_cv_lib_mad_mad_bit_init" = xyes; then : have_mad="yes" MAD_LIBS="${MAD_LIBS} -lmad" @@ -41568,6 +40080,7 @@ done + CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" CXXFLAGS="${CXXFLAGS_save}" @@ -41575,8 +40088,7 @@ LDFLAGS="${LDFLAGS_save}" LIBS="${LIBS_save}" - if test -n "$enable_mad" -a "${have_mad}" = "no" -then : + if test -n "$enable_mad" -a "${have_mad}" = "no"; then : as_fn_error $? "Could not find libmad. Install it or pass --disable-mad to disable it." "$LINENO" 5 @@ -41611,10 +40123,9 @@ # Check whether --enable-mpg123 was given. -if test ${enable_mpg123+y} -then : +if test "${enable_mpg123+set}" = set; then : enableval=$enable_mpg123; -else $as_nop +else enable_mpg123=auto fi @@ -41623,17 +40134,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmpg123" >&5 -printf %s "checking for libmpg123... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPG123" >&5 +$as_echo_n "checking for MPG123... " >&6; } if test -n "$MPG123_CFLAGS"; then pkg_cv_MPG123_CFLAGS="$MPG123_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmpg123") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MPG123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41647,10 +40158,10 @@ pkg_cv_MPG123_LIBS="$MPG123_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmpg123") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MPG123_LIBS=`$PKG_CONFIG --libs "libmpg123" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41664,8 +40175,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41673,38 +40184,36 @@ _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" -then : + if test x"$enable_mpg123" = "xyes"; then : as_fn_error $? "Library libmpg123 needed for mpg123 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpg123 needed for mpg123 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmpg123 needed for mpg123 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpg123 needed for mpg123 was not found" >&5 +$as_echo "$as_me: WARNING: Library libmpg123 needed for mpg123 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_mpg123" = "xyes"; then : as_fn_error $? "Library libmpg123 needed for mpg123 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpg123 needed for mpg123 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmpg123 needed for mpg123 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpg123 needed for mpg123 was not found" >&5 +$as_echo "$as_me: WARNING: Library libmpg123 needed for mpg123 was not found" >&2;} fi else - 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 + MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS + MPG123_LIBS=$pkg_cv_MPG123_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBmpg123=libmpg123_plugin.la @@ -41725,17 +40234,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmpg123" >&5 -printf %s "checking for libmpg123... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPG123" >&5 +$as_echo_n "checking for MPG123... " >&6; } if test -n "$MPG123_CFLAGS"; then pkg_cv_MPG123_CFLAGS="$MPG123_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmpg123") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MPG123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41749,10 +40258,10 @@ pkg_cv_MPG123_LIBS="$MPG123_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmpg123") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MPG123_LIBS=`$PKG_CONFIG --libs "libmpg123" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41766,8 +40275,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41775,40 +40284,38 @@ _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 - if test x"$enable_mpg123" = "xyes" -then : + enable_mpg123=no + if test x"$enable_mpg123" = "xyes"; then : as_fn_error $? "Library libmpg123 needed for mpg123 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpg123 needed for mpg123 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmpg123 needed for mpg123 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpg123 needed for mpg123 was not found" >&5 +$as_echo "$as_me: WARNING: Library libmpg123 needed for mpg123 was not found" >&2;} fi 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 - if test x"$enable_mpg123" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_mpg123=no + if test x"$enable_mpg123" = "xyes"; then : as_fn_error $? "Library libmpg123 needed for mpg123 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpg123 needed for mpg123 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmpg123 needed for mpg123 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpg123 needed for mpg123 was not found" >&5 +$as_echo "$as_me: WARNING: Library libmpg123 needed for mpg123 was not found" >&2;} fi else - 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 + MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS + MPG123_LIBS=$pkg_cv_MPG123_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_mpg123=yes LTLIBmpg123=libmpg123_plugin.la @@ -41845,29 +40352,27 @@ # Check whether --enable-gst-decode was given. -if test ${enable_gst_decode+y} -then : +if test "${enable_gst_decode+set}" = set; then : enableval=$enable_gst_decode; fi have_gst_decode="no" -if test "${enable_gst_decode}" != "no" -then : +if test "${enable_gst_decode}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gstreamer-app-1.0" >&5 -printf %s "checking for gstreamer-app-1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST_APP" >&5 +$as_echo_n "checking for GST_APP... " >&6; } if test -n "$GST_APP_CFLAGS"; then pkg_cv_GST_APP_CFLAGS="$GST_APP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-app-1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-app-1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gstreamer-app-1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GST_APP_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-app-1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41881,10 +40386,10 @@ pkg_cv_GST_APP_LIBS="$GST_APP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-app-1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-app-1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gstreamer-app-1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GST_APP_LIBS=`$PKG_CONFIG --libs "gstreamer-app-1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41898,8 +40403,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41907,43 +40412,43 @@ _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 -printf "%s\n" "$as_me: WARNING: ${GST_APP_PKG_ERRORS}. GStreamer modules will not be built." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${GST_APP_PKG_ERRORS}. GStreamer modules will not be built." >&5 +$as_echo "$as_me: WARNING: ${GST_APP_PKG_ERRORS}. GStreamer modules will not be built." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${GST_APP_PKG_ERRORS}. GStreamer modules will not be built." >&5 -printf "%s\n" "$as_me: WARNING: ${GST_APP_PKG_ERRORS}. GStreamer modules will not be built." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${GST_APP_PKG_ERRORS}. GStreamer modules will not be built." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + GST_APP_CFLAGS=$pkg_cv_GST_APP_CFLAGS + GST_APP_LIBS=$pkg_cv_GST_APP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gstreamer-video-1.0" >&5 -printf %s "checking for gstreamer-video-1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST_VIDEO" >&5 +$as_echo_n "checking for GST_VIDEO... " >&6; } if test -n "$GST_VIDEO_CFLAGS"; then pkg_cv_GST_VIDEO_CFLAGS="$GST_VIDEO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-video-1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-video-1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gstreamer-video-1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GST_VIDEO_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-video-1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41957,10 +40462,10 @@ pkg_cv_GST_VIDEO_LIBS="$GST_VIDEO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-video-1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-video-1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gstreamer-video-1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GST_VIDEO_LIBS=`$PKG_CONFIG --libs "gstreamer-video-1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -41974,8 +40479,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -41983,29 +40488,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${GST_VIDEO_PKG_ERRORS}. GStreamer decoder module will not be built." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${GST_VIDEO_PKG_ERRORS}. GStreamer decoder module will not be built." >&5 +$as_echo "$as_me: WARNING: ${GST_VIDEO_PKG_ERRORS}. GStreamer decoder module will not be built." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${GST_VIDEO_PKG_ERRORS}. GStreamer decoder module will not be built." >&5 -printf "%s\n" "$as_me: WARNING: ${GST_VIDEO_PKG_ERRORS}. GStreamer decoder module will not be built." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${GST_VIDEO_PKG_ERRORS}. GStreamer decoder module will not be built." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + GST_VIDEO_CFLAGS=$pkg_cv_GST_VIDEO_CFLAGS + GST_VIDEO_LIBS=$pkg_cv_GST_VIDEO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_gst_decode="yes" @@ -42024,10 +40529,9 @@ # Check whether --enable-merge-ffmpeg was given. -if test ${enable_merge_ffmpeg+y} -then : +if test "${enable_merge_ffmpeg+set}" = set; then : enableval=$enable_merge_ffmpeg; -else $as_nop +else enable_merge_ffmpeg="no" @@ -42042,23 +40546,22 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavutil variant" >&5 -printf %s "checking for libavutil variant... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavutil variant" >&5 +$as_echo_n "checking for libavutil variant... " >&6; } if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5 ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then libavutil_version="$(${PKG_CONFIG} --modversion libavutil)" libavutil_micro="${libavutil_version##*.}" - if test ${libavutil_micro} -le 99 -then : + if test ${libavutil_micro} -le 99; then : avfork="libav" -else $as_nop +else avfork="ffmpeg" @@ -42069,17 +40572,15 @@ avfork="none" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${avfork}" >&5 -printf "%s\n" "${avfork}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${avfork}" >&5 +$as_echo "${avfork}" >&6; } # Check whether --enable-avcodec was given. -if test ${enable_avcodec+y} -then : +if test "${enable_avcodec+set}" = set; then : enableval=$enable_avcodec; fi -if test "${enable_avcodec}" != "no" -then : +if test "${enable_avcodec}" != "no"; then : case "${avfork}" in libav) av_codec_ver="57.16.0" ;; @@ -42088,17 +40589,17 @@ esac pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavcodec >= ${av_codec_ver} libavutil >= 52.0.0" >&5 -printf %s "checking for libavcodec >= ${av_codec_ver} libavutil >= 52.0.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVCODEC" >&5 +$as_echo_n "checking for AVCODEC... " >&6; } if test -n "$AVCODEC_CFLAGS"; then pkg_cv_AVCODEC_CFLAGS="$AVCODEC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= \${av_codec_ver} libavutil >= 52.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= \${av_codec_ver} libavutil >= 52.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libavcodec >= ${av_codec_ver} libavutil >= 52.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= ${av_codec_ver} libavutil >= 52.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42112,10 +40613,10 @@ pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= \${av_codec_ver} libavutil >= 52.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= \${av_codec_ver} libavutil >= 52.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libavcodec >= ${av_codec_ver} libavutil >= 52.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavcodec >= ${av_codec_ver} libavutil >= 52.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42129,8 +40630,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42138,27 +40639,27 @@ _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 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS + AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } CPPFLAGS_save="${CPPFLAGS}" @@ -42170,20 +40671,30 @@ CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" - ac_fn_c_check_header_compile "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "$ac_includes_default" -if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVCODEC_AVCODEC_H 1" >>confdefs.h + for ac_header in libavcodec/avcodec.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "$ac_includes_default" +if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAVCODEC_AVCODEC_H 1 +_ACEOF fi - ac_fn_c_check_header_compile "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "$ac_includes_default" -if test "x$ac_cv_header_libavutil_avutil_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVUTIL_AVUTIL_H 1" >>confdefs.h +done + + for ac_header in libavutil/avutil.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "$ac_includes_default" +if test "x$ac_cv_header_libavutil_avutil_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAVUTIL_AVUTIL_H 1 +_ACEOF fi +done + CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -42196,7 +40707,7 @@ fi -else $as_nop +else have_avcodec="no" @@ -42211,14 +40722,12 @@ # Check whether --enable-libva was given. -if test ${enable_libva+y} -then : +if test "${enable_libva+set}" = set; then : enableval=$enable_libva; fi -if test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" -then : +if test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ; then : as_fn_error $? "--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec." "$LINENO" 5 @@ -42228,22 +40737,21 @@ have_vaapi_drm="no" have_vaapi_x11="no" have_vaapi_wl="no" -if test "${enable_libva}" != "no" -then : +if test "${enable_libva}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libva >= 0.38" >&5 -printf %s "checking for libva >= 0.38... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVA" >&5 +$as_echo_n "checking for LIBVA... " >&6; } if test -n "$LIBVA_CFLAGS"; then pkg_cv_LIBVA_CFLAGS="$LIBVA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= 0.38\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= 0.38\""; } >&5 ($PKG_CONFIG --exists --print-errors "libva >= 0.38") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVA_CFLAGS=`$PKG_CONFIG --cflags "libva >= 0.38" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42257,10 +40765,10 @@ pkg_cv_LIBVA_LIBS="$LIBVA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= 0.38\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= 0.38\""; } >&5 ($PKG_CONFIG --exists --print-errors "libva >= 0.38") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVA_LIBS=`$PKG_CONFIG --libs "libva >= 0.38" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42274,8 +40782,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42283,64 +40791,62 @@ _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}" -then : + if test -n "${enable_libva}"; then : as_fn_error $? "${LIBVA_PKG_ERRORS}." "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBVA_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBVA_PKG_ERRORS}." >&2;} fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_libva}" -then : + if test -n "${enable_libva}"; then : as_fn_error $? "${LIBVA_PKG_ERRORS}." "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBVA_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBVA_PKG_ERRORS}." >&2;} fi else - 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; } + LIBVA_CFLAGS=$pkg_cv_LIBVA_CFLAGS + LIBVA_LIBS=$pkg_cv_LIBVA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_vaapi="yes" fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libva-drm" >&5 -printf %s "checking for libva-drm... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVA_DRM" >&5 +$as_echo_n "checking for LIBVA_DRM... " >&6; } if test -n "$LIBVA_DRM_CFLAGS"; then pkg_cv_LIBVA_DRM_CFLAGS="$LIBVA_DRM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-drm\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-drm\""; } >&5 ($PKG_CONFIG --exists --print-errors "libva-drm") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVA_DRM_CFLAGS=`$PKG_CONFIG --cflags "libva-drm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42354,10 +40860,10 @@ pkg_cv_LIBVA_DRM_LIBS="$LIBVA_DRM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-drm\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-drm\""; } >&5 ($PKG_CONFIG --exists --print-errors "libva-drm") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVA_DRM_LIBS=`$PKG_CONFIG --libs "libva-drm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42371,8 +40877,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42380,46 +40886,46 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LIBVA_DRM_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_DRM_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBVA_DRM_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_DRM_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBVA_DRM_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_DRM_PKG_ERRORS}." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + LIBVA_DRM_CFLAGS=$pkg_cv_LIBVA_DRM_CFLAGS + LIBVA_DRM_LIBS=$pkg_cv_LIBVA_DRM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_vaapi_drm="yes" fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libva-x11" >&5 -printf %s "checking for libva-x11... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVA_X11" >&5 +$as_echo_n "checking for LIBVA_X11... " >&6; } if test -n "$LIBVA_X11_CFLAGS"; then pkg_cv_LIBVA_X11_CFLAGS="$LIBVA_X11_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-x11\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "libva-x11") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVA_X11_CFLAGS=`$PKG_CONFIG --cflags "libva-x11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42433,10 +40939,10 @@ pkg_cv_LIBVA_X11_LIBS="$LIBVA_X11_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-x11\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "libva-x11") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVA_X11_LIBS=`$PKG_CONFIG --libs "libva-x11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42450,8 +40956,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42459,46 +40965,46 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LIBVA_X11_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_X11_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBVA_X11_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_X11_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBVA_X11_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_X11_PKG_ERRORS}." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + LIBVA_X11_CFLAGS=$pkg_cv_LIBVA_X11_CFLAGS + LIBVA_X11_LIBS=$pkg_cv_LIBVA_X11_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_vaapi_x11="yes" fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libva-wayland" >&5 -printf %s "checking for libva-wayland... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVA_WL" >&5 +$as_echo_n "checking for LIBVA_WL... " >&6; } if test -n "$LIBVA_WL_CFLAGS"; then pkg_cv_LIBVA_WL_CFLAGS="$LIBVA_WL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-wayland\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-wayland\""; } >&5 ($PKG_CONFIG --exists --print-errors "libva-wayland") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVA_WL_CFLAGS=`$PKG_CONFIG --cflags "libva-wayland" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42512,10 +41018,10 @@ pkg_cv_LIBVA_WL_LIBS="$LIBVA_WL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-wayland\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva-wayland\""; } >&5 ($PKG_CONFIG --exists --print-errors "libva-wayland") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBVA_WL_LIBS=`$PKG_CONFIG --libs "libva-wayland" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42529,8 +41035,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42538,29 +41044,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${LIBVA_WL_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_WL_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBVA_WL_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_WL_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBVA_WL_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBVA_WL_PKG_ERRORS}." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + LIBVA_WL_CFLAGS=$pkg_cv_LIBVA_WL_CFLAGS + LIBVA_WL_LIBS=$pkg_cv_LIBVA_WL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_vaapi_wl="yes" @@ -42599,60 +41105,7 @@ HAVE_VAAPI_WL_FALSE= fi - -have_avcodec_vaapi="no" -if test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes" -then : - - - CPPFLAGS_save="${CPPFLAGS}" - CFLAGS_save="${CFLAGS}" - CXXFLAGS_save="${CXXFLAGS}" - OBJCFLAGS_save="${OBJCFLAGS}" - LDFLAGS_save="${LDFLAGS}" - LIBS_save="${LIBS}" - - CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" - CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" - for ac_header in libavcodec/vaapi.h -do : - ac_fn_c_check_header_compile "$LINENO" "libavcodec/vaapi.h" "ac_cv_header_libavcodec_vaapi_h" "$ac_includes_default" -if test "x$ac_cv_header_libavcodec_vaapi_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVCODEC_VAAPI_H 1" >>confdefs.h - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: VA API acceleration activated" >&5 -printf "%s\n" "$as_me: VA API acceleration activated" >&6;} - have_avcodec_vaapi="yes" - -else $as_nop - - if test -n "${enable_libva}" -then : - - as_fn_error $? "libva is present but libavcodec/vaapi.h is missing" "$LINENO" 5 - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libva is present but libavcodec/vaapi.h is missing " >&5 -printf "%s\n" "$as_me: WARNING: libva is present but libavcodec/vaapi.h is missing " >&2;} - -fi - -fi - -done - - CPPFLAGS="${CPPFLAGS_save}" - CFLAGS="${CFLAGS_save}" - CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS="${OBJCFLAGS_save}" - LDFLAGS="${LDFLAGS_save}" - LIBS="${LIBS_save}" - - -fi - if test "${have_avcodec_vaapi}" = "yes"; then + if test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"; then HAVE_AVCODEC_VAAPI_TRUE= HAVE_AVCODEC_VAAPI_FALSE='#' else @@ -42662,74 +41115,72 @@ # Check whether --enable-dxva2 was given. -if test ${enable_dxva2+y} -then : +if test "${enable_dxva2+set}" = set; then : enableval=$enable_dxva2; fi have_avcodec_dxva2="no" -if test "${enable_dxva2}" != "no" -then : +if test "${enable_dxva2}" != "no"; then : if test "${SYS}" = "mingw32"; then - if test "x${have_avcodec}" = "xyes" -then : + if test "x${have_avcodec}" = "xyes"; then : - for ac_header in dxva2api.h + for ac_header in dxva2api.h do : ac_fn_c_check_header_compile "$LINENO" "dxva2api.h" "ac_cv_header_dxva2api_h" "#include " -if test "x$ac_cv_header_dxva2api_h" = xyes -then : - printf "%s\n" "#define HAVE_DXVA2API_H 1" >>confdefs.h +if test "x$ac_cv_header_dxva2api_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DXVA2API_H 1 +_ACEOF - for ac_header in libavcodec/dxva2.h + for ac_header in libavcodec/dxva2.h do : ac_fn_c_check_header_compile "$LINENO" "libavcodec/dxva2.h" "ac_cv_header_libavcodec_dxva2_h" "#undef _WIN32_WINNT /* DXVA2 is only available in Vista and above */ #define _WIN32_WINNT 0x600 " -if test "x$ac_cv_header_libavcodec_dxva2_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVCODEC_DXVA2_H 1" >>confdefs.h +if test "x$ac_cv_header_libavcodec_dxva2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAVCODEC_DXVA2_H 1 +_ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: DxVA2 acceleration activated" >&5 -printf "%s\n" "$as_me: DxVA2 acceleration activated" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: DxVA2 acceleration activated" >&5 +$as_echo "$as_me: DxVA2 acceleration activated" >&6;} have_avcodec_dxva2="yes" -else $as_nop +else - if test "${enable_dxva2}" = "yes" -then : + if test "${enable_dxva2}" = "yes"; then : as_fn_error $? "dxva2 is present but libavcodec/dxva2.h is missing" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&5 -printf "%s\n" "$as_me: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&5 +$as_echo "$as_me: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&2;} fi fi done -else $as_nop - if test "${enable_dxva2}" = "yes" -then : +else + + if test "${enable_dxva2}" = "yes"; then : as_fn_error $? "Could not find required dxva2api.h" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: dxva2api.h not found" >&5 -printf "%s\n" "$as_me: WARNING: dxva2api.h not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2api.h not found" >&5 +$as_echo "$as_me: WARNING: dxva2api.h not found" >&2;} fi fi done -else $as_nop - if test "x${enable_dxva2}" != "x" -then : +else + + if test "x${enable_dxva2}" != "x"; then : as_fn_error $? "--enable-dxva2 and --disable-avcodec options are mutually exclusive." "$LINENO" 5 @@ -42749,98 +41200,96 @@ # Check whether --enable-d3d11va was given. -if test ${enable_d3d11va+y} -then : +if test "${enable_d3d11va+set}" = set; then : enableval=$enable_d3d11va; fi have_avcodec_d3d11va="no" -if test "${enable_d3d11va}" != "no" -then : +if test "${enable_d3d11va}" != "no"; then : if test "${SYS}" = "mingw32"; then - if test "x${have_avcodec}" = "xyes" -then : + if test "x${have_avcodec}" = "xyes"; then : ac_fn_c_check_type "$LINENO" "ID3D11VideoDecoder" "ac_cv_type_ID3D11VideoDecoder" "#include " -if test "x$ac_cv_type_ID3D11VideoDecoder" = xyes -then : +if test "x$ac_cv_type_ID3D11VideoDecoder" = xyes; then : -printf "%s\n" "#define HAVE_ID3D11VIDEODECODER 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_ID3D11VIDEODECODER 1 +_ACEOF - for ac_header in dxva2api.h + for ac_header in dxva2api.h do : ac_fn_c_check_header_compile "$LINENO" "dxva2api.h" "ac_cv_header_dxva2api_h" "#include " -if test "x$ac_cv_header_dxva2api_h" = xyes -then : - printf "%s\n" "#define HAVE_DXVA2API_H 1" >>confdefs.h +if test "x$ac_cv_header_dxva2api_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DXVA2API_H 1 +_ACEOF - for ac_header in libavcodec/d3d11va.h + for ac_header in libavcodec/d3d11va.h do : ac_fn_c_check_header_compile "$LINENO" "libavcodec/d3d11va.h" "ac_cv_header_libavcodec_d3d11va_h" "#undef _WIN32_WINNT /* D3D11 is only available in Vista and above */ #define _WIN32_WINNT 0x600 " -if test "x$ac_cv_header_libavcodec_d3d11va_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVCODEC_D3D11VA_H 1" >>confdefs.h +if test "x$ac_cv_header_libavcodec_d3d11va_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAVCODEC_D3D11VA_H 1 +_ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: D3D11 acceleration activated" >&5 -printf "%s\n" "$as_me: D3D11 acceleration activated" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: D3D11 acceleration activated" >&5 +$as_echo "$as_me: D3D11 acceleration activated" >&6;} -printf "%s\n" "#define HAVE_AVCODEC_D3D11VA 1" >>confdefs.h +$as_echo "#define HAVE_AVCODEC_D3D11VA 1" >>confdefs.h have_avcodec_d3d11va="yes" -else $as_nop +else - if test "${enable_d3d11va}" = "yes" -then : + if test "${enable_d3d11va}" = "yes"; then : as_fn_error $? "d3d11va is present but libavcodec/d3d11va.h is missing" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: d3d11va is present but libavcodec/d3d11va.h is missing " >&5 -printf "%s\n" "$as_me: WARNING: d3d11va is present but libavcodec/d3d11va.h is missing " >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: d3d11va is present but libavcodec/d3d11va.h is missing " >&5 +$as_echo "$as_me: WARNING: d3d11va is present but libavcodec/d3d11va.h is missing " >&2;} fi fi done -else $as_nop - if test "${enable_d3d11va}" = "yes" -then : +else + + if test "${enable_d3d11va}" = "yes"; then : as_fn_error $? "Could not find required dxva2api.h" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: dxva2api.h not found" >&5 -printf "%s\n" "$as_me: WARNING: dxva2api.h not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2api.h not found" >&5 +$as_echo "$as_me: WARNING: dxva2api.h not found" >&2;} fi fi done -else $as_nop - if test "${enable_d3d11va}" = "yes" -then : +else + + if test "${enable_d3d11va}" = "yes"; then : as_fn_error $? "Could not find required ID3D11VideoDecoder in d3d11.h" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ID3D11VideoDecoder not found" >&5 -printf "%s\n" "$as_me: WARNING: ID3D11VideoDecoder not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ID3D11VideoDecoder not found" >&5 +$as_echo "$as_me: WARNING: ID3D11VideoDecoder not found" >&2;} fi fi -else $as_nop +else - if test "x${enable_d3d11va}" != "x" -then : + if test "x${enable_d3d11va}" != "x"; then : as_fn_error $? "--enable-d3d11va and --disable-avcodec options are mutually exclusive." "$LINENO" 5 @@ -42859,54 +41308,46 @@ fi -ac_fn_c_check_header_compile "$LINENO" "dxgidebug.h" "ac_cv_header_dxgidebug_h" "$ac_includes_default" -if test "x$ac_cv_header_dxgidebug_h" = xyes -then : - printf "%s\n" "#define HAVE_DXGIDEBUG_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "dxgi1_6.h" "ac_cv_header_dxgi1_6_h" "$ac_includes_default" -if test "x$ac_cv_header_dxgi1_6_h" = xyes -then : - printf "%s\n" "#define HAVE_DXGI1_6_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "d3d11_4.h" "ac_cv_header_d3d11_4_h" "$ac_includes_default" -if test "x$ac_cv_header_d3d11_4_h" = xyes -then : - printf "%s\n" "#define HAVE_D3D11_4_H 1" >>confdefs.h +for ac_header in dxgidebug.h dxgi1_6.h d3d11_4.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi +done + # Check whether --enable-avformat was given. -if test ${enable_avformat+y} -then : +if test "${enable_avformat+set}" = set; then : enableval=$enable_avformat; -else $as_nop +else enable_avformat="${have_avcodec}" fi have_avformat="no" -if test "${enable_avformat}" != "no" -then : +if test "${enable_avformat}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavformat >= 53.21.0 libavcodec libavutil" >&5 -printf %s "checking for libavformat >= 53.21.0 libavcodec libavutil... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVFORMAT" >&5 +$as_echo_n "checking for AVFORMAT... " >&6; } if test -n "$AVFORMAT_CFLAGS"; then pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 53.21.0 libavcodec libavutil\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 53.21.0 libavcodec libavutil\""; } >&5 ($PKG_CONFIG --exists --print-errors "libavformat >= 53.21.0 libavcodec libavutil") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 53.21.0 libavcodec libavutil" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42920,10 +41361,10 @@ pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 53.21.0 libavcodec libavutil\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 53.21.0 libavcodec libavutil\""; } >&5 ($PKG_CONFIG --exists --print-errors "libavformat >= 53.21.0 libavcodec libavutil") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 53.21.0 libavcodec libavutil" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42937,8 +41378,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42946,27 +41387,27 @@ _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 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS + AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_avformat="yes" @@ -42979,35 +41420,44 @@ CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}" CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}" - ac_fn_c_check_header_compile "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "$ac_includes_default" -if test "x$ac_cv_header_libavformat_avformat_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVFORMAT_AVFORMAT_H 1" >>confdefs.h + for ac_header in libavformat/avformat.h libavformat/avio.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "libavformat/avio.h" "ac_cv_header_libavformat_avio_h" "$ac_includes_default" -if test "x$ac_cv_header_libavformat_avio_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVFORMAT_AVIO_H 1" >>confdefs.h -fi +done - ac_fn_c_check_header_compile "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "$ac_includes_default" -if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVCODEC_AVCODEC_H 1" >>confdefs.h + for ac_header in libavcodec/avcodec.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "$ac_includes_default" +if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAVCODEC_AVCODEC_H 1 +_ACEOF fi - ac_fn_c_check_header_compile "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "$ac_includes_default" -if test "x$ac_cv_header_libavutil_avutil_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVUTIL_AVUTIL_H 1" >>confdefs.h +done + + for ac_header in libavutil/avutil.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "$ac_includes_default" +if test "x$ac_cv_header_libavutil_avutil_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAVUTIL_AVUTIL_H 1 +_ACEOF fi - if test "$enable_merge_ffmpeg" = "no" -then : +done + + if test "$enable_merge_ffmpeg" = "no"; then : have_avformat="no" @@ -43035,8 +41485,7 @@ # Check whether --enable-swscale was given. -if test ${enable_swscale+y} -then : +if test "${enable_swscale+set}" = set; then : enableval=$enable_swscale; fi @@ -43044,17 +41493,17 @@ then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libswscale" >&5 -printf %s "checking for libswscale... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWSCALE" >&5 +$as_echo_n "checking for SWSCALE... " >&6; } if test -n "$SWSCALE_CFLAGS"; then pkg_cv_SWSCALE_CFLAGS="$SWSCALE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5 ($PKG_CONFIG --exists --print-errors "libswscale") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SWSCALE_CFLAGS=`$PKG_CONFIG --cflags "libswscale" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43068,10 +41517,10 @@ pkg_cv_SWSCALE_LIBS="$SWSCALE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5 ($PKG_CONFIG --exists --print-errors "libswscale") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SWSCALE_LIBS=`$PKG_CONFIG --libs "libswscale" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43085,8 +41534,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43094,27 +41543,27 @@ _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 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + SWSCALE_CFLAGS=$pkg_cv_SWSCALE_CFLAGS + SWSCALE_LIBS=$pkg_cv_SWSCALE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } CPPFLAGS_save="${CPPFLAGS}" @@ -43126,20 +41575,30 @@ CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}" CFLAGS="${CFLAGS} ${SWSCALE_CFLAGS}" - ac_fn_c_check_header_compile "$LINENO" "libswscale/swscale.h" "ac_cv_header_libswscale_swscale_h" "$ac_includes_default" -if test "x$ac_cv_header_libswscale_swscale_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBSWSCALE_SWSCALE_H 1" >>confdefs.h + for ac_header in libswscale/swscale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libswscale/swscale.h" "ac_cv_header_libswscale_swscale_h" "$ac_includes_default" +if test "x$ac_cv_header_libswscale_swscale_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSWSCALE_SWSCALE_H 1 +_ACEOF fi - ac_fn_c_check_header_compile "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "$ac_includes_default" -if test "x$ac_cv_header_libavutil_avutil_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBAVUTIL_AVUTIL_H 1" >>confdefs.h +done + + for ac_header in libavutil/avutil.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "$ac_includes_default" +if test "x$ac_cv_header_libavutil_avutil_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBAVUTIL_AVUTIL_H 1 +_ACEOF fi +done + LTLIBswscale=libswscale_plugin.la @@ -43158,8 +41617,7 @@ - if test -n "${ac_cv_ld_bsymbolic}" -then : + if test -n "${ac_cv_ld_bsymbolic}"; then : @@ -43183,8 +41641,7 @@ # Check whether --enable-postproc was given. -if test ${enable_postproc+y} -then : +if test "${enable_postproc+set}" = set; then : enableval=$enable_postproc; fi @@ -43192,17 +41649,17 @@ then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpostproc libavutil" >&5 -printf %s "checking for libpostproc libavutil... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSTPROC" >&5 +$as_echo_n "checking for POSTPROC... " >&6; } if test -n "$POSTPROC_CFLAGS"; then pkg_cv_POSTPROC_CFLAGS="$POSTPROC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpostproc libavutil\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpostproc libavutil\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpostproc libavutil") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POSTPROC_CFLAGS=`$PKG_CONFIG --cflags "libpostproc libavutil" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43216,10 +41673,10 @@ pkg_cv_POSTPROC_LIBS="$POSTPROC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpostproc libavutil\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpostproc libavutil\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpostproc libavutil") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POSTPROC_LIBS=`$PKG_CONFIG --libs "libpostproc libavutil" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43233,8 +41690,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43242,29 +41699,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${POSTPROC_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${POSTPROC_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${POSTPROC_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${POSTPROC_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${POSTPROC_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${POSTPROC_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${POSTPROC_PKG_ERRORS}." >&2;} else - 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; } + POSTPROC_CFLAGS=$pkg_cv_POSTPROC_CFLAGS + POSTPROC_LIBS=$pkg_cv_POSTPROC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } CPPFLAGS_save="${CPPFLAGS}" @@ -43276,13 +41733,18 @@ CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" - ac_fn_c_check_header_compile "$LINENO" "postproc/postprocess.h" "ac_cv_header_postproc_postprocess_h" "$ac_includes_default" -if test "x$ac_cv_header_postproc_postprocess_h" = xyes -then : - printf "%s\n" "#define HAVE_POSTPROC_POSTPROCESS_H 1" >>confdefs.h + for ac_header in postproc/postprocess.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "postproc/postprocess.h" "ac_cv_header_postproc_postprocess_h" "$ac_includes_default" +if test "x$ac_cv_header_postproc_postprocess_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_POSTPROC_POSTPROCESS_H 1 +_ACEOF fi +done + LTLIBpostproc=libpostproc_plugin.la @@ -43302,28 +41764,26 @@ fi # Check whether --enable-faad was given. -if test ${enable_faad+y} -then : +if test "${enable_faad+set}" = set; then : enableval=$enable_faad; fi have_faad="no" -if test "${enable_faad}" != "no" -then : +if test "${enable_faad}" != "no"; then : - for ac_header in neaacdec.h + for ac_header in neaacdec.h do : - ac_fn_c_check_header_compile "$LINENO" "neaacdec.h" "ac_cv_header_neaacdec_h" "$ac_includes_default" -if test "x$ac_cv_header_neaacdec_h" = xyes -then : - printf "%s\n" "#define HAVE_NEAACDEC_H 1" >>confdefs.h - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NeAACDecOpen in -lfaad" >&5 -printf %s "checking for NeAACDecOpen in -lfaad... " >&6; } -if test ${ac_cv_lib_faad_NeAACDecOpen+y} -then : - printf %s "(cached) " >&6 -else $as_nop + ac_fn_c_check_header_mongrel "$LINENO" "neaacdec.h" "ac_cv_header_neaacdec_h" "$ac_includes_default" +if test "x$ac_cv_header_neaacdec_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NEAACDEC_H 1 +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NeAACDecOpen in -lfaad" >&5 +$as_echo_n "checking for NeAACDecOpen in -lfaad... " >&6; } +if ${ac_cv_lib_faad_NeAACDecOpen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lfaad $LIBM $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43332,35 +41792,35 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char NeAACDecOpen (); int -main (void) +main () { return NeAACDecOpen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_faad_NeAACDecOpen=yes -else $as_nop +else ac_cv_lib_faad_NeAACDecOpen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_faad_NeAACDecOpen" >&5 -printf "%s\n" "$ac_cv_lib_faad_NeAACDecOpen" >&6; } -if test "x$ac_cv_lib_faad_NeAACDecOpen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_faad_NeAACDecOpen" >&5 +$as_echo "$ac_cv_lib_faad_NeAACDecOpen" >&6; } +if test "x$ac_cv_lib_faad_NeAACDecOpen" = xyes; then : have_faad="yes" fi - if test "${have_faad}" = "yes" -then : + if test "${have_faad}" = "yes"; then : @@ -43375,17 +41835,16 @@ -else $as_nop +else - if test "${enable_faad}" = "yes" -then : + if test "${enable_faad}" = "yes"; then : as_fn_error $? "cannot find FAAD library" "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find FAAD library" >&5 -printf "%s\n" "$as_me: WARNING: cannot find FAAD library" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find FAAD library" >&5 +$as_echo "$as_me: WARNING: cannot find FAAD library" >&2;} fi @@ -43395,6 +41854,7 @@ done + fi @@ -43414,10 +41874,9 @@ # Check whether --enable-aom was given. -if test ${enable_aom+y} -then : +if test "${enable_aom+set}" = set; then : enableval=$enable_aom; -else $as_nop +else enable_aom=auto fi @@ -43426,17 +41885,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aom" >&5 -printf %s "checking for aom... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AOM" >&5 +$as_echo_n "checking for AOM... " >&6; } if test -n "$AOM_CFLAGS"; then pkg_cv_AOM_CFLAGS="$AOM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aom\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aom\""; } >&5 ($PKG_CONFIG --exists --print-errors "aom") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AOM_CFLAGS=`$PKG_CONFIG --cflags "aom" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43450,10 +41909,10 @@ pkg_cv_AOM_LIBS="$AOM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aom\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aom\""; } >&5 ($PKG_CONFIG --exists --print-errors "aom") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AOM_LIBS=`$PKG_CONFIG --libs "aom" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43467,8 +41926,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43476,38 +41935,36 @@ _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" -then : + if test x"$enable_aom" = "xyes"; then : as_fn_error $? "Library aom needed for aom was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aom needed for aom was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aom needed for aom was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aom needed for aom was not found" >&5 +$as_echo "$as_me: WARNING: Library aom needed for aom was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_aom" = "xyes"; then : as_fn_error $? "Library aom needed for aom was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aom needed for aom was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aom needed for aom was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aom needed for aom was not found" >&5 +$as_echo "$as_me: WARNING: Library aom needed for aom was not found" >&2;} fi else - 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 + AOM_CFLAGS=$pkg_cv_AOM_CFLAGS + AOM_LIBS=$pkg_cv_AOM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBaom=libaom_plugin.la @@ -43528,17 +41985,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aom" >&5 -printf %s "checking for aom... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AOM" >&5 +$as_echo_n "checking for AOM... " >&6; } if test -n "$AOM_CFLAGS"; then pkg_cv_AOM_CFLAGS="$AOM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aom\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aom\""; } >&5 ($PKG_CONFIG --exists --print-errors "aom") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AOM_CFLAGS=`$PKG_CONFIG --cflags "aom" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43552,10 +42009,10 @@ pkg_cv_AOM_LIBS="$AOM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aom\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aom\""; } >&5 ($PKG_CONFIG --exists --print-errors "aom") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AOM_LIBS=`$PKG_CONFIG --libs "aom" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43569,8 +42026,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43578,40 +42035,38 @@ _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 - if test x"$enable_aom" = "xyes" -then : + enable_aom=no + if test x"$enable_aom" = "xyes"; then : as_fn_error $? "Library aom needed for aom was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aom needed for aom was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aom needed for aom was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aom needed for aom was not found" >&5 +$as_echo "$as_me: WARNING: Library aom needed for aom was not found" >&2;} fi 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 - if test x"$enable_aom" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_aom=no + if test x"$enable_aom" = "xyes"; then : as_fn_error $? "Library aom needed for aom was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aom needed for aom was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aom needed for aom was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aom needed for aom was not found" >&5 +$as_echo "$as_me: WARNING: Library aom needed for aom was not found" >&2;} fi else - 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 + AOM_CFLAGS=$pkg_cv_AOM_CFLAGS + AOM_LIBS=$pkg_cv_AOM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_aom=yes LTLIBaom=libaom_plugin.la @@ -43664,10 +42119,9 @@ # Check whether --enable-dav1d was given. -if test ${enable_dav1d+y} -then : +if test "${enable_dav1d+set}" = set; then : enableval=$enable_dav1d; -else $as_nop +else enable_dav1d=auto fi @@ -43676,17 +42130,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dav1d" >&5 -printf %s "checking for dav1d... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAV1D" >&5 +$as_echo_n "checking for DAV1D... " >&6; } if test -n "$DAV1D_CFLAGS"; then pkg_cv_DAV1D_CFLAGS="$DAV1D_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dav1d\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dav1d\""; } >&5 ($PKG_CONFIG --exists --print-errors "dav1d") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DAV1D_CFLAGS=`$PKG_CONFIG --cflags "dav1d" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43700,10 +42154,10 @@ pkg_cv_DAV1D_LIBS="$DAV1D_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dav1d\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dav1d\""; } >&5 ($PKG_CONFIG --exists --print-errors "dav1d") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DAV1D_LIBS=`$PKG_CONFIG --libs "dav1d" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43717,8 +42171,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43726,38 +42180,36 @@ _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" -then : + if test x"$enable_dav1d" = "xyes"; then : as_fn_error $? "Library dav1d needed for dav1d was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dav1d needed for dav1d was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dav1d needed for dav1d was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dav1d needed for dav1d was not found" >&5 +$as_echo "$as_me: WARNING: Library dav1d needed for dav1d was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_dav1d" = "xyes"; then : as_fn_error $? "Library dav1d needed for dav1d was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dav1d needed for dav1d was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dav1d needed for dav1d was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dav1d needed for dav1d was not found" >&5 +$as_echo "$as_me: WARNING: Library dav1d needed for dav1d was not found" >&2;} fi else - 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 + DAV1D_CFLAGS=$pkg_cv_DAV1D_CFLAGS + DAV1D_LIBS=$pkg_cv_DAV1D_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBdav1d=libdav1d_plugin.la @@ -43778,17 +42230,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dav1d" >&5 -printf %s "checking for dav1d... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAV1D" >&5 +$as_echo_n "checking for DAV1D... " >&6; } if test -n "$DAV1D_CFLAGS"; then pkg_cv_DAV1D_CFLAGS="$DAV1D_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dav1d\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dav1d\""; } >&5 ($PKG_CONFIG --exists --print-errors "dav1d") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DAV1D_CFLAGS=`$PKG_CONFIG --cflags "dav1d" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43802,10 +42254,10 @@ pkg_cv_DAV1D_LIBS="$DAV1D_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dav1d\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dav1d\""; } >&5 ($PKG_CONFIG --exists --print-errors "dav1d") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DAV1D_LIBS=`$PKG_CONFIG --libs "dav1d" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43819,8 +42271,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43828,40 +42280,38 @@ _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 - if test x"$enable_dav1d" = "xyes" -then : + enable_dav1d=no + if test x"$enable_dav1d" = "xyes"; then : as_fn_error $? "Library dav1d needed for dav1d was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dav1d needed for dav1d was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dav1d needed for dav1d was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dav1d needed for dav1d was not found" >&5 +$as_echo "$as_me: WARNING: Library dav1d needed for dav1d was not found" >&2;} fi 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 - if test x"$enable_dav1d" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_dav1d=no + if test x"$enable_dav1d" = "xyes"; then : as_fn_error $? "Library dav1d needed for dav1d was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library dav1d needed for dav1d was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library dav1d needed for dav1d was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library dav1d needed for dav1d was not found" >&5 +$as_echo "$as_me: WARNING: Library dav1d needed for dav1d was not found" >&2;} fi else - 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 + DAV1D_CFLAGS=$pkg_cv_DAV1D_CFLAGS + DAV1D_LIBS=$pkg_cv_DAV1D_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_dav1d=yes LTLIBdav1d=libdav1d_plugin.la @@ -43898,27 +42348,25 @@ # Check whether --enable-vpx was given. -if test ${enable_vpx+y} -then : +if test "${enable_vpx+set}" = set; then : enableval=$enable_vpx; fi -if test "${enable_vpx}" != "no" -then : +if test "${enable_vpx}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vpx >= 1.5.0" >&5 -printf %s "checking for vpx >= 1.5.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VPX" >&5 +$as_echo_n "checking for VPX... " >&6; } if test -n "$VPX_CFLAGS"; then pkg_cv_VPX_CFLAGS="$VPX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vpx >= 1.5.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vpx >= 1.5.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "vpx >= 1.5.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VPX_CFLAGS=`$PKG_CONFIG --cflags "vpx >= 1.5.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43932,10 +42380,10 @@ pkg_cv_VPX_LIBS="$VPX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vpx >= 1.5.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vpx >= 1.5.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "vpx >= 1.5.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VPX_LIBS=`$PKG_CONFIG --libs "vpx >= 1.5.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -43949,8 +42397,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -43958,35 +42406,33 @@ _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" -then : + if test "${enable_vpx}" = "yes"; then : as_fn_error $? "libvpx 1.5.0 or higher was not found" "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "${enable_vpx}" = "yes" -then : + if test "${enable_vpx}" = "yes"; then : as_fn_error $? "libvpx 1.5.0 or higher was not found" "$LINENO" 5 fi else - 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; } + VPX_CFLAGS=$pkg_cv_VPX_CFLAGS + VPX_LIBS=$pkg_cv_VPX_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -44006,12 +42452,11 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_vp8_dx in -lvpx" >&5 -printf %s "checking for vpx_codec_vp8_dx in -lvpx... " >&6; } -if test ${ac_cv_lib_vpx_vpx_codec_vp8_dx+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_vp8_dx in -lvpx" >&5 +$as_echo_n "checking for vpx_codec_vp8_dx in -lvpx... " >&6; } +if ${ac_cv_lib_vpx_vpx_codec_vp8_dx+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lvpx ${VPX_LIBS} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44020,29 +42465,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char vpx_codec_vp8_dx (); int -main (void) +main () { return vpx_codec_vp8_dx (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_vpx_vpx_codec_vp8_dx=yes -else $as_nop +else ac_cv_lib_vpx_vpx_codec_vp8_dx=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_vp8_dx" >&5 -printf "%s\n" "$ac_cv_lib_vpx_vpx_codec_vp8_dx" >&6; } -if test "x$ac_cv_lib_vpx_vpx_codec_vp8_dx" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_vp8_dx" >&5 +$as_echo "$ac_cv_lib_vpx_vpx_codec_vp8_dx" >&6; } +if test "x$ac_cv_lib_vpx_vpx_codec_vp8_dx" = xyes; then : @@ -44053,12 +42499,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_vp9_dx in -lvpx" >&5 -printf %s "checking for vpx_codec_vp9_dx in -lvpx... " >&6; } -if test ${ac_cv_lib_vpx_vpx_codec_vp9_dx+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_vp9_dx in -lvpx" >&5 +$as_echo_n "checking for vpx_codec_vp9_dx in -lvpx... " >&6; } +if ${ac_cv_lib_vpx_vpx_codec_vp9_dx+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lvpx ${VPX_LIBS} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44067,29 +42512,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char vpx_codec_vp9_dx (); int -main (void) +main () { return vpx_codec_vp9_dx (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_vpx_vpx_codec_vp9_dx=yes -else $as_nop +else ac_cv_lib_vpx_vpx_codec_vp9_dx=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_vp9_dx" >&5 -printf "%s\n" "$ac_cv_lib_vpx_vpx_codec_vp9_dx" >&6; } -if test "x$ac_cv_lib_vpx_vpx_codec_vp9_dx" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_vp9_dx" >&5 +$as_echo "$ac_cv_lib_vpx_vpx_codec_vp9_dx" >&6; } +if test "x$ac_cv_lib_vpx_vpx_codec_vp9_dx" = xyes; then : @@ -44100,12 +42546,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_vp8_cx in -lvpx" >&5 -printf %s "checking for vpx_codec_vp8_cx in -lvpx... " >&6; } -if test ${ac_cv_lib_vpx_vpx_codec_vp8_cx+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_vp8_cx in -lvpx" >&5 +$as_echo_n "checking for vpx_codec_vp8_cx in -lvpx... " >&6; } +if ${ac_cv_lib_vpx_vpx_codec_vp8_cx+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lvpx ${VPX_LIBS} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44114,29 +42559,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char vpx_codec_vp8_cx (); int -main (void) +main () { return vpx_codec_vp8_cx (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_vpx_vpx_codec_vp8_cx=yes -else $as_nop +else ac_cv_lib_vpx_vpx_codec_vp8_cx=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_vp8_cx" >&5 -printf "%s\n" "$ac_cv_lib_vpx_vpx_codec_vp8_cx" >&6; } -if test "x$ac_cv_lib_vpx_vpx_codec_vp8_cx" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_vp8_cx" >&5 +$as_echo "$ac_cv_lib_vpx_vpx_codec_vp8_cx" >&6; } +if test "x$ac_cv_lib_vpx_vpx_codec_vp8_cx" = xyes; then : @@ -44147,12 +42593,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_vp9_cx in -lvpx" >&5 -printf %s "checking for vpx_codec_vp9_cx in -lvpx... " >&6; } -if test ${ac_cv_lib_vpx_vpx_codec_vp9_cx+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_vp9_cx in -lvpx" >&5 +$as_echo_n "checking for vpx_codec_vp9_cx in -lvpx... " >&6; } +if ${ac_cv_lib_vpx_vpx_codec_vp9_cx+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lvpx ${VPX_LIBS} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44161,29 +42606,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char vpx_codec_vp9_cx (); int -main (void) +main () { return vpx_codec_vp9_cx (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_vpx_vpx_codec_vp9_cx=yes -else $as_nop +else ac_cv_lib_vpx_vpx_codec_vp9_cx=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_vp9_cx" >&5 -printf "%s\n" "$ac_cv_lib_vpx_vpx_codec_vp9_cx" >&6; } -if test "x$ac_cv_lib_vpx_vpx_codec_vp9_cx" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_vp9_cx" >&5 +$as_echo "$ac_cv_lib_vpx_vpx_codec_vp9_cx" >&6; } +if test "x$ac_cv_lib_vpx_vpx_codec_vp9_cx" = xyes; then : @@ -44216,10 +42662,9 @@ # Check whether --enable-twolame was given. -if test ${enable_twolame+y} -then : +if test "${enable_twolame+set}" = set; then : enableval=$enable_twolame; -else $as_nop +else enable_twolame=auto fi @@ -44228,17 +42673,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for twolame" >&5 -printf %s "checking for twolame... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TWOLAME" >&5 +$as_echo_n "checking for TWOLAME... " >&6; } if test -n "$TWOLAME_CFLAGS"; then pkg_cv_TWOLAME_CFLAGS="$TWOLAME_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5 ($PKG_CONFIG --exists --print-errors "twolame") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TWOLAME_CFLAGS=`$PKG_CONFIG --cflags "twolame" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44252,10 +42697,10 @@ pkg_cv_TWOLAME_LIBS="$TWOLAME_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5 ($PKG_CONFIG --exists --print-errors "twolame") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TWOLAME_LIBS=`$PKG_CONFIG --libs "twolame" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44269,8 +42714,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44278,38 +42723,36 @@ _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" -then : + if test x"$enable_twolame" = "xyes"; then : as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5 +$as_echo "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_twolame" = "xyes"; then : as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5 +$as_echo "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;} fi else - 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 + TWOLAME_CFLAGS=$pkg_cv_TWOLAME_CFLAGS + TWOLAME_LIBS=$pkg_cv_TWOLAME_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBtwolame=libtwolame_plugin.la @@ -44335,17 +42778,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for twolame" >&5 -printf %s "checking for twolame... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TWOLAME" >&5 +$as_echo_n "checking for TWOLAME... " >&6; } if test -n "$TWOLAME_CFLAGS"; then pkg_cv_TWOLAME_CFLAGS="$TWOLAME_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5 ($PKG_CONFIG --exists --print-errors "twolame") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TWOLAME_CFLAGS=`$PKG_CONFIG --cflags "twolame" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44359,10 +42802,10 @@ pkg_cv_TWOLAME_LIBS="$TWOLAME_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame\""; } >&5 ($PKG_CONFIG --exists --print-errors "twolame") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TWOLAME_LIBS=`$PKG_CONFIG --libs "twolame" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44376,8 +42819,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44385,40 +42828,38 @@ _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 - if test x"$enable_twolame" = "xyes" -then : + enable_twolame=no + if test x"$enable_twolame" = "xyes"; then : as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5 +$as_echo "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;} fi 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 - if test x"$enable_twolame" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_twolame=no + if test x"$enable_twolame" = "xyes"; then : as_fn_error $? "Library twolame needed for twolame was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library twolame needed for twolame was not found" >&5 +$as_echo "$as_me: WARNING: Library twolame needed for twolame was not found" >&2;} fi else - 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 + TWOLAME_CFLAGS=$pkg_cv_TWOLAME_CFLAGS + TWOLAME_LIBS=$pkg_cv_TWOLAME_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_twolame=yes LTLIBtwolame=libtwolame_plugin.la @@ -44476,10 +42917,9 @@ # Check whether --enable-fdkaac was given. -if test ${enable_fdkaac+y} -then : +if test "${enable_fdkaac+set}" = set; then : enableval=$enable_fdkaac; -else $as_nop +else enable_fdkaac=disabled fi @@ -44488,17 +42928,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fdk-aac" >&5 -printf %s "checking for fdk-aac... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FDKAAC" >&5 +$as_echo_n "checking for FDKAAC... " >&6; } if test -n "$FDKAAC_CFLAGS"; then pkg_cv_FDKAAC_CFLAGS="$FDKAAC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fdk-aac\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fdk-aac\""; } >&5 ($PKG_CONFIG --exists --print-errors "fdk-aac") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FDKAAC_CFLAGS=`$PKG_CONFIG --cflags "fdk-aac" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44512,10 +42952,10 @@ pkg_cv_FDKAAC_LIBS="$FDKAAC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fdk-aac\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fdk-aac\""; } >&5 ($PKG_CONFIG --exists --print-errors "fdk-aac") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FDKAAC_LIBS=`$PKG_CONFIG --libs "fdk-aac" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44529,8 +42969,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44538,38 +42978,36 @@ _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" -then : + if test x"$enable_fdkaac" = "xyes"; then : as_fn_error $? "Library fdk-aac needed for fdkaac was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fdk-aac needed for fdkaac was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fdk-aac needed for fdkaac was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fdk-aac needed for fdkaac was not found" >&5 +$as_echo "$as_me: WARNING: Library fdk-aac needed for fdkaac was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_fdkaac" = "xyes"; then : as_fn_error $? "Library fdk-aac needed for fdkaac was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fdk-aac needed for fdkaac was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fdk-aac needed for fdkaac was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fdk-aac needed for fdkaac was not found" >&5 +$as_echo "$as_me: WARNING: Library fdk-aac needed for fdkaac was not found" >&2;} fi else - 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 + FDKAAC_CFLAGS=$pkg_cv_FDKAAC_CFLAGS + FDKAAC_LIBS=$pkg_cv_FDKAAC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBfdkaac=libfdkaac_plugin.la @@ -44590,17 +43028,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fdk-aac" >&5 -printf %s "checking for fdk-aac... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FDKAAC" >&5 +$as_echo_n "checking for FDKAAC... " >&6; } if test -n "$FDKAAC_CFLAGS"; then pkg_cv_FDKAAC_CFLAGS="$FDKAAC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fdk-aac\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fdk-aac\""; } >&5 ($PKG_CONFIG --exists --print-errors "fdk-aac") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FDKAAC_CFLAGS=`$PKG_CONFIG --cflags "fdk-aac" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44614,10 +43052,10 @@ pkg_cv_FDKAAC_LIBS="$FDKAAC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fdk-aac\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fdk-aac\""; } >&5 ($PKG_CONFIG --exists --print-errors "fdk-aac") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FDKAAC_LIBS=`$PKG_CONFIG --libs "fdk-aac" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44631,8 +43069,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44640,40 +43078,38 @@ _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 - if test x"$enable_fdkaac" = "xyes" -then : + enable_fdkaac=no + if test x"$enable_fdkaac" = "xyes"; then : as_fn_error $? "Library fdk-aac needed for fdkaac was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fdk-aac needed for fdkaac was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fdk-aac needed for fdkaac was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fdk-aac needed for fdkaac was not found" >&5 +$as_echo "$as_me: WARNING: Library fdk-aac needed for fdkaac was not found" >&2;} fi 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 - if test x"$enable_fdkaac" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_fdkaac=no + if test x"$enable_fdkaac" = "xyes"; then : as_fn_error $? "Library fdk-aac needed for fdkaac was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fdk-aac needed for fdkaac was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fdk-aac needed for fdkaac was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fdk-aac needed for fdkaac was not found" >&5 +$as_echo "$as_me: WARNING: Library fdk-aac needed for fdkaac was not found" >&2;} fi else - 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 + FDKAAC_CFLAGS=$pkg_cv_FDKAAC_CFLAGS + FDKAAC_LIBS=$pkg_cv_FDKAAC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_fdkaac=yes LTLIBfdkaac=libfdkaac_plugin.la @@ -44711,17 +43147,15 @@ # Check whether --enable-a52 was given. -if test ${enable_a52+y} -then : +if test "${enable_a52+set}" = set; then : enableval=$enable_a52; fi -if test "${enable_a52}" != "no" +if test "${enable_a52}" = "yes" then # Check whether --with-a52 was given. -if test ${with_a52+y} -then : +if test "${with_a52+set}" = set; then : withval=$with_a52; fi @@ -44743,19 +43177,19 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_test} ${CPPFLAGS_a52}" LDFLAGS="${LDFLAGS} ${LDFLAGS_test} ${LIBS_a52}" - for ac_header in a52dec/a52.h + for ac_header in a52dec/a52.h do : - ac_fn_c_check_header_compile "$LINENO" "a52dec/a52.h" "ac_cv_header_a52dec_a52_h" "$ac_includes_default" -if test "x$ac_cv_header_a52dec_a52_h" = xyes -then : - printf "%s\n" "#define HAVE_A52DEC_A52_H 1" >>confdefs.h - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a52_free in -la52" >&5 -printf %s "checking for a52_free in -la52... " >&6; } -if test ${ac_cv_lib_a52_a52_free+y} -then : - printf %s "(cached) " >&6 -else $as_nop + ac_fn_c_check_header_mongrel "$LINENO" "a52dec/a52.h" "ac_cv_header_a52dec_a52_h" "$ac_includes_default" +if test "x$ac_cv_header_a52dec_a52_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_A52DEC_A52_H 1 +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a52_free in -la52" >&5 +$as_echo_n "checking for a52_free in -la52... " >&6; } +if ${ac_cv_lib_a52_a52_free+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-la52 $LIBM $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44764,29 +43198,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char a52_free (); int -main (void) +main () { return a52_free (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_a52_a52_free=yes -else $as_nop +else ac_cv_lib_a52_a52_free=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_a52_a52_free" >&5 -printf "%s\n" "$ac_cv_lib_a52_a52_free" >&6; } -if test "x$ac_cv_lib_a52_a52_free" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_a52_a52_free" >&5 +$as_echo "$ac_cv_lib_a52_a52_free" >&6; } +if test "x$ac_cv_lib_a52_a52_free" = xyes; then : @@ -44807,14 +43242,14 @@ -else $as_nop +else as_fn_error $? "Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin." "$LINENO" 5 fi -else $as_nop +else as_fn_error $? "Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin." "$LINENO" 5 @@ -44822,6 +43257,7 @@ done + CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" CXXFLAGS="${CXXFLAGS_save}" @@ -44848,11 +43284,10 @@ # Check whether --enable-dca was given. -if test ${enable_dca+y} -then : +if test "${enable_dca+set}" = set; then : enableval=$enable_dca; -else $as_nop - enable_dca=auto +else + enable_dca=disabled fi @@ -44860,17 +43295,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdca >= 0.0.5" >&5 -printf %s "checking for libdca >= 0.0.5... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DCA" >&5 +$as_echo_n "checking for DCA... " >&6; } if test -n "$DCA_CFLAGS"; then pkg_cv_DCA_CFLAGS="$DCA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdca >= 0.0.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DCA_CFLAGS=`$PKG_CONFIG --cflags "libdca >= 0.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44884,10 +43319,10 @@ pkg_cv_DCA_LIBS="$DCA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdca >= 0.0.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DCA_LIBS=`$PKG_CONFIG --libs "libdca >= 0.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44901,8 +43336,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -44910,38 +43345,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5 +$as_echo "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5 +$as_echo "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;} fi else - 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 + DCA_CFLAGS=$pkg_cv_DCA_CFLAGS + DCA_LIBS=$pkg_cv_DCA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBdca=libdca_plugin.la @@ -44962,17 +43395,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdca >= 0.0.5" >&5 -printf %s "checking for libdca >= 0.0.5... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DCA" >&5 +$as_echo_n "checking for DCA... " >&6; } if test -n "$DCA_CFLAGS"; then pkg_cv_DCA_CFLAGS="$DCA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdca >= 0.0.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DCA_CFLAGS=`$PKG_CONFIG --cflags "libdca >= 0.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -44986,10 +43419,10 @@ pkg_cv_DCA_LIBS="$DCA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdca >= 0.0.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libdca >= 0.0.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DCA_LIBS=`$PKG_CONFIG --libs "libdca >= 0.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45003,8 +43436,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45012,40 +43445,38 @@ _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 - if test x"$enable_dca" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5 +$as_echo "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;} fi 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 - if test x"$enable_dca" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&5 +$as_echo "$as_me: WARNING: Library libdca >= 0.0.5 needed for dca was not found" >&2;} fi else - 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 + DCA_CFLAGS=$pkg_cv_DCA_CFLAGS + DCA_LIBS=$pkg_cv_DCA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_dca=yes LTLIBdca=libdca_plugin.la @@ -45098,10 +43529,9 @@ # Check whether --enable-flac was given. -if test ${enable_flac+y} -then : +if test "${enable_flac+set}" = set; then : enableval=$enable_flac; -else $as_nop +else enable_flac=auto fi @@ -45110,17 +43540,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flac" >&5 -printf %s "checking for flac... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5 +$as_echo_n "checking for FLAC... " >&6; } if test -n "$FLAC_CFLAGS"; then pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5 ($PKG_CONFIG --exists --print-errors "flac") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLAC_CFLAGS=`$PKG_CONFIG --cflags "flac" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45134,10 +43564,10 @@ pkg_cv_FLAC_LIBS="$FLAC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5 ($PKG_CONFIG --exists --print-errors "flac") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLAC_LIBS=`$PKG_CONFIG --libs "flac" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45151,8 +43581,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45160,38 +43590,36 @@ _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" -then : + if test x"$enable_flac" = "xyes"; then : as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library flac needed for flac was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5 +$as_echo "$as_me: WARNING: Library flac needed for flac was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_flac" = "xyes"; then : as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library flac needed for flac was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5 +$as_echo "$as_me: WARNING: Library flac needed for flac was not found" >&2;} fi else - 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 + FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS + FLAC_LIBS=$pkg_cv_FLAC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBflac=libflac_plugin.la @@ -45212,17 +43640,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flac" >&5 -printf %s "checking for flac... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5 +$as_echo_n "checking for FLAC... " >&6; } if test -n "$FLAC_CFLAGS"; then pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5 ($PKG_CONFIG --exists --print-errors "flac") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLAC_CFLAGS=`$PKG_CONFIG --cflags "flac" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45236,10 +43664,10 @@ pkg_cv_FLAC_LIBS="$FLAC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac\""; } >&5 ($PKG_CONFIG --exists --print-errors "flac") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLAC_LIBS=`$PKG_CONFIG --libs "flac" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45253,8 +43681,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45262,40 +43690,38 @@ _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 - if test x"$enable_flac" = "xyes" -then : + enable_flac=no + if test x"$enable_flac" = "xyes"; then : as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library flac needed for flac was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5 +$as_echo "$as_me: WARNING: Library flac needed for flac was not found" >&2;} fi 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 - if test x"$enable_flac" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_flac=no + if test x"$enable_flac" = "xyes"; then : as_fn_error $? "Library flac needed for flac was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library flac needed for flac was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library flac needed for flac was not found" >&5 +$as_echo "$as_me: WARNING: Library flac needed for flac was not found" >&2;} fi else - 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 + FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS + FLAC_LIBS=$pkg_cv_FLAC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_flac=yes LTLIBflac=libflac_plugin.la @@ -45348,11 +43774,10 @@ # Check whether --enable-libmpeg2 was given. -if test ${enable_libmpeg2+y} -then : +if test "${enable_libmpeg2+set}" = set; then : enableval=$enable_libmpeg2; -else $as_nop - enable_libmpeg2=auto +else + enable_libmpeg2=disabled fi @@ -45360,17 +43785,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmpeg2 > 0.3.2" >&5 -printf %s "checking for libmpeg2 > 0.3.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMPEG2" >&5 +$as_echo_n "checking for LIBMPEG2... " >&6; } if test -n "$LIBMPEG2_CFLAGS"; then pkg_cv_LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmpeg2 > 0.3.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBMPEG2_CFLAGS=`$PKG_CONFIG --cflags "libmpeg2 > 0.3.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45384,10 +43809,10 @@ pkg_cv_LIBMPEG2_LIBS="$LIBMPEG2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmpeg2 > 0.3.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBMPEG2_LIBS=`$PKG_CONFIG --libs "libmpeg2 > 0.3.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45401,8 +43826,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45410,38 +43835,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;} fi else - 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 + LIBMPEG2_CFLAGS=$pkg_cv_LIBMPEG2_CFLAGS + LIBMPEG2_LIBS=$pkg_cv_LIBMPEG2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBlibmpeg2=liblibmpeg2_plugin.la @@ -45462,17 +43885,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmpeg2 > 0.3.2" >&5 -printf %s "checking for libmpeg2 > 0.3.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMPEG2" >&5 +$as_echo_n "checking for LIBMPEG2... " >&6; } if test -n "$LIBMPEG2_CFLAGS"; then pkg_cv_LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmpeg2 > 0.3.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBMPEG2_CFLAGS=`$PKG_CONFIG --cflags "libmpeg2 > 0.3.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45486,10 +43909,10 @@ pkg_cv_LIBMPEG2_LIBS="$LIBMPEG2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpeg2 > 0.3.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmpeg2 > 0.3.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBMPEG2_LIBS=`$PKG_CONFIG --libs "libmpeg2 > 0.3.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45503,8 +43926,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45512,40 +43935,38 @@ _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 - if test x"$enable_libmpeg2" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;} fi 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 - if test x"$enable_libmpeg2" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libmpeg2 > 0.3.2 needed for libmpeg2 was not found" >&2;} fi else - 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 + LIBMPEG2_CFLAGS=$pkg_cv_LIBMPEG2_CFLAGS + LIBMPEG2_LIBS=$pkg_cv_LIBMPEG2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_libmpeg2=yes LTLIBlibmpeg2=liblibmpeg2_plugin.la @@ -45598,10 +44019,9 @@ # Check whether --enable-vorbis was given. -if test ${enable_vorbis+y} -then : +if test "${enable_vorbis+set}" = set; then : enableval=$enable_vorbis; -else $as_nop +else enable_vorbis=auto fi @@ -45610,17 +44030,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg vorbis >= 1.1 vorbisenc >= 1.1" >&5 -printf %s "checking for ogg vorbis >= 1.1 vorbisenc >= 1.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5 +$as_echo_n "checking for VORBIS... " >&6; } if test -n "$VORBIS_CFLAGS"; then pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45634,10 +44054,10 @@ pkg_cv_VORBIS_LIBS="$VORBIS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45651,8 +44071,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45660,38 +44080,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;} fi else - 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 + VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS + VORBIS_LIBS=$pkg_cv_VORBIS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBvorbis=libvorbis_plugin.la @@ -45712,17 +44130,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg vorbis >= 1.1 vorbisenc >= 1.1" >&5 -printf %s "checking for ogg vorbis >= 1.1 vorbisenc >= 1.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5 +$as_echo_n "checking for VORBIS... " >&6; } if test -n "$VORBIS_CFLAGS"; then pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45736,10 +44154,10 @@ pkg_cv_VORBIS_LIBS="$VORBIS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg vorbis >= 1.1 vorbisenc >= 1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg vorbis >= 1.1 vorbisenc >= 1.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg vorbis >= 1.1 vorbisenc >= 1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45753,8 +44171,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45762,40 +44180,38 @@ _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 - if test x"$enable_vorbis" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;} fi 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 - if test x"$enable_vorbis" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg vorbis >= 1.1 vorbisenc >= 1.1 needed for vorbis was not found" >&2;} fi else - 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 + VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS + VORBIS_LIBS=$pkg_cv_VORBIS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_vorbis=yes LTLIBvorbis=libvorbis_plugin.la @@ -45832,19 +44248,19 @@ # Check whether --enable-tremor was given. -if test ${enable_tremor+y} -then : +if test "${enable_tremor+set}" = set; then : enableval=$enable_tremor; fi if test "${enable_tremor}" = "yes" then - for ac_header in tremor/ivorbiscodec.h + for ac_header in tremor/ivorbiscodec.h do : - ac_fn_c_check_header_compile "$LINENO" "tremor/ivorbiscodec.h" "ac_cv_header_tremor_ivorbiscodec_h" "$ac_includes_default" -if test "x$ac_cv_header_tremor_ivorbiscodec_h" = xyes -then : - printf "%s\n" "#define HAVE_TREMOR_IVORBISCODEC_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "tremor/ivorbiscodec.h" "ac_cv_header_tremor_ivorbiscodec_h" "$ac_includes_default" +if test "x$ac_cv_header_tremor_ivorbiscodec_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TREMOR_IVORBISCODEC_H 1 +_ACEOF @@ -45856,6 +44272,7 @@ fi done + fi @@ -45875,10 +44292,9 @@ # Check whether --enable-speex was given. -if test ${enable_speex+y} -then : +if test "${enable_speex+set}" = set; then : enableval=$enable_speex; -else $as_nop +else enable_speex=auto fi @@ -45887,17 +44303,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg speex >= 1.0.5" >&5 -printf %s "checking for ogg speex >= 1.0.5... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPEEX" >&5 +$as_echo_n "checking for SPEEX... " >&6; } if test -n "$SPEEX_CFLAGS"; then pkg_cv_SPEEX_CFLAGS="$SPEEX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg speex >= 1.0.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPEEX_CFLAGS=`$PKG_CONFIG --cflags "ogg speex >= 1.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45911,10 +44327,10 @@ pkg_cv_SPEEX_LIBS="$SPEEX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg speex >= 1.0.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPEEX_LIBS=`$PKG_CONFIG --libs "ogg speex >= 1.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -45928,8 +44344,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -45937,38 +44353,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;} fi else - 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 + SPEEX_CFLAGS=$pkg_cv_SPEEX_CFLAGS + SPEEX_LIBS=$pkg_cv_SPEEX_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBspeex=libspeex_plugin.la @@ -45989,17 +44403,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg speex >= 1.0.5" >&5 -printf %s "checking for ogg speex >= 1.0.5... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPEEX" >&5 +$as_echo_n "checking for SPEEX... " >&6; } if test -n "$SPEEX_CFLAGS"; then pkg_cv_SPEEX_CFLAGS="$SPEEX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg speex >= 1.0.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPEEX_CFLAGS=`$PKG_CONFIG --cflags "ogg speex >= 1.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46013,10 +44427,10 @@ pkg_cv_SPEEX_LIBS="$SPEEX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg speex >= 1.0.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg speex >= 1.0.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPEEX_LIBS=`$PKG_CONFIG --libs "ogg speex >= 1.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46030,8 +44444,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46039,40 +44453,38 @@ _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 - if test x"$enable_speex" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;} fi 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 - if test x"$enable_speex" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg speex >= 1.0.5 needed for speex was not found" >&2;} fi else - 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 + SPEEX_CFLAGS=$pkg_cv_SPEEX_CFLAGS + SPEEX_LIBS=$pkg_cv_SPEEX_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_speex=yes LTLIBspeex=libspeex_plugin.la @@ -46108,22 +44520,21 @@ have_speexdsp="no" -if test "${enable_speex}" != "no" -then : +if test "${enable_speex}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for speexdsp" >&5 -printf %s "checking for speexdsp... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPEEXDSP" >&5 +$as_echo_n "checking for SPEEXDSP... " >&6; } if test -n "$SPEEXDSP_CFLAGS"; then pkg_cv_SPEEXDSP_CFLAGS="$SPEEXDSP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"speexdsp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"speexdsp\""; } >&5 ($PKG_CONFIG --exists --print-errors "speexdsp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPEEXDSP_CFLAGS=`$PKG_CONFIG --cflags "speexdsp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46137,10 +44548,10 @@ pkg_cv_SPEEXDSP_LIBS="$SPEEXDSP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"speexdsp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"speexdsp\""; } >&5 ($PKG_CONFIG --exists --print-errors "speexdsp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPEEXDSP_LIBS=`$PKG_CONFIG --libs "speexdsp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46154,8 +44565,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46163,29 +44574,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${SPEEXDSP_PKG_ERRORS}." >&2;} else - 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; } + SPEEXDSP_CFLAGS=$pkg_cv_SPEEXDSP_CFLAGS + SPEEXDSP_LIBS=$pkg_cv_SPEEXDSP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_speexdsp="yes" @@ -46218,10 +44629,9 @@ # Check whether --enable-opus was given. -if test ${enable_opus+y} -then : +if test "${enable_opus+set}" = set; then : enableval=$enable_opus; -else $as_nop +else enable_opus=auto fi @@ -46230,17 +44640,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg opus >= 1.0.3" >&5 -printf %s "checking for ogg opus >= 1.0.3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPUS" >&5 +$as_echo_n "checking for OPUS... " >&6; } if test -n "$OPUS_CFLAGS"; then pkg_cv_OPUS_CFLAGS="$OPUS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg opus >= 1.0.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg opus >= 1.0.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg opus >= 1.0.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPUS_CFLAGS=`$PKG_CONFIG --cflags "ogg opus >= 1.0.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46254,10 +44664,10 @@ pkg_cv_OPUS_LIBS="$OPUS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg opus >= 1.0.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg opus >= 1.0.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg opus >= 1.0.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPUS_LIBS=`$PKG_CONFIG --libs "ogg opus >= 1.0.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46271,8 +44681,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46280,38 +44690,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&2;} fi else - 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 + OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS + OPUS_LIBS=$pkg_cv_OPUS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBopus=libopus_plugin.la @@ -46332,17 +44740,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg opus >= 1.0.3" >&5 -printf %s "checking for ogg opus >= 1.0.3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPUS" >&5 +$as_echo_n "checking for OPUS... " >&6; } if test -n "$OPUS_CFLAGS"; then pkg_cv_OPUS_CFLAGS="$OPUS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg opus >= 1.0.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg opus >= 1.0.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg opus >= 1.0.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPUS_CFLAGS=`$PKG_CONFIG --cflags "ogg opus >= 1.0.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46356,10 +44764,10 @@ pkg_cv_OPUS_LIBS="$OPUS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg opus >= 1.0.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg opus >= 1.0.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg opus >= 1.0.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPUS_LIBS=`$PKG_CONFIG --libs "ogg opus >= 1.0.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46373,8 +44781,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46382,40 +44790,38 @@ _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 - if test x"$enable_opus" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&2;} fi 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 - if test x"$enable_opus" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg opus >= 1.0.3 needed for opus was not found" >&2;} fi else - 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 + OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS + OPUS_LIBS=$pkg_cv_OPUS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_opus=yes LTLIBopus=libopus_plugin.la @@ -46468,10 +44874,9 @@ # Check whether --enable-spatialaudio was given. -if test ${enable_spatialaudio+y} -then : +if test "${enable_spatialaudio+set}" = set; then : enableval=$enable_spatialaudio; -else $as_nop +else enable_spatialaudio=auto fi @@ -46480,17 +44885,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for spatialaudio" >&5 -printf %s "checking for spatialaudio... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPATIALAUDIO" >&5 +$as_echo_n "checking for SPATIALAUDIO... " >&6; } if test -n "$SPATIALAUDIO_CFLAGS"; then pkg_cv_SPATIALAUDIO_CFLAGS="$SPATIALAUDIO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialaudio\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialaudio\""; } >&5 ($PKG_CONFIG --exists --print-errors "spatialaudio") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPATIALAUDIO_CFLAGS=`$PKG_CONFIG --cflags "spatialaudio" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46504,10 +44909,10 @@ pkg_cv_SPATIALAUDIO_LIBS="$SPATIALAUDIO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialaudio\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialaudio\""; } >&5 ($PKG_CONFIG --exists --print-errors "spatialaudio") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPATIALAUDIO_LIBS=`$PKG_CONFIG --libs "spatialaudio" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46521,8 +44926,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46530,38 +44935,36 @@ _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" -then : + if test x"$enable_spatialaudio" = "xyes"; then : as_fn_error $? "Library spatialaudio needed for spatialaudio was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library spatialaudio needed for spatialaudio was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library spatialaudio needed for spatialaudio was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library spatialaudio needed for spatialaudio was not found" >&5 +$as_echo "$as_me: WARNING: Library spatialaudio needed for spatialaudio was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_spatialaudio" = "xyes"; then : as_fn_error $? "Library spatialaudio needed for spatialaudio was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library spatialaudio needed for spatialaudio was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library spatialaudio needed for spatialaudio was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library spatialaudio needed for spatialaudio was not found" >&5 +$as_echo "$as_me: WARNING: Library spatialaudio needed for spatialaudio was not found" >&2;} fi else - 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 + SPATIALAUDIO_CFLAGS=$pkg_cv_SPATIALAUDIO_CFLAGS + SPATIALAUDIO_LIBS=$pkg_cv_SPATIALAUDIO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBspatialaudio=libspatialaudio_plugin.la @@ -46582,17 +44985,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for spatialaudio" >&5 -printf %s "checking for spatialaudio... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPATIALAUDIO" >&5 +$as_echo_n "checking for SPATIALAUDIO... " >&6; } if test -n "$SPATIALAUDIO_CFLAGS"; then pkg_cv_SPATIALAUDIO_CFLAGS="$SPATIALAUDIO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialaudio\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialaudio\""; } >&5 ($PKG_CONFIG --exists --print-errors "spatialaudio") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPATIALAUDIO_CFLAGS=`$PKG_CONFIG --cflags "spatialaudio" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46606,10 +45009,10 @@ pkg_cv_SPATIALAUDIO_LIBS="$SPATIALAUDIO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialaudio\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialaudio\""; } >&5 ($PKG_CONFIG --exists --print-errors "spatialaudio") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SPATIALAUDIO_LIBS=`$PKG_CONFIG --libs "spatialaudio" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46623,8 +45026,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46632,40 +45035,38 @@ _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 - if test x"$enable_spatialaudio" = "xyes" -then : + enable_spatialaudio=no + if test x"$enable_spatialaudio" = "xyes"; then : as_fn_error $? "Library spatialaudio needed for spatialaudio was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library spatialaudio needed for spatialaudio was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library spatialaudio needed for spatialaudio was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library spatialaudio needed for spatialaudio was not found" >&5 +$as_echo "$as_me: WARNING: Library spatialaudio needed for spatialaudio was not found" >&2;} fi 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 - if test x"$enable_spatialaudio" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_spatialaudio=no + if test x"$enable_spatialaudio" = "xyes"; then : as_fn_error $? "Library spatialaudio needed for spatialaudio was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library spatialaudio needed for spatialaudio was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library spatialaudio needed for spatialaudio was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library spatialaudio needed for spatialaudio was not found" >&5 +$as_echo "$as_me: WARNING: Library spatialaudio needed for spatialaudio was not found" >&2;} fi else - 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 + SPATIALAUDIO_CFLAGS=$pkg_cv_SPATIALAUDIO_CFLAGS + SPATIALAUDIO_LIBS=$pkg_cv_SPATIALAUDIO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_spatialaudio=yes LTLIBspatialaudio=libspatialaudio_plugin.la @@ -46718,10 +45119,9 @@ # Check whether --enable-theora was given. -if test ${enable_theora+y} -then : +if test "${enable_theora+set}" = set; then : enableval=$enable_theora; -else $as_nop +else enable_theora=auto fi @@ -46730,17 +45130,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg theoradec >= 1.0 theoraenc" >&5 -printf %s "checking for ogg theoradec >= 1.0 theoraenc... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for THEORA" >&5 +$as_echo_n "checking for THEORA... " >&6; } if test -n "$THEORA_CFLAGS"; then pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theoradec >= 1.0 theoraenc\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theoradec >= 1.0 theoraenc\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg theoradec >= 1.0 theoraenc") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_THEORA_CFLAGS=`$PKG_CONFIG --cflags "ogg theoradec >= 1.0 theoraenc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46754,10 +45154,10 @@ pkg_cv_THEORA_LIBS="$THEORA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theoradec >= 1.0 theoraenc\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theoradec >= 1.0 theoraenc\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg theoradec >= 1.0 theoraenc") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_THEORA_LIBS=`$PKG_CONFIG --libs "ogg theoradec >= 1.0 theoraenc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46771,8 +45171,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46780,38 +45180,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&2;} fi else - 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 + THEORA_CFLAGS=$pkg_cv_THEORA_CFLAGS + THEORA_LIBS=$pkg_cv_THEORA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBtheora=libtheora_plugin.la @@ -46832,17 +45230,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg theoradec >= 1.0 theoraenc" >&5 -printf %s "checking for ogg theoradec >= 1.0 theoraenc... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for THEORA" >&5 +$as_echo_n "checking for THEORA... " >&6; } if test -n "$THEORA_CFLAGS"; then pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theoradec >= 1.0 theoraenc\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theoradec >= 1.0 theoraenc\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg theoradec >= 1.0 theoraenc") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_THEORA_CFLAGS=`$PKG_CONFIG --cflags "ogg theoradec >= 1.0 theoraenc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46856,10 +45254,10 @@ pkg_cv_THEORA_LIBS="$THEORA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theoradec >= 1.0 theoraenc\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg theoradec >= 1.0 theoraenc\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg theoradec >= 1.0 theoraenc") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_THEORA_LIBS=`$PKG_CONFIG --libs "ogg theoradec >= 1.0 theoraenc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46873,8 +45271,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46882,40 +45280,38 @@ _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 - if test x"$enable_theora" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&2;} fi 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 - if test x"$enable_theora" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg theoradec >= 1.0 theoraenc needed for theora was not found" >&2;} fi else - 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 + THEORA_CFLAGS=$pkg_cv_THEORA_CFLAGS + THEORA_LIBS=$pkg_cv_THEORA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_theora=yes LTLIBtheora=libtheora_plugin.la @@ -46968,10 +45364,9 @@ # Check whether --enable-oggspots was given. -if test ${enable_oggspots+y} -then : +if test "${enable_oggspots+set}" = set; then : enableval=$enable_oggspots; -else $as_nop +else enable_oggspots=auto fi @@ -46980,17 +45375,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg" >&5 -printf %s "checking for ogg... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGGSPOTS" >&5 +$as_echo_n "checking for OGGSPOTS... " >&6; } if test -n "$OGGSPOTS_CFLAGS"; then pkg_cv_OGGSPOTS_CFLAGS="$OGGSPOTS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGGSPOTS_CFLAGS=`$PKG_CONFIG --cflags "ogg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47004,10 +45399,10 @@ pkg_cv_OGGSPOTS_LIBS="$OGGSPOTS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGGSPOTS_LIBS=`$PKG_CONFIG --libs "ogg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47021,8 +45416,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -47030,38 +45425,36 @@ _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" -then : + if test x"$enable_oggspots" = "xyes"; then : as_fn_error $? "Library ogg needed for oggspots was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg needed for oggspots was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg needed for oggspots was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg needed for oggspots was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg needed for oggspots was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_oggspots" = "xyes"; then : as_fn_error $? "Library ogg needed for oggspots was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg needed for oggspots was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg needed for oggspots was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg needed for oggspots was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg needed for oggspots was not found" >&2;} fi else - 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 + OGGSPOTS_CFLAGS=$pkg_cv_OGGSPOTS_CFLAGS + OGGSPOTS_LIBS=$pkg_cv_OGGSPOTS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBoggspots=liboggspots_plugin.la @@ -47082,17 +45475,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg" >&5 -printf %s "checking for ogg... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGGSPOTS" >&5 +$as_echo_n "checking for OGGSPOTS... " >&6; } if test -n "$OGGSPOTS_CFLAGS"; then pkg_cv_OGGSPOTS_CFLAGS="$OGGSPOTS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGGSPOTS_CFLAGS=`$PKG_CONFIG --cflags "ogg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47106,10 +45499,10 @@ pkg_cv_OGGSPOTS_LIBS="$OGGSPOTS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg\""; } >&5 ($PKG_CONFIG --exists --print-errors "ogg") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OGGSPOTS_LIBS=`$PKG_CONFIG --libs "ogg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47123,8 +45516,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -47132,40 +45525,38 @@ _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 - if test x"$enable_oggspots" = "xyes" -then : + enable_oggspots=no + if test x"$enable_oggspots" = "xyes"; then : as_fn_error $? "Library ogg needed for oggspots was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg needed for oggspots was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg needed for oggspots was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg needed for oggspots was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg needed for oggspots was not found" >&2;} fi 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 - if test x"$enable_oggspots" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_oggspots=no + if test x"$enable_oggspots" = "xyes"; then : as_fn_error $? "Library ogg needed for oggspots was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg needed for oggspots was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library ogg needed for oggspots was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library ogg needed for oggspots was not found" >&5 +$as_echo "$as_me: WARNING: Library ogg needed for oggspots was not found" >&2;} fi else - 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 + OGGSPOTS_CFLAGS=$pkg_cv_OGGSPOTS_CFLAGS + OGGSPOTS_LIBS=$pkg_cv_OGGSPOTS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_oggspots=yes LTLIBoggspots=liboggspots_plugin.la @@ -47218,10 +45609,9 @@ # Check whether --enable-daala was given. -if test ${enable_daala+y} -then : +if test "${enable_daala+set}" = set; then : enableval=$enable_daala; -else $as_nop +else enable_daala=disabled fi @@ -47230,17 +45620,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for daaladec daalaenc" >&5 -printf %s "checking for daaladec daalaenc... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAALA" >&5 +$as_echo_n "checking for DAALA... " >&6; } if test -n "$DAALA_CFLAGS"; then pkg_cv_DAALA_CFLAGS="$DAALA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"daaladec daalaenc\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"daaladec daalaenc\""; } >&5 ($PKG_CONFIG --exists --print-errors "daaladec daalaenc") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DAALA_CFLAGS=`$PKG_CONFIG --cflags "daaladec daalaenc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47254,10 +45644,10 @@ pkg_cv_DAALA_LIBS="$DAALA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"daaladec daalaenc\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"daaladec daalaenc\""; } >&5 ($PKG_CONFIG --exists --print-errors "daaladec daalaenc") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DAALA_LIBS=`$PKG_CONFIG --libs "daaladec daalaenc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47271,8 +45661,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -47280,38 +45670,36 @@ _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" -then : + if test x"$enable_daala" = "xyes"; then : as_fn_error $? "Library daaladec daalaenc needed for daala was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library daaladec daalaenc needed for daala was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library daaladec daalaenc needed for daala was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library daaladec daalaenc needed for daala was not found" >&5 +$as_echo "$as_me: WARNING: Library daaladec daalaenc needed for daala was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_daala" = "xyes"; then : as_fn_error $? "Library daaladec daalaenc needed for daala was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library daaladec daalaenc needed for daala was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library daaladec daalaenc needed for daala was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library daaladec daalaenc needed for daala was not found" >&5 +$as_echo "$as_me: WARNING: Library daaladec daalaenc needed for daala was not found" >&2;} fi else - 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 + DAALA_CFLAGS=$pkg_cv_DAALA_CFLAGS + DAALA_LIBS=$pkg_cv_DAALA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBdaala=libdaala_plugin.la @@ -47332,17 +45720,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for daaladec daalaenc" >&5 -printf %s "checking for daaladec daalaenc... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAALA" >&5 +$as_echo_n "checking for DAALA... " >&6; } if test -n "$DAALA_CFLAGS"; then pkg_cv_DAALA_CFLAGS="$DAALA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"daaladec daalaenc\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"daaladec daalaenc\""; } >&5 ($PKG_CONFIG --exists --print-errors "daaladec daalaenc") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DAALA_CFLAGS=`$PKG_CONFIG --cflags "daaladec daalaenc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47356,10 +45744,10 @@ pkg_cv_DAALA_LIBS="$DAALA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"daaladec daalaenc\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"daaladec daalaenc\""; } >&5 ($PKG_CONFIG --exists --print-errors "daaladec daalaenc") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DAALA_LIBS=`$PKG_CONFIG --libs "daaladec daalaenc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47373,8 +45761,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -47382,40 +45770,38 @@ _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 - if test x"$enable_daala" = "xyes" -then : + enable_daala=no + if test x"$enable_daala" = "xyes"; then : as_fn_error $? "Library daaladec daalaenc needed for daala was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library daaladec daalaenc needed for daala was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library daaladec daalaenc needed for daala was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library daaladec daalaenc needed for daala was not found" >&5 +$as_echo "$as_me: WARNING: Library daaladec daalaenc needed for daala was not found" >&2;} fi 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 - if test x"$enable_daala" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_daala=no + if test x"$enable_daala" = "xyes"; then : as_fn_error $? "Library daaladec daalaenc needed for daala was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library daaladec daalaenc needed for daala was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library daaladec daalaenc needed for daala was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library daaladec daalaenc needed for daala was not found" >&5 +$as_echo "$as_me: WARNING: Library daaladec daalaenc needed for daala was not found" >&2;} fi else - 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 + DAALA_CFLAGS=$pkg_cv_DAALA_CFLAGS + DAALA_LIBS=$pkg_cv_DAALA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_daala=yes LTLIBdaala=libdaala_plugin.la @@ -47468,10 +45854,9 @@ # Check whether --enable-schroedinger was given. -if test ${enable_schroedinger+y} -then : +if test "${enable_schroedinger+set}" = set; then : enableval=$enable_schroedinger; -else $as_nop +else enable_schroedinger=auto fi @@ -47480,17 +45865,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for schroedinger-1.0 >= 1.0.10" >&5 -printf %s "checking for schroedinger-1.0 >= 1.0.10... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCHROEDINGER" >&5 +$as_echo_n "checking for SCHROEDINGER... " >&6; } if test -n "$SCHROEDINGER_CFLAGS"; then pkg_cv_SCHROEDINGER_CFLAGS="$SCHROEDINGER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "schroedinger-1.0 >= 1.0.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SCHROEDINGER_CFLAGS=`$PKG_CONFIG --cflags "schroedinger-1.0 >= 1.0.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47504,10 +45889,10 @@ pkg_cv_SCHROEDINGER_LIBS="$SCHROEDINGER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "schroedinger-1.0 >= 1.0.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SCHROEDINGER_LIBS=`$PKG_CONFIG --libs "schroedinger-1.0 >= 1.0.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47521,8 +45906,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -47530,38 +45915,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&5 +$as_echo "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&5 +$as_echo "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&2;} fi else - 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 + SCHROEDINGER_CFLAGS=$pkg_cv_SCHROEDINGER_CFLAGS + SCHROEDINGER_LIBS=$pkg_cv_SCHROEDINGER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBschroedinger=libschroedinger_plugin.la @@ -47582,17 +45965,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for schroedinger-1.0 >= 1.0.10" >&5 -printf %s "checking for schroedinger-1.0 >= 1.0.10... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCHROEDINGER" >&5 +$as_echo_n "checking for SCHROEDINGER... " >&6; } if test -n "$SCHROEDINGER_CFLAGS"; then pkg_cv_SCHROEDINGER_CFLAGS="$SCHROEDINGER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "schroedinger-1.0 >= 1.0.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SCHROEDINGER_CFLAGS=`$PKG_CONFIG --cflags "schroedinger-1.0 >= 1.0.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47606,10 +45989,10 @@ pkg_cv_SCHROEDINGER_LIBS="$SCHROEDINGER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"schroedinger-1.0 >= 1.0.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "schroedinger-1.0 >= 1.0.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SCHROEDINGER_LIBS=`$PKG_CONFIG --libs "schroedinger-1.0 >= 1.0.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47623,8 +46006,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -47632,40 +46015,38 @@ _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 - if test x"$enable_schroedinger" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&5 +$as_echo "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&2;} fi 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 - if test x"$enable_schroedinger" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&5 +$as_echo "$as_me: WARNING: Library schroedinger-1.0 >= 1.0.10 needed for schroedinger was not found" >&2;} fi else - 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 + SCHROEDINGER_CFLAGS=$pkg_cv_SCHROEDINGER_CFLAGS + SCHROEDINGER_LIBS=$pkg_cv_SCHROEDINGER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_schroedinger=yes LTLIBschroedinger=libschroedinger_plugin.la @@ -47702,20 +46083,19 @@ # Check whether --enable-png was given. -if test ${enable_png+y} -then : +if test "${enable_png+set}" = set; then : enableval=$enable_png; fi -if test "${enable_png}" != "no" -then : +if test "${enable_png}" != "no"; then : - for ac_header in png.h +for ac_header in png.h do : - ac_fn_c_check_header_compile "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" -if test "x$ac_cv_header_png_h" = xyes -then : - printf "%s\n" "#define HAVE_PNG_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" +if test "x$ac_cv_header_png_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PNG_H 1 +_ACEOF CPPFLAGS_save="${CPPFLAGS}" @@ -47726,12 +46106,11 @@ LIBS_save="${LIBS}" LDFLAGS="${LDFLAGS} -lz $LIBM" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_set_alpha_mode in -lpng" >&5 -printf %s "checking for png_set_alpha_mode in -lpng... " >&6; } -if test ${ac_cv_lib_png_png_set_alpha_mode+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_alpha_mode in -lpng" >&5 +$as_echo_n "checking for png_set_alpha_mode in -lpng... " >&6; } +if ${ac_cv_lib_png_png_set_alpha_mode+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpng -lz $LIBM $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -47740,29 +46119,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char png_set_alpha_mode (); int -main (void) +main () { return png_set_alpha_mode (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_png_png_set_alpha_mode=yes -else $as_nop +else ac_cv_lib_png_png_set_alpha_mode=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_set_alpha_mode" >&5 -printf "%s\n" "$ac_cv_lib_png_png_set_alpha_mode" >&6; } -if test "x$ac_cv_lib_png_png_set_alpha_mode" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_set_alpha_mode" >&5 +$as_echo "$ac_cv_lib_png_png_set_alpha_mode" >&6; } +if test "x$ac_cv_lib_png_png_set_alpha_mode" = xyes; then : @@ -47786,23 +46166,23 @@ done + fi # Check whether --enable-jpeg was given. -if test ${enable_jpeg+y} -then : +if test "${enable_jpeg+set}" = set; then : enableval=$enable_jpeg; fi -if test "${enable_jpeg}" != "no" -then : +if test "${enable_jpeg}" != "no"; then : - for ac_header in jpeglib.h +for ac_header in jpeglib.h do : - ac_fn_c_check_header_compile "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" -if test "x$ac_cv_header_jpeglib_h" = xyes -then : - printf "%s\n" "#define HAVE_JPEGLIB_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" +if test "x$ac_cv_header_jpeglib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_JPEGLIB_H 1 +_ACEOF @@ -47815,23 +46195,23 @@ done + fi # Check whether --enable-bpg was given. -if test ${enable_bpg+y} -then : +if test "${enable_bpg+set}" = set; then : enableval=$enable_bpg; fi -if test "${enable_bpg}" != "no" -then : +if test "${enable_bpg}" != "no"; then : - for ac_header in libbpg.h +for ac_header in libbpg.h do : - ac_fn_c_check_header_compile "$LINENO" "libbpg.h" "ac_cv_header_libbpg_h" "$ac_includes_default" -if test "x$ac_cv_header_libbpg_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBBPG_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "libbpg.h" "ac_cv_header_libbpg_h" "$ac_includes_default" +if test "x$ac_cv_header_libbpg_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBBPG_H 1 +_ACEOF @@ -47844,28 +46224,29 @@ done + fi # Check whether --enable-x262 was given. -if test ${enable_x262+y} -then : +if test "${enable_x262+set}" = set; then : enableval=$enable_x262; fi -if test "${enable_x262}" != "no"; then +if test "${enable_x262}" != "no"; then : + pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x262" >&5 -printf %s "checking for x262... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X262" >&5 +$as_echo_n "checking for X262... " >&6; } if test -n "$X262_CFLAGS"; then pkg_cv_X262_CFLAGS="$X262_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x262\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x262\""; } >&5 ($PKG_CONFIG --exists --print-errors "x262") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X262_CFLAGS=`$PKG_CONFIG --cflags "x262" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47879,10 +46260,10 @@ pkg_cv_X262_LIBS="$X262_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x262\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x262\""; } >&5 ($PKG_CONFIG --exists --print-errors "x262") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X262_LIBS=`$PKG_CONFIG --libs "x262" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -47896,8 +46277,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -47905,31 +46286,35 @@ _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 - as_fn_error $? "x262 module doesn't work without staticly compiled libx262.a" "$LINENO" 5 - fi + if test "${enable_x262}" = "yes"; then : + + as_fn_error $? "x262 module does not work without statically compiled libx262.a" "$LINENO" 5 + +fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "${enable_x262}" = "yes"; then - as_fn_error $? "x262 module doesn't work without staticly compiled libx262.a" "$LINENO" 5 - fi + if test "${enable_x262}" = "yes"; then : + + as_fn_error $? "x262 module does not work without statically compiled libx262.a" "$LINENO" 5 + +fi else - 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; } + X262_CFLAGS=$pkg_cv_X262_CFLAGS + X262_LIBS=$pkg_cv_X262_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -47943,8 +46328,7 @@ - if test -n "${ac_cv_ld_bsymbolic}" -then : + if test -n "${ac_cv_ld_bsymbolic}"; then : @@ -47970,6 +46354,7 @@ fi fi + fi @@ -47989,10 +46374,9 @@ # Check whether --enable-x265 was given. -if test ${enable_x265+y} -then : +if test "${enable_x265+set}" = set; then : enableval=$enable_x265; -else $as_nop +else enable_x265=auto fi @@ -48001,17 +46385,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x265" >&5 -printf %s "checking for x265... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X265" >&5 +$as_echo_n "checking for X265... " >&6; } if test -n "$X265_CFLAGS"; then pkg_cv_X265_CFLAGS="$X265_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x265\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x265\""; } >&5 ($PKG_CONFIG --exists --print-errors "x265") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X265_CFLAGS=`$PKG_CONFIG --cflags "x265" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48025,10 +46409,10 @@ pkg_cv_X265_LIBS="$X265_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x265\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x265\""; } >&5 ($PKG_CONFIG --exists --print-errors "x265") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X265_LIBS=`$PKG_CONFIG --libs "x265" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48042,8 +46426,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -48051,38 +46435,36 @@ _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" -then : + if test x"$enable_x265" = "xyes"; then : as_fn_error $? "Library x265 needed for x265 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library x265 needed for x265 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library x265 needed for x265 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library x265 needed for x265 was not found" >&5 +$as_echo "$as_me: WARNING: Library x265 needed for x265 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_x265" = "xyes"; then : as_fn_error $? "Library x265 needed for x265 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library x265 needed for x265 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library x265 needed for x265 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library x265 needed for x265 was not found" >&5 +$as_echo "$as_me: WARNING: Library x265 needed for x265 was not found" >&2;} fi else - 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 + X265_CFLAGS=$pkg_cv_X265_CFLAGS + X265_LIBS=$pkg_cv_X265_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBx265=libx265_plugin.la @@ -48103,17 +46485,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x265" >&5 -printf %s "checking for x265... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X265" >&5 +$as_echo_n "checking for X265... " >&6; } if test -n "$X265_CFLAGS"; then pkg_cv_X265_CFLAGS="$X265_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x265\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x265\""; } >&5 ($PKG_CONFIG --exists --print-errors "x265") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X265_CFLAGS=`$PKG_CONFIG --cflags "x265" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48127,10 +46509,10 @@ pkg_cv_X265_LIBS="$X265_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x265\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x265\""; } >&5 ($PKG_CONFIG --exists --print-errors "x265") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X265_LIBS=`$PKG_CONFIG --libs "x265" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48144,8 +46526,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -48153,40 +46535,38 @@ _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 - if test x"$enable_x265" = "xyes" -then : + enable_x265=no + if test x"$enable_x265" = "xyes"; then : as_fn_error $? "Library x265 needed for x265 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library x265 needed for x265 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library x265 needed for x265 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library x265 needed for x265 was not found" >&5 +$as_echo "$as_me: WARNING: Library x265 needed for x265 was not found" >&2;} fi 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 - if test x"$enable_x265" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_x265=no + if test x"$enable_x265" = "xyes"; then : as_fn_error $? "Library x265 needed for x265 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library x265 needed for x265 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library x265 needed for x265 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library x265 needed for x265 was not found" >&5 +$as_echo "$as_me: WARNING: Library x265 needed for x265 was not found" >&2;} fi else - 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 + X265_CFLAGS=$pkg_cv_X265_CFLAGS + X265_LIBS=$pkg_cv_X265_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_x265=yes LTLIBx265=libx265_plugin.la @@ -48223,25 +46603,24 @@ # Check whether --enable-x264 was given. -if test ${enable_x264+y} -then : +if test "${enable_x264+set}" = set; then : enableval=$enable_x264; fi if test "${enable_x264}" != "no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x264 >= 0.148" >&5 -printf %s "checking for x264 >= 0.148... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X264" >&5 +$as_echo_n "checking for X264... " >&6; } if test -n "$X264_CFLAGS"; then pkg_cv_X264_CFLAGS="$X264_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5 ($PKG_CONFIG --exists --print-errors "x264 >= 0.148") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X264_CFLAGS=`$PKG_CONFIG --cflags "x264 >= 0.148" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48255,10 +46634,10 @@ pkg_cv_X264_LIBS="$X264_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5 ($PKG_CONFIG --exists --print-errors "x264 >= 0.148") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X264_LIBS=`$PKG_CONFIG --libs "x264 >= 0.148" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48272,8 +46651,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -48281,12 +46660,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 @@ -48294,18 +46673,18 @@ fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if test "${enable_x264}" = "yes"; then as_fn_error $? "${X264_PKG_ERRORS}: you may get it from http://www.videolan.org/x264.html" "$LINENO" 5 fi else - 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; } + X264_CFLAGS=$pkg_cv_X264_CFLAGS + X264_LIBS=$pkg_cv_X264_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -48320,8 +46699,7 @@ - if test -n "${ac_cv_ld_bsymbolic}" -then : + if test -n "${ac_cv_ld_bsymbolic}"; then : @@ -48351,25 +46729,24 @@ fi # Check whether --enable-x26410b was given. -if test ${enable_x26410b+y} -then : +if test "${enable_x26410b+set}" = set; then : enableval=$enable_x26410b; fi if test "${enable_x26410b}" != "no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x264 >= 0.153" >&5 -printf %s "checking for x264 >= 0.153... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X26410b" >&5 +$as_echo_n "checking for X26410b... " >&6; } if test -n "$X26410b_CFLAGS"; then pkg_cv_X26410b_CFLAGS="$X26410b_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.153\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.153\""; } >&5 ($PKG_CONFIG --exists --print-errors "x264 >= 0.153") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X26410b_CFLAGS=`$PKG_CONFIG --cflags "x264 >= 0.153" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48383,10 +46760,10 @@ pkg_cv_X26410b_LIBS="$X26410b_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.153\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.153\""; } >&5 ($PKG_CONFIG --exists --print-errors "x264 >= 0.153") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X26410b_LIBS=`$PKG_CONFIG --libs "x264 >= 0.153" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48400,8 +46777,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -48409,12 +46786,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 @@ -48422,18 +46799,18 @@ fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if test "${enable_x26410b}" = "yes"; then as_fn_error $? "${X264_PKG_ERRORS}: you may get it from http://www.videolan.org/x264.html" "$LINENO" 5 fi else - 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; } + X26410b_CFLAGS=$pkg_cv_X26410b_CFLAGS + X26410b_LIBS=$pkg_cv_X26410b_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -48448,8 +46825,7 @@ - if test -n "${ac_cv_ld_bsymbolic}" -then : + if test -n "${ac_cv_ld_bsymbolic}"; then : @@ -48496,10 +46872,9 @@ # Check whether --enable-mfx was given. -if test ${enable_mfx+y} -then : +if test "${enable_mfx+set}" = set; then : enableval=$enable_mfx; -else $as_nop +else enable_mfx=auto fi @@ -48508,17 +46883,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmfx" >&5 -printf %s "checking for libmfx... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MFX" >&5 +$as_echo_n "checking for MFX... " >&6; } if test -n "$MFX_CFLAGS"; then pkg_cv_MFX_CFLAGS="$MFX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmfx\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmfx\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmfx") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MFX_CFLAGS=`$PKG_CONFIG --cflags "libmfx" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48532,10 +46907,10 @@ pkg_cv_MFX_LIBS="$MFX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmfx\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmfx\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmfx") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MFX_LIBS=`$PKG_CONFIG --libs "libmfx" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48549,8 +46924,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -48558,38 +46933,36 @@ _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" -then : + if test x"$enable_mfx" = "xyes"; then : as_fn_error $? "Library libmfx needed for mfx was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmfx needed for mfx was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmfx needed for mfx was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmfx needed for mfx was not found" >&5 +$as_echo "$as_me: WARNING: Library libmfx needed for mfx was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_mfx" = "xyes"; then : as_fn_error $? "Library libmfx needed for mfx was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmfx needed for mfx was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmfx needed for mfx was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmfx needed for mfx was not found" >&5 +$as_echo "$as_me: WARNING: Library libmfx needed for mfx was not found" >&2;} fi else - 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 + MFX_CFLAGS=$pkg_cv_MFX_CFLAGS + MFX_LIBS=$pkg_cv_MFX_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBqsv=libqsv_plugin.la @@ -48610,17 +46983,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmfx" >&5 -printf %s "checking for libmfx... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MFX" >&5 +$as_echo_n "checking for MFX... " >&6; } if test -n "$MFX_CFLAGS"; then pkg_cv_MFX_CFLAGS="$MFX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmfx\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmfx\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmfx") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MFX_CFLAGS=`$PKG_CONFIG --cflags "libmfx" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48634,10 +47007,10 @@ pkg_cv_MFX_LIBS="$MFX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmfx\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmfx\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmfx") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MFX_LIBS=`$PKG_CONFIG --libs "libmfx" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48651,8 +47024,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -48660,40 +47033,38 @@ _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 - if test x"$enable_mfx" = "xyes" -then : + enable_mfx=no + if test x"$enable_mfx" = "xyes"; then : as_fn_error $? "Library libmfx needed for mfx was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmfx needed for mfx was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmfx needed for mfx was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmfx needed for mfx was not found" >&5 +$as_echo "$as_me: WARNING: Library libmfx needed for mfx was not found" >&2;} fi 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 - if test x"$enable_mfx" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_mfx=no + if test x"$enable_mfx" = "xyes"; then : as_fn_error $? "Library libmfx needed for mfx was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmfx needed for mfx was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmfx needed for mfx was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmfx needed for mfx was not found" >&5 +$as_echo "$as_me: WARNING: Library libmfx needed for mfx was not found" >&2;} fi else - 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 + MFX_CFLAGS=$pkg_cv_MFX_CFLAGS + MFX_LIBS=$pkg_cv_MFX_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_mfx=yes LTLIBqsv=libqsv_plugin.la @@ -48746,10 +47117,9 @@ # Check whether --enable-fluidsynth was given. -if test ${enable_fluidsynth+y} -then : +if test "${enable_fluidsynth+set}" = set; then : enableval=$enable_fluidsynth; -else $as_nop +else enable_fluidsynth=auto fi @@ -48758,17 +47128,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fluidsynth >= 1.1.2" >&5 -printf %s "checking for fluidsynth >= 1.1.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5 +$as_echo_n "checking for FLUIDSYNTH... " >&6; } if test -n "$FLUIDSYNTH_CFLAGS"; then pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLUIDSYNTH_CFLAGS=`$PKG_CONFIG --cflags "fluidsynth >= 1.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48782,10 +47152,10 @@ pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLUIDSYNTH_LIBS=`$PKG_CONFIG --libs "fluidsynth >= 1.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48799,8 +47169,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -48808,38 +47178,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&5 +$as_echo "$as_me: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&5 +$as_echo "$as_me: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&2;} fi else - 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 + FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS + FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBfluidsynth=libfluidsynth_plugin.la @@ -48860,17 +47228,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fluidsynth >= 1.1.2" >&5 -printf %s "checking for fluidsynth >= 1.1.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5 +$as_echo_n "checking for FLUIDSYNTH... " >&6; } if test -n "$FLUIDSYNTH_CFLAGS"; then pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLUIDSYNTH_CFLAGS=`$PKG_CONFIG --cflags "fluidsynth >= 1.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48884,10 +47252,10 @@ pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLUIDSYNTH_LIBS=`$PKG_CONFIG --libs "fluidsynth >= 1.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -48901,8 +47269,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -48910,40 +47278,38 @@ _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 - if test x"$enable_fluidsynth" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&5 +$as_echo "$as_me: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&2;} fi 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 - if test x"$enable_fluidsynth" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&5 +$as_echo "$as_me: WARNING: Library fluidsynth >= 1.1.2 needed for fluidsynth was not found" >&2;} fi else - 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 + FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS + FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_fluidsynth=yes LTLIBfluidsynth=libfluidsynth_plugin.la @@ -48995,10 +47361,9 @@ # Check whether --enable-fluidlite was given. -if test ${enable_fluidlite+y} -then : +if test "${enable_fluidlite+set}" = set; then : enableval=$enable_fluidlite; -else $as_nop +else enable_fluidlite=auto fi @@ -49007,17 +47372,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fluidlite" >&5 -printf %s "checking for fluidlite... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDLITE" >&5 +$as_echo_n "checking for FLUIDLITE... " >&6; } if test -n "$FLUIDLITE_CFLAGS"; then pkg_cv_FLUIDLITE_CFLAGS="$FLUIDLITE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidlite\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidlite\""; } >&5 ($PKG_CONFIG --exists --print-errors "fluidlite") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLUIDLITE_CFLAGS=`$PKG_CONFIG --cflags "fluidlite" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49031,10 +47396,10 @@ pkg_cv_FLUIDLITE_LIBS="$FLUIDLITE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidlite\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidlite\""; } >&5 ($PKG_CONFIG --exists --print-errors "fluidlite") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLUIDLITE_LIBS=`$PKG_CONFIG --libs "fluidlite" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49048,8 +47413,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49057,38 +47422,36 @@ _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" -then : + if test x"$enable_fluidlite" = "xyes"; then : as_fn_error $? "Library fluidlite needed for fluidlite was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidlite needed for fluidlite was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fluidlite needed for fluidlite was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidlite needed for fluidlite was not found" >&5 +$as_echo "$as_me: WARNING: Library fluidlite needed for fluidlite was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_fluidlite" = "xyes"; then : as_fn_error $? "Library fluidlite needed for fluidlite was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidlite needed for fluidlite was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fluidlite needed for fluidlite was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidlite needed for fluidlite was not found" >&5 +$as_echo "$as_me: WARNING: Library fluidlite needed for fluidlite was not found" >&2;} fi else - 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 + FLUIDLITE_CFLAGS=$pkg_cv_FLUIDLITE_CFLAGS + FLUIDLITE_LIBS=$pkg_cv_FLUIDLITE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBfluidsynth=libfluidsynth_plugin.la @@ -49109,17 +47472,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fluidlite" >&5 -printf %s "checking for fluidlite... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDLITE" >&5 +$as_echo_n "checking for FLUIDLITE... " >&6; } if test -n "$FLUIDLITE_CFLAGS"; then pkg_cv_FLUIDLITE_CFLAGS="$FLUIDLITE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidlite\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidlite\""; } >&5 ($PKG_CONFIG --exists --print-errors "fluidlite") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLUIDLITE_CFLAGS=`$PKG_CONFIG --cflags "fluidlite" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49133,10 +47496,10 @@ pkg_cv_FLUIDLITE_LIBS="$FLUIDLITE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidlite\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidlite\""; } >&5 ($PKG_CONFIG --exists --print-errors "fluidlite") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FLUIDLITE_LIBS=`$PKG_CONFIG --libs "fluidlite" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49150,8 +47513,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49159,40 +47522,38 @@ _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 - if test x"$enable_fluidlite" = "xyes" -then : + enable_fluidlite=no + if test x"$enable_fluidlite" = "xyes"; then : as_fn_error $? "Library fluidlite needed for fluidlite was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidlite needed for fluidlite was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fluidlite needed for fluidlite was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidlite needed for fluidlite was not found" >&5 +$as_echo "$as_me: WARNING: Library fluidlite needed for fluidlite was not found" >&2;} fi 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 - if test x"$enable_fluidlite" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_fluidlite=no + if test x"$enable_fluidlite" = "xyes"; then : as_fn_error $? "Library fluidlite needed for fluidlite was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidlite needed for fluidlite was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library fluidlite needed for fluidlite was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library fluidlite needed for fluidlite was not found" >&5 +$as_echo "$as_me: WARNING: Library fluidlite needed for fluidlite was not found" >&2;} fi else - 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 + FLUIDLITE_CFLAGS=$pkg_cv_FLUIDLITE_CFLAGS + FLUIDLITE_LIBS=$pkg_cv_FLUIDLITE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_fluidlite=yes LTLIBfluidsynth=libfluidsynth_plugin.la @@ -49227,47 +47588,46 @@ - for ac_header in fluidlite.h +for ac_header in fluidlite.h do : - ac_fn_c_check_header_compile "$LINENO" "fluidlite.h" "ac_cv_header_fluidlite_h" "$ac_includes_default" -if test "x$ac_cv_header_fluidlite_h" = xyes -then : - printf "%s\n" "#define HAVE_FLUIDLITE_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "fluidlite.h" "ac_cv_header_fluidlite_h" "$ac_includes_default" +if test "x$ac_cv_header_fluidlite_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FLUIDLITE_H 1 +_ACEOF FLUIDSYNTH_LIBS=${FLUIDLITE_LIBS} fi done + # Check whether --enable-zvbi was given. -if test ${enable_zvbi+y} -then : +if test "${enable_zvbi+set}" = set; then : enableval=$enable_zvbi; fi # Check whether --enable-telx was given. -if test ${enable_telx+y} -then : +if test "${enable_telx+set}" = set; then : enableval=$enable_telx; fi -if test "${enable_zvbi}" != "no" -then : +if test "${enable_zvbi}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zvbi-0.2 >= 0.2.28" >&5 -printf %s "checking for zvbi-0.2 >= 0.2.28... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZVBI" >&5 +$as_echo_n "checking for ZVBI... " >&6; } if test -n "$ZVBI_CFLAGS"; then pkg_cv_ZVBI_CFLAGS="$ZVBI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5 ($PKG_CONFIG --exists --print-errors "zvbi-0.2 >= 0.2.28") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZVBI_CFLAGS=`$PKG_CONFIG --cflags "zvbi-0.2 >= 0.2.28" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49281,10 +47641,10 @@ pkg_cv_ZVBI_LIBS="$ZVBI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zvbi-0.2 >= 0.2.28\""; } >&5 ($PKG_CONFIG --exists --print-errors "zvbi-0.2 >= 0.2.28") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZVBI_LIBS=`$PKG_CONFIG --libs "zvbi-0.2 >= 0.2.28" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49298,8 +47658,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49307,29 +47667,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${ZVBI_PKG_ERRORS}. Enabling the telx module instead." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${ZVBI_PKG_ERRORS}. Enabling the telx module instead." >&5 +$as_echo "$as_me: WARNING: ${ZVBI_PKG_ERRORS}. Enabling the telx module instead." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${ZVBI_PKG_ERRORS}. Enabling the telx module instead." >&5 -printf "%s\n" "$as_me: WARNING: ${ZVBI_PKG_ERRORS}. Enabling the telx module instead." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${ZVBI_PKG_ERRORS}. Enabling the telx module instead." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + ZVBI_CFLAGS=$pkg_cv_ZVBI_CFLAGS + ZVBI_LIBS=$pkg_cv_ZVBI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -49338,21 +47698,19 @@ -printf "%s\n" "#define ZVBI_COMPILED 1" >>confdefs.h +$as_echo "#define ZVBI_COMPILED 1" >>confdefs.h - if test "${enable_telx}" = "yes" -then : + if test "${enable_telx}" = "yes"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The zvbi and telx modules are incompatible. Using zvbi." >&5 -printf "%s\n" "$as_me: WARNING: The zvbi and telx modules are incompatible. Using zvbi." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The zvbi and telx modules are incompatible. Using zvbi." >&5 +$as_echo "$as_me: WARNING: The zvbi and telx modules are incompatible. Using zvbi." >&2;} fi fi fi -if test "${enable_telx}" != "no" -then : +if test "${enable_telx}" != "no" ; then : @@ -49363,147 +47721,26 @@ fi -# Check whether --enable-libass was given. -if test ${enable_libass+y} -then : - enableval=$enable_libass; -fi - -if test "${enable_libass}" != "no" -then : - - -pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libass >= 0.9.8" >&5 -printf %s "checking for libass >= 0.9.8... " >&6; } - -if test -n "$LIBASS_CFLAGS"; then - pkg_cv_LIBASS_CFLAGS="$LIBASS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libass >= 0.9.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libass >= 0.9.8") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBASS_CFLAGS=`$PKG_CONFIG --cflags "libass >= 0.9.8" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LIBASS_LIBS"; then - pkg_cv_LIBASS_LIBS="$LIBASS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libass >= 0.9.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libass >= 0.9.8") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBASS_LIBS=`$PKG_CONFIG --libs "libass >= 0.9.8" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _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` - else - 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 - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBASS_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBASS_PKG_ERRORS}." >&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: ${LIBASS_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${LIBASS_PKG_ERRORS}." >&2;} - -else - 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; } - - - - LTLIBlibass=liblibass_plugin.la - - - - - for ac_header in fontconfig/fontconfig.h -do : - ac_fn_c_check_header_compile "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default" -if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes -then : - printf "%s\n" "#define HAVE_FONTCONFIG_FONTCONFIG_H 1" >>confdefs.h - - - eval "CPPFLAGS_libass="'"$'"{CPPFLAGS_libass} -DHAVE_FONTCONFIG"'"' - - - - - - eval "LIBS_libass="'"'"-lfontconfig "'$'"{LIBS_libass}"'"' - - - - -fi - -done - -fi - -fi - # Check whether --enable-aribsub was given. -if test ${enable_aribsub+y} -then : +if test "${enable_aribsub+set}" = set; then : enableval=$enable_aribsub; fi -if test "${enable_aribsub}" != "no" -then : +if test "${enable_aribsub}" != "no" ; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aribb24 >= 1.0.1" >&5 -printf %s "checking for aribb24 >= 1.0.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARIBB24" >&5 +$as_echo_n "checking for ARIBB24... " >&6; } if test -n "$ARIBB24_CFLAGS"; then pkg_cv_ARIBB24_CFLAGS="$ARIBB24_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb24 >= 1.0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb24 >= 1.0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "aribb24 >= 1.0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARIBB24_CFLAGS=`$PKG_CONFIG --cflags "aribb24 >= 1.0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49517,10 +47754,10 @@ pkg_cv_ARIBB24_LIBS="$ARIBB24_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb24 >= 1.0.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb24 >= 1.0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "aribb24 >= 1.0.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARIBB24_LIBS=`$PKG_CONFIG --libs "aribb24 >= 1.0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49534,8 +47771,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49543,31 +47780,31 @@ _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 -printf "%s\n" "$as_me: WARNING: Library aribb24 needed for aribsub was not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb24 needed for aribsub was not found" >&5 +$as_echo "$as_me: WARNING: Library aribb24 needed for aribsub was not found" >&2;} have_aribb24="no" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb24 needed for aribsub was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aribb24 needed for aribsub was not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb24 needed for aribsub was not found" >&5 +$as_echo "$as_me: WARNING: Library aribb24 needed for aribsub was not found" >&2;} have_aribb24="no" else - 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; } + ARIBB24_CFLAGS=$pkg_cv_ARIBB24_CFLAGS + ARIBB24_LIBS=$pkg_cv_ARIBB24_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_aribb24="yes" @@ -49583,7 +47820,7 @@ -printf "%s\n" "#define HAVE_ARIBB24 1" >>confdefs.h +$as_echo "#define HAVE_ARIBB24 1" >>confdefs.h fi @@ -49615,10 +47852,9 @@ # Check whether --enable-aribb25 was given. -if test ${enable_aribb25+y} -then : +if test "${enable_aribb25+set}" = set; then : enableval=$enable_aribb25; -else $as_nop +else enable_aribb25=auto fi @@ -49627,17 +47863,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aribb25 >= 0.2.6" >&5 -printf %s "checking for aribb25 >= 0.2.6... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARIBB25" >&5 +$as_echo_n "checking for ARIBB25... " >&6; } if test -n "$ARIBB25_CFLAGS"; then pkg_cv_ARIBB25_CFLAGS="$ARIBB25_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb25 >= 0.2.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb25 >= 0.2.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "aribb25 >= 0.2.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARIBB25_CFLAGS=`$PKG_CONFIG --cflags "aribb25 >= 0.2.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49651,10 +47887,10 @@ pkg_cv_ARIBB25_LIBS="$ARIBB25_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb25 >= 0.2.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb25 >= 0.2.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "aribb25 >= 0.2.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARIBB25_LIBS=`$PKG_CONFIG --libs "aribb25 >= 0.2.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49668,8 +47904,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49677,38 +47913,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&5 +$as_echo "$as_me: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&5 +$as_echo "$as_me: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&2;} fi else - 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 + ARIBB25_CFLAGS=$pkg_cv_ARIBB25_CFLAGS + ARIBB25_LIBS=$pkg_cv_ARIBB25_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBaribcam=libaribcam_plugin.la @@ -49729,17 +47963,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aribb25 >= 0.2.6" >&5 -printf %s "checking for aribb25 >= 0.2.6... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARIBB25" >&5 +$as_echo_n "checking for ARIBB25... " >&6; } if test -n "$ARIBB25_CFLAGS"; then pkg_cv_ARIBB25_CFLAGS="$ARIBB25_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb25 >= 0.2.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb25 >= 0.2.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "aribb25 >= 0.2.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARIBB25_CFLAGS=`$PKG_CONFIG --cflags "aribb25 >= 0.2.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49753,10 +47987,10 @@ pkg_cv_ARIBB25_LIBS="$ARIBB25_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb25 >= 0.2.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"aribb25 >= 0.2.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "aribb25 >= 0.2.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARIBB25_LIBS=`$PKG_CONFIG --libs "aribb25 >= 0.2.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49770,8 +48004,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49779,40 +48013,38 @@ _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 - if test x"$enable_aribb25" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&5 +$as_echo "$as_me: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&2;} fi 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 - if test x"$enable_aribb25" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&5 +$as_echo "$as_me: WARNING: Library aribb25 >= 0.2.6 needed for aribb25 was not found" >&2;} fi else - 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 + ARIBB25_CFLAGS=$pkg_cv_ARIBB25_CFLAGS + ARIBB25_LIBS=$pkg_cv_ARIBB25_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_aribb25=yes LTLIBaribcam=libaribcam_plugin.la @@ -49865,10 +48097,9 @@ # Check whether --enable-kate was given. -if test ${enable_kate+y} -then : +if test "${enable_kate+set}" = set; then : enableval=$enable_kate; -else $as_nop +else enable_kate=auto fi @@ -49877,17 +48108,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kate >= 0.3.0" >&5 -printf %s "checking for kate >= 0.3.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for KATE" >&5 +$as_echo_n "checking for KATE... " >&6; } if test -n "$KATE_CFLAGS"; then pkg_cv_KATE_CFLAGS="$KATE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "kate >= 0.3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_KATE_CFLAGS=`$PKG_CONFIG --cflags "kate >= 0.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49901,10 +48132,10 @@ pkg_cv_KATE_LIBS="$KATE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "kate >= 0.3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_KATE_LIBS=`$PKG_CONFIG --libs "kate >= 0.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49918,8 +48149,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49927,38 +48158,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&5 +$as_echo "$as_me: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&5 +$as_echo "$as_me: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&2;} fi else - 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 + KATE_CFLAGS=$pkg_cv_KATE_CFLAGS + KATE_LIBS=$pkg_cv_KATE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBkate=libkate_plugin.la @@ -49979,17 +48208,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kate >= 0.3.0" >&5 -printf %s "checking for kate >= 0.3.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for KATE" >&5 +$as_echo_n "checking for KATE... " >&6; } if test -n "$KATE_CFLAGS"; then pkg_cv_KATE_CFLAGS="$KATE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "kate >= 0.3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_KATE_CFLAGS=`$PKG_CONFIG --cflags "kate >= 0.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50003,10 +48232,10 @@ pkg_cv_KATE_LIBS="$KATE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"kate >= 0.3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "kate >= 0.3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_KATE_LIBS=`$PKG_CONFIG --libs "kate >= 0.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50020,8 +48249,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -50029,40 +48258,38 @@ _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 - if test x"$enable_kate" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&5 +$as_echo "$as_me: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&2;} fi 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 - if test x"$enable_kate" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&5 +$as_echo "$as_me: WARNING: Library kate >= 0.3.0 needed for kate was not found" >&2;} fi else - 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 + KATE_CFLAGS=$pkg_cv_KATE_CFLAGS + KATE_LIBS=$pkg_cv_KATE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_kate=yes LTLIBkate=libkate_plugin.la @@ -50099,27 +48326,25 @@ # Check whether --enable-tiger was given. -if test ${enable_tiger+y} -then : +if test "${enable_tiger+set}" = set; then : enableval=$enable_tiger; fi -if test "${enable_tiger}" != "no" -then : +if test "${enable_tiger}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tiger >= 0.3.1" >&5 -printf %s "checking for tiger >= 0.3.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIGER" >&5 +$as_echo_n "checking for TIGER... " >&6; } if test -n "$TIGER_CFLAGS"; then pkg_cv_TIGER_CFLAGS="$TIGER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tiger >= 0.3.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tiger >= 0.3.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "tiger >= 0.3.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TIGER_CFLAGS=`$PKG_CONFIG --cflags "tiger >= 0.3.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50133,10 +48358,10 @@ pkg_cv_TIGER_LIBS="$TIGER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tiger >= 0.3.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tiger >= 0.3.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "tiger >= 0.3.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TIGER_LIBS=`$PKG_CONFIG --libs "tiger >= 0.3.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50150,8 +48375,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -50159,57 +48384,53 @@ _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}" -then : + if test -n "${enable_tiger}"; then : as_fn_error $? "${TIGER_PKG_ERRORS}." "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_tiger}" -then : + if test -n "${enable_tiger}"; then : as_fn_error $? "${TIGER_PKG_ERRORS}." "$LINENO" 5 fi else - 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; } + TIGER_CFLAGS=$pkg_cv_TIGER_CFLAGS + TIGER_LIBS=$pkg_cv_TIGER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -printf "%s\n" "#define HAVE_TIGER 1" >>confdefs.h +$as_echo "#define HAVE_TIGER 1" >>confdefs.h fi fi # Check whether --enable-css was given. -if test ${enable_css+y} -then : +if test "${enable_css+set}" = set; then : enableval=$enable_css; fi -if test "${enable_css}" != "no" -then : +if test "${enable_css}" != "no"; then : with_css="yes" -printf "%s\n" "#define HAVE_CSS 1" >>confdefs.h +$as_echo "#define HAVE_CSS 1" >>confdefs.h fi @@ -50228,17 +48449,17 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egl" >&5 -printf %s "checking for egl... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGL" >&5 +$as_echo_n "checking for EGL... " >&6; } if test -n "$EGL_CFLAGS"; then pkg_cv_EGL_CFLAGS="$EGL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl\""; } >&5 ($PKG_CONFIG --exists --print-errors "egl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EGL_CFLAGS=`$PKG_CONFIG --cflags "egl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50252,10 +48473,10 @@ pkg_cv_EGL_LIBS="$EGL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl\""; } >&5 ($PKG_CONFIG --exists --print-errors "egl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EGL_LIBS=`$PKG_CONFIG --libs "egl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50269,8 +48490,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -50278,27 +48499,27 @@ _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" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } have_egl="no" else - 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; } + EGL_CFLAGS=$pkg_cv_EGL_CFLAGS + EGL_LIBS=$pkg_cv_EGL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_egl="yes" @@ -50315,17 +48536,17 @@ have_gl="no" pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gl" >&5 -printf %s "checking for gl... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5 +$as_echo_n "checking for GL... " >&6; } if test -n "$GL_CFLAGS"; then pkg_cv_GL_CFLAGS="$GL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gl\""; } >&5 ($PKG_CONFIG --exists --print-errors "gl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "gl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50339,10 +48560,10 @@ pkg_cv_GL_LIBS="$GL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gl\""; } >&5 ($PKG_CONFIG --exists --print-errors "gl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "gl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50356,8 +48577,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -50365,16 +48586,16 @@ _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 -printf %s "checking for OpenGL... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL" >&5 +$as_echo_n "checking for OpenGL... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50384,7 +48605,7 @@ #include int -main (void) +main () { int t0 = GL_TEXTURE0; @@ -50393,33 +48614,31 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : GL_CFLAGS="" have_gl="yes" - if test "${SYS}" != "mingw32" -then : + if test "${SYS}" != "mingw32"; then : GL_LIBS="-lGL" -else $as_nop +else GL_LIBS="-lopengl32" fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_gl}" >&5 -printf "%s\n" "${have_gl}" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_gl}" >&5 +$as_echo "${have_gl}" >&6; } elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenGL" >&5 -printf %s "checking for OpenGL... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL" >&5 +$as_echo_n "checking for OpenGL... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50429,7 +48648,7 @@ #include int -main (void) +main () { int t0 = GL_TEXTURE0; @@ -50438,32 +48657,30 @@ } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : GL_CFLAGS="" have_gl="yes" - if test "${SYS}" != "mingw32" -then : + if test "${SYS}" != "mingw32"; then : GL_LIBS="-lGL" -else $as_nop +else GL_LIBS="-lopengl32" fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_gl}" >&5 -printf "%s\n" "${have_gl}" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_gl}" >&5 +$as_echo "${have_gl}" >&6; } else - 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; } + GL_CFLAGS=$pkg_cv_GL_CFLAGS + GL_LIBS=$pkg_cv_GL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_gl="yes" @@ -50476,11 +48693,10 @@ HAVE_GL_FALSE= fi -if test "${have_gl}" = "yes" -then : +if test "${have_gl}" = "yes"; then : -printf "%s\n" "#define HAVE_GL 1" >>confdefs.h +$as_echo "#define HAVE_GL 1" >>confdefs.h fi @@ -50502,10 +48718,9 @@ # Check whether --enable-gles2 was given. -if test ${enable_gles2+y} -then : +if test "${enable_gles2+set}" = set; then : enableval=$enable_gles2; -else $as_nop +else enable_gles2=disabled fi @@ -50514,17 +48729,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glesv2" >&5 -printf %s "checking for glesv2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLES2" >&5 +$as_echo_n "checking for GLES2... " >&6; } if test -n "$GLES2_CFLAGS"; then pkg_cv_GLES2_CFLAGS="$GLES2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5 ($PKG_CONFIG --exists --print-errors "glesv2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLES2_CFLAGS=`$PKG_CONFIG --cflags "glesv2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50538,10 +48753,10 @@ pkg_cv_GLES2_LIBS="$GLES2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5 ($PKG_CONFIG --exists --print-errors "glesv2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLES2_LIBS=`$PKG_CONFIG --libs "glesv2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50555,8 +48770,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -50564,38 +48779,36 @@ _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" -then : + if test x"$enable_gles2" = "xyes"; then : as_fn_error $? "Library glesv2 needed for gles2 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library glesv2 needed for gles2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library glesv2 needed for gles2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library glesv2 needed for gles2 was not found" >&5 +$as_echo "$as_me: WARNING: Library glesv2 needed for gles2 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_gles2" = "xyes"; then : as_fn_error $? "Library glesv2 needed for gles2 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library glesv2 needed for gles2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library glesv2 needed for gles2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library glesv2 needed for gles2 was not found" >&5 +$as_echo "$as_me: WARNING: Library glesv2 needed for gles2 was not found" >&2;} fi else - 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 + GLES2_CFLAGS=$pkg_cv_GLES2_CFLAGS + GLES2_LIBS=$pkg_cv_GLES2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBgles2=libgles2_plugin.la @@ -50616,17 +48829,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glesv2" >&5 -printf %s "checking for glesv2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLES2" >&5 +$as_echo_n "checking for GLES2... " >&6; } if test -n "$GLES2_CFLAGS"; then pkg_cv_GLES2_CFLAGS="$GLES2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5 ($PKG_CONFIG --exists --print-errors "glesv2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLES2_CFLAGS=`$PKG_CONFIG --cflags "glesv2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50640,10 +48853,10 @@ pkg_cv_GLES2_LIBS="$GLES2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glesv2\""; } >&5 ($PKG_CONFIG --exists --print-errors "glesv2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLES2_LIBS=`$PKG_CONFIG --libs "glesv2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50657,8 +48870,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -50666,40 +48879,38 @@ _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 - if test x"$enable_gles2" = "xyes" -then : + enable_gles2=no + if test x"$enable_gles2" = "xyes"; then : as_fn_error $? "Library glesv2 needed for gles2 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library glesv2 needed for gles2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library glesv2 needed for gles2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library glesv2 needed for gles2 was not found" >&5 +$as_echo "$as_me: WARNING: Library glesv2 needed for gles2 was not found" >&2;} fi 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 - if test x"$enable_gles2" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_gles2=no + if test x"$enable_gles2" = "xyes"; then : as_fn_error $? "Library glesv2 needed for gles2 was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library glesv2 needed for gles2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library glesv2 needed for gles2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library glesv2 needed for gles2 was not found" >&5 +$as_echo "$as_me: WARNING: Library glesv2 needed for gles2 was not found" >&2;} fi else - 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 + GLES2_CFLAGS=$pkg_cv_GLES2_CFLAGS + GLES2_LIBS=$pkg_cv_GLES2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_gles2=yes LTLIBgles2=libgles2_plugin.la @@ -50736,13 +48947,12 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -printf %s "checking for X... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +$as_echo_n "checking for X... " >&6; } # Check whether --with-x was given. -if test ${with_x+y} -then : +if test "${with_x+set}" = set; then : withval=$with_x; fi @@ -50753,41 +48963,12 @@ else case $x_includes,$x_libraries in #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if test ${ac_cv_have_x+y} -then : - printf %s "(cached) " >&6 -else $as_nop + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : + $as_echo_n "(cached) " >&6 +else # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no -ac_x_libraries=no -# Do we need to do anything special at all? -ac_save_LIBS=$LIBS -LIBS="-lX11 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - # We can compile and link X programs with no special options. - ac_x_includes= - ac_x_libraries= -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS="$ac_save_LIBS" -# If that didn't work, only try xmkmf and file system searches -# for native compilation. -if test x"$ac_x_includes" = xno && test "$cross_compiling" = no -then : - rm -f -r conftest.dir +ac_x_includes=no ac_x_libraries=no +rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir cat >Imakefile <<'_ACEOF' @@ -50826,7 +49007,7 @@ rm -f -r conftest.dir fi - # Standard set of common directories for X headers. +# Standard set of common directories for X headers. # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include @@ -50853,8 +49034,6 @@ /usr/local/include/X11R5 /usr/local/include/X11R4 -/opt/X11/include - /usr/X386/include /usr/x386/include /usr/XFree86/include/X11 @@ -50876,11 +49055,10 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : # We can compile using X headers with no special include directory. ac_x_includes= -else $as_nop +else for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir @@ -50901,21 +49079,20 @@ /* end confdefs.h. */ #include int -main (void) +main () { XrmInitialize () ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= -else $as_nop +else LIBS=$ac_save_LIBS -for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib la dll; do @@ -50926,21 +49103,19 @@ done done fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -fi -# Record the results. case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) : + no,* | *,no | *\'*) # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no" ;; #( - *) : + ac_cv_have_x="have_x=no";; #( + *) # Record where we found X for the cache. ac_cv_have_x="have_x=yes\ ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" ;; + ac_x_libraries='$ac_x_libraries'" esac fi ;; #( @@ -50950,8 +49125,8 @@ fi # $with_x != no if test "$have_x" != yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -printf "%s\n" "$have_x" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +$as_echo "$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -50961,14 +49136,14 @@ ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +$as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h +$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -50981,8 +49156,8 @@ X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -printf %s "checking whether -R must be followed by a space... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 +$as_echo_n "checking whether -R must be followed by a space... " >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -50990,44 +49165,42 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" -else $as_nop +else LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -printf "%s\n" "neither works" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +$as_echo "neither works" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag LIBS=$ac_xsave_LIBS @@ -51050,25 +49223,26 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char XOpenDisplay (); int -main (void) +main () { return XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -printf %s "checking for dnet_ntoa in -ldnet... " >&6; } -if test ${ac_cv_lib_dnet_dnet_ntoa+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -51077,39 +49251,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char dnet_ntoa (); int -main (void) +main () { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_dnet_ntoa=yes -else $as_nop +else ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -printf "%s\n" "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test ${ac_cv_lib_dnet_stub_dnet_ntoa+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -51118,35 +49292,36 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char dnet_ntoa (); int -main (void) +main () { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_stub_dnet_ntoa=yes -else $as_nop +else ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -51159,18 +49334,16 @@ # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes -then : +if test "x$ac_cv_func_gethostbyname" = xyes; then : fi if test $ac_cv_func_gethostbyname = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -printf %s "checking for gethostbyname in -lnsl... " >&6; } -if test ${ac_cv_lib_nsl_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -51179,39 +49352,39 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char gethostbyname (); int -main (void) +main () { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_gethostbyname=yes -else $as_nop +else ac_cv_lib_nsl_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -printf %s "checking for gethostbyname in -lbsd... " >&6; } -if test ${ac_cv_lib_bsd_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 +$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -51220,29 +49393,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char gethostbyname (); int -main (void) +main () { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bsd_gethostbyname=yes -else $as_nop +else ac_cv_lib_bsd_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -printf "%s\n" "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -51257,18 +49431,16 @@ # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = xyes -then : +if test "x$ac_cv_func_connect" = xyes; then : fi if test $ac_cv_func_connect = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -printf %s "checking for connect in -lsocket... " >&6; } -if test ${ac_cv_lib_socket_connect+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } +if ${ac_cv_lib_socket_connect+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -51277,29 +49449,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char connect (); int -main (void) +main () { return connect (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_connect=yes -else $as_nop +else ac_cv_lib_socket_connect=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -printf "%s\n" "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = xyes; then : X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -51307,18 +49480,16 @@ # Guillermo Gomez says -lposix is necessary on A/UX. ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = xyes -then : +if test "x$ac_cv_func_remove" = xyes; then : fi if test $ac_cv_func_remove = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -printf %s "checking for remove in -lposix... " >&6; } -if test ${ac_cv_lib_posix_remove+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +$as_echo_n "checking for remove in -lposix... " >&6; } +if ${ac_cv_lib_posix_remove+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -51327,29 +49498,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char remove (); int -main (void) +main () { return remove (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix_remove=yes -else $as_nop +else ac_cv_lib_posix_remove=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -printf "%s\n" "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +$as_echo "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -51357,18 +49529,16 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = xyes -then : +if test "x$ac_cv_func_shmat" = xyes; then : fi if test $ac_cv_func_shmat = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -printf %s "checking for shmat in -lipc... " >&6; } -if test ${ac_cv_lib_ipc_shmat+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 +$as_echo_n "checking for shmat in -lipc... " >&6; } +if ${ac_cv_lib_ipc_shmat+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -51377,29 +49547,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char shmat (); int -main (void) +main () { return shmat (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ipc_shmat=yes -else $as_nop +else ac_cv_lib_ipc_shmat=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -printf "%s\n" "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 +$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -51415,12 +49586,11 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -printf %s "checking for IceConnectionNumber in -lICE... " >&6; } -if test ${ac_cv_lib_ICE_IceConnectionNumber+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -51429,29 +49599,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char IceConnectionNumber (); int -main (void) +main () { return IceConnectionNumber (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_IceConnectionNumber=yes -else $as_nop +else ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -51459,26 +49630,29 @@ fi -ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_Xlib_h" = xyes -then : - printf "%s\n" "#define HAVE_X11_XLIB_H 1" >>confdefs.h +for ac_header in X11/Xlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_Xlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_X11_XLIB_H 1 +_ACEOF fi +done + # Check whether --enable-xcb was given. -if test ${enable_xcb+y} -then : +if test "${enable_xcb+set}" = set; then : enableval=$enable_xcb; -else $as_nop +else - if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -then : + if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin"; then : enable_xcb="yes" -else $as_nop +else enable_xcb="no" @@ -51487,10 +49661,9 @@ fi # Check whether --enable-xvideo was given. -if test ${enable_xvideo+y} -then : +if test "${enable_xvideo+set}" = set; then : enableval=$enable_xvideo; -else $as_nop +else enable_xvideo="$enable_xcb" @@ -51501,22 +49674,21 @@ have_xcb_keysyms="no" have_xcb_randr="no" have_xcb_xvideo="no" -if test "${enable_xcb}" != "no" -then : +if test "${enable_xcb}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xcb >= 1.6" >&5 -printf %s "checking for xcb >= 1.6... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB" >&5 +$as_echo_n "checking for XCB... " >&6; } if test -n "$XCB_CFLAGS"; then pkg_cv_XCB_CFLAGS="$XCB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb >= 1.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb >= 1.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51530,10 +49702,10 @@ pkg_cv_XCB_LIBS="$XCB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb >= 1.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb >= 1.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51547,8 +49719,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -51556,14 +49728,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 @@ -51574,10 +49746,10 @@ and XCB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -51589,26 +49761,26 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + XCB_CFLAGS=$pkg_cv_XCB_CFLAGS + XCB_LIBS=$pkg_cv_XCB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi have_xcb="yes" pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xcb-shm" >&5 -printf %s "checking for xcb-shm... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SHM" >&5 +$as_echo_n "checking for XCB_SHM... " >&6; } if test -n "$XCB_SHM_CFLAGS"; then pkg_cv_XCB_SHM_CFLAGS="$XCB_SHM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shm\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shm\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-shm") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_SHM_CFLAGS=`$PKG_CONFIG --cflags "xcb-shm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51622,10 +49794,10 @@ pkg_cv_XCB_SHM_LIBS="$XCB_SHM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shm\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shm\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-shm") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_SHM_LIBS=`$PKG_CONFIG --libs "xcb-shm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51639,8 +49811,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -51648,14 +49820,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 @@ -51666,10 +49838,10 @@ and XCB_SHM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -51681,25 +49853,25 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + XCB_SHM_CFLAGS=$pkg_cv_XCB_SHM_CFLAGS + XCB_SHM_LIBS=$pkg_cv_XCB_SHM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xcb-composite" >&5 -printf %s "checking for xcb-composite... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_COMPOSITE" >&5 +$as_echo_n "checking for XCB_COMPOSITE... " >&6; } if test -n "$XCB_COMPOSITE_CFLAGS"; then pkg_cv_XCB_COMPOSITE_CFLAGS="$XCB_COMPOSITE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-composite") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_COMPOSITE_CFLAGS=`$PKG_CONFIG --cflags "xcb-composite" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51713,10 +49885,10 @@ pkg_cv_XCB_COMPOSITE_LIBS="$XCB_COMPOSITE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-composite") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_COMPOSITE_LIBS=`$PKG_CONFIG --libs "xcb-composite" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51730,8 +49902,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -51739,14 +49911,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 @@ -51757,10 +49929,10 @@ and XCB_COMPOSITE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -51772,25 +49944,25 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + XCB_COMPOSITE_CFLAGS=$pkg_cv_XCB_COMPOSITE_CFLAGS + XCB_COMPOSITE_LIBS=$pkg_cv_XCB_COMPOSITE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xproto" >&5 -printf %s "checking for xproto... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPROTO" >&5 +$as_echo_n "checking for XPROTO... " >&6; } if test -n "$XPROTO_CFLAGS"; then pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto\""; } >&5 ($PKG_CONFIG --exists --print-errors "xproto") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XPROTO_CFLAGS=`$PKG_CONFIG --cflags "xproto" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51804,10 +49976,10 @@ pkg_cv_XPROTO_LIBS="$XPROTO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto\""; } >&5 ($PKG_CONFIG --exists --print-errors "xproto") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XPROTO_LIBS=`$PKG_CONFIG --libs "xproto" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51821,8 +49993,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -51830,14 +50002,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 @@ -51848,10 +50020,10 @@ and XPROTO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -51863,29 +50035,28 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + XPROTO_CFLAGS=$pkg_cv_XPROTO_CFLAGS + XPROTO_LIBS=$pkg_cv_XPROTO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - if test "${enable_xvideo}" != "no" -then : + if test "${enable_xvideo}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xcb-xv >= 1.1.90.1" >&5 -printf %s "checking for xcb-xv >= 1.1.90.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XV" >&5 +$as_echo_n "checking for XCB_XV... " >&6; } if test -n "$XCB_XV_CFLAGS"; then pkg_cv_XCB_XV_CFLAGS="$XCB_XV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv >= 1.1.90.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv >= 1.1.90.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-xv >= 1.1.90.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_XV_CFLAGS=`$PKG_CONFIG --cflags "xcb-xv >= 1.1.90.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51899,10 +50070,10 @@ pkg_cv_XCB_XV_LIBS="$XCB_XV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv >= 1.1.90.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xv >= 1.1.90.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-xv >= 1.1.90.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_XV_LIBS=`$PKG_CONFIG --libs "xcb-xv >= 1.1.90.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51916,8 +50087,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -51925,14 +50096,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 @@ -51943,10 +50114,10 @@ and XCB_XV_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -51958,28 +50129,28 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - have_xcb_xvideo="yes" + XCB_XV_CFLAGS=$pkg_cv_XCB_XV_CFLAGS + XCB_XV_LIBS=$pkg_cv_XCB_XV_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_xcb_xvideo="yes" fi fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xcb-randr >= 1.3" >&5 -printf %s "checking for xcb-randr >= 1.3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RANDR" >&5 +$as_echo_n "checking for XCB_RANDR... " >&6; } if test -n "$XCB_RANDR_CFLAGS"; then pkg_cv_XCB_RANDR_CFLAGS="$XCB_RANDR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr >= 1.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr >= 1.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-randr >= 1.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_RANDR_CFLAGS=`$PKG_CONFIG --cflags "xcb-randr >= 1.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -51993,10 +50164,10 @@ pkg_cv_XCB_RANDR_LIBS="$XCB_RANDR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr >= 1.3\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr >= 1.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-randr >= 1.3") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_RANDR_LIBS=`$PKG_CONFIG --libs "xcb-randr >= 1.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52010,8 +50181,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52019,14 +50190,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 @@ -52037,10 +50208,10 @@ and XCB_RANDR_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 path to pkg-config. @@ -52052,26 +50223,26 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - have_xcb_randr="yes" + XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS + XCB_RANDR_LIBS=$pkg_cv_XCB_RANDR_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_xcb_randr="yes" fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xcb-keysyms >= 0.3.4" >&5 -printf %s "checking for xcb-keysyms >= 0.3.4... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_KEYSYMS" >&5 +$as_echo_n "checking for XCB_KEYSYMS... " >&6; } if test -n "$XCB_KEYSYMS_CFLAGS"; then pkg_cv_XCB_KEYSYMS_CFLAGS="$XCB_KEYSYMS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms >= 0.3.4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms >= 0.3.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-keysyms >= 0.3.4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_KEYSYMS_CFLAGS=`$PKG_CONFIG --cflags "xcb-keysyms >= 0.3.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52085,10 +50256,10 @@ pkg_cv_XCB_KEYSYMS_LIBS="$XCB_KEYSYMS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms >= 0.3.4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-keysyms >= 0.3.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-keysyms >= 0.3.4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XCB_KEYSYMS_LIBS=`$PKG_CONFIG --libs "xcb-keysyms >= 0.3.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52102,8 +50273,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52111,30 +50282,30 @@ _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 -printf "%s\n" "$as_me: WARNING: ${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work." >&5 +$as_echo "$as_me: WARNING: ${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work." >&5 -printf "%s\n" "$as_me: WARNING: ${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - have_xcb_keysyms="yes" + XCB_KEYSYMS_CFLAGS=$pkg_cv_XCB_KEYSYMS_CFLAGS + XCB_KEYSYMS_LIBS=$pkg_cv_XCB_KEYSYMS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_xcb_keysyms="yes" fi fi @@ -52173,28 +50344,26 @@ # Check whether --enable-vdpau was given. -if test ${enable_vdpau+y} -then : +if test "${enable_vdpau+set}" = set; then : enableval=$enable_vdpau; fi have_vdpau="no" -if test "${enable_vdpau}" != "no" -then : +if test "${enable_vdpau}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vdpau >= 0.6" >&5 -printf %s "checking for vdpau >= 0.6... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VDPAU" >&5 +$as_echo_n "checking for VDPAU... " >&6; } if test -n "$VDPAU_CFLAGS"; then pkg_cv_VDPAU_CFLAGS="$VDPAU_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vdpau >= 0.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vdpau >= 0.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "vdpau >= 0.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VDPAU_CFLAGS=`$PKG_CONFIG --cflags "vdpau >= 0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52208,10 +50377,10 @@ pkg_cv_VDPAU_LIBS="$VDPAU_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vdpau >= 0.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vdpau >= 0.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "vdpau >= 0.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VDPAU_LIBS=`$PKG_CONFIG --libs "vdpau >= 0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52225,8 +50394,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52234,41 +50403,38 @@ _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}" -then : + if test -n "${enable_vdpau}"; then : as_fn_error $? "${VDPAU_PKG_ERRORS}." "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_vdpau}" -then : + if test -n "${enable_vdpau}"; then : as_fn_error $? "${VDPAU_PKG_ERRORS}." "$LINENO" 5 fi else - 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; } + VDPAU_CFLAGS=$pkg_cv_VDPAU_CFLAGS + VDPAU_LIBS=$pkg_cv_VDPAU_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_vdpau="yes" - if test "${no_x}" = "yes" -then : + if test "${no_x}" = "yes"; then : as_fn_error $? "VDPAU requires Xlib (X11)." "$LINENO" 5 @@ -52287,35 +50453,33 @@ have_avcodec_vdpau="no" -if test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes" -then : +if test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"; then : case "${avfork}" in libav) av_vdpau_ver="56.10.0" ;; ffmpeg) av_vdpau_ver="56.19.100" ;; esac if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= \${av_vdpau_ver}\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= \${av_vdpau_ver}\""; } >&5 ($PKG_CONFIG --exists --print-errors "libavcodec >= ${av_vdpau_ver}") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then have_avcodec_vdpau="yes" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: VDPAU decoding acceleration activated" >&5 -printf "%s\n" "$as_me: VDPAU decoding acceleration activated" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: VDPAU decoding acceleration activated" >&5 +$as_echo "$as_me: VDPAU decoding acceleration activated" >&6;} else - if test -n "${enable_vdpau}" -then : + if test -n "${enable_vdpau}"; then : as_fn_error $? "libavcodec >= 56.10.0 is required for VDPAU decoding." "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libavcodec >= 56.10.0 are required for VDPAU decoding." >&5 -printf "%s\n" "$as_me: WARNING: libavcodec >= 56.10.0 are required for VDPAU decoding." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libavcodec >= 56.10.0 are required for VDPAU decoding." >&5 +$as_echo "$as_me: WARNING: libavcodec >= 56.10.0 are required for VDPAU decoding." >&2;} fi @@ -52333,30 +50497,28 @@ # Check whether --enable-wayland was given. -if test ${enable_wayland+y} -then : +if test "${enable_wayland+set}" = set; then : enableval=$enable_wayland; fi have_wayland="no" have_wayland_egl="no" -if test "${enable_wayland}" = "yes" -then : +if test "${enable_wayland}" = "yes"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wayland-client >= 1.5.91" >&5 -printf %s "checking for wayland-client >= 1.5.91... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_CLIENT" >&5 +$as_echo_n "checking for WAYLAND_CLIENT... " >&6; } if test -n "$WAYLAND_CLIENT_CFLAGS"; then pkg_cv_WAYLAND_CLIENT_CFLAGS="$WAYLAND_CLIENT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client >= 1.5.91\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client >= 1.5.91\""; } >&5 ($PKG_CONFIG --exists --print-errors "wayland-client >= 1.5.91") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WAYLAND_CLIENT_CFLAGS=`$PKG_CONFIG --cflags "wayland-client >= 1.5.91" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52370,10 +50532,10 @@ pkg_cv_WAYLAND_CLIENT_LIBS="$WAYLAND_CLIENT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client >= 1.5.91\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client >= 1.5.91\""; } >&5 ($PKG_CONFIG --exists --print-errors "wayland-client >= 1.5.91") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WAYLAND_CLIENT_LIBS=`$PKG_CONFIG --libs "wayland-client >= 1.5.91" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52387,8 +50549,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52396,98 +50558,95 @@ _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}" -then : + if test -n "${enable_wayland}"; then : as_fn_error $? "${WAYLAND_CLIENT_PKG_ERRORS}." "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_wayland}" -then : + if test -n "${enable_wayland}"; then : as_fn_error $? "${WAYLAND_CLIENT_PKG_ERRORS}." "$LINENO" 5 fi else - 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; } + WAYLAND_CLIENT_CFLAGS=$pkg_cv_WAYLAND_CLIENT_CFLAGS + WAYLAND_CLIENT_LIBS=$pkg_cv_WAYLAND_CLIENT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Wayland protocols" >&5 -printf %s "checking for the Wayland protocols... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Wayland protocols" >&5 +$as_echo_n "checking for the Wayland protocols... " >&6; } if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-protocols >= 1.4\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-protocols >= 1.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "wayland-protocols >= 1.4") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then WAYLAND_PROTOCOLS="$(${PKG_CONFIG} wayland-protocols --variable pkgdatadir)" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${WAYLAND_PROTOCOLS}" >&5 -printf "%s\n" "${WAYLAND_PROTOCOLS}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${WAYLAND_PROTOCOLS}" >&5 +$as_echo "${WAYLAND_PROTOCOLS}" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } as_fn_error $? "$(${PKG_CONFIG} --print-errors 'wayland-protocols >= 1.4')" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Wayland scanner" >&5 -printf %s "checking for the Wayland scanner... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Wayland scanner" >&5 +$as_echo_n "checking for the Wayland scanner... " >&6; } if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-scanner\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-scanner\""; } >&5 ($PKG_CONFIG --exists --print-errors "wayland-scanner") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${WAYLAND_SCANNER}" >&5 -printf "%s\n" "${WAYLAND_SCANNER}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${WAYLAND_SCANNER}" >&5 +$as_echo "${WAYLAND_SCANNER}" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf "%s\n" "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } as_fn_error $? "$(${PKG_CONFIG} --print-errors wayland-scanner)" "$LINENO" 5 fi have_wayland="yes" - if test "${have_egl}" = "yes" -then : + if test "${have_egl}" = "yes"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wayland-egl" >&5 -printf %s "checking for wayland-egl... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_EGL" >&5 +$as_echo_n "checking for WAYLAND_EGL... " >&6; } if test -n "$WAYLAND_EGL_CFLAGS"; then pkg_cv_WAYLAND_EGL_CFLAGS="$WAYLAND_EGL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WAYLAND_EGL_CFLAGS=`$PKG_CONFIG --cflags "wayland-egl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52501,10 +50660,10 @@ pkg_cv_WAYLAND_EGL_LIBS="$WAYLAND_EGL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WAYLAND_EGL_LIBS=`$PKG_CONFIG --libs "wayland-egl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52518,8 +50677,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52527,27 +50686,27 @@ _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 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + WAYLAND_EGL_CFLAGS=$pkg_cv_WAYLAND_EGL_CFLAGS + WAYLAND_EGL_LIBS=$pkg_cv_WAYLAND_EGL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_wayland_egl="yes" @@ -52579,27 +50738,25 @@ # Check whether --enable-sdl-image was given. -if test ${enable_sdl_image+y} -then : +if test "${enable_sdl_image+set}" = set; then : enableval=$enable_sdl_image; fi -if test "${enable_sdl_image}" != "no" -then : +if test "${enable_sdl_image}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDL_image >= 1.2.10" >&5 -printf %s "checking for SDL_image >= 1.2.10... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL_IMAGE" >&5 +$as_echo_n "checking for SDL_IMAGE... " >&6; } if test -n "$SDL_IMAGE_CFLAGS"; then pkg_cv_SDL_IMAGE_CFLAGS="$SDL_IMAGE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_image >= 1.2.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_image >= 1.2.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "SDL_image >= 1.2.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_IMAGE_CFLAGS=`$PKG_CONFIG --cflags "SDL_image >= 1.2.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52613,10 +50770,10 @@ pkg_cv_SDL_IMAGE_LIBS="$SDL_IMAGE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_image >= 1.2.10\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_image >= 1.2.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "SDL_image >= 1.2.10") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_IMAGE_LIBS=`$PKG_CONFIG --libs "SDL_image >= 1.2.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52630,8 +50787,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52639,29 +50796,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package." >&5 +$as_echo "$as_me: WARNING: ${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package." >&5 -printf "%s\n" "$as_me: WARNING: ${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + SDL_IMAGE_CFLAGS=$pkg_cv_SDL_IMAGE_CFLAGS + SDL_IMAGE_LIBS=$pkg_cv_SDL_IMAGE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -52675,64 +50832,64 @@ fi # Check whether --enable-freetype was given. -if test ${enable_freetype+y} -then : +if test "${enable_freetype+set}" = set; then : enableval=$enable_freetype; fi # Check whether --enable-fribidi was given. -if test ${enable_fribidi+y} -then : +if test "${enable_fribidi+set}" = set; then : enableval=$enable_fribidi; fi # Check whether --enable-harfbuzz was given. -if test ${enable_harfbuzz+y} -then : +if test "${enable_harfbuzz+set}" = set; then : enableval=$enable_harfbuzz; fi # Check whether --enable-fontconfig was given. -if test ${enable_fontconfig+y} -then : +if test "${enable_fontconfig+set}" = set; then : enableval=$enable_fontconfig; fi # Check whether --with-default-font was given. -if test ${with_default_font+y} -then : +if test "${with_default_font+set}" = set; then : withval=$with_default_font; -printf "%s\n" "#define DEFAULT_FONT_FILE \"$withval\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define DEFAULT_FONT_FILE "$withval" +_ACEOF fi # Check whether --with-default-monospace-font was given. -if test ${with_default_monospace_font+y} -then : +if test "${with_default_monospace_font+set}" = set; then : withval=$with_default_monospace_font; -printf "%s\n" "#define DEFAULT_MONOSPACE_FONT_FILE \"$withval\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define DEFAULT_MONOSPACE_FONT_FILE "$withval" +_ACEOF fi # Check whether --with-default-font-family was given. -if test ${with_default_font_family+y} -then : +if test "${with_default_font_family+set}" = set; then : withval=$with_default_font_family; -printf "%s\n" "#define DEFAULT_FAMILY \"$withval\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define DEFAULT_FAMILY "$withval" +_ACEOF fi # Check whether --with-default-monospace-font-family was given. -if test ${with_default_monospace_font_family+y} -then : +if test "${with_default_monospace_font_family+set}" = set; then : withval=$with_default_monospace_font_family; -printf "%s\n" "#define DEFAULT_MONOSPACE_FAMILY \"$withval\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define DEFAULT_MONOSPACE_FAMILY "$withval" +_ACEOF fi @@ -52745,17 +50902,17 @@ if test "${enable_freetype}" != "no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5 -printf %s "checking for freetype2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5 +$as_echo_n "checking for FREETYPE... " >&6; } if test -n "$FREETYPE_CFLAGS"; then pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52769,10 +50926,10 @@ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52786,8 +50943,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52795,37 +50952,35 @@ _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}" -then : + if test -n "${enable_freetype}"; then : as_fn_error $? "${FREETYPE_PKG_ERRORS}. Install FreeType2 development or configure with --disable-freetype." "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_freetype}" -then : + if test -n "${enable_freetype}"; then : as_fn_error $? "${FREETYPE_PKG_ERRORS}. Install FreeType2 development or configure with --disable-freetype." "$LINENO" 5 fi else - 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; } + FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS + FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_freetype="yes" @@ -52841,22 +50996,21 @@ - if test "${enable_fontconfig}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -then : + if test "${enable_fontconfig}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "darwin"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fontconfig >= 2.11" >&5 -printf %s "checking for fontconfig >= 2.11... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5 +$as_echo_n "checking for FONTCONFIG... " >&6; } if test -n "$FONTCONFIG_CFLAGS"; then pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.11\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.11") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52870,10 +51024,10 @@ pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.11\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.11") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52887,8 +51041,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52896,29 +51050,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType." >&5 +$as_echo "$as_me: WARNING: ${FONTCONFIG_PKG_ERRORS}. Styles 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType." >&5 -printf "%s\n" "$as_me: WARNING: ${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS + FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_fontconfig="yes" @@ -52929,17 +51083,17 @@ if test "${enable_fribidi}" != "no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fribidi" >&5 -printf %s "checking for fribidi... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FRIBIDI" >&5 +$as_echo_n "checking for FRIBIDI... " >&6; } if test -n "$FRIBIDI_CFLAGS"; then pkg_cv_FRIBIDI_CFLAGS="$FRIBIDI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fribidi\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fribidi\""; } >&5 ($PKG_CONFIG --exists --print-errors "fribidi") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FRIBIDI_CFLAGS=`$PKG_CONFIG --cflags "fribidi" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52953,10 +51107,10 @@ pkg_cv_FRIBIDI_LIBS="$FRIBIDI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fribidi\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fribidi\""; } >&5 ($PKG_CONFIG --exists --print-errors "fribidi") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FRIBIDI_LIBS=`$PKG_CONFIG --libs "fribidi" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -52970,8 +51124,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -52979,25 +51133,25 @@ _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: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 +$as_echo "$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: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${FRIBIDI_PKG_ERRORS}. Bidirectional text and complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + FRIBIDI_CFLAGS=$pkg_cv_FRIBIDI_CFLAGS + FRIBIDI_LIBS=$pkg_cv_FRIBIDI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_fribidi="yes" @@ -53020,17 +51174,17 @@ if test "${enable_harfbuzz}" != "no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for harfbuzz" >&5 -printf %s "checking for harfbuzz... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HARFBUZZ" >&5 +$as_echo_n "checking for HARFBUZZ... " >&6; } if test -n "$HARFBUZZ_CFLAGS"; then pkg_cv_HARFBUZZ_CFLAGS="$HARFBUZZ_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"harfbuzz\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"harfbuzz\""; } >&5 ($PKG_CONFIG --exists --print-errors "harfbuzz") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HARFBUZZ_CFLAGS=`$PKG_CONFIG --cflags "harfbuzz" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53044,10 +51198,10 @@ pkg_cv_HARFBUZZ_LIBS="$HARFBUZZ_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"harfbuzz\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"harfbuzz\""; } >&5 ($PKG_CONFIG --exists --print-errors "harfbuzz") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HARFBUZZ_LIBS=`$PKG_CONFIG --libs "harfbuzz" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53061,8 +51215,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -53070,25 +51224,25 @@ _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: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 +$as_echo "$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: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${HARFBUZZ_PKG_ERRORS}. Support for complex scripts (Arabic, Farsi, Thai...) will be disabled in FreeType." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + HARFBUZZ_CFLAGS=$pkg_cv_HARFBUZZ_CFLAGS + HARFBUZZ_LIBS=$pkg_cv_HARFBUZZ_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_harfbuzz="yes" @@ -53144,6 +51298,115 @@ fi +# Check whether --enable-libass was given. +if test "${enable_libass+set}" = set; then : + enableval=$enable_libass; +fi + +if test "${enable_libass}" != "no"; then : + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBASS" >&5 +$as_echo_n "checking for LIBASS... " >&6; } + +if test -n "$LIBASS_CFLAGS"; then + pkg_cv_LIBASS_CFLAGS="$LIBASS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libass >= 0.9.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libass >= 0.9.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBASS_CFLAGS=`$PKG_CONFIG --cflags "libass >= 0.9.8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBASS_LIBS"; then + pkg_cv_LIBASS_LIBS="$LIBASS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libass >= 0.9.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libass >= 0.9.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBASS_LIBS=`$PKG_CONFIG --libs "libass >= 0.9.8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _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` + else + 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 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBASS_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBASS_PKG_ERRORS}." >&2;} + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LIBASS_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${LIBASS_PKG_ERRORS}." >&2;} + +else + LIBASS_CFLAGS=$pkg_cv_LIBASS_CFLAGS + LIBASS_LIBS=$pkg_cv_LIBASS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + + + LTLIBlibass=liblibass_plugin.la + + + + + if test "${have_fontconfig}" != "no"; then + + + eval "CPPFLAGS_libass="'"$'"{CPPFLAGS_libass} -DHAVE_FONTCONFIG"'"' + + + + + + eval "LIBS_libass="'"'"${FONTCONFIG_LIBS} "'$'"{LIBS_libass}"'"' + + + + fi + +fi + +fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -53154,17 +51417,18 @@ #include #include " -if test "x$ac_cv_type_ISpObjectToken" = xyes -then : +if test "x$ac_cv_type_ISpObjectToken" = xyes; then : -printf "%s\n" "#define HAVE_ISPOBJECTTOKEN 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_ISPOBJECTTOKEN 1 +_ACEOF have_sapi="yes" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: sapi.h not found. Text to Speech renderer for Windows disabled" >&5 -printf "%s\n" "$as_me: WARNING: sapi.h not found. Text to Speech renderer for Windows disabled" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sapi.h not found. Text to Speech renderer for Windows disabled" >&5 +$as_echo "$as_me: WARNING: sapi.h not found. Text to Speech renderer for Windows disabled" >&2;} fi if test "${have_sapi}" = "yes"; then @@ -53199,10 +51463,9 @@ # Check whether --enable-svg was given. -if test ${enable_svg+y} -then : +if test "${enable_svg+set}" = set; then : enableval=$enable_svg; -else $as_nop +else enable_svg=auto fi @@ -53211,17 +51474,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.9.0" >&5 -printf %s "checking for librsvg-2.0 >= 2.9.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVG" >&5 +$as_echo_n "checking for SVG... " >&6; } if test -n "$SVG_CFLAGS"; then pkg_cv_SVG_CFLAGS="$SVG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53235,10 +51498,10 @@ pkg_cv_SVG_LIBS="$SVG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53252,8 +51515,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -53261,38 +51524,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5 +$as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5 +$as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;} fi else - 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 + SVG_CFLAGS=$pkg_cv_SVG_CFLAGS + SVG_LIBS=$pkg_cv_SVG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBsvg=libsvg_plugin.la @@ -53313,17 +51574,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.9.0" >&5 -printf %s "checking for librsvg-2.0 >= 2.9.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVG" >&5 +$as_echo_n "checking for SVG... " >&6; } if test -n "$SVG_CFLAGS"; then pkg_cv_SVG_CFLAGS="$SVG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53337,10 +51598,10 @@ pkg_cv_SVG_LIBS="$SVG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.9.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53354,8 +51615,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -53363,40 +51624,38 @@ _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 - if test x"$enable_svg" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5 +$as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;} fi 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 - if test x"$enable_svg" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&5 +$as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 needed for svg was not found" >&2;} fi else - 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 + SVG_CFLAGS=$pkg_cv_SVG_CFLAGS + SVG_LIBS=$pkg_cv_SVG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_svg=yes LTLIBsvg=libsvg_plugin.la @@ -53448,10 +51707,9 @@ # Check whether --enable-svgdec was given. -if test ${enable_svgdec+y} -then : +if test "${enable_svgdec+set}" = set; then : enableval=$enable_svgdec; -else $as_nop +else enable_svgdec=auto fi @@ -53460,17 +51718,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" >&5 -printf %s "checking for librsvg-2.0 >= 2.9.0 cairo >= 1.13.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVGDEC" >&5 +$as_echo_n "checking for SVGDEC... " >&6; } if test -n "$SVGDEC_CFLAGS"; then pkg_cv_SVGDEC_CFLAGS="$SVGDEC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0 cairo >= 1.13.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0 cairo >= 1.13.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVGDEC_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53484,10 +51742,10 @@ pkg_cv_SVGDEC_LIBS="$SVGDEC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0 cairo >= 1.13.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0 cairo >= 1.13.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVGDEC_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53501,8 +51759,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -53510,38 +51768,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&5 +$as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&5 +$as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&2;} fi else - 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 + SVGDEC_CFLAGS=$pkg_cv_SVGDEC_CFLAGS + SVGDEC_LIBS=$pkg_cv_SVGDEC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBsvgdec=libsvgdec_plugin.la @@ -53562,17 +51818,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" >&5 -printf %s "checking for librsvg-2.0 >= 2.9.0 cairo >= 1.13.1... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVGDEC" >&5 +$as_echo_n "checking for SVGDEC... " >&6; } if test -n "$SVGDEC_CFLAGS"; then pkg_cv_SVGDEC_CFLAGS="$SVGDEC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0 cairo >= 1.13.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0 cairo >= 1.13.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVGDEC_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53586,10 +51842,10 @@ pkg_cv_SVGDEC_LIBS="$SVGDEC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0 cairo >= 1.13.1\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.9.0 cairo >= 1.13.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SVGDEC_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.9.0 cairo >= 1.13.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53603,8 +51859,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -53612,40 +51868,38 @@ _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 - if test x"$enable_svgdec" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&5 +$as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&2;} fi 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 - if test x"$enable_svgdec" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&5 +$as_echo "$as_me: WARNING: Library librsvg-2.0 >= 2.9.0 cairo >= 1.13.1 needed for svgdec was not found" >&2;} fi else - 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 + SVGDEC_CFLAGS=$pkg_cv_SVGDEC_CFLAGS + SVGDEC_LIBS=$pkg_cv_SVGDEC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_svgdec=yes LTLIBsvgdec=libsvgdec_plugin.la @@ -53683,17 +51937,15 @@ # Check whether --enable-directx was given. -if test ${enable_directx+y} -then : +if test "${enable_directx+set}" = set; then : enableval=$enable_directx; -else $as_nop +else - if test "${SYS}" = "mingw32" -then : + if test "${SYS}" = "mingw32"; then : enable_directx="yes" -else $as_nop +else enable_directx="no" @@ -53701,15 +51953,15 @@ fi -if test "${enable_directx}" != "no" -then : +if test "${enable_directx}" != "no"; then : - for ac_header in ddraw.h + for ac_header in ddraw.h do : - ac_fn_c_check_header_compile "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "$ac_includes_default" -if test "x$ac_cv_header_ddraw_h" = xyes -then : - printf "%s\n" "#define HAVE_DDRAW_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "$ac_includes_default" +if test "x$ac_cv_header_ddraw_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DDRAW_H 1 +_ACEOF @@ -53722,16 +51974,18 @@ done - for ac_header in GL/wglew.h + + for ac_header in GL/wglew.h do : ac_fn_c_check_header_compile "$LINENO" "GL/wglew.h" "ac_cv_header_GL_wglew_h" " #include #include " -if test "x$ac_cv_header_GL_wglew_h" = xyes -then : - printf "%s\n" "#define HAVE_GL_WGLEW_H 1" >>confdefs.h +if test "x$ac_cv_header_GL_wglew_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GL_WGLEW_H 1 +_ACEOF @@ -53747,19 +52001,22 @@ done - for ac_header in d3d11.h + + for ac_header in d3d11.h do : - ac_fn_c_check_header_compile "$LINENO" "d3d11.h" "ac_cv_header_d3d11_h" "$ac_includes_default" -if test "x$ac_cv_header_d3d11_h" = xyes -then : - printf "%s\n" "#define HAVE_D3D11_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "d3d11.h" "ac_cv_header_d3d11_h" "$ac_includes_default" +if test "x$ac_cv_header_d3d11_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_D3D11_H 1 +_ACEOF ac_fn_c_check_type "$LINENO" "D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS" "ac_cv_type_D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS" "#include " -if test "x$ac_cv_type_D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS" = xyes -then : +if test "x$ac_cv_type_D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS" = xyes; then : -printf "%s\n" "#define HAVE_D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS 1 +_ACEOF fi @@ -53778,12 +52035,14 @@ done - for ac_header in d3d9.h + + for ac_header in d3d9.h do : - ac_fn_c_check_header_compile "$LINENO" "d3d9.h" "ac_cv_header_d3d9_h" "$ac_includes_default" -if test "x$ac_cv_header_d3d9_h" = xyes -then : - printf "%s\n" "#define HAVE_D3D9_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "d3d9.h" "ac_cv_header_d3d9_h" "$ac_includes_default" +if test "x$ac_cv_header_d3d9_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_D3D9_H 1 +_ACEOF @@ -53791,13 +52050,18 @@ - ac_fn_c_check_header_compile "$LINENO" "d3dx9effect.h" "ac_cv_header_d3dx9effect_h" "$ac_includes_default" -if test "x$ac_cv_header_d3dx9effect_h" = xyes -then : - printf "%s\n" "#define HAVE_D3DX9EFFECT_H 1" >>confdefs.h + for ac_header in d3dx9effect.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "d3dx9effect.h" "ac_cv_header_d3dx9effect_h" "$ac_includes_default" +if test "x$ac_cv_header_d3dx9effect_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_D3DX9EFFECT_H 1 +_ACEOF fi +done + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -53809,7 +52073,7 @@ #endif int -main (void) +main () { ; ; @@ -53817,8 +52081,7 @@ } _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : @@ -53827,9 +52090,9 @@ -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Could not find required IDirectXVideoDecoder in dxva2api.h" >&5 -printf "%s\n" "$as_me: WARNING: Could not find required IDirectXVideoDecoder in dxva2api.h" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find required IDirectXVideoDecoder in dxva2api.h" >&5 +$as_echo "$as_me: WARNING: Could not find required IDirectXVideoDecoder in dxva2api.h" >&2;} fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -53838,11 +52101,11 @@ done + fi -ac_fn_c_check_header_compile "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_fb_h" = xyes -then : +ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_fb_h" = xyes; then : @@ -53855,22 +52118,22 @@ + # Check whether --enable-aa was given. -if test ${enable_aa+y} -then : +if test "${enable_aa+set}" = set; then : enableval=$enable_aa; fi if test "${enable_aa}" = "yes" then - ac_fn_c_check_header_compile "$LINENO" "aalib.h" "ac_cv_header_aalib_h" "$ac_includes_default" -if test "x$ac_cv_header_aalib_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "aalib.h" "ac_cv_header_aalib_h" "$ac_includes_default" +if test "x$ac_cv_header_aalib_h" = xyes; then : have_aa="true" -else $as_nop +else have_aa="false" fi + if test "${have_aa}" = "true" then @@ -53899,10 +52162,9 @@ # Check whether --enable-caca was given. -if test ${enable_caca+y} -then : +if test "${enable_caca+set}" = set; then : enableval=$enable_caca; -else $as_nop +else enable_caca=auto fi @@ -53911,17 +52173,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for caca >= 0.99.beta14" >&5 -printf %s "checking for caca >= 0.99.beta14... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CACA" >&5 +$as_echo_n "checking for CACA... " >&6; } if test -n "$CACA_CFLAGS"; then pkg_cv_CACA_CFLAGS="$CACA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5 ($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta14") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CACA_CFLAGS=`$PKG_CONFIG --cflags "caca >= 0.99.beta14" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53935,10 +52197,10 @@ pkg_cv_CACA_LIBS="$CACA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5 ($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta14") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CACA_LIBS=`$PKG_CONFIG --libs "caca >= 0.99.beta14" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -53952,8 +52214,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -53961,38 +52223,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5 +$as_echo "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5 +$as_echo "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;} fi else - 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 + CACA_CFLAGS=$pkg_cv_CACA_CFLAGS + CACA_LIBS=$pkg_cv_CACA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBcaca=libcaca_plugin.la @@ -54013,17 +52273,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for caca >= 0.99.beta14" >&5 -printf %s "checking for caca >= 0.99.beta14... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CACA" >&5 +$as_echo_n "checking for CACA... " >&6; } if test -n "$CACA_CFLAGS"; then pkg_cv_CACA_CFLAGS="$CACA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5 ($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta14") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CACA_CFLAGS=`$PKG_CONFIG --cflags "caca >= 0.99.beta14" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54037,10 +52297,10 @@ pkg_cv_CACA_LIBS="$CACA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta14\""; } >&5 ($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta14") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CACA_LIBS=`$PKG_CONFIG --libs "caca >= 0.99.beta14" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54054,8 +52314,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -54063,40 +52323,38 @@ _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 - if test x"$enable_caca" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5 +$as_echo "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;} fi 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 - if test x"$enable_caca" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&5 +$as_echo "$as_me: WARNING: Library caca >= 0.99.beta14 needed for caca was not found" >&2;} fi else - 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 + CACA_CFLAGS=$pkg_cv_CACA_CFLAGS + CACA_LIBS=$pkg_cv_CACA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_caca=yes LTLIBcaca=libcaca_plugin.la @@ -54133,13 +52391,11 @@ # Check whether --enable-kva was given. -if test ${enable_kva+y} -then : +if test "${enable_kva+set}" = set; then : enableval=$enable_kva; -else $as_nop +else - if test "$SYS" = "os2" -then : + if test "$SYS" = "os2"; then : enable_kva="yes" @@ -54149,23 +52405,22 @@ have_kva="no" KVA_LIBS="" -if test "$enable_kva" != "no" -then : +if test "$enable_kva" != "no"; then : - for ac_header in kva.h + for ac_header in kva.h do : - ac_fn_c_check_header_compile "$LINENO" "kva.h" "ac_cv_header_kva_h" "$ac_includes_default" -if test "x$ac_cv_header_kva_h" = xyes -then : - printf "%s\n" "#define HAVE_KVA_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "kva.h" "ac_cv_header_kva_h" "$ac_includes_default" +if test "x$ac_cv_header_kva_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KVA_H 1 +_ACEOF have_kva="yes" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lkva" >&5 -printf %s "checking for main in -lkva... " >&6; } -if test ${ac_cv_lib_kva_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkva" >&5 +$as_echo_n "checking for main in -lkva... " >&6; } +if ${ac_cv_lib_kva_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lkva $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -54173,27 +52428,25 @@ int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_kva_main=yes -else $as_nop +else ac_cv_lib_kva_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kva_main" >&5 -printf "%s\n" "$ac_cv_lib_kva_main" >&6; } -if test "x$ac_cv_lib_kva_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kva_main" >&5 +$as_echo "$ac_cv_lib_kva_main" >&6; } +if test "x$ac_cv_lib_kva_main" = xyes; then : KVA_LIBS="-lkva" @@ -54204,6 +52457,7 @@ done + fi if test "${have_kva}" = "yes"; then @@ -54216,8 +52470,7 @@ # Check whether --enable-mmal was given. -if test ${enable_mmal+y} -then : +if test "${enable_mmal+set}" = set; then : enableval=$enable_mmal; fi @@ -54232,18 +52485,18 @@ LDFLAGS="${LDFLAGS} -L/opt/vc/lib -lvchostif" CPPFLAGS="${CPPFLAGS} -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux" - for ac_header in interface/mmal/mmal.h + for ac_header in interface/mmal/mmal.h do : - ac_fn_c_check_header_compile "$LINENO" "interface/mmal/mmal.h" "ac_cv_header_interface_mmal_mmal_h" "$ac_includes_default" -if test "x$ac_cv_header_interface_mmal_mmal_h" = xyes -then : - printf "%s\n" "#define HAVE_INTERFACE_MMAL_MMAL_H 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vc_tv_unregister_callback_full in -lbcm_host" >&5 -printf %s "checking for vc_tv_unregister_callback_full in -lbcm_host... " >&6; } -if test ${ac_cv_lib_bcm_host_vc_tv_unregister_callback_full+y} -then : - printf %s "(cached) " >&6 -else $as_nop + ac_fn_c_check_header_mongrel "$LINENO" "interface/mmal/mmal.h" "ac_cv_header_interface_mmal_mmal_h" "$ac_includes_default" +if test "x$ac_cv_header_interface_mmal_mmal_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_INTERFACE_MMAL_MMAL_H 1 +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vc_tv_unregister_callback_full in -lbcm_host" >&5 +$as_echo_n "checking for vc_tv_unregister_callback_full in -lbcm_host... " >&6; } +if ${ac_cv_lib_bcm_host_vc_tv_unregister_callback_full+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lbcm_host $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -54252,29 +52505,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char vc_tv_unregister_callback_full (); int -main (void) +main () { return vc_tv_unregister_callback_full (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bcm_host_vc_tv_unregister_callback_full=yes -else $as_nop +else ac_cv_lib_bcm_host_vc_tv_unregister_callback_full=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bcm_host_vc_tv_unregister_callback_full" >&5 -printf "%s\n" "$ac_cv_lib_bcm_host_vc_tv_unregister_callback_full" >&6; } -if test "x$ac_cv_lib_bcm_host_vc_tv_unregister_callback_full" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bcm_host_vc_tv_unregister_callback_full" >&5 +$as_echo "$ac_cv_lib_bcm_host_vc_tv_unregister_callback_full" >&6; } +if test "x$ac_cv_lib_bcm_host_vc_tv_unregister_callback_full" = xyes; then : have_mmal="yes" @@ -54301,31 +52555,30 @@ -else $as_nop +else - if test "${enable_mmal}" = "yes" -then : + if test "${enable_mmal}" = "yes"; then : as_fn_error $? "Cannot find bcm library..." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find bcm library..." >&5 -printf "%s\n" "$as_me: WARNING: Cannot find bcm library..." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find bcm library..." >&5 +$as_echo "$as_me: WARNING: Cannot find bcm library..." >&2;} fi fi -else $as_nop - if test "${enable_mmal}" = "yes" -then : +else + if test "${enable_mmal}" = "yes"; then : as_fn_error $? "Cannot find development headers for mmal..." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find development headers for mmal..." >&5 -printf "%s\n" "$as_me: WARNING: Cannot find development headers for mmal..." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find development headers for mmal..." >&5 +$as_echo "$as_me: WARNING: Cannot find development headers for mmal..." >&2;} fi fi done + CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" CXXFLAGS="${CXXFLAGS_save}" @@ -54344,28 +52597,26 @@ # Check whether --enable-evas was given. -if test ${enable_evas+y} -then : +if test "${enable_evas+set}" = set; then : enableval=$enable_evas; fi have_evas="no" -if test "${enable_evas}" = "yes" -then : +if test "${enable_evas}" = "yes"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for evas >= 1.15.99 ecore >= 1.15.99" >&5 -printf %s "checking for evas >= 1.15.99 ecore >= 1.15.99... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVAS" >&5 +$as_echo_n "checking for EVAS... " >&6; } if test -n "$EVAS_CFLAGS"; then pkg_cv_EVAS_CFLAGS="$EVAS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.15.99 ecore >= 1.15.99\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.15.99 ecore >= 1.15.99\""; } >&5 ($PKG_CONFIG --exists --print-errors "evas >= 1.15.99 ecore >= 1.15.99") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.15.99 ecore >= 1.15.99" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54379,10 +52630,10 @@ pkg_cv_EVAS_LIBS="$EVAS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.15.99 ecore >= 1.15.99\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.15.99 ecore >= 1.15.99\""; } >&5 ($PKG_CONFIG --exists --print-errors "evas >= 1.15.99 ecore >= 1.15.99") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.15.99 ecore >= 1.15.99" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54396,8 +52647,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -54405,41 +52656,39 @@ _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" -then : + if test "x${enable_evas}" != "x"; then : as_fn_error $? "$EVAS_PKG_ERRORS. libevas and libecore 1.15.99 or later required." "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "x${enable_evas}" != "x" -then : + if test "x${enable_evas}" != "x"; then : as_fn_error $? "$EVAS_PKG_ERRORS. libevas and libecore 1.15.99 or later required." "$LINENO" 5 fi else - 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; } + EVAS_CFLAGS=$pkg_cv_EVAS_CFLAGS + EVAS_LIBS=$pkg_cv_EVAS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_evas="yes" -printf "%s\n" "#define HAVE_EVAS 1" >>confdefs.h +$as_echo "#define HAVE_EVAS 1" >>confdefs.h fi @@ -54458,28 +52707,26 @@ # Check whether --enable-pulse was given. -if test ${enable_pulse+y} -then : +if test "${enable_pulse+set}" = set; then : enableval=$enable_pulse; fi have_pulse="no" -if test "${enable_pulse}" != "no" -then : +if test "${enable_pulse}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpulse >= 1.0" >&5 -printf %s "checking for libpulse >= 1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5 +$as_echo_n "checking for PULSE... " >&6; } if test -n "$PULSE_CFLAGS"; then pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpulse >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54493,10 +52740,10 @@ pkg_cv_PULSE_LIBS="$PULSE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpulse >= 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54510,8 +52757,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -54519,37 +52766,35 @@ _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" -then : + if test "x${enable_pulse}" != "x"; then : as_fn_error $? "$PULSE_PKG_ERRORS. PulseAudio 1.0 or later required." "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "x${enable_pulse}" != "x" -then : + if test "x${enable_pulse}" != "x"; then : as_fn_error $? "$PULSE_PKG_ERRORS. PulseAudio 1.0 or later required." "$LINENO" 5 fi else - 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; } + PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS + PULSE_LIBS=$pkg_cv_PULSE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_pulse="yes" @@ -54566,13 +52811,11 @@ # Check whether --enable-alsa was given. -if test ${enable_alsa+y} -then : +if test "${enable_alsa+set}" = set; then : enableval=$enable_alsa; -else $as_nop +else - if test "$SYS" = "linux" -a "${have_pulse}" = "no" -then : + if test "$SYS" = "linux" -a "${have_pulse}" = "no"; then : enable_alsa="yes" @@ -54581,22 +52824,21 @@ fi have_alsa="no" -if test "${enable_alsa}" != "no" -then : +if test "${enable_alsa}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alsa >= 1.0.24" >&5 -printf %s "checking for alsa >= 1.0.24... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5 +$as_echo_n "checking for ALSA... " >&6; } if test -n "$ALSA_CFLAGS"; then pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.24\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.24\""; } >&5 ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.24") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.24" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54610,10 +52852,10 @@ pkg_cv_ALSA_LIBS="$ALSA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.24\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.24\""; } >&5 ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.24") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.24" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54627,8 +52869,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -54636,37 +52878,35 @@ _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" -then : + if test "x${enable_alsa}" != "x"; then : as_fn_error $? "$ALSA_PKG_ERRORS. alsa-lib 1.0.24 or later required. Pass --disable-alsa to ignore this error." "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "x${enable_alsa}" != "x" -then : + if test "x${enable_alsa}" != "x"; then : as_fn_error $? "$ALSA_PKG_ERRORS. alsa-lib 1.0.24 or later required. Pass --disable-alsa to ignore this error." "$LINENO" 5 fi else - 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; } + ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS + ALSA_LIBS=$pkg_cv_ALSA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_alsa="yes" @@ -54683,13 +52923,11 @@ # Check whether --enable-oss was given. -if test ${enable_oss+y} -then : +if test "${enable_oss+set}" = set; then : enableval=$enable_oss; -else $as_nop +else - if test "$SYS" = "mingw32" -o "$SYS" = "linux" -o "$SYS" = "openbsd" -then : + if test "$SYS" = "mingw32" -o "$SYS" = "linux" -o "$SYS" = "openbsd"; then : enable_oss="no" @@ -54699,26 +52937,23 @@ have_oss="no" OSS_LIBS="" -if test "$enable_oss" != "no" -then : +if test "$enable_oss" != "no"; then : - for ac_header in soundcard.h sys/soundcard.h + for ac_header in soundcard.h sys/soundcard.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF have_oss="yes" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lossaudio" >&5 -printf %s "checking for main in -lossaudio... " >&6; } -if test ${ac_cv_lib_ossaudio_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lossaudio" >&5 +$as_echo_n "checking for main in -lossaudio... " >&6; } +if ${ac_cv_lib_ossaudio_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lossaudio $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -54726,27 +52961,25 @@ int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ossaudio_main=yes -else $as_nop +else ac_cv_lib_ossaudio_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_main" >&5 -printf "%s\n" "$ac_cv_lib_ossaudio_main" >&6; } -if test "x$ac_cv_lib_ossaudio_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_main" >&5 +$as_echo "$ac_cv_lib_ossaudio_main" >&6; } +if test "x$ac_cv_lib_ossaudio_main" = xyes; then : OSS_LIBS="-lossaudio" @@ -54757,6 +52990,7 @@ done + fi if test "${have_oss}" = "yes"; then @@ -54769,13 +53003,11 @@ # Check whether --enable-sndio was given. -if test ${enable_sndio+y} -then : +if test "${enable_sndio+set}" = set; then : enableval=$enable_sndio; -else $as_nop +else - if test "$SYS" = "openbsd" -then : + if test "$SYS" = "openbsd"; then : enable_sndio="yes" @@ -54784,22 +53016,21 @@ fi have_sndio="no" -if test "$enable_sndio" != "no" -then : +if test "$enable_sndio" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sndio" >&5 -printf %s "checking for sndio... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDIO" >&5 +$as_echo_n "checking for SNDIO... " >&6; } if test -n "$SNDIO_CFLAGS"; then pkg_cv_SNDIO_CFLAGS="$SNDIO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio\""; } >&5 ($PKG_CONFIG --exists --print-errors "sndio") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SNDIO_CFLAGS=`$PKG_CONFIG --cflags "sndio" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54813,10 +53044,10 @@ pkg_cv_SNDIO_LIBS="$SNDIO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio\""; } >&5 ($PKG_CONFIG --exists --print-errors "sndio") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SNDIO_LIBS=`$PKG_CONFIG --libs "sndio" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54830,8 +53061,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -54839,37 +53070,35 @@ _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" -then : + if test -n "$enable_sndio"; then : as_fn_error $? "${SNDIO_PKG_ERRORS}.)" "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "$enable_sndio" -then : + if test -n "$enable_sndio"; then : as_fn_error $? "${SNDIO_PKG_ERRORS}.)" "$LINENO" 5 fi else - 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; } + SNDIO_CFLAGS=$pkg_cv_SNDIO_CFLAGS + SNDIO_LIBS=$pkg_cv_SNDIO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_sndio="yes" @@ -54886,25 +53115,21 @@ # Check whether --enable-wasapi was given. -if test ${enable_wasapi+y} -then : +if test "${enable_wasapi+set}" = set; then : enableval=$enable_wasapi; fi have_wasapi="no" -if test "$enable_wasapi" != "no" -then : +if test "$enable_wasapi" != "no"; then : - ac_fn_c_check_header_compile "$LINENO" "audioclient.h" "ac_cv_header_audioclient_h" "$ac_includes_default" -if test "x$ac_cv_header_audioclient_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "audioclient.h" "ac_cv_header_audioclient_h" "$ac_includes_default" +if test "x$ac_cv_header_audioclient_h" = xyes; then : have_wasapi="yes" -else $as_nop +else - if test "x${enable_wasapi}" != "x" -then : + if test "x${enable_wasapi}" != "x"; then : as_fn_error $? "Windows Audio Session API not found." "$LINENO" 5 @@ -54913,6 +53138,7 @@ fi + fi if test "${have_wasapi}" = "yes"; then HAVE_WASAPI_TRUE= @@ -54924,28 +53150,26 @@ # Check whether --enable-jack was given. -if test ${enable_jack+y} -then : +if test "${enable_jack+set}" = set; then : enableval=$enable_jack; fi have_jack="no" -if test "${enable_jack}" != "no" -then : +if test "${enable_jack}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jack >= 1.9.7" >&5 -printf %s "checking for jack >= 1.9.7... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 +$as_echo_n "checking for JACK... " >&6; } if test -n "$JACK_CFLAGS"; then pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "jack >= 1.9.7") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 1.9.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54959,10 +53183,10 @@ pkg_cv_JACK_LIBS="$JACK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "jack >= 1.9.7") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 1.9.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -54976,8 +53200,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -54985,30 +53209,30 @@ _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 -printf "%s\n" "$as_me: WARNING: ${JACK_PKG_ERRORS}, trying jack1 instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}, trying jack1 instead" >&5 +$as_echo "$as_me: WARNING: ${JACK_PKG_ERRORS}, trying jack1 instead" >&2;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jack >= 0.120.1 jack < 1.0" >&5 -printf %s "checking for jack >= 0.120.1 jack < 1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 +$as_echo_n "checking for JACK... " >&6; } if test -n "$JACK_CFLAGS"; then pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "jack >= 0.120.1 jack < 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.120.1 jack < 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55022,10 +53246,10 @@ pkg_cv_JACK_LIBS="$JACK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "jack >= 0.120.1 jack < 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.120.1 jack < 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55039,8 +53263,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -55048,62 +53272,60 @@ _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}" -then : + if test -n "${enable_jack}"; then : as_fn_error $? "${JACK_PKG_ERRORS}." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${JACK_PKG_ERRORS}." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${JACK_PKG_ERRORS}." >&2;} fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_jack}" -then : + if test -n "${enable_jack}"; then : as_fn_error $? "${JACK_PKG_ERRORS}." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${JACK_PKG_ERRORS}." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${JACK_PKG_ERRORS}." >&2;} fi else - 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 + JACK_CFLAGS=$pkg_cv_JACK_CFLAGS + JACK_LIBS=$pkg_cv_JACK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_jack=yes fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}, trying jack1 instead" >&5 -printf "%s\n" "$as_me: WARNING: ${JACK_PKG_ERRORS}, trying jack1 instead" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}, trying jack1 instead" >&5 +$as_echo "$as_me: WARNING: ${JACK_PKG_ERRORS}, trying jack1 instead" >&2;} pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jack >= 0.120.1 jack < 1.0" >&5 -printf %s "checking for jack >= 0.120.1 jack < 1.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 +$as_echo_n "checking for JACK... " >&6; } if test -n "$JACK_CFLAGS"; then pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "jack >= 0.120.1 jack < 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.120.1 jack < 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55117,10 +53339,10 @@ pkg_cv_JACK_LIBS="$JACK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "jack >= 0.120.1 jack < 1.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.120.1 jack < 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55134,8 +53356,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -55143,48 +53365,46 @@ _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}" -then : + if test -n "${enable_jack}"; then : as_fn_error $? "${JACK_PKG_ERRORS}." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${JACK_PKG_ERRORS}." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${JACK_PKG_ERRORS}." >&2;} fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_jack}" -then : + if test -n "${enable_jack}"; then : as_fn_error $? "${JACK_PKG_ERRORS}." "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${JACK_PKG_ERRORS}." >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${JACK_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${JACK_PKG_ERRORS}." >&2;} fi else - 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 + JACK_CFLAGS=$pkg_cv_JACK_CFLAGS + JACK_LIBS=$pkg_cv_JACK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_jack=yes fi else - 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 + JACK_CFLAGS=$pkg_cv_JACK_CFLAGS + JACK_LIBS=$pkg_cv_JACK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_jack=yes fi fi @@ -55198,41 +53418,40 @@ # Check whether --enable-opensles was given. -if test ${enable_opensles+y} -then : +if test "${enable_opensles+set}" = set; then : enableval=$enable_opensles; fi if test "${HAVE_ANDROID}" = "1"; then if test "${enable_opensles}" = "yes"; then - for ac_header in SLES/OpenSLES.h + for ac_header in SLES/OpenSLES.h do : - ac_fn_c_check_header_compile "$LINENO" "SLES/OpenSLES.h" "ac_cv_header_SLES_OpenSLES_h" "$ac_includes_default" -if test "x$ac_cv_header_SLES_OpenSLES_h" = xyes -then : - printf "%s\n" "#define HAVE_SLES_OPENSLES_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "SLES/OpenSLES.h" "ac_cv_header_SLES_OpenSLES_h" "$ac_includes_default" +if test "x$ac_cv_header_SLES_OpenSLES_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SLES_OPENSLES_H 1 +_ACEOF LTLIBopensles_android=libopensles_android_plugin.la -else $as_nop +else as_fn_error $? "cannot find OpenSLES headers" "$LINENO" 5 fi done + fi fi # Check whether --enable-tizen_audio was given. -if test ${enable_tizen_audio+y} -then : +if test "${enable_tizen_audio+set}" = set; then : enableval=$enable_tizen_audio; -else $as_nop +else - if test "$HAVE_TIZEN" = "1" -then : + if test "$HAVE_TIZEN" = "1"; then : enable_tizen_audio="yes" @@ -55241,23 +53460,25 @@ fi if test "${enable_tizen_audio}" = "yes"; then - for ac_header in audio_io.h + for ac_header in audio_io.h do : - ac_fn_c_check_header_compile "$LINENO" "audio_io.h" "ac_cv_header_audio_io_h" "$ac_includes_default" -if test "x$ac_cv_header_audio_io_h" = xyes -then : - printf "%s\n" "#define HAVE_AUDIO_IO_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "audio_io.h" "ac_cv_header_audio_io_h" "$ac_includes_default" +if test "x$ac_cv_header_audio_io_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_AUDIO_IO_H 1 +_ACEOF LTLIBtizen_audio=libtizen_audio_plugin.la -else $as_nop +else as_fn_error $? "cannot find Tizen audio_io headers" "$LINENO" 5 fi done + fi @@ -55277,10 +53498,9 @@ # Check whether --enable-samplerate was given. -if test ${enable_samplerate+y} -then : +if test "${enable_samplerate+set}" = set; then : enableval=$enable_samplerate; -else $as_nop +else enable_samplerate=auto fi @@ -55289,17 +53509,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for samplerate" >&5 -printf %s "checking for samplerate... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5 +$as_echo_n "checking for SAMPLERATE... " >&6; } if test -n "$SAMPLERATE_CFLAGS"; then pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5 ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55313,10 +53533,10 @@ pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5 ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55330,8 +53550,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -55339,38 +53559,36 @@ _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" -then : + if test x"$enable_samplerate" = "xyes"; then : as_fn_error $? "Library samplerate needed for samplerate was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library samplerate needed for samplerate was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library samplerate needed for samplerate was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library samplerate needed for samplerate was not found" >&5 +$as_echo "$as_me: WARNING: Library samplerate needed for samplerate was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_samplerate" = "xyes"; then : as_fn_error $? "Library samplerate needed for samplerate was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library samplerate needed for samplerate was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library samplerate needed for samplerate was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library samplerate needed for samplerate was not found" >&5 +$as_echo "$as_me: WARNING: Library samplerate needed for samplerate was not found" >&2;} fi else - 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 + SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS + SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBsamplerate=libsamplerate_plugin.la @@ -55391,17 +53609,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for samplerate" >&5 -printf %s "checking for samplerate... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5 +$as_echo_n "checking for SAMPLERATE... " >&6; } if test -n "$SAMPLERATE_CFLAGS"; then pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5 ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55415,10 +53633,10 @@ pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5 ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55432,8 +53650,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -55441,40 +53659,38 @@ _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 - if test x"$enable_samplerate" = "xyes" -then : + enable_samplerate=no + if test x"$enable_samplerate" = "xyes"; then : as_fn_error $? "Library samplerate needed for samplerate was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library samplerate needed for samplerate was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library samplerate needed for samplerate was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library samplerate needed for samplerate was not found" >&5 +$as_echo "$as_me: WARNING: Library samplerate needed for samplerate was not found" >&2;} fi 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 - if test x"$enable_samplerate" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_samplerate=no + if test x"$enable_samplerate" = "xyes"; then : as_fn_error $? "Library samplerate needed for samplerate was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library samplerate needed for samplerate was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library samplerate needed for samplerate was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library samplerate needed for samplerate was not found" >&5 +$as_echo "$as_me: WARNING: Library samplerate needed for samplerate was not found" >&2;} fi else - 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 + SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS + SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_samplerate=yes LTLIBsamplerate=libsamplerate_plugin.la @@ -55527,10 +53743,9 @@ # Check whether --enable-soxr was given. -if test ${enable_soxr+y} -then : +if test "${enable_soxr+set}" = set; then : enableval=$enable_soxr; -else $as_nop +else enable_soxr=auto fi @@ -55539,17 +53754,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for soxr >= 0.1.2" >&5 -printf %s "checking for soxr >= 0.1.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOXR" >&5 +$as_echo_n "checking for SOXR... " >&6; } if test -n "$SOXR_CFLAGS"; then pkg_cv_SOXR_CFLAGS="$SOXR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "soxr >= 0.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SOXR_CFLAGS=`$PKG_CONFIG --cflags "soxr >= 0.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55563,10 +53778,10 @@ pkg_cv_SOXR_LIBS="$SOXR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "soxr >= 0.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SOXR_LIBS=`$PKG_CONFIG --libs "soxr >= 0.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55580,8 +53795,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -55589,38 +53804,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&5 +$as_echo "$as_me: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&5 +$as_echo "$as_me: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&2;} fi else - 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 + SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS + SOXR_LIBS=$pkg_cv_SOXR_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBsoxr=libsoxr_plugin.la @@ -55641,17 +53854,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for soxr >= 0.1.2" >&5 -printf %s "checking for soxr >= 0.1.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOXR" >&5 +$as_echo_n "checking for SOXR... " >&6; } if test -n "$SOXR_CFLAGS"; then pkg_cv_SOXR_CFLAGS="$SOXR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "soxr >= 0.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SOXR_CFLAGS=`$PKG_CONFIG --cflags "soxr >= 0.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55665,10 +53878,10 @@ pkg_cv_SOXR_LIBS="$SOXR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "soxr >= 0.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SOXR_LIBS=`$PKG_CONFIG --libs "soxr >= 0.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55682,8 +53895,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -55691,40 +53904,38 @@ _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 - if test x"$enable_soxr" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&5 +$as_echo "$as_me: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&2;} fi 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 - if test x"$enable_soxr" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&5 +$as_echo "$as_me: WARNING: Library soxr >= 0.1.2 needed for soxr was not found" >&2;} fi else - 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 + SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS + SOXR_LIBS=$pkg_cv_SOXR_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_soxr=yes LTLIBsoxr=libsoxr_plugin.la @@ -55761,13 +53972,11 @@ # Check whether --enable-kai was given. -if test ${enable_kai+y} -then : +if test "${enable_kai+set}" = set; then : enableval=$enable_kai; -else $as_nop +else - if test "$SYS" = "os2" -then : + if test "$SYS" = "os2"; then : enable_kai="yes" @@ -55777,23 +53986,22 @@ have_kai="no" KAI_LIBS="" -if test "$enable_kai" != "no" -then : +if test "$enable_kai" != "no"; then : - for ac_header in kai.h + for ac_header in kai.h do : - ac_fn_c_check_header_compile "$LINENO" "kai.h" "ac_cv_header_kai_h" "$ac_includes_default" -if test "x$ac_cv_header_kai_h" = xyes -then : - printf "%s\n" "#define HAVE_KAI_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "kai.h" "ac_cv_header_kai_h" "$ac_includes_default" +if test "x$ac_cv_header_kai_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KAI_H 1 +_ACEOF have_kai="yes" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lkai" >&5 -printf %s "checking for main in -lkai... " >&6; } -if test ${ac_cv_lib_kai_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkai" >&5 +$as_echo_n "checking for main in -lkai... " >&6; } +if ${ac_cv_lib_kai_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lkai $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -55801,27 +54009,25 @@ int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_kai_main=yes -else $as_nop +else ac_cv_lib_kai_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kai_main" >&5 -printf "%s\n" "$ac_cv_lib_kai_main" >&6; } -if test "x$ac_cv_lib_kai_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kai_main" >&5 +$as_echo "$ac_cv_lib_kai_main" >&6; } +if test "x$ac_cv_lib_kai_main" = xyes; then : KAI_LIBS="-lkai" @@ -55832,6 +54038,7 @@ done + fi if test "${have_kai}" = "yes"; then @@ -55857,10 +54064,9 @@ # Check whether --enable-chromaprint was given. -if test ${enable_chromaprint+y} -then : +if test "${enable_chromaprint+set}" = set; then : enableval=$enable_chromaprint; -else $as_nop +else enable_chromaprint=auto fi @@ -55869,17 +54075,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libchromaprint >= 0.6.0" >&5 -printf %s "checking for libchromaprint >= 0.6.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHROMAPRINT" >&5 +$as_echo_n "checking for CHROMAPRINT... " >&6; } if test -n "$CHROMAPRINT_CFLAGS"; then pkg_cv_CHROMAPRINT_CFLAGS="$CHROMAPRINT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libchromaprint >= 0.6.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libchromaprint >= 0.6.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libchromaprint >= 0.6.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHROMAPRINT_CFLAGS=`$PKG_CONFIG --cflags "libchromaprint >= 0.6.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55893,10 +54099,10 @@ pkg_cv_CHROMAPRINT_LIBS="$CHROMAPRINT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libchromaprint >= 0.6.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libchromaprint >= 0.6.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libchromaprint >= 0.6.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHROMAPRINT_LIBS=`$PKG_CONFIG --libs "libchromaprint >= 0.6.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55910,8 +54116,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -55919,38 +54125,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&5 +$as_echo "$as_me: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&5 +$as_echo "$as_me: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&2;} fi else - 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 + CHROMAPRINT_CFLAGS=$pkg_cv_CHROMAPRINT_CFLAGS + CHROMAPRINT_LIBS=$pkg_cv_CHROMAPRINT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBstream_out_chromaprint=libstream_out_chromaprint_plugin.la @@ -55958,17 +54162,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libchromaprint >= 0.6.0" >&5 -printf %s "checking for libchromaprint >= 0.6.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHROMAPRINT" >&5 +$as_echo_n "checking for CHROMAPRINT... " >&6; } if test -n "$CHROMAPRINT_CFLAGS"; then pkg_cv_CHROMAPRINT_CFLAGS="$CHROMAPRINT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libchromaprint >= 0.6.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libchromaprint >= 0.6.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libchromaprint >= 0.6.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHROMAPRINT_CFLAGS=`$PKG_CONFIG --cflags "libchromaprint >= 0.6.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55982,10 +54186,10 @@ pkg_cv_CHROMAPRINT_LIBS="$CHROMAPRINT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libchromaprint >= 0.6.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libchromaprint >= 0.6.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libchromaprint >= 0.6.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHROMAPRINT_LIBS=`$PKG_CONFIG --libs "libchromaprint >= 0.6.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55999,8 +54203,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56008,40 +54212,38 @@ _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 - if test "${enable_chromaprint}" = "yes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&5 +$as_echo "$as_me: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&2;} fi 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 - if test "${enable_chromaprint}" = "yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&5 +$as_echo "$as_me: WARNING: Library libchromaprint >= 0.6.0 needed for chromaprint was not found" >&2;} fi else - 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 + CHROMAPRINT_CFLAGS=$pkg_cv_CHROMAPRINT_CFLAGS + CHROMAPRINT_LIBS=$pkg_cv_CHROMAPRINT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_chromaprint=yes LTLIBstream_out_chromaprint=libstream_out_chromaprint_plugin.la @@ -56066,12 +54268,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_PROTOC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PROTOC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$PROTOC"; then ac_cv_prog_PROTOC="$PROTOC" # Let the user override the test. else @@ -56079,15 +54280,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PROTOC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -56098,11 +54295,11 @@ fi PROTOC=$ac_cv_prog_PROTOC if test -n "$PROTOC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROTOC" >&5 -printf "%s\n" "$PROTOC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROTOC" >&5 +$as_echo "$PROTOC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -56123,10 +54320,9 @@ # Check whether --enable-chromecast was given. -if test ${enable_chromecast+y} -then : +if test "${enable_chromecast+set}" = set; then : enableval=$enable_chromecast; -else $as_nop +else enable_chromecast=auto fi @@ -56135,17 +54331,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for protobuf-lite >= 2.5.0" >&5 -printf %s "checking for protobuf-lite >= 2.5.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHROMECAST" >&5 +$as_echo_n "checking for CHROMECAST... " >&6; } if test -n "$CHROMECAST_CFLAGS"; then pkg_cv_CHROMECAST_CFLAGS="$CHROMECAST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf-lite >= 2.5.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf-lite >= 2.5.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "protobuf-lite >= 2.5.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHROMECAST_CFLAGS=`$PKG_CONFIG --cflags "protobuf-lite >= 2.5.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56159,10 +54355,10 @@ pkg_cv_CHROMECAST_LIBS="$CHROMECAST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf-lite >= 2.5.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf-lite >= 2.5.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "protobuf-lite >= 2.5.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHROMECAST_LIBS=`$PKG_CONFIG --libs "protobuf-lite >= 2.5.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56176,8 +54372,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56185,47 +54381,44 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&5 +$as_echo "$as_me: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&2;} fi enable_chromecast="no" 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&5 +$as_echo "$as_me: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&2;} fi enable_chromecast="no" else - 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" -then : + CHROMECAST_CFLAGS=$pkg_cv_CHROMECAST_CFLAGS + CHROMECAST_LIBS=$pkg_cv_CHROMECAST_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + if test "x${PROTOC}" != "xno"; then : build_chromecast="yes" -else $as_nop +else as_fn_error $? "protoc compiler needed for chromecast was not found" "$LINENO" 5 @@ -56235,17 +54428,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for protobuf-lite >= 2.5.0" >&5 -printf %s "checking for protobuf-lite >= 2.5.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHROMECAST" >&5 +$as_echo_n "checking for CHROMECAST... " >&6; } if test -n "$CHROMECAST_CFLAGS"; then pkg_cv_CHROMECAST_CFLAGS="$CHROMECAST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf-lite >= 2.5.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf-lite >= 2.5.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "protobuf-lite >= 2.5.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHROMECAST_CFLAGS=`$PKG_CONFIG --cflags "protobuf-lite >= 2.5.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56259,10 +54452,10 @@ pkg_cv_CHROMECAST_LIBS="$CHROMECAST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf-lite >= 2.5.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"protobuf-lite >= 2.5.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "protobuf-lite >= 2.5.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CHROMECAST_LIBS=`$PKG_CONFIG --libs "protobuf-lite >= 2.5.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56276,8 +54469,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56285,53 +54478,50 @@ _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 : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&5 +$as_echo "$as_me: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&2;} fi enable_chromecast="no" 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_chromecast=no - if test "${enable_chromecast}" = "yes" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&5 +$as_echo "$as_me: WARNING: Library protobuf-lite >= 2.5.0 needed for chromecast was not found" >&2;} fi enable_chromecast="no" else - 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 + CHROMECAST_CFLAGS=$pkg_cv_CHROMECAST_CFLAGS + CHROMECAST_LIBS=$pkg_cv_CHROMECAST_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_chromecast=yes - if test "x${PROTOC}" != "xno" -then : + if test "x${PROTOC}" != "xno"; then : build_chromecast="yes" -else $as_nop +else as_fn_error $? "protoc compiler needed for chromecast was not found" "$LINENO" 5 @@ -56361,13 +54551,11 @@ # Check whether --enable-qt was given. -if test ${enable_qt+y} -then : +if test "${enable_qt+set}" = set; then : enableval=$enable_qt; -else $as_nop +else - if test "${SYS}" = "darwin" -then : + if test "${SYS}" = "darwin"; then : enable_qt="no" @@ -56376,22 +54564,21 @@ fi have_qt5_x11="no" -if test "${enable_qt}" != "no" -then : +if test "${enable_qt}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg" >&5 -printf %s "checking for Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT" >&5 +$as_echo_n "checking for QT... " >&6; } if test -n "$QT_CFLAGS"; then pkg_cv_QT_CFLAGS="$QT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg\""; } >&5 ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56405,10 +54592,10 @@ pkg_cv_QT_LIBS="$QT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg\""; } >&5 ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "Qt5Core >= 5.5.0 Qt5Widgets Qt5Gui Qt5Svg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56422,8 +54609,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56431,63 +54618,61 @@ _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}" -then : + if test -n "${enable_qt}"; then : as_fn_error $? "${QT_PKG_ERRORS}." "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${QT_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${QT_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${QT_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${QT_PKG_ERRORS}." >&2;} fi enable_qt="no" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_qt}" -then : + if test -n "${enable_qt}"; then : as_fn_error $? "${QT_PKG_ERRORS}." "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${QT_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${QT_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${QT_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${QT_PKG_ERRORS}." >&2;} fi enable_qt="no" else - 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; } + QT_CFLAGS=$pkg_cv_QT_CFLAGS + QT_LIBS=$pkg_cv_QT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt5X11Extras" >&5 -printf %s "checking for Qt5X11Extras... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5_X11" >&5 +$as_echo_n "checking for QT5_X11... " >&6; } if test -n "$QT5_X11_CFLAGS"; then pkg_cv_QT5_X11_CFLAGS="$QT5_X11_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5X11Extras\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5X11Extras\""; } >&5 ($PKG_CONFIG --exists --print-errors "Qt5X11Extras") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT5_X11_CFLAGS=`$PKG_CONFIG --cflags "Qt5X11Extras" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56501,10 +54686,10 @@ pkg_cv_QT5_X11_LIBS="$QT5_X11_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5X11Extras\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5X11Extras\""; } >&5 ($PKG_CONFIG --exists --print-errors "Qt5X11Extras") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT5_X11_LIBS=`$PKG_CONFIG --libs "Qt5X11Extras" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56518,8 +54703,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56527,29 +54712,29 @@ _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 -printf "%s\n" "$as_me: WARNING: Not building Qt Interface with X11 helpers." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building Qt Interface with X11 helpers." >&5 +$as_echo "$as_me: WARNING: Not building Qt Interface with X11 helpers." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Not building Qt Interface with X11 helpers." >&5 -printf "%s\n" "$as_me: WARNING: Not building Qt Interface with X11 helpers." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building Qt Interface with X11 helpers." >&5 +$as_echo "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + QT5_X11_CFLAGS=$pkg_cv_QT5_X11_CFLAGS + QT5_X11_LIBS=$pkg_cv_QT5_X11_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_qt5_x11="yes" @@ -56561,12 +54746,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MOC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MOC+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MOC in [\\/]* | ?:[\\/]*) ac_cv_path_MOC="$MOC" # Let the user override the test with a path. @@ -56576,15 +54760,11 @@ for as_dir in "${QT_HOST_PATH}" "${QT_PATH}/bin" do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_MOC="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -56596,11 +54776,11 @@ fi MOC=$ac_cv_path_MOC if test -n "$MOC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5 -printf "%s\n" "$MOC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5 +$as_echo "$MOC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -56612,12 +54792,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_RCC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_RCC+:} false; then : + $as_echo_n "(cached) " >&6 +else case $RCC in [\\/]* | ?:[\\/]*) ac_cv_path_RCC="$RCC" # Let the user override the test with a path. @@ -56627,15 +54806,11 @@ for as_dir in "${QT_HOST_PATH}" "${QT_PATH}/bin" do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_RCC="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_RCC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -56647,11 +54822,11 @@ fi RCC=$ac_cv_path_RCC if test -n "$RCC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RCC" >&5 -printf "%s\n" "$RCC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RCC" >&5 +$as_echo "$RCC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -56663,12 +54838,11 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_UIC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_UIC+:} false; then : + $as_echo_n "(cached) " >&6 +else case $UIC in [\\/]* | ?:[\\/]*) ac_cv_path_UIC="$UIC" # Let the user override the test with a path. @@ -56678,15 +54852,11 @@ for as_dir in "${QT_HOST_PATH}" "${QT_PATH}/bin" do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_UIC="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_UIC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -56698,11 +54868,11 @@ fi UIC=$ac_cv_path_UIC if test -n "$UIC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UIC" >&5 -printf "%s\n" "$UIC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UIC" >&5 +$as_echo "$UIC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -56715,8 +54885,7 @@ fi -if test "${enable_qt}" != "no" -then : +if test "${enable_qt}" != "no"; then : ALIASES="${ALIASES} qvlc" @@ -56740,44 +54909,38 @@ -if test "x$KDE4_CONFIG" = "x" -then : +if test "x$KDE4_CONFIG" = "x"; then : KDE4_CONFIG="kde4-config" fi -if test "$enable_qt" = "no" -then : +if test "$enable_qt" = "no"; then : - if test "${enable_skins2}" = "yes" -then : + if test "${enable_skins2}" = "yes"; then : as_fn_error $? "The skins2 module depends on the Qt interface. Without it you will not be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt development package or alternatively you can also configure with: --disable-qt --disable-skins2." "$LINENO" 5 -else $as_nop +else enable_skins2="no" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The skins2 module depends on the Qt interface, Qt is not built so skins2 is disabled." >&5 -printf "%s\n" "$as_me: WARNING: The skins2 module depends on the Qt interface, Qt is not built so skins2 is disabled." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The skins2 module depends on the Qt interface, Qt is not built so skins2 is disabled." >&5 +$as_echo "$as_me: WARNING: The skins2 module depends on the Qt interface, Qt is not built so skins2 is disabled." >&2;} fi fi # Check whether --enable-skins2 was given. -if test ${enable_skins2+y} -then : +if test "${enable_skins2+set}" = set; then : enableval=$enable_skins2; fi -if test "${enable_skins2}" != "no" -then : +if test "${enable_skins2}" != "no"; then : have_skins_deps="yes" - if test "${SYS}" = "mingw32" -then : + if test "${SYS}" = "mingw32"; then : @@ -56792,8 +54955,7 @@ -elif test "${SYS}" = "os2" -then : +elif test "${SYS}" = "os2"; then : @@ -56802,21 +54964,21 @@ -else $as_nop +else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5 -printf %s "checking for xpm... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPM" >&5 +$as_echo_n "checking for XPM... " >&6; } if test -n "$XPM_CFLAGS"; then pkg_cv_XPM_CFLAGS="$XPM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5 ($PKG_CONFIG --exists --print-errors "xpm") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XPM_CFLAGS=`$PKG_CONFIG --cflags "xpm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56830,10 +54992,10 @@ pkg_cv_XPM_LIBS="$XPM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5 ($PKG_CONFIG --exists --print-errors "xpm") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XPM_LIBS=`$PKG_CONFIG --libs "xpm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56847,8 +55009,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56856,38 +55018,38 @@ _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" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_skins_deps="no" else - 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; } + XPM_CFLAGS=$pkg_cv_XPM_CFLAGS + XPM_LIBS=$pkg_cv_XPM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xinerama" >&5 -printf %s "checking for xinerama... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA" >&5 +$as_echo_n "checking for XINERAMA... " >&6; } if test -n "$XINERAMA_CFLAGS"; then pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5 ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56901,10 +55063,10 @@ pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5 ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56918,8 +55080,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56927,38 +55089,38 @@ _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" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_skins_deps="no" else - 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; } + XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS + XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xext" >&5 -printf %s "checking for xext... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5 +$as_echo_n "checking for XEXT... " >&6; } if test -n "$XEXT_CFLAGS"; then pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5 ($PKG_CONFIG --exists --print-errors "xext") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XEXT_CFLAGS=`$PKG_CONFIG --cflags "xext" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56972,10 +55134,10 @@ pkg_cv_XEXT_LIBS="$XEXT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5 ($PKG_CONFIG --exists --print-errors "xext") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XEXT_LIBS=`$PKG_CONFIG --libs "xext" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56989,8 +55151,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56998,23 +55160,23 @@ _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" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_skins_deps="no" else - 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; } + XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS + XEXT_LIBS=$pkg_cv_XEXT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi @@ -57032,30 +55194,27 @@ fi - if test "${have_freetype}" != "yes" -then : + if test "${have_freetype}" != "yes"; then : have_skins_deps="no" fi - if test "${have_skins_deps}" = "no" -then : + if test "${have_skins_deps}" = "no"; then : - if test "x${enable_skins2}" = "x" -then : + if test "x${enable_skins2}" = "x"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skins2 interface disabled due to missing dependencies." >&5 -printf "%s\n" "$as_me: WARNING: Skins2 interface disabled due to missing dependencies." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skins2 interface disabled due to missing dependencies." >&5 +$as_echo "$as_me: WARNING: Skins2 interface disabled due to missing dependencies." >&2;} -else $as_nop +else as_fn_error $? "Skins2 interface requires FreeType, libxpm, libxext and libxinerama" "$LINENO" 5 fi enable_skins2="no" -else $as_nop +else ALIASES="${ALIASES} svlc" enable_skins2="yes" @@ -57072,38 +55231,8 @@ fi -# Check whether --enable-libtar was given. -if test ${enable_libtar+y} -then : - enableval=$enable_libtar; -fi - -if test "${enable_skins2}" = "yes" && test "${enable_libtar}" != "no" -then : - - for ac_header in libtar.h -do : - ac_fn_c_check_header_compile "$LINENO" "libtar.h" "ac_cv_header_libtar_h" "$ac_includes_default" -if test "x$ac_cv_header_libtar_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBTAR_H 1" >>confdefs.h - - - - eval "LIBS_skins2="'"'"-ltar "'$'"{LIBS_skins2}"'"' - - - - -fi - -done - -fi - # Check whether --enable-macosx was given. -if test ${enable_macosx+y} -then : +if test "${enable_macosx+set}" = set; then : enableval=$enable_macosx; fi @@ -57113,12 +55242,11 @@ # Extract the first word of "xcrun", so it can be a program name with args. set dummy xcrun; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_XCRUN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XCRUN+:} false; then : + $as_echo_n "(cached) " >&6 +else case $XCRUN in [\\/]* | ?:[\\/]*) ac_cv_path_XCRUN="$XCRUN" # Let the user override the test with a path. @@ -57128,15 +55256,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_XCRUN="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XCRUN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -57149,41 +55273,38 @@ fi XCRUN=$ac_cv_path_XCRUN if test -n "$XCRUN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XCRUN" >&5 -printf "%s\n" "$XCRUN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCRUN" >&5 +$as_echo "$XCRUN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test ! "x${XCRUN}" = "xno" -then : + if test ! "x${XCRUN}" = "xno"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ibtool (using xcrun)" >&5 -printf %s "checking for ibtool (using xcrun)... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ibtool (using xcrun)" >&5 +$as_echo_n "checking for ibtool (using xcrun)... " >&6; } XIB="$(eval $XCRUN -f ibtool 2>/dev/null || echo no)" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${XIB}" >&5 -printf "%s\n" "${XIB}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${XIB}" >&5 +$as_echo "${XIB}" >&6; } -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Looking for tools without using xcrun" >&5 -printf "%s\n" "$as_me: WARNING: Looking for tools without using xcrun" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Looking for tools without using xcrun" >&5 +$as_echo "$as_me: WARNING: Looking for tools without using xcrun" >&2;} fi - if test "x${XIB}" = "xno" -then : + if test "x${XIB}" = "xno"; then : # Extract the first word of "ibtool", so it can be a program name with args. set dummy ibtool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_XIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XIB+:} false; then : + $as_echo_n "(cached) " >&6 +else case $XIB in [\\/]* | ?:[\\/]*) ac_cv_path_XIB="$XIB" # Let the user override the test with a path. @@ -57193,15 +55314,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_XIB="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XIB="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -57214,16 +55331,15 @@ fi XIB=$ac_cv_path_XIB if test -n "$XIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XIB" >&5 -printf "%s\n" "$XIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XIB" >&5 +$as_echo "$XIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x${XIB}" = "xno" -then : + if test "x${XIB}" = "xno"; then : as_fn_error $? "ibtool was not found, but is required for --enable-macosx" "$LINENO" 5 @@ -57241,8 +55357,7 @@ # Check whether --enable-sparkle was given. -if test ${enable_sparkle+y} -then : +if test "${enable_sparkle+set}" = set; then : enableval=$enable_sparkle; fi @@ -57254,7 +55369,7 @@ fi -printf "%s\n" "#define HAVE_SPARKLE 1" >>confdefs.h +$as_echo "#define HAVE_SPARKLE 1" >>confdefs.h fi if test "$enable_sparkle" != "no"; then @@ -57268,61 +55383,56 @@ # Check whether --with-breakpad was given. -if test ${with_breakpad+y} -then : +if test "${with_breakpad+set}" = set; then : withval=$with_breakpad; -else $as_nop +else with_breakpad=no fi -if test "$with_breakpad" != "no" -then : +if test "$with_breakpad" != "no"; then : - if test "$with_breakpad" = "yes" -then : + if test "$with_breakpad" = "yes"; then : as_fn_error $? "You need to supply the CrashDragon Server URL as value for --with-breakpad" "$LINENO" 5 fi - if test "$HAVE_OSX" = "1" -then : + if test "$HAVE_OSX" = "1"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Breakpad framework" >&5 -printf %s "checking for Breakpad framework... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Breakpad framework" >&5 +$as_echo_n "checking for Breakpad framework... " >&6; } if test ! -d ${CONTRIB_DIR}/Breakpad.framework -a \ - ! -d ${CONTRIB_DIR}/Frameworks/Breakpad.framework -then : + ! -d ${CONTRIB_DIR}/Frameworks/Breakpad.framework; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } with_breakpad="no" as_fn_error $? "Breakpad framework is required and was not found in ${CONTRIB_DIR}" "$LINENO" 5 -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -else $as_nop +else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for breakpad-client" >&5 -printf %s "checking for breakpad-client... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BREAKPAD" >&5 +$as_echo_n "checking for BREAKPAD... " >&6; } if test -n "$BREAKPAD_CFLAGS"; then pkg_cv_BREAKPAD_CFLAGS="$BREAKPAD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"breakpad-client\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"breakpad-client\""; } >&5 ($PKG_CONFIG --exists --print-errors "breakpad-client") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BREAKPAD_CFLAGS=`$PKG_CONFIG --cflags "breakpad-client" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -57336,10 +55446,10 @@ pkg_cv_BREAKPAD_LIBS="$BREAKPAD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"breakpad-client\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"breakpad-client\""; } >&5 ($PKG_CONFIG --exists --print-errors "breakpad-client") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BREAKPAD_LIBS=`$PKG_CONFIG --libs "breakpad-client" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -57353,8 +55463,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -57362,27 +55472,27 @@ _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 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } as_fn_error $? "\"breakpad not found\"" "$LINENO" 5 else - 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; } + BREAKPAD_CFLAGS=$pkg_cv_BREAKPAD_CFLAGS + BREAKPAD_LIBS=$pkg_cv_BREAKPAD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } LDFLAGS="${LDFLAGS} -Wl,--build-id" @@ -57400,8 +55510,7 @@ HAVE_BREAKPAD_FALSE= fi -if test "$with_breakpad" != "no" -then : +if test "$with_breakpad" != "no"; then : BREAKPAD_URL="${with_breakpad}" @@ -57409,8 +55518,7 @@ fi # Check whether --enable-minimal-macosx was given. -if test ${enable_minimal_macosx+y} -then : +if test "${enable_minimal_macosx+set}" = set; then : enableval=$enable_minimal_macosx; fi @@ -57428,12 +55536,11 @@ then # Extract the first word of "dmgbuild", so it can be a program name with args. set dummy dmgbuild; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_DMGBUILD+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DMGBUILD+:} false; then : + $as_echo_n "(cached) " >&6 +else case $DMGBUILD in [\\/]* | ?:[\\/]*) ac_cv_path_DMGBUILD="$DMGBUILD" # Let the user override the test with a path. @@ -57443,15 +55550,11 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_DMGBUILD="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DMGBUILD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -57464,19 +55567,18 @@ fi DMGBUILD=$ac_cv_path_DMGBUILD if test -n "$DMGBUILD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DMGBUILD" >&5 -printf "%s\n" "$DMGBUILD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMGBUILD" >&5 +$as_echo "$DMGBUILD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x${DMGBUILD}" = "xno" -then : + if test "x${DMGBUILD}" = "xno"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: dmgbuild not found -- unable to build fancy DMGs" >&5 -printf "%s\n" "$as_me: WARNING: dmgbuild not found -- unable to build fancy DMGs" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dmgbuild not found -- unable to build fancy DMGs" >&5 +$as_echo "$as_me: WARNING: dmgbuild not found -- unable to build fancy DMGs" >&2;} fi fi @@ -57489,12 +55591,13 @@ fi - for ac_header in VideoToolbox/VideoToolbox.h +for ac_header in VideoToolbox/VideoToolbox.h do : - ac_fn_c_check_header_compile "$LINENO" "VideoToolbox/VideoToolbox.h" "ac_cv_header_VideoToolbox_VideoToolbox_h" "$ac_includes_default" -if test "x$ac_cv_header_VideoToolbox_VideoToolbox_h" = xyes -then : - printf "%s\n" "#define HAVE_VIDEOTOOLBOX_VIDEOTOOLBOX_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "VideoToolbox/VideoToolbox.h" "ac_cv_header_VideoToolbox_VideoToolbox_h" "$ac_includes_default" +if test "x$ac_cv_header_VideoToolbox_VideoToolbox_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VIDEOTOOLBOX_VIDEOTOOLBOX_H 1 +_ACEOF @@ -57513,12 +55616,14 @@ done - for ac_header in AudioToolbox/AudioToolbox.h + +for ac_header in AudioToolbox/AudioToolbox.h do : - ac_fn_c_check_header_compile "$LINENO" "AudioToolbox/AudioToolbox.h" "ac_cv_header_AudioToolbox_AudioToolbox_h" "$ac_includes_default" -if test "x$ac_cv_header_AudioToolbox_AudioToolbox_h" = xyes -then : - printf "%s\n" "#define HAVE_AUDIOTOOLBOX_AUDIOTOOLBOX_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "AudioToolbox/AudioToolbox.h" "ac_cv_header_AudioToolbox_AudioToolbox_h" "$ac_includes_default" +if test "x$ac_cv_header_AudioToolbox_AudioToolbox_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_AUDIOTOOLBOX_AUDIOTOOLBOX_H 1 +_ACEOF @@ -57531,29 +55636,28 @@ done + # Check whether --enable-ncurses was given. -if test ${enable_ncurses+y} -then : +if test "${enable_ncurses+set}" = set; then : enableval=$enable_ncurses; fi have_ncurses="no" -if test "${enable_ncurses}" != "no" -then : +if test "${enable_ncurses}" != "no" ; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ncursesw" >&5 -printf %s "checking for ncursesw... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NCURSES" >&5 +$as_echo_n "checking for NCURSES... " >&6; } if test -n "$NCURSES_CFLAGS"; then pkg_cv_NCURSES_CFLAGS="$NCURSES_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5 ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NCURSES_CFLAGS=`$PKG_CONFIG --cflags "ncursesw" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -57567,10 +55671,10 @@ pkg_cv_NCURSES_LIBS="$NCURSES_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5 ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NCURSES_LIBS=`$PKG_CONFIG --libs "ncursesw" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -57584,8 +55688,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -57593,37 +55697,35 @@ _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}" -then : + if test -n "${enable_ncurses}"; then : as_fn_error $? "${NCURSES_PKG_ERRORS}." "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_ncurses}" -then : + if test -n "${enable_ncurses}"; then : as_fn_error $? "${NCURSES_PKG_ERRORS}." "$LINENO" 5 fi else - 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; } + NCURSES_CFLAGS=$pkg_cv_NCURSES_CFLAGS + NCURSES_LIBS=$pkg_cv_NCURSES_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_ncurses="yes" ALIASES="${ALIASES} nvlc" @@ -57641,25 +55743,21 @@ # Check whether --enable-lirc was given. -if test ${enable_lirc+y} -then : +if test "${enable_lirc+set}" = set; then : enableval=$enable_lirc; fi have_lirc="no" -if test "${enable_lirc}" = "yes" -then : +if test "${enable_lirc}" = "yes"; then : - ac_fn_c_check_header_compile "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default" -if test "x$ac_cv_header_lirc_lirc_client_h" = xyes -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lirc_init in -llirc_client" >&5 -printf %s "checking for lirc_init in -llirc_client... " >&6; } -if test ${ac_cv_lib_lirc_client_lirc_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop + ac_fn_c_check_header_mongrel "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default" +if test "x$ac_cv_header_lirc_lirc_client_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lirc_init in -llirc_client" >&5 +$as_echo_n "checking for lirc_init in -llirc_client... " >&6; } +if ${ac_cv_lib_lirc_client_lirc_init+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-llirc_client $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -57668,29 +55766,30 @@ /* 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. */ +#ifdef __cplusplus +extern "C" +#endif char lirc_init (); int -main (void) +main () { return lirc_init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_lirc_client_lirc_init=yes -else $as_nop +else ac_cv_lib_lirc_client_lirc_init=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lirc_client_lirc_init" >&5 -printf "%s\n" "$ac_cv_lib_lirc_client_lirc_init" >&6; } -if test "x$ac_cv_lib_lirc_client_lirc_init" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lirc_client_lirc_init" >&5 +$as_echo "$ac_cv_lib_lirc_client_lirc_init" >&6; } +if test "x$ac_cv_lib_lirc_client_lirc_init" = xyes; then : have_lirc="yes" @@ -57700,6 +55799,7 @@ fi + fi if test "${have_lirc}" = "yes"; then HAVE_LIRC_TRUE= @@ -57727,10 +55827,9 @@ # Check whether --enable-srt was given. -if test ${enable_srt+y} -then : +if test "${enable_srt+set}" = set; then : enableval=$enable_srt; -else $as_nop +else enable_srt=auto fi @@ -57739,17 +55838,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srt >= 1.3.0" >&5 -printf %s "checking for srt >= 1.3.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SRT" >&5 +$as_echo_n "checking for SRT... " >&6; } if test -n "$SRT_CFLAGS"; then pkg_cv_SRT_CFLAGS="$SRT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"srt >= 1.3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"srt >= 1.3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "srt >= 1.3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SRT_CFLAGS=`$PKG_CONFIG --cflags "srt >= 1.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -57763,10 +55862,10 @@ pkg_cv_SRT_LIBS="$SRT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"srt >= 1.3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"srt >= 1.3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "srt >= 1.3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SRT_LIBS=`$PKG_CONFIG --libs "srt >= 1.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -57780,8 +55879,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -57789,38 +55888,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&5 +$as_echo "$as_me: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&5 +$as_echo "$as_me: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&2;} fi else - 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 + SRT_CFLAGS=$pkg_cv_SRT_CFLAGS + SRT_LIBS=$pkg_cv_SRT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBaccess_srt=libaccess_srt_plugin.la LTLIBaccess_output_srt=libaccess_output_srt_plugin.la @@ -57858,17 +55955,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srt >= 1.3.0" >&5 -printf %s "checking for srt >= 1.3.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SRT" >&5 +$as_echo_n "checking for SRT... " >&6; } if test -n "$SRT_CFLAGS"; then pkg_cv_SRT_CFLAGS="$SRT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"srt >= 1.3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"srt >= 1.3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "srt >= 1.3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SRT_CFLAGS=`$PKG_CONFIG --cflags "srt >= 1.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -57882,10 +55979,10 @@ pkg_cv_SRT_LIBS="$SRT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"srt >= 1.3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"srt >= 1.3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "srt >= 1.3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SRT_LIBS=`$PKG_CONFIG --libs "srt >= 1.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -57899,8 +55996,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -57908,40 +56005,38 @@ _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 - if test x"$enable_srt" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&5 +$as_echo "$as_me: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&2;} fi 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 - if test x"$enable_srt" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&5 +$as_echo "$as_me: WARNING: Library srt >= 1.3.0 needed for srt was not found" >&2;} fi else - 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 + SRT_CFLAGS=$pkg_cv_SRT_CFLAGS + SRT_LIBS=$pkg_cv_SRT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_srt=yes LTLIBaccess_srt=libaccess_srt_plugin.la @@ -58012,10 +56107,9 @@ # Check whether --enable-goom was given. -if test ${enable_goom+y} -then : +if test "${enable_goom+set}" = set; then : enableval=$enable_goom; -else $as_nop +else enable_goom=auto fi @@ -58024,17 +56118,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgoom2" >&5 -printf %s "checking for libgoom2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOOM" >&5 +$as_echo_n "checking for GOOM... " >&6; } if test -n "$GOOM_CFLAGS"; then pkg_cv_GOOM_CFLAGS="$GOOM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libgoom2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GOOM_CFLAGS=`$PKG_CONFIG --cflags "libgoom2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58048,10 +56142,10 @@ pkg_cv_GOOM_LIBS="$GOOM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libgoom2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GOOM_LIBS=`$PKG_CONFIG --libs "libgoom2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58065,8 +56159,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58074,38 +56168,36 @@ _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" -then : + if test x"$enable_goom" = "xyes"; then : as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5 +$as_echo "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_goom" = "xyes"; then : as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5 +$as_echo "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;} fi else - 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 + GOOM_CFLAGS=$pkg_cv_GOOM_CFLAGS + GOOM_LIBS=$pkg_cv_GOOM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBgoom=libgoom_plugin.la @@ -58126,17 +56218,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgoom2" >&5 -printf %s "checking for libgoom2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOOM" >&5 +$as_echo_n "checking for GOOM... " >&6; } if test -n "$GOOM_CFLAGS"; then pkg_cv_GOOM_CFLAGS="$GOOM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libgoom2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GOOM_CFLAGS=`$PKG_CONFIG --cflags "libgoom2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58150,10 +56242,10 @@ pkg_cv_GOOM_LIBS="$GOOM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgoom2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libgoom2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GOOM_LIBS=`$PKG_CONFIG --libs "libgoom2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58167,8 +56259,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58176,40 +56268,38 @@ _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 - if test x"$enable_goom" = "xyes" -then : + enable_goom=no + if test x"$enable_goom" = "xyes"; then : as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5 +$as_echo "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;} fi 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 - if test x"$enable_goom" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_goom=no + if test x"$enable_goom" = "xyes"; then : as_fn_error $? "Library libgoom2 needed for goom was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libgoom2 needed for goom was not found" >&5 +$as_echo "$as_me: WARNING: Library libgoom2 needed for goom was not found" >&2;} fi else - 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 + GOOM_CFLAGS=$pkg_cv_GOOM_CFLAGS + GOOM_LIBS=$pkg_cv_GOOM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_goom=yes LTLIBgoom=libgoom_plugin.la @@ -58246,27 +56336,25 @@ # Check whether --enable-projectm was given. -if test ${enable_projectm+y} -then : +if test "${enable_projectm+set}" = set; then : enableval=$enable_projectm; fi -if test "${enable_projectm}" != "no" -then : +if test "${enable_projectm}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libprojectM" >&5 -printf %s "checking for libprojectM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROJECTM" >&5 +$as_echo_n "checking for PROJECTM... " >&6; } if test -n "$PROJECTM_CFLAGS"; then pkg_cv_PROJECTM_CFLAGS="$PROJECTM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM\""; } >&5 ($PKG_CONFIG --exists --print-errors "libprojectM") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PROJECTM_CFLAGS=`$PKG_CONFIG --cflags "libprojectM" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58280,10 +56368,10 @@ pkg_cv_PROJECTM_LIBS="$PROJECTM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM\""; } >&5 ($PKG_CONFIG --exists --print-errors "libprojectM") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PROJECTM_LIBS=`$PKG_CONFIG --libs "libprojectM" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58297,8 +56385,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58306,29 +56394,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${PROJECTM_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${PROJECTM_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${PROJECTM_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${PROJECTM_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${PROJECTM_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${PROJECTM_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${PROJECTM_PKG_ERRORS}." >&2;} else - 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; } + PROJECTM_CFLAGS=$pkg_cv_PROJECTM_CFLAGS + PROJECTM_LIBS=$pkg_cv_PROJECTM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -58337,17 +56425,17 @@ if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM >= 2.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM >= 2.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libprojectM >= 2.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then -printf "%s\n" "#define HAVE_PROJECTM2 1" >>confdefs.h +$as_echo "#define HAVE_PROJECTM2 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using libprojectM version 1 " >&5 -printf "%s\n" "$as_me: WARNING: Using libprojectM version 1 " >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using libprojectM version 1 " >&5 +$as_echo "$as_me: WARNING: Using libprojectM version 1 " >&2;} fi @@ -58356,27 +56444,25 @@ fi # Check whether --enable-vsxu was given. -if test ${enable_vsxu+y} -then : +if test "${enable_vsxu+set}" = set; then : enableval=$enable_vsxu; fi -if test "${enable_vsxu}" != "no" -then : +if test "${enable_vsxu}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libvsxu" >&5 -printf %s "checking for libvsxu... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VSXU" >&5 +$as_echo_n "checking for VSXU... " >&6; } if test -n "$VSXU_CFLAGS"; then pkg_cv_VSXU_CFLAGS="$VSXU_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvsxu\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvsxu\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvsxu") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VSXU_CFLAGS=`$PKG_CONFIG --cflags "libvsxu" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58390,10 +56476,10 @@ pkg_cv_VSXU_LIBS="$VSXU_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvsxu\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvsxu\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvsxu") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VSXU_LIBS=`$PKG_CONFIG --libs "libvsxu" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58407,8 +56493,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58416,29 +56502,29 @@ _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 -printf "%s\n" "$as_me: WARNING: ${VSXU_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${VSXU_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${VSXU_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${VSXU_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${VSXU_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${VSXU_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${VSXU_PKG_ERRORS}." >&2;} else - 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; } + VSXU_CFLAGS=$pkg_cv_VSXU_CFLAGS + VSXU_LIBS=$pkg_cv_VSXU_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -58469,10 +56555,9 @@ # Check whether --enable-avahi was given. -if test ${enable_avahi+y} -then : +if test "${enable_avahi+set}" = set; then : enableval=$enable_avahi; -else $as_nop +else enable_avahi=auto fi @@ -58481,17 +56566,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avahi-client >= 0.6" >&5 -printf %s "checking for avahi-client >= 0.6... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5 +$as_echo_n "checking for AVAHI... " >&6; } if test -n "$AVAHI_CFLAGS"; then pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-client >= 0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58505,10 +56590,10 @@ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-client >= 0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58522,8 +56607,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58531,38 +56616,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&5 +$as_echo "$as_me: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&5 +$as_echo "$as_me: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&2;} fi else - 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 + AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS + AVAHI_LIBS=$pkg_cv_AVAHI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBavahi=libavahi_plugin.la @@ -58583,17 +56666,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avahi-client >= 0.6" >&5 -printf %s "checking for avahi-client >= 0.6... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5 +$as_echo_n "checking for AVAHI... " >&6; } if test -n "$AVAHI_CFLAGS"; then pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-client >= 0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58607,10 +56690,10 @@ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-client >= 0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58624,8 +56707,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58633,40 +56716,38 @@ _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 - if test x"$enable_avahi" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&5 +$as_echo "$as_me: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&2;} fi 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 - if test x"$enable_avahi" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&5 +$as_echo "$as_me: WARNING: Library avahi-client >= 0.6 needed for avahi was not found" >&2;} fi else - 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 + AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS + AVAHI_LIBS=$pkg_cv_AVAHI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_avahi=yes LTLIBavahi=libavahi_plugin.la @@ -58719,10 +56800,9 @@ # Check whether --enable-udev was given. -if test ${enable_udev+y} -then : +if test "${enable_udev+set}" = set; then : enableval=$enable_udev; -else $as_nop +else enable_udev=auto fi @@ -58731,17 +56811,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libudev >= 142" >&5 -printf %s "checking for libudev >= 142... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5 +$as_echo_n "checking for UDEV... " >&6; } if test -n "$UDEV_CFLAGS"; then pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5 ($PKG_CONFIG --exists --print-errors "libudev >= 142") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 142" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58755,10 +56835,10 @@ pkg_cv_UDEV_LIBS="$UDEV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5 ($PKG_CONFIG --exists --print-errors "libudev >= 142") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 142" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58772,8 +56852,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58781,38 +56861,36 @@ _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" -then : + if test x"$enable_udev" = "xyes"; then : as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5 +$as_echo "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_udev" = "xyes"; then : as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5 +$as_echo "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;} fi else - 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 + UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS + UDEV_LIBS=$pkg_cv_UDEV_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBudev=libudev_plugin.la @@ -58833,17 +56911,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libudev >= 142" >&5 -printf %s "checking for libudev >= 142... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5 +$as_echo_n "checking for UDEV... " >&6; } if test -n "$UDEV_CFLAGS"; then pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5 ($PKG_CONFIG --exists --print-errors "libudev >= 142") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 142" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58857,10 +56935,10 @@ pkg_cv_UDEV_LIBS="$UDEV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 142\""; } >&5 ($PKG_CONFIG --exists --print-errors "libudev >= 142") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 142" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58874,8 +56952,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58883,40 +56961,38 @@ _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 - if test x"$enable_udev" = "xyes" -then : + enable_udev=no + if test x"$enable_udev" = "xyes"; then : as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5 +$as_echo "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;} fi 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 - if test x"$enable_udev" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_udev=no + if test x"$enable_udev" = "xyes"; then : as_fn_error $? "Library libudev >= 142 needed for udev was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libudev >= 142 needed for udev was not found" >&5 +$as_echo "$as_me: WARNING: Library libudev >= 142 needed for udev was not found" >&2;} fi else - 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 + UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS + UDEV_LIBS=$pkg_cv_UDEV_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_udev=yes LTLIBudev=libudev_plugin.la @@ -58969,10 +57045,9 @@ # Check whether --enable-mtp was given. -if test ${enable_mtp+y} -then : +if test "${enable_mtp+set}" = set; then : enableval=$enable_mtp; -else $as_nop +else enable_mtp=auto fi @@ -58981,17 +57056,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmtp >= 1.0.0" >&5 -printf %s "checking for libmtp >= 1.0.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTP" >&5 +$as_echo_n "checking for MTP... " >&6; } if test -n "$MTP_CFLAGS"; then pkg_cv_MTP_CFLAGS="$MTP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmtp >= 1.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MTP_CFLAGS=`$PKG_CONFIG --cflags "libmtp >= 1.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59005,10 +57080,10 @@ pkg_cv_MTP_LIBS="$MTP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmtp >= 1.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MTP_LIBS=`$PKG_CONFIG --libs "libmtp >= 1.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59022,8 +57097,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59031,38 +57106,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5 +$as_echo "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5 +$as_echo "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;} fi else - 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 + MTP_CFLAGS=$pkg_cv_MTP_CFLAGS + MTP_LIBS=$pkg_cv_MTP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBmtp=libmtp_plugin.la LTLIBaccess_mtp=libaccess_mtp_plugin.la @@ -59092,17 +57165,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmtp >= 1.0.0" >&5 -printf %s "checking for libmtp >= 1.0.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTP" >&5 +$as_echo_n "checking for MTP... " >&6; } if test -n "$MTP_CFLAGS"; then pkg_cv_MTP_CFLAGS="$MTP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmtp >= 1.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MTP_CFLAGS=`$PKG_CONFIG --cflags "libmtp >= 1.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59116,10 +57189,10 @@ pkg_cv_MTP_LIBS="$MTP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= 1.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libmtp >= 1.0.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MTP_LIBS=`$PKG_CONFIG --libs "libmtp >= 1.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59133,8 +57206,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59142,40 +57215,38 @@ _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 - if test x"$enable_mtp" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5 +$as_echo "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;} fi 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 - if test x"$enable_mtp" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&5 +$as_echo "$as_me: WARNING: Library libmtp >= 1.0.0 needed for mtp was not found" >&2;} fi else - 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 + MTP_CFLAGS=$pkg_cv_MTP_CFLAGS + MTP_LIBS=$pkg_cv_MTP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_mtp=yes LTLIBmtp=libmtp_plugin.la @@ -59237,10 +57308,9 @@ # Check whether --enable-upnp was given. -if test ${enable_upnp+y} -then : +if test "${enable_upnp+set}" = set; then : enableval=$enable_upnp; -else $as_nop +else enable_upnp=auto fi @@ -59249,17 +57319,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libupnp" >&5 -printf %s "checking for libupnp... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPNP" >&5 +$as_echo_n "checking for UPNP... " >&6; } if test -n "$UPNP_CFLAGS"; then pkg_cv_UPNP_CFLAGS="$UPNP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5 ($PKG_CONFIG --exists --print-errors "libupnp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UPNP_CFLAGS=`$PKG_CONFIG --cflags "libupnp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59273,10 +57343,10 @@ pkg_cv_UPNP_LIBS="$UPNP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5 ($PKG_CONFIG --exists --print-errors "libupnp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UPNP_LIBS=`$PKG_CONFIG --libs "libupnp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59290,8 +57360,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59299,38 +57369,36 @@ _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" -then : + if test x"$enable_upnp" = "xyes"; then : as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5 +$as_echo "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test x"$enable_upnp" = "xyes"; then : as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5 +$as_echo "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;} fi else - 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 + UPNP_CFLAGS=$pkg_cv_UPNP_CFLAGS + UPNP_LIBS=$pkg_cv_UPNP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBupnp=libupnp_plugin.la @@ -59351,17 +57419,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libupnp" >&5 -printf %s "checking for libupnp... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPNP" >&5 +$as_echo_n "checking for UPNP... " >&6; } if test -n "$UPNP_CFLAGS"; then pkg_cv_UPNP_CFLAGS="$UPNP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5 ($PKG_CONFIG --exists --print-errors "libupnp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UPNP_CFLAGS=`$PKG_CONFIG --cflags "libupnp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59375,10 +57443,10 @@ pkg_cv_UPNP_LIBS="$UPNP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libupnp\""; } >&5 ($PKG_CONFIG --exists --print-errors "libupnp") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UPNP_LIBS=`$PKG_CONFIG --libs "libupnp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59392,8 +57460,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59401,40 +57469,38 @@ _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 - if test x"$enable_upnp" = "xyes" -then : + enable_upnp=no + if test x"$enable_upnp" = "xyes"; then : as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5 +$as_echo "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;} fi 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 - if test x"$enable_upnp" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_upnp=no + if test x"$enable_upnp" = "xyes"; then : as_fn_error $? "Library libupnp needed for upnp was not found" "$LINENO" 5 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libupnp needed for upnp was not found" >&5 +$as_echo "$as_me: WARNING: Library libupnp needed for upnp was not found" >&2;} fi else - 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 + UPNP_CFLAGS=$pkg_cv_UPNP_CFLAGS + UPNP_LIBS=$pkg_cv_UPNP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_upnp=yes LTLIBupnp=libupnp_plugin.la @@ -59487,10 +57553,9 @@ # Check whether --enable-microdns was given. -if test ${enable_microdns+y} -then : +if test "${enable_microdns+set}" = set; then : enableval=$enable_microdns; -else $as_nop +else enable_microdns=auto fi @@ -59499,17 +57564,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for microdns >= 0.1.2" >&5 -printf %s "checking for microdns >= 0.1.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MICRODNS" >&5 +$as_echo_n "checking for MICRODNS... " >&6; } if test -n "$MICRODNS_CFLAGS"; then pkg_cv_MICRODNS_CFLAGS="$MICRODNS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"microdns >= 0.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"microdns >= 0.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "microdns >= 0.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MICRODNS_CFLAGS=`$PKG_CONFIG --cflags "microdns >= 0.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59523,10 +57588,10 @@ pkg_cv_MICRODNS_LIBS="$MICRODNS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"microdns >= 0.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"microdns >= 0.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "microdns >= 0.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MICRODNS_LIBS=`$PKG_CONFIG --libs "microdns >= 0.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59540,8 +57605,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59549,38 +57614,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&5 +$as_echo "$as_me: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&5 +$as_echo "$as_me: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&2;} fi else - 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 + MICRODNS_CFLAGS=$pkg_cv_MICRODNS_CFLAGS + MICRODNS_LIBS=$pkg_cv_MICRODNS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBmicrodns=libmicrodns_plugin.la @@ -59601,17 +57664,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for microdns >= 0.1.2" >&5 -printf %s "checking for microdns >= 0.1.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MICRODNS" >&5 +$as_echo_n "checking for MICRODNS... " >&6; } if test -n "$MICRODNS_CFLAGS"; then pkg_cv_MICRODNS_CFLAGS="$MICRODNS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"microdns >= 0.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"microdns >= 0.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "microdns >= 0.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MICRODNS_CFLAGS=`$PKG_CONFIG --cflags "microdns >= 0.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59625,10 +57688,10 @@ pkg_cv_MICRODNS_LIBS="$MICRODNS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"microdns >= 0.1.2\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"microdns >= 0.1.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "microdns >= 0.1.2") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MICRODNS_LIBS=`$PKG_CONFIG --libs "microdns >= 0.1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59642,8 +57705,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59651,40 +57714,38 @@ _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 - if test x"$enable_microdns" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&5 +$as_echo "$as_me: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&2;} fi 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 - if test x"$enable_microdns" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&5 +$as_echo "$as_me: WARNING: Library microdns >= 0.1.2 needed for microdns was not found" >&2;} fi else - 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 + MICRODNS_CFLAGS=$pkg_cv_MICRODNS_CFLAGS + MICRODNS_LIBS=$pkg_cv_MICRODNS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_microdns=yes LTLIBmicrodns=libmicrodns_plugin.la @@ -59740,10 +57801,9 @@ # Check whether --enable-libxml2 was given. -if test ${enable_libxml2+y} -then : +if test "${enable_libxml2+set}" = set; then : enableval=$enable_libxml2; -else $as_nop +else enable_libxml2=auto fi @@ -59752,17 +57812,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.5" >&5 -printf %s "checking for libxml-2.0 >= 2.5... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5 +$as_echo_n "checking for LIBXML2... " >&6; } if test -n "$LIBXML2_CFLAGS"; then pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59776,10 +57836,10 @@ pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59793,8 +57853,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59802,38 +57862,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;} fi else - 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 + LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS + LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBxml=libxml_plugin.la @@ -59854,17 +57912,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.5" >&5 -printf %s "checking for libxml-2.0 >= 2.5... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5 +$as_echo_n "checking for LIBXML2... " >&6; } if test -n "$LIBXML2_CFLAGS"; then pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59878,10 +57936,10 @@ pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.5") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59895,8 +57953,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59904,40 +57962,38 @@ _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 - if test x"$enable_libxml2" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;} fi 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 - if test x"$enable_libxml2" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&5 +$as_echo "$as_me: WARNING: Library libxml-2.0 >= 2.5 needed for libxml2 was not found" >&2;} fi else - 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 + LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS + LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_libxml2=yes LTLIBxml=libxml_plugin.la @@ -59975,8 +58031,7 @@ # Check whether --enable-libgcrypt was given. -if test ${enable_libgcrypt+y} -then : +if test "${enable_libgcrypt+set}" = set; then : enableval=$enable_libgcrypt; fi @@ -59984,15 +58039,13 @@ # require libgcrypt >= 1.6.0 -if test "${enable_libgcrypt}" != "no" -then : +if test "${enable_libgcrypt}" != "no"; then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcrypt 1.6.0 or later" >&5 -printf %s "checking for gcrypt 1.6.0 or later... " >&6; } -if test ${ac_cv_lib_gcrypt+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcrypt 1.6.0 or later" >&5 +$as_echo_n "checking for gcrypt 1.6.0 or later... " >&6; } +if ${ac_cv_lib_gcrypt+:} false; then : + $as_echo_n "(cached) " >&6 +else CPPFLAGS_save="${CPPFLAGS}" @@ -60011,24 +58064,23 @@ #error #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_lib_gcrypt=yes -else $as_nop +else ac_cv_lib_gcrypt=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${CPPFLAGS_save}" CFLAGS="${CFLAGS_save}" @@ -60039,20 +58091,18 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt" >&5 -printf "%s\n" "$ac_cv_lib_gcrypt" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt" >&5 +$as_echo "$ac_cv_lib_gcrypt" >&6; } - if test "${ac_cv_lib_gcrypt}" = "yes" -then : + if test "${ac_cv_lib_gcrypt}" = "yes"; then : -printf "%s\n" "#define HAVE_GCRYPT 1" >>confdefs.h +$as_echo "#define HAVE_GCRYPT 1" >>confdefs.h -else $as_nop +else - if test "${enable_libgcrypt}" = "yes" -then : + if test "${enable_libgcrypt}" = "yes"; then : as_fn_error $? "libgcrypt version 1.6.0 or higher not found. Install libgcrypt or pass --disable-libgcrypt." "$LINENO" 5 @@ -60062,8 +58112,7 @@ fi -if test -z "$GCRYPT_LIBS" -then : +if test -z "$GCRYPT_LIBS"; then : GCRYPT_LIBS="-lgcrypt -lgpg-error" @@ -60081,27 +58130,25 @@ # Check whether --enable-gnutls was given. -if test ${enable_gnutls+y} -then : +if test "${enable_gnutls+set}" = set; then : enableval=$enable_gnutls; fi -if test "${enable_gnutls}" != "no" -then : +if test "${enable_gnutls}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 3.3.6" >&5 -printf %s "checking for gnutls >= 3.3.6... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5 +$as_echo_n "checking for GNUTLS... " >&6; } if test -n "$GNUTLS_CFLAGS"; then pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.3.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.3.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "gnutls >= 3.3.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 3.3.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60115,10 +58162,10 @@ pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.3.6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.3.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "gnutls >= 3.3.6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 3.3.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60132,8 +58179,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -60141,37 +58188,35 @@ _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}" -then : + if test -n "${enable_gnutls}"; then : as_fn_error $? "${GNUTLS_PKG_ERRORS}.)" "$LINENO" 5 fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_gnutls}" -then : + if test -n "${enable_gnutls}"; then : as_fn_error $? "${GNUTLS_PKG_ERRORS}.)" "$LINENO" 5 fi else - 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; } + GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS + GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -60186,27 +58231,25 @@ # Check whether --enable-taglib was given. -if test ${enable_taglib+y} -then : +if test "${enable_taglib+set}" = set; then : enableval=$enable_taglib; fi -if test "${enable_taglib}" != "no" -then : +if test "${enable_taglib}" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for taglib >= 1.9" >&5 -printf %s "checking for taglib >= 1.9... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TAGLIB" >&5 +$as_echo_n "checking for TAGLIB... " >&6; } if test -n "$TAGLIB_CFLAGS"; then pkg_cv_TAGLIB_CFLAGS="$TAGLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"taglib >= 1.9\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"taglib >= 1.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "taglib >= 1.9") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TAGLIB_CFLAGS=`$PKG_CONFIG --cflags "taglib >= 1.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60220,10 +58263,10 @@ pkg_cv_TAGLIB_LIBS="$TAGLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"taglib >= 1.9\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"taglib >= 1.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "taglib >= 1.9") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TAGLIB_LIBS=`$PKG_CONFIG --libs "taglib >= 1.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60237,8 +58280,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -60246,27 +58289,27 @@ _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 -printf "%s\n" "$as_me: WARNING: ${TAGLIB_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${TAGLIB_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${TAGLIB_PKG_ERRORS}." >&2;} elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${TAGLIB_PKG_ERRORS}." >&5 -printf "%s\n" "$as_me: WARNING: ${TAGLIB_PKG_ERRORS}." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${TAGLIB_PKG_ERRORS}." >&5 +$as_echo "$as_me: WARNING: ${TAGLIB_PKG_ERRORS}." >&2;} else - 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; } + TAGLIB_CFLAGS=$pkg_cv_TAGLIB_CFLAGS + TAGLIB_LIBS=$pkg_cv_TAGLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -60296,10 +58339,9 @@ # Check whether --enable-secret was given. -if test ${enable_secret+y} -then : +if test "${enable_secret+set}" = set; then : enableval=$enable_secret; -else $as_nop +else enable_secret=auto fi @@ -60308,17 +58350,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsecret-1 >= 0.18" >&5 -printf %s "checking for libsecret-1 >= 0.18... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SECRET" >&5 +$as_echo_n "checking for SECRET... " >&6; } if test -n "$SECRET_CFLAGS"; then pkg_cv_SECRET_CFLAGS="$SECRET_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= 0.18\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= 0.18\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsecret-1 >= 0.18") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SECRET_CFLAGS=`$PKG_CONFIG --cflags "libsecret-1 >= 0.18" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60332,10 +58374,10 @@ pkg_cv_SECRET_LIBS="$SECRET_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= 0.18\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= 0.18\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsecret-1 >= 0.18") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SECRET_LIBS=`$PKG_CONFIG --libs "libsecret-1 >= 0.18" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60349,8 +58391,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -60358,38 +58400,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&5 +$as_echo "$as_me: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&5 +$as_echo "$as_me: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&2;} fi else - 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 + SECRET_CFLAGS=$pkg_cv_SECRET_CFLAGS + SECRET_LIBS=$pkg_cv_SECRET_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBsecret=libsecret_plugin.la @@ -60410,17 +58450,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsecret-1 >= 0.18" >&5 -printf %s "checking for libsecret-1 >= 0.18... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SECRET" >&5 +$as_echo_n "checking for SECRET... " >&6; } if test -n "$SECRET_CFLAGS"; then pkg_cv_SECRET_CFLAGS="$SECRET_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= 0.18\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= 0.18\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsecret-1 >= 0.18") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SECRET_CFLAGS=`$PKG_CONFIG --cflags "libsecret-1 >= 0.18" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60434,10 +58474,10 @@ pkg_cv_SECRET_LIBS="$SECRET_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= 0.18\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= 0.18\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsecret-1 >= 0.18") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SECRET_LIBS=`$PKG_CONFIG --libs "libsecret-1 >= 0.18" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60451,8 +58491,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -60460,40 +58500,38 @@ _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 - if test x"$enable_secret" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&5 +$as_echo "$as_me: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&2;} fi 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 - if test x"$enable_secret" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&5 +$as_echo "$as_me: WARNING: Library libsecret-1 >= 0.18 needed for secret was not found" >&2;} fi else - 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 + SECRET_CFLAGS=$pkg_cv_SECRET_CFLAGS + SECRET_LIBS=$pkg_cv_SECRET_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_secret=yes LTLIBsecret=libsecret_plugin.la @@ -60530,13 +58568,11 @@ # Check whether --enable-kwallet was given. -if test ${enable_kwallet+y} -then : +if test "${enable_kwallet+set}" = set; then : enableval=$enable_kwallet; fi -if test "${enable_kwallet}" != "no" -a "${have_dbus}" = "yes" -then : +if test "${enable_kwallet}" != "no" -a "${have_dbus}" = "yes"; then : @@ -60548,15 +58584,13 @@ fi # Check whether --enable-update-check was given. -if test ${enable_update_check+y} -then : +if test "${enable_update_check+set}" = set; then : enableval=$enable_update_check; fi if test "${enable_update_check}" = "yes" then - if test "${ac_cv_lib_gcrypt}" != "yes" -then : + if test "${ac_cv_lib_gcrypt}" != "yes"; then : as_fn_error $? "libgcrypt is required for update checking system" "$LINENO" 5 fi @@ -60571,15 +58605,13 @@ # Check whether --enable-osx_notifications was given. -if test ${enable_osx_notifications+y} -then : +if test "${enable_osx_notifications+set}" = set; then : enableval=$enable_osx_notifications; -else $as_nop +else enable_osx_notifications=no fi -if test "${enable_osx_notifications}" != "no" -then : +if test "${enable_osx_notifications}" != "no"; then : if test -d ${CONTRIB_DIR}/Growl.framework -o -d ${CONTRIB_DIR}/Frameworks/Growl.framework then @@ -60632,10 +58664,9 @@ # Check whether --enable-notify was given. -if test ${enable_notify+y} -then : +if test "${enable_notify+set}" = set; then : enableval=$enable_notify; -else $as_nop +else enable_notify=auto fi @@ -60644,17 +58675,17 @@ yes) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnotify gtk+-3.0" >&5 -printf %s "checking for libnotify gtk+-3.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5 +$as_echo_n "checking for NOTIFY... " >&6; } if test -n "$NOTIFY_CFLAGS"; then pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnotify gtk+-3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify gtk+-3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60668,10 +58699,10 @@ pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnotify gtk+-3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify gtk+-3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60685,8 +58716,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -60694,38 +58725,36 @@ _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" -then : + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&5 +$as_echo "$as_me: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&2;} fi 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" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&5 +$as_echo "$as_me: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&2;} fi else - 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 + NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS + NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LTLIBnotify=libnotify_plugin.la @@ -60746,17 +58775,17 @@ auto) : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnotify gtk+-3.0" >&5 -printf %s "checking for libnotify gtk+-3.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5 +$as_echo_n "checking for NOTIFY... " >&6; } if test -n "$NOTIFY_CFLAGS"; then pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnotify gtk+-3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify gtk+-3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60770,10 +58799,10 @@ pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-3.0\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify gtk+-3.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnotify gtk+-3.0") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify gtk+-3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60787,8 +58816,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -60796,40 +58825,38 @@ _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 - if test x"$enable_notify" = "xyes" -then : + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&5 +$as_echo "$as_me: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&2;} fi 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 - if test x"$enable_notify" = "xyes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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 -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&5 -printf "%s\n" "$as_me: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&5 +$as_echo "$as_me: WARNING: Library libnotify gtk+-3.0 needed for notify was not found" >&2;} fi else - 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 + NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS + NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_notify=yes LTLIBnotify=libnotify_plugin.la @@ -60866,28 +58893,26 @@ # Check whether --enable-libplacebo was given. -if test ${enable_libplacebo+y} -then : +if test "${enable_libplacebo+set}" = set; then : enableval=$enable_libplacebo; fi -if test "$enable_libplacebo" != "no" -then : +if test "$enable_libplacebo" != "no"; then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libplacebo >= 0.2.1 libplacebo < 6" >&5 -printf %s "checking for libplacebo >= 0.2.1 libplacebo < 6... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPLACEBO" >&5 +$as_echo_n "checking for LIBPLACEBO... " >&6; } if test -n "$LIBPLACEBO_CFLAGS"; then pkg_cv_LIBPLACEBO_CFLAGS="$LIBPLACEBO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libplacebo >= 0.2.1 libplacebo < 6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libplacebo >= 0.2.1 libplacebo < 6\""; } >&5 ($PKG_CONFIG --exists --print-errors "libplacebo >= 0.2.1 libplacebo < 6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBPLACEBO_CFLAGS=`$PKG_CONFIG --cflags "libplacebo >= 0.2.1 libplacebo < 6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60901,10 +58926,10 @@ pkg_cv_LIBPLACEBO_LIBS="$LIBPLACEBO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libplacebo >= 0.2.1 libplacebo < 6\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libplacebo >= 0.2.1 libplacebo < 6\""; } >&5 ($PKG_CONFIG --exists --print-errors "libplacebo >= 0.2.1 libplacebo < 6") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBPLACEBO_LIBS=`$PKG_CONFIG --libs "libplacebo >= 0.2.1 libplacebo < 6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -60918,8 +58943,8 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -60927,16 +58952,15 @@ _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 libplacebo < 6" 2>&1` + LIBPLACEBO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libplacebo >= 0.2.1 libplacebo < 6" 2>&1` else - LIBPLACEBO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libplacebo >= 0.2.1 libplacebo < 6" 2>&1` + LIBPLACEBO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libplacebo >= 0.2.1 libplacebo < 6" 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}" -then : + if test -n "${enable_libplacebo}"; then : as_fn_error $? "${LIBPLACEBO_PKG_ERRORS}." "$LINENO" 5 @@ -60944,11 +58968,10 @@ enable_libplacebo="no" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test -n "${enable_libplacebo}" -then : + if test -n "${enable_libplacebo}"; then : as_fn_error $? "${LIBPLACEBO_PKG_ERRORS}." "$LINENO" 5 @@ -60956,13 +58979,13 @@ enable_libplacebo="no" else - 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; } + LIBPLACEBO_CFLAGS=$pkg_cv_LIBPLACEBO_CFLAGS + LIBPLACEBO_LIBS=$pkg_cv_LIBPLACEBO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -printf "%s\n" "#define HAVE_LIBPLACEBO 1" >>confdefs.h +$as_echo "#define HAVE_LIBPLACEBO 1" >>confdefs.h fi @@ -60978,12 +59001,11 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -printf %s "checking whether byte ordering is bigendian... " >&6; } -if test ${ac_cv_c_bigendian+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -60994,8 +59016,7 @@ typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -61019,7 +59040,7 @@ fi done fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -61028,7 +59049,7 @@ #include int -main (void) +main () { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -61040,8 +59061,7 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61049,7 +59069,7 @@ #include int -main (void) +main () { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -61059,15 +59079,14 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes -else $as_nop +else ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). @@ -61076,7 +59095,7 @@ #include int -main (void) +main () { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -61086,15 +59105,14 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { #ifndef _BIG_ENDIAN not big endian @@ -61104,33 +59122,31 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes -else $as_nop +else ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -unsigned short int ascii_mm[] = +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - unsigned short int ascii_ii[] = + short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; int use_ascii (int i) { return ascii_mm[i] + ascii_ii[i]; } - unsigned short int ebcdic_ii[] = + short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - unsigned short int ebcdic_mm[] = + short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; @@ -61138,15 +59154,14 @@ extern int foo; int -main (void) +main () { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -61159,13 +59174,13 @@ fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else $as_nop +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main (void) +main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -61181,10 +59196,9 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no -else $as_nop +else ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -61193,17 +59207,17 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -printf "%s\n" "$ac_cv_c_bigendian" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -61211,12 +59225,11 @@ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -if test "${ac_cv_c_bigendian}" = "yes" -then : +if test "${ac_cv_c_bigendian}" = "yes"; then : DEFS_BIGENDIAN="-DWORDS_BIGENDIAN=1" -else $as_nop +else DEFS_BIGENDIAN="" @@ -61225,10 +59238,9 @@ # Check whether --with-kde-solid was given. -if test ${with_kde_solid+y} -then : +if test "${with_kde_solid+set}" = set; then : withval=$with_kde_solid; -else $as_nop +else if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -a "${HAVE_ANDROID}" != "1" ; then @@ -61238,20 +59250,17 @@ fi soliddatadir="" -if test "${with_kde_solid}" != "no" -then : +if test "${with_kde_solid}" != "no"; then : - if test "${with_kde_solid}" = "yes" -then : + if test "${with_kde_solid}" = "yes"; then : kde4datadir="`${KDE4_CONFIG} --install data`" - if test "x$kde4datadir" = "x" -then : + if test "x$kde4datadir" = "x"; then : kde4datadir='${datadir}/kde4/apps' fi soliddatadir="${kde4datadir}/solid/actions" -else $as_nop +else soliddatadir="${with_kde_solid}" @@ -61271,10 +59280,11 @@ if test "${SYS}" = "mingw32"; then ac_fn_c_check_type "$LINENO" "PROCESS_MITIGATION_IMAGE_LOAD_POLICY" "ac_cv_type_PROCESS_MITIGATION_IMAGE_LOAD_POLICY" "#include " -if test "x$ac_cv_type_PROCESS_MITIGATION_IMAGE_LOAD_POLICY" = xyes -then : +if test "x$ac_cv_type_PROCESS_MITIGATION_IMAGE_LOAD_POLICY" = xyes; then : -printf "%s\n" "#define HAVE_PROCESS_MITIGATION_IMAGE_LOAD_POLICY 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_PROCESS_MITIGATION_IMAGE_LOAD_POLICY 1 +_ACEOF fi @@ -61284,8 +59294,7 @@ # Check whether --enable-vlc was given. -if test ${enable_vlc+y} -then : +if test "${enable_vlc+set}" = set; then : enableval=$enable_vlc; fi @@ -61298,18 +59307,16 @@ fi -if test "x$with_libfuzzer" = xno -then : +if test "x$with_libfuzzer" = xno; then : -else $as_nop +else LIBS="-lstdc++ ${LIBM} ${LIBPTHREAD} -L${with_libfuzzer} -lFuzzer" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize-coverage=trace-pc-guard" >&5 -printf %s "checking whether C compiler accepts -fsanitize-coverage=trace-pc-guard... " >&6; } -if test ${ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize-coverage=trace-pc-guard" >&5 +$as_echo_n "checking whether C compiler accepts -fsanitize-coverage=trace-pc-guard... " >&6; } +if ${ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS -fsanitize-coverage=trace-pc-guard" @@ -61317,89 +59324,85 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard=yes -else $as_nop +else ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard" >&5 -printf "%s\n" "$ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard" >&6; } -if test "x$ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard" >&5 +$as_echo "$ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard" >&6; } +if test "x$ax_cv_check_cflags___fsanitize_coverage_trace_pc_guard" = xyes; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" -fsanitize-coverage=trace-pc-guard "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -fsanitize-coverage=trace-pc-guard"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -fsanitize-coverage=trace-pc-guard"; } >&5 (: CFLAGS already contains -fsanitize-coverage=trace-pc-guard) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " -fsanitize-coverage=trace-pc-guard" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=-fsanitize-coverage=trace-pc-guard - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" -fsanitize-coverage=trace-pc-guard "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -fsanitize-coverage=trace-pc-guard"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -fsanitize-coverage=trace-pc-guard"; } >&5 (: CXXFLAGS already contains -fsanitize-coverage=trace-pc-guard) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " -fsanitize-coverage=trace-pc-guard" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=-fsanitize-coverage=trace-pc-guard - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi @@ -61409,13 +59412,12 @@ for flag in -fsanitize-coverage=trace-cmp; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -61423,61 +59425,58 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 (: CFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi @@ -61488,13 +59487,12 @@ for flag in -fsanitize-coverage=trace-cmp; do - as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -printf %s "checking whether C compiler accepts $flag... " >&6; } -if eval test \${$as_CACHEVAR+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS $flag" @@ -61502,75 +59500,71 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_CACHEVAR=yes" -else $as_nop +else eval "$as_CACHEVAR=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi eval ac_res=\$$as_CACHEVAR - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_CACHEVAR"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" $flag "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5 (: CXXFLAGS already contains $flag) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " $flag" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=$flag - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else : fi done -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize-coverage=trace-pc" >&5 -printf %s "checking whether C compiler accepts -fsanitize-coverage=trace-pc... " >&6; } -if test ${ax_cv_check_cflags___fsanitize_coverage_trace_pc+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize-coverage=trace-pc" >&5 +$as_echo_n "checking whether C compiler accepts -fsanitize-coverage=trace-pc... " >&6; } +if ${ax_cv_check_cflags___fsanitize_coverage_trace_pc+:} false; then : + $as_echo_n "(cached) " >&6 +else ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS -fsanitize-coverage=trace-pc" @@ -61578,95 +59572,91 @@ /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ax_cv_check_cflags___fsanitize_coverage_trace_pc=yes -else $as_nop +else ax_cv_check_cflags___fsanitize_coverage_trace_pc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$ax_check_save_flags fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_coverage_trace_pc" >&5 -printf "%s\n" "$ax_cv_check_cflags___fsanitize_coverage_trace_pc" >&6; } -if test "x$ax_cv_check_cflags___fsanitize_coverage_trace_pc" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_coverage_trace_pc" >&5 +$as_echo "$ax_cv_check_cflags___fsanitize_coverage_trace_pc" >&6; } +if test "x$ax_cv_check_cflags___fsanitize_coverage_trace_pc" = xyes; then : -if test ${CFLAGS+y} -then : +if ${CFLAGS+:} false; then : case " $CFLAGS " in #( *" -fsanitize-coverage=trace-pc "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -fsanitize-coverage=trace-pc"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -fsanitize-coverage=trace-pc"; } >&5 (: CFLAGS already contains -fsanitize-coverage=trace-pc) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CFLAGS " -fsanitize-coverage=trace-pc" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CFLAGS=-fsanitize-coverage=trace-pc - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -if test ${CXXFLAGS+y} -then : +if ${CXXFLAGS+:} false; then : case " $CXXFLAGS " in #( *" -fsanitize-coverage=trace-pc "*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -fsanitize-coverage=trace-pc"; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -fsanitize-coverage=trace-pc"; } >&5 (: CXXFLAGS already contains -fsanitize-coverage=trace-pc) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; #( *) : as_fn_append CXXFLAGS " -fsanitize-coverage=trace-pc" - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } ;; esac -else $as_nop +else CXXFLAGS=-fsanitize-coverage=trace-pc - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS\""; } >&5 (: CXXFLAGS="$CXXFLAGS") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } fi -else $as_nop +else as_fn_error $? "Sanitizer coverage not supported by your compiler" "$LINENO" 5 @@ -61681,31 +59671,49 @@ VERSION_MESSAGE="${VERSION} ${CODENAME}" COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} the VideoLAN team" -printf "%s\n" "#define VERSION_MESSAGE \"${VERSION_MESSAGE}\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define VERSION_MESSAGE "${VERSION_MESSAGE}" +_ACEOF -printf "%s\n" "#define COPYRIGHT_MESSAGE \"${COPYRIGHT_MESSAGE}\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define COPYRIGHT_MESSAGE "${COPYRIGHT_MESSAGE}" +_ACEOF -printf "%s\n" "#define COPYRIGHT_YEARS \"${COPYRIGHT_YEARS}\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define COPYRIGHT_YEARS "${COPYRIGHT_YEARS}" +_ACEOF -printf "%s\n" "#define CONFIGURE_LINE \"${CONFIGURE_LINE}\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define CONFIGURE_LINE "${CONFIGURE_LINE}" +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION_MINOR ${VERSION_MINOR}" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR ${VERSION_MINOR} +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION_REVISION ${VERSION_REVISION}" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_REVISION ${VERSION_REVISION} +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION_EXTRA ${VERSION_EXTRA}" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_EXTRA ${VERSION_EXTRA} +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION_DEV \"${VERSION_DEV}\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_DEV "${VERSION_DEV}" +_ACEOF @@ -61714,23 +59722,25 @@ -if test -z "$VLC_COMPILE_BY" -then : +if test -z "$VLC_COMPILE_BY"; then : VLC_COMPILE_BY=`whoami|sed -e 's/\\\/\\\\\\\/g'` fi -printf "%s\n" "#define VLC_COMPILE_BY \"$VLC_COMPILE_BY\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define VLC_COMPILE_BY "$VLC_COMPILE_BY" +_ACEOF -if test -z "$VLC_COMPILE_HOST" -then : +if test -z "$VLC_COMPILE_HOST"; then : VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname` fi -printf "%s\n" "#define VLC_COMPILE_HOST \"$VLC_COMPILE_HOST\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define VLC_COMPILE_HOST "$VLC_COMPILE_HOST" +_ACEOF cat >>confdefs.h <<_ACEOF @@ -61754,7 +59764,7 @@ -ac_config_files="$ac_config_files Makefile doc/Makefile modules/Makefile m4/Makefile po/Makefile.in share/Makefile compat/Makefile src/Makefile lib/Makefile bin/Makefile test/Makefile modules/hw/mmal/Makefile share/vlc.appdata.xml.in" +ac_config_files="$ac_config_files Makefile doc/Makefile modules/Makefile m4/Makefile po/Makefile.in share/Makefile compat/Makefile src/Makefile lib/Makefile bin/Makefile test/Makefile modules/hw/mmal/Makefile share/org.videolan.vlc.appdata.xml.in" if test -z "$HAVE_WIN32_TRUE"; then : @@ -61798,8 +59808,8 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -61829,15 +59839,15 @@ /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -61851,8 +59861,8 @@ fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -61869,7 +59879,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -61880,14 +59890,14 @@ LTLIBOBJS=$ac_ltlibobjs -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -printf %s "checking that generated files are newer than configure... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 -printf "%s\n" "done" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -61988,6 +59998,10 @@ as_fn_error $? "conditional \"HAVE_DYNAMIC_PLUGINS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_STDCKDINT_TRUE}" && test -z "${HAVE_STDCKDINT_FALSE}"; then + as_fn_error $? "conditional \"HAVE_STDCKDINT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_SYSLOG_TRUE}" && test -z "${HAVE_SYSLOG_FALSE}"; then as_fn_error $? "conditional \"HAVE_SYSLOG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -62072,6 +60086,10 @@ as_fn_error $? "conditional \"HAVE_AMF_ENHANCER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_AMF_FRC_TRUE}" && test -z "${HAVE_AMF_FRC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_AMF_FRC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_DECKLINK_TRUE}" && test -z "${HAVE_DECKLINK_FALSE}"; then as_fn_error $? "conditional \"HAVE_DECKLINK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -62326,8 +60344,8 @@ ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -62350,16 +60368,14 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -62369,46 +60385,46 @@ fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -62417,6 +60433,13 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -62425,12 +60448,8 @@ for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -62442,10 +60461,30 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -62458,14 +60497,13 @@ as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -62492,20 +60530,18 @@ { eval $1=; unset $1;} } as_unset=as_fn_unset - # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -62517,13 +60553,12 @@ # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -62554,7 +60589,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -62576,10 +60611,6 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -62593,12 +60624,6 @@ ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -62640,7 +60665,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -62649,7 +60674,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -62711,8 +60736,8 @@ # 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.21, which was -generated by GNU Autoconf 2.71. Invocation command line was +This file was extended by vlc $as_me 3.0.22, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -62774,16 +60799,14 @@ Report bugs to the package provider." _ACEOF -ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` -ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config='$ac_cs_config_escaped' +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vlc config.status 3.0.21 -configured by $0, generated by GNU Autoconf 2.71, +vlc config.status 3.0.22 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -62823,15 +60846,15 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf "%s\n" "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - printf "%s\n" "$ac_cs_config"; exit ;; + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -62839,7 +60862,7 @@ --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -62848,7 +60871,7 @@ as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - printf "%s\n" "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -62876,7 +60899,7 @@ if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -62890,7 +60913,7 @@ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - printf "%s\n" "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF @@ -62945,14 +60968,12 @@ lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -63178,13 +61199,13 @@ lt_SP2NL \ lt_NL2SP \ reload_flag \ -FILECMD \ deplibs_check_method \ file_magic_cmd \ file_magic_glob \ want_nocaseglob \ sharedlib_from_linklib_cmd \ AR \ +AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -63402,7 +61423,7 @@ "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "modules/hw/mmal/Makefile") CONFIG_FILES="$CONFIG_FILES modules/hw/mmal/Makefile" ;; - "share/vlc.appdata.xml.in") CONFIG_FILES="$CONFIG_FILES share/vlc.appdata.xml.in" ;; + "share/org.videolan.vlc.appdata.xml.in") CONFIG_FILES="$CONFIG_FILES share/org.videolan.vlc.appdata.xml.in" ;; "extras/package/win32/NSIS/spad.nsi") CONFIG_FILES="$CONFIG_FILES extras/package/win32/NSIS/spad.nsi" ;; "extras/package/win32/NSIS/vlc.win32.nsi") CONFIG_FILES="$CONFIG_FILES extras/package/win32/NSIS/vlc.win32.nsi" ;; "extras/package/win32/msi/config.wxi") CONFIG_FILES="$CONFIG_FILES extras/package/win32/msi/config.wxi" ;; @@ -63418,9 +61439,9 @@ # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files - test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers - test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -63756,7 +61777,7 @@ esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -63764,17 +61785,17 @@ # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf "%s\n" "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf "%s\n" "$configure_input" | + ac_sed_conf_input=`$as_echo "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -63791,7 +61812,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -63815,9 +61836,9 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -63879,8 +61900,8 @@ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -63924,9 +61945,9 @@ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -63942,20 +61963,20 @@ # if test x"$ac_file" != x-; then { - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -63975,7 +61996,7 @@ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$_am_arg" | +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -63995,8 +62016,8 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -printf "%s\n" "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -64022,7 +62043,7 @@ for am_mf do # Strip MF so we end up with the name of the file. - am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'` + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile which includes # dependency-tracking related rules and includes. # Grep'ing the whole file directly is not great: AIX grep has a line @@ -64034,7 +62055,7 @@ X"$am_mf" : 'X\(//\)[^/]' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$am_mf" | +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -64056,7 +62077,7 @@ $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$am_mf" | +$as_echo X/"$am_mf" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -64081,12 +62102,10 @@ (exit $ac_status); } || am_rc=$? done if test $am_rc -ne 0; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. If GNU make was not used, consider - re-running the configure script with MAKE=\"gmake\" (or whatever is - necessary). You can also try re-running configure with the + for automatic dependency tracking. Try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } @@ -64241,9 +62260,6 @@ # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd -# A file(cmd) program that detects file types. -FILECMD=$lt_FILECMD - # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -64262,11 +62278,8 @@ # The archiver. AR=$lt_AR -# Flags to create an archive (by configure). -lt_ar_flags=$lt_ar_flags - # Flags to create an archive. -AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} +AR_FLAGS=$lt_AR_FLAGS # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -64648,7 +62661,6 @@ esac - ltmain=$ac_aux_dir/ltmain.sh @@ -64656,7 +62668,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - $SED '$q' "$ltmain" >> "$cfgfile" \ + sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -65118,8 +63130,8 @@ $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -65160,4 +63172,3 @@ fi echo " To build vlc and its plugins, type \`$MAKE', or \`./compile' if you like nice colors." - diff -Nru vlc-3.0.21/configure.ac vlc-3.0.22/configure.ac --- vlc-3.0.21/configure.ac 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/configure.ac 2025-11-24 23:00:36.000000000 +0000 @@ -1,11 +1,11 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 1999-2024 VLC authors and VideoLAN]) +AC_COPYRIGHT([Copyright 1999-2025 VLC authors and VideoLAN]) -AC_INIT(vlc, 3.0.21) +AC_INIT(vlc, 3.0.22) VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=21 +VERSION_REVISION=22 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-2024" +COPYRIGHT_YEARS="1996-2025" AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) @@ -144,8 +144,8 @@ dnl Force gcc "-arch" flag ARCH_flag="" - case "${host}" in - i?86*) + case "${host_cpu}" in + i?86) ARCH_flag="-arch i386" ;; ppc64*) @@ -154,7 +154,7 @@ ppc*) ARCH_flag="-arch ppc" ;; - x86_64*) + x86_64) ARCH_flag="-arch x86_64" ;; arm*) @@ -203,6 +203,7 @@ CC="${CC} -isysroot ${with_macosx_sdk}" CXX="${CXX} -isysroot ${with_macosx_sdk}" OBJC="${OBJC} -isysroot ${with_macosx_sdk}" + CCAS="${CCAS} -isysroot ${with_macosx_sdk}" LD="${LD} -syslibroot ${with_macosx_sdk}" fi AC_ARG_WITH(macosx-version-min, @@ -213,13 +214,16 @@ CC="${CC} -mmacosx-version-min=${with_macosx_version_min}" CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}" OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}" + CCAS="${CCAS} -mmacosx-version-min=${with_macosx_version_min}" LD="${LD} -mmacosx_version_min=${with_macosx_version_min}" fi ;; *mingw32* | *cygwin* | *wince* | *mingwce*) dnl Force libtool to not link to (shared) libgcc_s when detecting C++ dependencies dnl When doing this test with -static-libgcc it will link on (static) libgcc_eh - CXXFLAGS="${CXXFLAGS} -static-libgcc" + AC_LANG_PUSH(C++) + AX_APPEND_COMPILE_FLAGS([-static-libgcc], [CXXFLAGS], [-Werror]) + AC_LANG_POP(C++) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) AC_PREPROC_IFELSE([AC_LANG_PROGRAM( @@ -259,6 +263,21 @@ AC_DEFINE([_BSD_SOURCE], [1], [ISO C, POSIX, and 4.3BSD things.]) AC_DEFINE([_SVID_SOURCE], [1], [ISO C, POSIX, and SVID things.]) + AC_ARG_WITH(packagedir, + AS_HELP_STRING([--with-packagedir=DIR], + [output the packaged VLC files in DIR (default vlc-$PACKAGE_VERSION)])) + AS_IF([test "${with_packagedir}" != ""], [ + AS_IF([test -d "${with_packagedir}"], [ + PACKAGE_DIR=`cd "${with_packagedir}" && pwd -P` + ],[ + dnl this should be an absolute path + PACKAGE_DIR="${with_packagedir}" + ]) + ], [ + PACKAGE_DIR=`pwd -P`"/vlc-${PACKAGE_VERSION}" + ]) + AC_SUBST([PACKAGE_DIR]) + case "${host_os}" in *mingw32*) SYS=mingw32 @@ -285,16 +304,30 @@ dnl dnl NSIS/MSI Installer prefix and WIN64 dnl - case "${host}" in - amd64*|x86_64*) + case "${host_cpu}" in + aarch64) + HAVE_WIN64="1" + WINDOWS_ARCH="arm64" + PROGRAMFILES="PROGRAMFILES64" + LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000" + ;; + amd64|x86_64) HAVE_WIN64="1" WINDOWS_ARCH="x64" PROGRAMFILES="PROGRAMFILES64" LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000" ;; - *) + armv7) + WINDOWS_ARCH="arm" + PROGRAMFILES="PROGRAMFILES" + ;; + i?86) WINDOWS_ARCH="x86" PROGRAMFILES="PROGRAMFILES" + AX_APPEND_FLAG([-Wl,--large-address-aware], [LDFLAGS]) + ;; + *) + AC_MSG_ERROR([Unsupported Windows architecture ${host_cpu}]) ;; esac AC_SUBST(WINDOWS_ARCH) @@ -341,9 +374,13 @@ AS_IF([test "${enable_winstore_app}" = "yes"], [ vlc_winstore_app=1 LIBCOM="" - VLC_ADD_LIBS([libvlccore], [-lruntimeobject]) - AC_LIBOBJ([gai_strerror]) - ],[]) + AX_APPEND_FLAG([-DWINSTORECOMPAT],[CFLAGS]) + AX_APPEND_FLAG([-DWINSTORECOMPAT],[CPPFLAGS]) + AX_APPEND_FLAG([-DWINSTORECOMPAT],[CXXFLAGS]) + AX_APPEND_FLAG([-lwinstorecompat], [LDFLAGS]) + VLC_ADD_LIBS([libvlccore], [-lruntimeobject]) + AC_LIBOBJ([gai_strerror]) + ],[]) AC_SUBST(LIBCOM) ]) AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps]) @@ -355,8 +392,7 @@ AS_IF([test "${SYS}" = "mingw32"],[ AS_IF([test "${enable_pdb}" = "yes"], [ vlc_build_pdb=1 - AX_APPEND_FLAG([-g -gcodeview],[CFLAGS]) - AX_APPEND_FLAG([-g -gcodeview],[CXXFLAGS]) + AX_APPEND_FLAG([-g -gcodeview],[CPPFLAGS]) LDFLAGS="${LDFLAGS} -Wl,-pdb=" ],[]) ]) @@ -632,7 +668,7 @@ dnl Check for usual libc functions AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale]) -AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf]) +AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf]) AC_REPLACE_FUNCS([gettimeofday]) AC_CHECK_FUNC(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) @@ -646,6 +682,10 @@ VLC_REPLACE_DECL([gmtime_r], [#include ]) VLC_REPLACE_DECL([localtime_r], [#include ]) +dnl android 21 implements those as static inline, not functions with C linkage +VLC_REPLACE_DECL([swab], [#include ]) +VLC_REPLACE_DECL([ffsll], [#include ]) + dnl C11 static_assert() AC_MSG_CHECKING([for static_assert in assert.h]) AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [ @@ -836,6 +876,14 @@ dnl Check for headers dnl +have_stdckdint="no" +AC_CHECK_HEADER([stdckdint.h], [ + have_stdckdint="yes" +], [ + CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)/compat/stdckdint" +]) +AM_CONDITIONAL([HAVE_STDCKDINT], [test "${have_stdckdint}" = "yes"]) + dnl POSIX AC_CHECK_HEADERS([arpa/inet.h pthread.h search.h sys/shm.h sys/socket.h sys/uio.h]) AC_CHECK_HEADERS([net/if.h], [], [], @@ -1229,6 +1277,43 @@ AC_DEFINE(HAVE_ATTRIBUTE_PACKED, 1, Support for __attribute__((packed)) for structs) fi +WIN32_PATH_CMD= +AS_IF([test "${SYS}" = "mingw32"], [ + AC_MSG_CHECKING([how to transform windows pathes]) + win32_path_cmd=no + for win_path in "cygpath" "wslpath" "wine winepath" + do + ac_try="$win_path -u c: >/dev/null" + (eval "$ac_try") 2>&5 + ac_status=$? + if test $ac_status = 0; then + win32_path_cmd=$win_path + break + fi + done + AS_IF([test "${win32_path_cmd}" != "no"],[ + WIN32_PATH_CMD=${win32_path_cmd} + AC_MSG_RESULT([using '${win32_path_cmd}']) + ],[ + AC_MSG_RESULT([not possible]) + ]) +]) + +AC_SUBST([WIN32_PATH_CMD]) + +AC_ARG_WITH([wix], + AS_HELP_STRING([--with-wix=DIR], [location of WIX binary (default: contribs)]) +) +AS_IF([test -z "${with_wix}"], [ + AS_IF([test -n "${CONTRIB_DIR}"], [ + with_wix="${CONTRIB_DIR}/bin" + ]) +]) +AS_IF([test "${with_wix}" != "no"], [ + WIXPATH="${with_wix}" +]) +AC_SUBST([WIXPATH]) + dnl dnl Check the CPU dnl @@ -1246,8 +1331,13 @@ esac dnl Check for backtrace() support -AC_CHECK_HEADERS(execinfo.h) -AC_CHECK_FUNCS(backtrace) +AC_CHECK_HEADERS([execinfo.h]) +AC_CHECK_FUNCS([backtrace],, [ + AC_CHECK_LIB([execinfo], [backtrace], [ + LIBEXECINFO="-lexecinfo"]) +]) +AC_SUBST(LIBEXECINFO) + dnl dnl default modules @@ -1966,6 +2056,17 @@ ]) AM_CONDITIONAL([HAVE_AMF_ENHANCER], [test "${have_amf_enhancer}" != "no"]) +AC_ARG_ENABLE([amf-frc], AS_HELP_STRING([--disable-amf-frc], + [disable AMD FRC (default auto)])) +have_amf_frc="no" +AS_IF([test "$enable_amf_frc" != "no"], [ + AC_CHECK_HEADERS([AMF/core/PropertyStorage.h AMF/components/FRC.h], [ + have_amf_frc="yes" + AC_DEFINE(HAVE_AMF_FRC, 1, AMD Frame Rate Conversion supported) + ]) +]) +AM_CONDITIONAL([HAVE_AMF_FRC], [test "${have_amf_frc}" != "no"]) + dnl dnl special access module for Blackmagic SDI cards dnl @@ -2468,25 +2569,7 @@ AM_CONDITIONAL([HAVE_VAAPI_DRM], [test "${have_vaapi_drm}" = "yes"]) AM_CONDITIONAL([HAVE_VAAPI_X11], [test "${have_vaapi_x11}" = "yes"]) AM_CONDITIONAL([HAVE_VAAPI_WL], [test "${have_vaapi_wl}" = "yes"]) - -have_avcodec_vaapi="no" -AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [ - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" - CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" - AC_CHECK_HEADERS([libavcodec/vaapi.h], [ - AC_MSG_NOTICE([VA API acceleration activated]) - have_avcodec_vaapi="yes" - ],[ - AS_IF([test -n "${enable_libva}"], [ - AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing]) - ], [ - AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ]) - ]) - ]) - VLC_RESTORE_FLAGS -]) -AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_avcodec_vaapi}" = "yes"]) +AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"]) dnl dnl dxva2 needs avcodec @@ -2726,8 +2809,8 @@ dnl A52/AC3 decoder plugin dnl AC_ARG_ENABLE(a52, - [ --enable-a52 A/52 support with liba52 (default enabled)]) -if test "${enable_a52}" != "no" + [ --enable-a52 A/52 support with liba52 (default disabled)]) +if test "${enable_a52}" = "yes" then AC_ARG_WITH(a52, [ --with-a52=PATH a52 headers and libraries]) @@ -2759,7 +2842,7 @@ dnl dnl DTS Coherent Acoustics decoder plugin dnl -PKG_ENABLE_MODULES_VLC([DCA], [dca], [libdca >= 0.0.5], [DTS Coherent Acoustics support with libdca], [auto]) +PKG_ENABLE_MODULES_VLC([DCA], [dca], [libdca >= 0.0.5], [DTS Coherent Acoustics support with libdca], [disabled]) dnl dnl Flac plugin @@ -2769,7 +2852,7 @@ dnl dnl Libmpeg2 plugin dnl -PKG_ENABLE_MODULES_VLC([LIBMPEG2], [], [libmpeg2 > 0.3.2], [libmpeg2 decoder support], [auto]) +PKG_ENABLE_MODULES_VLC([LIBMPEG2], [], [libmpeg2 > 0.3.2], [libmpeg2 decoder support], [disabled]) dnl dnl Vorbis plugin @@ -2875,7 +2958,7 @@ dnl AC_ARG_ENABLE(x262, [ --enable-x262 H262 encoding support with static libx262 (default disabled)]) -if test "${enable_x262}" != "no"; then +AS_IF([test "${enable_x262}" != "no"], [ PKG_CHECK_MODULES(X262, x262, [ VLC_ADD_PLUGIN([x262]) VLC_ADD_LDFLAGS([x262],[${X262_LIBS}]) @@ -2886,12 +2969,12 @@ if echo ${X262_LIBS} |grep -q 'pthreadGC2'; then VLC_ADD_CFLAGS([x262], [-DPTW32_STATIC_LIB]) fi - ], [ - if test "${enable_x262}" = "yes"; then - AC_MSG_ERROR([x262 module doesn't work without staticly compiled libx262.a]) - fi + ],[ + AS_IF([test "${enable_x262}" = "yes"], [ + AC_MSG_ERROR([x262 module does not work without statically compiled libx262.a]) + ]) ]) -fi +]) dnl x265 encoder PKG_ENABLE_MODULES_VLC([X265],, [x265], [HEVC/H.265 encoder], [auto]) @@ -2989,25 +3072,6 @@ ]) dnl -dnl libass subtitle rendering module -dnl -AC_ARG_ENABLE(libass, - [ --enable-libass Subtitle support using libass (default enabled)]) -AS_IF( [test "${enable_libass}" != "no"], [ - PKG_CHECK_MODULES(LIBASS, [libass >= 0.9.8], - [ - VLC_ADD_PLUGIN([libass]) - - AC_CHECK_HEADERS(fontconfig/fontconfig.h, - [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG]) - VLC_ADD_LIBS([libass],[-lfontconfig]) - ]) - ],[ - AC_MSG_WARN([${LIBASS_PKG_ERRORS}.]) - ]) - ]) - -dnl dnl ARIB subtitles rendering module dnl AC_ARG_ENABLE(aribsub, @@ -3348,6 +3412,25 @@ AM_CONDITIONAL([HAVE_HARFBUZZ], [test "${have_harfbuzz}" = "yes"]) dnl +dnl libass subtitle rendering module +dnl +AC_ARG_ENABLE(libass, + [ --enable-libass Subtitle support using libass (default enabled)]) +AS_IF( [test "${enable_libass}" != "no"], [ + PKG_CHECK_MODULES(LIBASS, [libass >= 0.9.8], + [ + VLC_ADD_PLUGIN([libass]) + + if test "${have_fontconfig}" != "no"; then + VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG]) + VLC_ADD_LIBS([libass],[${FONTCONFIG_LIBS}]) + fi + ],[ + AC_MSG_WARN([${LIBASS_PKG_ERRORS}.]) + ]) + ]) + +dnl dnl SAPI (text to Speech renderer for Windows) dnl AC_LANG_PUSH([C++]) @@ -3858,14 +3941,6 @@ ]) AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) -AC_ARG_ENABLE(libtar, - [ --enable-libtar libtar support for skins2 (default auto)]) -AS_IF([test "${enable_skins2}" = "yes" && test "${enable_libtar}" != "no"], [ - AC_CHECK_HEADERS(libtar.h, [ - VLC_ADD_LIBS([skins2],[-ltar]) - ]) -]) - dnl dnl MacOS X gui module dnl @@ -4372,7 +4447,7 @@ bin/Makefile test/Makefile modules/hw/mmal/Makefile - share/vlc.appdata.xml.in + share/org.videolan.vlc.appdata.xml.in ]) AM_COND_IF([HAVE_WIN32], [ diff -Nru vlc-3.0.21/contrib/bootstrap vlc-3.0.22/contrib/bootstrap --- vlc-3.0.21/contrib/bootstrap 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/bootstrap 2025-11-13 22:17:54.000000000 +0000 @@ -36,6 +36,7 @@ echo " (USE AT YOUR OWN LEGAL RISKS)" echo " --disable-optim disable optimization in libraries" echo " --enable-pdb generate debug information in PDB format" + echo " --enable-bitcode generate bitcode information" } BUILD= @@ -51,6 +52,7 @@ AD_CLAUSES= WITH_OPTIMIZATION="1" ENABLE_PDB= +ENABLE_BITCODE= while test -n "$1" do @@ -83,6 +85,9 @@ --enable-pdb) ENABLE_PDB=1 ;; + --enable-bitcode) + ENABLE_BITCODE=1 + ;; --enable-small) ENABLE_SMALL=1 ;; @@ -320,6 +325,10 @@ then add_make_enabled "HAVE_TVOS" fi + if test "$ENABLE_BITCODE" + then + add_make_enabled "HAVE_BITCODE_ENABLED" + fi ;; *bsd*) add_make_enabled "HAVE_BSD" diff -Nru vlc-3.0.21/contrib/src/README.md vlc-3.0.22/contrib/src/README.md --- vlc-3.0.21/contrib/src/README.md 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/README.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -## Writing rules - -At the bare minimum, a package in contrib must provide two Makefile -targets in `src/foo/rules.mak`: - - `.foo` to build and install the package, and - - `.sum-foo` to fetch or create a source tarball and verify it, -where foo the package name. - - -### Tarball - -`.sum-foo` typically depends on a separate target that fetches the source -code. In that case, `.sum-foo` needs only verify that the tarball -is correct, e.g.: - - - $(TARBALLS)/libfoo-$(FOO_VERSION).tar.bz2: - $(call download,$(FOO_URL)) - - # This will use the default rule: check SHA-512 - .sum-foo: libfoo-$(FOO_VERSION).tar.bz2 - -NOTE: contrary to the previous VLC contribs, this system always uses -a source tarball, even if the source code is downloaded from a VCS. -This serves two purposes: - - offline builds (or behind a firewall), - - source code requirements compliance. - - -### Compilation - -Similarly, `.foo` typically depends on the source code directory. In this -case, care must be taken that the directory name only exists if the -source code is fully ready. Otherwise Makefile dependencies will break -(this is not an issue for files, only directories). - - libfoo: libfoo-$(FOO_VERSION).tar.bz2 .sum-foo - $(UNPACK) # to libfoo-$(FOO_VERSION) - ### apply patches here ### - # last command: make the target directory - $(MOVE) - - .foo: libfoo - $(MAKEBUILDDIR) - $(MAKECONFIGURE) - +$(MAKEBUILD) - +$(MAKEBUILD) install - touch $@ - -### Conditional builds - -As far as possible, build rules should determine automatically whether -a package is useful (for VLC media player) or not. Useful packages -should be listed in the PKGS special variable. See some examples: - - # FFmpeg is always useful - PKGS += ffmpeg - - # DirectX headers are useful only on Windows - ifdef HAVE_WIN32 - PKGS += directx - endif - - # x264 is only useful when stream output is enabled - ifdef BUILD_ENCODERS - PKGS += x264 - endif - -If a package is a dependency of another package, but it is not a -direct dependency of VLC, then it should NOT be added to PKGS. The -build system will automatically build it via dependencies (see below). - -Some packages may be provided by the target system. This is especially -common when building natively on Linux or BSD. When this situation is -detected, the package name should be added to the PKGS_FOUND special -variable. The build system will then skip building this package: - - # Asks pkg-config if foo version 1.2.3 or later is present: - ifeq ($(call need_pkg,'foo >= 1.2.3'),) - PKGS_FOUND += foo - endif - - -### Dependencies - -If package bar depends on package foo, the special `DEPS_bar` variable -should be defined as follow: - - DEPS_bar = foo $(DEPS_foo) - -Note that dependency resolution is unfortunately _not_ recursive. -Therefore `$(DEPS_foo)` really should be specified explicitly as shown -above. (In practice, this will not make any difference insofar as there -are no pure second-level nested dependencies. For instance, libass -depends on FontConfig, which depends on FreeType, but libass depends -directly on FreeType anyway.) - -Also note that `DEPS_bar` is set "recursively" with `=`, rather than -"immediately" with `:=`. This is so that `$(DEPS_foo)` is expanded -correctly, even if `DEPS_foo` it is defined after `DEPS_bar`. - -Implementation note: - - If you must know, the main.mak build hackery will automatically - emit a dependency from .bar onto .dep-foo: - - .bar: .dep-foo - - ...whereby .dep-foo will depend on .foo: - - .dep-foo: .foo - touch $@ - - ...unless foo was detected in the target distribution: - - .dep-foo: - touch $@ - - So you really only need to set DEPS_bar. diff -Nru vlc-3.0.21/contrib/src/SDL_image/rules.mak vlc-3.0.22/contrib/src/SDL_image/rules.mak --- vlc-3.0.21/contrib/src/SDL_image/rules.mak 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/SDL_image/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -28,5 +28,5 @@ .SDL_image: SDL_image cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-tif --disable-sdltest --disable-png - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/a52/rules.mak vlc-3.0.22/contrib/src/a52/rules.mak --- vlc-3.0.21/contrib/src/a52/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/a52/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -14,6 +14,7 @@ a52dec: a52dec-$(A52DEC_VERSION).tar.gz .sum-a52 $(UNPACK) + $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/a52/liba52-pic.patch $(APPLY) $(SRC)/a52/liba52-silence.patch $(APPLY) $(SRC)/a52/liba52-inline.patch @@ -26,6 +27,6 @@ $(REQUIRE_GPL) $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) -C liba52 install - cd $< && $(MAKE) -C include install + $(MAKE) -C $< -C liba52 install + $(MAKE) -C $< -C include install touch $@ diff -Nru vlc-3.0.21/contrib/src/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch vlc-3.0.22/contrib/src/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch --- vlc-3.0.21/contrib/src/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From cf190d084644d3d3e2ea1ffbb740ad8e7aede760 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 16 Feb 2024 08:18:19 +0100 -Subject: [PATCH] Differentiate the AMF_NO_VTABLE based on the compiler - -This is a Microsoft specific extension: https://learn.microsoft.com/en-us/cpp/cpp/novtable -Clang and gcc can compile for Windows but don't support this. ---- - amf/public/include/core/Platform.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h -index d6496d4..378f789 100644 ---- a/amf/public/include/core/Platform.h -+++ b/amf/public/include/core/Platform.h -@@ -100,6 +100,12 @@ typedef signed int HRESULT; - #include - #include - -+#if defined(_MSC_VER) -+ #define AMF_NO_VTABLE __declspec(novtable) -+#else -+ #define AMF_NO_VTABLE -+#endif -+ - #if defined(_WIN32) - - -@@ -116,7 +122,6 @@ typedef signed int HRESULT; - #define AMF_INLINE __inline - #define AMF_FORCEINLINE __forceinline - #endif -- #define AMF_NO_VTABLE __declspec(novtable) - - #else // !WIN32 - Linux and Mac - -@@ -130,7 +135,6 @@ typedef signed int HRESULT; - #define AMF_INLINE __inline__ - #define AMF_FORCEINLINE __inline__ - #endif -- #define AMF_NO_VTABLE - - #endif // WIN32 - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch vlc-3.0.22/contrib/src/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch --- vlc-3.0.21/contrib/src/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From e5498eb5e82c54c93fdd56127a8bb6dc96961e46 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 16 Feb 2024 08:05:13 +0100 -Subject: [PATCH] Don't cast amf_int64 when using a format string - -The format string is designed to match amf_int64. ---- - amf/public/include/core/Variant.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/amf/public/include/core/Variant.h b/amf/public/include/core/Variant.h -index edf14ae..a44fbf5 100644 ---- a/amf/public/include/core/Variant.h -+++ b/amf/public/include/core/Variant.h -@@ -872,14 +872,14 @@ namespace amf - { - res = AMF_OK; - char buff[0xFF]; -- sprintf(buff, "%" AMFPRId64, (long long)value); -+ sprintf(buff, "%" AMFPRId64, value); - return buff; - } - static AMF_INLINE AMFVariant::WString AMFConvertInt64ToWString(amf_int64 value, AMF_RESULT& res) - { - res = AMF_OK; - wchar_t buff[0xFF]; -- swprintf(buff, 0xFF, L"%" LPRId64, (long long)value); -+ swprintf(buff, 0xFF, L"%" LPRId64, value); - return buff; - } - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch vlc-3.0.22/contrib/src/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch --- vlc-3.0.21/contrib/src/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From 17cc77f3185ca562c7c0aa4e439c8f4bace1360a Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 16 Feb 2024 08:12:20 +0100 -Subject: [PATCH 1/2] Fix const on return by value AMF_DECLARE_IID() - -The returned value won't be const in C. - -Fixes this kind of warning: -include/AMF/core/../components/Component.h:326:5: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers] ---- - amf/public/include/core/Interface.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amf/public/include/core/Interface.h b/amf/public/include/core/Interface.h -index 9ac7e41..96117f0 100644 ---- a/amf/public/include/core/Interface.h -+++ b/amf/public/include/core/Interface.h -@@ -49,7 +49,7 @@ namespace amf - } - #else - #define AMF_DECLARE_IID(name, _data1, _data2, _data3, _data41, _data42, _data43, _data44, _data45, _data46, _data47, _data48) \ -- AMF_INLINE static const AMFGuid IID_##name(void) \ -+ AMF_INLINE static AMFGuid IID_##name(void) \ - { \ - AMFGuid uid = {_data1, _data2, _data3, _data41, _data42, _data43, _data44, _data45, _data46, _data47, _data48}; \ - return uid; \ --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch vlc-3.0.22/contrib/src/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch --- vlc-3.0.21/contrib/src/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -From 6c26950f67fb07550b86f3064fb0f7b7b53eec5d Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 16 Feb 2024 08:57:46 +0100 -Subject: [PATCH] Fix warning when _MSC_VER is not defined - ---- - amf/public/include/core/Variant.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/amf/public/include/core/Variant.h b/amf/public/include/core/Variant.h -index edf14ae..879f092 100644 ---- a/amf/public/include/core/Variant.h -+++ b/amf/public/include/core/Variant.h -@@ -365,7 +365,7 @@ namespace amf - operator=(p_other); - } - --#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600) -+#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (defined(_MSC_VER) && _MSC_VER >= 1600) - #pragma warning (push) - #pragma warning (disable : 26439) //This kind of function may not throw. Declare it 'noexcept'. - String(String&& p_other) : m_Str(nullptr) -@@ -393,7 +393,7 @@ namespace amf - m_Str = AMFVariantDuplicateString(p_other.m_Str); - return *this; - } --#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600) -+#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (defined(_MSC_VER) && _MSC_VER >= 1600) - String& operator=(String&& p_other) - { - Free(); -@@ -475,7 +475,7 @@ namespace amf - { - operator=(p_other); - } --#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600) -+#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (defined(_MSC_VER) && _MSC_VER >= 1600) - WString(WString&& p_other) : m_Str(nullptr) - { - operator=(p_other); -@@ -492,7 +492,7 @@ namespace amf - m_Str = AMFVariantDuplicateWString(p_other.m_Str); - return *this; - } --#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600) -+#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (defined(_MSC_VER) && _MSC_VER >= 1600) - WString& operator=(WString&& p_other) - { - Free(); --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch vlc-3.0.22/contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch --- vlc-3.0.21/contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,17 +1,17 @@ -From a9ee7691cf2535f58695769893e92a634f810523 Mon Sep 17 00:00:00 2001 +From 56828b95fc427e8475d0a03ac016fa7edcc0dfc8 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 16 Feb 2024 07:43:32 +0100 -Subject: [PATCH 1/4] Move AMF_UNICODE into Platform.h +Subject: [PATCH 1/3] Move AMF_UNICODE into Platform.h It's a common macro that can be used in other places. --- - amf/public/include/core/Platform.h | 14 ++++++++++++++ - 2 files changed, 14 insertions(+), 14 deletions(-) + core/Platform.h | 14 ++++ + 1 files changed, 14 insertions(+), 0 deletions(-) -diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h -index 3f997fe..cdab1b2 100644 ---- a/amf/public/include/core/Platform.h -+++ b/amf/public/include/core/Platform.h +diff --git a/core/Platform.h b/core/Platform.h +index 35cbc9a..2ced091 100644 +--- a/core/Platform.h ++++ b/core/Platform.h @@ -66,6 +66,20 @@ #define AMF_TODO(_todo) (__FILE__ "(" AMF_MACRO_STRING(__LINE__) "): TODO: "_todo) @@ -34,5 +34,5 @@ #if defined(__GNUC__) || defined(__clang__) #define AMF_ALIGN(n) __attribute__((aligned(n))) -- -2.37.3.windows.1 +2.45.0.windows.1 diff -Nru vlc-3.0.21/contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch vlc-3.0.22/contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch --- vlc-3.0.21/contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,20 +1,20 @@ -From 7a0df0c174dce8d383be26e7b96d410865c62cf1 Mon Sep 17 00:00:00 2001 +From a2c7dbd97a22febdb19b8a82cfea4fda7af0d4b6 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 16 Feb 2024 07:45:25 +0100 -Subject: [PATCH 2/4] Define LPRI(d|ud|x)64 as Unicode (wide) versions of +Subject: [PATCH 2/3] Define LPRI(d|ud|x)64 as Unicode (wide) versions of AMFPRI(d|ud|x)64 It's always true for all platforms. --- - amf/public/include/core/Platform.h | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) + core/Platform.h | 27 ++++----------------------- + 1 file changed, 4 insertions(+), 23 deletions(-) -diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h -index cdab1b2..12ee75c 100644 ---- a/amf/public/include/core/Platform.h -+++ b/amf/public/include/core/Platform.h -@@ -119,13 +119,10 @@ typedef signed int HRESULT; - #define AMF_NO_VTABLE __declspec(novtable) +diff --git a/core/Platform.h b/core/Platform.h +index 2ced091..12541f3 100644 +--- a/core/Platform.h ++++ b/core/Platform.h +@@ -124,13 +110,10 @@ typedef signed int HRESULT; + #endif #define AMFPRId64 "I64d" - #define LPRId64 L"I64d" @@ -27,9 +27,18 @@ #else // !WIN32 - Linux and Mac -@@ -143,17 +140,18 @@ typedef signed int HRESULT; +@@ -147,26 +130,24 @@ typedef signed int HRESULT; - #if !defined(AMFPRId64) + #if defined(__x86_64__) || defined(__aarch64__) + #define AMFPRId64 "ld" +- #define LPRId64 L"ld" + + #define AMFPRIud64 "uld" +- #define LPRIud64 L"uld" + + #define AMFPRIx64 "lx" +- #define LPRIx64 L"lx" + #else #define AMFPRId64 "lld" - #define LPRId64 L"lld" @@ -50,5 +59,5 @@ #if defined(_WIN32) #define AMF_WEAK __declspec( selectany ) -- -2.37.3.windows.1 +2.45.0.windows.1 diff -Nru vlc-3.0.21/contrib/src/amf/0002-Fix-const-on-return-by-value-Variant-values.patch vlc-3.0.22/contrib/src/amf/0002-Fix-const-on-return-by-value-Variant-values.patch --- vlc-3.0.21/contrib/src/amf/0002-Fix-const-on-return-by-value-Variant-values.patch 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/0002-Fix-const-on-return-by-value-Variant-values.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From 18c87b557f7d5b9f1850a66705b551ac482e47e3 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 16 Feb 2024 08:50:28 +0100 -Subject: [PATCH 2/2] Fix const on return by value Variant values - -Fix const on return by value AMF_DECLARE_IID() - -The returned value won't be const in C. - -Fixes this kind of warning: -include/AMF/core/Variant.h:135:23: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers] ---- - amf/public/include/core/Variant.h | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/amf/public/include/core/Variant.h b/amf/public/include/core/Variant.h -index edf14ae..a0a7eb8 100644 ---- a/amf/public/include/core/Variant.h -+++ b/amf/public/include/core/Variant.h -@@ -132,16 +132,16 @@ namespace amf - static AMF_INLINE const AMFRatio& AMF_STD_CALL AMFVariantGetRatio(const AMFVariantStruct* _variant) { return (_variant)->ratioValue; } - static AMF_INLINE const AMFColor& AMF_STD_CALL AMFVariantGetColor(const AMFVariantStruct* _variant) { return (_variant)->colorValue; } - #else // #if defined(__cplusplus) -- static AMF_INLINE const AMFRect AMF_STD_CALL AMFVariantGetRect (const AMFVariantStruct* _variant) { return (_variant)->rectValue; } -- static AMF_INLINE const AMFSize AMF_STD_CALL AMFVariantGetSize (const AMFVariantStruct* _variant) { return (_variant)->sizeValue; } -- static AMF_INLINE const AMFPoint AMF_STD_CALL AMFVariantGetPoint(const AMFVariantStruct* _variant) { return (_variant)->pointValue; } -- static AMF_INLINE const AMFFloatSize AMF_STD_CALL AMFVariantGetFloatSize(const AMFVariantStruct* _variant) { return (_variant)->floatSizeValue; } -- static AMF_INLINE const AMFFloatPoint2D AMF_STD_CALL AMFVariantGetFloatPoint2D(const AMFVariantStruct* _variant) { return (_variant)->floatPoint2DValue; } -- static AMF_INLINE const AMFFloatPoint3D AMF_STD_CALL AMFVariantGetFloatPoint3D(const AMFVariantStruct* _variant) { return (_variant)->floatPoint3DValue; } -- static AMF_INLINE const AMFFloatVector4D AMF_STD_CALL AMFVariantGetFloatVector4D(const AMFVariantStruct* _variant) { return (_variant)->floatVector4DValue; } -- static AMF_INLINE const AMFRate AMF_STD_CALL AMFVariantGetRate (const AMFVariantStruct* _variant) { return (_variant)->rateValue; } -- static AMF_INLINE const AMFRatio AMF_STD_CALL AMFVariantGetRatio(const AMFVariantStruct* _variant) { return (_variant)->ratioValue; } -- static AMF_INLINE const AMFColor AMF_STD_CALL AMFVariantGetColor(const AMFVariantStruct* _variant) { return (_variant)->colorValue; } -+ static AMF_INLINE AMFRect AMF_STD_CALL AMFVariantGetRect (const AMFVariantStruct* _variant) { return (_variant)->rectValue; } -+ static AMF_INLINE AMFSize AMF_STD_CALL AMFVariantGetSize (const AMFVariantStruct* _variant) { return (_variant)->sizeValue; } -+ static AMF_INLINE AMFPoint AMF_STD_CALL AMFVariantGetPoint(const AMFVariantStruct* _variant) { return (_variant)->pointValue; } -+ static AMF_INLINE AMFFloatSize AMF_STD_CALL AMFVariantGetFloatSize(const AMFVariantStruct* _variant) { return (_variant)->floatSizeValue; } -+ static AMF_INLINE AMFFloatPoint2D AMF_STD_CALL AMFVariantGetFloatPoint2D(const AMFVariantStruct* _variant) { return (_variant)->floatPoint2DValue; } -+ static AMF_INLINE AMFFloatPoint3D AMF_STD_CALL AMFVariantGetFloatPoint3D(const AMFVariantStruct* _variant) { return (_variant)->floatPoint3DValue; } -+ static AMF_INLINE AMFFloatVector4D AMF_STD_CALL AMFVariantGetFloatVector4D(const AMFVariantStruct* _variant) { return (_variant)->floatVector4DValue; } -+ static AMF_INLINE AMFRate AMF_STD_CALL AMFVariantGetRate (const AMFVariantStruct* _variant) { return (_variant)->rateValue; } -+ static AMF_INLINE AMFRatio AMF_STD_CALL AMFVariantGetRatio(const AMFVariantStruct* _variant) { return (_variant)->ratioValue; } -+ static AMF_INLINE AMFColor AMF_STD_CALL AMFVariantGetColor(const AMFVariantStruct* _variant) { return (_variant)->colorValue; } - #endif // #if defined(__cplusplus) - - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch vlc-3.0.22/contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch --- vlc-3.0.21/contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -From 4069f86effdc36ba3f12d120212c8f077b96cdb0 Mon Sep 17 00:00:00 2001 +From 3ecced3ba3ad710b6f86104a648f2c1b6dbb86fa Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 16 Feb 2024 07:50:03 +0100 -Subject: [PATCH 3/4] Define AMFPRI(d|ud|x)64 using the standard C++ format for +Subject: [PATCH 3/3] Define AMFPRI(d|ud|x)64 using the standard C++ format for C+11 and up See https://en.cppreference.com/w/cpp/types/integer @@ -9,16 +9,16 @@ When compiled in C, it depends whether it's the Microsoft flavor or the standard C format. Not whether it's Win32 or not. Clang or GCC use the proper string formats on windows. --- - amf/public/include/core/Platform.h | 29 ++++++++++++++++++++--------- - 1 file changed, 20 insertions(+), 9 deletions(-) + core/Platform.h | 33 +++++++++++++++--------------- + 1 file changed, 17 insertions(+), 16 deletions(-) -diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h -index 12ee75c..d6496d4 100644 ---- a/amf/public/include/core/Platform.h -+++ b/amf/public/include/core/Platform.h -@@ -118,12 +118,6 @@ typedef signed int HRESULT; +diff --git a/core/Platform.h b/core/Platform.h +index 12541f3..a1fa96c 100644 +--- a/core/Platform.h ++++ b/core/Platform.h +@@ -109,12 +109,6 @@ typedef signed int HRESULT; + #define AMF_FORCEINLINE __forceinline #endif - #define AMF_NO_VTABLE __declspec(novtable) - #define AMFPRId64 "I64d" - @@ -29,42 +29,45 @@ #else // !WIN32 - Linux and Mac #define AMF_STD_CALL -@@ -138,15 +132,32 @@ typedef signed int HRESULT; +@@ -128,21 +122,28 @@ typedef signed int HRESULT; + #define AMF_FORCEINLINE __inline__ #endif - #define AMF_NO_VTABLE +- #if defined(__x86_64__) || defined(__aarch64__) +- #define AMFPRId64 "ld" +#endif // WIN32 -+ + +- #define AMFPRIud64 "uld" +#if defined(__cplusplus) && (__cplusplus >= 201103L) + #include + #define AMFPRId64 PRId64 -+ + +- #define AMFPRIx64 "lx" +- #else +- #define AMFPRId64 "lld" + #define AMFPRIud64 PRIu64 -+ + +- #define AMFPRIud64 "ulld" + #define AMFPRIx64 PRIx64 -+#else -+#if defined(_MSC_VER) ++#elif defined(_MSC_VER) + #define AMFPRId64 "I64d" -+ -+ #define AMFPRIud64 "Iu64d" -+ -+ #define AMFPRIx64 "I64x" -+#else - #if !defined(AMFPRId64) - #define AMFPRId64 "lld" -- #define AMFPRIud64 "ulld" -+ #define AMFPRIud64 "ulld" +- #define AMFPRIx64 "llx" +- #endif ++ #define AMFPRIud64 "Iu64d" - #define AMFPRIx64 "llx" - #endif -- -#endif // WIN32 -+#endif ++ #define AMFPRIx64 "I64x" ++#elif !defined(AMFPRId64) ++ #define AMFPRId64 "lld" ++ ++ #define AMFPRIud64 "ulld" ++ ++ #define AMFPRIx64 "llx" +#endif #define LPRId64 AMF_UNICODE(AMFPRId64) #define LPRIud64 AMF_UNICODE(AMFPRIud64) -- -2.37.3.windows.1 +2.45.0.windows.1 diff -Nru vlc-3.0.21/contrib/src/amf/SHA512SUMS vlc-3.0.22/contrib/src/amf/SHA512SUMS --- vlc-3.0.21/contrib/src/amf/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -43d7d3c05cb385cc5b0b76562dae3f8d5fb0123300291019ddce1032eec55a664290bd9b0552073d3a5cc7036886a015d9edb1f17e2f0f8ffd07acf57360ec18 AMF-1.4.29.tar.gz +2f6e43908260d9f7cb8b28ab8dd34f8f2a1f61c6f2b24d847f277deb264de74d37e60b71e35f6eb079af5c1a16967d0fb780271aee751c18f2013023dcb96f6c AMF-1.4.34.tar.gz diff -Nru vlc-3.0.21/contrib/src/amf/rules.mak vlc-3.0.22/contrib/src/amf/rules.mak --- vlc-3.0.21/contrib/src/amf/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/amf/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,10 +1,10 @@ # AMF -AMF_VERSION := 1.4.33 -AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v$(AMF_VERSION).tar.gz +AMF_VERSION := 1.4.34 +AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v$(AMF_VERSION)/AMF-headers.tar.gz AMF_GITURL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF.git AMF_BRANCH := v$(AMF_VERSION) -AMF_GITVERSION := e8c7cd7c10d4e05c1913aa8dfd2be9f9dbdb03d6 +AMF_GITVERSION := 6d7bec0469961e2891c6e1aaa5122b76ed82e1db ifeq ($(ARCH),x86_64) ifdef HAVE_WIN32 @@ -17,9 +17,14 @@ endif endif +$(TARBALLS)/AMF-$(AMF_VERSION).tar.gz: + $(call download,$(AMF_URL)) + +.sum-amf: AMF-$(AMF_VERSION).tar.gz + $(TARBALLS)/AMF-$(AMF_GITVERSION).tar.xz: - rm -rf "$@" "$(@:.tar.xz=.githash)" - rm -rf "$(@:.tar.xz=)" + $(RM) -Rf "$@" "$(@:.tar.xz=.githash)" + $(RM) -Rf "$(@:.tar.xz=)" mkdir "$(@:.tar.xz=)" # clone the top of the branch and only checkout amf/public/include cd "$(@:.tar.xz=)" && git clone -n --depth=1 --no-checkout --branch $(AMF_BRANCH) $(AMF_GITURL) "$(notdir $(@:.tar.xz=))" @@ -28,26 +33,26 @@ cd "$(@:.tar.xz=)/$(notdir $(@:.tar.xz=))" && echo "`git rev-parse HEAD` $(@)" > "../tmp.githash" mv -f -- "$(@:.tar.xz=)/tmp.githash" "$(@:.tar.xz=.githash)" mv -f -- "$(@:.tar.xz=)/$(notdir $(@))" "$@" - rm -rf "$(@:.tar.xz=)" - -.sum-amf: AMF-$(AMF_GITVERSION).tar.xz - $(call check_githash,$(AMF_GITVERSION)) - touch "$@" + $(RM) -Rf "$(@:.tar.xz=)" -# amf: AMF-$(AMF_VERSION).tar.gz .sum-amf -amf: AMF-$(AMF_GITVERSION).tar.xz .sum-amf +# .sum-amf: AMF-$(AMF_GITVERSION).tar.xz +# $(call check_githash,$(AMF_GITVERSION)) +# touch "$@" + +amf: AMF-$(AMF_VERSION).tar.gz .sum-amf +# amf: AMF-$(AMF_GITVERSION).tar.xz .sum-amf + $(RM) -Rf AMF $(UNPACK) + # the tarball is extracted to AMF but it the filesystem is case insenstive + # we can't move AMF to amf + mv -f -- AMF AMF-$(AMF_VERSION) $(APPLY) $(SRC)/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch $(APPLY) $(SRC)/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch $(APPLY) $(SRC)/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch - $(APPLY) $(SRC)/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch - $(APPLY) $(SRC)/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch - $(APPLY) $(SRC)/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch - $(APPLY) $(SRC)/amf/0002-Fix-const-on-return-by-value-Variant-values.patch - $(APPLY) $(SRC)/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch $(MOVE) .amf: amf + $(RM) -Rf $(PREFIX)/include/AMF mkdir -p $(PREFIX)/include/AMF - cp -R $(UNPACK_DIR)/amf/public/include/* $(PREFIX)/include/AMF + cp -R $ -Date: Wed, 13 Sep 2023 13:17:23 -0400 -Subject: [PATCH 1/1] cmake: win: fix asm flag appending - -These were evaluating to e.g.: -aarch64-w64-mingw32-gcc;-c;-mimplicit-it=always - -which broke the detection of the actual asm executable's presence. ---- - build/cmake/aom_configure.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake -index aaef2c3..fe72e17 100644 ---- a/build/cmake/aom_configure.cmake -+++ b/build/cmake/aom_configure.cmake -@@ -190,7 +190,7 @@ elseif(AOM_TARGET_CPU MATCHES "arm") - set(AOM_AS_FLAGS -arch ${AOM_TARGET_CPU} -isysroot ${CMAKE_OSX_SYSROOT}) - elseif(AOM_TARGET_SYSTEM STREQUAL "Windows") - if(NOT CMAKE_ASM_COMPILER) -- set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} -c -mimplicit-it=always) -+ set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} "-c -mimplicit-it=always") - endif() - else() - if(NOT CMAKE_ASM_COMPILER) --- -2.39.2 - diff -Nru vlc-3.0.21/contrib/src/aom/rules.mak vlc-3.0.22/contrib/src/aom/rules.mak --- vlc-3.0.21/contrib/src/aom/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/aom/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -28,8 +28,6 @@ DEPS_aom += pthreads $(DEPS_pthreads) endif -AOM_LDFLAGS := $(LDFLAGS) - AOM_CONF := \ -DCONFIG_RUNTIME_CPU_DETECT=1 \ -DCONFIG_MULTITHREAD=1 \ @@ -85,10 +83,9 @@ # libaom doesn't allow in-tree builds .aom: aom toolchain.cmake rm -rf $(PREFIX)/include/aom - cd $< && rm -rf aom_build && mkdir -p aom_build - cd $< && mkdir -p aom_build - cd $ +Date: Tue, 12 Nov 2024 10:08:13 +0200 +Subject: [PATCH] aarch64: Set the right intended alignment for constants + +The align parameter to these macros is passed to the gas directive +.align. This directive is architecture dependent; on some +architectures, the given alignment is an alignment in bytes, +while on others, its the power of two to align to. On aarch64, +.align is for power of two alignment, see [1] for details; i.e. +it behaves the same as .p2align. + +This means that when the macros are invoked with align=16, we +actually requested 64 KB alignment, not 16 byte alignment. Fix +this, setting the alignment to the intended 16 byte alignment. + +This fixes building for aarch64-windows targets with assert enabled +versions of Clang; such versions of Clang error out with +"unsupported section alignment" on this case, while regular release +versions of Clang silently let this issue pass. + +[1] https://sourceware.org/binutils/docs/as/Align.html +--- + libass/aarch64/blend_bitmaps.S | 2 +- + libass/aarch64/blur.S | 2 +- + libass/aarch64/rasterizer.S | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libass/aarch64/blend_bitmaps.S b/libass/aarch64/blend_bitmaps.S +index 2e8f053..a58c09b 100644 +--- a/libass/aarch64/blend_bitmaps.S ++++ b/libass/aarch64/blend_bitmaps.S +@@ -18,7 +18,7 @@ + + #include "asm.S" + +-const edge_mask, align=16 ++const edge_mask, align=4 + .dcb.b 16, 0xFF + .dcb.b 16, 0x00 + endconst +diff --git a/libass/aarch64/blur.S b/libass/aarch64/blur.S +index de8b508..292ee84 100644 +--- a/libass/aarch64/blur.S ++++ b/libass/aarch64/blur.S +@@ -18,7 +18,7 @@ + + #include "asm.S" + +-const words_zero, align=16 ++const words_zero, align=4 + .dc.w 0, 0, 0, 0, 0, 0, 0, 0 + endconst + +diff --git a/libass/aarch64/rasterizer.S b/libass/aarch64/rasterizer.S +index 5fde704..514fba2 100644 +--- a/libass/aarch64/rasterizer.S ++++ b/libass/aarch64/rasterizer.S +@@ -28,7 +28,7 @@ + #endif + + +-const words_index, align=16 ++const words_index, align=4 + .dc.w 0, 1, 2, 3, 4, 5, 6, 7 + endconst + +-- +2.34.1 + diff -Nru vlc-3.0.21/contrib/src/ass/SHA512SUMS vlc-3.0.22/contrib/src/ass/SHA512SUMS --- vlc-3.0.21/contrib/src/ass/SHA512SUMS 2023-08-05 10:03:51.000000000 +0000 +++ vlc-3.0.22/contrib/src/ass/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -29c3f82e8d68ffc403941805202c4756b65cf48aeadbe9ae5e307ee4f52a5e4d916330ad26ec322aa92ddc72a4f01633033f9f628dbb8d8653a74b3e6eb7f735 libass-0.17.1.tar.gz +b8f7868f99fbc9128144d0cdad3de8ca83eefc6c186e2c295afa98e36bd88d4533969618030ff33ab809850ce1c584f967104b5725b41b1db5cef05434258d5d libass-0.17.3.tar.gz diff -Nru vlc-3.0.21/contrib/src/ass/rules.mak vlc-3.0.22/contrib/src/ass/rules.mak --- vlc-3.0.21/contrib/src/ass/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ass/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,5 +1,5 @@ # ASS -ASS_VERSION := 0.17.1 +ASS_VERSION := 0.17.3 ASS_URL := $(GITHUB)/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz PKGS += ass @@ -37,6 +37,8 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass $(UNPACK) + $(UPDATE_AUTOCONFIG) + $(APPLY) $(SRC)/ass/0001-aarch64-Set-the-right-intended-alignment-for-constan.patch $(MOVE) DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv $(DEPS_iconv) harfbuzz $(DEPS_harfbuzz) @@ -58,7 +60,7 @@ .ass: libass cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(ASS_CONF) - cd $< && $(MAKE) + $(MAKE) -C $< $(call pkg_static,"libass.pc") - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/basu/SHA512SUMS vlc-3.0.22/contrib/src/basu/SHA512SUMS --- vlc-3.0.21/contrib/src/basu/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/basu/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -b8017bbfdb5b408bd380e3b1cb1443321863ed8c9487ab0c8c80860c2ffb0c0403c81daf7e87f815027e9a826d08aa82a54c496bc87527209933e0d007b0c9ea basu-0.2.1.tar.gz diff -Nru vlc-3.0.21/contrib/src/basu/rules.mak vlc-3.0.22/contrib/src/basu/rules.mak --- vlc-3.0.21/contrib/src/basu/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/basu/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -# basu -BASU_VERSION := 0.2.1 -BASU_URL := http://git.sr.ht/~emersion/basu/refs/download/v$(BASU_VERSION)/basu-$(BASU_VERSION).tar.gz - -ifneq ($(call need_pkg,"libelogind"),) -ifneq ($(call need_pkg,"libsystemd"),) - - -ifdef HAVE_LINUX -ifndef HAVE_ANDROID -PKGS += basu -endif -endif - -ifdef HAVE_BSD -ifndef HAVE_DARWIN_OS -PKGS += basu -endif -endif - -endif # libsystemd -endif # libelogind - -ifeq ($(call need_pkg,"basu"),) -PKGS_FOUND += basu -endif - -$(TARBALLS)/basu-$(BASU_VERSION).tar.gz: - $(call download_pkg,$(BASU_URL),basu) - -.sum-basu: basu-$(BASU_VERSION).tar.gz - -basu: basu-$(BASU_VERSION).tar.gz .sum-basu - $(UNPACK) - $(MOVE) - -.basu: basu crossfile.meson - $(MESONCLEAN) - $(HOSTVARS_MESON) $(MESON) - +$(MESONBUILD) - touch $@ diff -Nru vlc-3.0.21/contrib/src/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch vlc-3.0.22/contrib/src/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch --- vlc-3.0.21/contrib/src/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,30 @@ +From 8e5ef374c8ff3603a8ed4e1f48d4d5399e2e8044 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Mon, 25 Aug 2025 16:11:15 +0200 +Subject: [PATCH] Link with gdi32 when using freetype in Windows + +It's calling EnumFontFamiliesExW(). +--- + src/meson.build | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/meson.build b/src/meson.build +index 07152660..255fbc47 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -65,6 +65,12 @@ if host_machine.system() == 'windows' + 'file/file_win32.c', + 'file/mount.c', + ) ++ ++ if freetype_dependency.found() ++ # for EnumFontFamiliesExW ++ extra_dependencies += cc.find_library('gdi32') ++ endif ++ + elif host_machine.system() == 'darwin' + libbluray_src += files( + 'file/dir_posix.c', +-- +2.45.1.windows.1 + diff -Nru vlc-3.0.21/contrib/src/bluray/0001-install-bdjo_data-header.patch vlc-3.0.22/contrib/src/bluray/0001-install-bdjo_data-header.patch --- vlc-3.0.21/contrib/src/bluray/0001-install-bdjo_data-header.patch 2018-12-16 18:59:47.000000000 +0000 +++ vlc-3.0.22/contrib/src/bluray/0001-install-bdjo_data-header.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -From 73681388dfd0f839e0b4447b3063842d606691d8 Mon Sep 17 00:00:00 2001 -From: Francois Cartegnie -Date: Mon, 19 Nov 2018 15:27:23 +0100 -Subject: [PATCH] install bdjo_data header - ---- - Makefile.am | 1 + - src/libbluray/bluray.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 94add5b..f9a76a0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -218,6 +218,7 @@ pkginclude_HEADERS = \ - src/libbluray/bluray-version.h \ - src/libbluray/keys.h \ - src/libbluray/player_settings.h \ -+ src/libbluray/bdj/bdjo_data.h \ - src/libbluray/bdnav/clpi_data.h \ - src/libbluray/bdnav/meta_data.h \ - src/libbluray/decoders/overlay.h \ -diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h -index 8eb8100..86be9e6 100644 ---- a/src/libbluray/bluray.h -+++ b/src/libbluray/bluray.h -@@ -1073,6 +1073,7 @@ void bd_free_mobj(struct mobj_objects *); - struct bdjo_data; - struct bdjo_data *bd_read_bdjo(const char *bdjo_file); - void bd_free_bdjo(struct bdjo_data *); -+#define BLURAY_HAS_BDJO_DATA_H - - /* BD-J testing */ - --- -2.17.2 - diff -Nru vlc-3.0.21/contrib/src/bluray/SHA512SUMS vlc-3.0.22/contrib/src/bluray/SHA512SUMS --- vlc-3.0.21/contrib/src/bluray/SHA512SUMS 2022-08-24 17:41:43.000000000 +0000 +++ vlc-3.0.22/contrib/src/bluray/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -6f2d3a984809db33a99d2fe3618370a3fda3ef1c417b725d3c2e1f24ff21495f95a6a5f78b30b2b26bab47865f68dd08c08e8a554809d3a5225956da712dc064 libbluray-1.3.2.tar.bz2 +7284169b32624e5ca4fd71b260a4cc2921efafb1f63143a562568be45e373bfcbfeac63895d5659ccdcb11d7dbd0236cc46ccb15c12eff855703010e46991f27 libbluray-1.4.0.tar.xz diff -Nru vlc-3.0.21/contrib/src/bluray/rules.mak vlc-3.0.22/contrib/src/bluray/rules.mak --- vlc-3.0.21/contrib/src/bluray/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/bluray/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ # LIBBLURAY -BLURAY_VERSION := 1.3.2 -BLURAY_URL := $(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2 +BLURAY_VERSION := 1.4.0 +BLURAY_URL := $(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.xz ifdef BUILD_DISCS PKGS += bluray @@ -26,35 +26,32 @@ DEPS_bluray = libxml2 $(DEPS_libxml2) freetype2 $(DEPS_freetype2) -BLURAY_CONF = --disable-examples \ - --with-libxml2 \ - --enable-udf \ - --enable-bdjava +BLURAY_CONF = -Dfreetype=enabled -Dlibxml2=enabled +ifdef HAVE_CROSS_COMPILE +BLURAY_CONF += -Denable_tools=false +endif ifneq ($(WITH_FONTCONFIG), 0) DEPS_bluray += fontconfig $(DEPS_fontconfig) -else -BLURAY_CONF += --without-fontconfig -endif +BLURAY_CONF += -Dfontconfig=enabled -ifndef WITH_OPTIMIZATION -BLURAY_CONF += --disable-optimizations +else +BLURAY_CONF += -Dfontconfig=disabled endif -$(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2: +$(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.xz: $(call download,$(BLURAY_URL)) -.sum-bluray: libbluray-$(BLURAY_VERSION).tar.bz2 +.sum-bluray: libbluray-$(BLURAY_VERSION).tar.xz -bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray +bluray: libbluray-$(BLURAY_VERSION).tar.xz .sum-bluray $(UNPACK) - $(APPLY) $(SRC)/bluray/0001-install-bdjo_data-header.patch - $(call pkg_static,"src/libbluray.pc.in") + $(APPLY) $(SRC)/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch $(MOVE) -.bluray: bluray +.bluray: bluray crossfile.meson rm -rf $(PREFIX)/share/java/libbluray*.jar - cd $< && ./bootstrap - cd $< && $(HOSTVARS) ./configure $(BLURAY_CONF) $(HOSTCONF) - cd $< && $(MAKE) install + $(MESONCLEAN) + $(MESON) $(BLURAY_CONF) + +$(MESONBUILD) touch $@ diff -Nru vlc-3.0.21/contrib/src/breakpad/rules.mak vlc-3.0.22/contrib/src/breakpad/rules.mak --- vlc-3.0.21/contrib/src/breakpad/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/breakpad/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -5,6 +5,17 @@ BREAKPAD_URL := http://download.videolan.org/pub/contrib/breakpad/breakpad-$(BREAKPAD_VERSION).tar.gz ifdef HAVE_MACOSX +# fails to build on newer SDK because of missing libarclite (found in 13.1, missing in 13.3 from XCode 14.3) +ifeq ($(call darwin_sdk_at_most, 13.1), true) +CAN_BUILD_BREAKPAD:=1 +endif +ifeq ($(call darwin_min_os_at_least, 10.11), true) +# builds when targeting macOS 10.11 +CAN_BUILD_BREAKPAD:=1 +endif +endif + +ifdef CAN_BUILD_BREAKPAD PKGS += breakpad endif @@ -16,9 +27,12 @@ breakpad: breakpad-$(BREAKPAD_VERSION).tar.gz .sum-breakpad $(UNPACK) $(APPLY) $(SRC)/breakpad/0001-mac-client-Upgrade-Breakpad.xib-to-new-format.patch + $(APPLY) $(SRC)/breakpad/windows-arm64.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_CONF := --disable-processor + .breakpad: breakpad # Framework ifdef HAVE_MACOSX @@ -34,7 +48,7 @@ install build/Release/dump_syms "$(PREFIX)/bin" else $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-processor - cd $< && Configuration=Release $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(BREAKPAD_CONF) + Configuration=Release $(MAKE) -C $< install endif touch $@ diff -Nru vlc-3.0.21/contrib/src/breakpad/windows-arm64.patch vlc-3.0.22/contrib/src/breakpad/windows-arm64.patch --- vlc-3.0.21/contrib/src/breakpad/windows-arm64.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/breakpad/windows-arm64.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,28 @@ +From b988fa74ec18de6214b18f723e48331d9a7802ae Mon Sep 17 00:00:00 2001 +From: Tom Tan +Date: Wed, 2 Jan 2019 15:06:59 -0800 +Subject: [PATCH] Extract intruction pointer correctly for Windows ARM64 + +Bug: 893460 +Change-Id: Ibbdf734e72c29c4779b6a701dceec1626056a9ba +Reviewed-on: https://chromium-review.googlesource.com/c/1393763 +Reviewed-by: Joshua Peraza +--- + src/client/windows/handler/exception_handler.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/client/windows/handler/exception_handler.cc b/src/client/windows/handler/exception_handler.cc +index c369b65d6..ad45b2000 100644 +--- a/src/client/windows/handler/exception_handler.cc ++++ b/src/client/windows/handler/exception_handler.cc +@@ -976,7 +976,9 @@ bool ExceptionHandler::WriteMinidumpWithExceptionForProcess( + #if defined(_M_IX86) + exinfo->ContextRecord->Eip; + #elif defined(_M_AMD64) +- exinfo->ContextRecord->Rip; ++ exinfo->ContextRecord->Rip; ++#elif defined(_M_ARM64) ++ exinfo->ContextRecord->Pc; + #else + #error Unsupported platform + #endif diff -Nru vlc-3.0.21/contrib/src/caca/0001-win32-don-t-for-_WIN32_WINNT-to-Win2K.patch vlc-3.0.22/contrib/src/caca/0001-win32-don-t-for-_WIN32_WINNT-to-Win2K.patch --- vlc-3.0.21/contrib/src/caca/0001-win32-don-t-for-_WIN32_WINNT-to-Win2K.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/caca/0001-win32-don-t-for-_WIN32_WINNT-to-Win2K.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From 93b558f26b53f4a677bd1b5afaf60a8849292afc Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 8 Jun 2023 09:07:01 +0200 -Subject: [PATCH 1/5] win32: don't for _WIN32_WINNT to Win2K - -If the system allows newer API's we should downversion it. ---- - caca/driver/win32.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/caca/driver/win32.c b/caca/driver/win32.c -index 439b8dc..53ff881 100644 ---- a/caca/driver/win32.c -+++ b/caca/driver/win32.c -@@ -19,7 +19,9 @@ - - #if defined(USE_WIN32) - -+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x500 /* _WIN32_WINNT_WIN2K */ - #define _WIN32_WINNT 0x500 /* Require WinXP or later */ -+#endif - #define WIN32_LEAN_AND_MEAN - #include - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/caca/0002-win32-don-t-redefine-GetCurrentConsoleFont-with-ming.patch vlc-3.0.22/contrib/src/caca/0002-win32-don-t-redefine-GetCurrentConsoleFont-with-ming.patch --- vlc-3.0.21/contrib/src/caca/0002-win32-don-t-redefine-GetCurrentConsoleFont-with-ming.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/caca/0002-win32-don-t-redefine-GetCurrentConsoleFont-with-ming.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From ceed13243b729e8795a0897f432cbd8a021805bc Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 8 Jun 2023 09:08:12 +0200 -Subject: [PATCH 2/5] win32: don't redefine GetCurrentConsoleFont with - mingw-w64 - -It's already defined properly. ---- - caca/driver/win32.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/caca/driver/win32.c b/caca/driver/win32.c -index 53ff881..9509172 100644 ---- a/caca/driver/win32.c -+++ b/caca/driver/win32.c -@@ -25,7 +25,7 @@ - #define WIN32_LEAN_AND_MEAN - #include - --#ifdef __MINGW32__ -+#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) - /* This is missing from the MinGW headers. */ - # if (_WIN32_WINNT >= 0x0500) - BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsoleOutput, BOOL bMaximumWindow, --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/caca/0003-win32-use-ANSI-calls-explicitly.patch vlc-3.0.22/contrib/src/caca/0003-win32-use-ANSI-calls-explicitly.patch --- vlc-3.0.21/contrib/src/caca/0003-win32-use-ANSI-calls-explicitly.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/caca/0003-win32-use-ANSI-calls-explicitly.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From 3b4670c82c650fb9aff07bdd9b98896821d6a2d0 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 8 Jun 2023 09:09:18 +0200 -Subject: [PATCH 3/5] win32: use ANSI calls explicitly - -If the environment forces the UNICODE define it will use the wrong call. ---- - caca/driver/win32.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/caca/driver/win32.c b/caca/driver/win32.c -index 9509172..40aeeed 100644 ---- a/caca/driver/win32.c -+++ b/caca/driver/win32.c -@@ -196,7 +196,7 @@ static int win32_end_graphics(caca_display_t *dp) - - static int win32_set_display_title(caca_display_t *dp, char const *title) - { -- SetConsoleTitle(title); -+ SetConsoleTitleA(title); - return 0; - } - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/caca/0004-win32-use-CreateFile2-when-compiling-for-Win8.patch vlc-3.0.22/contrib/src/caca/0004-win32-use-CreateFile2-when-compiling-for-Win8.patch --- vlc-3.0.21/contrib/src/caca/0004-win32-use-CreateFile2-when-compiling-for-Win8.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/caca/0004-win32-use-CreateFile2-when-compiling-for-Win8.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From 43a0870bbb4cfba5d3c9472f04ea9a31dc39a527 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 8 Jun 2023 09:13:36 +0200 -Subject: [PATCH 4/5] win32: use CreateFile2 when compiling for Win8+ - -The API is always available in Win8+ even in UWP builds, unlike CreateFileW. -The API is pretty much the same. CONOUT is also supported [1]. - -[1] https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfile2#consoles ---- - caca/driver/win32.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/caca/driver/win32.c b/caca/driver/win32.c -index 40aeeed..0c84470 100644 ---- a/caca/driver/win32.c -+++ b/caca/driver/win32.c -@@ -104,6 +104,9 @@ static int win32_init_graphics(caca_display_t *dp) - CONSOLE_CURSOR_INFO cci_screen; - SMALL_RECT rect; - COORD size; -+#if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */ -+ CREATEFILE2_EXTENDED_PARAMETERS createExParams; -+#endif - - dp->drv.p = malloc(sizeof(struct driver_private)); - -@@ -111,9 +114,18 @@ static int win32_init_graphics(caca_display_t *dp) - dp->drv.p->new_console = AllocConsole(); - - dp->drv.p->hin = GetStdHandle(STD_INPUT_HANDLE); -+#if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */ -+ ZeroMemory(&createExParams, sizeof(createExParams)); -+ createExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); -+ createExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; -+ dp->drv.p->hout = CreateFile2(L"CONOUT$", GENERIC_READ | GENERIC_WRITE, -+ FILE_SHARE_READ | FILE_SHARE_WRITE, -+ OPEN_EXISTING, &createExParams); -+#else - dp->drv.p->hout = CreateFile("CONOUT$", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); -+#endif - if(dp->drv.p->hout == INVALID_HANDLE_VALUE) - return -1; - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/caca/0005-canvas-use-GetCurrentProcessId-on-Windows.patch vlc-3.0.22/contrib/src/caca/0005-canvas-use-GetCurrentProcessId-on-Windows.patch --- vlc-3.0.21/contrib/src/caca/0005-canvas-use-GetCurrentProcessId-on-Windows.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/caca/0005-canvas-use-GetCurrentProcessId-on-Windows.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From d78bdde484524c737c9285d5332cf5e7dbbf9a56 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 8 Jun 2023 09:15:53 +0200 -Subject: [PATCH 5/5] canvas: use GetCurrentProcessId() on Windows - -getpid() or _getpid() are not available in UWP builds [1] but we can use -GetCurrentProcessId() instead. - -[1] https://learn.microsoft.com/en-us/cpp/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps#unsupported-crt-functions ---- - caca/canvas.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/caca/canvas.c b/caca/canvas.c -index 7beff5b..c7021d8 100644 ---- a/caca/canvas.c -+++ b/caca/canvas.c -@@ -27,6 +27,10 @@ - # include - # endif - #endif -+#ifdef _WIN32 -+#define WIN32_LEAN_AND_MEAN -+#include -+#endif - - #include "caca.h" - #include "caca_internals.h" -@@ -351,7 +355,11 @@ int caca_rand(int min, int max) - - if(need_init) - { -+#ifdef _WIN32 -+ srand(GetCurrentProcessId() + _caca_getticks(&timer)); -+#else - srand(getpid() + _caca_getticks(&timer)); -+#endif - need_init = 0; - } - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/caca/rules.mak vlc-3.0.22/contrib/src/caca/rules.mak --- vlc-3.0.21/contrib/src/caca/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/caca/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -19,6 +19,7 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca $(UNPACK) + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub .auto $(APPLY) $(SRC)/caca/caca-fix-compilation-llvmgcc.patch $(APPLY) $(SRC)/caca/caca-fix-pkgconfig.patch $(call pkg_static,"caca/caca.pc.in") @@ -60,6 +61,8 @@ CPPFLAGS="$(CPPFLAGS) -DCACA_STATIC" .caca: caca - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(CACA_CONF) - cd $< && $(MAKE) -C $< install + $(MAKEBUILDDIR) + $(MAKECONFIGURE) $(CACA_CONF) + +$(MAKEBUILD) -C $< + +$(MAKEBUILD) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/cargo/SHA512SUMS vlc-3.0.22/contrib/src/cargo/SHA512SUMS --- vlc-3.0.21/contrib/src/cargo/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/cargo/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -a77cb34ba0c2e7577c8acbd474197aabaa84e3b64b3c42f1d0c328df55c6accbe412aba9a787f0ea2f0654f085475455c9c488b2b6de34ad8889a2716d1e8d0c rustup-1.25.1.tar.gz diff -Nru vlc-3.0.21/contrib/src/cargo/rules.mak vlc-3.0.22/contrib/src/cargo/rules.mak --- vlc-3.0.21/contrib/src/cargo/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/cargo/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# cargo/cargo-c installation via rustup - -RUST_VERSION=1.69.0 -CARGOC_VERSION=0.9.20 -RUSTUP_VERSION=1.25.1 -RUSTUP_URL=$(GITHUB)/rust-lang/rustup/archive/$(RUSTUP_VERSION).tar.gz - -RUSTUP = . $(CARGO_HOME)/env && \ - RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) rustup - -$(TARBALLS)/rustup-$(RUSTUP_VERSION).tar.gz: - $(call download_pkg,$(RUSTUP_URL),rustup) - -.sum-cargo: rustup-$(RUSTUP_VERSION).tar.gz - -rustup: rustup-$(RUSTUP_VERSION).tar.gz .sum-cargo - $(UNPACK) - $(MOVE) - -# Test if we can use the host libssl library -ifeq ($(shell unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH; \ - pkg-config "openssl >= 1.0.1" 2>/dev/null || \ - pkg-config "libssl >= 2.5" 2>/dev/null || echo FAIL),) -CARGOC_FEATURES= -else -# Otherwise, let cargo build and statically link its own openssl -CARGOC_FEATURES=--features=cargo/vendored-openssl -endif - -# When needed (when we have a Rust dependency not using cargo-c), the cargo-c -# installation should go in a different package -.cargo: rustup - cd $< && RUSTUP_INIT_SKIP_PATH_CHECK=yes \ - RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) \ - ./rustup-init.sh --no-modify-path -y --default-toolchain $(RUST_VERSION) - +$(RUSTUP) default $(RUST_VERSION) - +$(RUSTUP) target add $(RUST_TARGET) - +unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH CFLAGS CPPFLAGS LDFLAGS; \ - $(CARGO) install --locked $(CARGOC_FEATURES) cargo-c --version $(CARGOC_VERSION) - touch $@ diff -Nru vlc-3.0.21/contrib/src/cddb/cddb-gcc14-getsockoptfix.patch vlc-3.0.22/contrib/src/cddb/cddb-gcc14-getsockoptfix.patch --- vlc-3.0.21/contrib/src/cddb/cddb-gcc14-getsockoptfix.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/cddb/cddb-gcc14-getsockoptfix.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,55 @@ +*size_t cannot be passed into getsockopt since gcc14 + +--- b/lib/cddb_net.c 2025-02-28 13:13:17.680209272 +0000 ++++ a/lib/cddb_net.c 2025-02-28 13:15:19.318977753 +0000 +@@ -265,10 +265,16 @@ int timeout_connect(int sockfd, const st + if (connect(sockfd, addr, len) == -1) { + /* check whether we can continue */ + if (errno == EINPROGRESS) { ++#ifdef _WIN32 ++ DWORD rv; ++#define GETSOCKOPT_VAL_TYPE char ++#else + int rv; ++#define GETSOCKOPT_VAL_TYPE int ++#endif + fd_set wfds; + struct timeval tv; +- size_t l; ++ socklen_t l; + + /* set up select time out */ + tv.tv_sec = timeout; +@@ -288,7 +294,7 @@ int timeout_connect(int sockfd, const st + default: + /* we got connected, check error condition */ + l = sizeof(rv); +- getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, &l); ++ getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (GETSOCKOPT_VAL_TYPE*)&rv, &l); + if (rv) { + /* something went wrong, simulate normal connect behaviour */ + errno = rv; +--- a/configure.ac.orig 2025-03-06 10:32:40.974509646 +0000 ++++ b/configure.ac 2025-03-09 10:13:07.446501285 +0000 +@@ -133,6 +133,21 @@ + fi + AC_SUBST(with_iconv) + ++dnl Check for socklen_t type ++AC_CHECK_TYPE([socklen_t], ++ [], ++ [AC_DEFINE([socklen_t], [int], [Define to `int' if does not define it.])], ++ [[ ++#if defined(_WIN32) ++# include ++# include ++#else ++# include ++# include ++#endif ++ ]] ++) ++ + dnl Check and add some GCC specific warning flags + dnl - we do this as the last thing so that a possible -Werror flag + dnl - does not cause a failure in one of the other tests above diff -Nru vlc-3.0.21/contrib/src/cddb/rules.mak vlc-3.0.22/contrib/src/cddb/rules.mak --- vlc-3.0.21/contrib/src/cddb/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/cddb/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -18,11 +18,13 @@ cddb: libcddb-$(CDDB_VERSION).tar.bz2 .sum-cddb $(UNPACK) + $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/cddb/cross.patch $(APPLY) $(SRC)/cddb/getenv-crash.patch $(APPLY) $(SRC)/cddb/cddb-no-alarm.patch $(APPLY) $(SRC)/cddb/fix-header-guards.patch $(APPLY) $(SRC)/cddb/no-gettext.patch + $(APPLY) $(SRC)/cddb/cddb-gcc14-getsockoptfix.patch ifdef HAVE_WIN32 $(APPLY) $(SRC)/cddb/win32-pkg.patch endif @@ -30,8 +32,10 @@ DEPS_cddb = regex $(DEPS_regex) +CDDB_CONF := --without-iconv + .cddb: cddb $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-iconv CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int -DWIN32_LEAN_AND_MEAN" - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int -DWIN32_LEAN_AND_MEAN" $(CDDB_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/chromaprint/0001-contribs-chromaprint-more-fixes-for-.pc-file.patch vlc-3.0.22/contrib/src/chromaprint/0001-contribs-chromaprint-more-fixes-for-.pc-file.patch --- vlc-3.0.21/contrib/src/chromaprint/0001-contribs-chromaprint-more-fixes-for-.pc-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/chromaprint/0001-contribs-chromaprint-more-fixes-for-.pc-file.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,49 @@ +From e0ef879e98b2aabb2aaf9124b6260d4af5e820d4 Mon Sep 17 00:00:00 2001 +From: Pavlov Konstantin +Date: Fri, 8 Dec 2017 13:12:30 +0100 +Subject: [PATCH 1/2] contribs: chromaprint: more fixes for .pc file. + +- Moved AVFFT check: FFMPEG_LIBRARIES might be unset even if +all needed FFmpeg libraries were found. +- Added an ability to link with VDSP/Accelerate Framework on macOS. +--- + CMakeLists.txt | 4 ++++ + libchromaprint.pc.cmake | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd6374e..c14e32b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -135,12 +135,16 @@ endif() + if(FFT_LIB STREQUAL "vdsp") + if(ACCELERATE_LIBRARIES) + set(USE_VDSP ON) ++ set(CHROMAPRINT_ADDITIONAL_LIBS "-F${ACCELERATE_LIBRARIES} -framework Accelerate") + else() + message(FATAL_ERROR "Selected ${FFT_LIB} for FFT calculations, but the library is not found") + endif() + elseif(FFT_LIB STREQUAL "avfft") + if(FFMPEG_LIBAVCODEC_FFT_FOUND) + set(USE_AVFFT ON) ++ find_package(PkgConfig) ++ pkg_check_modules(AVFFT REQUIRED libavcodec libavutil) ++ string(REPLACE ";" " " CHROMAPRINT_ADDITIONAL_LIBS "${AVFFT_LDFLAGS}") + else() + message(FATAL_ERROR "Selected ${FFT_LIB} for FFT calculations, but the library is not found") + endif() +diff --git a/libchromaprint.pc.cmake b/libchromaprint.pc.cmake +index 3799329..120e85d 100644 +--- a/libchromaprint.pc.cmake ++++ b/libchromaprint.pc.cmake +@@ -7,6 +7,6 @@ Name: ${PROJECT_NAME} + Description: Audio fingerprint library + URL: http://acoustid.org/chromaprint + Version: ${PROJECT_VERSION} +-Libs: -L${LIB_INSTALL_DIR} -lchromaprint ++Libs: -L${LIB_INSTALL_DIR} -lchromaprint @CHROMAPRINT_ADDITIONAL_LIBS@ + Cflags: -I${INCLUDE_INSTALL_DIR} + +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch vlc-3.0.22/contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch --- vlc-3.0.21/contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,23 +1,30 @@ -From 6726ebef3eec9dcc9d08b2ad6ae352bacb215e5e Mon Sep 17 00:00:00 2001 +From b4075d5b76b3efc717de27db5c093eed1be7a985 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Mon, 5 Sep 2022 16:13:05 +0200 Subject: [PATCH 2/2] add the C++ runtime to the packages to link to gcc needs libstdc++ and clang needs libc++. --- - CMakeLists.txt | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) + CMakeLists.txt | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0dbd9bd..67fa620 100644 +index c14e32b..b2545b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -197,6 +197,21 @@ else() +@@ -205,6 +205,28 @@ else() endif() if(NOT BUILD_FRAMEWORK) + foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}) -+ if (LIB MATCHES "-l.*") ++ if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB}) ++ list(APPEND PKG_CXX_LIBS "${LIB}") ++ elseif(LIB MATCHES "-l:lib.*.a") ++ string(LENGTH ${LIB} LIBLEN) ++ math(EXPR LIBLEN "${LIBLEN}-8") ++ string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB) ++ list(APPEND PKG_CXX_LIBS "-l${DIRECT_LIB}") ++ elseif(LIB MATCHES "-l.*") + list(APPEND PKG_CXX_LIBS "${LIB}") + else() + list(APPEND PKG_CXX_LIBS "-l${LIB}") @@ -32,8 +39,8 @@ + set(CHROMAPRINT_ADDITIONAL_LIBS "${CHROMAPRINT_ADDITIONAL_LIBS} ${PKG_LIBS}") + endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libchromaprint.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + endif() -- -2.27.0.windows.1 +2.45.0.windows.1 diff -Nru vlc-3.0.21/contrib/src/chromaprint/linklibs.patch vlc-3.0.22/contrib/src/chromaprint/linklibs.patch --- vlc-3.0.21/contrib/src/chromaprint/linklibs.patch 2017-12-09 15:34:11.000000000 +0000 +++ vlc-3.0.22/contrib/src/chromaprint/linklibs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -diff -urN chromaprint.orig/CMakeLists.txt chromaprint/CMakeLists.txt ---- chromaprint.orig/CMakeLists.txt 2016-12-28 21:10:42.000000000 +0100 -+++ chromaprint/CMakeLists.txt 2017-12-08 14:59:39.000000000 +0100 -@@ -135,12 +135,16 @@ - if(FFT_LIB STREQUAL "vdsp") - if(ACCELERATE_LIBRARIES) - set(USE_VDSP ON) -+ set(CHROMAPRINT_ADDITIONAL_LIBS "-F${ACCELERATE_LIBRARIES} -framework Accelerate") - else() - message(FATAL_ERROR "Selected ${FFT_LIB} for FFT calculations, but the library is not found") - endif() - elseif(FFT_LIB STREQUAL "avfft") - if(FFMPEG_LIBAVCODEC_FFT_FOUND) - set(USE_AVFFT ON) -+ find_package(PkgConfig) -+ pkg_check_modules(AVFFT REQUIRED libavcodec libavutil) -+ string(REPLACE ";" " " CHROMAPRINT_ADDITIONAL_LIBS "${AVFFT_LDFLAGS}") - else() - message(FATAL_ERROR "Selected ${FFT_LIB} for FFT calculations, but the library is not found") - endif() -diff -urN chromaprint.orig/libchromaprint.pc.cmake chromaprint/libchromaprint.pc.cmake ---- chromaprint.orig/libchromaprint.pc.cmake 2016-12-28 21:10:42.000000000 +0100 -+++ chromaprint/libchromaprint.pc.cmake 2017-12-08 14:56:22.000000000 +0100 -@@ -7,6 +7,6 @@ - Description: Audio fingerprint library - URL: http://acoustid.org/chromaprint - Version: ${PROJECT_VERSION} --Libs: -L${LIB_INSTALL_DIR} -lchromaprint -+Libs: -L${LIB_INSTALL_DIR} -lchromaprint ${CHROMAPRINT_ADDITIONAL_LIBS} - Cflags: -I${INCLUDE_INSTALL_DIR} - -diff -urN chromaprint.orig/src/fft_lib_avfft.h chromaprint/src/fft_lib_avfft.h ---- chromaprint.orig/src/fft_lib_avfft.h 2016-12-28 21:10:42.000000000 +0100 -+++ chromaprint/src/fft_lib_avfft.h 2017-12-08 14:55:35.000000000 +0100 -@@ -5,6 +5,7 @@ - #define CHROMAPRINT_FFT_LIB_AVFFT_H_ - - extern "C" { -+#include - #include - #include - #include diff -Nru vlc-3.0.21/contrib/src/chromaprint/rules.mak vlc-3.0.22/contrib/src/chromaprint/rules.mak --- vlc-3.0.21/contrib/src/chromaprint/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/chromaprint/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -15,12 +15,15 @@ chromaprint: chromaprint-$(CHROMAPRINT_VERSION).tar.gz .sum-chromaprint $(UNPACK) - $(APPLY) $(SRC)/chromaprint/linklibs.patch + $(APPLY) $(SRC)/chromaprint/0001-contribs-chromaprint-more-fixes-for-.pc-file.patch + $(APPLY) $(SRC)/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch $(MOVE) DEPS_chromaprint = ffmpeg $(DEPS_ffmpeg) -.chromaprint: chromaprint .ffmpeg toolchain.cmake - cd $< && $(HOSTVARS_PIC) $(CMAKE) - cd $< && $(CMAKEBUILD) . --target install +.chromaprint: chromaprint toolchain.cmake + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/d3d11/SHA512SUMS vlc-3.0.22/contrib/src/d3d11/SHA512SUMS --- vlc-3.0.21/contrib/src/d3d11/SHA512SUMS 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1,10 +1,15 @@ -0d97a004acd9d99d685aef6ae3c41b9951b41170d197173838ad2dbad4db309debcc2dd6ab2cfaa849ab9ca9841ae80232739b113b3e72c35ec8a481066acff5 d3d11.idl +47f35cd2cc5429f50bcc468af8fb5282e59840f1faca29b90fa2b12e2224e8b9631523d2555d15936fc7722d6adf7285bd10e80d359f38d3bedfd1a809b6df00 d3d11.h d309fc35b655213673ca2e79776a41088009cca845a7fe1968f0683093587de771039a3f2acd59f778e382ddb558309f728bbebbc4ffd1cfacc08bf57a223a89 d3d11_1.h 9cd0805fb4ede1b6269455ac44f309b1f3e60a64c401e157f9866ce41427324c05717f3dc166aef12bd865ffca0c96696de8a9e4b549836a47c322aeae955f4e d3d11_2.h 5c9b2d3ca071d555f61d45c839b3a474a8e3a440cb386c65303f0e9c95da74565ac7bdc6430582bdd506c192fc259707f10fd2b111ca0374e487e6bbd5ffc3ee d3d11_3.h f87eadc5c9a16a2e38d6a5615bd4e6d338df6a8b35879f315bcec39c876ebe9be47b0ce4174a5c259e6166895352a2403e503ae852218702fd7ed97b7aa3b142 d3d11_4.h -04b208ddf9c91f923d262ae68a5fb0588a3ef1a39ea450eaac9031e021bd5efdc7b30e3fb3e589b07bc88e41f8861caeb56934a2fa6cbf2efb7404f5f3453b70 dxgidebug.idl -1bee79fcaf5db6e53510f49fb40009fe6291ffafe47e1aea46ae0068afd001b405b0d970a55af63e475fbb18108e1ca0f91d86a18b6598b922c454ed082e8941 dxgi1_2.idl -3f24632a71c96498f3432ed55ebdbe0a90e00c86ff88e4a41d1d04fdda14532aeff7799401803a03c6f69b3a07930d3f190211accef4ca199a21b3671acdcc45 dxgitype.h -bba687b7cd4fd321f99d70a8137b1aa01851d8fd72a007cf5f8e5bce55fe06e15c27fe82de6493291b7c9932ceb43642234ed07d9a6bcb6140229cdbeb4a49bd dxgiformat.h -40eec2c5a96aeafb18ed9936c6ca9fc05303a08572efe6a3483e316b8af4e392eba863af86cdbb1342ac3ccb039be1b962688b05610e07f426bab6474073bfa3 dxgi.idl +baa4e380e41467c7d53191756376e8a60b9a2173ab3db08d5736416d89b6ca0b2b9d8eccce24e88731fdfbb9711ac36782a7fac03733de1342684a8557d2efbf dxgidebug.h +3d1fa12e80b8ce7d54568439b1229b08356ba07b8d35a73971b9ba9fe8efe2b3e05e05bf343663fc921d421a0deb4b2355af49a6dbf20d30e7fafdc898537510 dxgi1_2.h +b843e74266fdfdf4b6fdb121d75db441c48ab09282e20b1b9b81d816e9f2130b1404e9e4065bae69868e32b687c58a13d83f057a882b8cb4f897944b6330a22a dxgi1_3.h +22c658dc1a9c1a047f429cc27b46b81c42f0d44e35b5936dcfb74ed3d1dcd5aae53beb0a9e3f1285493e2f03ac85544b5bc3d0a91d37ef537a430cbbe89c1173 dxgi1_4.h +bcbb0b2929a512137b1298b160e265141b8405e336dd347e6131a938edc62f2906e19f1451fef07ecae328824533445a90c8dffe10d3eab1ef5c93219b61a082 dxgi1_5.h +5ab157d2c41e9fc070a7eeb31479ffd0d3a259a4cd60b747077fe0e4fcd67aa79da9232058127158316332b0d672e6c78ef224d3c17fdda1307074e4f4f09902 dxgi1_6.h +7887819e18867f793448e21e5a2a73305d4685ad2b80a4499b5a5710f2c7d0dc9079184e7e82aa5f1837c7a1b2d621ca392a9b8a903f0d135b29969be51d508a dxgitype.h +6c4929f4a4b262d901aa0b1a7b47ffc739ee8e1ecd82f20627c43ad0ee5367aa7c8b6f374a25273b6928d5d1e3c735fbb84404107e6e4d2f2965252a6d91c0c3 dxgicommon.h +3b1ccecaca5223a870a6195d4924908cfbc874d00e4dcb1e6415ec29323a15d36fae410049e86f25462dba996cc033f8ab716d9554c34f01ce061282b93c6f6e dxgiformat.h +cb0120badd7671f0cda1055971554950fc39c77e92c1acc2ab98f8c9e0398456799d2fb49a3c73e4d4452deaffd551d8754ad0665803feb3cf0711841e297c1c dxgi.h diff -Nru vlc-3.0.21/contrib/src/d3d11/dxgi12.patch vlc-3.0.22/contrib/src/d3d11/dxgi12.patch --- vlc-3.0.21/contrib/src/d3d11/dxgi12.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/dxgi12.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ ---- tarballs/dxgi1_2.idl.orig 2016-03-02 16:01:30.243405100 +0100 -+++ tarballs/dxgi1_2.idl 2016-03-02 16:19:58.006959300 +0100 -@@ -232,3 +232,106 @@ interface IDXGIAdapter2 : IDXGIAdapter1 - { - HRESULT GetDesc2([out] DXGI_ADAPTER_DESC2 *pDesc); - } -+ -+typedef struct DXGI_OUTDUPL_DESC { -+ DXGI_MODE_DESC ModeDesc; -+ DXGI_MODE_ROTATION Rotation; -+ BOOL DesktopImageInSystemMemory; -+} DXGI_OUTDUPL_DESC; -+ -+typedef struct DXGI_OUTDUPL_POINTER_POSITION { -+ POINT Position; -+ BOOL Visible; -+} DXGI_OUTDUPL_POINTER_POSITION; -+ -+typedef struct DXGI_OUTDUPL_FRAME_INFO { -+ LARGE_INTEGER LastPresentTime; -+ LARGE_INTEGER LastMouseUpdateTime; -+ UINT AccumulatedFrames; -+ BOOL RectsCoalesced; -+ BOOL ProtectedContentMaskedOut; -+ DXGI_OUTDUPL_POINTER_POSITION PointerPosition; -+ UINT TotalMetadataBufferSize; -+ UINT PointerShapeBufferSize; -+} DXGI_OUTDUPL_FRAME_INFO; -+ -+typedef struct DXGI_OUTDUPL_MOVE_RECT { -+ POINT SourcePoint; -+ RECT DestinationRect; -+} DXGI_OUTDUPL_MOVE_RECT; -+ -+typedef struct DXGI_OUTDUPL_POINTER_SHAPE_INFO { -+ UINT Type; -+ UINT Width; -+ UINT Height; -+ UINT Pitch; -+ POINT HotSpot; -+} DXGI_OUTDUPL_POINTER_SHAPE_INFO; -+[ -+ object, -+ uuid(191cfac3-a341-470d-b26e-a864f428319c), -+ local, -+ pointer_default(unique) -+] -+interface IDXGIOutputDuplication : -+ IDXGIObject -+{ -+ void GetDesc( -+ [out] DXGI_OUTDUPL_DESC* pDesc); -+ HRESULT AcquireNextFrame( -+ [in] UINT TimeoutInMilliseconds, -+ [out] DXGI_OUTDUPL_FRAME_INFO* pFrameInfo, -+ [out] IDXGIResource** ppDesktopResource); -+ HRESULT GetFrameDirtyRects( -+ [in] UINT DirtyRectsBufferSize, -+ [out] RECT* pDirtyRectsBuffer, -+ [out] UINT* pDirtyRectsBufferSizeRequired); -+ HRESULT GetFrameMoveRects( -+ [in] UINT MoveRectsBufferSize, -+ [out] DXGI_OUTDUPL_MOVE_RECT* pMoveRectBuffer, -+ [out] UINT* pMoveRectsBufferSizeRequired); -+ HRESULT GetFramePointerShape( -+ [in] UINT PointerShapeBufferSize, -+ [out] void* pPointerShapeBuffer, -+ [out] UINT* pPointerShapeBufferSizeRequired, -+ [out] DXGI_OUTDUPL_POINTER_SHAPE_INFO* pPointerShapeInfo); -+ HRESULT MapDesktopSurface( -+ [out] DXGI_MAPPED_RECT* pLockedRect); -+ HRESULT UnMapDesktopSurface(); -+ HRESULT ReleaseFrame(); -+}; -+ -+typedef struct DXGI_MODE_DESC1 -+{ -+ UINT Width; -+ UINT Height; -+ DXGI_RATIONAL RefreshRate; -+ DXGI_FORMAT Format; -+ DXGI_MODE_SCANLINE_ORDER ScanlineOrdering; -+ DXGI_MODE_SCALING Scaling; -+ BOOL Stereo; -+} DXGI_MODE_DESC1; -+ -+[ -+ object, -+ uuid(00cddea8-939b-4b83-a340-a685226666cc), -+ local, -+ pointer_default(unique) -+] -+interface IDXGIOutput1 : IDXGIOutput -+{ -+ HRESULT GetDisplayModeList1( -+ [in] DXGI_FORMAT EnumFormat, -+ [in] UINT Flags, -+ [in, out] UINT * pNumModes, -+ [out] DXGI_MODE_DESC1 *pDesc); -+ HRESULT FindClosestMatchingMode1( -+ [in] const DXGI_MODE_DESC1 *pModeToMatch, -+ [out] DXGI_MODE_DESC1 *pClosestMatch, -+ [in] IUnknown * pConcernedDevice); -+ HRESULT GetDisplaySurfaceData1( -+ [in] IDXGIResource *pDestination); -+ HRESULT DuplicateOutput( -+ [in] IUnknown *pDevice, -+ [out] IDXGIOutputDuplication **ppOutputDuplication); -+}; diff -Nru vlc-3.0.21/contrib/src/d3d11/dxgi1_3.idl vlc-3.0.22/contrib/src/d3d11/dxgi1_3.idl --- vlc-3.0.21/contrib/src/d3d11/dxgi1_3.idl 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/dxgi1_3.idl 1970-01-01 00:00:00.000000000 +0000 @@ -1,242 +0,0 @@ -/* - * Copyright 2015 Martell Malone - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "dxgi1_2.idl"; - -cpp_quote("#define DXGI_CREATE_FACTORY_DEBUG 0x1") - -typedef struct DXGI_DECODE_SWAP_CHAIN_DESC -{ - UINT Flags; -} DXGI_DECODE_SWAP_CHAIN_DESC; - -typedef enum DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS -{ - DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_NOMINAL_RANGE = 0x1, - DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_BT709 = 0x2, - DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_xvYCC = 0x4, -} DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS; - -[ - object, - local, - uuid(2633066b-4514-4c7a-8fd8-12ea98059d18) -] -interface IDXGIDecodeSwapChain : IUnknown -{ - HRESULT PresentBuffer( - UINT buffer, - UINT sync, - UINT flags - ); - - HRESULT SetSourceRect( - const RECT* rect - ); - - HRESULT SetTargetRect( - const RECT* rect - ); - - HRESULT SetDestSize( - UINT width, - UINT height - ); - - HRESULT GetSourceRect( - [out] RECT* rect - ); - - HRESULT GetTargetRect( - [out] RECT* rect - ); - - HRESULT GetDestSize( - [out] UINT* width, - [out] UINT* height - ); - - HRESULT SetColorSpace( - DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS colorSpace - ); - - DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS GetColorSpace(); -} - -[ - object, - local, - uuid(41e7d1f2-a591-4f7b-a2e5-fa9c843e1c12) -] -interface IDXGIFactoryMedia :IUnknown -{ - HRESULT CreateSwapChainForCompositionSurfaceHandle( - [in] IUnknown* device, - [in] HANDLE surface, - [in] const DXGI_SWAP_CHAIN_DESC1* desc, - [in] IDXGIOutput* output, - [out] IDXGISwapChain1** swapchain - ); - - HRESULT CreateDecodeSwapChainForCompositionSurfaceHandle( - [in] IUnknown* device, - [in] HANDLE surface, - [in] DXGI_DECODE_SWAP_CHAIN_DESC* desc, - [in] IDXGIResource* buffer, - [in] IDXGIOutput* output, - [out] IDXGIDecodeSwapChain** swapchain - ); -} - -typedef enum DXGI_FRAME_PRESENTATION_MODE -{ - DXGI_FRAME_PRESENTATION_MODE_COMPOSED = 0, - DXGI_FRAME_PRESENTATION_MODE_OVERLAY = 1, - DXGI_FRAME_PRESENTATION_MODE_NONE = 2, -} DXGI_FRAME_PRESENTATION_MODE; - -typedef struct DXGI_FRAME_STATISTICS_MEDIA -{ - UINT PresentCount; - UINT PresentRefreshCount; - UINT SyncRefreshCount; - LARGE_INTEGER SyncQPCTime; - LARGE_INTEGER SyncGPUTime; - DXGI_FRAME_PRESENTATION_MODE CompositionMode; - UINT ApprovedPresentDuration; -} DXGI_FRAME_STATISTICS_MEDIA; - -[ - object, - local, - uuid(dd95b90b-f05f-4f6a-bd65-25bfb264bd84) -] -interface IDXGISwapChainMedia : IUnknown -{ - HRESULT GetFrameStatisticsMedia( - [out] DXGI_FRAME_STATISTICS_MEDIA* pStats - ); - - HRESULT SetPresentDuration( - UINT duration - ); - - HRESULT CheckPresentDurationSupport( - UINT duration, - [out] UINT* smallerduration, - [out] UINT* largerduration - ); -}; - -typedef enum DXGI_OVERLAY_SUPPORT_FLAG -{ - DXGI_OVERLAY_SUPPORT_FLAG_DIRECT = 0x1, - DXGI_OVERLAY_SUPPORT_FLAG_SCALING = 0x2 -} DXGI_OVERLAY_SUPPORT_FLAG; - -[ - object, - local, - uuid(6007896c-3244-4afd-bf18-a6d3beda5023) -] -interface IDXGIDevice3 : IDXGIDevice2 -{ - void Trim(); -} - -[ - object, - local, - uuid(595e39d1-2724-4663-99b1-da969de28364) -] -interface IDXGIOutput2 : IDXGIOutput1 -{ - BOOL SupportsOverlays(); -} - -[ - object, - local, - uuid(8a6bb301-7e7e-41F4-a8e0-5b32f7f99b18) -] -interface IDXGIOutput3 : IDXGIOutput2 -{ - HRESULT CheckOverlaySupport( - [in] DXGI_FORMAT format, - [out, in] IUnknown* device, - [out] UINT* flags - ); -} - -[local] HRESULT __stdcall CreateDXGIFactory2(UINT Flags, REFIID riid, void **factory); - -typedef struct DXGI_MATRIX_3X2_F -{ - float _11; - float _12; - float _21; - float _22; - float _31; - float _32; -} DXGI_MATRIX_3X2_F; - -[ - object, - local, - uuid(a8be2ac4-199f-4946-b331-79599fb98de7) -] -interface IDXGISwapChain2 : IDXGISwapChain1 -{ - HRESULT SetSourceSize( - UINT width, - UINT height - ); - - HRESULT GetSourceSize( - [out] UINT* width, - [out] UINT* height - ); - - HRESULT SetMaximumFrameLatency( - UINT max_latency - ); - - HRESULT GetMaximumFrameLatency( - [out] UINT* max_latency - ); - - HANDLE GetFrameLatencyWaitableObject(); - - HRESULT SetMatrixTransform( - const DXGI_MATRIX_3X2_F* matrix - ); - - HRESULT GetMatrixTransform( - [out] DXGI_MATRIX_3X2_F* matrix - ); -} - -[ - object, - local, - uuid(25483823-cd46-4c7d-86ca-47aa95b837bd) -] -interface IDXGIFactory3 : IDXGIFactory2 -{ - UINT GetCreationFlags(); -} diff -Nru vlc-3.0.21/contrib/src/d3d11/dxgi1_4.idl vlc-3.0.22/contrib/src/d3d11/dxgi1_4.idl --- vlc-3.0.21/contrib/src/d3d11/dxgi1_4.idl 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/dxgi1_4.idl 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -/* - * Copyright 2016 Steve Lhomme - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "dxgi1_3.idl"; - -typedef enum DXGI_COLOR_SPACE_TYPE { - DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709 = 0, - DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709 = 1, - DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 = 2, - DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020 = 3, - DXGI_COLOR_SPACE_RESERVED = 4, - DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601 = 5, - DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601 = 6, - DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601 = 7, - DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709 = 8, - DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709 = 9, - DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020 = 10, - DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020 = 11, - DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020 = 12, - DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_LEFT_P2020 = 13, - DXGI_COLOR_SPACE_RGB_STUDIO_G2084_NONE_P2020 = 14, - DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_TOPLEFT_P2020 = 15, - DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_TOPLEFT_P2020 = 16, - DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020 = 17, - DXGI_COLOR_SPACE_CUSTOM = 0xFFFFFFFF, -} DXGI_COLOR_SPACE_TYPE; - -[ - object, - local, - uuid(94d99bdb-f1f8-4ab0-b236-7da0170edab1) -] -interface IDXGISwapChain3 : IDXGISwapChain2 -{ - UINT GetCurrentBackBufferIndex(); - - HRESULT CheckColorSpaceSupport( - [in] DXGI_COLOR_SPACE_TYPE ColorSpace, - [out] UINT* pColorSpaceSupport - ); - - HRESULT SetColorSpace1( - [in] DXGI_COLOR_SPACE_TYPE ColorSpace - ); - - HRESULT ResizeBuffers1( - [in] UINT BufferCount, - [in] UINT Width, - [in] UINT Height, - [in] DXGI_FORMAT Format, - [in] UINT SwapChainFlags, - [in] const UINT* pCreationNodeMask, - [in] IUnknown* const* ppPresentQueue - ); -}; - -typedef enum DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG -{ - DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x01, - DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_OVERLAY_PRESENT = 0x02, -} DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG; - -[ - object, - local, - uuid(1bc6ea02-ef36-464f-bf0c-21ca39e5168a) -] -interface IDXGIFactory4 : IDXGIFactory3 -{ - HRESULT EnumAdapterByLuid( - [in] LUID AdapterLuid, - [in] REFIID riid, - [out] void **ppvAdapter - ); - HRESULT EnumWarpAdapter( - [in] REFIID riid, - [out] void **ppvAdapter - ); -} - -[ - object, - local, - uuid(dc7dca35-2196-414d-9F53-617884032a60) -] -interface IDXGIOutput4 : IDXGIOutput3 -{ - HRESULT CheckOverlayColorSpaceSupport( - [in] DXGI_FORMAT Format, - [in] DXGI_COLOR_SPACE_TYPE ColorSpace, - [in] IUnknown *pConcernedDevice, - [out] UINT *pFlags - ); -} diff -Nru vlc-3.0.21/contrib/src/d3d11/dxgi1_5.idl vlc-3.0.22/contrib/src/d3d11/dxgi1_5.idl --- vlc-3.0.21/contrib/src/d3d11/dxgi1_5.idl 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/dxgi1_5.idl 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/* - * Copyright 2017 Steve Lhomme - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "dxgi1_4.idl"; - -typedef enum DXGI_HDR_METADATA_TYPE -{ - DXGI_HDR_METADATA_TYPE_NONE = 0x00, - DXGI_HDR_METADATA_TYPE_HDR10 = 0x01, -} DXGI_HDR_METADATA_TYPE; - -typedef struct DXGI_HDR_METADATA_HDR10 -{ - UINT16 RedPrimary[2]; - UINT16 GreenPrimary[2]; - UINT16 BluePrimary[2]; - UINT16 WhitePoint[2]; - UINT MaxMasteringLuminance; - UINT MinMasteringLuminance; - UINT16 MaxContentLightLevel; - UINT16 MaxFrameAverageLightLevel; -} DXGI_HDR_METADATA_HDR10; - -[ - object, - local, - uuid(3d585d5a-bd4a-489e-b1f4-3dbcb6452ffb) -] -interface IDXGISwapChain4 : IDXGISwapChain3 -{ - HRESULT SetHDRMetaData( - [in] DXGI_HDR_METADATA_TYPE Type, - [in] UINT Size, - [in] void* pMetaData - ); -}; - -[ - object, - local, - uuid(80A07424-AB52-42EB-833C-0C42FD282D98) -] -interface IDXGIOutput5 : IDXGIOutput4 -{ - HRESULT DuplicateOutput1( - [in] IUnknown *pDevice, - UINT Flags, - [in] UINT SupportedFormatsCount, - [in] const DXGI_FORMAT *pSupportedFormats, - [out] IDXGIOutputDuplication **ppOutputDuplication - ); -} diff -Nru vlc-3.0.21/contrib/src/d3d11/dxgi1_6.idl vlc-3.0.22/contrib/src/d3d11/dxgi1_6.idl --- vlc-3.0.21/contrib/src/d3d11/dxgi1_6.idl 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/dxgi1_6.idl 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/* - * Copyright 2017 Steve Lhomme - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "dxgi1_4.idl"; - -cpp_quote("/* HACK as widl segfaults with too many imports */") -cpp_quote("#include ") -cpp_quote("#ifndef __dxgi1_5_h__") - -[ - object, - local, - uuid(80A07424-AB52-42EB-833C-0C42FD282D98) -] -interface IDXGIOutput5 : IDXGIOutput4 -{ - HRESULT DuplicateOutput1( - [in] IUnknown *pDevice, - UINT Flags, - [in] UINT SupportedFormatsCount, - [in] const DXGI_FORMAT *pSupportedFormats, - [out] IDXGIOutputDuplication **ppOutputDuplication - ); -} - -cpp_quote("#endif /* __dxgi1_5_h__ */") - -typedef struct DXGI_OUTPUT_DESC1 -{ - WCHAR DeviceName[32]; - RECT DesktopCoordinates; - BOOL AttachedToDesktop; - DXGI_MODE_ROTATION Rotation; - HMONITOR Monitor; - UINT BitsPerColor; - DXGI_COLOR_SPACE_TYPE ColorSpace; - FLOAT RedPrimary[2]; - FLOAT GreenPrimary[2]; - FLOAT BluePrimary[2]; - FLOAT WhitePoint[2]; - FLOAT MinLuminance; - FLOAT MaxLuminance; - FLOAT MaxFullFrameLuminance; - BOOL InternalOutput; -} DXGI_OUTPUT_DESC1; - -[ - object, - local, - uuid(068346e8-aaec-4b84-add7-137f513f77a1) -] -interface IDXGIOutput6 : IDXGIOutput5 -{ - HRESULT GetDesc1( - [out] DXGI_OUTPUT_DESC1 *pDesc - ); -} diff -Nru vlc-3.0.21/contrib/src/d3d11/dxgidebug.patch vlc-3.0.22/contrib/src/d3d11/dxgidebug.patch --- vlc-3.0.21/contrib/src/d3d11/dxgidebug.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/dxgidebug.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -diff --git a/dxgidebug.idl b/dxgidebug.idl ---- /dev/null -+++ b/dxgidebug.idl -@@ -0,0 +1,44 @@ -+/* -+ * Copyright 2015 Steve Lhomme -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA02110-1301, USA -+ */ -+ -+import "oaidl.idl"; -+ -+cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b,0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);") -+cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d,0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);") -+cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1,0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);") -+cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x90, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") -+ -+typedef enum DXGI_DEBUG_RLO_FLAGS { -+ DXGI_DEBUG_RLO_SUMMARY = 0x0001, -+ DXGI_DEBUG_RLO_DETAIL = 0x0002, -+ DXGI_DEBUG_RLO_IGNORE_INTERNAL = 0x0004, -+ DXGI_DEBUG_RLO_ALL = 0x0007 -+} DXGI_DEBUG_RLO_FLAGS; -+ -+[ -+ object, -+ local, -+ uuid(119e7452-de9e-40fe-8806-88f90c12b441) -+] -+interface IDXGIDebug : IUnknown -+{ -+ HRESULT ReportLiveObjects( -+ [in] GUID apiid, -+ [in] DXGI_DEBUG_RLO_FLAGS flags); -+} -+ --- -1.9.5.msysgit.0 - diff -Nru vlc-3.0.21/contrib/src/d3d11/processor_format.patch vlc-3.0.22/contrib/src/d3d11/processor_format.patch --- vlc-3.0.21/contrib/src/d3d11/processor_format.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/processor_format.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---- a/d3d11.idl 2016-02-26 09:21:48.019575300 +0100 -+++ b/d3d11.idl 2016-02-26 10:41:58.461027900 +0100 -@@ -3199,6 +3199,18 @@ typedef enum D3D11_CREATE_DEVICE_FLAG { - D3D11_CREATE_DEVICE_VIDEO_SUPPORT = 0x0800 - } D3D11_CREATE_DEVICE_FLAG; - -+typedef enum D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT -+{ -+ D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_INPUT = 0x00000001, -+ D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT = 0x00000002, -+} D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT; -+ -+typedef struct D3D11_FEATURE_DATA_THREADING -+{ -+ BOOL DriverConcurrentCreates; -+ BOOL DriverCommandLists; -+} D3D11_FEATURE_DATA_THREADING; -+ - const UINT D3D11_SDK_VERSION = 7; - - cpp_quote("#include ") diff -Nru vlc-3.0.21/contrib/src/d3d11/rules.mak vlc-3.0.22/contrib/src/d3d11/rules.mak --- vlc-3.0.21/contrib/src/d3d11/rules.mak 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d11/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,161 +1,88 @@ # generate Direct3D11 temporary include -ifdef HAVE_CROSS_COMPILE -IDL_INCLUDES = -I/usr/include/wine/windows/ -I/usr/include/wine/wine/windows/ -else -#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_COMMIT_ID := f701c4c8cc9a881e660904f8c0047908a7b2ed04 D3D11_1_COMMIT_ID := aa6ab47929a9cac6897f38e630ce0bb88458e288 D3D11_4_COMMIT_ID := 6a1e782bb60bb1a93b5ab20fe895394d9c0904c2 -DXGI12_COMMIT_ID := 790a6544347b53c314b9c6f1ea757a2d5504c67e -DXGITYPE_COMMIT_ID := f4aba520d014ecfe3563e33860de001caf2804e2 -D3D11_IDL_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11.idl?format=raw +DXGI12_COMMIT_ID := 3419b2d4b2b7e8b378696dc79546e3593f00ade6 +DXGITYPE_COMMIT_ID := 3419b2d4b2b7e8b378696dc79546e3593f00ade6 +DXGIDEBUG_COMMIT_ID := 22333acf22f89b9709c718467e04735157b5d27a +D3D11_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_COMMIT_ID)/tree/mingw-w64-headers/include/d3d11.h?format=raw D3D11_1_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_1_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11_1.h?format=raw D3D11_2_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_1_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11_2.h?format=raw D3D11_3_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_1_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11_3.h?format=raw D3D11_4_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_4_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11_4.h?format=raw -DXGI12_IDL_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGI12_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/dxgi1_2.idl?format=raw -DXGITYPE_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/dxgitype.h?format=raw -DXGIFORMAT_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/dxgiformat.h?format=raw -DXGI_IDL_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/dxgi.idl?format=raw -DST_D3D11_H = $(PREFIX)/include/d3d11.h -DST_D3D11_1_H = $(PREFIX)/include/d3d11_1.h -DST_D3D11_2_H = $(PREFIX)/include/d3d11_2.h -DST_D3D11_3_H = $(PREFIX)/include/d3d11_3.h -DST_D3D11_4_H = $(PREFIX)/include/d3d11_4.h -DST_DXGIDEBUG_H = $(PREFIX)/include/dxgidebug.h -DST_DXGITYPE_H = $(PREFIX)/include/dxgitype.h -DST_DXGIFORMAT_H = $(PREFIX)/include/dxgiformat.h -DST_DXGI_IDL = $(PREFIX)/include/dxgi.idl -DST_DXGI12_H = $(PREFIX)/include/dxgi1_2.h -DST_DXGI13_H = $(PREFIX)/include/dxgi1_3.h -DST_DXGI14_H = $(PREFIX)/include/dxgi1_4.h -DST_DXGI15_H = $(PREFIX)/include/dxgi1_5.h -DST_DXGI16_H = $(PREFIX)/include/dxgi1_6.h +DXGI12_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGI12_COMMIT_ID)/tree/mingw-w64-headers/include/dxgi1_2.h?format=raw +DXGI13_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGI12_COMMIT_ID)/tree/mingw-w64-headers/include/dxgi1_3.h?format=raw +DXGI14_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGI12_COMMIT_ID)/tree/mingw-w64-headers/include/dxgi1_4.h?format=raw +DXGI15_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGI12_COMMIT_ID)/tree/mingw-w64-headers/include/dxgi1_5.h?format=raw +DXGI16_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGI12_COMMIT_ID)/tree/mingw-w64-headers/include/dxgi1_6.h?format=raw +DXGITYPE_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/include/dxgitype.h?format=raw +DXGICOMMON_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/include/dxgicommon.h?format=raw +DXGIDEBUG_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGIDEBUG_COMMIT_ID)/tree/mingw-w64-headers/include/dxgidebug.h?format=raw +DXGIFORMAT_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/include/dxgiformat.h?format=raw +DXGI_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/include/dxgi.h?format=raw ifdef HAVE_WIN32 PKGS += d3d11 endif -DEPS_d3d11 = pthreads $(DEPS_pthreads) +ifeq ($(call mingw_at_least, 8), true) +PKGS_FOUND += d3d11 +endif # MINGW 8 -$(TARBALLS)/d3d11.idl: - $(call download_pkg,$(D3D11_IDL_URL),d3d11) +$(TARBALLS)/d3d11.h: + $(call download,$(D3D11_H_URL)) $(TARBALLS)/d3d11_1.h: - $(call download_pkg,$(D3D11_1_H_URL),d3d11) + $(call download,$(D3D11_1_H_URL)) $(TARBALLS)/d3d11_2.h: - $(call download_pkg,$(D3D11_2_H_URL),d3d11) + $(call download,$(D3D11_2_H_URL)) $(TARBALLS)/d3d11_3.h: - $(call download_pkg,$(D3D11_3_H_URL),d3d11) + $(call download,$(D3D11_3_H_URL)) $(TARBALLS)/d3d11_4.h: - $(call download_pkg,$(D3D11_4_H_URL),d3d11) - -$(TARBALLS)/dxgidebug.idl: - (cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/dxgidebug.patch - -$(TARBALLS)/dxgi1_2.idl: - $(call download_pkg,$(DXGI12_IDL_URL),d3d11) - -$(TARBALLS)/dxgitype.h: - $(call download_pkg,$(DXGITYPE_H_URL),d3d11) - -$(TARBALLS)/dxgiformat.h: - $(call download_pkg,$(DXGIFORMAT_H_URL),d3d11) - -$(TARBALLS)/dxgi.idl: - $(call download_pkg,$(DXGI_IDL_URL),d3d11) - -.sum-d3d11: $(TARBALLS)/d3d11.idl $(TARBALLS)/d3d11_1.h $(TARBALLS)/d3d11_2.h $(TARBALLS)/d3d11_3.h $(TARBALLS)/d3d11_4.h $(TARBALLS)/dxgidebug.idl $(TARBALLS)/dxgi1_2.idl $(TARBALLS)/dxgitype.h $(TARBALLS)/dxgiformat.h $(TARBALLS)/dxgi.idl - -d3d11: .sum-d3d11 - mkdir -p $@ - cp $(TARBALLS)/d3d11.idl $@ && cd $@ && patch -fp1 < ../$(SRC)/d3d11/processor_format.patch - -dxgi12: .sum-d3d11 - mkdir -p $@ - cp $(TARBALLS)/dxgi1_2.idl $@ && cd $@ && patch -fp1 < ../$(SRC)/d3d11/dxgi12.patch - -$(DST_D3D11_H): d3d11 - mkdir -p -- "$(PREFIX)/include/" - $(WIDL) -DBOOL=WINBOOL -I$(PREFIX)/include $(IDL_INCLUDES) -h -o $@ $ - #endif diff -Nru vlc-3.0.21/contrib/src/d3d9/dxva2api.patch vlc-3.0.22/contrib/src/d3d9/dxva2api.patch --- vlc-3.0.21/contrib/src/d3d9/dxva2api.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d9/dxva2api.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,379 +0,0 @@ ---- a/dxva2api/dxva2api.idl 2017-06-13 14:45:14.598269100 +0200 -+++ b/dxva2api/dxva2api.idl 2017-06-26 10:08:58.732675300 +0200 -@@ -6,6 +6,8 @@ - - import "unknwn.idl"; - -+cpp_quote("#include ") -+ - /* Fake widl types */ - cpp_quote("#if 0") - typedef DWORD IDirect3DDevice9; -@@ -14,12 +16,15 @@ typedef DWORD D3DFORMAT; - typedef DWORD D3DPOOL; - cpp_quote("#endif") - -+cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)") -+ - interface IDirectXVideoDecoderService; -+interface IDirectXVideoProcessorService; - --cpp_quote("#ifndef __REFERENCE_TIME_DEFINED") --cpp_quote("#define __REFERENCE_TIME_DEFINED") --cpp_quote("typedef LONGLONG REFERENCE_TIME;") --cpp_quote("#endif /*__REFERENCE_TIME_DEFINED*/") -+#ifndef __REFERENCE_TIME_DEFINED -+#define __REFERENCE_TIME_DEFINED -+typedef LONGLONG REFERENCE_TIME; -+#endif /*__REFERENCE_TIME_DEFINED*/ - - cpp_quote("#define DXVA2_ProcAmp_None 0x0000") - cpp_quote("#define DXVA2_ProcAmp_Brightness 0x0001") -@@ -142,19 +147,19 @@ cpp_quote(" DXVA2_VideoTransferMatrix_B - cpp_quote(" DXVA2_VideoTransferMatrix_SMPTE240M = 3 ") - cpp_quote("} DXVA2_VideoTransferMatrix;") - cpp_quote("") --cpp_quote("typedef struct _DXVA2_AYUVSample16 {") --cpp_quote(" USHORT Cr;") --cpp_quote(" USHORT Cb;") --cpp_quote(" USHORT Y;") --cpp_quote(" USHORT Alpha;") --cpp_quote("} DXVA2_AYUVSample16;") --cpp_quote("") --cpp_quote("typedef struct _DXVA2_AYUVSample8 {") --cpp_quote(" UCHAR Cr;") --cpp_quote(" UCHAR Cb;") --cpp_quote(" UCHAR Y;") --cpp_quote(" UCHAR Alpha;") --cpp_quote("} DXVA2_AYUVSample8;") -+typedef struct _DXVA2_AYUVSample16 { -+ USHORT Cr; -+ USHORT Cb; -+ USHORT Y; -+ USHORT Alpha; -+} DXVA2_AYUVSample16; -+ -+typedef struct _DXVA2_AYUVSample8 { -+ UCHAR Cr; -+ UCHAR Cb; -+ UCHAR Y; -+ UCHAR Alpha; -+} DXVA2_AYUVSample8; - - typedef struct _DXVA2_ConfigPictureDecode { - GUID guidConfigBitstreamEncryption; -@@ -219,40 +224,40 @@ typedef struct _DXVA2_ExtendedFormat { - }; - } DXVA2_ExtendedFormat; - --cpp_quote("typedef struct _DXVA2_Fixed32 {") --cpp_quote(" __C89_NAMELESS union {") --cpp_quote(" __C89_NAMELESS struct {") --cpp_quote(" USHORT Fraction;") --cpp_quote(" SHORT Value;") --cpp_quote(" } DUMMYSTRUCTNAME;") --cpp_quote(" LONG ll;") --cpp_quote(" } DUMMYUNIONNAME;") --cpp_quote("} DXVA2_Fixed32;") --cpp_quote("") --cpp_quote("typedef struct _DXVA2_FilterValues {") --cpp_quote(" DXVA2_Fixed32 Level;") --cpp_quote(" DXVA2_Fixed32 Threshold;") --cpp_quote(" DXVA2_Fixed32 Radius;") --cpp_quote("} DXVA2_FilterValues;") -+typedef struct _DXVA2_Fixed32 { -+ __C89_NAMELESS union { -+ __C89_NAMELESS struct { -+ USHORT Fraction; -+ SHORT Value; -+ } DUMMYSTRUCTNAME; -+ LONG ll; -+ } DUMMYUNIONNAME; -+} DXVA2_Fixed32; -+ -+typedef struct _DXVA2_FilterValues { -+ DXVA2_Fixed32 Level; -+ DXVA2_Fixed32 Threshold; -+ DXVA2_Fixed32 Radius; -+} DXVA2_FilterValues; - - typedef struct _DXVA2_Frequency { - UINT Numerator; - UINT Denominator; - } DXVA2_Frequency; - --cpp_quote("typedef struct _DXVA2_ProcAmpValues {") --cpp_quote(" DXVA2_Fixed32 Brightness;") --cpp_quote(" DXVA2_Fixed32 Contrast;") --cpp_quote(" DXVA2_Fixed32 Hue;") --cpp_quote(" DXVA2_Fixed32 Saturation;") --cpp_quote("} DXVA2_ProcAmpValues;") --cpp_quote("") --cpp_quote("typedef struct _DXVA2_ValueRange {") --cpp_quote(" DXVA2_Fixed32 MinValue;") --cpp_quote(" DXVA2_Fixed32 MaxValue;") --cpp_quote(" DXVA2_Fixed32 DefaultValue;") --cpp_quote(" DXVA2_Fixed32 StepSize;") --cpp_quote("} DXVA2_ValueRange;") -+typedef struct _DXVA2_ProcAmpValues { -+ DXVA2_Fixed32 Brightness; -+ DXVA2_Fixed32 Contrast; -+ DXVA2_Fixed32 Hue; -+ DXVA2_Fixed32 Saturation; -+} DXVA2_ProcAmpValues; -+ -+typedef struct _DXVA2_ValueRange { -+ DXVA2_Fixed32 MinValue; -+ DXVA2_Fixed32 MaxValue; -+ DXVA2_Fixed32 DefaultValue; -+ DXVA2_Fixed32 StepSize; -+} DXVA2_ValueRange; - - typedef struct _DXVA2_VideoDesc { - UINT SampleWidth; -@@ -317,57 +322,93 @@ cpp_quote("DXVA2_DetailFilterTech_Unknow - cpp_quote("DXVA2_DetailFilterTech_Edge") - cpp_quote("DXVA2_DetailFilterTech_Sharpening") - cpp_quote("*/") --cpp_quote("typedef struct _DXVA2_VideoProcessBltParams {") --cpp_quote(" REFERENCE_TIME TargetFrame;") --cpp_quote(" RECT TargetRect;") --cpp_quote(" SIZE ConstrictionSize;") --cpp_quote(" UINT StreamingFlags;") --cpp_quote(" DXVA2_AYUVSample16 BackgroundColor;") --cpp_quote(" DXVA2_ExtendedFormat DestFormat;") --cpp_quote(" DXVA2_ProcAmpValues ProcAmpValues;") --cpp_quote(" DXVA2_Fixed32 Alpha;") --cpp_quote(" DXVA2_FilterValues NoiseFilterLuma;") --cpp_quote(" DXVA2_FilterValues NoiseFilterChroma;") --cpp_quote(" DXVA2_FilterValues DetailFilterLuma;") --cpp_quote(" DXVA2_FilterValues DetailFilterChroma;") --cpp_quote(" DWORD DestData;") --cpp_quote("} DXVA2_VideoProcessBltParams;") --cpp_quote("") --cpp_quote("#ifdef _D3D9_H_") --cpp_quote("typedef struct _DXVA2_VideoProcessorCaps {") --cpp_quote(" UINT DeviceCaps;") --cpp_quote(" D3DPOOL InputPool;") --cpp_quote(" UINT NumForwardRefSamples;") --cpp_quote(" UINT NumBackwardRefSamples;") --cpp_quote(" UINT Reserved;") --cpp_quote(" UINT DeinterlaceTechnology;") --cpp_quote(" UINT ProcAmpControlCaps;") --cpp_quote(" UINT VideoProcessorOperations;") --cpp_quote(" UINT NoiseFilterTechnology;") --cpp_quote(" UINT DetailFilterTechnology;") --cpp_quote("} DXVA2_VideoProcessorCaps;") --cpp_quote("#endif") --cpp_quote("") --cpp_quote("/* SampleData") --cpp_quote("DXVA2_SampleData_RFF") --cpp_quote("DXVA2_SampleData_TFF") --cpp_quote("DXVA2_SampleData_RFF_TFF_Present") --cpp_quote("*/") --cpp_quote("") --cpp_quote("#ifdef _D3D9_H_") --cpp_quote("typedef struct _DXVA2_VideoSample {") --cpp_quote(" REFERENCE_TIME Start;") --cpp_quote(" REFERENCE_TIME End;") --cpp_quote(" DXVA2_ExtendedFormat SampleFormat;") --cpp_quote(" IDirect3DSurface9* SrcSurface;") --cpp_quote(" RECT SrcRect;") --cpp_quote(" RECT DstRect;") --cpp_quote(" DXVA2_AYUVSample8 Pal[16];") --cpp_quote(" DXVA2_Fixed32 PlanarAlpha;") --cpp_quote(" DWORD SampleData;") --cpp_quote("} DXVA2_VideoSample;") --cpp_quote("#endif") --cpp_quote("") -+typedef struct _DXVA2_VideoProcessBltParams { -+ REFERENCE_TIME TargetFrame; -+ RECT TargetRect; -+ SIZE ConstrictionSize; -+ UINT StreamingFlags; -+ DXVA2_AYUVSample16 BackgroundColor; -+ DXVA2_ExtendedFormat DestFormat; -+ DXVA2_ProcAmpValues ProcAmpValues; -+ DXVA2_Fixed32 Alpha; -+ DXVA2_FilterValues NoiseFilterLuma; -+ DXVA2_FilterValues NoiseFilterChroma; -+ DXVA2_FilterValues DetailFilterLuma; -+ DXVA2_FilterValues DetailFilterChroma; -+ DWORD DestData; -+} DXVA2_VideoProcessBltParams; -+ -+#ifdef _D3D9_H_ -+typedef struct _DXVA2_VideoProcessorCaps { -+ UINT DeviceCaps; -+ D3DPOOL InputPool; -+ UINT NumForwardRefSamples; -+ UINT NumBackwardRefSamples; -+ UINT Reserved; -+ UINT DeinterlaceTechnology; -+ UINT ProcAmpControlCaps; -+ UINT VideoProcessorOperations; -+ UINT NoiseFilterTechnology; -+ UINT DetailFilterTechnology; -+} DXVA2_VideoProcessorCaps; -+#endif -+ -+cpp_quote("/* deinterlacing capabilities */") -+cpp_quote("#define DXVA2_DeinterlaceTech_Unknown 0x0") -+cpp_quote("#define DXVA2_DeinterlaceTech_BOBLineReplicate 0x1") -+cpp_quote("#define DXVA2_DeinterlaceTech_BOBVerticalStretch 0x2") -+cpp_quote("#define DXVA2_DeinterlaceTech_BOBVerticalStretch4Tap 0x4") -+cpp_quote("#define DXVA2_DeinterlaceTech_MedianFiltering 0x8") -+cpp_quote("#define DXVA2_DeinterlaceTech_EdgeFiltering 0x10") -+cpp_quote("#define DXVA2_DeinterlaceTech_FieldAdaptive 0x20") -+cpp_quote("#define DXVA2_DeinterlaceTech_PixelAdaptive 0x40") -+cpp_quote("#define DXVA2_DeinterlaceTech_MotionVectorSteered 0x80") -+cpp_quote("#define DXVA2_DeinterlaceTech_InverseTelecine 0x100") -+cpp_quote("#define DXVA2_DeinterlaceTech_Mask 0x1FF") -+ -+cpp_quote("/* VideoProcessor capabilities */") -+cpp_quote("#define DXVA2_VideoProcess_None 0x0") -+cpp_quote("#define DXVA2_VideoProcess_YUV2RGB 0x1") -+cpp_quote("#define DXVA2_VideoProcess_StretchX 0x2") -+cpp_quote("#define DXVA2_VideoProcess_StretchY 0x4") -+cpp_quote("#define DXVA2_VideoProcess_AlphaBlend 0x8") -+cpp_quote("#define DXVA2_VideoProcess_SubRects 0x10") -+cpp_quote("#define DXVA2_VideoProcess_SubStreams 0x20") -+cpp_quote("#define DXVA2_VideoProcess_SubStreamsExtended 0x40") -+cpp_quote("#define DXVA2_VideoProcess_YUV2RGBExtended 0x80") -+cpp_quote("#define DXVA2_VideoProcess_AlphaBlendExtended 0x100") -+cpp_quote("#define DXVA2_VideoProcess_Constriction 0x200") -+cpp_quote("#define DXVA2_VideoProcess_NoiseFilter 0x400") -+cpp_quote("#define DXVA2_VideoProcess_DetailFilter 0x800") -+cpp_quote("#define DXVA2_VideoProcess_PlanarAlpha 0x1000") -+cpp_quote("#define DXVA2_VideoProcess_LinearScaling 0x2000") -+cpp_quote("#define DXVA2_VideoProcess_GammaCompensated 0x4000") -+cpp_quote("#define DXVA2_VideoProcess_MaintainsOriginalFieldData 0x8000") -+cpp_quote("#define DXVA2_VideoProcess_Mask 0xFFFF") -+ -+cpp_quote("/* SampleData */") -+enum -+{ -+ DXVA2_SampleData_RFF = 1, -+ DXVA2_SampleData_TFF = 2, -+ DXVA2_SampleData_RFF_TFF_Present = 4, -+ DXVA2_SampleData_Mask = 0xFFFF -+}; -+ -+#ifdef _D3D9_H_ -+typedef struct _DXVA2_VideoSample { -+ REFERENCE_TIME Start; -+ REFERENCE_TIME End; -+ DXVA2_ExtendedFormat SampleFormat; -+ IDirect3DSurface9* SrcSurface; -+ RECT SrcRect; -+ RECT DstRect; -+ DXVA2_AYUVSample8 Pal[16]; -+ DXVA2_Fixed32 PlanarAlpha; -+ DWORD SampleData; -+} DXVA2_VideoSample; -+#endif -+ - cpp_quote("/* Constants */") - cpp_quote("") - cpp_quote("#define DXVA2_VideoDecoderRenderTarget 0") -@@ -385,13 +426,13 @@ cpp_quote("#define DXVA2_BitStreamDateBu - cpp_quote("#define DXVA2_MotionVectorBuffer 7") - cpp_quote("#define DXVA2_FilmGrainBuffer 8") - cpp_quote("") --cpp_quote("__forceinline const DXVA2_Fixed32 DXVA2_Fixed32OpaqueAlpha (void) {") -+cpp_quote("__forceinline DXVA2_Fixed32 DXVA2_Fixed32OpaqueAlpha (void) {") - cpp_quote(" DXVA2_Fixed32 f32;") - cpp_quote(" f32.ll = 0 + (1 << 16);") - cpp_quote(" return f32;") - cpp_quote("}") - cpp_quote("") --cpp_quote("__forceinline const DXVA2_Fixed32 DXVA2_Fixed32TransparentAlpha (void) {") -+cpp_quote("__forceinline DXVA2_Fixed32 DXVA2_Fixed32TransparentAlpha (void) {") - cpp_quote(" DXVA2_Fixed32 f32;") - cpp_quote(" f32.ll = 0;") - cpp_quote(" return f32;") -@@ -481,4 +522,84 @@ interface IDirectXVideoDecoderService : - [in] UINT NumRenderTargets, [out] IDirectXVideoDecoder **ppDecode); - } - -+[ -+ object, -+ uuid(8c3a39f0-916e-4690-804f-4c8001355d25), -+ local -+] -+interface IDirectXVideoProcessor : IUnknown -+{ -+ HRESULT GetVideoProcessorService([out] IDirectXVideoProcessorService** ppService); -+ -+ HRESULT GetCreationParameters( -+ [out] GUID* pDeviceGuid, -+ [out] DXVA2_VideoDesc* pVideoDesc, -+ [out] D3DFORMAT* pRenderTargetFormat, -+ [out] UINT* pMaxNumSubStreams); -+ HRESULT GetVideoProcessorCaps([out] DXVA2_VideoProcessorCaps* pCaps); -+ HRESULT GetProcAmpRange( -+ [in] UINT ProcAmpCap, -+ [out] DXVA2_ValueRange* pRange); -+ HRESULT GetFilterPropertyRange( -+ [in] UINT FilterSetting, -+ [out] DXVA2_ValueRange* pRange); -+ HRESULT VideoProcessBlt( -+ [in] IDirect3DSurface9* pRenderTarget, -+ [in] const DXVA2_VideoProcessBltParams* pBltParams, -+ [in] const DXVA2_VideoSample* pSamples, -+ [in] UINT NumSamples, -+ [out] HANDLE* pHandleComplete); -+}; -+ -+[ -+ object, -+ uuid(fc51a552-d5e7-11d9-af55-00054e43ff02), -+ local -+] -+interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService -+{ -+ HRESULT RegisterVideoProcessorSoftwareDevice([in] void* pCallbacks); -+ -+ HRESULT GetVideoProcessorDeviceGuids( -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [out] UINT* pCount, -+ [out] GUID** pGuids); -+ HRESULT GetVideoProcessorRenderTargets( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [out] UINT* pCount, -+ [out] D3DFORMAT** pFormats); -+ HRESULT GetVideoProcessorSubStreamFormats( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [out] UINT* pCount, -+ [out] D3DFORMAT** pFormats); -+ HRESULT GetVideoProcessorCaps( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [out] DXVA2_VideoProcessorCaps* pCaps); -+ HRESULT GetProcAmpRange( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [in] UINT ProcAmpCap, -+ [out] DXVA2_ValueRange* pRange); -+ HRESULT GetFilterPropertyRange( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [in] UINT FilterSetting, -+ [out] DXVA2_ValueRange* pRange); -+ HRESULT CreateVideoProcessor( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [in] UINT MaxNumSubStreams, -+ [out] IDirectXVideoProcessor** ppVidProcess); -+} -+ - cpp_quote("#endif /* _D3D9_H_ */") -+ -+cpp_quote("#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */") diff -Nru vlc-3.0.21/contrib/src/d3d9/rules.mak vlc-3.0.22/contrib/src/d3d9/rules.mak --- vlc-3.0.21/contrib/src/d3d9/rules.mak 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/d3d9/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,17 +1,10 @@ # generate Direct3D9 temporary include -ifdef HAVE_CROSS_COMPILE -IDL_INC_PATH = -I/usr/include/wine/windows/ -I/usr/include/wine/wine/windows/ -else -#ugly way to get the default location of standard idl files -IDL_INC_PATH = -I/`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include -endif - -D3D9CAPS_COMMIT_ID := 477108e5706e73421634436c21cb76e1795b3609 -DXVA2API_COMMIT_ID := 67bb96f54d720ca9e5aaa5da7d385348e0bfac31 +D3D9CAPS_COMMIT_ID := 49e9a673b36a1241747bf3ea95d040f127753f81 +DXVA2API_COMMIT_ID := 45def5d7a10885dfb87af3c7996f8de7197183b5 D3D9CAPS_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D9CAPS_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d9caps.h?format=raw D3D9_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D9CAPS_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d9.h?format=raw -DXVA2API_IDL_URL := https://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXVA2API_COMMIT_ID)/tree/mingw-w64-headers/include/dxva2api.idl?format=raw +DXVA2API_H_URL := https://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXVA2API_COMMIT_ID)/tree/mingw-w64-headers/include/dxva2api.h?format=raw DST_D3D9CAPS_H = $(PREFIX)/include/d3d9caps.h DST_D3D9_H = $(PREFIX)/include/d3d9.h DST_DXVA2API_H = $(PREFIX)/include/dxva2api.h @@ -21,35 +14,33 @@ ifndef HAVE_VISUALSTUDIO PKGS += d3d9 endif +ifeq ($(call mingw_at_least, 8), true) +PKGS_FOUND += d3d9 +endif # MINGW 8 endif $(TARBALLS)/d3d9caps.h: - $(call download_pkg,$(D3D9CAPS_H_URL),d3d9) + $(call download,$(D3D9CAPS_H_URL)) $(TARBALLS)/d3d9.h: - $(call download_pkg,$(D3D9_H_URL),d3d9) + $(call download,$(D3D9_H_URL)) -$(TARBALLS)/dxva2api.idl: - $(call download_pkg,$(DXVA2API_IDL_URL),d3d9) +$(TARBALLS)/dxva2api.h: + $(call download_pkg,$(DXVA2API_H_URL),d3d9) -.sum-d3d9: $(TARBALLS)/d3d9caps.h $(TARBALLS)/d3d9.h $(TARBALLS)/dxva2api.idl +.sum-d3d9: $(TARBALLS)/d3d9caps.h $(TARBALLS)/d3d9.h $(TARBALLS)/dxva2api.h $(DST_D3D9CAPS_H): $(TARBALLS)/d3d9caps.h .sum-d3d9 mkdir -p -- "$(PREFIX)/include/" - (cd $(TARBALLS) && patch -fp1 -o $@) < $(SRC)/d3d9/d3d9caps.patch + cp $(TARBALLS)/d3d9caps.h $@ $(DST_D3D9_H): $(TARBALLS)/d3d9.h .sum-d3d9 mkdir -p -- "$(PREFIX)/include/" (cd $(TARBALLS) && patch -fp1 -o $@) < $(SRC)/d3d9/d3d9.patch -dxva2api/dxva2api.idl: .sum-d3d9 - mkdir -p dxva2api - cp $(TARBALLS)/dxva2api.idl $@ - patch -fp1 < $(SRC)/d3d9/dxva2api.patch - -$(DST_DXVA2API_H): dxva2api/dxva2api.idl +$(DST_DXVA2API_H): .sum-d3d9 mkdir -p -- "$(PREFIX)/include/" - $(WIDL) -DBOOL=WINBOOL -D_D3D9_H_ -D__C89_NAMELESS $(IDL_INCLUDES) -h -o $@ $< + cp $(TARBALLS)/dxva2api.h $@ .d3d9caps: $(DST_D3D9CAPS_H) touch $@ diff -Nru vlc-3.0.21/contrib/src/daala/rules.mak vlc-3.0.22/contrib/src/daala/rules.mak --- vlc-3.0.21/contrib/src/daala/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/daala/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -16,11 +16,12 @@ daala: daala-$(DAALA_VERSION).tar.xz .sum-daala $(UNPACK) + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux $(call pkg_static,"daaladec.pc.in") $(call pkg_static,"daalaenc.pc.in") $(MOVE) -DAALACONF := $(HOSTCONF) \ +DAALACONF := \ --disable-tools \ --disable-unit-tests \ --disable-examples \ @@ -29,6 +30,6 @@ .daala: daala mkdir -p daala/m4 $(RECONF) - cd $< && $(HOSTVARS) ./configure $(DAALACONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(DAALACONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/dav1d/SHA512SUMS vlc-3.0.22/contrib/src/dav1d/SHA512SUMS --- vlc-3.0.21/contrib/src/dav1d/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/dav1d/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -36f8e632f64212db63e126b9ed2ca95c2db930d2388c551cde0b13b783ae872edeab1b5dd2274684bb03e98536d0334552ddcba209cff08c3568d97321034920 dav1d-1.4.2.tar.xz +3582dff4f797ebe2c137b28549a7214f11869ae308e3c78440849a3a501b12c326d3fa604126ccff4b648f37ab260c003c63385c70ba91e11f3442f20ad455db dav1d-1.5.1.tar.xz diff -Nru vlc-3.0.21/contrib/src/dav1d/rules.mak vlc-3.0.22/contrib/src/dav1d/rules.mak --- vlc-3.0.21/contrib/src/dav1d/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/dav1d/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ # libdav1d -DAV1D_VERSION := 1.4.2 +DAV1D_VERSION := 1.5.1 DAV1D_URL := $(VIDEOLAN)/dav1d/$(DAV1D_VERSION)/dav1d-$(DAV1D_VERSION).tar.xz PKGS += dav1d @@ -21,7 +21,7 @@ $(MOVE) .dav1d: dav1d crossfile.meson - cd $< && rm -rf ./build - cd $< && $(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF) build - cd $< && cd build && ninja install + $(MESONCLEAN) + $(MESON) $(DAV1D_CONF) + +$(MESONBUILD) touch $@ diff -Nru vlc-3.0.21/contrib/src/dca/rules.mak vlc-3.0.22/contrib/src/dca/rules.mak --- vlc-3.0.21/contrib/src/dca/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/dca/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -27,7 +27,7 @@ $(REQUIRE_GPL) $(RECONF) cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -std=gnu89" ./configure $(HOSTCONF) - cd $< && $(MAKE) -C include install - cd $< && $(MAKE) -C libdca install + $(MAKE) -C $< -C include install + $(MAKE) -C $< -C libdca install rm -f $(PREFIX)/lib/libdts.a touch $@ diff -Nru vlc-3.0.21/contrib/src/decklink/rules.mak vlc-3.0.22/contrib/src/decklink/rules.mak --- vlc-3.0.21/contrib/src/decklink/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/decklink/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -# decklink OSS version -DECKLINK_VERSION := 1977bf76bb5bde80d171373cf8d80dd01161679b -DECKLINK_GITURL := https://gitlab.com/robUx4/decklink-oss.git - -# enable build on supported platforms -ifdef HAVE_LINUX -PKGS += decklink -endif -ifdef HAVE_MACOSX -PKGS += decklink -endif -ifdef HAVE_WIN32 -PKGS += decklink -endif - -$(TARBALLS)/decklink-$(DECKLINK_VERSION).tar.xz: - $(call download_git,$(DECKLINK_GITURL),,$(DECKLINK_VERSION)) - -.sum-decklink: $(TARBALLS)/decklink-$(DECKLINK_VERSION).tar.xz - $(call check_githash,$(DECKLINK_VERSION)) - touch $@ - -decklink: decklink-$(DECKLINK_VERSION).tar.xz .sum-decklink - $(UNPACK) - $(MOVE) - -.decklink: decklink - mkdir -p -- "$(PREFIX)/include/" -ifdef HAVE_LINUX - cp -R $ +Date: Mon, 18 Nov 2024 13:19:27 +0700 +Subject: [PATCH 1/4] dvbpsi_packet_push: compute sizes using pointer to end of + packet + +--- + src/dvbpsi.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/dvbpsi.c b/src/dvbpsi.c +index cbb7511..a11d70a 100644 +--- a/src/dvbpsi.c ++++ b/src/dvbpsi.c +@@ -263,6 +263,7 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, uint8_t* p_data) + section is handled */ + int i_available; /* Byte count available in the + packet */ ++ const uint8_t *p_data_end = &p_data[188]; /* end of packet */ + + dvbpsi_decoder_t *p_decoder = p_dvbpsi->p_decoder; + assert(p_decoder); +@@ -355,7 +356,7 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, uint8_t* p_data) + } + + /* Remaining bytes in the payload */ +- i_available = 188 + p_data - p_payload_pos; ++ i_available = p_data_end - p_payload_pos; + + while (i_available > 0) + { +@@ -395,7 +396,7 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, uint8_t* p_data) + p_new_pos = NULL; + p_decoder->i_need = 3; + p_decoder->b_complete_header = false; +- i_available = 188 + p_data - p_payload_pos; ++ i_available = p_data_end - p_payload_pos; + } + else + { +@@ -480,7 +481,7 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, uint8_t* p_data) + p_new_pos = NULL; + p_decoder->i_need = 3; + p_decoder->b_complete_header = false; +- i_available = 188 + p_data - p_payload_pos; ++ i_available = p_data_end - p_payload_pos; + } + else + { +-- +2.48.1 + diff -Nru vlc-3.0.21/contrib/src/dvbpsi/0002-dvbpsi_packet_push-check-adaptation-field-length.patch vlc-3.0.22/contrib/src/dvbpsi/0002-dvbpsi_packet_push-check-adaptation-field-length.patch --- vlc-3.0.21/contrib/src/dvbpsi/0002-dvbpsi_packet_push-check-adaptation-field-length.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvbpsi/0002-dvbpsi_packet_push-check-adaptation-field-length.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,28 @@ +From f3f354fa18aaf9ebbe37b74d6fe91409a3dd8a75 Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Mon, 18 Nov 2024 13:20:15 +0700 +Subject: [PATCH 2/4] dvbpsi_packet_push: check adaptation field length + +--- + src/dvbpsi.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/dvbpsi.c b/src/dvbpsi.c +index a11d70a..0c8c440 100644 +--- a/src/dvbpsi.c ++++ b/src/dvbpsi.c +@@ -315,7 +315,11 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, uint8_t* p_data) + + /* Skip the adaptation_field if present */ + if (p_data[3] & 0x20) ++ { + p_payload_pos = p_data + 5 + p_data[4]; ++ if(p_payload_pos >= p_data_end) ++ return false; ++ } + else + p_payload_pos = p_data + 4; + +-- +2.48.1 + diff -Nru vlc-3.0.21/contrib/src/dvbpsi/0003-dvbpsi_packet_push-check-section-pointers-field.patch vlc-3.0.22/contrib/src/dvbpsi/0003-dvbpsi_packet_push-check-section-pointers-field.patch --- vlc-3.0.21/contrib/src/dvbpsi/0003-dvbpsi_packet_push-check-section-pointers-field.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvbpsi/0003-dvbpsi_packet_push-check-section-pointers-field.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,25 @@ +From 528be758326ac8c1caaf33bbd47615f2df00f21f Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Mon, 18 Nov 2024 13:20:34 +0700 +Subject: [PATCH 3/4] dvbpsi_packet_push: check section pointers field + +--- + src/dvbpsi.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/dvbpsi.c b/src/dvbpsi.c +index 0c8c440..6b5641a 100644 +--- a/src/dvbpsi.c ++++ b/src/dvbpsi.c +@@ -328,6 +328,8 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, uint8_t* p_data) + { + p_new_pos = p_payload_pos + *p_payload_pos + 1; + p_payload_pos += 1; ++ if(p_payload_pos >= p_data_end || p_new_pos >= p_data_end) ++ return false; + } + + p_section = p_decoder->p_current_section; +-- +2.48.1 + diff -Nru vlc-3.0.21/contrib/src/dvbpsi/0004-dvbpsi_packet_push-check-section-length.patch vlc-3.0.22/contrib/src/dvbpsi/0004-dvbpsi_packet_push-check-section-length.patch --- vlc-3.0.21/contrib/src/dvbpsi/0004-dvbpsi_packet_push-check-section-length.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvbpsi/0004-dvbpsi_packet_push-check-section-length.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,35 @@ +From 029b69147ea866b6ff5b938ef32cdfd8a8603303 Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Mon, 18 Nov 2024 17:35:52 +0700 +Subject: [PATCH 4/4] dvbpsi_packet_push: check section length + +--- + src/dvbpsi.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/dvbpsi.c b/src/dvbpsi.c +index 6b5641a..89444c5 100644 +--- a/src/dvbpsi.c ++++ b/src/dvbpsi.c +@@ -377,12 +377,14 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, uint8_t* p_data) + + if (!p_decoder->b_complete_header) + { +- /* Header is complete */ +- p_decoder->b_complete_header = true; + /* Compute p_section->i_length and update p_decoder->i_need */ +- p_decoder->i_need = p_section->i_length +- = ((uint16_t)(p_section->p_data[1] & 0xf)) << 8 ++ p_section->i_length = ((uint16_t)(p_section->p_data[1] & 0xf)) << 8 + | p_section->p_data[2]; ++ if(p_section->i_length > 4093) ++ return false; ++ p_decoder->i_need = p_section->i_length; ++ /* Header is complete */ ++ p_decoder->b_complete_header = true; + /* Check that the section isn't too long */ + if (p_decoder->i_need > p_decoder->i_section_max_size - 3) + { +-- +2.48.1 + diff -Nru vlc-3.0.21/contrib/src/dvbpsi/rules.mak vlc-3.0.22/contrib/src/dvbpsi/rules.mak --- vlc-3.0.21/contrib/src/dvbpsi/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvbpsi/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -20,9 +20,13 @@ $(APPLY) $(SRC)/dvbpsi/dvbpsi-sys-types.patch $(APPLY) $(SRC)/dvbpsi/0001-really-identify-duplicates.patch $(APPLY) $(SRC)/dvbpsi/0002-really-reset-packet-counter.patch + $(APPLY) $(SRC)/dvbpsi/0001-dvbpsi_packet_push-compute-sizes-using-pointer-to-en.patch + $(APPLY) $(SRC)/dvbpsi/0002-dvbpsi_packet_push-check-adaptation-field-length.patch + $(APPLY) $(SRC)/dvbpsi/0003-dvbpsi_packet_push-check-section-pointers-field.patch + $(APPLY) $(SRC)/dvbpsi/0004-dvbpsi_packet_push-check-section-length.patch $(MOVE) .dvbpsi: libdvbpsi cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/dvdcss/rules.mak vlc-3.0.22/contrib/src/dvdcss/rules.mak --- vlc-3.0.21/contrib/src/dvdcss/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvdcss/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -16,8 +16,11 @@ $(UNPACK) $(MOVE) +DVDCSS_CONF := --disable-doc + .dvdcss: dvdcss + $(REQUIRE_GPL) $(RECONF) - cd $< && $(HOSTVARS) ./configure --disable-doc $(HOSTCONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(DVDCSS_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch vlc-3.0.22/contrib/src/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch --- vlc-3.0.21/contrib/src/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,29 @@ +From e10f8570219748f67c7809cbdb57e8b790415083 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 22 May 2025 13:57:31 +0200 +Subject: [PATCH 1/2] Check the the title parts read are available + +The nr_of_ptts of the VTS and VMGI may differ. +We can't read past the number count of items in title[]. +--- + src/searching.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/searching.c b/src/searching.c +index 7c8e6e6..ba27306 100644 +--- a/src/searching.c ++++ b/src/searching.c +@@ -668,6 +668,10 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t + if(ptitle->vts_ttn == 0) + goto fail; + ptt = ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].ptt; ++ if (parts > ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].nr_of_ptts) { ++ printerr("Too many parts, using the ones available."); ++ parts = ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].nr_of_ptts; ++ } + + tmp = calloc(1, sizeof(uint64_t)*parts); + if(!tmp) +-- +2.45.1.windows.1 + diff -Nru vlc-3.0.21/contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch vlc-3.0.22/contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch --- vlc-3.0.21/contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,30 @@ +From ac7973075f808ffbf3bfeb601de940796485d6d1 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 18 Aug 2022 11:14:57 +0200 +Subject: [PATCH] configure: don't use ms style packing + +It is not used in libdvdread and we should use the same structure packing as +libdvdread. +--- + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 595378b..eb4cfa5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -99,11 +99,6 @@ AC_SUBST(THREAD_CFLAGS) + + PKG_CHECK_MODULES([DVDREAD], [dvdread >= ${DVDREAD_MIN_VERSION}]) + +-dnl --------------------------------------------- +-dnl Check for bitfield compiler flag +-dnl --------------------------------------------- +-CC_CHECK_CFLAG_APPEND([-mno-ms-bitfields]) +- + dnl check for -Wall -Wextra support + CC_CHECK_CFLAG_APPEND([-Wall -Wsign-compare -Wextra]) + +-- +2.27.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch vlc-3.0.22/contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch --- vlc-3.0.21/contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,30 @@ +From ff8676289c227d03293f63152d327b2a16775eea Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Fri, 24 Jan 2025 13:34:52 +0100 +Subject: [PATCH 1/2] play: avoid assert and exit and bogus PG link + +Just return LinkNoLink. +--- + src/vm/play.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/vm/play.c b/src/vm/play.c +index 8830883..e5d0e72 100644 +--- a/src/vm/play.c ++++ b/src/vm/play.c +@@ -177,7 +177,11 @@ link_t play_PG(vm_t *vm) { + Log3(vm, "play_PG: (vm->state).pgN (%i) > pgc->nr_of_programs (%i)", + (vm->state).pgN, (vm->state).pgc->nr_of_programs ); + #endif +- assert((vm->state).pgN == (vm->state).pgc->nr_of_programs + 1); ++ if((vm->state).pgN > (vm->state).pgc->nr_of_programs + 1) { ++ /* bogus link, ignore it */ ++ link_t link_values = { LinkNoLink, 0, 0, 0 }; ++ return link_values; ++ } + return play_PGC_post(vm); + } + +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch vlc-3.0.22/contrib/src/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch --- vlc-3.0.21/contrib/src/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,27 @@ +From 48ba3c481225dbe3b3a03ed621bed8df25bed941 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 22 May 2025 14:09:53 +0200 +Subject: [PATCH 2/2] Fix access to title not found in array + +--- + src/searching.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/searching.c b/src/searching.c +index ba27306..968deef 100644 +--- a/src/searching.c ++++ b/src/searching.c +@@ -667,6 +667,10 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t + parts = ptitle->nr_of_ptts; + if(ptitle->vts_ttn == 0) + goto fail; ++ if (ptitle->vts_ttn > ifo->vts_ptt_srpt->nr_of_srpts) { ++ printerr("Requested title not found."); ++ goto fail; ++ } + ptt = ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].ptt; + if (parts >= ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].nr_of_ptts) { + printerr("Too many parts, using the ones available."); +-- +2.45.1.windows.1 + diff -Nru vlc-3.0.21/contrib/src/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch vlc-3.0.22/contrib/src/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch --- vlc-3.0.21/contrib/src/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,30 @@ +From 43d76f9a0136fb244662e59876d87c7256df27c4 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Fri, 24 Jan 2025 13:39:11 +0100 +Subject: [PATCH 2/2] play: avoid assert and exit and bogus Cell link + +Just return LinkNoLink. +--- + src/vm/play.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/vm/play.c b/src/vm/play.c +index e5d0e72..a9d99fa 100644 +--- a/src/vm/play.c ++++ b/src/vm/play.c +@@ -203,7 +203,11 @@ link_t play_Cell(vm_t *vm) { + Log3(vm, "(vm->state).cellN (%i) > pgc->nr_of_cells (%i)", + (vm->state).cellN, (vm->state).pgc->nr_of_cells ); + #endif +- assert((vm->state).cellN == (vm->state).pgc->nr_of_cells + 1); ++ if((vm->state).cellN > (vm->state).pgc->nr_of_cells + 1) { ++ /* bogus link, ignore it */ ++ link_t link_values = { LinkNoLink, 0, 0, 0 }; ++ return link_values; ++ } + return play_PGC_post(vm); + } + +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/dvdnav/rules.mak vlc-3.0.22/contrib/src/dvdnav/rules.mak --- vlc-3.0.21/contrib/src/dvdnav/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvdnav/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -19,6 +19,13 @@ dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav $(UNPACK) + $(APPLY) $(SRC)/dvdnav/0001-configure-don-t-use-ms-style-packing.patch + # turn asserts/exit into silent discard + $(APPLY) $(SRC)/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch + $(APPLY) $(SRC)/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch + # fix some bogus accesses + $(APPLY) $(SRC)/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch + $(APPLY) $(SRC)/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch $(call pkg_static,"misc/dvdnav.pc.in") $(MOVE) @@ -28,5 +35,5 @@ $(REQUIRE_GPL) $(RECONF) -I m4 cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/dvdread/rules.mak vlc-3.0.22/contrib/src/dvdread/rules.mak --- vlc-3.0.21/contrib/src/dvdread/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/dvdread/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -26,9 +26,11 @@ DEPS_dvdread = dvdcss +DVDREAD_CONF := --with-libdvdcss + .dvdread: dvdread .dvdcss $(REQUIRE_GPL) $(RECONF) -I m4 - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-libdvdcss - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(DVDREAD_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/ebml/0001-EbmlMaster-fix-leak-when-reading-upper-level-element.patch vlc-3.0.22/contrib/src/ebml/0001-EbmlMaster-fix-leak-when-reading-upper-level-element.patch --- vlc-3.0.21/contrib/src/ebml/0001-EbmlMaster-fix-leak-when-reading-upper-level-element.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/ebml/0001-EbmlMaster-fix-leak-when-reading-upper-level-element.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,40 @@ +From 3660273b4a6b71f9678da744f86a2035fd98fcc2 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Fri, 25 Jul 2025 14:37:18 +0200 +Subject: [PATCH] EbmlMaster: fix leak when reading upper level elements + +When an element from an upper level is found we go up the caller chain, +passing the found element but it was not actually used (added to a list or freed). + +This patch allows setting that element as the ElementLevelA found in the loop. +We skip the call the inDataStream.FindNextElement() to find it. + +The new MaxSizeToRead is the size to read in the next inDataStream.FindNextElement() call. + +The old MaxSizeToRead <= 0 code seems bogus as it would exit the loop +to find elements for that EbmlMaster even though there might still be elements to read. +--- + src/EbmlMaster.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/EbmlMaster.cpp b/src/EbmlMaster.cpp +index 071eb5d..465560f 100644 +--- a/src/EbmlMaster.cpp ++++ b/src/EbmlMaster.cpp +@@ -455,9 +455,12 @@ void EbmlMaster::Read(EbmlStream & inDataStream, const EbmlSemanticContext & sCo + + if (UpperEltFound > 0) { + UpperEltFound--; +- if (UpperEltFound > 0 || MaxSizeToRead <= 0) ++ if (UpperEltFound > 0) + goto processCrc; + ElementLevelA = FoundElt; ++ if (IsFiniteSize() && ElementLevelA->IsFiniteSize()) { ++ MaxSizeToRead = GetEndPosition() - ElementLevelA->GetEndPosition(); // even if it's the default value ++ } + continue; + } + +-- +2.45.1.windows.1 + diff -Nru vlc-3.0.21/contrib/src/ebml/0001-EbmlString-ReadFully-use-automatic-memory-management.patch vlc-3.0.22/contrib/src/ebml/0001-EbmlString-ReadFully-use-automatic-memory-management.patch --- vlc-3.0.21/contrib/src/ebml/0001-EbmlString-ReadFully-use-automatic-memory-management.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/ebml/0001-EbmlString-ReadFully-use-automatic-memory-management.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,54 @@ +From bd77aaa19f0c658254f4e2a0c069a1bfcf0dbea2 Mon Sep 17 00:00:00 2001 +From: Moritz Bunkus +Date: Sat, 23 Dec 2023 09:33:04 +0100 +Subject: [PATCH 1/2] EbmlString::ReadFully: use automatic memory + management/fewer allocations + +(cherry picked from commit ae9bb2580c3e0a79496e72f79185256670abeb95) +--- + src/EbmlString.cpp | 26 +++++++++++--------------- + 1 file changed, 11 insertions(+), 15 deletions(-) + +diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp +index e1f4597..66b3338 100644 +--- a/src/EbmlString.cpp ++++ b/src/EbmlString.cpp +@@ -142,24 +142,20 @@ filepos_t EbmlString::ReadData(IOCallback & input, ScopeMode ReadFully) + return GetSize(); + + if (GetSize() == 0) { +- Value = ""; +- SetValueIsSet(); ++ Value.clear(); ++ + } else { +- auto Buffer = (GetSize() + 1 < std::numeric_limits::max()) ? new (std::nothrow) char[GetSize() + 1] : nullptr; +- if (Buffer == nullptr) { +- // unable to store the data, skip it +- input.setFilePointer(GetSize(), seek_current); +- } else { +- input.readFully(Buffer, GetSize()); +- if (Buffer[GetSize()-1] != '\0') { +- Buffer[GetSize()] = '\0'; +- } +- Value = Buffer; +- delete [] Buffer; +- SetValueIsSet(); +- } ++ Value.resize(GetSize()); ++ std::memset(&Value[0], 0, GetSize()); ++ input.readFully(&Value[0], GetSize()); ++ ++ auto PosNull = Value.find('\0'); ++ if (PosNull != std::string::npos) ++ Value.resize(PosNull); + } + ++ SetValueIsSet(); ++ + return GetSize(); + } + +-- +2.45.1.windows.1 + diff -Nru vlc-3.0.21/contrib/src/ebml/0002-EbmlUnicodeString-use-std-string-when-reading-instea.patch vlc-3.0.22/contrib/src/ebml/0002-EbmlUnicodeString-use-std-string-when-reading-instea.patch --- vlc-3.0.21/contrib/src/ebml/0002-EbmlUnicodeString-use-std-string-when-reading-instea.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/ebml/0002-EbmlUnicodeString-use-std-string-when-reading-instea.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,50 @@ +From 12c0cebbbda310420a935c021014bffc2b179102 Mon Sep 17 00:00:00 2001 +From: Moritz Bunkus +Date: Fri, 22 Dec 2023 17:50:15 +0100 +Subject: [PATCH 2/2] EbmlUnicodeString: use std::string when reading instead + of manual memory management + +(cherry picked from commit 6b83a0f6f6d1ae7fa14a4f96e70914c1a9686ed4) +--- + src/EbmlUnicodeString.cpp | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) + +diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp +index 56f74ce..570af17 100644 +--- a/src/EbmlUnicodeString.cpp ++++ b/src/EbmlUnicodeString.cpp +@@ -308,24 +308,16 @@ filepos_t EbmlUnicodeString::ReadData(IOCallback & input, ScopeMode ReadFully) + + if (GetSize() == 0) { + Value = static_cast(0); +- SetValueIsSet(); ++ + } else { +- auto Buffer = (GetSize() + 1 < std::numeric_limits::max()) ? new (std::nothrow) char[GetSize()+1] : nullptr; +- if (Buffer == nullptr) { +- // impossible to read, skip it +- input.setFilePointer(GetSize(), seek_current); +- } else { +- input.readFully(Buffer, GetSize()); +- if (Buffer[GetSize()-1] != 0) { +- Buffer[GetSize()] = 0; +- } +- +- Value.SetUTF8(Buffer); // implicit conversion to std::string +- delete [] Buffer; +- SetValueIsSet(); +- } ++ std::string Buffer(static_cast(GetSize()), static_cast(0)); ++ input.readFully(&Buffer[0], GetSize()); ++ ++ Value.SetUTF8(Buffer.c_str()); // Let conversion to std::string cut off at the first 0 + } + ++ SetValueIsSet(); ++ + return GetSize(); + } + +-- +2.45.1.windows.1 + diff -Nru vlc-3.0.21/contrib/src/ebml/rules.mak vlc-3.0.22/contrib/src/ebml/rules.mak --- vlc-3.0.21/contrib/src/ebml/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ebml/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -14,9 +14,14 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml $(UNPACK) + $(APPLY) $(SRC)/ebml/0001-EbmlString-ReadFully-use-automatic-memory-management.patch + $(APPLY) $(SRC)/ebml/0002-EbmlUnicodeString-use-std-string-when-reading-instea.patch + $(APPLY) $(SRC)/ebml/0001-EbmlMaster-fix-leak-when-reading-upper-level-element.patch $(MOVE) .ebml: ebml toolchain.cmake - cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_WIN32_IO=OFF - cd $< && $(CMAKEBUILD) . --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/faad2/rules.mak vlc-3.0.22/contrib/src/faad2/rules.mak --- vlc-3.0.21/contrib/src/faad2/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/faad2/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -18,6 +18,7 @@ faad2: faad2-$(FAAD2_VERSION_FIXED).tar.gz .sum-faad2 $(UNPACK) + $(UPDATE_AUTOCONFIG) ifndef HAVE_FPU $(APPLY) $(SRC)/faad2/faad2-fixed.patch endif @@ -27,10 +28,12 @@ cd $(UNPACK_DIR) && $(CC) -iquote . -E - +Date: Tue, 14 Sep 2021 21:31:53 +0200 +Subject: [PATCH] Replace all occurences of av_mallocz_array() by av_calloc() + +They do the same. + +Reviewed-by: Paul B Mahol +Signed-off-by: Andreas Rheinhardt +--- + compat/w32dlfcn.h | 2 +- + 131 files changed, 302 insertions(+), 301 deletions(-) + +diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h +index c83bdc9333..52a94efafb 100644 +--- a/compat/w32dlfcn.h ++++ b/compat/w32dlfcn.h +@@ -42,7 +42,7 @@ static inline HMODULE win32_dlopen(const char *name) + DWORD pathlen; + if (utf8towchar(name, &name_w)) + goto exit; +- path = (wchar_t *)av_mallocz_array(MAX_PATH, sizeof(wchar_t)); ++ path = (wchar_t *)av_calloc(MAX_PATH, sizeof(wchar_t)); + // Try local directory first + pathlen = GetModuleFileNameW(NULL, path, MAX_PATH); + pathlen = wcsrchr(path, '\\') - path; +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch vlc-3.0.22/contrib/src/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch --- vlc-3.0.21/contrib/src/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From 4bb53ad8e35f899f14e6d6144e60d8caa5c0651c Mon Sep 17 00:00:00 2001 -From: Mehdi Sabwat -Date: Mon, 6 Sep 2021 11:49:03 +0200 -Subject: [PATCH 1/1] ffmpeg: add target_os support for emscripten - ---- - configure | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure b/configure -index d7a3f50..57ca005 100755 ---- a/configure -+++ b/configure -@@ -5579,6 +5579,8 @@ case $target_os in - ;; - minix) - ;; -+ emscripten) -+ ;; - none) - ;; - *) --- -2.33.0 - diff -Nru vlc-3.0.21/contrib/src/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch vlc-3.0.22/contrib/src/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch --- vlc-3.0.21/contrib/src/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From b503a9056d2daf3763b49aab9ba5bebe80b70e16 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Mon, 31 May 2021 13:36:39 +0200 -Subject: [PATCH] fix mf_utils compilation with mingw64 - -In mingw64 and Windows Kits the MF_MT_VIDEO_ROTATION is defined if WINVER is at -least 0x0602. Normally WINVER would default to _WIN32_WINNT but here it's not -the case, so just force it manually. ---- - libavcodec/mf_utils.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libavcodec/mf_utils.c b/libavcodec/mf_utils.c -index eeabd0ce0b..9b82dacf41 100644 ---- a/libavcodec/mf_utils.c -+++ b/libavcodec/mf_utils.c -@@ -19,7 +19,9 @@ - #define COBJMACROS - #if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602 - #undef _WIN32_WINNT -+#undef WINVER - #define _WIN32_WINNT 0x0602 -+#define WINVER 0x0602 - #endif - - #include "mf_utils.h" --- -2.27.0.windows.1 - diff -Nru vlc-3.0.21/contrib/src/ffmpeg/0001-vulkan-Fix-win-i386-calling-convention.patch vlc-3.0.22/contrib/src/ffmpeg/0001-vulkan-Fix-win-i386-calling-convention.patch --- vlc-3.0.21/contrib/src/ffmpeg/0001-vulkan-Fix-win-i386-calling-convention.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/ffmpeg/0001-vulkan-Fix-win-i386-calling-convention.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From 2d5f9c9a5472ec826ab9e3f2d3e1ded11aeecd4b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Sun, 5 Mar 2023 23:36:53 +0200 -Subject: [PATCH 1/2] vulkan: Fix win/i386 calling convention -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes the following error when compiling with a modern -version of Clang for Windows/i386: - -src/libavutil/hwcontext_vulkan.c:738:32: error: incompatible function pointer types initializing 'PFN_vkDebugUtilsMessengerCallbackEXT' (aka 'unsigned int (*)(enum VkDebugUtilsMessageSeverityFlagBitsEXT, unsigned int, const struct VkDebugUtilsMessengerCallbackDataEXT *, void *) __attribute__((stdcall))') with an expression of type 'VkBool32 (VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT *, void *)' (aka 'unsigned int (enum VkDebugUtilsMessageSeverityFlagBitsEXT, unsigned int, const struct VkDebugUtilsMessengerCallbackDataEXT *, void *)') [-Wincompatible-function-pointer-types] - .pfnUserCallback = vk_dbg_callback, - ^~~~~~~~~~~~~~~ - -Signed-off-by: Martin Storsjö -(cherry picked from commit f9620d74cd49c35223304ba41e28be6144e45783) ---- - libavutil/hwcontext_vulkan.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c -index 2a9b5f4aac..5b86aa65e9 100644 ---- a/libavutil/hwcontext_vulkan.c -+++ b/libavutil/hwcontext_vulkan.c -@@ -401,10 +401,10 @@ static const char *vk_ret2str(VkResult res) - #undef CASE - } - --static VkBool32 vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity, -- VkDebugUtilsMessageTypeFlagsEXT messageType, -- const VkDebugUtilsMessengerCallbackDataEXT *data, -- void *priv) -+static VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity, -+ VkDebugUtilsMessageTypeFlagsEXT messageType, -+ const VkDebugUtilsMessengerCallbackDataEXT *data, -+ void *priv) - { - int l; - AVHWDeviceContext *ctx = priv; --- -2.34.1 - diff -Nru vlc-3.0.21/contrib/src/ffmpeg/0001-w32pthread-fix-signature-of-WinRT-version-of-thread-.patch vlc-3.0.22/contrib/src/ffmpeg/0001-w32pthread-fix-signature-of-WinRT-version-of-thread-.patch --- vlc-3.0.21/contrib/src/ffmpeg/0001-w32pthread-fix-signature-of-WinRT-version-of-thread-.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/ffmpeg/0001-w32pthread-fix-signature-of-WinRT-version-of-thread-.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From 090616d80ee58c334647877ab8e9f4d04f4fde1a Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Tue, 23 May 2023 12:24:46 +0200 -Subject: [PATCH] w32pthread: fix signature of WinRT version of thread worker - -The callback passed to CreateThread is not the same as with _beginthreadex(). - -This WinRT check could be removed if Win8 WinRT is not maintained -as _beginthreadex() is now available [1] - -[1] https://learn.microsoft.com/en-us/cpp/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps?view=msvc-160#windows-8x-store-apps-and-windows-phone-8x-apps ---- - compat/w32pthreads.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h -index 6405e72b64..364eebfe4e 100644 ---- a/compat/w32pthreads.h -+++ b/compat/w32pthreads.h -@@ -66,7 +66,11 @@ typedef CONDITION_VARIABLE pthread_cond_t; - #define PTHREAD_CANCEL_ENABLE 1 - #define PTHREAD_CANCEL_DISABLE 0 - -+#if HAVE_WINRT -+static av_unused DWORD WINAPI attribute_align_arg win32thread_worker(void *arg) -+#else - static av_unused unsigned __stdcall attribute_align_arg win32thread_worker(void *arg) -+#endif - { - pthread_t *h = (pthread_t*)arg; - h->ret = h->func(h->arg); --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/ffmpeg/0002-compat-w32dlfcn.h-Remove-MAX_PATH-limit-and-replace-.patch vlc-3.0.22/contrib/src/ffmpeg/0002-compat-w32dlfcn.h-Remove-MAX_PATH-limit-and-replace-.patch --- vlc-3.0.21/contrib/src/ffmpeg/0002-compat-w32dlfcn.h-Remove-MAX_PATH-limit-and-replace-.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/ffmpeg/0002-compat-w32dlfcn.h-Remove-MAX_PATH-limit-and-replace-.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,171 @@ +From dfa062ed3cae1d7ae3fdc52c7adda09cfc2e29b9 Mon Sep 17 00:00:00 2001 +From: Nil Admirari +Date: Mon, 20 Jun 2022 13:29:58 +0300 +Subject: [PATCH] compat/w32dlfcn.h: Remove MAX_PATH limit and replace + LoadLibraryExA with LoadLibraryExW +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Martin Storsjö +--- + compat/w32dlfcn.h | 100 ++++++++++++++++++++++++++++++++---------- + libavcodec/mf_utils.h | 1 + + 2 files changed, 79 insertions(+), 22 deletions(-) + +diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h +index 52a94efafb..fb1aa1b72e 100644 +--- a/compat/w32dlfcn.h ++++ b/compat/w32dlfcn.h +@@ -20,11 +20,40 @@ + #define COMPAT_W32DLFCN_H + + #ifdef _WIN32 ++#include ++ + #include ++ + #include "config.h" +-#if (_WIN32_WINNT < 0x0602) || HAVE_WINRT ++#include "libavutil/macros.h" + #include "libavutil/wchar_filename.h" +-#endif ++ ++static inline wchar_t *get_module_filename(HMODULE module) ++{ ++ wchar_t *path = NULL, *new_path; ++ DWORD path_size = 0, path_len; ++ ++ do { ++ path_size = path_size ? FFMIN(2 * path_size, INT16_MAX + 1) : MAX_PATH; ++ new_path = av_realloc_array(path, path_size, sizeof *path); ++ if (!new_path) { ++ av_free(path); ++ return NULL; ++ } ++ path = new_path; ++ // Returns path_size in case of insufficient buffer. ++ // Whether the error is set or not and whether the output ++ // is null-terminated or not depends on the version of Windows. ++ path_len = GetModuleFileNameW(module, path, path_size); ++ } while (path_len && path_size <= INT16_MAX && path_size <= path_len); ++ ++ if (!path_len) { ++ av_free(path); ++ return NULL; ++ } ++ return path; ++} ++ + /** + * Safe function used to open dynamic libs. This attempts to improve program security + * by removing the current directory from the dll search path. Only dll's found in the +@@ -34,29 +63,53 @@ + */ + static inline HMODULE win32_dlopen(const char *name) + { ++ wchar_t *name_w; ++ HMODULE module = NULL; ++ if (utf8towchar(name, &name_w)) ++ name_w = NULL; + #if _WIN32_WINNT < 0x0602 +- // Need to check if KB2533623 is available ++ // On Win7 and earlier we check if KB2533623 is available + if (!GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDefaultDllDirectories")) { +- HMODULE module = NULL; +- wchar_t *path = NULL, *name_w = NULL; +- DWORD pathlen; +- if (utf8towchar(name, &name_w)) ++ wchar_t *path = NULL, *new_path; ++ DWORD pathlen, pathsize, namelen; ++ if (!name_w) + goto exit; +- path = (wchar_t *)av_calloc(MAX_PATH, sizeof(wchar_t)); ++ namelen = wcslen(name_w); + // Try local directory first +- pathlen = GetModuleFileNameW(NULL, path, MAX_PATH); +- pathlen = wcsrchr(path, '\\') - path; +- if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) ++ path = get_module_filename(NULL); ++ if (!path) ++ goto exit; ++ new_path = wcsrchr(path, '\\'); ++ if (!new_path) + goto exit; +- path[pathlen] = '\\'; ++ pathlen = new_path - path; ++ pathsize = pathlen + namelen + 2; ++ new_path = av_realloc_array(path, pathsize, sizeof *path); ++ if (!new_path) ++ goto exit; ++ path = new_path; + wcscpy(path + pathlen + 1, name_w); + module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + if (module == NULL) { + // Next try System32 directory +- pathlen = GetSystemDirectoryW(path, MAX_PATH); +- if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) ++ pathlen = GetSystemDirectoryW(path, pathsize); ++ if (!pathlen) + goto exit; +- path[pathlen] = '\\'; ++ // Buffer is not enough in two cases: ++ // 1. system directory + \ + module name ++ // 2. system directory even without the module name. ++ if (pathlen + namelen + 2 > pathsize) { ++ pathsize = pathlen + namelen + 2; ++ new_path = av_realloc_array(path, pathsize, sizeof *path); ++ if (!new_path) ++ goto exit; ++ path = new_path; ++ // Query again to handle the case #2. ++ pathlen = GetSystemDirectoryW(path, pathsize); ++ if (!pathlen) ++ goto exit; ++ } ++ path[pathlen] = L'\\'; + wcscpy(path + pathlen + 1, name_w); + module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + } +@@ -73,16 +126,19 @@ exit: + # define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 + #endif + #if HAVE_WINRT +- wchar_t *name_w = NULL; +- int ret; +- if (utf8towchar(name, &name_w)) ++ if (!name_w) + return NULL; +- ret = LoadPackagedLibrary(name_w, 0); +- av_free(name_w); +- return ret; ++ module = LoadPackagedLibrary(name_w, 0); + #else +- return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); ++#define LOAD_FLAGS (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32) ++ /* filename may be be in CP_ACP */ ++ if (!name_w) ++ return LoadLibraryExA(name, NULL, LOAD_FLAGS); ++ module = LoadLibraryExW(name_w, NULL, LOAD_FLAGS); ++#undef LOAD_FLAGS + #endif ++ av_free(name_w); ++ return module; + } + #define dlopen(name, flags) win32_dlopen(name) + #define dlclose FreeLibrary +diff --git a/libavcodec/mf_utils.h b/libavcodec/mf_utils.h +index 3b12344f3e..aebfb9ad21 100644 +--- a/libavcodec/mf_utils.h ++++ b/libavcodec/mf_utils.h +@@ -29,6 +29,7 @@ + // mf*.h headers below indirectly include strmif.h.) + #include + #else ++#define NO_DSHOW_STRSAFE + #include + // Older versions of mingw-w64 need codecapi.h explicitly included, while newer + // ones include it implicitly from dshow.h (via uuids.h). +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/ffmpeg/0002-lavu-vulkan-fix-handle-type-for-32-bit-targets.patch vlc-3.0.22/contrib/src/ffmpeg/0002-lavu-vulkan-fix-handle-type-for-32-bit-targets.patch --- vlc-3.0.21/contrib/src/ffmpeg/0002-lavu-vulkan-fix-handle-type-for-32-bit-targets.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/ffmpeg/0002-lavu-vulkan-fix-handle-type-for-32-bit-targets.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -From 0ce6b348746c3c0fc5cb4f1494c50bcca9a28172 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= -Date: Thu, 2 Mar 2023 17:27:30 +0100 -Subject: [PATCH 2/2] lavu/vulkan: fix handle type for 32-bit targets -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes compilation with clang which errors out on Wint-conversion. - -Signed-off-by: Kacper Michajłow -Signed-off-by: Martin Storsjö -(cherry picked from commit cc76e8340d28438c1ac56ee7dfd774d25e944264) ---- - libavutil/hwcontext_vulkan.c | 2 +- - libavutil/vulkan.h | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c -index 5b86aa65e9..ffd4f5dec4 100644 ---- a/libavutil/hwcontext_vulkan.c -+++ b/libavutil/hwcontext_vulkan.c -@@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) - - av_freep(&cmd->queues); - av_freep(&cmd->bufs); -- cmd->pool = NULL; -+ cmd->pool = VK_NULL_HANDLE; - } - - static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) -diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h -index d1ea1e24fb..90922c6cf3 100644 ---- a/libavutil/vulkan.h -+++ b/libavutil/vulkan.h -@@ -122,7 +122,11 @@ typedef struct FFVulkanPipeline { - VkDescriptorSetLayout *desc_layout; - VkDescriptorPool desc_pool; - VkDescriptorSet *desc_set; -+#if VK_USE_64_BIT_PTR_DEFINES == 1 - void **desc_staging; -+#else -+ uint64_t *desc_staging; -+#endif - VkDescriptorSetLayoutBinding **desc_binding; - VkDescriptorUpdateTemplate *desc_template; - int *desc_set_initialized; --- -2.34.1 - diff -Nru vlc-3.0.21/contrib/src/ffmpeg/SHA512SUMS vlc-3.0.22/contrib/src/ffmpeg/SHA512SUMS --- vlc-3.0.21/contrib/src/ffmpeg/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ffmpeg/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf ffmpeg-4.4.4.tar.xz +70df4e63ef507a7ec76da34438142499139769728fd5130d9cf48d56c110ec82c3d6a7e6d1622da03c70167fa861d901d016bbe52c21d2b284b8a0d9f30811dc ffmpeg-4.4.5.tar.xz diff -Nru vlc-3.0.21/contrib/src/ffmpeg/rules.mak vlc-3.0.22/contrib/src/ffmpeg/rules.mak --- vlc-3.0.21/contrib/src/ffmpeg/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ffmpeg/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -7,7 +7,7 @@ ifndef USE_LIBAV FFMPEG_HASH=71fb6132637a2a430375c24afc381fff8b854fe7 FFMPEG_MAJVERSION := 4.4 -FFMPEG_REVISION := 4 +FFMPEG_REVISION := 5 FFMPEG_VERSION := $(FFMPEG_MAJVERSION).$(FFMPEG_REVISION) FFMPEG_BRANCH=release/$(FFMPEG_MAJVERSION) FFMPEG_URL := https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.xz @@ -78,6 +78,13 @@ FFMPEGCONF += --disable-encoders --disable-muxers endif +# Postproc +MAYBE_POSTPROC = +ifdef GPL +FFMPEGCONF += --enable-gpl --enable-postproc +MAYBE_POSTPROC = libpostproc +endif + # Small size ifdef WITH_OPTIMIZATION ifdef ENABLE_SMALL @@ -220,7 +227,7 @@ # Build PKGS += ffmpeg -ifeq ($(call need_pkg,"libavcodec >= $(FFMPEG_LAVC_MIN) libavformat >= 53.21.0 libswscale"),) +ifeq ($(call need_pkg,"libavcodec >= $(FFMPEG_LAVC_MIN) libavformat >= 53.21.0 libswscale $(MAYBE_POSTPROC)"),) PKGS_FOUND += ffmpeg endif @@ -239,9 +246,7 @@ .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) + $(UNPACK) ifdef USE_FFMPEG $(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch $(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch @@ -255,6 +260,8 @@ $(APPLY) $(SRC)/ffmpeg/0001-bring-back-XP-support.patch $(APPLY) $(SRC)/ffmpeg/0001-avcodec-vp9-Do-not-destroy-uninitialized-mutexes-con.patch $(APPLY) $(SRC)/ffmpeg/0001-dxva2_hevc-don-t-use-frames-as-reference-if-they-are.patch + $(APPLY) $(SRC)/ffmpeg/0001-Replace-all-occurences-of-av_mallocz_array-by-av_cal.patch + $(APPLY) $(SRC)/ffmpeg/0002-compat-w32dlfcn.h-Remove-MAX_PATH-limit-and-replace-.patch endif ifdef USE_LIBAV $(APPLY) $(SRC)/ffmpeg/libav_gsm.patch @@ -265,5 +272,5 @@ cd $< && $(HOSTVARS) ./configure \ --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) \ --prefix="$(PREFIX)" --enable-static --disable-shared - cd $< && $(MAKE) install-libs install-headers + $(MAKE) -C $< install-libs install-headers touch $@ diff -Nru vlc-3.0.21/contrib/src/flac/0001-Fixed-compilation-of-get_utf8_argv-for-Windows-UWP.patch vlc-3.0.22/contrib/src/flac/0001-Fixed-compilation-of-get_utf8_argv-for-Windows-UWP.patch --- vlc-3.0.21/contrib/src/flac/0001-Fixed-compilation-of-get_utf8_argv-for-Windows-UWP.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/flac/0001-Fixed-compilation-of-get_utf8_argv-for-Windows-UWP.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ -From fd842b6a3bacac9e47504ca4d4fb611fab014fa2 Mon Sep 17 00:00:00 2001 -From: DK -Date: Tue, 9 May 2023 15:37:57 +0300 -Subject: [PATCH] Fixed compilation of get_utf8_argv() for Windows UWP - -Fixed compilation in Win32 environment. -Use FLAC_WINDOWS_APP define to check between UWP app and Win32 for more consistency. ---- - src/share/win_utf8_io/win_utf8_io.c | 41 ++++++++++++++++++++--------- - 1 file changed, 28 insertions(+), 13 deletions(-) - -diff --git a/src/share/win_utf8_io/win_utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c -index 65b56997..18921748 100644 ---- a/src/share/win_utf8_io/win_utf8_io.c -+++ b/src/share/win_utf8_io/win_utf8_io.c -@@ -39,9 +39,12 @@ - - #define UTF8_BUFFER_SIZE 32768 - --#if !defined(WINAPI_FAMILY_PARTITION) --#define WINAPI_FAMILY_PARTITION(x) x --#define WINAPI_PARTITION_DESKTOP 1 -+/* detect whether it is Windows APP (UWP) or standard Win32 envionment */ -+#if defined(WINAPI_FAMILY_PARTITION) &&\ -+ WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+ #define FLAC_WINDOWS_APP 1 -+#else -+ #define FLAC_WINDOWS_APP 0 - #endif - - static int local_vsnprintf(char *str, size_t size, const char *fmt, va_list va) -@@ -106,15 +109,22 @@ static wchar_t *wchar_from_utf8(const char *str) - /* retrieve WCHAR commandline, expand wildcards and convert everything to UTF-8 */ - int get_utf8_argv(int *argc, char ***argv) - { -+#if !FLAC_WINDOWS_APP - typedef int (__cdecl *wgetmainargs_t)(int*, wchar_t***, wchar_t***, int, int*); - wgetmainargs_t wgetmainargs; - HMODULE handle; -+#endif // !FLAC_WINDOWS_APP - int wargc; - wchar_t **wargv; - wchar_t **wenv; - char **utf8argv; - int ret, i; - -+#if FLAC_WINDOWS_APP -+ wargc = __argc; -+ wargv = __wargv; -+ wenv = _wenviron; -+#else // !FLAC_WINDOWS_APP - if ((handle = LoadLibraryW(L"msvcrt.dll")) == NULL) return 1; - if ((wgetmainargs = (wgetmainargs_t)GetProcAddress(handle, "__wgetmainargs")) == NULL) { - FreeLibrary(handle); -@@ -126,8 +136,11 @@ int get_utf8_argv(int *argc, char ***argv) - FreeLibrary(handle); - return 1; - } -+#endif // !FLAC_WINDOWS_APP - if ((utf8argv = (char **)calloc(wargc, sizeof(char*))) == NULL) { -+ #if !FLAC_WINDOWS_APP - FreeLibrary(handle); -+ #endif // !FLAC_WINDOWS_APP - return 1; - } - -@@ -139,7 +152,9 @@ int get_utf8_argv(int *argc, char ***argv) - } - } - -+#if !FLAC_WINDOWS_APP - FreeLibrary(handle); /* do not free it when wargv or wenv are still in use */ -+#endif // !FLAC_WINDOWS_APP - - if (ret == 0) { - *argc = wargc; -@@ -160,9 +175,9 @@ HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWO - HANDLE handle = INVALID_HANDLE_VALUE; - - if ((wname = wchar_from_utf8(lpFileName)) != NULL) { --#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+#if !FLAC_WINDOWS_APP - handle = CreateFileW(wname, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); --#else // !WINAPI_PARTITION_DESKTOP -+#else // FLAC_WINDOWS_APP - CREATEFILE2_EXTENDED_PARAMETERS params; - params.dwSize = sizeof(params); - params.dwFileAttributes = dwFlagsAndAttributes & 0xFFFF; -@@ -171,7 +186,7 @@ HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWO - params.lpSecurityAttributes = lpSecurityAttributes; - params.hTemplateFile = hTemplateFile; - handle = CreateFile2(wname, dwDesiredAccess, dwShareMode, dwCreationDisposition, ¶ms); --#endif // !WINAPI_PARTITION_DESKTOP -+#endif // FLAC_WINDOWS_APP - free(wname); - } - -@@ -193,19 +208,19 @@ size_t strlen_utf8(const char *str) - int win_get_console_width(void) - { - int width = 80; --#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+#if !FLAC_WINDOWS_APP - CONSOLE_SCREEN_BUFFER_INFO csbi; - HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE); - if(hOut != INVALID_HANDLE_VALUE && hOut != NULL) - if (GetConsoleScreenBufferInfo(hOut, &csbi) != 0) - width = csbi.dwSize.X; --#endif // WINAPI_PARTITION_DESKTOP -+#endif // !FLAC_WINDOWS_APP - return width; - } - - /* print functions */ - --#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+#if !FLAC_WINDOWS_APP - static int wprint_console(FILE *stream, const wchar_t *text, size_t len) - { - DWORD out; -@@ -235,7 +250,7 @@ static int wprint_console(FILE *stream, const wchar_t *text, size_t len) - return ret; - return len; - } --#endif // WINAPI_PARTITION_DESKTOP -+#endif // !FLAC_WINDOWS_APP - - int printf_utf8(const char *format, ...) - { -@@ -276,12 +291,12 @@ int vfprintf_utf8(FILE *stream, const char *format, va_list argptr) - ret = -1; - break; - } --#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+#if !FLAC_WINDOWS_APP - ret = wprint_console(stream, wout, wcslen(wout)); --#else // !WINAPI_PARTITION_DESKTOP -+#else // FLAC_WINDOWS_APP - OutputDebugStringW(wout); - ret = 0; --#endif // !WINAPI_PARTITION_DESKTOP -+#endif // FLAC_WINDOWS_APP - } while(0); - - free(utmp); --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/flac/rules.mak vlc-3.0.22/contrib/src/flac/rules.mak --- vlc-3.0.21/contrib/src/flac/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/flac/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -35,7 +35,8 @@ $(UPDATE_AUTOCONFIG) $(MOVE) -FLACCONF := $(HOSTCONF) \ +FLACCONF := \ + --disable-examples \ --disable-thorough-tests \ --disable-doxygen-docs \ --disable-xmms-plugin \ @@ -58,7 +59,8 @@ .flac: flac cd $< && $(AUTORECONF) - cd $< && $(HOSTVARS) CFLAGS="$(FLAC_CFLAGS)" ./configure $(FLACCONF) - cd $< && $(MAKE) -C include install - cd $< && $(MAKE) -C src/libFLAC install && $(MAKE) -C src/share install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(FLAC_CFLAGS)" $(FLACCONF) + $(MAKE) -C $< -C include install + $(MAKE) -C $< -C src/libFLAC install + $(MAKE) -C $< -C src/share install touch $@ diff -Nru vlc-3.0.21/contrib/src/fluid/rules.mak vlc-3.0.22/contrib/src/fluid/rules.mak --- vlc-3.0.21/contrib/src/fluid/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/fluid/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -42,6 +42,8 @@ -Denable-readline=0 .fluid: fluidsynth toolchain.cmake - cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" $(CMAKE) $(FLUIDCONF) - cd $< && $(CMAKEBUILD) . --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(FLUIDCONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/fluidlite/rules.mak vlc-3.0.22/contrib/src/fluidlite/rules.mak --- vlc-3.0.21/contrib/src/fluidlite/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/fluidlite/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -27,7 +27,8 @@ FLUIDLITE_CONF := -DFLUIDLITE_BUILD_SHARED=OFF .fluidlite: fluidlite toolchain.cmake - cd $< && rm -f CMakeCache.txt - cd $< && $(HOSTVARS) $(CMAKE) $(FLUIDLITE_CONF) - cd $< && $(CMAKEBUILD) . --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(FLUIDLITE_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/fontconfig/rules.mak vlc-3.0.22/contrib/src/fontconfig/rules.mak --- vlc-3.0.21/contrib/src/fontconfig/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/fontconfig/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -15,6 +15,7 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig $(UNPACK) + $(UPDATE_AUTOCONFIG) ifdef HAVE_WIN32 $(APPLY) $(SRC)/fontconfig/fontconfig-win32.patch $(APPLY) $(SRC)/fontconfig/fontconfig-noxml2.patch @@ -23,9 +24,7 @@ $(call pkg_static, "fontconfig.pc.in") $(MOVE) -FONTCONFIG_CONF := $(HOSTCONF) \ - --enable-libxml2 \ - --disable-docs +FONTCONFIG_CONF := --enable-libxml2 --disable-docs FONTCONFIG_ENV := $(HOSTVARS) # FreeType flags @@ -54,13 +53,13 @@ ifdef HAVE_WIN32 $(RECONF) endif - cd $< && $(FONTCONFIG_ENV) ./configure $(FONTCONFIG_CONF) - cd $< && $(MAKE) + cd $< && $(FONTCONFIG_ENV) ./configure $(HOSTCONF) $(FONTCONFIG_CONF) + $(MAKE) -C $< ifndef HAVE_MACOSX - cd $< && $(MAKE) install + $(MAKE) -C $< install else - cd $< && $(MAKE) install-exec - cd $< && $(MAKE) -C fontconfig install-data + $(MAKE) -C $< install-exec + $(MAKE) -C $< -C fontconfig install-data sed -e 's%/usr/lib/libiconv.la%%' -i.orig $(PREFIX)/lib/libfontconfig.la cp $ -Date: Mon, 14 Jan 2019 09:52:49 +0100 -Subject: [PATCH 1/4] make /Vn argument as optional and provide default - variable name - ---- - fxc2.cpp | 40 +++++++++++++++++++++++++++++++++++++--- - 1 file changed, 37 insertions(+), 3 deletions(-) - -diff --git a/fxc2.cpp b/fxc2.cpp -index 990e669..066608c 100755 ---- a/fxc2.cpp -+++ b/fxc2.cpp -@@ -18,6 +18,29 @@ typedef HRESULT(__stdcall *pCompileFromFileg)(LPCWSTR, - ID3DBlob**, - ID3DBlob**); - -+struct ProfilePrefix { -+ const char* name; -+ const char* prefix; -+}; -+ -+static const ProfilePrefix g_profilePrefixTable[] = { -+ { "ps_2_0", "g_ps20"}, -+ { "ps_2_a", "g_ps21"}, -+ { "ps_2_b", "g_ps21"}, -+ { "ps_2_sw", "g_ps2ff"}, -+ { "ps_3_0", "g_ps30"}, -+ { "ps_3_sw", "g_ps3ff"}, -+ -+ { "vs_1_1", "g_vs11"}, -+ { "vs_2_0", "g_vs20"}, -+ { "vs_2_a", "g_vs21"}, -+ { "vs_2_sw", "g_vs2ff"}, -+ { "vs_3_0", "g_vs30"}, -+ { "vs_3_sw", "g_vs3ff"}, -+ -+ { NULL, NULL} -+}; -+ - void print_usage_arg() { - // https://msdn.microsoft.com/en-us/library/windows/desktop/bb509709(v=vs.85).aspx - printf("You have specified an argument that is not handled by fxc2\n"); -@@ -167,11 +190,22 @@ int main(int argc, char* argv[]) - print_usage_missing("entryPoint"); - if(defines == NULL) - print_usage_missing("defines"); -- if(variableName == NULL) -- print_usage_missing("variableName"); - if(outputFile == NULL) - print_usage_missing("outputFile"); - -+ //Default output variable name -+ if (variableName == NULL) { -+ const char* prefix = "g"; -+ for (int i = 0; g_profilePrefixTable[i].name != NULL; i++) { -+ if (strcmp(g_profilePrefixTable[i].name, model) == 0) { -+ prefix = g_profilePrefixTable[i].prefix; -+ break; -+ } -+ } -+ variableName = (char*)malloc(strlen(prefix) + strlen(entryPoint) + 2); -+ sprintf(variableName, "%s_%s", prefix, entryPoint); -+ } -+ - // ==================================================================================== - // Shader Compilation - -@@ -280,7 +314,7 @@ int main(int argc, char* argv[]) - FILE* f; - errno_t err = fopen_s(&f, outputFile, "w"); - -- fprintf(f, "const signed char %s[] =\n{\n", entryPoint); -+ fprintf(f, "const signed char %s[] =\n{\n", variableName); - for (i = 0; i < len; i++) { - fprintf(f, "%4i", outString[i]); - if (i != len - 1) --- -2.19.1 - diff -Nru vlc-3.0.21/contrib/src/fxc2/0002-accept-windows-style-flags-and-splitted-argument-val.patch vlc-3.0.22/contrib/src/fxc2/0002-accept-windows-style-flags-and-splitted-argument-val.patch --- vlc-3.0.21/contrib/src/fxc2/0002-accept-windows-style-flags-and-splitted-argument-val.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/fxc2/0002-accept-windows-style-flags-and-splitted-argument-val.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,261 +0,0 @@ -From 7c502bc09182958fa7268bfa792a338891c3df7b Mon Sep 17 00:00:00 2001 -From: Pierre Lamot -Date: Mon, 14 Jan 2019 15:09:36 +0100 -Subject: [PATCH 2/4] accept windows style flags and splitted argument value - - - accept windows style flags: /opt or -opt - - accept split arguments : -FhFilename.h or -Fh Filename ---- - fxc2.cpp | 194 +++++++++++++++++++++++++++---------------------------- - 1 file changed, 95 insertions(+), 99 deletions(-) - -diff --git a/fxc2.cpp b/fxc2.cpp -index 066608c..01a8d07 100755 ---- a/fxc2.cpp -+++ b/fxc2.cpp -@@ -2,7 +2,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -@@ -59,7 +58,41 @@ void print_usage_toomany() { - exit(1); - } - --int main(int argc, char* argv[]) -+bool parseOpt( const char* option, int argc, const char** argv, int* index, char** argumentOption ) -+{ -+ assert(option != NULL); -+ if (!index || *index >= argc) { -+ return false; -+ } -+ const char* argument = argv[*index]; -+ if (argument[0] == '-' || argument[0] == '/') -+ argument++; -+ else -+ return false; -+ -+ size_t optionSize = strlen(option); -+ if (strncmp(argument, option, optionSize) != 0) { -+ return false; -+ } -+ -+ if (argumentOption) { -+ argument += optionSize; -+ if (*argument == '\0') { -+ *index += 1; -+ if (*index >= argc) { -+ printf("Error: missing required argument for option %s\n", option); -+ return false; -+ } -+ *argumentOption = strdup(argv[*index]); -+ } else { -+ *argumentOption = strdup(argument); -+ } -+ } -+ *index += 1; -+ return true; -+} -+ -+int main(int argc, const char* argv[]) - { - // ==================================================================================== - // Process Command Line Arguments -@@ -71,114 +104,77 @@ int main(int argc, char* argv[]) - char* entryPoint = NULL; - char* variableName = NULL; - char* outputFile = NULL; -+ char* defineOption = NULL; - int numDefines = 1; - D3D_SHADER_MACRO* defines = new D3D_SHADER_MACRO[numDefines]; - defines[numDefines-1].Name = NULL; - defines[numDefines-1].Definition = NULL; - -- int i, c; -- static struct option longOptions[] = -- { -- /* These options set a flag. */ -- {"nologo", no_argument, &verbose, 0}, -- {0, 0, 0, 0} -- }; -- -+ int index = 1; - while (1) { - D3D_SHADER_MACRO* newDefines; - -- int optionIndex = 0; -- c = getopt_long_only (argc, argv, "T:E:D:V:F:", -- longOptions, &optionIndex); -- - /* Detect the end of the options. */ -- if (c == -1) -+ if (index >= argc) - break; - -- switch (c) -- { -- case 0: -- //printf ("option -nologo (quiet)\n"); -- //Technically, this is any flag we define in longOptions -- break; -- case 'T': -- model = strdup(optarg); -- if(verbose) { -- printf ("option -T (Shader Model/Profile) with arg %s\n", optarg); -- } -- break; -- case 'E': -- entryPoint = strdup(optarg); -- if(verbose) { -- printf ("option -E (Entry Point) with arg %s\n", optarg); -- } -- break; -- case 'D': -- numDefines++; -- //Copy the old array into the new array, but put the new definition at the beginning -- newDefines = new D3D_SHADER_MACRO[numDefines]; -- for(i=1; i -Date: Mon, 14 Jan 2019 15:37:02 +0100 -Subject: [PATCH 4/4] Revert "Fix: narrowing conversion from 'int' to 'BYTE'" - -This reverts commit 82527b81104e5e21390d3ddcd328700c67ce73d4. ---- - fxc2.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/fxc2.cpp b/fxc2.cpp -index 01a8d07..ac17328 100755 ---- a/fxc2.cpp -+++ b/fxc2.cpp -@@ -310,7 +310,7 @@ int main(int argc, const char* argv[]) - FILE* f; - errno_t err = fopen_s(&f, outputFile, "w"); - -- fprintf(f, "const signed char %s[] =\n{\n", variableName); -+ fprintf(f, "const BYTE %s[] =\n{\n", variableName); - for (int i = 0; i < len; i++) { - fprintf(f, "%4i", outString[i]); - if (i != len - 1) -@@ -319,7 +319,7 @@ int main(int argc, const char* argv[]) - fprintf(f, "\n"); - } - -- fprintf(f, "\n};\n"); -+ fprintf(f, "\n};"); - fclose(f); - - if(verbose) { --- -2.19.1 - diff -Nru vlc-3.0.21/contrib/src/fxc2/rules.mak vlc-3.0.22/contrib/src/fxc2/rules.mak --- vlc-3.0.21/contrib/src/fxc2/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/fxc2/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -FXC2_HASH := 654c29d62a02714ea0bacfb118c3e05127f846e0 -FXC2_VERSION := git-$(FXC2_HASH) -FXC2_GITURL := $(GITHUB)/mozilla/fxc2.git - -ifeq ($(call need_pkg,"fxc2"),) -PKGS_FOUND += fxc2 -endif - -$(TARBALLS)/fxc2-$(FXC2_VERSION).tar.xz: - $(call download_git,$(FXC2_GITURL),,$(FXC2_HASH)) - -.sum-fxc2: fxc2-$(FXC2_VERSION).tar.xz - $(call check_githash,$(FXC2_HASH)) - touch $@ - -fxc2: fxc2-$(FXC2_VERSION).tar.xz .sum-fxc2 - $(UNPACK) - $(APPLY) $(SRC)/fxc2/0001-make-Vn-argument-as-optional-and-provide-default-var.patch - $(APPLY) $(SRC)/fxc2/0002-accept-windows-style-flags-and-splitted-argument-val.patch - $(APPLY) $(SRC)/fxc2/0004-Revert-Fix-narrowing-conversion-from-int-to-BYTE.patch - $(MOVE) - -ifeq ($(shell uname -m),aarch64) -FXC2_CXX=aarch64-w64-mingw32-g++ -FXC2_DLL=dll/d3dcompiler_47_arm64.dll -else ifeq ($(ARCH),x86_64) -FXC2_CXX=$(CXX:uwp-g++=-g++) -FXC2_DLL=dll/d3dcompiler_47.dll -else ifeq ($(ARCH),i386) -FXC2_CXX=$(CXX:uwp-g++=-g++) -FXC2_DLL=dll/d3dcompiler_47_32.dll -else ifeq ($(shell command -v x86_64-w64-mingw32-g++ >/dev/null 2>&1 || echo FAIL),) -FXC2_CXX=x86_64-w64-mingw32-g++ -FXC2_DLL=dll/d3dcompiler_47.dll -else ifeq ($(shell command -v i686-w64-mingw32-g++ >/dev/null 2>&1 || echo FAIL),) -FXC2_CXX=i686-w64-mingw32-g++ -FXC2_DLL=dll/d3dcompiler_47_32.dll -else -FXC2_CXX=$(error No x86 (cross) compiler found for fxc2) -endif - - -.fxc2: fxc2 - cd $< && $(FXC2_CXX) -static fxc2.cpp -o fxc2.exe - cd $< && mkdir -p $(PREFIX)/bin && cp fxc2.exe $(PREFIX)/bin && cp $(FXC2_DLL) $(PREFIX)/bin/d3dcompiler_47.dll - touch $@ diff -Nru vlc-3.0.21/contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch vlc-3.0.22/contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch --- vlc-3.0.21/contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From ed41d6d6fb4551342b22ef763de1bd60e964e186 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Thu, 22 Mar 2018 23:32:36 +0200 -Subject: [PATCH 1/2] random: Don't assume that _WIN64 implies x86_64 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* random/rndw32.c: Change _WIN64 ifdef into __x86_64__. --- - -This fixes building this file for windows on aarch64. - -Signed-off-by: Martin Storsjö ---- - random/rndw32.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/random/rndw32.c b/random/rndw32.c -index 7e9ac50..08a8867 100644 ---- a/random/rndw32.c -+++ b/random/rndw32.c -@@ -986,7 +986,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, - - On AMD64, TSC is always available and intrinsic is provided for accessing - it. */ --#ifdef __WIN64__ -+#ifdef __x86_64__ - { - unsigned __int64 aint64; - -@@ -1024,7 +1024,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, - (*add) (&aword, sizeof (aword), origin ); - } - } --#endif /*__WIN64__*/ -+#endif /*__x86_64__*/ - - - } --- -2.7.4 - diff -Nru vlc-3.0.21/contrib/src/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch vlc-3.0.22/contrib/src/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch --- vlc-3.0.21/contrib/src/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,207 +0,0 @@ -From ec0a2f25c0f64a7b65b373508ce9081e10461965 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Thu, 22 Mar 2018 23:32:37 +0200 -Subject: [PATCH 2/2] aarch64: mpi: Fix building the mpi aarch64 assembly for - windows -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* mpi/aarch64/mpih-add1.S: Use ELF macro. -* mpi/aarch64/mpih-mul1.S: Use ELF macro. -* mpi/aarch64/mpih-mul2.S: Use ELF macro. -* mpi/aarch64/mpih-mul3.S: Use ELF macro. -* mpi/aarch64/mpih-sub1.S: Use ELF macro. -* mpi/asm-common-aarch64.h: New. --- - -The mpi aarch64 assembly is enabled as soon as the compiler supports -inline assembly, without checking for .type and .size, as is done -for the rest of the assembly in cipher/*.S. (The .type and .size -directives are only supported on ELF.) - -Signed-off-by: Martin Storsjö ---- - mpi/aarch64/mpih-add1.S | 5 +++-- - mpi/aarch64/mpih-mul1.S | 5 +++-- - mpi/aarch64/mpih-mul2.S | 5 +++-- - mpi/aarch64/mpih-mul3.S | 5 +++-- - mpi/aarch64/mpih-sub1.S | 5 +++-- - mpi/asm-common-aarch64.h | 30 ++++++++++++++++++++++++++++++ - 6 files changed, 45 insertions(+), 10 deletions(-) - create mode 100644 mpi/asm-common-aarch64.h - -diff --git a/mpi/aarch64/mpih-add1.S b/mpi/aarch64/mpih-add1.S -index fa8cd01..4ead1c2 100644 ---- a/mpi/aarch64/mpih-add1.S -+++ b/mpi/aarch64/mpih-add1.S -@@ -22,6 +22,7 @@ - - #include "sysdep.h" - #include "asm-syntax.h" -+#include "asm-common-aarch64.h" - - /******************* - * mpi_limb_t -@@ -34,7 +35,7 @@ - .text - - .globl _gcry_mpih_add_n --.type _gcry_mpih_add_n,%function -+ELF(.type _gcry_mpih_add_n,%function) - _gcry_mpih_add_n: - and x5, x3, #3; - adds xzr, xzr, xzr; /* clear carry flag */ -@@ -68,4 +69,4 @@ _gcry_mpih_add_n: - .Lend: - adc x0, xzr, xzr; - ret; --.size _gcry_mpih_add_n,.-_gcry_mpih_add_n; -+ELF(.size _gcry_mpih_add_n,.-_gcry_mpih_add_n;) -diff --git a/mpi/aarch64/mpih-mul1.S b/mpi/aarch64/mpih-mul1.S -index 65e98fe..8a86269 100644 ---- a/mpi/aarch64/mpih-mul1.S -+++ b/mpi/aarch64/mpih-mul1.S -@@ -22,6 +22,7 @@ - - #include "sysdep.h" - #include "asm-syntax.h" -+#include "asm-common-aarch64.h" - - /******************* - * mpi_limb_t -@@ -34,7 +35,7 @@ - .text - - .globl _gcry_mpih_mul_1 --.type _gcry_mpih_mul_1,%function -+ELF(.type _gcry_mpih_mul_1,%function) - _gcry_mpih_mul_1: - and x5, x2, #3; - mov x4, xzr; -@@ -93,4 +94,4 @@ _gcry_mpih_mul_1: - .Lend: - mov x0, x4; - ret; --.size _gcry_mpih_mul_1,.-_gcry_mpih_mul_1; -+ELF(.size _gcry_mpih_mul_1,.-_gcry_mpih_mul_1;) -diff --git a/mpi/aarch64/mpih-mul2.S b/mpi/aarch64/mpih-mul2.S -index bd3b2c9..c7c08e5 100644 ---- a/mpi/aarch64/mpih-mul2.S -+++ b/mpi/aarch64/mpih-mul2.S -@@ -22,6 +22,7 @@ - - #include "sysdep.h" - #include "asm-syntax.h" -+#include "asm-common-aarch64.h" - - /******************* - * mpi_limb_t -@@ -34,7 +35,7 @@ - .text - - .globl _gcry_mpih_addmul_1 --.type _gcry_mpih_addmul_1,%function -+ELF(.type _gcry_mpih_addmul_1,%function) - _gcry_mpih_addmul_1: - and x5, x2, #3; - mov x6, xzr; -@@ -105,4 +106,4 @@ _gcry_mpih_addmul_1: - .Lend: - mov x0, x6; - ret; --.size _gcry_mpih_addmul_1,.-_gcry_mpih_addmul_1; -+ELF(.size _gcry_mpih_addmul_1,.-_gcry_mpih_addmul_1;) -diff --git a/mpi/aarch64/mpih-mul3.S b/mpi/aarch64/mpih-mul3.S -index a58bc53..ccc961e 100644 ---- a/mpi/aarch64/mpih-mul3.S -+++ b/mpi/aarch64/mpih-mul3.S -@@ -22,6 +22,7 @@ - - #include "sysdep.h" - #include "asm-syntax.h" -+#include "asm-common-aarch64.h" - - /******************* - * mpi_limb_t -@@ -34,7 +35,7 @@ - .text - - .globl _gcry_mpih_submul_1 --.type _gcry_mpih_submul_1,%function -+ELF(.type _gcry_mpih_submul_1,%function) - _gcry_mpih_submul_1: - and x5, x2, #3; - mov x7, xzr; -@@ -118,4 +119,4 @@ _gcry_mpih_submul_1: - .Loop_end: - cinc x0, x7, cc; - ret; --.size _gcry_mpih_submul_1,.-_gcry_mpih_submul_1; -+ELF(.size _gcry_mpih_submul_1,.-_gcry_mpih_submul_1;) -diff --git a/mpi/aarch64/mpih-sub1.S b/mpi/aarch64/mpih-sub1.S -index cbf2f08..4a66373 100644 ---- a/mpi/aarch64/mpih-sub1.S -+++ b/mpi/aarch64/mpih-sub1.S -@@ -22,6 +22,7 @@ - - #include "sysdep.h" - #include "asm-syntax.h" -+#include "asm-common-aarch64.h" - - /******************* - * mpi_limb_t -@@ -34,7 +35,7 @@ - .text - - .globl _gcry_mpih_sub_n --.type _gcry_mpih_sub_n,%function -+ELF(.type _gcry_mpih_sub_n,%function) - _gcry_mpih_sub_n: - and x5, x3, #3; - subs xzr, xzr, xzr; /* prepare carry flag for sub */ -@@ -68,4 +69,4 @@ _gcry_mpih_sub_n: - .Lend: - cset x0, cc; - ret; --.size _gcry_mpih_sub_n,.-_gcry_mpih_sub_n; -+ELF(.size _gcry_mpih_sub_n,.-_gcry_mpih_sub_n;) -diff --git a/mpi/asm-common-aarch64.h b/mpi/asm-common-aarch64.h -new file mode 100644 -index 0000000..1269413 ---- /dev/null -+++ b/mpi/asm-common-aarch64.h -@@ -0,0 +1,30 @@ -+/* asm-common-aarch64.h - Common macros for AArch64 assembly -+ * -+ * Copyright (C) 2018 Martin Storsjö -+ * -+ * This file is part of Libgcrypt. -+ * -+ * Libgcrypt is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2.1 of -+ * the License, or (at your option) any later version. -+ * -+ * Libgcrypt is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this program; if not, see . -+ */ -+ -+#ifndef MPI_ASM_COMMON_AARCH64_H -+#define MPI_ASM_COMMON_AARCH64_H -+ -+#ifdef __ELF__ -+# define ELF(...) __VA_ARGS__ -+#else -+# define ELF(...) /*_*/ -+#endif -+ -+#endif /* MPI_ASM_COMMON_AARCH64_H */ --- -2.7.4 - diff -Nru vlc-3.0.21/contrib/src/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch vlc-3.0.22/contrib/src/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch --- vlc-3.0.21/contrib/src/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,18 +1,18 @@ -From 95cc768cce8de579d0414830fe1d93c15f9594a7 Mon Sep 17 00:00:00 2001 +From 9e794b8b2065d233e21f378217705df6985f6a18 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 19 Jun 2020 10:40:06 +0200 -Subject: [PATCH 7/9] random: don't use API's that are forbidden in UWP apps to +Subject: [PATCH 7/8] random: don't use API's that are forbidden in UWP apps to init the random generator --- - random/rndw32.c | 29 +++++++++++++++++++++++++---- - 1 file changed, 25 insertions(+), 4 deletions(-) + random/rndw32.c | 30 +++++++++++++++++++++++++----- + 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/random/rndw32.c b/random/rndw32.c -index aefc7275..45d1e7e7 100644 +index b3f63d20..02d20cc3 100644 --- a/random/rndw32.c +++ b/random/rndw32.c -@@ -337,6 +337,7 @@ read_mbm_data (void (*add)(const void*, size_t, enum random_origins), +@@ -338,6 +338,7 @@ read_mbm_data (void (*add)(const void*, size_t, enum random_origins), HANDLE hMBMData; SharedData *mbmDataPtr; @@ -20,7 +20,7 @@ hMBMData = OpenFileMapping (FILE_MAP_READ, FALSE, "$M$B$M$5$S$D$" ); if (hMBMData) { -@@ -351,6 +352,7 @@ read_mbm_data (void (*add)(const void*, size_t, enum random_origins), +@@ -352,6 +353,7 @@ read_mbm_data (void (*add)(const void*, size_t, enum random_origins), } CloseHandle (hMBMData); } @@ -28,7 +28,7 @@ } -@@ -359,6 +361,7 @@ static void +@@ -360,6 +362,7 @@ static void registry_poll (void (*add)(const void*, size_t, enum random_origins), enum random_origins requester) { @@ -36,7 +36,7 @@ static int cbPerfData = PERFORMANCE_BUFFER_SIZE; int iterations; DWORD dwSize, status; -@@ -478,6 +481,7 @@ registry_poll (void (*add)(const void*, size_t, enum random_origins), +@@ -479,6 +482,7 @@ registry_poll (void (*add)(const void*, size_t, enum random_origins), isn't done then any system components which provide performance data can't be removed or changed while the handle remains active. */ RegCloseKey (HKEY_PERFORMANCE_DATA); @@ -44,7 +44,7 @@ } -@@ -496,6 +500,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), +@@ -497,6 +501,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), if ( !is_initialized ) { @@ -52,7 +52,7 @@ HKEY hKey; if ( debug_me ) -@@ -565,6 +570,10 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), +@@ -566,6 +571,10 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), if (!pNtQuerySystemInformation || !pNtQueryInformationProcess) hNTAPI = NULL; } @@ -63,7 +63,7 @@ is_initialized = 1; -@@ -594,6 +603,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), +@@ -595,6 +604,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), } } @@ -71,7 +71,7 @@ /* Get disk I/O statistics for all the hard drives. 100 is an arbitrary failsafe limit. */ for (drive_no = 0; drive_no < 100 ; drive_no++) -@@ -628,6 +638,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), +@@ -629,6 +639,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), } CloseHandle (hDevice); } @@ -79,24 +79,26 @@ /* In theory we should be using the Win32 performance query API to obtain unpredictable data from the system, however this is so unreliable (see -@@ -786,12 +797,16 @@ _gcry_rndw32_gather_random (void (*add)(const void*, size_t, +@@ -788,6 +799,7 @@ _gcry_rndw32_gather_random (void (*add)(const void*, size_t, if (!is_initialized) { +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) OSVERSIONINFO osvi = { sizeof( osvi ) }; + const char *s; - GetVersionEx( &osvi ); +@@ -798,7 +810,9 @@ _gcry_rndw32_gather_random (void (*add)(const void*, size_t, if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT) log_fatal ("can only run on a Windows NT platform\n" ); system_is_w2000 = (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0); +- +#else /* !WINAPI_PARTITION_DESKTOP */ + system_is_w2000 = 0; +#endif /* !WINAPI_PARTITION_DESKTOP */ init_system_rng (); is_initialized = 1; } -@@ -842,14 +857,11 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, +@@ -856,14 +870,11 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, ADDINT((SIZE_T)aptr); \ } while (0) @@ -112,7 +114,7 @@ ADDPTR ( GetDesktopWindow ()); ADDPTR ( GetFocus ()); ADDINT ( GetInputState ()); -@@ -858,6 +870,11 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, +@@ -872,6 +883,11 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, ADDPTR ( GetOpenClipboardWindow ()); ADDPTR ( GetProcessHeap ()); ADDPTR ( GetProcessWindowStation ()); @@ -124,7 +126,7 @@ /* Following function in some cases stops returning events, and cannot be used as an entropy source. */ /*ADDINT ( GetQueueStatus (QS_ALLEVENTS));*/ -@@ -871,6 +888,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, +@@ -885,6 +901,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, /* Get multiword system information: Current caret position, current mouse cursor position. */ @@ -132,7 +134,7 @@ { POINT point; -@@ -922,10 +940,12 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, +@@ -936,10 +953,12 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, (*add) ( &minimumWorkingSetSize, sizeof (int), origin ); (*add) ( &maximumWorkingSetSize, sizeof (int), origin ); } @@ -145,7 +147,7 @@ if (!addedFixedItems) { STARTUPINFO startupInfo; -@@ -938,6 +958,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, +@@ -952,6 +971,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, (*add) ( &startupInfo, sizeof (STARTUPINFO), origin ); addedFixedItems = 1; } @@ -154,5 +156,5 @@ /* The performance of QPC varies depending on the architecture it's running on and on the OS, the MS documentation is vague about the -- -2.26.0.windows.1 +2.37.3.windows.1 diff -Nru vlc-3.0.21/contrib/src/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch vlc-3.0.22/contrib/src/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch --- vlc-3.0.21/contrib/src/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -From 1b09aa078628e93c0f95f0d5e20e708f81068bf5 Mon Sep 17 00:00:00 2001 +From 0673f231f333179d4698877ec40cdf43bf5b77c1 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 19 Jun 2020 10:37:50 +0200 -Subject: [PATCH 8/9] random: only use wincrypt in UWP builds if WINSTORECOMPAT +Subject: [PATCH 5/5] random: only use wincrypt in UWP builds if WINSTORECOMPAT is set This is a compatibility library to use older APIs that are forbidden in UWP apps. @@ -9,39 +9,53 @@ bcrypt is supposed to be used instead of wincrypt but is only available since Vista. --- - random/rndw32.c | 17 +++++++++++++++++ + random/rndw32.c | 22 ++++++++++++++++++++-- src/Makefile.am | 4 +++- - 2 files changed, 20 insertions(+), 1 deletion(-) + 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/random/rndw32.c b/random/rndw32.c -index 45d1e7e7..8b0a38fa 100644 +index 02d20cc3..f1b559e9 100644 --- a/random/rndw32.c +++ b/random/rndw32.c -@@ -98,6 +98,9 @@ +@@ -97,7 +97,11 @@ + #define SIZEOF_DISK_PERFORMANCE_STRUCT 256 /* We don't include wincrypt.h so define it here. */ - #define HCRYPTPROV HANDLE +#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && defined(WINSTORECOMPAT) +#include ++#else + #define HCRYPTPROV HANDLE +#endif /* When we query the performance counters, we allocate an initial buffer and -@@ -259,6 +262,7 @@ init_system_rng (void) +@@ -114,7 +118,7 @@ + + /* Intel Chipset CSP type and name */ + #define PROV_INTEL_SEC 22 +-#define INTEL_DEF_PROV "Intel Hardware Cryptographic Service Provider" ++#define INTEL_DEF_PROV TEXT("Intel Hardware Cryptographic Service Provider") + + + +@@ -258,8 +262,9 @@ static void + init_system_rng (void) + { system_rng_available = 0; - hRNGProv = NULL; +- hRNGProv = NULL; ++ hRNGProv = (HCRYPTPROV)NULL; +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) hAdvAPI32 = GetModuleHandle ("AdvAPI32.dll"); if (!hAdvAPI32) return; -@@ -274,6 +278,19 @@ init_system_rng (void) +@@ -275,6 +280,19 @@ init_system_rng (void) This isn't exported by name, so we have to get it by ordinal. */ pRtlGenRandom = (RTLGENRANDOM) GetProcAddress (hAdvAPI32, "SystemFunction036"); +#elif defined(WINSTORECOMPAT) + hAdvAPI32 = NULL; -+ pCryptAcquireContext = CryptAcquireContextA; ++ pCryptAcquireContext = CryptAcquireContextW; + pCryptGenRandom = CryptGenRandom; + pCryptReleaseContext = CryptReleaseContext; + pRtlGenRandom = NULL; @@ -56,13 +70,13 @@ /* Try and connect to the PIII RNG CSP. The AMD 768 southbridge (from the 760 MP chipset) also has a hardware RNG, but there doesn't appear diff --git a/src/Makefile.am b/src/Makefile.am -index 3cc4a552..a22acd41 100644 +index aa3548f6..154b35c7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -123,7 +123,9 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \ +@@ -126,7 +126,9 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \ ../random/librandom.la \ ../mpi/libmpi.la \ - ../compat/libcompat.la $(GPG_ERROR_LIBS) + ../compat/libcompat.la $(DL_LIBS) $(GPG_ERROR_LIBS) - +if HAVE_W32_SYSTEM +libgcrypt_la_LIBADD += -lbcrypt @@ -71,5 +85,5 @@ dumpsexp_SOURCES = dumpsexp.c dumpsexp_CFLAGS = $(arch_gpg_error_cflags) -- -2.26.0.windows.1 +2.37.3.windows.1 diff -Nru vlc-3.0.21/contrib/src/gcrypt/64bits-relocation.patch vlc-3.0.22/contrib/src/gcrypt/64bits-relocation.patch --- vlc-3.0.21/contrib/src/gcrypt/64bits-relocation.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/64bits-relocation.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---- libgcrypt/cipher/rijndael.c.orig 2016-08-25 17:54:33.755153207 +0200 -+++ libgcrypt/cipher/rijndael.c 2016-08-25 17:54:36.655151003 +0200 -@@ -744,7 +744,7 @@ - const void *key = ctx->keyschenc; - uintptr_t rounds = ctx->rounds; - uintptr_t ret; -- asm volatile ("movq %[encT], %%r8\n\t" -+ asm volatile ("movabs %[encT], %%r8\n\t" - "callq *%[ret]\n\t" - : [ret] "=a" (ret), - "+D" (key), -@@ -1127,7 +1127,7 @@ - const void *key = ctx->keyschdec; - uintptr_t rounds = ctx->rounds; - uintptr_t ret; -- asm volatile ("movq %[dectabs], %%r8\n\t" -+ asm volatile ("movabs %[dectabs], %%r8\n\t" - "callq *%[ret]\n\t" - : [ret] "=a" (ret), - "+D" (key), diff -Nru vlc-3.0.21/contrib/src/gcrypt/SHA512SUMS vlc-3.0.22/contrib/src/gcrypt/SHA512SUMS --- vlc-3.0.21/contrib/src/gcrypt/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -c76d9c9dfb2b831177848b0df7e41d05d1587d28af5322ab0518c9200cdcb1470413940a414036559e7bbed3e24d2e89340f7f06026697f65492c00761cc6385 libgcrypt-1.7.10.tar.bz2 +e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13 libgcrypt-1.10.1.tar.bz2 \ No newline at end of file diff -Nru vlc-3.0.21/contrib/src/gcrypt/clang-mips64.patch vlc-3.0.22/contrib/src/gcrypt/clang-mips64.patch --- vlc-3.0.21/contrib/src/gcrypt/clang-mips64.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/clang-mips64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -diff -Naur libgcrypt.orig/mpi/longlong.h libgcrypt/mpi/longlong.h ---- libgcrypt.orig/mpi/longlong.h 2016-06-08 18:18:15.000000000 +0200 -+++ libgcrypt/mpi/longlong.h 2016-08-30 12:56:30.751262074 +0200 -@@ -890,7 +890,7 @@ - ************** MIPS/64 ************** - ***************************************/ - #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 --# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) -+# if defined (__clang__) || (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) - typedef unsigned int UTItype __attribute__ ((mode (TI))); - # define umul_ppmm(w1, w0, u, v) \ - do { \ diff -Nru vlc-3.0.21/contrib/src/gcrypt/disable-tests-compilation.patch vlc-3.0.22/contrib/src/gcrypt/disable-tests-compilation.patch --- vlc-3.0.21/contrib/src/gcrypt/disable-tests-compilation.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/disable-tests-compilation.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,17 @@ ---- libgcrypt-1.7.3/Makefile.am.orig 2016-08-24 15:10:23.181783280 +0200 -+++ libgcrypt-1.7.3/Makefile.am 2016-08-24 15:11:19.813780757 +0200 -@@ -31,8 +31,8 @@ +From 35d4dd642c955f5aa006ad8d105105a15ff14921 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= +Date: Fri, 11 Sep 2015 16:43:11 +0200 +Subject: [PATCH 1/5] disable tests compilation + +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 77355d1a..737f32ad 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -41,8 +41,8 @@ doc = endif @@ -11,3 +22,6 @@ EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \ ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \ +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/gcrypt/fix-pthread-detection.patch vlc-3.0.22/contrib/src/gcrypt/fix-pthread-detection.patch --- vlc-3.0.21/contrib/src/gcrypt/fix-pthread-detection.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/fix-pthread-detection.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,14 +1,25 @@ ---- libgcrypt/configure.ac.old 2017-04-20 16:49:00.239092950 +0200 -+++ libgcrypt/configure.ac 2017-04-20 16:57:18.205011934 +0200 -@@ -215,7 +215,6 @@ - print_egd_notice=no +From 54a245738b12ad8985935de0ffea24980ce48db9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= +Date: Thu, 20 Apr 2017 17:26:02 +0200 +Subject: [PATCH 2/5] Fix pthread detection + +--- + configure.ac | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6ea38f53..781f3163 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -239,7 +239,6 @@ LIBGCRYPT_THREAD_MODULES="" + # Other definitions. have_w32_system=no have_w32ce_system=no -have_pthread=no # Setup some stuff depending on host. -@@ -751,10 +750,9 @@ +@@ -828,10 +827,9 @@ AC_SUBST(PTH_LIBS) # Check whether pthreads is available # if test "$have_w32_system" != yes; then @@ -22,3 +33,6 @@ fi +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/gcrypt/rules.mak vlc-3.0.22/contrib/src/gcrypt/rules.mak --- vlc-3.0.21/contrib/src/gcrypt/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gcrypt/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ # GCRYPT -GCRYPT_VERSION := 1.7.10 -GCRYPT_URL := http://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2 +GCRYPT_VERSION := 1.10.1 +GCRYPT_URL := $(GNUGPG)/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2 PKGS += gcrypt ifeq ($(call need_pkg,"libgcrypt"),) @@ -14,31 +14,34 @@ gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt $(UNPACK) + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux $(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch $(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch - $(APPLY) $(SRC)/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch - $(APPLY) $(SRC)/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch $(APPLY) $(SRC)/gcrypt/0001-compat-provide-a-getpid-replacement-that-works-on-Wi.patch $(APPLY) $(SRC)/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch $(APPLY) $(SRC)/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch -ifdef HAVE_WIN64 - $(APPLY) $(SRC)/gcrypt/64bits-relocation.patch -endif -ifeq ($(CC), clang) -ifeq ($(ARCH),mips64el) - $(APPLY) $(SRC)/gcrypt/clang-mips64.patch -endif + + # don't use getpid in UWP as it's not actually available + $(APPLY) $(SRC)/gcrypt/gcrypt-uwp-getpid.patch +ifdef HAVE_CROSS_COMPILE + # disable cross-compiled command line tools that can't be run + sed -i.orig -e 's,^bin_PROGRAMS ,bin_PROGRAMS_disabled ,g' $(UNPACK_DIR)/src/Makefile.am endif + $(MOVE) DEPS_gcrypt = gpg-error GCRYPT_CONF = \ - --enable-ciphers=aes,des,rfc2268,arcfour \ - --enable-digests=sha1,md5,rmd160,sha256,sha512 \ + --enable-ciphers=aes,des,rfc2268,arcfour,chacha20 \ + --enable-digests=sha1,md5,rmd160,sha256,sha512,blake2 \ --enable-pubkey-ciphers=dsa,rsa,ecc \ --disable-docs +ifneq ($(call need_pkg,"gpg-error >= 1.27"),) +GCRYPT_CONF += --with-libgpg-error-prefix=$(PREFIX) +endif + ifdef HAVE_WIN32 ifeq ($(ARCH),x86_64) GCRYPT_CONF += --disable-asm --disable-padlock-support @@ -54,6 +57,9 @@ ifeq ($(ARCH),aarch64) GCRYPT_CONF += --disable-asm --disable-arm-crypto-support endif +ifeq ($(ARCH), x86_64) +GCRYPT_CONF += ac_cv_sys_symbol_underscore=yes +endif else ifdef HAVE_BSD GCRYPT_CONF += --disable-asm --disable-aesni-support @@ -77,11 +83,7 @@ endif .gcrypt: gcrypt - # Reconfiguring this requires a git repo to be available, to - # successfully produce a nonempty mym4_revision_dec. - cd $< && git init && git config --local user.email "cone@example.com" && git config --local user.name "Cony Cone" && \ - git commit --allow-empty -m "dummy commit" $(RECONF) - cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(GCRYPT_EXTRA_CFLAGS)" ./configure $(HOSTCONF) $(GCRYPT_CONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(CFLAGS) $(GCRYPT_EXTRA_CFLAGS)" $(GCRYPT_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/gen-cmake-toolchain.py vlc-3.0.22/contrib/src/gen-cmake-toolchain.py --- vlc-3.0.21/contrib/src/gen-cmake-toolchain.py 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/gen-cmake-toolchain.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -#!/usr/bin/env python3 -import os -import argparse - -# Argument parsing -parser = argparse.ArgumentParser( - description="Generate a CMake crossfile based on environment variables") -parser.add_argument('file', type=argparse.FileType('w', encoding='UTF-8'), - help="output file") -args = parser.parse_args() - -# Helper to add env variable value to crossfile -def _add_environ_val(meson_key, env_key): - env_value = os.environ.get(env_key) - if env_value != None: - if " " in env_value: - args.file.write("set({} \"{}\")\n".format(meson_key, env_value)) - else: - args.file.write("set({} {})\n".format(meson_key, env_value)) - -def _add_environ_val_not_empty(meson_key, env_key): - env_value = os.environ.get(env_key) - if env_value != None and env_value != '': - args.file.write("set({} {})\n".format(meson_key, env_value)) - - -# Generate meson crossfile -args.file.write("# CMake toolchain automatically generated by contrib makefile\n") - -# Binaries section -_add_environ_val('CMAKE_BUILD_TYPE', 'BUILD_TYPE') -_add_environ_val('CMAKE_SYSTEM_PROCESSOR', 'HOST_ARCH') -_add_environ_val_not_empty('CMAKE_SYSTEM_NAME', 'SYSTEM_NAME') -_add_environ_val('CMAKE_RC_COMPILER', 'RC_COMPILER') -_add_environ_val('CMAKE_RANLIB', 'RANLIB') -_add_environ_val('CMAKE_AR', 'AR') - -_add_environ_val('CMAKE_OSX_SYSROOT', 'OSX_SYSROOT') - -# we should not have to set this -_add_environ_val('_CMAKE_TOOLCHAIN_PREFIX', 'TOOLCHAIN_PREFIX') - -_add_environ_val('CMAKE_C_COMPILER', 'CC') -_add_environ_val('CMAKE_CXX_COMPILER', 'CXX') - -_add_environ_val('CMAKE_C_SYSROOT_FLAG', 'C_SYSROOT_FLAG') -_add_environ_val('CMAKE_CXX_SYSROOT_FLAG', 'CXX_SYSROOT_FLAG') - - -_add_environ_val('CMAKE_FIND_ROOT_PATH', 'PREFIX') - -_add_environ_val('CMAKE_FIND_ROOT_PATH', 'FIND_ROOT_PATH') -args.file.write("set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n") -_add_environ_val('CMAKE_FIND_ROOT_PATH_MODE_LIBRARY', 'PATH_MODE_LIBRARY') -_add_environ_val('CMAKE_FIND_ROOT_PATH_MODE_INCLUDE', 'PATH_MODE_INCLUDE') - -# final includes -env_value = os.environ.get('EXTRA_INCLUDE') -if env_value != None and env_value != '': - args.file.write("include({})\n".format(env_value)) - diff -Nru vlc-3.0.21/contrib/src/gen-meson-crossfile.py vlc-3.0.22/contrib/src/gen-meson-crossfile.py --- vlc-3.0.21/contrib/src/gen-meson-crossfile.py 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gen-meson-crossfile.py 2025-11-13 22:17:54.000000000 +0000 @@ -28,6 +28,9 @@ args.file.write("\n[binaries]\n") _add_environ_val('c', 'CC') _add_environ_val('cpp', 'CXX') +if os.environ.get('HOST_SYSTEM') == 'darwin': + _add_environ_val('objc', 'OBJC') + _add_environ_val('objcpp', 'OBJCXX') _add_environ_val('ar', 'AR') _add_environ_val('strip', 'STRIP') _add_environ_val('pkgconfig', 'PKG_CONFIG') @@ -36,10 +39,7 @@ # Properties section args.file.write("\n[properties]\n") args.file.write("needs_exe_wrapper = true\n") -_add_environ_arr('c_args', 'CFLAGS') -_add_environ_arr('c_link_args', 'LDFLAGS') -_add_environ_arr('cpp_args', 'CXXFLAGS') -_add_environ_arr('cpp_link_args', 'LDFLAGS') +_add_environ_val('pkg_config_libdir', 'PKG_CONFIG_LIBDIR') # Host machine section args.file.write("\n[host_machine]\n") diff -Nru vlc-3.0.21/contrib/src/gen-meson-machinefile.py vlc-3.0.22/contrib/src/gen-meson-machinefile.py --- vlc-3.0.21/contrib/src/gen-meson-machinefile.py 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/gen-meson-machinefile.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -#!/usr/bin/env python3 -import os -import argparse -import shlex - -# Argument parsing -parser = argparse.ArgumentParser( - description="Generate a meson crossfile based on environment variables") -parser.add_argument('--type', - choices=['internal', 'external-cross', 'external-native'], - default='internal', - help=""" -internal: Internal crossfile used when contribs are cross-compiled. - Not meant for use outside the contribs build. -external-*: External machine file (either cross or native). - This is meant to be used by VLCs meson build system to easily - use the given contribs, similar to --with-contrib=DIR for ./configure -""") -parser.add_argument('file', type=argparse.FileType('w', encoding='UTF-8'), - help="output file") -args = parser.parse_args() - -# Helper to add env variable value to crossfile -def _add_environ_val(meson_key, env_key): - env_value = os.environ.get(env_key) - if env_value != None: - args.file.write("{} = '{}'\n".format(meson_key, env_value)) - -# Helper to single-quote array items -def _quote_arr(arr): - return ["'" + item + "'" for item in arr] - -# Helper to add an array to crossfile -def _add_arr(meson_key, arr, literal=False): - if not literal: - arr = _quote_arr(arr) - arr_string = (', '.join(arr)) - args.file.write("{} = [{}]\n".format(meson_key, arr_string)) - -# Helper to add env variable array to crossfile -def _add_environ_arr(meson_key, env_key): - env_array = os.environ.get(env_key) - if env_array != None: - env_values = shlex.split(env_array) - _add_arr(meson_key, env_values) - -# Generate meson crossfile -args.file.write("# Automatically generated by contrib makefile\n") - -if args.type == 'internal': - # Binaries section - args.file.write("\n[binaries]\n") - _add_environ_val('c', 'CC') - _add_environ_val('cpp', 'CXX') - if os.environ.get('HOST_SYSTEM') == 'darwin': - _add_environ_val('objc', 'OBJC') - _add_environ_val('objcpp', 'OBJCXX') - _add_environ_val('ar', 'AR') - _add_environ_val('strip', 'STRIP') - _add_environ_val('pkgconfig', 'PKG_CONFIG') - _add_environ_val('windres', 'WINDRES') - - # Properties section - args.file.write("\n[properties]\n") - args.file.write("needs_exe_wrapper = true\n") - _add_environ_val('pkg_config_libdir', 'PKG_CONFIG_LIBDIR') - - # Host machine section - args.file.write("\n[host_machine]\n") - _add_environ_val('system', 'HOST_SYSTEM') - _add_environ_val('cpu_family', 'HOST_ARCH') - args.file.write("endian = 'little'\n") - - # Get first part of triplet - cpu = os.environ.get('HOST', '').split('-')[0] - args.file.write("cpu = '{}'\n".format(cpu)) - - # CMake section - args.file.write("\n[cmake]\n") - _add_environ_val('CMAKE_C_COMPILER', 'CC') - _add_environ_val('CMAKE_CXX_COMPILER', 'CXX') - _add_environ_val('CMAKE_SYSTEM_NAME', 'CMAKE_SYSTEM_NAME') - _add_environ_val('CMAKE_SYSTEM_PROCESSOR', 'ARCH') - -elif args.type.startswith('external'): - # Constants section - args.file.write("\n[constants]\n") - args.file.write("contrib_dir = '{}'\n".format(os.environ['PREFIX'])) - args.file.write("contrib_libdir = contrib_dir / 'lib'\n") - args.file.write("contrib_incdir = contrib_dir / 'include'\n") - args.file.write("contrib_pkgconfdir = contrib_libdir / 'pkgconfig'\n") - - # Properties section - args.file.write("\n[properties]\n") - args.file.write("contrib_dir = contrib_dir\n") - args.file.write("contrib_libdir = contrib_libdir\n") - args.file.write("contrib_incdir = contrib_incdir\n") - - pkgconfdir_arr = ['contrib_pkgconfdir'] - if args.type == 'external-cross': - if os.environ.get('PKG_CONFIG', 'pkg-config') == 'pkg-config': - # If we have no host-specific pkg-config, set the libdir - # so we do not pick up incompatible deps. - _add_arr('pkg_config_libdir', pkgconfdir_arr, literal=True) - else: - pkgconfpath = os.environ.get('PKG_CONFIG_PATH') - if pkgconfpath is not None: - args.file.write("\n[built-in options]\n") - _add_arr('pkg_config_path', filter(None, pkgconfpath.split(':'))) - -else: - assert False, 'Unhandled type!' - diff -Nru vlc-3.0.21/contrib/src/gettext/0001-libasprintf-On-mingw-really-use-our-vasprintf-functi.patch vlc-3.0.22/contrib/src/gettext/0001-libasprintf-On-mingw-really-use-our-vasprintf-functi.patch --- vlc-3.0.21/contrib/src/gettext/0001-libasprintf-On-mingw-really-use-our-vasprintf-functi.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gettext/0001-libasprintf-On-mingw-really-use-our-vasprintf-functi.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -From 69105728ea5e1ce289498865b81e5ffeacebd840 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sun, 25 Nov 2018 02:10:44 +0100 -Subject: [PATCH 1/2] libasprintf: On mingw, really use our vasprintf function, - not mingw_vasprintf. - -mingw now has a definition of 'vasprintf' in that redirects to -mingw_vasprintf, which does not support argument reordering (i.e. -HAVE_POSIX_PRINTF is not defined). Make sure to avoid this function and use -the one defined in our lib-asprintf.c instead. - -* gettext-runtime/libasprintf/lib-asprintf.h (asprintf): Define as macro -redirecting to libasprintf_asprintf. -(vasprintf): Define as macro redirecting to libasprintf_vasprintf. -* gettext-runtime/libasprintf/lib-asprintf.c: Define also libasprintf_asprintf -and libasprintf_vasprintf. -* gettext-runtime/libasprintf/autosprintf.cc: Include lib-asprintf.h last. - -(cherry picked from commit 63295aac24c693d2d902eadd272259b7bdd7eae3) ---- - gettext-runtime/libasprintf/autosprintf.cc | 5 ++++- - gettext-runtime/libasprintf/lib-asprintf.c | 13 ++++++++++++- - gettext-runtime/libasprintf/lib-asprintf.h | 7 ++++++- - 3 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc -index 0c8bff1f1..57295aebd 100644 ---- a/gettext-runtime/libasprintf/autosprintf.cc -+++ b/gettext-runtime/libasprintf/autosprintf.cc -@@ -28,7 +28,6 @@ - #include - #include - #include --#include "lib-asprintf.h" - - /* std::swap() is in since C++11. */ - #if __cplusplus >= 201103L -@@ -37,6 +36,10 @@ - # include - #endif - -+/* This include must come last, since it contains overrides of functions that -+ the system may provide (namely, vasprintf). */ -+#include "lib-asprintf.h" -+ - namespace gnu - { - -diff --git a/gettext-runtime/libasprintf/lib-asprintf.c b/gettext-runtime/libasprintf/lib-asprintf.c -index afa04dda8..927fe7779 100644 ---- a/gettext-runtime/libasprintf/lib-asprintf.c -+++ b/gettext-runtime/libasprintf/lib-asprintf.c -@@ -1,5 +1,5 @@ - /* Library functions for class autosprintf. -- Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc. -+ Copyright (C) 2002-2003, 2006, 2018 Free Software Foundation, Inc. - Written by Bruno Haible , 2002. - - This program is free software: you can redistribute it and/or modify -@@ -31,8 +31,19 @@ - #include "vasnprintf.c" - #include "asnprintf.c" - -+/* Define to the same symbols as in lib-asprintf.h. */ -+#define asprintf libasprintf_asprintf -+#define vasprintf libasprintf_vasprintf -+ - /* Define functions declared in "vasprintf.h". */ - #include "vasprintf.c" - #include "asprintf.c" - -+/* Define the same functions also without the 'libasprintf_' prefix, -+ for binary backward-compatibility. */ -+#undef asprintf -+#undef vasprintf -+#include "vasprintf.c" -+#include "asprintf.c" -+ - #endif -diff --git a/gettext-runtime/libasprintf/lib-asprintf.h b/gettext-runtime/libasprintf/lib-asprintf.h -index 22874f289..c55c988c8 100644 ---- a/gettext-runtime/libasprintf/lib-asprintf.h -+++ b/gettext-runtime/libasprintf/lib-asprintf.h -@@ -1,5 +1,5 @@ - /* Library functions for class autosprintf. -- Copyright (C) 2002-2003, 2015-2016 Free Software Foundation, Inc. -+ Copyright (C) 2002-2003, 2018 Free Software Foundation, Inc. - Written by Bruno Haible , 2002. - - This program is free software: you can redistribute it and/or modify -@@ -26,6 +26,11 @@ - - #else - -+/* Define to symbols that are guaranteed to not be defined by the system -+ header files. */ -+#define asprintf libasprintf_asprintf -+#define vasprintf libasprintf_vasprintf -+ - /* Get asprintf(), vasprintf() declarations. */ - #include "vasprintf.h" - --- -2.17.1 - diff -Nru vlc-3.0.21/contrib/src/gettext/0002-libasprintf-Avoid-compilation-error-on-mingw-with-D_.patch vlc-3.0.22/contrib/src/gettext/0002-libasprintf-Avoid-compilation-error-on-mingw-with-D_.patch --- vlc-3.0.21/contrib/src/gettext/0002-libasprintf-Avoid-compilation-error-on-mingw-with-D_.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gettext/0002-libasprintf-Avoid-compilation-error-on-mingw-with-D_.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From 27b39c7a632b85966bbe0776e6a6e2d34fcee018 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sat, 18 May 2019 17:25:10 +0200 -Subject: [PATCH 2/2] libasprintf: Avoid compilation error on mingw with - -D__USE_MINGW_ANSI_STDIO=1. - -* gettext-runtime/libasprintf/lib-asprintf.c (asprintf, vasprintf): Don't define -on mingw when __USE_MINGW_ANSI_STDIO is non-zero. - -(cherry picked from commit ca6f6cfbb4c78c063f2a50bb758edfc95c9d64a2) ---- - gettext-runtime/libasprintf/lib-asprintf.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gettext-runtime/libasprintf/lib-asprintf.c b/gettext-runtime/libasprintf/lib-asprintf.c -index 927fe7779..93d75bcf7 100644 ---- a/gettext-runtime/libasprintf/lib-asprintf.c -+++ b/gettext-runtime/libasprintf/lib-asprintf.c -@@ -1,5 +1,5 @@ - /* Library functions for class autosprintf. -- Copyright (C) 2002-2003, 2006, 2018 Free Software Foundation, Inc. -+ Copyright (C) 2002-2003, 2006, 2018-2019 Free Software Foundation, Inc. - Written by Bruno Haible , 2002. - - This program is free software: you can redistribute it and/or modify -@@ -40,10 +40,13 @@ - #include "asprintf.c" - - /* Define the same functions also without the 'libasprintf_' prefix, -- for binary backward-compatibility. */ -+ for binary backward-compatibility. -+ But don't redefine functions already defined by mingw. */ -+#if !(defined __MINGW32__ && __USE_MINGW_ANSI_STDIO) - #undef asprintf - #undef vasprintf - #include "vasprintf.c" - #include "asprintf.c" -+#endif - - #endif --- -2.17.1 - diff -Nru vlc-3.0.21/contrib/src/gettext/SHA512SUMS vlc-3.0.22/contrib/src/gettext/SHA512SUMS --- vlc-3.0.21/contrib/src/gettext/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gettext/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 gettext-0.19.8.1.tar.gz +d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be gettext-0.22.5.tar.gz diff -Nru vlc-3.0.21/contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch vlc-3.0.22/contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch --- vlc-3.0.21/contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,29 @@ +diff -urN gettext-orig/gettext-tools/gnulib-lib/localtime.c gettext/gettext-tools/gnulib-lib/localtime.c +--- gettext-orig/gettext-tools/gnulib-lib/localtime.c 2024-02-21 12:44:25.000000000 +0200 ++++ gettext/gettext-tools/gnulib-lib/localtime.c 2025-09-16 13:24:27.574053984 +0300 +@@ -63,13 +63,19 @@ + char **env = _environ; + wchar_t **wenv = _wenviron; + if (env != NULL) +- for (char *s = env; *s != NULL; s++) +- if (s[0] == 'T' && s[1] == 'Z' && s[2] == '=') +- s[0] = '$'; ++ for (char **ep = env; *ep != NULL; ep++) ++ { ++ char *s = *ep; ++ if (s[0] == 'T' && s[1] == 'Z' && s[2] == '=') ++ s[0] = '$'; ++ } + if (wenv != NULL) +- for (wchar_t *ws = wenv; *ws != NULL; ws++) +- if (ws[0] == L'T' && ws[1] == L'Z' && ws[2] == L'=') +- ws[0] = L'$'; ++ for (wchar_t **wep = wenv; *wep != NULL; wep++) ++ { ++ wchar_t *ws = *wep; ++ if (ws[0] == L'T' && ws[1] == L'Z' && ws[2] == L'=') ++ ws[0] = L'$'; ++ } + } + #endif + diff -Nru vlc-3.0.21/contrib/src/gettext/gettext-0.22.5-gnulib-rename-real-openat.patch vlc-3.0.22/contrib/src/gettext/gettext-0.22.5-gnulib-rename-real-openat.patch --- vlc-3.0.21/contrib/src/gettext/gettext-0.22.5-gnulib-rename-real-openat.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/gettext/gettext-0.22.5-gnulib-rename-real-openat.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,13 @@ +diff -urN gettext-0.22.5-orig/gettext-tools/gnulib-lib/unistd.in.h gettext-0.22.5/gettext-tools/gnulib-lib/unistd.in.h +--- gettext-0.22.5-orig/gettext-tools/gnulib-lib/unistd.in.h 2024-02-21 12:44:25 ++++ gettext-0.22.5/gettext-tools/gnulib-lib/unistd.in.h 2025-08-15 14:19:45 +@@ -52,7 +52,9 @@ + # endif + # if (!defined MAC_OS_X_VERSION_MIN_REQUIRED \ + || MAC_OS_X_VERSION_MIN_REQUIRED < 99990000) ++#define openat real_openat + # include /* It also defines the two macros. */ ++#undef openat + # undef SEEK_DATA + # undef SEEK_HOLE + # endif diff -Nru vlc-3.0.21/contrib/src/gettext/rules.mak vlc-3.0.22/contrib/src/gettext/rules.mak --- vlc-3.0.21/contrib/src/gettext/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gettext/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,5 +1,5 @@ # gettext -GETTEXT_VERSION := 0.19.8.1 +GETTEXT_VERSION := 0.22.5 GETTEXT_URL := $(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz PKGS += gettext @@ -13,38 +13,71 @@ .sum-gettext: gettext-$(GETTEXT_VERSION).tar.gz +GETTEXT_TOOLS_DIRS := gettext-runtime/src gettext-tools/src + gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext $(UNPACK) - $(APPLY) $(SRC)/gettext/0001-libasprintf-On-mingw-really-use-our-vasprintf-functi.patch - $(APPLY) $(SRC)/gettext/0002-libasprintf-Avoid-compilation-error-on-mingw-with-D_.patch + $(APPLY) $(SRC)/gettext/gettext-0.22.5-gnulib-rename-real-openat.patch + $(APPLY) $(SRC)/gettext/gettext-0.22.5-gnulib-localtime.patch + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux + # disable libtextstyle + sed -i.orig -e 's,gettext-runtime libtextstyle gettext-tools,gettext-runtime gettext-tools,g' $(UNPACK_DIR)/configure + sed -i.orig -e 's,gettext-runtime libtextstyle gettext-tools,gettext-runtime gettext-tools,g' $(UNPACK_DIR)/Makefile.in + sed -i.orig -e 's,ENABLE_COLOR 1,ENABLE_COLOR 0,g' $(UNPACK_DIR)/gettext-tools/src/write-catalog.c + # disable gettext-tools examples configure + sed -i.orig -e "s,ac_subdirs_all='examples',ac_subdirs_all=," $(UNPACK_DIR)/gettext-tools/configure + sed -i.orig -e 's, examples",",' $(UNPACK_DIR)/gettext-tools/configure + # disable gettext-tools tests/samples + sed -i.orig -e 's,tests system-tests gnulib-tests examples doc,,' $(UNPACK_DIR)/gettext-tools/Makefile.in + # disable useless gettext-runtime targets + sed -i.orig -e 's,doc ,,' $(UNPACK_DIR)/gettext-runtime/Makefile.in + sed -i.orig -e 's,po man m4 tests,,' $(UNPACK_DIR)/gettext-runtime/Makefile.in + sed -i.orig -e 's,doc ,,' $(UNPACK_DIR)/gettext-runtime/Makefile.in +ifdef HAVE_CROSS_COMPILE + # disable cross-compiled command line tools that can't be run + sed -i.orig -e 's,install-binPROGRAMS install-exec-local,,' $(UNPACK_DIR)/gettext-tools/src/Makefile.in + for subdir in $(GETTEXT_TOOLS_DIRS); do \ + sed -i.orig -e 's,^bin_PROGRAMS = ,bin_PROGRAMS_disabled = ,g' $(UNPACK_DIR)/$$subdir/Makefile.in && \ + sed -i.orig -e 's,^noinst_PROGRAMS = ,noinst_PROGRAMS_disabled = ,g' $(UNPACK_DIR)/$$subdir/Makefile.in; done +endif $(MOVE) DEPS_gettext = iconv $(DEPS_iconv) libxml2 $(DEPS_libxml2) -GETTEXT_CFLAGS := $(CFLAGS) GETTEXT_CONF = \ --disable-relocatable \ --disable-java \ --disable-native-java \ + --disable-csharp \ --without-emacs \ - --without-included-libxml + --without-included-libxml \ + --with-installed-libtextstyle \ + --without-libtextstyle-prefix \ + --without-git + ifdef HAVE_WIN32 GETTEXT_CONF += --disable-threads -GETTEXT_CFLAGS += -DLIBXML_STATIC endif - -.gettext: gettext - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(GETTEXT_CFLAGS)" $(GETTEXT_CONF) -ifndef HAVE_ANDROID - cd $< && $(MAKE) install -else - cd $< && $(MAKE) -C gettext-runtime install - cd $< && $(MAKE) -C gettext-tools/intl - cd $< && $(MAKE) -C gettext-tools/misc install - cd $< && $(MAKE) -C gettext-tools/m4 install +ifdef HAVE_LINUX +GETTEXT_CONF += --disable-libasprintf +endif +ifdef HAVE_MINGW_W64 +GETTEXT_CONF += --disable-libasprintf endif ifdef HAVE_MACOSX - # detect libintl correctly in configure for static library - sed -i.orig 's/$$LIBS $$LIBINTL/$$LIBS $$LIBINTL $$INTL_MACOSX_LIBS/' "$(PREFIX)"/share/aclocal/gettext.m4 +# Mark functions as missing. Gettext/gnulib checks for functions without +# using headers (which would make them unavailable with +# -Werror=partial-availability), so we need to manually mark them unavailable. +# These are unavailable in macOS 10.7. + +# macOS 10.10 +GETTEXT_CONF += ac_cv_func_faccessat=no + endif + +.gettext: gettext + $(MAKEBUILDDIR) + $(MAKECONFIGURE) $(GETTEXT_CONF) + +$(MAKEBUILD) -C gettext-runtime bin_PROGRAMS= + +$(MAKEBUILD) -C gettext-runtime bin_PROGRAMS= install touch $@ diff -Nru vlc-3.0.21/contrib/src/glad/SHA512SUMS vlc-3.0.22/contrib/src/glad/SHA512SUMS --- vlc-3.0.21/contrib/src/glad/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/glad/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7 glad-2.0.4.tar.gz diff -Nru vlc-3.0.21/contrib/src/glad/rules.mak vlc-3.0.22/contrib/src/glad/rules.mak --- vlc-3.0.21/contrib/src/glad/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/glad/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -GLAD_VERSION := 2.0.4 -GLAD_URL := $(GITHUB)/Dav1dde/glad/archive/refs/tags/v$(GLAD_VERSION).tar.gz - -DEPS_glad = jinja $(DEPS_jinja) - -$(TARBALLS)/glad-$(GLAD_VERSION).tar.gz: - $(call download_pkg,$(GLAD_URL),glad) - -.sum-glad: glad-$(GLAD_VERSION).tar.gz - -glad: glad-$(GLAD_VERSION).tar.gz .sum-glad - $(UNPACK) - $(MOVE) - -.glad: glad .python-venv - $(PYTHON_INSTALL) - touch $@ diff -Nru vlc-3.0.21/contrib/src/glew/SHA512SUMS vlc-3.0.22/contrib/src/glew/SHA512SUMS --- vlc-3.0.21/contrib/src/glew/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/glew/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -03d7a816fde0c445c964280ac9e679a0d2dfca839e87345360adec4fdb2292b4ddfc85538954b052c538ca355e559d8ee3a5ea7ea2a99130687054a92e0df857 glew-1.7.0.tar.gz +9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab glew-2.1.0.tgz diff -Nru vlc-3.0.21/contrib/src/glew/rules.mak vlc-3.0.22/contrib/src/glew/rules.mak --- vlc-3.0.21/contrib/src/glew/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/glew/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,27 +1,24 @@ # GLEW -GLEW_VERSION := 1.7.0 +GLEW_VERSION := 2.1.0 GLEW_URL := $(SF)/glew/glew/$(GLEW_VERSION)/glew-$(GLEW_VERSION).tgz ifeq ($(call need_pkg,"glew"),) PKGS_FOUND += glew endif -$(TARBALLS)/glew-$(GLEW_VERSION).tar.gz: +$(TARBALLS)/glew-$(GLEW_VERSION).tgz: $(call download_pkg,$(GLEW_URL),glew) -.sum-glew: glew-$(GLEW_VERSION).tar.gz +.sum-glew: glew-$(GLEW_VERSION).tgz -glew: glew-$(GLEW_VERSION).tar.gz .sum-glew +glew: glew-$(GLEW_VERSION).tgz .sum-glew $(UNPACK) -ifdef HAVE_WIN32 - $(APPLY) $(SRC)/glew/win32.patch -endif + $(APPLY) $(SRC)/glew/glew-drop-debug-postfix.patch $(MOVE) -.glew: glew - cd $< && $(HOSTVARS) GLEW_DEST=$(PREFIX) CFLAGS="$(CFLAGS) -DGLEW_STATIC" $(MAKE) - cd $< && $(HOSTVARS) GLEW_DEST=$(PREFIX) $(MAKE) install -ifdef HAVE_WIN32 - -rm $(PREFIX)/lib/*glew32.dll* -endif +.glew: glew toolchain.cmake + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) -S $ - # else - typedef _W64 int ptrdiff_t; - # endif diff -Nru vlc-3.0.21/contrib/src/glib/rules.mak vlc-3.0.22/contrib/src/glib/rules.mak --- vlc-3.0.21/contrib/src/glib/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/glib/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -21,5 +21,5 @@ .glib: glib $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/glslang/SHA512SUMS vlc-3.0.22/contrib/src/glslang/SHA512SUMS --- vlc-3.0.21/contrib/src/glslang/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/glslang/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -201a295e47db552f8233d5f3072e7f03e36ad4d6f867a5f63d846e04d4276a94d26ff380f17128cbe24c031b47bbbf51a2c1ac0ad7a0140634be577f2d7343f8 glslang-12.3.1.tar.gz diff -Nru vlc-3.0.21/contrib/src/glslang/glslang-win32.patch vlc-3.0.22/contrib/src/glslang/glslang-win32.patch --- vlc-3.0.21/contrib/src/glslang/glslang-win32.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/glslang/glslang-win32.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6a43f6ff..55914a73 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -144,7 +144,7 @@ if(ENABLE_GLSLANG_WEBMIN) - endif() - - if(WIN32) -- set(CMAKE_DEBUG_POSTFIX "d") -+ #set(CMAKE_DEBUG_POSTFIX "d") - option(OVERRIDE_MSVCCRT "Overrides runtime of MSVC " ON) - if(MSVC AND OVERRIDE_MSVCCRT) - include(ChooseMSVCCRT.cmake) diff -Nru vlc-3.0.21/contrib/src/glslang/rules.mak vlc-3.0.22/contrib/src/glslang/rules.mak --- vlc-3.0.21/contrib/src/glslang/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/glslang/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -# glslang - -GLSLANG_VERSION := 12.3.1 -GLSLANG_URL := $(GITHUB)/KhronosGroup/glslang/archive/refs/tags/$(GLSLANG_VERSION).tar.gz - -# glslang doesn't export a pkg-config file, so we check the header manually -GLSLANG_MIN_VER := 10 -define GLSLANG_CHECK := -# include \n -# if GLSLANG_VERSION_MAJOR >= $(GLSLANG_MIN_VER) \n -# define GLSLANG_OK \n -# endif -endef - -PKGS += glslang -ifneq ($(call cppcheck, GLSLANG_OK, $(GLSLANG_CHECK)),) -PKGS_FOUND += glslang -endif - -$(TARBALLS)/glslang-$(GLSLANG_VERSION).tar.gz: - $(call download_pkg,$(GLSLANG_URL),glslang) - -.sum-glslang: glslang-$(GLSLANG_VERSION).tar.gz - -glslang: glslang-$(GLSLANG_VERSION).tar.gz .sum-glslang - $(UNPACK) - $(APPLY) $(SRC)/glslang/glslang-win32.patch - $(MOVE) - -GLSLANG_CONF := -DENABLE_GLSLANG_BINARIES=OFF -DENABLE_CTEST=OFF - -.glslang: glslang toolchain.cmake - $(CMAKECLEAN) - $(HOSTVARS) CXXFLAGS="$(CXXFLAGS) -DYYDEBUG=0" $(CMAKE) $(GLSLANG_CONF) - +$(CMAKEBUILD) - $(CMAKEINSTALL) - touch $@ diff -Nru vlc-3.0.21/contrib/src/gme/0001-don-t-skip-negative-fixes-14088.patch vlc-3.0.22/contrib/src/gme/0001-don-t-skip-negative-fixes-14088.patch --- vlc-3.0.21/contrib/src/gme/0001-don-t-skip-negative-fixes-14088.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/gme/0001-don-t-skip-negative-fixes-14088.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,26 @@ +From f070646738428aa1f237f4c3ab3318db3ed77165 Mon Sep 17 00:00:00 2001 +From: Hannes Domani +Date: Fri, 6 Mar 2015 14:43:45 +0100 +Subject: [PATCH] don't skip negative (fixes #14088) + +Signed-off-by: Jean-Baptiste Kempf +--- + gme/Fir_Resampler.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gme/Fir_Resampler.cpp b/gme/Fir_Resampler.cpp +index d8dd683..ae5f2df 100644 +--- a/gme/Fir_Resampler.cpp ++++ b/gme/Fir_Resampler.cpp +@@ -188,6 +188,8 @@ int Fir_Resampler_::skip_input( long count ) + { + int remain = write_pos - buf.begin(); + int max_count = remain - width_ * stereo; ++ if ( max_count < 0 ) ++ return 0; + if ( count > max_count ) + count = max_count; + +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch vlc-3.0.22/contrib/src/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch --- vlc-3.0.21/contrib/src/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -From 5fb77ca7127ab4343281920d79a87a899c6bc6bb Mon Sep 17 00:00:00 2001 +From b618db8f750d1201dceb05620978236aa44ce265 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Tue, 6 Sep 2022 11:56:30 +0200 -Subject: [PATCH 3/3] fix android toolchain broken +Subject: [PATCH 3/4] fix android toolchain broken CMAKE_CXX_IMPLICIT_LINK_LIBRARIES CMake 3.17.0 and Android NDK 25 the CMAKE_CXX_IMPLICIT_LINK_LIBRARIES is @@ -10,22 +10,27 @@ When it should be c++;m;unwind;dl;c;unwind;dl --- - gme/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) + gme/CMakeLists.txt | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/gme/CMakeLists.txt b/gme/CMakeLists.txt -index da23ea8..77738c4 100644 +index da23ea8..cc058c7 100644 --- a/gme/CMakeLists.txt +++ b/gme/CMakeLists.txt -@@ -196,6 +196,8 @@ set_target_properties(gme +@@ -196,6 +196,13 @@ set_target_properties(gme foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}) if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB}) list(APPEND IMPLICITS_LIST "${LIB}") -+ elseif(${LIB} MATCHES "-l:libunwind.a") # android toolchain -+ list(APPEND IMPLICITS_LIST "-lunwind") ++ elseif(LIB MATCHES "-l:lib.*.a") ++ string(LENGTH ${LIB} LIBLEN) ++ math(EXPR LIBLEN "${LIBLEN}-8") ++ string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB) ++ list(APPEND IMPLICITS_LIST "-l${DIRECT_LIB}") ++ elseif(LIB MATCHES "-l.*") ++ list(APPEND IMPLICITS_LIST "${LIB}") else() list(APPEND IMPLICITS_LIST "-l${LIB}") endif() -- -2.27.0.windows.1 +2.45.0.windows.1 diff -Nru vlc-3.0.21/contrib/src/gme/SHA512SUMS vlc-3.0.22/contrib/src/gme/SHA512SUMS --- vlc-3.0.21/contrib/src/gme/SHA512SUMS 2022-05-28 15:42:24.000000000 +0000 +++ vlc-3.0.22/contrib/src/gme/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -4b20c69ced696bb879c34bcb7ce0f5f276642458d4cebca8ede673eed7d50664e527626e2077f85a3411a26660f1b3f01e43cccd72945e1edb2994421efeb552 game-music-emu-0.6.3.tar.xz +fb4e8026f7b1565ef7884fabfcdedd97546bbe30d3047f06f0487dc752963ea37e5e4320cb0311eabe8fb7ed122f7958c388c7873ccff812fa3b612c9523491e game-music-emu-0.6.3.tar.gz diff -Nru vlc-3.0.21/contrib/src/gme/add-libm.patch vlc-3.0.22/contrib/src/gme/add-libm.patch --- vlc-3.0.21/contrib/src/gme/add-libm.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gme/add-libm.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ ---- game-music-emu-0.6.3/gme/libgme.pc.in.old 2022-08-26 08:35:03.000000000 +0200 -+++ game-music-emu-0.6.3/gme/libgme.pc.in 2022-08-26 08:35:18.000000000 +0200 -@@ -13,4 +13,4 @@ - Version: @GME_VERSION@ - Cflags: -I${includedir} - Libs: -L${libdir} -lgme --Libs.private: -lstdc++ @PKG_CONFIG_ZLIB@ -+Libs.private: -lstdc++ -lm @PKG_CONFIG_ZLIB@ diff -Nru vlc-3.0.21/contrib/src/gme/mac-use-c-stdlib.patch vlc-3.0.22/contrib/src/gme/mac-use-c-stdlib.patch --- vlc-3.0.21/contrib/src/gme/mac-use-c-stdlib.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gme/mac-use-c-stdlib.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ ---- game-music-emu/gme/libgme.pc.in.old 2022-08-25 21:46:36.000000000 +0200 -+++ game-music-emu/gme/libgme.pc.in 2022-08-25 21:46:57.000000000 +0200 -@@ -13,4 +13,4 @@ - Version: @GME_VERSION@ - Cflags: -I${includedir} - Libs: -L${libdir} -lgme --Libs.private: -lstdc++ -lm @PKG_CONFIG_ZLIB@ -+Libs.private: -lc++ -lm @PKG_CONFIG_ZLIB@ diff -Nru vlc-3.0.21/contrib/src/gme/rules.mak vlc-3.0.22/contrib/src/gme/rules.mak --- vlc-3.0.21/contrib/src/gme/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gme/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,29 +1,32 @@ # Game Music Emu GME_VERSION := 0.6.3 -GME_URL := https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$(GME_VERSION).tar.xz +GME_URL := $(GITHUB)/libgme/game-music-emu/archive/refs/tags/$(GME_VERSION).tar.gz PKGS += gme -$(TARBALLS)/game-music-emu-$(GME_VERSION).tar.xz: +$(TARBALLS)/game-music-emu-$(GME_VERSION).tar.gz: $(call download_pkg,$(GME_URL),gme) DEPS_gme = zlib $(DEPS_zlib) -.sum-gme: game-music-emu-$(GME_VERSION).tar.xz +.sum-gme: game-music-emu-$(GME_VERSION).tar.gz -game-music-emu: game-music-emu-$(GME_VERSION).tar.xz .sum-gme +game-music-emu: game-music-emu-$(GME_VERSION).tar.gz .sum-gme $(UNPACK) - $(APPLY) $(SRC)/gme/skip-underrun.patch - $(APPLY) $(SRC)/gme/add-libm.patch -ifdef HAVE_MACOSX - $(APPLY) $(SRC)/gme/mac-use-c-stdlib.patch -endif + $(APPLY) $(SRC)/gme/0001-don-t-skip-negative-fixes-14088.patch + $(APPLY) $(SRC)/gme/0001-Export-the-proper-C-runtime-library.patch + $(APPLY) $(SRC)/gme/0002-link-with-libm-and-set-it-in-pkg-config-when-buildin.patch + $(APPLY) $(SRC)/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch $(APPLY) $(SRC)/gme/0004-Blip_Buffer-replace-assert-with-a-check.patch $(call pkg_static,"gme/libgme.pc.in") $(MOVE) +GME_CONF := -DENABLE_UBSAN=OFF + .gme: game-music-emu toolchain.cmake - cd $< && $(HOSTVARS_PIC) $(CMAKE) . -DENABLE_UBSAN=OFF - +$(CMAKEBUILD) $< --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(GME_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/gme/skip-underrun.patch vlc-3.0.22/contrib/src/gme/skip-underrun.patch --- vlc-3.0.21/contrib/src/gme/skip-underrun.patch 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.22/contrib/src/gme/skip-underrun.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/gme/Fir_Resampler.cpp 2013-03-17 02:38:55.000000000 +0100 -+++ b/gme/Fir_Resampler.cpp 2015-03-06 14:33:01.061577900 +0100 -@@ -188,6 +188,8 @@ - { - int remain = write_pos - buf.begin(); - int max_count = remain - width_ * stereo; -+ if ( max_count < 0 ) -+ return 0; - if ( count > max_count ) - count = max_count; - diff -Nru vlc-3.0.21/contrib/src/gmp/SHA512SUMS vlc-3.0.22/contrib/src/gmp/SHA512SUMS --- vlc-3.0.21/contrib/src/gmp/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gmp/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -268db88447174617f5746d9a6ba2b105940cc1a5e73155eb23b6eedf55f8e7724eda05d161b2de19aca9e794956d226ba9ed6f23124c7c82f7e1872e32b003cf gmp-6.1.2.tar.bz2 +e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2 gmp-6.3.0.tar.xz diff -Nru vlc-3.0.21/contrib/src/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch vlc-3.0.22/contrib/src/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch --- vlc-3.0.21/contrib/src/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From 2612d34f216ec3e60b3f1b1165dc9935e4c2e2a5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Tue, 4 Aug 2020 13:45:54 +0300 -Subject: [PATCH 3/4] arm64: Add GSYM_PREFIX to function calls in assembly - ---- - mpn/arm64/gcd_1.asm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mpn/arm64/gcd_1.asm b/mpn/arm64/gcd_1.asm -index bc03d80dd..9c267cb07 100644 ---- a/mpn/arm64/gcd_1.asm -+++ b/mpn/arm64/gcd_1.asm -@@ -82,13 +82,13 @@ C Both U and V are single limbs, reduce with bmod if u0 >> v0. - b.hi L(red1) - - L(bmod):mov x3, #0 C carry argument -- bl mpn_modexact_1c_odd -+ bl GSYM_PREFIX`'mpn_modexact_1c_odd - b L(red0) - - L(nby1):cmp n, #BMOD_1_TO_MOD_1_THRESHOLD - b.lo L(bmod) - -- bl mpn_mod_1 -+ bl GSYM_PREFIX`'mpn_mod_1 - - L(red0):mov x3, x0 - L(red1):cmp x3, #0 --- -2.24.3 (Apple Git-128) - diff -Nru vlc-3.0.21/contrib/src/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch vlc-3.0.22/contrib/src/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch --- vlc-3.0.21/contrib/src/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From 056fbee0d76491b5f19f5741e9bf9178c03de7dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Tue, 4 Aug 2020 13:12:49 +0300 -Subject: [PATCH 2/4] arm64: Change adrp/add relocations to darwin style - ---- - mpn/arm64/invert_limb.asm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mpn/arm64/invert_limb.asm b/mpn/arm64/invert_limb.asm -index a94b0e961..bb876d97c 100644 ---- a/mpn/arm64/invert_limb.asm -+++ b/mpn/arm64/invert_limb.asm -@@ -41,9 +41,9 @@ C Compiler generated, mildly edited. Could surely be further optimised. - ASM_START() - PROLOGUE(mpn_invert_limb) - lsr x2, x0, #54 -- adrp x1, approx_tab -+ adrp x1, approx_tab@PAGE - and x2, x2, #0x1fe -- add x1, x1, :lo12:approx_tab -+ add x1, x1, approx_tab@PAGEOFF - ldrh w3, [x1,x2] - lsr x4, x0, #24 - add x4, x4, #1 --- -2.24.3 (Apple Git-128) - diff -Nru vlc-3.0.21/contrib/src/gmp/ppc64.patch vlc-3.0.22/contrib/src/gmp/ppc64.patch --- vlc-3.0.21/contrib/src/gmp/ppc64.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gmp/ppc64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ - -Signed-off-by: Armin Kuster - -This patch with pulled from gmp. -https://gmplib.org/repo/gmp/rev/4a6d258b467f -Upstream-Status: Backport - -# HG changeset patch -# User Torbjorn Granlund -# Date 1395835068 -3600 -# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7 -# Parent 301ce2788826a2d4d2725bd5cf01e998638db37a -Provide default for BMOD_1_TO_MOD_1_THRESHOLD. - -diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm ---- a/mpn/powerpc64/mode64/gcd_1.asm Tue Mar 25 15:34:52 2014 +0100 -+++ b/mpn/powerpc64/mode64/gcd_1.asm Wed Mar 26 12:57:48 2014 +0100 -@@ -43,6 +43,9 @@ - define(`n', `r4') - define(`v0', `r5') - -+ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',, -+ `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)') -+ - EXTERN_FUNC(mpn_mod_1) - EXTERN_FUNC(mpn_modexact_1c_odd) diff -Nru vlc-3.0.21/contrib/src/gmp/rules.mak vlc-3.0.22/contrib/src/gmp/rules.mak --- vlc-3.0.21/contrib/src/gmp/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gmp/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ # GNU Multiple Precision Arithmetic -GMP_VERSION := 6.1.2 -GMP_URL := https://gmplib.org/download/gmp-$(GMP_VERSION)/gmp-$(GMP_VERSION).tar.bz2 +GMP_VERSION := 6.3.0 +GMP_URL := https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.xz GMP_CONF := @@ -20,21 +20,21 @@ endif endif -$(TARBALLS)/gmp-$(GMP_VERSION).tar.bz2: +ifeq ($(call need_pkg,"gmp"),) +PKGS_FOUND += gmp +endif + +$(TARBALLS)/gmp-$(GMP_VERSION).tar.xz: $(call download_pkg,$(GMP_URL),gmp) -.sum-gmp: gmp-$(GMP_VERSION).tar.bz2 +.sum-gmp: gmp-$(GMP_VERSION).tar.xz -gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp +gmp: gmp-$(GMP_VERSION).tar.xz .sum-gmp $(UNPACK) - $(APPLY) $(SRC)/gmp/ppc64.patch - $(APPLY) $(SRC)/gmp/win-arm64.patch - $(APPLY) $(SRC)/gmp/arm64-Add-GSYM_PREFIX-to-function-calls-in-assembly.patch -ifdef HAVE_DARWIN_OS - $(APPLY) $(SRC)/gmp/arm64-Change-adrp-add-relocations-to-darwin-style.patch -endif + $(UPDATE_AUTOCONFIG) + $(APPLY) $(SRC)/gmp/gmp-fix-asm-detection.patch # do not try the cross compiler to detect the build compiler - cd $(UNPACK_DIR) && sed -i.orig 's/"$$CC" "$$CC $$CFLAGS $$CPPFLAGS" cc gcc c89 c99/cc gcc c89 c99/' acinclude.m4 + sed -i.orig 's/"$$CC" "$$CC $$CFLAGS $$CPPFLAGS" cc gcc c89 c99/cc gcc c89 c99/' $(UNPACK_DIR)/acinclude.m4 $(MOVE) # GMP requires either GPLv2 or LGPLv3 @@ -44,5 +44,6 @@ endif $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GMP_CONF) - cd $< && $(MAKE) install + $(MAKE) -C $< + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/gmp/win-arm64.patch vlc-3.0.22/contrib/src/gmp/win-arm64.patch --- vlc-3.0.21/contrib/src/gmp/win-arm64.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gmp/win-arm64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -From 7b969bbb2e3a0ec9a173a7ddf276b2a03e14452b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Mon, 19 Mar 2018 23:46:02 +0200 -Subject: [PATCH] Add support for building for windows on aarch64 - -Just as on windows/x86_64, "long" still is 32 bit; tweak the -arm/aarch64 ABI check to test sizeof(void*) instead of sizeof(long), -and use long long for mp_limb_t for mingw targets. ---- - acinclude.m4 | 4 ++-- - configure.ac | 6 ++++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 2ea5f5a..6eb7343 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -907,8 +907,8 @@ dnl a workaround for a HP compiler bug. - - AC_DEFUN([GMP_C_TEST_SIZEOF], - [echo "configure: testlist $2" >&AC_FD_CC --[gmp_sizeof_type=`echo "$2" | sed 's/sizeof-\([a-z]*\).*/\1/'`] --[gmp_sizeof_want=`echo "$2" | sed 's/sizeof-[a-z]*-\([0-9]*\).*/\1/'`] -+[gmp_sizeof_type=`echo "$2" | sed 's/sizeof-\([a-z\*]*\).*/\1/'`] -+[gmp_sizeof_want=`echo "$2" | sed 's/sizeof-[a-z\*]*-\([0-9]*\).*/\1/'`] - AC_MSG_CHECKING([compiler $1 has sizeof($gmp_sizeof_type)==$gmp_sizeof_want]) - cat >conftest.c < -Date: Sat, 30 May 2020 11:04:02 +0200 -Subject: [PATCH] Don't assume that UNICODE is not defined. - -Many Windows API functions are defined differently (redirecting to a -function with suffix 'W') if the application defines the macro UNICODE -than by default (redirecting to a function with suffix 'A'). - -* gnutls/gl/clean-temp.c (OSVERSIONINFO, GetVersionEx): Redirect to the -variant with suffix 'A'. -* gnutls/gl/dirent-private.h (WIN32_FIND_DATA): Likewise. -* gnutls/gl/gc-gnulib.c (CryptAcquireContext): Likewise. -* gnutls/gl/getaddrinfo.c (GetModuleHandle): Likewise. -* gnutls/gl/getlogin.c (GetUserName): Likewise. -* gnutls/gl/getlogin_r.c (GetUserName): Likewise. -* gnutls/gl/gettimeofday.c (LoadLibrary): Likewise. -* gnutls/gl/isatty.c (LoadLibrary, QueryFullProcessImageName): Likewise. -* gnutls/gl/link.c (GetModuleHandle, CreateHardLink): Likewise. -* gnutls/gl/localename.c (GetLocaleInfo, EnumSystemLocales): Likewise. -* gnutls/gl/mountlist.c (GetDriveType): Likewise. -* gnutls/gl/nonblocking.c (GetNamedPipeHandleState): Likewise. -* gnutls/gl/opendir.c (WIN32_FIND_DATA, GetFullPathName, FindFirstFile): -Likewise. -* gnutls/gl/physmem.c (GetModuleHandle): Likewise. -* gnutls/gl/poll.c (GetModuleHandle, PeekConsoleInput, CreateEvent, -PeekMessage, DispatchMessage): Likewise. -* gnutls/gl/progreloc.c (GetModuleFileName): Likewise. -* gnutls/gl/putenv.c (SetEnvironmentVariable): Likewise. -* gnutls/gl/read.c (GetNamedPipeHandleState): Likewise. -* gnutls/gl/readdir.c (FindNextFile): Likewise. -* gnutls/gl/relocatable.c (GetModuleFileName): Likewise. -* gnutls/gl/rename.c (MoveFileEx): Likewise. -* gnutls/gl/rewinddir.c (FindFirstFile): Likewise. -* gnutls/gl/select.c (GetModuleHandle, PeekConsoleInput, CreateEvent, -PeekMessage, DispatchMessage): Likewise. -* gnutls/gl/sethostname.c (GetComputerNameEx, SetComputerNameEx): Likewise. -* gnutls/gl/socket.c (WSASocket): Likewise. -* gnutls/gl/stat-w32.c (LoadLibrary, GetFinalPathNameByHandle): Likewise. -* gnutls/gl/stat.c (WIN32_FIND_DATA, CreateFile, FindFirstFile): Likewise. -* gnutls/gl/stdio-read.c (GetNamedPipeHandleState): Likewise. -* gnutls/gl/stdio-write.c (GetNamedPipeHandleState): Likewise. -* gnutls/gl/tmpdir.c (GetTempPath): Likewise. -* gnutls/gl/tmpfile.c (OSVERSIONINFO, GetVersionEx, GetTempPath): Likewise. -* gnutls/gl/uname.c (OSVERSIONINFO, GetVersionEx): Likewise. -* gnutls/gl/utime.c (CreateFile, GetFileAttributes): Likewise. -* gnutls/gl/windows-cond.c (CreateEvent): Likewise. -* gnutls/gl/windows-rwlock.c (CreateEvent): Likewise. -* gnutls/gl/windows-timedmutex.c (CreateEvent): Likewise. -* gnutls/gl/windows-timedrecmutex.c (CreateEvent): Likewise. -* gnutls/gl/windows-timedrwlock.c (CreateEvent): Likewise. -* gnutls/gl/write.c (GetNamedPipeHandleState): Likewise. ---- - gnutls/gl/gettimeofday.c | 4 +++ - gnutls/gl/stat-w32.c | 6 +++++ - gnutls/gl/stat.c | 7 ++++++ - 40 files changed, 279 insertions(+), 27 deletions(-) - -diff --git gnutls/gl/gettimeofday.c gnutls/gl/gettimeofday.c -index 93914ba92..305ab984e 100644 ---- gnutls/gl/gettimeofday.c -+++ gnutls/gl/gettimeofday.c -@@ -33,6 +33,10 @@ - - #ifdef WINDOWS_NATIVE - -+/* Don't assume that UNICODE is not defined. */ -+# undef LoadLibrary -+# define LoadLibrary LoadLibraryA -+ - # if !(_WIN32_WINNT >= _WIN32_WINNT_WIN8) - - /* Avoid warnings from gcc -Wcast-function-type. */ -diff --git gnutls/gl/stat-w32.c gnutls/gl/stat-w32.c -index cca12dd9c..19bdfaa37 100644 ---- gnutls/gl/stat-w32.c -+++ gnutls/gl/stat-w32.c -@@ -40,6 +40,12 @@ - #include "pathmax.h" - #include "verify.h" - -+/* Don't assume that UNICODE is not defined. */ -+#undef LoadLibrary -+#define LoadLibrary LoadLibraryA -+#undef GetFinalPathNameByHandle -+#define GetFinalPathNameByHandle GetFinalPathNameByHandleA -+ - #if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA) - - /* Avoid warnings from gcc -Wcast-function-type. */ -diff --git gnutls/gl/stat.c gnutls/gl/stat.c -index e074e6a0a..9d3965d3c 100644 ---- gnutls/gl/stat.c -+++ gnutls/gl/stat.c -@@ -65,6 +65,13 @@ orig_stat (const char *filename, struct stat *buf) - # define WIN32_LEAN_AND_MEAN - # include - # include "stat-w32.h" -+/* Don't assume that UNICODE is not defined. */ -+# undef WIN32_FIND_DATA -+# define WIN32_FIND_DATA WIN32_FIND_DATAA -+# undef CreateFile -+# define CreateFile CreateFileA -+# undef FindFirstFile -+# define FindFirstFile FindFirstFileA - #endif - - #ifdef WINDOWS_NATIVE --- -2.26.0.windows.1 - diff -Nru vlc-3.0.21/contrib/src/gnutls/0001-explicit_bzero-Do-not-call-SecureZeroMemory-on-UWP-b.patch vlc-3.0.22/contrib/src/gnutls/0001-explicit_bzero-Do-not-call-SecureZeroMemory-on-UWP-b.patch --- vlc-3.0.21/contrib/src/gnutls/0001-explicit_bzero-Do-not-call-SecureZeroMemory-on-UWP-b.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/0001-explicit_bzero-Do-not-call-SecureZeroMemory-on-UWP-b.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From 3c950e27a8d20603f100bf21d402f74355a495c1 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Mon, 8 Jun 2020 16:07:59 +0200 -Subject: [PATCH] explicit_bzero: Do not call SecureZeroMemory on UWP builds - -The call is forbidden: -https://docs.microsoft.com/en-us/previous-versions/windows/desktop/legacy/aa366877(v=vs.85) - -It's considered a legacy API and is implemented as an always inline function. - -There is no good replacement API that is available in UWP. - -Signed-off-by: Steve Lhomme ---- - gnutls/gl/explicit_bzero.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git gnutls/gl/explicit_bzero.c gnutls/gl/explicit_bzero.c -index b1df418e5..3b8cc4ea4 100644 ---- gnutls/gl/explicit_bzero.c -+++ gnutls/gl/explicit_bzero.c -@@ -35,6 +35,9 @@ - #if defined _WIN32 && !defined __CYGWIN__ - # define WIN32_LEAN_AND_MEAN - # include -+# if !defined WINAPI_FAMILY || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+# define USE_SECURE_ZERO_MEMORY -+# endif - #endif - - #if _LIBC -@@ -48,7 +51,7 @@ - void - explicit_bzero (void *s, size_t len) - { --#if defined _WIN32 && !defined __CYGWIN__ -+#if defined USE_SECURE_ZERO_MEMORY - (void) SecureZeroMemory (s, len); - #elif HAVE_EXPLICIT_MEMSET - explicit_memset (s, '\0', len); --- -2.26.0.windows.1 - diff -Nru vlc-3.0.21/contrib/src/gnutls/0001-fix-mingw64-detection.patch vlc-3.0.22/contrib/src/gnutls/0001-fix-mingw64-detection.patch --- vlc-3.0.21/contrib/src/gnutls/0001-fix-mingw64-detection.patch 2021-10-30 12:43:45.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/0001-fix-mingw64-detection.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -From f42ec27a26433902c098cf82f7b38d93ca579869 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 23 Sep 2021 09:03:50 +0200 -Subject: [PATCH] fix mingw64 detection - -__MINGW64__ is only defined for 64 bits builds of mingw64 [1]. -The intended test what to only use the CertEnumCRLsInStoreFunc via LoadLibrary -for some ancient mingw32 build and never for mingw64. - -__MINGW64_VERSION_MAJOR is a proper define to identify mingw64 against mingw32. - -[1] https://sourceforge.net/p/predef/wiki/Compilers/ - -Co-authored-by: Johannes Kauffmann - -Signed-off-by: Steve Lhomme ---- - lib/system.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/system.h b/lib/system.h -index 1e8ca7d07..e15c8cd33 100644 ---- a/lib/system.h -+++ b/lib/system.h -@@ -29,7 +29,7 @@ - #include - - #ifdef _WIN32 --# if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20 -+# if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20 - # define NEED_CERT_ENUM_CRLS - typedef PCCRL_CONTEXT WINAPI(*CertEnumCRLsInStoreFunc) (HCERTSTORE - hCertStore, --- -2.27.0.windows.1 - diff -Nru vlc-3.0.21/contrib/src/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch vlc-3.0.22/contrib/src/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch --- vlc-3.0.21/contrib/src/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -From 1796cda9975bd459a87222676030b943869c686e Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Wed, 16 Sep 2020 23:51:52 +0200 -Subject: [PATCH] stat, fstat: Fix when compiling for versions older than - Windows Vista. - -Reported by Eli Zaretskii in -. - -* lib/stat-w32.c: Include . Test the value of _WIN32_WINNT -that was originally set before we redefined it. -* m4/stat.m4 (gl_PREREQ_STAT_W32): New macro. -(gl_PREREQ_STAT): Require it. -* m4/fstat.m4 (gl_PREREQ_FSTAT): Likewise. ---- - gnutls/gl/stat-w32.c | 24 ++++++++++++++++++------ - 4 files changed, 43 insertions(+), 8 deletions(-) - -diff --git gnutls/gl/lib/stat-w32.c gnutls/gl/lib/stat-w32.c -index 19bdfaa37..72442e933 100644 ---- gnutls/gl/stat-w32.c -+++ gnutls/gl/stat-w32.c -@@ -20,10 +20,22 @@ - - #if defined _WIN32 && ! defined __CYGWIN__ - --/* Ensure that defines FILE_ID_INFO. */ --#if !defined _WIN32_WINNT || (_WIN32_WINNT < _WIN32_WINNT_WIN8) --# undef _WIN32_WINNT --# define _WIN32_WINNT _WIN32_WINNT_WIN8 -+/* Attempt to make define FILE_ID_INFO. -+ But ensure that the redefinition of _WIN32_WINNT does not make us assume -+ Windows Vista or newer when building for an older version of Windows. */ -+#if HAVE_SDKDDKVER_H -+# include -+# if _WIN32_WINNT >= _WIN32_WINNT_VISTA -+# define WIN32_ASSUME_VISTA 1 -+# else -+# define WIN32_ASSUME_VISTA 0 -+# endif -+# if !defined _WIN32_WINNT || (_WIN32_WINNT < _WIN32_WINNT_WIN8) -+# undef _WIN32_WINNT -+# define _WIN32_WINNT _WIN32_WINNT_WIN8 -+# endif -+#else -+# define WIN32_ASSUME_VISTA (_WIN32_WINNT >= _WIN32_WINNT_VISTA) - #endif - - #include -@@ -46,7 +58,7 @@ - #undef GetFinalPathNameByHandle - #define GetFinalPathNameByHandle GetFinalPathNameByHandleA - --#if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA) -+#if !WIN32_ASSUME_VISTA - - /* Avoid warnings from gcc -Wcast-function-type. */ - # define GetProcAddress \ -@@ -149,7 +161,7 @@ _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf) - DWORD type = GetFileType (h); - if (type == FILE_TYPE_DISK) - { --#if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA) -+#if !WIN32_ASSUME_VISTA - if (!initialized) - initialize (); - #endif diff -Nru vlc-3.0.21/contrib/src/gnutls/0001-windows-Avoid-Wint-conversion-errors.patch vlc-3.0.22/contrib/src/gnutls/0001-windows-Avoid-Wint-conversion-errors.patch --- vlc-3.0.21/contrib/src/gnutls/0001-windows-Avoid-Wint-conversion-errors.patch 2022-08-24 17:42:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/0001-windows-Avoid-Wint-conversion-errors.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -From 88d79b964d88730e316919d6ccd17ca0fe9b3244 Mon Sep 17 00:00:00 2001 -From: Martin Storsjo -Date: Mon, 15 Aug 2022 23:50:16 +0300 -Subject: [PATCH] windows: 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; - ^ ~~~~ - -Signed-off-by: Martin Storsjo ---- - lib/system/keys-win.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lib/system/keys-win.c b/lib/system/keys-win.c -index 4463c3b2d7..a0fffe249e 100644 ---- a/lib/system/keys-win.c -+++ b/lib/system/keys-win.c -@@ -254,7 +254,7 @@ int capi_sign(gnutls_privkey_t key, void *userdata, - { - priv_st *priv = (priv_st *) userdata; - ALG_ID Algid; -- HCRYPTHASH hHash = NULL; -+ HCRYPTHASH hHash = 0; - uint8_t digest[MAX_HASH_SIZE]; - unsigned int digest_size; - gnutls_digest_algorithm_t algo; -@@ -441,7 +441,7 @@ static - int privkey_import_capi(gnutls_privkey_t pkey, const char *url, - priv_st *priv, CRYPT_KEY_PROV_INFO *kpi) - { -- HCRYPTPROV hCryptProv = NULL; -+ HCRYPTPROV hCryptProv = 0; - int ret, enc_too = 0; - DWORD i, dwErrCode = 0; - -@@ -702,7 +702,7 @@ int privkey_import_ncrypt(gnutls_privkey_t pkey, const char *url, - priv_st *priv, CRYPT_KEY_PROV_INFO *kpi, NCRYPT_PROV_HANDLE *sctx) - { - SECURITY_STATUS r; -- NCRYPT_KEY_HANDLE nc = NULL; -+ NCRYPT_KEY_HANDLE nc = 0; - int ret, enc_too = 0; - WCHAR algo_str[64]; - DWORD algo_str_size = 0; -@@ -786,7 +786,7 @@ int _gnutls_privkey_import_system_url(gnutls_privkey_t pkey, const char *url) - const CERT_CONTEXT *cert = NULL; - CRYPT_HASH_BLOB blob; - CRYPT_KEY_PROV_INFO *kpi = NULL; -- NCRYPT_PROV_HANDLE sctx = NULL; -+ NCRYPT_PROV_HANDLE sctx = 0; - DWORD kpi_size; - SECURITY_STATUS r; - int ret; --- -2.25.1 - diff -Nru vlc-3.0.21/contrib/src/gnutls/SHA512SUMS vlc-3.0.22/contrib/src/gnutls/SHA512SUMS --- vlc-3.0.21/contrib/src/gnutls/SHA512SUMS 2022-07-23 08:04:37.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -72c78d7fcb024393c1d15f2a1856608ae4460ba43cc5bbbb4c29b80508cae6cb822df4638029de2363437d110187e0a3cc19a7288c3b2f44b2f648399a028438 gnutls-3.6.16.tar.xz +d453bd4527af95cb3905ce8753ceafd969e3f442ad1d148544a233ebf13285b999930553a805a0511293cc25390bb6a040260df5544a7c55019640f920ad3d92 gnutls-3.8.10.tar.xz diff -Nru vlc-3.0.21/contrib/src/gnutls/__faccessat-darwin.patch vlc-3.0.22/contrib/src/gnutls/__faccessat-darwin.patch --- vlc-3.0.21/contrib/src/gnutls/__faccessat-darwin.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/__faccessat-darwin.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,17 @@ +--- gnutls/gl/canonicalize-lgpl.c.orig 2024-01-16 10:15:15.000000000 +0100 ++++ gnutls/gl/canonicalize-lgpl.c 2024-11-18 09:49:49.355493000 +0100 +@@ -100,7 +100,13 @@ + static bool + file_accessible (char const *file) + { +-# if defined _LIBC || HAVE_FACCESSAT ++# if defined(__APPLE__) ++ if (__builtin_available(macOS 10.10, iOS 8.0, *)) { ++ return faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; ++ } ++ struct stat st; ++ return stat (file, &st) == 0 || errno == EOVERFLOW; ++# elif defined _LIBC || HAVE_FACCESSAT + return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; + # else + struct stat st; diff -Nru vlc-3.0.21/contrib/src/gnutls/gnutls-fix-aarch64-compilation-appleos.patch vlc-3.0.22/contrib/src/gnutls/gnutls-fix-aarch64-compilation-appleos.patch --- vlc-3.0.21/contrib/src/gnutls/gnutls-fix-aarch64-compilation-appleos.patch 2022-05-24 20:36:20.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/gnutls-fix-aarch64-compilation-appleos.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -diff -ru gnutls/lib/accelerated/aarch64/Makefile.in gnutls/lib/accelerated/aarch64/Makefile.in ---- gnutls/lib/accelerated/aarch64/Makefile.in 2021-05-24 10:05:49.000000000 +0200 -+++ gnutls/lib/accelerated/aarch64/Makefile.in 2022-03-28 15:06:23.000000000 +0200 -@@ -1634,7 +1634,7 @@ - -I$(srcdir)/../../ -I$(srcdir)/../ $(am__append_1) - - #ensure that we have all aarch64 instruction sets enabled for the assembler --AM_CCASFLAGS = -Wa,-march=all -+AM_CCASFLAGS = -Wa - EXTRA_DIST = README - noinst_LTLIBRARIES = libaarch64.la - libaarch64_la_SOURCES = aarch64-common.c aarch64-common.h \ diff -Nru vlc-3.0.21/contrib/src/gnutls/gnutls-fix-mangling.patch vlc-3.0.22/contrib/src/gnutls/gnutls-fix-mangling.patch --- vlc-3.0.21/contrib/src/gnutls/gnutls-fix-mangling.patch 2020-07-27 08:31:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/gnutls-fix-mangling.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- gnutls/lib/nettle/ecc/ecc-internal.h.ecc_random 2020-06-03 15:05:27.000000000 +0200 -+++ gnutls/lib/nettle/ecc/ecc-internal.h 2020-06-04 16:31:00.523456500 +0200 -@@ -71,6 +71,8 @@ - #define ecc_mul_g_eh _gnutls_nettle_ecc_ecc_mul_g_eh - #define ecc_mul_a_eh _gnutls_nettle_ecc_ecc_mul_a_eh - #define ecc_mul_m _gnutls_nettle_ecc_ecc_mul_m -+#undef ecc_scalar_random -+#define ecc_scalar_random _gnutls_nettle_ecc_scalar_random - #define cnd_copy _gnutls_nettle_ecc_cnd_copy - #define sec_add_1 _gnutls_nettle_ecc_sec_add_1 - #define sec_sub_1 _gnutls_nettle_ecc_sec_sub_1 diff -Nru vlc-3.0.21/contrib/src/gnutls/rules.mak vlc-3.0.22/contrib/src/gnutls/rules.mak --- vlc-3.0.21/contrib/src/gnutls/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gnutls/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,13 +1,25 @@ # GnuTLS -GNUTLS_VERSION := 3.6.16 -GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz +GNUTLS_MAJVERSION := 3.8 +GNUTLS_VERSION := $(GNUTLS_MAJVERSION).10 +GNUTLS_URL := $(GNUGPG)/gnutls/v$(GNUTLS_MAJVERSION)/gnutls-$(GNUTLS_VERSION).tar.xz + +# nettle/gmp can't be used with the LGPLv2 license +ifdef GPL +GNUTLS_PKG=1 +else +ifdef GNUV3 +GNUTLS_PKG=1 +endif +endif ifdef BUILD_NETWORK ifndef HAVE_DARWIN_OS +ifdef GNUTLS_PKG PKGS += gnutls endif endif +endif ifeq ($(call need_pkg,"gnutls >= 3.3.6"),) PKGS_FOUND += gnutls endif @@ -19,37 +31,25 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls $(UNPACK) - $(APPLY) $(SRC)/gnutls/gnutls-fix-mangling.patch - - # backport gnulib patch - $(APPLY) $(SRC)/gnutls/0001-Don-t-assume-that-UNICODE-is-not-defined.patch - # fix forbidden UWP call which can't be upstreamed as they won't # differentiate for winstore, only _WIN32_WINNT $(APPLY) $(SRC)/gnutls/0001-fcntl-do-not-call-GetHandleInformation-in-Winstore-a.patch - # forbidden RtlSecureZeroMemory call in winstore builds - $(APPLY) $(SRC)/gnutls/0001-explicit_bzero-Do-not-call-SecureZeroMemory-on-UWP-b.patch - - # Don't use functions available starting with windows vista - $(APPLY) $(SRC)/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch - # disable the dllimport in static linking (pkg-config --static doesn't handle Cflags.private) - cd $(UNPACK_DIR) && sed -i.orig -e s/"_SYM_EXPORT __declspec(dllimport)"/"_SYM_EXPORT"/g lib/includes/gnutls/gnutls.h.in + sed -i.orig -e s/"_SYM_EXPORT __declspec(dllimport)"/"_SYM_EXPORT"/g $(UNPACK_DIR)/lib/includes/gnutls/gnutls.h.in - # fix i686 UWP builds as they were using CertEnumCRLsInStore via invalid LoadLibrary - $(APPLY) $(SRC)/gnutls/0001-fix-mingw64-detection.patch + # disable __faccessat usage on Darwin as it's not available on our minimum target + $(APPLY) $(SRC)/gnutls/__faccessat-darwin.patch - $(call pkg_static,"lib/gnutls.pc.in") + # replace HANDLE_FLAG_INHERIT which may not be available in older UWP + sed -i.orig -e s/HANDLE_FLAG_INHERIT/0x1/g $(UNPACK_DIR)/gl/fcntl.c - # fix AArch64 builds for Apple OS by removing unsupported compiler flag (gnutls#1347, gnutls#1317) -ifdef HAVE_DARWIN_OS - $(APPLY) $(SRC)/gnutls/gnutls-fix-aarch64-compilation-appleos.patch -endif + $(call pkg_static,"lib/gnutls.pc.in") - $(APPLY) $(SRC)/gnutls/0001-windows-Avoid-Wint-conversion-errors.patch + # use CreateFile2 in Win8 as CreateFileW is forbidden in UWP + $(APPLY) $(SRC)/gnutls/0001-Use-CreateFile2-in-UWP-builds.patch - $(UPDATE_AUTOCONFIG) + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux $(MOVE) GNUTLS_CONF := \ @@ -66,20 +66,16 @@ --disable-tools \ --disable-tests \ --with-included-libtasn1 \ - --with-included-unistring \ - $(HOSTCONF) - -GNUTLS_ENV := $(HOSTVARS) + --with-included-unistring DEPS_gnutls = nettle $(DEPS_nettle) - -ifdef HAVE_ANDROID -GNUTLS_ENV += gl_cv_header_working_stdint_h=yes -endif ifdef HAVE_WINSTORE -ifeq ($(ARCH),x86_64) - GNUTLS_CONF += --disable-hardware-acceleration +# gnulib uses GetFileInformationByHandle / SecureZeroMemory +DEPS_gnutls += alloweduwp $(DEPS_alloweduwp) endif + +ifdef HAVE_ANDROID +GNUTLS_ENV := gl_cv_header_working_stdint_h=yes endif ifdef HAVE_WIN32 GNUTLS_CONF += --without-idn @@ -90,7 +86,7 @@ endif .gnutls: gnutls - cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF) - cd $< && $(MAKE) -C gl install - cd $< && $(MAKE) -C lib install + $(GNUTLS_ENV) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GNUTLS_CONF) + $(MAKE) -C $< -C gl install + $(MAKE) -C $< -C lib install touch $@ diff -Nru vlc-3.0.21/contrib/src/goom/rules.mak vlc-3.0.22/contrib/src/goom/rules.mak --- vlc-3.0.21/contrib/src/goom/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/goom/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -16,6 +16,7 @@ goom: goom-$(GOOM_VERSION)-src.tar.gz .sum-goom $(UNPACK) mv goom2k4-0 goom-2k4-0-src + $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/goom/goom2k4-0-memleaks.patch $(APPLY) $(SRC)/goom/goom2k4-autotools.patch $(APPLY) $(SRC)/goom/goom2k4-noxmmx.patch @@ -32,5 +33,5 @@ .goom: goom $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-glibtest --disable-gtktest - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/gpg-error/darwin-triplet.patch vlc-3.0.22/contrib/src/gpg-error/darwin-triplet.patch --- vlc-3.0.21/contrib/src/gpg-error/darwin-triplet.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/gpg-error/darwin-triplet.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,19 +1,11 @@ -diff --git a/src/mkheader.c b/src/mkheader.c -index 5aeb1e7..121d029 100644 ---- a/src/mkheader.c -+++ b/src/mkheader.c -@@ -91,23 +91,41 @@ canon_host_triplet (const char *triplet) - {"armv5-unknown-linux-musleabi" }, - {"armv6-unknown-linux-musleabihf" }, - -+ {"armv7-apple-darwin", "arm-apple-darwin"}, -+ - { NULL } - }; - int i; - const char *lastalias = NULL; - -+ /* Darwin triplet de-versioning */ +--- libgpg-error-1.27_orig/src/mkheader.c 2017-02-28 13:32:33.000000000 +0100 ++++ libgpg-error-1.27/src/mkheader.c 2020-01-23 11:36:50.000000000 +0100 +@@ -107,7 +107,21 @@ + return xstrdup (lastalias); + } + } +- return xstrdup (triplet); ++ /* Darwin triplet de-versioning */ + char *res_triplet = xstrdup (triplet); + + char *triplet_last = strrchr(res_triplet, '-'); @@ -27,20 +19,7 @@ + triplet_last[6] = '\0'; + } + - for (i=0; tbl[i].name; i++) - { - if (tbl[i].alias) - lastalias = tbl[i].alias; -- if (!strcmp (tbl[i].name, triplet)) -+ if (!strcmp (tbl[i].name, res_triplet)) - { - if (!lastalias) - break; /* Ooops: first entry has no alias. */ -+ free(res_triplet); - return xstrdup (lastalias); - } - } -- return xstrdup (triplet); -+ + return res_triplet; } + + diff -Nru vlc-3.0.21/contrib/src/gpg-error/rules.mak vlc-3.0.22/contrib/src/gpg-error/rules.mak --- vlc-3.0.21/contrib/src/gpg-error/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gpg-error/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ # GPGERROR GPGERROR_VERSION := 1.27 -GPGERROR_URL := https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2 +GPGERROR_URL := $(GNUGPG)/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2 $(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2: $(call download_pkg,$(GPGERROR_URL),gpg-error) @@ -13,17 +13,30 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error $(UNPACK) -ifdef HAVE_WIN32 + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux $(APPLY) $(SRC)/gpg-error/windres-make.patch -ifdef HAVE_WINSTORE $(APPLY) $(SRC)/gpg-error/winrt.patch -endif -endif $(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch $(APPLY) $(SRC)/gpg-error/no-executable.patch $(APPLY) $(SRC)/gpg-error/win32-unicode.patch $(APPLY) $(SRC)/gpg-error/version-bump-gawk-5.patch $(APPLY) $(SRC)/gpg-error/win32-extern-struct.patch + $(APPLY) $(SRC)/gpg-error/darwin-triplet.patch +ifndef HAVE_WIN32 + cp -f -- "$(SRC)/gpg-error/lock-obj-pub.posix.h" \ + "$(UNPACK_DIR)/src/lock-obj-pub.native.h" +endif + # gpg-error doesn't know about mingw32uwp but it's the same as mingw32 + cp -f -- "$(UNPACK_DIR)/src/syscfg/lock-obj-pub.mingw32.h" \ + "$(UNPACK_DIR)/src/syscfg/lock-obj-pub.mingw32uwp.h" + $(APPLY) $(SRC)/gpg-error/gpg-error-uwp-fix.patch + + # use CreateFile2 in Win8 as CreateFileW is forbidden in UWP + $(APPLY) $(SRC)/gpg-error/gpg-error-createfile2.patch + + # don't use GetFileSize on UWP + $(APPLY) $(SRC)/gpg-error/gpg-error-uwp-GetFileSize.patch + $(MOVE) ifdef HAVE_ANDROID ifeq ($(ARCH),aarch64) @@ -38,20 +51,16 @@ cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.linux-gnueabi.h endif endif -ifdef HAVE_DARWIN_OS -ifdef HAVE_ARMV7A - cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h -else -ifeq ($(ARCH),aarch64) - cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h -else - cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h -endif -endif -endif + +GPGERROR_CONF := \ + --disable-nls \ + --disable-languages \ + --disable-tests \ + --disable-doc .gpg-error: libgpg-error $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-nls --disable-shared --disable-languages --disable-tests - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GPGERROR_CONF) + # pre_mkheader_cmds would delete our lock-obj-pub-native.h + $(MAKE) -C $< pre_mkheader_cmds=true install touch $@ diff -Nru vlc-3.0.21/contrib/src/growl/rules.mak vlc-3.0.22/contrib/src/growl/rules.mak --- vlc-3.0.21/contrib/src/growl/rules.mak 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/growl/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -4,8 +4,11 @@ GROWL_URL := https://download.videolan.org/contrib/GrowlSDK-$(GROWL_VERSION)-src.tar.gz ifdef HAVE_MACOSX +# fails to build on newer SDK because of missing libarclite (found in 13.1, missing in 13.3 from XCode 14.3) +ifeq ($(call darwin_sdk_at_most, 13.1), true) PKGS += growl endif +endif $(TARBALLS)/GrowlSDK-$(GROWL_VERSION)-src.tar.gz: $(call download_pkg,$(GROWL_URL),growl) diff -Nru vlc-3.0.21/contrib/src/gsm/rules.mak vlc-3.0.22/contrib/src/gsm/rules.mak --- vlc-3.0.21/contrib/src/gsm/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/gsm/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -16,7 +16,7 @@ $(MOVE) .gsm: gsm - cd $< && $(HOSTVARS_PIC) $(MAKE) + $(HOSTVARS_PIC) $(MAKE) -C $< mkdir -p "$(PREFIX)/include/gsm" "$(PREFIX)/lib" cp $ -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.21/contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch vlc-3.0.22/contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch --- vlc-3.0.21/contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch 2022-05-31 16:10:59.000000000 +0000 +++ vlc-3.0.22/contrib/src/harfbuzz/0001-meson-Enable-big-objects-support-when-building-for-w.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From 38c155bd1edc9773fea287fcc80659f25d1b21eb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= -Date: Wed, 19 Jan 2022 11:53:02 +0100 -Subject: [PATCH] meson: Enable big objects support when building for windows - -Fix cross compilation when targetting win64 ---- - meson.build | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/meson.build b/meson.build -index 41344b3a3..8fb68f296 100644 ---- a/meson.build -+++ b/meson.build -@@ -57,6 +57,12 @@ if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') != - endif - endif - -+if host_machine.system() == 'windows' -+ add_project_arguments(cpp.get_supported_arguments([ -+ '-Wa,-mbig-obj' -+ ]), language : 'cpp') -+endif -+ - check_headers = [ - ['unistd.h'], - ['sys/mman.h'], --- -2.34.1 - diff -Nru vlc-3.0.21/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch vlc-3.0.22/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch --- vlc-3.0.21/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/contrib/src/harfbuzz/0002-Disable-Wcast-function-type-strict.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -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.21/contrib/src/harfbuzz/SHA512SUMS vlc-3.0.22/contrib/src/harfbuzz/SHA512SUMS --- vlc-3.0.21/contrib/src/harfbuzz/SHA512SUMS 2022-05-31 16:10:59.000000000 +0000 +++ vlc-3.0.22/contrib/src/harfbuzz/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -f300d041aa4af8f7957d5b352af399b9e411804a33ac710b3728247e23a02b867514537cc2b6fcf00746e71ac7a5a2a4b1392253bb5a888baa39b8a0193144c0 harfbuzz-3.4.0.tar.xz +94f2e8fcaede877ef869e9c71ea075af581210f7b05cf516c3bad768351a1c6b7df9a61022ec075b5f2c952cca3b9294a3b674ffd21b1604426b5a8e1693a022 harfbuzz-11.5.0.tar.xz diff -Nru vlc-3.0.21/contrib/src/harfbuzz/rules.mak vlc-3.0.22/contrib/src/harfbuzz/rules.mak --- vlc-3.0.21/contrib/src/harfbuzz/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/harfbuzz/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ # HARFBUZZ -HARFBUZZ_VERSION := 3.4.0 +HARFBUZZ_VERSION := 11.5.0 HARFBUZZ_URL := $(GITHUB)/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz PKGS += harfbuzz ifeq ($(call need_pkg,"harfbuzz"),) @@ -14,9 +14,6 @@ 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) @@ -32,7 +29,7 @@ endif .harfbuzz: harfbuzz crossfile.meson - cd $< && rm -rf ./build - cd $< && $(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF) build - cd $< && cd build && ninja install + $(MESONCLEAN) + $(MESON) $(HARFBUZZ_CONF) + +$(MESONBUILD) touch $@ diff -Nru vlc-3.0.21/contrib/src/iconv/0001-Use-CreateFile2-in-UWP-builds.patch vlc-3.0.22/contrib/src/iconv/0001-Use-CreateFile2-in-UWP-builds.patch --- vlc-3.0.21/contrib/src/iconv/0001-Use-CreateFile2-in-UWP-builds.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/iconv/0001-Use-CreateFile2-in-UWP-builds.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -From a74b2ef0f17b300c7cdf2f0d45a2d78a6b4c52d8 Mon Sep 17 00:00:00 2001 +From 8425c77fe89d66cd8d5411d0ccd14c688de1416a Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Tue, 16 May 2023 09:40:34 +0200 -Subject: [PATCH 1/3] Use CreateFile2 in UWP builds +Subject: [PATCH] Use CreateFile2 in UWP builds CreateFileA and CreateFileW are forbidden calls in UWP. CreateFile2 is close enough, some parameters are passed in a structure @@ -12,20 +12,18 @@ [1] https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stat-functions [2] https://learn.microsoft.com/en-us/windows/win32/api/stringapiset/nf-stringapiset-multibytetowidechar#parameters --- - lib/spawni.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/stat.c | 35 +++++++++++++++++++++++++++++++++++ - lib/utime.c | 35 +++++++++++++++++++++++++++++++++++ - 3 files changed, 120 insertions(+) + lib/stat.c | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) diff --git a/srclib/stat.c b/srclib/stat.c -index 7987e26583..d25f632967 100644 +index 7987e26583..f0e95a27dc 100644 --- a/srclib/stat.c +++ b/srclib/stat.c @@ -197,6 +197,7 @@ rpl_stat (char const *name, struct stat *buf) { /* Approach based on the file. */ -+# if !(_WIN32_WINNT >= _WIN32_WINNT_WIN8) ++# if !defined WINAPI_FAMILY || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) /* Open a handle to the file. CreateFile @@ -33,7 +31,7 @@ filesystem operations. */ FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */, NULL); -+# else /* _WIN32_WINNT_WIN8 */ ++# else + /* Only CreateFile2 is available in UWP builds. + + */ @@ -52,7 +50,7 @@ + /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only + in case as different) makes sense only when applied to *all* + filesystem operations. */ -+ createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */; ++ createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS; + createExParams.dwSecurityQosFlags = 0; + createExParams.lpSecurityAttributes = NULL; + createExParams.hTemplateFile = NULL; @@ -66,7 +64,7 @@ + freea(wrname); + } + } -+# endif /* _WIN32_WINNT_WIN8 */ ++# endif if (h != INVALID_HANDLE_VALUE) { ret = _gl_fstat_by_handle (h, rname, buf); diff -Nru vlc-3.0.21/contrib/src/iconv/0001-do-not-call-GetHandleInformation-in-Winstore-apps.patch vlc-3.0.22/contrib/src/iconv/0001-do-not-call-GetHandleInformation-in-Winstore-apps.patch --- vlc-3.0.21/contrib/src/iconv/0001-do-not-call-GetHandleInformation-in-Winstore-apps.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/iconv/0001-do-not-call-GetHandleInformation-in-Winstore-apps.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,41 @@ +From c934bfdfc343fbb4d84e59a339cde57b30779581 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 4 Jun 2020 10:15:38 +0200 +Subject: [PATCH] do not call GetHandleInformation() in Winstore apps + +The API is forbidden [1] and HANDLE_FLAG_INHERIT would never be set as exec() +is not allowed either [2]. + +[1] https://docs.microsoft.com/en-us/windows/win32/api/handleapi/nf-handleapi-gethandleinformation +[2] https://docs.microsoft.com/en-us/cpp/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps +--- + lib/fcntl.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/srclib/fcntl.c b/srclib/fcntl.c +index e220800845..c95322b2d4 100644 +--- a/srclib/fcntl.c ++++ b/srclib/fcntl.c +@@ -45,6 +45,19 @@ + # include + # endif + ++# if defined WINAPI_FAMILY && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) ++/* GetHandleInformation is not available in UWP, the flags it would provide ++ are also not available, so we just return 0. ++ ++ */ ++static inline BOOL GetHandleInformation(HANDLE h, DWORD *pf) ++{ ++ *pf = 0; ++ return TRUE; ++} ++# define HANDLE_FLAG_INHERIT (1) ++# endif /* WINAPI_PARTITION_DESKTOP */ ++ + /* Upper bound on getdtablesize(). See lib/getdtablesize.c. */ + # define OPEN_MAX_MAX 0x10000 + +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/iconv/SHA512SUMS vlc-3.0.22/contrib/src/iconv/SHA512SUMS --- vlc-3.0.21/contrib/src/iconv/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/iconv/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a libiconv-1.15.tar.gz +18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 libiconv-1.17.tar.gz \ No newline at end of file diff -Nru vlc-3.0.21/contrib/src/iconv/bins.patch vlc-3.0.22/contrib/src/iconv/bins.patch --- vlc-3.0.21/contrib/src/iconv/bins.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/iconv/bins.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,8 +1,8 @@ ---- iconv/Makefile.in 2015-10-10 08:51:48.738445600 +0200 -+++ iconv/stripped.Makefile.in 2015-10-10 08:52:35.541832900 +0200 -@@ -33,10 +33,6 @@ all : lib/localcharset.h force +--- libiconv-1.16/Makefile.in.orig 2019-01-27 23:07:13.000000000 +0100 ++++ libiconv-1.16/Makefile.in 2022-02-20 16:44:11.883655999 +0100 +@@ -32,10 +32,6 @@ + all : lib/localcharset.h force cd lib && $(MAKE) all - cd preload && $(MAKE) all cd srclib && $(MAKE) all - cd src && $(MAKE) all - cd po && $(MAKE) all @@ -11,10 +11,10 @@ lib/localcharset.h : builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" -@@ -52,52 +48,32 @@ install : lib/localcharset.h force +@@ -50,58 +46,34 @@ + install : lib/localcharset.h force cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd preload && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd srclib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd src && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi @@ -25,7 +25,6 @@ install-strip : lib/localcharset.h force cd libcharset && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' cd lib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd preload && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd srclib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd src && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi @@ -36,7 +35,6 @@ installdirs : force cd libcharset && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' cd lib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd preload && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd srclib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd src && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi @@ -46,7 +44,6 @@ uninstall : force cd libcharset && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' cd lib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd preload && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd srclib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - cd src && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' $(RM) $(DESTDIR)$(includedir)/iconv.h @@ -56,7 +53,6 @@ check : all force cd libcharset && $(MAKE) check cd lib && $(MAKE) check - cd preload && $(MAKE) check - cd srclib && $(MAKE) check - cd src && $(MAKE) check - cd po && $(MAKE) check @@ -64,10 +60,9 @@ if test -d tests; then cd tests && $(MAKE) check; fi mostlyclean : force -@@ -105,10 +81,6 @@ mostlyclean : force - $(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h + cd libcharset && $(MAKE) mostlyclean + $(RM) lib/libcharset.* lib/localcharset.h cd lib && $(MAKE) mostlyclean - cd preload && $(MAKE) mostlyclean - cd srclib && $(MAKE) mostlyclean - cd src && $(MAKE) mostlyclean - cd po && $(MAKE) mostlyclean @@ -75,10 +70,10 @@ if test -d tests; then cd tests && $(MAKE) mostlyclean; fi rm -rf bin -@@ -117,10 +89,6 @@ clean : force - $(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h +@@ -109,10 +81,6 @@ + cd libcharset && $(MAKE) clean + $(RM) lib/libcharset.* lib/localcharset.h cd lib && $(MAKE) clean - cd preload && $(MAKE) clean - cd srclib && $(MAKE) clean - cd src && $(MAKE) clean - cd po && $(MAKE) clean @@ -86,10 +81,10 @@ if test -d tests; then cd tests && $(MAKE) clean; fi rm -rf bin -@@ -129,10 +97,6 @@ distclean : force - $(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h +@@ -120,10 +88,6 @@ + cd libcharset && if test -f Makefile; then $(MAKE) distclean; fi + $(RM) lib/libcharset.* lib/localcharset.h cd lib && if test -f Makefile; then $(MAKE) distclean; fi - cd preload && if test -f Makefile; then $(MAKE) distclean; fi - cd srclib && if test -f Makefile; then $(MAKE) distclean; fi - cd src && if test -f Makefile; then $(MAKE) distclean; fi - cd po && if test -f Makefile; then $(MAKE) distclean; fi @@ -97,10 +92,10 @@ if test -d tests; then cd tests && if test -f Makefile; then $(MAKE) distclean; fi; fi $(RM) config.status config.log config.cache Makefile libtool $(RM) config.h stamp-h1 lib/stamp-h2 -@@ -144,10 +108,6 @@ maintainer-clean : force - $(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h +@@ -134,10 +98,6 @@ + cd libcharset && if test -f Makefile; then $(MAKE) maintainer-clean; fi + $(RM) lib/libcharset.* lib/localcharset.h cd lib && if test -f Makefile; then $(MAKE) maintainer-clean; fi - cd preload && if test -f Makefile; then $(MAKE) maintainer-clean; fi - cd srclib && if test -f Makefile; then $(MAKE) maintainer-clean; fi - cd src && if test -f Makefile; then $(MAKE) maintainer-clean; fi - cd po && if test -f Makefile; then $(MAKE) maintainer-clean; fi diff -Nru vlc-3.0.21/contrib/src/iconv/libiconv-win64.patch vlc-3.0.22/contrib/src/iconv/libiconv-win64.patch --- vlc-3.0.21/contrib/src/iconv/libiconv-win64.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/iconv/libiconv-win64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1534 +0,0 @@ ---- iconv/lib/aliases.h.orig 2017-04-11 11:15:29.530518427 +0200 -+++ iconv/lib/aliases.h 2017-04-11 11:20:52.782454542 +0200 -@@ -815,890 +815,890 @@ - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 134 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_10}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_10}, - {-1}, - #line 60 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str17, ei_iso8859_1}, - {-1}, {-1}, - #line 288 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_iso646_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str20, ei_iso646_cn}, - {-1}, {-1}, {-1}, {-1}, - #line 84 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_iso8859_4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str25, ei_iso8859_4}, - {-1}, - #line 126 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_9}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_9}, - {-1}, {-1}, - #line 227 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, ei_hp_roman8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str30, ei_hp_roman8}, - {-1}, {-1}, - #line 151 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_14}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_14}, - #line 308 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_sjis}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str34, ei_sjis}, - {-1}, - #line 207 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_cp866}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str36, ei_cp866}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 68 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 16 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str51, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str51, ei_ascii}, - {-1}, {-1}, - #line 205 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str54, ei_cp866}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str54, ei_cp866}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 51 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_c99}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str64, ei_c99}, - #line 252 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_tis620}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str65, ei_tis620}, - #line 320 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_euc_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str66, ei_euc_cn}, - #line 133 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str67, ei_iso8859_10}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str67, ei_iso8859_10}, - {-1}, {-1}, - #line 236 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_pt154}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str70, ei_pt154}, - #line 59 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_1}, - #line 319 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_euc_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str72, ei_euc_cn}, - {-1}, - #line 91 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_5}, - {-1}, - #line 286 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_iso646_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str76, ei_iso646_cn}, - {-1}, - #line 332 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_hz}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str78, ei_hz}, - #line 264 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso646_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str79, ei_iso646_jp}, - {-1}, {-1}, {-1}, {-1}, - #line 189 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_cp1256}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str84, ei_cp1256}, - {-1}, {-1}, - #line 83 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_4}, - #line 174 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1251}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1251}, - #line 294 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_isoir165}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str89, ei_isoir165}, - {-1}, - #line 125 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_9}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_9}, - #line 203 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_cp862}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str92, ei_cp862}, - #line 107 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_7}, - {-1}, - #line 90 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_5}, - #line 57 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 150 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_14}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_14}, - #line 183 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str104, ei_cp1254}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str104, ei_cp1254}, - #line 291 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str105, ei_gb2312}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str105, ei_gb2312}, - #line 353 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_cp949}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str106, ei_cp949}, - {-1}, - #line 186 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_cp1255}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str108, ei_cp1255}, - {-1}, - #line 201 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str110, ei_cp862}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str110, ei_cp862}, - #line 124 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_9}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_9}, - #line 76 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_3}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_3}, - #line 158 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_15}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_15}, - #line 293 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_gb2312}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str114, ei_gb2312}, - #line 299 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_ksc5601}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str115, ei_ksc5601}, - {-1}, - #line 283 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_jisx0212}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str117, ei_jisx0212}, - {-1}, - #line 163 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_16}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_16}, - #line 195 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_cp1258}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str120, ei_cp1258}, - #line 234 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_pt154}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str121, ei_pt154}, - {-1}, - #line 67 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_iso8859_2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str123, ei_iso8859_2}, - #line 102 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_6}, - #line 149 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_14}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_14}, - {-1}, {-1}, - #line 62 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_1}, - #line 152 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str129, ei_iso8859_14}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str129, ei_iso8859_14}, - #line 94 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_6}, - #line 95 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_6}, - #line 166 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_16}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_16}, - {-1}, - #line 53 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_1}, - #line 54 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_1}, - #line 139 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_11}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_11}, - {-1}, - #line 160 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_16}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_16}, - #line 161 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_16}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_16}, - #line 177 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str140, ei_cp1252}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str140, ei_cp1252}, - {-1}, - #line 137 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_11}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_11}, - #line 138 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_11}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_11}, - #line 86 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_4}, - #line 356 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_johab}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str145, ei_johab}, - #line 162 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_16}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_16}, - #line 209 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_cp1131}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str147, ei_cp1131}, - #line 93 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_5}, - {-1}, - #line 79 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_4}, - #line 80 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_4}, - #line 153 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_14}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_14}, - #line 325 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_cp936}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str153, ei_cp936}, - #line 87 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_5}, - #line 88 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_5}, - #line 159 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_iso8859_15}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str156, ei_iso8859_15}, - #line 212 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_mac_roman}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str157, ei_mac_roman}, - #line 146 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_14}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_14}, - #line 147 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str159, ei_iso8859_14}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str159, ei_iso8859_14}, - #line 120 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_8}, - #line 66 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_2}, - #line 154 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_15}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_15}, - #line 155 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_15}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_15}, - #line 128 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_9}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_9}, - {-1}, - #line 114 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_8}, - #line 115 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str167, ei_iso8859_8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str167, ei_iso8859_8}, - {-1}, {-1}, - #line 121 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_9}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_9}, - #line 122 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_9}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_9}, - #line 148 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str172, ei_iso8859_14}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str172, ei_iso8859_14}, - {-1}, - #line 156 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_iso8859_15}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str174, ei_iso8859_15}, - {-1}, - #line 239 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_rk1048}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str176, ei_rk1048}, - {-1}, {-1}, - #line 109 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_7}, - #line 70 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str180, ei_iso8859_2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str180, ei_iso8859_2}, - {-1}, - #line 206 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str182, ei_cp866}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str182, ei_cp866}, - #line 144 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str183, ei_iso8859_13}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str183, ei_iso8859_13}, - #line 21 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str184, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str184, ei_ascii}, - {-1}, - #line 63 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str186, ei_iso8859_2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str186, ei_iso8859_2}, - #line 64 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str187, ei_iso8859_2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str187, ei_iso8859_2}, - {-1}, {-1}, - #line 282 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str190, ei_jisx0212}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str190, ei_jisx0212}, - {-1}, {-1}, - #line 359 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str193, ei_local_char}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str193, ei_local_char}, - {-1}, {-1}, - #line 235 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_pt154}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str196, ei_pt154}, - #line 74 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_3}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_3}, - #line 117 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_iso8859_8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str198, ei_iso8859_8}, - #line 354 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str199, ei_cp949}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str199, ei_cp949}, - {-1}, {-1}, - #line 13 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str202, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str202, ei_ascii}, - {-1}, - #line 176 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str204, ei_cp1251}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str204, ei_cp1251}, - #line 165 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str205, ei_iso8859_16}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str205, ei_iso8859_16}, - #line 255 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_viscii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str206, ei_viscii}, - {-1}, {-1}, - #line 311 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_cp932}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str209, ei_cp932}, - #line 337 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_ces_big5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str210, ei_ces_big5}, - #line 258 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_tcvn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str211, ei_tcvn}, - #line 318 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str212, ei_iso2022_jpms}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str212, ei_iso2022_jpms}, - {-1}, {-1}, {-1}, - #line 338 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str216, ei_ces_big5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str216, ei_ces_big5}, - #line 173 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str217, ei_cp1250}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str217, ei_cp1250}, - {-1}, {-1}, - #line 199 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str220, ei_cp850}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str220, ei_cp850}, - {-1}, - #line 33 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_ucs4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str222, ei_ucs4}, - #line 22 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str223, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str223, ei_ascii}, - #line 58 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str224, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str224, ei_iso8859_1}, - #line 257 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_viscii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str225, ei_viscii}, - {-1}, - #line 321 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_euc_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str227, ei_euc_cn}, - #line 269 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_jisx0201}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str228, ei_jisx0201}, - #line 342 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str229, ei_ces_big5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str229, ei_ces_big5}, - {-1}, {-1}, {-1}, {-1}, {-1}, - #line 341 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_ces_big5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str235, ei_ces_big5}, - #line 167 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_koi8_r}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str236, ei_koi8_r}, - #line 351 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_euc_kr}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str237, ei_euc_kr}, - #line 202 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str238, ei_cp862}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str238, ei_cp862}, - #line 238 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str239, ei_pt154}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str239, ei_pt154}, - #line 35 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str240, ei_ucs4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str240, ei_ucs4}, - #line 14 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str241, ei_ascii}, - #line 253 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_cp874}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str242, ei_cp874}, - #line 350 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str243, ei_euc_kr}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str243, ei_euc_kr}, - #line 256 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_viscii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str244, ei_viscii}, - {-1}, - #line 15 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str246, ei_ascii}, - {-1}, - #line 218 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_mac_cyrillic}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str248, ei_mac_cyrillic}, - #line 168 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_koi8_r}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str249, ei_koi8_r}, - #line 197 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str250, ei_cp850}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str250, ei_cp850}, - #line 82 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_iso8859_4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str251, ei_iso8859_4}, - #line 343 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_cp950}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str252, ei_cp950}, - {-1}, - #line 329 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str254, ei_iso2022_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str254, ei_iso2022_cn}, - #line 295 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str255, ei_isoir165}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str255, ei_isoir165}, - {-1}, - #line 237 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str257, ei_pt154}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str257, ei_pt154}, - #line 24 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_ucs2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str258, ei_ucs2}, - #line 164 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_iso8859_16}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str259, ei_iso8859_16}, - #line 275 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_jisx0208}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str260, ei_jisx0208}, - #line 75 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str261, ei_iso8859_3}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str261, ei_iso8859_3}, - {-1}, - #line 330 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_iso2022_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str263, ei_iso2022_cn}, - #line 131 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str264, ei_iso8859_10}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str264, ei_iso8859_10}, - {-1}, {-1}, - #line 37 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_ucs4le}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str267, ei_ucs4le}, - #line 171 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str268, ei_cp1250}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str268, ei_cp1250}, - {-1}, {-1}, - #line 135 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_10}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_10}, - {-1}, - #line 142 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_iso8859_13}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str273, ei_iso8859_13}, - #line 326 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_cp936}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str274, ei_cp936}, - #line 61 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str275, ei_iso8859_1}, - #line 247 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_tis620}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str276, ei_tis620}, - {-1}, - #line 180 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_cp1253}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str278, ei_cp1253}, - {-1}, {-1}, - #line 331 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str281, ei_iso2022_cn_ext}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str281, ei_iso2022_cn_ext}, - #line 246 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_tis620}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str282, ei_tis620}, - {-1}, {-1}, - #line 31 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str285, ei_ucs2le}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str285, ei_ucs2le}, - #line 233 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str286, ei_koi8_t}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str286, ei_koi8_t}, - {-1}, {-1}, {-1}, - #line 92 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_5}, - #line 85 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_iso8859_4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str291, ei_iso8859_4}, - {-1}, {-1}, {-1}, - #line 127 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_iso8859_9}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str295, ei_iso8859_9}, - #line 29 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str296, ei_ucs2be}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str296, ei_ucs2be}, - {-1}, {-1}, {-1}, {-1}, - #line 110 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str301, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str301, ei_iso8859_7}, - #line 49 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str302, ei_ucs4internal}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str302, ei_ucs4internal}, - {-1}, - #line 30 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_ucs2be}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str304, ei_ucs2be}, - {-1}, - #line 26 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str306, ei_ucs2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str306, ei_ucs2}, - #line 249 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_tis620}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str307, ei_tis620}, - {-1}, {-1}, {-1}, - #line 229 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str311, ei_nextstep}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str311, ei_nextstep}, - #line 232 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str312, ei_georgian_ps}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str312, ei_georgian_ps}, - {-1}, {-1}, {-1}, - #line 136 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_iso8859_10}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str316, ei_iso8859_10}, - {-1}, - #line 78 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str318, ei_iso8859_3}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str318, ei_iso8859_3}, - {-1}, - #line 47 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2internal}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2internal}, - {-1}, - #line 129 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str322, ei_iso8859_10}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str322, ei_iso8859_10}, - #line 130 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str323, ei_iso8859_10}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str323, ei_iso8859_10}, - #line 71 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_iso8859_3}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str324, ei_iso8859_3}, - #line 72 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str325, ei_iso8859_3}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str325, ei_iso8859_3}, - #line 145 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str326, ei_iso8859_13}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str326, ei_iso8859_13}, - #line 69 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_iso8859_2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str327, ei_iso8859_2}, - {-1}, - #line 285 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_iso646_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str329, ei_iso646_cn}, - {-1}, {-1}, - #line 140 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str332, ei_iso8859_13}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str332, ei_iso8859_13}, - #line 141 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str333, ei_iso8859_13}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str333, ei_iso8859_13}, - {-1}, {-1}, {-1}, - #line 244 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str337, ei_cp1133}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str337, ei_cp1133}, - {-1}, - #line 179 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str339, ei_cp1252}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str339, ei_cp1252}, - {-1}, - #line 56 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str341, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str341, ei_iso8859_1}, - {-1}, {-1}, - #line 296 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str344, ei_ksc5601}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str344, ei_ksc5601}, - {-1}, {-1}, {-1}, {-1}, - #line 211 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str349, ei_mac_roman}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str349, ei_mac_roman}, - {-1}, {-1}, - #line 322 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str352, ei_euc_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str352, ei_euc_cn}, - {-1}, - #line 208 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_cp866}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str354, ei_cp866}, - #line 34 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str355, ei_ucs4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str355, ei_ucs4}, - {-1}, - #line 81 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str357, ei_iso8859_4}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str357, ei_iso8859_4}, - {-1}, - #line 89 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str359, ei_iso8859_5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str359, ei_iso8859_5}, - {-1}, - #line 38 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_utf16}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str361, ei_utf16}, - {-1}, - #line 241 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_rk1048}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str363, ei_rk1048}, - #line 226 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str364, ei_hp_roman8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str364, ei_hp_roman8}, - #line 116 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str365, ei_iso8859_8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str365, ei_iso8859_8}, - #line 32 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_ucs2le}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str366, ei_ucs2le}, - {-1}, {-1}, - #line 123 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_iso8859_9}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str369, ei_iso8859_9}, - {-1}, {-1}, - #line 265 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_iso646_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str372, ei_iso646_jp}, - #line 25 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str373, ei_ucs2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str373, ei_ucs2}, - {-1}, - #line 243 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str375, ei_mulelao}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str375, ei_mulelao}, - #line 242 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str376, ei_rk1048}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str376, ei_rk1048}, - #line 157 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str377, ei_iso8859_15}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str377, ei_iso8859_15}, - #line 198 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str378, ei_cp850}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str378, ei_cp850}, - {-1}, - #line 248 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str380, ei_tis620}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str380, ei_tis620}, - {-1}, - #line 98 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str382, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str382, ei_iso8859_6}, - {-1}, {-1}, {-1}, - #line 298 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str386, ei_ksc5601}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str386, ei_ksc5601}, - {-1}, - #line 324 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str388, ei_ces_gbk}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str388, ei_ces_gbk}, - #line 23 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str389, ei_utf8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str389, ei_utf8}, - {-1}, - #line 230 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str391, ei_armscii_8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str391, ei_armscii_8}, - #line 12 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str392, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str392, ei_ascii}, - {-1}, {-1}, {-1}, {-1}, {-1}, - #line 108 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str398, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str398, ei_iso8859_7}, - #line 323 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str399, ei_euc_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str399, ei_euc_cn}, - {-1}, {-1}, {-1}, - #line 143 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str403, ei_iso8859_13}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str403, ei_iso8859_13}, - #line 301 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str404, ei_ksc5601}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str404, ei_ksc5601}, - #line 287 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str405, ei_iso646_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str405, ei_iso646_cn}, - {-1}, {-1}, - #line 188 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str408, ei_cp1255}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str408, ei_cp1255}, - #line 266 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_iso646_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str409, ei_iso646_jp}, - {-1}, - #line 276 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_jisx0208}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str411, ei_jisx0208}, - {-1}, - #line 132 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str413, ei_iso8859_10}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str413, ei_iso8859_10}, - {-1}, {-1}, - #line 40 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_utf16le}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str416, ei_utf16le}, - {-1}, - #line 36 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_ucs4be}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str418, ei_ucs4be}, - {-1}, - #line 192 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_cp1257}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str420, ei_cp1257}, - #line 18 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str421, ei_ascii}, - {-1}, {-1}, - #line 352 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_euc_kr}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str424, ei_euc_kr}, - #line 357 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str425, ei_iso2022_kr}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str425, ei_iso2022_kr}, - #line 290 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_gb2312}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str426, ei_gb2312}, - {-1}, {-1}, - #line 97 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str429, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str429, ei_iso8859_6}, - #line 224 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str430, ei_mac_thai}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str430, ei_mac_thai}, - #line 335 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str431, ei_euc_tw}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str431, ei_euc_tw}, - {-1}, - #line 304 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str433, ei_euc_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str433, ei_euc_jp}, - #line 358 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str434, ei_iso2022_kr}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str434, ei_iso2022_kr}, - {-1}, - #line 27 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str436, ei_ucs2be}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str436, ei_ucs2be}, - #line 334 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_euc_tw}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str437, ei_euc_tw}, - {-1}, - #line 17 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str439, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str439, ei_ascii}, - #line 111 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str440, ei_iso8859_7}, - {-1}, - #line 215 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str442, ei_mac_iceland}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str442, ei_mac_iceland}, - #line 328 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str443, ei_gb18030}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str443, ei_gb18030}, - #line 73 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_iso8859_3}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str444, ei_iso8859_3}, - #line 101 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str445, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str445, ei_iso8859_6}, - #line 231 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str446, ei_georgian_academy}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str446, ei_georgian_academy}, - {-1}, - #line 225 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_hp_roman8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str448, ei_hp_roman8}, - {-1}, {-1}, {-1}, {-1}, - #line 251 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str453, ei_tis620}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str453, ei_tis620}, - {-1}, - #line 28 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str455, ei_ucs2be}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str455, ei_ucs2be}, - {-1}, {-1}, {-1}, - #line 260 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str459, ei_tcvn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str459, ei_tcvn}, - #line 113 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str460, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str460, ei_iso8859_7}, - #line 289 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str461, ei_iso646_cn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str461, ei_iso646_cn}, - {-1}, - #line 214 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str463, ei_mac_centraleurope}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str463, ei_mac_centraleurope}, - #line 112 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str464, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str464, ei_iso8859_7}, - #line 77 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str465, ei_iso8859_3}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str465, ei_iso8859_3}, - #line 103 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str466, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str466, ei_iso8859_7}, - #line 104 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str467, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str467, ei_iso8859_7}, - #line 45 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_utf7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str468, ei_utf7}, - #line 19 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str469, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str469, ei_ascii}, - #line 333 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_hz}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str470, ei_hz}, - {-1}, {-1}, - #line 303 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str473, ei_euc_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str473, ei_euc_jp}, - #line 46 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str474, ei_utf7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str474, ei_utf7}, - {-1}, - #line 210 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str476, ei_mac_roman}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str476, ei_mac_roman}, - #line 259 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str477, ei_tcvn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str477, ei_tcvn}, - {-1}, - #line 302 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str479, ei_euc_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str479, ei_euc_jp}, - {-1}, {-1}, {-1}, - #line 263 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str483, ei_iso646_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str483, ei_iso646_jp}, - {-1}, {-1}, {-1}, {-1}, {-1}, - #line 348 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_big5hkscs2008}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str489, ei_big5hkscs2008}, - #line 292 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str490, ei_gb2312}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str490, ei_gb2312}, - {-1}, - #line 190 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str492, ei_cp1256}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str492, ei_cp1256}, - {-1}, - #line 175 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str494, ei_cp1251}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str494, ei_cp1251}, - #line 347 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str495, ei_big5hkscs2008}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str495, ei_big5hkscs2008}, - #line 360 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str496, ei_local_wchar_t}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str496, ei_local_wchar_t}, - #line 96 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str497, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str497, ei_iso8859_6}, - {-1}, - #line 55 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str499, ei_iso8859_1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str499, ei_iso8859_1}, - {-1}, {-1}, - #line 184 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str502, ei_cp1254}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str502, ei_cp1254}, - {-1}, - #line 187 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str504, ei_cp1255}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str504, ei_cp1255}, - {-1}, {-1}, {-1}, {-1}, {-1}, - #line 196 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_cp1258}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str510, ei_cp1258}, - {-1}, - #line 41 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str512, ei_utf32}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str512, ei_utf32}, - {-1}, {-1}, {-1}, - #line 119 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str516, ei_iso8859_8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str516, ei_iso8859_8}, - #line 228 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str517, ei_hp_roman8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str517, ei_hp_roman8}, - {-1}, - #line 284 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str519, ei_jisx0212}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str519, ei_jisx0212}, - #line 178 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str520, ei_cp1252}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str520, ei_cp1252}, - {-1}, - #line 240 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str522, ei_rk1048}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str522, ei_rk1048}, - {-1}, {-1}, - #line 65 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str525, ei_iso8859_2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str525, ei_iso8859_2}, - {-1}, {-1}, {-1}, - #line 100 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str529, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str529, ei_iso8859_6}, - #line 213 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_mac_roman}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str530, ei_mac_roman}, - {-1}, {-1}, {-1}, - #line 297 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str534, ei_ksc5601}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str534, ei_ksc5601}, - {-1}, - #line 262 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str536, ei_iso646_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str536, ei_iso646_jp}, - #line 277 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str537, ei_jisx0208}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str537, ei_jisx0208}, - {-1}, - #line 43 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str539, ei_utf32le}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str539, ei_utf32le}, - {-1}, {-1}, {-1}, - #line 250 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str543, ei_tis620}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str543, ei_tis620}, - {-1}, {-1}, - #line 245 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str546, ei_cp1133}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str546, ei_cp1133}, - #line 307 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str547, ei_sjis}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str547, ei_sjis}, - #line 306 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str548, ei_sjis}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str548, ei_sjis}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 204 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str555, ei_cp862}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str555, ei_cp862}, - {-1}, - #line 340 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str557, ei_ces_big5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str557, ei_ces_big5}, - {-1}, {-1}, - #line 300 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str560, ei_ksc5601}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str560, ei_ksc5601}, - {-1}, - #line 216 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str562, ei_mac_croatian}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str562, ei_mac_croatian}, - #line 339 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str563, ei_ces_big5}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str563, ei_ces_big5}, - {-1}, {-1}, - #line 327 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str566, ei_cp936}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str566, ei_cp936}, - #line 39 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str567, ei_utf16be}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str567, ei_utf16be}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 169 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str574, ei_koi8_u}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str574, ei_koi8_u}, - {-1}, {-1}, {-1}, {-1}, {-1}, - #line 170 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str580, ei_koi8_ru}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str580, ei_koi8_ru}, - {-1}, {-1}, {-1}, - #line 172 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str584, ei_cp1250}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str584, ei_cp1250}, - #line 182 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str585, ei_cp1253}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str585, ei_cp1253}, - {-1}, {-1}, {-1}, - #line 181 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str589, ei_cp1253}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str589, ei_cp1253}, - {-1}, - #line 220 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str591, ei_mac_greek}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str591, ei_mac_greek}, - #line 200 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str592, ei_cp850}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str592, ei_cp850}, - {-1}, - #line 106 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str594, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str594, ei_iso8859_7}, - {-1}, - #line 274 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str596, ei_jisx0208}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str596, ei_jisx0208}, - #line 20 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str597, ei_ascii}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str597, ei_ascii}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, - #line 314 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str608, ei_iso2022_jp1}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str608, ei_iso2022_jp1}, - {-1}, - #line 317 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str610, ei_iso2022_jpms}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str610, ei_iso2022_jpms}, - {-1}, {-1}, - #line 279 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str613, ei_jisx0212}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str613, ei_jisx0212}, - {-1}, {-1}, {-1}, {-1}, - #line 336 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str618, ei_euc_tw}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str618, ei_euc_tw}, - {-1}, {-1}, {-1}, {-1}, {-1}, - #line 310 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str624, ei_sjis}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str624, ei_sjis}, - #line 118 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str625, ei_iso8859_8}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str625, ei_iso8859_8}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 315 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str634, ei_iso2022_jp2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str634, ei_iso2022_jp2}, - #line 99 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str635, ei_iso8859_6}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str635, ei_iso8859_6}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 316 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str642, ei_iso2022_jp2}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str642, ei_iso2022_jp2}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 267 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str651, ei_jisx0201}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str651, ei_jisx0201}, - {-1}, {-1}, {-1}, - #line 254 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str655, ei_cp874}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str655, ei_cp874}, - {-1}, {-1}, {-1}, {-1}, - #line 193 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str660, ei_cp1257}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str660, ei_cp1257}, - #line 312 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str661, ei_iso2022_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str661, ei_iso2022_jp}, - {-1}, {-1}, {-1}, - #line 105 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str665, ei_iso8859_7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str665, ei_iso8859_7}, - #line 278 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str666, ei_jisx0208}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str666, ei_jisx0208}, - {-1}, {-1}, {-1}, - #line 313 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str670, ei_iso2022_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str670, ei_iso2022_jp}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 223 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str680, ei_mac_arabic}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str680, ei_mac_arabic}, - {-1}, {-1}, - #line 271 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str683, ei_jisx0208}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str683, ei_jisx0208}, - #line 268 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str684, ei_jisx0201}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str684, ei_jisx0201}, - {-1}, {-1}, {-1}, {-1}, - #line 44 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str689, ei_utf7}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str689, ei_utf7}, - #line 42 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str690, ei_utf32be}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str690, ei_utf32be}, - {-1}, - #line 345 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str692, ei_big5hkscs2001}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str692, ei_big5hkscs2001}, - {-1}, - #line 281 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str694, ei_jisx0212}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str694, ei_jisx0212}, - {-1}, {-1}, - #line 280 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str697, ei_jisx0212}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str697, ei_jisx0212}, - {-1}, {-1}, - #line 346 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str700, ei_big5hkscs2004}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str700, ei_big5hkscs2004}, - {-1}, - #line 221 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str702, ei_mac_turkish}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str702, ei_mac_turkish}, - {-1}, {-1}, {-1}, {-1}, {-1}, - #line 349 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str708, ei_big5hkscs2008}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str708, ei_big5hkscs2008}, - {-1}, - #line 344 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str710, ei_big5hkscs1999}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str710, ei_big5hkscs1999}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, - #line 185 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str725, ei_cp1254}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str725, ei_cp1254}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 50 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str732, ei_ucs4swapped}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str732, ei_ucs4swapped}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 219 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str749, ei_mac_ukraine}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str749, ei_mac_ukraine}, - #line 48 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str750, ei_ucs2swapped}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str750, ei_ucs2swapped}, - {-1}, - #line 261 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str752, ei_tcvn}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str752, ei_tcvn}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, - #line 273 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str774, ei_jisx0208}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str774, ei_jisx0208}, - {-1}, {-1}, {-1}, {-1}, - #line 272 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str779, ei_jisx0208}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str779, ei_jisx0208}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 222 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str796, ei_mac_hebrew}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str796, ei_mac_hebrew}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 191 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str803, ei_cp1256}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str803, ei_cp1256}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 52 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str811, ei_java}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str811, ei_java}, - {-1}, - #line 217 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str813, ei_mac_romania}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str813, ei_mac_romania}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, - #line 309 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str827, ei_sjis}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str827, ei_sjis}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 194 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str837, ei_cp1257}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str837, ei_cp1257}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, - #line 305 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str866, ei_euc_jp}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str866, ei_euc_jp}, - {-1}, {-1}, - #line 355 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str869, ei_johab}, -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str869, ei_johab}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -@@ -1706,7 +1706,7 @@ - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - #line 270 "lib/aliases.gperf" -- {(int)(long)&((struct stringpool_t *)0)->stringpool_str921, ei_jisx0201} -+ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str921, ei_jisx0201} - }; - - #ifdef __GNUC__ ---- iconv/lib/iconv.c.orig 2017-04-11 11:27:20.897795458 +0200 -+++ iconv/lib/iconv.c 2017-04-11 11:27:43.769749249 +0200 -@@ -20,6 +20,7 @@ - #include - - #include -+#include - #include - #include - #include "config.h" -@@ -172,7 +173,7 @@ - }; - #define stringpool2 ((const char *) &stringpool2_contents) - static const struct alias sysdep_aliases[] = { --#define S(tag,name,encoding_index) { (int)(long)&((struct stringpool2_t *)0)->stringpool_##tag, encoding_index }, -+#define S(tag,name,encoding_index) { (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_##tag, encoding_index }, - #include "aliases2.h" - #undef S - }; ---- iconv/lib/canonical.h.orig 2017-04-11 11:31:05.769401908 +0200 -+++ iconv/lib/canonical.h 2017-04-11 11:31:07.269399680 +0200 -@@ -1,111 +1,111 @@ -- (int)(long)&((struct stringpool_t *)0)->stringpool_str392, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str389, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str258, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str436, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str285, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str222, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str418, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str267, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str361, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str567, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str416, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str512, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str690, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str539, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str689, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str320, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str750, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str302, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str732, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str64, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str811, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str134, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str186, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str324, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str150, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str154, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str130, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str466, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str166, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str170, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str322, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str142, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str332, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str158, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str162, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str138, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str236, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str574, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str580, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str268, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str88, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str140, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str278, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str104, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str108, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str84, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str420, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str120, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str250, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str110, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str54, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str147, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str476, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str463, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str442, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str562, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str813, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str248, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str749, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str591, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str702, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str796, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str680, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str430, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str448, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str311, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str391, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str446, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str312, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str286, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str121, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str176, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str375, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str337, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str282, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str242, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str206, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str211, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str536, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str651, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str683, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str613, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str329, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str426, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str89, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str344, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str479, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str548, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str209, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str661, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str608, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str634, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str610, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str72, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str388, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str153, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str443, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str254, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str281, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str78, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str437, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str210, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str252, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str710, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str692, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str700, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str495, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str243, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str106, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str869, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str425, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str392, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str389, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str258, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str436, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str285, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str222, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str418, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str267, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str361, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str567, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str416, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str512, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str690, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str539, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str689, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str320, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str750, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str302, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str732, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str64, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str811, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str134, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str186, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str324, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str150, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str154, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str130, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str466, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str166, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str170, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str322, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str142, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str332, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str158, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str162, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str138, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str236, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str574, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str580, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str268, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str88, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str140, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str278, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str104, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str108, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str84, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str420, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str120, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str250, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str110, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str54, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str147, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str476, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str463, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str442, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str562, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str813, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str248, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str749, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str591, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str702, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str796, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str680, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str430, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str448, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str311, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str391, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str446, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str312, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str286, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str121, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str176, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str375, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str337, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str282, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str242, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str206, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str211, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str536, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str651, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str683, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str613, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str329, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str426, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str89, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str344, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str479, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str548, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str209, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str661, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str608, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str634, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str610, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str72, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str388, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str153, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str443, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str254, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str281, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str78, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str437, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str210, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str252, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str710, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str692, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str700, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str495, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str243, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str106, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str869, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str425, ---- iconv/lib/canonical_dos.h.orig 2017-04-11 11:32:10.665309524 +0200 -+++ iconv/lib/canonical_dos.h 2017-04-11 11:32:20.421296308 +0200 -@@ -1,15 +1,15 @@ -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_0, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_4, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_5, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_8, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_12, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_13, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_17, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_21, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_22, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_26, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_31, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_35, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_38, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_42, -- (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_47, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_0, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_4, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_5, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_8, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_12, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_13, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_17, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_21, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_22, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_26, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_31, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_35, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_38, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_42, -+ (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_47, ---- iconv/lib/canonical_local.h.orig 2017-04-11 11:33:25.529212196 +0200 -+++ iconv/lib/canonical_local.h 2017-04-11 11:33:31.549204764 +0200 -@@ -1,2 +1,2 @@ -- (int)(long)&((struct stringpool_t *)0)->stringpool_str193, -- (int)(long)&((struct stringpool_t *)0)->stringpool_str496, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str193, -+ (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str496, diff -Nru vlc-3.0.21/contrib/src/iconv/rules.mak vlc-3.0.22/contrib/src/iconv/rules.mak --- vlc-3.0.21/contrib/src/iconv/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/iconv/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,5 +1,5 @@ # libiconv -LIBICONV_VERSION := 1.15 +LIBICONV_VERSION := 1.17 LIBICONV_URL := $(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz PKGS += iconv @@ -22,16 +22,21 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv $(UNPACK) - $(APPLY) $(SRC)/iconv/win32.patch $(APPLY) $(SRC)/iconv/bins.patch -ifdef HAVE_WIN64 - $(APPLY) $(SRC)/iconv/libiconv-win64.patch -endif + + # use CreateFile2 instead of CreateFile in UWP + $(APPLY) $(SRC)/iconv/0001-Use-CreateFile2-in-UWP-builds.patch + + # fix forbidden UWP call which can't be upstreamed as they won't + # differentiate for winstore, only _WIN32_WINNT + $(APPLY) $(SRC)/iconv/0001-do-not-call-GetHandleInformation-in-Winstore-apps.patch + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub libcharset/build-aux $(MOVE) .iconv: iconv - cd $< && $(HOSTVARS) ./configure CFLAGS="$(CFLAGS) -fgnu89-inline" $(HOSTCONF) --disable-nls - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-nls + $(MAKE) -C $< + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/iconv/win32.patch vlc-3.0.22/contrib/src/iconv/win32.patch --- vlc-3.0.21/contrib/src/iconv/win32.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/iconv/win32.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ ---- iconv/srclib/stdio-write.c.orig 2013-08-15 11:50:20.508093720 +0200 -+++ iconv/srclib/stdio-write.c 2013-08-15 11:51:36.344096864 +0200 -@@ -20,6 +20,14 @@ - /* Specification. */ - #include - -+#ifdef _WIN32 -+#include -+ -+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+#define GetFileType(h) FILE_TYPE_UNKNOWN -+#endif -+#endif -+ - /* Replace these functions only if module 'nonblocking' or module 'sigpipe' is - requested. */ - #if GNULIB_NONBLOCKING || GNULIB_SIGPIPE diff -Nru vlc-3.0.21/contrib/src/jack/rules.mak vlc-3.0.22/contrib/src/jack/rules.mak --- vlc-3.0.21/contrib/src/jack/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/jack/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -25,5 +25,5 @@ .jack: jack $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/jinja/SHA512SUMS vlc-3.0.22/contrib/src/jinja/SHA512SUMS --- vlc-3.0.21/contrib/src/jinja/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/jinja/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -50feebc7eed4c8b5bb0c2951784c1c115e3ee1c0e0c91bbf1884551b1312ef8fce24804a2ca1dfd8c543406529afe4817567c39e7cfd15028b54049853623144 jinja-3.1.2.tar.gz diff -Nru vlc-3.0.21/contrib/src/jinja/rules.mak vlc-3.0.22/contrib/src/jinja/rules.mak --- vlc-3.0.21/contrib/src/jinja/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/jinja/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -JINJA_VERSION := 3.1.2 -JINJA_URL := $(GITHUB)/pallets/jinja/archive/refs/tags/$(JINJA_VERSION).tar.gz - -DEPS_jinja = markupsafe $(DEPS_markupsafe) - -$(TARBALLS)/jinja-$(JINJA_VERSION).tar.gz: - $(call download_pkg,$(JINJA_URL),jinja) - -.sum-jinja: jinja-$(JINJA_VERSION).tar.gz - -jinja: jinja-$(JINJA_VERSION).tar.gz .sum-jinja - $(UNPACK) - $(MOVE) - -.jinja: jinja .python-venv - $(PYTHON_INSTALL) - touch $@ diff -Nru vlc-3.0.21/contrib/src/jpeg/rules.mak vlc-3.0.22/contrib/src/jpeg/rules.mak --- vlc-3.0.21/contrib/src/jpeg/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/jpeg/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -18,6 +18,6 @@ .jpeg: jpeg $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install cd $< && if test -e $(PREFIX)/lib/libjpeg.a; then $(RANLIB) $(PREFIX)/lib/libjpeg.a; fi touch $@ diff -Nru vlc-3.0.21/contrib/src/kate/rules.mak vlc-3.0.22/contrib/src/kate/rules.mak --- vlc-3.0.21/contrib/src/kate/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/kate/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -15,15 +15,14 @@ libkate: libkate-$(KATE_VERSION).tar.gz .sum-kate $(UNPACK) - $(UPDATE_AUTOCONFIG) + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub misc/autotools $(MOVE) - mv libkate/config.sub libkate/config.guess libkate/misc/autotools DEPS_kate = ogg $(DEPS_ogg) +KATE_CONF := --disable-valgrind --disable-doc + .kate: libkate - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \ - --disable-valgrind \ - --disable-doc - cd $< && $(MAKE) SUBDIRS=. install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(KATE_CONF) + $(MAKE) -C $< SUBDIRS=. install touch $@ diff -Nru vlc-3.0.21/contrib/src/lame/rules.mak vlc-3.0.22/contrib/src/lame/rules.mak --- vlc-3.0.21/contrib/src/lame/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/lame/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -23,12 +23,14 @@ $(APPLY) $(SRC)/lame/lame-fix-i386-on-aarch64.patch # Avoid relying on iconv.m4 from gettext, when reconfiguring. # This is only used by the frontend which we disable. - cd $(UNPACK_DIR) && sed -i.orig 's/^AM_ICONV/#&/' configure.in + sed -i.orig 's/^AM_ICONV/#&/' $(UNPACK_DIR)/configure.in $(UPDATE_AUTOCONFIG) $(MOVE) +LAME_CONF := --disable-analyzer-hooks --disable-decoder --disable-gtktest --disable-frontend + .lame: lame $(RECONF) - cd $< && $(HOSTVARS) CFLAGS="$(LAME_CFLAGS)" ./configure $(HOSTCONF) --disable-analyzer-hooks --disable-decoder --disable-gtktest --disable-frontend - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(LAME_CFLAGS)" $(LAME_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch vlc-3.0.22/contrib/src/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch --- vlc-3.0.21/contrib/src/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,39 @@ +From ac96967e36808cf4fb7a523e37bec66a4888b106 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Mon, 26 May 2025 10:44:49 +0200 +Subject: [PATCH] [cmake] add uuid library when using xmllite + +Consecutive to 16fd043f51d911b106f2a7834ad8f08f65051977 +IID_ISequentialStream is required by the code. +This GUID is defined in uuid.lib or libuuid.a in mingw-w64. It is required +to link with that library to get the definition of the GUID. Some toolchains +add it by default but not all. +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7096b7c0..e938df72 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1257,7 +1257,7 @@ ELSE(LIBXML2_FOUND) + # Check linkage as well; versions of mingw-w64 before v11.0.0 + # do not contain an import library for xmllite. + cmake_push_check_state() +- SET(CMAKE_REQUIRED_LIBRARIES "xmllite") ++ SET(CMAKE_REQUIRED_LIBRARIES "xmllite" "uuid") + check_c_source_compiles(" + #include + #include +@@ -1268,7 +1268,7 @@ ELSE(LIBXML2_FOUND) + cmake_pop_check_state() + IF(HAVE_XMLLITE_H) + SET(XMLLITE_FOUND TRUE) +- LIST(APPEND ADDITIONAL_LIBS "xmllite") ++ LIST(APPEND ADDITIONAL_LIBS "xmllite" "uuid") + ENDIF() + ENDIF() + ENDIF(EXPAT_FOUND) +-- +2.45.1.windows.1 + diff -Nru vlc-3.0.21/contrib/src/libarchive/0001-zstd-use-GetNativeSystemInfo-to-get-the-number-of-th.patch vlc-3.0.22/contrib/src/libarchive/0001-zstd-use-GetNativeSystemInfo-to-get-the-number-of-th.patch --- vlc-3.0.21/contrib/src/libarchive/0001-zstd-use-GetNativeSystemInfo-to-get-the-number-of-th.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/libarchive/0001-zstd-use-GetNativeSystemInfo-to-get-the-number-of-th.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,72 @@ +From 30308ee3c0b1eccc6747aac0cbabb6bfb171dd18 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Mon, 23 Sep 2024 13:37:22 +0200 +Subject: [PATCH] set_format: use GetNativeSystemInfo() to get the number of + threads + +GetActiveProcessorCount() is not available in UWP [1] and +it's not available before Windows 7. + +SYSTEM_INFO::dwNumberOfProcessors gives the same information [2] + +[1] https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-getactiveprocessorcount +[2] https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info +--- + libarchive/archive_write_add_filter_zstd.c | 6 +++--- + libarchive/archive_write_set_format_7zip.c | 6 +++--- + libarchive/archive_write_set_format_zip.c | 5 +++-- + 3 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/libarchive/archive_write_add_filter_zstd.c b/libarchive/archive_write_add_filter_zstd.c +index c0a6e5a3..0e2bdf44 100644 +--- a/libarchive/archive_write_add_filter_zstd.c ++++ b/libarchive/archive_write_add_filter_zstd.c +@@ -280,9 +280,9 @@ archive_compressor_zstd_options(struct archive_write_filter *f, const char *key, + #elif !defined(__CYGWIN__) && defined(_WIN32_WINNT) && \ + _WIN32_WINNT >= 0x0601 /* _WIN32_WINNT_WIN7 */ + if (threads == 0) { +- DWORD winCores = GetActiveProcessorCount( +- ALL_PROCESSOR_GROUPS); +- threads = (intmax_t)winCores; ++ SYSTEM_INFO systemInfo; ++ GetNativeSystemInfo(&systemInfo); ++ threads = (intmax_t)systemInfo.dwNumberOfProcessors; + } + #endif + if (threads < 0 || threads > INT_MAX) { +diff --git a/libarchive/archive_write_set_format_7zip.c b/libarchive/archive_write_set_format_7zip.c +index 902d03f6..793a2e8c 100644 +--- a/libarchive/archive_write_set_format_7zip.c ++++ b/libarchive/archive_write_set_format_7zip.c +@@ -533,9 +533,9 @@ _7z_options(struct archive_write *a, const char *key, const char *value) + threads = sysconf(_SC_NPROCESSORS_ONLN); + #elif !defined(__CYGWIN__) && defined(_WIN32_WINNT) && \ + _WIN32_WINNT >= 0x0601 /* _WIN32_WINNT_WIN7 */ +- DWORD winCores = GetActiveProcessorCount( +- ALL_PROCESSOR_GROUPS); +- threads = (intmax_t)winCores; ++ SYSTEM_INFO systemInfo; ++ GetNativeSystemInfo(&systemInfo); ++ threads = (intmax_t)systemInfo.dwNumberOfProcessors; + #else + threads = 1; + #endif +diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c +index 3630b9f2..76356d40 100644 +--- a/libarchive/archive_write_set_format_zip.c ++++ b/libarchive/archive_write_set_format_zip.c +@@ -453,8 +453,9 @@ archive_write_zip_options(struct archive_write *a, const char *key, + zip->threads = sysconf(_SC_NPROCESSORS_ONLN); + #elif !defined(__CYGWIN__) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0601 + /* Windows 7 and up */ +- DWORD activeProcs = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS); +- zip->threads = activeProcs <= SHRT_MAX ? (short)activeProcs : SHRT_MAX; ++ SYSTEM_INFO systemInfo; ++ GetNativeSystemInfo(&systemInfo); ++ zip->threads = systemInfo.dwNumberOfProcessors <= SHRT_MAX ? (short)systemInfo.dwNumberOfProcessors : SHRT_MAX; + #else + zip->threads = 1; + #endif +-- +2.47.2 + diff -Nru vlc-3.0.21/contrib/src/libarchive/SHA512SUMS vlc-3.0.22/contrib/src/libarchive/SHA512SUMS --- vlc-3.0.21/contrib/src/libarchive/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/libarchive/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -58f7ac0c52116f73326a07dec10ff232be33b318862078785dc39f1fb2f8773b5194eabfa14764bb51ce6a5a1aa8820526e7f4c76087a6f4fcbe7789a22275b4 libarchive-3.6.1.tar.gz +e563cd10cd447daf7c5d11c657cbc3d8971add4440264fb4754ea7670a249e8b7b1c31f62f78259867960392623dba73c2d20efc57dc02564c8f55841dc8f2cc libarchive-3.8.0.tar.gz diff -Nru vlc-3.0.21/contrib/src/libarchive/android.patch vlc-3.0.22/contrib/src/libarchive/android.patch --- vlc-3.0.21/contrib/src/libarchive/android.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/libarchive/android.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ ---- libarchive/Makefile.am.orig 2022-02-09 13:24:12.000000000 +0100 -+++ libarchive/Makefile.am 2022-02-14 19:22:31.487152622 +0100 -@@ -89,7 +89,7 @@ - # - # - --include_HEADERS= libarchive/archive.h libarchive/archive_entry.h -+include_HEADERS= libarchive/archive.h libarchive/archive_entry.h contrib/android/include/android_lf.h - - libarchive_la_SOURCES= \ - libarchive/archive_acl.c \ -@@ -284,6 +284,7 @@ - - # -no-undefined marks that libarchive doesn't rely on symbols - # defined in the application. This is mandatory for cygwin. -+libarchive_la_CPPFLAGS= -I$(top_srcdir)/contrib/android/include - libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION) $(GC_SECTIONS) - libarchive_la_LIBADD= $(LTLIBICONV) - diff -Nru vlc-3.0.21/contrib/src/libarchive/rules.mak vlc-3.0.22/contrib/src/libarchive/rules.mak --- vlc-3.0.21/contrib/src/libarchive/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/libarchive/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,13 +1,40 @@ # LIBARCHIVE -LIBARCHIVE_VERSION := 3.6.1 -LIBARCHIVE_URL := http://www.libarchive.org/downloads/libarchive-$(LIBARCHIVE_VERSION).tar.gz +LIBARCHIVE_VERSION := 3.8.0 +LIBARCHIVE_URL := $(GITHUB)/libarchive/libarchive/releases/download/v$(LIBARCHIVE_VERSION)/libarchive-$(LIBARCHIVE_VERSION).tar.gz PKGS += libarchive ifeq ($(call need_pkg,"libarchive >= 3.2.0"),) PKGS_FOUND += libarchive endif -DEPS_libarchive = zlib +DEPS_libarchive = zlib $(DEPS_zlib) +ifdef HAVE_WINSTORE +# libarchive uses CreateHardLinkW +DEPS_libarchive += alloweduwp $(DEPS_alloweduwp) +endif + +LIBARCHIVE_CONF := \ + -DENABLE_CPIO=OFF -DENABLE_TAR=OFF -DENABLE_CAT=OFF \ + -DENABLE_NETTLE=OFF \ + -DENABLE_LIBXML2=OFF -DENABLE_LZMA=OFF -DENABLE_ICONV=OFF -DENABLE_EXPAT=OFF \ + -DENABLE_TEST=OFF -DENABLE_WERROR=OFF + +# CNG enables bcrypt on Windows and useless otherwise, it's not used when building for XP +LIBARCHIVE_CONF +=-DENABLE_CNG=ON + +# bsdunzip doesn't build on macos, android and emscripten and it's disabled on Windows +LIBARCHIVE_CONF +=-DENABLE_UNZIP=OFF + +ifdef HAVE_WIN32 +LIBARCHIVE_CONF += -DENABLE_OPENSSL=OFF +endif + +ifdef HAVE_MACOSX +# these functions are detected as present but there are not until macOS 10.10 +# the minimum supported value is 10.7, in each case missing the functions falls +# back to an alternative +LIBARCHIVE_CONF += -DHAVE_FDOPENDIR:INTERNAL= -DHAVE_OPENAT:INTERNAL= -DHAVE_FSTATAT:INTERNAL= -DHAVE_LINKAT:INTERNAL= +endif $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz: $(call download_pkg,$(LIBARCHIVE_URL),libarchive) @@ -16,20 +43,14 @@ libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive $(UNPACK) -ifdef HAVE_ANDROID - $(APPLY) $(SRC)/libarchive/android.patch -endif -ifdef HAVE_WINSTORE - $(APPLY) $(SRC)/libarchive/winrt.patch -endif + $(APPLY) $(SRC)/libarchive/0001-zstd-use-GetNativeSystemInfo-to-get-the-number-of-th.patch + $(APPLY) $(SRC)/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch $(call pkg_static,"build/pkgconfig/libarchive.pc.in") $(MOVE) -.libarchive: libarchive - $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \ - --disable-bsdcpio --disable-bsdtar --disable-bsdcat \ - --without-nettle --without-cng \ - --without-xml2 --without-lzma --without-iconv --without-expat - cd $< && $(MAKE) install +.libarchive: libarchive toolchain.cmake + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(LIBARCHIVE_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/libarchive/winrt.patch vlc-3.0.22/contrib/src/libarchive/winrt.patch --- vlc-3.0.21/contrib/src/libarchive/winrt.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/libarchive/winrt.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,531 +0,0 @@ -From 54904e02380cd05191458f4b99bef92308ca12c7 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 27 Mar 2020 16:25:36 +0100 -Subject: [PATCH] WIP fix compilation for Universal Windows - ---- - libarchive/archive_check_magic.c | 3 +- - libarchive/archive_entry.h | 2 +- - libarchive/archive_entry_copy_bhfi.c | 2 +- - libarchive/archive_read_disk_windows.c | 9 ++++++ - .../archive_read_support_filter_bzip2.c | 4 +++ - .../archive_read_support_filter_grzip.c | 4 +++ - .../archive_read_support_filter_lrzip.c | 4 +++ - libarchive/archive_read_support_filter_lz4.c | 4 +++ - libarchive/archive_read_support_filter_lzop.c | 4 +++ - .../archive_read_support_filter_program.c | 14 ++++++--- - libarchive/archive_read_support_filter_xz.c | 12 +++++++ - libarchive/archive_read_support_filter_zstd.c | 4 +++ - .../archive_read_support_format_mtree.c | 10 ++++++ - libarchive/archive_string.c | 2 +- - libarchive/archive_util.c | 9 +++++- - libarchive/archive_windows.c | 31 ++++++++++++++++++- - libarchive/archive_windows.h | 6 ++++ - libarchive/filter_fork_windows.c | 8 +++++ - 18 files changed, 121 insertions(+), 11 deletions(-) - -diff --git a/libarchive/archive_check_magic.c b/libarchive/archive_check_magic.c -index 288ce233..3b3b9bc7 100644 ---- a/libarchive/archive_check_magic.c -+++ b/libarchive/archive_check_magic.c -@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_check_magic.c 201089 2009-12-28 - #if defined(_WIN32) && !defined(__CYGWIN__) - #include - #include -+#include - #endif - - #include "archive_private.h" -@@ -65,7 +66,7 @@ errmsg(const char *m) - static __LA_DEAD void - diediedie(void) - { --#if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG) -+#if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG) && WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - /* Cause a breakpoint exception */ - DebugBreak(); - #endif -diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h -index 42af2086..cff6e55a 100644 ---- a/libarchive/archive_entry.h -+++ b/libarchive/archive_entry.h -@@ -303,7 +303,7 @@ __LA_DECL int archive_entry_is_encrypted(struct archive_entry *); - - __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); - __LA_DECL void archive_entry_unset_atime(struct archive_entry *); --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - __LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, BY_HANDLE_FILE_INFORMATION *); - #endif - __LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); -diff --git a/libarchive/archive_entry_copy_bhfi.c b/libarchive/archive_entry_copy_bhfi.c -index 77bf38e4..22f9702c 100644 ---- a/libarchive/archive_entry_copy_bhfi.c -+++ b/libarchive/archive_entry_copy_bhfi.c -@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); - #include "archive_private.h" - #include "archive_entry.h" - --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - - #define EPOC_TIME ARCHIVE_LITERAL_ULL(116444736000000000) - -diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c -index fdd376f9..85215326 100644 ---- a/libarchive/archive_read_disk_windows.c -+++ b/libarchive/archive_read_disk_windows.c -@@ -715,7 +715,11 @@ start_next_async_read(struct archive_read_disk *a, struct tree *t) - if (olp->buff == NULL) { - void *p; - size_t s = (size_t)align_num_per_sector(t, READ_BUFFER_SIZE); -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - p = VirtualAlloc(NULL, s, MEM_COMMIT, PAGE_READWRITE); -+#else /* !WINAPI_PARTITION_DESKTOP */ -+ p = VirtualAllocFromApp(NULL, s, MEM_COMMIT, PAGE_READWRITE); -+#endif /* !WINAPI_PARTITION_DESKTOP */ - if (p == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Couldn't allocate memory"); -@@ -1512,7 +1516,12 @@ setup_current_filesystem(struct archive_read_disk *a) - - t->current_filesystem->synthetic = -1;/* Not supported */ - path = safe_path_for_statfs(t); -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - if (!GetVolumePathNameW(path, vol, sizeof(vol)/sizeof(vol[0]))) { -+#else /* !WINAPI_PARTITION_DESKTOP */ -+ DWORD MaximumComponentLength, FileSystemFlags; -+ if (!GetVolumeInformationW(path, vol, sizeof(vol)/sizeof(vol[0]), NULL, &MaximumComponentLength, &FileSystemFlags, NULL, 0)) { -+#endif - free(path); - t->current_filesystem->remote = -1; - t->current_filesystem->bytesPerSector = 0; -diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c -index 3885a7cf..d2e8b001 100644 ---- a/libarchive/archive_read_support_filter_bzip2.c -+++ b/libarchive/archive_read_support_filter_bzip2.c -@@ -169,6 +169,7 @@ bzip2_reader_bid(struct archive_read_filter_bidder *self, struct archive_read_fi - static int - bzip2_reader_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "bzip2 -d"); -@@ -178,6 +179,9 @@ bzip2_reader_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_BZIP2; - self->name = "bzip2"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } - - -diff --git a/libarchive/archive_read_support_filter_grzip.c b/libarchive/archive_read_support_filter_grzip.c -index 84c86aeb..66c32b4b 100644 ---- a/libarchive/archive_read_support_filter_grzip.c -+++ b/libarchive/archive_read_support_filter_grzip.c -@@ -109,6 +109,7 @@ grzip_bidder_bid(struct archive_read_filter_bidder *self, - static int - grzip_bidder_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "grzip -d"); -@@ -118,4 +119,7 @@ grzip_bidder_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_GRZIP; - self->name = "grzip"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } -diff --git a/libarchive/archive_read_support_filter_lrzip.c b/libarchive/archive_read_support_filter_lrzip.c -index c82a8e2f..b4100b9a 100644 ---- a/libarchive/archive_read_support_filter_lrzip.c -+++ b/libarchive/archive_read_support_filter_lrzip.c -@@ -120,6 +120,7 @@ lrzip_bidder_bid(struct archive_read_filter_bidder *self, - static int - lrzip_bidder_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "lrzip -d -q"); -@@ -129,4 +130,7 @@ lrzip_bidder_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_LRZIP; - self->name = "lrzip"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } -diff --git a/libarchive/archive_read_support_filter_lz4.c b/libarchive/archive_read_support_filter_lz4.c -index 43ee6c2b..5d3baf91 100644 ---- a/libarchive/archive_read_support_filter_lz4.c -+++ b/libarchive/archive_read_support_filter_lz4.c -@@ -204,6 +204,7 @@ lz4_reader_bid(struct archive_read_filter_bidder *self, - static int - lz4_reader_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "lz4 -d -q"); -@@ -213,6 +214,9 @@ lz4_reader_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_LZ4; - self->name = "lz4"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } - - -diff --git a/libarchive/archive_read_support_filter_lzop.c b/libarchive/archive_read_support_filter_lzop.c -index a1c392f4..191688f4 100644 ---- a/libarchive/archive_read_support_filter_lzop.c -+++ b/libarchive/archive_read_support_filter_lzop.c -@@ -160,6 +160,7 @@ lzop_bidder_bid(struct archive_read_filter_bidder *self, - static int - lzop_bidder_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "lzop -d"); -@@ -169,6 +170,9 @@ lzop_bidder_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_LZOP; - self->name = "lzop"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } - #else - /* -diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c -index b8bf1288..2197ed41 100644 ---- a/libarchive/archive_read_support_filter_program.c -+++ b/libarchive/archive_read_support_filter_program.c -@@ -82,6 +82,8 @@ archive_read_support_filter_program(struct archive *a, const char *cmd) - return (archive_read_support_filter_program_signature(a, cmd, NULL, 0)); - } - -+ #if !defined(_WIN32) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+ - /* - * The bidder object stores the command and the signature to watch for. - * The 'inhibit' entry here is used to ensure that unchecked filters never -@@ -105,7 +107,7 @@ static int program_bidder_free(struct archive_read_filter_bidder *); - */ - struct program_filter { - struct archive_string description; --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - HANDLE child; - #else - pid_t child; -@@ -254,7 +256,7 @@ child_stop(struct archive_read_filter *self, struct program_filter *state) - state->waitpid_return - = waitpid(state->child, &state->exit_status, 0); - } while (state->waitpid_return == -1 && errno == EINTR); --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - CloseHandle(state->child); - #endif - state->child = 0; -@@ -309,7 +311,7 @@ child_read(struct archive_read_filter *self, char *buf, size_t buf_len) - struct program_filter *state = self->data; - ssize_t ret, requested, avail; - const char *p; --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - HANDLE handle = (HANDLE)_get_osfhandle(state->child_stdout); - #endif - -@@ -317,7 +319,7 @@ child_read(struct archive_read_filter *self, char *buf, size_t buf_len) - - for (;;) { - do { --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - /* Avoid infinity wait. - * Note: If there is no data in the pipe, ReadFile() - * called in read() never returns and so we won't -@@ -516,3 +518,5 @@ program_filter_close(struct archive_read_filter *self) - - return (e); - } -+ -+#endif // !_WIN32 || WINAPI_PARTITION_DESKTOP -diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c -index 11807cf6..856e08a5 100644 ---- a/libarchive/archive_read_support_filter_xz.c -+++ b/libarchive/archive_read_support_filter_xz.c -@@ -754,6 +754,7 @@ xz_filter_close(struct archive_read_filter *self) - static int - lzma_bidder_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "lzma -d -qq"); -@@ -763,11 +764,15 @@ lzma_bidder_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_LZMA; - self->name = "lzma"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } - - static int - xz_bidder_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "xz -d -qq"); -@@ -777,11 +782,15 @@ xz_bidder_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_XZ; - self->name = "xz"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } - - static int - lzip_bidder_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "lzip -d -q"); -@@ -791,6 +800,9 @@ lzip_bidder_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_LZIP; - self->name = "lzip"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } - - #endif /* HAVE_LZMA_H */ -diff --git a/libarchive/archive_read_support_filter_zstd.c b/libarchive/archive_read_support_filter_zstd.c -index c8bb36be..84859211 100644 ---- a/libarchive/archive_read_support_filter_zstd.c -+++ b/libarchive/archive_read_support_filter_zstd.c -@@ -143,6 +143,7 @@ zstd_bidder_bid(struct archive_read_filter_bidder *self, - static int - zstd_bidder_init(struct archive_read_filter *self) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - int r; - - r = __archive_read_program(self, "zstd -d -qq"); -@@ -152,6 +153,9 @@ zstd_bidder_init(struct archive_read_filter *self) - self->code = ARCHIVE_FILTER_ZSTD; - self->name = "zstd"; - return (r); -+#else -+ return ARCHIVE_FATAL; -+#endif - } - - #else -diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c -index 332944ac..8c647131 100644 ---- a/libarchive/archive_read_support_format_mtree.c -+++ b/libarchive/archive_read_support_format_mtree.c -@@ -57,6 +57,8 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011 - #include "archive_string.h" - #include "archive_pack_dev.h" - -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+ - #ifndef O_BINARY - #define O_BINARY 0 - #endif -@@ -2023,3 +2025,11 @@ readline(struct archive_read *a, struct mtree *mtree, char **start, - find_off = u - mtree->line.s; - } - } -+ -+#else -+int -+archive_read_support_format_mtree(struct archive *_a) -+{ -+ return ARCHIVE_OK; -+} -+#endif -diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c -index c77dcf52..7942ff8b 100644 ---- a/libarchive/archive_string.c -+++ b/libarchive/archive_string.c -@@ -1323,7 +1323,7 @@ free_sconv_object(struct archive_string_conv *sc) - free(sc); - } - --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - static unsigned - my_atoi(const char *p) - { -diff --git a/libarchive/archive_util.c b/libarchive/archive_util.c -index 659665a8..d526497f 100644 ---- a/libarchive/archive_util.c -+++ b/libarchive/archive_util.c -@@ -209,7 +209,7 @@ __archive_errx(int retvalue, const char *msg) - * Create a temporary file - */ - #if defined(_WIN32) && !defined(__CYGWIN__) -- -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - /* - * Do not use Windows tmpfile() function. - * It will make a temporary file under the root directory -@@ -378,6 +378,13 @@ exit_tmpfile: - archive_wstring_free(&temp_name); - return (fd); - } -+#else -+int -+__archive_mktempx(const char *tmpdir, wchar_t *template) -+{ -+ return -1; -+} -+#endif - - int - __archive_mktemp(const char *tmpdir) -diff --git a/libarchive/archive_windows.c b/libarchive/archive_windows.c -index 624e2700..828a8543 100644 ---- a/libarchive/archive_windows.c -+++ b/libarchive/archive_windows.c -@@ -235,6 +235,7 @@ la_CreateFile(const char *path, DWORD dwDesiredAccess, DWORD dwShareMode, - wchar_t *wpath; - HANDLE handle; - -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - handle = CreateFileA(path, dwDesiredAccess, dwShareMode, - lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, - hTemplateFile); -@@ -249,6 +250,20 @@ la_CreateFile(const char *path, DWORD dwDesiredAccess, DWORD dwShareMode, - lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, - hTemplateFile); - free(wpath); -+#else /* !WINAPI_PARTITION_DESKTOP */ -+ wpath = __la_win_permissive_name(path); -+ if (wpath == NULL) -+ return (handle); -+ CREATEFILE2_EXTENDED_PARAMETERS createExParams; -+ createExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); -+ createExParams.dwFileAttributes = dwFlagsAndAttributes & 0xFFFF; -+ createExParams.dwFileFlags = dwFlagsAndAttributes & 0xFFF00000; -+ createExParams.dwSecurityQosFlags = dwFlagsAndAttributes & 0x000F00000; -+ createExParams.lpSecurityAttributes = lpSecurityAttributes; -+ createExParams.hTemplateFile = hTemplateFile; -+ handle = CreateFile2(wpath, dwDesiredAccess, dwShareMode, dwCreationDisposition, &createExParams); -+ free(wpath); -+#endif /* !WINAPI_PARTITION_DESKTOP */ - return (handle); - } - -@@ -320,7 +335,7 @@ __la_open(const char *path, int flags, ...) - } - if (attr & FILE_ATTRIBUTE_DIRECTORY) { - HANDLE handle; -- -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - if (ws != NULL) - handle = CreateFileW(ws, 0, 0, NULL, - OPEN_EXISTING, -@@ -333,6 +348,20 @@ __la_open(const char *path, int flags, ...) - FILE_FLAG_BACKUP_SEMANTICS | - FILE_ATTRIBUTE_READONLY, - NULL); -+#else /* !WINAPI_PARTITION_DESKTOP */ -+ if (ws != NULL) { -+ CREATEFILE2_EXTENDED_PARAMETERS createExParams; -+ createExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); -+ createExParams.dwFileAttributes = FILE_ATTRIBUTE_READONLY; -+ createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS; -+ createExParams.dwSecurityQosFlags = 0; -+ createExParams.lpSecurityAttributes = NULL; -+ createExParams.hTemplateFile = NULL; -+ handle = CreateFile2(ws, 0, 0, OPEN_EXISTING, &createExParams); -+ } -+ else -+ handle = INVALID_HANDLE_VALUE; -+#endif /* !WINAPI_PARTITION_DESKTOP */ - free(ws); - if (handle == INVALID_HANDLE_VALUE) { - la_dosmaperr(GetLastError()); -diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h -index 47b7cb8e..9743f310 100644 ---- a/libarchive/archive_windows.h -+++ b/libarchive/archive_windows.h -@@ -106,9 +106,11 @@ - #define lseek __la_lseek - #define __LA_LSEEK_NEEDED - #endif -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - #define lstat __la_stat - #define open __la_open - #define read __la_read -+#endif - #if !defined(__BORLANDC__) && !defined(__WATCOMC__) - #define setmode _setmode - #endif -@@ -122,8 +124,10 @@ - #define umask _umask - #endif - #endif -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - #define waitpid __la_waitpid - #define write __la_write -+#endif - - #if !defined(__WATCOMC__) - -@@ -276,8 +280,10 @@ extern int __la_stat(const char *path, struct stat *st); - extern pid_t __la_waitpid(HANDLE child, int *status, int option); - extern ssize_t __la_write(int fd, const void *buf, size_t nbytes); - -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - #define _stat64i32(path, st) __la_stat(path, st) - #define _stat64(path, st) __la_stat(path, st) -+#endif - /* for status returned by la_waitpid */ - #define WIFEXITED(sts) ((sts & 0x100) == 0) - #define WEXITSTATUS(sts) (sts & 0x0FF) -diff --git a/libarchive/filter_fork_windows.c b/libarchive/filter_fork_windows.c -index ad271fe6..0414d6f4 100644 ---- a/libarchive/filter_fork_windows.c.orig 2020-12-26 02:29:38.000000000 +0100 -+++ b/libarchive/filter_fork_windows.c 2021-04-21 17:17:42.651099766 +0200 -@@ -31,6 +31,13 @@ - - #include "filter_fork.h" - -+#if !WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -+int -+__archive_create_child(const char *cmd, int *child_stdin, int *child_stdout, HANDLE *out_child) -+{ -+ return ARCHIVE_FAILED; -+} -+#else /* WINAPI_PARTITION_DESKTOP */ - int - __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout, - HANDLE *out_child) -@@ -187,6 +194,7 @@ - __archive_cmdline_free(acmd); - return ARCHIVE_FAILED; - } -+#endif /* WINAPI_PARTITION_DESKTOP */ - - void - __archive_check_child(int in, int out) diff -Nru vlc-3.0.21/contrib/src/libaribcaption/SHA512SUMS vlc-3.0.22/contrib/src/libaribcaption/SHA512SUMS --- vlc-3.0.21/contrib/src/libaribcaption/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/libaribcaption/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3f3c802ae68734126d9b4a0525b3353af4c1a3807cd21bfa04b89f2092fe565cb2413bcdd0b762313d40b7e0ab75c7e8066bf4a1879c16637f35ee164f6ef6a4 libaribcaption-1.1.1.tar.gz diff -Nru vlc-3.0.21/contrib/src/libaribcaption/rules.mak vlc-3.0.22/contrib/src/libaribcaption/rules.mak --- vlc-3.0.21/contrib/src/libaribcaption/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/libaribcaption/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -LIBARIBCC_VERSION := 1.1.1 -LIBARIBCC_URL := $(GITHUB)/xqq/libaribcaption/archive/refs/tags/v$(LIBARIBCC_VERSION).tar.gz - -PKGS += libaribcaption -ifeq ($(call need_pkg,"libaribcaption"),) -PKGS_FOUND += libaribcaption -endif - -ifdef HAVE_ANDROID -LIBARIBCC_WITH_FONTCONFIG = 0 -else -ifdef HAVE_DARWIN_OS -LIBARIBCC_WITH_FONTCONFIG = 0 -else -ifdef HAVE_WIN32 -LIBARIBCC_WITH_FONTCONFIG = 0 -else -LIBARIBCC_WITH_FONTCONFIG = 1 -endif -endif -endif - -DEPS_libaribcaption = freetype2 $(DEPS_freetype2) - -ifeq ($(LIBARIBCC_WITH_FONTCONFIG), 1) -DEPS_libaribcaption += fontconfig $(DEPS_fontconfig) -endif - -$(TARBALLS)/libaribcaption-$(LIBARIBCC_VERSION).tar.gz: - ${call download_pkg,$(LIBARIBCC_URL),libaribcaption} - -.sum-libaribcaption: libaribcaption-$(LIBARIBCC_VERSION).tar.gz - -libaribcaption: libaribcaption-$(LIBARIBCC_VERSION).tar.gz .sum-libaribcaption - $(UNPACK) - $(MOVE) - -LIBARIBCC_CONF := \ - -DARIBCC_NO_EXCEPTIONS:BOOL=ON \ - -DARIBCC_NO_RTTI:BOOL=ON - -ifdef HAVE_ANDROID -LIBARIBCC_CONF += -DARIBCC_IS_ANDROID:BOOL=ON -endif - -LIBARIBCC_CONF += -DARIBCC_USE_FREETYPE:BOOL=ON - -ifeq ($(LIBARIBCC_WITH_FONTCONFIG), 1) -LIBARIBCC_CONF += -DARIBCC_USE_FONTCONFIG:BOOL=ON -else -LIBARIBCC_CONF += -DARIBCC_USE_FONTCONFIG:BOOL=OFF -endif - - -.libaribcaption: libaribcaption toolchain.cmake - $(CMAKECLEAN) - $(HOSTVARS) $(CMAKE) $(LIBARIBCC_CONF) - +$(CMAKEBUILD) - $(CMAKEINSTALL) - touch $@ diff -Nru vlc-3.0.21/contrib/src/libdsm/rules.mak vlc-3.0.22/contrib/src/libdsm/rules.mak --- vlc-3.0.21/contrib/src/libdsm/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/libdsm/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -19,6 +19,8 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.xz .sum-libdsm $(UNPACK) + $(APPLY) $(SRC)/libdsm/0001-Avoid-relying-on-implicit-function-declarations.patch + $(APPLY) $(SRC)/libdsm/0001-use-GetCurrentProcessId-for-the-process-ID-on-Window.patch $(MOVE) DEPS_libdsm = libtasn1 iconv @@ -27,7 +29,7 @@ endif .libdsm: libdsm crossfile.meson - cd $< && rm -rf ./build - cd $< && $(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled -Dbinaries=false build - cd $< && cd build && ninja install + $(MESONCLEAN) + $(MESON) -Dauto_features=disabled -Dbinaries=false + +$(MESONBUILD) touch $@ diff -Nru vlc-3.0.21/contrib/src/libebur128/SHA512SUMS vlc-3.0.22/contrib/src/libebur128/SHA512SUMS --- vlc-3.0.21/contrib/src/libebur128/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/libebur128/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582 libebur128-1.2.6.tar.gz diff -Nru vlc-3.0.21/contrib/src/libebur128/rules.mak vlc-3.0.22/contrib/src/libebur128/rules.mak --- vlc-3.0.21/contrib/src/libebur128/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/libebur128/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# EBU R128 standard for loudness normalisation - -LIBEBUR128_VERSION := 1.2.6 -LIBEBUR128_URL := $(GITHUB)/jiixyj/libebur128/archive/v$(LIBEBUR128_VERSION).tar.gz - -PKGS += libebur128 -ifeq ($(call need_pkg,"libebur128"),) -PKGS_FOUND += libebur128 -endif - -$(TARBALLS)/libebur128-$(LIBEBUR128_VERSION).tar.gz: - $(call download_pkg,$(LIBEBUR128_URL),libebur128) - -.sum-libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz - -libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz .sum-libebur128 - $(UNPACK) - $(call pkg_static,"./ebur128/libebur128.pc.cmake") - $(MOVE) - -LIBEBUR128_CONF := -DENABLE_INTERNAL_QUEUE_H=TRUE - -.libebur128: libebur128 toolchain.cmake - $(CMAKECLEAN) - $(HOSTVARS) $(CMAKE) $(LIBEBUR128_CONF) - +$(CMAKEBUILD) - $(CMAKEINSTALL) - touch $@ diff -Nru vlc-3.0.21/contrib/src/libmpeg2/rules.mak vlc-3.0.22/contrib/src/libmpeg2/rules.mak --- vlc-3.0.21/contrib/src/libmpeg2/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/libmpeg2/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ # libmpeg2 LIBMPEG2_VERSION := 0.5.1 -LIBMPEG2_URL := http://libmpeg2.sourceforge.net/files/libmpeg2-$(LIBMPEG2_VERSION).tar.gz +LIBMPEG2_URL := $(CONTRIB_VIDEOLAN)/libmpeg2/libmpeg2-$(LIBMPEG2_VERSION).tar.gz ifdef GPL PKGS += libmpeg2 @@ -20,13 +20,17 @@ $(APPLY) $(SRC)/libmpeg2/libmpeg2-arm-pld.patch $(APPLY) $(SRC)/libmpeg2/libmpeg2-inline.patch $(APPLY) $(SRC)/libmpeg2/libmpeg2-mc-neon.patch + sed -i.orig -e 's,libvo src test vc++,,' $(UNPACK_DIR)/Makefile.am + sed -i.orig -e 's,SUBDIRS,# SUBDIRS,' $(UNPACK_DIR)/libmpeg2/Makefile.am $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub .auto $(MOVE) +LIBMPEG2_CONF := --without-x --disable-sdl + .libmpeg2: libmpeg2 $(REQUIRE_GPL) $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-x --disable-sdl - cd $< && $(MAKE) -C libmpeg2 && $(MAKE) -C libmpeg2 install - cd $< && $(MAKE) -C include && $(MAKE) -C include install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(LIBMPEG2_CONF) + $(MAKE) -C $< + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/libplacebo/0001-meson-allow-forcing-the-path-to-look-for-libraries.patch vlc-3.0.22/contrib/src/libplacebo/0001-meson-allow-forcing-the-path-to-look-for-libraries.patch --- vlc-3.0.21/contrib/src/libplacebo/0001-meson-allow-forcing-the-path-to-look-for-libraries.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/libplacebo/0001-meson-allow-forcing-the-path-to-look-for-libraries.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -From 934dafd8f16e8c4b2b8421ceace74c5ea364f781 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 26 Apr 2023 11:55:59 +0200 -Subject: [PATCH] meson: allow forcing the path to look for libraries - -compiler.find_library() doesn't use c/cpp_lib_args when looking for libraries. - -The way to pass customized path to look for libraries not found in the system -is to give the path(es) manually to compiler.find_library(). ---- - meson_options.txt | 2 ++ - src/glsl/meson.build | 14 +++++++------- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 5b8113ae..6c38ceea 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -52,3 +52,5 @@ option('debug-abort', type: 'boolean', value: false, - description: 'abort() on most runtime errors (only for debugging purposes)') - - option('python-path', type: 'string', description: 'Path to python3 executable') -+ -+option('find_lib_path', type: 'string', description: 'Path to libraries') -diff --git a/src/glsl/meson.build b/src/glsl/meson.build -index 5cebfb89..5e3ef2d5 100644 ---- a/src/glsl/meson.build -+++ b/src/glsl/meson.build -@@ -31,7 +31,7 @@ elif not glslang_req.disabled() - static = arg[0] - required = arg[1] - -- spirv = cxx.find_library('SPIRV', required: required, static: static) -+ spirv = cxx.find_library('SPIRV', required: required, static: static, dirs: [get_option('find_lib_path')]) - - if not spirv.found() - continue -@@ -42,13 +42,13 @@ elif not glslang_req.disabled() - if static - glslang_deps += [ - # Always required for static linking -- cxx.find_library('MachineIndependent', required: true, static: true), -- cxx.find_library('OSDependent', required: true, static: true), -- cxx.find_library('OGLCompiler', required: true, static: true), -- cxx.find_library('GenericCodeGen', required: true, static: true), -+ cxx.find_library('MachineIndependent', required: true, static: true, dirs: [get_option('find_lib_path')]), -+ cxx.find_library('OSDependent', required: true, static: true, dirs: [get_option('find_lib_path')]), -+ cxx.find_library('OGLCompiler', required: true, static: true, dirs: [get_option('find_lib_path')]), -+ cxx.find_library('GenericCodeGen', required: true, static: true, dirs: [get_option('find_lib_path')]), - # SPIRV-Tools are required only if optimizer is enabled in glslang build -- cxx.find_library('SPIRV-Tools', required: false, static: true), -- cxx.find_library('SPIRV-Tools-opt', required: false, static: true), -+ cxx.find_library('SPIRV-Tools', required: false, static: true, dirs: [get_option('find_lib_path')]), -+ cxx.find_library('SPIRV-Tools-opt', required: false, static: true, dirs: [get_option('find_lib_path')]), - ] - endif - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/libplacebo/0001-meson-allow-overriding-python3-path.patch vlc-3.0.22/contrib/src/libplacebo/0001-meson-allow-overriding-python3-path.patch --- vlc-3.0.21/contrib/src/libplacebo/0001-meson-allow-overriding-python3-path.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/libplacebo/0001-meson-allow-overriding-python3-path.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -From 62dc67bd043a9982dafd7e1a4c708ce427489712 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Sat, 22 Oct 2022 13:59:37 +0200 -Subject: [PATCH] meson: allow overriding python3 path - -We need this to support building inside a virtualenv. ---- - meson.build | 2 +- - meson_options.txt | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 2ea819b2..c1404ee9 100644 ---- a/meson.build -+++ b/meson.build -@@ -320,7 +320,7 @@ add_project_link_arguments(link_args, language: 'c') - fs = import('fs') - libm = cc.find_library('m', required: false) - thirdparty = meson.project_source_root()/'3rdparty' --python = import('python').find_installation() -+python = import('python').find_installation(get_option('python-path')) - python_env = environment() - python_env.append('PYTHONPATH', thirdparty/'jinja'/'src') - python_env.append('PYTHONPATH', thirdparty/'markupsafe'/'src') -diff --git a/meson_options.txt b/meson_options.txt -index ce88b3bf..853d1347 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -44,3 +44,5 @@ option('unwind', type: 'feature', value: 'auto', - - option('debug-abort', type: 'boolean', value: false, - description: 'abort() on most runtime errors (only for debugging purposes)') -+ -+option('python-path', type: 'string', description: 'Path to python3 executable') --- -2.38.0 - diff -Nru vlc-3.0.21/contrib/src/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch vlc-3.0.22/contrib/src/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch --- vlc-3.0.21/contrib/src/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -From f338dcf654a615839925de33939e538cc92880a9 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Sat, 22 Oct 2022 11:36:51 +0200 -Subject: [PATCH] vulkan/meson: add the clang/gcc C++ runtime - -The Vulkan loader present on some Linux distro or Android don't export which -C++ they are using. When using libplacebo from C code it's missing in the link -parameters from libplacebo. So we do it on behalf of Vulkan loader. - -We suppose we're building with a compatible C++ compiler that was used to -generate the vulkan loader. - -We can't detect the link flags exposed by vulkan with Meson so we assume it's -never set. - -Authored-by: Steve Lhomme ---- - src/vulkan/meson.build | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build -index fe77f699..915df90b 100644 ---- a/src/vulkan/meson.build -+++ b/src/vulkan/meson.build -@@ -6,6 +6,14 @@ registry_xml = get_option('vulkan-registry') - - if vulkan_loader.found() - vulkan_headers = vulkan_loader.partial_dependency(includes: true, compile_args: true) -+ -+# add the C++ runtime that vulkan needs but may not expose in its pkg-config -+ if cxx.get_id() == 'clang' -+ build_deps += cxx.find_library('c++', required: true) -+ elif cxx.get_id() == 'gcc' -+ build_deps += cxx.find_library('stdc++', required: true) -+ endif -+ - # Probe for as a fallback for the vulkan headers - elif cc.has_header_symbol('vulkan/vulkan_core.h', 'VK_VERSION_1_2') - vulkan_headers = declare_dependency() --- -2.38.0 - diff -Nru vlc-3.0.21/contrib/src/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch vlc-3.0.22/contrib/src/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch --- vlc-3.0.21/contrib/src/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From ce4c19c96fb0f90c7728fc209f3544023bb5ddcd Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Tue, 23 May 2023 15:02:15 +0200 -Subject: [PATCH 1/2] meson: don't force the Windows version if it's higher - than Vista - -If the user requires a newer Windows version it should set it manually. - -It is also questionable to call inet_ntop (aka InetNtopA) if the build -requests minimum support for Win XP (VLC 3.0). It's only available since -Vista [1]. So building for a Vista target should be fine. - -[1] https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-inet_ntop ---- - meson.build | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f8ec49b..c2df33a 100755 ---- a/meson.build -+++ b/meson.build -@@ -64,7 +64,17 @@ threads = [] - test_args = [] - if host_machine.system() == 'windows' - deps += [ cc.find_library('ws2_32') ] -- add_project_arguments(['-D_WIN32_WINNT=0x0601'], language: 'c') -+ -+windows_version_test = ''' -+#include -+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 -+# error _WIN32_WINNT toolchain default not high enough -+#endif -+''' -+ if not cc.compiles(windows_version_test, name: '_WIN32_WINNT includes Vista') -+ add_project_arguments(['-D_WIN32_WINNT=0x0600'], language: 'c') -+ endif -+ - if get_option('default_library') != 'static' - add_project_arguments(['-DLIBRIST_BUILDING_DLL'], language: 'c') - endif --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/librist/SHA512SUMS vlc-3.0.22/contrib/src/librist/SHA512SUMS --- vlc-3.0.21/contrib/src/librist/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/librist/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -fa4e1aea75206781d062d350410e2f4e095e52191d22fb1882ec779ca13845294d00b5e4f06f04573eb8945ec280c304c96c1607622e978a241c5086b7d0a831 librist-v0.2.7.tar.gz diff -Nru vlc-3.0.21/contrib/src/librist/librist-fix-libcjson-meson.patch vlc-3.0.22/contrib/src/librist/librist-fix-libcjson-meson.patch --- vlc-3.0.21/contrib/src/librist/librist-fix-libcjson-meson.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/librist/librist-fix-libcjson-meson.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index a77780667dfb07d700d39c6c3353c0ba4906b178..0ed820152476e0caed3ba6d203ba236083fb8438 100755 ---- a/meson.build -+++ b/meson.build -@@ -156,7 +156,7 @@ endif - - #On ubuntu cjson does not come with pkgconfig files, hence the extended checking. - if not builtin_cjson -- cjson_lib = dependency('cJSON', required: false) -+ cjson_lib = dependency('libcjson', required: false) - if not cjson_lib.found() - cjson_lib = cc.find_library('cjson', required: required_library, has_headers: ['cjson/cJSON.h']) - if not cjson_lib.found() diff -Nru vlc-3.0.21/contrib/src/librist/rules.mak vlc-3.0.22/contrib/src/librist/rules.mak --- vlc-3.0.21/contrib/src/librist/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/librist/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -# librist - -LIBRIST_VERSION := v0.2.7 -LIBRIST_URL := http://code.videolan.org/rist/librist/-/archive/$(LIBRIST_VERSION)/librist-$(LIBRIST_VERSION).tar.gz - -ifdef BUILD_NETWORK -PKGS += librist -endif - -DEPS_librist = -ifdef HAVE_WIN32 -DEPS_librist += winpthreads $(DEPS_winpthreads) -endif -ifdef HAVE_WINSTORE -# librist uses wincrypt -DEPS_librist += alloweduwp $(DEPS_alloweduwp) -endif - -ifeq ($(call need_pkg,"librist >= 0.2"),) -PKGS_FOUND += librist -endif - -LIBRIST_CONF = -Dbuilt_tools=false -Dtest=false -ifdef HAVE_WIN32 -LIBRIST_CONF += -Dhave_mingw_pthreads=true -endif - -$(TARBALLS)/librist-$(LIBRIST_VERSION).tar.gz: - $(call download_pkg,$(LIBRIST_URL),librist) - -.sum-librist: librist-$(LIBRIST_VERSION).tar.gz - -librist: librist-$(LIBRIST_VERSION).tar.gz .sum-librist - $(UNPACK) - $(APPLY) $(SRC)/librist/librist-fix-libcjson-meson.patch - $(APPLY) $(SRC)/librist/win32-timing.patch - $(APPLY) $(SRC)/librist/0001-meson-don-t-force-the-Windows-version-if-it-s-higher.patch - $(MOVE) - -.librist: librist crossfile.meson - $(MESONCLEAN) - $(HOSTVARS_MESON) $(MESON) $(LIBRIST_CONF) - +$(MESONBUILD) - touch $@ diff -Nru vlc-3.0.21/contrib/src/librist/win32-timing.patch vlc-3.0.22/contrib/src/librist/win32-timing.patch --- vlc-3.0.21/contrib/src/librist/win32-timing.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/librist/win32-timing.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- librist/contrib/mbedtls/library/timing.c.orig 2022-04-21 15:15:32.479888797 +0300 -+++ librist/contrib/mbedtls/library/timing.c 2022-04-21 15:15:46.615589264 +0300 -@@ -195,7 +195,7 @@ - #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM && - __GNUC__ && __ia64__ */ - --#if !defined(HAVE_HARDCLOCK) && defined(_MSC_VER) && \ -+#if !defined(HAVE_HARDCLOCK) && defined(_WIN32) && \ - !defined(EFIX64) && !defined(EFI32) - - #define HAVE_HARDCLOCK diff -Nru vlc-3.0.21/contrib/src/libtasn1/0001-Use-CreateFile2-in-UWP-builds.patch vlc-3.0.22/contrib/src/libtasn1/0001-Use-CreateFile2-in-UWP-builds.patch --- vlc-3.0.21/contrib/src/libtasn1/0001-Use-CreateFile2-in-UWP-builds.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/libtasn1/0001-Use-CreateFile2-in-UWP-builds.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -From a74b2ef0f17b300c7cdf2f0d45a2d78a6b4c52d8 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Tue, 16 May 2023 09:40:34 +0200 -Subject: [PATCH 1/3] Use CreateFile2 in UWP builds - -CreateFileA and CreateFileW are forbidden calls in UWP. -CreateFile2 is close enough, some parameters are passed in a structure -and it requires a WCHAR filename. Given the original stat uses the -"multibyte code page currently in use" [1], the char should be converted -using CP_ACP [2]. - -[1] https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stat-functions -[2] https://learn.microsoft.com/en-us/windows/win32/api/stringapiset/nf-stringapiset-multibytetowidechar#parameters ---- - lib/spawni.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/stat.c | 35 +++++++++++++++++++++++++++++++++++ - lib/utime.c | 35 +++++++++++++++++++++++++++++++++++ - 3 files changed, 120 insertions(+) - -diff --git a/src/gl/stat.c b/src/gl/stat.c -index 7987e26583..d25f632967 100644 ---- a/src/gl/stat.c -+++ b/src/gl/stat.c -@@ -197,6 +197,7 @@ rpl_stat (char const *name, struct stat *buf) - { - /* Approach based on the file. */ - -+# if !(_WIN32_WINNT >= _WIN32_WINNT_WIN8) - /* Open a handle to the file. - CreateFile - -@@ -212,6 +213,40 @@ rpl_stat (char const *name, struct stat *buf) - filesystem operations. */ - FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */, - NULL); -+# else /* _WIN32_WINNT_WIN8 */ -+ /* Only CreateFile2 is available in UWP builds. -+ -+ */ -+ HANDLE h = INVALID_HANDLE_VALUE; -+ int wlen = MultiByteToWideChar (CP_ACP, 0, rname, -1, NULL, 0); -+ if (wlen > 0) -+ { -+ WCHAR *wrname = malloca (wlen * sizeof (WCHAR)); -+ if (wrname != NULL) -+ { -+ MultiByteToWideChar (CP_ACP, 0, rname, -1, wrname, wlen); -+ -+ CREATEFILE2_EXTENDED_PARAMETERS createExParams; -+ createExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); -+ createExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; -+ /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only -+ in case as different) makes sense only when applied to *all* -+ filesystem operations. */ -+ createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */; -+ createExParams.dwSecurityQosFlags = 0; -+ createExParams.lpSecurityAttributes = NULL; -+ createExParams.hTemplateFile = NULL; -+ -+ h = -+ CreateFile2 (wrname, -+ FILE_READ_ATTRIBUTES, -+ FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, -+ OPEN_EXISTING, -+ &createExParams); -+ freea(wrname); -+ } -+ } -+# endif /* _WIN32_WINNT_WIN8 */ - if (h != INVALID_HANDLE_VALUE) - { - ret = _gl_fstat_by_handle (h, rname, buf); --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/libtasn1/rules.mak vlc-3.0.22/contrib/src/libtasn1/rules.mak --- vlc-3.0.21/contrib/src/libtasn1/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/libtasn1/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -14,11 +14,14 @@ libtasn1: libtasn1-$(LIBTASN1_VERSION).tar.gz .sum-libtasn1 $(UNPACK) + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux $(APPLY) $(SRC)/libtasn1/no-executables.patch $(MOVE) +LIBTASN1_CONF := --disable-doc + .libtasn1: libtasn1 $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(LIBTASN1_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/libxml2/rules.mak vlc-3.0.22/contrib/src/libxml2/rules.mak --- vlc-3.0.21/contrib/src/libxml2/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/libxml2/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -49,5 +49,5 @@ .libxml2: libxml2 $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(CFLAGS) -DLIBXML_STATIC" $(XMLCONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/live555/android-no-ifaddrs.patch vlc-3.0.22/contrib/src/live555/android-no-ifaddrs.patch --- vlc-3.0.21/contrib/src/live555/android-no-ifaddrs.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/live555/android-no-ifaddrs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -diff -ur live.orig/groupsock/GroupsockHelper.cpp live/groupsock/GroupsockHelper.cpp ---- live.orig/groupsock/GroupsockHelper.cpp 2022-07-20 18:02:26.691125894 +0000 -+++ live/groupsock/GroupsockHelper.cpp 2022-07-20 22:23:47.755304434 +0000 -@@ -42,6 +42,9 @@ - #include - #define USE_SIGNALS 1 - #endif -+#if (defined(__ANDROID__) && __ANDROID_API__ < 24) -+#define NO_GETIFADDRS -+#endif - #ifndef NO_GETIFADDRS - #include - #include diff -Nru vlc-3.0.21/contrib/src/live555/live555-formatmessage.patch vlc-3.0.22/contrib/src/live555/live555-formatmessage.patch --- vlc-3.0.21/contrib/src/live555/live555-formatmessage.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/live555/live555-formatmessage.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ ---- live555/BasicUsageEnvironment/BasicUsageEnvironment0.cpp.unicode 2019-03-19 10:00:21.845187700 +0100 -+++ live555/BasicUsageEnvironment/BasicUsageEnvironment0.cpp 2019-03-19 09:59:40.204996800 +0100 -@@ -19,9 +19,6 @@ along with this library; if not, write t - - #include "BasicUsageEnvironment0.hh" - #include --#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_WCE) --#define snprintf _snprintf --#endif - - - ////////// BasicUsageEnvironment ////////// -@@ -68,7 +65,6 @@ void BasicUsageEnvironment0::setResultEr - - if (err == 0) err = getErrno(); - #if defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_WCE) --#ifndef _UNICODE - char errMsg[RESULT_MSG_BUFFER_MAX] = "\0"; - if (0 != FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, errMsg, sizeof(errMsg)/sizeof(errMsg[0]), NULL)) { - // Remove all trailing '\r', '\n' and '.' -@@ -76,9 +72,8 @@ void BasicUsageEnvironment0::setResultEr - *p = '\0'; - } - } else -- snprintf(errMsg, sizeof(errMsg)/sizeof(errMsg[0]), "error %d", err); -+ _snprintf(errMsg, sizeof(errMsg)/sizeof(errMsg[0]), "error %d", err); - appendToResultMsg(errMsg); --#endif - #else - appendToResultMsg(strerror(err)); - #endif diff -Nru vlc-3.0.21/contrib/src/live555/rules.mak vlc-3.0.22/contrib/src/live555/rules.mak --- vlc-3.0.21/contrib/src/live555/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/live555/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -2,7 +2,7 @@ LIVE555_VERSION := 2016.11.28 LIVE555_FILE := live.$(LIVE555_VERSION).tar.gz -LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE) +LIVEDOTCOM_URL := $(CONTRIB_VIDEOLAN)/live555/$(LIVE555_FILE) ifdef BUILD_NETWORK ifdef GNUV3 @@ -19,7 +19,7 @@ .sum-live555: $(LIVE555_FILE) -LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions $(CFLAGS) +LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions -DNO_OPENSSL=1 $(CFLAGS) LIVE_TARGET = $(error live555 target not defined!) ifdef HAVE_LINUX @@ -109,5 +109,5 @@ cd $< && ./genMakefiles $(LIVE_TARGET) cd $< && for subdir in $(SUBDIRS); do $(MAKE) $(HOSTVARS) -C $$subdir; done cd $< && for subdir in $(SUBDIRS); do $(MAKE) $(HOSTVARS) -C $$subdir install; done - cd $< && $(MAKE) install_shared_libraries + $(MAKE) -C $< install_shared_libraries touch $@ diff -Nru vlc-3.0.21/contrib/src/lua/0004-Fix-stack-overflow-in-vararg-functions.patch vlc-3.0.22/contrib/src/lua/0004-Fix-stack-overflow-in-vararg-functions.patch --- vlc-3.0.21/contrib/src/lua/0004-Fix-stack-overflow-in-vararg-functions.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/0004-Fix-stack-overflow-in-vararg-functions.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,21 @@ +From: Enrico Tassi +Date: Tue, 26 Aug 2014 16:20:55 +0200 +Subject: Fix stack overflow in vararg functions + +--- + src/ldo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ldo.c b/src/ldo.c +index d1bf786..30333bf 100644 +--- a/src/ldo.c ++++ b/src/ldo.c +@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) { + CallInfo *ci; + StkId st, base; + Proto *p = cl->p; +- luaD_checkstack(L, p->maxstacksize); ++ luaD_checkstack(L, p->maxstacksize + p->numparams); + func = restorestack(L, funcr); + if (!p->is_vararg) { /* no varargs? */ + base = func + 1; diff -Nru vlc-3.0.21/contrib/src/lua/Add-EXE_EXT-to-allow-specifying-binary-extension.patch vlc-3.0.22/contrib/src/lua/Add-EXE_EXT-to-allow-specifying-binary-extension.patch --- vlc-3.0.21/contrib/src/lua/Add-EXE_EXT-to-allow-specifying-binary-extension.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Add-EXE_EXT-to-allow-specifying-binary-extension.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -From f0f0afd2b0df3574a36e14f2ec71524f4c28eab5 Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Thu, 4 Nov 2021 16:15:53 +0100 -Subject: [PATCH] Add EXE_EXT to allow specifying binary extension - -This is needed to make the install step aware that the lua/luac -binaries have a .exe suffix for Windows. ---- - Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3e327ee..80cc1d6 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,13 +34,16 @@ INSTALL_DATA= $(INSTALL) -m 0644 - MKDIR= mkdir -p - RM= rm -f - -+# File extension used for executables -+EXE_EXT= -+ - # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - - # Convenience platforms targets. - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - - # What to install. --TO_BIN= lua luac -+TO_BIN= lua$(EXE_EXT) luac$(EXE_EXT) - TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp - TO_LIB= liblua5.4.a - TO_MAN= lua.1 luac.1 --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Add-a-Makefile-variable-to-override-the-strip-tool.patch vlc-3.0.22/contrib/src/lua/Add-a-Makefile-variable-to-override-the-strip-tool.patch --- vlc-3.0.21/contrib/src/lua/Add-a-Makefile-variable-to-override-the-strip-tool.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Add-a-Makefile-variable-to-override-the-strip-tool.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -From 7177fbcedd25f6ca7beb2370688a0ab447f3a202 Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Wed, 10 Nov 2021 12:44:52 +0100 -Subject: [PATCH] Add a Makefile variable to override the strip tool - ---- - src/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 91cd273..8e8fc96 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -15,6 +15,7 @@ AR= ar rcu - RANLIB= ranlib - RM= rm -f - UNAME= uname -+STRIP= strip - - SYSCFLAGS= - SYSLDFLAGS= -@@ -131,7 +132,7 @@ Darwin macos macosx: - - mingw: - $(MAKE) "LUA_A=lua54.dll" "LUA_T=lua.exe" "LUA_A_LINK=lua54.lib" \ -- "AR=$(CC) -shared -Wl,--out-implib,lua54.lib $(LDFLAGS) -o" "RANLIB=strip --strip-unneeded" \ -+ "AR=$(CC) -shared -Wl,--out-implib,lua54.lib $(LDFLAGS) -o" "RANLIB=$(STRIP) --strip-unneeded" \ - "SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe - $(MAKE) "LUAC_T=luac.exe" luac.exe - --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Add-version-to-library-name.patch vlc-3.0.22/contrib/src/lua/Add-version-to-library-name.patch --- vlc-3.0.21/contrib/src/lua/Add-version-to-library-name.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Add-version-to-library-name.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From ba86f7a6e8c8c0b7560c26ea2cad5c4c27469be9 Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Thu, 4 Nov 2021 13:47:03 +0100 -Subject: [PATCH] Add version to library name - ---- - Makefile | 2 +- - src/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index fef1af4..f3bf10c 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,7 +41,7 @@ PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix - # What to install. - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp --TO_LIB= liblua.a -+TO_LIB= liblua5.4.a - TO_MAN= lua.1 luac.1 - - # Lua version and release. -diff --git a/src/Makefile b/src/Makefile -index db3418d..91cd273 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -32,7 +32,7 @@ CMCFLAGS= - - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - --LUA_A= liblua.a -+LUA_A= liblua5.4.a - LUA_A_LINK= $(LUA_A) - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o - LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Avoid-usage-of-localeconv.patch vlc-3.0.22/contrib/src/lua/Avoid-usage-of-localeconv.patch --- vlc-3.0.21/contrib/src/lua/Avoid-usage-of-localeconv.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Avoid-usage-of-localeconv.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,241 +0,0 @@ -From 0393b6a5829cb8abeacc7617f080ed1823a28aad Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Fri, 29 Jul 2022 14:24:20 +0200 -Subject: [PATCH] Avoid usage of localeconv - -In order to properly do this, we need to implement a locale-independent -version of strtof and snprintf, else lua will be unable to properly -parse floating point numbers on systems that do not use a locale where -the dot is the decimal point. ---- - src/Makefile | 2 +- - src/clocwrappers.c | 159 +++++++++++++++++++++++++++++++++++++++++++++ - src/luaconf.h | 11 +++- - 3 files changed, 168 insertions(+), 4 deletions(-) - create mode 100644 src/clocwrappers.c - -diff --git a/src/Makefile b/src/Makefile -index 1907381..9e32d53 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -23,7 +23,7 @@ SYSLIBS= - MYCFLAGS= - MYLDFLAGS= - MYLIBS= --MYOBJS= -+MYOBJS= clocwrappers.o - - # Special flags for compiler modules; -Os reduces code size. - CMCFLAGS= -diff --git a/src/clocwrappers.c b/src/clocwrappers.c -new file mode 100644 -index 0000000..5a9b4cc ---- /dev/null -+++ b/src/clocwrappers.c -@@ -0,0 +1,159 @@ -+#include -+#include -+#include -+ -+#if defined(__APPLE__) -+# include -+#elif defined(_WIN32) -+# include -+# include -+#else -+# define _GNU_SOURCE -+# include -+#endif -+ -+/* A strtof replacement that always uses the C locale to ensure -+ * it always accepts '.' as decimal point. -+ */ -+ -+#if defined(__APPLE__) -+ -+float strtof_c_locale(const char *nptr, char **endptr) -+{ -+ return strtof_l(nptr, endptr, LC_C_LOCALE); -+} -+ -+int snprintf_c_locale(char * restrict str, size_t size, const char * restrict format, ...) -+{ -+ int res; -+ va_list args; -+ -+ va_start(args, format); -+ res = vsnprintf_l(str, size, LC_C_LOCALE, format, args); -+ va_end(args); -+ -+ return res; -+} -+ -+#elif defined(_WIN32) -+ -+float strtof_c_locale(const char *nptr, char **endptr) -+{ -+ float res; -+ -+ // Store old threadlocale state -+ int cfgtlocale_old = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); -+ char *orig_locale = NULL; -+ if (cfgtlocale_old != -1) { -+ // Store current locale -+ orig_locale = setlocale(LC_NUMERIC, NULL); -+ setlocale(LC_NUMERIC, "C"); -+ } -+ res = strtof(nptr, endptr); -+ if (orig_locale != NULL) { -+ // Restore the old locale -+ setlocale(LC_NUMERIC, orig_locale); -+ } -+ if (cfgtlocale_old != _ENABLE_PER_THREAD_LOCALE && cfgtlocale_old != -1) { -+ // Restore the old threadlocale state -+ _configthreadlocale(cfgtlocale_old); -+ } -+ -+ return res; -+} -+ -+int snprintf_c_locale(char * restrict str, size_t size, const char * restrict format, ...) -+{ -+ int res; -+ -+ // Store old threadlocale state -+ int cfgtlocale_old = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); -+ char *orig_locale = NULL; -+ if (cfgtlocale_old != -1) { -+ // Store current locale -+ orig_locale = setlocale(LC_NUMERIC, NULL); -+ setlocale(LC_NUMERIC, "C"); -+ } -+ -+ va_list args; -+ va_start(args, format); -+ res = vsnprintf(str, size, format, args); -+ va_end(args); -+ -+ if (orig_locale != NULL) { -+ // Restore the old locale -+ setlocale(LC_NUMERIC, orig_locale); -+ } -+ if (cfgtlocale_old != _ENABLE_PER_THREAD_LOCALE && cfgtlocale_old != -1) { -+ // Restore the old threadlocale state -+ _configthreadlocale(cfgtlocale_old); -+ } -+ -+ return res; -+} -+ -+#elif defined(__ANDROID__) && (__ANDROID_API__ < 21) -+ -+float strtof_c_locale(const char *nptr, char **endptr) -+{ -+ // Android API level < 21 has no locales support -+ return strtof(nptr, endptr); -+} -+ -+int snprintf_c_locale(char * restrict str, size_t size, const char * restrict format, ...) -+{ -+ // Android API level < 21 has no locales support -+ va_list args; -+ va_start(args, format); -+ return vsnprintf(str, size, format, args); -+ va_end(args); -+} -+ -+#else // Version for all other OSes -+ -+float strtof_c_locale(const char *nptr, char **endptr) -+{ -+ float res; -+ -+ locale_t orig_locale = (locale_t)0; -+ locale_t locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0); -+ if (locale != (locale_t)0) { -+ // Store current locale -+ orig_locale = uselocale(locale); -+ } -+ res = strtof(nptr, endptr); -+ if (locale != (locale_t)0) { -+ // Restore old locale -+ uselocale(orig_locale); -+ freelocale(locale); -+ } -+ -+ return res; -+} -+ -+int snprintf_c_locale(char * restrict str, size_t size, const char * restrict format, ...) -+{ -+ int res; -+ -+ locale_t orig_locale = (locale_t)0; -+ locale_t locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0); -+ if (locale != (locale_t)0) { -+ // Store current locale -+ orig_locale = uselocale(locale); -+ } -+ -+ va_list args; -+ va_start(args, format); -+ res = vsnprintf(str, size, format, args); -+ va_end(args); -+ -+ if (locale != (locale_t)0) { -+ // Restore old locale -+ uselocale(orig_locale); -+ freelocale(locale); -+ } -+ -+ return res; -+} -+ -+#endif -diff --git a/src/luaconf.h b/src/luaconf.h -index 6e59b40..12befbc 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -10,7 +10,12 @@ - - #include - #include -+#include -+#include -+#include - -+float strtof_c_locale(const char *nptr, char **endptr); -+int snprintf_c_locale(char * restrict str, size_t size, const char * restrict format, ...); - - /* - ** =================================================================== -@@ -435,7 +440,7 @@ - - #define l_mathop(op) op##f - --#define lua_str2number(s,p) strtof((s), (p)) -+#define lua_str2number(s,p) strtof_c_locale((s), (p)) - - - #elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE /* }{ long double */ -@@ -579,7 +584,7 @@ - ** (All uses in Lua have only one format item.) - */ - #if !defined(LUA_USE_C89) --#define l_sprintf(s,sz,f,i) snprintf(s,sz,f,i) -+#define l_sprintf(s,sz,f,i) snprintf_c_locale(s,sz,f,i) - #else - #define l_sprintf(s,sz,f,i) ((void)(sz), sprintf(s,f,i)) - #endif -@@ -653,7 +658,7 @@ - ** macro must include the header 'locale.h'.) - */ - #if !defined(lua_getlocaledecpoint) --#define lua_getlocaledecpoint() (localeconv()->decimal_point[0]) -+#define lua_getlocaledecpoint() '.' - #endif - - --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Create-an-import-library-needed-for-lld.patch vlc-3.0.22/contrib/src/lua/Create-an-import-library-needed-for-lld.patch --- vlc-3.0.21/contrib/src/lua/Create-an-import-library-needed-for-lld.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Create-an-import-library-needed-for-lld.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -From 0b7a8a682ec59c049ccf8fd252364709a843f622 Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Thu, 4 Nov 2021 05:40:43 +0100 -Subject: [PATCH] Create an import library needed for lld -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Based on the previous patch by Martin Storsjö ---- - src/Makefile | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 9e32d53..db3418d 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -33,6 +33,7 @@ CMCFLAGS= - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_A_LINK= $(LUA_A) - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o - LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o - BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) -@@ -61,7 +62,7 @@ $(LUA_A): $(BASE_O) - $(RANLIB) $@ - - $(LUA_T): $(LUA_O) $(LUA_A) -- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -+ $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A_LINK) $(LIBS) - - $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) -@@ -129,8 +130,8 @@ Darwin macos macosx: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" SYSLIBS="-lreadline" - - mingw: -- $(MAKE) "LUA_A=lua54.dll" "LUA_T=lua.exe" \ -- "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \ -+ $(MAKE) "LUA_A=lua54.dll" "LUA_T=lua.exe" "LUA_A_LINK=lua54.lib" \ -+ "AR=$(CC) -shared -Wl,--out-implib,lua54.lib $(LDFLAGS) -o" "RANLIB=strip --strip-unneeded" \ - "SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe - $(MAKE) "LUAC_T=luac.exe" luac.exe - --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Create-and-install-a-.pc-file.patch vlc-3.0.22/contrib/src/lua/Create-and-install-a-.pc-file.patch --- vlc-3.0.21/contrib/src/lua/Create-and-install-a-.pc-file.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Create-and-install-a-.pc-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -From b7ce05bd2b6b80b4b71c2794191fa60db2b12b23 Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Thu, 4 Nov 2021 15:33:41 +0100 -Subject: [PATCH] Create and install a .pc file - ---- - Makefile | 27 ++++++++++++++++++++++----- - 1 file changed, 22 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index f3bf10c..3e327ee 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,6 +14,7 @@ INSTALL_TOP= /usr/local - INSTALL_BIN= $(INSTALL_TOP)/bin - INSTALL_INC= $(INSTALL_TOP)/include - INSTALL_LIB= $(INSTALL_TOP)/lib -+INSTALL_LIB_PKGCONFIG= $(INSTALL_LIB)/pkgconfig - INSTALL_MAN= $(INSTALL_TOP)/man/man1 - INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V - INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V -@@ -43,6 +44,7 @@ TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp - TO_LIB= liblua5.4.a - TO_MAN= lua.1 luac.1 -+TO_PKGCONFIG= lua.pc - - # Lua version and release. - V= 5.4 -@@ -54,12 +56,17 @@ all: $(PLAT) - $(PLATS) help test clean: - @cd src && $(MAKE) $@ - --install: dummy -+lua.pc: -+ $(MAKE) pc > lua.pc -+ -+ -+install: dummy $(TO_PKGCONFIG) - cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) - cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) -+ $(INSTALL_DATA) $(TO_PKGCONFIG) $(INSTALL_LIB_PKGCONFIG) - - uninstall: - cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) -@@ -83,10 +90,12 @@ echo: - @echo "TO_INC= $(TO_INC)" - @echo "TO_LIB= $(TO_LIB)" - @echo "TO_MAN= $(TO_MAN)" -+ @echo "TO_PKGCONFIG= $(TO_PKGCONFIG)" - @echo "INSTALL_TOP= $(INSTALL_TOP)" - @echo "INSTALL_BIN= $(INSTALL_BIN)" - @echo "INSTALL_INC= $(INSTALL_INC)" - @echo "INSTALL_LIB= $(INSTALL_LIB)" -+ @echo "INSTALL_LIB_PKGCONFIG= $(INSTALL_LIB_PKGCONFIG)" - @echo "INSTALL_MAN= $(INSTALL_MAN)" - @echo "INSTALL_LMOD= $(INSTALL_LMOD)" - @echo "INSTALL_CMOD= $(INSTALL_CMOD)" -@@ -95,10 +104,18 @@ echo: - - # Echo pkg-config data. - pc: -- @echo "version=$R" -- @echo "prefix=$(INSTALL_TOP)" -- @echo "libdir=$(INSTALL_LIB)" -- @echo "includedir=$(INSTALL_INC)" -+ @echo 'version=$R' -+ @echo 'prefix=$(INSTALL_TOP)' -+ @echo 'libdir=$(INSTALL_LIB)' -+ @echo 'includedir=$(INSTALL_INC)' -+ @echo '' -+ @echo 'Name: lua' -+ @echo 'Description: the lua programming language' -+ @echo 'Version: $R' -+ @echo 'URL: https://www.lua.org' -+ @echo 'Cflags: -I$${includedir}' -+ @echo 'Libs: -L$${libdir} -llua5.4' -+ @echo 'Requires:' - - # Targets that do not create files (not all makes understand .PHONY). - .PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Disable-dynamic-library-loading-support.patch vlc-3.0.22/contrib/src/lua/Disable-dynamic-library-loading-support.patch --- vlc-3.0.21/contrib/src/lua/Disable-dynamic-library-loading-support.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Disable-dynamic-library-loading-support.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -From fd3bb7deb6000a3f7930a3e03ed3e7ce82fee0e9 Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Thu, 4 Nov 2021 03:30:05 +0100 -Subject: [PATCH] Disable dynamic library loading support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Based on the previous patch by Rafaël Carré ---- - src/luaconf.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/luaconf.h b/src/luaconf.h -index d42d14b..6e59b40 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -53,20 +53,20 @@ - - - #if defined(LUA_USE_WINDOWS) --#define LUA_DL_DLL /* enable support for DLL */ -+//#define LUA_DL_DLL /* enable support for DLL */ - #define LUA_USE_C89 /* broadly, Windows is C89 */ - #endif - - - #if defined(LUA_USE_LINUX) - #define LUA_USE_POSIX --#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ -+//#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ - #endif - - - #if defined(LUA_USE_MACOSX) - #define LUA_USE_POSIX --#define LUA_USE_DLOPEN /* MacOS does not need -ldl */ -+//#define LUA_USE_DLOPEN /* MacOS does not need -ldl */ - #endif - - --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Disable-system-and-popen-for-windows-store-builds.patch vlc-3.0.22/contrib/src/lua/Disable-system-and-popen-for-windows-store-builds.patch --- vlc-3.0.21/contrib/src/lua/Disable-system-and-popen-for-windows-store-builds.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Disable-system-and-popen-for-windows-store-builds.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -From a67413a37f55c55ee5d18bc5ab2cf9acd0206b6a Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Thu, 4 Nov 2021 06:42:04 +0100 -Subject: [PATCH] Disable system and popen for windows store builds - ---- - src/loslib.c | 4 ++++ - src/luaconf.h | 13 +++++++++++++ - 2 files changed, 17 insertions(+) - -diff --git a/src/loslib.c b/src/loslib.c -index 3e20d62..d7fdb40 100644 ---- a/src/loslib.c -+++ b/src/loslib.c -@@ -139,6 +139,7 @@ - - - -+#if !defined(LUA_USE_WINSTORE) - static int os_execute (lua_State *L) { - const char *cmd = luaL_optstring(L, 1, NULL); - int stat; -@@ -151,6 +152,7 @@ static int os_execute (lua_State *L) { - return 1; - } - } -+#endif - - - static int os_remove (lua_State *L) { -@@ -408,7 +410,9 @@ static const luaL_Reg syslib[] = { - {"clock", os_clock}, - {"date", os_date}, - {"difftime", os_difftime}, -+#if !defined(LUA_USE_WINSTORE) - {"execute", os_execute}, -+#endif - {"exit", os_exit}, - {"getenv", os_getenv}, - {"remove", os_remove}, -diff --git a/src/luaconf.h b/src/luaconf.h -index 12befbc..bbd9591 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -54,6 +54,19 @@ int snprintf_c_locale(char * restrict str, size_t size, const char * restrict fo - */ - #if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE) - #define LUA_USE_WINDOWS /* enable goodies for regular Windows */ -+ -+#include -+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+#define LUA_USE_WINSTORE -+#endif -+#endif -+ -+#if defined(LUA_USE_WINSTORE) -+#define l_popen(L,c,m) \ -+ ((void)c, (void)m, \ -+ luaL_error(L, "'popen' not supported"), \ -+ (FILE*)0) -+#define l_pclose(L,file) ((void)L, (void)file, -1) - #endif - - --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Do-not-use-large-file-offsets-with-too-old-Android-A.patch vlc-3.0.22/contrib/src/lua/Do-not-use-large-file-offsets-with-too-old-Android-A.patch --- vlc-3.0.21/contrib/src/lua/Do-not-use-large-file-offsets-with-too-old-Android-A.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Do-not-use-large-file-offsets-with-too-old-Android-A.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From 6260223f0afc96ffe6669588223f5c275c275b59 Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Fri, 5 Nov 2021 13:50:40 +0100 -Subject: [PATCH] Do not use large file offsets with too old Android API level - ---- - src/lprefix.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/lprefix.h b/src/lprefix.h -index 484f2ad..11b2889 100644 ---- a/src/lprefix.h -+++ b/src/lprefix.h -@@ -8,6 +8,13 @@ - #define lprefix_h - - -+#if defined(__ANDROID__) && (__ANDROID_API__ < 24) -+// Android API level < 24 does not support large file -+// offsets, so define this here to prevent it being -+// defined to 64 below. -+#define _FILE_OFFSET_BITS 32 -+#endif -+ - /* - ** Allows POSIX/XSI stuff - */ --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Do-not-use-log2f-with-too-old-Android-API-level.patch vlc-3.0.22/contrib/src/lua/Do-not-use-log2f-with-too-old-Android-API-level.patch --- vlc-3.0.21/contrib/src/lua/Do-not-use-log2f-with-too-old-Android-API-level.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Do-not-use-log2f-with-too-old-Android-API-level.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From f01e48b1debc55434442d6d9267e91a1ab1d8251 Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Fri, 5 Nov 2021 12:09:08 +0100 -Subject: [PATCH] Do not use log2f with too old Android API level - ---- - src/lmathlib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lmathlib.c b/src/lmathlib.c -index e0c61a1..7cfac2b 100644 ---- a/src/lmathlib.c -+++ b/src/lmathlib.c -@@ -173,7 +173,7 @@ static int math_log (lua_State *L) { - res = l_mathop(log)(x); - else { - lua_Number base = luaL_checknumber(L, 2); --#if !defined(LUA_USE_C89) -+#if !defined(LUA_USE_C89) && !(defined(__ANDROID__) && (__ANDROID_API__ < 18)) - if (base == l_mathop(2.0)) - res = l_mathop(log2)(x); - else --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/Enforce-always-using-64bit-integers-floats.patch vlc-3.0.22/contrib/src/lua/Enforce-always-using-64bit-integers-floats.patch --- vlc-3.0.21/contrib/src/lua/Enforce-always-using-64bit-integers-floats.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/Enforce-always-using-64bit-integers-floats.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -From 938ab15dd00a042263c8cf787c739305afdb63af Mon Sep 17 00:00:00 2001 -From: Marvin Scholz -Date: Fri, 29 Jul 2022 14:28:40 +0200 -Subject: [PATCH] Enforce always using 64bit integers/floats - ---- - src/luaconf.h | 42 ------------------------------------------ - 1 file changed, 42 deletions(-) - -diff --git a/src/luaconf.h b/src/luaconf.h -index bbd9591..d76d2ff 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -130,51 +130,9 @@ int snprintf_c_locale(char * restrict str, size_t size, const char * restrict fo - #define LUA_INT_DEFAULT LUA_INT_LONGLONG - #define LUA_FLOAT_DEFAULT LUA_FLOAT_DOUBLE - -- --/* --@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. --*/ --#define LUA_32BITS 0 -- -- --/* --@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for --** C89 ('long' and 'double'); Windows always has '__int64', so it does --** not need to use this case. --*/ --#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS) --#define LUA_C89_NUMBERS 1 --#else --#define LUA_C89_NUMBERS 0 --#endif -- -- --#if LUA_32BITS /* { */ --/* --** 32-bit integers and 'float' --*/ --#if LUAI_IS32INT /* use 'int' if big enough */ --#define LUA_INT_TYPE LUA_INT_INT --#else /* otherwise use 'long' */ --#define LUA_INT_TYPE LUA_INT_LONG --#endif --#define LUA_FLOAT_TYPE LUA_FLOAT_FLOAT -- --#elif LUA_C89_NUMBERS /* }{ */ --/* --** largest types available for C89 ('long' and 'double') --*/ --#define LUA_INT_TYPE LUA_INT_LONG --#define LUA_FLOAT_TYPE LUA_FLOAT_DOUBLE -- --#else /* }{ */ --/* use defaults */ -- - #define LUA_INT_TYPE LUA_INT_DEFAULT - #define LUA_FLOAT_TYPE LUA_FLOAT_DEFAULT - --#endif /* } */ -- - - /* }================================================================== */ - --- -2.32.0 (Apple Git-132) - diff -Nru vlc-3.0.21/contrib/src/lua/SHA512SUMS vlc-3.0.22/contrib/src/lua/SHA512SUMS --- vlc-3.0.21/contrib/src/lua/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f lua-5.1.4.tar.gz +0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 lua-5.1.5.tar.gz diff -Nru vlc-3.0.21/contrib/src/lua/rules.mak vlc-3.0.22/contrib/src/lua/rules.mak --- vlc-3.0.21/contrib/src/lua/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/lua/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ # Lua 5.1 -LUA_VERSION := 5.1.4 +LUA_VERSION := 5.1.5 LUA_URL := http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz # Reverse priority order @@ -41,6 +41,7 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua $(UNPACK) + $(APPLY) $(SRC)/lua/0004-Fix-stack-overflow-in-vararg-functions.patch $(APPLY) $(SRC)/lua/lua-noreadline.patch $(APPLY) $(SRC)/lua/no-dylibs.patch $(APPLY) $(SRC)/lua/luac-32bits.patch @@ -73,11 +74,11 @@ $(MOVE) .lua: lua - cd $< && $(HOSTVARS_PIC) $(MAKE) $(LUA_TARGET) + $(HOSTVARS_PIC) $(MAKE) -C $< $(LUA_TARGET) ifdef HAVE_WIN32 - cd $< && $(HOSTVARS) $(MAKE) -C src liblua.a + $(HOSTVARS) $(MAKE) -C $< -C src liblua.a endif - cd $< && $(HOSTVARS) $(MAKE) install INSTALL_TOP="$(PREFIX)" + $(HOSTVARS) $(MAKE) -C $< install INSTALL_TOP="$(PREFIX)" ifdef HAVE_WIN32 cd $< && $(RANLIB) "$(PREFIX)/lib/liblua.a" endif @@ -94,16 +95,16 @@ endif endif +# DO NOT use the same intermediate directory as the lua target +luac: UNPACK_DIR=luac-$(LUA_VERSION) luac: lua-$(LUA_VERSION).tar.gz .sum-luac - # DO NOT use the same intermediate directory as the lua target - rm -Rf -- $@-$(LUA_VERSION) $@ - mkdir -- $@-$(LUA_VERSION) - tar -x -v -z -o -C $@-$(LUA_VERSION) --strip-components=1 -f $< - (cd luac-$(LUA_VERSION) && patch -p1) < $(SRC)/lua/luac-32bits.patch - mv luac-$(LUA_VERSION) luac + $(RM) -Rf $@ $(UNPACK_DIR) && mkdir -p $(UNPACK_DIR) + tar $(TAR_VERBOSE)xzfo $< -C $(UNPACK_DIR) --strip-components=1 + $(APPLY) $(SRC)/lua/luac-32bits.patch + $(MOVE) .luac: luac - cd $< && $(LUACVARS) $(MAKE) generic + $(LUACVARS) $(MAKE) -C $< generic mkdir -p -- $(BUILDBINDIR) install -m 0755 -s -- $ $(UNPACK_DIR)/.cargo/config.toml; \ - echo "replace-with = \"vendored-sources\"" >> $(UNPACK_DIR)/.cargo/config.toml; \ - echo "[source.vendored-sources]" >> $(UNPACK_DIR)/.cargo/config.toml; \ - echo "directory = \"../$@-vendor\"" >> $(UNPACK_DIR)/.cargo/config.toml; \ - echo "Using cargo vendor archive for $(UNPACK_DIR)"; \ - fi; diff -Nru vlc-3.0.21/contrib/src/main.mak vlc-3.0.22/contrib/src/main.mak --- vlc-3.0.21/contrib/src/main.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/main.mak 2025-11-13 22:17:54.000000000 +0000 @@ -18,11 +18,13 @@ VPATH := $(TARBALLS) # Common download locations -GNU ?= http://ftp.gnu.org/gnu +GNU ?= http://ftpmirror.gnu.org/gnu SF := https://netcologne.dl.sourceforge.net/ VIDEOLAN := http://downloads.videolan.org/pub/videolan CONTRIB_VIDEOLAN := http://downloads.videolan.org/pub/contrib GITHUB := https://github.com/ +GNUGPG := https://www.gnupg.org/ftp/gcrypt +XIPH := https://ftp.osuosl.org/pub/xiph/releases # # Machine-dependent variables @@ -115,6 +117,18 @@ endif endif +get_version2_num =$(shell echo $(1) | awk -F. '{ printf("%d%02d\n", $$1,$$2); }') +ifdef HAVE_DARWIN_OS +# the CI currently has 14.5 (macos-xcode15), 12.3 (monterey), 10.13/10.15 (old-macmini) +darwin_sdk_at_most = $(shell [ $(call get_version2_num, $(shell xcrun --sdk $(SDKROOT) -show-sdk-version)) -le $(call get_version2_num, $(1)) ] && echo true) + +ifdef VLC_DEPLOYMENT_TARGET +darwin_min_os_at_least = $(shell [ $(call get_version2_num, $(VLC_DEPLOYMENT_TARGET)) -ge $(call get_version2_num, $(1)) ] && echo true) +else +darwin_min_os_at_least = $(shell echo false) +endif +endif + # -fno-stack-check is a workaround for a possible # bug in Xcode 11 or macOS 10.15+ ifdef HAVE_DARWIN_OS @@ -163,8 +177,17 @@ endif endif +ifdef HAVE_WINSTORE +EXTRA_CFLAGS += -DWINSTORECOMPAT +EXTRA_LDFLAGS += -lwinstorecompat +endif + ifneq ($(findstring clang, $(shell $(CC) --version)),) HAVE_CLANG := 1 +CLANG_VERSION := $(shell $(CC) --version | head -1 | grep -o '[0-9]\+\.' | head -1 | cut -d '.' -f 1) +clang_at_least = $(shell [ $(CLANG_VERSION) -ge $(1) ] && echo true) +else +clang_at_least = $(shell echo false) endif cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1)) @@ -231,7 +254,7 @@ SVN ?= $(error subversion client (svn) not found!) ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),) -download = curl -f -L -- "$(1)" > "$@" +download = curl -f -L --retry 3 --output "$@" -- "$(1)" else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),) download = (rm -f $@.tmp && \ wget --passive -c -p -O $@.tmp "$(1)" && \ @@ -296,12 +319,6 @@ PATH="$(PREFIX)/bin:$(PATH)" \ PKG_CONFIG="$(PKG_CONFIG)" -HOSTVARS_MESON := $(HOSTTOOLS) \ - CPPFLAGS="$(CPPFLAGS)" \ - CFLAGS="$(CFLAGS)" \ - CXXFLAGS="$(CXXFLAGS)" \ - LDFLAGS="$(LDFLAGS)" - # Add these flags after Meson consumed the CFLAGS/CXXFLAGS # as when setting those for Meson, it would apply to tests # and cause the check if symbols have underscore prefix to @@ -314,6 +331,11 @@ CXXFLAGS := $(CXXFLAGS) -g -O2 endif +ifdef HAVE_BITCODE_ENABLED +CFLAGS := $(CFLAGS) -fembed-bitcode +CXXFLAGS := $(CXXFLAGS) -fembed-bitcode +endif + ifdef ENABLE_PDB ifdef HAVE_CLANG ifneq ($(findstring $(ARCH),i686 x86_64),) @@ -353,6 +375,12 @@ < "$(<:.tar.xz=.githash)"` && \ test "$$h" = "$1" +ifeq ($(V),1) +TAR_VERBOSE := v +else +ZIP_QUIET := -q +endif + checksum = \ $(foreach f,$(filter $(TARBALLS)/%,$^), \ grep -- " $(f:$(TARBALLS)/%=%)$$" \ @@ -361,10 +389,10 @@ "$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS" CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512) UNPACK = $(RM) -R $@ \ - $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzfo $(f)) \ - $(foreach f,$(filter %.tar.bz2,$^), && tar xvjfo $(f)) \ - $(foreach f,$(filter %.tar.xz,$^), && tar xvJfo $(f)) \ - $(foreach f,$(filter %.zip,$^), && unzip $(f)) + $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar $(TAR_VERBOSE)xzfo $(f)) \ + $(foreach f,$(filter %.tar.bz2,$^), && tar $(TAR_VERBOSE)xjfo $(f)) \ + $(foreach f,$(filter %.tar.xz,$^), && tar $(TAR_VERBOSE)xJfo $(f)) \ + $(foreach f,$(filter %.zip,$^), && unzip $(ZIP_QUIET) $(f) $(UNZIP_PARAMS)) UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<))) APPLY = (cd $(UNPACK_DIR) && patch -fp1) < pkg_static = (cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-static.sh $(1)) @@ -385,25 +413,66 @@ endif RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \ cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS) -CMAKEBUILD := cmake --build -CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \ + +BUILD_DIR = $> $@ -else - echo "set(CMAKE_BUILD_TYPE RelWithDebInfo)" >> $@ -endif - echo "set(CMAKE_SYSTEM_PROCESSOR $(ARCH))" >> $@ + echo "set(CMAKE_SYSTEM_PROCESSOR $(CMAKE_HOST_ARCH))" >> $@ if test -n "$(CMAKE_SYSTEM_NAME)"; then \ echo "set(CMAKE_SYSTEM_NAME $(CMAKE_SYSTEM_NAME))" >> $@; \ fi; @@ -582,6 +671,10 @@ # Set it to "" right away to short-circuit this behaviour echo "set(CMAKE_CXX_SYSROOT_FLAG \"\")" >> $@ echo "set(CMAKE_C_SYSROOT_FLAG \"\")" >> $@ + echo "set(ANDROID_NDK $(ANDROID_NDK))" >> $@ + echo "set(ANDROID_ABI $(ANDROID_ABI))" >> $@ + echo "set(ANDROID_PLATFORM $(ANDROID_API))" >> $@ + echo "include($(ANDROID_NDK)/build/cmake/android.toolchain.cmake)" >> $@ endif endif echo "set(CMAKE_C_COMPILER $(CC))" >> $@ @@ -619,7 +712,7 @@ crossfile.meson: $(SRC)/gen-meson-crossfile.py - $(HOSTVARS_MESON) \ + $(HOSTTOOLS) \ WINDRES="$(WINDRES)" \ PKG_CONFIG="$(PKG_CONFIG)" \ HOST_SYSTEM="$(MESON_SYSTEM_NAME)" \ diff -Nru vlc-3.0.21/contrib/src/markupsafe/SHA512SUMS vlc-3.0.22/contrib/src/markupsafe/SHA512SUMS --- vlc-3.0.21/contrib/src/markupsafe/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/markupsafe/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -6b06a5f470858409eb186d20edd129be90f31030be91fcc73e989b0a4ee51c3755cce0938edd9a7c73471d307385260f868101b5e11cc4d97c309420b5a573da markupsafe-2.1.1.tar.gz diff -Nru vlc-3.0.21/contrib/src/markupsafe/rules.mak vlc-3.0.22/contrib/src/markupsafe/rules.mak --- vlc-3.0.21/contrib/src/markupsafe/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/markupsafe/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -MARKUPSAFE_VERSION := 2.1.1 -MARKUPSAFE_URL := $(GITHUB)/pallets/markupsafe/archive/refs/tags/$(MARKUPSAFE_VERSION).tar.gz - -$(TARBALLS)/markupsafe-$(MARKUPSAFE_VERSION).tar.gz: - $(call download_pkg,$(MARKUPSAFE_URL),markupsafe) - -.sum-markupsafe: markupsafe-$(MARKUPSAFE_VERSION).tar.gz - -markupsafe: markupsafe-$(MARKUPSAFE_VERSION).tar.gz .sum-markupsafe - $(UNPACK) - $(MOVE) - -.markupsafe: markupsafe .python-venv - $(PYTHON_INSTALL) - touch $@ diff -Nru vlc-3.0.21/contrib/src/matroska/SHA512SUMS vlc-3.0.22/contrib/src/matroska/SHA512SUMS --- vlc-3.0.21/contrib/src/matroska/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/matroska/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41 libmatroska-1.6.3.tar.xz +e635958113ab57fb6c7e808d4ad51f87c38ec6ff348b202df1789b34d25ca22bc00fbdf1ec4f386bc803ef3da9f57057bae78ecf22deabdf1399755b1c6fdd3e libmatroska-1.7.0.tar.xz diff -Nru vlc-3.0.21/contrib/src/matroska/rules.mak vlc-3.0.22/contrib/src/matroska/rules.mak --- vlc-3.0.21/contrib/src/matroska/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/matroska/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ # matroska -MATROSKA_VERSION := 1.6.3 +MATROSKA_VERSION := 1.7.0 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.xz PKGS += matroska @@ -22,6 +22,8 @@ $(MOVE) .matroska: matroska toolchain.cmake - cd $< && $(HOSTVARS_PIC) $(CMAKE) - cd $< && $(CMAKEBUILD) . --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/medialibrary/SHA512SUMS vlc-3.0.22/contrib/src/medialibrary/SHA512SUMS --- vlc-3.0.21/contrib/src/medialibrary/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/medialibrary/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2b9e9eb5000fd8ff333d29786c3c8ed9f2e2541cd34652b7087ea0fb6b46bfb354472e20dad7c53c159dd447882427e61233ef6224ad5902bedff37756fd950a medialibrary-0.12.4.tar.bz2 diff -Nru vlc-3.0.21/contrib/src/medialibrary/rules.mak vlc-3.0.22/contrib/src/medialibrary/rules.mak --- vlc-3.0.21/contrib/src/medialibrary/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/medialibrary/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -MEDIALIBRARY_VERSION := 0.12.4 -MEDIALIBRARY_URL := https://code.videolan.org/videolan/medialibrary/-/archive/$(MEDIALIBRARY_VERSION)/medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2 - -PKGS += medialibrary -ifeq ($(call need_pkg,"medialibrary >= 0.12.0"),) -PKGS_FOUND += medialibrary -endif - -DEPS_medialibrary = sqlite $(DEPS_sqlite) - -$(TARBALLS)/medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2: - $(call download_pkg,$(MEDIALIBRARY_URL),medialibrary) - -.sum-medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2 - -medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2 .sum-medialibrary - $(UNPACK) - $(MOVE) - -.medialibrary: medialibrary crossfile.meson - $(MESONCLEAN) - $(HOSTVARS_MESON) $(MESON) -Dlibvlc=disabled -Dlibtool_workaround=true - +$(MESONBUILD) - touch $@ - diff -Nru vlc-3.0.21/contrib/src/meson-machinefile/rules.mak vlc-3.0.22/contrib/src/meson-machinefile/rules.mak --- vlc-3.0.21/contrib/src/meson-machinefile/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/meson-machinefile/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -# Generate external meson machine file - -# This cross or native file is meant to be used to easiy -# use the contribs with VLCs meson build system by using -# either the --cross-file or --native-file option -# respectively. - -PKGS += meson-machinefile - -ifdef HAVE_CROSS_COMPILE -CROSS_OR_NATIVE := cross -else -CROSS_OR_NATIVE := native -endif - -meson-machinefile/contrib.ini: $(SRC)/gen-meson-machinefile.py - mkdir -p meson-machinefile - PREFIX="$(PREFIX)" \ - $(SRC)/gen-meson-machinefile.py --type external-$(CROSS_OR_NATIVE) $@ - -meson-machinefile: meson-machinefile/contrib.ini - -# Dummy target, there is nothing to check -# as we download nothing. -.sum-meson-machinefile: - touch $@ - -.meson-machinefile: meson-machinefile - install -d "$(PREFIX)/share/meson/$(CROSS_OR_NATIVE)" - install $ -Date: Tue, 30 May 2023 12:19:15 +0200 -Subject: [PATCH] Add missing mfx_dispatcher_uwp.h/.cpp - -Originaly found in api/mfx_dispatch/windows/include/mfx_dispatcher_uwp.h -And api/mfx_dispatch/windows/src/mfx_dispatcher_uwp.cpp ---- - Makefile.am | 1 + - src/mfx_dispatcher_uwp.cpp | 201 +++++++++++++++++++++++++++++++++++++ - src/mfx_dispatcher_uwp.h | 36 +++++++ - 3 files changed, 238 insertions(+) - create mode 100644 src/mfx_dispatcher_uwp.cpp - create mode 100644 src/mfx_dispatcher_uwp.h - -diff --git a/Makefile.am b/Makefile.am -index 40be4b1..680f125 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -42,6 +42,7 @@ libmfx_la_LIBADD = $(DLLIB) $(LIBVA_DRM_LIBS) $(LIBVA_X11_LIBS) - libmfx_la_CPPFLAGS = $(LIBVA_DRM_CFLAGS) $(LIBVA_X11_CFLAGS) $(AM_CPPFLAGS) - - if WINDOWS_STORE -+libmfx_la_SOURCES += src/mfx_dispatcher_uwp.cpp - libintel_gfx_api-x86.a: src/intel_gfx_api-x86.def - $(DLLTOOL) --as=as --output-lib $@ --input-def $< --as-flags=--32 -m i386 - libintel_gfx_api-x64.a: src/intel_gfx_api-x64.def -diff --git a/src/mfx_dispatcher_uwp.cpp b/src/mfx_dispatcher_uwp.cpp -new file mode 100644 -index 0000000..62c9f75 ---- /dev/null -+++ b/src/mfx_dispatcher_uwp.cpp -@@ -0,0 +1,201 @@ -+// Copyright (c) 2020 Intel Corporation -+// -+// Permission is hereby granted, free of charge, to any person obtaining a copy -+// of this software and associated documentation files (the "Software"), to deal -+// in the Software without restriction, including without limitation the rights -+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+// copies of the Software, and to permit persons to whom the Software is -+// furnished to do so, subject to the following conditions: -+// -+// The above copyright notice and this permission notice shall be included in all -+// copies or substantial portions of the Software. -+// -+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+// SOFTWARE. -+ -+#include "mfx_dispatcher.h" -+#include "mfx_dispatcher_uwp.h" -+#include "mfx_driver_store_loader.h" -+#include "mfx_dxva2_device.h" -+#include "mfx_load_dll.h" -+ -+mfxStatus GfxApiInit(mfxInitParam par, mfxU32 deviceID, mfxSession *session, mfxModuleHandle& hModule) -+{ -+ HRESULT hr = S_OK; -+ wchar_t IntelGFXAPIdllName[MFX_MAX_DLL_PATH] = { 0 }; -+ MFX::DriverStoreLoader dsLoader; -+ -+ if (!dsLoader.GetDriverStorePath(IntelGFXAPIdllName, sizeof(IntelGFXAPIdllName), deviceID)) -+ { -+ return MFX_ERR_UNSUPPORTED; -+ } -+ -+ size_t pathLen = wcslen(IntelGFXAPIdllName); -+ MFX::mfx_get_default_intel_gfx_api_dll_name(IntelGFXAPIdllName + pathLen, sizeof(IntelGFXAPIdllName) / sizeof(IntelGFXAPIdllName[0]) - pathLen); -+ DISPATCHER_LOG_INFO((("loading %S\n"), IntelGFXAPIdllName)); -+ -+ hModule = MFX::mfx_dll_load(IntelGFXAPIdllName); -+ if (!hModule) -+ { -+ DISPATCHER_LOG_ERROR("Can't load intel_gfx_api\n"); -+ return MFX_ERR_UNSUPPORTED; -+ } -+ -+ mfxFunctionPointer pFunc = (mfxFunctionPointer)MFX::mfx_dll_get_addr(hModule, "InitialiseMediaSession"); -+ if (!pFunc) -+ { -+ DISPATCHER_LOG_ERROR("Can't find required API function: InitialiseMediaSession\n"); -+ MFX::mfx_dll_free(hModule); -+ return MFX_ERR_UNSUPPORTED; -+ } -+ -+ typedef HRESULT(APIENTRY *InitialiseMediaSessionPtr) (HANDLE*, LPVOID, LPVOID); -+ InitialiseMediaSessionPtr init = (InitialiseMediaSessionPtr)pFunc; -+ hr = init((HANDLE*)session, &par, NULL); -+ -+ return (hr == S_OK) ? MFX_ERR_NONE : MFX_ERR_UNKNOWN; -+} -+ -+mfxStatus GfxApiClose(mfxSession& session, mfxModuleHandle& hModule) -+{ -+ HRESULT hr = S_OK; -+ -+ if (!hModule) -+ { -+ return MFX_ERR_INVALID_HANDLE; -+ } -+ -+ mfxFunctionPointer pFunc = (mfxFunctionPointer)MFX::mfx_dll_get_addr(hModule, "DisposeMediaSession"); -+ if (!pFunc) -+ { -+ DISPATCHER_LOG_ERROR("Can't find required API function: DisposeMediaSession\n"); -+ return MFX_ERR_INVALID_HANDLE; -+ } -+ -+ typedef HRESULT(APIENTRY *DisposeMediaSessionPtr) (HANDLE); -+ DisposeMediaSessionPtr dispose = (DisposeMediaSessionPtr)pFunc; -+ hr = dispose((HANDLE)session); -+ session = NULL; -+ -+ MFX::mfx_dll_free(hModule); -+ hModule = NULL; -+ -+ return (hr == S_OK) ? MFX_ERR_NONE : MFX_ERR_UNKNOWN; -+} -+ -+mfxStatus GfxApiInitByAdapterNum(mfxInitParam par, mfxU32 adapterNum, mfxSession *session, mfxModuleHandle& hModule) -+{ -+ MFX::DXVA2Device dxvaDevice; -+ -+ if (!dxvaDevice.InitDXGI1(adapterNum)) -+ { -+ DISPATCHER_LOG_ERROR((("dxvaDevice.InitDXGI1(%d) Failed\n"), adapterNum)); -+ return MFX_ERR_UNSUPPORTED; -+ } -+ -+ if (dxvaDevice.GetVendorID() != INTEL_VENDOR_ID) -+ { -+ DISPATCHER_LOG_ERROR("Specified adapter is not Intel\n"); -+ return MFX_ERR_UNSUPPORTED; -+ } -+ -+ return GfxApiInit(par, dxvaDevice.GetDeviceID(), session, hModule); -+} -+ -+struct GfxApiHandle -+{ -+ mfxModuleHandle hModule; -+ mfxSession session; -+ mfxU16 mediaAdapterType; -+}; -+ -+static int GfxApiHandleSort(const void * plhs, const void * prhs) -+{ -+ const GfxApiHandle * lhs = *(const GfxApiHandle **)plhs; -+ const GfxApiHandle * rhs = *(const GfxApiHandle **)prhs; -+ -+ // prefer integrated GPU -+ if (lhs->mediaAdapterType != MFX_MEDIA_INTEGRATED && rhs->mediaAdapterType == MFX_MEDIA_INTEGRATED) -+ { -+ return 1; -+ } -+ if (lhs->mediaAdapterType == MFX_MEDIA_INTEGRATED && rhs->mediaAdapterType != MFX_MEDIA_INTEGRATED) -+ { -+ return -1; -+ } -+ -+ return 0; -+} -+ -+mfxStatus GfxApiInitPriorityIntegrated(mfxInitParam par, mfxSession *session, mfxModuleHandle& hModule) -+{ -+ mfxStatus sts = MFX_ERR_UNSUPPORTED; -+ MFX::MFXVector gfxApiHandles; -+ -+ for (int adapterNum = 0; adapterNum < 4; ++adapterNum) -+ { -+ MFX::DXVA2Device dxvaDevice; -+ -+ if (!dxvaDevice.InitDXGI1(adapterNum) || dxvaDevice.GetVendorID() != INTEL_VENDOR_ID) -+ { -+ continue; -+ } -+ -+ par.Implementation &= ~(0xf); -+ switch (adapterNum) -+ { -+ case 0: -+ par.Implementation |= MFX_IMPL_HARDWARE; -+ break; -+ case 1: -+ par.Implementation |= MFX_IMPL_HARDWARE2; -+ break; -+ case 2: -+ par.Implementation |= MFX_IMPL_HARDWARE3; -+ break; -+ case 3: -+ par.Implementation |= MFX_IMPL_HARDWARE4; -+ break; -+ } -+ -+ mfxModuleHandle hModuleCur = NULL; -+ mfxSession sessionCur = NULL; -+ -+ sts = GfxApiInit(par, dxvaDevice.GetDeviceID(), &sessionCur, hModuleCur); -+ if (sts != MFX_ERR_NONE) -+ continue; -+ -+ mfxPlatform platform = { MFX_PLATFORM_UNKNOWN, 0, MFX_MEDIA_UNKNOWN }; -+ sts = MFXVideoCORE_QueryPlatform(sessionCur, &platform); -+ if (sts != MFX_ERR_NONE) -+ { -+ sts = GfxApiClose(sessionCur, hModuleCur); -+ if (sts != MFX_ERR_NONE) -+ return sts; -+ continue; -+ } -+ -+ GfxApiHandle handle = { hModuleCur, sessionCur, platform.MediaAdapterType }; -+ gfxApiHandles.push_back(handle); -+ } -+ -+ qsort(&(*gfxApiHandles.begin()), gfxApiHandles.size(), sizeof(GfxApiHandle), &GfxApiHandleSort); -+ -+ hModule = gfxApiHandles.begin()->hModule; -+ *session = gfxApiHandles.begin()->session; -+ -+ MFX::MFXVector::iterator it = gfxApiHandles.begin()++; -+ for (; it != gfxApiHandles.end(); ++it) -+ { -+ sts = GfxApiClose(it->session, it->hModule); -+ if (sts != MFX_ERR_NONE) -+ return sts; -+ } -+ -+ return sts; -+} -diff --git a/src/mfx_dispatcher_uwp.h b/src/mfx_dispatcher_uwp.h -new file mode 100644 -index 0000000..c3cbad3 ---- /dev/null -+++ b/src/mfx_dispatcher_uwp.h -@@ -0,0 +1,36 @@ -+// Copyright (c) 2020 Intel Corporation -+// -+// Permission is hereby granted, free of charge, to any person obtaining a copy -+// of this software and associated documentation files (the "Software"), to deal -+// in the Software without restriction, including without limitation the rights -+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+// copies of the Software, and to permit persons to whom the Software is -+// furnished to do so, subject to the following conditions: -+// -+// The above copyright notice and this permission notice shall be included in all -+// copies or substantial portions of the Software. -+// -+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+// SOFTWARE. -+ -+#if !defined(__MFX_DISPATCHER_UWP_H) -+#define __MFX_DISPATCHER_UWP_H -+ -+// Loads intel_gfx_api dll from DriverStore fro specified device and calls InitialiseMediaSession from it -+mfxStatus GfxApiInit(mfxInitParam par, mfxU32 deviceID, mfxSession *session, mfxModuleHandle& hModule); -+ -+// Calls DisposeMediaSession from the intel_gfx_api dll and unloads it -+mfxStatus GfxApiClose(mfxSession& session, mfxModuleHandle& hModule); -+ -+// Initializes intel_gfx_api for specified adapter number -+mfxStatus GfxApiInitByAdapterNum(mfxInitParam par, mfxU32 adapterNum, mfxSession *session, mfxModuleHandle& hModule); -+ -+// Initializes intel_gfx_api for any Intel adapter, chooses integrated adapter with higher priority -+mfxStatus GfxApiInitPriorityIntegrated(mfxInitParam par, mfxSession *session, mfxModuleHandle& hModule); -+ -+#endif // __MFX_DISPATCHER_UWP_H --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mfx/0001-fix-UWP-build-in-ming-w64.patch vlc-3.0.22/contrib/src/mfx/0001-fix-UWP-build-in-ming-w64.patch --- vlc-3.0.21/contrib/src/mfx/0001-fix-UWP-build-in-ming-w64.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mfx/0001-fix-UWP-build-in-ming-w64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From ca523b11e2e4e6a33708353095585a44cbd3d818 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 12 May 2023 11:45:47 +0200 -Subject: [PATCH] fix UWP build in ming-w64 - -minwg-w64 doesn't define these types in UWP mode and would require -a bit of code refactoring to do so. ---- - src/mfx_driver_store_loader.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/mfx_driver_store_loader.h b/src/mfx_driver_store_loader.h -index 372794f..650e170 100644 ---- a/src/mfx_driver_store_loader.h -+++ b/src/mfx_driver_store_loader.h -@@ -35,6 +35,13 @@ - #endif - #endif - -+#if defined(__MINGW64_VERSION_MAJOR) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -+// mingw-w64 doesn't set these types for WINAPI_PARTITION_APP -+typedef DWORD DEVINST; -+typedef DEVINST *PDEVINST; -+typedef ULONG REGDISPOSITION; -+#endif -+ - namespace MFX - { - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mfx/0002-fix-UWP-build-in-ming-w64.patch vlc-3.0.22/contrib/src/mfx/0002-fix-UWP-build-in-ming-w64.patch --- vlc-3.0.21/contrib/src/mfx/0002-fix-UWP-build-in-ming-w64.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mfx/0002-fix-UWP-build-in-ming-w64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From 0070532c09865a95f63987ccec25d529ce198683 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Tue, 30 May 2023 15:29:31 +0200 -Subject: [PATCH] fix UWP build in ming-w64 - -minwg-w64 doesn't define these types in UWP mode and would require -a bit of code refactoring to do so. ---- - src/mfx_driver_store_loader.h | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/mfx_driver_store_loader.h b/src/mfx_driver_store_loader.h -index 650e170..3895854 100644 ---- a/src/mfx_driver_store_loader.h -+++ b/src/mfx_driver_store_loader.h -@@ -35,11 +35,24 @@ - #endif - #endif - --#if defined(__MINGW64_VERSION_MAJOR) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) --// mingw-w64 doesn't set these types for WINAPI_PARTITION_APP -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -+// these are not defined for WINAPI_PARTITION_APP - typedef DWORD DEVINST; - typedef DEVINST *PDEVINST; - typedef ULONG REGDISPOSITION; -+#include -+DEFINE_GUID( GUID_DEVCLASS_DISPLAY, 0x4d36e968L, 0xe325, 0x11ce, 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18 ); -+ -+#if defined(__MINGW64_VERSION_MAJOR) -+#define CR_SUCCESS (0x00) -+#define CR_BUFFER_SMALL (0x1A) -+#define CM_LOCATE_DEVNODE_NORMAL (0x00000000) -+#define CM_REGISTRY_SOFTWARE (0x00000001) -+#define CM_GETIDLIST_FILTER_PRESENT (0x00000100) -+#define CM_GETIDLIST_FILTER_CLASS (0x00000200) -+#define RegDisposition_OpenExisting (0x00000001) -+#endif -+ - #endif - - namespace MFX --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mfx/SHA512SUMS vlc-3.0.22/contrib/src/mfx/SHA512SUMS --- vlc-3.0.21/contrib/src/mfx/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mfx/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -12517338342d3e653043a57e290eb9cffd190aede0c3a3948956f1c7f12f0ea859361cf3e534ab066b96b1c211f68409c67ef21fd6d76b68cc31daef541941b0 mfx_dispatch-1.35.1.tar.gz diff -Nru vlc-3.0.21/contrib/src/mfx/rules.mak vlc-3.0.22/contrib/src/mfx/rules.mak --- vlc-3.0.21/contrib/src/mfx/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/mfx/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -29,6 +29,7 @@ mfx: mfx-$(MFX_GITHASH).tar.xz .sum-mfx $(UNPACK) + $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/mfx/0001-detect-winstore-builds-with-a-regular-mingw32-toolch.patch $(APPLY) $(SRC)/mfx/0002-Fix-linking-statically-with-intel_gfx_api-x86.dll.patch $(APPLY) $(SRC)/mfx/0003-Don-t-change-the-calling-convention-of-x86-gfx-api.patch @@ -36,6 +37,6 @@ $(MOVE) .mfx: mfx - cd $< && $(HOSTVARS) CFLAGS="$(MFX_CFLAGS)" CXXFLAGS="$(MFX_CXXFLAGS)" ./configure $(HOSTCONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(MFX_CFLAGS)" CXXFLAGS="$(MFX_CXXFLAGS)" + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/microdns/rules.mak vlc-3.0.22/contrib/src/microdns/rules.mak --- vlc-3.0.21/contrib/src/microdns/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/microdns/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -22,7 +22,7 @@ $(MOVE) .microdns: microdns crossfile.meson - cd $< && rm -rf ./build - cd $< && $(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled build - cd $< && cd build && ninja install + $(MESONCLEAN) + $(MESON) -Dauto_features=disabled + +$(MESONBUILD) touch $@ diff -Nru vlc-3.0.21/contrib/src/mingw64/0001-headers-allow-CryptAcquireContext-in-Win10-RS4-UWP-b.patch vlc-3.0.22/contrib/src/mingw64/0001-headers-allow-CryptAcquireContext-in-Win10-RS4-UWP-b.patch --- vlc-3.0.21/contrib/src/mingw64/0001-headers-allow-CryptAcquireContext-in-Win10-RS4-UWP-b.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0001-headers-allow-CryptAcquireContext-in-Win10-RS4-UWP-b.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -From 8c7a455ce283451a8f2cfb8ab785ec2b0b3a0f0a Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 22 Jun 2023 09:00:49 +0200 -Subject: [PATCH 1/5] headers: allow CryptAcquireContext in Win10 RS4 UWP - builds - -It's allowed by the WACK and in api-ms-win-security-cryptoapi-l1-1-0 -since the 16299/RS4 SDK. ---- - mingw-w64-headers/include/wincrypt.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h -index 8c719b1c5..e60e3cd23 100644 ---- a/mingw-w64-headers/include/wincrypt.h -+++ b/mingw-w64-headers/include/wincrypt.h -@@ -773,10 +773,12 @@ extern "C" { - #endif - #endif - --#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_RS4 || defined(WINSTORECOMPAT) - WINIMPM WINBOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR szContainer, LPCSTR szProvider, DWORD dwProvType, DWORD dwFlags); - WINIMPM WINBOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR szContainer, LPCWSTR szProvider, DWORD dwProvType, DWORD dwFlags); - #define CryptAcquireContext __MINGW_NAME_AW(CryptAcquireContext) -+#endif -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) - WINIMPM WINBOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer); - #endif - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch vlc-3.0.22/contrib/src/mingw64/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch --- vlc-3.0.21/contrib/src/mingw64/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From d6b24ec2508f10dadbe9ccd8789b22ed1c0832bb Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 24 May 2023 08:30:19 +0200 -Subject: [PATCH 01/17] headers: enable GetFileInformationByHandle in Win10 UWP - builds - -Contrary to what the documentation says, it's available in the Windows SDK, -both in the headers and when linking with WindowsApp.lib. - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/fileapi.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mingw-w64-headers/include/fileapi.h b/mingw-w64-headers/include/fileapi.h -index ffbe12560..8ea09f6c9 100644 ---- a/mingw-w64-headers/include/fileapi.h -+++ b/mingw-w64-headers/include/fileapi.h -@@ -32,7 +32,7 @@ WINBASEAPI DWORD WINAPI GetFileAttributesW (LPCWSTR lpFileName); - #define GetFileAttributes __MINGW_NAME_AW(GetFileAttributes) - WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); - #endif --#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 - typedef struct _BY_HANDLE_FILE_INFORMATION { - DWORD dwFileAttributes; - FILETIME ftCreationTime; --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0001-include-process-fix-bare-DllMain-_CRT_INIT-signature.patch vlc-3.0.22/contrib/src/mingw64/0001-include-process-fix-bare-DllMain-_CRT_INIT-signature.patch --- vlc-3.0.21/contrib/src/mingw64/0001-include-process-fix-bare-DllMain-_CRT_INIT-signature.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0001-include-process-fix-bare-DllMain-_CRT_INIT-signature.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -From aa4e9797bac4b353ebfd6159e731e8347ea10f28 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 27 Sep 2023 13:53:54 +0200 -Subject: [PATCH] include/process: fix bare DllMain/_CRT_INIT signature - -The DWORD reason corresponds to an "unsigned long", not an "unsigned". -This is also how it's defined in the Windows SDK. ---- - mingw-w64-headers/crt/process.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/mingw-w64-headers/crt/process.h b/mingw-w64-headers/crt/process.h -index 08b73cf58..1ac39a064 100644 ---- a/mingw-w64-headers/crt/process.h -+++ b/mingw-w64-headers/crt/process.h -@@ -138,10 +138,10 @@ extern "C" { - WINBOOL WINAPI _wCRT_INIT(HANDLE _HDllHandle,DWORD _Reason,LPVOID _Reserved); - extern WINBOOL (WINAPI *const _pRawDllMain)(HANDLE,DWORD,LPVOID); - #else -- int __stdcall DllMain(void *_HDllHandle,unsigned _Reason,void *_Reserved); -- int __stdcall _CRT_INIT(void *_HDllHandle,unsigned _Reason,void *_Reserved); -- int __stdcall _wCRT_INIT(void *_HDllHandle,unsigned _Reason,void *_Reserved); -- extern int (__stdcall *const _pRawDllMain)(void *,unsigned,void *); -+ int __stdcall DllMain(void *_HDllHandle,unsigned long _Reason,void *_Reserved); -+ int __stdcall _CRT_INIT(void *_HDllHandle,unsigned long _Reason,void *_Reserved); -+ int __stdcall _wCRT_INIT(void *_HDllHandle,unsigned long _Reason,void *_Reserved); -+ extern int (__stdcall *const _pRawDllMain)(void *,unsigned long,void *); - #endif - #endif - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0002-headers-allow-CryptGenRandom-in-Win10-19H1-UWP-build.patch vlc-3.0.22/contrib/src/mingw64/0002-headers-allow-CryptGenRandom-in-Win10-19H1-UWP-build.patch --- vlc-3.0.21/contrib/src/mingw64/0002-headers-allow-CryptGenRandom-in-Win10-19H1-UWP-build.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0002-headers-allow-CryptGenRandom-in-Win10-19H1-UWP-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From b19b9c357d29769c7f1dd03ef0fa47315e4f2705 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 22 Jun 2023 09:03:08 +0200 -Subject: [PATCH 2/5] headers: allow CryptGenRandom in Win10 19H1 UWP builds - -It's allowed by the WACK and in api-ms-win-security-cryptoapi-l1-1-0 -since the 18362/19H1 SDK. ---- - mingw-w64-headers/include/wincrypt.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h -index e60e3cd23..05fd577fb 100644 ---- a/mingw-w64-headers/include/wincrypt.h -+++ b/mingw-w64-headers/include/wincrypt.h -@@ -778,7 +778,7 @@ extern "C" { - WINIMPM WINBOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR szContainer, LPCWSTR szProvider, DWORD dwProvType, DWORD dwFlags); - #define CryptAcquireContext __MINGW_NAME_AW(CryptAcquireContext) - #endif --#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 || defined(WINSTORECOMPAT) - WINIMPM WINBOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer); - #endif - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0002-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch vlc-3.0.22/contrib/src/mingw64/0002-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch --- vlc-3.0.21/contrib/src/mingw64/0002-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0002-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From 7669cac6e5266b8bb0a23cf6dbdcd0511aaee52c Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 25 May 2023 08:31:24 +0200 -Subject: [PATCH 02/17] headers: enable VirtualAlloc(Ex) in Win10 UWP builds - -It is now officially allowed [1]. - -[1] https://learn.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-virtualalloc - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/memoryapi.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mingw-w64-headers/include/memoryapi.h b/mingw-w64-headers/include/memoryapi.h -index 0f2b4ae79..152671c18 100644 ---- a/mingw-w64-headers/include/memoryapi.h -+++ b/mingw-w64-headers/include/memoryapi.h -@@ -29,6 +29,8 @@ extern "C" { - #endif - - #if (WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) && _WIN32_WINNT >= _WIN32_WINNT_WIN10) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -+ WINBASEAPI LPVOID WINAPI VirtualAlloc (LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); -+ WINBASEAPI LPVOID WINAPI VirtualAllocEx (HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); - WINBASEAPI WINBOOL WINAPI VirtualFree (LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType); - #endif - -@@ -78,8 +80,6 @@ extern "C" { - #define FILE_CACHE_MIN_HARD_ENABLE 0x00000004 - #define FILE_CACHE_MIN_HARD_DISABLE 0x00000008 - -- WINBASEAPI LPVOID WINAPI VirtualAlloc (LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); -- WINBASEAPI LPVOID WINAPI VirtualAllocEx (HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); - WINBASEAPI WINBOOL WINAPI VirtualProtectEx (HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD flNewProtect, PDWORD lpflOldProtect); - WINBASEAPI SIZE_T WINAPI VirtualQueryEx (HANDLE hProcess, LPCVOID lpAddress, PMEMORY_BASIC_INFORMATION lpBuffer, SIZE_T dwLength); - WINBASEAPI WINBOOL WINAPI ReadProcessMemory (HANDLE hProcess, LPCVOID lpBaseAddress, LPVOID lpBuffer, SIZE_T nSize, SIZE_T *lpNumberOfBytesRead); --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0003-headers-allow-more-wincrypt-API-s-in-Win10-RS4-UWP-b.patch vlc-3.0.22/contrib/src/mingw64/0003-headers-allow-more-wincrypt-API-s-in-Win10-RS4-UWP-b.patch --- vlc-3.0.21/contrib/src/mingw64/0003-headers-allow-more-wincrypt-API-s-in-Win10-RS4-UWP-b.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0003-headers-allow-more-wincrypt-API-s-in-Win10-RS4-UWP-b.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -From 50d55a75c1513a1f2751c49bf87e76e90f7adff9 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 22 Jun 2023 08:52:51 +0200 -Subject: [PATCH 3/5] headers: allow more wincrypt API's in Win10 RS4 UWP - builds - -The API's are allowed in windowsapp since RS4 and are allowed by the WACK. -Only the MS header don't specify it properly for WINAPI_FAMILY_PC_APP -but since the DLL is on all WINAPI_FAMILY_DESKTOP_APP and allowed by the -WACK this always works. - -CMS_DH_KEY_INFO is needed by CryptSetKeyParam(). ---- - mingw-w64-headers/include/wincrypt.h | 42 +++++++++++++++------------- - 1 file changed, 23 insertions(+), 19 deletions(-) - -diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h -index 05fd577fb..4bcc3ff70 100644 ---- a/mingw-w64-headers/include/wincrypt.h -+++ b/mingw-w64-headers/include/wincrypt.h -@@ -785,6 +785,29 @@ extern "C" { - WINIMPM WINBOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags); - #endif - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -+#define CryptEnumProviders __MINGW_NAME_AW(CryptEnumProviders) -+#define CryptEnumProviderTypes __MINGW_NAME_AW(CryptEnumProviderTypes) -+#define CryptSetProvider __MINGW_NAME_AW(CryptSetProvider) -+#define CryptSetProviderEx __MINGW_NAME_AW(CryptSetProviderEx) -+ -+ WINIMPM WINBOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); -+ WINIMPM WINBOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType); -+ WINIMPM WINBOOL WINAPI CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType); -+ WINIMPM WINBOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); -+ WINIMPM WINBOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); -+ WINIMPM WINBOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR szTypeName, DWORD *pcbTypeName); -+ WINIMPM WINBOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPWSTR szTypeName, DWORD *pcbTypeName); -+ WINIMPM WINBOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR szProvName, DWORD *pcbProvName); -+ WINIMPM WINBOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPWSTR szProvName, DWORD *pcbProvName); -+ WINIMPM WINBOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags); -+ WINIMPM WINBOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags, HCRYPTKEY *phKey); -+ WINIMPM WINBOOL WINAPI CryptDuplicateHash (HCRYPTHASH hHash, DWORD *pdwReserved, DWORD dwFlags, HCRYPTHASH *phHash); -+#if NTDDI_VERSION >= NTDDI_WS03 -+ WINBOOL __cdecl GetEncSChannel (BYTE **pData, DWORD *dwDecSize); -+#endif -+#endif -+ -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_RS4 - typedef struct _CMS_DH_KEY_INFO { - DWORD dwVersion; - ALG_ID Algid; -@@ -795,11 +818,7 @@ extern "C" { - - #define CryptSignHash __MINGW_NAME_AW(CryptSignHash) - #define CryptVerifySignature __MINGW_NAME_AW(CryptVerifySignature) --#define CryptSetProvider __MINGW_NAME_AW(CryptSetProvider) --#define CryptSetProviderEx __MINGW_NAME_AW(CryptSetProviderEx) - #define CryptGetDefaultProvider __MINGW_NAME_AW(CryptGetDefaultProvider) --#define CryptEnumProviderTypes __MINGW_NAME_AW(CryptEnumProviderTypes) --#define CryptEnumProviders __MINGW_NAME_AW(CryptEnumProviders) - - WINIMPM WINBOOL WINAPI CryptGenKey (HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYPTKEY *phKey); - WINIMPM WINBOOL WINAPI CryptDeriveKey (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseData, DWORD dwFlags, HCRYPTKEY *phKey); -@@ -817,28 +836,13 @@ extern "C" { - WINIMPM WINBOOL WINAPI CryptDecrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, WINBOOL Final, DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen); - WINIMPM WINBOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, DWORD dwFlags, HCRYPTHASH *phHash); - WINIMPM WINBOOL WINAPI CryptHashData (HCRYPTHASH hHash, CONST BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); -- WINIMPM WINBOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); - WINIMPM WINBOOL WINAPI CryptDestroyHash (HCRYPTHASH hHash); - WINIMPM WINBOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR szDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); - WINIMPM WINBOOL WINAPI CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR szDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); - WINIMPM WINBOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCSTR szDescription, DWORD dwFlags); - WINIMPM WINBOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR szDescription, DWORD dwFlags); -- WINIMPM WINBOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType); -- WINIMPM WINBOOL WINAPI CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType); -- WINIMPM WINBOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); -- WINIMPM WINBOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); - WINIMPM WINBOOL WINAPI CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags, LPSTR pszProvName, DWORD *pcbProvName); - WINIMPM WINBOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags, LPWSTR pszProvName, DWORD *pcbProvName); -- WINIMPM WINBOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR szTypeName, DWORD *pcbTypeName); -- WINIMPM WINBOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPWSTR szTypeName, DWORD *pcbTypeName); -- WINIMPM WINBOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR szProvName, DWORD *pcbProvName); -- WINIMPM WINBOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPWSTR szProvName, DWORD *pcbProvName); -- WINIMPM WINBOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags); -- WINIMPM WINBOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags, HCRYPTKEY *phKey); -- WINIMPM WINBOOL WINAPI CryptDuplicateHash (HCRYPTHASH hHash, DWORD *pdwReserved, DWORD dwFlags, HCRYPTHASH *phHash); --#if NTDDI_VERSION >= NTDDI_WS03 -- WINBOOL __cdecl GetEncSChannel (BYTE **pData, DWORD *dwDecSize); --#endif - #endif - - #ifndef _DDK_DRIVER_ --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0003-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch vlc-3.0.22/contrib/src/mingw64/0003-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch --- vlc-3.0.21/contrib/src/mingw64/0003-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0003-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -From 25beff61340b108d6b6fc4054c9a30a6f4fea281 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Sat, 27 May 2023 12:05:37 +0200 -Subject: [PATCH 03/17] headers: enable GetVolumePathNameW in Win10 UWP builds - -The documentation doesn't say it's allowed, but the WIndows SDK allow it and -the Windows App Certification as well. - -The official page for allowed API's also doesn't say it's allowed [1] -but the DLL that contains it is there. - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-file-l2-1-0dll - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/fileapi.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mingw-w64-headers/include/fileapi.h b/mingw-w64-headers/include/fileapi.h -index 8ea09f6c9..e9e0c647f 100644 ---- a/mingw-w64-headers/include/fileapi.h -+++ b/mingw-w64-headers/include/fileapi.h -@@ -81,6 +81,7 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON - WINBASEAPI DWORD WINAPI GetFullPathNameA (LPCSTR lpFileName, DWORD nBufferLength, LPSTR lpBuffer, LPSTR *lpFilePart); - WINBASEAPI DWORD WINAPI GetFullPathNameW (LPCWSTR lpFileName, DWORD nBufferLength, LPWSTR lpBuffer, LPWSTR *lpFilePart); - WINBASEAPI DWORD WINAPI GetLogicalDrives (VOID); -+ WINBASEAPI WINBOOL WINAPI GetVolumePathNameW (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength); - #define FindFirstFile __MINGW_NAME_AW(FindFirstFile) - #define GetDiskFreeSpace __MINGW_NAME_AW(GetDiskFreeSpace) - #define GetDriveType __MINGW_NAME_AW(GetDriveType) -@@ -89,7 +90,6 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW (DWORD nBufferLength, LPWSTR lpBuffer); - WINBASEAPI DWORD WINAPI GetShortPathNameW (LPCWSTR lpszLongPath, LPWSTR lpszShortPath, DWORD cchBuffer); -- WINBASEAPI WINBOOL WINAPI GetVolumePathNameW (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength); - WINBASEAPI DWORD WINAPI QueryDosDeviceW (LPCWSTR lpDeviceName, LPWSTR lpTargetPath, DWORD ucchMax); - WINBASEAPI WINBOOL WINAPI ReadFileScatter (HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToRead, LPDWORD lpReserved, LPOVERLAPPED lpOverlapped); - WINBASEAPI WINBOOL WINAPI SetFileValidData (HANDLE hFile, LONGLONG ValidDataLength); --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0004-headers-allow-more-wincrypt-API-s-in-Win10-19H1-UWP-.patch vlc-3.0.22/contrib/src/mingw64/0004-headers-allow-more-wincrypt-API-s-in-Win10-19H1-UWP-.patch --- vlc-3.0.21/contrib/src/mingw64/0004-headers-allow-more-wincrypt-API-s-in-Win10-19H1-UWP-.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0004-headers-allow-more-wincrypt-API-s-in-Win10-19H1-UWP-.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -From 920f2e29b1a3a296f6863bcd26179094aa94535a Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 22 Jun 2023 10:53:22 +0200 -Subject: [PATCH 4/5] headers: allow more wincrypt API's in Win10 19H1 UWP - builds - -The API's are allowed in windowsapp since 19H1 and are allowed by the WACK. -Only the MS header don't specify it properly for WINAPI_FAMILY_PC_APP -but since the DLL is on all WINAPI_FAMILY_DESKTOP_APP and allowed by the -WACK this always works. ---- - mingw-w64-headers/include/wincrypt.h | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h -index 4bcc3ff70..475ef7883 100644 ---- a/mingw-w64-headers/include/wincrypt.h -+++ b/mingw-w64-headers/include/wincrypt.h -@@ -785,22 +785,17 @@ extern "C" { - WINIMPM WINBOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags); - #endif - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) --#define CryptEnumProviders __MINGW_NAME_AW(CryptEnumProviders) - #define CryptEnumProviderTypes __MINGW_NAME_AW(CryptEnumProviderTypes) - #define CryptSetProvider __MINGW_NAME_AW(CryptSetProvider) - #define CryptSetProviderEx __MINGW_NAME_AW(CryptSetProviderEx) - - WINIMPM WINBOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); - WINIMPM WINBOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType); -- WINIMPM WINBOOL WINAPI CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType); - WINIMPM WINBOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); - WINIMPM WINBOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); - WINIMPM WINBOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR szTypeName, DWORD *pcbTypeName); - WINIMPM WINBOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPWSTR szTypeName, DWORD *pcbTypeName); -- WINIMPM WINBOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR szProvName, DWORD *pcbProvName); -- WINIMPM WINBOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPWSTR szProvName, DWORD *pcbProvName); - WINIMPM WINBOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags); -- WINIMPM WINBOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags, HCRYPTKEY *phKey); - WINIMPM WINBOOL WINAPI CryptDuplicateHash (HCRYPTHASH hHash, DWORD *pdwReserved, DWORD dwFlags, HCRYPTHASH *phHash); - #if NTDDI_VERSION >= NTDDI_WS03 - WINBOOL __cdecl GetEncSChannel (BYTE **pData, DWORD *dwDecSize); -@@ -845,6 +840,15 @@ extern "C" { - WINIMPM WINBOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags, LPWSTR pszProvName, DWORD *pcbProvName); - #endif - -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 -+ WINIMPM WINBOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags, HCRYPTKEY *phKey); -+ WINIMPM WINBOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR szProvName, DWORD *pcbProvName); -+ WINIMPM WINBOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPWSTR szProvName, DWORD *pcbProvName); -+ WINIMPM WINBOOL WINAPI CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType); -+ -+#define CryptEnumProviders __MINGW_NAME_AW(CryptEnumProviders) -+#endif -+ - #ifndef _DDK_DRIVER_ - typedef ULONG_PTR HCRYPTPROV_OR_NCRYPT_KEY_HANDLE; - typedef ULONG_PTR HCRYPTPROV_LEGACY; --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0004-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch vlc-3.0.22/contrib/src/mingw64/0004-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch --- vlc-3.0.21/contrib/src/mingw64/0004-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0004-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From 0ed84b9108a3a13dd7a7fb881ff1e4e82d6b19f1 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 31 May 2023 07:44:13 +0200 -Subject: [PATCH 04/17] headers: enable GET_MODULE_HANDLE_EX_xxx defines in UWP - builds - -It's available in the Windows 11 SDK for all builds targeting FAMILY_APP and more. - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/libloaderapi.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/mingw-w64-headers/include/libloaderapi.h b/mingw-w64-headers/include/libloaderapi.h -index d4c82ef8c..00070da2e 100644 ---- a/mingw-w64-headers/include/libloaderapi.h -+++ b/mingw-w64-headers/include/libloaderapi.h -@@ -79,11 +79,13 @@ extern "C" { - #if (NTDDI_VERSION >= NTDDI_WIN10_RS2) - #define LOAD_LIBRARY_OS_INTEGRITY_CONTINUITY 0x00008000 - #endif -+#endif /* WINAPI_PARTITION_DESKTOP */ - - #define GET_MODULE_HANDLE_EX_FLAG_PIN (0x1) - #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT (0x2) - #define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS (0x4) - -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - #define ENUMRESLANGPROC __MINGW_NAME_AW(ENUMRESLANGPROC) - #define ENUMRESNAMEPROC __MINGW_NAME_AW(ENUMRESNAMEPROC) - #define ENUMRESTYPEPROC __MINGW_NAME_AW(ENUMRESTYPEPROC) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0005-crt-use-wincrypt-API-from-windowsapp-in-Windows-10.patch vlc-3.0.22/contrib/src/mingw64/0005-crt-use-wincrypt-API-from-windowsapp-in-Windows-10.patch --- vlc-3.0.21/contrib/src/mingw64/0005-crt-use-wincrypt-API-from-windowsapp-in-Windows-10.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0005-crt-use-wincrypt-API-from-windowsapp-in-Windows-10.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -From 92d8233a063e7170c234bdfc8409689f15150d83 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 22 Jun 2023 09:01:28 +0200 -Subject: [PATCH 5/5] crt: use wincrypt API from windowsapp in Windows 10 - -The hidden API are found in windowsapp since the RS4/19H1 SDK. They are -also allowed by the WACK in api-ms-win-security-cryptoapi-l1-1-0. -That DLL has been on all Windows 10 versions [1]. - -It's better to use the real API than using CCryptography winrt API just for -these calls. - -Crypto.c is kept in the old winstorecompat when targetting Windows 8. - -Apps targetting UWP before 19H1 and using CryptGenRandom may not work -if api-ms-win-security-cryptoapi-l1-1-0.dll on older Windows doesn't -contain the entry. - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-security-cryptoapi-l1-1-0dll ---- - .../lib-common/api-ms-win-security-cryptoapi-l1-1-0.def | 9 ++++----- - .../lib32/api-ms-win-security-cryptoapi-l1-1-0.def | 9 ++++----- - mingw-w64-libraries/winstorecompat/Makefile.am | 1 - - 3 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/mingw-w64-crt/lib-common/api-ms-win-security-cryptoapi-l1-1-0.def b/mingw-w64-crt/lib-common/api-ms-win-security-cryptoapi-l1-1-0.def -index 93bdb91e6..ebeeda2c5 100644 ---- a/mingw-w64-crt/lib-common/api-ms-win-security-cryptoapi-l1-1-0.def -+++ b/mingw-w64-crt/lib-common/api-ms-win-security-cryptoapi-l1-1-0.def -@@ -2,9 +2,8 @@ LIBRARY api-ms-win-security-cryptoapi-l1-1-0 - - EXPORTS - --; Implemented in windowsappcompat --;CryptAcquireContextA --;CryptAcquireContextW -+CryptAcquireContextA -+CryptAcquireContextW - CryptCreateHash - CryptDecrypt - CryptDeriveKey -@@ -16,7 +15,7 @@ CryptEnumProvidersA - CryptEnumProvidersW - CryptExportKey - CryptGenKey --;CryptGenRandom -+CryptGenRandom - CryptGetDefaultProviderA - CryptGetDefaultProviderW - CryptGetHashParam -@@ -25,7 +24,7 @@ CryptGetProvParam - CryptGetUserKey - CryptHashData - CryptImportKey --;CryptReleaseContext -+CryptReleaseContext - CryptSetHashParam - CryptSetKeyParam - CryptSetProviderW -diff --git a/mingw-w64-crt/lib32/api-ms-win-security-cryptoapi-l1-1-0.def b/mingw-w64-crt/lib32/api-ms-win-security-cryptoapi-l1-1-0.def -index e175547ec..2590c143c 100644 ---- a/mingw-w64-crt/lib32/api-ms-win-security-cryptoapi-l1-1-0.def -+++ b/mingw-w64-crt/lib32/api-ms-win-security-cryptoapi-l1-1-0.def -@@ -2,9 +2,8 @@ LIBRARY api-ms-win-security-cryptoapi-l1-1-0 - - EXPORTS - --; Implemented in windowsappcompat --;CryptAcquireContextA@20 --;CryptAcquireContextW@20 -+CryptAcquireContextA@20 -+CryptAcquireContextW@20 - CryptCreateHash@20 - CryptDecrypt@24 - CryptDeriveKey@20 -@@ -16,7 +15,7 @@ CryptEnumProvidersA@24 - CryptEnumProvidersW@24 - CryptExportKey@24 - CryptGenKey@16 --;CryptGenRandom@12 -+CryptGenRandom@12 - CryptGetDefaultProviderA@20 - CryptGetDefaultProviderW@20 - CryptGetHashParam@20 -@@ -25,7 +24,7 @@ CryptGetProvParam@20 - CryptGetUserKey@12 - CryptHashData@16 - CryptImportKey@24 --;CryptReleaseContext@8 -+CryptReleaseContext@8 - CryptSetHashParam@16 - CryptSetKeyParam@16 - CryptSetProviderW@8 -diff --git a/mingw-w64-libraries/winstorecompat/Makefile.am b/mingw-w64-libraries/winstorecompat/Makefile.am -index 8b3312312..469b28b19 100644 ---- a/mingw-w64-libraries/winstorecompat/Makefile.am -+++ b/mingw-w64-libraries/winstorecompat/Makefile.am -@@ -59,7 +59,6 @@ libwindowsappcompat_a_SOURCES = \ - src/GetFileSize.c \ - src/SHGetFolderPathW.c \ - src/QueueTimer.c \ -- src/Crypto.c \ - src/GetStartupInfo.c \ - src/EnumProcessModules.c \ - src/RtlAddFunctionTable.c \ --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0005-headers-enable-CreateHardLinkW-in-Win10-19H1-UWP-bui.patch vlc-3.0.22/contrib/src/mingw64/0005-headers-enable-CreateHardLinkW-in-Win10-19H1-UWP-bui.patch --- vlc-3.0.21/contrib/src/mingw64/0005-headers-enable-CreateHardLinkW-in-Win10-19H1-UWP-bui.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0005-headers-enable-CreateHardLinkW-in-Win10-19H1-UWP-bui.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -From ae87f01321d98012576270bd85ee59fe2096fb92 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:27:53 +0200 -Subject: [PATCH 05/17] headers: enable CreateHardLinkW in Win10 19H1 UWP - builds - -The documentation doesn't say it's allowed but they are allowed by the -Windows Application Certification Kit and the 18362 Windows SDK. - -It is not allowed in older SDK. It won't compile or won't link. -The target DLL [1] will likely not have the function, so it should not -be used when targeting older Windows 10 versions in UWP mode. - -We already have api-ms-win-core-file-l2-1-0 in mincore and windowsapp. - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-file-l2-1-0dll - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/winbase.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h -index 82c8b7cc3..c6c34ed3b 100644 ---- a/mingw-w64-headers/include/winbase.h -+++ b/mingw-w64-headers/include/winbase.h -@@ -2464,9 +2464,11 @@ typedef enum FILE_FLUSH_MODE { - WINBASEAPI WINBOOL WINAPI ReplaceFileA (LPCSTR lpReplacedFileName, LPCSTR lpReplacementFileName, LPCSTR lpBackupFileName, DWORD dwReplaceFlags, LPVOID lpExclude, LPVOID lpReserved); - WINBASEAPI WINBOOL WINAPI ReplaceFileW (LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileName, LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, LPVOID lpExclude, LPVOID lpReserved); - #endif -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 -+ WINBASEAPI WINBOOL WINAPI CreateHardLinkW (LPCWSTR lpFileName, LPCWSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes); -+#endif - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - WINBASEAPI WINBOOL WINAPI CreateHardLinkA (LPCSTR lpFileName, LPCSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes); -- WINBASEAPI WINBOOL WINAPI CreateHardLinkW (LPCWSTR lpFileName, LPCWSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes); - - #define ReplaceFile __MINGW_NAME_AW(ReplaceFile) - #define CreateHardLink __MINGW_NAME_AW(CreateHardLink) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0006-headers-enable-more-module-API-in-Win10-19H1-UWP-bui.patch vlc-3.0.22/contrib/src/mingw64/0006-headers-enable-more-module-API-in-Win10-19H1-UWP-bui.patch --- vlc-3.0.21/contrib/src/mingw64/0006-headers-enable-more-module-API-in-Win10-19H1-UWP-bui.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0006-headers-enable-more-module-API-in-Win10-19H1-UWP-bui.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -From 0fbadbc7253a0376bfccd13a150d7f422ed63109 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:28:53 +0200 -Subject: [PATCH 06/17] headers: enable more module API in Win10 19H1 UWP - builds - -The documentation doesn't say it's allowed but they are allowed by the -Windows Application Certification Kit and the 18362 Windows SDK. - -It is not allowed in older SDK. It won't compile or won't link. -The target DLL [1] will likely not have the function, so it should not -be used when targeting older Windows 10 versions in UWP mode. - -We already have api-ms-win-core-libraryloader-l1-2-0 in mincore and windowsapp. - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-libraryloader-l1-2-0dll - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/libloaderapi.h | 44 ++++++++++++++---------- - 1 file changed, 26 insertions(+), 18 deletions(-) - -diff --git a/mingw-w64-headers/include/libloaderapi.h b/mingw-w64-headers/include/libloaderapi.h -index 00070da2e..25bacfd29 100644 ---- a/mingw-w64-headers/include/libloaderapi.h -+++ b/mingw-w64-headers/include/libloaderapi.h -@@ -37,11 +37,6 @@ extern "C" { - typedef FARPROC ENUMRESLANGPROCW; - #endif - --#ifndef RC_INVOKED -- typedef WINBOOL (WINAPI *PGET_MODULE_HANDLE_EXA) (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); -- typedef WINBOOL (WINAPI *PGET_MODULE_HANDLE_EXW) (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); --#endif -- - typedef PVOID DLL_DIRECTORY_COOKIE, *PDLL_DIRECTORY_COOKIE; - - #define FIND_RESOURCE_DIRECTORY_TYPES (0x0100) -@@ -92,31 +87,21 @@ extern "C" { - - WINBASEAPI WINBOOL WINAPI EnumResourceNamesW(HMODULE hModule, LPCWSTR lpType, ENUMRESNAMEPROCW lpEnumFunc, LONG_PTR lParam); - WINBASEAPI HRSRC WINAPI FindResourceW(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType); -- WINBASEAPI HRSRC WINAPI FindResourceExW (HMODULE hModule, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage); - WINBASEAPI WINBOOL WINAPI FreeResource (HGLOBAL hResData); -- WINBASEAPI HMODULE WINAPI LoadLibraryExA (LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); -- WINBASEAPI HMODULE WINAPI LoadLibraryExW (LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); - WINBASEAPI HGLOBAL WINAPI LoadResource (HMODULE hModule, HRSRC hResInfo); - WINUSERAPI int WINAPI LoadStringA (HINSTANCE hInstance, UINT uID, LPSTR lpBuffer, int cchBufferMax); - WINUSERAPI int WINAPI LoadStringW (HINSTANCE hInstance, UINT uID, LPWSTR lpBuffer, int cchBufferMax); - WINBASEAPI LPVOID WINAPI LockResource (HGLOBAL hResData); -- WINBASEAPI DWORD WINAPI SizeofResource (HMODULE hModule, HRSRC hResInfo); - WINBASEAPI DLL_DIRECTORY_COOKIE WINAPI AddDllDirectory (PCWSTR NewDirectory); - WINBASEAPI WINBOOL WINAPI RemoveDllDirectory (DLL_DIRECTORY_COOKIE Cookie); - WINBASEAPI WINBOOL WINAPI SetDefaultDllDirectories (DWORD DirectoryFlags); -- WINBASEAPI WINBOOL WINAPI GetModuleHandleExA (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); -- WINBASEAPI WINBOOL WINAPI GetModuleHandleExW (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); - - #ifdef UNICODE - #define EnumResourceNames EnumResourceNamesW - #define FindResource FindResourceW --#define FindResourceEx FindResourceExW - #endif - --#define PGET_MODULE_HANDLE_EX __MINGW_NAME_AW(PGET_MODULE_HANDLE_EX) - #define LoadString __MINGW_NAME_AW(LoadString) --#define GetModuleHandleEx __MINGW_NAME_AW(GetModuleHandleEx) --#define LoadLibraryEx __MINGW_NAME_AW(LoadLibraryEx) - - #define EnumResourceLanguages __MINGW_NAME_AW(EnumResourceLanguages) - WINBASEAPI WINBOOL WINAPI EnumResourceLanguagesA(HMODULE hModule,LPCSTR lpType,LPCSTR lpName,ENUMRESLANGPROCA lpEnumFunc,LONG_PTR lParam); -@@ -138,11 +123,8 @@ extern "C" { - #endif - #endif - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) --WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName); --WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName); - WINBASEAPI HMODULE WINAPI LoadLibraryA(LPCSTR lpLibFileName); - WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR lpLibFileName); --#define GetModuleHandle __MINGW_NAME_AW(GetModuleHandle) - #define LoadLibrary __MINGW_NAME_AW(LoadLibrary) - #endif - -@@ -178,6 +160,32 @@ typedef const REDIRECTION_DESCRIPTOR *PCREDIRECTION_DESCRIPTOR; - #endif - #endif - -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 -+ WINBASEAPI HRSRC WINAPI FindResourceExW (HMODULE hModule, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage); -+ WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName); -+ WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName); -+ WINBASEAPI WINBOOL WINAPI GetModuleHandleExA (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); -+ WINBASEAPI WINBOOL WINAPI GetModuleHandleExW (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); -+ WINBASEAPI HMODULE WINAPI LoadLibraryExA (LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); -+ WINBASEAPI HMODULE WINAPI LoadLibraryExW (LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); -+ WINBASEAPI DWORD WINAPI SizeofResource (HMODULE hModule, HRSRC hResInfo); -+ -+#ifdef UNICODE -+#define FindResourceEx FindResourceExW -+#endif -+ -+#define GetModuleHandle __MINGW_NAME_AW(GetModuleHandle) -+#define GetModuleHandleEx __MINGW_NAME_AW(GetModuleHandleEx) -+#define LoadLibraryEx __MINGW_NAME_AW(LoadLibraryEx) -+ -+#ifndef RC_INVOKED -+ typedef WINBOOL (WINAPI *PGET_MODULE_HANDLE_EXA) (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); -+ typedef WINBOOL (WINAPI *PGET_MODULE_HANDLE_EXW) (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); -+#endif -+ -+#define PGET_MODULE_HANDLE_EX __MINGW_NAME_AW(PGET_MODULE_HANDLE_EX) -+#endif -+ - #ifdef __cplusplus - } - #endif --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0007-crt-add-api-ms-core-registry-def-files.patch vlc-3.0.22/contrib/src/mingw64/0007-crt-add-api-ms-core-registry-def-files.patch --- vlc-3.0.21/contrib/src/mingw64/0007-crt-add-api-ms-core-registry-def-files.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0007-crt-add-api-ms-core-registry-def-files.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,145 +0,0 @@ -From 71fabf70d06913e8e8eafd050ff9f177eb53f3c6 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:30:03 +0200 -Subject: [PATCH 07/17] crt: add api-ms-core-registry-* def files - -These are needed to enable the registry API calls available in UWP. - -Add the target DLL to windowsapp, but not mincore (Win8) where it doesn't -exist. - -Signed-off-by: LIU Hao ---- - mingw-w64-crt/Makefile.in | 2 + - .../api-ms-win-core-registry-l1-1-0.def | 47 +++++++++++++++++++ - .../api-ms-win-core-registry-l2-1-0.def | 37 +++++++++++++++ - mingw-w64-crt/lib-common/windowsapp.mri | 2 + - 4 files changed, 88 insertions(+) - create mode 100644 mingw-w64-crt/lib-common/api-ms-win-core-registry-l1-1-0.def - create mode 100644 mingw-w64-crt/lib-common/api-ms-win-core-registry-l2-1-0.def - -diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in -index 0454ecec3..cff260421 100644 ---- a/mingw-w64-crt/Makefile.in -+++ b/mingw-w64-crt/Makefile.in -@@ -2237,6 +2237,8 @@ endif - %/libapi-ms-win-core-profile-l1-1-0.a \ - %/libapi-ms-win-core-realtime-l1-1-0.a \ - %/libapi-ms-win-core-realtime-l1-1-1.a \ -+ %/libapi-ms-win-core-registry-l1-1-0.a \ -+ %/libapi-ms-win-core-registry-l2-1-0.a \ - %/libapi-ms-win-core-rtlsupport-l1-2-0.a \ - %/libapi-ms-win-core-string-l1-1-0.a \ - %/libapi-ms-win-core-synch-ansi-l1-1-0.a \ -diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-registry-l1-1-0.def b/mingw-w64-crt/lib-common/api-ms-win-core-registry-l1-1-0.def -new file mode 100644 -index 000000000..2f01992ed ---- /dev/null -+++ b/mingw-w64-crt/lib-common/api-ms-win-core-registry-l1-1-0.def -@@ -0,0 +1,47 @@ -+LIBRARY api-ms-win-core-registry-l1-1-0 -+ -+EXPORTS -+ -+RegCloseKey -+RegCopyTreeW -+RegCreateKeyExA -+RegCreateKeyExW -+RegDeleteKeyExA -+RegDeleteKeyExW -+RegDeleteTreeA -+RegDeleteTreeW -+RegDeleteValueA -+RegDeleteValueW -+RegDisablePredefinedCacheEx -+RegEnumKeyExA -+RegEnumKeyExW -+RegEnumValueA -+RegEnumValueW -+RegFlushKey -+RegGetKeySecurity -+RegGetValueA -+RegGetValueW -+RegLoadAppKeyA -+RegLoadAppKeyW -+RegLoadKeyA -+RegLoadKeyW -+RegLoadMUIStringA -+RegLoadMUIStringW -+RegNotifyChangeKeyValue -+RegOpenCurrentUser -+RegOpenKeyExA -+RegOpenKeyExW -+RegOpenUserClassesRoot -+RegQueryInfoKeyA -+RegQueryInfoKeyW -+RegQueryValueExA -+RegQueryValueExW -+RegRestoreKeyA -+RegRestoreKeyW -+RegSaveKeyExA -+RegSaveKeyExW -+RegSetKeySecurity -+RegSetValueExA -+RegSetValueExW -+RegUnLoadKeyA -+RegUnLoadKeyW -diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-registry-l2-1-0.def b/mingw-w64-crt/lib-common/api-ms-win-core-registry-l2-1-0.def -new file mode 100644 -index 000000000..b35c308c4 ---- /dev/null -+++ b/mingw-w64-crt/lib-common/api-ms-win-core-registry-l2-1-0.def -@@ -0,0 +1,37 @@ -+LIBRARY api-ms-win-core-registry-l2-1-0 -+ -+EXPORTS -+ -+RegConnectRegistryA -+RegConnectRegistryW -+RegCopyTreeA -+RegCreateKeyA -+RegCreateKeyTransactedA -+RegCreateKeyTransactedW -+RegCreateKeyW -+RegDeleteKeyA -+RegDeleteKeyTransactedA -+RegDeleteKeyTransactedW -+RegDeleteKeyValueA -+RegDeleteKeyValueW -+RegDeleteKeyW -+RegDisablePredefinedCache -+RegEnumKeyA -+RegEnumKeyW -+RegOpenKeyA -+RegOpenKeyTransactedA -+RegOpenKeyTransactedW -+RegOpenKeyW -+RegOverridePredefKey -+RegQueryMultipleValuesA -+RegQueryMultipleValuesW -+RegQueryValueA -+RegQueryValueW -+RegReplaceKeyA -+RegReplaceKeyW -+RegSaveKeyA -+RegSaveKeyW -+RegSetKeyValueA -+RegSetKeyValueW -+RegSetValueA -+RegSetValueW -diff --git a/mingw-w64-crt/lib-common/windowsapp.mri b/mingw-w64-crt/lib-common/windowsapp.mri -index 8e0e3d888..2496280a5 100644 ---- a/mingw-w64-crt/lib-common/windowsapp.mri -+++ b/mingw-w64-crt/lib-common/windowsapp.mri -@@ -51,6 +51,8 @@ ADDLIB libapi-ms-win-core-psapi-ansi-l1-1-0.a - ADDLIB libapi-ms-win-core-profile-l1-1-0.a - ADDLIB libapi-ms-win-core-realtime-l1-1-0.a - ADDLIB libapi-ms-win-core-realtime-l1-1-1.a -+ADDLIB libapi-ms-win-core-registry-l1-1-0.a -+ADDLIB libapi-ms-win-core-registry-l2-1-0.a - ADDLIB libapi-ms-win-core-rtlsupport-l1-2-0.a - ADDLIB libapi-ms-win-core-string-l1-1-0.a - ADDLIB libapi-ms-win-core-synch-ansi-l1-1-0.a --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0008-headers-enable-some-Registry-API-calls-in-Win10-19H1.patch vlc-3.0.22/contrib/src/mingw64/0008-headers-enable-some-Registry-API-calls-in-Win10-19H1.patch --- vlc-3.0.21/contrib/src/mingw64/0008-headers-enable-some-Registry-API-calls-in-Win10-19H1.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0008-headers-enable-some-Registry-API-calls-in-Win10-19H1.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,188 +0,0 @@ -From f17aabd6ad7db49419950cbb456c8ecf64eba62a Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:30:04 +0200 -Subject: [PATCH 08/17] headers: enable some Registry API calls in Win10 19H1 - UWP builds - -The documentation doesn't say it's allowed but they are allowed by the -Windows Application Certification Kit and the 18362 Windows SDK. - -It is not allowed in older SDK. It won't compile or won't link. -The target DLL api-ms-win-core-registry-l1-1-0 will likely not have the -function, so it should not be used when targeting older Windows 10 versions -in UWP mode. - -We now have api-ms-win-core-registry-l1-1-0 in windowsapp. - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/winreg.h | 92 ++++++++++++++++-------------- - 1 file changed, 49 insertions(+), 43 deletions(-) - -diff --git a/mingw-w64-headers/include/winreg.h b/mingw-w64-headers/include/winreg.h -index dab9324e8..2f340fa92 100644 ---- a/mingw-w64-headers/include/winreg.h -+++ b/mingw-w64-headers/include/winreg.h -@@ -131,31 +131,20 @@ extern "C" { - #define RegConnectRegistry __MINGW_NAME_AW(RegConnectRegistry) - #define RegConnectRegistryEx __MINGW_NAME_AW(RegConnectRegistryEx) - #define RegCreateKey __MINGW_NAME_AW(RegCreateKey) --#define RegCreateKeyEx __MINGW_NAME_AW(RegCreateKeyEx) - #define RegDeleteKey __MINGW_NAME_AW(RegDeleteKey) --#define RegDeleteKeyEx __MINGW_NAME_AW(RegDeleteKeyEx) --#define RegDeleteValue __MINGW_NAME_AW(RegDeleteValue) - #define RegEnumKey __MINGW_NAME_AW(RegEnumKey) --#define RegEnumKeyEx __MINGW_NAME_AW(RegEnumKeyEx) --#define RegEnumValue __MINGW_NAME_AW(RegEnumValue) - #define RegLoadKey __MINGW_NAME_AW(RegLoadKey) - #define RegOpenKey __MINGW_NAME_AW(RegOpenKey) --#define RegOpenKeyEx __MINGW_NAME_AW(RegOpenKeyEx) --#define RegQueryInfoKey __MINGW_NAME_AW(RegQueryInfoKey) - #define RegQueryValue __MINGW_NAME_AW(RegQueryValue) - #define RegQueryMultipleValues __MINGW_NAME_AW(RegQueryMultipleValues) --#define RegQueryValueEx __MINGW_NAME_AW(RegQueryValueEx) - #define RegReplaceKey __MINGW_NAME_AW(RegReplaceKey) - #define RegRestoreKey __MINGW_NAME_AW(RegRestoreKey) - #define RegSaveKey __MINGW_NAME_AW(RegSaveKey) - #define RegSetValue __MINGW_NAME_AW(RegSetValue) --#define RegSetValueEx __MINGW_NAME_AW(RegSetValueEx) - #define RegUnLoadKey __MINGW_NAME_AW(RegUnLoadKey) --#define RegGetValue __MINGW_NAME_AW(RegGetValue) - #define InitiateSystemShutdown __MINGW_NAME_AW(InitiateSystemShutdown) - #define AbortSystemShutdown __MINGW_NAME_AW(AbortSystemShutdown) - -- WINADVAPI LONG WINAPI RegCloseKey(HKEY hKey); - WINADVAPI LONG WINAPI RegOverridePredefKey(HKEY hKey,HKEY hNewHKey); - WINADVAPI LONG WINAPI RegOpenUserClassesRoot(HANDLE hToken,DWORD dwOptions,REGSAM samDesired,PHKEY phkResult); - WINADVAPI LONG WINAPI RegOpenCurrentUser(REGSAM samDesired,PHKEY phkResult); -@@ -167,40 +156,23 @@ extern "C" { - WINADVAPI LONG WINAPI RegConnectRegistryExW(LPCWSTR lpMachineName,HKEY hKey,ULONG Flags,PHKEY phkResult); - WINADVAPI LONG WINAPI RegCreateKeyA(HKEY hKey,LPCSTR lpSubKey,PHKEY phkResult); - WINADVAPI LONG WINAPI RegCreateKeyW(HKEY hKey,LPCWSTR lpSubKey,PHKEY phkResult); -- WINADVAPI LONG WINAPI RegCreateKeyExA(HKEY hKey,LPCSTR lpSubKey,DWORD Reserved,LPSTR lpClass,DWORD dwOptions,REGSAM samDesired,LPSECURITY_ATTRIBUTES lpSecurityAttributes,PHKEY phkResult,LPDWORD lpdwDisposition); -- WINADVAPI LONG WINAPI RegCreateKeyExW(HKEY hKey,LPCWSTR lpSubKey,DWORD Reserved,LPWSTR lpClass,DWORD dwOptions,REGSAM samDesired,LPSECURITY_ATTRIBUTES lpSecurityAttributes,PHKEY phkResult,LPDWORD lpdwDisposition); - WINADVAPI LONG WINAPI RegDeleteKeyA(HKEY hKey,LPCSTR lpSubKey); - WINADVAPI LONG WINAPI RegDeleteKeyW(HKEY hKey,LPCWSTR lpSubKey); -- WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY hKey,LPCSTR lpSubKey,REGSAM samDesired,DWORD Reserved); -- WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY hKey,LPCWSTR lpSubKey,REGSAM samDesired,DWORD Reserved); - WINADVAPI LONG WINAPI RegDisableReflectionKey(HKEY hBase); - WINADVAPI LONG WINAPI RegEnableReflectionKey(HKEY hBase); - WINADVAPI LONG WINAPI RegQueryReflectionKey(HKEY hBase,WINBOOL *bIsReflectionDisabled); -- WINADVAPI LONG WINAPI RegDeleteValueA(HKEY hKey,LPCSTR lpValueName); -- WINADVAPI LONG WINAPI RegDeleteValueW(HKEY hKey,LPCWSTR lpValueName); - WINADVAPI LONG WINAPI RegEnumKeyA(HKEY hKey,DWORD dwIndex,LPSTR lpName,DWORD cchName); - WINADVAPI LONG WINAPI RegEnumKeyW(HKEY hKey,DWORD dwIndex,LPWSTR lpName,DWORD cchName); -- WINADVAPI LONG WINAPI RegEnumKeyExA(HKEY hKey,DWORD dwIndex,LPSTR lpName,LPDWORD lpcchName,LPDWORD lpReserved,LPSTR lpClass,LPDWORD lpcchClass,PFILETIME lpftLastWriteTime); -- WINADVAPI LONG WINAPI RegEnumKeyExW(HKEY hKey,DWORD dwIndex,LPWSTR lpName,LPDWORD lpcchName,LPDWORD lpReserved,LPWSTR lpClass,LPDWORD lpcchClass,PFILETIME lpftLastWriteTime); -- WINADVAPI LONG WINAPI RegEnumValueA(HKEY hKey,DWORD dwIndex,LPSTR lpValueName,LPDWORD lpcchValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); -- WINADVAPI LONG WINAPI RegEnumValueW(HKEY hKey,DWORD dwIndex,LPWSTR lpValueName,LPDWORD lpcchValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); - WINADVAPI LONG WINAPI RegFlushKey(HKEY hKey); - WINADVAPI LONG WINAPI RegGetKeySecurity(HKEY hKey,SECURITY_INFORMATION SecurityInformation,PSECURITY_DESCRIPTOR pSecurityDescriptor,LPDWORD lpcbSecurityDescriptor); - WINADVAPI LONG WINAPI RegLoadKeyA(HKEY hKey,LPCSTR lpSubKey,LPCSTR lpFile); - WINADVAPI LONG WINAPI RegLoadKeyW(HKEY hKey,LPCWSTR lpSubKey,LPCWSTR lpFile); -- WINADVAPI LONG WINAPI RegNotifyChangeKeyValue(HKEY hKey,WINBOOL bWatchSubtree,DWORD dwNotifyFilter,HANDLE hEvent,WINBOOL fAsynchronous); - WINADVAPI LONG WINAPI RegOpenKeyA(HKEY hKey,LPCSTR lpSubKey,PHKEY phkResult); - WINADVAPI LONG WINAPI RegOpenKeyW(HKEY hKey,LPCWSTR lpSubKey,PHKEY phkResult); -- WINADVAPI LONG WINAPI RegOpenKeyExA(HKEY hKey,LPCSTR lpSubKey,DWORD ulOptions,REGSAM samDesired,PHKEY phkResult); -- WINADVAPI LONG WINAPI RegOpenKeyExW(HKEY hKey,LPCWSTR lpSubKey,DWORD ulOptions,REGSAM samDesired,PHKEY phkResult); -- WINADVAPI LONG WINAPI RegQueryInfoKeyA(HKEY hKey,LPSTR lpClass,LPDWORD lpcchClass,LPDWORD lpReserved,LPDWORD lpcSubKeys,LPDWORD lpcbMaxSubKeyLen,LPDWORD lpcbMaxClassLen,LPDWORD lpcValues,LPDWORD lpcbMaxValueNameLen,LPDWORD lpcbMaxValueLen,LPDWORD lpcbSecurityDescriptor,PFILETIME lpftLastWriteTime); -- WINADVAPI LONG WINAPI RegQueryInfoKeyW(HKEY hKey,LPWSTR lpClass,LPDWORD lpcchClass,LPDWORD lpReserved,LPDWORD lpcSubKeys,LPDWORD lpcbMaxSubKeyLen,LPDWORD lpcbMaxClassLen,LPDWORD lpcValues,LPDWORD lpcbMaxValueNameLen,LPDWORD lpcbMaxValueLen,LPDWORD lpcbSecurityDescriptor,PFILETIME lpftLastWriteTime); - WINADVAPI LONG WINAPI RegQueryValueA(HKEY hKey,LPCSTR lpSubKey,LPSTR lpData,PLONG lpcbData); - WINADVAPI LONG WINAPI RegQueryValueW(HKEY hKey,LPCWSTR lpSubKey,LPWSTR lpData,PLONG lpcbData); - WINADVAPI LONG WINAPI RegQueryMultipleValuesA(HKEY hKey,PVALENTA val_list,DWORD num_vals,LPSTR lpValueBuf,LPDWORD ldwTotsize); - WINADVAPI LONG WINAPI RegQueryMultipleValuesW(HKEY hKey,PVALENTW val_list,DWORD num_vals,LPWSTR lpValueBuf,LPDWORD ldwTotsize); -- WINADVAPI LONG WINAPI RegQueryValueExA(HKEY hKey,LPCSTR lpValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); -- WINADVAPI LONG WINAPI RegQueryValueExW(HKEY hKey,LPCWSTR lpValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); - WINADVAPI LONG WINAPI RegReplaceKeyA(HKEY hKey,LPCSTR lpSubKey,LPCSTR lpNewFile,LPCSTR lpOldFile); - WINADVAPI LONG WINAPI RegReplaceKeyW(HKEY hKey,LPCWSTR lpSubKey,LPCWSTR lpNewFile,LPCWSTR lpOldFile); - WINADVAPI LONG WINAPI RegRestoreKeyA(HKEY hKey,LPCSTR lpFile,DWORD dwFlags); -@@ -210,12 +182,8 @@ extern "C" { - WINADVAPI LONG WINAPI RegSetKeySecurity(HKEY hKey,SECURITY_INFORMATION SecurityInformation,PSECURITY_DESCRIPTOR pSecurityDescriptor); - WINADVAPI LONG WINAPI RegSetValueA(HKEY hKey,LPCSTR lpSubKey,DWORD dwType,LPCSTR lpData,DWORD cbData); - WINADVAPI LONG WINAPI RegSetValueW(HKEY hKey,LPCWSTR lpSubKey,DWORD dwType,LPCWSTR lpData,DWORD cbData); -- WINADVAPI LONG WINAPI RegSetValueExA(HKEY hKey,LPCSTR lpValueName,DWORD Reserved,DWORD dwType,CONST BYTE *lpData,DWORD cbData); -- WINADVAPI LONG WINAPI RegSetValueExW(HKEY hKey,LPCWSTR lpValueName,DWORD Reserved,DWORD dwType,CONST BYTE *lpData,DWORD cbData); - WINADVAPI LONG WINAPI RegUnLoadKeyA(HKEY hKey,LPCSTR lpSubKey); - WINADVAPI LONG WINAPI RegUnLoadKeyW(HKEY hKey,LPCWSTR lpSubKey); -- WINADVAPI LONG WINAPI RegGetValueA(HKEY hkey,LPCSTR lpSubKey,LPCSTR lpValue,DWORD dwFlags,LPDWORD pdwType,PVOID pvData,LPDWORD pcbData); -- WINADVAPI LONG WINAPI RegGetValueW(HKEY hkey,LPCWSTR lpSubKey,LPCWSTR lpValue,DWORD dwFlags,LPDWORD pdwType,PVOID pvData,LPDWORD pcbData); - WINADVAPI WINBOOL WINAPI InitiateSystemShutdownA(LPSTR lpMachineName,LPSTR lpMessage,DWORD dwTimeout,WINBOOL bForceAppsClosed,WINBOOL bRebootAfterShutdown); - WINADVAPI WINBOOL WINAPI InitiateSystemShutdownW(LPWSTR lpMachineName,LPWSTR lpMessage,DWORD dwTimeout,WINBOOL bForceAppsClosed,WINBOOL bRebootAfterShutdown); - WINADVAPI WINBOOL WINAPI AbortSystemShutdownA(LPSTR lpMachineName); -@@ -320,17 +288,6 @@ WINADVAPI LONG WINAPI RegDeleteKeyValueW( - LPCWSTR lpValueName - ); - --#define RegDeleteTree __MINGW_NAME_AW(RegDeleteTree) --WINADVAPI LONG WINAPI RegDeleteTreeA( -- HKEY hKey, -- LPCSTR lpSubKey --); -- --WINADVAPI LONG WINAPI RegDeleteTreeW( -- HKEY hKey, -- LPCWSTR lpSubKey --); -- - WINADVAPI LONG WINAPI RegLoadAppKeyA( - LPCSTR lpFile, - PHKEY phkResult, -@@ -442,6 +399,55 @@ WINADVAPI DWORD WINAPI CheckForHiberboot( - - #endif /* WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) */ - -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 -+ WINADVAPI LONG WINAPI RegCloseKey(HKEY hKey); -+ WINADVAPI LONG WINAPI RegCreateKeyExA(HKEY hKey,LPCSTR lpSubKey,DWORD Reserved,LPSTR lpClass,DWORD dwOptions,REGSAM samDesired,LPSECURITY_ATTRIBUTES lpSecurityAttributes,PHKEY phkResult,LPDWORD lpdwDisposition); -+ WINADVAPI LONG WINAPI RegCreateKeyExW(HKEY hKey,LPCWSTR lpSubKey,DWORD Reserved,LPWSTR lpClass,DWORD dwOptions,REGSAM samDesired,LPSECURITY_ATTRIBUTES lpSecurityAttributes,PHKEY phkResult,LPDWORD lpdwDisposition); -+ WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY hKey,LPCSTR lpSubKey,REGSAM samDesired,DWORD Reserved); -+ WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY hKey,LPCWSTR lpSubKey,REGSAM samDesired,DWORD Reserved); -+ WINADVAPI LONG WINAPI RegDeleteValueA(HKEY hKey,LPCSTR lpValueName); -+ WINADVAPI LONG WINAPI RegDeleteValueW(HKEY hKey,LPCWSTR lpValueName); -+ WINADVAPI LONG WINAPI RegEnumKeyExA(HKEY hKey,DWORD dwIndex,LPSTR lpName,LPDWORD lpcchName,LPDWORD lpReserved,LPSTR lpClass,LPDWORD lpcchClass,PFILETIME lpftLastWriteTime); -+ WINADVAPI LONG WINAPI RegEnumKeyExW(HKEY hKey,DWORD dwIndex,LPWSTR lpName,LPDWORD lpcchName,LPDWORD lpReserved,LPWSTR lpClass,LPDWORD lpcchClass,PFILETIME lpftLastWriteTime); -+ WINADVAPI LONG WINAPI RegEnumValueA(HKEY hKey,DWORD dwIndex,LPSTR lpValueName,LPDWORD lpcchValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); -+ WINADVAPI LONG WINAPI RegEnumValueW(HKEY hKey,DWORD dwIndex,LPWSTR lpValueName,LPDWORD lpcchValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); -+ WINADVAPI LONG WINAPI RegGetValueA(HKEY hkey,LPCSTR lpSubKey,LPCSTR lpValue,DWORD dwFlags,LPDWORD pdwType,PVOID pvData,LPDWORD pcbData); -+ WINADVAPI LONG WINAPI RegGetValueW(HKEY hkey,LPCWSTR lpSubKey,LPCWSTR lpValue,DWORD dwFlags,LPDWORD pdwType,PVOID pvData,LPDWORD pcbData); -+ WINADVAPI LONG WINAPI RegNotifyChangeKeyValue(HKEY hKey,WINBOOL bWatchSubtree,DWORD dwNotifyFilter,HANDLE hEvent,WINBOOL fAsynchronous); -+ WINADVAPI LONG WINAPI RegOpenKeyExA(HKEY hKey,LPCSTR lpSubKey,DWORD ulOptions,REGSAM samDesired,PHKEY phkResult); -+ WINADVAPI LONG WINAPI RegOpenKeyExW(HKEY hKey,LPCWSTR lpSubKey,DWORD ulOptions,REGSAM samDesired,PHKEY phkResult); -+ WINADVAPI LONG WINAPI RegQueryInfoKeyA(HKEY hKey,LPSTR lpClass,LPDWORD lpcchClass,LPDWORD lpReserved,LPDWORD lpcSubKeys,LPDWORD lpcbMaxSubKeyLen,LPDWORD lpcbMaxClassLen,LPDWORD lpcValues,LPDWORD lpcbMaxValueNameLen,LPDWORD lpcbMaxValueLen,LPDWORD lpcbSecurityDescriptor,PFILETIME lpftLastWriteTime); -+ WINADVAPI LONG WINAPI RegQueryInfoKeyW(HKEY hKey,LPWSTR lpClass,LPDWORD lpcchClass,LPDWORD lpReserved,LPDWORD lpcSubKeys,LPDWORD lpcbMaxSubKeyLen,LPDWORD lpcbMaxClassLen,LPDWORD lpcValues,LPDWORD lpcbMaxValueNameLen,LPDWORD lpcbMaxValueLen,LPDWORD lpcbSecurityDescriptor,PFILETIME lpftLastWriteTime); -+ WINADVAPI LONG WINAPI RegQueryValueExA(HKEY hKey,LPCSTR lpValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); -+ WINADVAPI LONG WINAPI RegQueryValueExW(HKEY hKey,LPCWSTR lpValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); -+ WINADVAPI LONG WINAPI RegSetValueExA(HKEY hKey,LPCSTR lpValueName,DWORD Reserved,DWORD dwType,CONST BYTE *lpData,DWORD cbData); -+ WINADVAPI LONG WINAPI RegSetValueExW(HKEY hKey,LPCWSTR lpValueName,DWORD Reserved,DWORD dwType,CONST BYTE *lpData,DWORD cbData); -+#define RegCreateKeyEx __MINGW_NAME_AW(RegCreateKeyEx) -+#define RegDeleteKeyEx __MINGW_NAME_AW(RegDeleteKeyEx) -+#define RegDeleteValue __MINGW_NAME_AW(RegDeleteValue) -+#define RegEnumKeyEx __MINGW_NAME_AW(RegEnumKeyEx) -+#define RegEnumValue __MINGW_NAME_AW(RegEnumValue) -+#define RegGetValue __MINGW_NAME_AW(RegGetValue) -+#define RegOpenKeyEx __MINGW_NAME_AW(RegOpenKeyEx) -+#define RegQueryInfoKey __MINGW_NAME_AW(RegQueryInfoKey) -+#define RegQueryValueEx __MINGW_NAME_AW(RegQueryValueEx) -+#define RegSetValueEx __MINGW_NAME_AW(RegSetValueEx) -+#endif -+ -+#if _WIN32_WINNT >= 0x0600 && (WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1) -+WINADVAPI LONG WINAPI RegDeleteTreeA( -+ HKEY hKey, -+ LPCSTR lpSubKey -+); -+ -+WINADVAPI LONG WINAPI RegDeleteTreeW( -+ HKEY hKey, -+ LPCWSTR lpSubKey -+); -+ -+#define RegDeleteTree __MINGW_NAME_AW(RegDeleteTree) -+#endif -+ - #ifdef __cplusplus - } - #endif --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0009-headers-only-enable-GetFileInformationByHandle-for-1.patch vlc-3.0.22/contrib/src/mingw64/0009-headers-only-enable-GetFileInformationByHandle-for-1.patch --- vlc-3.0.21/contrib/src/mingw64/0009-headers-only-enable-GetFileInformationByHandle-for-1.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0009-headers-only-enable-GetFileInformationByHandle-for-1.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -From 20619a25985e84980d8fdc1ff7828e5fdff42ff4 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:31:43 +0200 -Subject: [PATCH 09/17] headers: only enable GetFileInformationByHandle for - 19H1 UWP builds - -It is not allowed in older SDK. It won't compile or won't link. The target DLL -will likely not have the function, so it should not be used when targetting older -Windows 10 versions in UWP mode. - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/fileapi.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mingw-w64-headers/include/fileapi.h b/mingw-w64-headers/include/fileapi.h -index e9e0c647f..8124bd5cc 100644 ---- a/mingw-w64-headers/include/fileapi.h -+++ b/mingw-w64-headers/include/fileapi.h -@@ -32,7 +32,7 @@ WINBASEAPI DWORD WINAPI GetFileAttributesW (LPCWSTR lpFileName); - #define GetFileAttributes __MINGW_NAME_AW(GetFileAttributes) - WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); - #endif --#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 || defined(WINSTORECOMPAT) - typedef struct _BY_HANDLE_FILE_INFORMATION { - DWORD dwFileAttributes; - FILETIME ftCreationTime; --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0010-headers-allow-Get-SetHandleInformation-in-Win10-19H1.patch vlc-3.0.22/contrib/src/mingw64/0010-headers-allow-Get-SetHandleInformation-in-Win10-19H1.patch --- vlc-3.0.21/contrib/src/mingw64/0010-headers-allow-Get-SetHandleInformation-in-Win10-19H1.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0010-headers-allow-Get-SetHandleInformation-in-Win10-19H1.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -From d598a2338f212cf88ae1ea54a2953ae3b2bd87d5 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:32:15 +0200 -Subject: [PATCH 10/17] headers: allow Get/SetHandleInformation in Win10 19H1 - UWP builds - -The documentation doesn't say it's allowed but they are allowed by the -Windows Application Certification Kit and the 18362 Windows SDK. - -It is not allowed in older SDK. It won't compile or won't link. -The target DLL [1] will likely not have the function, so it should not -be used when targeting older Windows 10 versions in UWP mode. - -We already have api-ms-win-core-handle-l1-1-0 in mincore and windowsapp. - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-handle-l1-1-0dll - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/handleapi.h | 2 +- - mingw-w64-headers/include/winbase.h | 5 ++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/mingw-w64-headers/include/handleapi.h b/mingw-w64-headers/include/handleapi.h -index 9f814f151..f33ceef71 100644 ---- a/mingw-w64-headers/include/handleapi.h -+++ b/mingw-w64-headers/include/handleapi.h -@@ -23,7 +23,7 @@ extern "C" { - #endif - #endif - --#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 - WINBASEAPI WINBOOL WINAPI GetHandleInformation (HANDLE hObject, LPDWORD lpdwFlags); - WINBASEAPI WINBOOL WINAPI SetHandleInformation (HANDLE hObject, DWORD dwMask, DWORD dwFlags); - #endif -diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h -index c6c34ed3b..6e114e28f 100644 ---- a/mingw-w64-headers/include/winbase.h -+++ b/mingw-w64-headers/include/winbase.h -@@ -1346,6 +1346,8 @@ typedef enum FILE_FLUSH_MODE { - - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 - WINBASEAPI DWORD WINAPI WaitForMultipleObjects (DWORD nCount, CONST HANDLE *lpHandles, WINBOOL bWaitAll, DWORD dwMilliseconds); -+#define HANDLE_FLAG_INHERIT 0x1 -+#define HANDLE_FLAG_PROTECT_FROM_CLOSE 0x2 - #endif - - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -@@ -1357,9 +1359,6 @@ typedef enum FILE_FLUSH_MODE { - DEPTotalPolicyCount - } DEP_SYSTEM_POLICY_TYPE; - --#define HANDLE_FLAG_INHERIT 0x1 --#define HANDLE_FLAG_PROTECT_FROM_CLOSE 0x2 -- - #define HINSTANCE_ERROR 32 - - #define GET_TAPE_MEDIA_INFORMATION 0 --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0011-crt-add-missing-api-ms-win-core-heap-l1-1-0.patch vlc-3.0.22/contrib/src/mingw64/0011-crt-add-missing-api-ms-win-core-heap-l1-1-0.patch --- vlc-3.0.21/contrib/src/mingw64/0011-crt-add-missing-api-ms-win-core-heap-l1-1-0.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0011-crt-add-missing-api-ms-win-core-heap-l1-1-0.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -From 3f2dcd43490f263210a7a61ae1a7250c70cd9330 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:33:39 +0200 -Subject: [PATCH 11/17] crt: add missing api-ms-win-core-heap-l1-1-0 - -It was supposed to be in mincore already. - -The parameters size in lib32 were generated from values found in other .def -files of lib32. - -Signed-off-by: LIU Hao ---- - mingw-w64-crt/Makefile.in | 1 + - .../api-ms-win-core-heap-l1-1-0.def | 20 +++++++++++++++++++ - mingw-w64-crt/lib-common/mincore.mri | 2 +- - mingw-w64-crt/lib-common/windowsapp.mri | 1 + - .../lib32/api-ms-win-core-heap-l1-1-0.def | 20 +++++++++++++++++++ - 5 files changed, 43 insertions(+), 1 deletion(-) - create mode 100644 mingw-w64-crt/lib-common/api-ms-win-core-heap-l1-1-0.def - create mode 100644 mingw-w64-crt/lib32/api-ms-win-core-heap-l1-1-0.def - -diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in -index cff260421..3310b0a44 100644 ---- a/mingw-w64-crt/Makefile.in -+++ b/mingw-w64-crt/Makefile.in -@@ -2206,6 +2206,7 @@ endif - %/libapi-ms-win-core-file-l2-1-0.a \ - %/libapi-ms-win-core-file-l2-1-1.a \ - %/libapi-ms-win-core-handle-l1-1-0.a \ -+ %/libapi-ms-win-core-heap-l1-1-0.a \ - %/libapi-ms-win-core-heap-l1-2-0.a \ - %/libapi-ms-win-core-interlocked-l1-2-0.a \ - %/libapi-ms-win-core-io-l1-1-0.a \ -diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-heap-l1-1-0.def b/mingw-w64-crt/lib-common/api-ms-win-core-heap-l1-1-0.def -new file mode 100644 -index 000000000..202bce3ac ---- /dev/null -+++ b/mingw-w64-crt/lib-common/api-ms-win-core-heap-l1-1-0.def -@@ -0,0 +1,20 @@ -+LIBRARY api-ms-win-core-heap-l1-1-0 -+ -+EXPORTS -+ -+GetProcessHeap -+GetProcessHeaps -+HeapAlloc -+HeapCompact -+HeapCreate -+HeapDestroy -+HeapFree -+HeapLock -+HeapQueryInformation -+HeapReAlloc -+HeapSetInformation -+HeapSize -+HeapSummary -+HeapUnlock -+HeapValidate -+HeapWalk -diff --git a/mingw-w64-crt/lib-common/mincore.mri b/mingw-w64-crt/lib-common/mincore.mri -index 7073eeb8d..27f5f50c9 100644 ---- a/mingw-w64-crt/lib-common/mincore.mri -+++ b/mingw-w64-crt/lib-common/mincore.mri -@@ -38,7 +38,7 @@ ADDLIB libapi-ms-win-core-file-l2-1-2.a - ; FIXME libapi-ms-win-core-file-l2-1-3.a - ADDLIB libapi-ms-win-core-firmware-l1-1-0.a - ADDLIB libapi-ms-win-core-handle-l1-1-0.a --; FIXME libapi-ms-win-core-heap-l1-1-0.a -+ADDLIB libapi-ms-win-core-heap-l1-1-0.a - ADDLIB libapi-ms-win-core-heap-l1-2-0.a - ADDLIB libapi-ms-win-core-interlocked-l1-1-0.a - ADDLIB libapi-ms-win-core-interlocked-l1-2-0.a -diff --git a/mingw-w64-crt/lib-common/windowsapp.mri b/mingw-w64-crt/lib-common/windowsapp.mri -index 2496280a5..d1445a4a7 100644 ---- a/mingw-w64-crt/lib-common/windowsapp.mri -+++ b/mingw-w64-crt/lib-common/windowsapp.mri -@@ -20,6 +20,7 @@ ADDLIB libapi-ms-win-core-file-l1-2-2.a - ADDLIB libapi-ms-win-core-file-l2-1-0.a - ADDLIB libapi-ms-win-core-file-l2-1-1.a - ADDLIB libapi-ms-win-core-handle-l1-1-0.a -+ADDLIB libapi-ms-win-core-heap-l1-1-0.a - ADDLIB libapi-ms-win-core-heap-l1-2-0.a - ADDLIB libapi-ms-win-core-interlocked-l1-2-0.a - ADDLIB libapi-ms-win-core-io-l1-1-0.a -diff --git a/mingw-w64-crt/lib32/api-ms-win-core-heap-l1-1-0.def b/mingw-w64-crt/lib32/api-ms-win-core-heap-l1-1-0.def -new file mode 100644 -index 000000000..419896a62 ---- /dev/null -+++ b/mingw-w64-crt/lib32/api-ms-win-core-heap-l1-1-0.def -@@ -0,0 +1,20 @@ -+LIBRARY api-ms-win-core-heap-l1-1-0 -+ -+EXPORTS -+ -+GetProcessHeap@0 -+GetProcessHeaps@8 -+HeapAlloc@12 -+HeapCompact@8 -+HeapCreate@12 -+HeapDestroy@4 -+HeapFree@12 -+HeapLock@4 -+HeapQueryInformation@20 -+HeapReAlloc@16 -+HeapSetInformation@16 -+HeapSize@12 -+HeapSummary@12 -+HeapUnlock@4 -+HeapValidate@12 -+HeapWalk@8 --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0012-headers-Allow-some-Heap-API-in-Win10-19H1-UWP-builds.patch vlc-3.0.22/contrib/src/mingw64/0012-headers-Allow-some-Heap-API-in-Win10-19H1-UWP-builds.patch --- vlc-3.0.21/contrib/src/mingw64/0012-headers-Allow-some-Heap-API-in-Win10-19H1-UWP-builds.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0012-headers-Allow-some-Heap-API-in-Win10-19H1-UWP-builds.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From be84314c974c5c3004ceeb3f510944a4074f137c Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:33:40 +0200 -Subject: [PATCH 12/17] headers: Allow some Heap API in Win10 19H1 UWP builds - -The documentation doesn't say it's allowed but they are allowed by the -Windows Application Certification Kit and the 18362 Windows SDK. - -It is not allowed in older SDK. It won't compile or won't link. -The target DLL [1] will likely not have the function, so it should not -be used when targeting older Windows 10 versions in UWP mode. - -We already have api-ms-win-core-heap-l1-1-0 and api-ms-win-core-heap-l1-2-0 -in mincore and windowsapp. - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-heap-l1-2-0dll - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/heapapi.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/mingw-w64-headers/include/heapapi.h b/mingw-w64-headers/include/heapapi.h -index b150e1056..fe937f301 100644 ---- a/mingw-w64-headers/include/heapapi.h -+++ b/mingw-w64-headers/include/heapapi.h -@@ -30,6 +30,9 @@ extern "C" { - WINBASEAPI DWORD WINAPI GetProcessHeaps (DWORD NumberOfHeaps, PHANDLE ProcessHeaps); - WINBASEAPI WINBOOL WINAPI HeapLock (HANDLE hHeap); - WINBASEAPI WINBOOL WINAPI HeapUnlock (HANDLE hHeap); -+#endif -+ -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 - WINBASEAPI WINBOOL WINAPI HeapWalk (HANDLE hHeap, LPPROCESS_HEAP_ENTRY lpEntry); - WINBASEAPI WINBOOL WINAPI HeapQueryInformation (HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, PVOID HeapInformation, SIZE_T HeapInformationLength, PSIZE_T ReturnLength); - #endif --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0013-headers-enable-FindResourceW-in-Win10-19H1-UWP-build.patch vlc-3.0.22/contrib/src/mingw64/0013-headers-enable-FindResourceW-in-Win10-19H1-UWP-build.patch --- vlc-3.0.21/contrib/src/mingw64/0013-headers-enable-FindResourceW-in-Win10-19H1-UWP-build.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0013-headers-enable-FindResourceW-in-Win10-19H1-UWP-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -From 2609975f80bd2c6357b5e6c01210eafee277a00e Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:34:34 +0200 -Subject: [PATCH 13/17] headers: enable FindResourceW in Win10 19H1 UWP builds - -The documentation doesn't say it's allowed but they are allowed by the -Windows Application Certification Kit and the 18362 Windows SDK. - -It is not allowed in older SDK. It won't compile or won't link. -The target DLL [1] will likely not have the function, so it should not -be used when targeting older Windows 10 versions in UWP mode. - -We already have api-ms-win-core-libraryloader-l1-2-1 in mincore and windowsapp. - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-libraryloader-l1-2-1dll - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/libloaderapi.h | 9 +++++++-- - mingw-w64-headers/include/winbase.h | 10 +++++++--- - 2 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/mingw-w64-headers/include/libloaderapi.h b/mingw-w64-headers/include/libloaderapi.h -index 25bacfd29..00aa50f2a 100644 ---- a/mingw-w64-headers/include/libloaderapi.h -+++ b/mingw-w64-headers/include/libloaderapi.h -@@ -80,13 +80,19 @@ extern "C" { - #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT (0x2) - #define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS (0x4) - -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0A00 -+ WINBASEAPI HRSRC WINAPI FindResourceW(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType); -+#ifdef UNICODE -+#define FindResource FindResourceW -+#endif -+#endif -+ - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - #define ENUMRESLANGPROC __MINGW_NAME_AW(ENUMRESLANGPROC) - #define ENUMRESNAMEPROC __MINGW_NAME_AW(ENUMRESNAMEPROC) - #define ENUMRESTYPEPROC __MINGW_NAME_AW(ENUMRESTYPEPROC) - - WINBASEAPI WINBOOL WINAPI EnumResourceNamesW(HMODULE hModule, LPCWSTR lpType, ENUMRESNAMEPROCW lpEnumFunc, LONG_PTR lParam); -- WINBASEAPI HRSRC WINAPI FindResourceW(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType); - WINBASEAPI WINBOOL WINAPI FreeResource (HGLOBAL hResData); - WINBASEAPI HGLOBAL WINAPI LoadResource (HMODULE hModule, HRSRC hResInfo); - WINUSERAPI int WINAPI LoadStringA (HINSTANCE hInstance, UINT uID, LPSTR lpBuffer, int cchBufferMax); -@@ -98,7 +104,6 @@ extern "C" { - - #ifdef UNICODE - #define EnumResourceNames EnumResourceNamesW --#define FindResource FindResourceW - #endif - - #define LoadString __MINGW_NAME_AW(LoadString) -diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h -index 6e114e28f..050c5e7d4 100644 ---- a/mingw-w64-headers/include/winbase.h -+++ b/mingw-w64-headers/include/winbase.h -@@ -2015,7 +2015,6 @@ typedef enum FILE_FLUSH_MODE { - WINBASEAPI VOID WINAPI FatalAppExitW (UINT uAction, LPCWSTR lpMessageText); - WINBASEAPI VOID WINAPI GetStartupInfoA (LPSTARTUPINFOA lpStartupInfo); - WINBASEAPI HRSRC WINAPI FindResourceA (HMODULE hModule, LPCSTR lpName, LPCSTR lpType); -- WINBASEAPI HRSRC WINAPI FindResourceW (HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType); - WINBASEAPI HRSRC WINAPI FindResourceExA (HMODULE hModule, LPCSTR lpType, LPCSTR lpName, WORD wLanguage); - WINBASEAPI WINBOOL WINAPI EnumResourceTypesA (HMODULE hModule, ENUMRESTYPEPROCA lpEnumFunc, LONG_PTR lParam); - WINBASEAPI WINBOOL WINAPI EnumResourceTypesW (HMODULE hModule, ENUMRESTYPEPROCW lpEnumFunc, LONG_PTR lParam); -@@ -2082,7 +2081,6 @@ typedef enum FILE_FLUSH_MODE { - #define FatalAppExit __MINGW_NAME_AW(FatalAppExit) - #define GetFirmwareEnvironmentVariable __MINGW_NAME_AW(GetFirmwareEnvironmentVariable) - #define SetFirmwareEnvironmentVariable __MINGW_NAME_AW(SetFirmwareEnvironmentVariable) --#define FindResource __MINGW_NAME_AW(FindResource) - #define EnumResourceTypes __MINGW_NAME_AW(EnumResourceTypes) - #define EnumResourceNames __MINGW_NAME_AW(EnumResourceNames) - #define EnumResourceLanguages __MINGW_NAME_AW(EnumResourceLanguages) -@@ -2168,7 +2166,13 @@ typedef enum FILE_FLUSH_MODE { - #endif /* WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) */ - - --#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 -+ WINBASEAPI HRSRC WINAPI FindResourceW (HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType); -+ -+#define FindResource __MINGW_NAME_AW(FindResource) -+#endif -+ -+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_VB - WINBASEAPI WINBOOL WINAPI CreateDirectoryExA (LPCSTR lpTemplateDirectory, LPCSTR lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes); - WINBASEAPI WINBOOL WINAPI CreateDirectoryExW (LPCWSTR lpTemplateDirectory, LPCWSTR lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes); - --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0014-headers-check-which-version-of-UWP-Windows-contains-.patch vlc-3.0.22/contrib/src/mingw64/0014-headers-check-which-version-of-UWP-Windows-contains-.patch --- vlc-3.0.21/contrib/src/mingw64/0014-headers-check-which-version-of-UWP-Windows-contains-.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0014-headers-check-which-version-of-UWP-Windows-contains-.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -From 5cd281859723b5fcb3c7a488a3f059aa8f2f74cf Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 1 Jun 2023 15:35:32 +0200 -Subject: [PATCH 14/17] headers: check which version of UWP Windows contains - Virtual functions - -* VirtualFree is always available in UWP -* VirtualAlloc is only available since 19H1/18362 SDK -* VirtualAllocEx is only available since 20H1/19041 SDK - -They are all found in api-ms-win-core-memory-l1-1-0 which is in mincore -and windowsapp. It's one of the target DLLs [1] - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-memory-l1-1-0dll - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/memoryapi.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/mingw-w64-headers/include/memoryapi.h b/mingw-w64-headers/include/memoryapi.h -index 152671c18..889c2a504 100644 ---- a/mingw-w64-headers/include/memoryapi.h -+++ b/mingw-w64-headers/include/memoryapi.h -@@ -29,9 +29,13 @@ extern "C" { - #endif - - #if (WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) && _WIN32_WINNT >= _WIN32_WINNT_WIN10) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -+ WINBASEAPI WINBOOL WINAPI VirtualFree (LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType); -+#endif -+#if (WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) && NTDDI_VERSION >= NTDDI_WIN10_19H1) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - WINBASEAPI LPVOID WINAPI VirtualAlloc (LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); -+#endif -+#if (WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) && NTDDI_VERSION >= NTDDI_WIN10_VB) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - WINBASEAPI LPVOID WINAPI VirtualAllocEx (HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); -- WINBASEAPI WINBOOL WINAPI VirtualFree (LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType); - #endif - - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0015-headers-enabled-LoadLibraryEx-flags-in-Win10-19H1-UW.patch vlc-3.0.22/contrib/src/mingw64/0015-headers-enabled-LoadLibraryEx-flags-in-Win10-19H1-UW.patch --- vlc-3.0.21/contrib/src/mingw64/0015-headers-enabled-LoadLibraryEx-flags-in-Win10-19H1-UW.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0015-headers-enabled-LoadLibraryEx-flags-in-Win10-19H1-UW.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -From 5f7be029976e3e5ad00901167ded70b5ca53ebb2 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 7 Jun 2023 09:46:58 +0200 -Subject: [PATCH 15/17] headers: enabled LoadLibraryEx flags in Win10 19H1 UWP - builds - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/libloaderapi.h | 48 ++++++++++++------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/mingw-w64-headers/include/libloaderapi.h b/mingw-w64-headers/include/libloaderapi.h -index 00aa50f2a..6a5f59ed4 100644 ---- a/mingw-w64-headers/include/libloaderapi.h -+++ b/mingw-w64-headers/include/libloaderapi.h -@@ -50,30 +50,6 @@ extern "C" { - #define RESOURCE_ENUM_MODULE_EXACT (0x0010) - - #define SUPPORT_LANG_NUMBER 32 -- --#define DONT_RESOLVE_DLL_REFERENCES 0x1 --#define LOAD_LIBRARY_AS_DATAFILE 0x2 --#define LOAD_WITH_ALTERED_SEARCH_PATH 0x8 --#define LOAD_IGNORE_CODE_AUTHZ_LEVEL 0x10 --#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x20 --#define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE 0x40 --#define LOAD_LIBRARY_REQUIRE_SIGNED_TARGET 0x80 --#define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x100 --#define LOAD_LIBRARY_SEARCH_APPLICATION_DIR 0x200 --#define LOAD_LIBRARY_SEARCH_USER_DIRS 0x400 --#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x800 --#define LOAD_LIBRARY_SEARCH_DEFAULT_DIRS 0x1000 -- --#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) --#define LOAD_LIBRARY_SAFE_CURRENT_DIRS 0x00002000 --#define LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER 0x00004000 --#else --#define LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER LOAD_LIBRARY_SEARCH_SYSTEM32 --#endif -- --#if (NTDDI_VERSION >= NTDDI_WIN10_RS2) --#define LOAD_LIBRARY_OS_INTEGRITY_CONTINUITY 0x00008000 --#endif - #endif /* WINAPI_PARTITION_DESKTOP */ - - #define GET_MODULE_HANDLE_EX_FLAG_PIN (0x1) -@@ -166,6 +142,30 @@ typedef const REDIRECTION_DESCRIPTOR *PCREDIRECTION_DESCRIPTOR; - #endif - - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 -+#define DONT_RESOLVE_DLL_REFERENCES 0x1 -+#define LOAD_LIBRARY_AS_DATAFILE 0x2 -+#define LOAD_WITH_ALTERED_SEARCH_PATH 0x8 -+#define LOAD_IGNORE_CODE_AUTHZ_LEVEL 0x10 -+#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x20 -+#define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE 0x40 -+#define LOAD_LIBRARY_REQUIRE_SIGNED_TARGET 0x80 -+#define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x100 -+#define LOAD_LIBRARY_SEARCH_APPLICATION_DIR 0x200 -+#define LOAD_LIBRARY_SEARCH_USER_DIRS 0x400 -+#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x800 -+#define LOAD_LIBRARY_SEARCH_DEFAULT_DIRS 0x1000 -+ -+#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) -+#define LOAD_LIBRARY_SAFE_CURRENT_DIRS 0x00002000 -+#define LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER 0x00004000 -+#else -+#define LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER LOAD_LIBRARY_SEARCH_SYSTEM32 -+#endif -+ -+#if (NTDDI_VERSION >= NTDDI_WIN10_RS2) -+#define LOAD_LIBRARY_OS_INTEGRITY_CONTINUITY 0x00008000 -+#endif -+ - WINBASEAPI HRSRC WINAPI FindResourceExW (HMODULE hModule, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage); - WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName); - WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName); --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0016-headers-Allow-SetDllDirectoryW-A-API-in-Win10-19H1-U.patch vlc-3.0.22/contrib/src/mingw64/0016-headers-Allow-SetDllDirectoryW-A-API-in-Win10-19H1-U.patch --- vlc-3.0.21/contrib/src/mingw64/0016-headers-Allow-SetDllDirectoryW-A-API-in-Win10-19H1-U.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0016-headers-Allow-SetDllDirectoryW-A-API-in-Win10-19H1-U.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -From b4d090324cbb623584b372c6a978f0d877b7e019 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 7 Jun 2023 09:46:59 +0200 -Subject: [PATCH 16/17] headers: Allow SetDllDirectoryW/A API in Win10 19H1 UWP - builds - -The documentation doesn't say it's allowed but they are allowed by the -Windows Application Certification Kit and the 18362 Windows SDK. - -It is not allowed in older SDK. It won't compile or won't link. -The target DLL [1] will likely not have the function, so it should not -be used when targeting older Windows 10 versions in UWP mode. - -We already have api-ms-win-core-kernel32-legacy-l1-1-1 -in windowsapp. - -[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-kernel32-legacy-l1-1-1dll - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/winbase.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h -index 050c5e7d4..ad8f069c4 100644 ---- a/mingw-w64-headers/include/winbase.h -+++ b/mingw-w64-headers/include/winbase.h -@@ -2136,8 +2136,6 @@ typedef enum FILE_FLUSH_MODE { - #define GET_SYSTEM_WOW64_DIRECTORY_NAME_T_T __MINGW_NAME_UAW_EXT(GET_SYSTEM_WOW64_DIRECTORY_NAME,T) - #endif - -- WINBASEAPI WINBOOL WINAPI SetDllDirectoryA (LPCSTR lpPathName); -- WINBASEAPI WINBOOL WINAPI SetDllDirectoryW (LPCWSTR lpPathName); - WINBASEAPI DWORD WINAPI GetDllDirectoryA (DWORD nBufferLength, LPSTR lpBuffer); - WINBASEAPI DWORD WINAPI GetDllDirectoryW (DWORD nBufferLength, LPWSTR lpBuffer); - -@@ -2167,6 +2165,8 @@ typedef enum FILE_FLUSH_MODE { - - - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 -+ WINBASEAPI WINBOOL WINAPI SetDllDirectoryA (LPCSTR lpPathName); -+ WINBASEAPI WINBOOL WINAPI SetDllDirectoryW (LPCWSTR lpPathName); - WINBASEAPI HRSRC WINAPI FindResourceW (HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType); - - #define FindResource __MINGW_NAME_AW(FindResource) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0017-headers-allow-FORMAT_MESSAGE_ALLOCATE_BUFFER-in-UWP.patch vlc-3.0.22/contrib/src/mingw64/0017-headers-allow-FORMAT_MESSAGE_ALLOCATE_BUFFER-in-UWP.patch --- vlc-3.0.21/contrib/src/mingw64/0017-headers-allow-FORMAT_MESSAGE_ALLOCATE_BUFFER-in-UWP.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0017-headers-allow-FORMAT_MESSAGE_ALLOCATE_BUFFER-in-UWP.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -From 856d9ba2e3095c8775d00933353641de0cee0236 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 14 Jun 2023 09:59:19 +0200 -Subject: [PATCH 17/17] headers: allow FORMAT_MESSAGE_ALLOCATE_BUFFER in UWP - -FormatMessageA/W are allowed, so the flag should be allowed too. - -Signed-off-by: LIU Hao ---- - mingw-w64-headers/include/winbase.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h -index ad8f069c4..24eb6b78d 100644 ---- a/mingw-w64-headers/include/winbase.h -+++ b/mingw-w64-headers/include/winbase.h -@@ -1448,6 +1448,7 @@ typedef enum FILE_FLUSH_MODE { - #define FORMAT_MESSAGE_FROM_SYSTEM 0x00001000 - #define FORMAT_MESSAGE_ARGUMENT_ARRAY 0x00002000 - #define FORMAT_MESSAGE_MAX_WIDTH_MASK 0x000000ff -+#define FORMAT_MESSAGE_ALLOCATE_BUFFER 0x00000100 - #endif - - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -@@ -1465,8 +1466,6 @@ typedef enum FILE_FLUSH_MODE { - #define FILE_READ_ONLY 8 - #define FILE_DIR_DISALLOWED 9 - --#define FORMAT_MESSAGE_ALLOCATE_BUFFER 0x00000100 -- - #define EFS_USE_RECOVERY_KEYS (0x1) - - #define CREATE_FOR_IMPORT (1) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0018-headers-allow-RtlSecureZeroMemory-in-all-targets.patch vlc-3.0.22/contrib/src/mingw64/0018-headers-allow-RtlSecureZeroMemory-in-all-targets.patch --- vlc-3.0.21/contrib/src/mingw64/0018-headers-allow-RtlSecureZeroMemory-in-all-targets.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0018-headers-allow-RtlSecureZeroMemory-in-all-targets.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -From 600b99cc479aa3086ab51c52e333671bab89bbb7 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 9 Aug 2023 08:35:59 +0200 -Subject: [PATCH 18/19] headers: allow RtlSecureZeroMemory in all targets - -It's usually an inline function doing native CPU calls. It's also unrestricted -in the Windows SDK since Windows 8, as well as SecureZeroMemory. ---- - mingw-w64-headers/include/winnt.h | 35 ++++++++++++++++--------------- - 1 file changed, 18 insertions(+), 17 deletions(-) - -diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h -index 257efdc1b..a49dd6ab8 100644 ---- a/mingw-w64-headers/include/winnt.h -+++ b/mingw-w64-headers/include/winnt.h -@@ -8928,6 +8928,24 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *); - #define HEAP_MAXIMUM_TAG 0x0FFF - #define HEAP_PSEUDO_TAG_FLAG 0x8000 - #define HEAP_TAG_SHIFT 18 -+ -+ PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt); -+ -+#if !defined (__CRT__NO_INLINE) && !defined (__WIDL__) -+ __CRT_INLINE PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt) { -+ volatile char *vptr =(volatile char *)ptr; -+#ifdef __x86_64 -+ __stosb((PBYTE)((DWORD64)vptr),0,cnt); -+#else -+ while(cnt) { -+ *vptr++ = 0; -+ cnt--; -+ } -+#endif /* __x86_64 */ -+ return ptr; -+ } -+#endif /* !__CRT__NO_INLINE // !__WIDL__ */ -+ - /* Let this macro fail for non-desktop mode. AFAIU this should be better an inline-function ... */ - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - #define HEAP_MAKE_TAG_FLAGS(b,o) ((DWORD)((b) + ((o) << 18))) -@@ -8983,23 +9001,6 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *); - #define RtlFillMemory(Destination,Length,Fill) memset((Destination),(Fill),(Length)) - #define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length)) - -- PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt); -- --#if !defined (__CRT__NO_INLINE) && !defined (__WIDL__) -- __CRT_INLINE PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt) { -- volatile char *vptr =(volatile char *)ptr; --#ifdef __x86_64 -- __stosb((PBYTE)((DWORD64)vptr),0,cnt); --#else -- while(cnt) { -- *vptr++ = 0; -- cnt--; -- } --#endif /* __x86_64 */ -- return ptr; -- } --#endif /* !__CRT__NO_INLINE // !__WIDL__ */ -- - typedef struct _MESSAGE_RESOURCE_ENTRY { - WORD Length; - WORD Flags; --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/0019-headers-use-inline-version-of-RtlSecureZeroMemory-fo.patch vlc-3.0.22/contrib/src/mingw64/0019-headers-use-inline-version-of-RtlSecureZeroMemory-fo.patch --- vlc-3.0.21/contrib/src/mingw64/0019-headers-use-inline-version-of-RtlSecureZeroMemory-fo.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/0019-headers-use-inline-version-of-RtlSecureZeroMemory-fo.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -From e810b0d5c51842a1cda4376dad7209458ad8fee0 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 9 Aug 2023 10:57:25 +0200 -Subject: [PATCH 19/19] headers: use inline version of RtlSecureZeroMemory for - UCRT builds - -There's an intrinsic version in the kernel32 library. But it's not supposed -to be used with UCRT builds. - -RtlSecureZeroMemory is not found in -O0 + UCRT builds without this fix. - -In the Windows SDK it's a forced inline version no matter what. -(and there's an ARM version) ---- - mingw-w64-headers/include/winnt.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h -index a49dd6ab8..7bd6d4bfe 100644 ---- a/mingw-w64-headers/include/winnt.h -+++ b/mingw-w64-headers/include/winnt.h -@@ -8929,10 +8929,8 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *); - #define HEAP_PSEUDO_TAG_FLAG 0x8000 - #define HEAP_TAG_SHIFT 18 - -- PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt); -- --#if !defined (__CRT__NO_INLINE) && !defined (__WIDL__) -- __CRT_INLINE PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt) { -+#if (!defined (__CRT__NO_INLINE) || defined(_UCRT)) && !defined (__WIDL__) -+ __forceinline PVOID RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt) { - volatile char *vptr =(volatile char *)ptr; - #ifdef __x86_64 - __stosb((PBYTE)((DWORD64)vptr),0,cnt); -@@ -8944,6 +8942,8 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *); - #endif /* __x86_64 */ - return ptr; - } -+#else // intrinsic in kernel32 -+ PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt); - #endif /* !__CRT__NO_INLINE // !__WIDL__ */ - - /* Let this macro fail for non-desktop mode. AFAIU this should be better an inline-function ... */ --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/mingw64/SHA512SUMS vlc-3.0.22/contrib/src/mingw64/SHA512SUMS --- vlc-3.0.21/contrib/src/mingw64/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d mingw-w64-v11.0.0.tar.bz2 \ No newline at end of file diff -Nru vlc-3.0.21/contrib/src/mingw64/rules.mak vlc-3.0.22/contrib/src/mingw64/rules.mak --- vlc-3.0.21/contrib/src/mingw64/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/mingw64/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,198 +0,0 @@ -# winpthreads, dxvahd, winrt_headers, dcomp - -MINGW64_VERSION := 11.0.0 -MINGW64_URL := $(SF)/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$(MINGW64_VERSION).tar.bz2 -MINGW64_HASH=2c35e8ff0d33916bd490e8932cba2049cd1af3d0 -MINGW64_GITURL := https://git.code.sf.net/p/mingw-w64/mingw-w64 - -ifdef HAVE_WIN32 -PKGS += winpthreads - -ifndef HAVE_VISUALSTUDIO -ifdef HAVE_WINSTORE -PKGS += winrt_headers alloweduwp -else # !HAVE_WINSTORE -PKGS += d3d9 dcomp -endif # !HAVE_WINSTORE -PKGS += dxva dxvahd mingw11-fixes - -ifeq ($(call mingw_at_least, 8), true) -PKGS_FOUND += d3d9 -endif # MINGW 8 -ifeq ($(call mingw_at_least, 9), true) -ifdef HAVE_WINSTORE -PKGS_FOUND += winrt_headers -endif # HAVE_WINSTORE -endif # MINGW 9 -ifeq ($(call mingw_at_least, 10), true) -PKGS_FOUND += dxva -endif # MINGW 10 -ifeq ($(call mingw_at_least, 10), true) -PKGS_FOUND += dcomp -endif -ifeq ($(call mingw_at_least, 11), true) -PKGS_FOUND += dxvahd -endif # MINGW 11 -ifeq ($(call mingw_at_least, 12), true) -PKGS_FOUND += mingw11-fixes -endif # MINGW 12 -endif # !HAVE_VISUALSTUDIO - -HAVE_WINPTHREAD := $(shell $(CC) $(CFLAGS) -E -dM -include pthread.h - < /dev/null >/dev/null 2>&1 || echo FAIL) -ifeq ($(HAVE_WINPTHREAD),) -PKGS_FOUND += winpthreads -endif - -endif # HAVE_WIN32 - -PKGS_ALL += winpthreads winrt_headers d3d9 dxva dxvahd dcomp mingw11-fixes alloweduwp - -$(TARBALLS)/mingw-w64-$(MINGW64_HASH).tar.xz: - $(call download_git,$(MINGW64_GITURL),,$(MINGW64_HASH)) - -$(TARBALLS)/mingw-w64-v$(MINGW64_VERSION).tar.bz2: - $(call download_pkg,$(MINGW64_URL),winpthreads) - -.sum-mingw64: mingw-w64-v$(MINGW64_VERSION).tar.bz2 -# .sum-mingw64: mingw-w64-$(MINGW64_HASH).tar.xz - -mingw64: mingw-w64-v$(MINGW64_VERSION).tar.bz2 .sum-mingw64 -# mingw64: mingw-w64-$(MINGW64_HASH).tar.xz .sum-mingw64 - $(UNPACK) - $(APPLY) $(SRC)/mingw64/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch - $(APPLY) $(SRC)/mingw64/0002-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch - $(APPLY) $(SRC)/mingw64/0003-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch - $(APPLY) $(SRC)/mingw64/0004-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch - $(APPLY) $(SRC)/mingw64/0005-headers-enable-CreateHardLinkW-in-Win10-19H1-UWP-bui.patch - $(APPLY) $(SRC)/mingw64/0006-headers-enable-more-module-API-in-Win10-19H1-UWP-bui.patch - $(APPLY) $(SRC)/mingw64/0007-crt-add-api-ms-core-registry-def-files.patch - $(APPLY) $(SRC)/mingw64/0008-headers-enable-some-Registry-API-calls-in-Win10-19H1.patch - $(APPLY) $(SRC)/mingw64/0009-headers-only-enable-GetFileInformationByHandle-for-1.patch - $(APPLY) $(SRC)/mingw64/0010-headers-allow-Get-SetHandleInformation-in-Win10-19H1.patch - $(APPLY) $(SRC)/mingw64/0011-crt-add-missing-api-ms-win-core-heap-l1-1-0.patch - $(APPLY) $(SRC)/mingw64/0012-headers-Allow-some-Heap-API-in-Win10-19H1-UWP-builds.patch - $(APPLY) $(SRC)/mingw64/0013-headers-enable-FindResourceW-in-Win10-19H1-UWP-build.patch - $(APPLY) $(SRC)/mingw64/0014-headers-check-which-version-of-UWP-Windows-contains-.patch - $(APPLY) $(SRC)/mingw64/0015-headers-enabled-LoadLibraryEx-flags-in-Win10-19H1-UW.patch - $(APPLY) $(SRC)/mingw64/0016-headers-Allow-SetDllDirectoryW-A-API-in-Win10-19H1-U.patch - $(APPLY) $(SRC)/mingw64/0017-headers-allow-FORMAT_MESSAGE_ALLOCATE_BUFFER-in-UWP.patch - $(APPLY) $(SRC)/mingw64/0018-headers-allow-RtlSecureZeroMemory-in-all-targets.patch - $(APPLY) $(SRC)/mingw64/0019-headers-use-inline-version-of-RtlSecureZeroMemory-fo.patch - $(APPLY) $(SRC)/mingw64/0001-headers-allow-CryptAcquireContext-in-Win10-RS4-UWP-b.patch - $(APPLY) $(SRC)/mingw64/0002-headers-allow-CryptGenRandom-in-Win10-19H1-UWP-build.patch - $(APPLY) $(SRC)/mingw64/0003-headers-allow-more-wincrypt-API-s-in-Win10-RS4-UWP-b.patch - $(APPLY) $(SRC)/mingw64/0004-headers-allow-more-wincrypt-API-s-in-Win10-19H1-UWP-.patch - $(APPLY) $(SRC)/mingw64/0005-crt-use-wincrypt-API-from-windowsapp-in-Windows-10.patch - $(APPLY) $(SRC)/mingw64/0001-include-process-fix-bare-DllMain-_CRT_INIT-signature.patch - $(MOVE) - -.mingw64: mingw64 - touch $@ - -.sum-winpthreads: .sum-mingw64 - touch $@ - -.winpthreads: mingw64 - $(MAKEBUILDDIR) - $(MAKECONFDIR)/mingw-w64-libraries/winpthreads/configure $(HOSTCONF) - +$(MAKEBUILD) - +$(MAKEBUILD) install - touch $@ - -.sum-winrt_headers: .sum-mingw64 - touch $@ - -MINGW_HEADERS_WINRT := \ - windows.foundation.h \ - windows.storage.h \ - windows.storage.streams.h \ - windows.system.threading.h \ - windows.foundation.collections.h \ - eventtoken.h \ - asyncinfo.h \ - windowscontracts.h - -.winrt_headers: mingw64 - install -d "$(PREFIX)/include" - install $(addprefix $ Date: Sun, 14 Feb 2016 22:07:10 +0000 -Subject: [PATCH 6/6] adapted patch 0001-shared.patch from buildroot: +Subject: [PATCH 6/7] adapted patch 0001-shared.patch from buildroot: https://git.busybox.net/buildroot/tree/package/musepack/0001-shared.patch original changelog : @@ -16,7 +16,7 @@ 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libmpcdec/CMakeLists.txt b/libmpcdec/CMakeLists.txt -index fb18968..fa9c800 100644 +index 5579d55..7ce5e94 100644 --- a/libmpcdec/CMakeLists.txt +++ b/libmpcdec/CMakeLists.txt @@ -4,7 +4,6 @@ SET(mpcdec_VERSION_PATCH 1) @@ -29,7 +29,7 @@ ${libmpc_SOURCE_DIR}/include/mpc/reader.h @@ -12,12 +11,16 @@ install(FILES ${libmpc_SOURCE_DIR}/include/mpc/mpc_types.h - DESTINATION include/mpcdec COMPONENT headers) + DESTINATION include/mpc COMPONENT headers) +include_directories(${libmpc_SOURCE_DIR}/include) if(SHARED) @@ -49,5 +49,5 @@ endif(SHARED) -- -2.37.3.windows.1 +2.45.0.windows.1 diff -Nru vlc-3.0.21/contrib/src/mpcdec/0007-only-build-libmpcdec.patch vlc-3.0.22/contrib/src/mpcdec/0007-only-build-libmpcdec.patch --- vlc-3.0.21/contrib/src/mpcdec/0007-only-build-libmpcdec.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/mpcdec/0007-only-build-libmpcdec.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,24 @@ +From 0b5a35b4a87952465717a76d5dcdadf52b930ba9 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 13 Nov 2024 14:25:36 +0100 +Subject: [PATCH 7/7] only build libmpcdec + +We don't need anything else for VLC +--- + CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50666fe..237daf1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,3 @@ if(NOT MSVC) + endif(NOT MSVC) + + add_subdirectory(libmpcdec) +-add_subdirectory(libmpcpsy) +-add_subdirectory(libmpcenc) +-add_subdirectory(libwavformat) +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/mpcdec/musepack-asinh-msvc.patch vlc-3.0.22/contrib/src/mpcdec/musepack-asinh-msvc.patch --- vlc-3.0.21/contrib/src/mpcdec/musepack-asinh-msvc.patch 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.22/contrib/src/mpcdec/musepack-asinh-msvc.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,11 +1,25 @@ ---- musepack.clean/libmpcpsy/psy_tab.c 2014-12-03 15:25:37.877616700 +0100 -+++ musepack/libmpcpsy/psy_tab.c 2014-12-03 15:20:59.300071300 +0100 -@@ -186,7 +187,7 @@ +From db238381db9763ca1a7fc066a613a087b37d87e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= +Date: Wed, 3 Dec 2014 15:47:33 +0100 +Subject: [PATCH 3/7] contribs: Fix mpcdec build with MSVC + +--- + libmpcpsy/psy_tab.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libmpcpsy/psy_tab.c b/libmpcpsy/psy_tab.c +index 35c56ac..698601c 100644 +--- a/libmpcpsy/psy_tab.c ++++ b/libmpcpsy/psy_tab.c +@@ -187,7 +187,7 @@ Ruhehoerschwelle ( PsyModel* m, } } - + -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1800 static double asinh ( double x ) { +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/mpcdec/musepack-no-binaries.patch vlc-3.0.22/contrib/src/mpcdec/musepack-no-binaries.patch --- vlc-3.0.21/contrib/src/mpcdec/musepack-no-binaries.patch 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.22/contrib/src/mpcdec/musepack-no-binaries.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,17 @@ -diff -urN musepack_src_r475.clean/CMakeLists.txt musepack_src_r475/CMakeLists.txt ---- musepack_src_r475.clean/CMakeLists.txt 2012-04-17 15:16:37.000000000 +0400 -+++ musepack_src_r475/CMakeLists.txt 2012-04-17 15:17:07.000000000 +0400 -@@ -23,11 +23,4 @@ +From 22bfcda42e120ffe18b727a53b346fb489ebd88f Mon Sep 17 00:00:00 2001 +From: Pavlov Konstantin +Date: Tue, 17 Apr 2012 13:18:34 +0200 +Subject: [PATCH 2/7] don't build binaries + +--- + CMakeLists.txt | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a6478c5..06d4363 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,11 +23,4 @@ add_subdirectory(libmpcdec) add_subdirectory(libmpcpsy) add_subdirectory(libmpcenc) add_subdirectory(libwavformat) @@ -13,3 +23,6 @@ -add_subdirectory(mpcchap) -add_subdirectory(wavcmp) add_subdirectory(include) +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/mpcdec/musepack-no-cflags-clobber.patch vlc-3.0.22/contrib/src/mpcdec/musepack-no-cflags-clobber.patch --- vlc-3.0.21/contrib/src/mpcdec/musepack-no-cflags-clobber.patch 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.22/contrib/src/mpcdec/musepack-no-cflags-clobber.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,17 @@ -diff -ru musepack.orig/CMakeLists.txt musepack/CMakeLists.txt ---- musepack.orig/CMakeLists.txt 2011-08-08 10:21:17.000000000 +0300 -+++ musepack/CMakeLists.txt 2011-08-08 10:21:03.000000000 +0300 -@@ -16,7 +16,7 @@ +From 1f177a63ae04331f07be40b6cbfda312c51ac0c8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Mon, 8 Aug 2011 17:31:04 +0200 +Subject: [PATCH 1/7] do not clobber our precious CFLAGS + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b13f78c..a6478c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,7 +16,7 @@ endif(WIN32) add_definitions(-DFAST_MATH -DCVD_FASTLOG) if(NOT MSVC) @@ -10,3 +20,6 @@ endif(NOT MSVC) add_subdirectory(libmpcdec) +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/mpcdec/rules.mak vlc-3.0.22/contrib/src/mpcdec/rules.mak --- vlc-3.0.21/contrib/src/mpcdec/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/mpcdec/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -15,37 +15,22 @@ #MUSE_REV := 481 #MUSE_SVN := http://svn.musepack.net/libmpc/trunk/ -#$(TARBALLS)/musepack_src_r$(MUSE_REV).tar.gz: -# rm -Rf musepack_src_r$(MUSE_REV) -# $(SVN) export $(MUSE_SVN) -r $(MUSE_REV) musepack_src_r$(MUSE_REV) -# tar czv musepack_src_r$(MUSE_REV) > $@ - .sum-mpcdec: musepack_src_r$(MUSE_REV).tar.gz -# $(warning $@ not implemented) -# touch $@ musepack: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec $(UNPACK) $(APPLY) $(SRC)/mpcdec/musepack-no-cflags-clobber.patch $(APPLY) $(SRC)/mpcdec/musepack-no-binaries.patch -ifdef HAVE_VISUALSTUDIO $(APPLY) $(SRC)/mpcdec/musepack-asinh-msvc.patch -endif - sed -i.orig \ - -e 's,^add_subdirectory(mpcgain),,g' \ - -e 's,^add_subdirectory(mpcchap),,g' \ - $@_src_r$(MUSE_REV)/CMakeLists.txt -ifdef HAVE_MACOSX - cd musepack_src_r$(MUSE_REV) && \ - sed -e 's%-O3 -Wall%-O3 -Wall $(CFLAGS)%' CMakeLists.txt -endif - mv $@_src_r$(MUSE_REV) $@ - touch $@ + $(APPLY) $(SRC)/mpcdec/0004-libmpcdec-added-install-and-soversion.patch + $(APPLY) $(SRC)/mpcdec/0005-If-BUILD_SHARED_LIBS-is-set-and-SHARED-undefined-the.patch + $(APPLY) $(SRC)/mpcdec/0006-adapted-patch-0001-shared.patch-from-buildroot.patch + $(APPLY) $(SRC)/mpcdec/0007-only-build-libmpcdec.patch + $(MOVE) .mpcdec: musepack toolchain.cmake - cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF . - cd $< && $(CMAKEBUILD) . --target install - mkdir -p -- "$(PREFIX)/lib" - # Use globbing to work around cmake's change of destination file - cd $< && cp libmpcdec/*mpcdec_static.* "$(PREFIX)/lib/libmpcdec.a" + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/mpg123/rules.mak vlc-3.0.22/contrib/src/mpg123/rules.mak --- vlc-3.0.21/contrib/src/mpg123/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/mpg123/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -11,7 +11,7 @@ # Same forced value as in VLC MPG123_CFLAGS += -D_FILE_OFFSET_BITS=64 -MPG123CONF = $(HOSTCONF) +MPG123CONF = MPG123CONF += --with-default-audio=dummy --enable-buffer=no --enable-modules=no --disable-network ifdef HAVE_ANDROID @@ -37,12 +37,13 @@ mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123 $(UNPACK) + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build $(APPLY) $(SRC)/mpg123/no-programs.patch $(call pkg_static,"libmpg123.pc.in") $(MOVE) .mpg123: mpg123 $(RECONF) - cd $< && $(HOSTVARS) CFLAGS="$(MPG123_CFLAGS)" ./configure $(MPG123CONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(MPG123_CFLAGS)" $(MPG123CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/mysofa/rules.mak vlc-3.0.22/contrib/src/mysofa/rules.mak --- vlc-3.0.21/contrib/src/mysofa/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/mysofa/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -23,9 +23,12 @@ $(UNPACK) $(MOVE) +MYSOFA_CONF := -DBUILD_TESTS=OFF + .mysofa: mysofa toolchain.cmake - cd $< && rm -f CMakeCache.txt - cd $< && $(HOSTVARS) $(CMAKE) -DBUILD_TESTS=OFF - cd $< && $(CMAKEBUILD) . --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(MYSOFA_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/ncurses/ncurses-win32.patch vlc-3.0.22/contrib/src/ncurses/ncurses-win32.patch --- vlc-3.0.21/contrib/src/ncurses/ncurses-win32.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/ncurses/ncurses-win32.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- ncurses/ncurses/tinfo/lib_napms.c.orig.c 2022-09-20 09:42:37.463160900 +0200 -+++ ncurses/ncurses/tinfo/lib_napms.c 2022-09-20 09:42:45.210335100 +0200 -@@ -50,6 +50,8 @@ - #if HAVE_SYS_TIME_H - #include /* needed for MacOS X DP3 */ - #endif -+#elif defined(_NC_WINDOWS) -+#include - #endif - - MODULE_ID("$Id: lib_napms.c,v 1.27 2020/08/15 19:45:23 tom Exp $") diff -Nru vlc-3.0.21/contrib/src/ncurses/rules.mak vlc-3.0.22/contrib/src/ncurses/rules.mak --- vlc-3.0.21/contrib/src/ncurses/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ncurses/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -18,6 +18,7 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz .sum-ncurses $(UNPACK) + $(UPDATE_AUTOCONFIG) $(MOVE) .ncurses: ncurses diff -Nru vlc-3.0.21/contrib/src/nettle/rules.mak vlc-3.0.22/contrib/src/nettle/rules.mak --- vlc-3.0.21/contrib/src/nettle/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/nettle/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -31,5 +31,5 @@ endif $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(NETTLE_CONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/nfs/rules.mak vlc-3.0.22/contrib/src/nfs/rules.mak --- vlc-3.0.21/contrib/src/nfs/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/nfs/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -18,8 +18,10 @@ $(UPDATE_AUTOCONFIG) $(MOVE) +NFS_CONF := --disable-examples --disable-utils --disable-werror + .nfs: nfs cd $< && ./bootstrap - cd $< && $(HOSTVARS) ./configure --disable-examples --disable-utils --disable-werror $(HOSTCONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(NFS_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/nvcodec/SHA512SUMS vlc-3.0.22/contrib/src/nvcodec/SHA512SUMS --- vlc-3.0.21/contrib/src/nvcodec/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/nvcodec/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -96e924d9cba5a8cc043fe80f78a19dc00f6fd454c3ec77f89d402ca54ecea5db3cefbebfaccee861ce1aed191aade2487647ce4ae63e8d23ba0ac144cd95bbc3 nv-codec-headers-12.0.16.0.tar.gz \ No newline at end of file diff -Nru vlc-3.0.21/contrib/src/nvcodec/rules.mak vlc-3.0.22/contrib/src/nvcodec/rules.mak --- vlc-3.0.21/contrib/src/nvcodec/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/nvcodec/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# NVCODEC_HASH := 84483da70d903239d4536763fde8c7e6c4e80784 -# NVCODEC_GITURL := $(VIDEOLAN_GIT)/ffmpeg/nv-codec-headers.git -# NVCODEC_GITURL := $(GITHUB)/FFmpeg/nv-codec-headers.git -NVCODEC_VERSION := 12.0.16.0 -NVCODEC_URL := $(GITHUB)/FFmpeg/nv-codec-headers/releases/download/n$(NVCODEC_VERSION)/nv-codec-headers-$(NVCODEC_VERSION).tar.gz - -ifndef HAVE_DARWIN_OS -PKGS += nvcodec -endif - -# $(TARBALLS)/nvcodec-$(NVCODEC_HASH).tar.xz: -# $(call download_git,$(NVCODEC_GITURL),,$(NVCODEC_HASH)) - -$(TARBALLS)/nv-codec-headers-$(NVCODEC_VERSION).tar.gz: - $(call download_pkg,$(NVCODEC_URL),nvcodec) - -.sum-nvcodec: nv-codec-headers-$(NVCODEC_VERSION).tar.gz - -nvcodec: nv-codec-headers-$(NVCODEC_VERSION).tar.gz .sum-nvcodec - $(UNPACK) - $(MOVE) - -.nvcodec: nv-codec-headers-$(NVCODEC_VERSION).tar.gz nvcodec - $(MAKE) -C nvcodec install PREFIX="$(PREFIX)" - touch $@ diff -Nru vlc-3.0.21/contrib/src/ogg/SHA512SUMS vlc-3.0.22/contrib/src/ogg/SHA512SUMS --- vlc-3.0.21/contrib/src/ogg/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ogg/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b libogg-1.3.3.tar.xz +2168548e57e23fadca4aa66351214b23d699bc3aa47f5d065f8b583a3fe85c99333014a6aa38e4021b0e3750115b88258a6c00cac1e1496cdee5f12cdc633814 libogg-1.3.6.tar.xz diff -Nru vlc-3.0.21/contrib/src/ogg/libogg-configure.patch vlc-3.0.22/contrib/src/ogg/libogg-configure.patch --- vlc-3.0.21/contrib/src/ogg/libogg-configure.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ogg/libogg-configure.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ ---- libogg-1.3.3/configure.ac 2017-11-07 15:33:00.000000000 -0500 -+++ libogg-1.3.3-new/configure.ac 2017-11-15 16:00:23.786278061 -0500 -@@ -27,17 +27,17 @@ - case $host in - *-*-irix*) - DEBUG="-g -signed" -- CFLAGS="-O2 -w -signed" -+ EXTRA_CFLAGS="-O2 -w -signed" - PROFILE="-p -g3 -O2 -signed" - ;; - sparc-sun-solaris*) - DEBUG="-v -g" -- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" -+ EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" - PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" - ;; - *) - DEBUG="-g" -- CFLAGS="-O" -+ EXTRA_CFLAGS="-O" - PROFILE="-g -p" - ;; - esac -@@ -45,27 +45,27 @@ - case $host in - *-*-linux*) - DEBUG="-g -Wall -fsigned-char" -- CFLAGS="-O20 -Wall -ffast-math -fsigned-char" -+ EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char" - PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char" - ;; - sparc-sun-*) - DEBUG="-g -Wall -fsigned-char" -- CFLAGS="-O20 -ffast-math -fsigned-char" -+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char" - PROFILE="-pg -g -O20 -fsigned-char" - ;; - *-*-darwin*) - DEBUG="-fno-common -g -Wall -fsigned-char" -- CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math" -+ EXTRA_CFLAGS="-fno-common -O3 -Wall -fsigned-char -ffast-math" - PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math" - ;; - *) - DEBUG="-g -Wall -fsigned-char" -- CFLAGS="-O20 -fsigned-char" -+ EXTRA_CFLAGS="-O20 -fsigned-char" - PROFILE="-O20 -g -pg -fsigned-char" - ;; - esac - fi --CFLAGS="$CFLAGS $cflags_save" -+CFLAGS="$EXTRA_CFLAGS $cflags_save" - DEBUG="$DEBUG $cflags_save" - PROFILE="$PROFILE $cflags_save" - diff -Nru vlc-3.0.21/contrib/src/ogg/libogg-disable-check.patch vlc-3.0.22/contrib/src/ogg/libogg-disable-check.patch --- vlc-3.0.21/contrib/src/ogg/libogg-disable-check.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ogg/libogg-disable-check.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- libogg-1.3.3/src/Makefile.am 2017-06-12 13:14:31.000000000 -0400 -+++ libogg-1.3.3-new/src/Makefile.am 2017-11-15 16:03:05.434272042 -0500 -@@ -9,7 +9,7 @@ - - # build and run the self tests on 'make check' - --noinst_PROGRAMS = test_bitwise test_framing -+noinst_PROGRAMS = - - test_bitwise_SOURCES = bitwise.c - test_bitwise_CFLAGS = -D_V_SELFTEST diff -Nru vlc-3.0.21/contrib/src/ogg/rules.mak vlc-3.0.22/contrib/src/ogg/rules.mak --- vlc-3.0.21/contrib/src/ogg/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ogg/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,9 +1,8 @@ # libogg -OGG_VERSION := 1.3.3 +OGG_VERSION := 1.3.6 -OGG_URL := http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz -#OGG_CVSROOT := :pserver:anoncvs@xiph.org:/usr/local/cvsroot +OGG_URL := $(XIPH)/ogg/libogg-$(OGG_VERSION).tar.xz PKGS += ogg ifeq ($(call need_pkg,"ogg >= 1.0"),) @@ -17,13 +16,13 @@ libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg $(UNPACK) - $(APPLY) $(SRC)/ogg/libogg-configure.patch - $(APPLY) $(SRC)/ogg/libogg-disable-check.patch - $(UPDATE_AUTOCONFIG) $(MOVE) -.ogg: libogg - $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) install +OGG_CONF := -DINSTALL_DOCS:BOOL=OFF + +.ogg: libogg toolchain.cmake + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(OGG_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/openjpeg/SHA512SUMS vlc-3.0.22/contrib/src/openjpeg/SHA512SUMS --- vlc-3.0.21/contrib/src/openjpeg/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/openjpeg/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-v2.3.0.tar.gz +08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a openjpeg-2.5.0.tar.gz diff -Nru vlc-3.0.21/contrib/src/openjpeg/install.patch vlc-3.0.22/contrib/src/openjpeg/install.patch --- vlc-3.0.21/contrib/src/openjpeg/install.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/openjpeg/install.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Mon, 9 Oct 2017 11:40:43 +0200 -Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or - static-only build lacks the installation target for the library (#1019, fixes - regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b) - ---- - src/lib/openjp2/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt -index 0b4520384..f8990ccf0 100644 ---- a/src/lib/openjp2/CMakeLists.txt -+++ b/src/lib/openjp2/CMakeLists.txt -@@ -99,6 +99,7 @@ else() - set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static) - else() - add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) -+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) - endif() - endif() - diff -Nru vlc-3.0.21/contrib/src/openjpeg/msvc.patch vlc-3.0.22/contrib/src/openjpeg/msvc.patch --- vlc-3.0.21/contrib/src/openjpeg/msvc.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/openjpeg/msvc.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- openjpeg/libopenjpeg/opj_includes.h 2012-02-07 11:49:55.000000000 +0100 -+++ /home/vlc/vlc/contrib/windowsphone/openjpeg/libopenjpeg/opj_includes.h 2014-12-15 16:54:31.303058600 +0100 -@@ -87,7 +87,7 @@ - #endif - - /* MSVC and Borland C do not have lrintf */ --#if defined(_MSC_VER) || defined(__BORLANDC__) -+#if (defined(_MSC_VER) && _MSC_VER < 1800) || defined(__BORLANDC__) - static INLINE long lrintf(float f){ - #ifdef _M_X64 - return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f)); diff -Nru vlc-3.0.21/contrib/src/openjpeg/openjp2_pthread.patch vlc-3.0.22/contrib/src/openjpeg/openjp2_pthread.patch --- vlc-3.0.21/contrib/src/openjpeg/openjp2_pthread.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/openjpeg/openjp2_pthread.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,5 +1,5 @@ ---- openjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in.ORIG 2017-10-04 18:23:14.000000000 -0400 -+++ openjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in 2017-12-05 19:05:07.578239280 -0500 +--- openjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in.ORIG 2022-09-11 18:37:05.422118714 +0200 ++++ openjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in 2022-09-11 18:37:24.669787836 +0200 @@ -10,5 +10,5 @@ URL: http://www.openjpeg.org/ Version: @OPENJPEG_VERSION@ @@ -7,9 +7,9 @@ -Libs.private: -lm +Libs.private: -lm @PTHREAD_LIBS@ Cflags: -I${includedir} ---- openjpeg/src/lib/openjp2/CMakeLists.txt.ORIG 2017-12-05 19:24:42.152312033 -0500 -+++ openjpeg/src/lib/openjp2/CMakeLists.txt 2017-12-05 19:25:35.097306981 -0500 -@@ -188,6 +188,7 @@ +--- openjpeg/src/lib/openjp2/CMakeLists.txt.ORIG 2022-09-11 18:54:26.244430934 +0200 ++++ openjpeg/src/lib/openjp2/CMakeLists.txt 2022-09-11 19:01:15.953517284 +0200 +@@ -191,6 +191,7 @@ endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) if(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) @@ -17,18 +17,18 @@ add_definitions( -DMUTEX_pthread) endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) -@@ -216,3 +216,8 @@ +@@ -219,3 +220,8 @@ target_link_libraries(test_sparse_array ${CMAKE_THREAD_LIBS_INIT}) endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) - endif(BUILD_UNIT_TESTS) + endif(BUILD_UNIT_TESTS AND UNIX) + +if(BUILD_PKGCONFIG_FILES) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libopenjp2.pc.cmake.in + ${PROJECT_BINARY_DIR}/libopenjp2.pc @ONLY) +endif(BUILD_PKGCONFIG_FILES) ---- openjpeg/CMakeLists.txt.ORIG 2017-10-04 18:23:14.000000000 -0400 -+++ openjpeg/CMakeLists.txt 2017-12-05 19:43:35.573788173 -0500 -@@ -359,8 +359,6 @@ +--- openjpeg/CMakeLists.txt.ORIG 2022-09-11 18:55:05.655765381 +0200 ++++ openjpeg/CMakeLists.txt 2022-09-11 18:55:30.279349621 +0200 +@@ -367,8 +367,6 @@ endif() if(BUILD_PKGCONFIG_FILES) # install in lib and not share (see multi-arch note above) diff -Nru vlc-3.0.21/contrib/src/openjpeg/pic.patch vlc-3.0.22/contrib/src/openjpeg/pic.patch --- vlc-3.0.21/contrib/src/openjpeg/pic.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/openjpeg/pic.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ ---- openjpeg/src/lib/openjp2/CMakeLists.txt.ORIG 2017-12-06 00:07:11.830711871 -0500 -+++ openjpeg/src/lib/openjp2/CMakeLists.txt 2017-12-06 00:11:45.359362244 -0500 -@@ -1,5 +1,7 @@ - include_regular_expression("^.*$") - -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - # - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h - DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers) diff -Nru vlc-3.0.21/contrib/src/openjpeg/rules.mak vlc-3.0.22/contrib/src/openjpeg/rules.mak --- vlc-3.0.21/contrib/src/openjpeg/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/openjpeg/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,34 +1,28 @@ # jpeg -OPENJPEG_VERSION := 2.3.0 +OPENJPEG_VERSION := 2.5.0 OPENJPEG_URL := $(GITHUB)/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz ifdef HAVE_WIN32 DEPS_openjpeg += pthreads $(DEPS_pthreads) endif -$(TARBALLS)/openjpeg-v$(OPENJPEG_VERSION).tar.gz: +$(TARBALLS)/openjpeg-$(OPENJPEG_VERSION).tar.gz: $(call download_pkg,$(OPENJPEG_URL),openjpeg) -.sum-openjpeg: openjpeg-v$(OPENJPEG_VERSION).tar.gz +.sum-openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz -openjpeg: openjpeg-v$(OPENJPEG_VERSION).tar.gz .sum-openjpeg +openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz .sum-openjpeg $(UNPACK) - mv openjpeg-$(OPENJPEG_VERSION) openjpeg-v$(OPENJPEG_VERSION) -ifdef HAVE_VISUALSTUDIO -# $(APPLY) $(SRC)/openjpeg/msvc.patch -endif -# $(APPLY) $(SRC)/openjpeg/restrict.patch - $(APPLY) $(SRC)/openjpeg/install.patch - $(APPLY) $(SRC)/openjpeg/pic.patch $(APPLY) $(SRC)/openjpeg/openjp2_pthread.patch $(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in") $(MOVE) +OPENJPEG_CONF := -DBUILD_PKGCONFIG_FILES=ON -DBUILD_CODEC:bool=OFF + .openjpeg: openjpeg toolchain.cmake - cd $< && $(HOSTVARS) $(CMAKE) \ - -DBUILD_PKGCONFIG_FILES=ON \ - -DBUILD_CODEC:bool=OFF \ - . - cd $< && $(CMAKEBUILD) . --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(OPENJPEG_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/opus/0001-meson-arm64.patch vlc-3.0.22/contrib/src/opus/0001-meson-arm64.patch --- vlc-3.0.21/contrib/src/opus/0001-meson-arm64.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/opus/0001-meson-arm64.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -From 07d1fa08b618585c7c019b7a24a221c8161cbbb5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Thu, 20 Apr 2023 19:06:13 +0100 -Subject: [PATCH] meson: fix build on arm64 - -Would fail like: - -Checking if "compiler supports ARMv7/AArch64 NEON intrinsics" : links: NO -Checking if "compiler supports ARMv7/AArch64 NEON intrinsics with -mfpu=neon" : links: YES -Checking if "compiler supports AArch64 NEON intrinsics" : links: NO -Checking if "compiler supports AArch64 NEON intrinsics with -mfpu=neon" : links: NO -Message: Compiler does not support AArch64 NEON intrinsics -../silk/meson.build:28:45: ERROR: Unknown variable "have_arm_intrinsics_or_asm". - -since commit 08088411259056f63774befb2d00951fdd5c46ba. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index ed66d380..9f28de33 100644 ---- a/meson.build -+++ b/meson.build -@@ -574,8 +574,8 @@ foreach l : lines - endforeach - - subdir('include') --subdir('silk') - subdir('celt') -+subdir('silk') - subdir('src') - - configure_file(output: 'config.h', configuration: opus_conf) --- -GitLab - diff -Nru vlc-3.0.21/contrib/src/opus/rules.mak vlc-3.0.22/contrib/src/opus/rules.mak --- vlc-3.0.21/contrib/src/opus/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/opus/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -26,5 +26,5 @@ .opus: opus cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/orc/0001-Fix-usage-of-pthread_jit_write_protect_np-on-macOS-a.patch vlc-3.0.22/contrib/src/orc/0001-Fix-usage-of-pthread_jit_write_protect_np-on-macOS-a.patch --- vlc-3.0.21/contrib/src/orc/0001-Fix-usage-of-pthread_jit_write_protect_np-on-macOS-a.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/orc/0001-Fix-usage-of-pthread_jit_write_protect_np-on-macOS-a.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,129 @@ +From 4d0144a9cc4efa195ae3e7f6b99b2daa9ad47b54 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan +Date: Fri, 3 Feb 2023 17:27:48 +0530 +Subject: [PATCH] Fix usage of pthread_jit_write_protect_np() on macOS and iOS + +The API is not available on iOS at all, and is only available on macOS +starting from macOS 11, as can be seen in `pthread/pthread.h` in the +Xcode SDK: + +``` +__API_AVAILABLE(macos(11.0)) +__API_UNAVAILABLE(ios, tvos, watchos, driverkit) +void pthread_jit_write_protect_np(int enabled); + +__API_AVAILABLE(macos(11.0)) +__API_UNAVAILABLE(ios, tvos, watchos, driverkit) +int pthread_jit_write_protect_supported_np(void); +``` + +The configuration check for this is actually wrong. We should detect +availability of the API at compile time and use it conditionally at +runtime. The code now checks the following cases: + +1. Are we building for macOS? +2. Do we have a new-enough SDK that defines MAC_OS_VERSION_11_0 and + hence has pthread_jit_write_* available? +3. Is the maximum macOS version allowed at least macOS 11.0, so we + have a possibility of using this API at runtime? +4. Are we running on macOS 11.0 or newer? + +Also: we need to ensure that pthread_jit_write_protect_supported_np() +actually returns true before using the API, because if you're shipping +an app, you need to set `com.apple.security.cs.allow-jit` in your app +otherwise the API won't work if you've opted in to Hardened Runtime. +See: https://developer.apple.com/documentation/apple-silicon/porting-just-in-time-compilers-to-apple-silicon + +Fixes https://gitlab.freedesktop.org/gstreamer/orc/-/issues/44 +--- + meson.build | 8 -------- + orc/orccompiler.c | 26 ++++++++++++++++---------- + 2 files changed, 16 insertions(+), 18 deletions(-) + +diff --git a/meson.build b/meson.build +index ef636d0..b1901d3 100644 +--- a/meson.build ++++ b/meson.build +@@ -130,14 +130,6 @@ cdata.set('HAVE_MONOTONIC_CLOCK', cc.compiles(monotonic_test)) + cdata.set('HAVE_GETTIMEOFDAY', cc.has_function('gettimeofday')) + cdata.set('HAVE_POSIX_MEMALIGN', cc.has_function('posix_memalign', prefix : '#include ')) + cdata.set('HAVE_MMAP', cc.has_function('mmap')) +- +-# pthread_jit_write_protect_np() is available but unusable on iOS simulator +-if host_os == 'ios' and cpu_family == 'x86_64' +- cdata.set('HAVE_PTHREAD_JIT', false) +-else +- cdata.set('HAVE_PTHREAD_JIT', cc.has_function('pthread_jit_write_protect_np')) +-endif +- + cdata.set('HAVE_SYS_TIME_H', cc.has_header('sys/time.h')) + cdata.set('HAVE_UNISTD_H', cc.has_header('unistd.h')) + cdata.set('HAVE_VALGRIND_VALGRIND_H', cc.has_header('valgrind/valgrind.h')) +diff --git a/orc/orccompiler.c b/orc/orccompiler.c +index a391e86..19bec9e 100644 +--- a/orc/orccompiler.c ++++ b/orc/orccompiler.c +@@ -6,7 +6,7 @@ + #include + #include + +-#if defined(HAVE_PTHREAD_JIT) ++#ifdef __APPLE__ + #include + #endif + +@@ -64,6 +64,17 @@ int _orc_compiler_flag_randomize; + /* For Windows */ + int _orc_codemem_alignment; + ++#if defined(MAC_OS_VERSION_11_0) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0 ++G_ALWAYS_INLINE ++static void ++orc_pthread_jit_write_protect_np (int protect) ++{ ++ if (__builtin_available (macOS 10.11, *)) ++ if (pthread_jit_write_protect_supported_np ()) ++ pthread_jit_write_protect_np (protect); ++} ++#endif ++ + void + _orc_compiler_init (void) + { +@@ -126,11 +137,6 @@ _orc_compiler_init (void) + } + } + #endif +- +-#if defined(HAVE_PTHREAD_JIT) +- ORC_INFO("pthread_jit_write_protect_supported_np() = %i", +- pthread_jit_write_protect_supported_np()); +-#endif + } + + int +@@ -456,8 +462,8 @@ orc_program_compile_full (OrcProgram *program, OrcTarget *target, + program->orccode->code_size = compiler->codeptr - compiler->code; + orc_code_allocate_codemem (program->orccode, program->orccode->code_size); + +-#if defined(HAVE_PTHREAD_JIT) +- pthread_jit_write_protect_np(0); ++#if defined(MAC_OS_VERSION_11_0) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0 ++ orc_pthread_jit_write_protect_np (0); + #endif + #if defined(HAVE_CODEMEM_VIRTUALALLOC) + /* Ensure that code region is writable before memcpy */ +@@ -475,8 +481,8 @@ orc_program_compile_full (OrcProgram *program, OrcTarget *target, + compiler->target->flush_cache (program->orccode); + } + +-#if defined(HAVE_PTHREAD_JIT) +- pthread_jit_write_protect_np(1); ++#if defined(MAC_OS_VERSION_11_0) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0 ++ orc_pthread_jit_write_protect_np (1); + #endif + #if defined(HAVE_CODEMEM_VIRTUALALLOC) + /* Code region is now ready for execution */ +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/orc/SHA512SUMS vlc-3.0.22/contrib/src/orc/SHA512SUMS --- vlc-3.0.21/contrib/src/orc/SHA512SUMS 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.22/contrib/src/orc/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -75f06d603f71077daa952533b33597fb2bce573647ed75496d55e436485b3c58cd6a43865e931c4def32217b0969bb4c07ef222845c28e9e711bfba80d0d9a21 orc-0.4.18.tar.gz +e8981908f37a77a2638c3461622a8e5ed8b583a3067c525de0737eb951a57d8a6f22f8930c31e0c16dae5bc94f98a79c1aba976b35e58f5d59b33d5a1d721e68 orc-0.4.33.tar.bz2 diff -Nru vlc-3.0.21/contrib/src/orc/rules.mak vlc-3.0.22/contrib/src/orc/rules.mak --- vlc-3.0.21/contrib/src/orc/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/orc/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,24 +1,31 @@ # orc -ORC_VERSION := 0.4.18 -ORC_URL := $(CONTRIB_VIDEOLAN)/orc/orc-$(ORC_VERSION).tar.gz +ORC_VERSION := 0.4.33 +ORC_URL := https://gitlab.freedesktop.org/gstreamer/orc/-/archive/$(ORC_VERSION)/orc-$(ORC_VERSION).tar.bz2 ifeq ($(call need_pkg,"orc-0.4"),) PKGS_FOUND += orc endif -$(TARBALLS)/orc-$(ORC_VERSION).tar.gz: +$(TARBALLS)/orc-$(ORC_VERSION).tar.bz2: $(call download_pkg,$(ORC_URL),orc) -.sum-orc: orc-$(ORC_VERSION).tar.gz +.sum-orc: orc-$(ORC_VERSION).tar.bz2 -orc: orc-$(ORC_VERSION).tar.gz .sum-orc +orc: orc-$(ORC_VERSION).tar.bz2 .sum-orc $(UNPACK) - $(APPLY) $(SRC)/orc/use-proper-func-detection.patch $(UPDATE_AUTOCONFIG) + $(APPLY) $(SRC)/orc/0001-Fix-usage-of-pthread_jit_write_protect_np-on-macOS-a.patch + + # replace FORMAT_MESSAGE_ALLOCATE_BUFFER which may not be available in older mingw-w64 UWP + sed -i.orig -e s/FORMAT_MESSAGE_ALLOCATE_BUFFER/0x00000100/g $(UNPACK_DIR)/orc/orccompiler.c + $(MOVE) +ORC_CONF := -Dauto_features=disabled + .orc: orc - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) install + $(MESONCLEAN) + $(MESON) $(ORC_CONF) + +$(MESONBUILD) touch $@ diff -Nru vlc-3.0.21/contrib/src/orc/use-proper-func-detection.patch vlc-3.0.22/contrib/src/orc/use-proper-func-detection.patch --- vlc-3.0.21/contrib/src/orc/use-proper-func-detection.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/orc/use-proper-func-detection.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ ---- orc/configure.ac.orig 2016-06-20 13:07:27.584543779 +0000 -+++ orc/configure.ac 2016-06-20 13:14:21.920651349 +0000 -@@ -90,20 +90,7 @@ - AS_COMPILER_FLAG(-Werror, ERROR_CFLAGS="-Werror") - fi - --case "${host_os}" in -- nobody_is_using_this_currently) -- AC_DEFINE(HAVE_CODEMEM_MALLOC, 1, [Use malloc to allocate code for execution]) -- ;; -- mingw*|pw32*|cygwin*) -- AC_DEFINE(HAVE_CODEMEM_VIRTUALALLOC, 1, [Use VirtualAlloc to allocate code for execution]) -- ;; -- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*) -- AC_DEFINE(HAVE_CODEMEM_MMAP, 1, [Use mmap to allocate code for execution]) -- ;; -- *) -- AC_ERROR([no code allocation backend]) -- ;; --esac -+AC_CHECK_FUNCS([VirtualAlloc mmap]) - - case "${host_os}" in - mingw*|pw32*|cygwin*) ---- orc/orc/orccodemem.c.orig 2016-06-20 16:43:22.126619599 +0200 -+++ orc/orc/orccodemem.c 2016-06-20 16:45:03.370771546 +0200 -@@ -11,10 +11,10 @@ - #include - #include - #include --#ifdef HAVE_CODEMEM_MMAP -+#ifdef HAVE_MMAP - #include - #endif --#ifdef HAVE_CODEMEM_VIRTUALALLOC -+#ifdef HAVE_VIRTUALALLOC - #include - #endif - -@@ -190,7 +190,7 @@ - } - } - --#ifdef HAVE_CODEMEM_MMAP -+#ifdef HAVE_MMAP - int - orc_code_region_allocate_codemem_dual_map (OrcCodeRegion *region, - const char *dir, int force_unlink) -@@ -285,9 +285,7 @@ - "and $TMPDIR and $HOME are mounted noexec (bad)."); - } - --#endif -- --#ifdef HAVE_CODEMEM_VIRTUALALLOC -+#elif defined(HAVE_VIRTUALALLOC) - void - orc_code_region_allocate_codemem (OrcCodeRegion *region) - { -@@ -295,9 +293,7 @@ - region->exec_ptr = region->write_ptr; - region->size = SIZE; - } --#endif -- --#ifdef HAVE_CODEMEM_MALLOC -+#else - void - orc_code_region_allocate_codemem (OrcCodeRegion *region) - { diff -Nru vlc-3.0.21/contrib/src/pkg-rewrite-absolute.py vlc-3.0.22/contrib/src/pkg-rewrite-absolute.py --- vlc-3.0.21/contrib/src/pkg-rewrite-absolute.py 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/pkg-rewrite-absolute.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -#!/usr/bin/env python3 -import os, sys, argparse -from collections import OrderedDict - -class PkgConfigFile(): - """Representation of a pkg-config file (.pc)""" - - pc_variables = OrderedDict() - pc_variables_expanded = OrderedDict() - - pc_keywords = OrderedDict() - - def __init__(self, file): - for line in file: - self.parse_pc_line(line) - - def parse_pc_line(self, line): - for i, c in enumerate(line): - if c == '=': - # This is a pkg-config variable line - key = line[:i].strip() - val = line[(i + 1):].strip() - - # Add unexpanded version of variable - self.pc_variables.update({ key : val }) - - # Add expanded version of variable - self.pc_variables_expanded.update({ key : self.expand_pc_vars(val) }) - break - elif c == ':': - # This is a pkg-config keyword line - key = line[:i].strip() - val = line[(i + 1):].strip() - - self.pc_keywords.update({ key : val }) - break - - def expand_pc_vars(self, line): - for key, val in self.pc_variables_expanded.items(): - line = line.replace('${' + key + '}', val) - return line - - def get_variable(self, key, expand=True): - if expand: - return self.pc_variables_expanded.get(key, None) - else: - return self.pc_variables.get(key, None) - - def get_keyword(self, key, expand=True): - keyword = self.pc_keywords.get(key, None) - if expand and keyword != None: - return self.expand_pc_vars(keyword) - else: - return keyword - - def set_keyword(self, key, value): - self.pc_keywords.update({ key : value }) - - def write(self, file): - pc_contents = '' - # Print variables - for key, val in self.pc_variables.items(): - pc_contents += key + '=' + val + '\n' - pc_contents += '\n' - # Print keywords - for key, val in self.pc_keywords.items(): - pc_contents += key + ': ' + val + '\n' - - file.write(pc_contents) - -def remove_str_fix(text, prefix, suffix): - start = len(prefix) if text.startswith(prefix) else 0 - end_offset = len(suffix) if text.endswith(suffix) else 0 - end = len(text) - end_offset - return text[start:end] - -def rewrite_abs_to_rel(pc_file): - linker_args = pc_file.get_keyword('Libs', expand=False) - if linker_args is None: - raise KeyError('No "Libs" keyword in input .pc file found!') - linker_args_list = linker_args.split() - - # Replace absolute library paths with relative ones - # i.e. /foo/bar/baz.a to -L/foo/bar -lbaz - lib_paths = [] - out_args = [] - for arg in linker_args_list: - if arg.startswith('-L'): - path = arg[2:] - path = pc_file.expand_pc_vars(path) - lib_paths.append(path) - - # Filter all absolute static library paths - if arg.startswith('/') and arg.endswith('.a'): - lib_path = os.path.dirname(arg) - lib_filename = os.path.basename(arg) - # Remove lib prefix and .a suffix - lib_name = remove_str_fix(lib_filename, 'lib', '.a') - if lib_path not in lib_paths: - out_args.append('-L' + lib_path) - lib_paths.append(lib_path) - out_args.append('-l' + lib_name) - else: - out_args.append(arg) - - linker_args = ' '.join(out_args) - pc_file.set_keyword('Libs', linker_args) - -# Main function -# Do argument parsing and other stuff needed -# for CLI usage here. -def main(): - if not sys.version_info >= (3, 4): - print("Python version 3.4 or higher required!", file=sys.stderr) - exit(1) - - # Create main parser - parser = argparse.ArgumentParser() - parser.add_argument('-i', '--input', required=True) - parser.add_argument('-o', '--output') - - args = parser.parse_args() - - # Default to input file (in-place editing) if no output file is given - args.output = args.output or args.input - - # Read .pc from input file - input_file = sys.stdin if args.input == '-' else open(args.input, 'r') - pc_file = PkgConfigFile(input_file) - if input_file is not sys.stdin: - input_file.close() - - rewrite_abs_to_rel(pc_file) - - # Write output - output_file = sys.stdout if args.output == '-' else open(args.output, 'w') - pc_file.write(output_file) - if output_file is not sys.stdout: - output_file.close() - - return 0 - -if __name__ == "__main__": - exit(main()) diff -Nru vlc-3.0.21/contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch vlc-3.0.22/contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch --- vlc-3.0.21/contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch 2025-11-13 22:17:54.000000000 +0000 @@ -6,13 +6,13 @@ If the CMake flags have some include directory with an old pnglibconf.h it will use that one instead of ours --- - scripts/genout.cmake.in | 2 +- + scripts/cmake/genout.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/scripts/genout.cmake.in b/scripts/genout.cmake.in +diff --git a/scripts/cmake/genout.cmake.in b/scripts/cmake/genout.cmake.in index ec685d900..f6d478723 100644 ---- a/scripts/genout.cmake.in -+++ b/scripts/genout.cmake.in +--- a/scripts/cmake/genout.cmake.in ++++ b/scripts/cmake/genout.cmake.in @@ -59,11 +59,11 @@ if ("${INPUTEXT}" STREQUAL ".c" AND "${OUTPUTEXT}" STREQUAL ".out") endif() diff -Nru vlc-3.0.21/contrib/src/png/SHA512SUMS vlc-3.0.22/contrib/src/png/SHA512SUMS --- vlc-3.0.21/contrib/src/png/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/png/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074 libpng-1.6.37.tar.xz +05adc94ef532bbddaae46e087088a23236e6528fd3fc705c8edfb5ff293983b790d4361d6b20c20df73632a9fbe55d2f394296385cd8efd646f58393ff21257d libpng-1.6.50.tar.xz diff -Nru vlc-3.0.21/contrib/src/png/automake.patch vlc-3.0.22/contrib/src/png/automake.patch --- vlc-3.0.21/contrib/src/png/automake.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/png/automake.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- libpng-1.6.8/configure.ac.orig 2014-02-08 15:42:46.399091835 +0100 -+++ libpng-1.6.8/configure.ac 2014-02-08 15:47:42.684534041 +0100 -@@ -27,7 +27,7 @@ - # dist-xz requires automake 1.11 or later - # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1 - # 1.13 is required for parallel tests --AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects]) -+AM_INIT_AUTOMAKE([1.11 foreign dist-xz color-tests silent-rules subdir-objects]) - # The following line causes --disable-maintainer-mode to be the default to - # configure, this is necessary because libpng distributions cannot rely on the - # time stamps of the autotools generated files being correct diff -Nru vlc-3.0.21/contrib/src/png/bins.patch vlc-3.0.22/contrib/src/png/bins.patch --- vlc-3.0.21/contrib/src/png/bins.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/png/bins.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ ---- libpng-1.6.29/Makefile.am.orig 2017-04-08 12:12:49.688261183 +0200 -+++ libpng-1.6.29/Makefile.am 2017-04-08 12:13:27.148259514 +0200 -@@ -12,13 +12,13 @@ - ACLOCAL_AMFLAGS = -I scripts - - # test programs - run on make check, make distcheck --check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage pngcp -+check_PROGRAMS= - if HAVE_CLOCK_GETTIME - check_PROGRAMS += timepng - endif - - # Utilities - installed --bin_PROGRAMS= pngfix png-fix-itxt -+bin_PROGRAMS= - - # This ensures that pnglibconf.h gets built at the start of 'make all' or - # 'make check', but it does not add dependencies to the individual programs, diff -Nru vlc-3.0.21/contrib/src/png/rules.mak vlc-3.0.22/contrib/src/png/rules.mak --- vlc-3.0.21/contrib/src/png/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/png/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,5 +1,5 @@ # PNG -PNG_VERSION := 1.6.37 +PNG_VERSION := 1.6.50 PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz PKGS += png @@ -14,16 +14,43 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png $(UNPACK) - $(APPLY) $(SRC)/png/winrt.patch - $(APPLY) $(SRC)/png/bins.patch - $(APPLY) $(SRC)/png/automake.patch + $(APPLY) $(SRC)/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch $(call pkg_static,"libpng.pc.in") $(MOVE) DEPS_png = zlib $(DEPS_zlib) -.png: png - $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) install +PNG_CONF := -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_EXECUTABLES=OFF + +ifdef HAVE_CLANG +ifneq ($(filter arm aarch64, $(ARCH)),) +# TODO this might be set globally and for all targets where intrinsincs are used +PNG_CONF += -DCMAKE_ASM_FLAGS="$(CFLAGS)" +endif +endif + +PNG_CONF += -DPNG_DEBUG_POSTFIX:STRING= + +ifeq ($(ARCH),arm) +ifdef HAVE_IOS +# otherwise detection fails +PNG_CONF += -DPNG_ARM_NEON=on +else ifdef HAVE_WIN32 +# No runtime detection needed +PNG_CONF += -DPNG_ARM_NEON=on +else ifdef HAVE_ANDROID +# libpng disallows "check" for ARM here as it would be redundant/"unproductive", +# see https://github.com/glennrp/libpng/commit/b8ca9108acddfb9fb5d886f5e8a072ebaf436dbb +PNG_CONF += -DPNG_ARM_NEON=on +else +# Otherwise do runtime detection +PNG_CONF += -DPNG_ARM_NEON=check +endif +endif + +.png: png toolchain.cmake + $(CMAKECLEAN) + $(HOSTVARS_PIC) $(CMAKE) $(PNG_CONF) + +$(CMAKEBUILD) + +$(CMAKEBUILD) --target install touch $@ diff -Nru vlc-3.0.21/contrib/src/png/winrt.patch vlc-3.0.22/contrib/src/png/winrt.patch --- vlc-3.0.21/contrib/src/png/winrt.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/png/winrt.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ ---- png/pngpriv.h.orig 2013-05-09 15:17:34.933583625 +0200 -+++ png/pngpriv.h 2013-05-09 15:18:33.981581142 +0200 -@@ -360,11 +360,7 @@ - - /* Memory model/platform independent fns */ - #ifndef PNG_ABORT --# ifdef _WINDOWS_ --# define PNG_ABORT() ExitProcess(0) --# else - # define PNG_ABORT() abort() --# endif - #endif - - #ifdef USE_FAR_KEYWORD diff -Nru vlc-3.0.21/contrib/src/postproc/rules.mak vlc-3.0.22/contrib/src/postproc/rules.mak --- vlc-3.0.21/contrib/src/postproc/rules.mak 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/postproc/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,137 +0,0 @@ -# POSTPROC - -POSTPROC_URL := http://git.videolan.org/git/libpostproc.git -POSTPROC_HASH := 3b7053f46dbfe4662063345245cb00b6acbbe969 -POSTPROC_VERSION := $(POSTPROC_HASH) - -POSTPROCCONF = \ - --cc="$(CC)" \ - --disable-debug \ - --enable-gpl \ - --enable-postproc - -DEPS_postproc = ffmpeg - -ifdef ENABLE_SMALL -POSTPROCCONF += --enable-small -endif -ifdef HAVE_ARMV7A -POSTPROCCONF += --enable-thumb -endif - -ifdef HAVE_CROSS_COMPILE -POSTPROCCONF += --enable-cross-compile -ifndef HAVE_DARWIN_OS -POSTPROCCONF += --cross-prefix=$(HOST)- -endif -endif - -# ARM stuff -ifeq ($(ARCH),arm) -POSTPROCCONF += --disable-runtime-cpudetect --arch=arm -ifdef HAVE_ARMV7A -POSTPROCCONF += --cpu=cortex-a8 -endif -ifdef HAVE_NEON -POSTPROCCONF += --enable-neon -endif -endif - -# ARM64 stuff -ifeq ($(ARCH),aarch64) -POSTPROCCONF += --arch=aarch64 -endif - -# MIPS stuff -ifeq ($(ARCH),mipsel) -POSTPROCCONF += --arch=mips -endif -ifeq ($(ARCH),mips64el) -POSTPROCCONF += --arch=mips64 -endif - -# RISC-V stuff -ifneq ($(findstring $(ARCH),riscv32 riscv64),) -POSTPROCCONF += --arch=riscv -endif - -# x86 stuff -ifeq ($(ARCH),i386) -POSTPROCCONF += --arch=x86 -endif - -# x86_64 stuff -ifeq ($(ARCH),x86_64) -POSTPROCCONF += --arch=x64_64 -endif - -# Darwin -ifdef HAVE_DARWIN_OS -POSTPROCCONF += --arch=$(ARCH) --target-os=darwin -endif -ifeq ($(ARCH),x86_64) -POSTPROCCONF += --cpu=core2 -endif -ifdef HAVE_IOS -ifeq ($(ARCH),arm) -POSTPROCCONF += --as="$(AS)" -endif -endif - -# Linux -ifdef HAVE_LINUX -POSTPROCCONF += --target-os=linux --enable-pic -endif - -ifdef HAVE_ANDROID -ifeq ($(ANDROID_ABI), x86) -POSTPROCCONF += --disable-mmx --disable-mmxext -endif -endif - -# Windows -ifdef HAVE_WIN32 -POSTPROCCONF += --target-os=mingw32 -ifeq ($(ARCH),x86_64) -POSTPROCCONF += --cpu=athlon64 --arch=x86_64 -endif -ifeq ($(ARCH),i386) -POSTPROCCONF+= --cpu=i686 --arch=x86 -endif -else -POSTPROCCONF += --enable-pthreads -endif - -ifdef HAVE_SOLARIS -POSTPROCCONF += --enable-pic -endif - -# Build - -ifdef GPL -PKGS += postproc -endif -ifeq ($(call need_pkg,"libpostproc"),) -PKGS_FOUND += postproc -endif - -$(TARBALLS)/postproc-$(POSTPROC_VERSION).tar.xz: - $(call download_git,$(POSTPROC_URL),,$(POSTPROC_HASH)) - -.sum-postproc: $(TARBALLS)/postproc-$(POSTPROC_VERSION).tar.xz - $(call check_githash,$(POSTPROC_HASH)) - touch $@ - -postproc: postproc-$(POSTPROC_VERSION).tar.xz .sum-postproc - $(UNPACK) - $(APPLY) $(SRC)/postproc/win-pic.patch - $(MOVE) - -.postproc: postproc - $(REQUIRE_GPL) - cd $< && $(HOSTVARS) ./configure \ - --extra-cflags="$(EXTRA_CFLAGS)" \ - --extra-ldflags="$(LDFLAGS)" $(POSTPROCCONF) \ - --prefix="$(PREFIX)" --enable-static --disable-shared - cd $< && $(MAKE) install-libs install-headers - touch $@ diff -Nru vlc-3.0.21/contrib/src/postproc/win-pic.patch vlc-3.0.22/contrib/src/postproc/win-pic.patch --- vlc-3.0.21/contrib/src/postproc/win-pic.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/postproc/win-pic.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -diff -urN postproc-orig/configure postproc/configure ---- postproc-orig/configure 2012-08-21 23:27:39.000000000 +0300 -+++ postproc/configure 2018-02-26 10:36:48.956225615 +0200 -@@ -2419,8 +2419,14 @@ - enable_pic() { - enable pic - add_cppflags -DPIC -- add_cflags -fPIC -- add_asflags -fPIC -+ case "$target_os" in -+ mingw*|cygwin*|win*) -+ ;; -+ *) -+ add_cflags -fPIC -+ add_asflags -fPIC -+ ;; -+ esac - } - - enabled pic && enable_pic diff -Nru vlc-3.0.21/contrib/src/projectM/rules.mak vlc-3.0.22/contrib/src/projectM/rules.mak --- vlc-3.0.21/contrib/src/projectM/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/projectM/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -13,6 +13,8 @@ PKGS_FOUND += projectM endif +DEPS_projectM = glew $(DEPS_glew) + $(TARBALLS)/projectM-$(PROJECTM_VERSION)-Source.tar.gz: $(call download_pkg,$(PROJECTM_URL),projectM) @@ -29,20 +31,18 @@ $(APPLY) $(SRC)/projectM/gcc6.patch $(APPLY) $(SRC)/projectM/clang6.patch $(APPLY) $(SRC)/projectM/missing-includes.patch + $(APPLY) $(SRC)/projectM/projectm-cmake-install.patch $(MOVE) -DEPS_projectM = glew $(DEPS_glew) - -.projectM: projectM toolchain.cmake - cd $< && rm -f CMakeCache.txt - cd $< && $(HOSTVARS) $(CMAKE) \ +PROJECTM_CONF := \ -DCMAKE_CXX_STANDARD=98 \ - -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF \ -DDISABLE_NATIVE_PRESETS:BOOL=ON \ -DUSE_FTGL:BOOL=OFF \ - -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF \ - -DINCLUDE-PROJECTM-QT:BOOL=OFF \ - -DBUILD_PROJECTM_STATIC:BOOL=ON . - cd $< && $(CMAKEBUILD) . --target install - -cd $<; cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib + -DBUILD_PROJECTM_STATIC:BOOL=ON + +.projectM: projectM toolchain.cmake + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(PROJECTM_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/protobuf/protobuf-no-mingw-pthread.patch vlc-3.0.22/contrib/src/protobuf/protobuf-no-mingw-pthread.patch --- vlc-3.0.21/contrib/src/protobuf/protobuf-no-mingw-pthread.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/protobuf/protobuf-no-mingw-pthread.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ ---- protobuf/m4/acx_pthread.m4.orig 2022-02-23 11:15:51.818483000 +0100 -+++ protobuf/m4/acx_pthread.m4 2022-02-23 11:16:06.148340600 +0100 -@@ -134,6 +134,10 @@ case "${host_cpu}-${host_os}" in - - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" - ;; -+ *mingw*) -+ # Do not use pthread, fallback to the win32 threading API -+ acx_pthread_flags="" -+ ;; - esac - - if test x"$acx_pthread_ok" = xno; then diff -Nru vlc-3.0.21/contrib/src/protobuf/rules.mak vlc-3.0.22/contrib/src/protobuf/rules.mak --- vlc-3.0.21/contrib/src/protobuf/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/protobuf/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -17,6 +17,8 @@ DEPS_protobuf += pthreads $(DEPS_pthreads) endif +PROTOBUFVARS := DIST_LANG="cpp" + protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf $(UNPACK) mv protobuf-$(PROTOBUF_VERSION) protobuf-$(PROTOBUF_VERSION)-cpp @@ -26,6 +28,6 @@ .protobuf: protobuf $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc="$(PROTOC)" - cd $< && $(MAKE) && $(MAKE) install + cd $< && $(HOSTVARS) $(PROTOBUFVARS) ./configure $(HOSTCONF) --with-protoc="$(PROTOC)" + $(MAKE) -C $< && $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/pthread-stubs/SHA512SUMS vlc-3.0.22/contrib/src/pthread-stubs/SHA512SUMS --- vlc-3.0.21/contrib/src/pthread-stubs/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthread-stubs/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954 libpthread-stubs-0.4.tar.bz2 diff -Nru vlc-3.0.21/contrib/src/pthread-stubs/rules.mak vlc-3.0.22/contrib/src/pthread-stubs/rules.mak --- vlc-3.0.21/contrib/src/pthread-stubs/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthread-stubs/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -PTHREAD_STUBS_VERSION := 0.4 -PTHREAD_STUBS_URL := https://xcb.freedesktop.org/dist/libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2 - -$(TARBALLS)/libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2: - $(call download_pkg,$(PTHREAD_STUBS_URL),pthreads) - -.sum-pthread-stubs: libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2 - -libpthread-stubs: libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2 .sum-pthread-stubs - $(UNPACK) - $(call pkg_static,"pthread-stubs.pc.in") - $(MOVE) - -.pthread-stubs: libpthread-stubs - $(MAKEBUILDDIR) - $(MAKECONFIGURE) - +$(MAKEBUILD) - +$(MAKEBUILD) install - touch $@ diff -Nru vlc-3.0.21/contrib/src/pthreads/0001-add-api-ms-core-registry-def-files.patch vlc-3.0.22/contrib/src/pthreads/0001-add-api-ms-core-registry-def-files.patch --- vlc-3.0.21/contrib/src/pthreads/0001-add-api-ms-core-registry-def-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/0001-add-api-ms-core-registry-def-files.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,164 @@ +From bc8986696605c29c8ef54f9c448ab889c2195d93 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Tue, 30 May 2023 16:54:31 +0200 +Subject: [PATCH] add api-ms-core-registry-* def files + +These are needed to enable the registry API calls available in UWP. +--- + mingw-w64-crt/Makefile.in | 4 ++ + .../api-ms-win-core-registry-l1-1-0.def | 47 +++++++++++++++++++ + .../api-ms-win-core-registry-l2-1-0.def | 37 +++++++++++++++ + mingw-w64-crt/lib-common/mincore.mri | 3 +- + mingw-w64-crt/lib-common/windowsapp.mri | 2 + + 5 files changed, 92 insertions(+), 1 deletion(-) + create mode 100644 mingw-w64-crt/lib-common/api-ms-win-core-registry-l1-1-0.def + create mode 100644 mingw-w64-crt/lib-common/api-ms-win-core-registry-l2-1-0.def + +diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am +index a4a1ed922..6087f050e 100644 +--- a/mingw-w64-crt/Makefile.in ++++ b/mingw-w64-crt/Makefile.in +@@ -2104,6 +2104,8 @@ endif + %/libapi-ms-win-core-realtime-l1-1-0.a \ + %/libapi-ms-win-core-realtime-l1-1-1.a \ + %/libapi-ms-win-core-realtime-l1-1-2.a \ ++ %/libapi-ms-win-core-registry-l1-1-0.a \ ++ %/libapi-ms-win-core-registry-l2-1-0.a \ + %/libapi-ms-win-core-rtlsupport-l1-2-0.a \ + %/libapi-ms-win-core-string-l1-1-0.a \ + %/libapi-ms-win-core-synch-l1-1-0.a \ +@@ -2237,6 +2239,8 @@ endif + %/libapi-ms-win-core-profile-l1-1-0.a \ + %/libapi-ms-win-core-realtime-l1-1-0.a \ + %/libapi-ms-win-core-realtime-l1-1-1.a \ ++ %/libapi-ms-win-core-registry-l1-1-0.a \ ++ %/libapi-ms-win-core-registry-l2-1-0.a \ + %/libapi-ms-win-core-rtlsupport-l1-2-0.a \ + %/libapi-ms-win-core-string-l1-1-0.a \ + %/libapi-ms-win-core-synch-ansi-l1-1-0.a \ +diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-registry-l1-1-0.def b/mingw-w64-crt/lib-common/api-ms-win-core-registry-l1-1-0.def +new file mode 100644 +index 000000000..5cb72046b +--- /dev/null ++++ b/mingw-w64-crt/lib-common/api-ms-win-core-registry-l1-1-0.def +@@ -0,0 +1,47 @@ ++LIBRARY api-ms-win-core-registry-l1-1-0 ++ ++EXPORTS ++ ++RegCloseKey ++RegCopyTreeW ++RegCreateKeyExA ++RegCreateKeyExW ++RegDeleteKeyExA ++RegDeleteKeyExW ++RegDeleteTreeA ++RegDeleteTreeW ++RegDeleteValueA ++RegDeleteValueW ++RegDisablePredefinedCacheEx ++RegEnumKeyExA ++RegEnumKeyExW ++RegEnumValueA ++RegEnumValueW ++RegFlushKey ++RegGetKeySecurity ++RegGetValueA ++RegGetValueW ++RegLoadAppKeyA ++RegLoadAppKeyW ++RegLoadKeyA ++RegLoadKeyW ++RegLoadMUIStringA ++RegLoadMUIStringW ++RegNotifyChangeKeyValue ++RegOpenCurrentUser ++RegOpenKeyExA ++RegOpenKeyExW ++RegOpenUserClassesRoot ++RegQueryInfoKeyA ++RegQueryInfoKeyW ++RegQueryValueExA ++RegQueryValueExW ++RegRestoreKeyA ++RegRestoreKeyW ++RegSaveKeyExA ++RegSaveKeyExW ++RegSetKeySecurity ++RegSetValueExA ++RegSetValueExW ++RegUnLoadKeyA ++RegUnLoadKeyW +diff --git a/mingw-w64-crt/lib-common/api-ms-win-core-registry-l2-1-0.def b/mingw-w64-crt/lib-common/api-ms-win-core-registry-l2-1-0.def +new file mode 100644 +index 000000000..3e05bbf74 +--- /dev/null ++++ b/mingw-w64-crt/lib-common/api-ms-win-core-registry-l2-1-0.def +@@ -0,0 +1,37 @@ ++LIBRARY api-ms-win-core-registry-l2-1-0 ++ ++EXPORTS ++ ++RegConnectRegistryA ++RegConnectRegistryW ++RegCopyTreeA ++RegCreateKeyA ++RegCreateKeyTransactedA ++RegCreateKeyTransactedW ++RegCreateKeyW ++RegDeleteKeyA ++RegDeleteKeyTransactedA ++RegDeleteKeyTransactedW ++RegDeleteKeyValueA ++RegDeleteKeyValueW ++RegDeleteKeyW ++RegDisablePredefinedCache ++RegEnumKeyA ++RegEnumKeyW ++RegOpenKeyA ++RegOpenKeyTransactedA ++RegOpenKeyTransactedW ++RegOpenKeyW ++RegOverridePredefKey ++RegQueryMultipleValuesA ++RegQueryMultipleValuesW ++RegQueryValueA ++RegQueryValueW ++RegReplaceKeyA ++RegReplaceKeyW ++RegSaveKeyA ++RegSaveKeyW ++RegSetKeyValueA ++RegSetKeyValueW ++RegSetValueA ++RegSetValueW +diff --git a/mingw-w64-crt/lib-common/mincore.mri b/mingw-w64-crt/lib-common/mincore.mri +index 7073eeb8d..03f4b4c37 100644 +--- a/mingw-w64-crt/lib-common/mincore.mri ++++ b/mingw-w64-crt/lib-common/mincore.mri +@@ -85,7 +85,8 @@ ADDLIB libapi-ms-win-core-psapi-ansi-l1-1-0.a + ADDLIB libapi-ms-win-core-realtime-l1-1-0.a + ADDLIB libapi-ms-win-core-realtime-l1-1-1.a + ADDLIB libapi-ms-win-core-realtime-l1-1-2.a +-; FIXME libapi-ms-win-core-registry-l1-1-0.a ++ADDLIB libapi-ms-win-core-registry-l1-1-0.a ++ADDLIB libapi-ms-win-core-registry-l2-1-0.a + ; FIXME libapi-ms-win-core-registry-l1-1-1.a + ; FIXME libapi-ms-win-core-registry-l1-1-2.a + ; FIXME libapi-ms-win-core-rtlsupport-l1-1-0.a +diff --git a/mingw-w64-crt/lib-common/windowsapp.mri b/mingw-w64-crt/lib-common/windowsapp.mri +index 8e0e3d888..2496280a5 100644 +--- a/mingw-w64-crt/lib-common/windowsapp.mri ++++ b/mingw-w64-crt/lib-common/windowsapp.mri +@@ -51,6 +51,8 @@ ADDLIB libapi-ms-win-core-psapi-ansi-l1-1-0.a + ADDLIB libapi-ms-win-core-profile-l1-1-0.a + ADDLIB libapi-ms-win-core-realtime-l1-1-0.a + ADDLIB libapi-ms-win-core-realtime-l1-1-1.a ++ADDLIB libapi-ms-win-core-registry-l1-1-0.a ++ADDLIB libapi-ms-win-core-registry-l2-1-0.a + ADDLIB libapi-ms-win-core-rtlsupport-l1-2-0.a + ADDLIB libapi-ms-win-core-string-l1-1-0.a + ADDLIB libapi-ms-win-core-synch-ansi-l1-1-0.a +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-CreateHardLinkW-in-Win10-UWP-builds.patch vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-CreateHardLinkW-in-Win10-UWP-builds.patch --- vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-CreateHardLinkW-in-Win10-UWP-builds.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-CreateHardLinkW-in-Win10-UWP-builds.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,36 @@ +From dd4f835601548529980550ddb0a66a7c8881ce9b Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 25 May 2023 09:44:35 +0200 +Subject: [PATCH] headers: enable CreateHardLinkW in Win10 UWP builds + +The documentation doesn't say it's allowed, but the WIndows SDK allow it and +the Windows App Certification as well. + +The official page for allowed API's also doesn't say it's allowed [1] +but the DLL that contains it is there. + +[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-file-l2-1-0dll +--- + mingw-w64-headers/include/winbase.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h +index 82c8b7cc3..94f5df309 100644 +--- a/mingw-w64-headers/include/winbase.h ++++ b/mingw-w64-headers/include/winbase.h +@@ -2464,9 +2464,11 @@ typedef enum FILE_FLUSH_MODE { + WINBASEAPI WINBOOL WINAPI ReplaceFileA (LPCSTR lpReplacedFileName, LPCSTR lpReplacementFileName, LPCSTR lpBackupFileName, DWORD dwReplaceFlags, LPVOID lpExclude, LPVOID lpReserved); + WINBASEAPI WINBOOL WINAPI ReplaceFileW (LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileName, LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, LPVOID lpExclude, LPVOID lpReserved); + #endif ++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 ++ WINBASEAPI WINBOOL WINAPI CreateHardLinkW (LPCWSTR lpFileName, LPCWSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes); ++#endif + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) + WINBASEAPI WINBOOL WINAPI CreateHardLinkA (LPCSTR lpFileName, LPCSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes); +- WINBASEAPI WINBOOL WINAPI CreateHardLinkW (LPCWSTR lpFileName, LPCWSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes); + + #define ReplaceFile __MINGW_NAME_AW(ReplaceFile) + #define CreateHardLink __MINGW_NAME_AW(CreateHardLink) +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch --- vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,32 @@ +From 5ce33c808919cc129fe04fa306ca64cdd9762248 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Tue, 30 May 2023 15:52:28 +0200 +Subject: [PATCH] headers: enable GET_MODULE_HANDLE_EX_xxx defines in UWP + builds + +It's available in the Windows 11 SDK for all builds targeting FAMILY_APP and more. +--- + mingw-w64-headers/include/libloaderapi.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/mingw-w64-headers/include/libloaderapi.h b/mingw-w64-headers/include/libloaderapi.h +index 26115ad9e..2705c18a4 100644 +--- a/mingw-w64-headers/include/libloaderapi.h ++++ b/mingw-w64-headers/include/libloaderapi.h +@@ -79,11 +79,13 @@ extern "C" { + #if (NTDDI_VERSION >= NTDDI_WIN10_RS2) + #define LOAD_LIBRARY_OS_INTEGRITY_CONTINUITY 0x00008000 + #endif ++#endif /* WINAPI_PARTITION_DESKTOP */ + + #define GET_MODULE_HANDLE_EX_FLAG_PIN (0x1) + #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT (0x2) + #define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS (0x4) + ++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) + #define ENUMRESLANGPROC __MINGW_NAME_AW(ENUMRESLANGPROC) + #define ENUMRESNAMEPROC __MINGW_NAME_AW(ENUMRESNAMEPROC) + #define ENUMRESTYPEPROC __MINGW_NAME_AW(ENUMRESTYPEPROC) +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch --- vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,28 @@ +From ad395a3d5a9873e4388bf34687fd3e705e384a0d Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 24 May 2023 08:39:51 +0200 +Subject: [PATCH] headers: enable GetFileInformationByHandle in Win10 UWP + builds + +Contrary to what the documentation says, it's available in the Windows SDK, +both in the headers and when linking with WindowsApp.lib. +--- + mingw-w64-headers/include/fileapi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mingw-w64-headers/include/fileapi.h b/mingw-w64-headers/include/fileapi.h +index ffbe12560..d22c62704 100644 +--- a/mingw-w64-headers/include/fileapi.h ++++ b/mingw-w64-headers/include/fileapi.h +@@ -32,7 +32,7 @@ WINBASEAPI DWORD WINAPI GetFileAttributesW (LPCWSTR lpFileName); + #define GetFileAttributes __MINGW_NAME_AW(GetFileAttributes) + WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); + #endif +-#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) ++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 + typedef struct _BY_HANDLE_FILE_INFORMATION { + DWORD dwFileAttributes; + FILETIME ftCreationTime; +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch --- vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,39 @@ +From de5009b7952c6c74511facef02c3d21855b4ee0e Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Sat, 27 May 2023 11:52:25 +0200 +Subject: [PATCH] headers: enable GetVolumePathNameW in Win10 UWP builds + +The documentation doesn't say it's allowed, but the WIndows SDK allow it and +the Windows App Certification as well. + +The official page for allowed API's also doesn't say it's allowed [1] +but the DLL that contains it is there. + +[1] https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-file-l2-1-0dll +--- + mingw-w64-headers/include/fileapi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mingw-w64-headers/include/fileapi.h b/mingw-w64-headers/include/fileapi.h +index 8ea09f6c9..e9e0c647f 100644 +--- a/mingw-w64-headers/include/fileapi.h ++++ b/mingw-w64-headers/include/fileapi.h +@@ -81,6 +81,7 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON + WINBASEAPI DWORD WINAPI GetFullPathNameA (LPCSTR lpFileName, DWORD nBufferLength, LPSTR lpBuffer, LPSTR *lpFilePart); + WINBASEAPI DWORD WINAPI GetFullPathNameW (LPCWSTR lpFileName, DWORD nBufferLength, LPWSTR lpBuffer, LPWSTR *lpFilePart); + WINBASEAPI DWORD WINAPI GetLogicalDrives (VOID); ++ WINBASEAPI WINBOOL WINAPI GetVolumePathNameW (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength); + #define FindFirstFile __MINGW_NAME_AW(FindFirstFile) + #define GetDiskFreeSpace __MINGW_NAME_AW(GetDiskFreeSpace) + #define GetDriveType __MINGW_NAME_AW(GetDriveType) +@@ -89,7 +90,6 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, PLON + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) + WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW (DWORD nBufferLength, LPWSTR lpBuffer); + WINBASEAPI DWORD WINAPI GetShortPathNameW (LPCWSTR lpszLongPath, LPWSTR lpszShortPath, DWORD cchBuffer); +- WINBASEAPI WINBOOL WINAPI GetVolumePathNameW (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength); + WINBASEAPI DWORD WINAPI QueryDosDeviceW (LPCWSTR lpDeviceName, LPWSTR lpTargetPath, DWORD ucchMax); + WINBASEAPI WINBOOL WINAPI ReadFileScatter (HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToRead, LPDWORD lpReserved, LPOVERLAPPED lpOverlapped); + WINBASEAPI WINBOOL WINAPI SetFileValidData (HANDLE hFile, LONGLONG ValidDataLength); +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch --- vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,37 @@ +From 9559b683801027a3a944b60dd4c7b49debbcb66e Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 25 May 2023 08:19:26 +0200 +Subject: [PATCH] headers: enable VirtualAlloc(Ex) in Win10 UWP builds + +It is now officially allowed [1]. + +[1] https://learn.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-virtualalloc +--- + mingw-w64-headers/include/memoryapi.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mingw-w64-headers/include/memoryapi.h b/mingw-w64-headers/include/memoryapi.h +index 0f2b4ae79..152671c18 100644 +--- a/mingw-w64-headers/include/memoryapi.h ++++ b/mingw-w64-headers/include/memoryapi.h +@@ -29,6 +29,8 @@ extern "C" { + #endif + + #if (WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) && _WIN32_WINNT >= _WIN32_WINNT_WIN10) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) ++ WINBASEAPI LPVOID WINAPI VirtualAlloc (LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); ++ WINBASEAPI LPVOID WINAPI VirtualAllocEx (HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); + WINBASEAPI WINBOOL WINAPI VirtualFree (LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType); + #endif + +@@ -78,8 +80,6 @@ extern "C" { + #define FILE_CACHE_MIN_HARD_ENABLE 0x00000004 + #define FILE_CACHE_MIN_HARD_DISABLE 0x00000008 + +- WINBASEAPI LPVOID WINAPI VirtualAlloc (LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); +- WINBASEAPI LPVOID WINAPI VirtualAllocEx (HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); + WINBASEAPI WINBOOL WINAPI VirtualProtectEx (HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD flNewProtect, PDWORD lpflOldProtect); + WINBASEAPI SIZE_T WINAPI VirtualQueryEx (HANDLE hProcess, LPCVOID lpAddress, PMEMORY_BASIC_INFORMATION lpBuffer, SIZE_T dwLength); + WINBASEAPI WINBOOL WINAPI ReadProcessMemory (HANDLE hProcess, LPCVOID lpBaseAddress, LPVOID lpBuffer, SIZE_T nSize, SIZE_T *lpNumberOfBytesRead); +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-more-module-API-in-Win10-UWP-builds.patch vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-more-module-API-in-Win10-UWP-builds.patch --- vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-more-module-API-in-Win10-UWP-builds.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-more-module-API-in-Win10-UWP-builds.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,113 @@ +From f24fb397cf423d55d363ac4fdc7e6b7aeb7ae830 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Tue, 30 May 2023 14:42:07 +0200 +Subject: [PATCH] headers: enable more module API in Win10 UWP builds + +The documentation doesn't say they're allowed, but the WIndows SDK allow it +since 22000 and the Windows App Certification as well. +It is not restricted to Win11 in both cases but applies when targeting Win10 +as well. +--- + mingw-w64-headers/include/libloaderapi.h | 51 ++++++++++++++---------- + 1 file changed, 29 insertions(+), 22 deletions(-) + +diff --git a/mingw-w64-headers/include/libloaderapi.h b/mingw-w64-headers/include/libloaderapi.h +index d4c82ef8c..288e78d9f 100644 +--- a/mingw-w64-headers/include/libloaderapi.h ++++ b/mingw-w64-headers/include/libloaderapi.h +@@ -37,11 +37,6 @@ extern "C" { + typedef FARPROC ENUMRESLANGPROCW; + #endif + +-#ifndef RC_INVOKED +- typedef WINBOOL (WINAPI *PGET_MODULE_HANDLE_EXA) (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); +- typedef WINBOOL (WINAPI *PGET_MODULE_HANDLE_EXW) (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); +-#endif +- + typedef PVOID DLL_DIRECTORY_COOKIE, *PDLL_DIRECTORY_COOKIE; + + #define FIND_RESOURCE_DIRECTORY_TYPES (0x0100) +@@ -90,32 +85,18 @@ extern "C" { + + WINBASEAPI WINBOOL WINAPI EnumResourceNamesW(HMODULE hModule, LPCWSTR lpType, ENUMRESNAMEPROCW lpEnumFunc, LONG_PTR lParam); + WINBASEAPI HRSRC WINAPI FindResourceW(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType); +- WINBASEAPI HRSRC WINAPI FindResourceExW (HMODULE hModule, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage); + WINBASEAPI WINBOOL WINAPI FreeResource (HGLOBAL hResData); +- WINBASEAPI HMODULE WINAPI LoadLibraryExA (LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); +- WINBASEAPI HMODULE WINAPI LoadLibraryExW (LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); + WINBASEAPI HGLOBAL WINAPI LoadResource (HMODULE hModule, HRSRC hResInfo); +- WINUSERAPI int WINAPI LoadStringA (HINSTANCE hInstance, UINT uID, LPSTR lpBuffer, int cchBufferMax); +- WINUSERAPI int WINAPI LoadStringW (HINSTANCE hInstance, UINT uID, LPWSTR lpBuffer, int cchBufferMax); + WINBASEAPI LPVOID WINAPI LockResource (HGLOBAL hResData); +- WINBASEAPI DWORD WINAPI SizeofResource (HMODULE hModule, HRSRC hResInfo); + WINBASEAPI DLL_DIRECTORY_COOKIE WINAPI AddDllDirectory (PCWSTR NewDirectory); + WINBASEAPI WINBOOL WINAPI RemoveDllDirectory (DLL_DIRECTORY_COOKIE Cookie); + WINBASEAPI WINBOOL WINAPI SetDefaultDllDirectories (DWORD DirectoryFlags); +- WINBASEAPI WINBOOL WINAPI GetModuleHandleExA (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); +- WINBASEAPI WINBOOL WINAPI GetModuleHandleExW (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); + + #ifdef UNICODE + #define EnumResourceNames EnumResourceNamesW + #define FindResource FindResourceW +-#define FindResourceEx FindResourceExW + #endif + +-#define PGET_MODULE_HANDLE_EX __MINGW_NAME_AW(PGET_MODULE_HANDLE_EX) +-#define LoadString __MINGW_NAME_AW(LoadString) +-#define GetModuleHandleEx __MINGW_NAME_AW(GetModuleHandleEx) +-#define LoadLibraryEx __MINGW_NAME_AW(LoadLibraryEx) +- + #define EnumResourceLanguages __MINGW_NAME_AW(EnumResourceLanguages) + WINBASEAPI WINBOOL WINAPI EnumResourceLanguagesA(HMODULE hModule,LPCSTR lpType,LPCSTR lpName,ENUMRESLANGPROCA lpEnumFunc,LONG_PTR lParam); + WINBASEAPI WINBOOL WINAPI EnumResourceLanguagesW(HMODULE hModule,LPCWSTR lpType,LPCWSTR lpName,ENUMRESLANGPROCW lpEnumFunc,LONG_PTR lParam); +@@ -136,11 +117,8 @@ extern "C" { + #endif + #endif + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) +-WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName); +-WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName); + WINBASEAPI HMODULE WINAPI LoadLibraryA(LPCSTR lpLibFileName); + WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR lpLibFileName); +-#define GetModuleHandle __MINGW_NAME_AW(GetModuleHandle) + #define LoadLibrary __MINGW_NAME_AW(LoadLibrary) + #endif + +@@ -176,6 +154,35 @@ typedef const REDIRECTION_DESCRIPTOR *PCREDIRECTION_DESCRIPTOR; + #endif + #endif + ++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0A00 ++ WINBASEAPI HRSRC WINAPI FindResourceExW (HMODULE hModule, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage); ++ WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName); ++ WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName); ++ WINBASEAPI WINBOOL WINAPI GetModuleHandleExA (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); ++ WINBASEAPI WINBOOL WINAPI GetModuleHandleExW (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); ++ WINBASEAPI HMODULE WINAPI LoadLibraryExA (LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); ++ WINBASEAPI HMODULE WINAPI LoadLibraryExW (LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); ++ WINUSERAPI int WINAPI LoadStringA (HINSTANCE hInstance, UINT uID, LPSTR lpBuffer, int cchBufferMax); ++ WINUSERAPI int WINAPI LoadStringW (HINSTANCE hInstance, UINT uID, LPWSTR lpBuffer, int cchBufferMax); ++ WINBASEAPI DWORD WINAPI SizeofResource (HMODULE hModule, HRSRC hResInfo); ++ ++#ifdef UNICODE ++#define FindResourceEx FindResourceExW ++#endif ++ ++#define GetModuleHandle __MINGW_NAME_AW(GetModuleHandle) ++#define GetModuleHandleEx __MINGW_NAME_AW(GetModuleHandleEx) ++#define LoadLibraryEx __MINGW_NAME_AW(LoadLibraryEx) ++#define LoadString __MINGW_NAME_AW(LoadString) ++ ++#ifndef RC_INVOKED ++ typedef WINBOOL (WINAPI *PGET_MODULE_HANDLE_EXA) (DWORD dwFlags, LPCSTR lpModuleName, HMODULE *phModule); ++ typedef WINBOOL (WINAPI *PGET_MODULE_HANDLE_EXW) (DWORD dwFlags, LPCWSTR lpModuleName, HMODULE *phModule); ++#endif ++ ++#define PGET_MODULE_HANDLE_EX __MINGW_NAME_AW(PGET_MODULE_HANDLE_EX) ++#endif ++ + #ifdef __cplusplus + } + #endif +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-some-Registry-API-calls-in-UWP-8.1-bu.patch vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-some-Registry-API-calls-in-UWP-8.1-bu.patch --- vlc-3.0.21/contrib/src/pthreads/0001-headers-enable-some-Registry-API-calls-in-UWP-8.1-bu.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/0001-headers-enable-some-Registry-API-calls-in-UWP-8.1-bu.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,179 @@ +From 9349ece34b6fc36264d0d61ba3f45727de777d4c Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Tue, 30 May 2023 15:16:03 +0200 +Subject: [PATCH] headers: enable some Registry API calls in UWP 8.1+ builds + +The documentation doesn't say it's allowed, but the WIndows SDK allow it since 22000 and +the Windows App Certification as well. It is not restricted to Win11 in both +cases. It's even allowed for 8.1 in api-ms-win-core-registry-l1-1-0.dll. +--- + mingw-w64-headers/include/winreg.h | 92 ++++++++++++++++-------------- + 1 file changed, 49 insertions(+), 43 deletions(-) + +diff --git a/mingw-w64-headers/include/winreg.h b/mingw-w64-headers/include/winreg.h +index dab9324e8..6c5743a28 100644 +--- a/mingw-w64-headers/include/winreg.h ++++ b/mingw-w64-headers/include/winreg.h +@@ -131,31 +131,20 @@ extern "C" { + #define RegConnectRegistry __MINGW_NAME_AW(RegConnectRegistry) + #define RegConnectRegistryEx __MINGW_NAME_AW(RegConnectRegistryEx) + #define RegCreateKey __MINGW_NAME_AW(RegCreateKey) +-#define RegCreateKeyEx __MINGW_NAME_AW(RegCreateKeyEx) + #define RegDeleteKey __MINGW_NAME_AW(RegDeleteKey) +-#define RegDeleteKeyEx __MINGW_NAME_AW(RegDeleteKeyEx) +-#define RegDeleteValue __MINGW_NAME_AW(RegDeleteValue) + #define RegEnumKey __MINGW_NAME_AW(RegEnumKey) +-#define RegEnumKeyEx __MINGW_NAME_AW(RegEnumKeyEx) +-#define RegEnumValue __MINGW_NAME_AW(RegEnumValue) + #define RegLoadKey __MINGW_NAME_AW(RegLoadKey) + #define RegOpenKey __MINGW_NAME_AW(RegOpenKey) +-#define RegOpenKeyEx __MINGW_NAME_AW(RegOpenKeyEx) +-#define RegQueryInfoKey __MINGW_NAME_AW(RegQueryInfoKey) + #define RegQueryValue __MINGW_NAME_AW(RegQueryValue) + #define RegQueryMultipleValues __MINGW_NAME_AW(RegQueryMultipleValues) +-#define RegQueryValueEx __MINGW_NAME_AW(RegQueryValueEx) + #define RegReplaceKey __MINGW_NAME_AW(RegReplaceKey) + #define RegRestoreKey __MINGW_NAME_AW(RegRestoreKey) + #define RegSaveKey __MINGW_NAME_AW(RegSaveKey) + #define RegSetValue __MINGW_NAME_AW(RegSetValue) +-#define RegSetValueEx __MINGW_NAME_AW(RegSetValueEx) + #define RegUnLoadKey __MINGW_NAME_AW(RegUnLoadKey) +-#define RegGetValue __MINGW_NAME_AW(RegGetValue) + #define InitiateSystemShutdown __MINGW_NAME_AW(InitiateSystemShutdown) + #define AbortSystemShutdown __MINGW_NAME_AW(AbortSystemShutdown) + +- WINADVAPI LONG WINAPI RegCloseKey(HKEY hKey); + WINADVAPI LONG WINAPI RegOverridePredefKey(HKEY hKey,HKEY hNewHKey); + WINADVAPI LONG WINAPI RegOpenUserClassesRoot(HANDLE hToken,DWORD dwOptions,REGSAM samDesired,PHKEY phkResult); + WINADVAPI LONG WINAPI RegOpenCurrentUser(REGSAM samDesired,PHKEY phkResult); +@@ -167,40 +156,23 @@ extern "C" { + WINADVAPI LONG WINAPI RegConnectRegistryExW(LPCWSTR lpMachineName,HKEY hKey,ULONG Flags,PHKEY phkResult); + WINADVAPI LONG WINAPI RegCreateKeyA(HKEY hKey,LPCSTR lpSubKey,PHKEY phkResult); + WINADVAPI LONG WINAPI RegCreateKeyW(HKEY hKey,LPCWSTR lpSubKey,PHKEY phkResult); +- WINADVAPI LONG WINAPI RegCreateKeyExA(HKEY hKey,LPCSTR lpSubKey,DWORD Reserved,LPSTR lpClass,DWORD dwOptions,REGSAM samDesired,LPSECURITY_ATTRIBUTES lpSecurityAttributes,PHKEY phkResult,LPDWORD lpdwDisposition); +- WINADVAPI LONG WINAPI RegCreateKeyExW(HKEY hKey,LPCWSTR lpSubKey,DWORD Reserved,LPWSTR lpClass,DWORD dwOptions,REGSAM samDesired,LPSECURITY_ATTRIBUTES lpSecurityAttributes,PHKEY phkResult,LPDWORD lpdwDisposition); + WINADVAPI LONG WINAPI RegDeleteKeyA(HKEY hKey,LPCSTR lpSubKey); + WINADVAPI LONG WINAPI RegDeleteKeyW(HKEY hKey,LPCWSTR lpSubKey); +- WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY hKey,LPCSTR lpSubKey,REGSAM samDesired,DWORD Reserved); +- WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY hKey,LPCWSTR lpSubKey,REGSAM samDesired,DWORD Reserved); + WINADVAPI LONG WINAPI RegDisableReflectionKey(HKEY hBase); + WINADVAPI LONG WINAPI RegEnableReflectionKey(HKEY hBase); + WINADVAPI LONG WINAPI RegQueryReflectionKey(HKEY hBase,WINBOOL *bIsReflectionDisabled); +- WINADVAPI LONG WINAPI RegDeleteValueA(HKEY hKey,LPCSTR lpValueName); +- WINADVAPI LONG WINAPI RegDeleteValueW(HKEY hKey,LPCWSTR lpValueName); + WINADVAPI LONG WINAPI RegEnumKeyA(HKEY hKey,DWORD dwIndex,LPSTR lpName,DWORD cchName); + WINADVAPI LONG WINAPI RegEnumKeyW(HKEY hKey,DWORD dwIndex,LPWSTR lpName,DWORD cchName); +- WINADVAPI LONG WINAPI RegEnumKeyExA(HKEY hKey,DWORD dwIndex,LPSTR lpName,LPDWORD lpcchName,LPDWORD lpReserved,LPSTR lpClass,LPDWORD lpcchClass,PFILETIME lpftLastWriteTime); +- WINADVAPI LONG WINAPI RegEnumKeyExW(HKEY hKey,DWORD dwIndex,LPWSTR lpName,LPDWORD lpcchName,LPDWORD lpReserved,LPWSTR lpClass,LPDWORD lpcchClass,PFILETIME lpftLastWriteTime); +- WINADVAPI LONG WINAPI RegEnumValueA(HKEY hKey,DWORD dwIndex,LPSTR lpValueName,LPDWORD lpcchValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); +- WINADVAPI LONG WINAPI RegEnumValueW(HKEY hKey,DWORD dwIndex,LPWSTR lpValueName,LPDWORD lpcchValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); + WINADVAPI LONG WINAPI RegFlushKey(HKEY hKey); + WINADVAPI LONG WINAPI RegGetKeySecurity(HKEY hKey,SECURITY_INFORMATION SecurityInformation,PSECURITY_DESCRIPTOR pSecurityDescriptor,LPDWORD lpcbSecurityDescriptor); + WINADVAPI LONG WINAPI RegLoadKeyA(HKEY hKey,LPCSTR lpSubKey,LPCSTR lpFile); + WINADVAPI LONG WINAPI RegLoadKeyW(HKEY hKey,LPCWSTR lpSubKey,LPCWSTR lpFile); +- WINADVAPI LONG WINAPI RegNotifyChangeKeyValue(HKEY hKey,WINBOOL bWatchSubtree,DWORD dwNotifyFilter,HANDLE hEvent,WINBOOL fAsynchronous); + WINADVAPI LONG WINAPI RegOpenKeyA(HKEY hKey,LPCSTR lpSubKey,PHKEY phkResult); + WINADVAPI LONG WINAPI RegOpenKeyW(HKEY hKey,LPCWSTR lpSubKey,PHKEY phkResult); +- WINADVAPI LONG WINAPI RegOpenKeyExA(HKEY hKey,LPCSTR lpSubKey,DWORD ulOptions,REGSAM samDesired,PHKEY phkResult); +- WINADVAPI LONG WINAPI RegOpenKeyExW(HKEY hKey,LPCWSTR lpSubKey,DWORD ulOptions,REGSAM samDesired,PHKEY phkResult); +- WINADVAPI LONG WINAPI RegQueryInfoKeyA(HKEY hKey,LPSTR lpClass,LPDWORD lpcchClass,LPDWORD lpReserved,LPDWORD lpcSubKeys,LPDWORD lpcbMaxSubKeyLen,LPDWORD lpcbMaxClassLen,LPDWORD lpcValues,LPDWORD lpcbMaxValueNameLen,LPDWORD lpcbMaxValueLen,LPDWORD lpcbSecurityDescriptor,PFILETIME lpftLastWriteTime); +- WINADVAPI LONG WINAPI RegQueryInfoKeyW(HKEY hKey,LPWSTR lpClass,LPDWORD lpcchClass,LPDWORD lpReserved,LPDWORD lpcSubKeys,LPDWORD lpcbMaxSubKeyLen,LPDWORD lpcbMaxClassLen,LPDWORD lpcValues,LPDWORD lpcbMaxValueNameLen,LPDWORD lpcbMaxValueLen,LPDWORD lpcbSecurityDescriptor,PFILETIME lpftLastWriteTime); + WINADVAPI LONG WINAPI RegQueryValueA(HKEY hKey,LPCSTR lpSubKey,LPSTR lpData,PLONG lpcbData); + WINADVAPI LONG WINAPI RegQueryValueW(HKEY hKey,LPCWSTR lpSubKey,LPWSTR lpData,PLONG lpcbData); + WINADVAPI LONG WINAPI RegQueryMultipleValuesA(HKEY hKey,PVALENTA val_list,DWORD num_vals,LPSTR lpValueBuf,LPDWORD ldwTotsize); + WINADVAPI LONG WINAPI RegQueryMultipleValuesW(HKEY hKey,PVALENTW val_list,DWORD num_vals,LPWSTR lpValueBuf,LPDWORD ldwTotsize); +- WINADVAPI LONG WINAPI RegQueryValueExA(HKEY hKey,LPCSTR lpValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); +- WINADVAPI LONG WINAPI RegQueryValueExW(HKEY hKey,LPCWSTR lpValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); + WINADVAPI LONG WINAPI RegReplaceKeyA(HKEY hKey,LPCSTR lpSubKey,LPCSTR lpNewFile,LPCSTR lpOldFile); + WINADVAPI LONG WINAPI RegReplaceKeyW(HKEY hKey,LPCWSTR lpSubKey,LPCWSTR lpNewFile,LPCWSTR lpOldFile); + WINADVAPI LONG WINAPI RegRestoreKeyA(HKEY hKey,LPCSTR lpFile,DWORD dwFlags); +@@ -210,12 +182,8 @@ extern "C" { + WINADVAPI LONG WINAPI RegSetKeySecurity(HKEY hKey,SECURITY_INFORMATION SecurityInformation,PSECURITY_DESCRIPTOR pSecurityDescriptor); + WINADVAPI LONG WINAPI RegSetValueA(HKEY hKey,LPCSTR lpSubKey,DWORD dwType,LPCSTR lpData,DWORD cbData); + WINADVAPI LONG WINAPI RegSetValueW(HKEY hKey,LPCWSTR lpSubKey,DWORD dwType,LPCWSTR lpData,DWORD cbData); +- WINADVAPI LONG WINAPI RegSetValueExA(HKEY hKey,LPCSTR lpValueName,DWORD Reserved,DWORD dwType,CONST BYTE *lpData,DWORD cbData); +- WINADVAPI LONG WINAPI RegSetValueExW(HKEY hKey,LPCWSTR lpValueName,DWORD Reserved,DWORD dwType,CONST BYTE *lpData,DWORD cbData); + WINADVAPI LONG WINAPI RegUnLoadKeyA(HKEY hKey,LPCSTR lpSubKey); + WINADVAPI LONG WINAPI RegUnLoadKeyW(HKEY hKey,LPCWSTR lpSubKey); +- WINADVAPI LONG WINAPI RegGetValueA(HKEY hkey,LPCSTR lpSubKey,LPCSTR lpValue,DWORD dwFlags,LPDWORD pdwType,PVOID pvData,LPDWORD pcbData); +- WINADVAPI LONG WINAPI RegGetValueW(HKEY hkey,LPCWSTR lpSubKey,LPCWSTR lpValue,DWORD dwFlags,LPDWORD pdwType,PVOID pvData,LPDWORD pcbData); + WINADVAPI WINBOOL WINAPI InitiateSystemShutdownA(LPSTR lpMachineName,LPSTR lpMessage,DWORD dwTimeout,WINBOOL bForceAppsClosed,WINBOOL bRebootAfterShutdown); + WINADVAPI WINBOOL WINAPI InitiateSystemShutdownW(LPWSTR lpMachineName,LPWSTR lpMessage,DWORD dwTimeout,WINBOOL bForceAppsClosed,WINBOOL bRebootAfterShutdown); + WINADVAPI WINBOOL WINAPI AbortSystemShutdownA(LPSTR lpMachineName); +@@ -320,17 +288,6 @@ WINADVAPI LONG WINAPI RegDeleteKeyValueW( + LPCWSTR lpValueName + ); + +-#define RegDeleteTree __MINGW_NAME_AW(RegDeleteTree) +-WINADVAPI LONG WINAPI RegDeleteTreeA( +- HKEY hKey, +- LPCSTR lpSubKey +-); +- +-WINADVAPI LONG WINAPI RegDeleteTreeW( +- HKEY hKey, +- LPCWSTR lpSubKey +-); +- + WINADVAPI LONG WINAPI RegLoadAppKeyA( + LPCSTR lpFile, + PHKEY phkResult, +@@ -442,6 +399,55 @@ WINADVAPI DWORD WINAPI CheckForHiberboot( + + #endif /* WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) */ + ++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0603 ++ WINADVAPI LONG WINAPI RegCloseKey(HKEY hKey); ++ WINADVAPI LONG WINAPI RegCreateKeyExA(HKEY hKey,LPCSTR lpSubKey,DWORD Reserved,LPSTR lpClass,DWORD dwOptions,REGSAM samDesired,LPSECURITY_ATTRIBUTES lpSecurityAttributes,PHKEY phkResult,LPDWORD lpdwDisposition); ++ WINADVAPI LONG WINAPI RegCreateKeyExW(HKEY hKey,LPCWSTR lpSubKey,DWORD Reserved,LPWSTR lpClass,DWORD dwOptions,REGSAM samDesired,LPSECURITY_ATTRIBUTES lpSecurityAttributes,PHKEY phkResult,LPDWORD lpdwDisposition); ++ WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY hKey,LPCSTR lpSubKey,REGSAM samDesired,DWORD Reserved); ++ WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY hKey,LPCWSTR lpSubKey,REGSAM samDesired,DWORD Reserved); ++ WINADVAPI LONG WINAPI RegDeleteValueA(HKEY hKey,LPCSTR lpValueName); ++ WINADVAPI LONG WINAPI RegDeleteValueW(HKEY hKey,LPCWSTR lpValueName); ++ WINADVAPI LONG WINAPI RegEnumKeyExA(HKEY hKey,DWORD dwIndex,LPSTR lpName,LPDWORD lpcchName,LPDWORD lpReserved,LPSTR lpClass,LPDWORD lpcchClass,PFILETIME lpftLastWriteTime); ++ WINADVAPI LONG WINAPI RegEnumKeyExW(HKEY hKey,DWORD dwIndex,LPWSTR lpName,LPDWORD lpcchName,LPDWORD lpReserved,LPWSTR lpClass,LPDWORD lpcchClass,PFILETIME lpftLastWriteTime); ++ WINADVAPI LONG WINAPI RegEnumValueA(HKEY hKey,DWORD dwIndex,LPSTR lpValueName,LPDWORD lpcchValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); ++ WINADVAPI LONG WINAPI RegEnumValueW(HKEY hKey,DWORD dwIndex,LPWSTR lpValueName,LPDWORD lpcchValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); ++ WINADVAPI LONG WINAPI RegGetValueA(HKEY hkey,LPCSTR lpSubKey,LPCSTR lpValue,DWORD dwFlags,LPDWORD pdwType,PVOID pvData,LPDWORD pcbData); ++ WINADVAPI LONG WINAPI RegGetValueW(HKEY hkey,LPCWSTR lpSubKey,LPCWSTR lpValue,DWORD dwFlags,LPDWORD pdwType,PVOID pvData,LPDWORD pcbData); ++ WINADVAPI LONG WINAPI RegNotifyChangeKeyValue(HKEY hKey,WINBOOL bWatchSubtree,DWORD dwNotifyFilter,HANDLE hEvent,WINBOOL fAsynchronous); ++ WINADVAPI LONG WINAPI RegOpenKeyExA(HKEY hKey,LPCSTR lpSubKey,DWORD ulOptions,REGSAM samDesired,PHKEY phkResult); ++ WINADVAPI LONG WINAPI RegOpenKeyExW(HKEY hKey,LPCWSTR lpSubKey,DWORD ulOptions,REGSAM samDesired,PHKEY phkResult); ++ WINADVAPI LONG WINAPI RegQueryInfoKeyA(HKEY hKey,LPSTR lpClass,LPDWORD lpcchClass,LPDWORD lpReserved,LPDWORD lpcSubKeys,LPDWORD lpcbMaxSubKeyLen,LPDWORD lpcbMaxClassLen,LPDWORD lpcValues,LPDWORD lpcbMaxValueNameLen,LPDWORD lpcbMaxValueLen,LPDWORD lpcbSecurityDescriptor,PFILETIME lpftLastWriteTime); ++ WINADVAPI LONG WINAPI RegQueryInfoKeyW(HKEY hKey,LPWSTR lpClass,LPDWORD lpcchClass,LPDWORD lpReserved,LPDWORD lpcSubKeys,LPDWORD lpcbMaxSubKeyLen,LPDWORD lpcbMaxClassLen,LPDWORD lpcValues,LPDWORD lpcbMaxValueNameLen,LPDWORD lpcbMaxValueLen,LPDWORD lpcbSecurityDescriptor,PFILETIME lpftLastWriteTime); ++ WINADVAPI LONG WINAPI RegQueryValueExA(HKEY hKey,LPCSTR lpValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); ++ WINADVAPI LONG WINAPI RegQueryValueExW(HKEY hKey,LPCWSTR lpValueName,LPDWORD lpReserved,LPDWORD lpType,LPBYTE lpData,LPDWORD lpcbData); ++ WINADVAPI LONG WINAPI RegSetValueExA(HKEY hKey,LPCSTR lpValueName,DWORD Reserved,DWORD dwType,CONST BYTE *lpData,DWORD cbData); ++ WINADVAPI LONG WINAPI RegSetValueExW(HKEY hKey,LPCWSTR lpValueName,DWORD Reserved,DWORD dwType,CONST BYTE *lpData,DWORD cbData); ++#define RegCreateKeyEx __MINGW_NAME_AW(RegCreateKeyEx) ++#define RegDeleteKeyEx __MINGW_NAME_AW(RegDeleteKeyEx) ++#define RegDeleteValue __MINGW_NAME_AW(RegDeleteValue) ++#define RegEnumKeyEx __MINGW_NAME_AW(RegEnumKeyEx) ++#define RegEnumValue __MINGW_NAME_AW(RegEnumValue) ++#define RegGetValue __MINGW_NAME_AW(RegGetValue) ++#define RegOpenKeyEx __MINGW_NAME_AW(RegOpenKeyEx) ++#define RegQueryInfoKey __MINGW_NAME_AW(RegQueryInfoKey) ++#define RegQueryValueEx __MINGW_NAME_AW(RegQueryValueEx) ++#define RegSetValueEx __MINGW_NAME_AW(RegSetValueEx) ++#endif ++ ++#if _WIN32_WINNT >= 0x0600 && (WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0603) ++WINADVAPI LONG WINAPI RegDeleteTreeA( ++ HKEY hKey, ++ LPCSTR lpSubKey ++); ++ ++WINADVAPI LONG WINAPI RegDeleteTreeW( ++ HKEY hKey, ++ LPCWSTR lpSubKey ++); ++ ++#define RegDeleteTree __MINGW_NAME_AW(RegDeleteTree) ++#endif ++ + #ifdef __cplusplus + } + #endif +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/pthreads/SHA512SUMS vlc-3.0.22/contrib/src/pthreads/SHA512SUMS --- vlc-3.0.21/contrib/src/pthreads/SHA512SUMS 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -4e2ffbb6cbe59c65f60d3f0035d1c2065b14ad16a63ae7a297f5c61d83b8e1b6847e3579996b91b2b9d807e3b9c1de2c60ee01a3349c9dd5f6e13d36f25221ea mingw-w64-2c35e8ff0d33916bd490e8932cba2049cd1af3d0.tar.xz +3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516 mingw-w64-v10.0.0.tar.bz2 \ No newline at end of file diff -Nru vlc-3.0.21/contrib/src/pthreads/rules.mak vlc-3.0.22/contrib/src/pthreads/rules.mak --- vlc-3.0.21/contrib/src/pthreads/rules.mak 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/pthreads/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ # winpthreads, dxvahd -MINGW64_VERSION := 9.0.0 -MINGW64_URL := https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v$(MINGW64_VERSION).tar.bz2/download +MINGW64_VERSION := 10.0.0 +MINGW64_URL := $(SF)/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$(MINGW64_VERSION).tar.bz2 MINGW64_HASH=2c35e8ff0d33916bd490e8932cba2049cd1af3d0 MINGW64_GITURL := https://git.code.sf.net/p/mingw-w64/mingw-w64 @@ -9,8 +9,11 @@ PKGS += pthreads ifndef HAVE_VISUALSTUDIO +ifdef HAVE_WINSTORE +PKGS += alloweduwp +endif PKGS += dxva dxvahd -PKGS_ALL += dxva dxvahd +PKGS_ALL += dxva dxvahd alloweduwp ifeq ($(call mingw_at_least, 10), true) PKGS_FOUND += dxva endif # MINGW 10 @@ -29,19 +32,29 @@ $(TARBALLS)/mingw-w64-v$(MINGW64_VERSION).tar.bz2: $(call download_pkg,$(MINGW64_URL),winpthreads) -# .sum-pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2 -.sum-pthreads: mingw-w64-$(MINGW64_HASH).tar.xz +.sum-pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2 +# .sum-pthreads: mingw-w64-$(MINGW64_HASH).tar.xz +# $(call check_githash,$(MINGW64_HASH)) +# touch $@ -# pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2 .sum-pthreads -pthreads: mingw-w64-$(MINGW64_HASH).tar.xz .sum-pthreads +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 + $(APPLY) $(SRC)/pthreads/0001-headers-enable-GetFileInformationByHandle-in-Win10-U.patch + $(APPLY) $(SRC)/pthreads/0001-headers-enable-VirtualAlloc-Ex-in-Win10-UWP-builds.patch + $(APPLY) $(SRC)/pthreads/0001-headers-enable-CreateHardLinkW-in-Win10-UWP-builds.patch + $(APPLY) $(SRC)/pthreads/0001-headers-enable-GetVolumePathNameW-in-Win10-UWP-build.patch + $(APPLY) $(SRC)/pthreads/0001-headers-enable-more-module-API-in-Win10-UWP-builds.patch + $(APPLY) $(SRC)/pthreads/0001-headers-enable-GET_MODULE_HANDLE_EX_xxx-defines-in-U.patch + $(APPLY) $(SRC)/pthreads/0001-headers-enable-some-Registry-API-calls-in-UWP-8.1-bu.patch + $(APPLY) $(SRC)/pthreads/0001-add-api-ms-core-registry-def-files.patch $(MOVE) .pthreads: pthreads cd $ -Date: Fri, 15 Jun 2018 09:59:42 +0300 -Subject: [PATCH 2/2] Windows QPA: Disable systray notification sounds - ---- - src/plugins/platforms/windows/qwindowssystemtrayicon.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp b/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp -index 901d132ea5..c30fa0e76d 100644 ---- a/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp -+++ b/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp -@@ -279,6 +279,10 @@ void QWindowsSystemTrayIcon::showMessage(const QString &title, const QString &me - } - tnd.hBalloonIcon = qt_pixmapToWinHICON(pm); - } -+ -+ // Never play audio on notifications. -+ tnd.dwInfoFlags |= NIIF_NOSOUND; -+ - tnd.hWnd = m_hwnd; - tnd.uTimeout = msecsIn <= 0 ? UINT(10000) : UINT(msecsIn); // 10s default - tnd.uFlags = NIF_INFO | NIF_SHOWTIP; --- -2.15.2 (Apple Git-101.1) - diff -Nru vlc-3.0.21/contrib/src/qt/0003-allow-cross-compilation-of-angle-with-wine.patch vlc-3.0.22/contrib/src/qt/0003-allow-cross-compilation-of-angle-with-wine.patch --- vlc-3.0.21/contrib/src/qt/0003-allow-cross-compilation-of-angle-with-wine.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/0003-allow-cross-compilation-of-angle-with-wine.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -From 5b0815cdbdc729da3135d3a9c41d7579883f739d Mon Sep 17 00:00:00 2001 -From: Pierre Lamot -Date: Tue, 9 Apr 2019 16:39:23 +0200 -Subject: [PATCH] allow cross-compilation of angle with wine - ---- - src/angle/src/common/common.pri | 2 +- - src/gui/configure.json | 2 +- - src/gui/configure.pri | 24 ++---------------------- - 3 files changed, 4 insertions(+), 24 deletions(-) - -diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri -index df29269..b6bde4d 100644 ---- a/src/angle/src/common/common.pri -+++ b/src/angle/src/common/common.pri -@@ -22,7 +22,7 @@ lib_replace.replace = \$\$\$\$[QT_INSTALL_LIBS] - lib_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace - --FXC = $$shell_quote($$shell_path($$QMAKE_FXC_LOCATION)) -+FXC = $$shell_path($$QMAKE_FXC_LOCATION) - - win32 { - VERSION = $$MODULE_VERSION -diff --git a/src/gui/configure.json b/src/gui/configure.json -index 44140bc..53f4984 100644 ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -1106,7 +1106,7 @@ - "angle": { - "label": "ANGLE", - "autoDetect": "features.opengles2 || features.opengl-dynamic", -- "condition": "!features.opengl-desktop && features.dxguid && tests.fxc && (features.direct3d9 || (config.winrt && features.direct3d11 && libs.d3dcompiler))", -+ "condition": "!features.opengl-desktop && features.dxguid && tests.fxc && (features.direct3d9 || (features.direct3d11 && libs.d3dcompiler))", - "output": [ - "publicFeature", - { "type": "define", "name": "QT_OPENGL_ES_2_ANGLE" }, -diff --git a/src/gui/configure.pri b/src/gui/configure.pri -index 1b95449..875e890 100644 ---- a/src/gui/configure.pri -+++ b/src/gui/configure.pri -@@ -20,29 +20,9 @@ defineTest(qtConfLibrary_freetype) { - # DXSDK_DIR variable. Starting with Windows Kit 8, it is included in - # the Windows SDK. - defineTest(qtConfTest_fxc) { -- !mingw { -- fxc = $$qtConfFindInPath("fxc.exe") -- } else { -- equals(QMAKE_HOST.arch, x86_64): \ -- fns = x64/fxc.exe -- else: \ -- fns = x86/fxc.exe -- dxdir = $$(DXSDK_DIR) -- !isEmpty(dxdir) { -- fxc = $$dxdir/Utilities/bin/$$fns -- } else { -- winkitbindir = $$(WindowsSdkVerBinPath) -- !isEmpty(winkitbindir) { -- fxc = $$winkitbindir/$$fns -- } else { -- winkitdir = $$(WindowsSdkDir) -- !isEmpty(winkitdir): \ -- fxc = $$winkitdir/bin/$$fns -- } -- } -- } -+ fxc = wine "$$(DXSDK_DIR)/fxc2.exe" - -- !isEmpty(fxc):exists($$fxc) { -+ !isEmpty(fxc) { - $${1}.value = $$clean_path($$fxc) - export($${1}.value) - $${1}.cache += value --- -2.19.1 - diff -Nru vlc-3.0.21/contrib/src/qt/0007-ANGLE-remove-static-assert-that-can-t-be-evaluated-b.patch vlc-3.0.22/contrib/src/qt/0007-ANGLE-remove-static-assert-that-can-t-be-evaluated-b.patch --- vlc-3.0.21/contrib/src/qt/0007-ANGLE-remove-static-assert-that-can-t-be-evaluated-b.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/0007-ANGLE-remove-static-assert-that-can-t-be-evaluated-b.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From 5de8d0bf9fb22d8a2f1b648bcbf9fc5b247dbf41 Mon Sep 17 00:00:00 2001 -From: Pierre Lamot -Date: Thu, 21 Mar 2019 14:26:17 +0100 -Subject: [PATCH 2/2] ANGLE: remove static assert that can't be evaluated by - gcc 6.4 - ---- - .../angle/src/libANGLE/renderer/d3d/FramebufferD3D.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/FramebufferD3D.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/FramebufferD3D.cpp -index 3d73b2c..12a809f 100644 ---- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/FramebufferD3D.cpp -+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/FramebufferD3D.cpp -@@ -379,8 +379,8 @@ const gl::AttachmentList &FramebufferD3D::getColorAttachmentsForRender(const gl: - if (mRenderer->getWorkarounds().addDummyTextureNoRenderTarget && - colorAttachmentsForRender.empty()) - { -- static_assert(static_cast(activeProgramOutputs.size()) <= 32, -- "Size of active program outputs should less or equal than 32."); -+ //static_assert(static_cast(activeProgramOutputs.size()) <= 32, -+ //"Size of active program outputs should less or equal than 32."); - GLenum i = static_cast( - gl::ScanForward(static_cast(activeProgramOutputs.bits()))); - --- -2.19.1 - diff -Nru vlc-3.0.21/contrib/src/qt/0008-ANGLE-disable-ANGLE_STD_ASYNC_WORKERS-when-compiling.patch vlc-3.0.22/contrib/src/qt/0008-ANGLE-disable-ANGLE_STD_ASYNC_WORKERS-when-compiling.patch --- vlc-3.0.21/contrib/src/qt/0008-ANGLE-disable-ANGLE_STD_ASYNC_WORKERS-when-compiling.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/0008-ANGLE-disable-ANGLE_STD_ASYNC_WORKERS-when-compiling.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From 0b5fc908a3d8e24c28e72f61bf8c6242cb85ba3e Mon Sep 17 00:00:00 2001 -From: Pierre Lamot -Date: Thu, 21 Mar 2019 16:39:41 +0100 -Subject: [PATCH] ANGLE: disable ANGLE_STD_ASYNC_WORKERS when compiling with - gcc/mingw as std::future is not supported - ---- - src/angle/src/config.pri | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri -index 5c52128..23109cd 100644 ---- a/src/angle/src/config.pri -+++ b/src/angle/src/config.pri -@@ -95,6 +95,9 @@ gcc { - -Wno-strict-aliasing -Wno-type-limits -Wno-unused-local-typedefs - - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Wno-reorder -Wno-conversion-null -Wno-delete-non-virtual-dtor -+ !clang { -+ DEFINES += ANGLE_STD_ASYNC_WORKERS=ANGLE_DISABLED -+ } - } - - QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG --- -2.19.1 - diff -Nru vlc-3.0.21/contrib/src/qt/0009-Add-KHRONOS_STATIC-to-allow-static-linking-on-Windows.patch vlc-3.0.22/contrib/src/qt/0009-Add-KHRONOS_STATIC-to-allow-static-linking-on-Windows.patch --- vlc-3.0.21/contrib/src/qt/0009-Add-KHRONOS_STATIC-to-allow-static-linking-on-Windows.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/0009-Add-KHRONOS_STATIC-to-allow-static-linking-on-Windows.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From f0a66adc8862622ef65830dc7f3c154c211e22e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= -Date: Wed, 24 Apr 2019 17:44:46 -0700 -Subject: [PATCH] Add KHRONOS_STATIC to allow static linking on Windows. - -I have encountered multiple situations where it is desirable to -statically link against a software implementation of EGL on Windows. -Add the preprocessor constant KHRONOS_STATIC that disables the -annotation of EGL entry points as DLL-imported. - -This is squashed from commits 94ba8ee876206364cf45a9bc08b8db5a52cb9543 -and f636b23410dd4db5055dffbe499f4754013759d5 from -https://github.com/KhronosGroup/EGL-Registry, applied on the qtbase -repo. ---- - src/3rdparty/angle/include/KHR/khrplatform.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/angle/include/KHR/khrplatform.h b/src/3rdparty/angle/include/KHR/khrplatform.h -index 975bbff..dd22d92 100644 ---- a/src/3rdparty/angle/include/KHR/khrplatform.h -+++ b/src/3rdparty/angle/include/KHR/khrplatform.h -@@ -90,12 +90,20 @@ - * int arg2) KHRONOS_APIATTRIBUTES; - */ - -+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC) -+# define KHRONOS_STATIC 1 -+#endif -+ - /*------------------------------------------------------------------------- - * Definition of KHRONOS_APICALL - *------------------------------------------------------------------------- - * This precedes the return type of the function in the function prototype. - */ --#if defined(_WIN32) && !defined(__SCITECH_SNAP__) -+#if defined(KHRONOS_STATIC) -+ /* If the preprocessor constant KHRONOS_STATIC is defined, make the -+ * header compatible with static linking. */ -+# define KHRONOS_APICALL -+#elif defined(_WIN32) - # define KHRONOS_APICALL __declspec(dllimport) - #elif defined (__SYMBIAN32__) - # define KHRONOS_APICALL IMPORT_C --- -2.17.1 - diff -Nru vlc-3.0.21/contrib/src/qt/add-includedir-to-pc-file.patch vlc-3.0.22/contrib/src/qt/add-includedir-to-pc-file.patch --- vlc-3.0.21/contrib/src/qt/add-includedir-to-pc-file.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/add-includedir-to-pc-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -From 3114853cdc19b35ca9a312321e4014319e5828fa Mon Sep 17 00:00:00 2001 -From: Johannes Kauffmann -Date: Mon, 12 Dec 2022 13:36:45 +0100 -Subject: [PATCH] qmake: always add includedir to the .pc files - -The generated .pc files do not contain -I${includedir}, only --I${includedir}/$QTMODULE. This is because QMake finds out that our -standard contrib include path is already in the QMAKE_DEFAULT_INCDIRS -list. - -When this includepath is not forced externally through some script and -only the .pc file flags are used for the qt plugin, the build fails: - -In file included from /vlc/contrib/x86_64-linux-gnu/include/QtWidgets/QApplication:1, - from ../modules/gui/qt/vlc-qt-check.cpp:26: -/vlc/contrib/x86_64-linux-gnu/include/QtWidgets/qapplication.h:43:10: fatal error: QtWidgets/qtwidgetsglobal.h: No such file or directory - 43 | #include - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Fixes #27588. ---- - qmake/generators/makefile.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 5c61a3c65c..ab9d696440 100644 ---- a/qmake/generators/makefile.cpp -+++ b/qmake/generators/makefile.cpp -@@ -3388,8 +3388,7 @@ MakefileGenerator::writePkgConfigFile() - << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") - // << varGlue("DEFINES","-D"," -D"," ") - ; -- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir)) -- t << "-I${includedir}"; -+ t << "-I${includedir}"; - if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") - && libDir != QLatin1String("/Library/Frameworks")) { - t << " -F${libdir}"; --- -2.34.1 - diff -Nru vlc-3.0.21/contrib/src/qt/configure-env.py vlc-3.0.22/contrib/src/qt/configure-env.py --- vlc-3.0.21/contrib/src/qt/configure-env.py 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/configure-env.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#!/usr/bin/env python3 -import argparse - -# Argument parsing -parser = argparse.ArgumentParser(description="Generate Qt configure options from the compilation variables") -parser.add_argument('-D', action='append', help='compiler definition') -parser.add_argument('-I', action='append', help='include directory') -parser.add_argument('-L', action='append', help='linker directory') -# parser.add_argument('-F', action='append', help='framework flags') -args, remaining = parser.parse_known_args() - -all_params = [] -if args.D: - all_params += ['-D ' + sub for sub in args.D] -if args.I: - all_params += ['-I ' + sub for sub in args.I] -if args.L: - all_params += ['-L ' + sub for sub in args.L] - -if all_params: - print(' '.join(all_params)) -else: - print('') diff -Nru vlc-3.0.21/contrib/src/qt/force-pkgconfg-replace.patch vlc-3.0.22/contrib/src/qt/force-pkgconfg-replace.patch --- vlc-3.0.21/contrib/src/qt/force-pkgconfg-replace.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/force-pkgconfg-replace.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ ---- a/mkspecs/features/qml_plugin.prf 2020-09-02 12:15:07.000000000 +0200 -+++ b/mkspecs/features/qml_plugin.prf 2022-08-31 10:58:10.110600024 +0200 -@@ -13,6 +13,10 @@ - - TEMPLATE = lib - CONFIG += plugin -+qmlprefixpclib_replace.match = $$dirname(_QMAKE_CONF_) -+qmlprefixpclib_replace.replace = $$[QT_INSTALL_PREFIX] -+qmlprefixpclib_replace.CONFIG = path -+QMAKE_PKGCONFIG_INSTALL_REPLACE += qmlprefixpclib_replace - - if(win32|mac):!macx-xcode { - qtConfig(debug_and_release): CONFIG += debug_and_release ---- a/mkspecs/features/qt_plugin.prf 2020-09-02 12:15:07.000000000 +0200 -+++ b/mkspecs/features/qt_plugin.prf 2022-08-31 10:59:48.380662936 +0200 -@@ -15,6 +15,10 @@ - - TEMPLATE = lib - CONFIG += plugin -+pluginpclib_replace.match = $$MODULE_BASE_OUTDIR/lib -+pluginpclib_replace.replace = $$[QT_INSTALL_LIBS] -+pluginpclib_replace.CONFIG = path -+QMAKE_PKGCONFIG_INSTALL_REPLACE += pluginpclib_replace - DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE - - win32:CONFIG(shared, static|shared) { diff -Nru vlc-3.0.21/contrib/src/qt/install_wrapper.sh vlc-3.0.22/contrib/src/qt/install_wrapper.sh --- vlc-3.0.21/contrib/src/qt/install_wrapper.sh 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/install_wrapper.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -#!/usr/bin/env sh -# Copyright (C) 2022 Videolabs -# This file is distributed under the same license as the vlc package. -set -e - -SCRIPT_DIR="$(cd "$(dirname "$0" )" && pwd -P)" -SOURCE="$1" -DEST="$2" - -install -m 644 -p $SOURCE $DEST - -# Filter pkg-config files only -if [ "${SOURCE##*.}" != 'pc' ]; then - exit 0 -fi - -"${SCRIPT_DIR}/../pkg-static.sh" "${DEST}" - -# Filter pkg-config files that are not installed in the main pkg-config folder -if [ "$(dirname $2)" -ef "${VLC_PREFIX}/lib/pkgconfig" ]; then - exit 0 -fi - -pkgconfigdir="$(cd "$(dirname "${DEST}")" && pwd -P)" - -# Filter packages installed in a pkgconfig/ folder -if [ "$(basename "${pkgconfigdir}")" = "pkgconfig" ]; then - exit 0 -fi - -sed -i.orig "s,libdir=.*,libdir=${pkgconfigdir}," "${DEST}" -mkdir -p "${VLC_PREFIX}/lib/pkgconfig" -cp "${DEST}" "${VLC_PREFIX}/lib/pkgconfig/" diff -Nru vlc-3.0.21/contrib/src/qt/qt-fix-gcc11-build.patch vlc-3.0.22/contrib/src/qt/qt-fix-gcc11-build.patch --- vlc-3.0.21/contrib/src/qt/qt-fix-gcc11-build.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/qt-fix-gcc11-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ ---- qt/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp.old 2022-01-18 17:55:16.527952044 +0100 -+++ qt/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp 2022-01-18 17:55:28.315744081 +0100 -@@ -10,6 +10,7 @@ - #include "libANGLE/HandleAllocator.h" - - #include -+#include - - #include "common/debug.h" - diff -Nru vlc-3.0.21/contrib/src/qt/rules.mak vlc-3.0.22/contrib/src/qt/rules.mak --- vlc-3.0.21/contrib/src/qt/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -42,6 +42,10 @@ $(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 + # fix forcing the WINVER/_WIN32_WINNT version without NTDDI_VERSION + sed -i.orig -e "s/DEFINES += WINVER/DEFINES += NTDDI_VERSION=0x06000000 WINVER/" "$(UNPACK_DIR)/src/network/kernel/kernel.pri" + # TOUCHINPUT is properly defined in mingw since v4 + sed -i.orig -e "s/defined(Q_CC_MINGW) || !defined(TOUCHEVENTF_MOVE)/!defined(TOUCHEVENTF_MOVE)/" "$(UNPACK_DIR)/src/plugins/platforms/windows/qtwindows_additional.h" $(MOVE) ifdef HAVE_MACOSX @@ -50,7 +54,8 @@ ifdef HAVE_WIN32 # filter out the contrib includes as Qt doesn't ike pthread-GC2 headers QT_VARS := CFLAGS="$(shell echo $$CFLAGS | sed 's@ -I$$(PREFIX)/include@@g')" \ - CXXFLAGS="$(shell echo $$CXXFLAGS | sed 's@ -I$$(PREFIX)/include@@g')" + CXXFLAGS="$(shell echo $$CXXFLAGS | sed 's@ -I$$(PREFIX)/include@@g')" \ + LDFLAGS="-L$(PREFIX)/lib $(EXTRA_LDFLAGS)" ifdef HAVE_CLANG QT_SPEC := win32-clang-g++ else @@ -69,12 +74,12 @@ .qt: qt cd $< && $(QT_VARS) ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX) # Make && Install libraries - cd $< && $(MAKE) - cd $< && $(MAKE) -C src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-zlib-install_subtargets sub-bootstrap-install_subtargets + $(MAKE) -C $< + $(MAKE) -C $< -C src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-zlib-install_subtargets sub-bootstrap-install_subtargets # Install tools - cd $< && $(MAKE) -C src sub-moc-install_subtargets sub-rcc-install_subtargets sub-uic-install_subtargets + $(MAKE) -C $< -C src sub-moc-install_subtargets sub-rcc-install_subtargets sub-uic-install_subtargets # Install plugins - cd $< && $(MAKE) -C src/plugins sub-platforms-install_subtargets + $(MAKE) -C $< -C src/plugins sub-platforms-install_subtargets mv $(PREFIX)/plugins/platforms/libqwindows.a $(PREFIX)/lib/ && rm -rf $(PREFIX)/plugins # Move includes to match what VLC expects mkdir -p $(PREFIX)/include/QtGui/qpa diff -Nru vlc-3.0.21/contrib/src/qt/set-mkspecs-properties.patch vlc-3.0.22/contrib/src/qt/set-mkspecs-properties.patch --- vlc-3.0.21/contrib/src/qt/set-mkspecs-properties.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/set-mkspecs-properties.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ ---- qt/qmake/generators/makefile.cpp.orig 2022-12-09 12:33:15.756774500 +0100 -+++ qt/qmake/generators/makefile.cpp 2022-12-09 12:41:41.744418400 +0100 -@@ -3471,11 +3471,16 @@ QString MakefileGenerator::installMetaFi - { - QString ret; - QString sedargs = createSedArgs(replace_rule); -- if (sedargs.isEmpty()) { -- ret = "$(INSTALL_FILE) " + escapeFilePath(src) + ' ' + escapeFilePath(dst); -- } else { -- ret = "$(SED) " + sedargs + ' ' + escapeFilePath(src) + " > " + escapeFilePath(dst); -+ QString escaped_src = escapeFilePath(src); -+ if (!sedargs.isEmpty()) { -+ int pos = src.lastIndexOf('.'); -+ QString filename = src.left(pos); -+ QString ext = src.mid(pos + 1); -+ escaped_src = escapeFilePath(filename + ".qmakereplace." + ext); -+ ret += "$(SED) " + sedargs + ' ' + escapeFilePath(src) + " > " -+ + escaped_src + " && "; - } -+ ret += "$(INSTALL_FILE) " + escaped_src + ' ' + escapeFilePath(dst); - return ret; - } diff -Nru vlc-3.0.21/contrib/src/qt/set-mkspecs-version.patch vlc-3.0.22/contrib/src/qt/set-mkspecs-version.patch --- vlc-3.0.21/contrib/src/qt/set-mkspecs-version.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qt/set-mkspecs-version.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ ---- a/mkspecs/features/qml_plugin.prf 2022-09-02 14:15:09.023765377 +0200 -+++ b/mkspecs/features/qml_plugin.prf 2022-09-02 14:59:06.296938907 +0200 -@@ -30,9 +30,9 @@ - } - isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name) - -+isEmpty(VERSION): VERSION = $$MODULE_VERSION - win32:CONFIG(shared, static|shared) { - # Embed a VERSIONINFO resource into the plugin's DLL. -- isEmpty(VERSION): VERSION = $$MODULE_VERSION - CONFIG += skip_target_version_ext - } - ---- a/mkspecs/features/qt_plugin.prf 2022-09-02 14:15:04.593670115 +0200 -+++ b/mkspecs/features/qt_plugin.prf 2022-09-02 14:59:06.296938907 +0200 -@@ -17,9 +17,9 @@ - CONFIG += plugin create_pc - DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE - -+isEmpty(VERSION): VERSION = $$QT_VERSION - win32:CONFIG(shared, static|shared) { - # Embed a VERSIONINFO resource into the plugin's DLL. -- isEmpty(VERSION): VERSION = $$QT_VERSION - CONFIG += skip_target_version_ext - } - diff -Nru vlc-3.0.21/contrib/src/qtdeclarative/0001-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch vlc-3.0.22/contrib/src/qtdeclarative/0001-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch --- vlc-3.0.21/contrib/src/qtdeclarative/0001-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtdeclarative/0001-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -From 3bb63935369d7e1baf53aa401563cc75b87397fb Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii -Date: Sat, 29 Jan 2022 21:59:33 +0200 -Subject: [PATCH 1/2] Make sure QQuickWidget and its offscreen window's screens - are always in sync - -By default, the offscreen window is placed on the primary screen. -However, if the parent widget argument is passed to the QQuickWidget's -constructor, then QQuickWidget's and the offscreen window's screens can -be different and that can create rendering issues, e.g. blurry text if -the primary screen and QQuickWidget's screen have different scale -factors. - -Change-Id: I10c62b5635664f943b11828773f14017f198a770 -Reviewed-by: David Edmundson -Reviewed-by: Laszlo Agocs -(cherry picked from commit a2a2734bffa1459639b31fb3f4f83873ba44ab5c) ---- - src/quickwidgets/qquickwidget.cpp | 26 +++++++++++--------------- - 1 file changed, 11 insertions(+), 15 deletions(-) - -diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp -index 39780f8de3..223d91f579 100644 ---- a/src/quickwidgets/qquickwidget.cpp -+++ b/src/quickwidgets/qquickwidget.cpp -@@ -106,6 +106,7 @@ void QQuickWidgetPrivate::init(QQmlEngine* e) - - renderControl = new QQuickWidgetRenderControl(q); - offscreenWindow = new QQuickWindow(*new QQuickOffcreenWindowPrivate(),renderControl); -+ offscreenWindow->setScreen(q->screen()); - offscreenWindow->setTitle(QString::fromLatin1("Offscreen")); - offscreenWindow->setObjectName(QString::fromLatin1("QQuickOffScreenWindow")); - // Do not call create() on offscreenWindow. -@@ -901,9 +902,7 @@ void QQuickWidgetPrivate::createContext() - - context = new QOpenGLContext; - context->setFormat(offscreenWindow->requestedFormat()); -- const QWindow *win = q->window()->windowHandle(); -- if (win && win->screen()) -- context->setScreen(win->screen()); -+ context->setScreen(q->screen()); - QOpenGLContext *shareContext = qt_gl_global_share_context(); - if (!shareContext) - shareContext = QWidgetPrivate::get(q->window())->shareContext(); -@@ -1520,19 +1519,16 @@ bool QQuickWidget::event(QEvent *e) - d->handleWindowChange(); - break; - -- case QEvent::ScreenChangeInternal: -- if (QWindow *window = this->window()->windowHandle()) { -- QScreen *newScreen = window->screen(); -- -- if (d->offscreenWindow) -- d->offscreenWindow->setScreen(newScreen); -- if (d->offscreenSurface) -- d->offscreenSurface->setScreen(newScreen); -+ case QEvent::ScreenChangeInternal: { -+ QScreen *newScreen = screen(); -+ if (d->offscreenWindow) -+ d->offscreenWindow->setScreen(newScreen); -+ if (d->offscreenSurface) -+ d->offscreenSurface->setScreen(newScreen); - #if QT_CONFIG(opengl) -- if (d->context) -- d->context->setScreen(newScreen); -+ if (d->context) -+ d->context->setScreen(newScreen); - #endif -- } - - if (d->useSoftwareRenderer - #if QT_CONFIG(opengl) -@@ -1545,7 +1541,7 @@ bool QQuickWidget::event(QEvent *e) - d->render(true); - } - break; -- -+ } - case QEvent::Show: - case QEvent::Move: - d->updatePosition(); --- -2.34.1 - diff -Nru vlc-3.0.21/contrib/src/qtdeclarative/0002-Implement-accessibility-for-QQuickWidget.patch vlc-3.0.22/contrib/src/qtdeclarative/0002-Implement-accessibility-for-QQuickWidget.patch --- vlc-3.0.21/contrib/src/qtdeclarative/0002-Implement-accessibility-for-QQuickWidget.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtdeclarative/0002-Implement-accessibility-for-QQuickWidget.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,565 +0,0 @@ -From f2afdde302aeb895989a4fef58c6fa75fc93364f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= -Date: Fri, 7 May 2021 10:07:50 +0200 -Subject: [PATCH 2/2] Implement accessibility for QQuickWidget -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The accessibility tree for the Qt Quick content should -be rooted at the QQuickWidget, and not at the offscreen -QQuickWindow. - -For this to be the case, several things must happen: - - QQuickWindow must not report the child interfaces - - QQuickWidget must report the child interfaces - - The child interfaces must report the QQuickWidget as the parent - -Create accessibility interfaces for QQuickWidget and -and QQuickWigetOffscreenWindow (which now gets a proper -subclass), where the QQuickWidget interface reports -the child interfaces and the QQuickWigetOffscreenWindow -reports no children - -Change the code in QAccessibleQuickItem to use the -true (visible) window, where needed. - -Fixes: QTBUG-67290 -Change-Id: I387d0ef711138d248a8dd16eefc9839499b35eeb -Reviewed-by: Jan Arve Sæther -Reviewed-by: Volker Hilsheimer -(cherry picked from commit 41926e08d73ea6c4bbfc87a1dd52d2cdbc435c27) ---- - src/quick/accessible/qaccessiblequickitem.cpp | 29 +++-- - src/quick/accessible/qaccessiblequickview_p.h | 2 +- - src/quickwidgets/qaccessiblequickwidget.cpp | 110 ++++++++++++++++++ - src/quickwidgets/qaccessiblequickwidget.h | 84 +++++++++++++ - .../qaccessiblequickwidgetfactory.cpp | 60 ++++++++++ - .../qaccessiblequickwidgetfactory_p.h | 66 +++++++++++ - src/quickwidgets/qquickwidget.cpp | 18 ++- - src/quickwidgets/qquickwidget_p.h | 8 ++ - src/quickwidgets/quickwidgets.pro | 8 +- - 9 files changed, 368 insertions(+), 17 deletions(-) - create mode 100644 src/quickwidgets/qaccessiblequickwidget.cpp - create mode 100644 src/quickwidgets/qaccessiblequickwidget.h - create mode 100644 src/quickwidgets/qaccessiblequickwidgetfactory.cpp - create mode 100644 src/quickwidgets/qaccessiblequickwidgetfactory_p.h - -diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp -index 85719fdc80..eb3df4d4cd 100644 ---- a/src/quick/accessible/qaccessiblequickitem.cpp -+++ b/src/quick/accessible/qaccessiblequickitem.cpp -@@ -46,6 +46,7 @@ - #include "QtQuick/private/qquicktextinput_p.h" - #include "QtQuick/private/qquickaccessibleattached_p.h" - #include "QtQuick/qquicktextdocument.h" -+#include "QtQuick/qquickrendercontrol.h" - QT_BEGIN_NAMESPACE - - #if QT_CONFIG(accessibility) -@@ -57,7 +58,19 @@ QAccessibleQuickItem::QAccessibleQuickItem(QQuickItem *item) - - QWindow *QAccessibleQuickItem::window() const - { -- return item()->window(); -+ QQuickWindow *window = item()->window(); -+ -+ // For QQuickWidget the above window will be the offscreen QQuickWindow, -+ // which is not a part of the accessibility tree. Detect this case and -+ // return the window for the QQuickWidget instead. -+ if (window && !window->handle()) { -+ if (QQuickRenderControl *renderControl = QQuickWindowPrivate::get(window)->renderControl) { -+ if (QWindow *renderWindow = renderControl->renderWindow(nullptr)) -+ return renderWindow; -+ } -+ } -+ -+ return window; - } - - int QAccessibleQuickItem::childCount() const -@@ -113,19 +126,15 @@ QAccessibleInterface *QAccessibleQuickItem::childAt(int x, int y) const - QAccessibleInterface *QAccessibleQuickItem::parent() const - { - QQuickItem *parent = item()->parentItem(); -- QQuickWindow *window = item()->window(); -- QQuickItem *ci = window ? window->contentItem() : nullptr; -+ QQuickWindow *itemWindow = item()->window(); -+ QQuickItem *ci = itemWindow ? itemWindow->contentItem() : nullptr; - while (parent && !QQuickItemPrivate::get(parent)->isAccessible && parent != ci) - parent = parent->parentItem(); - - if (parent) { - if (parent == ci) { -- // Jump out to the scene widget if the parent is the root item. -- // There are two root items, QQuickWindow::rootItem and -- // QQuickView::declarativeRoot. The former is the true root item, -- // but is not a part of the accessibility tree. Check if we hit -- // it here and return an interface for the scene instead. -- return QAccessible::queryAccessibleInterface(window); -+ // Jump out to the window if the parent is the root item -+ return QAccessible::queryAccessibleInterface(window()); - } else { - while (parent && !parent->d_func()->isAccessible) - parent = parent->parentItem(); -@@ -188,7 +197,7 @@ QAccessible::State QAccessibleQuickItem::state() const - QRect viewRect_ = viewRect(); - QRect itemRect = rect(); - -- if (viewRect_.isNull() || itemRect.isNull() || !item()->window() || !item()->window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity())) -+ if (viewRect_.isNull() || itemRect.isNull() || !window() || !window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity())) - state.invisible = true; - if (!viewRect_.intersects(itemRect)) - state.offscreen = true; -diff --git a/src/quick/accessible/qaccessiblequickview_p.h b/src/quick/accessible/qaccessiblequickview_p.h -index 39ffcaf39c..8baa01330c 100644 ---- a/src/quick/accessible/qaccessiblequickview_p.h -+++ b/src/quick/accessible/qaccessiblequickview_p.h -@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE - - #if QT_CONFIG(accessibility) - --class QAccessibleQuickWindow : public QAccessibleObject -+class Q_QUICK_EXPORT QAccessibleQuickWindow : public QAccessibleObject - { - public: - QAccessibleQuickWindow(QQuickWindow *object); -diff --git a/src/quickwidgets/qaccessiblequickwidget.cpp b/src/quickwidgets/qaccessiblequickwidget.cpp -new file mode 100644 -index 0000000000..6f04d6693f ---- /dev/null -+++ b/src/quickwidgets/qaccessiblequickwidget.cpp -@@ -0,0 +1,110 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2021 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtQuick module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include "qaccessiblequickwidget.h" -+ -+#include "qquickwidget_p.h" -+ -+QT_BEGIN_NAMESPACE -+ -+#if QT_CONFIG(accessibility) -+ -+QAccessibleQuickWidget::QAccessibleQuickWidget(QQuickWidget* widget) -+: QAccessibleWidget(widget) -+, m_accessibleWindow(QQuickWidgetPrivate::get(widget)->offscreenWindow) -+{ -+ // NOTE: m_accessibleWindow is a QAccessibleQuickWindow, and not a -+ // QAccessibleQuickWidgetOffscreenWindow (defined below). This means -+ // it will return the Quick item child interfaces, which is what's needed here -+ // (unlike QAccessibleQuickWidgetOffscreenWindow, which will report 0 children). -+} -+ -+QAccessibleInterface *QAccessibleQuickWidget::child(int index) const -+{ -+ return m_accessibleWindow.child(index); -+} -+ -+int QAccessibleQuickWidget::childCount() const -+{ -+ return m_accessibleWindow.childCount(); -+} -+ -+int QAccessibleQuickWidget::indexOfChild(const QAccessibleInterface *iface) const -+{ -+ return m_accessibleWindow.indexOfChild(iface); -+} -+ -+QAccessibleInterface *QAccessibleQuickWidget::childAt(int x, int y) const -+{ -+ return m_accessibleWindow.childAt(x, y); -+} -+ -+QAccessibleQuickWidgetOffscreenWindow::QAccessibleQuickWidgetOffscreenWindow(QQuickWindow *window) -+:QAccessibleQuickWindow(window) -+{ -+ -+} -+ -+QAccessibleInterface *QAccessibleQuickWidgetOffscreenWindow::child(int index) const -+{ -+ Q_UNUSED(index); -+ return nullptr; -+} -+ -+int QAccessibleQuickWidgetOffscreenWindow::childCount() const -+{ -+ return 0; -+} -+ -+int QAccessibleQuickWidgetOffscreenWindow::indexOfChild(const QAccessibleInterface *iface) const -+{ -+ Q_UNUSED(iface); -+ return -1; -+} -+ -+QAccessibleInterface *QAccessibleQuickWidgetOffscreenWindow::QAccessibleQuickWidgetOffscreenWindow::childAt(int x, int y) const -+{ -+ Q_UNUSED(x); -+ Q_UNUSED(y); -+ return nullptr; -+} -+ -+#endif // accessibility -+ -+QT_END_NAMESPACE -diff --git a/src/quickwidgets/qaccessiblequickwidget.h b/src/quickwidgets/qaccessiblequickwidget.h -new file mode 100644 -index 0000000000..1f52c78c46 ---- /dev/null -+++ b/src/quickwidgets/qaccessiblequickwidget.h -@@ -0,0 +1,84 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2021 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtQuick module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#ifndef QACCESSIBLEQUICKWIDGET_H -+#define QACCESSIBLEQUICKWIDGET_H -+ -+#include "qquickwidget.h" -+#include -+ -+#include -+ -+QT_BEGIN_NAMESPACE -+ -+#if QT_CONFIG(accessibility) -+ -+// These classes implement the QQuickWiget accessibility switcharoo, -+// where the child items of the QQuickWidgetOffscreenWindow are reported -+// as child accessible interfaces of the QAccessibleQuickWidget. -+class QAccessibleQuickWidget: public QAccessibleWidget -+{ -+public: -+ QAccessibleQuickWidget(QQuickWidget* widget); -+ -+ QAccessibleInterface *child(int index) const override; -+ int childCount() const override; -+ int indexOfChild(const QAccessibleInterface *iface) const override; -+ QAccessibleInterface *childAt(int x, int y) const override; -+ -+private: -+ QAccessibleQuickWindow m_accessibleWindow; -+ Q_DISABLE_COPY(QAccessibleQuickWidget) -+}; -+ -+class QAccessibleQuickWidgetOffscreenWindow: public QAccessibleQuickWindow -+{ -+public: -+ QAccessibleQuickWidgetOffscreenWindow(QQuickWindow *window); -+ QAccessibleInterface *child(int index) const override; -+ int childCount() const override; -+ int indexOfChild(const QAccessibleInterface *iface) const override; -+ QAccessibleInterface *childAt(int x, int y) const override; -+}; -+ -+#endif // accessibility -+ -+QT_END_NAMESPACE -+ -+#endif -diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory.cpp b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp -new file mode 100644 -index 0000000000..3756d0c27c ---- /dev/null -+++ b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp -@@ -0,0 +1,60 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2021 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtQuick module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include "qaccessiblequickwidgetfactory_p.h" -+#include "qaccessiblequickwidget.h" -+ -+QT_BEGIN_NAMESPACE -+ -+#if QT_CONFIG(accessibility) -+ -+QAccessibleInterface *qAccessibleQuickWidgetFactory(const QString &classname, QObject *object) -+{ -+ if (classname == QLatin1String("QQuickWidget")) { -+ return new QAccessibleQuickWidget(qobject_cast(object)); -+ } else if (classname == QLatin1String("QQuickWidgetOffscreenWindow")) { -+ return new QAccessibleQuickWidgetOffscreenWindow(qobject_cast(object)); -+ } -+ return 0; -+} -+ -+#endif // accessibility -+ -+QT_END_NAMESPACE -+ -diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory_p.h b/src/quickwidgets/qaccessiblequickwidgetfactory_p.h -new file mode 100644 -index 0000000000..8c63b09f81 ---- /dev/null -+++ b/src/quickwidgets/qaccessiblequickwidgetfactory_p.h -@@ -0,0 +1,66 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2021 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtQuick module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include -+ -+#ifndef QACCESSIBLEQUICKWIDGETFACTORY_H -+#define QACCESSIBLEQUICKWIDGETFACTORY_H -+ -+// -+// W A R N I N G -+// ------------- -+// -+// This file is not part of the Qt API. It exists purely as an -+// implementation detail. This header file may change from version to -+// version without notice, or even be removed. -+// -+// We mean it. -+// -+ -+QT_BEGIN_NAMESPACE -+ -+#if QT_CONFIG(accessibility) -+ -+QAccessibleInterface *qAccessibleQuickWidgetFactory(const QString &classname, QObject *object); -+ -+#endif -+ -+QT_END_NAMESPACE -+ -+#endif -diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp -index 223d91f579..9c97b43518 100644 ---- a/src/quickwidgets/qquickwidget.cpp -+++ b/src/quickwidgets/qquickwidget.cpp -@@ -39,6 +39,7 @@ - - #include "qquickwidget.h" - #include "qquickwidget_p.h" -+#include "qaccessiblequickwidgetfactory_p.h" - - #include "private/qquickwindow_p.h" - #include "private/qquickitem_p.h" -@@ -75,9 +76,16 @@ - - QT_BEGIN_NAMESPACE - -+QQuickWidgetOffscreenWindow::QQuickWidgetOffscreenWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control) -+:QQuickWindow(dd, control) -+{ -+ setTitle(QString::fromLatin1("Offscreen")); -+ setObjectName(QString::fromLatin1("QQuickOffScreenWindow")); -+} -+ - // override setVisble to prevent accidental offscreen window being created - // by base class. --class QQuickOffcreenWindowPrivate: public QQuickWindowPrivate { -+class QQuickWidgetOffscreenWindowPrivate: public QQuickWindowPrivate { - public: - void setVisible(bool visible) override { - Q_Q(QWindow); -@@ -105,10 +113,8 @@ void QQuickWidgetPrivate::init(QQmlEngine* e) - Q_Q(QQuickWidget); - - renderControl = new QQuickWidgetRenderControl(q); -- offscreenWindow = new QQuickWindow(*new QQuickOffcreenWindowPrivate(),renderControl); -+ offscreenWindow = new QQuickWidgetOffscreenWindow(*new QQuickWidgetOffscreenWindowPrivate(), renderControl); - offscreenWindow->setScreen(q->screen()); -- offscreenWindow->setTitle(QString::fromLatin1("Offscreen")); -- offscreenWindow->setObjectName(QString::fromLatin1("QQuickOffScreenWindow")); - // Do not call create() on offscreenWindow. - - // Check if the Software Adaptation is being used -@@ -139,6 +145,10 @@ void QQuickWidgetPrivate::init(QQmlEngine* e) - QWidget::connect(offscreenWindow, &QQuickWindow::focusObjectChanged, q, &QQuickWidget::propagateFocusObjectChanged); - QObject::connect(renderControl, SIGNAL(renderRequested()), q, SLOT(triggerUpdate())); - QObject::connect(renderControl, SIGNAL(sceneChanged()), q, SLOT(triggerUpdate())); -+ -+#if QT_CONFIG(accessibility) -+ QAccessible::installFactory(&qAccessibleQuickWidgetFactory); -+#endif - } - - void QQuickWidgetPrivate::ensureEngine() const -diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h -index 881f7f9220..1a946bcc71 100644 ---- a/src/quickwidgets/qquickwidget_p.h -+++ b/src/quickwidgets/qquickwidget_p.h -@@ -148,6 +148,14 @@ public: - bool forceFullUpdate; - }; - -+class QQuickWidgetOffscreenWindow: public QQuickWindow -+{ -+ Q_OBJECT -+ -+public: -+ QQuickWidgetOffscreenWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control); -+}; -+ - QT_END_NAMESPACE - - #endif // QQuickWidget_P_H -diff --git a/src/quickwidgets/quickwidgets.pro b/src/quickwidgets/quickwidgets.pro -index 2438e577ae..f46deb54ac 100644 ---- a/src/quickwidgets/quickwidgets.pro -+++ b/src/quickwidgets/quickwidgets.pro -@@ -7,9 +7,13 @@ DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FO - HEADERS += \ - qquickwidget.h \ - qquickwidget_p.h \ -- qtquickwidgetsglobal.h -+ qtquickwidgetsglobal.h \ -+ qaccessiblequickwidget.h \ -+ qaccessiblequickwidgetfactory_p.h - - SOURCES += \ -- qquickwidget.cpp -+ qquickwidget.cpp \ -+ qaccessiblequickwidget.cpp \ -+ qaccessiblequickwidgetfactory.cpp - - load(qt_module) --- -2.34.1 - diff -Nru vlc-3.0.21/contrib/src/qtdeclarative/SHA512SUMS vlc-3.0.22/contrib/src/qtdeclarative/SHA512SUMS --- vlc-3.0.21/contrib/src/qtdeclarative/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtdeclarative/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73 qtdeclarative-everywhere-src-5.15.8.tar.xz diff -Nru vlc-3.0.21/contrib/src/qtdeclarative/rules.mak vlc-3.0.22/contrib/src/qtdeclarative/rules.mak --- vlc-3.0.21/contrib/src/qtdeclarative/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtdeclarative/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -# QtDeclarative - -QTDECLARATIVE_VERSION_MAJOR := 5.15 -QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).8 -QTDECLARATIVE_URL := $(QT)/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-opensource-src-$(QTDECLARATIVE_VERSION).tar.xz - -DEPS_qtdeclarative += qt $(DEPS_qt) - -ifdef HAVE_WIN32 -PKGS += qtdeclarative -endif - -ifeq ($(call need_pkg,"Qt5Quick"),) -PKGS_FOUND += qtdeclarative -endif - -$(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz: - $(call download_pkg,$(QTDECLARATIVE_URL),qt) - -.sum-qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz - -qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative - $(UNPACK) - $(APPLY) $(SRC)/qtdeclarative/0001-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch - $(APPLY) $(SRC)/qtdeclarative/0002-Implement-accessibility-for-QQuickWidget.patch - # do not build qml.exe and other useless tools - sed -i.orig 's,!wasm:!rtems ,!wasm:!rtems:!static ,' "$(UNPACK_DIR)/tools/tools.pro" - $(MOVE) - -QT_DECLARATIVE_CONFIG := \ - -no-feature-d3d12 \ - -no-feature-qml-debug \ - -no-feature-quick-designer \ - -no-feature-quick-particles - -.qtdeclarative: qtdeclarative - # Generate Makefile & src/Makefile - $(call qmake_toolchain, $<) - cd $< && $(PREFIX)/lib/qt5/bin/qmake -- $(QT_DECLARATIVE_CONFIG) - $(MAKE) -C $< - $(MAKE) -C $< install - touch $@ diff -Nru vlc-3.0.21/contrib/src/qtgraphicaleffects/SHA512SUMS vlc-3.0.22/contrib/src/qtgraphicaleffects/SHA512SUMS --- vlc-3.0.21/contrib/src/qtgraphicaleffects/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtgraphicaleffects/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bac9d18492b7ce0092ae9e3b27bcbc2fa421531eb76b3f4c69d20eeaa0520201eca850a2cc692c38f00b8efb24015cd28f53bd892b350e3c1d1337003b399c28 qtgraphicaleffects-everywhere-src-5.15.8.tar.xz diff -Nru vlc-3.0.21/contrib/src/qtgraphicaleffects/rules.mak vlc-3.0.22/contrib/src/qtgraphicaleffects/rules.mak --- vlc-3.0.21/contrib/src/qtgraphicaleffects/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtgraphicaleffects/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -# QtGraphicalEffects - -QTGE_VERSION_MAJOR := 5.15 -QTGE_VERSION := $(QTGE_VERSION_MAJOR).8 -QTGE_URL := $(QT)/$(QTGE_VERSION_MAJOR)/$(QTGE_VERSION)/submodules/qtgraphicaleffects-everywhere-opensource-src-$(QTGE_VERSION).tar.xz - -DEPS_qtgraphicaleffects += qtdeclarative $(DEPS_qtdeclarative) - -ifdef HAVE_WIN32 -PKGS += qtgraphicaleffects -endif - -ifeq ($(call need_pkg,"Qt5QuickControls2"),) -PKGS_FOUND += qtgraphicaleffects -endif - -$(TARBALLS)/qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz: - $(call download_pkg,$(QTGE_URL),qt) - -.sum-qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz - -qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz .sum-qtgraphicaleffects - $(UNPACK) - $(MOVE) - -.qtgraphicaleffects: qtgraphicaleffects - $(call qmake_toolchain, $<) - cd $< && $(PREFIX)/lib/qt5/bin/qmake - $(MAKE) -C $< - $(MAKE) -C $< install - touch $@ diff -Nru vlc-3.0.21/contrib/src/qtquickcontrols2/SHA512SUMS vlc-3.0.22/contrib/src/qtquickcontrols2/SHA512SUMS --- vlc-3.0.21/contrib/src/qtquickcontrols2/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtquickcontrols2/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -d42fd70f1d9d1d951e5a8eee886311bf70f0c9b21718b3b76b87ee38fee010c654abc82259e73883c9aca36dafcefb25e5297bf34213cafe4da6a68c4f45d816 qtquickcontrols2-everywhere-src-5.15.8.tar.xz diff -Nru vlc-3.0.21/contrib/src/qtquickcontrols2/rules.mak vlc-3.0.22/contrib/src/qtquickcontrols2/rules.mak --- vlc-3.0.21/contrib/src/qtquickcontrols2/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtquickcontrols2/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# QtQuickControls 2 - -QTQC2_VERSION_MAJOR := 5.15 -QTQC2_VERSION := $(QTQC2_VERSION_MAJOR).8 -QTQC2_URL := $(QT)/$(QTQC2_VERSION_MAJOR)/$(QTQC2_VERSION)/submodules/qtquickcontrols2-everywhere-opensource-src-$(QTQC2_VERSION).tar.xz - -ifdef HAVE_WIN32 -PKGS += qtquickcontrols2 -endif - -ifeq ($(call need_pkg,"Qt5QuickControls2"),) -PKGS_FOUND += qtquickcontrols2 -endif -# QtQuickControl(1) doesn't provide a .pc - -DEPS_qtquickcontrols2 = qtdeclarative $(DEPS_qtdeclarative) - -$(TARBALLS)/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz: - $(call download_pkg,$(QTQC2_URL),qt) - -.sum-qtquickcontrols2: qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz - -qtquickcontrols2: qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2 - $(UNPACK) - $(MOVE) - -QUICK_CONTROL_CONFIG := \ - -no-feature-quicktemplates2-multitouch \ - -no-feature-quickcontrols2-universal \ - -no-feature-quickcontrols2-material \ - -no-feature-quickcontrols2-imagine - -.qtquickcontrols2: qtquickcontrols2 - $(call qmake_toolchain, $<) - cd $< && $(PREFIX)/lib/qt5/bin/qmake -- $(QUICK_CONTROL_CONFIG) - # Make && Install libraries - $(MAKE) -C $< -ifndef HAVE_CROSS_COMPILE - cd $<; for i in QtQuickControls2 QtQuickTemplates2; do \ - sed -i -e 's,"../../../../../src,"../src,g' include/$$i/$(QTQC2_VERSION)/$$i/private/*.h; done -endif - $(MAKE) -C $< install - touch $@ diff -Nru vlc-3.0.21/contrib/src/qtsvg/rules.mak vlc-3.0.22/contrib/src/qtsvg/rules.mak --- vlc-3.0.21/contrib/src/qtsvg/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtsvg/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -27,8 +27,8 @@ .qtsvg: qtsvg cd $< && $(PREFIX)/bin/qmake # Make && Install libraries - cd $< && $(MAKE) - cd $< && $(MAKE) -C src sub-plugins-install_subtargets sub-svg-install_subtargets + $(MAKE) -C $< + $(MAKE) -C $< -C src sub-plugins-install_subtargets sub-svg-install_subtargets mv $(PREFIX)/plugins/iconengines/libqsvgicon.a $(PREFIX)/lib/ mv $(PREFIX)/plugins/imageformats/libqsvg.a $(PREFIX)/lib/ cd $(PREFIX)/lib/pkgconfig; sed -i \ diff -Nru vlc-3.0.21/contrib/src/qtwayland/SHA512SUMS vlc-3.0.22/contrib/src/qtwayland/SHA512SUMS --- vlc-3.0.21/contrib/src/qtwayland/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtwayland/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d qtwayland-everywhere-src-5.15.8.tar.xz diff -Nru vlc-3.0.21/contrib/src/qtwayland/rules.mak vlc-3.0.22/contrib/src/qtwayland/rules.mak --- vlc-3.0.21/contrib/src/qtwayland/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtwayland/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# qtwayland - -QTWAYLAND_VERSION_MAJOR := 5.15 -QTWAYLAND_VERSION := $(QTWAYLAND_VERSION_MAJOR).8 -QTWAYLAND_URL := $(QT)/$(QTWAYLAND_VERSION_MAJOR)/$(QTWAYLAND_VERSION)/submodules/qtwayland-everywhere-opensource-src-$(QTWAYLAND_VERSION).tar.xz - -DEPS_qtwayland = qtdeclarative $(DEPS_qtdeclarative) - -$(TARBALLS)/qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz: - $(call download,$(QTWAYLAND_URL)) - -.sum-qtwayland: qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz - -qtwayland: qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz .sum-qtwayland - $(UNPACK) - sed -i.orig '/SUBDIRS/d' "$(UNPACK_DIR)/tests/tests.pro" - sed -i.orig 's/"egl drm"/"egl"/g' \ - $(UNPACK_DIR)/src/compositor/configure.json \ - $(UNPACK_DIR)/src/client/configure.json - $(MOVE) - -.qtwayland: qtwayland - $(call qmake_toolchain, $<) - cd $< && $(PREFIX)/lib/qt5/bin/qmake - # Make && Install libraries - $(MAKE) -C $< - $(MAKE) -C $< install - touch $@ diff -Nru vlc-3.0.21/contrib/src/qtx11extras/SHA512SUMS vlc-3.0.22/contrib/src/qtx11extras/SHA512SUMS --- vlc-3.0.21/contrib/src/qtx11extras/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtx11extras/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -a7b2cd611ec863b43cbf16a09868a9543b4dfc3c40b21c23317a3520345a9464e2ad34f884f3619fa67fdf563bc2d1a8b31d97d063766a8988454ee4a8c8e1fd qtx11extras-everywhere-src-5.15.8.tar.xz diff -Nru vlc-3.0.21/contrib/src/qtx11extras/rules.mak vlc-3.0.22/contrib/src/qtx11extras/rules.mak --- vlc-3.0.21/contrib/src/qtx11extras/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/qtx11extras/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# qtx11extras - -QTX11_VERSION_MAJOR := 5.15 -QTX11_VERSION:= $(QTX11_VERSION_MAJOR).8 -QTX11_URL := $(QT)/$(QTX11_VERSION_MAJOR)/$(QTX11_VERSION)/submodules/qtx11extras-everywhere-opensource-src-$(QTX11_VERSION).tar.xz - -DEPS_qtx11extras += qt $(DEPS_qt) - -$(TARBALLS)/qtx11extras-everywhere-src-$(QTX11_VERSION).tar.xz: - $(call download,$(QTX11_URL)) - -.sum-qtx11extras: qtx11extras-everywhere-src-$(QTX11_VERSION).tar.xz - -qtx11extras: qtx11extras-everywhere-src-$(QTX11_VERSION).tar.xz .sum-qtx11extras - $(UNPACK) - $(MOVE) - -.qtx11extras: qtx11extras - $(call qmake_toolchain, $<) - cd $< && $(PREFIX)/lib/qt5/bin/qmake - # Make && Install libraries - $(MAKE) -C $< - $(MAKE) -C $< install - touch $@ diff -Nru vlc-3.0.21/contrib/src/rav1e/SHA512SUMS vlc-3.0.22/contrib/src/rav1e/SHA512SUMS --- vlc-3.0.21/contrib/src/rav1e/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/rav1e/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -e2c8502da92cb954c587049e544bd136514a5b9f26acaf3430d6e727da4c050de2cabb6a6e0d017ba79194ec45d9078aa7846746e823837373b4ed391db6e70a rav1e-0.6.6.tar.gz diff -Nru vlc-3.0.21/contrib/src/rav1e/rules.mak vlc-3.0.22/contrib/src/rav1e/rules.mak --- vlc-3.0.21/contrib/src/rav1e/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/rav1e/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -# rav1e - -RAV1E_VERSION := 0.6.6 -RAV1E_URL := https://crates.io/api/v1/crates/rav1e/$(RAV1E_VERSION)/download - -ifdef BUILD_RUST -ifdef BUILD_ENCODERS -# Rav1e is not linking correctly on iOS arm64 -ifndef HAVE_IOS -PKGS += rav1e -endif -endif -endif - -ifeq ($(call need_pkg,"rav1e"),) -PKGS_FOUND += rav1e -endif - -$(TARBALLS)/rav1e-$(RAV1E_VERSION).tar.gz: - $(call download_pkg,$(RAV1E_URL),rav1e) - -.sum-rav1e: rav1e-$(RAV1E_VERSION).tar.gz - -RAV1E_FEATURES=--features=asm - -rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e .rav1e-vendor - $(UNPACK) -ifdef HAVE_WIN32 -ifndef HAVE_WIN64 - $(APPLY) $(SRC)/rav1e/unwind-resume-stub.patch -endif -endif - $(CARGO_VENDOR_SETUP) - $(MOVE) - -.rav1e: rav1e .cargo - +cd $< && $(CARGOC_INSTALL) --no-default-features $(RAV1E_FEATURES) -# No gcc in Android NDK25 -ifdef HAVE_ANDROID - sed -i -e 's/ -lgcc//g' $(PREFIX)/lib/pkgconfig/rav1e.pc -endif - touch $@ diff -Nru vlc-3.0.21/contrib/src/rav1e/unwind-resume-stub.patch vlc-3.0.22/contrib/src/rav1e/unwind-resume-stub.patch --- vlc-3.0.21/contrib/src/rav1e/unwind-resume-stub.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/rav1e/unwind-resume-stub.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -From d186b5350e425a82dbd4513b5d629dc892c3c4a5 Mon Sep 17 00:00:00 2001 -From: Tristan Matthews -Date: Fri, 25 Feb 2022 12:30:01 -0500 -Subject: [PATCH] lib: workaround for - https://github.com/rust-lang/rust/issues/79609 - -This avoids to broken linking on some mingw32 versions. The function -will never be called since we set `-C panic=abort`. ---- - src/lib.rs | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/src/lib.rs b/src/lib.rs -index 3425588d..1b645340 100644 ---- a/src/lib.rs -+++ b/src/lib.rs -@@ -486,3 +486,35 @@ pub mod bench { - - #[cfg(fuzzing)] - pub mod fuzzing; -+ -+#[no_mangle] -+#[allow(non_snake_case)] -+fn _Unwind_GetDataRelBase() {} -+ -+#[no_mangle] -+#[allow(non_snake_case)] -+fn _Unwind_GetIPInfo() {} -+ -+#[no_mangle] -+#[allow(non_snake_case)] -+fn _Unwind_GetLanguageSpecificData() {} -+ -+#[no_mangle] -+#[allow(non_snake_case)] -+fn _Unwind_GetRegionStart() {} -+ -+#[no_mangle] -+#[allow(non_snake_case)] -+fn _Unwind_GetTextRelBase() {} -+ -+#[no_mangle] -+#[allow(non_snake_case)] -+fn _Unwind_Resume() {} -+ -+#[no_mangle] -+#[allow(non_snake_case)] -+fn _Unwind_SetGR() {} -+ -+#[no_mangle] -+#[allow(non_snake_case)] -+fn _Unwind_SetIP() {} --- -2.37.1 (Apple Git-137.1) - diff -Nru vlc-3.0.21/contrib/src/rav1e-vendor/SHA512SUMS vlc-3.0.22/contrib/src/rav1e-vendor/SHA512SUMS --- vlc-3.0.21/contrib/src/rav1e-vendor/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/rav1e-vendor/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -33527a381fe402fc7372ad853d0fb3a15c9ea0be45ff288c41621a979f97967d187f3694f2e2cb2f84af774bbf444ae2d2e22ce3237d76e427b746b03602afc8 rav1e-0.3.4-vendor.tar.bz2 diff -Nru vlc-3.0.21/contrib/src/rav1e-vendor/rules.mak vlc-3.0.22/contrib/src/rav1e-vendor/rules.mak --- vlc-3.0.21/contrib/src/rav1e-vendor/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/rav1e-vendor/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# rav1e-vendor - -$(TARBALLS)/rav1e-$(RAV1E_VERSION)-vendor.tar.bz2: - $(call download_vendor,rav1e-$(RAV1E_VERSION)-vendor.tar.bz2,rav1e) - -.rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 diff -Nru vlc-3.0.21/contrib/src/regex/rules.mak vlc-3.0.22/contrib/src/regex/rules.mak --- vlc-3.0.21/contrib/src/regex/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/regex/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -20,7 +20,7 @@ .regex: regex cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) subirs= + $(MAKE) -C $< subirs= cd $< && $(AR) rcvu libregex.a regex.o && $(RANLIB) libregex.a mkdir -p $(PREFIX)/include/ && cp $= 1.0.24"),) -PKGS_FOUND += alsa -endif - -DEPS_alsa = salsa $(DEPS_salsa) - -.sum-alsa: .sum-salsa - touch $@ - -.alsa: .sum-alsa - touch $@ diff -Nru vlc-3.0.21/contrib/src/salsa/salsa-cast-fix.patch vlc-3.0.22/contrib/src/salsa/salsa-cast-fix.patch --- vlc-3.0.21/contrib/src/salsa/salsa-cast-fix.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/salsa/salsa-cast-fix.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From 0c83bfa7ddc13efa2160a8d6f2d081818ed5d6af Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 25 Feb 2022 09:37:13 +0100 -Subject: [PATCH] fix invalid cast - -I get this error when compiling - -``` -error: assignment to 'snd_config_t **' {aka 'struct _snd_config **'} from incompatible pointer type 'snd_config_t *' {aka 'struct _snd_config *'} [-Werror=incompatible-pointer-types] -| top = (snd_config_t*)1; -| ^ -``` ---- - src/conf.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conf.h b/src/conf.h -index 56858e7..2603d93 100644 ---- a/src/conf.h -+++ b/src/conf.h -@@ -69,7 +69,7 @@ __SALSA_EXPORT_FUNC - int snd_config_update_ref(snd_config_t **top) - { - /* an invalid address, but just mark to be non-NULL */ -- top = (snd_config_t*)1; -+ *top = (snd_config_t*)1; - snd_config_update(); - return 0; - } diff -Nru vlc-3.0.21/contrib/src/samplerate/rules.mak vlc-3.0.22/contrib/src/samplerate/rules.mak --- vlc-3.0.21/contrib/src/samplerate/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/samplerate/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -22,5 +22,6 @@ .samplerate: samplerate $(REQUIRE_GPL) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) -C src install && $(MAKE) install-data + $(MAKE) -C $< -C src install + $(MAKE) -C $< install-data touch $@ diff -Nru vlc-3.0.21/contrib/src/schroedinger/rules.mak vlc-3.0.22/contrib/src/schroedinger/rules.mak --- vlc-3.0.21/contrib/src/schroedinger/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/schroedinger/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -15,14 +15,19 @@ schroedinger: schroedinger-$(SCHROEDINGER_VERSION).tar.gz .sum-schroedinger $(UNPACK) + $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/schroedinger/schroedinger-notests.patch + # disable orc compilation, the old compiler matches what was used to precompile + $(APPLY) $(SRC)/schroedinger/schroedinger-disable-orcc.patch $(call pkg_static,"schroedinger.pc.in") $(MOVE) DEPS_schroedinger = orc $(DEPS_orc) +SCHRODINGER_CONF := --with-thread=none --disable-gtk-doc + .schroedinger: schroedinger $(RECONF) - cd $< && $(HOSTVARS) ./configure --with-thread=none --disable-gtk-doc $(HOSTCONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SCHRODINGER_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/schroedinger/schroedinger-disable-orcc.patch vlc-3.0.22/contrib/src/schroedinger/schroedinger-disable-orcc.patch --- vlc-3.0.21/contrib/src/schroedinger/schroedinger-disable-orcc.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/schroedinger/schroedinger-disable-orcc.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,11 @@ +--- schroedinger/configure.ac.orig 2024-05-24 11:11:32.059775800 +0200 ++++ schroedinger/configure.ac 2024-05-24 11:11:46.999404400 +0200 +@@ -56,7 +56,7 @@ fi + SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER" + ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` + AC_SUBST(ORCC) +-AM_CONDITIONAL(HAVE_ORCC, test "x$cross_compiling" != xyes) ++AM_CONDITIONAL(HAVE_ORCC, test "x$cross_compiling" = none) + + AC_ARG_WITH([thread], + AS_HELP_STRING([--with-thread=IMPL],[use threading library {auto,pthread,gthread,win32,none} [[default=auto]]]), diff -Nru vlc-3.0.21/contrib/src/sdl/rules.mak vlc-3.0.22/contrib/src/sdl/rules.mak --- vlc-3.0.21/contrib/src/sdl/rules.mak 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/sdl/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -42,5 +42,5 @@ .sdl: sdl cd $< && $(HOSTVARS) ./configure $(SDLCONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/shout/0001-Favor-GetCurrentProcessId-on-Windows.patch vlc-3.0.22/contrib/src/shout/0001-Favor-GetCurrentProcessId-on-Windows.patch --- vlc-3.0.21/contrib/src/shout/0001-Favor-GetCurrentProcessId-on-Windows.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/shout/0001-Favor-GetCurrentProcessId-on-Windows.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -From 8a11efd9c218275816f75148e7096c27f390932c Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Tue, 23 May 2023 14:23:11 +0200 -Subject: [PATCH] Favor GetCurrentProcessId() on Windows - -getpid() is not available in UWP [1] builds but GetCurrentProcessId() is. -It's available since Windows XP [2]. - -[1] https://learn.microsoft.com/en-us/cpp/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps -[2] https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getcurrentprocessid ---- - src/proto_roaraudio.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/proto_roaraudio.c b/src/proto_roaraudio.c -index 041590d..a2b1fb5 100644 ---- a/src/proto_roaraudio.c -+++ b/src/proto_roaraudio.c -@@ -111,7 +111,11 @@ static int shout_create_roaraudio_request_ident(shout_t *self, shout_connection_ - size_t datalen; - uint8_t *data; - const char *agent; -+#ifdef _WIN32 -+ uint32_t pid = GetCurrentProcessId(); -+#else - uint32_t pid = getpid(); -+#endif - - /* We implement version 1 IDENTIFY header. - * It has the following structure: --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/shout/add-missing-stdlib-stdio.patch vlc-3.0.22/contrib/src/shout/add-missing-stdlib-stdio.patch --- vlc-3.0.21/contrib/src/shout/add-missing-stdlib-stdio.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/shout/add-missing-stdlib-stdio.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ ---- a/src/legacy.c 2022-04-10 12:10:14.000000000 +0200 -+++ b/src/legacy.c 2022-09-14 16:16:30.000000000 +0200 -@@ -28,6 +28,8 @@ - #include "shout_private.h" - #include "util.h" - -+#include -+ - int shout_set_format(shout_t *self, unsigned int format) - { - if (!self) ---- a/src/icy.c 2022-04-10 12:10:14.000000000 +0200 -+++ b/src/icy.c 2022-09-14 16:19:42.000000000 +0200 -@@ -25,6 +25,8 @@ - - #include - #include -+#include -+#include - - #include - diff -Nru vlc-3.0.21/contrib/src/shout/rules.mak vlc-3.0.22/contrib/src/shout/rules.mak --- vlc-3.0.21/contrib/src/shout/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/shout/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ # shout SHOUT_VERSION := 2.4.1 -SHOUT_URL := http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz +SHOUT_URL := $(XIPH)/libshout/libshout-$(SHOUT_VERSION).tar.gz ifdef BUILD_ENCODERS ifdef BUILD_NETWORK @@ -37,17 +37,17 @@ DEPS_shout = ogg $(DEPS_ogg) theora $(DEPS_theora) speex $(DEPS_speex) DEPS_shout += vorbis $(DEPS_vorbis) -SHOUT_CONF := +SHOUT_CONF := --disable-examples --disable-tools --without-openssl ifdef HAVE_WIN32 -SHOUT_CONF += "--disable-thread" +SHOUT_CONF += --disable-thread endif ifdef HAVE_ANDROID -SHOUT_CONF += "--disable-thread" +SHOUT_CONF += --disable-thread endif .shout: libshout $(RECONF) - cd $< && $(HOSTVARS) ./configure --without-openssl $(SHOUT_CONF) $(HOSTCONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SHOUT_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/sidplay2/rules.mak vlc-3.0.22/contrib/src/sidplay2/rules.mak --- vlc-3.0.21/contrib/src/sidplay2/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/sidplay2/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -18,16 +18,19 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2 $(UNPACK) + $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/sidplay2/sidplay2-openmode.patch $(APPLY) $(SRC)/sidplay2/sidplay2-endian.patch $(APPLY) $(SRC)/sidplay2/sidplay2-smartprt.patch $(APPLY) $(SRC)/sidplay2/sidplay2-noutils.patch $(APPLY) $(SRC)/sidplay2/sidplay2-string.patch $(APPLY) $(SRC)/sidplay2/sidplay2-fix-overflow.patch + $(APPLY) $(SRC)/sidplay2/sidplay2-cxxtest.patch $(MOVE) .sidplay2: sidplay-libs $(REQUIRE_GPL) + #export ac_cv_sizeof_int=4 for d in . libsidplay builders resid builders/resid-builder \ builders/hardsid-builder libsidutils ; \ do \ @@ -39,6 +42,6 @@ (cd $= 0.1"),) PKGS_FOUND += soxr @@ -29,15 +29,17 @@ SOXR_EXTRA_CONF=-DCMAKE_SYSTEM_NAME=Generic endif -.soxr: soxr toolchain.cmake - rm -f $= 1.0.5"),) @@ -24,13 +24,10 @@ SPEEX_CONF += --enable-arm5e-asm endif endif -ifeq ($(ARCH),aarch64) -SPEEX_CONF += --disable-neon -endif .speex: speex cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF) - cd $< && $(MAKE) + $(MAKE) -C $< $(call pkg_static,"speex.pc") - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/speexdsp/missing-stdint-for-aarch.patch vlc-3.0.22/contrib/src/speexdsp/missing-stdint-for-aarch.patch --- vlc-3.0.21/contrib/src/speexdsp/missing-stdint-for-aarch.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/speexdsp/missing-stdint-for-aarch.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From 1d99e79f604aa23fd3c9db2a727f24287519999b Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Wed, 22 Jun 2022 09:19:45 +0200 -Subject: [PATCH 1/1] resample_neon.h: add missing stdint include for aarch64 - -aarch64 code is referencing stdint types but the file is missing -the include. - -Signed-off-by: Tristan Matthews ---- - libspeexdsp/resample_neon.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libspeexdsp/resample_neon.h b/libspeexdsp/resample_neon.h -index e14ffe1..85a51fe 100644 ---- a/libspeexdsp/resample_neon.h -+++ b/libspeexdsp/resample_neon.h -@@ -36,6 +36,8 @@ - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include -+ - #ifdef FIXED_POINT - #if defined(__aarch64__) - static inline int32_t saturate_32bit_to_16bit(int32_t a) { --- -2.34.1 - diff -Nru vlc-3.0.21/contrib/src/speexdsp/rules.mak vlc-3.0.22/contrib/src/speexdsp/rules.mak --- vlc-3.0.21/contrib/src/speexdsp/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/speexdsp/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ # speexdsp SPEEXDSP_VERSION := 1.2.1 -SPEEXDSP_URL := http://downloads.us.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz +SPEEXDSP_URL := $(XIPH)/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz PKGS += speexdsp ifeq ($(call need_pkg,"speexdsp"),) @@ -35,7 +35,7 @@ .speexdsp: speexdsp $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF) - cd $< && $(MAKE) + $(MAKE) -C $< $(call pkg_static,"speexdsp.pc") - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/sqlite/SHA512SUMS vlc-3.0.22/contrib/src/sqlite/SHA512SUMS --- vlc-3.0.21/contrib/src/sqlite/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/sqlite/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -fd6761a6c8f76d137cc8c98b8ae77f8f4206dbf187d66e324f7dc6a79eb752d441446139216eadb534cf5601345c2ea1da3312305e24c762b6e16318cf4adb5e sqlite-3.6.20.tar.gz diff -Nru vlc-3.0.21/contrib/src/sqlite/rules.mak vlc-3.0.22/contrib/src/sqlite/rules.mak --- vlc-3.0.21/contrib/src/sqlite/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/sqlite/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# sqlite - -SQLITE_VERSION := 3.6.20 -SQLITE_URL := http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz - -# PKGS += sqlite - -ifeq ($(call need_pkg,"sqlite3"),) -PKGS_FOUND += sqlite -endif - -$(TARBALLS)/sqlite-$(SQLITE_VERSION).tar.gz: - $(call download_pkg,$(SQLITE_URL),sqlite) - -.sum-sqlite: sqlite-$(SQLITE_VERSION).tar.gz - -sqlite: sqlite-$(SQLITE_VERSION).tar.gz .sum-sqlite - $(UNPACK) - $(MOVE) - -.sqlite: sqlite - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) && $(MAKE) install - touch $@ diff -Nru vlc-3.0.21/contrib/src/srt/0001-build-fix-implicit-libraries-set-using-Wl-l-libname..patch vlc-3.0.22/contrib/src/srt/0001-build-fix-implicit-libraries-set-using-Wl-l-libname..patch --- vlc-3.0.21/contrib/src/srt/0001-build-fix-implicit-libraries-set-using-Wl-l-libname..patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/srt/0001-build-fix-implicit-libraries-set-using-Wl-l-libname..patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,33 @@ +From 64157b23fd0359fdbe706a17154be3733fc0deb2 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Fri, 10 Jan 2025 13:04:59 +0100 +Subject: [PATCH] [build] fix implicit libraries set using -Wl,-l:libname.a + +We need to turn it to a more generic name in the pkg-config file. +--- + CMakeLists.txt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1492306..49d4869 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1183,7 +1183,14 @@ endif() + # obtained by `pkg-config --libs`. + if(ENABLE_CXX_DEPS) + foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}) +- if((IS_ABSOLUTE ${LIB} AND EXISTS ${LIB}) OR (${LIB} MATCHES "^-l")) ++ if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB}) ++ set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ${LIB}) ++ elseif(${LIB} MATCHES "-l:lib.*.a") ++ string(LENGTH ${LIB} LIBLEN) ++ math(EXPR LIBLEN "${LIBLEN}-8") ++ string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB) ++ set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} "-l${DIRECT_LIB}") ++ elseif(${LIB} MATCHES "^-l") + set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ${LIB}) + else() + set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} "-l${LIB}") +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/srt/0001-core-ifdef-MSG_TRUNC-nixes-fix.patch vlc-3.0.22/contrib/src/srt/0001-core-ifdef-MSG_TRUNC-nixes-fix.patch --- vlc-3.0.21/contrib/src/srt/0001-core-ifdef-MSG_TRUNC-nixes-fix.patch 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/contrib/src/srt/0001-core-ifdef-MSG_TRUNC-nixes-fix.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From b159a783ac11cb6c2c8ec035deaeb3d8a73e0e2f Mon Sep 17 00:00:00 2001 -From: Francois Cartegnie -Date: Mon, 9 Nov 2020 20:54:14 +0100 -Subject: [PATCH] core: ifdef MSG_TRUNC nixes fix - ---- - srtcore/channel.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp -index 3473e75..3af852e 100644 ---- a/srtcore/channel.cpp -+++ b/srtcore/channel.cpp -@@ -801,6 +801,7 @@ EReadStatus CChannel::recvfrom(sockaddr_any& w_addr, CPacket& w_packet) const - goto Return_error; - } - -+#ifndef _WIN32 - // Fix for an issue with Linux Kernel found during tests at Tencent. - // - // There was a bug in older Linux Kernel which caused that when the internal -@@ -825,6 +826,7 @@ EReadStatus CChannel::recvfrom(sockaddr_any& w_addr, CPacket& w_packet) const - status = RST_AGAIN; - goto Return_error; - } -+#endif - - w_packet.setLength(recv_size - CPacket::HDR_SIZE); - --- -2.26.2 - diff -Nru vlc-3.0.21/contrib/src/srt/SHA512SUMS vlc-3.0.22/contrib/src/srt/SHA512SUMS --- vlc-3.0.21/contrib/src/srt/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/srt/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -0d51e0ef73f4aa7eb284288cdbbd75b1c161969c2c2fed3a6d4e13a931341ca41dfcf2d6c1b9728f72b43454a9fde3764da67a27af9f0c99a6818682e4f4d4ba srt-1.4.4.tar.gz +5b576d6fd325515e05074e4568e3b65d1ae265e3e971db6e6242e5138243fc1594df1e3a7d90962385dac38abc34c4c4b0a567439050f8c0ff818b3b3d497efc srt-1.5.3.tar.gz diff -Nru vlc-3.0.21/contrib/src/srt/rules.mak vlc-3.0.22/contrib/src/srt/rules.mak --- vlc-3.0.21/contrib/src/srt/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/srt/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,11 +1,22 @@ # srt -SRT_VERSION := 1.4.4 +SRT_VERSION := 1.5.3 SRT_URL := $(GITHUB)/Haivision/srt/archive/v$(SRT_VERSION).tar.gz +# gnutls (nettle/gmp) can't be used with the LGPLv2 license +ifdef GPL +SRT_PKG=1 +else +ifdef GNUV3 +SRT_PKG=1 +endif +endif + ifdef BUILD_NETWORK +ifdef SRT_PKG PKGS += srt endif +endif ifeq ($(call need_pkg,"srt >= 1.3.1"),) PKGS_FOUND += srt @@ -23,12 +34,15 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt $(UNPACK) - $(APPLY) $(SRC)/srt/0001-core-ifdef-MSG_TRUNC-nixes-fix.patch + $(APPLY) $(SRC)/srt/0001-build-fix-implicit-libraries-set-using-Wl-l-libname..patch $(call pkg_static,"scripts/srt.pc.in") - mv srt-$(SRT_VERSION) $@ && touch $@ + $(MOVE) + +SRT_CONF := -DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF .srt: srt toolchain.cmake - cd $< && $(HOSTVARS_PIC) $(CMAKE) \ - -DENABLE_SHARED=OFF -DUSE_GNUTLS=ON -DENABLE_CXX11=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include - cd $< && $(CMAKEBUILD) . --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(SRT_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/ssh2/rules.mak vlc-3.0.22/contrib/src/ssh2/rules.mak --- vlc-3.0.21/contrib/src/ssh2/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/ssh2/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -21,6 +21,7 @@ ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2 $(UNPACK) + $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/ssh2/no-tests.patch $(APPLY) $(SRC)/ssh2/0001-fix-gcrypt-linking.patch $(call pkg_static,"libssh2.pc.in") @@ -31,8 +32,10 @@ DEPS_ssh2 = gcrypt $(DEPS_gcrypt) +SSH2_CONF := --disable-examples-build --with-libgcrypt --without-openssl --without-mbedtls + .ssh2: ssh2 $(RECONF) - cd $< && $(HOSTVARS) ./configure $(BROKEN_GCC_CFLAGS) $(HOSTCONF) --disable-examples-build --with-libgcrypt --without-openssl --without-mbedtls - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(BROKEN_GCC_CFLAGS) $(HOSTCONF) $(SSH2_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/taglib/SHA512SUMS vlc-3.0.22/contrib/src/taglib/SHA512SUMS --- vlc-3.0.21/contrib/src/taglib/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/taglib/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -7e369faa5e3c6c6401052b7a19e35b0cf8c1e5ed9597053ac731a7718791d5d4803d1b18a93e903ec8c3fc6cb92e34d9616daa2ae4d326965d4c4d5624dcdaba taglib-1.12.tar.gz +986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b taglib-1.13.1.tar.gz diff -Nru vlc-3.0.21/contrib/src/taglib/rules.mak vlc-3.0.22/contrib/src/taglib/rules.mak --- vlc-3.0.21/contrib/src/taglib/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/taglib/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ # TagLib -TAGLIB_VERSION := 1.12 +TAGLIB_VERSION := 1.13.1 TAGLIB_URL := https://taglib.org/releases/taglib-$(TAGLIB_VERSION).tar.gz PKGS += taglib @@ -15,9 +15,18 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib $(UNPACK) + $(APPLY) $(SRC)/taglib/0001-Implement-ID3v2-readStyle-avoid-worst-case.patch $(MOVE) +TAGLIB_CONF := -DBUILD_BINDINGS=OFF +ifdef HAVE_WINSTORE +TAGLIB_CONF += -DPLATFORM_WINRT=ON +endif + + .taglib: taglib toolchain.cmake - cd $< && $(HOSTVARS_PIC) $(CMAKE) . - cd $< && $(CMAKEBUILD) . --target install + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(TAGLIB_CONF) + +$(CMAKEBUILD) + $(CMAKEINSTALL) touch $@ diff -Nru vlc-3.0.21/contrib/src/theora/rules.mak vlc-3.0.22/contrib/src/theora/rules.mak --- vlc-3.0.21/contrib/src/theora/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/theora/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ # Theora THEORA_VERSION := 1.1.1 -THEORA_URL := http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.xz +THEORA_URL := $(XIPH)/theora/libtheora-$(THEORA_VERSION).tar.xz PKGS += theora ifeq ($(call need_pkg,"theora >= 1.0"),) @@ -23,7 +23,7 @@ $(UPDATE_AUTOCONFIG) $(MOVE) -THEORACONF := $(HOSTCONF) \ +THEORACONF := \ --disable-spec \ --disable-sdltest \ --disable-oggtest \ @@ -51,6 +51,6 @@ DEPS_theora = ogg $(DEPS_ogg) .theora: libtheora - cd $< && $(HOSTVARS) ./configure $(THEORACONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(THEORACONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/tiff/rules.mak vlc-3.0.22/contrib/src/tiff/rules.mak --- vlc-3.0.21/contrib/src/tiff/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/tiff/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -20,6 +20,7 @@ --disable-zlib \ --disable-cxx \ --without-x - cd $< && $(MAKE) -C port && $(MAKE) -C libtiff - cd $< && $(MAKE) install + $(MAKE) -C $< -C port + $(MAKE) -C $< -C libtiff + $(MAKE) -C $< -C libtiff install touch $@ diff -Nru vlc-3.0.21/contrib/src/tiff/tiff-winstore.patch vlc-3.0.22/contrib/src/tiff/tiff-winstore.patch --- vlc-3.0.21/contrib/src/tiff/tiff-winstore.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/tiff/tiff-winstore.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ---- tiff/libtiff/tif_win32.c.winstore 2019-03-07 11:51:43.944778200 +0100 -+++ tiff/libtiff/tif_win32.c 2019-03-07 11:58:04.931465200 +0100 -@@ -56,6 +56,7 @@ - #include "tiffiop.h" - - #include -+#include - - static tmsize_t - _tiffReadProc(thandle_t fd, void* buf, tmsize_t size) -@@ -181,6 +182,7 @@ _tiffDummyMapProc(thandle_t fd, void** p - static int - _tiffMapProc(thandle_t fd, void** pbase, toff_t* psize) - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - uint64 size; - tmsize_t sizem; - HANDLE hMapFile; -@@ -201,6 +203,9 @@ _tiffMapProc(thandle_t fd, void** pbase, - return (0); - *psize = size; - return(1); -+#else -+ return(0); -+#endif - } - - static void -@@ -235,8 +240,12 @@ TIFFFdOpen(int ifd, const char* name, co - { - if (mode[m]=='u') - { -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - fSuppressMap=1; - break; -+#else -+ return NULL; -+#endif - } - } - tif = TIFFClientOpen(name, mode, (thandle_t)ifd, /* FIXME: WIN64 cast to pointer warning */ diff -Nru vlc-3.0.21/contrib/src/tiger/rules.mak vlc-3.0.22/contrib/src/tiger/rules.mak --- vlc-3.0.21/contrib/src/tiger/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/tiger/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -18,14 +18,17 @@ libtiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger $(UNPACK) + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub misc/autotools $(APPLY) $(SRC)/tiger/autotools.patch $(call pkg_static,"misc/pkgconfig/tiger.pc.in") $(MOVE) DEPS_tiger = kate $(DEPS_kate) +TIGER_CONF := --disable-doc + .tiger: libtiger $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(TIGER_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/tremor/rules.mak vlc-3.0.22/contrib/src/tremor/rules.mak --- vlc-3.0.21/contrib/src/tremor/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/tremor/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -11,12 +11,13 @@ $(call download_git,$(TREMOR_URL),master,$(TREMOR_HASH)) .sum-tremor: tremor-git.tar.xz - $(warning Integrity check skipped.) + $(call check_githash,$(TREMOR_HASH)) touch $@ tremor: tremor-git.tar.xz .sum-tremor # Stuff that does not depend on libogg $(UNPACK) + $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/tremor/tremor.patch $(MOVE) @@ -27,5 +28,5 @@ $(RECONF) cd $< && \ $(HOSTVARS) CFLAGS="$(CFLAGS) $(NOTHUMB)" ./configure $(HOSTCONF) - cd $< && $(MAKE) install + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/twolame/rules.mak vlc-3.0.22/contrib/src/twolame/rules.mak --- vlc-3.0.21/contrib/src/twolame/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/twolame/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -22,8 +22,8 @@ .twolame: twolame $(RECONF) - cd $< && $(HOSTVARS) CFLAGS="${CFLAGS} -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) - cd $< && $(MAKE) - cd $< && $(MAKE) -C libtwolame install - cd $< && $(MAKE) install-data + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="${CFLAGS} -DLIBTWOLAME_STATIC" + $(MAKE) -C $< + $(MAKE) -C $< -C libtwolame install + $(MAKE) -C $< install-data touch $@ diff -Nru vlc-3.0.21/contrib/src/upnp/libtool-nostdlib-workaround.patch vlc-3.0.22/contrib/src/upnp/libtool-nostdlib-workaround.patch --- vlc-3.0.21/contrib/src/upnp/libtool-nostdlib-workaround.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/upnp/libtool-nostdlib-workaround.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -From 10278966327553b32d6799fb228be7506757778e Mon Sep 17 00:00:00 2001 -From: Alaric Senat -Date: Tue, 29 Nov 2022 14:00:02 +0100 -Subject: [PATCH] libtool-nostdlib-workaround - -Works around a libtool linking with `-no-stdlib` which discards -`-lpthread`. -Also forces win32 networking libs which are probably missing for the -same reasons. ---- - CMakeLists.txt | 9 +++++++++ - libupnp.pc.in | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index de7f4525..6fd04bf4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -301,6 +301,15 @@ if (UPNP_ENABLE_OPEN_SSL) - set (OPENSSL_LIBS "-lssl") - endif() - -+if (WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ set (VLC_FORCED_LIBS "-pthread -lpthread") -+ -+ # Force network libs. -+ if (WIN32) -+ set (VLC_FORCED_LIBS "${VLC_FORCED_LIBS} -liphlpapi -lws2_32") -+ endif() -+endif() -+ - configure_file (${CMAKE_CURRENT_SOURCE_DIR}/libupnp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libupnp.pc @ONLY) - - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libupnp.pc -diff --git a/libupnp.pc.in b/libupnp.pc.in -index 8c6fc22f..4c8b9f79 100644 ---- a/libupnp.pc.in -+++ b/libupnp.pc.in -@@ -6,7 +6,7 @@ includedir=@includedir@ - Name: libupnp - Description: Linux SDK for UPnP Devices - Version: @VERSION@ --Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml -+Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml @VLC_FORCED_LIBS@ - Libs.private: @OPENSSL_LIBS@ - Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp - --- -2.38.1 - diff -Nru vlc-3.0.21/contrib/src/upnp/rules.mak vlc-3.0.22/contrib/src/upnp/rules.mak --- vlc-3.0.21/contrib/src/upnp/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/upnp/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -61,6 +61,6 @@ .upnp: upnp $(RECONF) - cd $< && $(HOSTVARS) CFLAGS="$(UPNP_CFLAGS)" CXXFLAGS="$(UPNP_CXXFLAGS)" ./configure $(UPNP_CONF) $(HOSTCONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(UPNP_CFLAGS)" CXXFLAGS="$(UPNP_CXXFLAGS)" $(UPNP_CONF) + $(MAKE) -C $< install touch $@ diff -Nru vlc-3.0.21/contrib/src/vncclient/cross-ar.patch vlc-3.0.22/contrib/src/vncclient/cross-ar.patch --- vlc-3.0.21/contrib/src/vncclient/cross-ar.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/vncclient/cross-ar.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From 2dc984dcaa28fd4df90fe011a58fd8fe329bc7a1 Mon Sep 17 00:00:00 2001 -From: Thomas Anderson -Date: Wed, 15 Apr 2015 03:42:32 +0000 -Subject: [PATCH] configure.ac: Use AC_CHECK_TOOL for cross-compiling support. - -When cross-compiling the ar program has the appropriate prefix prepended. -Respect that here and have autotools autodetect the appropriate tool. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bcf51283..3069eedd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,7 +24,7 @@ test "x$GCC" = "xyes" && CFLAGS="$CFLAGS -Wall" - AC_PROG_MAKE_SET - AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL --AC_PATH_PROG([AR], [ar], [/usr/bin/ar], -+AC_CHECK_TOOL([AR], [ar], [/usr/bin/ar], - [$PATH:/usr/ccs/bin]) - - # Options diff -Nru vlc-3.0.21/contrib/src/vncclient/rules.mak vlc-3.0.22/contrib/src/vncclient/rules.mak --- vlc-3.0.21/contrib/src/vncclient/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/vncclient/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -32,11 +32,16 @@ DEPS_vncclient = gcrypt $(DEPS_gcrypt) jpeg $(DEPS_jpeg) png $(DEPS_png) gnutls $(DEPS_gnutls) +VNCCLIENT_CONF := --without-libva +ifdef HAVE_WIN32 +VNCCLIENT_CONF += --without-pthread +endif + .vncclient: vncclient $(REQUIRE_GPL) $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-libva - cd $< && $(MAKE) -C libvncclient install - cd $< && $(MAKE) install-data + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(VNCCLIENT_CONF) + $(MAKE) -C $< -C libvncclient install + $(MAKE) -C $< install-data rm $(PREFIX)/lib/pkgconfig/libvncserver.pc touch $@ diff -Nru vlc-3.0.21/contrib/src/vorbis/rules.mak vlc-3.0.22/contrib/src/vorbis/rules.mak --- vlc-3.0.21/contrib/src/vorbis/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/vorbis/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,7 @@ # libvorbis VORBIS_VERSION := 1.3.6 -VORBIS_URL := http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz +VORBIS_URL := $(XIPH)/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz ifdef HAVE_FPU PKGS += vorbis @@ -34,10 +34,12 @@ DEPS_vorbis = ogg $(DEPS_ogg) +VORBIS_CONF := --disable-docs --disable-examples --disable-oggtest + .vorbis: libvorbis $(RECONF) -Im4 - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-docs --disable-examples --disable-oggtest - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(VORBIS_CONF) + $(MAKE) -C $< install touch $@ .sum-vorbisenc: .sum-vorbis diff -Nru vlc-3.0.21/contrib/src/vpx/0001-force-detection-of-pthread-on-Windows.patch vlc-3.0.22/contrib/src/vpx/0001-force-detection-of-pthread-on-Windows.patch --- vlc-3.0.21/contrib/src/vpx/0001-force-detection-of-pthread-on-Windows.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/vpx/0001-force-detection-of-pthread-on-Windows.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,27 @@ +From 31d0b0f8b637ad92b505ba0b696721afb9a16c1a Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Tue, 14 Jan 2025 15:12:48 +0100 +Subject: [PATCH] force detection of pthread on Windows + +--- + configure | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure b/configure +index 97e78996e..84a6fa093 100755 +--- a/configure ++++ b/configure +@@ -598,10 +598,6 @@ process_detect() { + + # Specialize windows and POSIX environments. + case $toolchain in +- *-win*-*) +- # Don't check for any headers in Windows builds. +- false +- ;; + *) + case $header in + pthread.h) true;; +-- +2.43.0 + diff -Nru vlc-3.0.21/contrib/src/vpx/SHA512SUMS vlc-3.0.22/contrib/src/vpx/SHA512SUMS --- vlc-3.0.21/contrib/src/vpx/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/vpx/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -3e3bfad3d035c0bc3db7cb5a194d56d3c90f5963fb1ad527ae5252054e7c48ce2973de1346c97d94b59f7a95d4801bec44214cce10faf123f92b36fca79a8d1e libvpx-1.14.1.tar.gz +824fe8719e4115ec359ae0642f5e1cea051d458f09eb8c24d60858cf082f66e411215e23228173ab154044bafbdfbb2d93b589bb726f55b233939b91f928aae0 libvpx-1.15.2.tar.gz diff -Nru vlc-3.0.21/contrib/src/vpx/libvpx-darwin-aarch64.patch vlc-3.0.22/contrib/src/vpx/libvpx-darwin-aarch64.patch --- vlc-3.0.21/contrib/src/vpx/libvpx-darwin-aarch64.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/vpx/libvpx-darwin-aarch64.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ ---- libvpx-1.14.0/build/make/configure.sh 2024-01-24 14:51:54.835698759 -0500 -+++ libvpx-1.14.0-new/build/make/configure.sh 2024-01-24 14:54:28.595456073 -0500 -@@ -1146,7 +1146,7 @@ +--- libvpx/build/make/configure.sh 2025-04-16 15:30:51.431710564 -0400 ++++ libvpx-new/build/make/configure.sh 2025-04-16 15:36:35.935402419 -0400 +@@ -1183,7 +1183,7 @@ darwin) if ! enabled external_build; then @@ -9,7 +9,7 @@ CXX="$(${XCRUN_FIND} clang++)" CC="$(${XCRUN_FIND} clang)" AR="$(${XCRUN_FIND} ar)" -@@ -1165,7 +1165,7 @@ +@@ -1200,7 +1200,7 @@ add_cflags -arch ${tgt_isa} add_ldflags -arch ${tgt_isa} diff -Nru vlc-3.0.21/contrib/src/vpx/libvpx-ios.patch vlc-3.0.22/contrib/src/vpx/libvpx-ios.patch --- vlc-3.0.21/contrib/src/vpx/libvpx-ios.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/vpx/libvpx-ios.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ ---- libvpx-1.14.0/build/make/configure.sh 2024-01-09 16:12:22.000000000 -0500 -+++ libvpx-1.14.0-new/build/make/configure.sh 2024-01-24 16:12:30.986695507 -0500 -@@ -863,109 +863,6 @@ +--- libvpx/build/make/configure.sh 2025-01-10 14:30:59.000000000 -0500 ++++ libvpx-new/build/make/configure.sh 2025-04-16 16:06:21.962173179 -0400 +@@ -903,109 +903,6 @@ ;; esac @@ -92,7 +92,7 @@ - add_cflags "-mmacosx-version-min=10.15" - add_ldflags "-mmacosx-version-min=10.15" - ;; -- *-darwin2[0-3]-*) +- *-darwin2[0-4]-*) - add_cflags "-arch ${toolchain%%-*}" - add_ldflags "-arch ${toolchain%%-*}" - ;; @@ -110,7 +110,7 @@ # Handle Solaris variants. Solaris 10 needs -lposix4 case ${toolchain} in sparc-solaris-*) -@@ -1170,12 +1067,6 @@ +@@ -1205,12 +1102,6 @@ add_cflags -isysroot ${alt_libc} fi diff -Nru vlc-3.0.21/contrib/src/vpx/libvpx-remove-bitcode.patch vlc-3.0.22/contrib/src/vpx/libvpx-remove-bitcode.patch --- vlc-3.0.21/contrib/src/vpx/libvpx-remove-bitcode.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/vpx/libvpx-remove-bitcode.patch 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ ---- libvpx-1.14.0/build/make/configure.sh 2024-01-24 15:55:34.070346026 -0500 -+++ libvpx-1.14.0-new/build/make/configure.sh 2024-01-24 15:57:57.821681598 -0500 -@@ -1090,12 +1090,6 @@ +--- libvpx/build/make/configure.sh 2025-01-10 14:30:59.000000000 -0500 ++++ libvpx-new/build/make/configure.sh 2025-04-16 16:13:01.119638658 -0400 +@@ -1228,12 +1228,6 @@ fi ;; esac diff -Nru vlc-3.0.21/contrib/src/vpx/rules.mak vlc-3.0.22/contrib/src/vpx/rules.mak --- vlc-3.0.21/contrib/src/vpx/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/vpx/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,9 +1,11 @@ # libvpx -VPX_VERSION := 1.14.1 +VPX_VERSION := 1.15.2 VPX_URL := $(GITHUB)/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz +ifneq ($(filter arm aarch64 i386 loongarch64 mipsel mips64el ppc64le x86_64, $(ARCH)),) PKGS += vpx +endif ifeq ($(call need_pkg,"vpx >= 1.5.0"),) PKGS_FOUND += vpx endif @@ -30,6 +32,8 @@ # Disable automatic addition of -fembed-bitcode for iOS # as it is enabled through --extra-cflags if necessary. $(APPLY) $(SRC)/vpx/libvpx-remove-bitcode.patch + # make sure we can build when targetting Windows XP + $(APPLY) $(SRC)/vpx/0001-force-detection-of-pthread-on-Windows.patch $(MOVE) DEPS_vpx = @@ -62,14 +66,10 @@ VPX_ARCH := mips32 else ifeq ($(ARCH),ppc) VPX_ARCH := ppc32 -else ifeq ($(ARCH),ppc64) -VPX_ARCH := ppc64 -else ifeq ($(ARCH),sparc) -VPX_ARCH := sparc -else ifeq ($(ARCH),x86_64) -VPX_ARCH := x86_64 else ifeq ($(ARCH),aarch64) VPX_ARCH := arm64 +else +VPX_ARCH := $(ARCH) endif ifdef HAVE_ANDROID @@ -108,7 +108,9 @@ --disable-install-docs \ --disable-dependency-tracking \ --enable-vp9-highbitdepth \ - --disable-tools + --disable-tools \ + --target=$(VPX_TARGET) \ + --prefix=$(PREFIX) ifneq ($(filter arm aarch64, $(ARCH)),) # Only enable runtime cpu detect on architectures other than arm/aarch64 @@ -120,22 +122,26 @@ endif endif +VPX_CFLAGS=$(CFLAGS) + ifndef BUILD_ENCODERS VPX_CONF += --disable-vp8-encoder --disable-vp9-encoder endif +ifeq ($(ARCH),i386) +VPX_CFLAGS += -mstackrealign +endif + ifndef HAVE_WIN32 VPX_CONF += --enable-pic else -VPX_CONF += --extra-cflags="-mstackrealign" ifeq ($(ARCH),arm) # As of libvpx 1.14.0 we have to explicitly disable runtime CPU detection for Windows armv7 VPX_CONF += --disable-runtime-cpu-detect endif endif ifdef HAVE_DARWIN_OS -VPX_CONF += --enable-vp8-decoder --disable-tools -VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)" +VPX_CONF += --enable-vp8-decoder ifdef HAVE_IOS ifeq ($(ARCH),arm) # As of libvpx 1.14.0 we have to explicitly disable runtime CPU detection for iOS arm7 @@ -144,15 +150,24 @@ VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) $(LDFLAGS) endif ifdef HAVE_MACOSX +ifeq ($(ARCH),$(filter $(ARCH), arm aarch64)) +ifneq ($(call clang_at_least, 13), true) +# arm_neon.h broken on clang 12 +VPX_CONF += --disable-neon-dotprod +endif +endif VPX_LDFLAGS := -L$(MACOSX_SDK)/usr/lib -isysroot $(MACOSX_SDK) -mmacosx-version-min=10.7 endif VPX_LDFLAGS += -arch $(PLATFORM_SHORT_ARCH) endif ifndef WITH_OPTIMIZATION -VPX_CONF += --enable-debug --disable-optimizations +VPX_CONF += --disable-optimizations endif +# Always enable debug symbols, we strip in the final executables if needed +VPX_CONF += --enable-debug + ifdef HAVE_ANDROID # Starting NDK19, standalone toolchains are deprecated and gcc is not shipped. # The presence of gcc can be used to detect if we are using an old standalone @@ -163,11 +178,13 @@ endif endif +VPX_CONF += --extra-cflags="$(VPX_CFLAGS)" + .vpx: libvpx rm -rf $(PREFIX)/include/vpx - cd $< && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) ./configure --target=$(VPX_TARGET) \ - $(VPX_CONF) --prefix=$(PREFIX) - cd $< && $(MAKE) - $(call pkg_static,"vpx.pc") - cd $< && $(MAKE) install + $(MAKEBUILDDIR) + cd $(BUILD_DIR) && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) $(BUILD_SRC)/configure $(VPX_CONF) + +CONFIG_DEBUG=1 $(MAKEBUILD) + $(call pkg_static,"_build/vpx.pc") + +CONFIG_DEBUG=1 $(MAKEBUILD) install touch $@ diff -Nru vlc-3.0.21/contrib/src/vulkan-headers/SHA512SUMS vlc-3.0.22/contrib/src/vulkan-headers/SHA512SUMS --- vlc-3.0.21/contrib/src/vulkan-headers/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/vulkan-headers/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -b6f4459a55a7a0f83a17f9155cf201f4e832bde45a127efbfb0e1e5805fb813249e8ccb00b81285ff26fffed1fe0f33b14cdf41515c2b649204de54284e7bc60 Vulkan-Headers-1.3.219.tar.gz diff -Nru vlc-3.0.21/contrib/src/vulkan-headers/rules.mak vlc-3.0.22/contrib/src/vulkan-headers/rules.mak --- vlc-3.0.21/contrib/src/vulkan-headers/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/vulkan-headers/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -VULKAN_HEADERS_VERSION := 1.3.219 -VULKAN_HEADERS_URL := $(GITHUB)/KhronosGroup/Vulkan-Headers/archive/v$(VULKAN_HEADERS_VERSION).tar.gz - -DEPS_vulkan-headers = - -$(TARBALLS)/Vulkan-Headers-$(VULKAN_HEADERS_VERSION).tar.gz: - $(call download_pkg,$(VULKAN_HEADERS_URL),vulkan-headers) - -.sum-vulkan-headers: Vulkan-Headers-$(VULKAN_HEADERS_VERSION).tar.gz - -vulkan-headers: Vulkan-Headers-$(VULKAN_HEADERS_VERSION).tar.gz .sum-vulkan-headers - $(UNPACK) - $(MOVE) - -.vulkan-headers: vulkan-headers toolchain.cmake - $(CMAKECLEAN) - $(HOSTVARS) $(CMAKE) - +$(CMAKEBUILD) - $(CMAKEINSTALL) - touch $@ diff -Nru vlc-3.0.21/contrib/src/vulkan-loader/002-proper-def-files-for-32bit.patch vlc-3.0.22/contrib/src/vulkan-loader/002-proper-def-files-for-32bit.patch --- vlc-3.0.21/contrib/src/vulkan-loader/002-proper-def-files-for-32bit.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/vulkan-loader/002-proper-def-files-for-32bit.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index 8bb10fd..fc38ecc 100644 ---- a/loader/CMakeLists.txt -+++ b/loader/CMakeLists.txt -@@ -127,7 +127,7 @@ set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG}Note that this may be unsafe, as the C co - set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} the stack frame for certain calls. If the compiler does not do this, then unknown device") - set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} extensions will suffer from a corrupted stack.") - if(WIN32) -- if(MINGW) -+ if(NOT MINGW) - find_program(JWASM_FOUND jwasm) - if (JWASM_FOUND) - set(CMAKE_ASM_MASM_COMPILER ${JWASM_FOUND}) -@@ -145,7 +145,7 @@ if(WIN32) - if (USE_MASM) - enable_language(ASM_MASM) - endif () -- if(CMAKE_ASM_MASM_COMPILER_WORKS OR JWASM_FOUND) -+ if(MSVC AND CMAKE_ASM_MASM_COMPILER_WORKS OR JWASM_FOUND) - if(MINGW) - set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS}) - elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND) -@@ -161,12 +161,14 @@ if(WIN32) - target_link_libraries(loader-unknown-chain Vulkan::Headers) - target_include_directories(loader-unknown-chain PUBLIC $) - add_dependencies(loader-unknown-chain loader_asm_gen_files) -+ set_target_properties(loader-unknown-chain PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL") - else() - message(WARNING "Could not find working MASM assebler\n${ASM_FAILURE_MSG}") - add_custom_target(loader_asm_gen_files) - add_library(loader-unknown-chain OBJECT unknown_ext_chain.c) - target_link_libraries(loader-unknown-chain loader_specific_options) - set_target_properties(loader-unknown-chain PROPERTIES CMAKE_C_FLAGS_DEBUG "${MODIFIED_C_FLAGS_DEBUG}") -+ set_target_properties(loader-unknown-chain PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL") - endif() - elseif(APPLE) - # For MacOS, use the C code and force the compiler's tail-call optimization instead of using assembly code. -@@ -261,6 +263,7 @@ endif() - - if(WIN32) - add_library(loader-opt STATIC ${OPT_LOADER_SRCS}) -+ set_target_properties(loader-opt PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL") - target_link_libraries(loader-opt PUBLIC loader_specific_options) - add_dependencies(loader-opt loader_asm_gen_files) - set_target_properties(loader-opt PROPERTIES CMAKE_C_FLAGS_DEBUG "${MODIFIED_C_FLAGS_DEBUG}") -@@ -237,10 +240,17 @@ if(WIN32) - # when adding the suffix the import and runtime library names must be consistent - # mingw: libvulkan-1.dll.a / libvulkan-1.dll - # msvc: vulkan-1.lib / vulkan-1.dll -+ if(MSVC) - set_target_properties(vulkan - PROPERTIES - OUTPUT_NAME vulkan-1) -- -+ else() -+ set_target_properties(vulkan -+ PROPERTIES -+ LIBRARY_OUTPUT_NAME vulkan -+ RUNTIME_OUTPUT_NAME vulkan-1 -+ ARCHIVE_OUTPUT_NAME vulkan) -+ endif() - if(MSVC AND ENABLE_WIN10_ONECORE) - target_link_libraries(vulkan OneCoreUAP.lib LIBCMT.LIB LIBCMTD.LIB LIBVCRUNTIME.LIB LIBUCRT.LIB) - set_target_properties(vulkan PROPERTIES LINK_FLAGS "/NODEFAULTLIB") -diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h -index 507a901..6b8fc48 100644 ---- a/loader/vk_loader_platform.h -+++ b/loader/vk_loader_platform.h -@@ -77,7 +77,13 @@ - #include "vk_layer_dispatch_table.h" - #include "vk_loader_extensions.h" - --#if defined(__GNUC__) && __GNUC__ >= 4 -+#if defined(_WIN32) -+# if defined (VK_BUILDING_DLL) -+# define LOADER_EXPORT __declspec(dllexport) -+# else -+# define LOADER_EXPORT -+# endif -+#elif defined(__GNUC__) && __GNUC__ >= 4 - #define LOADER_EXPORT __attribute__((visibility("default"))) - #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) - #define LOADER_EXPORT __attribute__((visibility("default"))) -diff --git a/loader/vulkan-1.def b/loader/vulkan-1.def -index 6a88b55..1d26b1f 100644 ---- a/loader/vulkan-1.def -+++ b/loader/vulkan-1.def -@@ -22,7 +22,7 @@ - ; - ;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - --LIBRARY vulkan-1.dll -+LIBRARY libvulkan-1.dll - EXPORTS - vkCreateInstance - vkDestroyInstance diff -Nru vlc-3.0.21/contrib/src/vulkan-loader/004-disable-suffix-in-static-lib.patch vlc-3.0.22/contrib/src/vulkan-loader/004-disable-suffix-in-static-lib.patch --- vlc-3.0.21/contrib/src/vulkan-loader/004-disable-suffix-in-static-lib.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/vulkan-loader/004-disable-suffix-in-static-lib.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/loader/CMakeLists.txt -+++ b/loader/CMakeLists.txt -@@ -398,7 +398,7 @@ - foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) - set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") - endforeach() -- if(WIN32) -+ if(MSVC) - set(VULKAN_LIB_SUFFIX "-1") - # Set libdir path as in cmake's FindVulkan.cmake - # https://github.com/KhronosGroup/Vulkan-Loader/issues/668 diff -Nru vlc-3.0.21/contrib/src/vulkan-loader/SHA512SUMS vlc-3.0.22/contrib/src/vulkan-loader/SHA512SUMS --- vlc-3.0.21/contrib/src/vulkan-loader/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/vulkan-loader/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -b4c9716a0cb3d6748f69b91735e43a5fe51599f44c21f9c4d90e69daa05bddcfd354978e53e95d64cb6a6bcca640c48974d61893590ab443b230294d4668f245 Vulkan-Loader-1.3.211.tar.gz diff -Nru vlc-3.0.21/contrib/src/vulkan-loader/libvulkan-32.def vlc-3.0.22/contrib/src/vulkan-loader/libvulkan-32.def --- vlc-3.0.21/contrib/src/vulkan-loader/libvulkan-32.def 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/vulkan-loader/libvulkan-32.def 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ -; -; Definition file of vulkan-1.dll -; Automatic generated by gendef -; written by Kai Tietz 2008 -; -LIBRARY "libvulkan-1.dll" -EXPORTS -vkAcquireNextImage2KHR@12 -vkAcquireNextImageKHR@40 -vkAllocateCommandBuffers@12 -vkAllocateDescriptorSets@12 -vkAllocateMemory@16 -vkBeginCommandBuffer@8 -vkBindBufferMemory2@12 -vkBindBufferMemory@28 -vkBindImageMemory2@12 -vkBindImageMemory@28 -vkCmdBeginQuery@20 -vkCmdBeginRenderPass2@12 -vkCmdBeginRenderPass@12 -vkCmdBindDescriptorSets@36 -vkCmdBindIndexBuffer@24 -vkCmdBindPipeline@16 -vkCmdBindVertexBuffers@20 -vkCmdBlitImage@40 -vkCmdClearAttachments@20 -vkCmdClearColorImage@28 -vkCmdClearDepthStencilImage@28 -vkCmdCopyBuffer@28 -vkCmdCopyBufferToImage@32 -vkCmdCopyImage@36 -vkCmdCopyImageToBuffer@32 -vkCmdCopyQueryPoolResults@48 -vkCmdDispatch@16 -vkCmdDispatchBase@28 -vkCmdDispatchIndirect@20 -vkCmdDraw@20 -vkCmdDrawIndexed@24 -vkCmdDrawIndexedIndirect@28 -vkCmdDrawIndexedIndirectCount@44 -vkCmdDrawIndirect@28 -vkCmdDrawIndirectCount@44 -vkCmdEndQuery@16 -vkCmdEndRenderPass2@8 -vkCmdEndRenderPass@4 -vkCmdExecuteCommands@12 -vkCmdFillBuffer@32 -vkCmdNextSubpass2@12 -vkCmdNextSubpass@8 -vkCmdPipelineBarrier@40 -vkCmdPushConstants@28 -vkCmdResetEvent@16 -vkCmdResetQueryPool@20 -vkCmdResolveImage@36 -vkCmdSetBlendConstants@8 -vkCmdSetDepthBias@16 -vkCmdSetDepthBounds@12 -vkCmdSetDeviceMask@8 -vkCmdSetEvent@16 -vkCmdSetLineWidth@8 -vkCmdSetScissor@16 -vkCmdSetStencilCompareMask@12 -vkCmdSetStencilReference@12 -vkCmdSetStencilWriteMask@12 -vkCmdSetViewport@16 -vkCmdUpdateBuffer@32 -vkCmdWaitEvents@44 -vkCmdWriteTimestamp@20 -vkCreateBuffer@16 -vkCreateBufferView@16 -vkCreateCommandPool@16 -vkCreateComputePipelines@28 -vkCreateDescriptorPool@16 -vkCreateDescriptorSetLayout@16 -vkCreateDescriptorUpdateTemplate@16 -vkCreateDevice@16 -vkCreateDisplayModeKHR@24 -vkCreateDisplayPlaneSurfaceKHR@16 -vkCreateEvent@16 -vkCreateFence@16 -vkCreateFramebuffer@16 -vkCreateGraphicsPipelines@28 -vkCreateHeadlessSurfaceEXT@16 -vkCreateImage@16 -vkCreateImageView@16 -vkCreateInstance@12 -vkCreatePipelineCache@16 -vkCreatePipelineLayout@16 -vkCreateQueryPool@16 -vkCreateRenderPass2@16 -vkCreateRenderPass@16 -vkCreateSampler@16 -vkCreateSamplerYcbcrConversion@16 -vkCreateSemaphore@16 -vkCreateShaderModule@16 -vkCreateSharedSwapchainsKHR@20 -vkCreateSwapchainKHR@16 -vkCreateWin32SurfaceKHR@16 -vkDestroyBuffer@16 -vkDestroyBufferView@16 -vkDestroyCommandPool@16 -vkDestroyDescriptorPool@16 -vkDestroyDescriptorSetLayout@16 -vkDestroyDescriptorUpdateTemplate@16 -vkDestroyDevice@8 -vkDestroyEvent@16 -vkDestroyFence@16 -vkDestroyFramebuffer@16 -vkDestroyImage@16 -vkDestroyImageView@16 -vkDestroyInstance@8 -vkDestroyPipeline@16 -vkDestroyPipelineCache@16 -vkDestroyPipelineLayout@16 -vkDestroyQueryPool@16 -vkDestroyRenderPass@16 -vkDestroySampler@16 -vkDestroySamplerYcbcrConversion@16 -vkDestroySemaphore@16 -vkDestroyShaderModule@16 -vkDestroySurfaceKHR@16 -vkDestroySwapchainKHR@16 -vkDeviceWaitIdle@4 -vkEndCommandBuffer@4 -vkEnumerateDeviceExtensionProperties@16 -vkEnumerateDeviceLayerProperties@12 -vkEnumerateInstanceExtensionProperties@12 -vkEnumerateInstanceLayerProperties@8 -vkEnumerateInstanceVersion@4 -vkEnumeratePhysicalDeviceGroups@12 -vkEnumeratePhysicalDevices@12 -vkFlushMappedMemoryRanges@12 -vkFreeCommandBuffers@20 -vkFreeDescriptorSets@20 -vkFreeMemory@16 -vkGetBufferDeviceAddress@8 -vkGetBufferMemoryRequirements2@12 -vkGetBufferMemoryRequirements@16 -vkGetBufferOpaqueCaptureAddress@8 -vkGetDescriptorSetLayoutSupport@12 -vkGetDeviceGroupPeerMemoryFeatures@20 -vkGetDeviceGroupPresentCapabilitiesKHR@8 -vkGetDeviceGroupSurfacePresentModesKHR@16 -vkGetDeviceMemoryCommitment@16 -vkGetDeviceMemoryOpaqueCaptureAddress@8 -vkGetDeviceProcAddr@8 -vkGetDeviceQueue2@12 -vkGetDeviceQueue@16 -vkGetDisplayModeProperties2KHR@20 -vkGetDisplayModePropertiesKHR@20 -vkGetDisplayPlaneCapabilities2KHR@12 -vkGetDisplayPlaneCapabilitiesKHR@20 -vkGetDisplayPlaneSupportedDisplaysKHR@16 -vkGetEventStatus@12 -vkGetFenceStatus@12 -vkGetImageMemoryRequirements2@12 -vkGetImageMemoryRequirements@16 -vkGetImageSparseMemoryRequirements2@16 -vkGetImageSparseMemoryRequirements@20 -vkGetImageSubresourceLayout@20 -vkGetInstanceProcAddr@8 -vkGetPhysicalDeviceDisplayPlaneProperties2KHR@12 -vkGetPhysicalDeviceDisplayPlanePropertiesKHR@12 -vkGetPhysicalDeviceDisplayProperties2KHR@12 -vkGetPhysicalDeviceDisplayPropertiesKHR@12 -vkGetPhysicalDeviceExternalBufferProperties@12 -vkGetPhysicalDeviceExternalFenceProperties@12 -vkGetPhysicalDeviceExternalSemaphoreProperties@12 -vkGetPhysicalDeviceFeatures2@8 -vkGetPhysicalDeviceFeatures@8 -vkGetPhysicalDeviceFormatProperties2@12 -vkGetPhysicalDeviceFormatProperties@12 -vkGetPhysicalDeviceImageFormatProperties2@12 -vkGetPhysicalDeviceImageFormatProperties@28 -vkGetPhysicalDeviceMemoryProperties2@8 -vkGetPhysicalDeviceMemoryProperties@8 -vkGetPhysicalDevicePresentRectanglesKHR@20 -vkGetPhysicalDeviceProperties2@8 -vkGetPhysicalDeviceProperties@8 -vkGetPhysicalDeviceQueueFamilyProperties2@12 -vkGetPhysicalDeviceQueueFamilyProperties@12 -vkGetPhysicalDeviceSparseImageFormatProperties2@16 -vkGetPhysicalDeviceSparseImageFormatProperties@32 -vkGetPhysicalDeviceSurfaceCapabilities2KHR@12 -vkGetPhysicalDeviceSurfaceCapabilitiesKHR@16 -vkGetPhysicalDeviceSurfaceFormats2KHR@16 -vkGetPhysicalDeviceSurfaceFormatsKHR@20 -vkGetPhysicalDeviceSurfacePresentModesKHR@20 -vkGetPhysicalDeviceSurfaceSupportKHR@20 -vkGetPhysicalDeviceWin32PresentationSupportKHR@8 -vkGetPipelineCacheData@20 -vkGetQueryPoolResults@40 -vkGetRenderAreaGranularity@16 -vkGetSemaphoreCounterValue@16 -vkGetSwapchainImagesKHR@20 -vkInvalidateMappedMemoryRanges@12 -vkMapMemory@36 -vkMergePipelineCaches@20 -vkQueueBindSparse@20 -vkQueuePresentKHR@8 -vkQueueSubmit@20 -vkQueueWaitIdle@4 -vkResetCommandBuffer@8 -vkResetCommandPool@16 -vkResetDescriptorPool@16 -vkResetEvent@12 -vkResetFences@12 -vkResetQueryPool@20 -vkSetEvent@12 -vkSignalSemaphore@8 -vkTrimCommandPool@16 -vkUnmapMemory@12 -vkUpdateDescriptorSetWithTemplate@24 -vkUpdateDescriptorSets@20 -vkWaitForFences@24 -vkWaitSemaphores@16 diff -Nru vlc-3.0.21/contrib/src/vulkan-loader/rules.mak vlc-3.0.22/contrib/src/vulkan-loader/rules.mak --- vlc-3.0.21/contrib/src/vulkan-loader/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/vulkan-loader/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -VULKAN_LOADER_VERSION := 1.3.211 -VULKAN_LOADER_URL := $(GITHUB)/KhronosGroup/Vulkan-Loader/archive/v$(VULKAN_LOADER_VERSION).tar.gz - -DEPS_vulkan-loader = vulkan-headers $(DEPS_vulkan-headers) - -# On WIN32 platform, we don't know where to find the loader -# so always build it for the Vulkan module. -ifdef HAVE_WIN32_DESKTOP -PKGS += vulkan-loader -endif - -ifeq ($(call need_pkg,"vulkan"),) -PKGS_FOUND += vulkan-loader -endif - -# On Android, vulkan-loader is available on the system itself. -ifdef HAVE_ANDROID -PKGS_FOUND += vulkan-loader -endif - -ifndef HAVE_ANDROID -ifdef HAVE_LINUX -DEPS_vulkan-loader += xcb $(DEPS_xcb) -endif -endif - -VULKAN_LOADER_CONF := \ - -DENABLE_STATIC_LOADER=ON \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_WERROR=OFF \ - -DBUILD_TESTS=OFF \ - -DBUILD_LOADER=ON \ - -DCMAKE_ASM_COMPILER="$(AS)" - -$(TARBALLS)/Vulkan-Loader-$(VULKAN_LOADER_VERSION).tar.gz: - $(call download_pkg,$(VULKAN_LOADER_URL),vulkan-loader) - -.sum-vulkan-loader: Vulkan-Loader-$(VULKAN_LOADER_VERSION).tar.gz - -vulkan-loader: Vulkan-Loader-$(VULKAN_LOADER_VERSION).tar.gz .sum-vulkan-loader - $(UNPACK) -# Patches are from msys2 package system -# https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-vulkan-loader - $(APPLY) $(SRC)/vulkan-loader/002-proper-def-files-for-32bit.patch - $(APPLY) $(SRC)/vulkan-loader/004-disable-suffix-in-static-lib.patch -ifeq ($(HOST),i686-w64-mingw32) - cp -v $(SRC)/vulkan-loader/libvulkan-32.def $(UNPACK_DIR)/loader/vulkan-1.def -endif - $(call pkg_static,"loader/vulkan.pc.in") - $(MOVE) - -# Needed for the loader's cmake script to find the registry files -VULKAN_LOADER_ENV_CONF = \ - VULKAN_HEADERS_INSTALL_DIR="$(PREFIX)" - -.vulkan-loader: vulkan-loader toolchain.cmake - $(CMAKECLEAN) - $(VULKAN_LOADER_ENV_CONF) $(HOSTVARS) $(CMAKE) $(VULKAN_LOADER_CONF) - +$(CMAKEBUILD) - -ifdef HAVE_WIN32 -# CMake will generate a .pc file with -lvulkan even if the static library -# generated is libvulkan.dll.a. It also forget to link with libcfgmgr32. - sed -i.orig -e "s,-lvulkan,-lvulkan.dll -lcfgmgr32," $(BUILD_DIR)/loader/vulkan.pc -endif - - +$(CMAKEBUILD) - $(CMAKEINSTALL) - touch $@ diff -Nru vlc-3.0.21/contrib/src/wine-headers/SHA512SUMS vlc-3.0.22/contrib/src/wine-headers/SHA512SUMS --- vlc-3.0.21/contrib/src/wine-headers/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/wine-headers/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee wine-6.13.tar.xz diff -Nru vlc-3.0.21/contrib/src/wine-headers/rules.mak vlc-3.0.22/contrib/src/wine-headers/rules.mak --- vlc-3.0.21/contrib/src/wine-headers/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/wine-headers/rules.mak 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# WINE -WINE_VERSION := 6.13 -WINE_URL := https://dl.winehq.org/wine/source/6.x/wine-$(WINE_VERSION).tar.xz - -ifdef HAVE_WIN32 -PKGS += wine-headers -endif -ifeq ($(call mingw_at_least, 8), true) -PKGS_FOUND += wine-headers -endif - -# Order is important since *_(n).idl will depends on *_(n-1).idl -WINE_IDL_HEADERS = \ - d3d11.idl \ - d3d11_1.idl d3d11_2.idl d3d11_3.idl d3d11_4.idl \ - dxgicommon.idl dxgitype.idl dxgiformat.idl \ - dxgidebug.idl \ - dxgi.idl dxgi1_2.idl dxgi1_3.idl dxgi1_4.idl dxgi1_5.idl dxgi1_6.idl \ - dxva2api.idl - -$(TARBALLS)/wine-$(WINE_VERSION).tar.xz: - $(call download_pkg,$(WINE_URL),wine) - -.sum-wine-headers: wine-$(WINE_VERSION).tar.xz - -wine-headers: wine-$(WINE_VERSION).tar.xz .sum-wine-headers - $(UNPACK) - $(MOVE) - -wine_widl = echo "GEN $(1)" && \ - $(WIDL) -DBOOL=WINBOOL $(3) \ - -I$(PREFIX)/include -Iwine-headers/idl-include \ - -I`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include -h \ - -o "$(PREFIX)/include/$(1)" "wine-headers/idl-include/$(2)" - -.wine-headers: wine-headers - @mkdir -p $(PREFIX)/include - @mkdir -p wine-headers/idl-include - @cp wine-headers/include/*.idl wine-headers/idl-include # be sure to not use .h from the wine project - @for header in $(WINE_IDL_HEADERS); do \ - $(call wine_widl,"`basename $$header idl`h",$$header,); \ - done - touch $@ diff -Nru vlc-3.0.21/contrib/src/wix/SHA512SUMS vlc-3.0.22/contrib/src/wix/SHA512SUMS --- vlc-3.0.21/contrib/src/wix/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/wix/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -9ff09b4e6c612ca742c763740fb89d99211bf1d0eace84e3693cb503deb6a85bd28c3754c34772a3220bb0c1e92a3013e7d99bcf106ff1b835c0fdc6aba8bbc6 wix3.14.0.6526.zip +ff58d224e545722eb794d413c541ad483ab834f9ce92e2528fe8aeb645717ab077db833ae783e1a31ad9e50803eb80fdc9efcda72535493a3f0faea4aa3ba36d wix3.14.1.8722.zip diff -Nru vlc-3.0.21/contrib/src/wix/rules.mak vlc-3.0.22/contrib/src/wix/rules.mak --- vlc-3.0.21/contrib/src/wix/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/wix/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,12 +1,11 @@ WIX_VERSION=314 -WIX_FULL_VERSION=3.14.0.6526 -WIX_URL := https://wixtoolset.org/downloads/v$(WIX_FULL_VERSION)/wix$(WIX_VERSION)-binaries.zip +WIX_SUB_VERSION=1 +WIX_FULL_VERSION=3.14.1.8722 +WIX_URL := $(GITHUB)/wixtoolset/wix3/releases/download/wix$(WIX_VERSION)$(WIX_SUB_VERSION)rtm/wix$(WIX_VERSION)-binaries.zip ifdef HAVE_WIN32 # this requires dotnet 4.0 to be installed when running wix PKGS += wix -# need to be installed when using prebuilt -PKGS_TOOLS += wix endif .sum-wix: wix$(WIX_FULL_VERSION).zip diff -Nru vlc-3.0.21/contrib/src/wixlzx/rules.mak vlc-3.0.22/contrib/src/wixlzx/rules.mak --- vlc-3.0.21/contrib/src/wixlzx/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/wixlzx/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -28,8 +28,6 @@ ifdef HAVE_WIN32 # this requires dotnet 4.0 to be installed when running wix PKGS += wixlzx -# need to be installed when using prebuilt -PKGS_TOOLS += wixlzx endif DEPS_wixlzx := wix $(DEPS_wix) diff -Nru vlc-3.0.21/contrib/src/x262/rules.mak vlc-3.0.22/contrib/src/x262/rules.mak --- vlc-3.0.21/contrib/src/x262/rules.mak 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/x262/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ # x262 -X262_GITURL := $(VIDEOLAN_GIT)/x262.git +X262_GITURL := git://git.videolan.org/x262.git X262_HASH := bb887aa4c0a4da955524aa220b62998c3b50504e # ifdef BUILD_ENCODERS @@ -28,12 +28,11 @@ .x262: x262 $(REQUIRE_GPL) sed -i -e 's/x264/x262/g' $ +Date: Mon, 22 Apr 2024 14:03:02 +0200 +Subject: [PATCH] configure: set _FILE_OFFSET_BITS to detect fseeko + +On Android fseeko is not detected properly if if _FILE_OFFSET_BITS is not set. +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index c1fb599f..60ad229b 100755 +--- a/configure ++++ b/configure +@@ -1369,7 +1369,7 @@ if [ $SYS = WINDOWS -a $ARCH = X86 -a $compiler = GNU ] ; then + cc_check '' -fno-zero-initialized-in-bss && CFLAGS="$CFLAGS -fno-zero-initialized-in-bss" + fi + +-if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then ++if cc_check "stdio.h" "#define _FILE_OFFSET_BITS 64" "fseeko(stdin,0,0);" ; then + define fseek fseeko + define ftell ftello + elif cc_check "stdio.h" "" "fseeko64(stdin,0,0);" ; then +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/x264/SHA512SUMS vlc-3.0.22/contrib/src/x264/SHA512SUMS --- vlc-3.0.21/contrib/src/x264/SHA512SUMS 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/x264/SHA512SUMS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3d917a11f4e87d039f3c0549c6824ab8317fce2478872e174426c6b70275937e94234a709a7d43ec2cd0d4d4cd388a362890d0b103d091a3750216b8a7763a22 x264-e067ab0b530395f90b578f6d05ab0a225e2efdf9.tar.xz diff -Nru vlc-3.0.21/contrib/src/x264/rules.mak vlc-3.0.22/contrib/src/x264/rules.mak --- vlc-3.0.21/contrib/src/x264/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/x264/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,8 +1,8 @@ # x264 -X264_GITURL := git://git.videolan.org/x264.git -X264_SNAPURL := http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180324-2245.tar.bz2 -X262_GITURL := git://git.videolan.org/x262.git +X264_HASH := e067ab0b530395f90b578f6d05ab0a225e2efdf9 +X264_VERSION := $(X264_HASH) +X264_GITURL := https://code.videolan.org/videolan/x264.git ifdef BUILD_ENCODERS ifdef GPL @@ -18,14 +18,9 @@ PKGS_FOUND += x26410b endif -#ifeq ($(call need_pkg,"x262"),) -#PKGS_FOUND += x262 -#endif - PKGS_ALL += x26410b -X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" \ - --enable-static \ +X264CONF = \ --disable-avs \ --disable-lavf \ --disable-cli \ @@ -39,90 +34,56 @@ else X264CONF += --disable-win32thread endif -ifeq ($(ARCH), arm) -X264_AS = AS="./tools/gas-preprocessor.pl -arch arm -as-type clang -force-thumb -- $(CC) -mimplicit-it=always" -endif -ifeq ($(ARCH),aarch64) -# Configure defaults to gas-preprocessor + armasm64 for this target, -# unless overridden. -X264_AS = AS="$(CC)" -endif endif ifdef HAVE_CROSS_COMPILE ifndef HAVE_DARWIN_OS +ifdef HAVE_ANDROID +X264CONF += --cross-prefix="$(subst ld,,$(LD))" +else X264CONF += --cross-prefix="$(HOST)-" endif +endif ifdef HAVE_ANDROID # broken text relocations ifeq ($(ANDROID_ABI), x86) X264CONF += --disable-asm endif -ifeq ($(ANDROID_ABI), x86_64) -X264CONF += --disable-asm -endif endif endif -ifdef HAVE_DARWIN_OS -ifeq ($(ARCH),aarch64) -X264CONF += --extra-asflags="-arch $(PLATFORM_SHORT_ARCH)" + +ifneq ($(filter arm aarch64, $(ARCH)),) +ifndef HAVE_WIN32 +X264_ASM_USES_CC:=1 endif endif -$(TARBALLS)/x262-git.tar.xz: - $(call download_git,$(X262_GITURL)) - -$(TARBALLS)/x262-git.tar.gz: - $(call download,$(X262_SNAPURL)) - -$(TARBALLS)/x264-git.tar.xz: - $(call download_git,$(X264_GITURL)) +ifdef X264_ASM_USES_CC +X264CONF += --extra-asflags="$(EXTRA_CFLAGS)" +endif -$(TARBALLS)/x264-git.tar.bz2: - $(call download,$(X264_SNAPURL)) - -.sum-x262: x262-git.tar.gz - $(warning $@ not implemented) - touch $@ +$(TARBALLS)/x264-$(X264_VERSION).tar.xz: + $(call download_git,$(X264_GITURL),,$(X264_HASH)) .sum-x26410b: .sum-x264 touch $@ -.sum-x264: x264-git.tar.bz2 - $(warning $@ not implemented) +.sum-x264: x264-$(X264_VERSION).tar.xz + $(call check_githash,$(X264_VERSION)) touch $@ -x264 x26410b: %: x264-git.tar.bz2 .sum-% - rm -Rf $*-git - mkdir -p $*-git - tar xvjfo "$<" --strip-components=1 -C $*-git - $(UPDATE_AUTOCONFIG) - mv $*-git $* - -x262: x262-git.tar.gz .sum-x262 - rm -Rf $@-git - mkdir -p $@-git - tar xvzfo "$<" --strip-components=1 -C $@-git +x264 x26410b: %: x264-$(X264_VERSION).tar.xz .sum-% + $(UNPACK) $(UPDATE_AUTOCONFIG) + $(APPLY) $(SRC)/x264/x264-winstore.patch + $(APPLY) $(SRC)/x264/0001-osdep-use-direct-path-to-internal-x264.h.patch + $(APPLY) $(SRC)/x264/0001-configure-set-_FILE_OFFSET_BITS-to-detect-fseeko.patch $(MOVE) - .x264: x264 $(REQUIRE_GPL) - cd $< && $(HOSTVARS) $(X264_AS) ./configure $(X264CONF) - cd $< && $(MAKE) install + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(X264CONF) + $(MAKE) -C $< install touch $@ .x26410b: .x264 touch $@ - -.x262: x262 - $(REQUIRE_GPL) - cd $< && sed -i -e 's/x264/x262/g' configure - cd $< && sed -i -e 's/x264_config/x262_config/g' *.h Makefile *.c - cd $< && $(HOSTVARS) ./configure $(X264CONF) - cd $< && sed -i -e 's/x264.pc/x262.pc/g' Makefile - cd $< && sed -i -e 's/x264.h/x262.h/g' Makefile - cd $< && $(MAKE) - cd $< && cp x264.h x262.h - cd $< && $(MAKE) install - touch $@ diff -Nru vlc-3.0.21/contrib/src/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch vlc-3.0.22/contrib/src/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch --- vlc-3.0.21/contrib/src/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,31 @@ +From 6e5f1a13bf5abaa1a84a65d6bb4fa3c9eb5fb41a Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 16 Oct 2024 10:43:58 +0200 +Subject: [PATCH] Fix libunwind static linking on Android toolchains + +As well as llvm-mingw with -static-libgcc. +--- + source/CMakeLists.txt | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 33b6523f1..4d452e2c0 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -649,6 +649,13 @@ if(X265_LATEST_TAG) + foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) + if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB}) + list(APPEND PLIBLIST "${LIB}") ++ elseif(${LIB} MATCHES "-l:lib.*.a") ++ string(LENGTH ${LIB} LIBLEN) ++ math(EXPR LIBLEN "${LIBLEN}-8") ++ string(SUBSTRING ${LIB} 6 ${LIBLEN} DIRECT_LIB) ++ list(APPEND PLIBLIST "-l${DIRECT_LIB}") ++ elseif(${LIB} MATCHES "-l.*") ++ list(APPEND PLIBLIST ${LIB}) + else() + list(APPEND PLIBLIST "-l${LIB}") + endif() +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/x265/0001-api-use-LoadLibraryExA-instead-of-LoadLibraryA.patch vlc-3.0.22/contrib/src/x265/0001-api-use-LoadLibraryExA-instead-of-LoadLibraryA.patch --- vlc-3.0.21/contrib/src/x265/0001-api-use-LoadLibraryExA-instead-of-LoadLibraryA.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/x265/0001-api-use-LoadLibraryExA-instead-of-LoadLibraryA.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From 2c465c6112734c6879d789dd6d679205b3ae7a17 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 7 Jun 2023 10:36:43 +0200 -Subject: [PATCH 1/2] api: use LoadLibraryExA instead of LoadLibraryA - -They were introduced in XP but only LoadLibraryExA is allowed in -Universal Windows Platform 19H1 builds. - -Using LOAD_LIBRARY_SEARCH_DEFAULT_DIRS is equivalent to the behavior -of LoadLibraryA. ---- - source/encoder/api.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/source/encoder/api.cpp b/source/encoder/api.cpp -index 10031d109..46d84a75c 100644 ---- a/source/encoder/api.cpp -+++ b/source/encoder/api.cpp -@@ -720,10 +720,10 @@ const x265_api* x265_api_get(int bitDepth) - g_recursion++; - - #if _WIN32 -- HMODULE h = LoadLibraryA(libname); -+ HMODULE h = LoadLibraryExA(libname, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); - if (!h) - { -- h = LoadLibraryA(multilibname); -+ h = LoadLibraryExA(multilibname, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); - reqDepth = bitDepth; - } - if (h) -@@ -813,10 +813,10 @@ const x265_api* x265_api_query(int bitDepth, int apiVersion, int* err) - g_recursion++; - - #if _WIN32 -- HMODULE h = LoadLibraryA(libname); -+ HMODULE h = LoadLibraryExA(libname, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); - if (!h) - { -- h = LoadLibraryA(multilibname); -+ h = LoadLibraryExA(multilibname, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); - reqDepth = bitDepth; - } - if (h) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/x265/0001-fix-ldl-linking-error-of-x265.patch vlc-3.0.22/contrib/src/x265/0001-fix-ldl-linking-error-of-x265.patch --- vlc-3.0.21/contrib/src/x265/0001-fix-ldl-linking-error-of-x265.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/x265/0001-fix-ldl-linking-error-of-x265.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,26 @@ +From 6a859d8fc1b064dd9db9f5807b95d621604aab7c Mon Sep 17 00:00:00 2001 +From: Gilles Sabourin +Date: Sun, 10 Jul 2016 15:21:38 +0200 +Subject: [PATCH 1/3] fix ldl linking error of x265 + +Signed-off-by: Jean-Baptiste Kempf +--- + source/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 33b6523f1..0ea2487c7 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -713,7 +713,7 @@ if(ENABLE_CLI) + if(WIN32 OR NOT ENABLE_SHARED OR INTEL_CXX) + # The CLI cannot link to the shared library on Windows, it + # requires internal APIs not exported from the DLL +- target_link_libraries(cli x265-static ${PLATFORM_LIBS}) ++ target_link_libraries(cli x265-static ${PLATFORM_LIBS} ${CMAKE_DL_LIBS}) + else() + target_link_libraries(cli x265-shared ${PLATFORM_LIBS}) + endif() +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/x265/0001-threadpool-disable-group-affinity-in-UWP-builds.patch vlc-3.0.22/contrib/src/x265/0001-threadpool-disable-group-affinity-in-UWP-builds.patch --- vlc-3.0.21/contrib/src/x265/0001-threadpool-disable-group-affinity-in-UWP-builds.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/x265/0001-threadpool-disable-group-affinity-in-UWP-builds.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -From d5f07f19fba444a2639cd93ddae0b2556d6fbb7e Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 7 Jun 2023 10:39:09 +0200 -Subject: [PATCH] threadpool: disable group affinity in UWP builds - -GetNumaNodeProcessorMaskEx() is not allowed in any UWP builds. ---- - source/common/threadpool.cpp | 14 +++++++------- - source/common/threadpool.h | 11 ++++++++++- - 2 files changed, 17 insertions(+), 8 deletions(-) - -diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp -index 91e82a24e..ab0b3b76a 100644 ---- a/source/common/threadpool.cpp -+++ b/source/common/threadpool.cpp -@@ -71,7 +71,7 @@ - # define strcasecmp _stricmp - #endif - --#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#ifdef USE_WIN32_AFFINITY - const uint64_t m1 = 0x5555555555555555; //binary: 0101... - const uint64_t m2 = 0x3333333333333333; //binary: 00110011.. - const uint64_t m3 = 0x0f0f0f0f0f0f0f0f; //binary: 4 zeros, 4 ones ... -@@ -262,14 +262,14 @@ ThreadPool* ThreadPool::allocThreadPools(x265_param* p, int& numPools, bool isTh - int numNumaNodes = X265_MIN(getNumaNodeCount(), MAX_NODE_NUM); - bool bNumaSupport = false; - --#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#ifdef USE_WIN32_AFFINITY - bNumaSupport = true; - #elif HAVE_LIBNUMA - bNumaSupport = numa_available() >= 0; - #endif - - --#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#ifdef USE_WIN32_AFFINITY - PGROUP_AFFINITY groupAffinityPointer = new GROUP_AFFINITY; - for (int i = 0; i < numNumaNodes; i++) - { -@@ -475,7 +475,7 @@ bool ThreadPool::create(int numThreads, int maxProviders, uint64_t nodeMask) - { - X265_CHECK(numThreads <= MAX_POOL_THREADS, "a single thread pool cannot have more than MAX_POOL_THREADS threads\n"); - --#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#ifdef USE_WIN32_AFFINITY - memset(&m_groupAffinity, 0, sizeof(GROUP_AFFINITY)); - for (int i = 0; i < getNumaNodeCount(); i++) - { -@@ -568,7 +568,7 @@ void ThreadPool::setCurrentThreadAffinity() - - void ThreadPool::setThreadNodeAffinity(void *numaMask) - { --#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#ifdef USE_WIN32_AFFINITY - UNREFERENCED_PARAMETER(numaMask); - GROUP_AFFINITY groupAffinity; - memset(&groupAffinity, 0, sizeof(GROUP_AFFINITY)); -@@ -597,7 +597,7 @@ void ThreadPool::setThreadNodeAffinity(void *numaMask) - /* static */ - int ThreadPool::getNumaNodeCount() - { --#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#ifdef USE_WIN32_AFFINITY - ULONG num = 1; - if (GetNumaHighestNodeNumber(&num)) - num++; -@@ -615,7 +615,7 @@ int ThreadPool::getNumaNodeCount() - /* static */ - int ThreadPool::getCpuCount() - { --#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#ifdef USE_WIN32_AFFINITY - enum { MAX_NODE_NUM = 127 }; - int cpus = 0; - int numNumaNodes = X265_MIN(getNumaNodeCount(), MAX_NODE_NUM); -diff --git a/source/common/threadpool.h b/source/common/threadpool.h -index 867539f3a..d295a02bd 100644 ---- a/source/common/threadpool.h -+++ b/source/common/threadpool.h -@@ -44,6 +44,15 @@ static const sleepbitmap_t ALL_POOL_THREADS = (sleepbitmap_t)-1; - enum { MAX_POOL_THREADS = sizeof(sleepbitmap_t) * 8 }; - enum { INVALID_SLICE_PRIORITY = 10 }; // a value larger than any X265_TYPE_* macro - -+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#include -+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+// GetNumaNodeProcessorMaskEx is not available in UWP apps -+# define USE_WIN32_AFFINITY 1 -+# endif -+#endif -+ -+ - // Frame level job providers. FrameEncoder and Lookahead derive from - // this class and implement findJob() - class JobProvider -@@ -84,7 +93,7 @@ public: - int m_numProviders; - int m_numWorkers; - void* m_numaMask; // node mask in linux, cpu mask in windows --#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -+#ifdef USE_WIN32_AFFINITY - GROUP_AFFINITY m_groupAffinity; - #endif - bool m_isActive; --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/x265/0002-do-not-copy-.pdb-files-that-don-t-exist.patch vlc-3.0.22/contrib/src/x265/0002-do-not-copy-.pdb-files-that-don-t-exist.patch --- vlc-3.0.21/contrib/src/x265/0002-do-not-copy-.pdb-files-that-don-t-exist.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/x265/0002-do-not-copy-.pdb-files-that-don-t-exist.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,25 @@ +From 0a77b8c80bc3ae6b10fa159102dc78d1b0fc6918 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Fri, 18 May 2018 16:32:17 +0200 +Subject: [PATCH 2/3] do not copy .pdb files that don't exist + +--- + source/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 0ea2487c7..f6649ced1 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -554,7 +554,7 @@ if(ENABLE_HDR10_PLUS) + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) + endif() + install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) +-if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED)) ++if((WIN32 AND ENABLE_CLI AND MSVC_IDE) OR (WIN32 AND ENABLE_SHARED AND MSVC_IDE)) + if(MSVC_IDE) + install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) + install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/x265/0003-add-patch-to-enable-detect512.patch vlc-3.0.22/contrib/src/x265/0003-add-patch-to-enable-detect512.patch --- vlc-3.0.21/contrib/src/x265/0003-add-patch-to-enable-detect512.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/x265/0003-add-patch-to-enable-detect512.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,40 @@ +From 84f315deced14f7541fb68a637391bd6eaab9f6c Mon Sep 17 00:00:00 2001 +From: rego21 +Date: Sun, 20 Mar 2022 23:27:21 +0100 +Subject: [PATCH 3/3] add patch to enable detect512 + +Enables detect512 for all architectures +--- + source/common/cpu.cpp | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp +index 0681ff55b..fa687da7c 100644 +--- a/source/common/cpu.cpp ++++ b/source/common/cpu.cpp +@@ -110,6 +110,11 @@ const cpu_name_t cpu_names[] = + { "", 0 }, + }; + ++bool detect512() ++{ ++ return(enable512); ++} ++ + #if X265_ARCH_X86 + + extern "C" { +@@ -123,10 +128,6 @@ uint64_t PFX(cpu_xgetbv)(int xcr); + #pragma warning(disable: 4309) // truncation of constant value + #endif + +-bool detect512() +-{ +- return(enable512); +-} + uint32_t cpu_detect(bool benableavx512 ) + { + +-- +2.45.0.windows.1 + diff -Nru vlc-3.0.21/contrib/src/x265/rules.mak vlc-3.0.22/contrib/src/x265/rules.mak --- vlc-3.0.21/contrib/src/x265/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/x265/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -24,18 +24,23 @@ x265: x265_$(X265_VERSION).tar.gz .sum-x265 $(UNPACK) - $(APPLY) $(SRC)/x265/x265-ldl-linking.patch - $(APPLY) $(SRC)/x265/x265-no-pdb-install.patch - $(APPLY) $(SRC)/x265/x265-enable-detect512.patch + $(APPLY) $(SRC)/x265/0001-fix-ldl-linking-error-of-x265.patch + $(APPLY) $(SRC)/x265/0002-do-not-copy-.pdb-files-that-don-t-exist.patch + $(APPLY) $(SRC)/x265/0003-add-patch-to-enable-detect512.patch + $(APPLY) $(SRC)/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch $(call pkg_static,"source/x265.pc.in") ifndef HAVE_WIN32 $(APPLY) $(SRC)/x265/x265-pkg-libs.patch endif $(MOVE) +X265_CONF := -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) -DENABLE_CLI=OFF + .x265: x265 toolchain.cmake $(REQUIRE_GPL) - cd $ +Date: Mon, 12 Feb 2024 20:39:05 +0100 +Subject: [PATCH] CMakeList.txt: force static library name to `z` + +They build code in a UNIX like environment but CMake doesn't set UNIX +for it. + +In contribs, we can always enforce this value. + +Co-authored-by: Alexandre Janniaux +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 15ceebe..c952cde 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,9 +167,9 @@ if(NOT CYGWIN) + set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) + endif() + ++# On unix-like platforms the library is almost always called libz ++set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) + if(UNIX) +- # On unix-like platforms the library is almost always called libz +- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) + if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +-- +2.43.0 + diff -Nru vlc-3.0.21/contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch vlc-3.0.22/contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch --- vlc-3.0.21/contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From 5c03377a53b137d647f1e485cd89e57f358ee3e9 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 9 Sep 2022 10:19:56 +0200 -Subject: [PATCH 1/2] Fix mingw static library name on mingw and Emscripten - -They build code in a UNIX like environment but CMake doesn't set UNIX for it. ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b412dc7..3f42869 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -163,10 +163,10 @@ if(NOT CYGWIN) - set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) - endif() - --if(UNIX) -+if(UNIX OR MINGW OR EMSCRIPTEN) - # On unix-like platforms the library is almost always called libz - set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) -- if(NOT APPLE) -+ if(NOT APPLE AND NOT MINGW AND NOT EMSCRIPTEN) - set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") - endif() - elseif(BUILD_SHARED_LIBS AND WIN32) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch vlc-3.0.22/contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch --- vlc-3.0.21/contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch 2024-06-05 15:55:36.000000000 +0000 +++ vlc-3.0.22/contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -From dc5305dbdd39d5f90c0413704d6945c5f8ac6617 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 29 Sep 2022 06:32:21 +0200 -Subject: [PATCH 2/2] Add an option to enable/disable building examples - ---- - CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3f42869..3f6de05 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ project(zlib C) - - set(VERSION "1.2.13") - -+option(BUILD_EXAMPLES "Build examples" ON) -+ - set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") - set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") - set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") -@@ -194,6 +196,7 @@ endif() - # Example binaries - #============================================================================ - -+if(BUILD_EXAMPLES) - add_executable(example test/example.c) - target_link_libraries(example zlib) - add_test(example example) -@@ -211,3 +214,4 @@ if(HAVE_OFF64_T) - target_link_libraries(minigzip64 zlib) - set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") - endif() -+endif(BUILD_EXAMPLES) --- -2.37.3.windows.1 - diff -Nru vlc-3.0.21/contrib/src/zlib/SHA512SUMS vlc-3.0.22/contrib/src/zlib/SHA512SUMS --- vlc-3.0.21/contrib/src/zlib/SHA512SUMS 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/contrib/src/zlib/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -1 +1 @@ -9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725 zlib-1.2.13.tar.xz +1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d zlib-1.3.1.tar.xz diff -Nru vlc-3.0.21/contrib/src/zlib/no-shared.patch vlc-3.0.22/contrib/src/zlib/no-shared.patch --- vlc-3.0.21/contrib/src/zlib/no-shared.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/zlib/no-shared.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- zlib/win32/Makefile.gcc.orig 2016-08-30 16:03:24.458949860 +0000 -+++ zlib/win32/Makefile.gcc 2016-08-30 16:03:29.598983275 +0000 -@@ -90,7 +90,8 @@ - $(STATICLIB): $(OBJS) $(OBJA) - $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA) - --$(IMPLIB): $(SHAREDLIB) -+$(IMPLIB): -+ touch $@ - - $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o - $(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \ diff -Nru vlc-3.0.21/contrib/src/zlib/rules.mak vlc-3.0.22/contrib/src/zlib/rules.mak --- vlc-3.0.21/contrib/src/zlib/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/zlib/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,5 +1,5 @@ # ZLIB -ZLIB_VERSION := 1.2.13 +ZLIB_VERSION := 1.3.1 ZLIB_URL := $(GITHUB)/madler/zlib/releases/download/v$(ZLIB_VERSION)/zlib-$(ZLIB_VERSION).tar.xz PKGS += zlib @@ -7,12 +7,6 @@ PKGS_FOUND += zlib endif -ifeq ($(shell uname),Darwin) # zlib tries to use libtool on Darwin -ifdef HAVE_CROSS_COMPILE -ZLIB_CONFIG_VARS=CHOST=$(HOST) -endif -endif - $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.xz: $(call download_pkg,$(ZLIB_URL),zlib) @@ -20,14 +14,28 @@ zlib: zlib-$(ZLIB_VERSION).tar.xz .sum-zlib $(UNPACK) - $(APPLY) $(SRC)/zlib/no-shared.patch + $(APPLY) $(SRC)/zlib/0001-CMakeList.txt-force-static-library-name-to-z.patch + # disable the installation of the dynamic library since there's no option + sed -e 's,install(TARGETS zlib zlibstatic,install(TARGETS zlibstatic,' -i.orig $(UNPACK_DIR)/CMakeLists.txt + # only use the proper libz name for the static library + sed -e 's,set_target_properties(zlib zlibstatic ,set_target_properties(zlibstatic ,' -i.orig $(UNPACK_DIR)/CMakeLists.txt + # don't use --version-script on static libraries + sed -e 's,if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)),if(BUILD_SHARED_LIBS AND (NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))),' -i.orig $(UNPACK_DIR)/CMakeLists.txt $(MOVE) -.zlib: zlib -ifdef HAVE_WIN32 - cd $< && $(HOSTVARS) $(MAKE) -fwin32/Makefile.gcc install $(HOSTVARS) $(ZLIB_CONFIG_VARS) LD="$(CC)" prefix="$(PREFIX)" INCLUDE_PATH="$(PREFIX)/include" LIBRARY_PATH="$(PREFIX)/lib" BINARY_PATH="$(PREFIX)/bin" -else - cd $< && $(HOSTVARS_PIC) $(ZLIB_CONFIG_VARS) ./configure --prefix=$(PREFIX) --static - cd $< && $(MAKE) install -endif +ZLIB_CONF = -DINSTALL_PKGCONFIG_DIR:STRING=$(PREFIX)/lib/pkgconfig -DZLIB_BUILD_EXAMPLES=OFF + +# ASM is disabled as the necessary source files are not in the tarball nor the git +# ifeq ($(ARCH),i386) +# ZLIB_CONF += -DASM686=ON +# endif +# ifeq ($(ARCH),x86_64) +# ZLIB_CONF += -DAMD64=ON +# endif + +.zlib: zlib toolchain.cmake + $(CMAKECLEAN) + $(HOSTVARS) $(CMAKE) $(ZLIB_CONF) + +$(CMAKEBUILD) + +$(CMAKEBUILD) --target install touch $@ diff -Nru vlc-3.0.21/contrib/src/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch vlc-3.0.22/contrib/src/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch --- vlc-3.0.21/contrib/src/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,30 @@ +From 9d3e264119fdcbe0598fe637d18c66ebf0731cfc Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Tue, 16 Apr 2024 07:59:13 +0200 +Subject: [PATCH] configure: hardcode -liconv instead of the full path + +It disturbs libtool when adding a .a as a file to link with. + +png and libz are already hardcoded. +--- + configure.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 25e6aa7..62fd0c9 100644 +--- a/configure.in ++++ b/configure.in +@@ -236,7 +236,9 @@ AM_ICONV_LINK + if test "x$am_cv_func_iconv" != xyes; then + AC_MSG_ERROR([iconv() not found]) + fi +-LIBS="$LIBS $LIBICONV" ++if test "$am_cv_lib_iconv" = yes; then ++LIBS="$LIBS -liconv" ++fi + + dnl + dnl Check for png library. +-- +2.37.3.windows.1 + diff -Nru vlc-3.0.21/contrib/src/zvbi/rules.mak vlc-3.0.22/contrib/src/zvbi/rules.mak --- vlc-3.0.21/contrib/src/zvbi/rules.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/contrib/src/zvbi/rules.mak 2025-11-13 22:17:54.000000000 +0000 @@ -23,9 +23,14 @@ $(APPLY) $(SRC)/zvbi/zvbi-win32-undefined.patch endif $(APPLY) $(SRC)/zvbi/zvbi-fix-clang-support.patch + $(APPLY) $(SRC)/zvbi/zvbi-va_copy.patch ifdef HAVE_ANDROID $(APPLY) $(SRC)/zvbi/zvbi-android.patch endif + # hardcode -liconv instead of the full path + $(APPLY) $(SRC)/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch + # check for pthread_create in pthreads as well + sed -i.orig "s/AC_CHECK_LIB(pthread, pthread_create,,/AC_SEARCH_LIBS([pthread_create], [pthread pthreads],,/" $(UNPACK_DIR)/configure.in $(MOVE) DEPS_zvbi = png $(DEPS_png) iconv $(DEPS_iconv) @@ -33,8 +38,12 @@ ZVBICONF := \ --disable-dvb --disable-bktr \ --disable-nls --disable-proxy \ - --without-doxygen \ - $(HOSTCONF) + --without-doxygen + +ifdef HAVE_ANDROID +# discard bogus pthread_cancel calls +ZVBICONF += CFLAGS="$(CFLAGS) -Wno-implicit-function-declaration" +endif ifdef HAVE_WIN32 DEPS_zvbi += pthreads $(DEPS_pthreads) @@ -43,8 +52,7 @@ .zvbi: zvbi $(UPDATE_AUTOCONFIG) $(RECONF) - cd $< && $(HOSTVARS) ./configure $(ZVBICONF) - cd $< && $(MAKE) -C src install - cd $< && $(MAKE) SUBDIRS=. install - sed -i.orig -e "s/\/[^ ]*libiconv.a/-liconv/" $(PREFIX)/lib/pkgconfig/zvbi-0.2.pc + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(ZVBICONF) + $(MAKE) -C $< -C src install + $(MAKE) -C $< SUBDIRS=. install touch $@ diff -Nru vlc-3.0.21/contrib/src/zvbi/zvbi-va_copy.patch vlc-3.0.22/contrib/src/zvbi/zvbi-va_copy.patch --- vlc-3.0.21/contrib/src/zvbi/zvbi-va_copy.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/contrib/src/zvbi/zvbi-va_copy.patch 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,13 @@ +--- zvbi/src/misc.h.ORIG 2013-07-01 22:32:31.000000000 -0400 ++++ zvbi/src/misc.h 2021-09-01 23:30:14.400736405 -0400 +@@ -424,7 +424,9 @@ + #endif + + /* __va_copy is a GNU extension. */ +-#ifndef __va_copy ++#ifdef va_copy && !defined(__va_copy) ++# define __va_copy va_copy ++#else + # define __va_copy(ap1, ap2) do { ap1 = ap2; } while (0) + #endif + diff -Nru vlc-3.0.21/debian/changelog vlc-3.0.22/debian/changelog --- vlc-3.0.21/debian/changelog 2024-06-10 20:58:19.000000000 +0000 +++ vlc-3.0.22/debian/changelog 2025-12-13 22:56:12.000000000 +0000 @@ -1,3 +1,10 @@ +vlc (3.0.22-0+deb12u1) bookworm-security; urgency=medium + + * New upstream version 3.0.22 + * debian/: Re-enable VAAPI support (Closes: #1021601, #1013898) + + -- Sebastian Ramacher Sat, 13 Dec 2025 23:56:12 +0100 + vlc (3.0.21-0+deb12u1) bookworm-security; urgency=medium * New upstream version 3.0.21 diff -Nru vlc-3.0.21/debian/rules vlc-3.0.22/debian/rules --- vlc-3.0.21/debian/rules 2024-06-10 20:56:47.000000000 +0000 +++ vlc-3.0.22/debian/rules 2025-12-13 22:42:50.000000000 +0000 @@ -151,8 +151,6 @@ --disable-wasapi \ $(NULL) -removeplugins += libva - # Linux specific flags ifeq ($(DEB_HOST_ARCH_OS),linux) # V4L2 is disabled on kFreeBSD due to a build failure. @@ -198,6 +196,7 @@ # Linux and kFreeBSD specific flags (disabled on Hurd) ifeq (,$(filter-out linux kfreebsd,$(DEB_HOST_ARCH_OS))) confflags += \ + --enable-libva \ --enable-vcd \ --enable-smbclient \ $(NULL) diff -Nru vlc-3.0.21/debian/vlc-plugin-video-output.install vlc-3.0.22/debian/vlc-plugin-video-output.install --- vlc-3.0.21/debian/vlc-plugin-video-output.install 2024-06-10 20:56:47.000000000 +0000 +++ vlc-3.0.22/debian/vlc-plugin-video-output.install 2025-12-13 22:42:50.000000000 +0000 @@ -2,7 +2,7 @@ exec python3 $(dirname $0)/filter-plugin.py < -Date: Thu Jan 1 17:41:25 2004 +0000 - - * Updated german and french translations - * Updated version number and Changelog diff -Nru vlc-3.0.21/doc/ChangeLog-2005 vlc-3.0.22/doc/ChangeLog-2005 --- vlc-3.0.21/doc/ChangeLog-2005 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2005 2025-11-24 23:15:36.000000000 +0000 @@ -22696,22 +22696,3 @@ Date: Sun Jan 2 18:58:53 2005 +0000 * moved the preferences-window to a seperate nib-file - -commit 46f1af78e551014ce2e88d6924b71b5f4502f34c -Author: Felix Paul Kühne -Date: Sat Jan 1 18:13:51 2005 +0000 - - * give credit to Jonas Larsen for creating the Danish l10n - * replace all "@" with " at " - -commit d1ddeb74fd85b4837e5a2d37a2088b7405397aa6 -Author: Felix Paul Kühne -Date: Sat Jan 1 17:54:05 2005 +0000 - - * build libiconv without i18n-support, so it can be compiled without gettext -- gettext will be compiled afterwards, so it can take advantage of libiconv - -commit 5fc224c4aadc7f7eb1085a207341105838231ca9 -Author: Felix Paul Kühne -Date: Sat Jan 1 16:29:51 2005 +0000 - - * make sure gettext is built before libiconv, since it is needed for its compilation diff -Nru vlc-3.0.21/doc/ChangeLog-2007 vlc-3.0.22/doc/ChangeLog-2007 --- vlc-3.0.21/doc/ChangeLog-2007 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2007 2025-11-24 23:15:37.000000000 +0000 @@ -32305,21 +32305,3 @@ Fix a bunch of format string injection in VCDX and CDDA. Initially reported by Kevin Finisterre - -commit b11fb39b618411a952b1ee7593a1cdfb37438000 -Author: Felix Paul Kühne -Date: Mon Jan 1 22:39:01 2007 +0000 - - * using GCC 3.3 with the 10.3.9 SDK is definitelly no good idea. x264 and libtwolame remain broken for future d. releases - -commit 2a35ffae6fc5f9ee8b8c81177a4902f72f6239ce -Author: Jean-Paul Saman -Date: Mon Jan 1 18:56:37 2007 +0000 - - Patch by Mikko Hirvonen for Firefox-1.5.x development tools detection in configure.ac. The patch is applied with some modifications of me - -commit 641707d30e39c4cfa108587019817c96695cef21 -Author: Felix Paul Kühne -Date: Mon Jan 1 17:05:32 2007 +0000 - - * added out-of-the-box support for future darwin releases. right now, the following libraries are broken (due to linking issues): cdio, cddb, vcdimager and twolame. additionally, x264 doesn't compile because of a bug in makefile/config.mak. diff -Nru vlc-3.0.21/doc/ChangeLog-2008 vlc-3.0.22/doc/ChangeLog-2008 --- vlc-3.0.21/doc/ChangeLog-2008 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2008 2025-11-24 23:15:37.000000000 +0000 @@ -8482,7 +8482,7 @@ WinCE: more missing functions fixes commit 07faebaf35bfa682913ac99f11562ecd8b974021 -Merge: b973e326f27 938c3c464fd +Merge: b973e326f2 938c3c464f Author: Geoffroy Couprie Date: Tue Sep 30 12:08:41 2008 +0200 @@ -16931,7 +16931,7 @@ Use FIND_CHILD when possible to look for the vout as suggested by dionoea and nefrir commit b38e99dd1389bc6b9a7579dd3fa872fdc59e88c1 -Merge: e40db6d8bb7 2d5437cec89 +Merge: e40db6d8bb 2d5437cec8 Author: Loïc Minier Date: Fri Aug 22 23:50:02 2008 +0200 @@ -18250,7 +18250,7 @@ mkv: bool spacing cleanup commit 75348facc56350e53eb336252c496876a5d04c09 -Merge: 0b301104d48 7b3f256f61c +Merge: 0b301104d4 7b3f256f61 Author: Pierre d'Herbemont Date: Fri Aug 15 00:59:10 2008 +0200 @@ -19674,7 +19674,7 @@ Signed-off-by: Rémi Denis-Courmont commit 6ebae83db81a80cdc3cead264455074702223ac0 -Merge: 626d109e739 684179744fa +Merge: 626d109e73 684179744f Author: Derk-Jan Hartman Date: Sat Aug 9 02:07:55 2008 +0200 @@ -21297,7 +21297,7 @@ pda gui: Set prio to 0, so it is not eligible for automatic selection. This is bad since it's a GTK module, and with our Qt switch and demise of wxGTK module, this module might be selected more often. It is not for the average user, and 0 tested under 0.9.0. Relates to #1798 commit 35824733e305214dfada18dd6362cfa02a86dcd3 -Merge: ec6ed81c26a 7ca75b8a239 +Merge: ec6ed81c26 7ca75b8a23 Author: Derk-Jan Hartman Date: Fri Aug 1 00:41:33 2008 +0200 @@ -23154,7 +23154,7 @@ Use pl_Locked and pl_Unlocked. commit cd4c4f1dadf2a9b595948da6d70ac2eaad93c990 -Merge: 344b1df5552 9525c2bdc42 +Merge: 344b1df555 9525c2bdc4 Author: Derk-Jan Hartman Date: Mon Jul 21 02:35:21 2008 +0200 @@ -27181,7 +27181,7 @@ Remove dummy $Id$ commit e2a614c82b502ea6c3cdee7d0fc39cbb9627041e -Merge: 51f898a0eb6 c617646c2e1 +Merge: 51f898a0eb c617646c2e Author: Ilkka Ollakka Date: Thu Jun 26 10:38:53 2008 +0300 @@ -27249,7 +27249,7 @@ If you are unpleased about that, fix the core (threading and networking). commit 84e0f97a07c049c9c7082032699d54f9b4e5708a -Merge: 2f53d49924d 12b188309df +Merge: 2f53d49924 12b188309d Author: Jean-Baptiste Kempf Date: Wed Jun 25 12:49:51 2008 -0700 @@ -32726,7 +32726,7 @@ Fix [95e3bb2eaf22929dac3e2c37a26a23e9a0619333] commit 975a356c965b7f84586b929b14ea8a70c6535beb -Merge: b4fdd335a49 e41bccdf881 +Merge: b4fdd335a4 e41bccdf88 Author: Jean-Paul Saman Date: Wed May 28 18:12:49 2008 +0200 @@ -32764,7 +32764,7 @@ This case is already handled in vlc_object_find() commit dd61f37b57429f10db99ffef010ec1c4e2fa0498 -Merge: e1629c217e6 c807dafe39e +Merge: e1629c217e c807dafe39 Author: Jean-Paul Saman Date: Wed May 28 17:33:49 2008 +0200 @@ -38442,7 +38442,7 @@ Signed-off-by: Meuuh the cow commit df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff -Merge: cb23a8236a2 0311983688a +Merge: cb23a8236a 0311983688 Author: Jean-Paul Saman Date: Mon Apr 14 15:44:31 2008 +0200 @@ -38789,7 +38789,7 @@ Compile fix. commit dff434365d951b38be69859dc8c3b210c82e019f -Merge: c72f2f9dcdc 87db766dfd9 +Merge: c72f2f9dcd 87db766dfd Author: Jean-Paul Saman Date: Fri Apr 11 10:53:45 2008 +0200 @@ -38903,7 +38903,7 @@ more VLM tests commit 1ac8441a1c11c1c242a4c5ad7ed9918fbf14da37 -Merge: 665cd9209c6 569f294d6aa +Merge: 665cd9209c 569f294d6a Author: Jean-Paul Saman Date: Wed Apr 9 12:45:24 2008 +0200 @@ -41840,7 +41840,7 @@ Do not allocate arbitrary length on the stack commit c8e6c21dc43999ad81e6801011c57553a07e85ab -Merge: 05278162c64 e5189c41aa4 +Merge: 05278162c6 e5189c41aa Author: Rafaël Carré Date: Sun Mar 23 22:28:03 2008 +0000 @@ -42249,7 +42249,7 @@ missing \param and \return tags (though a lot remains to be done). commit 4e0e4d6d4a3421ccf21715b0705b582826b0d62e -Merge: cfc98288bab 3b0534ea2cd +Merge: cfc98288ba 3b0534ea2c Author: Sam Hocevar Date: Thu Mar 20 17:38:00 2008 +0000 @@ -44963,7 +44963,7 @@ Signed-off-by: Rémi Denis-Courmont commit 132bf65db16a3496f2b14bb219b90695bdec3b86 -Merge: 79223aaeafe bd9f77136ff +Merge: 79223aaeaf bd9f77136f Author: André Weber Date: Sun Mar 2 18:37:32 2008 +0100 @@ -53553,147 +53553,3 @@ Date: Wed Jan 2 02:18:30 2008 +0000 MacOSX/VLC_App: Fix the framework Copy Phase. Patch by Enrique Osuna. - -commit e375d958ef136cbd23f3702bb4709d201c664bab -Author: Pierre d'Herbemont -Date: Tue Jan 1 22:26:33 2008 +0000 - - MacOSX: set the pbxproj file type to text and the right eol. - -commit 79ba2c850e422c7d2fdbbc7aaa618b0d226afbe5 -Author: Pierre d'Herbemont -Date: Tue Jan 1 22:00:20 2008 +0000 - - MacOSX: Default the Debug configuration variant. - -commit 124f1fe682d916f2e0e17cf697a0ea488c613ea5 -Author: Pierre d'Herbemont -Date: Tue Jan 1 21:57:48 2008 +0000 - - MacOSX/VLC_app/VLC.xcodeproj: Create three different targets to have more grain control over the dependencies. And fix the framework installation script. Default the use of the vlc-contrib-core-framework-app Target. - -commit 361d1636a38d6c3ac50360235be353a7cfcab160 -Author: Pierre d'Herbemont -Date: Tue Jan 1 21:49:30 2008 +0000 - - MacOSX/Framework/VLC.xcodeproj: Don't show the env var when executing scripts. (2nd). - -commit d42ca251ef780d16e715c2aba042ae918d89b54d -Author: Pierre d'Herbemont -Date: Tue Jan 1 21:42:10 2008 +0000 - - MacOSX/VLC_app/VLC.xcodeproj: Work around what seems to be a Xcode bug. We can't use the VLC.framework in the Copy Phase. - -commit 7596446d000b6a3411bf8bb803037ac95a42785b -Author: Pierre d'Herbemont -Date: Tue Jan 1 21:41:18 2008 +0000 - - MacOSX/Framework/VLC.xcodeproj: Remove debug print of the variables when launching our scripts. - -commit da2e003a8290621da2eb4099da79fb75852bd70c -Author: Pierre d'Herbemont -Date: Tue Jan 1 21:31:51 2008 +0000 - - MacOSX/Framework/VLC.xcodeproj: Allow one-click build for the whole contrib-core-module-framework. - -commit ce9f843609cf1f73c8f69f1c84646d7e708a7f79 -Author: Pierre d'Herbemont -Date: Tue Jan 1 21:28:24 2008 +0000 - - MacOSX/VLC_app/VLCController.m: Remove dead category. - -commit 9fe304603a31b2c01b910ab0977bd8f72e3133df -Author: Pierre d'Herbemont -Date: Tue Jan 1 20:38:24 2008 +0000 - - VLC_app/VLC.xcodeproj: Correctly add a dependancy for the VLC.framework. (Thanks to Julien Robert). - -commit a3d1163009fd3b54dfa094521961317c25d7039a -Author: Pierre d'Herbemont -Date: Tue Jan 1 19:24:58 2008 +0000 - - extras/MacOSX: Dead code removal. Not working code removal. - -commit b92ad8fc4b6c67a3a57859aee10525c2b705304d -Author: Pierre d'Herbemont -Date: Tue Jan 1 19:16:38 2008 +0000 - - VLCController.m: Remove unneeded code. - -commit 0a73fb583e66d2c9e4ef0917ffe8353c812871d8 -Author: Damien Fouilleul -Date: Tue Jan 1 18:48:24 2008 +0000 - - configure: reworked MacOS X SDK options, now use --with-macosx-sdk=DIR and --with-macosx-version-min=VERSION - -commit a4b0c7d0ff346bb1c9fc3e94e26928864816a9e5 -Author: Felix Paul Kühne -Date: Tue Jan 1 18:26:08 2008 +0000 - - macosx: fixed on-the-fly-changing of the adjust filter. code cleanup. Thanks to Antoine for pointing in the correct direction - -commit 99f6722d6c42bd408e50c43e7ab397cbb0b33667 -Author: Pierre d'Herbemont -Date: Tue Jan 1 18:03:56 2008 +0000 - - Revert [23949]. - -commit 054a2b0615657a039bd8bbf257a68df1b59ed43e -Author: Pierre d'Herbemont -Date: Tue Jan 1 17:06:40 2008 +0000 - - svn:keywords. - -commit b83ae6b44b26c3db50a9875b30479da954f4d72c -Author: Pierre d'Herbemont -Date: Tue Jan 1 16:46:55 2008 +0000 - - VLCExceptionHandler.m: -initialize to -load. initialize gets called to late or never. - -commit 8d5d2f839b28e3aebe560463cf5b3a977c6ef385 -Author: Rémi Duraffort -Date: Tue Jan 1 16:43:09 2008 +0000 - - Little correction of the double-clicks detection under sdl - -commit bace31c80180283b84d4794e54d6521cf838e969 -Author: Pierre d'Herbemont -Date: Tue Jan 1 16:23:38 2008 +0000 - - MacOSX/VLC_app: Add MainWindow.xib. - -commit 77d74ab447b6d78f765ea35e5eddf820d6e3f156 -Author: Christophe Mutricy -Date: Tue Jan 1 16:19:50 2008 +0000 - - Happy new year (2) - -commit b6dd543eb1394707708274a7686d1b07c9c6b98c -Author: Christophe Mutricy -Date: Tue Jan 1 16:19:02 2008 +0000 - - Happy new year - -commit 9cd8c3cac199bb326c3e6fb84851855aa7ac4470 -Author: Antoine Cellerier -Date: Tue Jan 1 16:17:42 2008 +0000 - - Fix the video controls extended panels (make extensive use of the object's name). - -commit 2b69849b1228b2453fcea3c9f8a19893a93a0462 -Author: Pierre d'Herbemont -Date: Tue Jan 1 16:15:23 2008 +0000 - - Fix previous commit. - -commit 991f12499f32b787c23b3a77cd0279ea2bd2994d -Author: Pierre d'Herbemont -Date: Tue Jan 1 16:13:58 2008 +0000 - - VLC_app/VLCMainWindow.h: Fix a warning, about the wrong type of the slider outlet. - -commit 9b675d98d239a28d1db37486b711b2107763be56 -Author: Pierre d'Herbemont -Date: Tue Jan 1 16:08:00 2008 +0000 - - VLCMediaList.m: Don't mess between node hierachical and hierarchical cached copy of the MediaListAspect. diff -Nru vlc-3.0.21/doc/ChangeLog-2009 vlc-3.0.22/doc/ChangeLog-2009 --- vlc-3.0.21/doc/ChangeLog-2009 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2009 2025-11-24 23:15:37.000000000 +0000 @@ -22654,7 +22654,7 @@ Fixed flicker with overlapped subtitles in ssa. commit 108053ff0921f359fd01c1c6988ce4fa0dc49f3f -Merge: 82633df33d7 ccfb6c20d6d +Merge: 82633df33d ccfb6c20d6 Author: JP Dinger Date: Fri Jul 24 17:24:46 2009 +0200 @@ -22803,7 +22803,7 @@ Use VLC_VAR_CLASS when applicable. commit bf8d85d77b6fc8c47704a0b787aca8ee8d72bb47 -Merge: 8baae61a21c aae7dd03aee +Merge: 8baae61a21 aae7dd03ae Author: JP Dinger Date: Fri Jul 24 13:38:22 2009 +0200 @@ -28789,7 +28789,7 @@ changes made to 7079b91c24f7c8032025576407f1386350cae58f. commit 3eeab0d3a064349bbd0f65b9a890a3cfc82f6283 -Merge: 7079b91c24f 4b44912ce08 +Merge: 7079b91c24 4b44912ce0 Author: Rémi Denis-Courmont Date: Sun May 31 22:32:09 2009 +0300 @@ -28804,7 +28804,7 @@ This reverts commit 8d812e0a8417d97334ad008185cd9ece30294ab3. commit 4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b -Merge: 8d812e0a841 6520db28ddf +Merge: 8d812e0a84 6520db28dd Author: Rémi Denis-Courmont Date: Sun May 31 22:30:31 2009 +0300 @@ -29263,7 +29263,7 @@ Signed-off-by: Rémi Denis-Courmont commit 55c960749e8f91763e720ac610d5dd56f90fcde1 -Merge: b74ce937e05 8e4c60f63eb +Merge: b74ce937e0 8e4c60f63e Author: Rémi Denis-Courmont Date: Wed May 27 18:50:03 2009 +0300 @@ -29432,7 +29432,7 @@ Fix compilation on Windows commit ad77d955a5dc051976d94d6e08ee0f717ec3a938 -Merge: 3bc0ec07775 4db7858c806 +Merge: 3bc0ec0777 4db7858c80 Author: Rémi Denis-Courmont Date: Tue May 26 19:37:54 2009 +0300 @@ -29498,7 +29498,7 @@ macosx: fixed regressions from merges with the 1.0-bugfix branch commit 74e5a0727b83ea8bd5ee87dbce7596b990ef14c1 -Merge: c5c06b64c80 8d5c75701a7 +Merge: c5c06b64c8 8d5c75701a Author: Derk-Jan Hartman Date: Tue May 26 16:10:57 2009 +0200 @@ -29513,7 +29513,7 @@ This was broken in [3d5ff7dc53d5ac154fd56faca23a3b6364037aa2] commit c5c06b64c806052086e5772d64e540a8db7e4a9b -Merge: ca07b0f9329 622c64a18a8 +Merge: ca07b0f932 622c64a18a Author: Rémi Duraffort Date: Tue May 26 15:50:52 2009 +0200 @@ -29591,7 +29591,7 @@ Signed-off-by: Jean-Baptiste Kempf commit 14f37b2101842fa6e427f962f689db74eff6faba -Merge: c65eebb30a7 46a33c34dcc +Merge: c65eebb30a 46a33c34dc Author: Rémi Duraffort Date: Tue May 26 12:58:18 2009 +0200 @@ -29646,7 +29646,7 @@ Small fix in NEWS. commit 658686029ee756fbf4beb8e0cdcc4b0bc5dd18ed -Merge: 13a41fa0f38 aeb955d83e1 +Merge: 13a41fa0f3 aeb955d83e Author: Jean-Baptiste Kempf Date: Tue May 26 01:57:08 2009 +0200 @@ -29687,7 +29687,7 @@ Fix conflicts. commit 66bd92014e5d721d8fe74bfd69f601bfd228012a -Merge: 1319c5c5700 f02742c79fc +Merge: 1319c5c570 f02742c79f Author: Jean-Baptiste Kempf Date: Tue May 26 00:51:06 2009 +0200 @@ -30023,7 +30023,7 @@ This fix all the dialogs (Fix AVI, HTTP login) that didn't show in skins interface. commit 9d5e75a7a5643a2144dc561fc246a7a3ca7e5fb0 -Merge: b13a8009cc2 f56161ec9f0 +Merge: b13a8009cc f56161ec9f Author: Rémi Denis-Courmont Date: Sat May 23 22:39:20 2009 +0300 @@ -30154,7 +30154,7 @@ Remove dummy debug commit 152b1687c0ec112f3ab1360006d048d6b9cf7258 -Merge: 4d4f701e03e 0577234ca3d +Merge: 4d4f701e03 0577234ca3 Author: Rémi Denis-Courmont Date: Sat May 23 17:01:32 2009 +0300 @@ -30221,7 +30221,7 @@ Missing space commit 52c18c4dec68158eedd655e0502820b7d7b6128f -Merge: 49d534e0209 deb3a851530 +Merge: 49d534e020 deb3a85153 Author: Rémi Denis-Courmont Date: Sat May 23 12:43:00 2009 +0300 @@ -30451,7 +30451,7 @@ Fix mouse key strings commit 51bbf793131496c6f31f70953ff434f17be80d63 -Merge: 0f2826187da 83116c1c926 +Merge: 0f2826187d 83116c1c92 Author: Rémi Denis-Courmont Date: Thu May 21 18:30:26 2009 +0300 @@ -30640,7 +30640,7 @@ Factorization. commit 78d87996ccb92d1dc91c9987685f976ed3be08a6 -Merge: a4bcd514cc7 b36b614a146 +Merge: a4bcd514cc b36b614a14 Author: Rémi Duraffort Date: Wed May 20 21:53:35 2009 +0200 @@ -30690,7 +30690,7 @@ Remove unwanted "\v". commit 7f12470415d98e9e0ac725f2bb96b5fa74ef27f1 -Merge: a516ab36c18 63980c43dd7 +Merge: a516ab36c1 63980c43dd Author: Rémi Denis-Courmont Date: Wed May 20 19:46:41 2009 +0300 @@ -31408,7 +31408,7 @@ (and add ftp and smb to the list) commit 24cddfa0efa80557f538d6dbf08f9b0b4b4d52a4 -Merge: d1d3d7b413a 6dce48f670a +Merge: d1d3d7b413 6dce48f670 Author: Laurent Aimar Date: Sat May 16 23:26:19 2009 +0200 @@ -31591,7 +31591,7 @@ Qt4: remove dead code commit 174f75debc6ff4b0b3a7037bc21e7b77bfe2a9d8 -Merge: cc321882c23 0bbc1eeee3f +Merge: cc321882c2 0bbc1eeee3 Author: Rémi Denis-Courmont Date: Sat May 16 20:07:46 2009 +0300 @@ -31701,7 +31701,7 @@ doSomehting() is not a good function name. commit 89b6530d8abd99b96b9f33af022022241fe97ee2 -Merge: e169fa3a378 da62e6d3fd7 +Merge: e169fa3a37 da62e6d3fd Author: Laurent Aimar Date: Sat May 16 01:09:40 2009 +0200 @@ -31874,7 +31874,7 @@ Signed-off-by: Rémi Duraffort commit ec6a7b8ec1fc9f070d1d5242836b1d643f9f2dd8 -Merge: 97ada6d92f4 e936fbd6171 +Merge: 97ada6d92f e936fbd617 Author: Jean-Baptiste Kempf Date: Thu May 14 23:20:40 2009 +0200 @@ -32050,7 +32050,7 @@ Well, only those that VLC knows anyway. commit fd7f8f854a13f7b65cb2b8622755aa47ee932919 -Merge: 8e1f14148bf 0dec2f724e0 +Merge: 8e1f14148b 0dec2f724e Author: Rémi Denis-Courmont Date: Thu May 14 18:54:17 2009 +0300 @@ -32160,7 +32160,7 @@ Require XCB so we always have a window provider (fixes #2736) commit 2151d6fe01a3b730b6d241b561ce18f5cc424faf -Merge: 43087f360f4 548f78df2e9 +Merge: 43087f360f 548f78df2e Author: Rémi Denis-Courmont Date: Wed May 13 23:32:57 2009 +0300 @@ -32347,7 +32347,7 @@ Don't hesitate if you have any comments. commit c6d2ba8aa42a6b2fdb3e10db38c3ef053f65b19d -Merge: 9c1f8ba1495 2d4241a1f7a +Merge: 9c1f8ba149 2d4241a1f7 Author: Rémi Denis-Courmont Date: Wed May 13 21:57:34 2009 +0300 @@ -32383,7 +32383,7 @@ Use input_GetVout() instead of vlc_object_find() commit 9c1f8ba149532713c7912eb233409b283c150155 -Merge: 03b85ce331b 42043990d34 +Merge: 03b85ce331 42043990d3 Author: Rémi Denis-Courmont Date: Wed May 13 21:08:54 2009 +0300 @@ -32453,7 +32453,7 @@ fbosd: fix compilation with the changes of text_style_* commit b65308f0b9f038e8f56aebbee784d128be7b0f7e -Merge: 44f031cb1db 9a1855005d5 +Merge: 44f031cb1d 9a1855005d Author: Rémi Denis-Courmont Date: Wed May 13 18:52:30 2009 +0300 @@ -32511,7 +32511,7 @@ and sues internal types commit 272817e4e8be36e209ea64e5de1784f951bc8ebb -Merge: 1403f3a061c 9b9051c4c1a +Merge: 1403f3a061 9b9051c4c1 Author: Rémi Denis-Courmont Date: Tue May 12 19:13:38 2009 +0300 @@ -32524,7 +32524,7 @@ Syntax error commit 1403f3a061c3c1eaff53e2e077d46d84bab30201 -Merge: 224e96f2aef a11122ee5f8 +Merge: 224e96f2ae a11122ee5f Author: Rémi Denis-Courmont Date: Tue May 12 18:46:25 2009 +0300 @@ -32679,7 +32679,7 @@ Removed dead code. commit 1ac10ca36325552f134fdc0d93512bbc35b808a7 -Merge: 7692ffe0ad8 8766feda419 +Merge: 7692ffe0ad 8766feda41 Author: Rémi Denis-Courmont Date: Mon May 11 22:22:52 2009 +0300 @@ -32712,7 +32712,7 @@ qt4: remove double check of isFullScreen commit 33d7f71f6907172c063d9383102de00abc6a3b30 -Merge: e83df29b1f3 109900f90d2 +Merge: e83df29b1f 109900f90d Author: Rémi Denis-Courmont Date: Mon May 11 19:30:53 2009 +0300 @@ -32748,7 +32748,7 @@ Signed-off-by: Rémi Denis-Courmont commit 0036da65250f7f6b785da2be9f68af0bb9275600 -Merge: c48ac54880b 2b4e12cdbe7 +Merge: c48ac54880 2b4e12cdbe Author: Rémi Denis-Courmont Date: Sun May 10 18:40:42 2009 +0300 @@ -32791,7 +32791,7 @@ HTTP: use DIR_SEP(_CHAR) commit c48ac54880b101834b5106bca116024999067db2 -Merge: 600d029594f 7a0efcc7090 +Merge: 600d029594 7a0efcc709 Author: Rémi Denis-Courmont Date: Sun May 10 15:32:30 2009 +0300 @@ -32834,7 +32834,7 @@ Remove static prototypes from header file commit 600d029594f32258567f27a875e4b956e0949a46 -Merge: d93246d2d33 b8f23ea7166 +Merge: d93246d2d3 b8f23ea716 Author: Rémi Denis-Courmont Date: Sun May 10 12:41:17 2009 +0300 @@ -34819,7 +34819,7 @@ Libass: set more debug messages. commit 6907b236982ed549573879d2590c5cb7e565ac9a -Merge: fcae9e71e8c a67c1100d0b +Merge: fcae9e71e8 a67c1100d0 Author: Jean-Baptiste Kempf Date: Fri Apr 24 18:22:14 2009 +0200 @@ -35687,7 +35687,7 @@ Compile fix commit 6511df53b2ea6320b5cf36a539ea6cffa99dffb9 -Merge: 665ba714270 e5030121893 +Merge: 665ba71427 e503012189 Author: Rémi Denis-Courmont Date: Wed Apr 15 23:27:33 2009 +0300 @@ -36225,7 +36225,7 @@ mkv: remove unmatche #endif introduced [b870bc9ddf45f01d24adb398b5f442ddc87a00ae] commit d3c449f26a72761b20dc8cb8334fdd5622acd1f2 -Merge: 81863915310 5c30d75fcc2 +Merge: 8186391531 5c30d75fcc Author: Rémi Denis-Courmont Date: Fri Apr 10 22:19:20 2009 +0300 @@ -37786,7 +37786,7 @@ Signed-off-by: Laurent Aimar commit 1c56e0ed3e363aa8c581c7e2880ac3e9bc51c674 -Merge: 0d358ba08ae 5b963efaee9 +Merge: 0d358ba08a 5b963efaee Author: Jean-Baptiste Kempf Date: Sun Mar 29 19:23:14 2009 +0200 @@ -41861,7 +41861,7 @@ Qt: use the new lock icon. commit 4362a469b5203cc57a17d4acb9354e8d03925478 -Merge: 10f1c32dbd8 36ed9b07993 +Merge: 10f1c32dbd 36ed9b0799 Author: Jean-Baptiste Kempf Date: Tue Feb 24 11:15:50 2009 +0100 @@ -43181,7 +43181,7 @@ Stay polite commit 31a51c3e45d72159defca0aaf95a5b599fc7cc5d -Merge: 1a11a808f3b 0f594de02d5 +Merge: 1a11a808f3 0f594de02d Author: Rémi Denis-Courmont Date: Sun Feb 15 19:26:12 2009 +0200 @@ -46128,7 +46128,7 @@ Missing vlc_savecancel() commit ff283ead4a3ec930becc2b382a175df13dee8cb9 -Merge: 72218fb9b9b 3e97bc6eafb +Merge: 72218fb9b9 3e97bc6eaf Author: Rémi Denis-Courmont Date: Sun Jan 25 20:31:21 2009 +0200 @@ -49790,9 +49790,3 @@ playlist: Don't assume that psz_name != NULL as GetName can return NULL and strcasecmp doesn't like comparing NULLs - -commit 8dca232ea871a54ee3089bddf6650a5a241532e9 -Author: Rémi Duraffort -Date: Thu Jan 1 21:39:37 2009 +0100 - - taglib: read and write some APE tags. diff -Nru vlc-3.0.21/doc/ChangeLog-2010 vlc-3.0.22/doc/ChangeLog-2010 --- vlc-3.0.21/doc/ChangeLog-2010 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2010 2025-11-24 23:15:37.000000000 +0000 @@ -11389,7 +11389,7 @@ Disable swscale if avcodec is disabled commit 1c6ac615a82aa1d8bab6295c828238e126ad201a -Merge: c1cf203b272 a81518d6c9f +Merge: c1cf203b27 a81518d6c9 Author: Jean-Baptiste Kempf Date: Wed Jul 21 18:16:32 2010 +0200 @@ -25249,7 +25249,7 @@ kilobit is kb, not kB commit 778a6f0719a6bf547917ff9f2ef7fd84769fd901 -Merge: 8d76c39a239 f8aeca6aea3 +Merge: 8d76c39a23 f8aeca6aea Author: Rémi Denis-Courmont Date: Wed Mar 3 20:09:49 2010 +0200 @@ -31900,7 +31900,7 @@ macosx/framework: Get rid of VLCMediaListAspect, and remove a bunch of exception. commit cb9e605beef6ce4134bec22a90aa54746444e667 -Merge: 0afbf878082 58b047635b7 +Merge: 0afbf87808 58b047635b Author: JP Dinger Date: Mon Feb 1 01:57:41 2010 +0100 @@ -38564,52 +38564,3 @@ Date: Sat Jan 2 22:53:24 2010 +0200 Win32: using a static mutex with a condition is not implemented yet - -commit bc8ee31f30c51821529af6403e7929f2df2f5487 -Author: Jean-Baptiste Kempf -Date: Sat Jan 2 00:04:08 2010 +0100 - - Qt: Fix audio options in SPrefs - - SPDIF and directx device - -commit 2d6fe3ddb119ad9da87a6bdcae0f4f578e692332 -Author: Jean-Baptiste Kempf -Date: Fri Jan 1 23:56:53 2010 +0100 - - Qt: update audio panel to newest DirectSound changes - - Close #3218 - -commit bd5c1734c30588ba439ae11d345ac7b3252bb84c -Author: Jean-Baptiste Kempf -Date: Fri Jan 1 23:55:10 2010 +0100 - - Win32: Be sure to strip axvlc.dll and npvlc.dll - -commit f40ec470c9a04e91c9102c764db5b92828ad1849 -Author: Pierre d'Herbemont -Date: Fri Jan 1 18:42:30 2010 +0100 - - macosx/framework: contrib are fat now. - -commit 5a20b90e8c6920a79d7d7b7ca56fb011b97dfc73 -Author: Pierre d'Herbemont -Date: Thu Dec 31 20:36:00 2009 +0100 - - macosx/framework: Support multiple architectures. - - Warning, building fat are not supported by automake if dependency-tracking is enabled. - That's why this fat build is disabled by default. - -commit 65ed93af7b623248bae389f656698248fe52bf8f -Author: Pierre d'Herbemont -Date: Thu Dec 31 19:33:06 2009 +0100 - - configure: Detect fat contribs. - -commit 2e024847e1bbfad3ddf4aa9fcb01c90c0e41c854 -Author: Pierre d'Herbemont -Date: Thu Dec 31 19:30:49 2009 +0100 - - contrib: Build fat binary using binary contrib on Mac OS X. diff -Nru vlc-3.0.21/doc/ChangeLog-2013 vlc-3.0.22/doc/ChangeLog-2013 --- vlc-3.0.21/doc/ChangeLog-2013 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2013 2025-11-24 23:15:37.000000000 +0000 @@ -25758,23 +25758,3 @@ The left and right arrow keys have not any real advantage / functionality for the playlist view or sidebar but are used by default for several hotkeys. So lets allow these as VLC hotkeys (also for audio files). - -commit fccc6ab913cad66c50b98d1ac14d2fe1f41f7453 -Author: Rafaël Carré -Date: Tue Jan 1 20:18:09 2013 +0100 - - Happy new year 2013 - -commit 10af2bf60149ab5ae08cb82d4fadfbb7b65897c4 -Author: Timo Rothenpieler -Date: Tue Jan 1 18:23:00 2013 +0100 - - vaapi: Use vaDeriveImage instead of vaGetImage if available - - Signed-off-by: Rafaël Carré - -commit 10d7463d9b9f664f7ccffd77da583db4304653d0 -Author: Rafaël Carré -Date: Tue Jan 1 18:04:54 2013 +0100 - - oldrc: fix segfault diff -Nru vlc-3.0.21/doc/ChangeLog-2014 vlc-3.0.22/doc/ChangeLog-2014 --- vlc-3.0.21/doc/ChangeLog-2014 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2014 2025-11-24 23:15:37.000000000 +0000 @@ -28283,69 +28283,3 @@ Date: Tue Dec 31 15:52:43 2013 +0100 chorus: remove wrong (and uneeded) dealocations - -commit 33f3158d5e79432b06ae8014aa999514f6f19f90 -Author: Denis Charmet -Date: Wed Jan 1 22:35:36 2014 +0100 - - Remove faulty return when vobsub doesn't define a size. - - Close #10111 - -commit 776f719e75bad42a1e684b5c074a95cf7f9fc3b1 -Author: Rémi Denis-Courmont -Date: Wed Jan 1 20:31:26 2014 +0200 - - input_CreateFilename: take explicit input thread pointer - - This should fix meta-data expansion in LibVLC (i.e. when recording). - -commit 68bc7fd968916a68eb16873431d48e4185669838 -Author: Rémi Denis-Courmont -Date: Wed Jan 1 20:25:52 2014 +0200 - - str_format_meta: take input thread pointer rather than playlist - -commit 098f3844b086a18c332f663a13c586bf1881b297 -Author: Rémi Denis-Courmont -Date: Wed Jan 1 20:17:32 2014 +0200 - - str_format_meta: clean up - -commit 27da83668571d11e8fed3bd87d2b396dfd5b57b0 -Author: Rémi Denis-Courmont -Date: Wed Jan 1 19:19:26 2014 +0200 - - dbus: use pl_CurrentInput() - -commit 5be88dcfc4e3585a90b8cdcbe6aee28c471173d4 -Author: Rémi Denis-Courmont -Date: Wed Jan 1 19:19:13 2014 +0200 - - pl_CurrentInput: more specific prototype - -commit b3f95b9594696b80ad5c3f0053b1507306c9ccb5 -Author: Rémi Denis-Courmont -Date: Wed Jan 1 18:07:45 2014 +0200 - - intf-add: small simplification - -commit 11c1769c986a690a75e8fe5df11e293f5f52e206 -Author: Rémi Denis-Courmont -Date: Wed Jan 1 18:55:49 2014 +0200 - - libvlc: look "syslog" value only once, simplify - -commit bc1fa152b3f17a26eef9cf57596c8368b6e30829 -Author: Rémi Denis-Courmont -Date: Wed Jan 1 18:52:01 2014 +0200 - - libvlc: look the value of intf up only once when used - -commit d19530bcb2f4721e5c4b2704865c0d86440d899b -Author: Rémi Denis-Courmont -Date: Wed Jan 1 18:38:19 2014 +0200 - - libvlc: remove "evil" daemon global variable and clean up - - (The unlikely corner case of ENOMEM remains unhandled/unfixed.) diff -Nru vlc-3.0.21/doc/ChangeLog-2015 vlc-3.0.22/doc/ChangeLog-2015 --- vlc-3.0.21/doc/ChangeLog-2015 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2015 2025-11-24 23:15:37.000000000 +0000 @@ -30010,13 +30010,3 @@ Date: Fri Jan 2 12:39:25 2015 +0100 VCD: avoid macro redefinition - -commit ee397ea877856bb48d7498b5b857a4a715d905c6 -Author: Sean McGovern -Date: Thu Jan 1 15:25:03 2015 -0500 - - configure: require libarchive 3.1.0 for the archive plugin - - archive_seek_data() was not introduced until this version. - - Signed-off-by: Jean-Baptiste Kempf diff -Nru vlc-3.0.21/doc/ChangeLog-2016 vlc-3.0.22/doc/ChangeLog-2016 --- vlc-3.0.21/doc/ChangeLog-2016 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2016 2025-11-24 23:15:37.000000000 +0000 @@ -36307,137 +36307,3 @@ Date: Sat Jan 2 18:25:07 2016 +0200 test: fix memory leaks (fixes #14730) - -commit 41754b7da7806eb11cfda77e44fae4a2dc8b9456 -Author: David Fuhrmann -Date: Fri Jan 1 22:39:45 2016 +0100 - - macosx: Remove VLCPlaylist reference from PLModel - -commit e66d8e654f78c41a529632e7fa79846b2dcb4839 -Author: David Fuhrmann -Date: Fri Jan 1 22:31:21 2016 +0100 - - macosx: Factor code for drop handling of external files - - Adds helper method createItemsFromExternalPasteboard: returning - an array of file items from the pasteboard. - performDragOperation: in VLCCoreInteraction is the now only place - where we try to add the dropped file as a subtitle. - -commit f82f77baff59d1835c5580598f817993416a8d85 -Author: David Fuhrmann -Date: Fri Jan 1 22:19:10 2016 +0100 - - macosx: cosmetics - -commit bffe61d55f0aa068808d488d7a9b7731b98c78e3 -Author: Francois Cartegnie -Date: Fri Jan 1 21:34:44 2016 +0100 - - fix overflowing shifts (cid #1346922, cid #1253066) - -commit e7f095c2806b0349201d31fd87e9a919ae051f8e -Author: David Fuhrmann -Date: Fri Jan 1 20:40:45 2016 +0100 - - macosx: Clear logs once window is closed - - Logs are not recorded in background, so do not retain old logs - to avoid confusion. - -commit c3dad7ffc124cb26b66e11691a4c1864705d70d8 -Author: David Fuhrmann -Date: Fri Jan 1 20:33:53 2016 +0100 - - macosx: messages panel: save log as text file instead of rtf - - Those rtf files were awful to read, and rather unhandy. Switch to - plain txt which should make debugging more easy. - -commit 6f31dda7037872663809b0c5ad9774ab3f1c7566 -Author: David Fuhrmann -Date: Fri Jan 1 20:21:55 2016 +0100 - - macosx: messages panel: create outlets in the new style - -commit 80f24bf744d38aa67aa026a25a6cbecbb1f024e1 -Author: David Fuhrmann -Date: Fri Jan 1 20:03:28 2016 +0100 - - macosx: Add button to clear the messages panel - -commit 001d15f50a67b79ffa6fb5b1ceff1dc21c5a3458 -Author: David Fuhrmann -Date: Fri Jan 1 19:55:20 2016 +0100 - - macosx: Simplify messages panel code, fix some invalid data accesses - - Manipulate the data source on the main thread to fix some unprotected - accesses to the array. - - Increase the maximum number of lines, for a more complete log. - -commit 1b27ba8c0240044d578fbfc06027aa3aeca09366 -Author: Sebastian Ramacher -Date: Fri Jan 1 15:57:17 2016 +0100 - - Fix spelling of "response" - - Signed-off-by: Jean-Baptiste Kempf - -commit bab8d966c279100dd1992c782b31a51690983a43 -Author: Sebastian Ramacher -Date: Fri Jan 1 15:57:16 2016 +0100 - - Fix spelling of "unknown" - - Signed-off-by: Jean-Baptiste Kempf - -commit e8e468fbbc27a4ed8e71613f289d5969e3ccd305 -Author: Francois Cartegnie -Date: Fri Jan 1 18:16:02 2016 +0100 - - modules: cache: fix leaking path on error (cid #1048948) - -commit f9fcc8bcc9da9845c1ab25c4814dc8c967e823f9 -Author: Francois Cartegnie -Date: Fri Jan 1 18:01:40 2016 +0100 - - demux: wpl: fix leak on repeated attributes (cid #1313808) - -commit 8348ef445cc9da9d682ae0632b4b1f8f98a2bd8d -Author: Francois Cartegnie -Date: Fri Jan 1 17:58:23 2016 +0100 - - demux: xspf: fix leaks with unwanted attributes (cid #1253106) - -commit 2b24884ff2934f3081a43ecea7ef06bb8b2f8c12 -Author: Francois Cartegnie -Date: Fri Jan 1 17:49:46 2016 +0100 - - video_filter: rss: fix leak on repeats (cid #1253113) - -commit e6801f12213e640774194de3144458f05e074560 -Author: Francois Cartegnie -Date: Fri Jan 1 17:46:52 2016 +0100 - - demux: xspf: fix leak and broken logic (cid #1253125) - -commit 6f78ecc71cb6ada9f09fcf67fb9e0f1ca7865ebf -Author: Francois Cartegnie -Date: Fri Jan 1 17:34:33 2016 +0100 - - mux: mp4: fix leaks on failed allocs (cid #1313792, #1313791, #1313790) - -commit a9c4efde9589e7bda19afeb0462a7382ad791589 -Author: Francois Cartegnie -Date: Fri Jan 1 17:10:53 2016 +0100 - - demux: mp4: fix off by one write in channels handling (cid #1251054) - -commit a2aca1efedf8a619de284e3a2b4fec44451a7a0b -Author: Jean-Baptiste Kempf -Date: Fri Jan 1 17:45:43 2016 +0100 - - Welcome to 2016 diff -Nru vlc-3.0.21/doc/ChangeLog-2017 vlc-3.0.22/doc/ChangeLog-2017 --- vlc-3.0.21/doc/ChangeLog-2017 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2017 2025-11-24 23:15:37.000000000 +0000 @@ -46014,27 +46014,3 @@ Date: Mon Jan 2 10:44:39 2017 +0100 mux: ts: fix AC3/EAC3 (fix #17834) - -commit 9a559764be9e94305b1e034d6c044e38d0169b47 -Author: Francois Cartegnie -Date: Fri Dec 30 21:00:50 2016 +0100 - - demux: ts: use bsearch for pid lookup/insertion - -commit 2efd018968bcc96923b0507f7921421a86f54421 -Author: Francois Cartegnie -Date: Fri Dec 30 19:17:44 2016 +0100 - - demux: ts: lower first packet msg to debug level - -commit f77bb3953a4178212d1873e69323f6c2f19075a7 -Author: Francois Cartegnie -Date: Fri Dec 30 19:14:30 2016 +0100 - - demux: ts: fix pre pmt SI continuity warnings - -commit 3dcdfe1d35282bd6b61262c2a2d506bd08055c15 -Author: Francois Cartegnie -Date: Sun Jan 1 17:39:36 2017 +0100 - - demux: adaptive: output http error messages diff -Nru vlc-3.0.21/doc/ChangeLog-2018 vlc-3.0.22/doc/ChangeLog-2018 --- vlc-3.0.21/doc/ChangeLog-2018 2024-06-05 16:02:47.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2018 2025-11-24 23:15:37.000000000 +0000 @@ -23926,18 +23926,3 @@ Signed-off-by: Thomas Guillem (cherry picked from commit 16f3fdaa38395360f503fc81e77745764609210b) Signed-off-by: Jean-Baptiste Kempf - -commit de4a188fcf84f1bdbe6cd23c7fec8b544b451c58 -Author: Jean-Baptiste Kempf -Date: Mon Jan 1 19:26:52 2018 +0100 - - Welcome to 2018! - -commit 86788c91f75bf51957c40c2982c1b476fe1c356c -Author: Marián Hikaník -Date: Mon Jan 1 17:31:57 2018 +0100 - - win32: fix Slovak installer - - (cherry picked from commit ca5c3c4e8c34ca82143146112279c8a6873e1e64) - Signed-off-by: Jean-Baptiste Kempf diff -Nru vlc-3.0.21/doc/ChangeLog-2024 vlc-3.0.22/doc/ChangeLog-2024 --- vlc-3.0.21/doc/ChangeLog-2024 2024-06-05 16:02:48.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2024 2025-11-24 23:15:37.000000000 +0000 @@ -1,3 +1,4485 @@ +commit 55138b57794e500f2dacfc185fca243576f9dd40 +Author: Steve Lhomme +Date: Tue Dec 17 09:39:26 2024 +0100 + + qt: use std::sort instead of deprecated qSort() + + Similar to c49140dcff3a2ba2729cec8756c7f78b198d50c9. + +commit 3f51b02e779dcd934ed0e918987c9604fd8d8d82 +Author: Steve Lhomme +Date: Mon Dec 16 16:01:44 2024 +0100 + + qt: use QString::arg() rather than QString::sprintf() + + It's deprecated and one of the replacement suggested in the doc [^1]. + QString::asprint() might be the more logical choice, but it's also not recommended [^2]. + + [^1] https://doc.qt.io/qt-5/qstring-obsolete.html#sprintf + [^2] https://doc.qt.io/qt-5/qstring.html#asprintf + +commit 1482690de7e7a924b56ea7db08ebf59242b4b930 +Author: Steve Lhomme +Date: Wed Dec 18 11:57:05 2024 +0100 + + qt: use QString::setNum() rather than QString::sprintf() + + It's deprecated and one of the replacement suggested in the doc [^1]. + QString::asprint() might be the more logical choice, but it's also not recommended [^2]. + + [^1] https://doc.qt.io/qt-5/qstring-obsolete.html#sprintf + [^2] https://doc.qt.io/qt-5/qstring.html#asprintf + +commit 15677901c8906e64506ed3bbecb57f9def9e199b +Author: Steve Lhomme +Date: Tue Dec 17 08:41:58 2024 +0100 + + qt: use QLayout::setContentsMargins() instead of QLayout::setMargin() + + Similar to ed986711c159499b873157d4e5d4a53026d94719. + + It's deprecated in Qt 5.15 [^1], since 5.13 [^2], and removed in Qt 6. + + [^1] https://doc.qt.io/qt-5/qlayout-obsolete.html#setMargin + [^2] https://github.com/qt/qtbase/commit/d6d33f0b80dd85043c71f71a3ed5485d6014e6c4 + +commit edc257c5168e4b66234174f9ec8ce6b362c41f7e +Author: Steve Lhomme +Date: Tue Dec 17 09:17:00 2024 +0100 + + qt: add missing QActionGroup include + + To be able to use rendererGroup. + +commit 66d78681eea3b7c1b188de862daf8beb5c1b90bf +Author: Steve Lhomme +Date: Tue Dec 17 09:09:39 2024 +0100 + + qt: fix UTF-8 string usage + + Similar to bbb9f6a07adfd20c544d29198ea2fec601bf3e62. + +commit 4e5956b752e3ea19718c223eec048a427ffa78d1 +Author: Steve Lhomme +Date: Mon Dec 16 15:48:41 2024 +0100 + + qt: fix bitfield added values set in QVariant + + It's checked with actions[i]->data().toInt() anyway. + + The code was removed in 4.0 with e1c82853965d44b4390af78d9184bd0b60ccc3fb + but was never fixed. + +commit 30d837043c3f9907b1bd52b292a40424d7136660 +Author: Steve Lhomme +Date: Mon Dec 16 14:28:13 2024 +0100 + + qt: avoid using obsolete QSysInfo::windowsVersion() to check for Windows 10 + + It's deprecated [^1] and there is no replacement suggested in the doc. + + We can use the safe way we use in VLC 4. + We could also not check the OS version at all since it's dynamically loaded + and the call returns an error on Windows 7 and earlier [^2]. + + [^1] https://doc.qt.io/qt-5/qsysinfo-obsolete.html#windowsVersion + [^2] https://learn.microsoft.com/en-us/windows/win32/api/dwmapi/nf-dwmapi-dwmsetwindowattribute#return-value + +commit dc1e422e0a9f3204474222514682913b27b39185 +Author: Steve Lhomme +Date: Tue Dec 10 15:37:46 2024 +0100 + + qt: remove deprecated QPainter::HighQualityAntialiasing usage + + It's deprecated in Qt 5.15 [^1], since 5.14 [^2], and removed in Qt 6. + + The commit log of [^2] even mentions its deprecated for all Qt5 but was not + marked as such yet. + + [^1] https://doc.qt.io/qt-5/qpainter.html#RenderHint-enum + [^2] https://github.com/qt/qtbase/commit/1e4e006c3f6e8cbd0092fe882bc23a2280352a91 + +commit 949a27e2e4780c0084c07c7610ab4369171bf069 +Author: Steve Lhomme +Date: Tue Dec 10 14:51:58 2024 +0100 + + qt: fix IN_ITEM_ROLE documentation + +commit 9705833b71329cdf159ba48493536612c6440acf +Author: Steve Lhomme +Date: Thu Dec 5 10:50:50 2024 +0100 + + qt: remove unused meta_to_mlmeta() + +commit 3b46a77768f40878e7eb9b1e3c449c294f6d2276 +Author: fengchao wei <1358610673@qq.com> +Date: Sat Dec 14 13:27:36 2024 +0000 + + [3.0] interop_vaapi: fix mem leak while pause + +commit 20cdad9169309d03359e5e0c4c076cc0953270ec +Author: Steve Lhomme +Date: Mon Dec 9 08:47:54 2024 +0100 + + direct3d11: fix potential double free + + Added in b4f9d49b130e4e4f6da9398c01fd9bc5dd153a88. + + Fixes #28902 + +commit 9c2fecdeedfc73d2dd75af6277c3eea9e6545964 +Author: Martin Tuma +Date: Mon Dec 2 12:36:22 2024 +0100 + + access/v4l2: add support for V4L2_PIX_FMT_ABGR32 and V4L2_PIX_FMT_XBGR32 + + Fix broken v4l2 pixel format selection when the device supports/uses + the V4L2_PIX_FMT_ABGR32 or V4L2_PIX_FMT_XBGR32 pixel formats. + + See the v4l2 documentation for the pixel formats details: + https://docs.kernel.org/userspace-api/media/v4l/pixfmt-rgb.html + +commit 2c2bcc2348a639ca1aff6a68093a6e8cf616e45a +Author: Mangal Kushwah +Date: Thu Sep 12 12:03:58 2024 +0530 + + mediacodec: set color keys in media format explicitly + + Fixes issues where by default mediacodec sets wrong keys for video. + See #26948 + + (cherry picked from commit 55e0779f98b71ab135a4c0c78c2cb91b16a72547) + +commit 1700e28723cb48ce70ef63d775c19cdcb138313e +Author: Steve Lhomme +Date: Fri Nov 29 09:10:00 2024 +0100 + + package/win32: fix MSI installation text on Windows arm64 + + When installing files the messages are like: + Copying new files: File: [1], Directory: [9], Size: [6] + + It only happens on Windows arm64, but we can apply this to all targets + to have a consistent experience. + + Found the fix in https://stackoverflow.com/a/44182276 + + Fixes #28887 + + (cherry picked from commit c9f967f5d6fc76ddcac032fe35aefe3128101c9f) + +commit 6c2749a2ba8f60c468f1d7f549a655feeb021c5a +Author: Steve Lhomme +Date: Wed Nov 27 14:21:02 2024 +0100 + + package/win32: do not add .pdb files in the NSIS package + + Fixes #28885 + + (cherry picked from commit cfa511f3178735ca0d8873a1c26a0e360a3d2c63) + +commit 3afe12167a72af766740b8277d878167e9366508 +Author: Steve Lhomme +Date: Fri Nov 29 11:28:46 2024 +0100 + + demux/mp4: force the packetizer to fill AV1 extradata without optional OBUs + + The hardware decoders need it and the packetizer can fill it for us. + + (cherry picked from commit fe8b4bf937ad08d17d69de07ae21e9f326e2bd96) (edited) + edited: + - the extradata handling is missing many backports, adapting the to 3.0 code + +commit 79422b9852023200c096c1c9e0bfbea0046ddaf0 +Author: Steve Lhomme +Date: Fri Nov 29 11:27:50 2024 +0100 + + demux/mkv: force the packetizer to fill AV1 extradata without optional OBUs + + The hardware decoders need it and the packetizer can fill it for us. + + (cherry picked from commit f05f3388d32bfff5c20de710f79a87a914dcd166) + +commit 13c0f6d560f31af1389bec1d672ca2ef72fbe6b0 +Author: Steve Lhomme +Date: Fri Nov 29 11:57:36 2024 +0100 + + packetizer/av1: fill the full extradata if it doesn't have the optional OBU + + The optional part needed by the decoders. + This will restart the decoders if needed, but they should have received no frames yet + or the hardware decoder may be usable again or not (after a sequence header change). + + (cherry picked from commit a95213e20de69d584324f6d0c9f37c7a7cdfe3e3) (edited) + edited: + - fmt_in was not a pointer in 3.0 + +commit 1c0be0c3b9ed76f0fc52d08371d5498cebbc74e1 +Author: Steve Lhomme +Date: Tue Nov 26 06:33:48 2024 +0100 + + demux: mkv: don't use EbmlDummy elements coming out of FindNextID() + + FindNextID() is supposed to return an element of the given type when it's found. But in some cases, + when the ID and sizes are plausible, an EbmlDummy is returned [1]. + + We should not use that element as if it was a legit element we're looking for. + This is especially crucial when we're opening a file to decide if it's an EBML file or not (EbmlHead). + + [1] https://github.com/Matroska-Org/libebml/blob/1c4e2f31b8df7f2c137d8943c73385759aae35b9/src/EbmlElement.cpp#L185 + + (cherry picked from commit 49d4586fe82aa105ebc1f519e8c8b7385f89c211) + +commit aa197580f26e74ed58cf38b17d871fc536940d1d +Author: Steve Lhomme +Date: Thu Nov 28 11:47:42 2024 +0100 + + win32: dirs: avoid using wcscat_s + + It seems it's not available in Windows XP. + https://forum.videolan.org/viewtopic.php?f=14&t=164742&p=544877#p544877 + +commit aef2b61f8578cb52022cc82ad2da60f8af049f2c +Author: Steve Lhomme +Date: Mon Nov 25 08:31:06 2024 +0100 + + breakpad: remove MAX_PATH limits + + It's unlikely the user path is that large, but just in case we are ready. + + This fixes an issue where the result of _snwprintf() is not checked. + The wstringstream will only fail if there's no memory. At this point + further calls using std::map and breakpad will also fail. + + (cherry picked from commit 05e7dae2fcd2b4b6483fc333b2f5257e84407e34) + +commit bfad5b4af766ad74c310a8536ceaab4850229b84 +Author: Steve Lhomme +Date: Mon Nov 25 08:18:19 2024 +0100 + + win32: dirs: fix potential buffer overflow when appending "portable" + + We let the concatenation decide if there's enough room or not. + + And use the Wide char calls where wide char pointers are used. + + (cherry picked from commit 28241fad50c5bca21ba13069f62f5d92f95f4805) (rebased) + rebased: + - the code around is slightly different + +commit 353a652619b8a7ac4f05c9a6d210ee9c692735e3 +Author: Steve Lhomme +Date: Wed Nov 29 08:49:44 2023 +0100 + + eject: use ANSI API's to handle Windows drive letters + + We don't need wide chars for this. + + (cherry picked from commit 4d62dc124285f9e7488d100f3ebe2c841ce9d32d) + +commit a89a24d085dc86a6f02343184e3b8bdcb95162ef +Author: Steve Lhomme +Date: Tue Nov 28 12:51:26 2023 +0100 + + ntservice: use ANSI API + + All the internal strings we use are using CHAR. + + (cherry picked from commit 4e84066f051be361306dae109aeb012efffe0f3b) + +commit 047b27e1e0fdefe44fc3ddf1f14bf73be47e02ba +Author: Steve Lhomme +Date: Tue Nov 28 13:44:54 2023 +0100 + + windrive: use ANSI API's to test drive letters + + No need for wide chars for that. The API is supported in UWP [1]. + The code was also puttin a WCHAR letter in a char string. + + [1] https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getdrivetypea + + (cherry picked from commit ec8924b3a92c7a2c35ce930106140556d02c6038) + +commit 51c25f6a9f5ad3daee6180118231e41e211cee52 +Author: Steve Lhomme +Date: Wed May 17 10:20:16 2023 +0200 + + es_out_timeshift: explicitely use GetTempPathW + + The API is available in UWP builds. _wgetcwd() should work as well. + + (cherry picked from commit d00ede66bf27211ca4a75975026f7f0ab312cab7) (edited) + edited: + - 3.0 already disabled the code in UWP differently + +commit b4f521224b5e99bb5332848d0d73ccf6bc20dcd0 +Author: Steve Lhomme +Date: Wed Oct 14 08:48:39 2020 +0200 + + win32: remove unused vlc_win32_tmpfile + + (cherry picked from commit 7e2763d0882002827d4192fc499b1d6870bd05db) (rebased) + rebased: + - the code around is slightly different + +commit 669e44e9028f367ccea8200172028ae422c8bc84 +Author: Steve Lhomme +Date: Wed Apr 3 10:44:55 2019 +0200 + + ntservice: don't use a temporary conversion to printf a wide char string + + (cherry picked from commit 987e7371bb8c4739c71a9d41c1f8839b1879867a) + +commit abd424e63784f936a8007bb995e7a06905f67a01 +Author: Steve Lhomme +Date: Wed Apr 3 08:54:04 2019 +0200 + + modules: use WCHAR when calling wide char Win32 APIs + + (cherry picked from commit 2f7271eaff83c6388ac0f629e44eb93b1e2da07e) (edited) + edited: + - removed freetype/fonts/win32.c and d3d11_fmt.c changes we were too different + +commit 4bf49f09cae811e00ec1e69252d476f44c8eb796 +Author: Steve Lhomme +Date: Wed Nov 27 15:06:02 2024 +0100 + + package/win32: install arm64 binaries in Program Files from the MSI package + + Instead of defaulting to "Program Files (x86)". + + Fixes #28886 + + (cherry picked from commit 840c29fd7dd7781bc890ea48e331c65b18ba3a4b) + +commit 0e6f874df5f0887073c222cd4bf8c3d603a52d1a +Author: Steve Lhomme +Date: Mon Nov 25 10:11:32 2024 +0100 + + CI: test the UWP with a x86 target + + It's the target that gives the most problem, even when x64 works. + + Co-authored-by: Martin Finkel + +commit b346cd6efe13b5c48a9e247296262e5a7720a598 +Author: Steve Lhomme +Date: Mon Nov 25 10:10:25 2024 +0100 + + CI: update the Docker image for UWP + + It's the latest (and last) version of this image. + +commit f43852ba20ce9d0f95e68fe140b3c3af08430583 +Author: Steve Lhomme +Date: Mon Nov 25 10:39:26 2024 +0100 + + Revert "contrib: remove patches to disable GetHandleInformation() calls in UWP" + + This reverts commit 7d45e4312be8c0426e8ffe31a8ffc0313467de33. + + On 3.0 we target older UWP versions where it's not available (19H1). + +commit eb85d062cf9bc101177165efb20e88b87aa4e768 +Author: Johannes Kauffmann +Date: Tue Nov 19 23:30:23 2024 +0100 + + musicbrainz: fix leak + + (cherry picked from commit 2edddb01da361d1040736d7fda637e118ea6aee1) (edited) + edited: + - the 3.0 uses the other json parser which outputs the result differently + +commit f87307ef33f59d02e222686d493e2ecbff2873fa +Author: Steve Lhomme +Date: Thu Nov 3 13:10:24 2022 +0100 + + CI: add a VLCARCH variable for Windows targets + + The build folder doesn't always correspond to the arch, for example it may contain + ucrt. + + (cherry picked from commit f2afde1e1406bb31d26adfe727a0ff4cea706a1a) (edited) + edited: + - 3.0 doesn't build code from doc/ + - 3.0 has less Windows targets + +commit 5d532c2b7f9323db19b8984edb6c66962b6ec2cc +Author: Steve Lhomme +Date: Wed Oct 26 08:08:52 2022 +0200 + + CI: don't expect a Windows -debug package + + It's gone since 04d7d5c32f16fd1fa4e8535ac02b79149f28a527 + + (cherry picked from commit 5b0a0d2b39b7054a2044e81988fc9c196549d6af) (edited) + edited: + - it's gone since bb0f4f968d7f2e719c1f76124ec58bb39bce6280 + +commit f2a4147eb89e8d7f36585e4840851a81a9a7abc8 +Author: Steve Lhomme +Date: Fri Nov 22 16:13:14 2024 +0100 + + package/win32: fix relative path joining with older Python + + It's not supported with a Path before 3.6 [1]. + + [1] https://docs.python.org/3/library/os.path.html#os.path.join + +commit 559a171b039013473128a6bb7b2406d3692b92fa +Author: Steve Lhomme +Date: Fri Nov 22 14:20:32 2024 +0100 + + package/win32: remove -pdb option from heat Python script + + It's not used. And BooleanOptionalAction only available since Python 3.9. + +commit c10746f23ec100d31d12a63e6451aaf5562bbae9 +Author: Steve Lhomme +Date: Fri Nov 22 14:16:43 2024 +0100 + + npapi: don't use broken --enable-pdb option + + It's not used in VLC 4 either. + +commit 038e789bdaf3059b2cca79f8b46834aae79144d1 +Author: Steve Lhomme +Date: Thu Nov 7 15:52:44 2024 +0100 + + package/win32: use $()" rather than "``" for commands + + (cherry picked from commit 5080e48b32cc70fbe72f8023c2da5d9003209002) (rebased) + rebased: + - the code around used VLC_LDFLAGS/VLC_CPPFLAGS + +commit 297ed29d044faaf35bbe395582aca920c13898ba +Author: Alexandre Janniaux +Date: Wed May 29 15:13:37 2024 +0200 + + configure.ac: remove x-test checks + + The variable is already quoted so there's no need to x-test them. + + (cherry picked from commit 5e2724f55ca7684b5c60020f94978968792db430) + +commit 36e1a8b25b34f07d60fa9ac48b5d335a78d0331a +Author: Steve Lhomme +Date: Tue Jun 27 10:18:09 2023 +0200 + + package/win32: show the usage when a bogus option is passed + + (cherry picked from commit 756bd8f250dd03c4165a8d4119cd3491861b3f1c) (rebased) + rebased: + - 3.0 doesn't have the meson option + +commit 560c6d24772eb936c8bc576a97e8fedb99f58244 +Author: Steve Lhomme +Date: Fri Oct 21 08:04:04 2022 +0200 + + package/win32: build.sh: generate the built 7z+zip+msi in parallel + + But we need to do the debug package first as the other will strip debug + information that is needed in the debug packages. + + (cherry picked from commit 93895d57d08656a5f64970c89d8f61b290cbf38f) + +commit 6ad8308eef359771606ff67659b02d3c0ddb9222 +Author: Steve Lhomme +Date: Fri Nov 18 10:07:43 2022 +0100 + + win32: package: use the configured path to the WIX binaries + + (cherry picked from commit a5ea1181bc66e2f7aed3100ee94daa9ba5bff6cb) + +commit d95ada17849c35470170a2cf8a0c26fe91dbbf67 +Author: Steve Lhomme +Date: Tue May 12 09:20:29 2020 +0200 + + win32: msi: use the detected way to handle windows pathes + + Rather than hardcoding "wine winepath". + + (cherry picked from commit 268d209e207ea40410dbfc37bc9e55636a0f7b66) + +commit fa2084f050b7a6fe4f53afed3bfc7fc47d8f64a4 +Author: Steve Lhomme +Date: Fri Nov 18 08:36:52 2022 +0100 + + win32: package: build inside the output directory + + So we don't need to include windows style path. By default light.exe looks for + files in the current directory. + + (cherry picked from commit 385db2b181df63ea28dfe92259418f1be537a9b9) + +commit f6bacb5de89f48943b1c04886ec54ddc69eda9c6 +Author: Steve Lhomme +Date: Tue Nov 22 13:46:21 2022 +0100 + + win32: package: use the package dir instead of vlc-4.0.0-dev + + (cherry picked from commit 939e574ef27665a2a62fa90c82582f2a5963beaf) (rebased) + rebased: + - the code around is slightly different + +commit 3304cfcf3e9e9d0db68da44ffbe6864caaa4475d +Author: Steve Lhomme +Date: Tue Nov 8 13:58:58 2022 +0100 + + win32: replace Wix heat with a python script + + It allows showing friendly names in the .msi for each file rather than some hash. + + For now we never keep the .pdb files. + + (cherry picked from commit 6f996ffa27a620e1a25cffc2039a322eb4fdabc2) + +commit 650413d5049439f83153e37f99a27764582a8251 +Author: Steve Lhomme +Date: Fri Nov 18 09:56:50 2022 +0100 + + configure: add an option to set the PATH to WIX + + In the CI the path is in a wine location. If we build WIX in contribs, we can + use that path instead. + + We default to the contrib path unless set by the user. + + (cherry picked from commit a9f4e219648104daa4b9b66b06c1f80bd735998d) + +commit 1c0ecc9d8201c64cf67afb0d421c9f831021bb6b +Author: Steve Lhomme +Date: Wed Jul 31 06:36:54 2024 +0200 + + contrib: wix: don't pretend they are native tools + + prebuilt contains the cross-compiled tools. + + (cherry picked from commit 1bab36476f3f549111381f6de2214fb5b51c443b) (rebased) + rebased: + - the code around is slightly different + +commit 9b6eaf300fcda6e753f98f4324bc21b25fb21bd0 +Author: Steve Lhomme +Date: Fri Apr 5 07:08:21 2024 +0200 + + contrib: wix: update to 3.14.1.8722 + + The previous URL is still valid but the tarball silently changed from 3.14.0.6526 to 3.14.0.8606. + Skip to the latest 3.14 release. Until they silently change the tarball using the same URL. + + (cherry picked from commit 9b3edfbbac0e02da263e5c736454d9ffaeac036d) + +commit ae18a517add55ca96b09de0a3478fe918ad33c55 +Author: Steve Lhomme +Date: Fri Mar 22 07:13:15 2024 +0100 + + contrib: wix: use Github to get 3.14.0.6526 + + The hash matches the version we used. + They keep removing their old downloads from their website... + + (cherry picked from commit efb169a38668ecb58979abb64a9f20b988932766) + +commit 1b2d086ea7a2cbd11894ee9b3c12b7e982d4d6fc +Author: Steve Lhomme +Date: Tue Dec 6 13:16:23 2022 +0100 + + contrib: update wix to a more recent version + + Use winterop.dll from the 3.5 package as that's the only one that can use LZX + compression with Wine. + + (cherry picked from commit a8eeadb109922af38d5edba3fc1049a79709be77) + +commit 25197927799ceadab95493a0ad80e81007e314ef +Author: Steve Lhomme +Date: Tue Nov 22 13:24:56 2022 +0100 + + configure: allow setting the directory where packaged files are put + + By default packaged files (Windows, Mac) are build in /vlc-4.0.0-dev. + + This allows setting a different directory which might avoid some copies when + building into a third party project. + + (cherry picked from commit 56faa4e12abca0e62697f139aeac60a0eba1e3bb) + +commit f5fe404b37d2ceb9a2b7a0dd24c0681c7cc9d63b +Author: Steve Lhomme +Date: Thu Nov 17 15:01:56 2022 +0100 + + contrib: wix: add the Wix tool as a windows prebuilt bin package + + Rather than relying on it being installed somewhere on wine we can use our own + and control which version is used. + + It's always added to the windows builds even though it may not be used in the + end. But the package is not big and doesn't require any building. + + It requires dotnet 4.0 being installed in Wine. + + While WIX is open source, the wix 3.5 we are using cannot realistically be + built in our contribs as it's hardcoded to build with VS 2008. Even the most + recent builds of WIX still don't build in Linux. We already use a prebuilt + version in Docker images, except it's a .msi file that is installed via wine. + + (cherry picked from commit 777b11043897c70dca4932019b2a61d62a66840e) + +commit 7d369e179e84ab8817ec39a1bcfc3dc5a5488390 +Author: Steve Lhomme +Date: Thu Nov 17 14:59:38 2022 +0100 + + contrib: allow passing parameters to the unzip call + + .zip files usually don't have a top directory with a version number. + + (cherry picked from commit c93ee73db16c22dd8e1d4be3b01dfeba535660e5) + +commit 0a1c6f9b0872c23200af2db04997bb6d64aa1a4d +Author: Steve Lhomme +Date: Fri Nov 18 07:48:07 2022 +0100 + + win32: package: use the output .msi file as a target + + So we can show when we generate it. + + (cherry picked from commit 59d7186b9202a3f63f020d57607f239d2d791ce4) + +commit 0343e5f66b3062a1df066ba62788d7ee8fdc330c +Author: Steve Lhomme +Date: Wed Nov 16 15:17:45 2022 +0100 + + win32: package: group the wine path for the virtual build drive + + (cherry picked from commit 4649dc4fd6430c25acae8f44df0631f26e074f0f) + +commit 4ff2699feed27ae1c7a783e901599ec5e191dd2a +Author: Steve Lhomme +Date: Wed Nov 16 15:11:12 2022 +0100 + + win32: package: use forward slash for Windows pathes + + wix has no problem with that + + (cherry picked from commit 4f82ee8a386ba8ec2ce238cf76003919918a6833) + +commit 24846a9c599355ed02980b8a225ae07b759c5a55 +Author: Steve Lhomme +Date: Tue Nov 8 15:13:01 2022 +0100 + + msi: use a UNIX path for the config.wxi + + Wix is OK with it and UNIX MSI tools will not handle the Windows path. + + (cherry picked from commit 672c356c1350cbbb32efb019d55a65f1d67e4c56) + +commit bb0f4f968d7f2e719c1f76124ec58bb39bce6280 +Author: Steve Lhomme +Date: Fri Oct 21 07:58:55 2022 +0200 + + package/win32: build.sh: don't generate -debug.zip package + + We don't need 2 variants of the same thing. The zip version is twice bigger + than the 7z. This is a developer package, they can deal with 7z files. + + (cherry picked from commit 04d7d5c32f16fd1fa4e8535ac02b79149f28a527) + +commit c813d72a13045b6a8365e9bb278e1d4e23eef0bd +Author: Steve Lhomme +Date: Tue May 12 09:18:06 2020 +0200 + + configure: detect how to transform windows pathes + + winepath, wslpath and cygpath have a compatible syntax (at least -w and -u). + + They should be used depending on what is available in the build environment + rather than hardcoding "wine winepath". + + (cherry picked from commit 6151644c327403534551abcd6ee60a9717ae434f) + +commit c3f04a62ca0bd7e431b51d65ff3eb76a2e883b73 +Author: Steve Lhomme +Date: Wed Jul 1 15:23:22 2020 +0200 + + package/win32: build.sh: fix fake wine call in WSL + + (cherry picked from commit e560d83b9d9067ad67d06cb12b6e9768cb909283) + +commit ffbd3bb810bfa72ba9a0d0d70eac33c595eec3bf +Author: Steve Lhomme +Date: Fri Jan 31 11:20:54 2020 +0100 + + package/win32: build.sh: don't require a wine installation on WSL + + No need to add a lot of packages just to run one program. + + (cherry picked from commit 803f18544377610101472a143af6a98c0f59cbee) (rebased) + rebased: + - the code around is slightly different + +commit 8fb1e3411e467a263f3ddb045a36b2e17ee92aec +Author: Steve Lhomme +Date: Fri May 17 13:52:28 2019 +0200 + + win32: package: fix missing files depending on the build configuration + + (cherry picked from commit 4103ffe169e3747f797776b6e994af7d868af503) + +commit 6dc4d484c6c4e9b29c94410cc8723fc7fbc5f4dc +Author: Steve Lhomme +Date: Thu Aug 18 11:23:33 2022 +0200 + + contrib: dvdnav: do not force a packing style + + We should use the same packing as libdvdread. It's done and made public through + a header. But we must also use the compiler the same way. libdvdread doesn't + force -mno-ms-bitfields. + + (cherry picked from commit 2f08e3cc36bd79ab593d45e0c2cc8183765e12d2) (rebased) + rebased: + - on 4.0 the autoconf is updated before this line + +commit b24844ffc7e4962b757269bb43c94811aabad7bd +Author: KO Myung-Hun +Date: Tue Feb 28 23:47:47 2023 +0900 + + qt: PodcastConfiguration inherits QDialog not QWidget + + Especially, accept() and reject() slots are in QDialog. + + (cherry picked from commit 183acaecc1fafdfe57a3c4981702ec00561c31e0) + Signed-off-by: Steve Lhomme + +commit 5a843f83f9f97ca415497eea9359a778f74e9386 +Author: Steve Lhomme +Date: Wed Nov 2 17:16:45 2022 +0100 + + contrib: don't show untar'ed files in non verbose mode + + This avoids being bombarded with logs when building. + + (cherry picked from commit 0a555fa1ac6db47923c9db03faa8d49393f571ec) + +commit 8539875836e4974cfdb53d91014f57aea1a62863 +Author: Steve Lhomme +Date: Fri Jul 10 09:39:37 2020 +0200 + + contrib: lua: use UNPACK_DIR to extract to a different folder for luac + + (cherry picked from commit c04c755b5378de4affb79ae37fca80d895fd449e) + +commit 801e7068ddd8b8110ecb17ed48e0921bab409ff8 +Author: Steve Lhomme +Date: Tue Sep 26 15:11:48 2023 +0200 + + nsis/pluginapi: fix warning for declaration without parameters + + (cherry picked from commit 95495e69b078381699f8eea6ba0c49bbd57c052a) + +commit 1f9de477d4e0fe9f2443605125490269a596d6ac +Author: Steve Lhomme +Date: Tue Sep 26 15:08:55 2023 +0200 + + nsis/process: remove win95/98/ME support + + We don't need these anymore. + + (cherry picked from commit bd0cc4e797deac4bb4aa9fa1a2f79d5e3af69b48) + +commit 6c37463116f4d04c501e2914149f74faa7c9dd27 +Author: Steve Lhomme +Date: Tue Sep 26 15:11:18 2023 +0200 + + nsis/process: fix warning on variable set and tested + + (cherry picked from commit ebcd76e1d632267a6b03ea8098255a7823796856) + +commit 50465f199bf23005ce659ec5894ab7d5445e07bb +Author: Steve Lhomme +Date: Tue Sep 26 15:10:33 2023 +0200 + + nsis:/process: rework the way the process ID/HWND are handled + + Don't use a HANDLE for both values, as structure with the proper type + works better. + + (cherry picked from commit 0f8b7e834aa0ec2b4de84a27e2e42fce8059d8dd) + +commit 8d4b49503c8b40ced8cfbd372c185f9d73fbf5cd +Author: Steve Lhomme +Date: Wed Nov 6 14:40:11 2024 +0100 + + contrib: gnutls: disable faccessat on macos + + It was not used before and it's not usable on our minimum macOS version. + It was added in macOS 10.10. + See https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57b9f54c2f6d4a15585/bsd/sys/unistd.h#L210 + +commit ca1a2464dd0b02daeac54d27a8567a5d0f17fef5 +Author: Steve Lhomme +Date: Wed Nov 6 13:02:27 2024 +0100 + + contrib: gnutls: replace HANDLE_FLAG_INHERIT which may not be available in older UWP + +commit 3be9e3f6d41b2b1f585ffb530b1607a1f38f7cc6 +Author: Steve Lhomme +Date: Tue Feb 13 15:03:58 2024 +0100 + + contrib: gnutls: update to 3.8.3 + + There doesn't seem to be any API changes: https://www.gnutls.org/manual/html_node/Upgrading-from-previous-versions.html + + Many of our patches have been upstreamed. + + (cherry picked from commit 9ffc31dd5fe8224a5163e969bf9aabb872181287) (rebased) + rebased: + - 3.0 uses pkg_static in the UNPACK directory + +commit 2b0f6dc3b664a180f9917e9107b0af2761453fca +Author: Steve Lhomme +Date: Wed Aug 9 08:57:32 2023 +0200 + + contrib: gnutls: allow SecureZeroMemory + + This is possible now that RtlSecureZeroMemory is allowed. + + Partial revert of a4841494fd974ec2c6208bc77f0f0c90dc5aebaf. + + (cherry picked from commit e8af0221767591b35c81561b8308f5051e594055) (rebased) + rebased: + - the code around was different + +commit 1829f817f62b4c3836b8623756257b1e12d76760 +Author: Steve Lhomme +Date: Tue Jun 27 14:39:08 2023 +0200 + + contrib: gnutls: disable build if license is not matched + + We need nettle and gmp and they can't be used with the LGPLv2 license. + + (cherry picked from commit dc74c5d571db5b4ef7839aa30d551a93cef32516) (rebased) + +commit 7d45e4312be8c0426e8ffe31a8ffc0313467de33 +Author: Steve Lhomme +Date: Wed May 31 14:06:52 2023 +0200 + + contrib: remove patches to disable GetHandleInformation() calls in UWP + + It's now allowed. The contribs involved already depend on alloweuwp. + + (cherry picked from commit 313a3991ef7a9041cd6afec1f979332578815476) (edited) + edited: + - 3.0 didn't have patches for iconv, libtasn1 + +commit 29e4d3fd6b095607e3e5d08c8f6bc1b75184f312 +Author: Steve Lhomme +Date: Tue May 23 12:26:16 2023 +0200 + + contrib: gnutls: avoid more forbidden UWP calls in gnulib + + (cherry picked from commit c5447f8157afc10ab225dc8a67b586a72f5372a3) + +commit de60a536d71cce442df9e71ae6aab24bd5011381 +Author: Steve Lhomme +Date: Mon May 15 09:51:06 2023 +0200 + + contrib: gnutls: fix UWP build + + The gnulib rpl_stat() function uses CreateFileA which is forbidden. + We need to use CreateFile2 in UWP. + + (cherry picked from commit 0a20220043aca2ea772b0bb434541c2e369f7b72) + +commit b30b7f660b42e538dae7556c3c7db0efb28aba1a +Author: Steve Lhomme +Date: Fri May 12 16:42:23 2023 +0200 + + contrib: gnutls: remove unneeded UWP modif + + (cherry picked from commit 2c62bced70139e792e8b3bdb47a0acd8f1838b67) + +commit dbb0a07748defa402c7d1ad25bf6f483e83af052 +Author: Steve Lhomme +Date: Mon May 15 08:40:04 2023 +0200 + + contrib: factorize the GNUGPG/Gcrypt URLs + + (cherry picked from commit ea7354d2e51e42d183923a6577e05bacb1d27782) (edited) + edited: + - 3.0 only had GITHUB + - 3.0 uses gcrypt 1.7.10 + +commit f33320d5e7dc03a1ecd79bd9bdab62496c1a3bf9 +Author: Steve Lhomme +Date: Thu Sep 22 13:02:40 2022 +0200 + + contrib: call sed directly on the files to change + + (cherry picked from commit 637d00420fa1a3f4b71215ba869cb5d05bb7bead) (edited) + edited: + - 3.0 didn't have use sed on FLAC, libtasn1, qt, zlib + +commit 02798996572cfbe680b807684cef63854b443e87 +Author: Steve Lhomme +Date: Fri Sep 16 08:21:49 2022 +0200 + + contrib: flac: disable examples building + + (cherry picked from commit a371bda5d761fc18044cb0c5bde1aa7b443a33b8) (rebased) + rebased: + - 3.0 already moved HOSTCONF + +commit 005b084937e9351f3c434f1d1ab5c5645a4ca753 +Author: Thomas Guillem +Date: Fri Jul 22 08:43:51 2022 +0200 + + contrib: gnutls: fix build with Android NDK25 + + It needs the same patch than appleos. Maybe we should check for + aarch64 instead. + + (cherry picked from commit 03f8817fd8712d9a8b3ad2b7fd77f693831d3c44) (rebased) + rebased: + - 3.0 has different code around + +commit 536f90c4f503d43807f8de62f8e758be90323553 +Author: Steve Lhomme +Date: Fri Nov 15 13:24:06 2024 +0100 + + CI: add Windows ARM64 nightly build + + Since it's built with LLVM we can generate PDBs. + +commit ab35f87de85a13302d8b30c3c79d91c747bc5386 +Author: Steve Lhomme +Date: Fri Nov 15 13:21:10 2024 +0100 + + CI: add Windows ARM64 build target + + It's the same target as for VLC 4. + + - It's using UCRT (rather than MSVCRT). + - It is built with LLVM 15. + - It is targeting Windows 10 1809 = Redstone 5. + +commit d4188b858c21ead11aaeaeeff0790d21dd363968 +Author: Steve Lhomme +Date: Wed Sep 29 16:59:59 2021 +0200 + + skins2: remove outdated WINVER value + + We don't need to force it to Win2K. + + (cherry picked from commit b460a4474fa8a8ce1fc14372c4b76d5d25251edd) + +commit 22722d96c5a80490faa507dfdb0d2a7ebbe2ec49 +Author: Steve Lhomme +Date: Mon Nov 18 06:51:14 2024 +0100 + + contrib: qt: don't redefine TOUCHINPUT in mingw-w64 + + It's defined since mingw-w64 v4. + It won't be defined if an WINVER smaller than 0x0601 (Win7) is used. + +commit 4acf8274e0d24947d227b7d864e9072b1496705f +Author: Steve Lhomme +Date: Fri Nov 15 16:27:49 2024 +0100 + + contrib: qt: don't force the WINVER/_WIN32_WINNT version + + We set the value ourselves. + + contrib: qt: fix forcing the WINVER/_WIN32_WINNT version without NTDDI_VERSION + + That leads to inconsistencies when detecting available API's. + +commit b3a04fcd544315daf21ea4760458c93526ff26a6 +Author: Steve Lhomme +Date: Fri Nov 15 15:33:10 2024 +0100 + + contrib: qt: do not use external LDFLAGS on Windows + + When cross-compiling it may try to link native tools with windows libraries. + +commit ece51a9e635370136019b27b85b3a190a660bcae +Author: Martin Storsjö +Date: Tue Nov 12 10:11:04 2024 +0200 + + contrib: ass: Apply a patch to fix aarch64 assembly issues + + This fixes building for aarch64 Windows with assert enabled versions + of Clang. (This issue appeared recently, after updating to a newer + version of libass that includes new aarch64 assembly.) + + The same patch has been sent upstream in + https://github.com/libass/libass/pull/849. + + (cherry picked from commit 44710998f52638131ddc133e912ddf48d2463ae9) + + edited: + - Minor conflicts around the $(APPLY) line + +commit 225b649ec51fe4ff4b8f47cdd8885f960757357d +Author: Martin Storsjö +Date: Thu Feb 7 12:35:33 2019 +0200 + + configure: Don't set X86ASMFLAGS for windows on arm + + This avoids enabling HAVE_X86ASM in these configurations, fixing + compilation. + + Also set proper values for WINDOWS_ARCH in these configurations. + + (cherry picked from commit 4285591989568484ec1c7478da1a519d82d8f2b0) + + edited: + - 616d1a05b1011450bae637b029c98eec071a26eb was cherrypicked before + (as 64e099576f908ad29205cd77a7dd1f0ea8053447), causing compilation + to fail for non-x86 Windows targets in 3.0. This caused some minor + conflicts in cherrypicking this patch. + +commit 02084f728d25386357f902980288c8ad43dfe10c +Author: Hugo Beauzée-Luyssen +Date: Wed Dec 12 16:18:09 2018 +0100 + + configure.ac: Detect aarch64 as a 64bits windows + + (cherry picked from commit 94ba3ab49628827a6bcbff9a805350ab41c37d7a) + +commit 9999ce93eba814d9d92334322f64335693ccb78e +Author: Steve Lhomme +Date: Sun Nov 10 10:48:38 2024 +0100 + + demux: mkv: fix potential leak of KaxBlockAdditions when seeking + + (cherry picked from commit f7c0d24733350e4c43a2dcb84e3106d9e2be9e7b) + +commit ae85a589416a5ecf8099b2ec03ff2274400edd82 +Author: Steve Lhomme +Date: Sun Nov 10 10:41:00 2024 +0100 + + demux: mkv: don't expose local BlockDecode function + + (cherry picked from commit e3adf1736cf32bba3db208cc5d0d18b23a7c17a5) (rebased) + rebased: + - the code around is different + +commit feba5f92e62aa66b12493bb73f5cb43a422c1b24 +Author: Steve Lhomme +Date: Sun Nov 10 10:32:44 2024 +0100 + + demux: mkv: read data from KaxBlockAdditions as const + + We should not be able to modify what we read. + + (cherry picked from commit c03249a02c2d1aa529c7c9a6de7545305b567860) (edited) + edited: + - 3.0 doesn't support VPx alpha + +commit 966518b21c47cb431ad019e1408a46ab75f4ff1d +Author: Steve Lhomme +Date: Thu Jul 11 14:06:59 2024 +0200 + + demux: mkv: add missing helpers from libebml 2.0 + + The const versions are more versatile. + + (cherry picked from commit 42945dadb88c72bd6b34a3468f4ac125d81198f1) + +commit 77a2c01e2dcb3474173904ce9fa761907cb10550 +Author: Steve Lhomme +Date: Sat Nov 9 13:41:37 2024 +0100 + + demux: mkv: use the internal QDMC FourCC value + + Rather than a local FourCC. + + (cherry picked from commit 71c2622ab992a4bb4485e5e151f3019e60543d35) + +commit bf98c55691d4d95913b2c80d5fd02e93cb79b23e +Author: Steve Lhomme +Date: Sat Nov 9 13:35:06 2024 +0100 + + demux: mkv: use the internal USF FourCC value + + Rather than a local FourCC. + + (cherry picked from commit 447116d324f8493120ce84544aed0cfc290aafb2) + +commit 64e099576f908ad29205cd77a7dd1f0ea8053447 +Author: Steve Lhomme +Date: Fri Aug 23 10:43:35 2024 +0200 + + configure: enable large-address-aware on 32-bit Windows + + This allows the GPU drivers to use more memory than a 32-bit app would use. + This should have no effect on a 32-bit Windows. + + Fixes #28743 + + (cherry picked from commit 616d1a05b1011450bae637b029c98eec071a26eb) (edited) + edited: + - 3.0 doesn't have armv7 configuration variables + - 3.0 doesn't have X86ASMFLAGS/X86ASMDEFS + +commit d78ca74ec6ac620ed1383d239547160b4ed4c5b8 +Author: Rémi Denis-Courmont +Date: Sat Jun 16 21:34:58 2018 +0300 + + configure: use $host_cpu where applicable + + (cherry picked from commit a50366bc9702ad4ec0db1e5361bcea8378bf8132) + +commit 4a56da187dd7a09daa92279f02572163404d2bdd +Author: Steve Lhomme +Date: Sun Nov 10 13:47:48 2024 +0100 + + contrib: libass: update to 0.17.3 + + (cherry picked from commit e0cd2de6caecd9d7a43829c04b41c941f54121e6) + +commit a6ddbd7c2018beeb6b073c3a6861c68f420f38c3 +Author: Steve Lhomme +Date: Wed Nov 6 13:12:34 2024 +0100 + + contrib: vpx: update to 1.15.0 + + This release includes new codec control for key frame filtering, more Neon + optimizations, improvements to RTC encoding and bug fixes. + - Upgrading: + This release is ABI compatible with the previous release. + Temporal filtering improvement that can be turned on with the new codec + control VP9E_SET_KEY_FRAME_FILTERING, which gives 1+% BD-rate saving with + minimal encoder time increase. + libwebm is upgraded to libwebm-1.0.0.31-10-g3b63004 + - Enhancement: + Neon optimization speed up + Scene detection is allowed for all RTC speeds (>=5) + Support profile guided optimizations + Delta quantization parameters for UV channels for vp8 is supported in RTC + rate control library + Rate control parameters are reset and maximum QP is enforced on scene + changes in SVC when there is no inter-layer prediction + - Bug fixes: + Fix to Uninitialized scalar variable in `vp9_rd_pick_inter_mode_sb()` + Fix to Integer-overflow in `resize_multistep` + Fix to Heap-buffer-overflow in `vpx_sad64x64_avx2` + Fix to Crash in `vpx_sad8x8_sse2` + Fix to Assertion in `write_modes` + Support profile guided optimizations + Fix to Integer-overflow in `encode_frame_to_data_rate` + Fix to Integer-overflow in `vp9_svc_check_reset_layer_rc_flag` + Fix to core dump error from /usr/bin/tools/tiny_ssim --help + Fix to use-of-uninitialized-value in `vp9_setup_tpl_stats` + Fix to Undefined-shift in `vp9_cyclic_refresh_setup` + Fix to redundant `&& __GNUC__` preproc check + Fix to valgrind warning in EncodeAPI.OssFuzz69906 + Fix to Index-out-of-bounds in `vp8_rd_pick_inter_mode` + Fix to Integer-overflow in `vp8_pick_frame_size` + Fix to Use-of-uninitialized-value in `vpx_codec_peek_stream_info` + Fix to log clutters with the message "Warning: Desired height too large" + Fix to Integer-overflow in `vp9_svc_adjust_avg_frame_qindex` + Fix to integer overflows caused by huge target bitrate, frame rate, or + g_timebase numerator or denominator + Fix to missing license headers + Fix to build failure for Android Armv7 + Fix to integer overflows in image helpers + Fix to Integer-overflow in `vp9_calc_iframe_target_size_one_pass_cbr` + Fix to Heap-buffer-overflow in `vp9_pick_inter_mode` + Fix to Segv in `vp9_multi_thread_tile_init` + Fix to Use-of-uninitialized-value in `vp9_row_mt_sync_mem_dealloc` + Fix to Crash in `mbloop_filter_vertical_edge_c` + Fix to Check failed in CheckUnwind + Fix to Heap-buffer-overflow in `write_modes_b` and `vpx_write` + Fix to Possible signed integer overflow found in `vpx_codec_encode` + Fix to build conflicts between Abseil and libaom/libvpx in Win ARM64 builds + Fix to build failures on aarch64 + Fix to Data race in libvpx ARM NEON + Fix to Heap-buffer-overflow in `scale_plane_1_to_2_phase_0` + Fix to integer overflow in `encode_mb_row` + Fix to Floating-point-exception in `vp8_pick_frame_size` + Fix to Heap-buffer-overflow in `vp9_enc_setup_mi` + Fix to build failure with --target=arm64-win64-vs17 + Fix to heap-buffer-overflow write in `vpx_img_read()` + Fix to C vs armv8-linux-gcc encode mismatches for `y4m_360p_10bit_input` + Fix to Null-dereference READ in `ml_predict_var_rd_partitioning` + Fix to Heap-buffer-overflow in `vpx_scaled_2d_ssse3` + Fix to Crash in `convolve_horiz` + Fix to Ill in `vpx_scaled_2d_ssse3` + Fix to Global-buffer-overflow in `cost_coeffs` + + (cherry picked from commit 937dc12adac21f4d98025bf01b45b7fcf771fdbd) + +commit 1713be552f9e26260a3ac33ce04ab89f660780cc +Author: François Cartegnie +Date: Thu Jun 20 13:12:37 2024 +0200 + + avcodec: add a define to test for AVCodecContext.ch_layout availability + + Co-authored-by: Steve Lhomme + (cherry picked from commit 3abf93735df97cc2c96e11028b76067547c27eb7) (rebased) + rebased: + - on 3.0 the fmt_in is not a pointer + - the code around is slightly different due to the use of API_CHANNEL_LAYOUT + +commit e5072b340425e786b9e376cdf4bff4962c6e32f2 +Author: Steve Lhomme +Date: Wed Jun 19 08:36:40 2024 +0200 + + ffmpeg: fix libavutil version check for AVFrame.ch_layout + + It was added in db6efa1815e217ed76f39aee8b15ee5c64698537 which + was libavutil 57.23.100 at the time but the minor version was not updated in + that commit so we check 57.24.100. + + This is part of FFmpeg 5.1. + + https://github.com/FFmpeg/FFmpeg/commit/db6efa1815e217ed76f39aee8b15ee5c64698537 + (cherry picked from commit f237155887f049f8befef2fdfadae7b60f697b0d) + +commit 0939d55b81e916ff303f92f301257c2e0885fdb9 +Author: Steve Lhomme +Date: Wed Jun 19 13:41:04 2024 +0200 + + avcodec: fix libavcodec version check for AVCodecContext.ch_layout + + It was added in 548aeb93834b8425c86d1ce60fddc1d41805724d which + was libavcodec 59.23.100 at the time but the minor version was not updated in + that commit so we check 59.24.100. + + This is part of FFmpeg 5.1. + + https://github.com/FFmpeg/FFmpeg/commit/548aeb93834b8425c86d1ce60fddc1d41805724d + + Co-authored-by: François Cartegnie + (cherry picked from commit 8fd918b8787b8d077decf1a2b955ab0c7b964bf3) (rebased) + rebased: + - on 3.0 fmt_in is not a pointer + +commit 38f9638ec71c2fe917dfd99ac2e1795b3357cfc3 +Author: Steve Lhomme +Date: Tue Jun 18 16:04:41 2024 +0200 + + ffmpeg: fix libavcodec version check for AVCodecParameters.ch_layout + + It was added in 276c06726fbd2f784d51189870bd834e9284812f which + was libavcodec 59.23.100 at the time but the minor version was not updated in + that commit so we check 59.24.100. + + This is part of FFmpeg 5.1. + + It was erroneously removed in a55ec32ab3760d9edb6f05481cd3a981aa42878d. + + https://github.com/FFmpeg/FFmpeg/commit/276c06726fbd2f784d51189870bd834e9284812f + + Co-authored-by: François Cartegnie + (cherry picked from commit 597bdb8e0784101b5f412feba3309558ad5b8862) + +commit 0bcb306b7c05549a795b901ae33d6c7204456716 +Author: Steve Lhomme +Date: Tue Jun 18 15:34:10 2024 +0200 + + ffmpeg: fix libavutil version check for av_channel_layout_default() + + It was added in c41899a3770cb4510e15b223fa34d129305b1589 which + was libavutil 57.23.100 at the time but the minor version was not updated in + that commit so we check 57.24.100. + + The same check applies for av_channel_layout_copy() added in the same commit. + + This is part of FFmpeg 5.1. + + https://github.com/FFmpeg/FFmpeg/commit/086a8048061bf9fb4c63943f6962db48175f655c + (cherry picked from commit 195f0c98599b55950c49a62f98d9d3495be310df) (rebased) + rebased: + - the code around is slightly different + +commit d1fb5c6cb372d2233046064db174daf1987c1211 +Author: François Cartegnie +Date: Mon Jun 10 11:10:37 2024 +0700 + + codec: avcodec: fix ch_layout requirement + + refs #28667 + + (cherry picked from commit 41778535dcae8b145ebfaa0392de281e470a91bf) (edited) + edited: + - on 3.0 the audio check was still using a LIBAVCODEC_VERSION_CHECK check + - the mux/demux checks were already there with different spaces + +commit 763dc3eba52cb7633a84f44dcde19602fca5eac7 +Author: Ilkka Ollakka +Date: Wed Jul 5 15:09:57 2023 +0300 + + avcodec/audio: make channel mapping array 0 terminated + + Also change pi_channels_src to be only AOUT_CHAN_MAX instead of same + size as mapping array. + + (cherry picked from commit 0ff86bf8a28a080340f600cb8561815fc43e3b4a) (rebased) + rebased: + - the code around is slightly different + +commit b2b54eb1efa3ecc72a4a64d0d962cab0676fbce1 +Author: Steve Lhomme +Date: Fri Jan 6 10:16:09 2023 +0100 + + avcodec: use ARRAY_SIZE instead of custom code + + (cherry picked from commit 28c80ee47e6cdf961f501eed9d4837956b38afd1) + +commit 534564b289db7ee966abf888207258c3e6828c98 +Author: Zhao Zhili +Date: Fri Jun 11 18:02:34 2021 +0800 + + codec: avcodec: check open codec return value + + (cherry picked from commit 21ab6be22e7c1831cebf023fd53bd7ffbfad22f6) (edited) + edited: + - on 3.0 DecodeBlock returns a picture_t, not an error code + +commit ce084152c9bade041ca18e19c3b264e4e134c6c3 +Author: Steve Lhomme +Date: Wed Jun 19 13:59:15 2024 +0200 + + avcommon: use a specific macro to check the FFmpeg libavcodec version + + This macro doesn't check for libav which is assumed to not have to relevant + code. This is the same macro name used in VLC 4.0. + +commit 930ddc0d0fec55fff6c2ed0ffcc904773bae6622 +Author: Steve Lhomme +Date: Thu Nov 7 07:23:27 2024 +0100 + + avcommon: rename LIBAVCODEC_VERSION_CHECK to LIBAV_CODEC_VERSION_CHECK + + The LIBAVCODEC_VERSION_CHECK form will be for checks also done in 4.0. + + No functional changes. + +commit d406a3127635afcba2436cbc9cbb3efbdc826331 +Author: Steve Lhomme +Date: Wed Jun 19 13:57:24 2024 +0200 + + avcommon: use a specific macro to check the FFmpeg libavformat version + + This macro doesn't check for libav which is assumed to not have to relevant + code. This is the same macro name used in VLC 4.0. + +commit 554a97ab33cd680b60731ec85fd9122329291725 +Author: Steve Lhomme +Date: Thu Nov 7 07:22:26 2024 +0100 + + avcommon: rename LIBAVFORMAT_VERSION_CHECK to LIBAV_FORMAT_VERSION_CHECK + + The LIBAVFORMAT_VERSION_CHECK form will be for checks also done in 4.0. + + No functional changes. + +commit 5efaca393b7388d629bba920127eb5465325c436 +Author: Steve Lhomme +Date: Wed Jun 19 13:56:31 2024 +0200 + + avcommon: use a specific macro to check the FFmpeg libavutil version + + This macro doesn't check for libav which is assumed to not have to relevant + code. This is the same macro name used in VLC 4.0. + +commit 8fef83731a6b7324ffd03933272fcfd9b08a2cb0 +Author: Steve Lhomme +Date: Thu Nov 7 07:20:57 2024 +0100 + + avcommon: rename LIBAVUTIL_VERSION_CHECK to LIBAV_UTIL_VERSION_CHECK + + The LIBAVUTIL_VERSION_CHECK form will be for checks also done in 4.0. + + No functional changes. + +commit 2afbbfe5cd61641cc88a332fd7f8c4bfdea5d9db +Author: Steve Lhomme +Date: Wed Nov 6 15:16:41 2024 +0100 + + contrib: ffmpeg: update to 4.4.5 + +commit 6acdc80bbfa12b9fcc3e57c1ee237e25bf6b1c49 +Author: Steve Lhomme +Date: Wed Nov 6 15:30:41 2024 +0100 + + contrib: ffmpeg: don't rely on MAX_PATH for Windows DLL loading + + It also fixes building with newer UWP toolchains. + + Only a small part of the first patch is backported. + +commit 075e8d6968bf8b2e6118be90626da9918ec70296 +Author: Steve Lhomme +Date: Tue May 23 10:17:20 2023 +0200 + + contrib: libdsm: fix getpid usage in winstore builds + + (cherry picked from commit 06cfac960b0491ec5d68df205cc2bce5578b3a10) + +commit 676a4763e18b1336fe56c51c03c88d58683c6d54 +Author: Steve Lhomme +Date: Mon May 15 10:14:03 2023 +0200 + + contrib: libdsm: fix UWP build + + Even though _CRT_RAND_S is defined a few lines above, rand_s is still not + defined properly. + + Use the upstream patch that fixes this issue. + + (cherry picked from commit df3a5954c3513aa7f4b675275d34063d09bf81f8) + +commit db369b4534f3c1acac8da909eba9964e79dd1231 +Author: Steve Lhomme +Date: Wed Nov 6 14:04:53 2024 +0100 + + contrib: orc: replace FORMAT_MESSAGE_ALLOCATE_BUFFER which may not be available in older UWP + +commit 16024a575a7ce22147f3281ee5ab51e6fc484602 +Author: Steve Lhomme +Date: Fri May 24 09:34:54 2024 +0200 + + contrib: schroedinger: compile the same core in native and cross-compiled builds + + (cherry picked from commit b5cfbf6e1431a23698ea4f13d4cadabeba597e90) + +commit 4229f74762675ef90441507953563f922b542281 +Author: Steve Lhomme +Date: Wed Nov 6 13:59:37 2024 +0100 + + contrib: orc: backport macos/ios fix + +commit 724f05184099e7422133584ab8fb9ba57af6d447 +Author: Steve Lhomme +Date: Tue Nov 5 08:12:07 2024 +0100 + + contrib: orc: update to 0.4.33 + + Fixes a crash in diracpromo-tr1000.ts + + The upstream submission of the meson patch can be found at + https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/70 + + (cherry picked from commit 0ca61cd3fdebfc06177bb5b7dd03597705cd6c10) (edited) + edited: + - 4.0 update to 0.4.40 but the last one compatible with XP is 0.4.33 + - 3.0 was not using the cleaner autotools calls + - 3.0 was not using the config.* updates + - 3.0 was not using alloweduwp + +commit 8222277ce1ceb444381121612038685472a943e6 +Author: Steve Lhomme +Date: Thu Oct 31 07:17:55 2024 +0100 + + contrib: only pass the tools to meson when not cross-compiling + + When cross-compiling they are included in the crossfile. + + (cherry picked from commit cb0ebea6f3ece814b7b4b70b2d4b7f0eab68f372) (edited) + edited: + - 3.0 doesn't use BUILD_DIR with meson + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't build glib with meson + - 3.0 doesn't build opus with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit ee92e20fafb362de279e82454dc6b14a1e4c11df +Author: Steve Lhomme +Date: Thu Oct 31 07:12:34 2024 +0100 + + contrib: use HOSTTOOLS instead of HOSTVARS_MESON + + They are always the same. No need for an extra variable with a confusing name. + + (cherry picked from commit dedaffaf5fb896a1a85f3420fe55f75687b41a41) (edited) + edited: + - the code around the edited code is slightly different + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't build glib with meson + - 3.0 doesn't build opus with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit a35c60584812622b358fa56079dd3cc40c3661a7 +Author: Alaric Senat +Date: Thu Mar 9 18:06:07 2023 +0100 + + contrib: meson: always use meson `setup` + + "meson builddir" has been deprecated since 0.64.0. + + Please see 3c7ab542c0c4770241eae149b0d4cd8de329aee0 [1] upstream for the + complete explanation. + + [1] https://github.com/mesonbuild/meson/commit/3c7ab542c0c4770241eae149b0d4cd8de329aee0 + + (cherry picked from commit f16229374002d796979f3b6b5cb95cc5e8d45c4d) (rebased) + - 3.0 doesn't use BUILD_DIR with meson + +commit 32b551aa647ae10276088c18aa6488db8885c3e9 +Author: Steve Lhomme +Date: Tue Sep 27 17:04:58 2022 +0200 + + contrib: pass compiler flags to Meson via the command line + + Rather than the cross file which generates warnings. It also allows to override + each flag per target. + + (cherry picked from commit 6e912b40384f4be0bd5ce7632d2034fb4c03e23b) + +commit 61be44b0f56b41811e62fc9bff5e8d2d1f3f1af2 +Author: Hugo Beauzée-Luyssen +Date: Wed Apr 21 14:13:39 2021 +0200 + + contrib: meson: Provide objc & objcpp compiler to crossfile + + (cherry picked from commit fb67f4b79b3d2c5ba49c71e656c33f0c7c36900a) + +commit 56c89ccf25ef44d95cdf633ddf5716a1302f19c6 +Author: Marvin Scholz +Date: Sat Jan 22 15:13:04 2022 +0100 + + contrib: meson: fix writing pkg_config_libdir + + Write pkg_config_libdir to the correct crossfile section, should + fix the build after 74060949afbbca285fefdc746f61ff43ed2cb213. + + (cherry picked from commit 09154ece03233a1f01e20aea5430b70616d58a93) + +commit 61df2e7e4490aee05fa7d49b8d3383227792db03 +Author: Mehdi Sabwat +Date: Mon Nov 29 13:13:58 2021 +0100 + + contrib: set pkg_config_libdir in meson crossfile + + pkg_config_libdir is not a builtin option, to use + it we need to define it either in the meson.build of the + project or in the crossfile. + + This used to fail silently, but since PR#8974 (meson 0.60.0.rc1) + it is a fatal error. + + (cherry picked from commit 791c4833683a19bcf5de2ce946c07425224c901d) + +commit 8f8b16deac6a3d85e62e4b386f2e5398b036d0ef +Author: Hugo Beauzée-Luyssen +Date: Mon Apr 27 15:53:39 2020 +0200 + + contrib: meson: Use meson properties to pass PKG_CONFIG_PATH/LIBDIR + + In addition to environment variables. Those are ignored when cross + compiling starting with meson 0.54 + Use of environment variables should be removed in the future + + (cherry picked from commit 583a941d13996d96d45a7f0d886666abbf64c260) + +commit 8ea9144d959c00d48e2689cba7bbd723f2ce75dd +Author: Felix Paul Kühne +Date: Wed Mar 9 08:15:53 2022 +0100 + + contrib: add support for bitcode + + (cherry picked from commit e4b58707be272b76abc7aff51f673fd017a4e083) (rebased) + rebased: + - the code around is different + +commit e77005901febd37f02aed56c1544297e6fa9aeb0 +Author: Steve Lhomme +Date: Thu Dec 15 12:05:23 2022 +0100 + + contrib: build meson with jobserver support + + If the installed ninja supports it, it will play nice with the other build + jobs. + + (cherry picked from commit 72f38f5cbb1b9b25323b0045010411a9dc3aa601) (edited) + edited: + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't build glib with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit ae3ce0c83c5614010f7ef002a56fdeae9db643f1 +Author: Steve Lhomme +Date: Wed Sep 14 06:38:18 2022 +0200 + + contrib: use a command to clean the meson contrib before rebuilding + + Now the meson build folder is handled in a single place. + + (cherry picked from commit d0055d6cb397e91351d3b0363a32bcb640220537) (edited) + edited: + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit f484ef097cfdff958c638579d83c0eb1b41947fd +Author: Steve Lhomme +Date: Tue Sep 13 16:54:11 2022 +0200 + + contrib: move the build and source folders in the MESON command + + This simplifies the meson calls without worrying where the files will be put. + + (cherry picked from commit 159d86097020310dfad14f971b818c2a3a8d3034) (edited) + edited: + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit 48a314c299e0655c604b13cb84585d42e0be211e +Author: Steve Lhomme +Date: Wed Sep 14 08:10:24 2022 +0200 + + contrib: allow adding custom parameters to the meson build phase + + like MESON_BUILD="-v -j4" + + We need to split the compile and install phases as install doesn't have as many + options as compile. + + (cherry picked from commit 0773a89ed61faf9a933d4c715d2773d71e866598) (rebased) + rebased: + - DCMAKE_VERBOSE_MAKEFILE is placed differently on 3.0 + +commit c4bb5e34fb4b77f68498d9719e92e90d89e2f9a9 +Author: Steve Lhomme +Date: Tue Sep 13 15:37:51 2022 +0200 + + contrib: add MESONBUILD similar to CMAKEBUILD + + We don't use the '+' in front because it doesn't use the jobserver from our + make call, because of ninja: + https://github.com/ninja-build/ninja/issues/1139 + + (cherry picked from commit 0b2008e9fe3d8235b94c02feb4809dfd0b98b3c8) (edited) + edited: + - DCMAKE_VERBOSE_MAKEFILE is placed differently on 3.0 + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit b0330f9f5a37a3bf803cd298e7c4d960cf65a1aa +Author: Steve Lhomme +Date: Tue Sep 13 13:18:13 2022 +0200 + + contrib: call meson install instead of ninja + + Just like we have CMAKEBUILD we can use meson to call build and use whatever + it picks for the build system. + + (cherry picked from commit ddbfe0bd07761cdd1af88eb9f2ca7e5cd29132b7) (edited) + edited: + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit e767f48b3a72d18513a14d247bc726c6bcb17ceb +Author: Steve Lhomme +Date: Tue Sep 13 13:19:08 2022 +0200 + + contrib: remove the meson build folders from the top directory + + (cherry picked from commit aa8b38be5ee076f9ee3b7e7e7e4eb48d9c159819) (edited) + edited: + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit 589c8fcd11d951f10f8463f1709d9c5fc27bf00e +Author: Steve Lhomme +Date: Tue Sep 13 13:16:52 2022 +0200 + + contrib: call meson from the current directory + + (cherry picked from commit 7d6501b210ff8b6e20148bcd1a98161deb715744) (edited) + edited: + - 3.0 doesn't build libplacebo with meson + - 3.0 doesn't have basu + - 3.0 doesn't have librist + - 3.0 doesn't have medialibrary + +commit dd191b6f27a364a04c2a838b6a97aa8c9411a72e +Author: Pratik Patel +Date: Wed Oct 16 19:54:22 2024 +0530 + + qt: add option to use dark palette + +commit 9305408197f68baa4bc215ef14f33ab3e64d276b +Author: Pratik Patel +Date: Mon Oct 7 20:23:58 2024 +0530 + + qt: Enabled Styles ComboBox on Windows + +commit ae1fe0e3f754cc4bf5bdd278a609f2c43a309dae +Author: Steve Lhomme +Date: Mon Oct 14 09:02:47 2024 +0200 + + contrib: libarchive: update to 3.7.7 + + Security fixes: + + - gzip: prevent a hang when processing a malformed gzip inside a gzip (2366, OSS-Fuzz) + - tar: don't crash on truncated tar archives (2364, OSS-Fuzz) + - tar: fix two leaks in tar header parsing (2377) + + Important bugfixes: + + - 7-zip: read/write symlink paths as UTF-8 (2252) + - cpio: exit with an error code if an entry could not be extracted (2371) + - rar5: report encrypted entries (2096) + - tar: fix truncation of entry pathnames in specific archives (2360) + - windows: fix ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (2363) + + (cherry picked from commit 784b7c5978efc8df13732b8d3f9a2b45c809344e) (edited) + edited: + - 3.0 doesn't use GITHUB for the tarball + - 3.0 had a patch for WinXP that has been merged + +commit eadb90ffad45a39c725f52382782926a58c4e534 +Author: Tristan Matthews +Date: Wed Oct 16 15:29:35 2024 -0400 + + hds: fix crash if bootstrap data or URL are missing + + (cherry picked from commit 01934b339cf5f467c9c2e3a7fb61c7458347684c) + +commit 83a1a1eb37ff75524878041a8c00a13ee8ec2098 +Author: Steve Lhomme +Date: Thu Sep 15 11:41:58 2022 +0200 + + contrib: gpg-error: remove configure setting found in HOSTCONF + + (cherry picked from commit ebdae4eaf4d0cb4531b8f640e4b12f73cf688210) + +commit f4eef641ed6a1b7a0951b65a4a358a6d964bac53 +Author: Steve Lhomme +Date: Tue May 23 14:31:16 2023 +0200 + + contrib: gpg-error: avoid more forbidden UWP calls in gnulib + + (cherry picked from commit 156b76ba9a9441fc321954cc2e03920cfdce7e78) + +commit c14736b1c5c487bc8b8b5b62f25efd28f3edbc43 +Author: Steve Lhomme +Date: Tue May 23 15:46:45 2023 +0200 + + contrib: gpg-error: always apply Windows patches + + They only apply to Windows specific code and are safe for all Windows versions. + + (cherry picked from commit a1c663c13086da89a1c79d5e8bcef09fe2e72e14) + +commit 5b274360f9c76e5e8c65da5fe1af4e29f65138b4 +Author: Steve Lhomme +Date: Mon May 15 08:20:15 2023 +0200 + + contrib: gpg-error: fix UWP build + + (cherry picked from commit c441dda9b51fd650354d81ebb0b781039c0905b2) + +commit 5fd266ef1d2b50faaa3b2e41eb23032e6018e1c1 +Author: Steve Lhomme +Date: Fri Sep 16 08:26:21 2022 +0200 + + contrib: gpg-error: disable documentation building + + (cherry picked from commit 0d5e38ce25f0757b2fddf44a573eb1024ff84378) + +commit c2297601733dcf3e0fbbf389402333b000341bbc +Author: Rémi Denis-Courmont +Date: Wed Feb 2 20:21:19 2022 +0200 + + contrib: gpg-error: sanitise POSIX lock object + + This provides a sane portable lock object definition for all platforms + with basic POSIX threads. This replaces the insane gpg-error build + system attempting and failing to second guess the platform-specific + size and alignment of pthread_mutex_t. + + (cherry picked from commit ba314fb4c19977d45ce76f2412f2decc6afd4c6c) + +commit 010edeea07fac030c85d0ac2777378659b22cecb +Author: Marvin Scholz +Date: Thu Jan 23 11:59:33 2020 +0100 + + contrib/gpg-error: simplify darwin triplet handling + + Instead of copying the header files around, change the triplet + canonicalization function to correctly remove version numbers for + darwin triplets. + + (cherry picked from commit ebd6b48b5fbe543bcacc2f9a877a350528b1bd3f) + +commit 78fa990e38b0e9b49171d428bd56a90208f773cb +Author: Rémi Denis-Courmont +Date: Sat Sep 30 11:19:34 2023 +0300 + + contrib: mingw: fix ARCH usage + + IA-32 is canonicalised as i386 by the ad-hoc script. + $(ARCH) will never equal i686. + + (cherry picked from commit 93907682b4c68fda13b15b7961f38863baaf944d) (edited) + edited: + - 3.0 uses pthreads/rules.mak + +commit 467230e0c287149f196dcd18ce2d6ae5d537eaa7 +Author: Steve Lhomme +Date: Thu Sep 22 13:03:13 2022 +0200 + + contrib: use a variable for the build dir and source dir from there + + (cherry picked from commit 66fdd2d83faee83de38a351b28d69c9b32fdf279) (edited) + edited: + - only apply to autotools as it was already used for CMake + +commit f09f7796a764a92b03fb900d43dbfaf9cfb07cb2 +Author: Steve Lhomme +Date: Thu Sep 15 14:09:25 2022 +0200 + + contrib: add some command to factorize configure/make calls + + (cherry picked from commit b7c5ba6eca052a965e933f5d64564b25e645f403) (rebased) + rebased: + - 3.0 already has BUILD_DIR + +commit 1435e5e691a35837af906a96d3b4fcfe6c96e6a3 +Author: Steve Lhomme +Date: Tue May 30 14:50:44 2023 +0200 + + contrib: mingw64: patch headers to allow more API's in UWP + + * libloaderapi.h to allow LoadLibraryEx, GetModuleHandle, + GetModuleHandleEx, LoadString, SizeofResource in UWP + * winreg.h to allow RegCloseKey, RegCreateKeyEx, RegDeleteKeyEx, + RegDeleteValue, RegEnumKeyEx, RegEnumValue, RegGetValue, + RegNotifyChangeKeyValue, RegOpenKeyEx, RegQueryInfoKey, + RegQueryValueEx, RegSetValueEx and RegDeleteTree in UWP 8.1 + + (cherry picked from commit b39bb8da1b7760c999bdc6d381c56f17eca4cfd2) (edited) + edited: + - 3.0 uses pthreads/rules.mak + +commit 524bd5debd3dd6e37154b774d18d5d25d640393d +Author: Steve Lhomme +Date: Fri Oct 11 11:43:26 2024 +0200 + + amf_frc: lock D3D11 context on QueryOutput() + + (cherry picked from commit bf7ce0156d8713b5b1cef5d398f7ee3576567430) + +commit fa203ea4e0d25a67688f6090697e6102cd7a7a01 +Author: Steve Lhomme +Date: Fri Oct 11 11:39:55 2024 +0200 + + amf_frc: don't use a staging texture to pass the input texture + + There is a trick to set the slice array number on the D3D resource before submission. + + (cherry picked from commit b25d56b220c95a5f8003c3af0706e5e80478163e) (rebased) + rebased: + - in 3.0 we code around is slightly different + +commit 941a927de9fc8a24452430dff9f2b7aea849f4c2 +Author: Steve Lhomme +Date: Mon Oct 14 11:47:03 2024 +0200 + + mft: don't force WINVER + + We should only force it if it's wrong. But even then we must reset the value so it matches the + _WIN32_WINNT_WIN7 we force. + + Forcing _WIN32_WINNT is better than just WINVER. + +commit 0aa6dbad9c2af66e87427275a3796a0cd9fe499a +Author: Steve Lhomme +Date: Mon Oct 14 11:45:21 2024 +0200 + + win32touch: don't force WINVER + + We should only force it if it's wrong. But even then we must reset the value so it matches the + _WIN32_WINNT_WIN7 we force. + +commit 9cf50d17c666ffe39cf5fcbf7d682a796f1f9dd2 +Author: Steve Lhomme +Date: Fri Oct 11 12:51:33 2024 +0200 + + contrib: x264: don't validate the checksum of the local tarball + + Different versions of xz may produce different checksums. + Ref. #28825 + + (cherry picked from commit 704097649a53a33b21780275fa03ebedea7088c0) + +commit 4b3fa640cde8027b47f69044a0b0cd643514e1cb +Author: Steve Lhomme +Date: Fri Oct 11 12:35:34 2024 +0200 + + contrib: x264: fix android aarch64/arm cross prefix + + "aarch64" is turned into "ach64 " and "arm" into "m". + + ld is not found in the path to LD: + /sdk/android-ndk/toolchains/llvm/prebuilt/linux-aarch64/bin/aarch64-linux-android-ld + + (cherry picked from commit 27d993252ccd7548578e0986b30c4e970863397f) + +commit ea663d5492778264683c284c3e92c76d26aedd10 +Author: Steve Lhomme +Date: Fri Oct 11 12:33:35 2024 +0200 + + contrib: x264: only set --cross-prefix once + + (cherry picked from commit 8bfcb80dbe1e36641878205c0f927d00f56094a9) + +commit 97b885ccf82af77c93fcc190164ca9a0b5def329 +Author: Steve Lhomme +Date: Mon Apr 22 14:09:09 2024 +0200 + + contrib: x264: fix fseeko detection on older 32-bit Android + + It's not supported [1]. NDK 26 will emit an error if you try to use it. + + Upstream patch: https://code.videolan.org/videolan/x264/-/merge_requests/150 + + [1] https://android.googlesource.com/platform/bionic/+/main/docs/32-bit-abi.md + + (cherry picked from commit e750fb576b5d2c7b1341c71697e26bad79bb5460) + +commit 9f45e0b8b4476252a31343024e8241b5584659e2 +Author: Steve Lhomme +Date: Thu Sep 21 11:46:29 2023 +0200 + + contrib: x264: fix build when x264 is in the include path + + (cherry picked from commit 117561315447fa25425bc09f9168e9692cb9a561) + +commit 5ecded35f258c0ecdea51460d3460a8857d7a390 +Author: Martin Storsjö +Date: Fri Sep 23 10:27:54 2022 +0300 + + contrib: x264: Update to the latest version from code.videolan.org + + This allows dropping some portability workarounds. + + (cherry picked from commit 426ff68ea89c7a98d90b7b20e359e54955a4959e) (edited) + edited: + - X264_AS was exporting variables on 3.0 + - 3.0 doesn't use MAKECONFIGURE yet + +commit f76013b69f707f7305a07ec119244bc9557fbf51 +Author: Steve Lhomme +Date: Thu Sep 15 14:21:15 2022 +0200 + + contrib: x264: remove configure setting found in HOSTCONF + + (cherry picked from commit 2b45932a6bcebf12d2292dad6759aa91a5a9062d) + +commit 6680761733a986cd9f757147d9936a0467ba2c76 +Author: Thomas Guillem +Date: Mon Aug 1 12:58:32 2022 +0200 + + contrib: x264: enable back x86_64 asm on Android + + Since relocation issues are now fixed. + + (cherry picked from commit 047cc58ad8111ebc8bf7cc4c213bdfdc41b59c43) + +commit 1a009d1f829dd9786ac513fea08578f3629a8096 +Author: Thomas Guillem +Date: Thu Jul 21 17:19:26 2022 +0200 + + contrib: x264: with build with Android NDK25 + + Cross tools changed from ${ARCH}-linux-android${API}-${TOOL} to + llvm-${TOOL). + + Example: aarch64-linux-android21-strings to llvm-strings. + (cherry picked from commit 9e4252a513e6b0314b364ad2cba1b65b97a585b8) + +commit 84793061ac4c1285746e7923560f3a020a041a9b +Author: Steve Lhomme +Date: Mon Jul 6 15:37:50 2020 +0200 + + contrib: use UNPACK in targets using --strip-components=1 + + They don't actually need some special treatment. They extract properly in the + expected folder given their tarball name. + + (cherry picked from commit 018f006925eb402c3f29063bd83c079ceba5b4b7) (edited) + edited: + - 3.0 has slightly different tarball naming for ffmpeg + - 3.0 doesn't have bitstream, fxc2, glslang, medialibrary + +commit e31969d344830f4be8466cb5f936e39231a27f51 +Author: Steve Lhomme +Date: Fri Jul 10 10:09:20 2020 +0200 + + contrib: x262: move the x262 target in its own folder + + It doesn't have any depedency with x264 nor anything shared. + + (cherry picked from commit 9b9447af810905a760246a4e2a04547267f9938f) (edited) + edited: + - 3.0 already has the HOSTCONF after configure + +commit e4368812866660b46dedf4ad908d7eb2cb5dd410 +Author: Steve Lhomme +Date: Fri Jul 10 10:06:00 2020 +0200 + + contrib: x262: clean build dependencies to use the git source + + It doesn't build but at least we get the sources to build properly. + + (cherry picked from commit 2792169a9702a3f2c5025e5cd67e67e074a28277) + +commit 9bc0a8a0956b7bfb53e361db1b440231f0925441 +Author: David Fuhrmann +Date: Fri Mar 22 08:06:37 2019 +0100 + + contrib: x264: Fix build by using UNPACK_DIR + + UNPACK_DIR instead of x264-git is expected for the following + contrib macros (UPDATE_AUTOCONFIG, APPLY). + + Fixes build on macOS. + + Signed-off-by: Steve Lhomme + (cherry picked from commit f87092a889ea00f60e6c34140a5fbf807eac0626) + +commit 297ea7b6a9374fdc70ceb4347164b817e75fa631 +Author: Steve Lhomme +Date: Thu Mar 7 12:44:09 2019 +0100 + + contrib: x264: enable Winstore builds without MSVC + + (cherry picked from commit ec0b6bdc91024fef63cebfb6a07cc14f889ed6d8) + +commit e8caa1de07a6e176540a5acb351473eb6bef175a +Author: Martin Storsjö +Date: Wed Mar 28 10:24:29 2018 +0300 + + contrib: x264: Use a unique file name for the x264 snapshot tarball download + + Treat x264 as an (almost) normal package to download, except for not + checking for the download in http://downloads.videolan.org/pub/contrib. + + This fixes building contribs with a prepopulated tarballs directory, + even if the x264 snapshot version changes. + + Alternatively, the x264 contrib could be changed to use download_git + with proper support for pinning to a specific git hash. + + (Not touching the x262 part since that doesn't seem to be working + at all right now. Downloading x262 fails since it tries to download + from an undefined X262_SNAPURL.) + + (cherry picked from commit 0845207525933a4da28238b56ef7e77daff00c54) (rebased) + rebased: + - 3.0 uses tar xvjfo + +commit 5cdb9b25440ec1d295e76bc866227a6f91502d55 +Author: Steve Lhomme +Date: Mon Oct 14 11:11:36 2024 +0200 + + fetcher: don't download network metadata if the user doesn't want to + + The option is defined as "Allow metadata network access". If it's false (default but query during the first run) that means the + user doesn't want to check metadata from the network. + So we should not start a network job when there's a possibility to do it. + + This is a regression from ea88b8d68e252445bcc305fd7a3dd45ef3ce0126. + Before that we only used FETCHER_SCOPE_LOCAL if the option wasn't set. + + (cherry picked from commit 1a85d6793948c88afe35692d8c17a82089a58f33) + +commit a618e31cf209168ae420e95750734a37359969e1 +Author: François Cartegnie +Date: Sun Jul 7 11:14:05 2024 +0200 + + mux: avformat: fix avio callbacks signature with ffmpeg 6.1 + + API signature changes introduced depending on a positive define, + then removed later, making it break prior or post removal... + + (adapted from commit 503c04fad9239420be26d67aab4d5f63c53eb4f7) + +commit e8cc58caff295e99cbefc8608021dfc83ad8bfa4 +Author: Steve Lhomme +Date: Mon Oct 14 14:03:24 2024 +0200 + + contrib: pthreads: use git integrity check + + We can't validate the checksum of the local tarball. + Different versions of xz may produce different checksums. + Ref. #28825 + +commit af4a6fc9a5aa3dd2c0abfbde778bb8faf2ce4afc +Author: Steve Lhomme +Date: Mon Oct 14 14:02:58 2024 +0200 + + contrib: tremor: use git integrity check + + We can't validate the checksum of the local tarball. + Different versions of xz may produce different checksums. + Ref. #28825 + +commit c0438390cc8f551dbaef0131fa5e054c82f9fc12 +Author: François Cartegnie +Date: Tue Sep 24 18:53:11 2024 +0700 + + codec: x265: handle 4.0 encoding API change + + refs #28799 + + (cherry picked from commit 83e2c3955a563b60f74f05cea57e3ab5f447c8fb) + +commit 4cbeec2436cfb6718d72ae5cd0e8a74971dc2c03 +Author: François Cartegnie +Date: Tue Sep 24 18:43:08 2024 +0700 + + codec: x265: handle X265_MAX_FRAME_THREADS on newer CPU + + libx265 will bail out when hitting the limit + + x265 [error]: frameNumThreads (--frame-threads) must be [0 .. X265_MAX_FRAME_THREADS) + + (cherry picked from commit bbd294d1e46b86653873ec88d49e9a15cbaae68f) + +commit 651679fa2f9f7941327cf7fc975383c4f08f7c95 +Author: Steve Lhomme +Date: Wed May 22 11:16:33 2024 +0200 + + package/win32: use the mingw-llvm ar/ranlib + + If a regular gcc toolchain is also in the path the gcc-ar/gcc-ranlib + variants will be used. We want to use the one coming with the mingw-llvm toolchain. + + (cherry picked from commit 232d0a2c2500fcd83c596f3fb5e292e1f452b075) + +commit ce24e0ed4d9c2e3d5d04a7b996bc78ed1ee2d6b4 +Author: Steve Lhomme +Date: Tue May 16 13:14:47 2023 +0200 + + package/win32: fix UWP warnings when forcing windowsapp linking + + When files are compiled they don't use the linker part and clang emits a warning. + Some contribs like libvpx use -Werror and won't build if there's anything + extra in the command-line. + + (cherry picked from commit 98598ce92e9d36cb296d8ab39a0998a5f27d773c) (rebased) + rebased: + - on 3.0 we set the minimum Windows version with UCRT support to Win7 (0x0601) + +commit 0fe8d0385a259993e731a95ceef813cd816d1e90 +Author: Steve Lhomme +Date: Tue May 16 13:05:55 2023 +0200 + + package/win32: don't force windowsappcompat in contribs + + It's already done in contrib/main.mak and should be removed from there. + + (cherry picked from commit 36129d5171e07f3e1f2789aee0bf5d6988ddf921) (rebased) + rebased: + - on 3.0 we set the minimum Windows version with UCRT support to Win7 (0x0601) + +commit 8a5276b30deb62d7e3d203afaddb4003df4b1e39 +Author: Steve Lhomme +Date: Fri May 12 16:14:15 2023 +0200 + + package/win32: remove forced vcruntime140_app linking + + We should not need it with UCRT. + + (cherry picked from commit 522d0b7796bfb9d46a79a114bb2903998922f490) (rebased) + rebased: + - 522d0b7796bfb9d46a79a114bb2903998922f490 + +commit 4ed2fd973393260b1d051b6b4c08540fd30a80ec +Author: Steve Lhomme +Date: Fri Feb 17 10:32:15 2023 +0100 + + package/win32: don't force ucrt linking with C/C++ file + + We already check that the C toolchain defaults to UCRT since 23fac2466a6284f1b341d3f87e3fa9f336d87c7e. + Using -lucrt with recent cland creates a warning. + arrib25 is compiled with -Werror which prevents it from compiling. But we don't + need -lucrt at all. + + (cherry picked from commit e6cf68a5326d3e91fec81623b726b6104a803dbc) (rebased) + rebased: + - on 3.0 we set the minimum Windows version with UCRT support to Win7 (0x0601) + +commit 88c0c371e0a81bfca52c5af94a416c3df79c664e +Author: Steve Lhomme +Date: Fri Feb 17 10:28:16 2023 +0100 + + package/win32: add the -l in the EXTRA_CRUNTIME string + + So we don't have to repeat it each time + + (cherry picked from commit 9178cfcd74764490076a1934c31dd6cdb1d8d75d) (rebased) + rebased: + - on 3.0 we set the minimum Windows version with UCRT support to Win7 (0x0601) + +commit 85b05c03cc6b15fbcb5ff5e62d8e5552439d2b4d +Author: Steve Lhomme +Date: Thu Jan 26 15:08:52 2023 +0100 + + package/win32: detect when UCRT is enabled without a UCRT toolchain + + (cherry picked from commit 5d219486314740ca005d55dc1320d491b7052d39) + +commit 214c7bc28d4d154abf61722d874f77e81d2a2152 +Author: Steve Lhomme +Date: Thu Jan 26 15:05:13 2023 +0100 + + package/win32: detect we build with a UCRT toolchain + + (cherry picked from commit 23fac2466a6284f1b341d3f87e3fa9f336d87c7e) + +commit 30f36be4756c55ff7211da451c79dd7eeca07d27 +Author: Steve Lhomme +Date: Thu Jan 26 12:35:15 2023 +0100 + + package/win32: set _UCRT when enabling URCT in mingw-64 + + _UCRT was not set automatically in with mingw-w64 older than 7 [1]. _UCRT is + needed to enable certain UCRT API. It's also set by MSVC. + + [1] https://github.com/mingw-w64/mingw-w64/commit/8b2ece59fccf0a65257b1ba2fe8d67d7e8a2e8c1 + + (cherry picked from commit 4657ba2647ca051294dc5fce38a38488e775bb95) + +commit 948bfcfe4bcb4551032bfaf5664f1d6010e887ab +Author: Steve Lhomme +Date: Wed Sep 29 16:02:24 2021 +0200 + + package/win32: build.sh: add an option to set the Windows SDK version + + The NTDDI version contains the windows version and the subversion like the + Windows 10 flavor or Service Pack. This is supported by mingw64 and MSDK. + + https://docs.microsoft.com/en-us/windows/win32/winprog/using-the-windows-headers + (cherry picked from commit 62cdc93a11775210f39f03b71afc3a2133f6d567) (edited) + edited: + - the minimum WINVER for 3.0 is XP SP1 (0x0502) + - when selecting UCRT we still force the minimum to Win7 (0x0601) + +commit 841ea44264b9a5cd6b983b76ed7e48bcfdfc310e +Author: Steve Lhomme +Date: Wed Jul 5 13:42:25 2023 +0200 + + contrib: libarchive: disable Werror when building + + We have odd configurations that it may not expect. Like passing -gcodeview + to get .pdb files in clang. + + Werror is on by default in debug builds. + + (cherry picked from commit a57b38d5306fb0839283383a51c0792dae13954a) (rebased) + rebased: + - the comment about XP/Win7 support is different on 3.0 + +commit c99ecb1ab587a31fec601fb999c8c1d0ece49905 +Author: Steve Lhomme +Date: Wed Mar 13 15:51:28 2019 +0100 + + configure: use WINSTORECOMPAT when building for Windows Store + + We may use some forbidden APIs that are actually usable via WindowsStoreCompat + + GetACP in the core, for example. + + (cherry picked from commit 277b45efff01dcccd42f1e4943aa09297f99650e) + +commit e020f9abb31809584e33d740593d6ae5a190771d +Author: François Cartegnie +Date: Mon Aug 12 19:32:42 2024 +0700 + + codec: avcodec: bypass removed define for Intel workarounds + + adapted from cherry picked commit 1280728ad305f00ceba3491ce11bf66107017a6c + +commit bb62989ccc12866d308e6f38dc1513de9cb1c6da +Author: Ilkka Ollakka +Date: Tue Jul 4 16:55:28 2023 +0300 + + avcodec: use ch_layout for channel layout in audio encoder + + channels and channel_layout has been deprecated in FFMPEG 5.1 and will be removed eventually + + also always create the mapping, as ch_layout is always there + + (cherry picked from commit b73dc8841d999c6be9de718cd2cd3aeb13279792) + +commit fa001cda7f6b22843438c39dfc078050bb54c72a +Author: Ilkka Ollakka +Date: Tue Jul 4 16:53:43 2023 +0300 + + avcodec: add handling of new ch_layout in audio encoder + + conditioned to avcodec version where is it added + + (cherry picked from commit c4302ca59dd79efd7208a45a3fcdc44388fd03a8) + +commit b5bb9bda03a06fc1cfd682dacb571b688b5558d9 +Author: François Cartegnie +Date: Tue Apr 23 13:14:53 2024 +0700 + + demux/mux: avformat: use ch_layout from ffmpeg 5.1 + + merger pick from commit a55ec32ab3760d9edb6f05481cd3a981aa42878d + and fixup 195f0c98599b55950c49a62f98d9d3495be310df + +commit 3db6e677680a1a94e473fe9d9fc121af34cdcf2b +Author: François Cartegnie +Date: Sat Aug 17 11:22:33 2024 +0700 + + codec: avcodec: fix audio channel_layout conditionals + +commit 58c05240c26b6eef56e7c5ab35b14ccd8377667f +Author: François Cartegnie +Date: Thu Jun 13 12:21:58 2024 +0700 + + avcodec: encoder: fix channel_layout conditionals + +commit b8ad80a20e9e84082dac2848070d251fa68412c7 +Author: François Cartegnie +Date: Tue Apr 23 13:13:30 2024 +0700 + + codec: avcodec: map AYUV as RAWVIDEO with ffmpeg 6.0 + + (cherry picked from commit 955ef939467a628eb8da08e0d5eaefc9a3484cba) + +commit c44edb85e4f25cbc7a848211d2d3ca9f03bd46e6 +Author: Ilkka Ollakka +Date: Tue Jul 4 16:52:38 2023 +0300 + + avcodec: use p_enc audio channels instead of context channels in encoder + + Allows to have less conditions in code when adding new ch_layout use + + (cherry-picked from commit 29747a8abb98ba53a64aa6761983891eeed2e0e4) + +commit 99b14966182995314f5b29fd972d6a9000ea3e00 +Author: Ilkka Ollakka +Date: Wed Jul 5 13:33:09 2023 +0300 + + avcodec: audio decoder to use ch_layout + + (cherry picked from commit 496f0f2a659c1339d1e37330d446e9b6ce96e76b) + +commit c7709e7a048eb69b656d7f9663debbc1dde1f591 +Author: Ilkka Ollakka +Date: Wed Jul 5 12:51:34 2023 +0300 + + avcodec: use p_dec->fmt_out instead of context channels on audio channel-count + + reduces the need of ifdefs when adding ch_layout support + + (cherry picked from commit bddf5ba19111d1cc4463d9876c4bc4ba75f82d7f) + +commit 81d6d56df6e5a66ed99970e2c559539858f4a0b7 +Author: Rémi Denis-Courmont +Date: Sat May 5 15:28:15 2018 +0300 + + avcodec: avoid signedness mismatch warning + + Bitmask should be unsigned, but ffmpeg seems confused with itself. + + (cherry picked from commit 8544233e7fde2965435e32a445494898440ecc30) + +commit 76ef452e901739f0431d8feacc47845f81b4a15c +Author: Steve Lhomme +Date: Tue Oct 8 13:26:34 2024 +0200 + + contrib: libarchive: fix bcrypt usage + + The header may be detected but we don't want to use it when targetting XP. + + Patch sent upstream: https://github.com/libarchive/libarchive/pull/2374 + It's not necessary on 4.0 since we build for Windows 7. + +commit eb54f4ce347c0cd89188b827d2f33b3b034bf39d +Author: Steve Lhomme +Date: Tue Oct 8 08:20:23 2024 +0200 + + contrib: libarchive: fix detection of newer functions on macOS + +commit e09768457a8bfe15fa1fcefda88706ca7c80e693 +Author: Steve Lhomme +Date: Thu May 25 13:11:03 2023 +0200 + + contrib: libarchive: allow CreateHardLinkW in UWP + + (cherry picked from commit d853db29e953c65aa370fb20643c4b89bb6dde64) (rebased) + rebased: + - 3.0 doesn't use DEPS_zlib before + - 3.0 doesn't have LIBARCHIVE_CONF next + +commit f709dcdbc9b43c2bb50f87498b98029b4b407662 +Author: Steve Lhomme +Date: Mon Sep 23 13:17:24 2024 +0200 + + contrib: libarchive: update to 3.7.6 + + Includes our UWP patch and some CVE fixes from 3.7.4 and 3.7.5. + + (cherry picked from commit 78ae78c044e87086bc976b9c226eb6fa93e4af54) (rebased) + rebased: + - 3.0 doesn't use $(GITHUB) for the tarball + +commit 6fe63c98e2bb992362d0d9c38202db3f42aaca28 +Author: Steve Lhomme +Date: Tue Jul 18 11:22:11 2023 +0200 + + contrib: update libarchive to 3.7.0 + + It contains all the patches we had. + + Changelog: https://github.com/libarchive/libarchive/releases/tag/v3.7.0 + + New features: + + * bsdunzip: new tool ported from FreeBSD) + * drop-in replacement for Info-ZIP unzip, not yet ported for Windows + * 7zip reader: support for Zstandard compression + * 7zip reader: support for ARM64 filter + * zstd filter: support for multi-frame zstd archives + + Other notable bugfixes and improvements: + + * pax: fix year 2038 problem on platforms with 64-bit time_t + * Windows: Universal Windows Platform (UWP) fixes and improvements + * Windows: bcrypt usage fixes and improvements + * Windows: time function usage fixes and improvements + + (cherry picked from commit fa419f41709adb04bb4ef92b1dfc249dcc7bb897) (edited) + edited: + - 3.0 builds with autotools so the bsdunzip option is used there + - 3.0 had old patches we don't need anymore + - 3.0 used RECONF that is not needed anymore + +commit 82b1831df2734c8e9861ff03fffc26a88385b329 +Author: Steve Lhomme +Date: Tue Jun 18 07:42:58 2024 +0200 + + contrib: libarchive: fix usage of GetVolumePathNameW in UWP before 20H1 + + (cherry picked from commit 037300632832df831721c0b6b09fbc13255b6fa2) (rebased) + rebased: + - the code around is slightly different + +commit dc46659b84acd77cbe0b6366d520b7add28f8ba5 +Author: Khalid Masum +Date: Wed Mar 15 16:00:26 2023 +0600 + + contrib: libarchive: update to 3.6.2 + + Co-authored-by: Steve Lhomme + (cherry picked from commit 37e03085a721c4a19210a5b8d8da7d110aef691e) (edited) + edited: + - 3.0 didn't have the UWP patch removed + - 3.0 didn't use $(GITHUB) for thr tarball URL + +commit bd6d977262e3c8b05481973f1ff1b67370549973 +Author: Steve Lhomme +Date: Thu May 25 11:54:39 2023 +0200 + + contrib: libarchive: build with CMake + + That's the target they use in their CI. Although they don't test + cross-compilation to Windows... + + We don't need the Android patch anymore. + + (cherry picked from commit 7179b5ee6e24641844c2a1ba075187ee12216534) (edited) + edited: + - 3.0 was not use MAKEBUILD + - LIBARCHIVE_CONF was different on 3.0 + +commit 1b4ab35f6e091b21e9cb5d3183868f70fc08ef98 +Author: Steve Lhomme +Date: Wed May 24 09:51:22 2023 +0200 + + contrib: mingw64: allow CreateHardLinkW/GetVolumePathNameW in UWP + + (cherry picked from commit 4347aac5881d003f4edd10f7509f73b1f49d081a) (edited) + edited: + - 3.0 uses pthreads/rules.mak + - 3.0 doesn't use mingw-w64 v11 + +commit 2dcc3673f7d46f50a434cda033d8445f75d17b63 +Author: Steve Lhomme +Date: Wed May 24 09:51:22 2023 +0200 + + contrib: mingw64: patch headers to allow more API's in UWP + + * fileapi.h to allow GetFileInformationByHandle in UWP + Unlike all the documentation says, it's allowed in the SDK. + * memoryapi.h for VirtualAlloc + + (cherry picked from commit 826f28e5c90424367c2bde7e4140e6f734f38516) (edited) + edited: + - 3.0 uses pthreads/rules.mak + - 3.0 doesn't use winrt_headers + +commit b8e6e00809f36cb9e74bac0b9d6a4b58d532575d +Author: Steve Lhomme +Date: Mon Apr 15 11:11:57 2024 +0200 + + contrib: don't set the build mode in the toolchain file + + It doesn't describe the toolchain we use. We can pass the value as a regular flag. + + (cherry picked from commit 89fe89ee75a508d486e85b43961616cf17faa10b) (edited) + edited: + - 3.0 doesn't use gen-cmake-toolchain.py + +commit b8768a504daf965acf6f08ae8c11fd85e067db4b +Author: Steve Lhomme +Date: Tue May 23 08:33:24 2023 +0200 + + contrib: taglib: enable WinRT option in winstore mode + + This triggers the use of CreateFile2 instead of CreateFileW. + + (cherry picked from commit c133bc4b6cfa7bb02e51697e02a861e5733e7c6d) + +commit 9d47a81b8f13df95ba91f8a5dd887474d0ce9bc0 +Author: Steve Lhomme +Date: Fri Jun 2 11:13:38 2023 +0200 + + contrib: mimic the Android CMake toolchain + + We need to set ANDROID so that the code can tell it's building for Android. + This is until we use the proper CMake Android configuration. + + (cherry picked from commit 7e172702b1e64da90ba9519bdc3693451b653936) (rebased) + rebased: + - 3.0 doesn't have the following MSYS_BUILD check + +commit cac144379e04f643e577a6fd99f63311b4e2fbc3 +Author: Steve Lhomme +Date: Thu Nov 17 11:51:11 2022 +0100 + + contrib: simplify the cmake call + + We don't need a specific CMAKE_PIC anymore + + (cherry picked from commit 61eff32a9b4bda4c8917f9570ad8850d1305b68d) (edited) + edited: + - 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib) + - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader) + +commit c7c249b75a0b37dea47079cdd4347c7a121a2cac +Author: Steve Lhomme +Date: Wed Oct 19 11:49:50 2022 +0200 + + contrib: openjpeg: extract to the proper directory during UNPACK + + (cherry picked from commit c3d55dc14495a338906bca7602581f2b62b8ed50) (rebased) + rebased: + - 3.0 uses pthreads instead of winpthreads + +commit 7a12274abdc198e7374cf9d0f91f8ef085b59732 +Author: Steve Lhomme +Date: Thu Nov 17 11:48:28 2022 +0100 + + contrib: always use CMAKE_POSITION_INDEPENDENT_CODE for CMake projects + + It's used for static libraries and only for some targets that need it. CMake + takes care of picking the right configuration. + + (cherry picked from commit 1266db2bf6410fd8a5ee8b52d636783f8d2c1bd8) (rebased) + rebased: + - the code around is slightly different + +commit ddbbf247dd75dee082047f2abb453a924bd629b1 +Author: Steve Lhomme +Date: Wed Oct 19 06:56:37 2022 +0200 + + contrib: use the CMake flag to select the PIC flag + + It may differ between compilers and is internally handled by CMake, including + not doing it on Windows targets. + + (cherry picked from commit e1b6661e1ec42362800b6b928267899d271a144a) (edited) + edited: + - 3.0 doesn't use BUILD_DIR for autotools + - 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib) + +commit f96fd3c1c9d3659a7e2dcec188d4bbc4f50644d2 +Author: Steve Lhomme +Date: Wed Oct 5 11:20:03 2022 +0200 + + contrib: use HOSTVARS_PIC on CMake targets forcing POSITION_INDEPENDENT_CODE + + ...for static library builds. + + So we have a clearer view of which target uses PIC and which doesn't. + + aom does it with the CONFIG_PIC variable that we set with the same conditions + we set PIC. + + (cherry picked from commit c3ceacfd26fbbf765bd48696cbe8dd9d8f2c7a1a) (edited) + edited: + - 3.0 some contribs are not build with CMake (libxml2) + +commit 774abe26459c0139a9f869d0e3f363b0a796e954 +Author: Johannes Kauffmann +Date: Sun Sep 11 17:45:31 2022 +0200 + + contrib: openjpeg: update to 2.5.0 + + (cherry picked from commit eb7ec4423f78204136f8d8bcdc1509ae1ec7e2f7) (edited) + edited: + - 3.0 didn't have the emscripten patch + - 3.0 already used $(GITHUB) + +commit 75ad2577cbb3159f36d09973ae22b9fc9a1a5e48 +Author: Steve Lhomme +Date: Mon Oct 10 10:26:30 2022 +0200 + + contrib: use cmake --install to install CMake targets + + It is cleaner than using an internal "install" target which may not be on all + CMake generators. + + We don't need multiple threads to install files. They will be better used for + compiling files. + + (cherry picked from commit d2b9059d191a7752fdcc57c454360ed4dc4a6104) + +commit 2313453b5d6e92acd69652dee5f385b1a212be46 +Author: Steve Lhomme +Date: Mon Oct 10 10:20:38 2022 +0200 + + contrib: replace CMAKEBUILD --target install with CMAKEINSTALL + + We don't need to know the prefix when compiling. We also don't need multiple + threads to install files. They will be better used for compiling files. + + (cherry picked from commit 6c86ff70e67146e0c1163d2a9fde6ca891d093f1) (edited) + edited: + - 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib) + - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader) + +commit cbabeb443e1a69210ee8012a7a22fb5af1ba1d2a +Author: Steve Lhomme +Date: Mon Sep 26 12:17:43 2022 +0200 + + contrib: build all code before installing for cmake contribs + + If the contrib install sub-directories it may install some and fail later. We + should only install when we know everything built correctly. + + Do each build step in a separate make line. + + zlib had issues building all at once on emscripten + https://code.videolan.org/robUx4/vlc/-/jobs/1149115 + + (cherry picked from commit 420e9f62fe57a3891f68e551ec7df1f21a4fe3bd) (edited) + edited: + - 3.0 some contribs are not build with CMake (flac, freetype2) + - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader) + +commit ea11a0d887ad13567c2918fd3fe23404cab5c6fd +Author: Steve Lhomme +Date: Mon Sep 26 15:16:54 2022 +0200 + + contrib: taglib: disable C bindings + + We use it with the C++ interface. + + (cherry picked from commit 2599291bb489512b20147a1df3175345b0411e26) (rebased) + rebased: + - 3.0 doesn't patch the same files + +commit e4e0727f52603038ee40957a10efceb9f4c720a5 +Author: Steve Lhomme +Date: Mon Sep 26 10:15:53 2022 +0200 + + contrib: use the specific build directory variables + + (cherry picked from commit 8d0461dd448142545aa447d45edf1c226153ddf0) (edited) + edited: + - only keep the AOM change building with CMake + +commit 90368e8ffe79744cddedb2f12df38044167864a1 +Author: Steve Lhomme +Date: Mon Oct 10 10:19:17 2022 +0200 + + contrib: add a command to install the built CMake target + + (cherry picked from commit 0f2caa566c8c9df248e0781d098edf5271e6115a) + +commit 83f9894211d35b5e6d8d73e6745b42b7e4152b38 +Author: Steve Lhomme +Date: Thu Sep 22 13:03:13 2022 +0200 + + contrib: use a variable for the build dir and source dir from there + + (cherry picked from commit 66fdd2d83faee83de38a351b28d69c9b32fdf279) (edited) + edited: + - 3.0 doesn't have MAKEBUILD + - don't modify MESON + +commit 747e969f54a99ef19e52736439961bac7d21490b +Author: Steve Lhomme +Date: Thu Sep 15 10:28:30 2022 +0200 + + contrib: put variables after the configure call + + It should make no different where the variables are. They should be before the + target name if there is one. + + (cherry picked from commit cfeea778135bf125ad2720a97199b7f1233b07af) (edited) + edited: + - PROTOBUFVARS is already in the right place + - 3.0 doesn't use sqlite anymore + +commit 3c2f5583d4fa9a58999f58d129796bca65cd7f5a +Author: Steve Lhomme +Date: Wed Sep 14 16:40:32 2022 +0200 + + contrib: always put HOSTCONF before custom parameters + + (cherry picked from commit 88b6c195472ce4cc75aebaf63f71f571d7e934b4) (edited) + edited: + - 3.0 doesn't have a VNCCLIENT_CONF + - 3.0 had SHOUT_CONF an empty because 85268b42d744538158fbef6ad1973147cf8e8f5c is not backported + - 3.0 doesn't use the sqlite anymore + - 3.0 has FONTCONFIG_ENV + +commit 5c4f13f01a0a1026d90610c088afdf445968d1c1 +Author: Steve Lhomme +Date: Thu Sep 15 11:19:53 2022 +0200 + + contrib: x264: use HOSTCONF for common autotools parameters + + (cherry picked from commit 3f557ee5dde63bcbe15caee641f46429da9723f1) (edited) + edited: + - on 3.0 x262 is in the same build script as x264 + +commit a13f6c4e1f075228afef78cdadb0fa22187813a2 +Author: Steve Lhomme +Date: Fri Sep 16 12:08:59 2022 +0200 + + contrib: use a variable to set the configuration + + (cherry picked from commit 52add02a4e13f7b210b89406a12cba50985207eb) (edited) + edited: + - 3.0 doesn't have rnnoise + - ssh2 has a flag for gcc 4.9 + +commit a5968cb28ba3e1ed70abd8fdda6ae7ded9c8b57e +Author: Steve Lhomme +Date: Thu Sep 15 09:50:19 2022 +0200 + + contrib: do successive builds separately + + (cherry picked from commit c637a0bd59ea311683a7a41e039edb0e8b7b4988) + +commit c345ce7144fc5a94103e5a51268918294f83e3e5 +Author: Hugo Beauzée-Luyssen +Date: Wed Apr 1 11:14:17 2020 +0200 + + contrib: tiff: Ensure we only build & install the lib + + (cherry picked from commit 52971aeb0e6217132969ba2bae2551d1c7d6cf29) + +commit 70d22dbede3b07ed1c1d9caa159656918566395d +Author: Steve Lhomme +Date: Wed Sep 14 07:36:43 2022 +0200 + + contrib: use a command to clean the cemake contrib before rebuilding + + Now the cmake build folder is handled in a single place. + + (cherry picked from commit b650363488c735a1bb2959e8380044cad9e3b5d2) (edited) + edited: + - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader) + +commit fae2865c530115792de38295b5355881c20d2d84 +Author: Steve Lhomme +Date: Mon Sep 12 08:55:24 2022 +0200 + + contrib: assume CMakeLists.txt is in the contrib folder by default + + It can be overriden when calling $(CMAKE). + + Remove the stray '.' that was left after -S was used in all cases. + + (cherry picked from commit b2e78e25bcbf57cf945652985c38883d6a588a1e) (edited) + edited: + - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader) + +commit e690bd151dc167560c47e0cd0d18afc126841ebf +Author: Steve Lhomme +Date: Mon Sep 12 09:10:39 2022 +0200 + + contrib: put the build folder directly in the CMAKEBUILD command + + We always use the same name and always use it. + + (cherry picked from commit 8fa16a23d569ece87931b0fc2071e6cf8440e531) (edited) + edited: + - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader) + +commit 4edc058293a979db03a18867e055959c5c3b9016 +Author: Steve Lhomme +Date: Mon Sep 12 08:43:12 2022 +0200 + + contrib: put the build folder directly in the CMAKE command + + We always use the same name and always use it. + + (cherry picked from commit 44ccea2f0783733bed7f9ce39b0e7ce8136d0fb7) (edited) + edited: + - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader) + +commit f86adb2f46b19fcaa54ef21ec408c26fbe8a3c30 +Author: Steve Lhomme +Date: Mon Sep 12 08:36:09 2022 +0200 + + contrib: aom: use the same build folder as other CMake contribs + + We don't need to destroy nor create the build folder each time. + + (cherry picked from commit bb04ae4603a95020ffe9ca5c8b3f8f395b7275cb) + +commit 6f298bb9c3509496ffd08c478c91ce4edcd4e4f7 +Author: Steve Lhomme +Date: Thu Sep 1 10:54:24 2022 +0200 + + contrib: aom: remove redundant flag + + LDFLAGS is already set in HOSTVARS + + (cherry picked from commit 0857e1c9799a9510df70bc13572f5a3a1f92a88e) + +commit bd2900f4a24cb2f377ee6368740b6f3b63b4101d +Author: Steve Lhomme +Date: Mon Sep 12 08:30:05 2022 +0200 + + contrib: build CMake targets in a build folder + + Meson targets already do it. + + We don't need to create the build folder prior to using it, CMake will do it + for us. We don't need to cd in the folder either, we can tell CMake where to + find the CMakeLists.txt file in the same call. + + (cherry picked from commit 8f47412922df15870614f2ac21cef703edd43d37) (edited) + edited: + - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader) + +commit 58026bf24172c7193afaab27aed55e944aa605b7 +Author: Steve Lhomme +Date: Mon Sep 12 13:23:00 2022 +0200 + + contrib: mpcdec: backport some patches from the original SVN repo + + via https://github.com/ctarbide/musepack_libmpc + + It transforms the SHARED option into proper BUILD_SHARED_LIBS. + + Fix the old patches and apply them as commits. The MSVC patch can be applied + no matter what. The macOS patching is useless since CFLAGS are respected thanks + to the first patch. The sed is not needed since the second patch removes build + of all the programs. + + The decoder and encoder code has not changed since revision 481. Only the tools + have been slightly updated. + + We don't need to copy the .a manually anymore. + + (cherry picked from commit 48caea17c602e026290b6eef0c3cf994263d4c1d) (edited) + edited: + - 3.0 used $@_src_r$(MUSE_REV) instead of UNPACK_DIR + +commit 5b2499ac829b503cd705dc94b8e85e55812e7507 +Author: Steve Lhomme +Date: Mon Sep 5 09:30:55 2022 +0200 + + contribs: don't force CMake to build in the current folder + + It is the default behavior. We could change that in CMAKE for all targets + at once. + + (cherry picked from commit 3513e834d34642831fcc60174582ffe02638ba09) + +commit 572cd3631b77d48f6440ca87b1c122f69289455e +Author: Steve Lhomme +Date: Thu Sep 1 15:31:59 2022 +0200 + + contrib: remove CMakeCache.txt without changing the current directory + + (cherry picked from commit dd0c79a7270b0f9f074bd3536b37a0fbec263ff4) (edited) + edited: + - 3.0 some contribs don't exist (libaribcaption) + +commit 15141855599703aba080b382a4a4d5d2c8f449d2 +Author: Steve Lhomme +Date: Mon Sep 5 09:04:35 2022 +0200 + + contribs: build from the top directory like other contribs + + We just need to tell CMake where to find the root CMakeLists.txt file. + + CMake already puts all its build files in a CMakeFiles folder. + + There's only libaom that generates an error if you build the library from the + root... + + (cherry picked from commit cd41528ce933448badd35ba5bf96424e3f0fdbf8) + +commit d3d4c94ed77b0854dbe450f9cabf722b7df90d4c +Author: Steve Lhomme +Date: Fri Sep 2 10:49:09 2022 +0200 + + contrib: remove the CMakeCache.txt at every run + + Just like we do with autotools builds, we configure the target every time we + build a contrib. + + In the case of cmake, touching `toolchain.cmake` does rebuild the cmake + contribs but if there's a cache it's not reconfigured and doesn't rebuild + anything. + + (cherry picked from commit 575c4acdf5f4bc57f43e1213c43a8721741df6b9) (edited) + edited: + - 3.0 some contribs don't exist (glslang, libebur128, vulkan-headers) + +commit 1721009169c7dfc4b71d0cbbb282109e896bb4c0 +Author: Steve Lhomme +Date: Thu Sep 1 11:06:11 2022 +0200 + + contrib: fluidsynth: do not force FLUIDSYNTH_NOT_A_DLL + + FLUIDSYNTH_NOT_A_DLL is not used anymore when built statically. Here's the file + used to generate the public header: + + https://github.com/FluidSynth/fluidsynth/blob/v2.1.8/include/fluidsynth.cmake + (cherry picked from commit e1fb8bcba014cfb76294d1fa6b332dceff59fe02) + +commit a7899a98949c669d66df16b3c4e95ad016b93263 +Author: Steve Lhomme +Date: Mon Sep 5 16:25:37 2022 +0200 + + contrib: chromaprint: use CMAKE_CXX_IMPLICIT_LINK_LIBRARIES to get the C++ runtime + + Submitted upstream https://github.com/acoustid/chromaprint/pull/119 + + (cherry picked from commit 7a772424d70e512976ab806a95fbc887df7c0381) + +commit d80b45c8d941ece6d0717c05aec1bdde393c0dfe +Author: Steve Lhomme +Date: Thu Sep 1 10:57:06 2022 +0200 + + contrib: ebml: no need to disable ENABLE_WIN32_IO + + It's off by default. + + (cherry picked from commit 9aee532882e2bda62a073006aca3ef1fa22d2f01) + +commit 9a485aceaea22b38bcff9a32ea788c091debe6a0 +Author: Steve Lhomme +Date: Thu Sep 1 13:15:49 2022 +0200 + + contrib: glew: don't force GLEW_USE_STATIC_LIBS + + It's used to set the library prefix between glew (dynamic) and glew_s (static). + But only the static target (glew_s) is selected in our environment. It will + pick the proper prefix on its own. It's not even a public option to set. + + (cherry picked from commit bf1793ee250f958488da820bb34c89832eefbcc0) + +commit bead67a35b78ad69996d9bfaab111de38c95592a +Author: Steve Lhomme +Date: Wed Aug 31 09:28:00 2022 +0200 + + contribs: don't force libraries to be build statically locally + + The CMAKE variable already sets it for all targets. + + (cherry picked from commit 49ff728d48005aac6d87ecfb8f8114fe07dedd51) (edited) + edited: + - 3.0 some contribs don't exist (glslang, libebur128) + +commit fffb78c381eaa19417db982040224757dff8bd29 +Author: Steve Lhomme +Date: Thu Sep 1 06:41:10 2022 +0200 + + contrib: use internal CONF variables for the project configurations + + This is how it's done for autotools target and some cmake targets. It makes + long lines a little better to read. + + (cherry picked from commit 780b04d35d3c2618c0d63b26a500ae7d2066b845) (edited) + edited: + - 3.0 some contribs don't exist (glslang, libebur128) + - on 3.0 soxr uses -Wno-dev + - on 3.0 projectM uses -DCMAKE_CXX_STANDARD=98 + +commit ffb160a0b2db096a1d0f667ec0d14d0c64cb7f10 +Author: Steve Lhomme +Date: Thu Sep 1 13:01:42 2022 +0200 + + contrib: projectM: remove unused cmake include options + + These options don't exist. The others are set to non default values. + + (cherry picked from commit 9ac24e74962957018472b788ed4c0751e358b913) (rebased) + rebased: + - on 3.0 projectM uses -DCMAKE_CXX_STANDARD=98 + +commit ada3105d0a18b059d6086d3812d5dc287f662bc0 +Author: Steve Lhomme +Date: Tue Sep 13 09:44:39 2022 +0200 + + contrib: projectM: install extra depended on libraries via CMake + + rather than manually. + + (cherry picked from commit 7017b973de2e8d0e40ad362312fa74cdeffb524f) (rebased) + rebased: + - 3.0 does't have PROJECTM_CONF + +commit 972ee3915c66989051fb7dca0be8128b08359e45 +Author: Steve Lhomme +Date: Thu Sep 1 14:49:57 2022 +0200 + + contrib: soxr: remove default cmake option values + + (cherry picked from commit 375d5a48e501a0d95118cb3a90bc28fa3b432d06) + +commit f1bf9e2afa22441182c6e891b14a2122eefdc57b +Author: Steve Lhomme +Date: Thu Sep 1 15:01:25 2022 +0200 + + contrib: srt: don't set default GNU folders + + We do force CMAKE_INSTALL_LIBDIR which makes srt not use any other of the GNU + directories... + + Merged upstream: https://github.com/Haivision/srt/pull/2450 + + (cherry picked from commit 055841ec129641f5e121f883c5746ff03ccc6d1e) + +commit 929bdda5d7b41e54e22853a31cf87bb8a4057971 +Author: Steve Lhomme +Date: Fri Sep 2 12:41:37 2022 +0200 + + contrib: srt: replace MSG_TRUNC with upstream fix + + It can be removed once we update to the next release. + + The previous patch potentially hides an error handling. + + (cherry picked from commit 183ecb2eb3e1c516d8b64b54f8a11b34f6f60478) + +commit 82d0523e5a1fa2c9685c9d7351dfd06ff22e62b9 +Author: Steve Lhomme +Date: Thu Sep 1 14:58:46 2022 +0200 + + contrib: srt: use the recommended USE_ENCLIB to select gnutls + + (cherry picked from commit 60b079bb97903b50efa2cc422768dd625237fc3e) + +commit bd488ed08e0528481958204cc5ecdfda961bb628 +Author: Hugo Beauzée-Luyssen +Date: Thu Feb 17 16:36:33 2022 +0100 + + contrib: main.mak: Work around GNU Make bug + + (cherry picked from commit 94415f30fa7771c2516a318c0ca78210c11b87ac) (rebased) + rebased: + - the code around is slightly different + +commit 4b8cce48debba6a8a69331ba2d323cab0b60f251 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:23:28 2022 +0100 + + contrib: aom: Allow make to communicate with jobserver + + (cherry picked from commit 8c3d39bfbb93f76403ac78080b9741b1420cd934) + +commit 78b8d730dd689efdfb5b947201fc5458d98ca0bd +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:32:41 2022 +0100 + + contrib: taglib: Allow make to communicate with jobserver + + (cherry picked from commit f941c3ca6d051cfe0b8f95b2caba1cad2a3c17e7) + +commit 5ee4c35a863f07c83db47c55587b0911090dea92 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:31:05 2022 +0100 + + contrib: matroska: Allow make to communicate with jobserver + + (cherry picked from commit c8c5541cc1090b69027d37b15a05e544d74c5886) + +commit e929828f647e414101ec44e24cdfc46877faa337 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:30:00 2022 +0100 + + contrib: fluidlite: Allow make to communicate with jobserver + + (cherry picked from commit 2f71ade47af315498d7e93c2f0425f338bfa62a8) (rebased) + rebased: + - 3.0 already has FLUIDLITE_CONF + +commit 6f3e064e26d3b65034817e340a7d508c2e386107 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:24:57 2022 +0100 + + contrib: fluid: Allow make to communicate with jobserver + + (cherry picked from commit 96b9ffec876b2cfb81b87726afbfcf854cade095) + +commit 979ba6fa6360c5db2ba14dfb2f9ab27a7fe05c83 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:24:40 2022 +0100 + + contrib: chromaprint: Allow make to communicate with jobserver + + (cherry picked from commit 140cd0a387f870bf461310be2da17a192c5cfb4a) + +commit d937c2d3d86506150963a32ba1664d87b0157ab2 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:24:45 2022 +0100 + + contrib: ebml: Allow make to communicate with jobserver + + (cherry picked from commit 0d97ee8a13965684b960e17c19050e50b6f14f60) + +commit 8e2e32b0359be89adac8c91f77c1887f8892b25e +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:30:10 2022 +0100 + + contrib: glew: Allow make to communicate with jobserver + + (cherry picked from commit a1405bc989547a4a676ab53fbdd378ee59cd7086) + +commit 9e2e46348fcedf73b37ded72c5197be176a63ec1 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:31:41 2022 +0100 + + contrib: mpcdec: Allow make to communicate with jobserver + + (cherry picked from commit 6cf7db55b0499b1bb10384eff226b17d71cfc05e) + +commit a9dc792bc4b265467ca611b5f5c48674fe7696c9 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:31:50 2022 +0100 + + contrib: mysofa: Allow make to communicate with jobserver + + (cherry picked from commit 83893fd0f3123b2ff006b82a3715c2d9f589bbb4) + +commit 4f00b920eed7ea4dbc5a4076d6241831255cc466 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:31:59 2022 +0100 + + contrib: openjpeg: Allow make to communicate with jobserver + + (cherry picked from commit 69f5556704ab2562c102a6faeba06c3bf628cec5) + +commit b2048bef4dd01a24776e2a134fab666204ac282f +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:32:07 2022 +0100 + + contrib: projectM: Allow make to communicate with jobserver + + (cherry picked from commit 7c5abbf37037e289894db4ba522ffe03a7d93a3b) + +commit c33775c4558491140ca5df7ea47544c1df3e25c2 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:32:18 2022 +0100 + + contrib: soxr: Allow make to communicate with jobserver + + (cherry picked from commit a29d55b19e89e4e7c0a8960e75c51abd926fe691) + +commit 31daf263b9c5a4dffb8441e2c4a1a009a012e335 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:32:25 2022 +0100 + + contrib: spatialaudio: Allow make to communicate with jobserver + + (cherry picked from commit 89954b5a9a41b634e39c87af1fec1fbb3c5ff090) + +commit 6fe74ca848cc6cb91b23062d875d46c639c0f2aa +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:32:34 2022 +0100 + + contrib: src: Allow make to communicate with jobserver + + (cherry picked from commit ed5fd4176879f80d035cb578ad134d1cef31ee9e) (rebased) + rebased: + - 3.0 doesn't have CFLAGS/CXXFLAGS for srt + +commit 5fd083438e1dea4ea8f04a73f6994ee98c23f3b8 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 10:32:49 2022 +0100 + + contrib: x265: Allow make to communicate with jobserver + + (cherry picked from commit 2277fd97a409d494f7186d4070b82b0ebcc55625) + +commit 998349900801de04cbf505f540eb05c66caac01a +Author: Zhao Zhili +Date: Wed Nov 4 20:12:49 2020 +0800 + + contrib: support CMAKE_GENERATOR other than makefile + + First, fix the conflict setting/using of CMAKE_GENERATOR. Second, + call build via cmake instead of run make directly. + + Signed-off-by: Alexandre Janniaux + (cherry picked from commit c74a77e7eba252d0e126e71b59910fc9507ba9ed) (edited) + edited: + - only use the patch for glew that is now built with CMake + +commit 220091ac9ac10dd796cf548ec67a89e76e27c534 +Author: Steve Lhomme +Date: Thu Sep 15 13:03:20 2022 +0200 + + contrib: mad: remove forced -O3 + + This shouldn't be enforced. We already use -O2 on release builds. + + -O4 was removed in 8d09802392b674ea6ae7993c20e6f725b0d7a86c + -O3 was added with the contrib in 9c0b836a35bced0ede45054b85640694f54faeaa + + (cherry picked from commit 6240c4cea4bdbeab9422378f90eaddf7116b8952) + +commit 8d215010ba60ef18d17e05a6a1e9179dddde4821 +Author: Steve Lhomme +Date: Fri May 25 16:57:38 2018 +0200 + + contrib: mad: pass the extra flags via a single variable + + (cherry picked from commit 405c8b41858af8f7425b61f2e9967a8db297f43f) + +commit 7a1352aca239940ea30d023985874bc7179bbd31 +Author: Steve Lhomme +Date: Tue Mar 24 15:20:50 2020 +0100 + + contrib: protobuf: only build for C++ support + + (cherry picked from commit 75dc8ba56b8732a2622002631c353835bd154147) (edited) + edited: + - 3.0 build protoc separately + +commit d33b3b80eae11823d1aaf9c69e3123374f70bbb0 +Author: Konstantin Pavlov +Date: Sun Oct 27 06:34:24 2019 +0300 + + contrib: glew: drop debug postfix from the library name + + With 4d57652c407d4a75e0b36f4e1fbc438def3b5c2e the Cmake BUILD_TYPE is + set to Debug when optimizations are disabled, which is then used by glew + to determine the resulting library name. + + This in turn confuses our build of projectM, which uses glew32 as a name + to use when linking. + + (cherry picked from commit 31d47ca70e4b8c412eab440b2212bdc6aefdea03) + +commit d6edc329c88e57d7e9ee6963a3e7faf20be0447e +Author: Alexandre Janniaux +Date: Mon Jul 22 17:21:03 2019 +0200 + + contrib: chromaprint: remove dependency on .ffmpeg + + This dependency is already setup by the dependency propagation at + the end of the main.mak makefile. + + Signed-off-by: Steve Lhomme + (cherry picked from commit bda34233393d36d085963a7147f887612c337f7d) (rebased) + rebased: + - DBUILD_SHARED_LIBS:BOOL=OFF is not used on 3.0 + +commit f404827b19dc2eba52baf2427030ceef1771313e +Author: Hugo Beauzée-Luyssen +Date: Wed Mar 6 11:55:33 2019 +0100 + + contribs: src: Fix glew tarball name + + sourceforge accepted .tar.gz but was redirecting to .tgz + Our mirrors have .tgz + + (cherry picked from commit 3bf912cc7366ddfd1b8bba4e0998f8a28c3dd537) + +commit b2f26c8d73c22b5231df2cd3daa3ea10d0170335 +Author: Steve Lhomme +Date: Fri Jan 25 12:19:14 2019 +0100 + + contrib: glew: update to 2.1.0 + + And build using cmake rather their manually edited makefiles + + (cherry picked from commit d44e8c06423fc7fb255337bc39de268dc98f470c) (edited) + edited: + - 3.0 had GLEW_DEST=$(PREFIX) on the MAKE like + +commit 56e2cea3f0e163c436d82a8b6e1f8e7192ead09e +Author: Steve Lhomme +Date: Fri May 25 08:55:29 2018 +0200 + + contrib: turn the verbose mode of CMake when called with make V=1 + + So that we get a similar level of verbosity as the make based targets + + (cherry picked from commit 5389c05bb639fb8e3457c663b26f5ba0981bd59a) (rebased) + rebased: + - 4.0 has MESON defined above + +commit 74deed0afe9b5002aa2a40b2849a14def4677727 +Author: Steve Lhomme +Date: Thu May 24 16:45:26 2018 +0200 + + contrib: gpg-error: group the configure flags in a variable + + (cherry picked from commit 498619b876398ce2ff4c4dc3abfef4ab515e7e52) + +commit feb960f232add2a17e146da65bc06108e9f22724 +Author: Steve Lhomme +Date: Wed May 16 13:45:49 2018 +0200 + + contrib: vncclient: build without pthread on windows + + That's how the buildbot does it + + (cherry picked from commit 660de93940fa497d86b27f34f46fd34a6fe2a97a) (rebased) + rebased: + - the code around is slightly different + +commit e38fa342be7494b31bb722a8544b6656b04c4ae0 +Author: Steve Lhomme +Date: Mon May 14 08:48:20 2018 +0200 + + contrib: libarchive: use a local variable to store the configuration + + (cherry picked from commit 0b609afa656c561050077ec05233815e42ce3dbb) + +commit f7ba35f7eb525878f5208d252cbcccfe3d6ad1b8 +Author: Steve Lhomme +Date: Thu Oct 3 12:41:21 2024 +0200 + + extras: snap: build all tools in one call, including cmake + +commit 1743b53b4879b634491b2458faf217426134f5aa +Author: Steve Lhomme +Date: Thu Oct 3 11:26:31 2024 +0200 + + contrib: aom: remove redundant mkdir + +commit 7b8f075537a4cdebefd39fae193eb8bc131dd8b5 +Author: Steve Lhomme +Date: Thu Oct 3 14:06:24 2024 +0200 + + contrib: remove unused sqlite + + It's not built by default. + It doesn't seem to be force built by libvlcjni or medialibrary either. + +commit 2f6a50828b03da47ef05fb40340034010ecd191d +Author: Steve Lhomme +Date: Wed Sep 25 13:56:47 2024 +0200 + + video_output: allow the AMD FRC filter as a static filter + + "Interactive" filters can only do one output per input. + Only "static" filters are allowed to generate more frames, like the deinterlacers. + + There is no way at this point to probe the module that will be used + if it will output many frames or not. And even if it could the order of + filters would need to be respected. We cannot dynamically add filters + on one chain or the other. + + (cherry picked from commit b3379d35c9794b93f1558c06852174145c48da39) + +commit 585f2c88ac15e455014052992ee58d2ca6e0f18c +Author: Steve Lhomme +Date: Fri Aug 9 07:48:43 2024 +0200 + + video_filter: add AMD FRC filter + + (cherry picked from commit 44833103120be4b98d8869a4fe5f3a68eb0442c2) (edited) + edited: + - on 3.0 the D3D11 filters are in a single DLL + - on 3.0 add_bool has an extra parameter + - on 3.0 the output pictures come from filter_NewPicture() + - on 3.0 there is no vlc_filter_operations + - on 3.0 there is no video context + - on 3.0 there is no vlc_picture_chain_AppendChain() + +commit ceaddfac54bcb0dbcd4b1e80e691eaacf750220a +Author: Steve Lhomme +Date: Fri Aug 9 07:48:18 2024 +0200 + + configure: detect AMD FRC.h + + (cherry picked from commit c2256ac9717eba469479fd6052db2286fc45d0ae) (edited) + edited: + - add a define to be able to conditionally use the code. + +commit d73f972fd1cceef358c4d860a35f8f74ab262019 +Author: Steve Lhomme +Date: Wed Sep 25 11:37:02 2024 +0200 + + hw/amf: let the AMF system know what version was used to compile + + With future drivers and old binaries it may trigger different code + pathes than the latest version. + + (cherry picked from commit e1c9c361849e6042185d123ab559d14fa7d7e8e3) + +commit e3ebd51aad0439d4ed3cf390ceecb29f8d20bc22 +Author: Steve Lhomme +Date: Fri Aug 9 07:22:40 2024 +0200 + + contrib: amf: update to 1.4.34 + + It now comes with a nicer header-only package. + + (cherry picked from commit fb18df85ca73deffe66bb83a06fd09bb9de4b09d) + +commit e2be4359a22ced0a765f991449d290cf9d57586d +Author: Sean McGovern +Date: Thu Sep 14 15:14:25 2023 -0400 + + contrib/amf: remove old SHA512SUMS entry + + (cherry picked from commit 7d1e89fc10f1758a40062c92c6658fb54ea411b6) + +commit 27ff7bd53a2b7f5ef8402b9a98a0bf05e3843eb6 +Author: Steve Lhomme +Date: Tue Oct 1 08:36:17 2024 +0200 + + d3d11_fmt: use CheckInterfaceSupport() to get the driver version + + It works well with WDDM 2.3 and above. Otherwise we fallback to the old + way. + + (cherry picked from commit d48871ba62dbdd2c0be59195d2f91d3e31ba6523) (edited) + edited: + - on 3.0 we use C + - on 3.0 the call is done outside of the adapter setup + +commit 9b7b520e0f09404006ced5e19db047d3fe7e5194 +Author: Steve Lhomme +Date: Tue Oct 1 08:33:26 2024 +0200 + + d3d11: read the adapter description when reading the driver version + + So we have all the information about the adapter. + +commit f94f0a5f979668fee7b0d2e8bb9cc89152135eac +Author: Francois Cartegnie +Date: Thu Jun 1 17:44:52 2023 +0700 + + stream_extractor: set correct offset on read failure + + (cherry picked from commit 9f160402e3ea835f1d242e8ca5af89c57a3a2583) + +commit 5da01cd098b4950be2fd9a938c84715731cfdb24 +Author: Steve Lhomme +Date: Wed Jan 4 14:51:51 2023 +0100 + + archive: fix the type used for libarchive_skip_cb + + It is not using off_t. + + (cherry picked from commit 5da9f85b186a69e5b64d83470b32b7fd19dbf943) + +commit 64888ed19574915b4789e87ab4a3f1620c3ca8de +Author: Johan Gunnarsson +Date: Sun Nov 3 00:23:00 2019 +0100 + + archive: Add support for RAR 5.0 format + + libarchive 3.4.0 adds support for RAR 5.0. See + https://www.rarlab.com/technote.htm#rarsign for description of signatures. + + Signed-off-by: Jean-Baptiste Kempf + (cherry picked from commit 059f6f5690005853f3e3160f5f896301b2f52ecd) + +commit 47e6c1b726b22afb53a0762506864650ca1a2d33 +Author: Steve Lhomme +Date: Tue Sep 3 09:07:14 2024 +0200 + + hw/amf: keep the AMF version in the context + + For FRC we may need to disable it before 1.4.34. + + (cherry picked from commit de748458776f58f150edc06a4b9cac8c961dac20) + +commit 8d11bb2fafceab82b76b2935ad92462b1b5f1e07 +Author: Steve Lhomme +Date: Tue Sep 3 10:27:59 2024 +0200 + + video_filter: disable VQ Enhancer for other GPU manufacturers + + InitDX11 crashes if the filter is enabled but an incompatible GPU is used. + + (cherry picked from commit 49381f476eda197962d1164133cc7021a0adb52d) (edited) + edited: + - on 3.0 we need to get the D3D device via D3D11_FilterHoldInstance() + +commit f0703a7162b14e178d745b64157ea932cb61a491 +Author: Steve Lhomme +Date: Thu Sep 19 10:30:06 2024 +0200 + + demux: mkv: handle mkv-use-chapter-codec option + + For safety reasons some users may not want to handle any chapter codec. + The option was added 8697e6ef99ef0cec90bcf515052e5de1c09601ce but + never implemented. + + (cherry picked from commit 4b479fb554cf1474fc549334459512b0b096dbcc) + +commit 6536cb798328111ff48c0311716e8cf3d78b8a7a +Author: Steve Lhomme +Date: Mon Aug 5 11:04:09 2024 +0200 + + demux: mkv: write the actual extra data size in the ALAC extradata + + This is what avcodec/audio expects when detecting the extradata. + + See InitDecoderConfig() + + (cherry picked from commit d2265e981fa19a9f5f1299e968348ed3ca98ee60) + +commit e7e39457be9ae9d77c60676903bb9bd4de564139 +Author: Steve Lhomme +Date: Mon Aug 5 10:58:29 2024 +0200 + + demux: mkv: fix link to ALAC documentation + + The 36 is the 12 bytes we write plus 24 bytes from ALACSpecificConfig. + + Also avoid subtracting 12 from a variable were we added 12 (our header). + + (cherry picked from commit d71ed1c6f081fba9e6e7ec4339734fc270ba0d64) + +commit 33e838f0260591fedcc55776121eba03026d9b9e +Author: Steve Lhomme +Date: Wed Sep 18 12:57:04 2024 +0200 + + lua: don't use | operator on VLC errors + + This could end up with unknown/invalid error values. + + (cherry picked from commit 586b28f4aab1f936d666bd3dab7904793c3012d7) + +commit 720c55a08c1f4fe18114040bf9bc7fde32eb12c2 +Author: Martin Storsjö +Date: Wed Sep 18 00:12:47 2024 +0300 + + directx_va: Fix building with latest mingw-w64 from git + + Since mingw-w64 20331109d1c90c19a510408ab119a76004bc41ea + (September 17th), mingw-w64 headers do provide these GUIDs. + (They come from Wine as upstream, from Wine commit + 6dfb84f5cbdf30c1dc0775fd4dae821ee8705ad4 from September 10th.) + + This change does break building with older mingw-w64 13 git + snapshots though. + + This is the same fix as in c81cb6fb980c51fffdd2567dfc7ff6ddcccdf814 + in the VLC 4.x branch, but adapted to the state of the source + in 3.0.x. + +commit 5ee481afa798f281304754b001572dfe5dc0078e +Author: Vikram Kangotra +Date: Sat Feb 3 02:52:52 2024 +0530 + + Taglib: Use ID3v2Tag() instead of tag() for RIFF::WAV::File + + `WriteMetaToId3v2` expects a `ID3v2::Tag` instead of `Tag`, but Since TagLib v2.0, + `RIFF::WAV::File::tag()` returns a `Tag` instead of `ID3v2::Tag`, hence replace + the usage of `tag()` method with `ID3v2Tag()`. + + https://github.com/taglib/taglib/blob/master/taglib/riff/wav/wavfile.h#L124 + + Additionally, to resolve the compilation error, the function signatures of + `insert` and `removeBlock` have been adjusted to align with the base class + functions. + + (cherry picked from commit ec29dfca1e59530dd412d779e0b045079b72ffb6) + +commit e69ef263f369dcfc86bb6d8757250a43665de90b +Author: Steve Lhomme +Date: Mon Jul 3 10:00:39 2023 +0200 + + contrib: Bump taglib to 1.13.1 + + Changelog: https://github.com/taglib/taglib/releases/tag/v1.13.1 + (cherry picked from commit c7cceca69ba1fc96fc6d29d9750c6dcfb4ef44aa) + +commit 6da0cba608256bfa0a037670885d12e80ea8761f +Author: Johannes Kauffmann +Date: Sat Jun 3 17:35:09 2023 +0200 + + taglib: remove VLC path define check + + It is no longer needed with contribs taglib updated to 1.13. + + (cherry picked from commit c5851fd495ed6de1d3712e64a2b1cc1e4e9059f4) + +commit 78af081da100958c8fa66a2e5eaeda7b8364530f +Author: Johannes Kauffmann +Date: Wed May 31 23:58:44 2023 +0200 + + contrib: taglib: update to 1.13 + + (cherry picked from commit 436526ec6a05aa3acb75d888b4baaa649cf8b87d) (rebased) + +commit 97f309a711fdd0095712e4198ec0c59429e1772a +Author: Hugo Beauzée-Luyssen +Date: Mon Feb 28 08:25:48 2022 +0100 + + contrib: taglib: Update patch from upstream + + This is the version that was merged upstream so it makes sense to use it + to facilitate future rebases + upstream PR: https://github.com/taglib/taglib/pull/1040 + + (cherry picked from commit c5893a223668fd9d0085c03998ceb9055a7ccede) + +commit 651da62cd4e5dd3feb08900220156edf464e6c55 +Author: Steve Lhomme +Date: Wed Jan 4 15:24:47 2023 +0100 + + taglib: don't cast the file st_size to a possibly smaller type + + We can just use auto and always get the proper type. + + (cherry picked from commit 7413126744e0b494856ba9acc5ae3c27ce4af625) + +commit 286d843d45d1616d6e7c10fcf71ab51008f6e516 +Author: Marvin Scholz +Date: Mon Apr 11 23:21:25 2022 +0200 + + meta: taglib: use std::min + + (cherry picked from commit 584fd17a9445d8d5f7d692b7416eec09b9240b0e) + +commit 01c9003d74e2f08b03c487b3d904bacb67e569cb +Author: Hugo Beauzée-Luyssen +Date: Fri Feb 18 08:26:41 2022 +0100 + + taglib: Fix invalid version check + + (cherry picked from commit 53260ca5ae906f1e35791d14e4b588d25c04e51b) + +commit ba8583858d36a3555ac5fe154e6ea524aa1d1157 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 9 14:18:11 2022 +0100 + + taglib: Use nullptr instead of 0 for pointers + + (cherry picked from commit 89e20ea0d87f414f763ce38ff5579aec61f71b42) + +commit 6a14f299495dec75174f043e9ea796fc43e6bd71 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 9 14:14:08 2022 +0100 + + taglib: Implement new StreamTypeResolver interface when available + + refs #26602 + + (cherry picked from commit 268b5b8bc1f1109c4fc69b22e53095c6d81faa76) (rebased) + +commit d226e0c694fdb8d8af0efdb45a5cdaeb41da2ad4 +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 9 14:12:14 2022 +0100 + + contrib: taglib: Fix custom resolvers with IOStream + + upstreamed at: https://github.com/taglib/taglib/pull/1040 + Fix #26602 + + (cherry picked from commit 2f82d6b9280c8e56b1ad7247ea9ffbe2a4df95a4) + +commit 7b2f1d3513683b26a8a4bf5ac81c38baf7d3b3da +Author: Hugo Beauzée-Luyssen +Date: Wed Feb 16 09:52:38 2022 +0100 + + taglib: Remove explicit invocation of default constructor + + This is already done implicitly + + (cherry picked from commit 93842f650548d6f29ec13cf0679bf49cf5ce107c) + +commit 230edbcc47abd744714ef57d4be486779c02c298 +Author: Hugo Beauzée-Luyssen +Date: Fri Nov 26 18:19:41 2021 +0100 + + taglib: Remove use of deprecated String::isNull + + (cherry picked from commit c404fdb24183031a419667639846edddca3401f8) (edited) + edited: + - 294cbdbaee0209bc88ca7bec9164da8da4ac44ef was merged before this patch + +commit 72446e872e4cbb7b59042671b7654f36b2262e82 +Author: Hugo Beauzée-Luyssen +Date: Fri Nov 26 18:17:19 2021 +0100 + + taglib: Remove usages of deprecated itemListMap + + contains() was added in 1.10 and item() is supported since 1.9 + + (cherry picked from commit ac59d0ba59ba800c52c0a92ec1d9576d2653dbe2) + +commit 7c09325e252c9f60da98c8522aea8114ccb3dd2c +Author: Hugo Beauzée-Luyssen +Date: Fri Nov 26 18:08:47 2021 +0100 + + taglib: ByteVector::null is now deprecated + + (cherry picked from commit d2663d6c3fe3af76bdefd58367b4a45c598b83e4) + +commit fc401e9b1a2026898d39ae1abe4f8f574e8df40c +Author: Hugo Beauzée-Luyssen +Date: Mon Sep 13 12:08:53 2021 +0200 + + taglib: Don't convert base64 strings to UTF8 + + The convertion will incur a cost which we don't want to pay since the + art needs to be encoded in base64, which doesn't include anything + outside of ASCII + + (cherry picked from commit 65dfe0cdc97bbb98ad34a690989636d40f326e32) + +commit e60dd2df9dac0d799af6af0843889ba0e24816fc +Author: Steve Lhomme +Date: Fri Jun 25 13:09:14 2021 +0200 + + taglib: fix variable shadowing + + list is already a different local list defined earlier in the function. + + (cherry picked from commit 34ca2a286edda76a9718cfa1e50bd3e4ea51702c) + +commit f036afb7368a124cb1092a5e759de25041a3733c +Author: François Cartegnie +Date: Wed Sep 2 16:53:13 2020 +0200 + + meta: taglib: reject non expected schemes + + refs #25035 + + (cherry picked from commit 8191ac5727a3525a6bee99e1674167a7894f9ccb) (rebased) + rebased: + - 3.0 already has a26e2ba370d898dda04c718176af7d2e329dab7a above + +commit 88e4dc19cde62602d09f3f3d1dd45260d0aed746 +Author: François Cartegnie +Date: Mon Aug 10 14:55:02 2020 +0200 + + meta_engine: taglib: restrict unlimited reads on streams + + taglib reads unlimited if no IDv3 or MPEG header is found at the + beginning. + + (cherry picked from commit 8ec8b0d2add84b6d6b0c043e1c4f241998915ecd) (rebased) + rebased: + - only used with Taglib 1.11+ which is not always the case with 3.0 + +commit 625675cd48883bfe39f1a16c282000db1773fece +Author: François Cartegnie +Date: Mon Aug 10 14:52:11 2020 +0200 + + meta_engine: taglib: add sequential read limit on VlcIostream + + (cherry picked from commit d375284a144e6b18896deda3a86b9560bc04f3d8) (rebased) + rebased: + - 3.0 already has 1.11 ifdef + +commit 00cbfccec9d73d5459e6a76807e44bdcf0c3605d +Author: François Cartegnie +Date: Mon Aug 10 14:38:00 2020 +0200 + + meta_engine: taglib: reject read on failed seek + + (cherry picked from commit 837b583e4e4e531ff8b11f13300c7cbc565beb9f) (rebased) + rebased: + - 3.0 already has 1.11 ifdef + +commit 3a4b557af5e268766282ff5cfc58718712913c9b +Author: François Cartegnie +Date: Mon Aug 10 14:32:32 2020 +0200 + + meta_engine: taglib: increment VlcIostream readpos + + (cherry picked from commit 0cbcf504b43a02ddb7ecc1c65c0c1e82f39b4f1c) + +commit 88149ff4b8a3869d4912752049e87f673123a9bc +Author: Hugo Beauzée-Luyssen +Date: Mon Nov 22 12:10:17 2021 +0100 + + contrib: Bump taglib to 1.12 + + fix #26309 + + (cherry picked from commit c651b10d33dc0fb7b9670208f93f94f850ba8ca4) (edited) + edited: + - only contains the patches to 0001-Implement-ID3v2-readStyle-avoid-worst-case.patch + which were not properly backported in 1353e52693d8deb4e629e153d9c73d7dc69afc13 + +commit 630b2f6879b994456cf5b50136de13f57870daa6 +Author: François Cartegnie +Date: Tue Aug 11 13:04:41 2020 +0200 + + contribs: patch taglib to avoid full/infinite streams read + + (cherry picked from commit 3257bb4a84e60fd60e83ba7c938485e71ba12188) (rebased) + rebased: + - 3.0 already switched to 1.12 with less patches + +commit 3720cf2c475096f6f24773b51cd7b7bb7bc2c4f7 +Author: Alexandre Janniaux +Date: Fri Feb 7 23:50:00 2020 +0100 + + taglib: fix -Wdeprecated-copy warnings + + Warnings were happening because we were using copy operator= as the + assigned object was already initialized. This patch use the copy + constructor or move constructor instead if available. + + Those warnings were: + + ../../modules/meta_engine/taglib.cpp: In function ‘void ReadMetaFromXiph(TagLib::Ogg::XiphComment*, demux_meta_t*, vlc_meta_t*)’: + ../../modules/meta_engine/taglib.cpp:672:39: warning: implicitly-declared ‘TagLib::StringList& TagLib::StringList::operator=(const TagLib::StringList&)’ is deprecated [-Wdeprecated-copy] + 672 | list = tag->fieldListMap()[keyName]; \ + | ^ + ../../modules/meta_engine/taglib.cpp:681:5: note: in expansion of macro ‘SET’ + 681 | SET( "COPYRIGHT", Copyright ); + | ^~~ + In file included from /usr/include/taglib/fileref.h:30, + from ../../modules/meta_engine/taglib.cpp:58: + /usr/include/taglib/tstringlist.h:59:5: note: because ‘TagLib::StringList’ has user-provided ‘TagLib::StringList::StringList(const TagLib::StringList&)’ + 59 | StringList(const StringList &l); + | ^~~~~~~~~~ + + Signed-off-by: Jean-Baptiste Kempf + (cherry picked from commit be4f907a0e834c10277b8217520f745238da1c13) + +commit c2ca6c3036d2dea3860870482bbb78f26ed03e62 +Author: Hugo Beauzée-Luyssen +Date: Tue Oct 8 17:21:20 2019 +0200 + + taglib: Enable prefetch/cache on the IOStream + + We can't do it through vlc_stream_NewURL as it will include the + skiptags filter + + (cherry picked from commit 976cd219465a72daa02d22e60c9ac4c704c0b18b) + +commit df406faf9c786acb51cc96878ef0a22fb3a0b238 +Author: Steve Lhomme +Date: Mon Sep 16 13:21:17 2024 +0200 + + taglib: Always use IOStream to read the media + + (cherry picked from commit 4bc7607f31f80264b5e61fbd187f2f8d2f3bb604) (edited) + edited: + - keep the support for taglib older than 1.11 which doesn't have the + proper FileRef constructor to use it + - the aacresolver is only called for Taglib 1.11+ on 3.0 + - 4.0 doesn't make a difference for UWP or regular Windows + +commit db09e821f9d8d0c48e8d3eb22a9f1087c3407e4b +Author: Hugo Beauzée-Luyssen +Date: Mon Mar 18 15:09:39 2019 +0100 + + taglib: IOStream: Return the url as fileName + + Since the only part that matters to taglib is the filename, and more + specifically the extension part. + + (cherry picked from commit 026a76066efa78f1934ab2c177669a2e6a519cff) + +commit 09b558dd07d47678c3dfa1417a0bb359c51ed08e +Author: François Cartegnie +Date: Mon Aug 5 15:24:45 2019 +0200 + + modules: taglib: simplify reading embedded art + + (cherry picked from commit 3533f90eb44398abe6cff1b14ece757654449acf) (rebased) + rebased: + - 294cbdbaee0209bc88ca7bec9164da8da4ac44ef has been merged above + +commit 109d2ac2be66b39df1a0b0d5e5b7316c87408a95 +Author: Hugo Beauzée-Luyssen +Date: Thu Feb 7 17:58:11 2019 +0100 + + taglib: .m4v are already registered as MP4 files + + https://github.com/taglib/taglib/pull/662 + (cherry picked from commit 84962e474bfefa242527f7c3ddffe6ed4f697fbe) (rebased) + +commit 1f265fe0b460300d0ffebb261246a971c41dd45e +Author: Tristan Matthews +Date: Mon Sep 9 17:27:24 2024 -0400 + + aom: make BGR matching stricter + + This is equivalent to the fix in ece317a245e8c32a5efc11d5e82dcd8a28a2f10b + as the aom decoder had the same issue reported in #28776. + + (cherry picked from commit 0001e85a098ee4e6e2526eaec8a76899c2b23b90) + +commit 9682584bec494ba5f4b3fea002bfaeee9780e384 +Author: Thomas Guillem +Date: Wed Sep 11 08:16:36 2024 +0200 + + packetizer: dts: check for frame_size for the first sync + + Only substreams are allowed to have a frame_size of 0. + + (cherry picked from commit 16b31aa57e3919dbe661c213868dee4b8bc1e3bd) + Signed-off-by: Thomas Guillem + +commit da002b53302c5eb20dde954c4d707df4dfdd7df1 +Author: Thomas Guillem +Date: Wed Sep 11 08:15:52 2024 +0200 + + dts_header: initialize SUBSTREAM_LBR size to 0 + + It's a substream and can't work alone, so a size of 0 is legitimate. + + Fixes #28773 (Use of uninitialised value) + + (cherry picked from commit b23f09b258dc63c2221af502ec856630f68817e5) + Signed-off-by: Thomas Guillem + +commit 0490fe5396ed6eb3a731d40f9fd2af5b07cc220f +Author: Tristan Matthews +Date: Thu Sep 5 10:21:11 2024 -0400 + + dav1d: add dav1d-all-layers flag + + This will output all spatial layers if requested, defaults to false (the built-in dav1d + behavior would defaults this to true). + + Fix suggested-by Maryla Ustarroz + + Fixes #28776 + + (cherry picked from commit 6ffede3f445586e5d368de936666cabb84f6a16f) + +commit 2a9a547142db54cd3f5af6fa9caafc87ba06f66a +Author: Steve Lhomme +Date: Mon Jun 27 14:13:26 2022 +0200 + + compat: add missing errno on Winsock errors + + Some of the error codes [1] correspond to errno values [2] + + [1] https://docs.microsoft.com/en-us/windows/win32/winsock/windows-sockets-error-codes-2 + [2] https://docs.microsoft.com/en-us/cpp/c-runtime-library/errno-constants + + (cherry picked from commit ddcc2cdcff84e6a83a4dfe581fddde6f524877aa) + +commit 4d1a508e6b6736237e6f62f62924b535512fa582 +Author: Tristan Matthews +Date: Sat Aug 31 12:58:27 2024 -0400 + + dav1d: treat RGB formats separately + + This avoids incorrectly matching as GBR. + Fixes #28763 which was missing checks for the matrix and primaries. + + This also replaces the loop with a constant-time lookup. + + (cherry picked from commit ece317a245e8c32a5efc11d5e82dcd8a28a2f10b) + +commit 8462f7960d48a4452608063a921303bf66f3d351 +Author: Mangal Kushwah +Date: Sat Aug 31 16:45:07 2024 +0530 + + Use `vlc_fourcc_GetCodec` to map XVID to MP4V + +commit 1f9ebe0387b0612562d5d8886652b916374ec849 +Author: Mangal Kushwah +Date: Fri Aug 9 19:30:05 2024 +0530 + + codec: videotoolbox: remove sw decoder fallback for mp4v + + commit 7a2bf498d545d500d30636970fa930eb54de5569 insert packetizer for + xvid mpeg4 video, so now hw decoder can decode xvid encoded video + without any playback issues. + + (cherry picked from commit a9343f68bb19a1c20e45e1029848326020b0c69e) + +commit b37da99f5647b9954535869ade835946dae49891 +Author: Mangal Kushwah +Date: Thu Aug 8 21:30:19 2024 +0530 + + demux: AVI insert packetizer for XVID MPEG-4 video + + Older DivX-encoded videos commonly use an method called packed + bitstream which puts several video frames into a single AVI chunk. + Since Packed bitstream isn't standard MPEG-4 it causes playback issues + with some hw decoders. + + (cherry picked from commit 980e4d7449e9e06bef525d9049dff5b9b5ecd673) + +commit b16e559eadbcea539c893b319c360ade4e257d13 +Author: François Cartegnie +Date: Fri Aug 16 11:30:16 2024 +0700 + + demux: asf: add missing subpayloads drain on EOF + + refs #28716 + + (cherry picked from commit 6bf0a1407b5b9aef792ef94a57142254d079e8fd) + +commit 45ecb60b539d8ffd520e58798afd7d2b115f7763 +Author: François Cartegnie +Date: Thu Jun 27 18:24:03 2024 +0700 + + packetizer: hxxx: add missing drain for non annexb content + + (cherry picked from commit 4f0a39ada1bd9314601e80d7f48855462524d1fc) + +commit f661f8f32a070dee2daeb08b9dd1614db25c7618 +Author: François Cartegnie +Date: Thu Jun 27 18:25:07 2024 +0700 + + packetizer: hxxx: pass opaque to callbacks instead of decoder + + (cherry picked from commit 09655dea51c0d383cc86c0f5020e3bea160c69bf) + +commit 4a39d4805b4b3b8e08d91e7d9291210bb2e8de89 +Author: François Cartegnie +Date: Thu Jun 27 15:08:55 2024 +0700 + + packetizer: hxxx_common: rename function pointer + + (cherry picked from commit 6e7b32f64db918b3aa2deefe885571b734d32f53) + +commit 890c81a87124970d0492dbd22ae0c4ef01507824 +Author: Steve Lhomme +Date: Thu Jul 18 09:27:00 2024 +0200 + + opencv: check the image conversion worked + + Otherwise we release the output picture that would have been used and returned. + + (cherry picked from commit 19813291fcfb31ddd91a2e4d0f1d37ad3239d300) (rebased) + rebased: + - p_filter->p_sys is p_sys on 4.0 + Signed-off-by: Steve Lhomme + +commit 341860024cf344d21bb4f21e9016e64273cce110 +Author: Steve Lhomme +Date: Thu Jul 18 09:23:58 2024 +0200 + + magnify: check the image conversion worked + + return NULL on failure as we cannot produce the required output. + + Fixes #28707 + + (cherry picked from commit 990de75bc0a7db5f2c4e4cb88e868b75b689ac7d) (rebased) + rebased: + - picture_CopyPixels is called picture_CopyVisiblePixels on 4.0 + Signed-off-by: Steve Lhomme + +commit 56d0aca2566775ca572c61a725cfbce373cf6d97 +Author: Maxime Even +Date: Mon Jul 8 17:51:14 2024 +0200 + + spectrogram: allows better visualization of low frequencies + + In some cases, Y which represents the height of a column was equal to 1 + and therefore when passed through the log, the output displayed was + zero, by adding this 0.1, this allows you to see a column when y = 1 + without really changing the height of each column + + (cherry picked from commit c347fed91e76bd31387171e1ff67224c21194362) + +commit 6b9617565e9805450abcf1a8b1f6793cc2bf479f +Author: Maxime Even +Date: Mon Jul 8 17:41:39 2024 +0200 + + spectrogram: convert int16 to unsigned for correct range + + p_dest is used to set the height of the column, and it is used + as a variable defined from zero to 2^16 - 1. It is therefore + considered in the rest of the program as an unsigned int 16. + Moreover, the value that we put inside are a sum of two squared + real value, so they are necessarily positive. + + (cherry picked from commit 94a8d152eadd53073305c95d221eca7623b4ed6c) + +commit d63ebcbb55df86ced69e1d4f81fdefee7c123d9f +Author: Maxime Even +Date: Tue Jul 9 13:20:25 2024 +0200 + + spectrogram: fix FFT result scaling factor + + This function is just a scaling operation that passes a value between 0 and + FFT_SCALING_VALUE to a value between 0 and 2^16-1. + + It is therefore a power that must be applied here and not a xor. + + Moreover, the initial formula was quite wrong since it was assuming that the max_input + value, which is a signed int 16, was 2^15 = 32768 where it is in fact 2^15-1=32767. + + Moreover, the initial formula wasn't taking into account that, since the + output of the fft_perform is the sum of two variables which have for max value + (FFT_BUFFER_SIZE / 2 * INT16_MAX)^2, then we need to multiply the final max + value by 2. + + Corrects the following compiler warnings: + visualization/glspectrum.c:528:43: warning: result of ‘2^16’ is 18; did you mean ‘1 << 16’ (65536)? [-Wxor-used-as-pow] + visualization/visual/effects.c:216:40: warning: result of ‘2^16’ is 18; did you mean ‘1 << 16’ (65536)? [-Wxor-used-as-pow] + + Fixes #28506 + + Co-authored-by: Disha Baghel + + (cherry picked from commit 77a08a60f72bda081d144119e4d0a57a9c3c72f6) + +commit b54c0adce71e36f9ae003115b7a87f3ca7122472 +Author: Felix Paul Kühne +Date: Thu Jul 4 06:29:28 2024 +0200 + + UPnP: remove SAT>IP channel list fallback + + When introducing SAT>IP support, we added a fallback mechanism on + officially published channel lists in case the user neither specified + a custom list nor the used set-top box provided one. + + With the end of the SAT>IP Alliance that was dissolved 3 years ago, the + fallback server is no longer available and there will be no replacement + so this feature was removed. + + Fixes #28684 + + (cherry picked from commit 3df7b6e1187030591febd8e1bdd2712c0d6af132) + +commit 7367f53b56011f87069a4529ae7e1baa6a4f2275 +Author: François Cartegnie +Date: Wed Jun 26 16:36:01 2024 +0700 + + demux: adaptive: fix start with indexes only + + refs #28683 + + (cherry picked from commit 9f9c466bc14c1dcd75564c7cd18d031ea9e76325) + +commit f9990a466eb1753c1187ae5d9eb6b158e31aff6e +Author: François Cartegnie +Date: Tue Jul 2 10:31:51 2024 +0200 + + packetizer: h264: fix reading prediction weight tables + + (cherry picked from commit f878115e184a4d896e4df39bccbde32ea6d9357c) + +commit cdc04a5e1e16fcfe3120693ff0fd945ea42a6dae +Author: Hugo Beauzée-Luyssen +Date: Thu Apr 2 10:26:37 2020 +0200 + + npapi: Fix warning during autoreconf + + extras/package/npapi.am:34: warning: ':='-style assignments are not portable + Makefile.am:219: 'extras/package/win32/package.mak' included from here + extras/package/win32/package.mak:13: 'extras/package/npapi.am' included from here + + (cherry picked from commit ac33d9ee07c343cc3bc963a19689aa808f676b31) + Signed-off-by: Steve Lhomme + +commit 34f5c02ae47725965d89625500aa564daee53866 +Author: Steve Lhomme +Date: Wed Jul 3 14:12:17 2024 +0200 + + qt: hardcode the name of the shortcut for the AMD VQ Enhancer + + Otherwise the name is the same of the DLL which doesn't correspond to + the shortcut we need to use. + + Fixes #28691 + +commit 29ac334929847727e4041ba8d1aa3cb36c6be299 +Author: Aleksey Vasenev +Date: Sun Jun 23 22:41:39 2024 +0300 + + sftp: fix seek for large files on 32-bit OS + + (cherry picked from commit 4698e0336447de8dc6f7214743082cc55b6ebd77) + +commit a203e5da7486e3ed6435bd3921d71820398b660b +Author: Alaric Senat +Date: Mon Jun 24 18:11:59 2024 +0200 + + transcode: fix picture fifo leak + + Draining sets the abort flag. It was skipping the picture fifo deletion + before. + +commit 7df61e3ed343027456abdd3d3e0f2b1a1a05c86f +Author: Alaric Senat +Date: Mon Jun 24 18:11:23 2024 +0200 + + transcode: fix destructive assignment after drain + + The drain checks are done after the first encoder output fetch. At this + point, `out` is already filled with some frames gotten from the encoder + some lines above: + + ``` + // ... + if( p_sys->i_threads >= 1 ) + { + /* Pick up any return data the encoder thread wants to output. */ + vlc_mutex_lock( &p_sys->lock_out ); + *out = p_sys->p_buffers; + p_sys->p_buffers = NULL; + vlc_mutex_unlock( &p_sys->lock_out ); + } + + // ... + ``` + + This assignment currently leaks all previously gathered frames to + replace them by the drained output. This patch appends the drained + frames to the existing output instead. + +commit ac310b4b193bd86b741308393aa8d8833a1075ae +Author: Alexandre Janniaux +Date: Fri Jun 21 16:11:28 2024 +0200 + + vlc_common: remove warnings on VLC_OBJECT + + Fix an infinite amount of warnings on Darwin: + + ../../include/vlc_variables.h:563:5: warning: due to lvalue conversion of the controlling expression, association of type 'const struct vlc_common_members' will never be selected because it is qualified [-Wunreachable-code-generic-assoc] + var_Create( p_obj, psz_name, VLC_VAR_STRING | VLC_VAR_DOINHERIT + ^ + ../../include/vlc_variables.h:122:39: note: expanded from macro 'var_Create' + #define var_Create(a,b,c) var_Create( VLC_OBJECT(a), b, c ) + ^ + ../../include/vlc_common.h:481:15: note: expanded from macro 'VLC_OBJECT' + const struct vlc_common_members: (const vlc_object_t *)(&(x)->obj) \ + +commit 1da0715dae1ed259ba719f723023d942f4019434 +Author: Felix Paul Kühne +Date: Wed Jun 19 11:14:40 2024 +0200 + + contrib: update dav1d to 1.4.3 + + 1.4.3 is a very small release focused on security issues: + - AArch64: Fix potential out of bounds access in DotProd H/HV filters + - cli: Prevent buffer over-read + + (cherry picked from commit 900a4290b6ef251eccffadce02abda9bb0df5ad2) + +commit a761e1c202b632e7865d18fcf11a2b9e285ea9ae +Author: Tristan Matthews +Date: Wed Feb 1 23:39:36 2023 -0500 + + opus_header: fix channel mapping family 1 parsing + + Fixes #27808 + + (cherry picked from commit 79fa6af0a98921f9d34933761f4fe20ef6c35309) + +commit dc14756a05b08b1dd1f4e5e1937b89683fee48f5 +Author: Steve Lhomme +Date: Fri Sep 30 13:10:33 2022 +0200 + + contrib: matroska: update to 1.7.0 + + (cherry picked from commit 0b13cf8b2c58f3e99909c426c2186ac5dfff01fe) + Signed-off-by: Steve Lhomme + +commit f3105733322f8135221cb1fff210c8ca450d22f2 +Author: Steve Lhomme +Date: Thu Mar 24 11:20:43 2022 +0100 + + configure: don't pass -gcodeview to the linker + + CFLAGS is added to the linker flags and newer LLVM don't like that. + CPPFLAGS is used during C compilation and C++ but not added to LDFLAGS. + + (cherry picked from commit b700021569c1f16f63c86a9ccd912cfdc7126f41) + Signed-off-by: Steve Lhomme + +commit 41c9458ddd6c3b5cf8787609187daba8ce775d50 +Author: Steve Lhomme +Date: Thu Mar 24 11:59:44 2022 +0100 + + configure: only use -static-libgcc if the C++ compiler accepts it + + newer clang reports that it ignores the command on each C++ file compiled. + In the end the static C++ compiler is used on Windows anyway. + + (cherry picked from commit 8ddd2bdd963fd3ace52e7bf24968238b6cddf80a) + Signed-off-by: Steve Lhomme + +commit 656a0f6dce1dce14d27e4dd03cef0e7778d2e136 +Author: François Cartegnie +Date: Tue Jun 11 17:26:11 2024 +0700 + + demux: avi: do not set up invalid bitsperpixel + + UINT16_MAX is set and propagated from the bitmap header reader + + refs #28661 + +commit b0c75254581e409f9479cee7c08df5346f64176d +Author: Steve Lhomme +Date: Tue Jun 11 12:08:16 2024 +0200 + + d3d11_quad: fix bogus pointer type on reset + + It should behave the same but it's the wrong type. + +commit ac6c3502f33dbe0ffb0d502a14b9f162343a9a61 +Author: Steve Lhomme +Date: Tue Jun 11 09:27:49 2024 +0200 + + avoid using wcscat_s + + It seems it's not available in Windows XP. + https://forum.videolan.org/viewtopic.php?f=14&t=164742&p=544877#p544877 + + _snwprintf was used before but we can't tell if the whole string was appended + properly. + +commit ee032a34259c3644c73d94c712e0a53b26f5dba9 +Author: Steve Lhomme +Date: Wed Jun 5 11:55:39 2024 +0200 + + demux: image: detect ICC profile before JFIF data + + Fixes #18857 + + (cherry picked from commit 5ffd36ffa26a83ae498373f7d0ace1d82ab952f4) + Signed-off-by: Steve Lhomme + +commit 0543689abd8728aa5fd294ac2721acba377550cd +Author: Steve Lhomme +Date: Mon May 6 11:55:53 2024 +0200 + + contrib: bluray: update to 1.3.4 + + (cherry picked from commit f44944a5501863c769479b6190f7974fbbd31286) + Signed-off-by: Steve Lhomme + +commit 9c4768291ee0ce8e29fdadf3e05cbde2714bbe0c +Author: Steve Lhomme +Date: Sat Jun 8 11:23:24 2024 +0200 + + d3d11_tonemap: log when the TrueHDR feature is not available + + That is the case for win32 builds on win64. + +commit ec7bd545d74a7c4b4ef85ce90f9247d83f6146f6 +Author: Steve Lhomme +Date: Sat Jun 8 21:27:31 2024 +0200 + + d3d11_scaler: always read the staging size without the decoder padding + +commit ed469a1388bf482cd8febf5fe7d2c47dd7ea68c2 +Author: Steve Lhomme +Date: Wed Nov 29 09:44:20 2023 +0100 + + freetype/win32: fix string constant when using WCHAR/wchar_t API's explicitely + + wcscat_s is part of msvcrt.dll so should be in Windows XP. + + (cherry picked from commit ab501d6a93f25064adf17456340f9ab965855571) (edited) + edited: + - 3.0 was already using a long constant + + Signed-off-by: Steve Lhomme + +commit 947e24533287c3a43b3381bac189a27915e81d6f +Author: Steve Lhomme +Date: Wed Nov 29 09:42:41 2023 +0100 + + freetype/win32: fix bogus string cast + + lfFaceName is a WCHAR table. + + (cherry picked from commit f4d040e050a1c0c484d8334442c7a93c5c809df4) (edited) + edited: + - 3.0 uses the tchar API + + Signed-off-by: Steve Lhomme + +commit 4071ece4bbfc860ea0793aed8589db6bb1329f32 +Author: Steve Lhomme +Date: Sat Jun 8 09:46:31 2024 +0200 + + d3d11_scaler: fix missing picture sys for AMD super scaler + + This code is different from 4.0, must have been lost in a rebase. + +commit 97d162d5bed9bdce81449e4cd384f050b0e1cdd6 +Author: Steve Lhomme +Date: Sat Jun 8 09:44:54 2024 +0200 + + d3d11_scaler: fix AMD super scaler if the source has padding + + It asserts in debug build and will keep the padding in release mode. + +commit d587ae967ad6fc5a93c127b7263c179224e75cdc +Author: Steve Lhomme +Date: Sat Jun 8 10:34:32 2024 +0200 + + d3d11_fmt: remove unused variable + + Since 380dee8053ef69220707aed10b57113b64e0a925 + +commit 317dc63b5aeaa33f951863ebc2fc6c13f5f6fb6d +Author: Steve Lhomme +Date: Sat Jun 8 10:19:23 2024 +0200 + + d3d11_fmt: create texture for decoders or not + + In HDR to SDR the texture staging texture cannot be allocated as a decoder texture. + RDG10A2 is not supported for decoding. + +commit 86a582c93eb1a442bd1d8641853bebf752225dbd +Author: David Fuhrmann +Date: Thu Jun 6 09:38:36 2024 +0200 + + contrib: sidplay: Do not overwrite CXXFLAGS in configure.in + + resid configure has a bug which overwrites CXXFLAGS unconditionally, + causing build failures when preset CXXFLAGS are needed. + + Reason: In newer autoconf, ac_test_CXXFLAGS does not use "set" + anymore, but "y". + commit dd8bfdbabe8ae3974ca3864ad3125879f523e3a2 Author: Jean-Baptiste Kempf Date: Wed Jun 5 17:44:26 2024 +0200 diff -Nru vlc-3.0.21/doc/ChangeLog-2025 vlc-3.0.22/doc/ChangeLog-2025 --- vlc-3.0.21/doc/ChangeLog-2025 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/doc/ChangeLog-2025 2025-11-24 23:15:37.000000000 +0000 @@ -0,0 +1,7323 @@ +commit f9020c4df073c861a28f0cda5c6c5dccb58a49ef +Author: Jean-Baptiste Kempf +Date: Mon Nov 24 16:23:58 2025 +0100 + + Update NEWS for 3.0.22 + +commit 77471842b52e6b0ef3e60c30f0fbeb76393693a6 +Author: Joe Breuer +Date: Fri Nov 14 09:46:55 2025 +0100 + + dbus: fix unpause from KDE MPRIS + + (cherry picked from commit c5513cf900aaf59b048c3404fd3662f9a301259f) + Signed-off-by: Marvin Scholz + +commit 911133a0440e18300fe9876dc93c04c8fcbc671f +Author: Johannes Kauffmann +Date: Sat Oct 4 21:42:56 2025 +0200 + + canvas: fix fmt leak + + (cherry picked from commit cc140332997025b835172c14adb020b8b7e42bf1) + edited: + - the filter_chain_Reset() signature is different on 3.0.x and caused + a conflict + +commit 844fb8060ea968d078dc2b7c6fcafdc4e55da9af +Author: Steve Lhomme +Date: Wed Oct 15 13:52:42 2025 +0200 + + automake: use MKDIR_P instead of mkdir -p + + (cherry picked from commit c87cbb73d9f2833df214049c93f06e9ffafe06d9) + Signed-off-by: Marvin Scholz + +commit 3908fb9a60453e8a861a395f58de8af2c6441314 +Author: Alexandre Janniaux +Date: Fri Sep 9 12:55:51 2022 +0200 + + share: Makefile.am: use $(EGREP) instead of egrep + + Fix the following warning: + + egrep: warning: egrep is obsolescent; using grep -E + + (cherry picked from commit c6ed4170a5aa38be847b63bc86daad87358ffb54) + Signed-off-by: Marvin Scholz + +commit 761bbd3e0dcf0dcafbda2e3edd895e94b9690635 +Author: Marvin Scholz +Date: Sun Nov 16 15:02:24 2025 +0100 + + macosx: PLItem: clamp pos when inserting + + Pos needs to be clamped to the amount of items in the array, else + we might try to insert at an invalid position in the array. + + This can happen because the playlist can change till we process the + insertion request, so an item that would have been inserted before at + position 0 is dropped and then we try to insert the next item at + position 1 which would lead to an exception as it is outside the array + bounds. + + This is easy to reproduce when using the flattened playlist and dragging + a folder with a few items and a subfolder onto the icon or playlist. + + Fix #28660 + +commit aa9ff8aca3a67e2e86aa39d4c158a94073ce9c08 +Author: Pierre Lamot +Date: Fri Nov 21 17:22:41 2025 +0100 + + qt: consume THBN_CLICKED events + + otherwise events are evaluated twice + +commit 02102a889082ffb3b5dff4710a7c3475923b79e1 +Author: Tristan Matthews +Date: Wed Nov 12 10:53:11 2025 -0500 + + codec: vorbis: fix leak on xiph_AppendHeaders error + + (cherry picked from commit 1efee9cd4463bc62e359cd5f43e1a560d4f3c292) + +commit 20f35cc4f2414ca790bad42946fc065d5e1757b1 +Author: Tristan Matthews +Date: Wed Nov 12 10:50:03 2025 -0500 + + codec: theora: fix leak on xiph_AppendHeaders error + + (cherry picked from commit e18f719aca1e9aabb3f97457a3a0ca6e7f64b9c7) + +commit 67358978f610feb4e8f0982653321364f2241cc6 +Author: Tristan Matthews +Date: Wed Nov 12 10:44:12 2025 -0500 + + demux: ogg: fix leak on xiph_AppendHeaders error + + Fixes #29448 + Fixes https://issues.oss-fuzz.com/issues/456426262 + + Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/vlc + (cherry picked from commit c10dde079c65799a58307fb6f23ee18275f0363f) + +commit a9d5a66e458565305d21831b5061baf19543170a +Author: Jean-Baptiste Kempf +Date: Thu Nov 13 23:15:13 2025 +0100 + + Update NEWS for 3.0.22-rc2 + +commit ca8dd2c982eb048aad45f0d2e0358e452a9ac281 +Author: Khalid Masum +Date: Mon Oct 6 23:52:02 2025 +0600 + + text_renderer/svg: fix uaf at template load + + If token is not found in svg template, psz_template is + freed. Yet it is used in svg_GetDocument as + psz_file_template and incorectly being double freed in + Destroy(). + + Since the only use of psz_file_template is in svg_GetDocument + and it is performed after a null-check, setting psz_template + to null after freed should fix the issue. + + Fixes: #29370 (Coverity 1398436) + (cherry picked from commit 03e511aea8214405b2a2bc44b4d9b9fc5a7ce56e) (rebased) + + rebased: + - Replacement of tab with space + +commit 5338b87fb1e24f848ce7fc80eea9b5ab70642700 +Author: AsciiWolf +Date: Sat Nov 30 01:00:32 2024 +0100 + + appdata: fix AppStream metadata file name, other small fixes + + The file name should match the app id + + Also add OARS metadata, fix default screenshot and fix component type + + (cherry picked from commit a66e01306dd5a072cf9e7e61763be967f8648110) + Signed-off-by: Rémi Denis-Courmont + + Conflicts: + configure.ac + po/POTFILES.in + share/.gitignore + share/Makefile.am + share/org.videolan.vlc.appdata.xml.in.in + +commit f5dea94ed03557776223228f0199b4f96ea0ad90 +Author: Rémi Denis-Courmont +Date: Sat Dec 21 20:06:33 2019 +0200 + + dmsmux: use symbolic constants and macros + + (cherry picked from commit 8233a6195eb7cc75dca3468a6bc2a45b08d02f2f) + +commit 5525a1d6c60bb31f3768d63c18c0709b86906496 +Author: Rémi Denis-Courmont +Date: Sat Dec 21 18:19:58 2019 +0200 + + dmsmux: revector + + (cherry picked from commit 35ee25e478aeec7974bd7de23ccd7a8b9651e24e) + +commit 06f8bfd1620e0731d1d594ae54dcd6adebd06d95 +Author: Rémi Denis-Courmont +Date: Fri Dec 20 21:50:13 2019 +0200 + + dmxmus: demuxer for MUS files from the DMX audio library + + (cherry picked from commit 08eef6a645e128ca34c881d6dc4ac782d6b4d97b) + +commit 3beff849612c11218b4e63b1d13cde88aed5e5d0 +Author: Steve Lhomme +Date: Wed Nov 12 16:02:30 2025 +0100 + + spudec: fix crash when no region was found for the SPU + + Fixes #29445 + +commit 84e055cf36aed1abf4513b01d849037d9726eb98 +Author: Khalid Masum +Date: Sat Oct 11 05:54:00 2025 +0600 + + demux: ts: fix possible divide by 0 at j2k parse + + i_num, which comes from an untrusted source is used as a divisor in + vlc_tick_from_samples. + + Fixes: #29369 (Coverity: 1666134) + (cherry picked from commit 5ca90ea1) (rebased) + rebased: + - vlc_tick_from_samples doesn't exist in VLC 3 + +commit f7745d071ba5b7164bb06c22322dcfd278e384da +Author: Stanislav Fort +Date: Tue Oct 28 16:46:49 2025 +0100 + + oggspots: fix OOB read (unchecked image offset) + + Fixes #29319 + +commit 153a13b9be4447222e893e7cc29b0421ae4fd057 +Author: Stanislav Fort +Date: Mon Oct 27 14:25:53 2025 +0100 + + cea708: fix CEA708_Window_Truncate() + + Make truncation actually drop one column in LTR/RTL (adjust + lastcol/firstcol; delete rows only when they become empty). + + Fixes #29328 + +commit e5d01c1ae85b6db59ed7c508c88477cbdc3baf50 +Author: Stanislav Fort +Date: Mon Oct 27 14:03:46 2025 +0100 + + cea708: fix Window_MinCol()/Window_MaxCol() indexes + + Refs #29328 + +commit 6e585a4d3cef23c05bd3322b1c8eb372b41d37b0 +Author: Stanislav Fort +Date: Mon Oct 27 13:49:30 2025 +0100 + + cea708: fix OOB write in CEA-708 LTR window scroll + + Due to wrong bound check + + Fixes #29375 + +commit 7cda527f1b3c07ce4281534982173532d4b920fd +Author: Stanislav Fort +Date: Mon Oct 27 13:47:17 2025 +0100 + + cea708: use 4-byte stride for 4-byte character cells + + Fixes corruption/OOB. + Fixes #29326 + +commit 96f32bb67d9930128a6360d96f69b594269245be +Author: Stanislav Fort +Date: Mon Oct 27 11:51:40 2025 +0100 + + cea708: fix OOB write in CEA-708 RTL window scroll + + Fixes #29323 + +commit fa562df84c8aee880f36f23109028975bac71a5b +Author: Steve Lhomme +Date: Wed Sep 24 12:06:31 2025 +0200 + + demux: ty: don't look for ES header past the input buffer boundaries + +commit ee89f0f7f8060892e4d20076607dbdd958d147e8 +Author: Steve Lhomme +Date: Wed Sep 24 11:57:53 2025 +0200 + + demux: ty: don't check for S1/S2 if the offsets are too large + +commit b728f20701d4ff111a6bacd21d352518887f11ac +Author: Steve Lhomme +Date: Wed Sep 24 11:55:22 2025 +0200 + + demux: ty: stop read chunk if offset is past the data + + Fixes https://code.videolan.org/videolan/vlc/-/issues/29316 + +commit 82c10bb0eb32a3051f613fa3a0f38c9748044f03 +Author: Steve Lhomme +Date: Wed Sep 24 10:59:31 2025 +0200 + + cvdbsub: don't use metadata offset if bigger than whole SPU + + ParseMetaInfo() will not parse anything in that case as p == p_end. + The image will use the whole of the SPU buffer, potentially containing + metadata at the end. But the reading in RenderImage() is constrained by the width/height + so it won't use these data. + + Fixes https://code.videolan.org/videolan/vlc/-/issues/29325 + +commit b3a03a21961166c04fb09476a5ca45bba70648f2 +Author: Steve Lhomme +Date: Wed Sep 17 11:25:19 2025 +0200 + + demux: ogg: keep the map sizes when they are set + + The p_old_map/p_new_map sizes should match their buffer size. + + By default the channel counts are zero which considers the old/new maps match. + The channel count read may be updated but not the channel mapping. + We need to check the channel count match and the mapping matches. + + Fixes https://code.videolan.org/videolan/vlc/-/issues/29314 + +commit d0adf4fbb02555447fa6880a53c4f29a1629d7d5 +Author: Jean-Baptiste Kempf +Date: Thu Nov 13 15:32:26 2025 +0100 + + Update to RC2 + +commit 86a14a729f7b10c75e592a159bf267dab219bd14 +Author: Rémi Denis-Courmont +Date: Sun Sep 28 13:53:19 2025 +0300 + + po: remove country from Assamese localisation + + We have no other variants of this locale. Adding a country code only + makes the locale more difficult for people to select. + + Refs #29383. Manual backport to 3.0.x + +commit f5142d2806e1023c778a74727755e7adf14d1485 +Author: VideoLAN +Date: Mon Nov 10 20:04:22 2025 +0100 + + po: pull updated translations from transifex + + Signed-off-by: Felix Paul Kühne + +commit 104bc8729e86030eaa5b3b0969b3ea588fe31655 +Author: François Cartegnie +Date: Wed Oct 29 14:14:19 2025 +0100 + + codec: webvtt: replace recursive css cleanup + + refs #29392 + + (cherry picked from commit 5902316a43d47cda218330f94756286659756d55) + +commit b125e361b21db3099eac2ffcb99e995643cf36ef +Author: François Cartegnie +Date: Wed Oct 29 14:09:31 2025 +0100 + + codec: webvtt: fix recursive cleanup + + no siblings were reclaimed on cleanup + + regression by 150a7f5648970abfe9adfa84586d951ec4951645 + + (cherry picked from commit 73861536c3943774823bc65cbde4469d6bbc7335) + +commit 83feb4a3c31c9c0860530bf53426bdf0994c6513 +Author: Steve Lhomme +Date: Wed Oct 15 10:40:30 2025 +0200 + + contrib: x264: pass EXTRA_CFLAGS to the CC assembler + + Otherwise we end up with warnings like this: + + > ld: warning: object file (/Volumes/APFS/Programs/Videolabs/vlc/build/contrib/aarch64-apple-darwin15/lib/libx264.a[63](bitstream-a-8.o)) was built for newer 'macOS' version (15.0) than being linked (11.0) + + (cherry picked from commit 47ecb166f300e0b8b4b6d96838a7abeb112ba7d0) + +commit 2a06a37806e64f4296d099e748f0e4299f107702 +Author: Steve Lhomme +Date: Wed Oct 15 09:57:19 2025 +0200 + + configure: pass the macOS toolchain flags to CCAS + + Otherwise we end up with warnings like this: + + > ld: warning: object file (vlc/build/modules/isa/aarch64/simd/.libs/merge.o) was built for newer 'macOS' version (15.0) than being linked (11.0) + + (cherry picked from commit 1e7dc2770d5b234973605dd2aa507bf95e8fe0fb) + +commit 0ab9522e5f2241e95b71ccffffb54229bd6b4e82 +Author: Rémi Denis-Courmont +Date: Sun Oct 12 15:58:15 2025 +0300 + + contrib: gmp: detect with pkg-config + + It doesn't even compile on Debian unstable at the moment, not even + natively if taken from contribs. Not that there would be any reasons + not to use the build from the distro. + + (cherry picked from commit 525ebe9fc34cc92060adb5fba79ea263f4709e22) (rebased) + rebased: + - the code around is slightly different + +commit 6ca6e8aac1bd4d5e01ad1b64efa7798f04db1ef4 +Author: Steve Lhomme +Date: Tue Oct 14 15:36:21 2025 +0200 + + contrib: don't show unzip'ed files in non verbose mode + + This avoids being bombarded with logs when building. + + Similar to 0a555fa1ac6db47923c9db03faa8d49393f571ec for unzip. + + (cherry picked from commit d11f22f763a3601c018eb096556db13712b5641b) + +commit 963407c92e251a37d4bb825847bc232abe0d93e6 +Author: Steve Lhomme +Date: Thu Oct 9 09:59:14 2025 +0200 + + contrib: allow verbose compilation with V=1 in meson + + As supported by make and CMake targets. + + (cherry picked from commit dd6be4fa388238e1b98eadf792c576e56ad98ea7) (rebased) + rebased: + - the code around is slightly different + +commit 7bec9f68922e5ba1c31c00ff32be3e4645807f7d +Author: Steve Lhomme +Date: Tue Oct 21 07:45:15 2025 +0200 + + package/macos: build extras/tools with multiple threads + + (cherry picked from commit 1deac746dcac43f53f52bbefe0b689ad89599291) + +commit ada86d530a235a62b052d68f4cf7c096dd35f3ee +Author: Steve Lhomme +Date: Tue Oct 14 10:49:36 2025 +0200 + + package/macosx: use the same minimum version as the other scripts + + The value is grabbed when calling env.build.sh. + + (cherry picked from commit d6a636de2098f1f713da95b2a68de5da631eefad) (edited) + - 3.0 had the minimum to 10.7 + - 4.0 also disabled x + +commit ed1baf0bab22a9370fb8ed956cf3c80683a670d4 +Author: Steve Lhomme +Date: Mon Oct 13 13:55:19 2025 +0200 + + package/macosx: show the SDK version used to build + + (cherry picked from commit cb6ba2c39c485fcd46f6442b3bcccb9eff292de6) + +commit 225996d202fbdfff3238a8b7cf94f982f3b56e7d +Author: Romain Vimont +Date: Tue Jul 11 11:31:08 2023 +0200 + + Fix extra tool error message + + The error message is printed (among others) when the major versions + differ, not only when the current version is older than the expected + one, so "too old" may be incorrect. + + Before: + + > meson too old + + After: + + > meson incompatible version (expected 0.51.1, got 1.1.1) + + (cherry picked from commit 8449690b0dbad24aff2f83b0213de810332e3883) + +commit 8da71b5a45b8064a96bb576be86f03b8e17753b0 +Author: Pierre Lamot +Date: Wed Nov 5 14:52:15 2025 +0100 + + qt: fix wheel event on volume slider being interpreted multiple times + + If the event isn't accepted it is forwarded to the parent widget which also + handles the wheel event. As a result, the if the vout as vertical scrolling used + for seeking, and we scroll vertically on the sound slider, both events would + occur when scrolling on the widget. + +commit 1d52533d7bfdb157455be31b57b692618e13afa0 +Author: Pierre Lamot +Date: Wed Nov 5 11:39:04 2025 +0100 + + qt: fix scrolling horizontally on the volumne slider has no effect + + We now use wheel converter as it provides better handling of touch pads + +commit b28eb7a58c97f72eb2403d6d2318a6a6c94c1d31 +Author: Pierre Lamot +Date: Wed Nov 5 11:39:04 2025 +0100 + + qt: fix scrolling vertically on input slider always scrolls forward + + When scrolling vertically, angleDelta.x() is 0, so the backward direction was + never accounted for. + + We now use wheel converter as it provides better handling of touch pads + +commit 49e97a2a04d6eaa322ef37f791f037887f353712 +Author: Pierre Lamot +Date: Wed Nov 5 14:34:44 2025 +0100 + + qt: introduce WheelToVLCConverter to aggregate wheel events as VLC keys + + this class aggregates wheel events until a full step (120 angle units) is + reached in a direction and emits a synthesized event usable by VLC hotkeys + + (cherry picked from commit 7498ac55db73dec778d97de88a758707964ebdc7 without the + QML related methods) + +commit 5d1b310ca0ae75f02307611a77f90aa2ec7d2250 +Author: Pierre Lamot +Date: Wed Nov 5 14:31:44 2025 +0100 + + qt: make Qt Mouse/Input/KeyEvent to VLC converter functions const + +commit fe60420c4060e22c1660668f124b14da875f36be +Author: Alexandre Janniaux +Date: Fri Feb 19 23:20:00 2021 +0100 + + gitignore: unblacklist build.sh script + + (cherry picked from commit 1cff424af81f9ce1fdfb2a12a89c2383dffe4a31) + +commit 318bfabe45d47bbb7d25b2eddc1fb7cb37e4eb40 +Author: Steve Lhomme +Date: Tue Oct 14 10:41:51 2025 +0200 + + contrib: allow building xcodebuild targets with newer SDKs if targeting OS 10.11+ + +commit d29ea814ded0274e7065116d7ab010a13b8bfe28 +Author: Steve Lhomme +Date: Mon Oct 13 13:11:23 2025 +0200 + + contrib: disable targets if they can't be built with xcodebuild + + Here is a failure log: + > clang++: error: SDK does not contain 'libarclite' at the path '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_macosx.a'; try increasing the minimum deployment target + > + > contrib-x86_64-apple-darwin18/sparkle/Sparkle.xcodeproj: warning: The macOS deployment target 'MACOSX_DEPLOYMENT_TARGET' is set to 10.7, but the range of supported deployment target versions is 10.13 to 26.0.99. + + xcodebuild seems to only be able to support a certain range of + macOS version. + + In XCode 26 the minimum supported version seems + to be 10.13 but we need 10.7. However the sparkle/breakpad + builds work when targeting 10.11. growl doesn't build anyway. + + The number 26 may differ if an older version is used because iOS, tvOS, etc + had different values than the OSX version before that. + + Older XCode versions may have different issues. + + Ref. #29414 + + clang: error: SDK does not contain 'libarclite' at the path '/Volumes/APFS/opt/Xcode15.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_macosx.a'; try increasing the minimum deployment target + + clang: error: SDK does not contain 'libarclite' at the path '/Volumes/APFS/opt/Xcode15.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_macosx.a'; try increasing the minimum deployment target + ld: file not found: /Volumes/APFS/opt/Xcode14.3.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_macosx.a + +commit bc31b4d18604f3583f3f7afb111f5b0178d6af7b +Author: Steve Lhomme +Date: Tue Oct 14 11:07:51 2025 +0200 + + contrib: add a way to check the Apple Target OS version + +commit 01d5ad915c6da0a6f60b02ed37fbd1442a84f838 +Author: Steve Lhomme +Date: Mon Oct 13 12:58:32 2025 +0200 + + contrib: add a way to check the Apple SDK version + +commit edc7a1b110180cd3d528f4917abbac3e107317af +Author: Steve Lhomme +Date: Tue Oct 14 11:50:06 2025 +0200 + + package/macosx: ensure the nightly builds have growl + +commit 4cc9b413d3bb71ebe700d0406c25a6396a539b7b +Author: Steve Lhomme +Date: Tue Oct 14 11:49:11 2025 +0200 + + package/macosx: ensure the release build has all the contribs we want + +commit f7a7cab664af20d2dfdd67a5d20d5819b91ed8f0 +Author: Steve Lhomme +Date: Tue Oct 14 14:04:38 2025 +0200 + + CI: really generate tarball packages + + The CI_DEFAULT_BRANCH is "master" but we should + generate the tarballs when the "3.0.x" branch has been merged. + +commit d249316478bdf90b66599372dbfdecd30b88be11 +Author: Johannes Kauffmann +Date: Fri Oct 3 22:20:41 2025 +0200 + + canvas: fix p_chain leak + + (cherry picked from commit 4787f40122d16cc9385781903aee55deb525f6d7) + +commit 251374ca474443c83c800ceaf07a702b76b02f42 +Author: Steve Lhomme +Date: Fri Sep 5 07:16:51 2025 +0200 + + tools: build less things in gettext tools + + Borrowed from 8f2fd35daf5dbc864208e5c32cb3dc2a724aac3b without updating gettext. + +commit 922f6d11598b6bbfc6d8c71cb844801e1644b781 +Author: Steve Lhomme +Date: Fri Oct 10 10:05:43 2025 +0200 + + contrib: gettext: only explicitly disable faccessat usage + + The other calls were used for native tools that we don't build. + +commit 53cb37ccacd5976c9a1c65a9337301855dace3c7 +Author: Steve Lhomme +Date: Wed Sep 17 09:52:56 2025 +0200 + + contrib: gettext: do not build any binary tools + + We don't use cross-compiled binaries. The binaries should come from extras/tools. + + (cherry picked from commit 381cc2fe7777460d896c60580fc1dc111600c7ff) + +commit 29f765a59f30fa9018b0d09dedf976e4005e146a +Author: Steve Lhomme +Date: Fri Oct 10 10:03:12 2025 +0200 + + contrib: gettext: use MAKEBUILD macros + +commit ce362903621efe709eceacc8b2e11a0b44b11c3a +Author: Steve Lhomme +Date: Fri Oct 10 10:01:17 2025 +0200 + + contrib: gettext: disable building native tools + + We only need the runtime part to compile/link with. + The native tools are in the system or in extras/tools. + + Similar to 031aff1c30a635c83578b30a90e52e37aa9f5c8a + +commit ee9412bc0feaa5351736830ef7683a6ac8512d41 +Author: Steve Lhomme +Date: Thu Aug 1 14:50:27 2024 +0200 + + CI: only generate the contrib tarball on master after the merge + + The rebased branch before merging has a different CI_PROJECT_PATH. + The tarball will not be used, so no need to create it. + It will be created and used in the build on the videolan/vlc account. + + (cherry picked from commit d0f931107bcc0fcc54e6e01de9588576fa81b73b) (edited) + edited: + - 3.0 doesn't have debian-contrib, raspbian-arm, wasm32 + +commit 56096270e64d326553aebec47ccaf236a77e2448 +Author: Steve Lhomme +Date: Mon Oct 17 16:28:00 2022 +0200 + + CI: only generate a contrib tarball if we're on the main branch + + There's no need to generate the tarball since it's not going to be used by + anyone else. It's only used on master after a merge or in nightly builds. + + This should save a few minutes during each contrib MR builds. + + (cherry picked from commit b4d374071298e944d31ddaba51d317c72b006204) + +commit 677a5b5d8990df7465be8df5ebc5c15a49fb2936 +Author: Marvin Scholz +Date: Sat Mar 12 03:49:24 2022 +0100 + + CI: macosx: package zip instead of dmg + + (only for non-nightly, nightlies still package a dmg as before) + + (cherry picked from commit 155036d4a4a071ac21812f0d6723e5c531ed4a08) + +commit 79023faacbdf5571fdbc569b94f8053b8df85907 +Author: Steve Lhomme +Date: Tue Sep 27 11:46:31 2022 +0200 + + ci: generate a contrib package if Windows prebuilt were used but failed + + If the previous prebuilt was broken we have a fresh one to use. + + (cherry picked from commit ee926f4251d123fa68a4f814d5ec2e1e1cc45388) + +commit 731469b0a4ab5fdf75013b9cab88d74e690ca27c +Author: Felix Paul Kühne +Date: Fri Apr 8 23:57:21 2022 +0200 + + CI/appleOS: use tools available on the runner + + (cherry picked from commit 27948cbf566a6f06f92b9ac354c69fb80fe0e019) (edited) + edited: + - there is no apple-os-common on 3.0 + +commit 75c51d778a5b492fb775cb605658ef3fe811e1a4 +Author: Steve Lhomme +Date: Sat Sep 20 09:40:39 2025 +0200 + + contrib: harfbuzz: update to 11.5.0 + + Support Unicode 17 + + (cherry picked from commit 5e2aa683cd50f5122bbf5761e79d02c5843c499f) + Signed-off-by: Felix Paul Kühne + +commit 7fb5da0b9e69220975cc04062667635dab91d92f +Author: Steve Lhomme +Date: Fri Sep 23 13:16:10 2022 +0200 + + contrib: macos: always shows the list of know contribs before building + + We also want to know about native tools that may or may not be there. + + (cherry picked from commit cf349b29f55f67e9642a0634c31cc349b91f63fd) + +commit 7c5843a7ea3e945e7c7641788046523736969c2c +Author: David Fuhrmann +Date: Sat Jul 13 21:48:05 2019 +0200 + + macOS build.sh: Explicitly list all packages for contribs source build + + (cherry picked from commit 8d4373ff50918b65c4c06c5bd65b7feac072ef75) + +commit b3c1b62320a65eba8071fc8b923486d2b363cf68 +Author: Steve Lhomme +Date: Mon Jul 7 10:32:01 2025 +0200 + + package/macos: build gettext via dependencies + + It's already working for other targets. If a dependency is not properly defined + it needs to be fixed. + + (cherry picked from commit 7a58c476ffeeb5e00c260b74be2ac9a6631ddacd) + +commit 2cb79f83df4c819ef1f5cd0f5d163870b62766d0 +Author: Johannes Kauffmann +Date: Sun Sep 28 13:05:33 2025 +0200 + + livehttp: fix psz_keyfile and key_uri leak + + (cherry picked from commit dc90c38045f43d8a6ab0dc5de06112736013bf58) + +commit 52b1b3df595df6318289a34f820edb2509b304d8 +Author: Johannes Kauffmann +Date: Sun Sep 28 12:59:53 2025 +0200 + + access: decklink: fix opt leak + + (cherry picked from commit 9f54ff720b6a67b0b63020e39a5527dc5841e38f) + +commit b69ca0fa1a5ec0703f8a8514a471d71ed5aca058 +Author: Johannes Kauffmann +Date: Sun Sep 28 13:18:04 2025 +0200 + + direct3d9: fix filepath leak + + In case the string is non-NULL but empty, var_InheritString returns NULL + so we can treat that case the same. + + (cherry picked from commit 9d2d8f0136730fb81d1de130680796f6f512aad3) + edited: + - the direct3d9 code is reordered on master + +commit c9dde25a62c4612d71250c4eb845154e0ea9e13e +Author: Gabriel Lafond-Thenaille +Date: Tue May 13 15:16:02 2025 +0200 + + vlc_common: don't redefine `unreachable` when using C23 + + Fixes #29390 + + (cherry picked from commit d56f1e196b570a2e2893c31a0d593bab2b31b349) + Signed-off-by: Thomas Guillem + +commit d3d4aea356246ea36b0068e8d6b8ae2118f10149 +Author: Andreas Sturmlechner +Date: Sat Sep 20 22:22:54 2025 +0200 + + Drop Qt6 mention from NEWS + + It is in fact not possible to build with Qt6 at least as long as + https://code.videolan.org/videolan/vlc/-/merge_requests/6812 is not + done. "News" sites are already picking this up though for the fact + that 3.0.22-rc1 was tagged. + + Signed-off-by: Andreas Sturmlechner + +commit 9f42f96623ed845640fa3a8e587e0e5df15d03d2 +Author: Steve Lhomme +Date: Thu Sep 25 09:25:30 2025 +0000 + + libvlc: fix vout table leak in set_value() + + + (cherry picked from commit 916b3aa23e265fa3bf87fed83c015ffce3e3d4c2) + + Co-authored-by: Steve Lhomme + +commit 8052b3a827571387dae28667c4916aefc76309a0 +Author: Steve Lhomme +Date: Tue Sep 23 09:47:56 2025 +0200 + + contrib: lua: fix CVE-2014-5461 + + Using debian's patch [^1]. + + Co-authored-by: Thomas Guillem + + [^1]: https://sources.debian.org/data/main/l/lua5.1/5.1.5-11/debian/patches/0004-Fix-stack-overflow-in-vararg-functions.patch + +commit 4cbcfa740fd7b2176024d654c4ddc1561f899d00 +Author: Steve Lhomme +Date: Tue Sep 23 09:44:07 2025 +0200 + + contrib: update Lua to 5.1.5 + + This is the latest (and last) version of 5.1. + +commit 4a645203d3b88f56e5d83925650373a1e450182a +Author: Steve Lhomme +Date: Fri Sep 5 07:16:27 2025 +0200 + + tools: use ftpmirror for GNU packages + + It's less overloaded and the recommended URL [^1]. + + Similar to 03d3b0a941b1bce0715af0dda612fa080a975d1c for tools. + + [^1]: https://www.gnu.org/prep/ftp.en.html + + (cherry picked from commit 36356178a0461bd6b65a2d36946a9c7ede82e23f) + +commit a22bdad4adeb764f43f08e7bb4ddd81409d6eead +Author: William Woodruff +Date: Thu Apr 3 19:41:31 2025 -0400 + + extras/tools: use HTTPS for all tool bootstrapping + + This patch updates all of the URL prefixes and + templates in packages.mak to use HTTPS instead of + HTTP. + + Each of the domains was tested to ensure that + HTTPS was available. One domain, used for + Apache, was updated from an OVH mirror + to the official Apache downloads site, as the + OVH mirror did not support HTTPS. + + Signed-off-by: William Woodruff + (cherry picked from commit e02872fb5cd25eff369cae445f7bf58529dd2f19) (edited) + edited: + - 3.0 has less tools + +commit 8c7274c258d60f91ffb674be7a365456f20908eb +Author: Steve Lhomme +Date: Fri Sep 19 08:13:24 2025 +0200 + + tools: use curl --retry to download tarballs + + If some URLs are flaky we have a better chance of not failing a build. + (like GNU mirrors and git) + + We don't need a temporary file, we let curl manage the output file and + overwrite it when necessary. If anything the hash will not match. + + (cherry picked from commit ded9e6c5d9162dfb0bbac50740e0c13b24f67e2e) + +commit 81771e1cba5d44a4913605edd00d66d5b3efb03c +Author: Steve Lhomme +Date: Fri Sep 19 08:13:37 2025 +0200 + + contrib: use curl --retry to download tarballs + + If some URLs are flaky we have a better chance of not failing a build. + (like GNU mirrors and git) + + We don't need a temporary file, we let curl manage the output file and + overwrite it when necessary. If anything the hash will not match. + + (cherry picked from commit b57f13f97e0c395791aeff997a85380e4769d0df) + +commit 553e1def6a7d8371292208279c1c695206696b00 +Author: Pierre Lamot +Date: Mon Sep 22 09:30:41 2025 +0200 + + qt: set foreground color when setting background color in stylesheet + + otherwise we may end up with not enough contrast between the foreground and the + backgroud color + +commit 6da8ba684714ee535dc9ae2c67ca3f9d57eadb90 +Author: Pierre Lamot +Date: Mon Sep 22 09:21:42 2025 +0200 + + qt: force stylesheet to be re-evaluated when palette changes + + As far as I understand, the colors used by the widgets are evaluated when we + set a stylesheet on an item (even if the style sheet doesn't specify any + colors), if the applicationpalette changes afterward, the colors of a widget + with a custom style is not updated properly. Forcing the stylesheet to be + re-evaluated when the palette changes, forces the colors to be updated. + + since Qt 5.7, we can use Qt::AA_UseStyleSheetPropagationInWidgetStyles which + propagates the palette automatically + + fix: #29315 + +commit de6771a51b7f5fc67659a2a9fc563c8c62ac59aa +Author: David Fuhrmann +Date: Sat Sep 20 10:48:29 2025 +0200 + + Revert "macOS: Explicitly set the App icon" + + macOS Tahoe adapts application icons by itself depending on user + style. If we overwrite the icon again, it is replaced with the + default icon, resulting in visual glitch in the whole dock. + + This reverts commit 92e03acf1602e2df355a4bb85a9e636b60d59a9c. + +commit 73dd10dab846e962ce024f4ba85696c6ae720840 +Author: Steve Lhomme +Date: Sat Sep 20 08:59:55 2025 +0200 + + CI: keep tools tarballs as release artifacts for Windows builds + +commit fceab7f2812f93c4c8e2152d096e24a55ba55218 +Author: Steve Lhomme +Date: Fri Sep 19 12:20:37 2025 +0200 + + CI: keep contrib tarballs as release artifacts for Windows builds + +commit 40e98d8fa19ea0f440bc03a33801f4fd1d41beca +Author: Steve Lhomme +Date: Fri Sep 19 12:19:58 2025 +0200 + + CI: keep the Windows symbols artifacts as a tar.xz + +commit a711e972451a4f66a6ebc66c1473eace9525e023 +Author: Steve Lhomme +Date: Fri Sep 19 09:39:08 2025 +0200 + + CI: keep the Windows symbols folder in release artifacts + + In case it's not uploaded properly. + +commit 09e3851e95a08a14692aca122a3f80dafda5786e +Author: Steve Lhomme +Date: Wed Sep 17 13:43:25 2025 +0200 + + Update PO files for pending 3.0.22-rc1 + +commit 9e23cc7e00954f91607471fd0f1c109a715650b7 +Author: François Cartegnie +Date: Tue Jan 17 17:02:21 2023 +0100 + + contribs: xiph has moved to mirror + + (cherry picked from commit e37bc901e9286df5480b4cbe27e55f70792f38cd) (rebased) + rebased: + - there are more defined sources in 4.0 + +commit 7c316a1a2daf3cffe11680e4400f60c024380afd +Author: Steve Lhomme +Date: Mon Oct 31 14:35:32 2022 +0100 + + contrib: use a define for XIPH URL downloads + + (cherry picked from commit e21277451f93ea514cf73ec493741dc5ecea8bdd) (edited) + edited: + - 3.0 used downloads.us.xiph.org in some places + +commit 00718ec15105a033a987c800fc59dc7cf5d1cc9e +Author: Steve Lhomme +Date: Mon Sep 19 13:52:18 2022 +0200 + + contrib: soxr: use the GitHub tarball + + It has the same hash. + + (cherry picked from commit 48a05f9ac07050368ce8080dab6cadb5a7504feb) (edited) + edited: + - 4.0 had more changes before reaching that URL + +commit d7bfea6d8bbeaef3b4f869ba52d104c30384234f +Author: Steve Lhomme +Date: Wed Sep 17 07:47:30 2025 +0200 + + contrib: libmpeg2: only use the VLC URL + + It's not available on Sourceforge anymore. + +commit c9674864c1ddb0c1021d6a3998e61d2d1fc57f6b +Author: Steve Lhomme +Date: Fri Jun 2 13:47:37 2023 +0200 + + contrib: use SF for all sourceforge contribs + + (cherry picked from commit 36b1865d9588c47fb2b136f367d5fb6455dd0fd0) (edited) + edited: + - 3.0 still uses pthread for the mingw contrib + +commit e55793ca30a3b2f6990c339734900d882044db8f +Author: Steve Lhomme +Date: Thu Sep 18 08:15:36 2025 +0200 + + CI: call symbol upload in a Python venv + + So we have the most recent versions of the packages and don't require + more python packages from the Docker images. + +commit bf5c339cad70c50797e319b1575bc43bc0a0e2b5 +Author: Steve Lhomme +Date: Thu Sep 18 13:02:39 2025 +0200 + + CI: show the release tag used + + This can be usefule for debugging. + +commit bf2a986c4162f7752096f75f4e31f6bcab06f89a +Author: Steve Lhomme +Date: Thu Sep 18 11:27:10 2025 +0200 + + CI: update mingw64 gcc images + + Add a version with python-venv. + + It has + - a newer protoc (3.4.1) but already build it anyway. + - gcc 11.3.0 + - mingw-w64 v10 + - newer winetricks + - breakpad built from a tarball (https://download.videolan.org/pub/contrib/breakpad/breakpad-0.1.4.tar.gz) + +commit e0f77e237d6269537d237d4e99c1a7d6cdf4416e +Author: Steve Lhomme +Date: Thu Sep 18 08:13:09 2025 +0200 + + extras: breakpad: add requirements.txt file describing needed Python modules + +commit 6f21c4d5adb8f6f20254f5942e62a03b8fc4b66f +Author: Steve Lhomme +Date: Thu Sep 18 10:58:41 2025 +0200 + + extras: breakpad: use io types for IO classes + + typing.io doesn't seem to exist anymore. + + typing.io was in Python 3.5 [^1] but not in 3.6 [^2]. + + ``` + Traceback (most recent call last): + File "/builds/robUx4/vlc/./extras/breakpad/symb_upload.py", line 146, in + class OutputStore: + def store(self, dump: typing.io.TextIO, meta): + assert(False) + File "/builds/robUx4/vlc/./extras/breakpad/symb_upload.py", line 147, in OutputStore + def store(self, dump: typing.io.TextIO, meta): + ^^^^^^^^^ + File "/usr/lib/python3.13/typing.py", line 3817, in __getattr__ + raise AttributeError(f"module {__name__!r} has no attribute {attr!r}") + AttributeError: module 'typing' has no attribute 'io'. Did you mean: 'IO'? + ``` + + [^1]: https://docs.python.org/3.5/library/typing.html#typing.io + [^2]: https://docs.python.org/3.6/library/typing.html + +commit 5bd37679406d364c39c3385867794cce814aa664 +Author: Martin Storsjö +Date: Tue Sep 16 13:26:01 2025 +0300 + + contrib: gettext: Apply a patch to fix building with latest Clang + + The latest nightly Clang made -Wincompatible-pointer-types an + error by default, which GCC 14 also already did. + + Backport a patch from newer gnulib [1], which fixes a bug in + parsing environment strings; this bug was pointed out by the + warning that now was upgraded to an error. + + Newer versions of gettext have new enough gnulib bundled out + of the box. + + [1] https://cgit.git.savannah.gnu.org/cgit/gnulib.git/commit/?id=92cdf62b56462b914193c7770440e505a37c2526 + +commit f63d56faddf912b822856b30ba8b76d42567c48e +Author: Steve Lhomme +Date: Fri Sep 12 14:59:20 2025 +0200 + + qt: rename dark option to Enable Dark Mode + + This should be easier to understand (and translate) for most people. + +commit c2434df31e41e8b752c7598a4e756e2ae5f5dc46 +Author: Steve Lhomme +Date: Tue Sep 16 13:30:19 2025 +0200 + + demux: ty: reset the number of records on error + + So it matches the data in p_sys->rec_hdrs. + + Fixes #29294 + + (cherry picked from commit 6b6a44e75c52c55167c1ae6921d8b1fc01cc1b61) + +commit 5f8320a612b206f707bc88d3f40d99d8b4139a0d +Author: Florian Albrechtskirchinger +Date: Sun Mar 2 08:30:43 2025 +0100 + + live555: fix build with versions >= 2024.11.28 + + In the 2024.11.28 release (version 1732752000), live555 introduced + `EventLoopWatchVariable` as a typedef for `std::atomic`, replacing + direct use of `char` in earlier versions. Add a conditional typedef to + define it as `char` for older versions, and update `event_rtsp` and + `event_data` to use `EventLoopWatchVariable`. + + (cherry picked from commit 8befcbfa834b809602db24c9ba7456d8cfc25cdb) + +commit 3d6a85245bf4db9ca32b138936311fd7613342df +Author: Steve Lhomme +Date: Fri Sep 12 14:03:16 2025 +0200 + + demux: mkv: fix uncaught throw when reading Block data + +commit e8e7274a82d6acec5a37df62d4e30e1ed607e567 +Author: Steve Lhomme +Date: Fri Sep 12 14:02:47 2025 +0200 + + demux: mkv: fix uncaught throw when reading Cluster first elements + + Fixes https://code.videolan.org/videolan/vlc/-/issues/29288 + +commit 1e42a94883e4df237fa737573111f35e0c3f4c68 +Author: Steve Lhomme +Date: Mon Sep 15 13:40:11 2025 +0200 + + contrib: vpx: disable neon_dotprod with Apple Clang 12 + + It fails to compile with the provided intrinsics although the code is correct. + + ``` + ../vpx_dsp/arm/vpx_convolve8_neon_dotprod.c:55:19: error: initializing 'int32x4_t' (vector of 4 'int32_t' values) with an expression of incompatible type '__attribute__((__vector_size__(4 * sizeof(uint32_t)))) uint32_t' (vector of 4 'uint32_t' values) + int32x4_t sum = vdotq_lane_s32(acc, perm_samples, filters, 0); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/12.0.0/include/arm_neon.h:37021:11: note: expanded from macro 'vdotq_lane_s32' + int32x4_t __reint1 = __builtin_shufflevector(*(uint32x2_t *) &__reint, *(uint32x2_t *) &__reint, __p3, __p3, __p3, __p3); \ + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ``` + + Fixes #29292 + +commit 71b5a8e016c154adb6a68ff7317f22e5032713fd +Author: Steve Lhomme +Date: Mon Sep 15 13:11:22 2025 +0200 + + contrib: add a macro to check the minimum clang version + +commit cd71ad62d9564205ce5deeeb4b5b214ab4895234 +Author: Steve Lhomme +Date: Thu Apr 18 07:22:35 2024 +0200 + + Revert "contrib: harfbuff: build internal ragel if not found" + + ragel is used internally to generate some files when they are changed. + But we don't modify any source, we can just build harfbuzz without ragel. + The option is even off by default. + + When it's not enabled there is this warning: + > You have to install ragel if you are going to develop HarfBuzz itself + + But that's not our case. + + This reverts commit 071a7581ff4e7366972218e340abfe6e6c2c1686. + +commit 760e42f07aeff281e2652f15191fb8efd2997409 +Author: Rémi Denis-Courmont +Date: Sun Apr 14 09:32:58 2019 +0300 + + compat: missing #include, fix warning + + (cherry picked from commit fa48f95c8567a1babc1610b3a966961482119d9c) + +commit e98449998883ff438151b68f18b23d4345787a73 +Author: Steve Lhomme +Date: Mon Sep 15 09:32:00 2025 +0200 + + demux: nsv: don't dereference pointer if it's past the buffer + + Fixes #29300 + +commit 540d35fef5baefe2b4c4b9e5742761a0d636b63e +Author: Steve Lhomme +Date: Fri Sep 12 11:59:15 2025 +0200 + + cvdsub: avoid reading past the end of metadata + + We always read p[0] to p[3]. If p[3] is further than the end + of our buffer we should not use these data. + + Fixes https://code.videolan.org/videolan/vlc/-/issues/29286 + +commit c6f5ee9f4bbe308dbb9a530936baa2fa2d758531 +Author: Steve Lhomme +Date: Fri Sep 12 08:04:40 2025 +0200 + + CI: add a release target for Debian that does make distcheck + +commit e78b9dd4cd509bd84d8c1dcf34faeb3125be8bc3 +Author: Steve Lhomme +Date: Fri Sep 12 08:12:58 2025 +0200 + + doc: mention the POTFILES.in needs to be edited before make distcheck + +commit 8eb3373e860d4760c39dd13a719192496ebb01bc +Author: Steve Lhomme +Date: Fri Sep 12 09:22:49 2025 +0200 + + test: fix check_POTFILES.sh folder + + So it can be called manually. + +commit 8d58813b8f611e71718b864323b69a43c5db1611 +Author: Steve Lhomme +Date: Fri Sep 5 08:43:01 2025 +0200 + + tools: make use of parallel builds + + (cherry picked from commit 21a36f8c4dae1271ae0e59cb126b0b274d4e5f97) (edited) + edited: + - gettext is not defined in the same place in 3.0 + +commit bc454c46ad63882af3132f74727fab1a3187fb49 +Author: Steve Lhomme +Date: Mon May 6 11:02:49 2024 +0200 + + extras/tools: build tar with xz support before unpacking tar.xz files + + (cherry picked from commit 46c57f4dbf811fe92b8879f3103802d8d5352dce) + +commit dd4078546548b32896a29e894097dd1c5162ebbc +Author: Steve Lhomme +Date: Mon May 6 11:01:51 2024 +0200 + + extras/tools: build xz before tar + + The reason we build tar is because it's missing xz support. + + (cherry picked from commit ee9ea36529e70199d5c81894e1e8dae6b7cd4446) + +commit 25cc51ff6ba9345e0a44cf31be06390c831377ba +Author: Alexandre Janniaux +Date: Wed Jan 17 10:01:32 2024 +0100 + + extras: tools: add .m4 dependency for .buildautoconf + + Autoconf will require m4 to build correctly, and will complain with the + following error, at least starting with Autoconf 2.72, when the system + provided m4 is too old: + + GNU M4 1.4.8 or later is required; 1.4.16 or newer is recommended. + GNU M4 1.4.15 uses a buggy replacement strstr on some systems. + Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. + yes + checking whether stricmp is declared... make: *** [.buildautoconf] Error 1 + make: *** Waiting for unfinished jobs.... + + Ensure that whenever we need to build m4, we build it before autoconf. + + (cherry picked from commit a8e83b1b69df3d500d52e5ddb9bd562723ee3b5e) + +commit 75f3371f49ac1c789e53eb198e0f0a89fdd939dc +Author: Steve Lhomme +Date: Sat Dec 9 09:38:34 2023 +0100 + + extras/tools: disable automake documentation + + It does not build for me, as it tries to use makeinfo/texinfo which is not + installed and not part of the tools we require. + + (cherry picked from commit 90462d2f4d0f0555d4f0915960506c1fa8226343) + +commit 39ddeba4b42efe413e3c91aa92f4f17fded2344a +Author: Steve Lhomme +Date: Mon Jul 20 16:46:51 2020 +0200 + + tools: avoid building tracking dependencies for tools + + This is a waste of time 99.9999% of the time. + That's also what we do in contribs. + + (cherry picked from commit 4958f6b5911d5771ca7fbd8727f65684f4f923a5) (edited) + edited: + - 3.0 doesn't have ragel anymore + +commit 049d29410fa1c1e4eab74e44913fccf917e086e8 +Author: Steve Lhomme +Date: Thu Sep 11 15:46:16 2025 +0200 + + package/win32: give a different name to Windows ARM64 exe/msi/7z + + Otherwise we don't know if the win64 is for arm or x86. + +commit 4a5ad643780ce33eabbb2abbda12b41bb1814549 +Author: Steve Lhomme +Date: Thu Feb 24 16:44:54 2022 +0100 + + makefile: remove unknown disable-mkv option from distcheck + + It generates a warning + configure: WARNING: unrecognized options: --disable-mkv + + (cherry picked from commit 3342f3d56756fd3c7da0066648bea5ab133eb6da) + +commit c7c1d68aa00f6845776a9c8075e575d42976504f +Author: Steve Lhomme +Date: Fri Sep 12 08:47:57 2025 +0200 + + src: use git safe.directory to get the revision number + + In the release build runner this seems to be an issue [^1]. + + ``` + Making all in src + Makefile:3751: warning: ignoring prerequisites on suffix rule definition + Makefile:3755: warning: ignoring prerequisites on suffix rule definition + make[2]: Entering directory '/builds/videolan/vlc/winarm64-ucrt/src' + CC fourcc_gen + GEN stamp-revision + GEN ../include/vlc_about.h + fatal: detected dubious ownership in repository at '/builds/videolan/vlc' + To add an exception for this directory, call: + git config --global --add safe.directory /builds/videolan/vlc + cat: /builds/videolan/vlc/extras/package/win32/../../../src/revision.txt: No such file or directory + make[2]: *** [Makefile:3781: stamp-revision] Error 1 + make[2]: *** Waiting for unfinished jobs.... + make[2]: Leaving directory '/builds/videolan/vlc/winarm64-ucrt/src' + make[1]: *** [Makefile:1573: all-recursive] Error 1 + make[1]: Leaving directory '/builds/videolan/vlc/winarm64-ucrt' + make: *** [Makefile:1460: all] Error 2 + ``` + + [^1]: https://code.videolan.org/videolan/vlc/-/jobs/2288139 + +commit 537d5ed35bac06405b120146d07b2ad834d7d6b2 +Author: Steve Lhomme +Date: Fri Sep 12 08:08:19 2025 +0200 + + NEWS: add -rc1 in new version + + This is necessary for make dist. It will need to be reverted + when doing the final 3.0.22 build. + +commit 40530db7bf75031d30a4feeae7856a67966efce4 +Author: Steve Lhomme +Date: Thu Sep 11 13:42:21 2025 +0200 + + CI: keep the .exe/.msi Windows installer in release builds + +commit 00cb822968eef9b670f9a167cf59c1c3d6fe61f6 +Author: Steve Lhomme +Date: Thu Sep 11 13:11:52 2025 +0200 + + CI: add missing UWP_EXTRA_BUILD_FLAGS to Windows releases + + That will turn the ARM build into a UCRT build. + +commit ba3e9c6ade225f70434a6eec167f8725e146e629 +Author: Steve Lhomme +Date: Thu Sep 11 14:37:00 2025 +0200 + + package/win32: generate the .exe and .msi installer in release builds + + So we don't have to generate package-win-strip again and possibly + have different binary signatures. + + The .msi package generation is tricky and requires many calls. It's easier + to let the makefile do it. + +commit a3c6bc2755e9597e73d2aacc795980eb4e2d814c +Author: Steve Lhomme +Date: Thu Sep 11 13:24:06 2025 +0200 + + configure.ac: Correctly set version to 3.0.22-rc1 + + Similar to ed93768cedee7dae31a5b44d57a38d59da4dd1cf + +commit c26b46004e02b5f9eb66b0d3bbdbe486645bbf5c +Author: Steve Lhomme +Date: Thu Sep 11 13:49:12 2025 +0200 + + contrib: breakpad: fix support for Windows ARM64 + +commit f555dff5bc1f0fd4ada24a80974498aac0ef2f80 +Author: Steve Lhomme +Date: Tue Aug 6 07:47:33 2024 +0200 + + tools: don't show untar'ed files in non verbose mode + + This avoids being bombarded with logs when building like the 6000 lines of meson. + + Similar to 0a555fa1ac6db47923c9db03faa8d49393f571ec for tools. + + (cherry picked from commit 66aa9ee86f897bcabf0a36cc0b90ec4687a57bfa) + +commit 940dae524b0f03ad034ca19b1166278338da0ba2 +Author: Romain Vimont +Date: Fri Sep 5 11:05:12 2025 +0200 + + tools: fix libtool version check for Debian + + On Debian, the libtool version is prefixed by "Debian-": + + $ libtool --version | head -1 + libtool (GNU libtool) 2.5.4 Debian-2.5.4-4 + + As a consequence, the extracted version is incorrect: + + $ libtool --version | head -1 | sed s/'.* '// + Debian-2.5.4-4 + + causing the bootstrap script to fail: + + ./bootstrap: 31: [: Illegal number: Debian-2 + ./bootstrap: 32: [: Illegal number: Debian-2 + ./bootstrap: 33: [: Illegal number: Debian-2 + + Extract the first pattern matching NUM.NUM or NUM.NUM.NUM. + + (cherry picked from commit 42e32fb792a7d9962e35a1cc6e2e4d96c9bf7708) + +commit 76d714c3df6e4e0eeb0bbbb13fb23f7eb1aa7014 +Author: Tristan Matthews +Date: Tue Sep 9 15:57:48 2025 -0400 + + flac: handle NULL streaminfo + + Fixes https://issues.oss-fuzz.com/issues/443965736 + +commit 68522c2628db42ef250d04e14a72121c4c82a9c2 +Author: Felix Paul Kühne +Date: Wed Sep 10 21:44:01 2025 +0200 + + video_filter/amf: drop shortcut l10n + + The module shortcut name should not be translatable. + +commit 7d92d2b72d9568dc94b5a136a8e978c8e38880c7 +Author: Steve Lhomme +Date: Tue Sep 9 14:11:20 2025 +0200 + + NEWS: update for 3.0.22 + +commit 1aa8851784ee5fdbe4a40b38a3c05ecec4bcce77 +Author: Felix Paul Kühne +Date: Sat Jun 21 22:11:31 2025 +0200 + + NEWS: prepare for 3.0.22 + +commit f5f7d5ff146ab71437f79f90962d82fd8798c372 +Author: Steve Lhomme +Date: Tue Sep 9 15:51:49 2025 +0200 + + configure: prepare 3.0.22-rc1 + +commit d7a666402bd335312a819b216ce8c0e77d73a37c +Author: Felix Paul Kühne +Date: Sat Jun 21 22:11:19 2025 +0200 + + configure.ac: prepare for 3.0.22 + +commit 8d8c79b4ae37a82d6c9184cf08c3a2c73e6bacce +Author: Felix Paul Kühne +Date: Sat Jun 21 22:11:08 2025 +0200 + + doc: update for 2025 + +commit 6f1a5903b6e67360e165bd92d5095c64a151bca1 +Author: François Cartegnie +Date: Mon Feb 3 16:16:01 2025 +0100 + + contrib: dvbpsi: fix out-of-bounds read + + (cherry picked from commit 5e024041bfcb2f51bfd27d122efe2199aeeea216) + +commit 102b196643a09980be9548d50019266343662a2a +Author: Steve Lhomme +Date: Wed May 14 11:34:31 2025 +0200 + + demux: libmp4: keep stss sample numbers as they are in the file + + Adapt the only place it's used in the code to account for the -1 difference. + + Fixes #28982 + +commit 1af979fc357dfc37a9941e130c834a023c0f3401 +Author: Steve Lhomme +Date: Tue Aug 5 15:14:11 2025 +0200 + + demux: libmp4: avoid allowing an index bigger than the array contains + + It should not happen in the for loop, but better safe than sorry. + +commit 8e7503ad91bb910d787dfb5d4d0796edc6ee8f1d +Author: Francois Cartegnie +Date: Tue Aug 12 13:53:21 2025 +0800 + + codec: webvtt: early exit on empty class + +commit 28663bc783e6322bb9888ced2da0efefde980ac3 +Author: Francois Cartegnie +Date: Tue Aug 12 13:52:19 2025 +0800 + + codec: webvtt: fix heap read overflow on empty string match + + refs #29233 + +commit 8b191f39ab08f5e75760c7948de96976fb9867b2 +Author: Steve Lhomme +Date: Mon Aug 4 16:10:23 2025 +0200 + + demux: subtitle: always end the filled buffer + + strstr() expects a nul terminated string. + + Fixes https://code.videolan.org/videolan/vlc/-/issues/29235 + +commit deae8a9de6101295cd1a8f1fb83bbbc69f72e5e9 +Author: Steve Lhomme +Date: Mon Aug 4 15:40:55 2025 +0200 + + spudec: don't read Nibble past our buffer + + We read in the buffer with an offset of 4. + + Fixes https://code.videolan.org/videolan/vlc/-/issues/29234 + +commit 9e76bfac8ea86dd6fd562e479dfc4c08443bf5f4 +Author: Steve Lhomme +Date: Thu Feb 27 16:18:09 2025 +0100 + + demux: mkv: check bogus block reading + + We should not use the block data if it was not fully read. + +commit 08e35bf2baa8b6f2ae43d3c949b10e5ae9848ccb +Author: Thomas Guillem +Date: Thu Feb 27 13:28:10 2025 +0100 + + codec: webvtt: fix SEGV + + psz can be NULL, cf. CSSGrammar.y + + Fixes #29047 + +commit c91c4d467092ce86113fcd24ae263df516ad78ae +Author: Steve Lhomme +Date: Tue May 13 09:38:24 2025 +0200 + + mmx: only allocate the length we will use in mms_ParseCommand() + +commit d0b2e534ac571f697d7dbc4d70c7cde8c7259187 +Author: Steve Lhomme +Date: Tue May 13 09:34:22 2025 +0200 + + mms: check errors before allocating the output buffer in mms_ParseCommand + + And set the state when there's an error by default. + +commit 7c1b7970d3c23c7ab2120858414bacb332ab26ea +Author: Steve Lhomme +Date: Tue May 13 10:03:36 2025 +0200 + + mms: initialize the error states in mms_ParseCommand() + + The pi_used may have been used uninitialized. + +commit 1ea226583ddf79d936049a01c558ae3979ab5679 +Author: Steve Lhomme +Date: Tue May 13 09:21:22 2025 +0200 + + mms: clarify reading boundaries + + We need to take in account how much buffer is available to write. + Given we were requesting at least half our (arbitrary) buffer size, we might as + well request to fill the whole available buffer. + + This is equivalent to the previous code since i_tcp is always + > MMS_BUFFER_SIZE/2 - p_sys->i_buffer_tcp + + And i_udp is always + > MMS_BUFFER_SIZE/2 - p_sys->i_buffer_udp + +commit 8532a9dd061982709ccaa5d29f2bc4a8bb29fe81 +Author: Steve Lhomme +Date: Wed Feb 12 15:57:38 2025 +0100 + + codec: webvtt: split the code to acutally Delete webvtt_dom_node_t data + + So we don't use recursions. We only need an extra loop on the child elements + to delete. But it will not cause a recursion. + +commit 2d7b038d61060c63d7202d2e9e7fce7342062c7f +Author: Steve Lhomme +Date: Wed Feb 12 15:41:05 2025 +0100 + + codec: webvtt: always free the current node in webvtt_domnode_ChainDelete() + + It doesn't matter which type it has. + +commit 223f855408463c1916e839fb0f4708cae07f8131 +Author: Steve Lhomme +Date: Wed Feb 12 15:38:01 2025 +0100 + + codec: webvtt: inline Delete calls in webvtt_domnode_ChainDelete() + + So we can see the recursions. + +commit 9bcd86472f1d95c99a3adc5af602477e2f6d6fd7 +Author: Steve Lhomme +Date: Wed Feb 12 15:38:38 2025 +0100 + + codec: webvtt: inline webvtt_region_ClearCues calls into webvtt_region_Delete() + +commit 170f71cd7c67caf97e7aae636b47a3b29612e4b8 +Author: Steve Lhomme +Date: Wed Feb 12 16:01:20 2025 +0100 + + codec: webvtt: limit the recursive calls to GetTimedTags/ConvertNodesToSegments() + + With malicious files it's possible to overflow the stack. + 50 levels of nested tags ought to be enough for anyone. + + Fixes #28993. + + No ruby support in VLC 3.0 compared to the same patch on VLC 4.0. + +commit 2487ba279a17df733ab4d873037d6964fdafa311 +Author: Steve Lhomme +Date: Wed May 14 09:39:07 2025 +0200 + + demux: subtitle: only parse end time if it's found + + We should not parse uninitialized buffers. + +commit 8bd8a14858895d5d788bcdc8d78ae3d49682facf +Author: Steve Lhomme +Date: Wed May 14 09:32:48 2025 +0200 + + demux: subtitle: keep parsed fields private + + And we don't need to initialize them. + +commit da171a5b4a859dcf8cf5542dba7bf918a26ad343 +Author: Steve Lhomme +Date: Wed May 14 08:54:32 2025 +0200 + + demux: subtitle: avoid using uninitialized variables in ParseRealTime + + The value may have been set by previous calls but we should not use it. + +commit 2a4690a01c926ee89eafc6915ec152dd190f89b5 +Author: Steve Lhomme +Date: Wed May 14 08:44:32 2025 +0200 + + demux: subtitle: return a vlc_tick_t from ParseRealTime + + We should not mix VLC_EGENERIC and a vlc_tick_t return value. + We shift directly the value with VLC_TICK_0 when we have the value + as done in other parsers. + + The invalid -1 value is used as in other parsers. + +commit 76e98161ee8976a548981b7afbbb25272016e234 +Author: Steve Lhomme +Date: Wed May 14 08:45:20 2025 +0200 + + demux: subtitle: sort items in demux master mode + + We don't want the PCR to go back and forth. + + Fixes #29051 + +commit 87513b4cc0dc9765d50b24650db8f6ce04968b76 +Author: Steve Lhomme +Date: Tue May 13 12:03:27 2025 +0200 + + packetizer: h264: use the default ref_idx is the read value is too big + + Reference values should only go up to 31: + + > num_ref_idx_l0_default_active_minus1 specifies how + > num_ref_idx_l0_active_minus1 is inferred for P, SP, and B slices + > with num_ref_idx_active_override_flag equal to 0. The value of + > num_ref_idx_l0_default_active_minus1 shall be in the range of 0 to 31, inclusive. + > num_ref_idx_l1_default_active_minus1 specifies how num_ref_idx_l1_active_minus1 + > is inferred for B slices with num_ref_idx_active_override_flag equal to 0. + > The value of num_ref_idx_l1_default_active_minus1 shall be in the range + > of 0 to 31, inclusive. + + This is for the default values but it also applies to the read slice values. + + Fixes #29050 + +commit dcb3586658967ff5970ef4ea87f3a885e4f30b4b +Author: Steve Lhomme +Date: Tue May 13 12:03:02 2025 +0200 + + packetizer: h264: check the default ref_idx values are valid + + Reference values should only go up to 31: + + > num_ref_idx_l0_default_active_minus1 specifies how > num_ref_idx_l0_active_minus1 is inferred for P, SP, and B slices + with num_ref_idx_active_override_flag equal to 0. The value of num_ref_idx_l0_default_active_minus1 shall be in the + range of 0 to 31, inclusive. + num_ref_idx_l1_default_active_minus1 specifies how num_ref_idx_l1_active_minus1 is inferred for B slices with + num_ref_idx_active_override_flag equal to 0. The value of num_ref_idx_l1_default_active_minus1 shall be in the range + of 0 to 31, inclusive. + +commit 83f789b1be97ecd6c85f4b33a413eb8f87fa34e3 +Author: Steve Lhomme +Date: Thu May 15 13:47:44 2025 +0200 + + gme: handle es_out_Add() failure + + Ref. #29114 + +commit 5372fa64e743af30e34ec99588b96ebd5b8dbed8 +Author: Steve Lhomme +Date: Wed May 14 14:50:26 2025 +0200 + + demux: mp4: don't use the i_nztime if it's invalid + + It may be invalid when set via FragGetDemuxTimeFromTracksTime(). + + Ref. #28997 + +commit 57b68c9714416ebd2d41f41784eab220b8bae795 +Author: Steve Lhomme +Date: Tue May 13 08:45:00 2025 +0200 + + asx: fix potential null dereference + + Ref. #29114 + +commit 424aa4f6fb51e296d86d59fdc5cbdd6e16fb61b0 +Author: Thomas Guillem +Date: Thu Feb 27 13:47:59 2025 +0100 + + codec: webvtt: subsvtt: fix SEGV + + node->psz_attrs can be NULL, cf. CreateDomNodes(). + + Fixes #29049 + +commit b3453533bd35774112d2851e67e3e15a3b6c8447 +Author: Steve Lhomme +Date: Tue May 13 11:21:57 2025 +0200 + + packetizer: dts: fix busy loop with empty returned blocks + + Fixes #29046 + +commit 354cffb7a75d2bdc36fecaa095d037e71d392ee1 +Author: Thomas Guillem +Date: Mon Sep 9 16:28:24 2024 +0200 + + wav: fix use of uninitialised value + + This could lead to the wav probing to succeed without a valid fmt. + + Fixes #28772 + +commit e9f7ff2810303da1e21d716a96e27c8e5e8ebdae +Author: Steve Lhomme +Date: Thu Feb 20 11:18:15 2025 +0100 + + demux/mkv: fix header leak on error + + Fixes #29044 + +commit 331007e5c2c8e3970dec2405ade80178ca078786 +Author: Steve Lhomme +Date: Thu Feb 20 11:01:12 2025 +0100 + + demux/mkv: discard extra elements provided when reading a master element + + If this happens that means we're leaking the upper element that was found. + It's not part of the data we want to read and went further than expected. + + Fixes #29043 + +commit ae1938e7851cac5ed13ee8d9a47b6865f987e061 +Author: François Cartegnie +Date: Fri Jul 25 10:32:02 2025 +0700 + + packetizer: hevc: hvcc->annexb output prefix size is always 4 + + refs #29217 + +commit 859df557da17baeb3aaab4003e5b65276fe4449e +Author: François Cartegnie +Date: Fri Jul 25 11:33:28 2025 +0700 + + codec: cc: don't assume input size is checked by caller + + refs #29216 + +commit 532e81b9395c6ca169b7b7fe7da7104825350c6a +Author: Francois Cartegnie +Date: Thu Jul 24 23:44:21 2025 +0700 + + demux: ogg: fix potential double free + + refs #29220 + +commit f40e2df4c240659a3f4714ec576703fdb47f0fe8 +Author: Tristan Matthews +Date: Mon Feb 10 17:36:25 2025 -0500 + + demux: mkv: check earlier that current segment is valid + + Fixes #29017 + +commit 384a3b27f147bad502575fd3aab12272a5186ff9 +Author: Steve Lhomme +Date: Thu Feb 20 09:42:38 2025 +0100 + + demux/mkv: avoid casting to KaxCluster if it's not the right type + + Fixes #29042 + +commit f956e243c63616fc5cfd09a0c0db4e3238be74fa +Author: Thomas Guillem +Date: Thu Feb 13 15:13:05 2025 +0100 + + avi: fix Integer-overflow in AVI_Rescale + + Fixes #29001 + +commit ffcc2707fb8fdb13d4f6d107471e43bfee34e07a +Author: Rémi Denis-Courmont +Date: Sat Jul 13 11:49:25 2019 +0300 + + mms: fix signed warning + + (cherry picked from commit 324958967b62104375438093d08e91d8d2c70324) + +commit d8d09e7ccadc4baa5e949dd80ef13f0a8226b872 +Author: Rémi Denis-Courmont +Date: Tue Nov 20 21:15:30 2018 +0200 + + mmstu: add proper boundary checks + + This removes nonsensical arithmetic with pointer representation. + + (cherry picked from commit da4d817d41024d32580aeecb5cfc1acf6fe81dcc) + +commit 6d2de75bc8cef51615d82f548ea338d7272d6e47 +Author: Rémi Denis-Courmont +Date: Tue Nov 20 21:12:31 2018 +0200 + + mmstu: do not keep useless strings around + + They are only printed in debug at start-up. + + (cherry picked from commit 282163420fced9e638a21ff26d227b9e5bdaddef) + +commit 7485e3c70a6e28f99869f6b5a4f66d99dd750af8 +Author: Rémi Denis-Courmont +Date: Tue Nov 20 21:01:47 2018 +0200 + + mms: fix connection response string parsing + + - Do not assume 16-bits unaligned reads work. + - Do not assume little endianess. + - Do not assume ASCII strings. + + (cherry picked from commit a77e5fb55d0c32dcca07ee6067a9959caa2e4a7a) + +commit 5de04cd4b064ef93985b625e488b3a72794b34b8 +Author: François Cartegnie +Date: Wed Apr 2 17:32:35 2025 +0700 + + packetizer: dts: fix dead loop + + refs #29063 + +commit f421dd3b6c612866a5cef3a66efca37b2831d5c0 +Author: Steve Lhomme +Date: Fri Feb 21 13:34:07 2025 +0100 + + demux: asf: fix unitialized free on error + + The goto may occur before the variables are initialized, + consecutive to 3758d15c000c9ec10711ca7e9580e43ba09601df. + + Fixes #29058 + +commit d86797d6b0d6020d5b4d4df6b4ce04057541eb8b +Author: Thomas Guillem +Date: Mon Jul 7 11:23:08 2025 +0200 + + modules: packetizer: enforce type + + Backportable version of 0463a37586aceebd09c1c294446d0c3b15a5fc4b + (without any CORE API change) + + Fixes #28972 + +commit f596de79dd9fa7316db64668555aad3ec3495fcd +Author: François Cartegnie +Date: Mon Feb 3 17:32:37 2025 +0100 + + aout_ChannelReorder: always use limited range for reorder + + aout_CheckChannelReorder <= aout_ChannelReorder + + refs #28968 + +commit cc08e838cbd52a3ab9071b8f6db58cc1cc773d8d +Author: Steve Lhomme +Date: Mon May 12 14:58:49 2025 +0200 + + demux: mp4: accumulate all trun for a given track + + Before the previous array was leaking and we were writing too + far in the array. + + Fixes #28959 + +commit 5e62dbb971cb8b8de8b4778f942c971976275fab +Author: Steve Lhomme +Date: Tue Feb 4 10:00:26 2025 +0100 + + spudec: don't read/write past the RLE pixeldata + + Fixes #28960 + + No error is generated, we just store valid data. + + If we end up reading too much we will not issue a region for the subpicture. + +commit e37c298fba79f6409331268a661112c96176d15d +Author: Steve Lhomme +Date: Thu Feb 13 08:21:02 2025 +0100 + + demux: webvtt: avoid cast removing const + +commit 81b2dc3dc22c1eace7eddeb8e407904b50374439 +Author: Steve Lhomme +Date: Thu Feb 13 08:19:56 2025 +0100 + + codec: webvtt: parse timestamps as signed values + + sscanf("-1:00:27.500", "%u:%2u:%2u.%3u") returns a large for the negative value. + This happens on Windows and in Linux too [^1]. + + The returned timestamp is negative (matching what the text says). + That bogus timestamps is then discarded as invalid. + + Fixes #28994 + + [^1]: https://godbolt.org/z/YWEYzPeGq + +commit 3a6dd613c53c2e8ab7a45603c1aa7c4d34f80116 +Author: François Cartegnie +Date: Thu Feb 20 16:50:33 2025 +0700 + + codec: webvtt: fix potential NULL derefs + + refs #28988 + +commit c793ca95344cb9f97b7456fc7ba0a7fc8a49f5e7 +Author: François Cartegnie +Date: Thu Feb 20 18:04:02 2025 +0700 + + codec: webvtt: fix potential null deref + + refs #28987 + +commit 214fc295c9beac0e615dbb88e7fd01e7d5004e38 +Author: Steve Lhomme +Date: Fri Feb 14 14:59:17 2025 +0100 + + demux: mp4: read the sample description index as unsigned + + Fixes #29008 + +commit d009b5777d9ab14fc45610017ddfd44f8b65e748 +Author: Steve Lhomme +Date: Fri Feb 14 13:29:00 2025 +0100 + + demux: libavi: avoid potential unsigned shift issue + + biClrUsed is a uint32_t. + + Fixes #29007 + +commit 4beb515c8188fc6fe38bd2299e96410a272d6e6a +Author: Steve Lhomme +Date: Fri Feb 14 12:44:35 2025 +0100 + + demux: libasf: error on preroll conversion overflow + + If the uint64_t is too big, the conversion to vlc_tick_t will be bogus. + + We can't use such a huge preroll. + + Fixes #29005 + +commit 6f24087ea51b1a1a1df395868ba3656e3f7ae477 +Author: François Cartegnie +Date: Fri Feb 14 12:04:31 2025 +0700 + + demux: avi: ensure max_streams limits + + refs #28975 + +commit 298e0a838c38cefa6e423ecf0d38a2004c238874 +Author: Thomas Guillem +Date: Wed Feb 12 09:36:03 2025 +0100 + + mjpeg: fix heap-buffer-overflow + + Fixes #29009 + +commit 23f4a5ee2117059c93437036e5e74bbf3399164b +Author: Thomas Guillem +Date: Wed Feb 12 09:29:32 2025 +0100 + + mjpeg: fetch separator length once + +commit ce603eeb2fc6b03449fbf6d7deeeb40d9edb32b1 +Author: Steve Lhomme +Date: Wed Feb 12 08:43:50 2025 +0100 + + codec: webvtt: exit reduce loop when no reduction happens + + The assert was there to ensure we don't loop indefinitely on a reduction + that does not happen. + We can check directly if it happened or not. + + Fixes #28981 + +commit 87697f2a91d58217174a9876f75a086835c16ed5 +Author: Steve Lhomme +Date: Wed Feb 12 08:18:19 2025 +0100 + + demux: wav: simplify unnecessary negative checks + + And simplify associated logs. + +commit 77b4bcd772ddba4f2c125d62b3c86f131db66899 +Author: Steve Lhomme +Date: Wed Feb 12 08:10:20 2025 +0100 + + demux: wav: ensure i_frame_samples is always positive + +commit a2f4edfe9fee78918955993b11db95b70f71830f +Author: Steve Lhomme +Date: Wed Feb 12 08:15:11 2025 +0100 + + demux: wav: reject IMA with negative number of samples + +commit 96a6e495e82413737edd5ef3e5b5d4cfc8ef2325 +Author: Steve Lhomme +Date: Wed Feb 12 07:59:27 2025 +0100 + + demux: wav: reject ADPCM with negative number of samples + + Fixes #28978 + +commit 65e04179c9835b11e12af32c515ade77d9437ec7 +Author: Steve Lhomme +Date: Thu Feb 13 10:32:48 2025 +0100 + + demux: avi: return -1 for errors in AVI_PTSToChunk()/AVI_PTSToByte() + + All callsites are checked. + demuxctx.i_toread is already assuming -1 is some sort of error. + +commit dbf08d00199ab652343e1a4374453dbda943a40b +Author: Steve Lhomme +Date: Thu Feb 13 10:14:22 2025 +0100 + + demux: avi: fix potential negative chunk position usage + + If we let AVI_PTSToChunk() report errors with negative values, a positive + i_dpts may result in a negative i_chunks_count. + + We don't need to check i_dpts is positive anymore. + +commit 634d4b0d40e68c4efed2e22a14e539c08c905833 +Author: Steve Lhomme +Date: Thu Feb 13 10:10:21 2025 +0100 + + demux: avi: fix AVI_StreamChunkSet() being called with potential negative/large value + +commit ce2af8f8625807df857fbface1fa3b480a7a3e26 +Author: Steve Lhomme +Date: Thu Feb 13 10:04:50 2025 +0100 + + demux: avi: fix AVI_StreamBytesSet() being called with potential negative value + +commit cb28cb729c3b9ad8f61c4b5e5f91d45fb2dc49ce +Author: Steve Lhomme +Date: Tue Feb 11 13:10:34 2025 +0100 + + demux: avi: avoid rescaling with 0 rate + + The result would end up being 0 anyway, but since 8c59fc7af4ad5c52168cb12b8bd296c4494df345 + The newscale is also used for divisions. + + Fixes [#28974](https://github.com/FilipRoseen-refp/vlc/issues/28974) + +commit 96788d37bb477736e3907fbded27438b5a8bc907 +Author: Thomas Guillem +Date: Wed Feb 5 16:47:03 2025 +0100 + + dts: check rate and frame_length + + Fixes #28977 + +commit b6b3b8abece10ba3c0b210cd44858cedf3053288 +Author: Steve Lhomme +Date: Tue Feb 4 12:48:47 2025 +0100 + + svcdsub: avoid writing past the line pitch + + Since we add +1 to i_count, we must remove it from the max value. + + Fixes #28961 + +commit f38423a1dcf8cd1ec04feee07cf75a8b1ccbc6b0 +Author: Steve Lhomme +Date: Tue Feb 4 13:25:55 2025 +0100 + + substx3g: only replace \r on existing characters in the string + + psz_subtitle is null terminated and doesn't always have the + same size as i_psz_bytelength. + + Fixes #28965 + +commit a00cc493397765017e5f363c66c3718d7038f83f +Author: Steve Lhomme +Date: Tue Feb 4 08:07:21 2025 +0100 + + spudec: don't generate a region for 0 width/height + + Fixes #28983 + +commit 968113070af127dd9163d6ca8baa24214a1d4cbd +Author: Thomas Guillem +Date: Thu Nov 14 15:48:02 2024 +0100 + + demux: ty: check l_rec_size + + prevent that the sum of all l_rec_size don't go past the CHUNK. + + Fixes #28771 + +commit beaa2622da4f67ac13cb17fa20bc16215be7dce3 +Author: Thomas Guillem +Date: Tue Sep 10 10:14:43 2024 +0200 + + demux: ty: remove xmalloc usage in get_chunk_header() + +commit e487d82146fe442e6a1ede3ba660deab0e9b1830 +Author: Thomas Guillem +Date: Tue Sep 10 10:11:04 2024 +0200 + + demux: ty: prevent out of bound read + +commit c2808a8f8defc4db6f780a786f1b0bf5db3e319e +Author: Thomas Guillem +Date: Tue Sep 10 10:02:03 2024 +0200 + + demux: ty: check buffer size + + Prevent potential out of bound reads at the end of input. + +commit ede7bf749cd3b489d63d789363489e346c87b254 +Author: Thomas Guillem +Date: Tue Sep 10 09:47:22 2024 +0200 + + demux: ty: handle possible errors from analyse_chunk + +commit 9f2d2d2f7148d547cf0440cb8ab54ddf460e0f01 +Author: Thomas Guillem +Date: Thu Nov 14 15:32:01 2024 +0100 + + demux: ty: check i_num_recs + +commit 50cbdd05d7b3c7d826586d8d7cf26c202f4d5409 +Author: Thomas Guillem +Date: Thu Nov 14 15:31:35 2024 +0100 + + demux: ty: define CHUNK_HEADER_SIZE + +commit a74759b1de7c1ae260818ce49e7c6752c84d4838 +Author: Thomas Guillem +Date: Thu Nov 14 14:49:41 2024 +0100 + + demux: ty: define REC_SIZE + +commit a78e408365bd2975b9a670524192604671cc8f67 +Author: Thomas Guillem +Date: Mon Sep 9 13:03:39 2024 +0200 + + demux: ty: fix leak in case of error + + (cherry picked from commit 02921db96886fd82f94efa72fbbe4c1b7f32e5c4) + Signed-off-by: Thomas Guillem + +commit 40395e7beb958451344a11f2155dedbc17a0ded7 +Author: Steve Lhomme +Date: Mon Jun 27 08:59:01 2022 +0200 + + ty: replace skip size comparisons by skip size equality check + + Compiler may generate better code and we really want to skip exactly that + amount. This will also bring some consistency with the other + vlc_stream_Read(NULL) callers. + + (Partially cherry picked from commit e889e7326b3dcba59e290d82050527b1f54d6e53) + Signed-off-by: Thomas Guillem + +commit 3e8d17d7a329f968f5fc6bbc6c0c5f96d6aca425 +Author: Rémi Denis-Courmont +Date: Sat Jul 13 12:02:52 2019 +0300 + + ty: fix signedness warning, missing limit check + + (cherry picked from commit 9bd797a5c408da38551eb3269f9bfad141894059) + Signed-off-by: Thomas Guillem + +commit 00d35e21e301415d59272e1b393955f529c0d5c8 +Author: François Cartegnie +Date: Mon Dec 24 12:01:01 2018 +0100 + + demux: ty: fix all warnings + + (cherry picked from commit 52dbf22859e581fa5af74600247e9a0340d47c38) + Signed-off-by: Thomas Guillem + +commit 9f1d03dd3cdcb2372f9e1a84c308442ba2ea25b6 +Author: Steve Lhomme +Date: Tue Sep 9 13:31:19 2025 +0200 + + CI: generate a Windows arm64 release build when tagging + +commit 2ad9fa6c3ea287bc53e0d4495d72afae7cfd8e3a +Author: Steve Lhomme +Date: Tue Sep 9 13:29:27 2025 +0200 + + CI: move Windows arm64 UWP_EXTRA_BUILD_FLAGS in variables-win64-arm + + They enable + - minimum Windows 10 17763 Redstone 5 1809 (0x0A000006) + - UCRT build (since we require Windows 10+) + - extra compilation checks + +commit 6086337dbfa4fb6b0b8d0d192de6bba536f19c92 +Author: Steve Lhomme +Date: Tue Sep 9 13:21:54 2025 +0200 + + CI: move Windows arm64 VLCARCH in variables-win64-arm + +commit 827794605f744ac65ab8b40c057dc81c4177cc6e +Author: Steve Lhomme +Date: Fri Sep 5 10:19:20 2025 +0200 + + CI: update Windows LLVM UCRT image to LLVM 19 + + Based on Debian trixie and contains mingw-w64 v13. + + It's used for the Windows arm64 builds. + +commit 9c7a33dc7379237579e8a460b231b7c5fa45f1a5 +Author: Steve Lhomme +Date: Mon Sep 8 10:10:05 2025 +0200 + + Update PO files for pending 3.0.22 + +commit 8fffdf01adcaf9a7fd68a1e9e0fe27b5e068495f +Author: Steve Lhomme +Date: Mon Sep 8 11:44:36 2025 +0200 + + POTFILES.in: add missing fingerprintdialog.h from Qt UI file + +commit a9d69ddd923176f6722e2dcdd68d113198b463bf +Author: Tristan Matthews +Date: Thu Sep 4 07:51:07 2025 -0400 + + demux: mkv: fix formatting of debug info + + (cherry picked from commit 9d1342e3952c52842761efd279f4cf0bf419fce6) (rebased) + rebased: + - the code around doesn't use vlc_tick conversions + +commit a8411f9c2be402eb0004c88f552c553ddfbdc067 +Author: Steve Lhomme +Date: Thu Feb 15 07:26:27 2024 +0100 + + contrib: gmp: update to 6.3.0 + + It should be handling arm64 much better. + + (cherry picked from commit 9a078736ce748c4cf2935c4c3b9368922ea5a0a3) + +commit 17e0a294dbdc5841ecb9c364e104a4295b5ff196 +Author: Marvin Scholz +Date: Wed Feb 23 18:23:20 2022 +0100 + + contrib: update gmp to 6.2.1 + + (cherry picked from commit baf4be7ca6080aad8bffc3f03e5b7f821ca2b6b0) + +commit adea2f6a14a43f216c754f25afe5fe3457877f6e +Author: Steve Lhomme +Date: Mon Jun 25 14:12:43 2018 +0200 + + contrib:gmp: do not try to detect assembler format when assembler is disabled + + (cherry picked from commit 0feb493b2146493b32e74bc4f49cd768d25562e5) + +commit 4997358dabec1bbef47446ab1d7fed7c6eeb6687 +Author: Steve Lhomme +Date: Thu Sep 4 10:46:26 2025 +0200 + + contrib: gmp: build all code before installing for autotools contribs + + If the contrib install sub-directories it may install some and fail later. We + should only install when we know everything built correctly. + + Do each build step in a separate make line. + + Similar to 8a2109a3947ef513e64e9ccae4f85e9399a7d243 for gmp without the macros. + +commit b9865af9ee3a4605be58f80099cdfa4b34a7a218 +Author: Steve Lhomme +Date: Wed Aug 27 08:11:49 2025 +0200 + + contrib: harfbuzz: update to 11.4.4 + + In the 3.4.0 update commit 6e3bfdbf1157133dc41ebcdb65d9d7b56e182ec2, + the 4.0 version was described as having massive API changes. However + libass, our plugin and Qt all build fine with this version. + + Debian trixie uses 10.2.0 [^1]. + + [^1]: https://packages.debian.org/trixie/libharfbuzz-dev + + (cherry picked from commit 775a1047bf29aefbc24ca4594ef4874cd963b1ba) + +commit 7dedd030a80c8233abc6c5845b30f8ace669ef98 +Author: Steve Lhomme +Date: Thu Apr 18 07:23:56 2024 +0200 + + tools: don't build ragel + + It's only used by harfbuzz which has its own internal version. + + (cherry picked from commit c0470455a92077db5b840d5bd31f3dc45e95e7d4) (edited) + edited: + - the code around is slightly different + +commit 21ca61bd86515d3f5d457233fa81720f8cc0ab5c +Author: Steve Lhomme +Date: Thu Apr 18 07:22:35 2024 +0200 + + contrib: harfbuff: build internal ragel if not found + + (cherry picked from commit 071a7581ff4e7366972218e340abfe6e6c2c1686) + +commit 10b100d458c0340cf42ceae093b1baf7981b3102 +Author: Steve Lhomme +Date: Mon May 13 10:07:08 2024 +0200 + + contrib: harfbuzz: build ragel as a native tool + + Fixes #28634 + + (cherry picked from commit 8c9891d4bb7f7c146abb17606e7528f6d0209ea3) + +commit dc67166f3ff9dec236f1296a993005217e63a52c +Author: Steve Lhomme +Date: Mon Aug 25 15:24:23 2025 +0200 + + contrib: libbluray: update to 1.4.0 + + (cherry picked from commit 87cb4d8687ce08cb8004221f37d6908c772297a8) (edited) + edited: + - the autoconf usage was updated in 3.0 but now we use meson + +commit dee10a9e86d53f271aec7d8fc6797ce041814cf3 +Author: Steve Lhomme +Date: Wed Jun 5 15:51:27 2024 +0200 + + contrib: bluray: remove internal header installation + + We don't use the hack anymore. + + (cherry picked from commit 804acaed6762e0213ab263fb6e203a185c7a4cb1) (rebased) + rebased: + - the code around the patch is different + +commit a812c7f2aec2292498f3da0d9911c7ddf1fd9283 +Author: Pavlov Konstantin +Date: Fri Apr 12 22:45:51 2019 +0300 + + contrib: bluray: drop unused configure switches + + (cherry picked from commit a2ce74c34a7da04a63552c94f8d30ec28d834a0a) + +commit 52607b44a1ac1ecdcc847a35d2b075d669ab7c45 +Author: Steve Lhomme +Date: Wed Aug 13 12:55:42 2025 +0200 + + access: dvd: don't pass 0 as a pointer + + (cherry picked from commit 49636827b8b95a396e94a8ebc0aa236dad4afa32) (edited) + edited: + - 3.0 has one less parameter + +commit f84aaa42ea3de88de3283941d1e1adc3f3a2f85c +Author: Steve Lhomme +Date: Wed Aug 13 12:35:34 2025 +0200 + + demux: ps: simplify else after return + + (cherry picked from commit b3e2686885822234e477626d230f3779677c3ea5) (edited) + edited: + - the code around is slightly different + +commit ebf9dde38c206d7f931bdd95b2c66acbb9a0476a +Author: Steve Lhomme +Date: Tue Aug 12 15:57:53 2025 +0200 + + dvdread: use VOB packet ID mask to get stream ID + + (cherry picked from commit a7ff6e36163a421e788bfddda7c961d62a39a9b7) + +commit c9fd36841a96bc65b2cc5fd81d7eb6f7b91f4401 +Author: Steve Lhomme +Date: Wed Aug 13 07:41:31 2025 +0200 + + demux: pes: document magic value + + (cherry picked from commit 6c8f9130b3c804f24d443493d4688ff18316f9fd) + +commit 6b668629bfadcc7beaee101d0207bf2ab131dc1b +Author: Steve Lhomme +Date: Tue Aug 12 15:56:03 2025 +0200 + + demux: ps: use VOB/AOB MLP packet IDs for detection + + (cherry picked from commit f7fd7a0b159c5270818e6781622da399d2b85bdf) (edited) + edited: + - 3.0 had the tests on the same line + +commit 3bf1baa221580edae80c3bbe8cdf8abdc53421f0 +Author: Steve Lhomme +Date: Tue Aug 12 15:55:10 2025 +0200 + + demux: ps: use stream ID defines to check packet header type + + (cherry picked from commit 1c7d2fe048810d29e1b2aa4e144b7945d29b3615) (edited) + edited: + - 3.0 has different names for the defines + +commit 39916c7ee0eeca65c0a4ee54bf76fe241ad2817f +Author: Steve Lhomme +Date: Tue Aug 12 15:54:06 2025 +0200 + + demux: ps: use packet ID masks based on the stream type + + (cherry picked from commit ee6f973d6d0a2be7f49f737411dd94d13733d707) (edited) + edited: + - 3.0 use p_pkt->p_buffer in ps_pkt_id() + +commit c8c6b4d1cf5b219dac464c5e7c91d06b1d61a142 +Author: Steve Lhomme +Date: Tue Aug 12 15:53:01 2025 +0200 + + demux: ps: use MLP packet IDs to check detect AOB or VOB + + (cherry picked from commit c0e2a4ad7fccda0b3d771dfb0bc62eabbc773363) + +commit ad9c14bb87f2690cddecb2a201143b91125540aa +Author: Steve Lhomme +Date: Tue Aug 12 15:51:49 2025 +0200 + + demux: ps: use packet ID mask to check for type of track + + (cherry picked from commit 0669884799d9bc2715a01523bd004f2fb6e946f7) + +commit 839349336776346345b1d73d981d8c072b671196 +Author: Steve Lhomme +Date: Tue Aug 12 15:50:43 2025 +0200 + + demux: ps: use the packet ID mask to check track IDs + + (cherry picked from commit db15b02d8d92dba07e3b923f10c4ddbdfbb400c8) + +commit f03f3b2941eb9485440054cf432d61f6a8f491ba +Author: Steve Lhomme +Date: Tue Aug 12 15:49:32 2025 +0200 + + demux: ps: add defines for packet ID values + + (cherry picked from commit 8c2f94fd30497473a3a04c8ad79051223e8751c0) + +commit 6999a3c99ee8a335f3d3c72f884f4099a6a9b27d +Author: Steve Lhomme +Date: Fri Sep 5 06:46:05 2025 +0200 + + tools: require meson 0.60 + + This is needed for newer harfbuzz and possibly other contribs we should backport. + +commit b9e3d51b5cf55129fc5d5b0a4132d0407ff0130c +Author: Felix Paul Kühne +Date: Fri Jul 22 11:55:19 2022 +0200 + + extras/tools: update meson to 0.63.0 + + (cherry picked from commit bb18231acda9a8983a8a765d2e00701be045b141) (rebased) + rebased: + - the sha512 around are different + +commit 5272a87d23364e09fe1a730c8f5971b58746c81e +Author: Steve Lhomme +Date: Fri Sep 5 14:57:23 2025 +0200 + + extras: snap: build all tools at once in parallel + + We don't build CMake anymore so we don't have dependency problems. + +commit fe4ab67e2d784bd92d41c8ff5fd3944ab12b07e7 +Author: Steve Lhomme +Date: Fri Sep 5 14:12:40 2025 +0200 + + extras: snap: force using local ninja + + The vlc-ubuntu-bionic:20250904134924 contains ninja-1.13.0.git.kitware.jobserver-pipe-1. + It supports jobserver as a client like the old kitware fork. But it only + does so when combined with GNU make 4.4. + + It seems to mess the job sharing in the CI so use the one that is validated + with old GNU make versions. + +commit 063c3285c0eeccb535681466519a6afc4a4bc253 +Author: Steve Lhomme +Date: Thu Sep 4 11:10:45 2025 +0200 + + CI: update snap image + + It contains python 3.8 and CMake 3.7 + protoc 3.10. + +commit 373a6c17314f9eab3a20ed7ba0a5aac245835098 +Author: Steve Lhomme +Date: Wed Sep 3 11:31:47 2025 +0200 + + CI: update mingw64 gcc images + + These images were for 4.0 but are not used anymore there (LLVM or gcc-posix). + They are based on Debian bullseye, rather than Debian stretch in the previous + images. + + They correspond to the last commit before upgrading protoc to match VLC4. + gcc is version 11, mingw-w64 is v10. + +commit 262a5d95f5f6f23ec7fd9aef02bcd5c36dae5fb2 +Author: Steve Lhomme +Date: Tue Sep 2 09:08:18 2025 +0200 + + win32: inhibit: restrict SystemParametersInfo calls to Windows XP + + As mentioned in !7651 the 2 different APIs we use may race each other. + So we select one based on the OS uses. + + We use the same detection for XP vs Vista as already done in D3D9. + + Co-authored-by: Icham AIDIBE + +commit 9af12a6e8240b89da4d9c2ff7e031bff9fc6c829 +Author: Felix Paul Kühne +Date: Sat Aug 30 20:15:46 2025 +0200 + + contrib/live555: use VideoLAN mirror instead of upstream + + Apparently, they decided to remove all previous packages from their server. + + (cherry picked from commit b194800fc45d2afc6cb97965285a6ca4885b9a1c) + +commit dfbec325520e36c83775c74120fdb3e5e38f35f6 +Author: Steve Lhomme +Date: Mon Aug 25 09:34:07 2025 +0200 + + contrib: cddb: fix more gcc 14 issues with mingw-w64 + + (cherry picked from commit 3dc740c6547441769500e8b4f9af1db8d5c2fc76) + +commit 9e6dd813d2bd4d70dfe26fe9c91fe3445bf5c49b +Author: Steve Lhomme +Date: Mon Aug 25 08:35:54 2025 +0200 + + contrib: use ftpmirror for GNU packages + + It's less overloaded and the recommended URL [^1]. + + [^1]: https://www.gnu.org/prep/ftp.en.html + + (cherry picked from commit 0150e3d5cfd0344d00391ad09f6b9585f9d4b495) (edited) + edited: + - 3.0 did not switch to https + +commit 73bad97d8df909a0312faf3194aea6b5ec6fe0e2 +Author: Steve Lhomme +Date: Mon Aug 25 08:39:11 2025 +0200 + + contrib: gnutls: update to 3.8.10 + + It builds properly with gcc 14 mingw-w64. + + (cherry picked from commit 20cb70f22beb160eff022ae69ed3e23c373936f8) + +commit 7bc5e75d46c072e3fb891fc0e5fde1bf4790e77f +Author: Steve Lhomme +Date: Wed Aug 27 08:35:14 2025 +0200 + + CI: update windows LLVM target with mingw13 + + So we have a target (windows arm64) with an up to date toolchain. + +commit 810a90f8fad62aca7324dfbbb84c8e7de10cb971 +Author: Steve Lhomme +Date: Wed May 14 13:03:11 2025 +0200 + + xiph_metadata: ensure the tracks metadata are valid numbers + + They are already parsed as unsigned values in the TRACKNUMBER field. + The UTF-8 check was removed from these fields in dfdc98f72edafc586f5a531f9071461d0d68a314. + If we turn them into a valid integer (when they are) we have safe UTF-8 data. + + Ref. #28976 + + (cherry picked from commit 63c36ef5af18366f38c7229d653a9e29eead7f06) + +commit bad977d0342751fcbcb8d885226ce5fbd8bbffd0 +Author: Steve Lhomme +Date: Fri Aug 22 11:32:51 2025 +0200 + + demux: mkv: factorize code to read a whole master element + + (cherry picked from commit 6a9d6e8e92527853a8c0fde4069411cd0fe07614) (edited) + edited: + - 3.0 doesn't read tags fully in memory + - 3.0 doesn't have an internal b_seekable flag + - 3.0 doesn't know about demux_sys_t in the header so move code in .cpp + +commit 1e8f353b4a8bc076bdc83ed685593fb7d2aaf0bd +Author: Steve Lhomme +Date: Fri Aug 22 11:51:17 2025 +0200 + + demux: mkv: remove unnecessary cast + + (cherry picked from commit 0fe8906c08593379f713cee634dddb5e6c66de58) + +commit 8e85ff80a7ea8299cbf9672b7530ebdbaddbf162 +Author: Steve Lhomme +Date: Fri Aug 22 11:48:05 2025 +0200 + + demux: mkv: allow dummy elements inside KaxBlockAdditions + + There might be new elements that libmatroska doesn't know about. + It's better to assume they are new elements rather than bogus data. + This is how we read elements in general to be forward compatible. + + (cherry picked from commit 30ec492274356c7c5795d3d3a87dd06e943b8253) + +commit 98b5a0b27f8a2a876c029fef4f78a901bbb100b8 +Author: Steve Lhomme +Date: Fri Aug 22 11:06:58 2025 +0200 + + demux: mkv: release upper EBML elements when reading an element in memory + + The element is created but we don't use it. + + Fixes #29260 + + (cherry picked from commit 74407acf6547bdd644063d739c54c4b421661d22) (edited) + - 3.0 doesn't read tags fully in memory + +commit 49aa2af76c55e3badfd00d2d958225589d3d7733 +Author: Steve Lhomme +Date: Fri Aug 22 11:05:15 2025 +0200 + + demux: mkv: use local upper element handling + + We don't need to keep the data in the parser. + + (cherry picked from commit f2b070a8ef74407777896cd6b702ee2c72e07fae) (edited) + edited: + - 3.0 doesn't keep the duration + +commit 30f31c7ed61cf7ac57a7b2fd108338c75a258b89 +Author: Steve Lhomme +Date: Thu Jul 31 15:01:29 2025 +0200 + + demux: voc: limit the maximum sampling rate to 768000 + + Fixes https://code.videolan.org/videolan/vlc/-/issues/28978 + + (cherry picked from commit dd8256bfdb821871b7e25e32d5fb325cb679c5e6) + +commit b698111aa1cf0e36543189b6980804703bcbf862 +Author: Steve Lhomme +Date: Thu Jul 31 14:28:41 2025 +0200 + + demux: voc: check the number of channels read is usable + + (cherry picked from commit 34057a6d9d0e8de667c4bc7fe0960582061623f7) + +commit d69cf45d305efb86c9158f957539fc770a62e96a +Author: Steve Lhomme +Date: Thu Jul 31 14:20:32 2025 +0200 + + demux: voc: remove unneeded mulitplying by 1 + + (cherry picked from commit aa19e5e63463df006a97f54b7a52b12164a76809) + +commit 2b73b4e0a6c0c8ef9ccd1313bce30a2ce6c3ba46 +Author: Hugo Beauzée-Luyssen +Date: Tue Mar 6 16:32:16 2018 +0100 + + voc: Reject blocks with a 0 samplerate + + (cherry picked from commit 74b68b0f3b64096bc4b48a4eacf5204b85b508e8) + +commit 9a1b2e837486e48438cf5bfcb15f0bc29ce52c94 +Author: Rémi Denis-Courmont +Date: Thu May 3 12:07:27 2018 +0300 + + voc: check ES + + (cherry picked from commit 0d12b150747911a1facb869b4d1d78b9f287cdb4) + +commit d8973ad341a352addfd6344cde15214431a8aa2d +Author: Steve Lhomme +Date: Wed May 14 13:32:39 2025 +0200 + + demux: avi: cut QNap title on first invalid character + + We should only use valid UTF-8 metadata. + We don't know if this is supposed to be ASCII, UTF-8 or something else. + This is the same code as EnsureUTF8() except we cut the rest of the string if it's invalid. + + Ref. #28976 + + (cherry picked from commit 9c5ea58677b9f86e278a4c2c0b0fa738bf72ccd4) + +commit 437869892f53c21da183abfaa3ccd4d66c8458d9 +Author: Steve Lhomme +Date: Mon Aug 18 07:08:54 2025 +0200 + + demux: mp4: use the p_mvhd::i_duration once + + So it's clearer they are all the same value. + + (cherry picked from commit 8753b281ba36378ab2803a5419b9c0713b26a389) + +commit 5539dab2ada4dae2eb7d36331875135ad8555923 +Author: Steve Lhomme +Date: Mon Aug 18 07:07:19 2025 +0200 + + demux: mp4: add sanity check on duration + + The duration is coded on 4 or 8 bytes as unsigned. But it is converted to signed + in the MP4_rescale() which creates bogus computation. + A scaled duration should likely never reach INT64_MAX. + + Fixes #29256 + + (cherry picked from commit 5983df5c1fd5f86f895a1cc35e27c3de050d294e) + +commit 12c232514def241d81bc4a5358043048d73c52a4 +Author: Steve Lhomme +Date: Mon Aug 18 11:13:42 2025 +0200 + + demux: pva: avoid using data that were not read + + We only use up to 14 + 1 + 5 bytes in the data we peek. + + We need at least 9 bytes to read the amount of data to skip. + + (cherry picked from commit d92f1d5ea463d08f06f9c3634b2713e7f344fc40) + +commit 214783ab790ae84883cf692f41aee932eea186c9 +Author: Steve Lhomme +Date: Mon Aug 18 11:07:26 2025 +0200 + + demux: pva: move the timestamps reading after the block is created + + No need to do it before and check for errors later. + + (cherry picked from commit fa9ae6e57af6670bfab68451a6cf7ce515387a20) (edited) + edited: + - 3.0 doesn't have the MPEG timestamp helpers + +commit a79c2014d053805e77f60e4637d8486d16903fbf +Author: Steve Lhomme +Date: Fri Aug 22 17:01:17 2025 +0200 + + demux: pva: fix PTS computation + + On 4.0 the MPEG macros are used since 65838ea0fee8d7634cb00baf1310478b56bbd8b1. + The last part uses an offset of 4 in the buffer. This is also the case + for the computed DTS in 3.0. + +commit 8e148227c552b218cbe365d42f9cf60b5fb9f008 +Author: Steve Lhomme +Date: Tue Aug 19 08:08:03 2025 +0200 + + demux: ps: define what flavor of PS streams can be expected + + Between VOB and AOB files the 0xa0->0xaf substreams may be used + with different codec or different encapsulation. + There is nothing in the data to really distinguish them. But when reading + either of those files we know if the file we opened is a dvd, dvda, .VOB, + .AOB or something else. + + This will break detection of MLP in AOB files that are not named *.AOB. + But it was already broken in a different way by checking a certain value. + + In any case DVD sources will be considered as DVD unless it's marked as + coming from DVD-Audio. + + The DVD-Audio support in dvdread is commented out and will have to be + uncommented when DVD-Audio support is added. + + (cherry picked from commit 1ae5b0b8d4c67a74d9f98d84aad78b4f38a4cb8c) + - 3.0 uses a block_t rather than buffer+size + - the code around is slightly different + - the 0xa001||0xbda1 check is done on one line ine 3.0 + +commit 40adda7810b22a6c1e05b32d154c96f9ab99f27b +Author: Steve Lhomme +Date: Wed Aug 13 08:49:12 2025 +0200 + + demux: ps: relax the test for LPCM AOB detection + + The 0xc0 check was added for MLP in 7e3972c490bf6de6db0050dc05a3a6974dd12d88 + + Verified on a VOB with LPCM, p_pkt[i_start + 6] is always 0x80. + libavformat has the same test to detect PCM [^1]. + + [^1]: https://code.ffmpeg.org/FFmpeg/FFmpeg/src/6dd83fab44ca309b02b4ca1baea3ca9ed8b6180f/libavformat/mpeg.c#L517 + + (cherry picked from commit 7b0b957ece321cadb215a07c47629f8d2853c751) (edited) + edited: + - 3.0 uses a block_t rather than buffer+size + +commit 9c01af2b752a17ba0aa9f9f6e99b1a6617121b4d +Author: Steve Lhomme +Date: Wed Aug 13 08:42:30 2025 +0200 + + demux: ps: split LPCM/MLP AOB detection + + In AOB files LPCM is always 0xa0 and MLP always 0xa1. + + (cherry picked from commit 3d0669c368ce8f64eaa5987eb82f85747aba1eca) (edited) + edited: + - 3.0 uses a block_t rather than buffer+size + +commit 7fdc139ef5bdd96d8e58f82fc709df8104aeb030 +Author: Steve Lhomme +Date: Fri Aug 22 16:38:48 2025 +0200 + + contrib: caca: use MAKE contrib macros + + Otherwise it builds more things that we don't need. + +commit b608cace7e81f0df8c64db8eff790e5d56c82d03 +Author: Steve Lhomme +Date: Fri Aug 22 16:37:11 2025 +0200 + + contrib: libmpeg2: disable subfolders we don't want to build + + Selecting the folder to run make doesn't work, nor passing SUBDIRS directly + as it's also used in subfolders. + +commit 4ce93430234330ab7d5ef15b6dfd864e75e150cb +Author: Johannes Kauffmann +Date: Sat Aug 16 17:04:50 2025 +0200 + + contrib: dvdnav: update title parts patch from upstream + + The patch was updated upstream. + + (cherry picked from commit c149deb2c7c16318f85376a3fe95769a07b04781) + +commit d9a89e481c13a9a020968673f5fbfb1d9170c8ec +Author: Steve Lhomme +Date: Tue Jun 10 14:13:55 2025 +0200 + + demux: wav: check the size of the fmt chunk is legit + + WAVEFORMATEX.cbSize represents the size of data after the WAVEFORMATEX structure [^1]. + It is coded on a uint16_t so the size of the WAVEFORMATEX plus its extra data + can never exceed sizeof(WAVEFORMATEX) + UINT16_MAX. + + Fixes #29004 + + [^1]: https://learn.microsoft.com/en-us/windows/win32/api/mmeapi/ns-mmeapi-waveformatex + + (cherry picked from commit d5ab4348ed214174c2f3c50549c7e28acda3b223) + +commit 32028657178123df1f148b9c508499adf066ab08 +Author: Steve Lhomme +Date: Tue Aug 12 11:26:43 2025 +0200 + + demux: mpeg: cast to vlc_tick_t early + + So we can pass smaller type and not overflow. + + (cherry picked from commit 031b57d6ad2275f8fa2e35d3fbbed918745830c3) + +commit 4294c905d60f34336eb9c194295a39d584976a95 +Author: Steve Lhomme +Date: Thu Sep 20 13:04:04 2018 +0200 + + demux:mpeg: make sure FROM_SCALE_NZ() returns a vlc_tick_t + + (cherry picked from commit c58f46eec96045389f20e4b9bea79d47974b9cc3) + +commit aa5acb3629b79b4708a894ab97eee989c3de5362 +Author: Steve Lhomme +Date: Mon May 7 14:17:19 2018 +0200 + + bluray: use common MPEG timestamps macros + + (cherry picked from commit 8da763f888b3b17b2f3dd596b5fbae3bae3ed3a0) (edited) + edited: + - timestamps.h was already included in f97c70a9b38c0dae8803b16381b236330cdb2ab6 + +commit 285ab70a5aba325f39f0adf4c8272a7fac7e98ca +Author: Steve Lhomme +Date: Mon Aug 4 15:02:31 2025 +0200 + + demux/mkv: fix header leak on error + + Fixes https://code.videolan.org/videolan/vlc/-/issues/29044 + + (cherry picked from commit e6ea9b6049faa430dab97d3c657cc9cfa2f3fa1f) + +commit 49307128534c4bb3a554734ac40e32bd2d04a80d +Author: Steve Lhomme +Date: Thu May 23 10:59:58 2024 +0200 + + contrib: gettext: don't build command-line tools when cross-compiling + + We may need a separate target for the native tools. + + (cherry picked from commit 5b154d9b0e6a16ba96160d11ce0490b1dec9ad78) + +commit 8040ca6f09d0e742ccb713f6bc54c7933bf2a67a +Author: Martin Storsjö +Date: Tue Jun 24 17:46:21 2025 +0300 + + contrib: gettext: Fix building for older macOS versions + + Work around the fact that gettext/gnulib tests for functions + without using headers, by manually marking a bunch of functions + as unavailable. + + The function openat is extra tricky, because the gnulib functions + themselves unconditionally use openat (expecting to either get it + from the system, or from a gnulib polyfill). When using that, + it would see both declarations of openat, both from the system headers + and from gnulib. In that case the system headers still indicated that + the function is unavailable on 10.7. + + Rename the function while including the system header, so that we + only see the gnulib replacement declaration. + +commit c738b90eebc463514904cf4b5809e9dda9e59c93 +Author: Steve Lhomme +Date: Thu May 23 07:57:48 2024 +0200 + + contrib: gettext: update to 0.22.5 + + (cherry picked from commit c548ff625dd81940d633fe97f8d7592869ae32d7) + +commit 3aba712d499c75c35f3602330ddcd624f2bd4069 +Author: Steve Lhomme +Date: Fri Jun 30 09:30:05 2023 +0200 + + contrib: gettext: add local unistd to reuse textstyle.h + + On Windows fsync is not declared, we need a header that declares it, + from gnulib. + + (cherry picked from commit 3dac9ffa929a1a517e9b29df22c96f55259156a8) + +commit 159c7142025743774a1a5c735d8057b469d898e2 +Author: Steve Lhomme +Date: Fri Jun 30 07:41:01 2023 +0200 + + contrib: gettext: don't build libasprintf on Linux/mingw-w64 + + They have native support for it. + + (cherry picked from commit 07bca76d365a53239a8fb563505235aa46742e99) + +commit cd508c0607478c1b9460c7160c7fe6407bef4799 +Author: Steve Lhomme +Date: Tue Jun 27 08:29:27 2023 +0200 + + contrib: update gettext to 0.22 + + (cherry picked from commit dd4338525b711433d057e7f9c512835ca926f632) + +commit e17734149bfe7d681d1256dbf812148d19230da4 +Author: Steve Lhomme +Date: Thu Sep 15 13:17:45 2022 +0200 + + contrib: gettext: remove extra CFLAGS with no extra + + It's already part of HOSTVARS. + + (cherry picked from commit 6fa63706dfedd77f28a8b3396d76bf951cfe8641) + +commit 3ad5c847fe3337149c182b84c2b1984df5086aa9 +Author: Martin Storsjö +Date: Fri Aug 12 11:13:49 2022 +0300 + + contrib: gettext: Backport a gnulib patch to fix building on Clang 16 + + Clang 16 made implicit function pointer conversions in C an error + (which previously was only a warning). + + This backports the following change from upstream gnulib + to the version of the files bundled in gettext: + https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/obstack.c?id=0cc39712803ade7b2d4b89c36b143dad72404063 + + This fixes errors like these: + + obstack.c:351:31: error: incompatible function pointer types initializing 'void (*)(void) __attribute__((noreturn))' with an expression of type 'void (void)' [-Wincompatible-function-pointer-types] + __attribute_noreturn__ void (*obstack_alloc_failed_handler) (void) + ^ + + (cherry picked from commit 2afe251d735b03c030dcd227a9a51fc7d426b7c0) + +commit cf5ce9db69e4973b09927b90e40fb485274b109a +Author: Jean-Baptiste Kempf +Date: Sun Feb 20 17:04:21 2022 +0100 + + Contribs: update gettext to 0.21 + + (cherry picked from commit 5494afa0e9df55cd92982e81e516c2e26e965be8) + +commit 0c74bb94ad352da2794ccc5b65fcd6120a917e54 +Author: François Cartegnie +Date: Wed Sep 6 15:00:42 2023 +0700 + + demux: webvtt: fix style/header leak + + (cherry picked from commit b7c8649644a3806bf9e24637e466474bf4710d64) + +commit 87f3a6424d5de64968ed324c3f0eef8895456847 +Author: François Cartegnie +Date: Mon Jul 28 15:17:39 2025 +0700 + + packetizer: h264: check range for delta_scale + + refs #29224 + + (cherry picked from commit 5cf0e2af37846baf1d6fa60a94b47cb4e450471f) + +commit a0338747da84fc543bf9d4115acbb7a7f66ee131 +Author: Steve Lhomme +Date: Fri Jul 25 14:48:31 2025 +0200 + + contrib: ebml: fix leak of upper elements + + This can happen in damaged files. Undamaged files are unaffected. + + Sent for review upstream in https://github.com/Matroska-Org/libebml/pull/321 / https://github.com/Matroska-Org/libebml/pull/322 + + (cherry picked from commit cace91aebc7c1fc7dffecd8c88992a49b8e9438a) + +commit 8c62ca272d8f907c7e344c473776e12d2f2451dc +Author: Johannes Kauffmann +Date: Sat Dec 3 22:19:27 2022 +0100 + + contrib: freetype: actually disable bzip2 + + Regression from d9c9482b253762312bcb5c0ab5043e34bb23575f. + + This fixes linking on macOS with static Qt from contribs: + + Undefined symbols for architecture x86_64: + "_BZ2_bzDecompress", referenced from: + _ft_bzip2_file_fill_output in libfreetype.a(ftbzip2.c.o) + "_BZ2_bzDecompressEnd", referenced from: + _ft_bzip2_stream_io in libfreetype.a(ftbzip2.c.o) + _ft_bzip2_stream_close in libfreetype.a(ftbzip2.c.o) + "_BZ2_bzDecompressInit", referenced from: + _FT_Stream_OpenBzip2 in libfreetype.a(ftbzip2.c.o) + _ft_bzip2_stream_io in libfreetype.a(ftbzip2.c.o) + ld: symbol(s) not found for architecture x86_64 + + (cherry picked from commit 0f6b7fab25d8c79f078b0c7b7a98ea4ebe3e2b5a) + +commit b46561576c641984171ff714598b412fbc6d66c9 +Author: Steve Lhomme +Date: Mon Sep 26 12:41:42 2022 +0200 + + contrib: freetype2: disable building doc and brotli + + Fix regression from d9c9482b253762312bcb5c0ab5043e34bb23575f + + Ref. #27365 + + (cherry picked from commit 0afd81965307eb0b767538e9506a3c03661accb6) + +commit 47737025415823b484303919e2a73e55769e6315 +Author: Steve Lhomme +Date: Tue Sep 13 12:09:17 2022 +0200 + + contrib: freetype2: build with CMake + + So we don't use a home made build system that doesn't allow out of tree builds. + + (cherry picked from commit d9c9482b253762312bcb5c0ab5043e34bb23575f) + +commit 7954edabe247681aaacd97ecbd660910ac88d9f3 +Author: Tristan Matthews +Date: Mon Jul 28 11:23:28 2025 -0400 + + contrib: png: update to 1.6.50 + + (cherry picked from commit debf83ba467c2c302510acdfa4b5ef9049678fae) + +commit 29b00a3c0e7e880d6c4bc40b16e53a1414e4011f +Author: Tristan Matthews +Date: Wed Jun 25 07:13:32 2025 -0400 + + contrib: png: update to 1.6.49 + + This release "includes a fix for a floating-point bug in the setter of the mDCv chunk." + + (cherry picked from commit 2d3763a8780ca48ec415f11708d81110fa60558a) + +commit d03d8e7f583e81010a09a9da4a0dbb84d0d077e1 +Author: Tristan Matthews +Date: Wed Feb 12 16:40:25 2025 -0500 + + contrib: png: update to 1.6.46 + + (cherry picked from commit d05a600c4b27e28d73ed91aa34714f3027e3da7c) + +commit baeaaeec24e34398dab4efd24d0c9a86949688ed +Author: Maxime Chapelet +Date: Fri Jan 24 15:24:19 2025 +0100 + + contribs: png: disable debug lib suffix for all platforms + + Given contribs are bootstrapped with `--disable-optimizations` option, + the CMAKE flag `-DCMAKE_BUILD_TYPE` is set to `Debug`, and when + build configuration is set to `Debug` in libpng contrib, it CMAKE + configuration append a `d` char to the static library name, + resulting in a lib named `libpng16d.a` instead of `libpng16.a`. + Then some vlc module depending on libpng aren't able to link + properly as they can't find their lpng16 dependency. + + (cherry picked from commit 9858ba5d19d0aa5dafd779be307f951cb1273589) + +commit f56486f751db7c6a01c81a0120f59e8eca94553f +Author: Tristan Matthews +Date: Thu Dec 12 12:04:49 2024 -0500 + + contrib: png: update to libpng 1.6.44 + + (cherry picked from commit 04f140a9d0c6a40bc999e1fa2f973680d9109b5b) + +commit 8ac9d4671b8c476f78527a25374682b86e9bd3cc +Author: Steve Lhomme +Date: Thu Sep 21 13:40:54 2023 +0200 + + contrib: png: fix update from older installed version + + When you have an old png+zlib in your path, it was using that + to detect the PNG/ZLIB incompatibility instead of using the + local pnglibconf.h + + (cherry picked from commit 5a75966b395d13cab0fa082e50e34b36a554840a) + +commit 2b8ef26f87fdd159d7c0e3195ec92107d88ef49f +Author: Tristan Matthews +Date: Sat Jul 15 15:42:10 2023 -0400 + + contrib: png: update to 1.6.40 + + Changes from version 1.6.39 to version 1.6.40 + --------------------------------------------- + + * Fixed the eXIf chunk multiplicity checks. + * Fixed a memory leak in pCAL processing. + * Corrected the validity report about tRNS inside png_get_valid(). + * Fixed various build issues on *BSD, Mac and Windows. + * Updated the configurations and the scripts for continuous integration. + * Cleaned up the code, the build scripts, and the documentation. + + See: + https://sourceforge.net/p/libpng/code/ci/libpng16/tree/ANNOUNCE + (cherry picked from commit 12787876b36d0db2abefb4c6714585a407ea47c1) + +commit a96135c0a2b314ff43c5ccff6ff17bdc8ee9960f +Author: Tristan Matthews +Date: Tue Jan 10 10:24:23 2023 -0500 + + contrib: png: update to 1.6.39 + + On 32-bit ARM, the cmake default is now -DPNG_ARM_NEON=off so we do runtime + detection for platforms where it's not already hard enabled. + + (cherry picked from commit 2a242c29b2445899584ae09abdba7a55dac7d603) + +commit 845eb47467557f4c28c2ba1e92cbb88dd17879b0 +Author: Martin Storsjö +Date: Mon Oct 10 00:24:00 2022 +0300 + + contrib: png: Don't require runtime checks for NEON on arm on win32 + + NEON is always available there, just like on iOS. + + This fixes building for Windows on ARM after switching to building + libpng with CMake - after that change, building failed due to + "No support for run-time ARM Neon checking; use compile-time options". + + (cherry picked from commit a4240eedabe5ef823d929d48449d36c64a71ada8) + +commit 8aef6c5ba717e0dd4f67c4f5ca242c61313479b5 +Author: Steve Lhomme +Date: Mon Oct 3 09:49:48 2022 +0200 + + contrib: png: update to 1.6.38 + + * Added configurations and scripts for continuous integration. + * Fixed various errors in the handling of tRNS, hIST and eXIf. + * Implemented many stability improvements across all platforms. + * Updated the internal documentation. + + (cherry picked from commit 20bdf55cb5a5903b2c3bc032bf646e3f0b903a64) + +commit afb5a980544baa8f0ac9cbb5ba0eac35d1ea3cf4 +Author: Steve Lhomme +Date: Mon Oct 3 09:44:58 2022 +0200 + + contrib: png: build with CMake + + And don't depend on an outdated automake 1.11 version. + + (cherry picked from commit 319339db5a538afe1490038e2bf8c8731cf3a710) + +commit 655f0a35e2b336d72a2eda9fe393b27695790f2b +Author: Steve Lhomme +Date: Wed Apr 10 13:22:49 2024 +0200 + + contrib: zlib: disable --version-script on static libraries + + According to the documentation it's only useful for shared libraries. + With recent Android NDK this leads to linking issues with gz_intmax + In autotools it's only set with LDSHARED. + + https://ftp.gnu.org/old-gnu/Manuals/ld-2.9.1/html_chapter/ld_3.html + (cherry picked from commit e50ca0c0b407195d7d3ecc77fdaccb2ec01eda6d) + +commit 16d5a84862ba87639fbfb7b96aa202bf8eb18488 +Author: Alexandre Janniaux +Date: Mon Feb 12 20:43:26 2024 +0100 + + contrib: zlib: bump to 1.3.1 + + Rewrite the first patch on top of v1.3.1 and simplify it since we always + need the same name for the static zlib target. + + Remove the second patch since there is now a ZLIB_BUILD_EXAMPLES cmake + switch to disable the examples. + + (cherry picked from commit 29fbfc0d75e361293ed8c86b837ac4c761f0839a) + +commit e2e42eaaac29db1ff403a6a0304f2839a0280fe6 +Author: Steve Lhomme +Date: Thu Sep 29 14:29:51 2022 +0200 + + contrib: zlib: only use the proper libz name for the static library + + We don't care about the dynamic library. It should not pollute our build with a + similar name. + + (cherry picked from commit 1419660b5e4cc260adcdaf8d51ae50b3b7cf700a) + +commit bc5a81c2e3e647831f9ce4bebc0fc33e41713e5c +Author: Steve Lhomme +Date: Thu Sep 29 09:45:12 2022 +0200 + + contrib: zlib: disable building examples + + Hopefully this should fix the odd emscripten random build failure. + + (cherry picked from commit cc0c26ab1de415c960788a965a8f0ae47bcbec6c) + +commit 114a20915a98ddbfd3c0b8dce9018ee310200e0a +Author: Steve Lhomme +Date: Thu Sep 22 13:02:40 2022 +0200 + + contrib: call sed directly on the files to change + + (cherry picked from commit 637d00420fa1a3f4b71215ba869cb5d05bb7bead) + +commit 194f5235003f1172e1d3dd752ec4643fc4b0b94b +Author: Steve Lhomme +Date: Fri Sep 9 09:40:18 2022 +0200 + + contrib: zlib: build with CMake + + (cherry picked from commit c3af02188c623692d33a703020f65ecf3d18f39e) + +commit 77e9b206c6024e6af7c687d302bfcd6e34c3ab31 +Author: Steve Lhomme +Date: Thu Sep 15 14:08:12 2022 +0200 + + contrib: use $(MAKE) -C to build + + (cherry picked from commit 3ce55c39551fb6188718330b333a1fd24a8cb1ee) + +commit dc88699432b582b0d4193d0abd46c7cdca3a5616 +Author: Steve Lhomme +Date: Wed Apr 17 14:31:42 2019 +0200 + + wingdi: use a better stretch mode + + This gives a much better picture quality. + + If the call fails (COLORONCOLOR not supported) this has no effect and the old + ugly stretch mode is used. + + (cherry picked from commit 622389c9) + +commit 1fd71e04f1140d3b42555d9a3c101c7e436460c7 +Author: Steve Lhomme +Date: Fri Nov 24 11:09:48 2023 +0100 + + mrl_helpers: return the escaped string in mrl_EscapeFragmentIdentifier + + We don't need an error code. + + (cherry picked from commit 6c9543c4d435d23d16c496589ea2201d9c2d420a) + +commit 1e71d438fede23a98bd6da9339e27f0dfa5435aa +Author: Steve Lhomme +Date: Fri Nov 24 10:26:30 2023 +0100 + + modules: set VLC_MALLOC on strings allocated by a memstream + + After vlc_memstream_close() the memstream cannot be used anymore. + + (cherry picked from commit e52cc89f8077c4cf264faabec470b09cd70d8d9a) (edited) + edited: + - the smb2 code doesn't have the extra line ending + - 3.0 doesn't have the HLS stream output. + +commit b2e8eaaf14b3d9e256cedcf4748e7633068a3c6f +Author: Steve Lhomme +Date: Fri Nov 24 10:21:58 2023 +0100 + + core: set VLC_MALLOC on strings allocated by a memstream + + After vlc_memstream_close() the memstream cannot be used anymore. + + (cherry picked from commit 02b47bc2e4c5e612bc7f38412ade12c0f676f3d9) (edited) + - vlc_strfplayer is vlc_strfinput in 3.0 + - es_out and vlc_player don't have the related API's in 3.0 + +commit 7e15be40f6cdca99e66406801995b208bca1e89d +Author: Steve Lhomme +Date: Fri Nov 24 08:13:39 2023 +0100 + + webvtt: don't reset empty memstream pointer + + The content is later used with vlc_memstream_write. Passing NULL is undefined. + On Windows it uses fwrite which doesn't allow passing NULL [1]. + + [1] https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/fwrite + + (cherry picked from commit 932a1c3e9cd476ff650d5a6a497a9aad351e8227) + +commit ce3bebaece28fa737364fbeffd6b1fe62e28da4b +Author: Steve Lhomme +Date: Fri Nov 24 07:25:41 2023 +0100 + + modules: fix vlc_memstream_close success checks + + It doesn't return VLC_SUCCESS but 0 (even though it's the same thing). + + (cherry picked from commit 05761dd35816a6f4086b8f3da9b9ba6684e736ea) + +commit eaa8a3c3a0a58bb9ec8caeaf3c1372be3da1b93a +Author: Thomas Guillem +Date: Thu Jul 24 08:17:22 2025 +0200 + + test: demux-run: always print error (on stderr) + + (cherry picked from commit 194d83767780313e589da432b574d1f6e1393383) + +commit 7492a0e9a0ec6b805072776ed9d3da95f1c80fc1 +Author: Marvin Scholz +Date: Tue Mar 25 15:21:33 2025 +0100 + + contrib: speex: do not pass --disable-neon + + Speex' configure does not recognize it and warns about it. + + This effectively reverts 6860455438177ba8669a2d0738bdd9503abc5cb5 + + (cherry picked from commit 32412f3161e2cca13d20b9032e9cd5c289426502) + +commit 25ef86375dfc87a2d1ed762c898288fabbc48f60 +Author: asivery +Date: Fri Jun 13 01:23:39 2025 +0200 + + demux: add A_ATRAC/AT1 support in matroska + + Signed-off-by: asivery + (cherry picked from commit 14217002b528a7334013011d9473a3a4bdf34c75) + +commit 2f3633f15953533658eb8d5ed26924bf0fe3b877 +Author: Steve Lhomme +Date: Thu Feb 13 11:37:37 2025 +0100 + + demux: asf: remove hardcoded overflow checks + + vlc_alloc does check the multiplying is possible. + + (cherry picked from commit c0a72e5cda0f8c71f096cfe9008f630ab8ad9607) + +commit 4f60d1ac2d53a36a2a098c4ae66eaa1d7c4b7b65 +Author: Steve Lhomme +Date: Tue Jul 11 09:14:19 2023 +0200 + + modules: allocate with the table type size + + So there can be no mismatch. + + (cherry picked from commit 8b2d42c400cbdc4cea05c0149864530e3ba728f4) + +commit 60e3b680b52ac81996ef414c5d5fc1da0b0e4566 +Author: Steve Lhomme +Date: Tue Jul 11 09:31:09 2023 +0200 + + asf: use the table size to check if the number of streams can fit + + This is more logical. The #if check should also use that, but we can't use + sizeof() here. + + (cherry picked from commit a7c77cf44777eaabfbeea756eaacb8ceea8bda36) + +commit 64af7294faab7a8affe33d6eb02bb4529281394c +Author: Alexandre Janniaux +Date: Thu Jan 30 15:36:31 2025 +0100 + + packetizer: av1: fix double free + + If the p_extra is freed in the previous branch, it is also freed in this + branch without being reset to NULL before. + + Regression from a95213e20de69d584324f6d0c9f37c7a7cdfe3e3. + + (cherry picked from commit fc0325dbe13bb3d7a2fb0438beeb658897e01044) + +commit de7cf8f21f4f19c4c535bba8afac5aefbc54deac +Author: Steve Lhomme +Date: Tue Jun 10 14:57:05 2025 +0200 + + css_parser: check allocation errors + + (cherry picked from commit 3a90548bc1c85a18d81f14f3ce5aedc5af943b6a) + +commit 9fbced240edf4cfd0502cd7344818e1e5f5df702 +Author: Thomas Guillem +Date: Thu Jul 24 11:30:20 2025 +0200 + + webvtt: fix null pointer passed in qsort + + From UBSAN: null pointer passed as argument 1, which is declared to never be null + + (cherry picked from commit b26cb55943993b8060754f9757f8ea354736b8e2) + +commit 3fb3d83683b6954247848bbe05aca10967e5c8cb +Author: Steve Lhomme +Date: Wed Jul 30 10:41:23 2025 +0200 + + CI: update the libvlcjni targets to support 16k aligned libc++_shared.so + +commit 4f03ee47ef2f37acc4af4649d0ac9f99a572020c +Author: Steve Lhomme +Date: Fri Jul 25 15:33:31 2025 +0200 + + contrib: ebml: use backported versions of string reading + + The code is cleaner and doesn't leak local buffers when readFully() emits + an exception. As in "oss-fuzz 5479158623043584". + + Backport sent upstream at https://github.com/Matroska-Org/libebml/pull/323 + + (cherry picked from commit bee5a09d3e231e125b8bc72d04fc6b62e81533a7) + +commit 7ad9339a5fbd0976159cea3e6c568ff0b6835dcc +Author: Steve Lhomme +Date: Mon Apr 15 16:43:14 2024 +0200 + + contrib: zvbi: don't keep the full iconv path + + It disturbs libtool. + + (cherry picked from commit f0e3a36f562a23fa19be0e84d6a9dc5499433ceb) + +commit e05d859a7414a02a4cb4e6f0b107407804e06ac4 +Author: Sean McGovern +Date: Sat Sep 4 12:34:47 2021 -0400 + + contrib: zvbi: fix __va_copy() usage + + (cherry picked from commit beebc0dec083be5cc5583d5356a6ce89e19d27ee) + +commit da391be597edb7bebf1f153eb41d567d6ed0fa64 +Author: Steve Lhomme +Date: Fri Nov 24 14:22:32 2023 +0100 + + memstream: reset ptr on vlc_memstream_close() error + + It's easier to spot of NULL pointer dereference than a use after free. + + In the POSIX implementation [1] the status of the pointer is undefined on + error. In our implementation it's free'd. + + In both cases it's better some to use that pointer value after exiting + vlc_memstream_close(). + + [1] https://pubs.opengroup.org/onlinepubs/9699919799/functions/open_memstream.html + + (cherry picked from commit e957881f713b057b3841a44ec023c404544748d7) + Signed-off-by: Thomas Guillem + +commit cddc7aea18c694a3277ee4432f93f281f8a867de +Author: Steve Lhomme +Date: Fri Nov 24 08:08:25 2023 +0100 + + memstream: do nothing when writing a length of 0 + + (cherry picked from commit a3749aa6a159636ca844dd3d75567737fbe83954) + Signed-off-by: Thomas Guillem + +commit 5a8d8a88ef6a16a81ed5115e765eb372ce3d53ab +Author: Rémi Denis-Courmont +Date: Tue Jul 16 22:49:20 2019 +0300 + + memstream: handle overflow + + (cherry picked from commit ed7707caffbde23921dedc545694f5d56dd8b877) + Signed-off-by: Thomas Guillem + +commit 09208d78ab928d4d1928570309afc1a19a5bed6b +Author: Rémi Denis-Courmont +Date: Tue Jul 16 22:49:12 2019 +0300 + + memstream: handle overflow + + (cherry picked from commit cd9085186853ff87f13fb5a1cff42787b7639b63) + Signed-off-by: Thomas Guillem + +commit 1763811d7fb7c9ad09fe4598816d09446b3be14f +Author: Steve Lhomme +Date: Thu Jul 24 11:02:58 2025 +0200 + + contrib: add more Android target selection in toolchain.cmake + + As done in dbc272a9e65cf197d3e5147763a2373684a23f77 but without the python script. + +commit 9f7290dade520b5fb8837df23c3051451c36b0bd +Author: Steve Lhomme +Date: Thu Jul 24 10:41:57 2025 +0200 + + contrib: include the NDK android.toolchain.cmake on Android + + Similar to b2ae29b45449e8451a8298f849223f035c484aec but without the python script. + +commit 2337fc781e6e8de5c48aee2e111d04e8c185a095 +Author: Steve Lhomme +Date: Wed Jul 23 13:57:46 2025 +0200 + + configure: check ffsll is declared in a header + + On Android 25 it's a static inline. + Calling VLC_REPLACE_DECL after AC_REPLACE_FUNCS for the same function should work. + +commit 6d76c7dddd762062aa26d9885e839550b2a70717 +Author: Steve Lhomme +Date: Thu Jul 24 08:04:56 2025 +0200 + + configure: check swab is declared in a header + + On Android 25 it's a static inline. + Calling VLC_REPLACE_DECL after AC_REPLACE_FUNCS for the same function should work. + +commit 798b074e5b27146b3d0cfede568cb6e29a58772f +Author: Steve Lhomme +Date: Thu Jul 24 08:47:15 2025 +0200 + + contribs: put the config.guess/sub in the right folder + + UPDATE_AUTOCONFIG puts them in the root but some contribs + use a different location. + It's already handled by some contribs but not all added by c5f6f819f8d9554f3ceefead3c990ef48a1a0847. + +commit 6edaf9b5a1edbb7ca41326be20dd4b4669493556 +Author: Steve Lhomme +Date: Thu Jul 24 08:45:21 2025 +0200 + + contribs: add missing autotools config updates + + Not covered by c5f6f819f8d9554f3ceefead3c990ef48a1a0847. + +commit daf06b51c8d2573ad5d6ae81bb3aa8b2014e43a2 +Author: Steve Lhomme +Date: Wed Jul 23 13:43:10 2025 +0200 + + contrib: live555: disable OpenSSL + + As done in 78998cab182bbdbd1915deeead1ad4bc945b514e for VLC 4. + +commit 8a04fb720fce6f31cceb0b2a24cc6255bca2694d +Author: Steve Lhomme +Date: Wed Jul 23 11:15:10 2025 +0200 + + contrib: iconv: build before installing + +commit c7fa48c6f86e56cc37a26a31e5635a707cc31477 +Author: Steve Lhomme +Date: Fri Jun 21 07:55:14 2024 +0200 + + contribs: call UPDATE_AUTOCONFIG for targets using ac_aux_dir_candidates to find config.guess + + Or at least using AC_CONFIG_AUX_DIR. + + (cherry picked from commit c5f6f819f8d9554f3ceefead3c990ef48a1a0847) (rebased) + rebased: + - some files don't exist on 3.0 + - some patches existed in 4.0 not found in 3.0 and vice versa + +commit 260dc7cb3060e02d5071df0cbe2a00db2345bca2 +Author: Steve Lhomme +Date: Wed Apr 10 15:37:10 2024 +0200 + + contrib: zvbi: fix Android usage of pthread + + - pthread_create is not detected properly with the NDK26. + - pthread_cancel is called but it's not supported by Android, it's probably dead code that is removed during linking + + (cherry picked from commit 848b0f08c10480079809c46951809da543fea39c) (rebased) + rebased: + - the code around is slightly different + +commit 9407d0e1e2c425e2ff717bfbd050c63c0c3a728f +Author: Steve Lhomme +Date: Mon May 15 08:19:56 2023 +0200 + + contrib: update libiconv to 1.17 + + (cherry picked from commit 29d9e2b0c42ddfa2b3706a24bc632f98922e3232) (rebased) + rebased: + - the code around is slightly different + +commit f011f80b2d86b8637b61f9beadd8095dee758e2f +Author: Steve Lhomme +Date: Tue May 16 10:17:10 2023 +0200 + + contrib: iconv: remove GetFileType UWP patch + + GetFileType() is allowed in Win10 UWP. + + (cherry picked from commit 23246d980d392d749e510c78a7cf64bdff80fb31) (rebased) + rebased: + - the code around is slightly different + +commit d6314ba2d8d80a1a25c99a25c6f431ce2b1f3047 +Author: Steve Lhomme +Date: Fri Sep 16 05:45:11 2022 +0200 + + contrib: iconv: don't build with forced old inline style + + It should have been updated to modern C since then. + + (cherry picked from commit afdc39763c86078c0c25d1ce8cfcceed744316b3) + +commit a271af6babb2a0b14920e1dabbceb2f326f72ba0 +Author: Jean-Baptiste Kempf +Date: Sun Feb 20 16:45:44 2022 +0100 + + Contribs: update libiconv to 1.16 + + (cherry picked from commit 8c7c22e325e7e5b3df752fea8d6222251f07309a) + +commit 896370b46c46b709b9aefc2cf80da8fe485134bf +Author: Steve Lhomme +Date: Mon Apr 22 12:19:06 2024 +0200 + + contrib: fix the CMake i386 and arm ARCH names + + It works for Android and should be the same on other platforms. + + (cherry picked from commit 06a9b6b3ac09b856bf6907bb98a3b956ca2998e2) (rebased) + rebased: + - the code around is slightly different + +commit 438287140143be484503f287ec254206177d2484 +Author: Steve Lhomme +Date: Mon Apr 22 12:17:31 2024 +0200 + + contrib: force CMake system to Android for Android + + So the the proper system detection happens: + + https://github.com/Kitware/CMake/blob/master/Modules/Platform/Android-Determine.cmake + (cherry picked from commit deb9246cd3ef2543a0237583a487df19b00ea671) + +commit 0d21f02c130a261580adfff3df8e12f21e7758b8 +Author: Rémi Denis-Courmont +Date: Wed Jan 19 18:47:58 2022 +0200 + + contrib: cmake: require a system name + + Cross-compilation will fail if the system name is not specified, because + such is CMake's design. + + (cherry picked from commit f2e67d22ff313ce44bd60cd534d51ff529ffda00) + +commit ce9e5e89a3840f9d21ec8437ac39c3523f367d9c +Author: Rémi Denis-Courmont +Date: Wed Jan 19 18:47:34 2022 +0200 + + contrib: cmake: set CMAKE_SYSTEM_NAME on Linux + + (cherry picked from commit 485a809c4bcbb388f77367d75108ee216561032b) + +commit 404d94266b50c8a498b98d3415adfb80d8a55eb3 +Author: Alexandre Janniaux +Date: Fri Jan 27 16:42:33 2023 +0100 + + extras/tools: bump bison to 3.8.2 + + Fixes #28048 + Fixes videolan/vlc-android#2477 + + (cherry picked from commit 3a7c80c1fb7167f4ee94d50e76ec8a1545151ef8) (rebased) + rebased: + - the code around is slightly different + +commit e085a8240816d16a8c3c3b0e2b621ee1bce3a8fb +Author: Steve Lhomme +Date: Tue Jun 27 08:35:11 2023 +0200 + + extras/tools: update gettext to 0.22 + + (cherry picked from commit acdd200e96e3d8c195729a1440de45df0d077445) (rebased) + rebased: + - the code around is slightly different + +commit a183a71f189c8efb077b7c0ce5e20705dc5d3a6e +Author: Martin Storsjö +Date: Thu Jun 14 14:19:39 2018 +0300 + + extras: tools: Provide gettext if necessary + + Building many contribs requires having autopoint available, and + having using the version from contribs isn't right when cross compiling. + + (cherry picked from commit d1d2759d799442baef78d451d53f8790a8e6a325) (rebased) + rebased: + - 3.0 needs ".buildgettext" to be called properly + - the code around is slightly different + +commit c495a9a12249943823a44a2494ff0981c8d39b5a +Author: François Cartegnie +Date: Fri Jun 20 16:13:59 2025 +0800 + + demux: adaptive: remove trivial setters/getters + + (adapted from commit 1d4ecd2c252691b69420ae891b94ddf421b5f462) + +commit af3e7af1838e0e0393f68e11abff93ec55a096e6 +Author: Astrom Cheng +Date: Fri Jul 4 05:58:50 2025 +0000 + + [3.0] demux: flac: prevent seeking logic get stuck + +commit 08dae4ad1d6c16df5d25245d6436324456b6130b +Author: François Cartegnie +Date: Fri Apr 25 15:56:41 2025 +0700 + + xml: Node: remove unneeded includes + + (adapted from commit ac37bcc89d6a0b7293168350f7c2c022b37bcd9d) + +commit cc09ef58eddb0284b925d618079fd80f6f123b27 +Author: François Cartegnie +Date: Wed May 7 14:08:39 2025 +0700 + + demux: adaptive: return string reference for ContentType + + (adapted from commit 05e6bc4a080b16266362276b43ad6c23f722c258) + +commit 7008fb63145739b30b0a616cf1f524a6fb44a7f7 +Author: François Cartegnie +Date: Tue May 27 18:15:00 2025 +0700 + + demux: adaptive: fix potential dead loop with non block methods + + (cherry picked from commit 62961d2a402a72978f124f2ca904057a4e7b97fb) + +commit 5a9459ce2a522c515be1ae2d34c8c8ebd00d98ac +Author: François Cartegnie +Date: Fri Jun 6 16:00:35 2025 +0700 + + demux: adaptive: correct logics default uxtors + + (adapted from commit 7e3ce3d0d5f4dc091ff5a7a42edb93e2f2752473) + +commit 33697d7c0a00ede43d4ee29ddc1e7b1f5fc36557 +Author: François Cartegnie +Date: Fri Jun 6 19:52:25 2025 +0700 + + demux: adaptive: fix deletion order between logic & resources + + (cherry picked from commit cb509e30da3d54a54c0d5946528a6e350a577c19) + +commit 0ef5c1296bda493a733c270e7b0f501ee3a4ca5f +Author: François Cartegnie +Date: Wed Jun 18 17:35:01 2025 +0800 + + demux: hls: fix byterange offset propagation + + refs #29179 + + (cherry picked from commit c52d819d60090ac41d78604e6455e3deaeffb736) + +commit e7cf1c17e66e687c6e3d6ad3d5d1909220a7e77a +Author: François Cartegnie +Date: Wed Jun 18 17:25:22 2025 +0800 + + demux: hls: fix byterange attribute comment + + (cherry picked from commit e367a322a9f268c38a25924d2449af557dc6f563) + +commit e4d11f202910a52e5f5dab400e39299b73cb7ab5 +Author: François Cartegnie +Date: Thu Jun 19 16:11:28 2025 +0800 + + demux: adaptive: replace Unset with optional + + (adapted from commit af4c229f325dd89c2f8bbb207533a548e667369a) + +commit eebc64c395c58bff3b7ba5bccdd32ae2035f8775 +Author: François Cartegnie +Date: Thu Jun 19 16:08:13 2025 +0800 + + demux: adaptive: add std::optional compatibility + + (cherry picked from commit 3870be59cdf753c571ab3834d9c8a85547bc635e) + +commit 9e304223660f8878f4db70b21adca4820836c21e +Author: François Cartegnie +Date: Mon Jun 9 18:35:41 2025 +0700 + + demux: hls: add test for subrange continuity + + (cherry picked from commit 5503b393ec578aca23fb3cb237ade492ff5586d5) + +commit 0598db331e123aa38681380458970c7bfa76d84c +Author: Steve Lhomme +Date: Mon Mar 31 09:02:37 2025 +0200 + + win32/filesystem: use CreateFileW with FILE_SHARE_DELETE in vlc_open() + + So the file can be renamed while we read it [^1]. + + The file permission creation mode is not used anymore. + Only 0666 and 0600 were used. + + Fixes #19700. + + [^1]: https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew#file_share_delete + + (cherry picked from commit 73950592f883ff237173837c5574416cb3d0beec) + +commit c96fecdf230d18f802222abc3267d645f2120800 +Author: Steve Lhomme +Date: Tue Jun 24 11:34:30 2025 +0200 + + direct3d11: fix potential double free + + When the pool size doesn't match the input size, the p_sys->resource may change. + We just want to release the ID3D11Resource we got from OpenSharedResource1(). + + Issue consecutive to 833b02552a6d6055f1ed1d5f84827ac213db5774. + +commit e3463d2eb3423ff5c79c3f67ebe4d5a0a1f336ff +Author: François Cartegnie +Date: Sun Jan 22 21:04:08 2023 +0100 + + demux: adaptive: fix bogus port discarding condition + + (cherry picked from commit 6d65ec658949c63546af2df9758865aeed1a23e5) + +commit 7d59fbc7310687f7056d75564569fe2009005562 +Author: Khalid Masum +Date: Thu May 29 17:50:05 2025 +0600 + + contrib: freetype: update to 2.13.1 + + (cherry picked from commit 1ef06f3349a66e9ec8c6c88dcfa71806d8d2067b) + +commit d1fd0eda8d830fcf5e85ee76fdc63c5e0cf7bd80 +Author: Johannes Kauffmann +Date: Sat May 27 12:59:26 2023 +0200 + + contrib: freetype: update to 2.13.0 + + (cherry picked from commit 923fc85ac9e6d77904cbccc235cbb7eed93b6fbb) + +commit b8678c346501614125ba2093ad670139814c0bac +Author: Tristan Matthews +Date: Mon Jun 16 14:06:04 2025 -0400 + + contrib: ogg: update to ogg 1.3.6 + + (cherry picked from commit e94baffb23596029e90d535a2a3c79ddf6d9bf54) + +commit 38f6ba0f868d4b3fd5229ad63b8730aadcad65c0 +Author: Johannes Kauffmann +Date: Wed May 31 23:26:57 2023 +0200 + + contrib: ogg: avoid installing documentation + + (cherry picked from commit e3c25c0f35cd2e6d0ce9efc7950a1539923d3189) + +commit 3c1998d4e191fd9d58e82cdd8785e5db975791b2 +Author: Johannes Kauffmann +Date: Tue Jun 17 08:17:46 2025 -0400 + + contrib: ogg: update to 1.3.5 + + (cherry picked from commit 8ae3870ca9e5030ff554a56545c6fa7445bfd876) + +commit bb9031aac02b02c24d4d5e31634814f8b88123bf +Author: Steve Lhomme +Date: Tue Jun 17 08:15:09 2025 -0400 + + contrib: ogg: build with CMake + +commit a075cd0bf5787e540e4fa957f040f9477c090dbe +Author: Tristan Matthews +Date: Tue Sep 3 12:15:29 2019 -0400 + + contrib: ogg: update to 1.3.4 and fix typedefs for MacOS + + (cherry picked from commit 8c7a70b62f200a612ab0aa2f53e2fde090fddc4a) + (cherry picked from commit 03b3f47bda6f462533c2d8eab74ea44799053b2c) + +commit 3d209f05270dc109a5b737c30c9bee3a51206859 +Author: Tristan Matthews +Date: Mon Jun 9 15:21:35 2025 -0400 + + contrib: vpx: update to 1.15.2 + + This release fixes CVE-2025-5283 (bug webm:413411335), and is ABI compatible + with the previous release. + + (cherry picked from commit 5869fc3ef1f33649cd5606117f9692e73a2ea4e4) + +commit 5283b2a71f51b8bf21ce90dc7ef9f85c05bedfea +Author: Tristan Matthews +Date: Thu Apr 10 12:40:39 2025 -0400 + + contrib: vpx: update to 1.15.1 + + The dropped patches have been merged upstream. + + (cherry picked from commit 6351a747182cdfee5c2a7341083b6196254a160b) + +commit 97d5de37cfd7361fadbd5069133d73949b2d660c +Author: Devin Heitmueller +Date: Sun Jun 1 19:32:51 2025 -0400 + + codec/cc: Fix lost CEA-608 pair for DVD captions with truncate flag + + If parsing GOP based captions, the truncate field wasn't being + properly respected, resulting in the last pair being lost if the + flag was set. This would cause intermittent caption bytes to be + missing (e.g. missing characters in rendered captions). + + Correct the logic so that the last pair isn't lost, by comparing + the code against the original ccextractor code it was based on. + + Tested with "Sports Night", season 1, disc 1. + + Signed-off-by: Devin Heitmueller + (cherry picked from commit 778d9d254ebc5da7f40ecd7ccccd66fc99adc27b) + +commit 6ecb42759578469259a497279746cb70f409bb2a +Author: Devin Heitmueller +Date: Sun Jun 1 19:27:15 2025 -0400 + + codec/cc: Fix garbled DVD CEA-608 captions with large cc_counts + + The GOP parser for captions when found in DVD GOPs had an error + when determining the CC count, which excluded the top bit (i.e. + only using the lower four bits of a five bit field). Thus + it would work properly if the cc_count was less than 16, but would + lose the rest of the captions in the GOP. + + Parse all five bits of the field. + + Signed-off-by: Devin Heitmueller + (cherry picked from commit 067b9da0e62d0c57c2442656c9a196d731ce5bd1) + +commit ce409518fe268b5cdaded3ee3df24c698a8a65f1 +Author: Khalid Masum +Date: Fri Feb 28 14:06:22 2025 +0000 + + contrib: cddb: add gcc14 support + + Since GCC14, GCC no longer allows implicitly casting all pointer types + to all other pointer types. This behavior is now restricted to the + * type and its qualified variations. + + https://www.gnu.org/software/gcc/gcc-14/porting_to.html#incompatible-pointer-types + + This causes cddb fail to build on gcc14. This patch fixes that. + + (cherry picked from commit 674d2da4f3bb6806a5ba17b9b8106aca7006a1a1) + +commit 1f846116c1b15324b0edae18a4b541f619f3bc29 +Author: Steve Lhomme +Date: Mon May 26 10:49:02 2025 +0200 + + contrib libarchive: link for uuid when building with xmllite + + Fixes UWP builds of VLC with autotools + + (cherry picked from commit d0b1b4aa062ffdcd7644b765b541a9f07419c5bf) + +commit 86d9e3403164b0b7d8ce2f9fdcd8366cc7087e2a +Author: Steve Lhomme +Date: Thu May 22 06:51:38 2025 +0200 + + contrib: libarchive: update to 3.8.0 + + Fixes some security issues and bugs [^1]. + + [^1]: https://github.com/libarchive/libarchive/releases/tag/v3.8.0 + + (cherry picked from commit d942198743f8c059b1bf475bae48b43985b38fe0) + +commit 29e47660ced8e478ad4f7db095bd21b1ea9625d1 +Author: Steve Lhomme +Date: Thu May 22 14:15:41 2025 +0200 + + contrib: dvdnav: fix some mismatched reference index/available elements + + (cherry picked from commit ae87cc1de201956333635f0df7f6152ce91bd665) + +commit 09ded3f4092c662c7e962faf4358e14e292297db +Author: Steve Lhomme +Date: Thu May 15 16:45:07 2025 +0200 + + libmp4: always read the tfra data into 64 bits variables + + We need to handle the worst case scenario anyway. + It should not take that much more memory and that avoids + casting pointers. + + (cherry picked from commit 3e4bec57cfc24826aca3a80730353017156c14e8) + +commit 4991e43d02898079bf65953887528e9ad51dbabf +Author: Steve Lhomme +Date: Tue May 20 13:16:16 2025 +0200 + + demux: mp4: remove redundant call + + The same call is done below. + + (cherry picked from commit 33384c7a9493f6671ef3b0954807d9ed048fba98) + +commit 3ea20f6266e71323023fbbbb348afe061264b419 +Author: Steve Lhomme +Date: Tue May 20 13:22:09 2025 +0200 + + demux: mp4: only set p_sys->i_nztime once for moov + + (cherry picked from commit 656fc6e0094300f970d6ce92af6a65b1f1e10974) + +commit db25f697dad261c7207e3fe016b866df2fd4be97 +Author: Steve Lhomme +Date: Thu May 15 15:30:00 2025 +0200 + + demux: mp4: always set the p_sample_offset_pts to i_ctsdelta + + The assignment is the same in all if/else cases. + + (cherry picked from commit 58bbde65b1116a4784714691a1082646b3d5221e) + +commit 1f4c5ba39a572db5126bcfc683843633716c9b1e +Author: Steve Lhomme +Date: Tue May 20 12:51:06 2025 +0200 + + demux: mp4: handle moof time outside of FragSeekLoadFragment() + + (cherry picked from commit a9a8b3d0ded548ba7a20b571b4ece26c7cd508e6) + +commit 8cdf86bf97f48c55823ed81a188a30177b2154e8 +Author: Steve Lhomme +Date: Fri Jun 8 14:12:55 2018 +0200 + + demux:mp4: the local i_time in FragGetMoofByTfraIndex() is not an mtime_t + + (cherry picked from commit c43b6de185878ea645982dcd0e8d1ddee240f769) (edited) + edited: + - in 4.0 it was done when mtime_t was still used + +commit 6360e4f5f7ab0128a1563ffa717f32d5b7692582 +Author: Steve Lhomme +Date: Tue May 20 07:52:15 2025 +0200 + + demux: ts: fix mismatched comparison timestamp types + + i_first_dts is a vlc_tick_t as seen a few lines above. + + (cherry picked from commit 6a8fef1d1ffb336760ce817540887816fe63106c) (edited) + - 4.0 used VLC_TICK_FROM_MS(500) instead of CLOCK_FREQ / 2 + +commit 37ec4b604d79a8d5dd48577b56219837d91219a9 +Author: Steve Lhomme +Date: Tue May 20 07:49:59 2025 +0200 + + demux: ts: fix check against TS_90KHZ_INVALID + + The TS_90KHZ_INVALID should not be any particular value. + We can only check if it's equal or not. + + (cherry picked from commit e96ebb7dfe1c57de73a37f7e94f2642076896a43) + +commit f1a8be1010e4f1d0dc08f7b1b6c9cd1dfe1b035e +Author: Steve Lhomme +Date: Tue May 20 07:46:13 2025 +0200 + + demux: ts: fix comparison between vlc_tick_t and TS_90KHZ_INVALID + + (cherry picked from commit 70942381f759c66f887c081ddf6f5bd789b2dc3c) + +commit 91bd06609e3d3c87551a8398a27c2a7b6d18caab +Author: Steve Lhomme +Date: Tue May 20 07:41:13 2025 +0200 + + demux: ts: fix mismatched substraction timestamp types + + i_dts is a ts_90khz_t and the other values are vlc_tick_t. + + i_first_dts is already set to FROM_SCALE(i_dts) a few lines above. + + (cherry picked from commit 29c1ee07a8b7825cdc46494bf17690c374001358) + +commit 1f037b17391c1fdc66f1fdd4ccabdacfda187275 +Author: Steve Lhomme +Date: Tue May 20 07:35:12 2025 +0200 + + demux: scte: fix bogus vlc_tick_t conversion + + Originally introduced in 7e3dcdd09c2fac64f00acb360d30f24c74894609. + + (cherry picked from commit e3adccef03cd3c477cc59628d0ca998e12da0769) (edited) + edited: + - 3.0 did not use FROM_SCALE + +commit 46637794bea86d6d08d7ce8cfaa82bc44edf1a44 +Author: Steve Lhomme +Date: Tue May 20 07:30:07 2025 +0200 + + demux: ts: use proper invalid ts_90khz_t value + + (cherry picked from commit cd5a435254f1586e671aff9603397cda9222de69) + +commit 7f7aad34083b52c8fff63279a8ea0e0b3d4e268a +Author: Steve Lhomme +Date: Tue May 20 07:23:36 2025 +0200 + + demux: ts: fix bogus vlc_tick_t conversion + + p_pmt->pcr.i_first_dts and p_block->i_dts are both vlc_tick_t. + + Introduced in 68fcf13842229e17c3db26ed62f457219484ff77. + + (cherry picked from commit 086758c8c60f6b36b393a94c7f22400a66368bf3) + +commit 02013c329df488df030788e03673fcd5b966d0d4 +Author: Steve Lhomme +Date: Fri May 16 15:42:50 2025 +0200 + + subpicture: set regions to full range SDR by default + + The caller of subpicture_region_New() can change it afterwards + in the region format and the picture format. + By default the values were undefined and might pick the + colorimetry of the video. + + Ref. #27877 and #26180 + + Similar to 35396660acf211bc481dffb3e2225072a738ea41 adapted to 3.0 + +commit e8716078976c2592584531ccc6ad42a311f18ad2 +Author: Steve Lhomme +Date: Fri May 16 15:16:58 2025 +0200 + + text_render/svg: set decoded pictures as SDR explictly + + (cherry picked from commit e2fa4b9ebcddfd34a73d83f49b2e63fd83731f65) (edited) + edited: + - on 3.0 the range is a boolean + +commit f08736c2cbd870bd17bd4e39092fc81e3288dc8a +Author: Steve Lhomme +Date: Fri May 16 15:15:37 2025 +0200 + + text_render/svg: remove unneeded forward declarations + + (cherry picked from commit ff0c91ff96cf37981fb1cd6fbf9763cef06b87ad) + +commit 60cd6f53732f001ce714ef03d198de16017fb764 +Author: Steve Lhomme +Date: Mon May 19 11:20:29 2025 +0200 + + kate: output SDR full range by default + + We don't want to keep the colorimetry of the video. + + (cherry picked from commit 68119b28d87d398911f69734512cfd48c0706e0d) (edited) + edited: + - adapted the range variable + +commit d415d4150836ca6833b53f91fc2cb9209dafef57 +Author: Steve Lhomme +Date: Mon May 19 10:32:32 2025 +0200 + + libass: output SDR full range by default + + We don't want to keep the colorimetry of the video. + Until there's a proper spec for HDR colors. + + (cherry picked from commit acf3fb486a5cd6a0444dc683360ade163bbbd5f8) (edited) + edited: + - moved the fmt_region init to match 4.0 + - adapted the range variable + +commit bff855760f9517b585ec4b549b35a23445784ae7 +Author: Steve Lhomme +Date: Mon May 19 10:51:04 2025 +0200 + + textst: document the palette colors are in limited range + + As found in 9.14.4.2.2.1.1 Semantic definition of fields in PDS + of the Blu-ray specs. + + (cherry picked from commit 888438ee92cab44f310e2eaf97f4ab71db578f2d) (edited) + edited: + - in 3.0 the p_sys comes from p_dec + +commit b715f900596d2d1a7ade91be1592f19a8fc89cf3 +Author: Steve Lhomme +Date: Mon May 19 11:35:24 2025 +0200 + + spudec: output limited range by default + + The YUV colors from DVDs are likely in limited range. + + (cherry picked from commit e605d5b4696be26805834d581acbe5e9174af652) (edited) + edited: + - adapted range variable + +commit 6282a01c737b2793ca84d753a65dc62945f3ebd2 +Author: Steve Lhomme +Date: Mon May 19 09:06:20 2025 +0200 + + dvbsub: keep the color range in the region output + + (cherry picked from commit fb2f877d1981c4a207d8db58088f7907c1c1cbf4) (edited) + edited: + - adapted range variable + +commit b6be9a811b0144fbfa8c3b3eb159f74b8b3e2873 +Author: Steve Lhomme +Date: Thu May 15 10:02:50 2025 +0200 + + demux: mp4: only return true in GetMoofTrackDuration with a duration + + If for some reason there is no traf, we returned true even though p_duration was never set. + + (cherry picked from commit b76b5e73257f92156da825855ac6700a3c22ded2) + +commit 78988161fdc66355d04ae9540e7947c970b6ea81 +Author: François Cartegnie +Date: Thu May 15 16:04:37 2025 +0700 + + demux: ts: wrap probing times + +commit 751327805cf98c52b77e6b8c55c1d50701be77c4 +Author: François Cartegnie +Date: Tue Apr 22 18:13:19 2025 +0700 + + demux: ts: fix multiple wrapping + + refs streams/ts/1fps93hours.ts + + (adapted from commit caf3ea133abc93da7d640fbec5243e3478c3e1d8) + +commit c43911dea98312874a7639bdc608d9db1f8cfcb7 +Author: François Cartegnie +Date: Wed May 14 15:18:36 2025 +0700 + + demux: ts: temporary fix timestamps wrapping + + for tests & before full fix + +commit d22791c5d056744f009ea61d4d8f7a026ceb1cff +Author: François Cartegnie +Date: Thu Apr 24 13:52:50 2025 +0700 + + tests: add timestamps wrapping check + + (cherry picked from commit 56b1956461e627eb6c7f650b35fe239aaf21a6ac) + +commit 7f2c6b67cf375b593954e32a4d1a658022ab1437 +Author: François Cartegnie +Date: Wed Apr 9 13:08:17 2025 +0700 + + demux: ts: revert native scale changes to fix wrapping + + Can never work with timestamp value 0 + + (adapted from from commit af38707d0e72f81c5e6e0258a91f4718ca7bdf76) + +commit ec97822426bbe40ec995223b80e02790f1707372 +Author: François Cartegnie +Date: Wed Apr 23 12:39:15 2025 +0700 + + demux: ts: add TS_90KHZ_INVALID + + (adapted from commit cf2f062fdf6ed1050ecb098d7c131daa46110243) + +commit 768977963de7a383db581a63302af2ada66499fe +Author: François Cartegnie +Date: Tue May 13 19:13:00 2025 +0700 + + demux: ts: change stime_t for ts_90khz_t + + (adapted from 0a5bd92c5218f6416d498648254356b4fbc258aa) + +commit 4e3a0be7c5b0603d02379627f827fb4334fb9365 +Author: François Cartegnie +Date: Sat Jul 13 17:25:32 2019 +0200 + + demux: ts: workaround broken teletext + + (adapted from commit 4d37595856b6164c4b9b6ce104ae97f21242295c) + +commit 76b66156781a38bf3aeba9554e8fa90fd382b9b1 +Author: François Cartegnie +Date: Sat Jul 13 17:25:00 2019 +0200 + + demux: ts: store last dts on pes struct + + (cherry picked from commit cb1c8d6946ee1b08d47551127c45e485ff12ae2a) + +commit 6fbb86e004b75a05f26daf3697cb9170a85298cd +Author: François Cartegnie +Date: Fri Jan 17 17:59:27 2020 +0100 + + test: add PES assembly tests + + (adapted from commit cef77e6f7f0d47df92e3ca609da07916dc44a3fa) + +commit 8aeda18935f7f07377fce4abb8e17b3b4bc91c88 +Author: François Cartegnie +Date: Thu Jan 23 18:10:41 2020 +0100 + + demux: ts: don't start PES without PUSI + + (cherry picked from commit afe64934d2b5f488dd28c52dd654569e534f1721) + +commit d3465ce873808d590e60731772c4dd3551640d46 +Author: François Cartegnie +Date: Wed Jan 22 16:55:40 2020 +0100 + + demux: ts: always end PES on PUSI + + (cherry picked from commit d7ace86225528b61508845d3bb762c617e3fc2a1) + +commit 58d21108d727e5e822133fc13429e8726a88d0e1 +Author: François Cartegnie +Date: Tue Jan 21 15:35:52 2020 +0100 + + demux: ts: don't append empty ts packets into PES (refs #23654) + + (cherry picked from commit 8210974f589be933cc9c9150d8d43f2052bce063) + +commit 077e2dcad10bca789dfa6bdf439d95b0e318a7ee +Author: François Cartegnie +Date: Wed Jan 22 14:06:06 2020 +0100 + + demux: ts: fix output from variable->fixed (refs #23654) + + (cherry picked from commit 6efb4c78a573f754987a3bb3df107b720c5986bc) + +commit e63d73a2f314b89771211c3eb4ae37b4e0023298 +Author: François Cartegnie +Date: Thu Jan 23 18:48:15 2020 +0100 + + demux: ts: replace push with explicit drain + + (cherry picked from commit 7413a20bb2dbfd4691731dd8c5c8b2d8ea727385) + +commit fd441747440df227373c81e54433e67d59d9315b +Author: François Cartegnie +Date: Fri Jan 17 17:17:55 2020 +0100 + + demux: ts: split PES processing + + (adapted from commit 7ed1257d9d917e486ad58eabb7cde2f46ea199fc) + +commit 37b7094ba2dbf1864517fbe9805966e1060ec1a7 +Author: François Cartegnie +Date: Fri May 4 19:33:51 2018 +0200 + + demux: ts: typedef timestamps + + (adapted from commit 68fcf13842229e17c3db26ed62f457219484ff77) + +commit f854d8174cb6ad1f51b82f646735cbca465c0f49 +Author: François Cartegnie +Date: Tue May 13 16:42:44 2025 +0700 + + demux: ts: fix scale of first_dts + +commit e4cf8ccefe49d9a2a4717409e18997f556b84e21 +Author: François Cartegnie +Date: Fri Apr 27 16:00:09 2018 +0200 + + demux: mp4: fix missing traf start + + (cherry picked from commit 3fae8409a472c5df3e31b4e9a5ecfcc47d9edb21) + +commit 8a7f54566a01a9990a60473b6a2417481a074cce +Author: William Woodruff +Date: Thu Apr 3 21:21:31 2025 -0400 + + gnutls: remove manual DH prime bits setting + + This sets the DH group to an unnecessarily and + insecure small size. By removing this function + call GnuTLS will select an appropriate DH + group from the priority string which, when + configured appropriately, will always be + a 2048-bit or larger group. + + Signed-off-by: William Woodruff + (cherry picked from commit 3c9e4df184162940c43fcf1f6e51421fca4e2ac4) + Signed-off-by: Tristan Matthews + +commit 70b0f6f50168dba784cde9dbf6e67a657fa62ff5 +Author: Tung Huynh +Date: Wed May 14 12:25:33 2025 +0000 + + [3.0] direct3d11: fetch missing device information when running in UWP + +commit 084400e20af8ca762d945719684d0fbadc3f43b0 +Author: Steve Lhomme +Date: Mon May 12 09:58:22 2025 +0200 + + d3d11_scaler: keep the context in the staging picture_sys_t + + Since 833b02552a6d6055f1ed1d5f84827ac213db5774 it's used to detect external GPU decoding. + +commit 5748ee2f1da8f1495bb0295df9d32ef614ca40a9 +Author: Steve Lhomme +Date: Mon May 12 08:57:11 2025 +0200 + + amf: fix crash when enabling AMF filters on non-AMD GPUs + +commit af4d43cd4aa05e59d681fcf230eb1b5c41787d31 +Author: Thomas Guillem +Date: Thu Nov 14 12:44:31 2024 +0100 + + libmpeg2: disable by default + + This module has a lower priority than avcodec, therefore MPEG2 is almost + always decoded by avcodec. This module can be used if avcodec fails to + parse the codec, in that case, there are 3 possibles scenario: + - libmpeg2 can decode when ffmepg can't (very unlikely) + - libmpeg2 fails too (likely) + - Security issue in libmpeg2, possible since this library and module are + not well tested and supported + +commit bfb9e2fccde667cad607c859a7887e67bf6e1b56 +Author: Thomas Guillem +Date: Thu Nov 14 12:44:20 2024 +0100 + + dca: disable by default + + This module has a lower priority than avcodec, therefore DTS is almost + always decoded by avcodec. This module can be used if avcodec fails to + parse the codec, in that case, there are 3 possibles scenario: + - libdca can decode when ffmepg can't (very unlikely) + - libdca fails too (likely) + - Security issue in libdca, possible since this library and module are + not well tested and supported + +commit 3a817551046bee0c17e56649d11d98c71c965a07 +Author: Thomas Guillem +Date: Thu Nov 14 12:44:10 2024 +0100 + + a52: disable by default + + This module has a lower priority than avcodec, therefore AC3 is almost + always decoded by avcodec. This module can be used if avcodec fails to + parse the codec, in that case, there are 3 possibles scenario: + - liba52 can decode when ffmepg can't (very unlikely) + - liba52 fails too (likely) + - Security issue in liba52, possible since this library and module are + not well tested and supported + +commit 504ffcaae914b91c7f61d92f6284f2a37af8b4d5 +Author: Steve Lhomme +Date: Wed Jul 31 07:41:56 2024 +0200 + + contrib: gcrypt: use the path to the gpg-error we install + + So we don't have to hardcode the PATH. + + (cherry picked from commit 2c5e7d3c7738bcc72222b60e41064dea008a26e1) (rebased) + rebased + - 3.0 calls disable-docs instead of disable-doc + +commit 19f0bba66367e33de1db39439414d75306b50513 +Author: Steve Lhomme +Date: Fri May 24 08:25:58 2024 +0200 + + contrib: gcrypt: don't build command-line tools when cross-compiling + + It builds faster and makes prebuilt tarballs smaller. + + (cherry picked from commit afff6353250803a37bf58657cc0020c0a9db1d25) + +commit 29dcf801388f9962701ec5e56acd403ce3cee0b0 +Author: Steve Lhomme +Date: Tue May 23 14:32:20 2023 +0200 + + contrib: gcrypt: avoid getpid calls on Windows + + It's not available in UWP. + + (cherry picked from commit cfd40b3f4df13a3c740ff64d3ab35074f462261e) (rebased) + rebased: + - 3.0 doesn't depend on $(DEPS_gpg-error) + +commit a591316204afa043013399cbaa41227db3927c97 +Author: Steve Lhomme +Date: Mon May 15 08:59:06 2023 +0200 + + contrib: gcrypt: fix UWP build + + (cherry picked from commit e428cc3d7f5b476b3fbe38b31c382a0e58917878) + +commit 850dd59478d568640318e1f9ff49c6b84c29e5dd +Author: Steve Lhomme +Date: Wed Oct 12 07:41:59 2022 +0200 + + contrib: gcrypt: update to 1.10.1 + + Enabled blake2 and chacha20 because there are some missing ifdef throughout the + code to enable/disable some code if they are not set. The easiest fix is to + just enable them, rather than patching the code. + + (cherry picked from commit 8883fd6feadb537cc5b62f41a3c7404c10cb604b) (edited) + edited: + - the 3.0 branch didn't have the .S patch + - the 3.0 branch was already using $(GNUGPG) + - the 3.0 branch doesn't use MAKEBUILDDIR + +commit 4f988b342493165cda2b9b5d6d63261569a953ce +Author: Steve Lhomme +Date: Fri Apr 8 11:12:00 2022 +0200 + + contrib: update mingw-w64 to v10 + + This is the latest stable release. We can update our Docker images as well. + + We can now detect the proper dcomp.h with the installed mingw-w64 version. + See 50e71ad6fb43c710d64ac4f3945cdd11ccfe5aa5 + + (cherry picked from commit e3e0854b6dd61d0dde8017257b9e04713a00670a) (edited) + edited: + - 3.0 doesn't need the dcomp target + - 3.0 did not have a SHA512SUMS yet + - 3.0 was using check_githash for the git version + +commit b0e325c06dc89cba29db48331337a342310153c6 +Author: Steve Lhomme +Date: Mon Nov 18 13:43:12 2024 +0100 + + contrib: mpcdec: apply all patches + + The build reduction patch was added but not called in 22e73a44cf2b707fd0d825ad2eed5e882d003c25. + + (cherry picked from commit fc6bc315243345a4798618ccaa3135b61660edca) + +commit 3b38641e0d2518692b5222649d04e68381781b8d +Author: Steve Lhomme +Date: Wed Nov 13 14:29:27 2024 +0100 + + contrib: mpcdec: only build libmpcdec + + We don't need the rest. + + (cherry picked from commit 22e73a44cf2b707fd0d825ad2eed5e882d003c25) + +commit d16bcc8589f72366400b6506a56ae6388b3ae1bb +Author: Steve Lhomme +Date: Wed Nov 13 14:14:22 2024 +0100 + + contrib: mpcdec: remove unused MUSE_CONF + + Not defined since 48caea17c602e026290b6eef0c3cf994263d4c1d. + + (cherry picked from commit 3885cd774689c6127217498e150583adb7d3f150) (edited) + edited: + - 3.0 doesn't use HOSTVARS_CMAKE + +commit 36405a91076ab889edf5afd331c1ec2a64e41d77 +Author: Steve Lhomme +Date: Wed Apr 17 14:15:35 2024 +0200 + + contrib: mpcdec: remove references to the building from SVN + + We don't use that anymore. The repository still exists though. + + (cherry picked from commit eaa4b3b4678e3a78d6d7d33cb19442678a0352cb) + +commit aa299db4a4d23d5a09c35f15fcc86cc8e0ee8ede +Author: Steve Lhomme +Date: Thu Sep 29 10:13:15 2022 +0200 + + contrib: disable test building for all targets + + BUILD_TESTING is an option automatically used by CTest and recognized by all + projects that have some CMake-based tests + + (cherry picked from commit 637b57742e89106bc43d5c415190e68f9eb4da30) (edited) + edited: + - 3.0 already differentiates CMAKE_BUILD_TYPE + - 3.0 doesn't build flac with Cmake + +commit 698aaa846e48d9bd1ac3fe737818f72bc1354864 +Author: François Cartegnie +Date: Thu Apr 24 17:06:43 2025 +0700 + + demux: mp4: convert and forward Opus extradata + + refs #29135 + + (cherry picked from commit 6ac95c00183ff8f7a8172f216d306a0d56d14b2b) + Signed-off-by: Tristan Matthews + +commit 8c5fd5bedfc2241c9c897b933d053a77d932d7a4 +Author: François Cartegnie +Date: Tue Sep 24 15:27:56 2024 +0700 + + meta: taglib: simplify processing Ogg pictures + + (cherry picked from commit e4b04ce37b02cb9c257612b52aaf5abb2b1e14fe) + +commit f7eebe130cbd9ca50b81ca77edcd6f3555d4735b +Author: François Cartegnie +Date: Mon Sep 23 15:01:22 2024 +0700 + + meta: taglib: process FLAC pictures + + (cherry picked from commit 02586bac929a2009b16a90d989208ad865cdde8c) + +commit e171d11e9095fadd74e58388cfd3d53f53e4fe15 +Author: François Cartegnie +Date: Mon Sep 23 15:00:40 2024 +0700 + + meta: taglib: template default picture lookup + + (cherry picked from commit d5f7b25db0ac237319c436ccaa6a237915f1523d) + +commit cd434246066cf3b0ef0d98f5418001f6822ddb16 +Author: François Cartegnie +Date: Mon Sep 23 14:23:16 2024 +0700 + + meta: taglib: refactor setting up picture as attachment + + (cherry picked from commit 4240ef82cccfd280c868ed84d1ff8d39ad149497) + +commit 27f920bc9e6fb3c3a9adde14db23854ff58cd030 +Author: François Cartegnie +Date: Tue Sep 24 12:37:45 2024 +0700 + + meta: move ID3 picture defines to ID3Pictures.h + + (cherry picked from commit c344cc44d14feb2938357e47c6eb5703d89dbeb6) + +commit 82b241ee2bdffa1fbaa0d4fd3d7dc522e2f9b1d6 +Author: Kartik Dua +Date: Tue Apr 8 20:25:12 2025 +0530 + + Lua : replace recursive logic with iterative approach + + Converted recursive implementation to an iterative one to prevent + stack overflows from deeply nested calls. This enhances stability + and ensures safer execution for long sequences. + + (cherry picked from commit 33e05c8474f431fe735826961e89b38b9f4e3664) + +commit 3e1083e7b5510aa9ca955793d01e226a673880e0 +Author: Steve Lhomme +Date: Wed Apr 16 09:21:15 2025 +0200 + + contrib: d3d9: consider mingw-w64 v8 has recent enough headers + + All mentioned hashes as part of the v8 release. + +commit 9e48d6e3e00865878b23d6e075af9f80c49866a5 +Author: Steve Lhomme +Date: Wed Apr 16 09:46:32 2025 +0200 + + contrib: d3d9: download already patched d3d9caps.h + + The headers found in the videolan tarball cache are outdated. + +commit d652d58f34553b302a012ca423d0cc0911614f00 +Author: Steve Lhomme +Date: Wed Apr 16 09:39:08 2025 +0200 + + contrib: d3d9: download already patched dxva2api.h + + No need a widl an old and patched version. + +commit 833b02552a6d6055f1ed1d5f84827ac213db5774 +Author: Steve Lhomme +Date: Mon Mar 24 14:00:23 2025 +0100 + + direct3d11: use a shared staging texture for sources from another D3D11 + + This can happen with a clone video output. The decoder D3D11 device + is tied to the first display pool or its own. We can copy from GPU to GPU. + +commit eeb0578d1661826f3d4be41a059b86862725b145 +Author: Steve Lhomme +Date: Mon Mar 24 13:46:46 2025 +0100 + + direct3d11: use a function to create the staging texture + +commit e5acf58afb4e3f329c9124ca764a86898b6688f6 +Author: Steve Lhomme +Date: Mon Mar 24 13:32:55 2025 +0100 + + d3d11: allow creating shared D3D11 textures + +commit bfad92c826e038ea4d11d06e099b12b5595a5d83 +Author: Steve Lhomme +Date: Mon Mar 31 14:25:30 2025 +0200 + + contrib: d3d11: consider the headers are OK starting with mingw-w64 v8 + +commit 82cf66151b27c3cbbe5e3e5ccff1c125e1545cf1 +Author: Steve Lhomme +Date: Mon Mar 24 13:31:07 2025 +0100 + + contrib: d3d11: use working headers directly + + We don't need to go through widl if we get all the dependent headers. + + The headers found in the videolan tarball cache are outdated. + +commit 8a3978009382062196b7e4f6734cfeda84f729ff +Author: Marvin Scholz +Date: Mon Apr 11 17:25:57 2022 +0200 + + contrib: build postproc as part of ffmpeg + + If GPL is enabled, build postproc together with ffmpeg + instead of building an ffmpeg-less ancient version with + numerous bugs. + + Should fix crashes on macOS and possibly other OSes when + postproc is used. + + (cherry picked from commit 599191d3a4063d9d69b29f3a9bbd99fbfa636455) (edited) + - 3.0 didn't have the ranlib patch + +commit 74de0fda0bec6507ba1e305f7943150140f9dc44 +Author: Thomas Guillem +Date: Tue Apr 8 15:20:04 2025 +0200 + + avcodec: enable AV1-hw only for Windows + + To avoid crazy chroma chain configuration that will always fail in the end. + +commit 8c339ae3ca02b5a22ed860fa31dead66618be7f5 +Author: Thomas Guillem +Date: Tue Apr 8 15:08:14 2025 +0200 + + vout: android: revert window to base values + + This fixes OpenGL vout layout when it is used just after with the same + Android Surface. + + This android vout is normally only used with opaque chroma (mediacodec), + and the opengl one should be used for software rendering. + + Nevertheless, this vout could be used for software rendering when the + OpenGL one failed. This was the case when the avcodec AV1-hw decoder + requested a VAAPI chroma (via a YUV chroma fallback). + + Fixes #29120 + +commit 0df7b1bef2a46ef1eb73429db6aff3ed6c2156ab +Author: Thomas Guillem +Date: Tue Apr 8 15:02:11 2025 +0200 + + vout: android: remove AndroidWindow_ConfigureJavaSurface + + It was a hack for Android 2 and 3, removed since in a long time in vlc-android. + +commit 281cbc8548732ed2d4ab20330823d93a8bbf46dc +Author: Fatih Uzunoglu +Date: Thu Aug 31 17:14:25 2023 +0300 + + qt: add const to psz_config + + (cherry picked from commit b55e37761a557c49f8b424a198106fa95fdd702a) + +commit e8f8bfe4ed7f404f45c8ca2a0f36dea53d7d5850 +Author: Zhao Zhili +Date: Sun Oct 17 00:27:59 2021 +0800 + + avcodec: map VLC_CODEC_YUVA_444_12 + + (cherry picked from commit 51c3da8b001290a2f0513bddbcceb3263166ed90) + Signed-off-by: Marvin Scholz + +commit 58bdf5c693dff12f90824348a867bad3117d722e +Author: Zhao Zhili +Date: Mon Oct 18 15:39:12 2021 +0800 + + fourcc: add description for VLC_CODEC_YUVA_444_10B + + (cherry picked from commit 8888b173a0286606df83b53bd0602937edac5620) + Signed-off-by: Marvin Scholz + +commit e880afdd335734480ab9a8caac4bd39d73584b77 +Author: Zhao Zhili +Date: Sat Oct 16 23:56:20 2021 +0800 + + fourcc: add planar Y:U:V:A 4:4:4 12bits + + (cherry picked from commit f88c010486dd7a8cf567aac22b70d7c06de271d5) + Signed-off-by: Marvin Scholz + +commit 8236ad0ff91dac00361a8804a4b62c31a98213e7 +Author: Marvin Scholz +Date: Wed Mar 26 03:07:08 2025 +0100 + + macosx: fix slider bounds clipping + + Fixes the slider not clipping correctly on recent macOS versions when + built against recent SDKs. + + Fix #28953 + +commit a59723657920230975e925b95f2739db6b0313c7 +Author: Marvin Scholz +Date: Wed Mar 26 03:24:42 2025 +0100 + + macosx: env.build.sh: sync with main build script + + We target macOS 10.7 for VLC 3.x, so properly reflect that in the + env.build.sh script as well and sync the list of disabled functions + with the ones from the main build script to properly catch all of the + relevant ones. + +commit b342676852145fcc1e640630e6617e7628b7fe88 +Author: Steve Lhomme +Date: Thu Mar 20 11:28:34 2025 +0100 + + contrib: libarchive: update to 3.7.8 + + Fixes some CVE's [^1]. + + [^1]: https://github.com/libarchive/libarchive/releases/tag/v3.7.8 + + (cherry picked from commit 2804dc2688b0ca6eb7dca7c15b34cbf44f56d729) + +commit f115919db1446a03398af4d3febec88629ffa0c2 +Author: Steve Lhomme +Date: Thu May 25 13:42:56 2023 +0200 + + contrib: libarchive: download tarball from GitHub + + The hash is unchanged (good). + + (cherry picked from commit c340f0b0ae77df1cd89123404f4c052d6c17873c) (rebased) + rebased: + - the 3.7.7 had already been cherry-picked without this patch + +commit a381bf5bc0883db0edaedbf9d88ef9282b4af055 +Author: Johannes Kauffmann +Date: Fri Feb 28 21:38:32 2025 +0100 + + substx3g: fix leak on error + + (cherry picked from commit 80ca615d96cddb7493ef1183a32c42efc23d0cfe) + +commit e5cc1bf6a5b3ff520334c33e8b1b02cadd0180c2 +Author: Johannes Kauffmann +Date: Fri Feb 28 20:58:23 2025 +0100 + + substx3g: factor error handling + + (cherry picked from commit 18b1c9d8fd8ce0a5fbd4274ebe2064b66dea8e2f) + +commit ec194c043f301da550a3e835887a410115b26b94 +Author: Johannes Kauffmann +Date: Fri Feb 28 21:39:08 2025 +0100 + + substx3g: fix file name comment + + (cherry picked from commit 576dc57489c40485034b1fd82b0f6ded2f9cde62) + +commit 2ad4e0b252d4f96f33d779e2d7f237b29aa5690c +Author: Steve Lhomme +Date: Mon Mar 10 09:23:00 2025 +0100 + + extra/tools: allow ninja to use as many components as needed + + That should allow using ninja to build libvlc.so on Android (it uses 300+ .a files). + + This is part of ninja 1.12 which doesn't have proper jobserver support. + + (cherry picked from commit cf5a1db0bf290948ab7e9c0d64605e49e1209e70) + +commit 0f585cf8a21490be778b551e55af8dbdb3dc71f5 +Author: Steve Lhomme +Date: Thu Dec 15 12:00:37 2022 +0100 + + extras: tools: update ninja to 1.11.1 + + (cherry picked from commit f31a7e8fc07bc845f1fd67847066585a6e1149a0) (rebased) + rebased: + - the SHA512SUMS has different surrounding values + +commit 1f284e03666acf09521566b4d27798f374d4dbfe +Author: Steve Lhomme +Date: Thu Dec 15 11:46:37 2022 +0100 + + extra: tools: use the ninja fork from Kitware + + This work, from the CMake makers, supports jobserver and is actively + maintained. + + (cherry picked from commit 270efe5932bbb97cbaec173120ce79173fee0fcb) + +commit 6d7029aa047b318ad77a604c68c61b3e84522502 +Author: Steve Lhomme +Date: Fri Nov 10 10:34:02 2023 +0100 + + adaptive: fix debug string formatting + + These debug messages can be enabled via defines in Debug.hpp. + + (cherry picked from commit 88a93fbcb93eea470ca16c28d3c24a9ce9520f16) (edited) + edited: + - HTTPConnectionManager.cpp doesn't have some logs in 3.0 + - 3.0 has some mutex unlock after some logs + +commit d8715e1ad91bb377fc352e16367b6426e9bf9e4f +Author: Marvin Scholz +Date: Tue Apr 12 00:15:55 2022 +0200 + + demux: adaptive: use correct format specifier + + (cherry picked from commit 311e0303c54b7a7afe2a2b8daeb05c2d03a79ed6) + +commit 458b19aff577cbab75e4873209895474b133eb3a +Author: Alexandre Janniaux +Date: Thu Apr 9 14:56:57 2020 +0200 + + aribcam: use %zu formatter for size_t + + Fix warnings when size_t is not the same size as a long unsigned int. + + (cherry picked from commit 20b485cd901afb5b04e7dd9b74a9d1d97a0ceb85) + +commit 141d87953b33b93fd4f6949ea7135cbe12b4dcc8 +Author: Rémi Denis-Courmont +Date: Sun Apr 14 10:15:11 2019 +0300 + + avi: fix format string + + (cherry picked from commit 4382fe0f8461b611d35aaec3dc73cace1a1a32f6) + +commit ce971ea70a7dad794490ed39ceea28498e706516 +Author: Steve Lhomme +Date: Fri Feb 28 13:18:26 2025 +0100 + + demux: subtitle: check the FORMAT= value is a number in mpsub + + We don't need vlc_strtof_c() since we already have the float value. + We also don't need to check what is after the number (a comment for example). + As long as it's a number it should be FPS. Anything else other than + "FORMAT=TIME" is bogus. So we don't need to get the remaining part of the string. + + (cherry picked from commit a2c276959052b592fb37eeed0968ffeac02f0014) (edited) + edited: + - us_strtof has not been renamed to vlc_strtof_c + - sub-original-fps is called sub-fps on 3.0 + +commit 8afa165d950382a19536461e3e120cfd9c131ff2 +Author: Steve Lhomme +Date: Tue Mar 4 12:55:09 2025 +0100 + + demux: subtitle: don't break when using FPS in mpsub + + We still need to look for the wait & duration values after that. + + (cherry picked from commit 107de58d1786b47f2c2c7c5591b623140d5b4210) (rebased) + rebased: + - sub-original-fps is called sub-fps on 3.0 + +commit f79221eec8129cf662301d79b1589eb82538930f +Author: Steve Lhomme +Date: Fri Feb 28 12:58:54 2025 +0100 + + demux: subtitle: simplify "FORMAT=TIME*" check + + (cherry picked from commit 3c4cff54b5b39b33a785036e746ea0502ac55c14) + +commit 089a5c67a08b583ff25a6527c17219b3af167e5e +Author: Steve Lhomme +Date: Fri Feb 28 12:56:24 2025 +0100 + + demux: subtitle: check for the "FORMAT=" string once + + (cherry picked from commit 5fa5916a60f5a61f483ca78c8793105686a90189) (rebased) + rebased: + - us_strtof has not been renamed to vlc_strtof_c + +commit 66feed43aea36fa286173bb69e2b84258fbd699a +Author: Steve Lhomme +Date: Tue Mar 4 12:28:24 2025 +0100 + + demux: subtitle: skip mpsub comment and empty lines early + + (cherry picked from commit 8e78d79215fefd3a34154504ff8dc4d3460d282e) + +commit 2d3548eee8376afadc544513b6df9efdf01fe304 +Author: Steve Lhomme +Date: Tue Mar 4 12:24:27 2025 +0100 + + demux: subtitle: check mpsub timing line early + + Most of the time that's the first line we will get. + If not the line can contain different things other than a FORMAT setting. + + And calling vlc_strtof_c without checking the lines contains 2 values + was bound to use 0 if the line did not actually contain numbers. + + (cherry picked from commit dcb0dfcc32f12baaf4ca4b8e9969601d8c847763) (edited) + edited: + - us_strtof has not been renamed to vlc_strtof_c + +commit a5a1f51050db4d9ee3b1aafdb9ce1108f138904a +Author: Steve Lhomme +Date: Fri Feb 28 14:26:46 2025 +0100 + + demux: subtitle: only set the string terminator on loop exit + + No need to set it on each iteration. + + (cherry picked from commit 1f9b8484003d74e1b1a6e0bd4c8b738bafd8aa9d) + +commit 72958083e31cb5b8ef53361a8da878ab2732af34 +Author: Steve Lhomme +Date: Fri Feb 28 13:13:34 2025 +0100 + + demux: subtitle: avoid allocating a dummy string + + realloc works fine on NULL. + The pointer is set in p_subtitle->psz_text which is free'd later. + It's OK to free a NULL pointer if there wasn't any line to use. + + (cherry picked from commit de7e5074734d39a6cfde69a0fe3212b61333a795) + +commit 390951f9b862b37439f5d3e33d134c5ad97060e2 +Author: Steve Lhomme +Date: Fri Feb 28 13:12:14 2025 +0100 + + demux: subtitle: keep the size of the concatenated string + + No need to do a lengthy strlen() call each time the concatenated string grows. + + (cherry picked from commit 1e03b716637ff7180a169454ccbf88a2a4f9f8f3) + +commit 7208fbbc6c524a98a1e132ce0bda1e013c78f3ec +Author: Steve Lhomme +Date: Fri Feb 28 13:09:37 2025 +0100 + + demux: subtitle: avoid using strcat when we know the string sizes + + We're just concatenating the lines in psz_text. + + (cherry picked from commit e8f7ac273de7ec0bf2e87dbc8c4cacf0800f9927) + +commit 3b16df6e0033bfbeb77f65ae289a69414ea1ef5d +Author: Steve Lhomme +Date: Fri Feb 28 13:08:54 2025 +0100 + + demux: subtitle: only allocate internal psz_text when needed + + (cherry picked from commit 3f110c9571560f07ef3ce543410cb5f800c8e84a) + +commit 9a7f8217d42ffea5b9e2b11072d2e7fe188e39a9 +Author: François Cartegnie +Date: Mon Apr 3 21:51:17 2023 +0200 + + demux: subtitle: add missing TS_0 offset + + (cherry picked from commit 6dc0701b983082cd8fc7155ca608a8ceff2a0af6) (rebased) + rebased: + - us_strtof has not been renamed to vlc_strtof_c + +commit d6b72946fd3f7d64a0eec170d6491d1314801d3b +Author: Steve Lhomme +Date: Thu May 31 15:20:52 2018 +0200 + + modules: transform vlc_tick_t value from seconds with vlc_tick_from_sec + + (cherry picked from commit ca5fc95f6366d4c079ec574411934ac52ed8683e) (edited) + edited: + - CLOCK_FREQ was not used as 04db84cd9cdace60ce450d269414ac0923dc857f was + not backported + +commit 6639b10151115f3805085dcb6b4b5523b96196b3 +Author: Steve Lhomme +Date: Mon May 7 14:05:58 2018 +0200 + + modules: transform milliseconds value into vlc_tick_t with VLC_TICK_FROM_MS + + (cherry picked from commit 25d7af9c59e3a9aac7174c1f4aff595d6808f03b) (edited) + edited: + - 3.0 uses mdate/msleep instead of the vlc_tick API + +commit 5749ca3d1d47ad2ec3c12c163788d6ee3b7c075e +Author: Steve Lhomme +Date: Mon Mar 10 08:44:21 2025 +0100 + + demux: adaptive: remove local variants of vlc_tick conversions + +commit 0558400309a854da4cce44e775f46d4e7017c321 +Author: Hugo Beauzée-Luyssen +Date: Fri Jun 29 18:16:17 2018 +0200 + + vlc_ticks: Simplify C++ integer variants of vlc_tick_from_sec + + (cherry picked from commit af03afe3e17069728fac9458fb43ab3921042f82) (edited) + edited: + - the file modified is vlc_mtime.h and not vlc_tick.h + +commit 6df317b6f731647bb24b00e09fe9d1f4cb425385 +Author: Steve Lhomme +Date: Fri Jun 29 17:56:53 2018 +0200 + + vlc_tick: remove C++ long variant of vlc_tick_from_sec() + + it collides with the int64_t variant on some platform + + (cherry picked from commit 2d4a266663c225b137060b41e37fb7611fe63522) (edited) + edited: + - the file modified is vlc_mtime.h and not vlc_tick.h + +commit 86b93c7c66688f1c21231abbfc8cbcbac4ab934e +Author: Steve Lhomme +Date: Fri Jun 22 18:01:09 2018 +0200 + + vlc_tick: add helper macros to convert seconds to/from vlc_tick_t + + (cherry picked from commit 58a6a21271f8d3db5f48418488c0dece09d94247) (edited) + edited: + - the file modified is vlc_mtime.h and not vlc_tick.h + +commit 5e823c0c499c32ba14a7444feb5848fc557a9c64 +Author: Steve Lhomme +Date: Fri Jun 1 17:13:12 2018 +0200 + + demux: subtitle: use an integer for the mpsub factor + + it's never a floating value + + (cherry picked from commit 7572803a07fdd5ccfc5afb7e6ada724cb4277883) + +commit fed25a62527e02fe6b7cfdbb4f36e19a4a9ae0b4 +Author: Marvin Scholz +Date: Mon Nov 25 16:27:20 2024 +0100 + + extras/tools: add /dev/stdin to sha512sum command + + This is needed with the sha512sum introduced on recent macOS versions + and matches what is already done for contribs too. + + (cherry picked from commit 2564699fa2c51bb969a2ca0ff76788005dc1968b) (rebased) + rebased: + - the code around is slightly different + +commit fb5640776c1bebfd110464d3998565a812677ad4 +Author: Steve Lhomme +Date: Wed Mar 5 13:53:18 2025 +0100 + + d3d11_deinterlace: remove duplicate D3D11_Create call + + It was added in 159ef80cd41bbb24fca51044b09fa73f33382a28 + But it was already there since 74361a31b6b40b554fb61ce59c65e6f84c534c8d. + + The order doesn't matter because we rely on D3D11_FilterHoldInstance() + which already has the DLL loaded. + +commit 5eacbb5593827f8798c6e3d9374c70fe3cea3d38 +Author: Steve Lhomme +Date: Wed Mar 5 13:54:37 2025 +0100 + + d3d11_filters: hold the D3D11 DLL which the filter is alive + + This is similar to 74361a31b6b40b554fb61ce59c65e6f84c534c8d and done + in the other D3D11 filters. + + Fixes #29069 + +commit e0557cf4de1c1d3dc4300f4ec2ca1e5075aadab8 +Author: Steve Lhomme +Date: Wed Mar 5 13:31:15 2025 +0100 + + doc: libvlc: add 's' shortcut to stop playback + +commit 9a125ac41427c4293420e440b756679ae3b262dd +Author: Steve Lhomme +Date: Wed Mar 5 09:01:03 2025 +0100 + + doc: libvlc: remove ssize_t definition for MSVC + + It's not needed since ab4f2bc2ec72c69fe0220d4f519b67cc5b7fc22f. + +commit b64a9b6c754e4c32ad610d891e3d379d4492d6bf +Author: Khalid Masum +Date: Mon Feb 24 17:28:20 2025 +0000 + + extras: tools: add python 3.13 support to Ninja + + Backport a patch from Ninja 1.12 that adds python 3.13 + support. This is necessary because current version of Ninja + does not work with python 3.13 as pipes module is deprecated. + + (cherry picked from commit b8dff0645a6754d6afaf087215d208d3c8c6c307) + +commit aed678ebbb47b88de66ce343515b6aadc3ae5c10 +Author: Steve Lhomme +Date: Thu Feb 27 13:13:24 2025 +0100 + + freetype: avoid very large fonts in portrait mode + + Either when the video is in portrait mode or when the subtitles + are shown in the black bars and the video area is in portrait mode, + the text can become very large just because we apply a percentage base on + the output height. + + We switch mode when the height becomes bigger than the width + so there's a continuity in the ratio when growing/shrinking the + video in one direction or the other. + + (cherry picked from commit e25ec4e25be1f2620ec031d2ef7bf5a09809235d) + +commit d2aa58982c9247f44f29a7fe461c3a480aebb053 +Author: Steve Lhomme +Date: Thu Feb 13 08:50:32 2025 +0100 + + cvdsub: fix leak on missing PTS + + Fixes #28995 + + (cherry picked from commit 35e67cfa5d3ac3907c2e47a856955300706d6083) + +commit b2850c07a01d88e0171f98d9678eb5195cb40165 +Author: Steve Lhomme +Date: Wed Feb 12 14:33:30 2025 +0100 + + svcdsub: fix decoded block leaking + + A "gathered" SPU is assembled to send to the decoder, and the decoder then handles + the data from there. But it was never released. + + Fixes #28992 + + (cherry picked from commit f350f64fcbd4df51e2fef8446e8e9cf7c0760f33) + +commit 26e42d016f0c4cc059161ee6f005fc80d1ce840e +Author: Steve Lhomme +Date: Wed Feb 12 13:55:26 2025 +0100 + + codec: webvtt: fix leaking cue segments + + The p_new element was never added to the chain. + + Fixes #28990 + + (cherry picked from commit 60d9ff2fe65ecb895e67218af7d50bcb0b749bba) (edited) + edited: + - the indentation is different on 3.0 + +commit 51ac114275229615ee21fcc4a4200278896492b1 +Author: Ds886 +Date: Mon Oct 25 08:13:02 2021 +0000 + + configure: remove unneeded libtar + + (cherry picked from commit 53ec4c4d502f40cccd32c82bcb6484dc943837eb) + Signed-off-by: Thomas Guillem + +commit b12613a80361d190660439627f75a0c965074c3d +Author: Steve Lhomme +Date: Tue Apr 18 14:12:46 2023 +0200 + + include cassert instead of assert.h + + cassert is the preferred way in C++. It doesn't contain static_assert + which is otherwise a keyword. + + https://stackoverflow.com/a/43011752/1266123 + https://en.cppreference.com/w/cpp/header/cassert + https://en.cppreference.com/w/cpp/language/static_assert + + (cherry picked from commit 4c99f1a44ab6db4dba475327b2eed90405619bcd) (edited) + edited: + - 3.0 has less files in C++ (d3d11, medialibrary, renderer) + - some Qt files were moved in 4.0 + +commit bb833e10b1d6502089952973295a3736b52eef3a +Author: Alexandre Janniaux +Date: Mon Mar 21 14:49:41 2022 +0100 + + avparser: fix missing const + + (cherry picked from commit 72992236eda5b11786b30e73a212146060e4f317) + +commit 41f1c168a5a9c5ac5c88ecbbe0f8f4ddef8b999f +Author: Steve Lhomme +Date: Mon Dec 16 09:28:55 2024 +0100 + + nfs: fix libnfs API v2 support + + Introduced in libnfs 6.0.0. + + Co-authored-by: ronnie sahlberg + Co-authored-by: Thomas Guillem + + (cherry picked from commit a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc) + +commit 60b94fcbdbc40bfdcc237b5670f85ae74186185f +Author: Steve Lhomme +Date: Mon May 13 15:44:22 2024 +0200 + + configure: clean the x262 check and fix typo + + (cherry picked from commit 31938ff13aa6d56474e867fc3c4e72df1f66a359) (rebased) + rebased: + - the code around/inside is slightly different + +commit 672d60bdc4694be97d195e8c15a14917ec53e1a5 +Author: Steve Lhomme +Date: Fri Feb 14 14:40:57 2025 +0100 + + demux: libmp4: put VLC_FORMAT in the MP4_BoxXXX declaration + + So the compiler can check the callers. + + (cherry picked from commit 21aaf77b87ccfb2fedbd5199c71b96fed051e910) + +commit 75b68ec0a57a9cdd682cf88c17fabb772dd6bd6b +Author: Steve Lhomme +Date: Fri Feb 14 14:49:44 2025 +0100 + + demux: mp4: use %u with using MP4_BoxGet varargs + + (cherry picked from commit bd5c9bc1fc23ff566c03e5e61b7be3085acb85ed) (edited) + edited: + - only one location needs a fix on 3.0 + +commit cd31c1bfffeadfcef8ea6ebf2347fd07e1c9608b +Author: Steve Lhomme +Date: Tue Feb 18 08:58:24 2025 +0100 + + demux: libmp4: add simplified MP4_BoxGet/MP4_BoxCount + + Without varargs which is most of the call we use. + And it won't parse and allocate a new string each time. + + (cherry picked from commit 8cf9d34a64d70a6b70aee4ac08f5977e9c2a6173) (edited) + edited: + - 3.0 doesn't have heif.c + - 3.0 has some varargs calls in different places + +commit 0e178b899bd82c835134a5e5e515862517434fd7 +Author: Steve Lhomme +Date: Tue Feb 18 08:56:07 2025 +0100 + + demux: libmp4: split the code that gets the path and the MP4 box + + MP4_BoxGet_Path must always be called with a usable path that won't + be free'd by MP4_BoxGet_Path(). + + (cherry picked from commit aef04a7b425fb004286b5e3c18ca55ee7b84876e) + +commit 696da7b33eaea16b27c88bec892f476150cc7fec +Author: Steve Lhomme +Date: Fri Feb 14 14:46:38 2025 +0100 + + demux: mp4: avoid passing unused extra parameter to MP4_BoxGet() + + The format string doesn't contain any string to replace. + + (cherry picked from commit 11723c0906d010aed04f311d51408735508fd9a7) (edited) + edited: + - 3.0 needs a similar fix in "tref/chap" handling as 6fd1fbf7582df806079a863773694f3a13ed22ab + is not backported. + +commit fe23f3296c1e2d1e80160f644de1cecc1934f829 +Author: Rémi Denis-Courmont +Date: Fri May 4 19:35:35 2018 +0300 + + mp4: add format attribute + + (cherry picked from commit 1a3017ef2dcbc7a3a9cc08299ceec88696f535d1) + +commit 5c0f49410deab34af4f37a1327aeb51d9ac007a7 +Author: Steve Lhomme +Date: Tue Feb 18 15:59:14 2025 +0100 + + direct3d11: find a usable IDXGIOutput in UWP + + GetContainingOutput fails in UWP so we pick any IDXGIOutput for the D3D11 device. + We can't tell where it is in the screen so we most likely get the first display. + + Fixes #29039 + + Co-authored-by: Tung Huynh + +commit 6895dc7f3d2e5e9d86da47107a81f72e8da0f619 +Author: Rémi Denis-Courmont +Date: Wed Jul 22 17:04:17 2020 +0300 + + asf: improve log message + + Peeking is an irrelevant implementation detail here. + + (cherry picked from commit 788007c8f6a462376a5d9603f78dea3da20881d9) + +commit e701467d5ad49c929c8eb57cf4127b39bdaa509e +Author: Zhao Zhili +Date: Thu Sep 20 11:19:01 2018 +0800 + + demux: asf: fix log format string + + Signed-off-by: Rémi Denis-Courmont + (cherry picked from commit 1438d0767c842812e502635c320cad4bd178ef62) + +commit 739a486caac27da897628b1b13cc27446dc1ca74 +Author: Steve Lhomme +Date: Tue Sep 18 10:16:29 2018 +0200 + + demux:asf: process the i_pkt_time in vlc_tick_t instead of milliseconds + + (cherry picked from commit fe73d59ce50b98fa7256115de834538389299c52) + +commit 1de0d6f88bfe556177f07a82f2f07533038d1b60 +Author: Steve Lhomme +Date: Tue Sep 18 10:18:45 2018 +0200 + + demux:asf: handle the i_pkt_time_delta in vlc_tick_t instead of milliseconds + + (cherry picked from commit 7d05ad592d0fc5a006c4bb3b7fcfe4402e3d7e43) (rebased) + rebased: + - 3.0 doesn't use VLC_TICK_FROM_MSFTIME + +commit 44202c22d41d11af5df44a78465bf2dc451d299f +Author: Steve Lhomme +Date: Thu Jun 7 11:30:04 2018 +0200 + + demux:asf: fix the i_preroll_start substracting milliseconds from an mtime + + store the preroll in vlc_tick_t instead of milliseconds + Divide all uses by 1000 for now + + SeekIndex was using the value in milliseconds substracted from the vlc_tick_t date. + + (cherry picked from commit 120e2cb800da292077e80dc790f323b901a13ff2) (rebased) + rebased: + - 3.0 doesn't use msftime_t + +commit 66c2e24f432627d3874f62f02df1a38a85a95eb5 +Author: Steve Lhomme +Date: Thu Jun 7 11:26:16 2018 +0200 + + demux:asf: store the send_time as an vlc_tick_t rather than milliseconds + + Divide all the uses by 1000 for now + + (cherry picked from commit cac66afe7f52899bb6b6c7b1f615a6c752bf7e49) (rebased) + rebased: + - the code around is slightly different + +commit eb9e6c0e892b2735aeba733d0b92e195201cffd8 +Author: Steve Lhomme +Date: Thu Jun 7 10:27:05 2018 +0200 + + demux:asf: remove write-only i_extension_pts + + (cherry picked from commit c3fbff8aa4e313d8dc6af645f216c949e88dcd26) (rebased) + rebased: + - i_payload_pts is already a vlc_tick_t on 3.0 since 3f9fc44176cc5505132977885799fa988c5e7701 + +commit 5ef2ed124b4bc2ec9b04b54e04ca9323ce838c21 +Author: Steve Lhomme +Date: Fri Jun 22 18:02:36 2018 +0200 + + vlc_tick: add helper macros to convert milliseconds to/from vlc_tick_t + + (cherry picked from commit 505182d874273dcbfdc10184f450469ee63a96df) (edited) + edited: + - the header is still called vlc_mtime.h in 3.0 + +commit fa5ecdd0ed4b606313b50450e4a64985cb7083d8 +Author: Steve Lhomme +Date: Tue Feb 18 15:06:53 2025 +0100 + + rename mtime_t to vlc_tick_t + + Keep a copy of vlc_tick_tfor backward compatibility. + +commit 3341555e06fd6db3c4e2cdf1a05c0451a6b043af +Author: Steve Lhomme +Date: Thu Jun 7 11:31:58 2018 +0200 + + demux:asf: the preroll start is in mtime_t + + (cherry picked from commit 96d5784c855aa3ab52446453472d9654c0086c84) + +commit 0c0430b699c05d26eb867ef78a4d37a17d5493e3 +Author: Thomas Guillem +Date: Mon Feb 17 15:47:32 2025 +0100 + + compat: test stdckdint + + Test C23 header, clang/gcc builtins and compat versions. + + (cherry picked from commit a7ff7c3c00d4bcd3e1230f46a18485b43af0672b) + Signed-off-by: Thomas Guillem + +commit 79146a8a366b2f46a41f9d57c742a4b9227259b5 +Author: Thomas Guillem +Date: Mon Feb 17 15:13:11 2025 +0100 + + compat: stdckdint: handle signed cases + + (cherry picked from commit 9cab61e7fe0f8d54673228e40bedb35be8c4abf9) + Signed-off-by: Thomas Guillem + +commit ba82dcd25f7ba5e77a5ff782a306dea5e3c48343 +Author: Rémi Denis-Courmont +Date: Sun Feb 18 15:14:34 2024 +0200 + + stdckdint: add compatibility header + + This only implements unsigned types for now, as there are no known use + cases for signed checked arithmetic as of yet. The macros will safely + error out at compilation time if signed types are misused. + + (cherry picked from commit 38c10291760e55aa6ba4713be5ec1d37138a3bd9) + Signed-off-by: Thomas Guillem + +commit 7b9c6bf309d9da4c22b3605608893a0af9b73ce2 +Author: Steve Lhomme +Date: Wed Feb 19 13:18:08 2025 +0100 + + qt: use QWheelEvent::DefaultDeltasPerStep instead of hardcoded values + + The constant was added in [^1] in Qt 5.5 which is the minimum + we support. + + [^1]: https://github.com/qt/qtbase/commit/aac6cda8041bc039efbffef5235a6f84bcae326a + +commit cf4f31f5c1cad4d11b1460f99e774189990e6f30 +Author: Steve Lhomme +Date: Tue Dec 17 08:57:05 2024 +0100 + + qt: get the screens geometry using screens() + + Gettting the desktop() object is deprecated and removed in Qt6 [^1]. + + targetScreen() is always within the boundaries of QGuiApplication::screens().length() + or -1. And that's always the value used in controller.cpp. + + [^1]: https://doc.qt.io/qt-6/widgets-changes-qt6.html#qdesktopwidget-and-qapplication-desktop + +commit fc2b1f6d5b1fbac0fc1698da668ea0bd45103d6b +Author: Steve Lhomme +Date: Tue Dec 17 09:06:11 2024 +0100 + + qt: use screenAt() to find the screen at a given position + + Gettting the desktop() object is deprecated and removed in Qt6 [^1]. + + [^1]: https://doc.qt.io/qt-6/widgets-changes-qt6.html#qdesktopwidget-and-qapplication-desktop + +commit 855a266757791de5d4d44ee21d96181a785d479c +Author: Steve Lhomme +Date: Mon Dec 16 14:48:15 2024 +0100 + + qt: use availableGeometry() from the primaryscreen + + Gettting the desktop() object is deprecated and removed in Qt6 [^1]. + + [^1]: https://doc.qt.io/qt-6/widgets-changes-qt6.html#qdesktopwidget-and-qapplication-desktop + +commit f82e97c9b400e5981af710e1fbe18fc595f20fbf +Author: Steve Lhomme +Date: Tue Dec 17 08:50:57 2024 +0100 + + qt: use screens() to get the list of screen + + Gettting the desktop() object is deprecated and removed in Qt6 [^1]. + + [^1]: https://doc.qt.io/qt-6/widgets-changes-qt6.html#qdesktopwidget-and-qapplication-desktop + +commit 1e28616a7ed5662b926a6166dbf069e6cb615815 +Author: Steve Lhomme +Date: Tue Dec 17 08:22:48 2024 +0100 + + qt: use QEnterEvent with enterEvent() in Qt6 + +commit acad49d6dff6aeca59d657b4c29847f23581033a +Author: Steve Lhomme +Date: Tue Dec 17 08:15:16 2024 +0100 + + qt: disable statusBar() usage if Qt is not built with it + + We can't remove the unused methods because we don't have the proper + check in moc. + +commit 2e2cf95735958ead637e365110de0dcbc3c3c642 +Author: Steve Lhomme +Date: Fri Dec 20 10:51:48 2024 +0100 + + qt: remove unused showBuffering() + + Removed in 4.0 in 92539782be07770312eeb6549b50a72c86879729. + +commit 9d22c80f819408014be0a24c67059aa22831b712 +Author: Steve Lhomme +Date: Mon Dec 16 14:54:48 2024 +0100 + + qt: use QAbstractNativeEventFilter + + Instead of deprecated nativeEvent() method. + +commit 0713a59ad9836ae100fef924c16ec4971de2d7e8 +Author: Steve Lhomme +Date: Wed Dec 18 09:04:18 2024 +0100 + + qt: merge MainInterfaceWin32::nativeEvent() and MainInterfaceWin32::winEvent() + + No need for an extra method. + +commit ec38184b7dc20670a9a91a382f8b0de58e00abbe +Author: Steve Lhomme +Date: Tue Dec 17 16:12:27 2024 +0100 + + qt: use QMouseEvent::globalPosition() instead of QMouseEvent::globalX/Y() + + globalPosition() doesn't exist in Qt5 but globalPos() is the same thing [^2]. + + It's deprecated in Qt 5.15 [^1], since 5.0 [^3], and removed in Qt 6. + Although the deprecation was delayed to 5.15 because of a Qt3D issue [^4], that + we don't use. + We use a replacement is suggested in [^1]. + + The commit log of [^3] even mentions its deprecated "since Qt4 times". + + [^1]: https://doc.qt.io/qt-6.2/qmouseevent-obsolete.html#globalX + [^2]: https://doc.qt.io/qt-5/qmouseevent.html#globalPos + [^3]: https://github.com/qt/qtbase/commit/7d29807296cb7ccc7f3459e106d74f93a321c493 + [^4]: https://github.com/qt/qtbase/commit/8dc45d5b7cd9637f28b2d872a834266b991bf434 + +commit 3e2e63bcc38635766168560b0e26513782fb8355 +Author: Steve Lhomme +Date: Tue Dec 17 13:42:42 2024 +0100 + + qt: use QWheelEvent::angleDelta() instead of QWheelEvent::orientation() + + It's deprecated in Qt 5.15 [^1], since 5.0 [^2], and removed in Qt 6. + Although the deprecation was delayed to 5.15 because of a Qt3D issue [^3], that + we don't use. + We use a replacement is suggested in [^1]. + + The commit log of [^2] even mentions its deprecated "since Qt4 times". + + The code is slightly similar to what is found in qtWheelEventToVLCKey(). + And borrows from 7498ac55db73dec778d97de88a758707964ebdc7. + + [^1]: https://doc.qt.io/qt-5/qwheelevent-obsolete.html#orientation + [^2]: https://github.com/qt/qtbase/commit/7d29807296cb7ccc7f3459e106d74f93a321c493 + [^3]: https://github.com/qt/qtbase/commit/8dc45d5b7cd9637f28b2d872a834266b991bf434 + +commit 39742c0b27cbd28e584d59b28b666d41aeaa23ee +Author: Steve Lhomme +Date: Tue Dec 17 13:35:16 2024 +0100 + + qt: use Qt::MiddleButton instead of Qt::MidButton + + It's deprecated in Qt 5.15 [^1], since 4.7, and removed in Qt 6. + + [^1]: https://github.com/qt/qtbase/commit/6ee6c52b57a0fbe9df00b30616afd90476ebdfd6 + +commit 2d21d237be8b5609ecb7b00eee2a16043c2340fa +Author: Steve Lhomme +Date: Tue Dec 17 13:29:09 2024 +0100 + + qt: use QWheelEvent::angleDelta() instead of QWheelEvent::delta() + + It's deprecated in Qt 5.15 [^1], since 5.0 [^2], and removed in Qt 6. + Although the deprecation was delayed to 5.15 because of a Qt3D issue [^3], that + we don't use. + We use a replacement is suggested in [^1]. + + The commit log of [^2] even mentions its deprecated "since Qt4 times". + + [^1]: https://doc.qt.io/qt-5/qwheelevent-obsolete.html#delta + [^2]: https://github.com/qt/qtbase/commit/7d29807296cb7ccc7f3459e106d74f93a321c493 + [^3]: https://github.com/qt/qtbase/commit/8dc45d5b7cd9637f28b2d872a834266b991bf434 + +commit 7ae9caeb96f0387e4c6786b798ddb694c78da6a8 +Author: Steve Lhomme +Date: Tue Dec 17 13:19:54 2024 +0100 + + qt: use QAbstractItemModel::index() instead of QModelIndex::child() + + It's deprecated in Qt 5.15 [^1], since 5.8 [^2], and removed in Qt 6. + We use a replacement is suggested in [^1]. + + The commit log of [^2] even mentions its deprecated "since Qt4 times". + + [^1]: https://doc.qt.io/qt-5/qmodelindex-obsolete.html#child + [^2]: https://github.com/qt/qtbase/commit/8dc45d5b7cd9637f28b2d872a834266b991bf434 + +commit 02de7fdafe7da0bdcc2389391b9647d1f9f6ed5f +Author: Steve Lhomme +Date: Tue Dec 17 13:10:52 2024 +0100 + + qt: use QPixmapCache::find(QPixmap*) instead of QPixmapCache::find(QPixmap&) + + It's deprecated in Qt 5.15 [^1], since 5.13 [^2], and removed in Qt 6. + + The commit log of [^2] even mentions its deprecated "since Qt4 times". + + [^1]: https://doc.qt.io/qt-5/qpixmapcache-obsolete.html#find + [^2]: https://github.com/qt/qtbase/commit/daee9af969a04a2919a948ba1f5d314626925a9a + +commit 55ad77f4c1e912d0187844917c1c0b0010669f2f +Author: Steve Lhomme +Date: Tue Dec 17 11:54:44 2024 +0100 + + qt: remove Qt::WA_MacBrushedMetal + + It's deprecated in Qt 5.15 [^1], since 5.14 [^2], and removed in Qt 6. + + The commit log of [^2] even mentions its deprecated for "a log time". + + [^1]: https://doc.qt.io/qt-5/qt.html#WidgetAttribute-enum + [^2]: https://github.com/qt/qtbase/commit/4f6eb43898aa14fef5f3a54966b340188271d85e + +commit b811be7a3be63d5c1b9da8ae96039a07f7bf61c5 +Author: Steve Lhomme +Date: Tue Dec 17 15:58:32 2024 +0100 + + qt: use QRandomGenerator instead of qrand() + + It's deprecated since Qt 5.15 [^1], and removed in Qt 6. + + The commit log of [^2] even mentions its deprecated "in the documentation for a while". + + The QRandomGenerator class was added in Qt 5.10 [^3] so we can't use it + before that. + + [^1]: https://doc.qt.io/qt-5/qtglobal-obsolete.html#qrand + [^2]: https://github.com/qt/qtbase/commit/b3c0e9afa0041d4d45e47880732deda1dd1013b9 + [^3]: https://doc.qt.io/qt-5/qrandomgenerator.html + +commit 71693edd4cf1f3c9ab9fe39099886b664ae7bf84 +Author: Steve Lhomme +Date: Tue Dec 17 10:59:17 2024 +0100 + + qt: use QTreeWidgetItem::setExpanded() instead of QTreeWidget::InfoTree->setItemExpanded() + + It's deprecated in Qt 5.15 [^1], since 5.13 [^2], and removed in Qt 6. + + The commit log of [^2] even mentions its deprecated for "a long time". + + [^1]: https://doc.qt.io/qt-5/qtreewidget-obsolete.html#setItemExpanded + [^2]: https://github.com/qt/qtbase/commit/76bb804405f424708fffec502788995ea91206b8 + +commit b392e3456f27f6bd2cb572bb190befb046a7f104 +Author: Steve Lhomme +Date: Tue Dec 17 10:11:30 2024 +0100 + + qt: use QPalette::window() instead of QPalette::background() + + It's deprecated and the replacement suggested in the doc [^1]. + + It's deprecated in Qt 5.15 [^1], since 5.13 [^2], and removed in Qt 6. + + The commit log of [^2] even mentions its deprecated for all Qt5 but was not + marked as such yet. + + [^1]: https://doc.qt.io/qt-5/qpainter.html#RenderHint-enum + [^2]: https://github.com/qt/qtbase/commit/4c522e0226da1bcc67a585130e3b2a976be128fd + +commit 2c43e321f246e1ef4588400cfb77e95d05a2a0ca +Author: Steve Lhomme +Date: Tue Dec 10 07:33:06 2024 +0100 + + qt: remove deprecated timespec + + Will be gone in 6.10. The replacement Timezone was added in 6.7. + And we don't need to set it unless the display format uses a timezone [^1] + [^2]. + + This avoids this kind of warnings: + ``` + ./gui/qt/ui/open.h:205:27: warning: 'setTimeSpec' is deprecated: Use setTimeZone() instead [-Wdeprecated-declarations] + 205 | stopTimeTimeEdit->setTimeSpec(Qt::LocalTime); + | ^ + /mnt/s/sources/build/win64-llvm18/contrib/x86_64-w64-mingw32ucrt/include/QtWidgets/qdatetimeedit.h:134:5: note: 'setTimeSpec' has been explicitly marked deprecated here + 134 | QT_DEPRECATED_VERSION_X_6_10("Use setTimeZone() instead") + | ^ + /mnt/s/sources/build/win64-llvm18/contrib/x86_64-w64-mingw32ucrt/include/QtCore/qtdeprecationmarkers.h:187:45: note: expanded from macro 'QT_DEPRECATED_VERSION_X_6_10' + 187 | # define QT_DEPRECATED_VERSION_X_6_10(text) QT_DEPRECATED_X(text) + | ^ + /mnt/s/sources/build/win64-llvm18/contrib/x86_64-w64-mingw32ucrt/include/QtCore/qtdeprecationmarkers.h:29:33: note: expanded from macro 'QT_DEPRECATED_X' + 29 | # define QT_DEPRECATED_X(text) Q_DECL_DEPRECATED_X(text) + | ^ + /mnt/s/sources/build/win64-llvm18/contrib/x86_64-w64-mingw32ucrt/include/QtCore/qcompilerdetection.h:1000:36: note: expanded from macro 'Q_DECL_DEPRECATED_X' + 1000 | # define Q_DECL_DEPRECATED_X(x) [[deprecated(x)]] + | ^ + ``` + + [^1]: https://doc.qt.io/qt-6/qdatetimeedit.html#timeZone-prop + [^2]: https://doc.qt.io/qt-6/qtime.html#toString + + (cherry picked from commit 3c07c3369a5313b2d79e95dec20c1f6a1041ad23) (edited) + edited: + - the file was moved in 4.0 + +commit fffeec5ce15d2036b288df85fd5fdfea9ce0ae31 +Author: Fatih Uzunoglu +Date: Tue Oct 22 16:45:32 2024 +0300 + + qt: define QT_NO_CAST_FROM_BYTEARRAY + + It is dangerous to have implicit casting between + QByteArray and pointer types. + + (cherry picked from commit 18f4f954ae044089df4b95d37eb874e9a8629417) (edited) + edited: + - 3.0 doesn't have meson + - the CPP flags are different on 3.0 + - 3.0 uses p_intf with config_PutPsz() + - some files modified in 4.0 don't exist on 3.0 + +commit c780832579dcc28d674d4d94a890ca9f5251e462 +Author: Fatih Uzunoglu +Date: Tue Oct 22 17:22:50 2024 +0300 + + qt: use QT_USE_QSTRINGBUILDER + + (cherry picked from commit 0450706563e262c5728ff159241ec276fc359969) (edited) + edited: + - 3.0 doesn't have meson + - the CPP flags are different on 3.0 + +commit adacb4ff6d96781b2ae2dffd56022ad886d4a05d +Author: Fatih Uzunoglu +Date: Fri Sep 8 15:46:52 2023 +0300 + + qt: proper format handling for indeterministic integer type + + (cherry picked from commit 283b2b483802a6369347477f51c68068268cce20) (edited) + edited: + - the file was moved in 4.0 + +commit 548889c14217cc0a8ebd1152c5845c6d3064b111 +Author: Johannes Kauffmann +Date: Fri Aug 26 21:56:23 2022 +0000 + + qt: purge remaining use of Q_DECL_OVERRIDE + + (cherry picked from commit 258921fd9eb54275a0b25806c800bf039f082002) (edited) + edited: + - many files were moved in 4.0 + +commit edd971323433b7440d24020f89a2fc5c38537f6b +Author: Lyndon Brown +Date: Sun Mar 6 05:57:28 2022 +0000 + + qt: check cdda module exists before handling cdda specific option + + Fixes #26492. + + (cherry picked from commit fdf0eaa4fcbcda71017d0ef528b310774b35a2a2) (edited) + edited: + - the file was moved in 4.0 + - 3.0 uses p_intf with config_GetPsz() + +commit 692d3bb7822121f2f78d4679cb03bb34325da47c +Author: Marvin Scholz +Date: Fri Jul 26 21:32:46 2019 +0200 + + qt: add missing override specifier + + Signed-off-by: Jean-Baptiste Kempf + (cherry picked from commit 52d261a014748f7aa404df0be437af31cda27bf5) (edited) + edited: + - 3.0 doesn't have setupVoutWindow() in components/voutwindow/qvoutwindowdummy.hpp + +commit fa92546494eb6a16351f7dab6ebb53e329c127be +Author: Steve Lhomme +Date: Wed Feb 5 09:52:36 2025 +0100 + + qt: use QString::fromWCharArray() to translate widows WCHAR strings + + No need to translate to UTF-8 first (which is also not used as such later). + + (cherry picked from commit 65b9fe623a57a0368ac2a620410b6f037c7a0c48) (edited) + edited: + - the file was moved in 4.0 + +commit d77b9e1dd2ecef2d6b0b593662fd40584e99814f +Author: Steve Lhomme +Date: Wed Feb 5 13:01:28 2025 +0100 + + qt: keep the module name as a QString + + So we don't have to release it manually. + + This should be backported as Qt5 with QT_USE_QSTRINGBUILDER + doesn't like the + in onUpdate(). + For some reason Qt6 is OK with that. + + (cherry picked from commit e063d116ed6832b2b5c4463e980935ba09ddb082) (edited) + edited: + - the file was moved in 4.0 + +commit 0c699ef96efdd11b16f05d811f446c24e01bc063 +Author: Steve Lhomme +Date: Fri Feb 7 12:53:52 2025 +0100 + + qt: use QStringLiteral with constant string concatenation + + Qt5 with QT_USE_QSTRINGBUILDER doesn't like the +. + +commit a031af8522d7cc1ad03eb7985e4ca60fd031eabc +Author: Rémi Denis-Courmont +Date: Mon Jan 31 19:17:16 2022 +0200 + + configure: look for backtrace() in libexecinfo (fixes #26562) + + Fixes linking on *BSD's. + + (cherry picked from commit b3179e1e0993b8c15b735c93282c7675632c183c) + +commit 0f5199a5ca322cbd785b7f534955428e604d6836 +Author: Thomas Guillem +Date: Mon Feb 17 03:38:34 2025 -0500 + + libass: fix fontconfig detection + + Fixes fontconfig test as the header path is not passed in and the header + is not found. + + (cherry picked from commit d19599c42141eaf72cae9a0cb21b5889cd01c860) + +commit ac807d2c8574c292a34c51e000c1554f372aa618 +Author: Steve Lhomme +Date: Thu Feb 13 09:42:06 2025 +0100 + + caf: don't keep extra data for an unknown codec + + The codec ID is set in ReadDescChunk(). And according to the error before using it: + + > The audio description chunk must be the first chunk + + We should not be using codec data if we don't have the codec. + The file will eventually fail with this error, but we don't need to + copy bogus data before that. + + Fixes #29012 + + (cherry picked from commit b3ec88d53167d4a3383db43328f10abcc454cebe) + +commit 3758d15c000c9ec10711ca7e9580e43ba09601df +Author: Steve Lhomme +Date: Thu Feb 13 11:36:21 2025 +0100 + + demux: asf: fix local buffer leak + + Fixes #28998 + + (cherry picked from commit 430792dc3f9f0e7bb526c38564f57e3b7fab4a0a) + +commit 33a49638866b7aca6d767da3751b940849c9512c +Author: Steve Lhomme +Date: Wed Feb 5 08:23:58 2025 +0100 + + contrib: dvdnav: fix bogus test in patch + + Only the cellN values above nr_of_cells + 1 should be rejected, + just as with pgN and nr_of_programs + 1 in the other patch. + + (cherry picked from commit 0ddf69feccd687f0a694aeeefbc31c76074103ec) + +commit 120f41a5741fc502b1a73d835093212cccbcb87d +Author: Steve Lhomme +Date: Fri Feb 7 11:09:54 2025 +0100 + + picture_pool: fully initialize the test video format + + video_format_Setup() doesn't intialize all the fields. + + (cherry picked from commit 20ba271df1def00217592499c55551fe87d87d43) + +commit 8678d1e317a9e57e1f52a74229106a93573a4e90 +Author: Tristan Matthews +Date: Wed Feb 5 10:52:24 2025 -0500 + + packetizer: flac: avoid integer overflow + + Fixes #29010 + Fixes https://issues.oss-fuzz.com/issues/42503720 + + found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/vlc + (cherry picked from commit d0100b92ac9997fece08052b2abb90e4f519ae3a) + +commit 83da242d70834cbcd63b730df754ec2b3aff5597 +Author: Tristan Matthews +Date: Fri Feb 7 14:50:52 2025 -0500 + + packetizer: flac: convert read_utf8 to unsigned + + Rationale: this is what the standard implementation (libFLAC) is doing and + there is no need to consider negative samples/frame numbers. + + (cherry picked from commit fd378b20470d916d839ea2f65faa6036c16e759d) + +commit 3e64644242783c68892262b11c178a1c668ab14a +Author: Steve Lhomme +Date: Mon Jan 29 09:23:41 2024 +0100 + + qt: remove virtual on override methods + + It's implied. + + (cherry picked from commit 324b9f5a730318b9206f5061db7825d738e3e63b) (edited) + - the files moved in 4.0 + - a lot of 4.0 files are not in 3.0 + +commit 1b50b8af51de10d546a137f2c04210a8d20effb0 +Author: Johannes Kauffmann +Date: Fri Aug 26 21:53:03 2022 +0000 + + qt: egp: use override + + (cherry picked from commit 5d9b04653b939a8f7e93c50f49248515633b4455) (edited) + edited: + - the files moved in 4.0 + +commit a572d691d7ba23af39189e7ddb737aea01b459b0 +Author: Steve Lhomme +Date: Tue Dec 17 15:41:59 2024 +0100 + + qt: use override+virtual + + from 2abc4460ce175e812670b551e12412ee427786f2 + +commit 4e5531106becf8cca985dbb458f33cdfd29dad7f +Author: Fatih Uzunoglu +Date: Mon Sep 4 19:42:14 2023 +0300 + + qt: use QTimeZone::systemTimeZone() instead of QTimeZone::utc() + + (cherry picked from commit a1b6ba86ca054298425e93d8dc669e9e811a3f40) (edited) + edited: + - the code in 3.0 has a check for Qt 5.8 + - 3.0 doesn't have mlrecentsmodel.cpp, mlurlmodel.cpp and networkmediamodel.cpp + - the files were moved in 4.0 + +commit 6cf18cc55213569c28bc4bac8bfaf597f628950e +Author: Fatih Uzunoglu +Date: Fri Sep 1 14:22:07 2023 +0300 + + qt: use QRegularExpression instead of QRegex + + Co-authored-by: Pierre Lamot + (cherry picked from commit d32667992e3fca21f49d35e6294b581d4443d3ad) (edited) + edited: + - the files were moved in 4.0 + - 3.0 doesn't have sortfilterproxymodel.cpp + - 3.0 already backport 37480bc2294f58881f4dfa49b5e0204a64bc7cba + +commit a22fe6c9468ba48e130a5d277f5423d6d95ebe57 +Author: Fatih Uzunoglu +Date: Fri Sep 1 14:13:22 2023 +0300 + + qt: use different overload for QDateTime::fromSecsSinceEpoch() + + Before Qt 6.5, it is necessary to provide the timezone explicitly. + + (cherry picked from commit cfef77dd5da1ae259e2bf7937e6e05846f39dd15) (edited) + edited: + - the code in 3.0 has a check for Qt 5.8 + - 3.0 doesn't have mlrecentsmodel.cpp, mlurlmodel.cpp and networkmediamodel.cpp + - files were moved in 4.0 + +commit 3293e98afff2ab1dac1bfcc3f41647b8d01cec9e +Author: Ilkka Ollakka +Date: Sat May 6 10:42:05 2023 +0300 + + qt: remove QDirModel include + + It has been deprecated since qt4.7 and only use seemed to be in commented out code + + (cherry picked from commit 9d4e884c7452f1919dfc1d264c683778cc60d630) (edited) + edited: + - the file was moved in 4.0 + +commit 66f095c3aac1fe03a915803ba77a43f817c95cab +Author: Ilkka Ollakka +Date: Sat Mar 4 13:12:20 2023 +0200 + + qt: replace setMargin with setContentsMargins + + setMargin has been deprecated and shouldn't be used + + (cherry picked from commit ed986711c159499b873157d4e5d4a53026d94719) (edited) + edited: + - files were moved in 4.0 + +commit 29e931a9c711c6d1fce400a705187611bc0a4e0e +Author: Ilkka Ollakka +Date: Sat Mar 4 12:58:04 2023 +0200 + + qt: convert fromTime_t to fromSecsSinceEpoch + + fromTime_t has been deprecated and fromSecsSinceEpoch looks like drop-in replacement in our use + + (cherry picked from commit 8a5bcc93c08d714f82e25a60461dd7fa88e443b5) (edited) + edited: + - 3.0 doesn't have mlrecentsmodel.cpp and mlurlmodel.cpp + - the files were moved in 4.0 + - the API is only available since Qt 5.8 + +commit d2d422907dbc98d7fe04ebe43c9320041aad50e5 +Author: Steve Lhomme +Date: Tue Jan 24 09:14:12 2023 +0100 + + qt: fix UTF-8 string usage + + (cherry picked from commit bbb9f6a07adfd20c544d29198ea2fec601bf3e62) (edited) + edited: + - 3.0 doesn't have expert_model.cpp + - files were moved in 4.0 + +commit 732b92b61aad7514c1c3bbcb917eb0aa88731ca5 +Author: Pierre Lamot +Date: Wed Jan 18 09:26:44 2023 +0100 + + qt: fix ambiguous string construction + + (cherry picked from commit a8d3ae63820ade765c1e21c1d8d44ab37c396e81) (edited) + edited: + - the file was moved in 4.0 + +commit 8e8a41ac42d481898068283cc025d28e417ed983 +Author: Johannes Kauffmann +Date: Sun Aug 7 09:41:39 2022 +0000 + + qt: open_panels: add missing override + + (cherry picked from commit 64f86598c61f5666379c180a311626b89eff0979) (edited) + edited: + - the file was moved in 4.0 + +commit 9399cc218cccdea08791f30f00cabab91410bf88 +Author: Alexandre Janniaux +Date: Fri May 20 14:45:30 2022 +0200 + + qt: preferences_widgets: use override + + ... instead of Q_DECL_OVERRIDE, since it always expand to override for + >=C++11 configuration, and the module uses C++11 anyway. + + (cherry picked from commit 8d838e7ea2abe99dbb4a51d5e3212524767c0689) (edited) + edited: + - only a few select methods were updated and they are different in 3.0 but on + the same classes + +commit ec16474cbad171fa1c09dfbe1c3fe12a53a24cf4 +Author: Steve Lhomme +Date: Tue Dec 17 09:54:57 2024 +0100 + + qt: add missing includes + +commit 0d53ece64d595352b28b2fed21099ea6ce41e066 +Author: Lyndon Brown +Date: Wed Feb 23 01:07:25 2022 +0000 + + qt: purge more redundant includes + + Note that in some cases they have been changed to forward declarations, and + in some they have been moved, for instance inclusion of `` was moved + from `qt.hpp` to where it was needed. + + (cherry picked from commit b86a9ce6833c17f37d87b30be0b5181a06d6ac6b) (edited) + edited: + - 4.0 has more files + - some files were moved in 4.0 + +commit 674f3b58cecbd1f6c23318e96b1d50bba6ac0c04 +Author: Marvin Scholz +Date: Wed Dec 8 00:07:54 2021 +0100 + + gui/qt: do not use deprecated SystemLocaleLongDate + + (cherry picked from commit dcb97734fd4597a6b648f3b55ba7af6c5b7ce269) (edited) + edited: + - the file was moved in 4.0 + +commit 928c8e9f638f9ee7317fab5c9bcf541b1743cf1f +Author: Fatih Uzunoglu +Date: Fri Feb 12 00:23:35 2021 +0300 + + qt: fix QDateTime warning when Qt 5.14 is used + + Signed-off-by: Pierre Lamot + (cherry picked from commit 9da7c8c4f9d2f90c151decc0ec61a6db474f850d) (edited) + edited: + - the file was moved in 4.0 + +commit 2043530875d855d0d3b1eb9aa74c00e01282518b +Author: Fatih Uzunoglu +Date: Fri Feb 12 00:23:34 2021 +0300 + + qt: use Qt::SkipEmptyParts in newer Qt version + + It's gone in recent versions of Qt. + + (cherry picked from commit ecebe9fc1db5c9952e64a1d8b31ac5026a096ac0) (edited) + edited: + - the change was also needed in controller.cpp and bookmarks.cpp + - 3.0 doesn't have playercontrolbarmodel.cpp + +commit 9072173b468e88429e27165e05a4b9585420c596 +Author: Pierre Lamot +Date: Thu May 28 11:47:49 2020 +0200 + + qt: using QMap as multimap is deprecated in Qt5.15 + + (cherry picked from commit 78708b273d07c5387c30772de365674dc690b5dc) (edited) + edited: + - 3.0 doesn't have navigation_history.cpp + - the const iterator was using the wrong type + +commit 880ae34d4b12d6bc046d1c1296e0341c654202df +Author: Pierre Lamot +Date: Thu May 28 10:04:45 2020 +0200 + + qt: constructing QFlags from int is deprecated since Qt 5.15 + + Zero initializing can be done with default constructor. here the default + value of the parameter. + + (cherry picked from commit f2d32344cfe9638f48981e067d0d94bfe95bf4d7) (edited) + edited: + - the files were moved on 4.0 + +commit 952f7990086b036449e99d5fc3a1a22d464f9d78 +Author: Pierre Lamot +Date: Thu May 28 10:04:25 2020 +0200 + + qt: QGraphicsView::setMatrix is deprecated since Qt 5.15 + + (cherry picked from commit be856f33c6798067816a4e224786cc7d5d84c99f) (edited) + edited: + - the file was moved on 4.0 + +commit 5a48655d9e51696c669350d8cbaa9a72a7873be6 +Author: Pierre Lamot +Date: Wed May 27 11:06:39 2020 +0200 + + qt: QLinkedList is deprecated in Qt 5.15 + + (cherry picked from commit 28bc7efdabd040b8d66eb17ffbbacaefcb1a8d4f) (edited) + edited: + - the files were moved on 4.0 + +commit f537d0e1063c76d1d0d96839f31d32efa511c517 +Author: Alexandre Janniaux +Date: Sun Feb 23 20:34:24 2020 +0100 + + qt: messages: use C++ atomic instead of Qt's + + It removes a deprecation warning on QBasicAtomicInteger::load which + is not solvable with Qt 5.12 version at the same time. + + Signed-off-by: Marvin Scholz + (cherry picked from commit c5e302585ee0e02080400fde79a9aa27de01e2a9) (edited) + edited: + - the file was moved on 4.0 + +commit 6f0a9ec6792db90d54b876262ec141624bb8217d +Author: Alexandre Janniaux +Date: Sun Jan 19 16:39:05 2020 +0100 + + qt: info_panels: replace deprecated QString::sprintf + + QString::sprintf is deprecated in Qt 5.14, so use QString::setNum + instead. As we always use the same precision, width and format, enforce + it in the macro itself too. + + Signed-off-by: Thomas Guillem + (cherry picked from commit 50d57469219f82981856a18a2698cf349e9b951c) (edited) + edited: + - on 4.0 the stats come from a local variable + +commit de46ad7eef90aaba778a5e6e2459ea79fa1356f0 +Author: Alexandre Janniaux +Date: Thu Jan 9 00:56:34 2020 +0100 + + qt: replace deprecated qVariantFromValue by QVariant::fromValue + + They are warned as obsolete in Qt 5.14, and were historic workaround + for MSVC builds. + + Signed-off-by: Thomas Guillem + (cherry picked from commit f8aa7058fab0452024a0b769f549d9e663a9cde8) (edited) + edited: + - the file was moved in 4.0 + +commit d7b0eeb143b25fc48048de889f42fa7f6978f60a +Author: Alexandre Janniaux +Date: Thu Jul 25 01:14:53 2019 +0200 + + qt: extended_panels: replace deprecated QFontMetrics::width + + Signed-off-by: Jean-Baptiste Kempf + (cherry picked from commit 5a62d2aa2fdfd76ce9aa96dc17975f1ec90b0a07) (edited) + edited: + - horizontalAdvance() was added in 5.11 https://doc.qt.io/qt-5/qfontmetrics.html#horizontalAdvance + +commit cdf0eaad2773b89c58907deace0af43446d264c9 +Author: Alexandre Janniaux +Date: Thu Jul 25 01:14:52 2019 +0200 + + qt: EPGChannels: replace deprecated QFontMetrics::width + + Signed-off-by: Jean-Baptiste Kempf + (cherry picked from commit 9a11d6198baf46f4a42ab33f87b6688532815a0f) (edited) + edited: + - the API is only available since Qt 5.11 + +commit 86eff076ad405ac26b5d4031dc761d8480bbb42d +Author: Alexandre Janniaux +Date: Thu Jul 25 01:14:51 2019 +0200 + + qt: EPGChannels: use std::sort instead of qSort + + Signed-off-by: Jean-Baptiste Kempf + (cherry picked from commit c49140dcff3a2ba2729cec8756c7f78b198d50c9) + +commit 812fdf1050e75cbb5ae58d92aac60ac47e8268fe +Author: Marvin Scholz +Date: Tue Aug 21 02:33:11 2018 +0200 + + gui/qt: Fix invalid widget in buddy + + This fixes the warning: "Buddy assignment is not a valid widget" caused + by referencing an invalid widget as buddy for the mmdevice label. + + (cherry picked from commit a7f623dd3225b2a07532142660184a046d1fa920) + +commit 71ad405fde6a00fa0b139d57cd152a9b78a8b9b8 +Author: Tristan Matthews +Date: Mon Jan 20 11:13:48 2025 -0500 + + contrib: dav1d: update to 1.5.1 + + 1.5.1 is a minor release of dav1d, focusing on speed optimizations and + on stack reduction. + + Notable optimizations happened on SSSE3, ARM32/ARM64, RISC-V and power-PC. + A possible deadlock was also fixed. + + (cherry picked from commit 00fb0120934881d297eeb0e4a13e1acd0ef75e12) + +commit e56013eb889ea436054792be57bc5983e6247592 +Author: Tristan Matthews +Date: Mon Oct 21 23:01:13 2024 -0400 + + contrib: dav1d: update to 1.5.0 + + 1.5.0 is a major release of dav1d, that adds numerous optimizations on + all platforms, x86, ARM, PPC, Risc-V, Loogarch, making it the fastest + release ever. + + (cherry picked from commit 6e4895f39c5e33b65abd1656758babe8612919ef) + +commit 7d9556076c73705896c3efe79d3a1f53b264c404 +Author: Steve Lhomme +Date: Fri Jan 24 08:11:35 2025 +0100 + + contrib: dvdcss: require GPL to build + + It's only picked as a dependency from the dvdread contrib which also requires GPL. + But it's cleaner to make it explicit. + + (cherry picked from commit cf9f8a3516e22e5ce1972318c82631649fa2a7e5) (rebased) + rebased: + - 3.0 doesn't use the simplified autotools macros + +commit 1c4ba2065162f76532e0f4dd84935d54b44770d1 +Author: Steve Lhomme +Date: Fri Jan 24 13:50:53 2025 +0100 + + contrib: dvdnav: turn assert+exit into silent discard + + This fixes playback on some bogus DVDs. + + (cherry picked from commit ef256ba8acde2a159b58ead454a5f8a96824e521) + +commit 9342d4c96de520d4fc711fb432e85ff4cc58ccab +Author: Alexandre Janniaux +Date: Sun Dec 8 22:43:37 2024 +0100 + + Makefile.am: fix installation regression + + Automake doesn't generate automatic rules when a rule already exist in + the file, except if it cannot detect it. Adding the + `install-fooLTLIBRARIES: install-pkglibLTLIBRARIES` rule for audio + outputs, video outputs and vdpau broke the installation. + + Adding `$(install-fooLTLIBRARIES): install-pkglibLTLIBRARIES` also makes + automake unhappy because of the variable name looking suspiciously close + to the target it generates, so a version without the dash is used for + the variable name in the rule. With this, the install target is + preserved but the dependency also exists in the output. + + (cherry picked from commit 0b9f3f836f1c678e6d101f62545a8edaba16dcd0) (rebased) + rebased: + - the code around is slightly different + +commit 42b95ec9e81e77f3ae0178f8e67434ed67bf2c60 +Author: Alexandre Janniaux +Date: Sun Dec 1 06:25:29 2024 +0100 + + Makefile.am: enforce pkglib dependency order for install + + During installation, no dependencies existed between the targets being + installed and the targets being relinked against the installed version, + which made the following race condition: + + ../doltlibtool --mode=install /usr/bin/install -c libvlc_pipewire.la libvlc_pulse.la libvlc_vdpau.la libvlc_xcb_events.la '/builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc' + libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_build/sub/modules; /bin/bash "/builds/videolan/vlc/vlc-4.0.0-dev/_build/sub/modules/../libtool" --silent --tag CC --mode=relink gcc -g -O2 -pthread -Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security -Wduplicated-branches -Wduplicated-cond -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Werror-implicit-function-declaration -Winit-self -Wlogical-op -Wshadow=local -Wmultistatement-macros -pipe -Werror=missing-field-initializers -Werror=format -Werror=incompatible-pointer-types -Werror=restrict -Werror=int-conversion -Werror=implicit-int -Werror=return-mismatch -Werror=declaration-missing-parameter-type -fvisibility=hidden -fno-math-errno -funsafe-math-optimizations -fno-rounding-math -fno-signaling-nans -fcx-limited-range -funroll-loops -fstack-protector-strong -avoid-version -module -export-symbols-regex "^vlc_entry" -shrext .so -no-undefined ../compat/libcompat.la ../src/libvlccore.la -Wl,-z,defs -o libvdpau_instance_plugin.la -rpath /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/plugins/vdpau hw/vdpau/libvdpau_instance_plugin_la-device.lo libvlc_vdpau.la -lSM -lICE -lX11 -lanl ) + libtool: install: /usr/bin/install -c .libs/libvlc_vdpau.so.0.0.0 /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/libvlc_vdpau.so.0.0.0 + /usr/bin/ld: cannot find -lvlc_vdpau: No such file or directory + libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc && { ln -s -f libvlc_vdpau.so.0.0.0 libvlc_vdpau.so.0 || { rm -f libvlc_vdpau.so.0 && ln -s libvlc_vdpau.so.0.0.0 libvlc_vdpau.so.0; }; }) + collect2: error: ld returned 1 exit status + libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc && { ln -s -f libvlc_vdpau.so.0.0.0 libvlc_vdpau.so || { rm -f libvlc_vdpau.so && ln -s libvlc_vdpau.so.0.0.0 libvlc_vdpau.so; }; }) + ---------------------------------------------------------------------- + libtool: error: error: relink 'libvdpau_instance_plugin.la' with the above command before installing it + libtool: install: /usr/bin/install -c .libs/libvlc_vdpau.lai /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/libvlc_vdpau.la + make[6]: *** [Makefile:15527: install-vdpauLTLIBRARIES] Error 1 + + Here, with the thread number, we have: + - (1) doltlibtool installing the pkglibs (install-exec-am). + - (2) in parallel, libtool relinking the vdpau instance plugin. + - (1) libtool starts to be called for "relinking" (which is only + installing there) with version 0.0.0. + - (2) libtool tried to run the linker but it failed because + libvlc_vdpau.so doesn't exist yet on the target prefix. + - (1) libtool .0.0.0 links to the major version shortcut .0 for + libvlc_vdpau. + - (1) libtool .0.0.0 links to the unversioned shortcut for + libvlc_vdpau. + + So the pkglibs were not installed before installing the plugins linking + them and it was racy whether automake succeeded in installing vlc_vdpau + before or not. This could apply to any pkglib being used from plugins. + + This patch ensure the pkglibs are installed before relinking the plugins + for vpdau, same must be done for each other pkglib usage location. + + Note that install-vdpauLTLIBRARIES itself will install each target from + vdpau_LTLIBRARIES serially in the order they are defined, so there would + be no race inside the same LTLIBRARIES variables, but the different + LTLIBRARIES variables are processed in parallel themselves. + + Fixes #28374 + + (cherry picked from commit 056d7349a559cb63b456505bb11c08a4910452aa) (rebased) + rebased: + - the code around is slightly different + +commit 63245fd383f51132a127e80f25b77c0531265d93 +Author: Steve Lhomme +Date: Mon Jan 13 10:35:07 2025 +0100 + + x265: fix API signature with x265 4.1 + + They changed the API in c69c113960834400545bc4bce2830ff51dcb86b3 + And then reverted it in + 78e5b703b186fe184bf91bb37df82f64059b3f61 + + The X265_BUILD is how you can tell the x265 version(s). But they didn't change + the values in these commits. + + - X265_BUILD was 210 when the API was changed + - X265_BUILD was 214 when the API was reverted + +commit 33fb3b37d066d28db592ed683d6240346e4bae2e +Author: Steve Lhomme +Date: Tue Jan 14 15:51:36 2025 +0100 + + package/win32: only use start-no-unused-arguments with Clang14 and up + + It generates compilation errors before as it's not supported. + + (cherry picked from commit f9041c3467f0cd63fac456af5fe840d2137d1b68) (rebased) + rebased: + - 3.0 has winstore compat above + +commit 2fd25d46a710b997c653218ceae172ed764d1077 +Author: Steve Lhomme +Date: Thu Jan 9 15:58:00 2025 +0100 + + package/win32: favor the static version of winpthread with clang + + Just like we favor the static version of libunwind. + + We don't need any extra flags for the compiler. It's all handled in the linker. + + Ref. #28903 + + (cherry picked from commit cd7e35c6f05d401268b72bf51077cf47295ae7f2) + +commit 6fdf53a02d0536600da78c25fdc3646588cd88e7 +Author: Steve Lhomme +Date: Thu Nov 7 15:51:15 2024 +0100 + + package/win32: use "-n" instead of "! -z" tests + + (cherry picked from commit d897981340cb55002a19c5d44b007d6ade2c53da) (edited) + edited: + - 3.0 had more/in different places + +commit f9091cb9dbf35e5e4464e95fd45bd036b52bf3a3 +Author: Steve Lhomme +Date: Mon Nov 4 14:52:43 2024 +0100 + + package/win32: enable PDB for contrib binaries + + This way it's enabled the same way for all the code we build. + + (cherry picked from commit 2c2eb681922e4e2c5aba3f8cc77dfe83cd185563) + +commit d78d32477b7d32209b678d9ad84e65123efe390c +Author: Steve Lhomme +Date: Mon Nov 4 11:08:41 2024 +0100 + + package/win32: don't issue a wanring when -gcodeview is not used + + This may trigger some compiler detection in some contribs. + The warning is issued when linking through the compiler. + + (cherry picked from commit 112d5c78615a507373bc649f2fed432c91f717e4) + +commit 9b387eb416c58dba1954400f18cd41e775762ade +Author: Steve Lhomme +Date: Mon Nov 4 11:04:52 2024 +0100 + + package/win32: pass -lwindowsapp with -Wl in VLC_LDFLAGS + + Only used in UWP builds. + + (cherry picked from commit 619dff36e3da20c3f63acd52566191187a9cf2f1) (edited) + edited: + - 3.0 has winstorecompat library + +commit 1469c780bc60043a9957ed1e62f12fc8c56730bf +Author: Steve Lhomme +Date: Mon Nov 4 10:07:01 2024 +0100 + + package/win32: don't discard all unused args in UWP + + Only ignore the options we add locally. + This is how it's done in the llvm-mingw wrappers. + + (cherry picked from commit 1539eac31284dab504e4f9b8436924f9aef4843a) (rebased) + rebased: + - 3.0 has winstore compat below + +commit 75467401cbdf0ac48cca4847a414c48c5f3d9bec +Author: Steve Lhomme +Date: Mon Nov 4 08:35:18 2024 +0100 + + package/win32: build all C++ with the static (LLVM) runtime + + Otherwise it may use the dynamic libunwind (as found in meson). + + Don't emit errors if it's not using (when only compiling). Some contribs don't like that. + + (cherry picked from commit 90488d3508de2571b3dd2942e295a616085bb482) (edited) + edited: + - 3.0 doesn't have meson support + +commit 0b9f605d014b2a8ccf352a854b9cf8a9d720db6b +Author: Steve Lhomme +Date: Wed Oct 16 12:07:51 2024 +0200 + + package/win32: always export the pkg-config to use + + We did the detection, we know what we should use. + + (cherry picked from commit 55d616000698179ade1b9b534e5f9df4c4c15420) + +commit 47882e7fdaf84d6677335306ea2fc9d068c9c1f6 +Author: Steve Lhomme +Date: Tue Oct 15 12:46:06 2024 +0200 + + package/win32: always use -gcodeview when using PDB + + So it applies to autotools and meson builds. + It's currently forced in the configure script. + + (cherry picked from commit e324c59cf4bfd4a51a61e09c3309f6ea35914d29) + +commit c2be5fa5575caa18c2f67e541fb3c6dbed57937b +Author: Steve Lhomme +Date: Wed Oct 9 14:38:37 2024 +0200 + + package/win32: use config.mak to pass custom flags to contribs + + (cherry picked from commit c272db053a3600f6bf05aa1f4b658faf49932d46) (edited) + edited: + - 3.0 builds .luac instead of tools + +commit 6a72fcb7903a894ac7d8c5447264f3f2af4c50fe +Author: Steve Lhomme +Date: Wed Oct 9 14:12:54 2024 +0200 + + package/win32: pass the PKG_CONFIG/PKG_CONFIG_LIBDIR without exporting them + + (cherry picked from commit 60a8da05dbef41eeaa4bfca777d353126f7eeb92) (edited) + edited: + - 3.0 builds .luac instead of tools + +commit 479deb4781093e46f8e5c0f6c6050daac630d347 +Author: Steve Lhomme +Date: Wed Oct 9 14:12:17 2024 +0200 + + package/win32: set PKG_CONFIG/PKG_CONFIG_LIBDIR variables before building contribs + + (cherry picked from commit f341ca78edbed2c1c82d4b9f877b615c3108a970) (edited) + edited: + - in 3.0 it was placed after the configure message + +commit 93d0458eeac43b22edb2918c44d5ac46cc141406 +Author: Steve Lhomme +Date: Wed Oct 9 14:05:20 2024 +0200 + + package/win32: use internal PKG_CONFIG/PKG_CONFIG_LIBDIR variables + + For now we keep exporting the usual names + + (cherry picked from commit 64297f36b4422c420403467582d713b22f7c784f) (rebased) + rebased: + - the code around is slightly different + +commit 73fd8ad9e72f733fe154a6dba2807df4efa19141 +Author: Steve Lhomme +Date: Wed Oct 9 13:56:13 2024 +0200 + + package/win32: pass the AR/RANLIB without exporting them + + (cherry picked from commit 1a9fe27e756b6b0cf7d6e89281547d0e8ddfa236) (edited) + edited: + - 3.0 builds .luac instead of tools + +commit 849625f87a260f5f15e453330586806712b2c91b +Author: Steve Lhomme +Date: Wed Oct 9 12:14:23 2024 +0200 + + package/win32: pass the xxxFLAGS without exporting them + + (cherry picked from commit 9165d99ce980dac3432a1683792c7ed0f6325617) (edited) + edited: + - 3.0 builds .luac instead of tools + - 3.0 doesn't use SHORTARCH + +commit 5daf369d238f93493f760331a5afb1ab9964c2f3 +Author: Steve Lhomme +Date: Wed Oct 9 12:08:02 2024 +0200 + + package/win32: use internal xxxFLAGS variables + + For now we keep exporting the usual names + + (cherry picked from commit 5e67a886d832097973ee3208fe3f2b1feb58b22e) (edited) + edited: + - 3.0 has winstorecompat library and define + +commit 72c38b8e93f68048c0527aedaaf61b4b0e072fd2 +Author: Steve Lhomme +Date: Wed Oct 9 13:50:06 2024 +0200 + + package/win32: don't export HAVE_WINSTORE + + The contribs and VLC have their own way of detecting/unabling winstore builds. + + (cherry picked from commit 7f7405c94dce140a885d41fc4bde2f1a1dbe178f) (rebased) + rebased: + - qt the code around is slightly different + +commit 62e4fb06b25010c4dbf8eaacf3491197d9da692a +Author: Steve Lhomme +Date: Wed Oct 9 13:55:42 2024 +0200 + + package/win32: use internal AR/RANLIB variables + + For now we keep exporting the usual names + + (cherry picked from commit 4290a69d913ac47c53c275be2e6c77e9ef67c3d7) + +commit 7b5b2e9be871d4b7a3c511f0745ef7a657031fce +Author: Steve Lhomme +Date: Wed Apr 3 09:59:09 2024 +0200 + + win32: build.sh: show the list of packages after the prebuilt is done + + So we know the tools that need to be built from there. + + (cherry picked from commit 41bbcde5ec71881f99d85c78df6839a3a7438b6b) + +commit 8cbd74e74f893dee6cbfa9fe5c8e0a1ef83bcfc4 +Author: Steve Lhomme +Date: Fri May 12 13:38:58 2023 +0200 + + package/win32: use the proper triplet for uwp + + The mingw-w64 LLVM packages use XXX-w64-mingw32uwp for UWP targets. + + This will enable HAVE_WINSTORE in contribs. + + (cherry picked from commit f0b8e4413c1ad898a7f0045fe5cf2e683f6fb932) + +commit c9a8fba4885fbcc00663f2662c79c30e391d8a7e +Author: Steve Lhomme +Date: Thu Jan 26 15:05:28 2023 +0100 + + package/win32: avoid verbose errors when checking for clang + + (cherry picked from commit 98f77b7ea18628e2ec2d35f570fa1e138d3bdf76) + +commit e65c51c4c64386e015b0f87bb5f9dadf85fba9cc +Author: Steve Lhomme +Date: Tue Sep 27 11:44:42 2022 +0200 + + package/win32: build.sh: build contribs locally if prebuilt failed + + (cherry picked from commit 8998fca08bcd6662ee59b5cea3b7192245c31055) (edited) + edited: + - 3.0 doesn't have the tools target, it just builds .luac + +commit 9a37865b44ce5c28a34b4acf4f7325db2c6a7bc0 +Author: Steve Lhomme +Date: Fri Sep 23 13:16:31 2022 +0200 + + contrib: win32: always shows the list of know contribs before building + + We also want to know about native tools that may or may not be there. + + (cherry picked from commit aca4094634c01d8ec768df14a80d23e80cf00d9e) + +commit 077266d1aa73bdcfac4330d08c631c1fb73422b2 +Author: Marvin Scholz +Date: Fri Oct 11 13:10:16 2019 +0200 + + package/win32: Fix indentation + + (cherry picked from commit 27f7dfcc5aa636b98a5d24f9c6e3ce754f8fe2e6) + +commit a7056120d6c8878117ea7a1bc7a45bd30ac05551 +Author: Steve Lhomme +Date: Thu Jan 16 15:29:55 2025 +0100 + + Revert "package/win32: don't force windowsappcompat in contribs" + + This reverts commit 0fe8d0385a259993e731a95ceef813cd816d1e90. + + This is still needed for 3.0 contribs. + +commit 7e988ea031c6f386cd733fa3117b1cf6d8c33ba2 +Author: Steve Lhomme +Date: Tue Jan 14 13:15:26 2025 +0100 + + avformat: get the palette side data + + (cherry picked from commit 53858f99d4c334bc131800292a8709173769c882) (rebased) + rebased: + - 3.0 doesn't carry DolbyVision metadata + - the code around is slightly different + +commit eb35d13760a1f469d9619480cdbad1da5353a712 +Author: Steve Lhomme +Date: Wed Jan 15 07:04:31 2025 +0100 + + avformat: use a flag to tell if the matrix is flipped + + If it's flipped, it's modifying the source matrix inside the codec + which doesn't seem right... + + (cherry picked from commit 0e208650bb10528c4caeb0a8ecfb3a4d460de36f) + +commit d4bcfefe780cdfc157cc4cc77c93e186bf87184b +Author: Steve Lhomme +Date: Wed Jan 15 07:07:11 2025 +0100 + + avformat: pass a const AVStream in side data getters + + (cherry picked from commit 27e327e78458261870fd99d0195f41ac4a8bd1f7) (edited) + edited: + - 3.0 doesn't carry DolbyVision metadata + +commit bb8d03182c5be77dc634d806dcbc2e25ea727d54 +Author: Steve Lhomme +Date: Tue Jan 14 12:12:58 2025 +0100 + + avformat: use av_packet_side_data_get() instead of deprecated av_stream_get_side_data() + + (cherry picked from commit de0cf6297d50ad21543719092f1a8a14b0a66931) (edited) + edited: + - 3.0 doesn't carry DolbyVision metadata + +commit 349ab812fa579497ab7b856073d07fda6b9ac51e +Author: Steve Lhomme +Date: Wed Jan 15 06:49:02 2025 +0100 + + avformat: add a helper to read stream side data + + av_packet_side_data_get() was introduced in lavc 60.29.100 [^1]. + av_stream_get_side_data() is deprecated and will be removed in the future. + + [^1] https://github.com/FFmpeg/FFmpeg/commit/74279227dd28d01b447edb8e617a545982171c2c + + (cherry picked from commit d3f5c8746f2884a46d8421cd051dc74b25000870) + +commit 9c1c856d042fe3fbc25f47a3b7a6b79eea533ebd +Author: Vittorio Giovara +Date: Tue Feb 26 18:20:22 2019 -0500 + + demux/avformat: Apply flip operations from the display matrix + + (cherry picked from commit 6903d3a77520d9ae110f112c7ba9010612f5d36a) + +commit 4f91d136416cc04c2bcc4ea99b49d66f9be48aea +Author: Vittorio Giovara +Date: Tue Feb 26 17:00:32 2019 -0500 + + demux/avformat: Prioritize side data rotation rather than metadata one + + The side data API will offer a more accurate representation of the + rendering operations in the next commit. + + (cherry picked from commit 1997cec8abd801bbf4ebcae72db28ab8277f221c) + +commit 43e848065c13a533e3fa48578ddfe78172d80dc8 +Author: Steve Lhomme +Date: Tue Jan 14 11:54:56 2025 +0100 + + avcodec/encoder: use avcodec_free_context in place of avcodec_close() + + avcodec_close() has been discouraged since 2016 [^1]. + The internal closing we need under lock is done inside avcodec_free_context(). + + [^1] https://github.com/FFmpeg/FFmpeg/commit/1cc24d749569a42510399a29b034f7a77bdec34e + + (cherry picked from commit cda249f4ffd150539dfc145b7ee2fcaca7ab67c3) + +commit 82cee41e0a0f6c0d32e758865ae10058bb461c27 +Author: Steve Lhomme +Date: Tue Jan 14 11:46:41 2025 +0100 + + avcodec/encoder: use AV_CODEC_CONFIG_SAMPLE_FORMAT to get supported sample formats + + p_codec->sample_fmts is deprecated. + It both cases the array was ending with AV_SAMPLE_FMT_NONE. + + (cherry picked from commit f20c48050e0b4f42269ff4e0340c8c430712a691) + +commit 9f5ad85d441b098f7ef9a6076e4359ac8cb76c04 +Author: Steve Lhomme +Date: Tue Jan 14 11:43:34 2025 +0100 + + avcodec/encoder: use AV_CODEC_CONFIG_PIX_FORMAT to get supported pixel formats + + p_codec->pix_fmts is deprecated. + It both cases the array was ending with AV_PIX_FMT_NONE. + + (cherry picked from commit 5e11c8f387f3c135d9aa2e36fd0ee81774917404) (edited) + edited: + - 3.0 was using PixelFormat instead of AVPixelFormat + +commit 5815fdd7eacda254299bcb8200afd17458015e9c +Author: Steve Lhomme +Date: Tue Jan 14 11:40:33 2025 +0100 + + avcodec/encoder: use AV_CODEC_CONFIG_FRAME_RATE to get supported frame rates + + p_codec->supported_framerates is deprecated. + + (cherry picked from commit e1f4cc8240f62c37aeb2d1fed8b6b4073f35d433) (rebased) + rebased: + - the code around is slightly different + +commit 2748c79f9e793c283353e41bcd0d1edb014b75ff +Author: Steve Lhomme +Date: Tue Jan 14 11:25:05 2025 +0100 + + avcodec/encoder: use frame flags instead of fields + + The structure fields are deprecated. + It was introduced in lavu 58.7.100. + + (cherry picked from commit 44dfaf630c9b1b536797917e619c8eba0aa40b6c) + +commit 2f0e6205d6c9f3091be37c007c6932cc6edcfe20 +Author: Steve Lhomme +Date: Tue Jan 14 11:13:38 2025 +0100 + + avcodec: use AV_CODEC_PROP_FIELDS to tell the number of ticks + + codecs sending 2 fields set the flag, otherwise it's one field. + + ticks_per_frame is deprecated and will be removed in the next major API bump. + + (cherry picked from commit 47b878be880242637aea7a0ea2fa0aa4d6794cde) (rebased) + rebased: + - the code around is slightly different + +commit c0da09ef7059349760bcdf49b94ed9bf690582aa +Author: Steve Lhomme +Date: Tue Jan 14 11:00:38 2025 +0100 + + avcodec: don't assume ticks_per_frame can be 0 + + The documentation says it's either 1 or 2. + I verified this is the case in FFmpeg 7.1. Only h264dec, mpeg12dec, mpegvideo_parser, vc1 set it. + + (cherry picked from commit 2f5c860459f9d72a42b55cf0d0df4dc9b0eb0de5) (edited) + edited: + - p_sys is accessed via dec->p_sys on 3.0 + +commit 38c5c239a8729f8d04430f41dfc677ade0f22ad1 +Author: Steve Lhomme +Date: Thu Jan 16 10:41:18 2025 +0100 + + contrib: vpx: put extra configuration flags in VPX_CONF + + (cherry picked from commit eae7e7673d0a52da34226e036d5ef482f16ae31c) + +commit 92e5139211d7ad418c548597bdc9c368b8c3c706 +Author: Steve Lhomme +Date: Wed Jan 15 08:42:56 2025 +0100 + + contrib: vpx: build out of tree with more threads + + Integrates backports of: + - 3ce55c39551fb6188718330b333a1fd24a8cb1ee + - 697a2fcda3321c44f0ef2898b513851ba699ade7 + - d4c40209e85d51e1681a9aa8b7d38d0eb4caf39a + - aa530aec17403e0971ea5af17ba07001c65a3d50 + - 8d0461dd448142545aa447d45edf1c226153ddf0 + +commit bb0ee3fc738050c4792ea5d1027a51bcf72d1db9 +Author: Steve Lhomme +Date: Wed Jan 15 07:55:11 2025 +0100 + + contrib: vpx: remove redundant option on iOS + + It's already set in the global VPX_CONF + + (cherry picked from commit 2aeb39a816882af33e8cee1e01d69ba59224df65) (rebased) + rebased: + - the call was located in a different place on 3.0 + +commit 6732c761ccce450c40374e81016d6e6fd5a0c52f +Author: Steve Lhomme +Date: Wed Jan 15 07:40:44 2025 +0100 + + contrib: vpx: only force mstackrealign for x86 targets + + And it should be done on all OS. + + (cherry picked from commit 4fe2e588ee85195417cf191229cb5b092cd5157c) + +commit 477a1ea3c207805c443f78ec9bc850602cbe3a62 +Author: Steve Lhomme +Date: Wed Jan 15 07:39:08 2025 +0100 + + contrib: vpx: always pass the CFLAGS + + On Windows it doesn't contain the flags for PDB or UWP. + If we want CFLAGS for all contribs we build, that includes libvpx. + + (cherry picked from commit 5e251ce24749f84c8785ca2a004f06e835aaebea) (edited) + edited: + - 3.0 doesn't have emscripten + - the darwin code is different from master since 7a5400bcb5031cd1f0b9298116f55bd0fe5540c3 + +commit 8508e57ed70fefb790be62a7ad329c714d5a1c5b +Author: Rémi Denis-Courmont +Date: Sat Sep 30 11:15:28 2023 +0300 + + contrib: vpx: restrict architectures + + VPX has an exclusive list of supported instruction sets. + + This follows it, unblocking contrib builds on other targets. + + (cherry picked from commit 293601d23044498ae6fd3d06020e9b2db07d326f) (rebased) + rebased: + - on 3.0 this was done when 1.13.1 was used + +commit 30863c9be35350076c33d3f8735ab88f9aa9d86e +Author: Sean McGovern +Date: Wed Aug 23 17:00:48 2023 -0400 + + contrib: vpx: trust the value of ARCH when setting VPX_ARCH + + (cherry picked from commit 973bccb6d6cbb71dc97de4ee22eeb6a61ca7f3f3) + +commit bed63dc2271fadf57a7993468ea36dd72eef49c7 +Author: Steve Lhomme +Date: Thu Sep 15 13:21:07 2022 +0200 + + contrib: vpx: remove unused VPX_CFLAGS variable + + (cherry picked from commit 6fe9dfe0e6b17a1a9175ab2940a2feda1fec4372) (rebased) + rebased: + - the code before is slightly different + +commit 1b7f95710df22597a388da0a53186348b4d4df06 +Author: Alexandre Janniaux +Date: Thu Apr 30 11:39:14 2020 +0200 + + contrib: vpx: remove strip step and fix debug symbols + + Without CONFIG_DEBUG set, libvpx is calling `$(STRIP) --strip-debug` + on the final library and removes the debug symbols from it. With the + variable set, it becomes a simple copy operation. + + In addition, debug symbols should be enabled for all builds since we + strip in the end, so as to have the debug symbols in a separate file + when doing releases. In case we build with optimization, remove the + assertions. + + (cherry picked from commit 52e22b96239cc3784aa13495be92f5f3ce591bf1) (rebased) + rebased: + - the code before is slightly different + +commit ac6a290ecb7f0af6571854dc49658253f7ec5b73 +Author: Steve Lhomme +Date: Tue Jan 14 15:14:50 2025 +0100 + + contrib: vpx: force using winpthreads + + We even have the dependency. + This is only necessary for 3.0 which needs to build for XP. + +commit 10aa0e6e1bba557409c9173c89dd3a9c199fccd4 +Author: Steve Lhomme +Date: Fri Jan 10 08:24:30 2025 +0100 + + contrib: modplug: reference libc++ for all Clang compilations + + Not just the Apple ones. + + (cherry picked from commit 7b43acff4f2c342d51a604ae29e34c078e5d188e) + +commit 385482369ccaa575b0730e4e83789dc4b7dd04d9 +Author: Steve Lhomme +Date: Fri Jan 10 13:15:55 2025 +0100 + + contrib: x265: fix -Wl,-l: linker flag escaping in implicit libraries + + (cherry picked from commit 49eb55d9b9df8b2720e53375a4064368f0b9e3e2) + +commit 1ced7e0ca56d85276088c8edad234a8d2dd8e883 +Author: Steve Lhomme +Date: Fri Jan 10 13:27:29 2025 +0100 + + contrib: x265: use proper patch format for old fixes + + (cherry picked from commit 9800e3deada25cd4cf162d034f8c5b358543ae65) (rebased) + rebased: + - the 3.0 patches around are slightly different + +commit 8795b3c2c80b3383464a5864222b0cc2928dfecb +Author: Steve Lhomme +Date: Wed Oct 16 10:49:41 2024 +0200 + + contrib: x265: fix libunwind usage when static linking + + It ends up with + - set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "atomic;m;-l:libunwind.a;dl;c;-l:libunwind.a;dl") + - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "windowsapp;windowsapp;ucrt;windowsapp;ucrtapp;c++;mingw32;-l:libunwind.a;moldname;mingwex;mingw32;-l:libunwind.a;moldname;mingwex") + + (cherry picked from commit 517bf7f5c3cd7c1a6742c0f7e23758f3178e201c) (rebased) + rebased: + - the 3.0 patches around are slightly different + +commit 8e5a9c8e2e3215f79874b299810ba87ae69d9200 +Author: Steve Lhomme +Date: Fri Jan 10 13:15:17 2025 +0100 + + contrib: srt: fix -Wl,-l: linker flag escaping in implicit libraries + + (cherry picked from commit 248ddae0d5a394f503b632204ec20931f7b8a263) + +commit f9032333897a6cab7c5eea16187f412456c827a2 +Author: Tristan Matthews +Date: Wed Oct 25 10:53:49 2023 -0400 + + contrib: srt: update to 1.5.3 + + (cherry picked from commit 409e9fc82cac40899daf4923b81a1a4d5de8b767) + +commit 33b3f658f164427700f5b66405e663c8b99905ac +Author: Johannes Kauffmann +Date: Fri Jul 28 21:54:40 2023 +0200 + + contrib: srt: update to 1.5.2 + + (cherry picked from commit 2e741d956d39ec261c078c1379fdd51603a1a501) (rebased) + rebased: + - the 3.0 code around is slightly different + +commit 163a896c17f58d112c80279ce48e456927a53e10 +Author: Steve Lhomme +Date: Tue Jun 27 14:10:36 2023 +0200 + + contrib: srt: disable build if license is not matched + + We need nettle and gmp and they can't be used with the LGPLv2 license. + + (cherry picked from commit 82faf7932af044cd93c841bc2e53c26216fe0d07) (rebased) + rebased: + - the minimum srt on 3.0 is different + +commit b4c46271697a683723d97a999925e6e3b687c9ad +Author: Steve Lhomme +Date: Fri Jan 10 12:59:30 2025 +0100 + + contrib: srt: use the MOVE call + + (cherry picked from commit 252472aa6b4ed54994f1d186718f956234837b1e) (rebased) + rebased: + - the 3.0 patching around is slightly different + +commit d308bfe6673519d7120f831d250057a0bd460949 +Author: Steve Lhomme +Date: Fri Jan 10 12:51:51 2025 +0100 + + contrib: chromaprint: fix -Wl,-l: linker flag escaping in implicit libraries + + (cherry picked from commit 17cb1afc962f605484a789f009b185436d69e0e3) + +commit eb50de7a3e2d5e910dc92a66f541138da28ca1a7 +Author: Steve Lhomme +Date: Wed Oct 16 10:53:19 2024 +0200 + + contrib: chromaprint: fix libunwind usage when static linking + + It ends up with + - set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "atomic;m;-l:libunwind.a;dl;c;-l:libunwind.a;dl") + - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "windowsapp;windowsapp;ucrt;windowsapp;ucrtapp;c++;mingw32;-l:libunwind.a;moldname;mingwex;mingw32;-l:libunwind.a;moldname;mingwex") + + (cherry picked from commit fe40fb7f4e14c1c6b87b78adf17943f94605f742) + +commit 63ed2193b7580ab25f8c5de6d2f5a3a3e090712e +Author: Steve Lhomme +Date: Fri Jan 10 12:52:47 2025 +0100 + + contrib: chromaprint: use proper patch format for library fixes + + (cherry picked from commit 27acbe02e8effd926dab89decb097f1dd8fae630) + +commit 10964add5fcc86ff739ce5af489093c2fbe442cd +Author: Steve Lhomme +Date: Fri Jan 10 11:53:23 2025 +0100 + + contrib: gme: fix -Wl,-l: linker flag escaping in implicit libraries + + (cherry picked from commit 3c60f1462213c4b38aba0488378913cc8c6c38f7) + +commit cf6e1f9eebacb832b8633e88ec360547100ae9ce +Author: Steve Lhomme +Date: Fri Jan 10 11:54:01 2025 +0100 + + contrib: gme: use proper patch format for underrun + + (cherry picked from commit a57a1c040861b4ec137c3e19161ad4dcc6f93d04) + +commit 72a3bd8786be6acf730a1035525e1d6abe35d118 +Author: Steve Lhomme +Date: Mon Sep 5 13:57:43 2022 +0200 + + contrib: gme: use CMAKE_CXX_IMPLICIT_LINK_LIBRARIES to get the C++ runtime + + And since we need to patch the pkg-config, add libm from there as well. + + (cherry picked from commit 740d93a609150ec938610ab250dbe8f1e8979c9a) (rebased) + rebased: + - 3.0 already contains the 8205482c3ad8436c244f04b7a09e94b7acf9c66e backport + +commit 92c8c6a94cab3c4bc2240c78fd64e856d8a04a81 +Author: Steve Lhomme +Date: Fri Jan 10 11:01:47 2025 +0100 + + contrib: gme: switch to github + + This is the new official home. + + (cherry picked from commit 5e125e3ab3f331dc276219eb30a5cf78af6de4a8) (rebased) + rebased: + - the 3.0 patching around is slightly different + +commit daa0ff26f001acf889bb07648dfb8cfe82290ec5 +Author: Steve Lhomme +Date: Wed Mar 13 09:18:21 2019 +0100 + + contrib: use winstorecompat when building for Windows Store + + Many contribs use forbidden APIs that are mapped to valid APIs in the + winstorecompat. We make sure they map to these calls with the define and + linking with the matching library. + + (cherry picked from commit 8a7939228feef676cfafd5cd45d2fea9c4bb941f) (rebased) + rebased: + - the code around is slightly different + +commit 7b58309ae72af83d2053bd88f0529e7addaddc6f +Author: Vikram Kangotra +Date: Mon Dec 23 03:03:31 2024 +0530 + + win32: Prevent VLC from registering as the default player for MIDI files + + This commit resolves an issue where the installation of VLC on Windows + unintentionally designated it as the default application for MIDI files. + Given that Windows supports MIDI playback natively through Windows Media + Player and that VLC requires a SoundFont for proper MIDI playback, this + change ensures that VLC does not disrupt the default MIDI file associations, + maintaining the expected user experience. + + Fixes: #27464 + (cherry picked from commit dd4f9152118af3667f3befa568f20ed6e4cf4fb3) + +commit ba5dc03aecc1d96f81b76838f845ebde7348cf62 +Author: David Rosca +Date: Fri Dec 20 20:24:36 2024 +0100 + + avcodec: vaapi: Support VAAPI with latest FFmpeg diff -Nru vlc-3.0.21/doc/Makefile.am vlc-3.0.22/doc/Makefile.am --- vlc-3.0.21/doc/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/doc/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -47,6 +47,7 @@ ChangeLog-2022 \ ChangeLog-2023 \ ChangeLog-2024 \ + ChangeLog-2025 \ $(NULL) man1_MANS = \ diff -Nru vlc-3.0.21/doc/Makefile.in vlc-3.0.22/doc/Makefile.in --- vlc-3.0.21/doc/Makefile.in 2024-06-05 16:02:16.000000000 +0000 +++ vlc-3.0.22/doc/Makefile.in 2025-11-24 23:10:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -356,8 +356,6 @@ CPPFLAGS_vpx = @CPPFLAGS_vpx@ CPPFLAGS_x265 = @CPPFLAGS_x265@ CPPFLAGS_xml = @CPPFLAGS_xml@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -401,14 +399,12 @@ EGL_CFLAGS = @EGL_CFLAGS@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ -ETAGS = @ETAGS@ EVAS_CFLAGS = @EVAS_CFLAGS@ EVAS_LIBS = @EVAS_LIBS@ EXEEXT = @EXEEXT@ FDKAAC_CFLAGS = @FDKAAC_CFLAGS@ FDKAAC_LIBS = @FDKAAC_LIBS@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@ FLAC_CFLAGS = @FLAC_CFLAGS@ @@ -481,6 +477,7 @@ LIBCDDB_LIBS = @LIBCDDB_LIBS@ LIBCOM = @LIBCOM@ LIBDL = @LIBDL@ +LIBEXECINFO = @LIBEXECINFO@ LIBEXT = @LIBEXT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -771,6 +768,7 @@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DIR = @PACKAGE_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -882,9 +880,11 @@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ WAYLAND_PROTOCOLS = @WAYLAND_PROTOCOLS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ +WIN32_PATH_CMD = @WIN32_PATH_CMD@ WINDOWS_ARCH = @WINDOWS_ARCH@ WINDRES = @WINDRES@ WINE_SDK_PATH = @WINE_SDK_PATH@ +WIXPATH = @WIXPATH@ X262_CFLAGS = @X262_CFLAGS@ X262_LIBS = @X262_LIBS@ X26410b_CFLAGS = @X26410b_CFLAGS@ @@ -1033,6 +1033,7 @@ ChangeLog-2022 \ ChangeLog-2023 \ ChangeLog-2024 \ + ChangeLog-2025 \ $(NULL) man1_MANS = \ @@ -1191,6 +1192,7 @@ cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -Nru vlc-3.0.21/doc/libvlc/win_player.c vlc-3.0.22/doc/libvlc/win_player.c --- vlc-3.0.21/doc/libvlc/win_player.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/doc/libvlc/win_player.c 2025-11-13 22:17:54.000000000 +0000 @@ -3,10 +3,6 @@ #include #include -#ifdef _MSC_VER -typedef int ssize_t; -#endif - #include #define SCREEN_WIDTH 1500 @@ -89,6 +85,10 @@ AspectRatio = NULL; libvlc_video_set_aspect_ratio( ctx->p_mediaplayer, AspectRatio ); } + if (key == 's') + { + libvlc_media_player_stop( ctx->p_mediaplayer ); + } break; } default: break; diff -Nru vlc-3.0.21/doc/release-howto.txt vlc-3.0.22/doc/release-howto.txt --- vlc-3.0.21/doc/release-howto.txt 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.22/doc/release-howto.txt 2025-11-13 22:17:54.000000000 +0000 @@ -23,6 +23,7 @@ git push origin * Tarballs (Use a clean tree !!!) + - Edit POTFILES.in to include generated Qt UI files (doesn't work out of tree) - Use 'make distcheck' to make sure all files are exported correctly - copy the tar.xz file on ganesh.videolan.org - generate SHA, MD5 hashes and OpenPGP signature of these files : diff -Nru vlc-3.0.21/extras/package/macosx/build.sh vlc-3.0.22/extras/package/macosx/build.sh --- vlc-3.0.21/extras/package/macosx/build.sh 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/package/macosx/build.sh 2025-11-13 22:17:54.000000000 +0000 @@ -224,7 +224,7 @@ make clean ./bootstrap > $out fi -make > $out +make -j$JOBS > $out spopd # @@ -247,16 +247,25 @@ # xcodebuild only allows to set a build-in sdk, not a custom one. Therefore use the default included SDK here export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk macosx WARNING_CFLAGS=-Werror=partial-availability" +CONTRIBFLAGS= +if [ "$PACKAGETYPE" = "u" ]; then + # release package should have sparkle, breakpad, growl + CONTRIBFLAGS="$CONTRIBFLAGS --enable-sparkle --enable-breakpad --enable-growl" +elif [ "$PACKAGETYPE" = "n" ]; then + # nightly package should have growl + CONTRIBFLAGS="$CONTRIBFLAGS --enable-growl" +fi + info "Building contribs" spushd "${vlcroot}/contrib" mkdir -p contrib-$HOST_TRIPLET && cd contrib-$HOST_TRIPLET -../bootstrap --build=$BUILD_TRIPLET --host=$HOST_TRIPLET > $out +../bootstrap --build=$BUILD_TRIPLET --host=$HOST_TRIPLET $CONTRIBFLAGS > $out if [ "$REBUILD" = "yes" ]; then make clean fi +make list if [ "$CONTRIBFROMSOURCE" = "yes" ]; then make fetch - make -j$JOBS .gettext make -j$JOBS -k || make -j1 if [ "$PACKAGE" = "yes" ]; then @@ -314,6 +323,13 @@ if [ ! -z "$BREAKPAD" ]; then CONFIGFLAGS="$CONFIGFLAGS --with-breakpad=$BREAKPAD" fi +if [ "$PACKAGETYPE" = "u" ]; then + # release package should have sparkle, breakpad, growl + CONFIGFLAGS="$CONFIGFLAGS --enable-sparkle --enable-breakpad --enable-growl" +elif [ "$PACKAGETYPE" = "n" ]; then + # nightly package should have growl + CONFIGFLAGS="$CONFIGFLAGS --enable-growl" +fi if [ "${vlcroot}/configure" -nt Makefile ]; then diff -Nru vlc-3.0.21/extras/package/macosx/configure.sh vlc-3.0.22/extras/package/macosx/configure.sh --- vlc-3.0.21/extras/package/macosx/configure.sh 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/package/macosx/configure.sh 2025-11-13 22:17:54.000000000 +0000 @@ -23,7 +23,7 @@ --disable-pulse --disable-sdl-image --disable-vnc - --with-macosx-version-min=10.7 + --with-macosx-version-min=$MINIMAL_OSX_VERSION " export CFLAGS diff -Nru vlc-3.0.21/extras/package/npapi.am vlc-3.0.22/extras/package/npapi.am --- vlc-3.0.21/extras/package/npapi.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/package/npapi.am 2025-11-13 22:17:54.000000000 +0000 @@ -30,9 +30,9 @@ $(SHELL) ./autogen.sh touch $@ -if ENABLE_PDB -ENABLE_PDB_OPTION := --enable-pdb -endif +# if ENABLE_PDB +# ENABLE_PDB_OPTION = --enable-pdb +# endif npapi-vlc/Makefile: npapi-vlc/configure cd npapi-vlc && \ diff -Nru vlc-3.0.21/extras/package/win32/NSIS/vlc.win32.nsi.in vlc-3.0.22/extras/package/win32/NSIS/vlc.win32.nsi.in --- vlc-3.0.21/extras/package/win32/NSIS/vlc.win32.nsi.in 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/package/win32/NSIS/vlc.win32.nsi.in 2025-11-13 22:17:54.000000000 +0000 @@ -45,8 +45,9 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; Name "${PRODUCT_NAME}" -@HAVE_WIN64_FALSE@ OutFile ..\vlc-${VERSION}-win32.exe -@HAVE_WIN64_TRUE@ OutFile ..\vlc-${VERSION}-win64.exe +@HAVE_WIN64_FALSE@ OutFile ..\vlc-${VERSION}-win32.exe +@HAVE_WIN64_TRUE@@HAVE_ARM64_FALSE@ OutFile ..\vlc-${VERSION}-win64.exe +@HAVE_WIN64_TRUE@@HAVE_ARM64_TRUE@ OutFile ..\vlc-${VERSION}-winarm64.exe InstallDir "$@PROGRAMFILES@\VideoLAN\VLC" !ifdef NSIS_LZMA_COMPRESS_WHOLE SetCompressor lzma diff -Nru vlc-3.0.21/extras/package/win32/configure.sh vlc-3.0.22/extras/package/win32/configure.sh --- vlc-3.0.21/extras/package/win32/configure.sh 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/package/win32/configure.sh 2025-11-13 22:17:54.000000000 +0000 @@ -7,7 +7,6 @@ --enable-flac --enable-theora --enable-avcodec --enable-merge-ffmpeg - --enable-dca --enable-mpc --enable-libass --enable-schroedinger diff -Nru vlc-3.0.21/extras/package/win32/msi/config.wxi.in vlc-3.0.22/extras/package/win32/msi/config.wxi.in --- vlc-3.0.21/extras/package/win32/msi/config.wxi.in 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/package/win32/msi/config.wxi.in 2025-11-13 22:17:54.000000000 +0000 @@ -14,21 +14,18 @@ - - + - - - - - + + + + + diff -Nru vlc-3.0.21/extras/package/win32/msi.mak vlc-3.0.22/extras/package/win32/msi.mak --- vlc-3.0.21/extras/package/win32/msi.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/package/win32/msi.mak 2025-11-13 22:17:54.000000000 +0000 @@ -3,38 +3,42 @@ extras/package/win32/msi/config.wxi endif -WIXPATH=`wine winepath -u 'C:\\Program Files (x86)\\Windows Installer XML v3.5\\bin'` -HEAT=wine "$(WIXPATH)/heat.exe" -CANDLE=wine "$(WIXPATH)/candle.exe" -LIGHT=wine "$(WIXPATH)/light.exe" -VLCDIR=`wine winepath -s \`wine winepath -w '$(abs_top_builddir)/vlc-$(VERSION)'\`` +HEAT=$(MSIDIR)/msi-heat.py +CANDLE=wine "@WIXPATH@/candle.exe" +LIGHT=wine "@WIXPATH@/light.exe" +VLCDIR=@PACKAGE_DIR@ MSIDIR=$(abs_srcdir)/extras/package/win32/msi -W_MSIDIR=`wine winepath -w '$(MSIDIR)'` +W_MSIDIR=`$(WIN32_PATH_CMD) -w '$(MSIDIR)'` MSIBUILDDIR=$(abs_top_builddir)/extras/package/win32/msi -W_MSIBUILDDIR=`wine winepath -w '$(MSIBUILDDIR)'` +W_MSIBUILDDIR=`$(WIN32_PATH_CMD) -w '$(MSIBUILDDIR)'` +if HAVE_ARM64 +MSIOUTFILE=vlc-$(VERSION)-winarm64.msi +else if HAVE_WIN64 MSIOUTFILE=vlc-$(VERSION)-win64.msi else MSIOUTFILE=vlc-$(VERSION)-win32.msi endif -WINE_C=`wine winepath c:` +endif heat: package-win-strip - $(HEAT) dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs - $(HEAT) dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Locale.fragment.wxs - $(HEAT) dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Lua.fragment.wxs - $(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Skins.fragment.wxs + $(HEAT) --dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Plugins.fragment.wxs + $(HEAT) --dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Locale.fragment.wxs +if BUILD_LUA + $(HEAT) --dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Lua.fragment.wxs +endif +if BUILD_SKINS + $(HEAT) --dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Skins.fragment.wxs +endif candle: heat - $(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)\\product.wxs $(W_MSIDIR)\\axvlc.wxs $(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs + $(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)/product.wxs $(W_MSIDIR)/axvlc.wxs $(W_MSIDIR)/extensions.wxs $(W_MSIBUILDDIR)/*.fragment.wxs -light: candle - test ! -d "$(WINE_C)/v" -o ! -f "$(WINE_C)/v" - ln -Tsf "$(abs_top_builddir)/vlc-$(VERSION)" "$(WINE_C)"/v - $(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b $(W_MSIDIR) -b C:/v/plugins -b C:/v/locale -b C:/v/lua -b C:/v/skins $(W_MSIBUILDDIR)\\product.wixobj $(W_MSIBUILDDIR)\\axvlc.wixobj $(W_MSIBUILDDIR)\\extensions.wixobj $(W_MSIBUILDDIR)\\*.fragment.wixobj -o $(MSIOUTFILE) - chmod 644 $(MSIOUTFILE) +$(MSIOUTFILE): candle + $(AM_V_GEN)cd vlc-@VERSION@ && $(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b $(W_MSIDIR) $(W_MSIBUILDDIR)/product.wixobj $(W_MSIBUILDDIR)/axvlc.wixobj $(W_MSIBUILDDIR)/extensions.wixobj $(W_MSIBUILDDIR)/*.fragment.wixobj -o ../$@ + chmod 644 $@ -package-msi: light +package-msi: $(MSIOUTFILE) cleanmsi: -rm -f $(MSIBUILDDIR)/*.wixobj @@ -44,4 +48,4 @@ distcleanmsi: cleanmsi -rm -f $(MSIOUTFILE) -.PHONY: heat candle light cleanmsi distcleanmsi package-msi +.PHONY: heat candle cleanmsi distcleanmsi package-msi diff -Nru vlc-3.0.21/extras/package/win32/package.mak vlc-3.0.22/extras/package/win32/package.mak --- vlc-3.0.21/extras/package/win32/package.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/package/win32/package.mak 2025-11-13 22:17:54.000000000 +0000 @@ -3,7 +3,7 @@ extras/package/win32/NSIS/vlc.win32.nsi extras/package/win32/NSIS/spad.nsi endif -win32_destdir=$(top_builddir)/vlc-$(VERSION) +win32_destdir=@PACKAGE_DIR@ win32_debugdir=$(abs_top_builddir)/symbols-$(VERSION) win32_xpi_destdir=$(abs_top_builddir)/vlc-plugin-$(VERSION) @@ -16,11 +16,15 @@ build-npapi: package-win-install endif +if HAVE_ARM64 +WINVERSION=vlc-$(VERSION)-winarm64 +else if HAVE_WIN64 WINVERSION=vlc-$(VERSION)-win64 else WINVERSION=vlc-$(VERSION)-win32 endif +endif package-win-install: $(MAKE) install @@ -128,16 +132,16 @@ $(STRIP) $@ endif - -package-win32-exe: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll extras/package/win32/NSIS/vlc.win32.nsi +package-win32-src: package-win-strip # Script installer cp $(top_builddir)/extras/package/win32/NSIS/vlc.win32.nsi "$(win32_destdir)/" cp $(top_builddir)/extras/package/win32/NSIS/spad.nsi "$(win32_destdir)/" - cp -r $(srcdir)/extras/package/win32/NSIS/languages "$(win32_destdir)/" - cp -r $(srcdir)/extras/package/win32/NSIS/helpers "$(win32_destdir)/" + cp -r $(srcdir)/extras/package/win32/NSIS/languages "$(win32_destdir)/" + cp -r $(srcdir)/extras/package/win32/NSIS/helpers "$(win32_destdir)/" cp "$(top_srcdir)/extras/package/win32/NSIS/nsProcess.nsh" "$(win32_destdir)/NSIS/" cp "$(top_srcdir)/extras/package/win32/NSIS/vlc_branding.bmp" "$(win32_destdir)/NSIS/" +package-win32-exe: package-win32-src $(win32_destdir)/NSIS/nsProcess.dll extras/package/win32/NSIS/vlc.win32.nsi # Create package if makensis -VERSION >/dev/null 2>&1; then \ MAKENSIS="makensis"; \ @@ -175,14 +179,7 @@ package-win32-debug: package-win32-debug-zip package-win32-debug-7zip -package-win32-release: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll package-win-sdk - cp $(top_builddir)/extras/package/win32/NSIS/vlc.win32.nsi "$(win32_destdir)/" - cp $(top_builddir)/extras/package/win32/NSIS/spad.nsi "$(win32_destdir)/" - cp -r $(srcdir)/extras/package/win32/NSIS/languages "$(win32_destdir)/" - cp -r $(srcdir)/extras/package/win32/NSIS/helpers "$(win32_destdir)/" - cp "$(top_srcdir)/extras/package/win32/NSIS/nsProcess.nsh" "$(win32_destdir)/NSIS/" - cp "$(top_srcdir)/extras/package/win32/NSIS/vlc_branding.bmp" "$(win32_destdir)/NSIS/" - +package-win32-release: package-win32-src $(win32_destdir)/NSIS/nsProcess.dll package-win-sdk mkdir -p "$(win32_destdir)/msi/" cp $(top_builddir)/extras/package/win32/msi/config.wxi "$(win32_destdir)/msi/" cp $(top_srcdir)/extras/package/win32/msi/axvlc.wxs "$(win32_destdir)/msi/" @@ -200,7 +197,7 @@ rm -f -- vlc-$(VERSION)-wince.zip zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION) -.PHONY: package-win-install package-win-common package-win-strip package-win32-webplugin-common package-win32-xpi package-win32-crx package-win32-exe package-win32-zip package-win32-debug-zip package-win32-7zip package-win32-debug-7zip package-win32-cleanup package-win32 package-win32-debug package-wince +.PHONY: package-win-install package-win-common package-win-strip package-win32-webplugin-common package-win32-xpi package-win32-crx package-win32-src package-win32-exe package-win32-zip package-win32-debug-zip package-win32-7zip package-win32-debug-7zip package-win32-cleanup package-win32 package-win32-debug package-wince EXTRA_DIST += \ extras/package/win32/vlc.exe.manifest \ @@ -262,5 +259,3 @@ extras/package/win32/NSIS/languages/UkrainianExtra.nsh \ extras/package/win32/NSIS/languages/UzbekExtra.nsh \ extras/package/win32/NSIS/languages/WelshExtra.nsh - - diff -Nru vlc-3.0.21/extras/tools/SHA512SUMS vlc-3.0.22/extras/tools/SHA512SUMS --- vlc-3.0.21/extras/tools/SHA512SUMS 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/tools/SHA512SUMS 2025-11-13 22:17:54.000000000 +0000 @@ -6,15 +6,15 @@ f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2 m4-1.4.19.tar.gz 56a9656539448972bc3080357ccc987bd4cbca3847758fe41251eb8af1a5e403a75f38d1344fa2c0bd56de880f37f3eaafbe7116c506f33331e7a8dd8a53cf2a pkg-config-0.28-1.tar.gz 9f85a98e55cbc9f245a3079d5a597f778454bc945f0942cb10fbdfbde5fe12b17d6dda93d6a8d5281459ad30a3840be7e0712feb33a824226884e7e4da54a061 protobuf-3.1.0.tar.gz -6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38 ragel-6.10.tar.gz dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573 sed-4.2.2.tar.bz2 3bc12441bebfc388017ad0632fb3e777ceaf62be82fb19ce771df8bbb765eb094dad336110189f49f5eaaebd4d6ced586098e1e3c8b9f7f775dc483d5513f209 tar-1.26.tar.bz2 83c50b8949b7215ab650fc9bf335e684d4bb2738357e1d002f31cfe4c77f96072e45767a0126016363e0272db880c4a5bd35b280e6f5074a466882137a477c79 xz-5.2.2.tar.bz2 572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645 yasm-1.3.0.tar.gz -bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412 bison-3.0.4.tar.xz +d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444 bison-3.8.2.tar.xz e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e flex-2.6.4.tar.gz 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd nasm-2.14.tar.gz d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 help2man-1.47.6.tar.xz -3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514 meson-0.56.2.tar.gz -1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 ninja-1.8.2.tar.gz +8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea meson-0.63.0.tar.gz +37b3a421419b16930e53181c431fe3b4afd55ac54733a5df08376641fd2fb88eeb73ee7abe3788f3e491e7c1b215c7f35aefa66f44b09008ad22b76ab2998830 ninja-1.11.1.tar.gz 27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385 libtool-2.4.7.tar.gz +e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 gettext-0.22.tar.gz diff -Nru vlc-3.0.21/extras/tools/bison-macOS-7df04f9.patch vlc-3.0.22/extras/tools/bison-macOS-7df04f9.patch --- vlc-3.0.21/extras/tools/bison-macOS-7df04f9.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/tools/bison-macOS-7df04f9.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -From 7df04f9b8a0adb1575ca0555775ec10860143cbf Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Fri, 7 Jul 2017 23:35:32 +0200 -Subject: vasnprintf: port to macOS 10.13 - -Improve comments in last commit. ---- - lib/vasnprintf.c | 17 ++++++++++------- - 2 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index fecaf27..2e4eb19 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -4869,10 +4869,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if ! (((__GLIBC__ > 2 \ -- || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -- && !defined __UCLIBC__) \ -- || (defined __APPLE__ && defined __MACH__) \ -+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__) \ -+ || (defined __APPLE__ && defined __MACH__) \ - || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; -@@ -4887,9 +4886,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - in format strings in writable memory may crash the program - (if compiled with _FORTIFY_SOURCE=2), so we should avoid it - in this situation. */ -- /* macOS 10.13 High Sierra behaves like glibc with -- _FORTIFY_SOURCE=2, and older macOS releases -- presumably do not need %n. */ -+ /* On Mac OS X 10.3 or newer, we know that snprintf's return -+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 -+ and gl_SNPRINTF_TRUNCATION_C99 pass. -+ Therefore we can avoid using %n in this situation. -+ On Mac OS X 10.13 or newer, the use of %n in format strings -+ in writable memory by default crashes the program, so we -+ should avoid it in this situation. */ - /* On native Windows systems (such as mingw), we can avoid using - %n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, --- -cgit v1.0-41-gc330 - diff -Nru vlc-3.0.21/extras/tools/bison-macOS-c41f233c.patch vlc-3.0.22/extras/tools/bison-macOS-c41f233c.patch --- vlc-3.0.21/extras/tools/bison-macOS-c41f233c.patch 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/tools/bison-macOS-c41f233c.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From c41f233c4c38e84023a16339782ee306f03e7f59 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Fri, 7 Jul 2017 14:10:20 -0700 -Subject: vasnprintf: port to macOS 10.13 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by comex in: -http://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html -* lib/vasnprintf.c (VASNPRINTF): Don’t use %n on macOS. ---- - lib/vasnprintf.c | 9 ++++++++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index 9c2af0e..fecaf27 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -4869,7 +4869,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if ! (((__GLIBC__ > 2 \ -+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__) \ -+ || (defined __APPLE__ && defined __MACH__) \ -+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; -@@ -4883,6 +4887,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - in format strings in writable memory may crash the program - (if compiled with _FORTIFY_SOURCE=2), so we should avoid it - in this situation. */ -+ /* macOS 10.13 High Sierra behaves like glibc with -+ _FORTIFY_SOURCE=2, and older macOS releases -+ presumably do not need %n. */ - /* On native Windows systems (such as mingw), we can avoid using - %n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, --- -cgit v1.0-41-gc330 - diff -Nru vlc-3.0.21/extras/tools/bootstrap vlc-3.0.22/extras/tools/bootstrap --- vlc-3.0.21/extras/tools/bootstrap 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/tools/bootstrap 2025-11-13 22:17:54.000000000 +0000 @@ -32,7 +32,7 @@ [ "$needmajor" -eq "$gotmajor" -a "$needminor" -gt "$gotminor" ] || [ "$needmajor" -eq "$gotmajor" -a "$needminor" -eq "$gotminor" -a "$needmicro" -gt "$gotmicro" ]; then - echo "$1 too old" + echo "$1 incompatible version (expected $3, got $2)" NEEDED="$NEEDED $1" else FOUND="$FOUND $1" @@ -106,7 +106,7 @@ if [ -z "$2" ];then FOUND="$FOUND $1" else - gotver=`$1 --version | head -1 | sed s/'.* '//` + gotver=`$1 --version | head -1 | grep -o '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' | head -1` check_version $1 $gotver $2 fi fi @@ -136,7 +136,6 @@ check cmake 3.17.0 check yasm check_tar -check ragel check_sed check protoc 2.6.0 check ant @@ -145,8 +144,9 @@ check flex check_nasm 2.14 check help2man -check meson 0.54.2 +check meson 0.60.0 check ninja +check gettext DEPS_ONLY="help2man" diff -Nru vlc-3.0.21/extras/tools/packages.mak vlc-3.0.22/extras/tools/packages.mak --- vlc-3.0.21/extras/tools/packages.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/tools/packages.mak 2025-11-13 22:17:54.000000000 +0000 @@ -1,16 +1,16 @@ -GNU=http://ftp.gnu.org/gnu -APACHE=http://mir2.ovh.net/ftp.apache.org/dist -SF= http://downloads.sourceforge.net/project -VIDEOLAN=http://downloads.videolan.org/pub/contrib +GNU=https://ftpmirror.gnu.org/gnu +APACHE=https://downloads.apache.org/ +SF=https://downloads.sourceforge.net/project +VIDEOLAN=https://downloads.videolan.org/pub/contrib YASM_VERSION=1.3.0 YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz NASM_VERSION=2.14 -NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz +NASM_URL=https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz CMAKE_VERSION=3.17.0 -CMAKE_URL=http://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz +CMAKE_URL=https://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz LIBTOOL_VERSION=2.4.7 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz @@ -31,14 +31,11 @@ TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2 XZ_VERSION=5.2.2 -XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2 +XZ_URL=https://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2 GAS_VERSION=72887b9 GAS_URL=http://git.libav.org/?p=gas-preprocessor.git;a=snapshot;h=$(GAS_VERSION);sf=tgz -RAGEL_VERSION=6.10 -RAGEL_URL=http://www.colm.net/files/ragel/ragel-$(RAGEL_VERSION).tar.gz - SED_VERSION=4.2.2 SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2 @@ -48,17 +45,21 @@ PROTOBUF_VERSION := 3.1.0 PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz -BISON_VERSION=3.0.4 +BISON_VERSION=3.8.2 BISON_URL=$(GNU)/bison/bison-$(BISON_VERSION).tar.xz FLEX_VERSION=2.6.4 FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-$(FLEX_VERSION).tar.gz +GETTEXT_VERSION=0.22 +GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz + HELP2MAN_VERSION=1.47.6 HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz -MESON_VERSION=0.56.2 +MESON_VERSION=0.63.0 MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz -NINJA_VERSION=1.8.2 -NINJA_URL=https://github.com/ninja-build/ninja/archive/v$(NINJA_VERSION).tar.gz +NINJA_VERSION=1.11.1 +NINJA_BUILD_NAME=$(NINJA_VERSION).g95dee.kitware.jobserver-1 +NINJA_URL=https://github.com/Kitware/ninja/archive/refs/tags/v$(NINJA_BUILD_NAME).tar.gz diff -Nru vlc-3.0.21/extras/tools/ragel-6.8-javacodegen.patch vlc-3.0.22/extras/tools/ragel-6.8-javacodegen.patch --- vlc-3.0.21/extras/tools/ragel-6.8-javacodegen.patch 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.22/extras/tools/ragel-6.8-javacodegen.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -diff -urN ragel-6.8.orig/ragel/javacodegen.cpp ragel-6.8/ragel/javacodegen.cpp ---- ragel-6.8.orig/ragel/javacodegen.cpp 2013-02-11 05:57:45.000000000 +0400 -+++ ragel-6.8/ragel/javacodegen.cpp.new 2013-09-01 14:42:27.000000000 +0400 -@@ -50,6 +50,7 @@ - using std::ifstream; - using std::ostream; - using std::ios; -+using std::setiosflags; - using std::cin; - using std::cout; - using std::cerr; diff -Nru vlc-3.0.21/extras/tools/tools.mak vlc-3.0.22/extras/tools/tools.mak --- vlc-3.0.21/extras/tools/tools.mak 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/extras/tools/tools.mak 2025-11-13 22:17:54.000000000 +0000 @@ -10,7 +10,7 @@ # ifeq ($(shell command -v curl >/dev/null 2>&1 || echo FAIL),) -download = curl -f -L -- "$(1)" > "$@.tmp" && touch $@.tmp && mv $@.tmp $@ +download = curl -f -L --retry 3 --output "$@" -- "$(1)" else ifeq ($(shell command -v wget >/dev/null 2>&1 || echo FAIL),) download = rm -f $@.tmp && \ wget --passive -c -p -O $@.tmp "$(1)" && \ @@ -37,12 +37,16 @@ download_pkg = $(call download,$(VIDEOLAN)/$(2)/$(lastword $(subst /, ,$(@)))) || \ ( $(call download,$(1)) && echo "Please upload package $(lastword $(subst /, ,$(@))) to our FTP" ) \ - && grep $(@) $(TOOLS)/SHA512SUMS| $(SHA512SUM) + && grep $(@) $(TOOLS)/SHA512SUMS| $(SHA512SUM) /dev/stdin + +ifeq ($(V),1) +TAR_VERBOSE := v +endif UNPACK = $(RM) -R $@ \ - $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzfo $(f)) \ - $(foreach f,$(filter %.tar.bz2,$^), && tar xvjfo $(f)) \ - $(foreach f,$(filter %.tar.xz,$^), && tar xvJfo $(f)) \ + $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar $(TAR_VERBOSE)xzfo $(f)) \ + $(foreach f,$(filter %.tar.bz2,$^), && tar $(TAR_VERBOSE)xjfo $(f)) \ + $(foreach f,$(filter %.tar.xz,$^), && tar $(TAR_VERBOSE)xJfo $(f)) \ $(foreach f,$(filter %.zip,$^), && unzip $(f)) UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<))) @@ -78,7 +82,9 @@ $(MOVE) .buildnasm: nasm - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_FILE += .buildnasm @@ -96,7 +102,9 @@ $(MOVE) .buildcmake: cmake - (cd $<; ./configure --prefix=$(PREFIX) $(CMAKEFLAGS) --no-qt-gui -- -DCMAKE_USE_OPENSSL:BOOL=OFF -DBUILD_TESTING:BOOL=OFF && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) $(CMAKEFLAGS) --no-qt-gui -- -DCMAKE_USE_OPENSSL:BOOL=OFF -DBUILD_TESTING:BOOL=OFF + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_FILE += .buildcmake @@ -107,12 +115,14 @@ help2man-$(HELP2MAN_VERSION).tar.xz: $(call download_pkg,$(HELP2MAN_URL),help2man) -help2man: help2man-$(HELP2MAN_VERSION).tar.xz +help2man: help2man-$(HELP2MAN_VERSION).tar.xz .xz .tar $(UNPACK) $(MOVE) .buildhelp2man: help2man - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_FILE += .buildhelp2man @@ -136,7 +146,9 @@ .buildlibtool: libtool .automake .help2man (cd $(UNPACK_DIR) && autoreconf -fv) - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install ln -sf libtool $(PREFIX)/bin/glibtool ln -sf libtoolize $(PREFIX)/bin/glibtoolize touch $@ @@ -154,8 +166,10 @@ $(UNPACK) $(MOVE) -.buildtar: tar - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) +.buildtar: .xz tar + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_PKG += tar @@ -172,7 +186,10 @@ $(MOVE) .buildxz: xz - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install && rm $(PREFIX)/lib/pkgconfig/liblzma.pc) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install + rm $(PREFIX)/lib/pkgconfig/liblzma.pc touch $@ CLEAN_PKG += xz @@ -188,8 +205,10 @@ $(UNPACK) $(MOVE) -.buildautoconf: autoconf .pkg-config - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) +.buildautoconf: autoconf .pkg-config .m4 + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_FILE += .buildautoconf @@ -203,11 +222,15 @@ automake: automake-$(AUTOMAKE_VERSION).tar.gz $(UNPACK) + $(APPLY) $(TOOLS)/automake-disable-documentation.patch $(APPLY) $(TOOLS)/automake-clang.patch $(MOVE) .buildautomake: automake .autoconf - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) + (cd $<; ./bootstrap) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_FILE += .buildautomake @@ -224,7 +247,9 @@ $(MOVE) .buildm4: m4 - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_FILE += .buildm4 @@ -242,7 +267,9 @@ $(MOVE) .buildpkg-config: pkgconfig - (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static --disable-dependency-tracking + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_FILE += .buildpkg-config @@ -266,24 +293,6 @@ CLEAN_PKG += gas DISTCLEAN_PKG += gas-preprocessor-$(GAS_VERSION).tar.gz -# Ragel State Machine Compiler -ragel-$(RAGEL_VERSION).tar.gz: - $(call download_pkg,$(RAGEL_URL),ragel) - -ragel: ragel-$(RAGEL_VERSION).tar.gz - $(UNPACK) - $(APPLY) $(TOOLS)/ragel-6.8-javacodegen.patch - $(MOVE) - - -.buildragel: ragel - (cd ragel; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && $(MAKE) && $(MAKE) install) - touch $@ - -CLEAN_FILE += .buildragel -CLEAN_PKG += ragel -DISTCLEAN_PKG += ragel-$(RAGEL_VERSION).tar.gz - # GNU sed sed-$(SED_VERSION).tar.bz2: @@ -294,7 +303,9 @@ $(MOVE) .buildsed: sed - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_PKG += sed @@ -332,7 +343,7 @@ $(MOVE) .buildprotoc: protobuf - (cd $< && ./configure --prefix="$(PREFIX)" --disable-shared --enable-static && $(MAKE) && $(MAKE) install) + (cd $< && ./configure --prefix="$(PREFIX)" --disable-shared --enable-static --disable-dependency-tracking && $(MAKE) && $(MAKE) install) (find $(PREFIX) -name 'protobuf*.pc' -exec rm -f {} \;) touch $@ @@ -347,14 +358,14 @@ bison-$(BISON_VERSION).tar.xz: $(call download_pkg,$(BISON_URL),bison) -bison: bison-$(BISON_VERSION).tar.xz +bison: bison-$(BISON_VERSION).tar.xz .xz .tar $(UNPACK) - $(APPLY) $(TOOLS)/bison-macOS-c41f233c.patch - $(APPLY) $(TOOLS)/bison-macOS-7df04f9.patch $(MOVE) .buildbison: bison - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_PKG += bison @@ -373,7 +384,9 @@ $(MOVE) .buildflex: flex - (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install) + cd $<; ./configure --prefix=$(PREFIX) + +$(MAKE) -C $< + +$(MAKE) -C $< install touch $@ CLEAN_PKG += flex @@ -408,8 +421,12 @@ ninja-$(NINJA_VERSION).tar.gz: $(call download_pkg,$(NINJA_URL),ninja) +ninja: UNPACK_DIR=ninja-$(NINJA_BUILD_NAME) ninja: ninja-$(NINJA_VERSION).tar.gz $(UNPACK) + $(APPLY) $(TOOLS)/ninja-1.11.1-replace-pipes-quote-with-shlex-quote.patch + $(APPLY) $(TOOLS)/0001-CanonicalizePath-Remove-kMaxComponents-limit.patch + $(APPLY) $(TOOLS)/0002-CanonicalizePath-fix-a-b-._foo-a-replacement.patch $(MOVE) .buildninja: ninja @@ -420,6 +437,43 @@ DISTCLEAN_PKG += ninja-$(NINJA_VERSION).tar.gz CLEAN_FILE += .buildninja + +# +# GNU gettext +# + +GETTEXT_CONF = \ + --disable-relocatable \ + --disable-java \ + --disable-native-java \ + --disable-csharp \ + --disable-d \ + --disable-go \ + --disable-modula2 \ + --disable-openmp \ + --without-emacs \ + --without-included-libxml \ + --without-git \ + --without-cvs + +gettext-$(GETTEXT_VERSION).tar.gz: + $(call download_pkg,$(GETTEXT_URL),gettext) + +gettext: gettext-$(GETTEXT_VERSION).tar.gz + $(UNPACK) + $(MOVE) + +.buildgettext: gettext + cd $<; ./configure --prefix=$(PREFIX) $(GETTEXT_CONF) + +$(MAKE) -C $< EXAMPLESFILES= EXAMPLESDIRS= TESTS= + +$(MAKE) -C $< EXAMPLESFILES= EXAMPLESDIRS= TESTS= install + touch $@ + +CLEAN_PKG += gettext +DISTCLEAN_PKG += gettext-$(GETTEXT_VERSION).tar.gz +CLEAN_FILE += .buildgettext + + # # # diff -Nru vlc-3.0.21/include/vlc_common.h vlc-3.0.22/include/vlc_common.h --- vlc-3.0.21/include/vlc_common.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/include/vlc_common.h 2025-11-13 22:17:54.000000000 +0000 @@ -112,7 +112,9 @@ #ifdef __GNUC__ # define likely(p) __builtin_expect(!!(p), 1) # define unlikely(p) __builtin_expect(!!(p), 0) -# define unreachable() __builtin_unreachable() +# if !defined(unreachable) +# define unreachable() __builtin_unreachable() +# endif #else # define likely(p) (!!(p)) # define unlikely(p) (!!(p)) @@ -477,8 +479,8 @@ #if !defined(__cplusplus) # define VLC_OBJECT(x) \ _Generic((x)->obj, \ - struct vlc_common_members: (vlc_object_t *)(&(x)->obj), \ - const struct vlc_common_members: (const vlc_object_t *)(&(x)->obj) \ + vlc_object_t: (vlc_object_t *)(&(x)->obj), \ + struct vlc_common_members: (vlc_object_t *)(x) \ ) #else # define VLC_OBJECT( x ) ((vlc_object_t *)&(x)->obj) diff -Nru vlc-3.0.21/include/vlc_fixups.h vlc-3.0.22/include/vlc_fixups.h --- vlc-3.0.21/include/vlc_fixups.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/include/vlc_fixups.h 2025-11-13 22:17:54.000000000 +0000 @@ -657,10 +657,6 @@ char *realpath(const char * restrict pathname, char * restrict resolved_path); #endif -#ifdef _WIN32 -FILE *vlc_win32_tmpfile(void); -#endif - /* mingw-w64 has a broken IN6_IS_ADDR_MULTICAST macro */ #if defined(_WIN32) && defined(__MINGW64_VERSION_MAJOR) # define IN6_IS_ADDR_MULTICAST IN6_IS_ADDR_MULTICAST diff -Nru vlc-3.0.21/include/vlc_fourcc.h vlc-3.0.22/include/vlc_fourcc.h --- vlc-3.0.21/include/vlc_fourcc.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/include/vlc_fourcc.h 2025-11-13 22:17:54.000000000 +0000 @@ -269,6 +269,10 @@ #define VLC_CODEC_YUVA_444_10L VLC_FOURCC('Y','A','0','L') #define VLC_CODEC_YUVA_444_10B VLC_FOURCC('Y','A','0','B') +/* Planar Y:U:V:A 4:4:4 12bits */ +#define VLC_CODEC_YUVA_444_12L VLC_FOURCC('Y','A','2','L') +#define VLC_CODEC_YUVA_444_12B VLC_FOURCC('Y','A','2','B') + /* Semi-planar Y/UV */ /* 2 planes Y/UV 4:2:0 */ diff -Nru vlc-3.0.21/include/vlc_mtime.h vlc-3.0.22/include/vlc_mtime.h --- vlc-3.0.21/include/vlc_mtime.h 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/include/vlc_mtime.h 2025-11-13 22:17:54.000000000 +0000 @@ -42,6 +42,66 @@ *****************************************************************************/ #define LAST_MDATE ((vlc_tick_t)((uint64_t)(-1)/2)) +/* + * vlc_tick_t <> milliseconds (ms) conversions + */ +#if (CLOCK_FREQ % 1000) == 0 +#define VLC_TICK_FROM_MS(ms) ((CLOCK_FREQ / INT64_C(1000)) * (ms)) +#define MS_FROM_VLC_TICK(vtk) ((vtk) / (CLOCK_FREQ / INT64_C(1000))) +#elif (1000 % CLOCK_FREQ) == 0 +#define VLC_TICK_FROM_MS(ms) ((ms) / (INT64_C(1000) / CLOCK_FREQ)) +#define MS_FROM_VLC_TICK(vtk) ((vtk) * (INT64_C(1000) / CLOCK_FREQ)) +#else /* rounded overflowing conversion */ +#define VLC_TICK_FROM_MS(ms) (CLOCK_FREQ * (ms) / 1000) +#define MS_FROM_VLC_TICK(vtk) ((vtk) * 1000 / CLOCK_FREQ) +#endif /* CLOCK_FREQ / 1000 */ + + +/* + * vlc_tick_t <> seconds (sec) conversions + */ +#define VLC_TICK_FROM_SEC(sec) (CLOCK_FREQ * (sec)) +#define SEC_FROM_VLC_TICK(vtk) ((vtk) / CLOCK_FREQ) + +#ifdef __cplusplus +#include + +template +static inline auto vlc_tick_from_sec(T sec) + -> typename std::enable_if::value, vlc_tick_t>::type +{ + return CLOCK_FREQ * sec; +} + +/* seconds in floating point */ +static inline vlc_tick_t vlc_tick_from_sec(double secf) +{ + return (vlc_tick_t)(CLOCK_FREQ * secf); /* TODO use llround ? */ +} +#else /* !__cplusplus */ +static inline vlc_tick_t vlc_tick_from_seci(int64_t sec) +{ + return CLOCK_FREQ * sec; +} +/* seconds in floating point */ +static inline vlc_tick_t vlc_tick_from_secf(double secf) +{ + return (vlc_tick_t)(CLOCK_FREQ * secf); /* TODO use llround ? */ +} + +#define vlc_tick_from_sec(sec) _Generic((sec), \ + double: vlc_tick_from_secf(sec), \ + float: vlc_tick_from_secf(sec), \ + default: vlc_tick_from_seci(sec) ) +#endif /* !__cplusplus */ + +/* seconds in floating point from vlc_tick_t */ +static inline double secf_from_vlc_tick(vlc_tick_t vtk) +{ + return (double)vtk / (double)CLOCK_FREQ; +} + + /***************************************************************************** * MSTRTIME_MAX_SIZE: maximum possible size of mstrtime ***************************************************************************** diff -Nru vlc-3.0.21/include/vlc_strings.h vlc-3.0.22/include/vlc_strings.h --- vlc-3.0.21/include/vlc_strings.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/include/vlc_strings.h 2025-11-13 22:17:54.000000000 +0000 @@ -138,7 +138,7 @@ * * Formats input and input item meta-informations into a heap-allocated string. */ -VLC_API char *vlc_strfinput( input_thread_t *, const char * ); +VLC_API char *vlc_strfinput( input_thread_t *, const char * ) VLC_MALLOC; static inline char *str_format( input_thread_t *input, const char *fmt ) { diff -Nru vlc-3.0.21/lib/Makefile.in vlc-3.0.22/lib/Makefile.in --- vlc-3.0.21/lib/Makefile.in 2024-06-05 16:02:16.000000000 +0000 +++ vlc-3.0.22/lib/Makefile.in 2025-11-24 23:10:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -225,6 +225,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/autotools/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -418,8 +420,6 @@ CPPFLAGS_vpx = @CPPFLAGS_vpx@ CPPFLAGS_x265 = @CPPFLAGS_x265@ CPPFLAGS_xml = @CPPFLAGS_xml@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -463,14 +463,12 @@ EGL_CFLAGS = @EGL_CFLAGS@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ -ETAGS = @ETAGS@ EVAS_CFLAGS = @EVAS_CFLAGS@ EVAS_LIBS = @EVAS_LIBS@ EXEEXT = @EXEEXT@ FDKAAC_CFLAGS = @FDKAAC_CFLAGS@ FDKAAC_LIBS = @FDKAAC_LIBS@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@ FLAC_CFLAGS = @FLAC_CFLAGS@ @@ -543,6 +541,7 @@ LIBCDDB_LIBS = @LIBCDDB_LIBS@ LIBCOM = @LIBCOM@ LIBDL = @LIBDL@ +LIBEXECINFO = @LIBEXECINFO@ LIBEXT = @LIBEXT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -833,6 +832,7 @@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DIR = @PACKAGE_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -944,9 +944,11 @@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ WAYLAND_PROTOCOLS = @WAYLAND_PROTOCOLS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ +WIN32_PATH_CMD = @WIN32_PATH_CMD@ WINDOWS_ARCH = @WINDOWS_ARCH@ WINDRES = @WINDRES@ WINE_SDK_PATH = @WINE_SDK_PATH@ +WIXPATH = @WIXPATH@ X262_CFLAGS = @X262_CFLAGS@ X262_LIBS = @X262_LIBS@ X26410b_CFLAGS = @X26410b_CFLAGS@ @@ -1350,6 +1352,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -1394,8 +1397,7 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-exec-am +install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1530,8 +1532,7 @@ uninstall-nodist_pkgincludeHEADERS uninstall-pkgconfigDATA \ uninstall-pkgincludeHEADERS -.MAKE: all check check-am install install-am install-exec \ - install-strip +.MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \ check-local clean clean-generic clean-libLTLIBRARIES \ diff -Nru vlc-3.0.21/lib/video.c vlc-3.0.22/lib/video.c --- vlc-3.0.21/lib/video.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/lib/video.c 2025-11-13 22:17:54.000000000 +0000 @@ -865,6 +865,7 @@ var_TriggerCallback( pp_vouts[i], "sub-source" ); vlc_object_release( pp_vouts[i] ); } + free (pp_vouts); if( opt->type == 0 ) free( new_val.psz_string ); diff -Nru vlc-3.0.21/m4/Makefile.in vlc-3.0.22/m4/Makefile.in --- vlc-3.0.21/m4/Makefile.in 2024-06-05 16:02:16.000000000 +0000 +++ vlc-3.0.22/m4/Makefile.in 2025-11-24 23:10:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -322,8 +322,6 @@ CPPFLAGS_vpx = @CPPFLAGS_vpx@ CPPFLAGS_x265 = @CPPFLAGS_x265@ CPPFLAGS_xml = @CPPFLAGS_xml@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -367,14 +365,12 @@ EGL_CFLAGS = @EGL_CFLAGS@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ -ETAGS = @ETAGS@ EVAS_CFLAGS = @EVAS_CFLAGS@ EVAS_LIBS = @EVAS_LIBS@ EXEEXT = @EXEEXT@ FDKAAC_CFLAGS = @FDKAAC_CFLAGS@ FDKAAC_LIBS = @FDKAAC_LIBS@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@ FLAC_CFLAGS = @FLAC_CFLAGS@ @@ -447,6 +443,7 @@ LIBCDDB_LIBS = @LIBCDDB_LIBS@ LIBCOM = @LIBCOM@ LIBDL = @LIBDL@ +LIBEXECINFO = @LIBEXECINFO@ LIBEXT = @LIBEXT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -737,6 +734,7 @@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DIR = @PACKAGE_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -848,9 +846,11 @@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ WAYLAND_PROTOCOLS = @WAYLAND_PROTOCOLS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ +WIN32_PATH_CMD = @WIN32_PATH_CMD@ WINDOWS_ARCH = @WINDOWS_ARCH@ WINDRES = @WINDRES@ WINE_SDK_PATH = @WINE_SDK_PATH@ +WIXPATH = @WIXPATH@ X262_CFLAGS = @X262_CFLAGS@ X262_LIBS = @X262_LIBS@ X26410b_CFLAGS = @X26410b_CFLAGS@ @@ -1036,6 +1036,7 @@ cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -Nru vlc-3.0.21/m4/libtool.m4 vlc-3.0.22/m4/libtool.m4 --- vlc-3.0.21/m4/libtool.m4 2022-08-03 11:11:36.000000000 +0000 +++ vlc-3.0.22/m4/libtool.m4 2025-11-24 23:10:22.000000000 +0000 @@ -1,7 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -32,7 +31,7 @@ # along with this program. If not, see . ]) -# serial 59 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -182,7 +181,6 @@ m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -221,8 +219,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC and -# ICC, which need '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -779,7 +777,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - $SED '$q' "$ltmain" >> "$cfgfile" \ + sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1043,8 +1041,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1068,12 +1066,17 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) - case $MACOSX_DEPLOYMENT_TARGET,$host in - 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - *) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1122,12 +1125,12 @@ output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1241,8 +1244,7 @@ # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[m4_require([_LT_DECL_SED])dnl -AC_MSG_CHECKING([for sysroot]) +[AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1259,7 +1261,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1289,7 +1291,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1306,7 +1308,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1318,7 +1320,7 @@ ;; esac else - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1340,7 +1342,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1348,7 +1350,7 @@ emul="${emul}64" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1356,7 +1358,7 @@ emul="${emul}ltsmip" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1376,14 +1378,14 @@ # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1451,7 +1453,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1490,22 +1492,9 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) - -# Use ARFLAGS variable as AR's operation code to sync the variable naming with -# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have -# higher priority because thats what people were doing historically (setting -# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS -# variable obsoleted/removed. - -test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} -lt_ar_flags=$AR_FLAGS -_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) - -# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override -# by AR_FLAGS because that was never working and AR_FLAGS is about to die. -_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], - [Flags to create an archive]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1724,7 +1713,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1767,7 +1756,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2217,35 +2206,26 @@ striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -z "$STRIP"; then - AC_MSG_RESULT([no]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) else - if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) - else - case $host_os in - darwin*) - # FIXME - insert some real tests, host_os isn't really good enough +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - ;; - freebsd*) - if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) + else AC_MSG_RESULT([no]) - ;; - esac - fi + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2568,7 +2548,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2578,14 +2558,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl* | *,icl*) - # Native MSVC or ICC + *,cl*) + # Native MSVC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2604,7 +2584,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2641,7 +2621,7 @@ ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2674,7 +2654,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3485,7 +3465,7 @@ bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='$FILECMD -L' + lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3519,14 +3499,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3540,7 +3520,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3587,7 +3567,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3714,13 +3694,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3746,7 +3726,7 @@ # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3986,7 +3966,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -4004,20 +3984,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4041,7 +4021,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++ or ICC, + # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4059,9 +4039,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4349,7 +4329,7 @@ ;; esac ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4432,7 +4412,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4774,7 +4754,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4957,7 +4937,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4965,7 +4945,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl* | icl*) + cl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5025,15 +5005,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time + # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5088,7 +5068,7 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5200,7 +5180,6 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5215,7 +5194,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5258,7 +5237,7 @@ _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5270,14 +5249,13 @@ if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -5287,7 +5265,7 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5419,7 +5397,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5602,12 +5580,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl* | icl*) - # Native MSVC or ICC + cl*) + # Native MSVC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5648,7 +5626,7 @@ fi' ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5696,7 +5674,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5837,7 +5815,6 @@ # Fabrice Bellard et al's Tiny C Compiler _LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; esac ;; @@ -5909,7 +5886,6 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6680,8 +6656,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl* | ,icl* | no,icl*) - # Native MSVC or ICC + ,cl* | no,cl*) + # Native MSVC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6779,7 +6755,6 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6810,7 +6785,7 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6947,7 +6922,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7087,13 +7062,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8239,14 +8214,6 @@ AC_SUBST([DLLTOOL]) ]) -# _LT_DECL_FILECMD -# ---------------- -# Check for a file(cmd) program that can be used to detect file type and magic -m4_defun([_LT_DECL_FILECMD], -[AC_CHECK_TOOL([FILECMD], [file], [:]) -_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) -])# _LD_DECL_FILECMD - # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff -Nru vlc-3.0.21/m4/ltoptions.m4 vlc-3.0.22/m4/ltoptions.m4 --- vlc-3.0.21/m4/ltoptions.m4 2022-08-03 11:11:36.000000000 +0000 +++ vlc-3.0.22/m4/ltoptions.m4 2025-11-24 23:10:22.000000000 +0000 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free -# Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff -Nru vlc-3.0.21/m4/ltsugar.m4 vlc-3.0.22/m4/ltsugar.m4 --- vlc-3.0.21/m4/ltsugar.m4 2022-08-03 11:11:36.000000000 +0000 +++ vlc-3.0.22/m4/ltsugar.m4 2025-11-24 23:10:22.000000000 +0000 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff -Nru vlc-3.0.21/m4/ltversion.m4 vlc-3.0.22/m4/ltversion.m4 --- vlc-3.0.21/m4/ltversion.m4 2022-08-03 11:11:36.000000000 +0000 +++ vlc-3.0.22/m4/ltversion.m4 2025-11-24 23:10:22.000000000 +0000 @@ -1,7 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, -# Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -10,15 +9,15 @@ # @configure_input@ -# serial 4245 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.7]) -m4_define([LT_PACKAGE_REVISION], [2.4.7]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.7' -macro_revision='2.4.7' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru vlc-3.0.21/m4/lt~obsolete.m4 vlc-3.0.22/m4/lt~obsolete.m4 --- vlc-3.0.21/m4/lt~obsolete.m4 2022-08-03 11:11:36.000000000 +0000 +++ vlc-3.0.22/m4/lt~obsolete.m4 2025-11-24 23:10:23.000000000 +0000 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free -# Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff -Nru vlc-3.0.21/modules/Makefile.am vlc-3.0.22/modules/Makefile.am --- vlc-3.0.21/modules/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -1,3 +1,4 @@ + noinst_LTLIBRARIES = check_LTLIBRARIES = pkglib_LTLIBRARIES = diff -Nru vlc-3.0.21/modules/Makefile.in vlc-3.0.22/modules/Makefile.in --- vlc-3.0.21/modules/Makefile.in 2024-06-05 16:02:19.000000000 +0000 +++ vlc-3.0.22/modules/Makefile.in 2025-11-24 23:10:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -350,164 +350,165 @@ @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_AMF_ENHANCER_TRUE@am__append_150 = video_filter/amf_vqenhancer.c \ -@HAVE_AMF_ENHANCER_TRUE@ hw/amf/amf_helper.c hw/amf/amf_helper.h - -@HAVE_VDPAU_TRUE@am__append_151 = libvlc_vdpau.la -@HAVE_VDPAU_TRUE@@HAVE_XCB_TRUE@am__append_152 = libvdpau_display_plugin.la -@HAVE_AVCODEC_VDPAU_TRUE@@HAVE_VDPAU_TRUE@am__append_153 = libvdpau_avcodec_plugin.la -@HAVE_ANDROID_TRUE@am__append_154 = keystore/file_crypt_android.c -@HAVE_WIN32_TRUE@am__append_155 = keystore/file_crypt_win32.c -@HAVE_OSX_TRUE@am__append_156 = libkeychain_plugin.la -@HAVE_SYSLOG_TRUE@am__append_157 = libsyslog_plugin.la -@HAVE_SYSTEMD_TRUE@am__append_158 = libsd_journal_plugin.la -@HAVE_ANDROID_TRUE@am__append_159 = libandroid_logger_plugin.la -@HAVE_WIN32_TRUE@am__append_160 = lua/libs/win.c -@HAVE_WIN32_TRUE@am__append_161 = $(SOCKET_LIBS) -@HAVE_DARWIN_TRUE@am__append_162 = -Wl,-framework,Security,-framework,CoreFoundation -@HAVE_DARWIN_TRUE@am__append_163 = libsecuretransport_plugin.la -@HAVE_XCB_TRUE@am__append_164 = libxdg_screensaver_plugin.la -@HAVE_DBUS_TRUE@am__append_165 = libdbus_screensaver_plugin.la -@ENABLE_ADDONMANAGERMODULES_TRUE@am__append_166 = \ +@HAVE_AMF_ENHANCER_TRUE@am__append_150 = video_filter/amf_vqenhancer.c +@HAVE_AMF_FRC_TRUE@am__append_151 = video_filter/amf_frc.c +@HAVE_AMF_ENHANCER_TRUE@am__append_152 = hw/amf/amf_helper.c hw/amf/amf_helper.h +@HAVE_AMF_ENHANCER_FALSE@@HAVE_AMF_FRC_TRUE@am__append_153 = hw/amf/amf_helper.c hw/amf/amf_helper.h +@HAVE_VDPAU_TRUE@am__append_154 = libvlc_vdpau.la +@HAVE_VDPAU_TRUE@@HAVE_XCB_TRUE@am__append_155 = libvdpau_display_plugin.la +@HAVE_AVCODEC_VDPAU_TRUE@@HAVE_VDPAU_TRUE@am__append_156 = libvdpau_avcodec_plugin.la +@HAVE_ANDROID_TRUE@am__append_157 = keystore/file_crypt_android.c +@HAVE_WIN32_TRUE@am__append_158 = keystore/file_crypt_win32.c +@HAVE_OSX_TRUE@am__append_159 = libkeychain_plugin.la +@HAVE_SYSLOG_TRUE@am__append_160 = libsyslog_plugin.la +@HAVE_SYSTEMD_TRUE@am__append_161 = libsd_journal_plugin.la +@HAVE_ANDROID_TRUE@am__append_162 = libandroid_logger_plugin.la +@HAVE_WIN32_TRUE@am__append_163 = lua/libs/win.c +@HAVE_WIN32_TRUE@am__append_164 = $(SOCKET_LIBS) +@HAVE_DARWIN_TRUE@am__append_165 = -Wl,-framework,Security,-framework,CoreFoundation +@HAVE_DARWIN_TRUE@am__append_166 = libsecuretransport_plugin.la +@HAVE_XCB_TRUE@am__append_167 = libxdg_screensaver_plugin.la +@HAVE_DBUS_TRUE@am__append_168 = libdbus_screensaver_plugin.la +@ENABLE_ADDONMANAGERMODULES_TRUE@am__append_169 = \ @ENABLE_ADDONMANAGERMODULES_TRUE@ libaddonsvorepository_plugin.la \ @ENABLE_ADDONMANAGERMODULES_TRUE@ libaddonsfsstorage_plugin.la -@ENABLE_SOUT_TRUE@am__append_167 = libvod_rtsp_plugin.la -@HAVE_AVCODEC_TRUE@@MERGE_FFMPEG_FALSE@am__append_168 = libpacketizer_avparser_plugin.la -@HAVE_OSX_TRUE@am__append_169 = -Wl,-framework,CoreFoundation,-framework,SystemConfiguration -@HAVE_PULSE_TRUE@am__append_170 = libpulselist_plugin.la -@HAVE_ALSA_TRUE@am__append_171 = $(ALSA_CFLAGS) -DHAVE_ALSA -@HAVE_ALSA_TRUE@am__append_172 = $(ALSA_LIBS) -@HAVE_XCB_TRUE@am__append_173 = libxcb_apps_plugin.la -@HAVE_WIN32_DESKTOP_TRUE@am__append_174 = libwindrive_plugin.la -@HAVE_OS2_TRUE@am__append_175 = libos2drive_plugin.la -@HAVE_WIN32_TRUE@am__append_176 = -liphlpapi -@HAVE_DARWIN_TRUE@am__append_177 = libbonjour_plugin.la -@HAVE_WIN32_FALSE@am__append_178 = libdynamicoverlay_plugin.la -@HAVE_GCRYPT_TRUE@am__append_179 = libremoteosd_plugin.la -@HAVE_TVOS_FALSE@@HAVE_WIN32_FALSE@am__append_180 = libdecomp_plugin.la -@HAVE_ZLIB_TRUE@am__append_181 = libinflate_plugin.la -@HAVE_WINSTORE_FALSE@am__append_182 = libprefetch_plugin.la -@HAVE_WIN32_TRUE@am__append_183 = text_renderer/freetype/fonts/dwrite.cpp -@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__append_184 = text_renderer/freetype/fonts/win32.c -@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__append_185 = -liconv -lz -lusp10 -lgdi32 -luuid -@HAVE_WIN32_DESKTOP_FALSE@@HAVE_WIN32_TRUE@am__append_186 = -ldwrite -luuid -@HAVE_FONTCONFIG_TRUE@am__append_187 = text_renderer/freetype/fonts/fontconfig.c -@HAVE_FONTCONFIG_TRUE@am__append_188 = -DHAVE_FONTCONFIG -@HAVE_FONTCONFIG_TRUE@am__append_189 = $(FONTCONFIG_LIBS) -@HAVE_ANDROID_TRUE@am__append_190 = text_renderer/freetype/fonts/android.c -@HAVE_DARWIN_TRUE@am__append_191 = text_renderer/freetype/fonts/darwin.c -@HAVE_DARWIN_TRUE@am__append_192 = -Wl,-framework,CoreFoundation -Wl,-framework,CoreText -@HAVE_FRIBIDI_TRUE@am__append_193 = $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI -@HAVE_FRIBIDI_TRUE@am__append_194 = $(FRIBIDI_LIBS) -@HAVE_HARFBUZZ_TRUE@am__append_195 = $(HARFBUZZ_CFLAGS) -DHAVE_HARFBUZZ -@HAVE_HARFBUZZ_TRUE@am__append_196 = $(HARFBUZZ_LIBS) -@HAVE_FREETYPE_TRUE@am__append_197 = libfreetype_plugin.la -@HAVE_OSX_TRUE@am__append_198 = libnsspeechsynthesizer_plugin.la -@HAVE_SAPI_TRUE@am__append_199 = libsapi_plugin.la -@HAVE_ALTIVEC_TRUE@am__append_200 = \ +@ENABLE_SOUT_TRUE@am__append_170 = libvod_rtsp_plugin.la +@HAVE_AVCODEC_TRUE@@MERGE_FFMPEG_FALSE@am__append_171 = libpacketizer_avparser_plugin.la +@HAVE_OSX_TRUE@am__append_172 = -Wl,-framework,CoreFoundation,-framework,SystemConfiguration +@HAVE_PULSE_TRUE@am__append_173 = libpulselist_plugin.la +@HAVE_ALSA_TRUE@am__append_174 = $(ALSA_CFLAGS) -DHAVE_ALSA +@HAVE_ALSA_TRUE@am__append_175 = $(ALSA_LIBS) +@HAVE_XCB_TRUE@am__append_176 = libxcb_apps_plugin.la +@HAVE_WIN32_DESKTOP_TRUE@am__append_177 = libwindrive_plugin.la +@HAVE_OS2_TRUE@am__append_178 = libos2drive_plugin.la +@HAVE_WIN32_TRUE@am__append_179 = -liphlpapi +@HAVE_DARWIN_TRUE@am__append_180 = libbonjour_plugin.la +@HAVE_WIN32_FALSE@am__append_181 = libdynamicoverlay_plugin.la +@HAVE_GCRYPT_TRUE@am__append_182 = libremoteosd_plugin.la +@HAVE_TVOS_FALSE@@HAVE_WIN32_FALSE@am__append_183 = libdecomp_plugin.la +@HAVE_ZLIB_TRUE@am__append_184 = libinflate_plugin.la +@HAVE_WINSTORE_FALSE@am__append_185 = libprefetch_plugin.la +@HAVE_WIN32_TRUE@am__append_186 = text_renderer/freetype/fonts/dwrite.cpp +@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__append_187 = text_renderer/freetype/fonts/win32.c +@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__append_188 = -liconv -lz -lusp10 -lgdi32 -luuid +@HAVE_WIN32_DESKTOP_FALSE@@HAVE_WIN32_TRUE@am__append_189 = -ldwrite -luuid +@HAVE_FONTCONFIG_TRUE@am__append_190 = text_renderer/freetype/fonts/fontconfig.c +@HAVE_FONTCONFIG_TRUE@am__append_191 = -DHAVE_FONTCONFIG +@HAVE_FONTCONFIG_TRUE@am__append_192 = $(FONTCONFIG_LIBS) +@HAVE_ANDROID_TRUE@am__append_193 = text_renderer/freetype/fonts/android.c +@HAVE_DARWIN_TRUE@am__append_194 = text_renderer/freetype/fonts/darwin.c +@HAVE_DARWIN_TRUE@am__append_195 = -Wl,-framework,CoreFoundation -Wl,-framework,CoreText +@HAVE_FRIBIDI_TRUE@am__append_196 = $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI +@HAVE_FRIBIDI_TRUE@am__append_197 = $(FRIBIDI_LIBS) +@HAVE_HARFBUZZ_TRUE@am__append_198 = $(HARFBUZZ_CFLAGS) -DHAVE_HARFBUZZ +@HAVE_HARFBUZZ_TRUE@am__append_199 = $(HARFBUZZ_LIBS) +@HAVE_FREETYPE_TRUE@am__append_200 = libfreetype_plugin.la +@HAVE_OSX_TRUE@am__append_201 = libnsspeechsynthesizer_plugin.la +@HAVE_SAPI_TRUE@am__append_202 = libsapi_plugin.la +@HAVE_ALTIVEC_TRUE@am__append_203 = \ @HAVE_ALTIVEC_TRUE@ libi420_yuy2_altivec_plugin.la -@HAVE_MMX_TRUE@am__append_201 = \ +@HAVE_MMX_TRUE@am__append_204 = \ @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_202 = \ +@HAVE_SSE2_TRUE@am__append_205 = \ @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_203 = chroma_copy_sse_test -@HAVE_SSE2_TRUE@am__append_204 = chroma_copy_sse_test -@HAVE_DARWIN_TRUE@am__append_205 = -Wl,-framework,IOKit,-framework,CoreFoundation -@HAVE_OSX_TRUE@am__append_206 = libci_filters_plugin.la -@HAVE_IOS_TRUE@am__append_207 = libci_filters_plugin.la -@HAVE_NEON_TRUE@am__append_208 = video_filter/deinterlace/merge_arm.S -@HAVE_NEON_TRUE@am__append_209 = -DCAN_COMPILE_ARM -@HAVE_ARM64_TRUE@am__append_210 = video_filter/deinterlace/merge_arm64.S -@HAVE_ARM64_TRUE@am__append_211 = -DCAN_COMPILE_ARM64 -@HAVE_ALTIVEC_TRUE@am__append_212 = -DCAN_COMPILE_C_ALTIVEC -@HAVE_WIN32_DESKTOP_TRUE@am__append_213 = libpanoramix_plugin.la -@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_214 = $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS) -@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_215 = $(XCB_RANDR_LIBS) $(XCB_LIBS) -@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_216 = libpanoramix_plugin.la -@HAVE_DECKLINK_TRUE@am__append_217 = libdecklinkoutput_plugin.la -@HAVE_OSX_TRUE@am__append_218 = libvout_macosx_plugin.la libcaopengllayer_plugin.la \ +@HAVE_SSE2_TRUE@am__append_206 = chroma_copy_sse_test +@HAVE_SSE2_TRUE@am__append_207 = chroma_copy_sse_test +@HAVE_DARWIN_TRUE@am__append_208 = -Wl,-framework,IOKit,-framework,CoreFoundation +@HAVE_OSX_TRUE@am__append_209 = libci_filters_plugin.la +@HAVE_IOS_TRUE@am__append_210 = libci_filters_plugin.la +@HAVE_NEON_TRUE@am__append_211 = video_filter/deinterlace/merge_arm.S +@HAVE_NEON_TRUE@am__append_212 = -DCAN_COMPILE_ARM +@HAVE_ARM64_TRUE@am__append_213 = video_filter/deinterlace/merge_arm64.S +@HAVE_ARM64_TRUE@am__append_214 = -DCAN_COMPILE_ARM64 +@HAVE_ALTIVEC_TRUE@am__append_215 = -DCAN_COMPILE_C_ALTIVEC +@HAVE_WIN32_DESKTOP_TRUE@am__append_216 = libpanoramix_plugin.la +@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_217 = $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS) +@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_218 = $(XCB_RANDR_LIBS) $(XCB_LIBS) +@HAVE_WIN32_DESKTOP_FALSE@@HAVE_XCB_RANDR_TRUE@am__append_219 = libpanoramix_plugin.la +@HAVE_DECKLINK_TRUE@am__append_220 = libdecklinkoutput_plugin.la +@HAVE_OSX_TRUE@am__append_221 = libvout_macosx_plugin.la libcaopengllayer_plugin.la \ @HAVE_OSX_TRUE@ libglconv_cvpx_plugin.la -@HAVE_OSX_TRUE@am__append_219 = -Wl,-framework,OpenGL -@HAVE_OSX_FALSE@am__append_220 = -Wl,-framework,OpenGLES -@HAVE_IOS_TRUE@am__append_221 = libvout_ios_plugin.la libglconv_cvpx_plugin.la -@HAVE_TVOS_TRUE@am__append_222 = libvout_ios_plugin.la libglconv_cvpx_plugin.la -@HAVE_WIN32_TRUE@am__append_223 = -DHAVE_GL_CORE_SYMBOLS -@HAVE_WIN32_TRUE@am__append_224 = $(GL_LIBS) -@HAVE_GL_TRUE@am__append_225 = libgl_plugin.la -@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_TRUE@@HAVE_VAAPI_WL_TRUE@@HAVE_WAYLAND_EGL_TRUE@am__append_226 = libglconv_vaapi_wl_plugin.la -@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_TRUE@@HAVE_VAAPI_X11_TRUE@@HAVE_XCB_TRUE@am__append_227 = libglconv_vaapi_x11_plugin.la -@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_DRM_TRUE@@HAVE_VAAPI_TRUE@am__append_228 = libglconv_vaapi_drm_plugin.la -@HAVE_GL_TRUE@@HAVE_VDPAU_TRUE@am__append_229 = libglconv_vdpau_plugin.la -@HAVE_XCB_TRUE@am__append_230 = libvlc_xcb_events.la -@HAVE_XCB_TRUE@am__append_231 = libxcb_x11_plugin.la libxcb_window_plugin.la -@HAVE_XCB_KEYSYMS_TRUE@@HAVE_XCB_TRUE@am__append_232 = -DHAVE_XCB_KEYSYMS -@HAVE_XCB_TRUE@@HAVE_XCB_XVIDEO_TRUE@am__append_233 = libxcb_xv_plugin.la -@HAVE_EGL_TRUE@@HAVE_XCB_TRUE@am__append_234 = libegl_x11_plugin.la -@HAVE_GL_TRUE@@HAVE_XCB_TRUE@am__append_235 = libglx_plugin.la -@HAVE_WAYLAND_TRUE@am__append_236 = \ +@HAVE_OSX_TRUE@am__append_222 = -Wl,-framework,OpenGL +@HAVE_OSX_FALSE@am__append_223 = -Wl,-framework,OpenGLES +@HAVE_IOS_TRUE@am__append_224 = libvout_ios_plugin.la libglconv_cvpx_plugin.la +@HAVE_TVOS_TRUE@am__append_225 = libvout_ios_plugin.la libglconv_cvpx_plugin.la +@HAVE_WIN32_TRUE@am__append_226 = -DHAVE_GL_CORE_SYMBOLS +@HAVE_WIN32_TRUE@am__append_227 = $(GL_LIBS) +@HAVE_GL_TRUE@am__append_228 = libgl_plugin.la +@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_TRUE@@HAVE_VAAPI_WL_TRUE@@HAVE_WAYLAND_EGL_TRUE@am__append_229 = libglconv_vaapi_wl_plugin.la +@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_TRUE@@HAVE_VAAPI_X11_TRUE@@HAVE_XCB_TRUE@am__append_230 = libglconv_vaapi_x11_plugin.la +@HAVE_EGL_TRUE@@HAVE_GL_TRUE@@HAVE_VAAPI_DRM_TRUE@@HAVE_VAAPI_TRUE@am__append_231 = libglconv_vaapi_drm_plugin.la +@HAVE_GL_TRUE@@HAVE_VDPAU_TRUE@am__append_232 = libglconv_vdpau_plugin.la +@HAVE_XCB_TRUE@am__append_233 = libvlc_xcb_events.la +@HAVE_XCB_TRUE@am__append_234 = libxcb_x11_plugin.la libxcb_window_plugin.la +@HAVE_XCB_KEYSYMS_TRUE@@HAVE_XCB_TRUE@am__append_235 = -DHAVE_XCB_KEYSYMS +@HAVE_XCB_TRUE@@HAVE_XCB_XVIDEO_TRUE@am__append_236 = libxcb_xv_plugin.la +@HAVE_EGL_TRUE@@HAVE_XCB_TRUE@am__append_237 = libegl_x11_plugin.la +@HAVE_GL_TRUE@@HAVE_XCB_TRUE@am__append_238 = libglx_plugin.la +@HAVE_WAYLAND_TRUE@am__append_239 = \ @HAVE_WAYLAND_TRUE@ $(nodist_libwl_shm_plugin_la_SOURCES) \ @HAVE_WAYLAND_TRUE@ $(nodist_libxdg_shell_plugin_la_SOURCES) -@HAVE_WAYLAND_TRUE@am__append_237 = libwl_shm_plugin.la \ +@HAVE_WAYLAND_TRUE@am__append_240 = 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_238 = libegl_wl_plugin.la -@HAVE_WIN32_DESKTOP_TRUE@am__append_239 = $(LTLIBdirect3d9) -@HAVE_WIN32_DESKTOP_TRUE@am__append_240 = libdirect3d9_plugin.la -@HAVE_GL_TRUE@@HAVE_WIN32_DESKTOP_TRUE@am__append_241 = libglinterop_dxva2_plugin.la -@HAVE_WINSTORE_FALSE@am__append_242 = video_output/win32/events.c \ +@HAVE_EGL_TRUE@@HAVE_WAYLAND_EGL_TRUE@@HAVE_WAYLAND_TRUE@am__append_241 = libegl_wl_plugin.la +@HAVE_WIN32_DESKTOP_TRUE@am__append_242 = $(LTLIBdirect3d9) +@HAVE_WIN32_DESKTOP_TRUE@am__append_243 = libdirect3d9_plugin.la +@HAVE_GL_TRUE@@HAVE_WIN32_DESKTOP_TRUE@am__append_244 = libglinterop_dxva2_plugin.la +@HAVE_WINSTORE_FALSE@am__append_245 = 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_243 = -lgdi32 -@HAVE_WINSTORE_TRUE@am__append_244 = -ld3d11 -ld3dcompiler_47 -@HAVE_AMF_SCALER_TRUE@am__append_245 = hw/amf/amf_helper.c hw/amf/amf_helper.h -@HAVE_WIN32_DESKTOP_TRUE@am__append_246 = $(LTLIBdirectdraw) \ +@HAVE_WINSTORE_FALSE@am__append_246 = -lgdi32 +@HAVE_WINSTORE_TRUE@am__append_247 = -ld3d11 -ld3dcompiler_47 +@HAVE_AMF_SCALER_TRUE@am__append_248 = hw/amf/amf_helper.c hw/amf/amf_helper.h +@HAVE_WIN32_DESKTOP_TRUE@am__append_249 = $(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_247 = libdirectdraw_plugin.la \ +@HAVE_WIN32_DESKTOP_TRUE@am__append_250 = libdirectdraw_plugin.la \ @HAVE_WIN32_DESKTOP_TRUE@ libglwin32_plugin.la libwgl_plugin.la -@HAVE_EGL_TRUE@@HAVE_WIN32_TRUE@am__append_248 = libegl_win32_plugin.la -@HAVE_WIN32_TRUE@am__append_249 = libdrawable_plugin.la +@HAVE_EGL_TRUE@@HAVE_WIN32_TRUE@am__append_251 = libegl_win32_plugin.la +@HAVE_WIN32_TRUE@am__append_252 = libdrawable_plugin.la ### OS/2 ### -@HAVE_OS2_TRUE@am__append_250 = libdrawable_plugin.la -@HAVE_KVA_TRUE@am__append_251 = libkva_plugin.la -@HAVE_ANDROID_TRUE@am__append_252 = libandroid_window_plugin.la libandroid_display_plugin.la -@HAVE_ANDROID_TRUE@@HAVE_EGL_TRUE@am__append_253 = libegl_android_plugin.la libglconv_android_plugin.la -@HAVE_WIN32_FALSE@am__append_254 = $(X_LIBS) $(X_PRE_LIBS) -lX11 -@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_255 = $(X_LIBS) $(X_PRE_LIBS) -lX11 -@HAVE_EVAS_TRUE@am__append_256 = libevas_plugin.la -@HAVE_GL_TRUE@am__append_257 = libglspectrum_plugin.la -@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_258 = libaccess_output_livehttp_plugin.la -@ENABLE_SOUT_TRUE@am__append_259 = libaccess_output_shout_plugin.la \ +@HAVE_OS2_TRUE@am__append_253 = libdrawable_plugin.la +@HAVE_KVA_TRUE@am__append_254 = libkva_plugin.la +@HAVE_ANDROID_TRUE@am__append_255 = libandroid_window_plugin.la libandroid_display_plugin.la +@HAVE_ANDROID_TRUE@@HAVE_EGL_TRUE@am__append_256 = libegl_android_plugin.la libglconv_android_plugin.la +@HAVE_WIN32_FALSE@am__append_257 = $(X_LIBS) $(X_PRE_LIBS) -lX11 +@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_258 = $(X_LIBS) $(X_PRE_LIBS) -lX11 +@HAVE_EVAS_TRUE@am__append_259 = libevas_plugin.la +@HAVE_GL_TRUE@am__append_260 = libglspectrum_plugin.la +@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_261 = libaccess_output_livehttp_plugin.la +@ENABLE_SOUT_TRUE@am__append_262 = 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_260 = libmux_ts_plugin.la -@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_261 = -DHAVE_SRTP $(SRTP_CFLAGS) \ +@ENABLE_SOUT_TRUE@@HAVE_DVBPSI_TRUE@am__append_263 = libmux_ts_plugin.la +@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_264 = -DHAVE_SRTP $(SRTP_CFLAGS) \ @ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@ $(GCRYPT_CFLAGS) -@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_262 = $(SRTP_LIBS) $(GCRYPT_LIBS) +@ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_265 = $(SRTP_LIBS) $(GCRYPT_LIBS) # Chromecast plugin -@ENABLE_SOUT_TRUE@am__append_263 = .proto .pb.cc -@ENABLE_SOUT_TRUE@am__append_264 = $(nodist_libstream_out_chromecast_plugin_la_SOURCES) -@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_265 = stream_out/chromecast/cast_channel.pb.h -@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_266 = libstream_out_chromecast_plugin.la -@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_267 = libdemux_chromecast_plugin.la -@HAVE_WIN32_TRUE@am__append_268 = module.rc.lo -@HAVE_WIN32_TRUE@am__append_269 = module.rc +@ENABLE_SOUT_TRUE@am__append_266 = .proto .pb.cc +@ENABLE_SOUT_TRUE@am__append_267 = $(nodist_libstream_out_chromecast_plugin_la_SOURCES) +@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_268 = stream_out/chromecast/cast_channel.pb.h +@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_269 = libstream_out_chromecast_plugin.la +@BUILD_CHROMECAST_TRUE@@ENABLE_SOUT_TRUE@am__append_270 = libdemux_chromecast_plugin.la +@HAVE_WIN32_TRUE@am__append_271 = module.rc.lo +@HAVE_WIN32_TRUE@am__append_272 = module.rc subdir = modules ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ @@ -1517,14 +1518,17 @@ hw/d3d11/d3d11_filters.h hw/d3d11/d3d11_filters.c \ hw/d3d11/d3d11_deinterlace.c hw/d3d11/d3d11_surface.c \ hw/d3d11/d3d11_instance.c video_filter/amf_vqenhancer.c \ - hw/amf/amf_helper.c hw/amf/amf_helper.h + video_filter/amf_frc.c hw/amf/amf_helper.c hw/amf/amf_helper.h @HAVE_AMF_ENHANCER_TRUE@am__objects_8 = \ -@HAVE_AMF_ENHANCER_TRUE@ video_filter/amf_vqenhancer.lo \ -@HAVE_AMF_ENHANCER_TRUE@ hw/amf/amf_helper.lo +@HAVE_AMF_ENHANCER_TRUE@ video_filter/amf_vqenhancer.lo +@HAVE_AMF_FRC_TRUE@am__objects_9 = video_filter/amf_frc.lo +@HAVE_AMF_ENHANCER_TRUE@am__objects_10 = hw/amf/amf_helper.lo +@HAVE_AMF_ENHANCER_FALSE@@HAVE_AMF_FRC_TRUE@am__objects_11 = hw/amf/amf_helper.lo am_libdirect3d11_filters_plugin_la_OBJECTS = \ hw/d3d11/d3d11_filters.lo hw/d3d11/d3d11_deinterlace.lo \ hw/d3d11/d3d11_surface.lo hw/d3d11/d3d11_instance.lo \ - $(am__objects_8) + $(am__objects_8) $(am__objects_9) $(am__objects_10) \ + $(am__objects_11) libdirect3d11_filters_plugin_la_OBJECTS = \ $(am_libdirect3d11_filters_plugin_la_OBJECTS) libdirect3d11_filters_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1549,10 +1553,10 @@ video_output/win32/win32touch.c \ video_output/win32/win32touch.h hw/amf/amf_helper.c \ hw/amf/amf_helper.h -@HAVE_WINSTORE_FALSE@am__objects_9 = video_output/win32/libdirect3d11_plugin_la-events.lo \ +@HAVE_WINSTORE_FALSE@am__objects_12 = video_output/win32/libdirect3d11_plugin_la-events.lo \ @HAVE_WINSTORE_FALSE@ video_output/win32/libdirect3d11_plugin_la-sensors.lo \ @HAVE_WINSTORE_FALSE@ video_output/win32/libdirect3d11_plugin_la-win32touch.lo -@HAVE_AMF_SCALER_TRUE@am__objects_10 = hw/amf/libdirect3d11_plugin_la-amf_helper.lo +@HAVE_AMF_SCALER_TRUE@am__objects_13 = hw/amf/libdirect3d11_plugin_la-amf_helper.lo am_libdirect3d11_plugin_la_OBJECTS = \ video_output/win32/libdirect3d11_plugin_la-direct3d11.lo \ video_output/win32/libdirect3d11_plugin_la-d3d11_quad.lo \ @@ -1560,7 +1564,7 @@ video_output/win32/libdirect3d11_plugin_la-common.lo \ video_output/win32/libdirect3d11_plugin_la-d3d11_scaler.lo \ video_output/win32/libdirect3d11_plugin_la-d3d11_tonemap.lo \ - $(am__objects_9) $(am__objects_10) + $(am__objects_12) $(am__objects_13) libdirect3d11_plugin_la_OBJECTS = \ $(am_libdirect3d11_plugin_la_OBJECTS) libdirect3d11_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ @@ -1625,6 +1629,9 @@ am_libdmo_plugin_la_OBJECTS = codec/dmo/dmo.lo codec/dmo/buffer.lo libdmo_plugin_la_OBJECTS = $(am_libdmo_plugin_la_OBJECTS) @HAVE_WIN32_TRUE@am_libdmo_plugin_la_rpath = -rpath $(codecdir) +libdmxmus_plugin_la_LIBADD = +am_libdmxmus_plugin_la_OBJECTS = demux/dmxmus.lo +libdmxmus_plugin_la_OBJECTS = $(am_libdmxmus_plugin_la_OBJECTS) libdolby_surround_decoder_plugin_la_LIBADD = am_libdolby_surround_decoder_plugin_la_OBJECTS = \ audio_filter/channel_mixer/dolby.lo @@ -1652,11 +1659,11 @@ am__libdtv_plugin_la_SOURCES_DIST = access/dtv/dtv.h \ access/dtv/access.c access/dtv/linux.c access/dtv/en50221.c \ access/dtv/en50221.h access/dtv/en50221_capmt.h -@HAVE_LINUX_DVB_TRUE@am__objects_11 = \ +@HAVE_LINUX_DVB_TRUE@am__objects_14 = \ @HAVE_LINUX_DVB_TRUE@ access/dtv/libdtv_plugin_la-linux.lo \ @HAVE_LINUX_DVB_TRUE@ access/dtv/libdtv_plugin_la-en50221.lo am_libdtv_plugin_la_OBJECTS = access/dtv/libdtv_plugin_la-access.lo \ - $(am__objects_11) + $(am__objects_14) libdtv_plugin_la_OBJECTS = $(am_libdtv_plugin_la_OBJECTS) libdtv_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -1682,11 +1689,11 @@ access/dvb/linux_dvb.c access/dvb/scan.c access/dvb/scan.h \ access/dvb/scan_list.c access/dvb/scan_list.h access/dvb/dvb.h \ mux/mpeg/dvbpsi_compat.h -am__objects_12 = +am__objects_15 = am_libdvb_plugin_la_OBJECTS = access/dvb/libdvb_plugin_la-access.lo \ access/dvb/libdvb_plugin_la-linux_dvb.lo \ access/dvb/libdvb_plugin_la-scan.lo \ - access/dvb/libdvb_plugin_la-scan_list.lo $(am__objects_12) + access/dvb/libdvb_plugin_la-scan_list.lo $(am__objects_15) libdvb_plugin_la_OBJECTS = $(am_libdvb_plugin_la_OBJECTS) libdvb_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -1842,10 +1849,10 @@ keystore/file_crypt.h keystore/list_util.c \ keystore/list_util.h keystore/file_crypt_android.c \ keystore/file_crypt_win32.c -@HAVE_ANDROID_TRUE@am__objects_13 = keystore/file_crypt_android.lo -@HAVE_WIN32_TRUE@am__objects_14 = keystore/file_crypt_win32.lo +@HAVE_ANDROID_TRUE@am__objects_16 = keystore/file_crypt_android.lo +@HAVE_WIN32_TRUE@am__objects_17 = keystore/file_crypt_win32.lo am_libfile_keystore_plugin_la_OBJECTS = keystore/file.lo \ - keystore/list_util.lo $(am__objects_13) $(am__objects_14) + keystore/list_util.lo $(am__objects_16) $(am__objects_17) libfile_keystore_plugin_la_OBJECTS = \ $(am_libfile_keystore_plugin_la_OBJECTS) libfile_logger_plugin_la_LIBADD = @@ -1919,16 +1926,16 @@ text_renderer/freetype/fonts/fontconfig.c \ text_renderer/freetype/fonts/android.c \ text_renderer/freetype/fonts/darwin.c -@HAVE_WIN32_TRUE@am__objects_15 = text_renderer/freetype/fonts/libfreetype_plugin_la-dwrite.lo -@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__objects_16 = text_renderer/freetype/fonts/libfreetype_plugin_la-win32.lo -@HAVE_FONTCONFIG_TRUE@am__objects_17 = text_renderer/freetype/fonts/libfreetype_plugin_la-fontconfig.lo -@HAVE_ANDROID_TRUE@am__objects_18 = text_renderer/freetype/fonts/libfreetype_plugin_la-android.lo -@HAVE_DARWIN_TRUE@am__objects_19 = text_renderer/freetype/fonts/libfreetype_plugin_la-darwin.lo +@HAVE_WIN32_TRUE@am__objects_18 = text_renderer/freetype/fonts/libfreetype_plugin_la-dwrite.lo +@HAVE_WIN32_DESKTOP_TRUE@@HAVE_WIN32_TRUE@am__objects_19 = text_renderer/freetype/fonts/libfreetype_plugin_la-win32.lo +@HAVE_FONTCONFIG_TRUE@am__objects_20 = text_renderer/freetype/fonts/libfreetype_plugin_la-fontconfig.lo +@HAVE_ANDROID_TRUE@am__objects_21 = text_renderer/freetype/fonts/libfreetype_plugin_la-android.lo +@HAVE_DARWIN_TRUE@am__objects_22 = text_renderer/freetype/fonts/libfreetype_plugin_la-darwin.lo am_libfreetype_plugin_la_OBJECTS = text_renderer/freetype/libfreetype_plugin_la-platform_fonts.lo \ text_renderer/freetype/libfreetype_plugin_la-freetype.lo \ text_renderer/freetype/libfreetype_plugin_la-text_layout.lo \ - $(am__objects_15) $(am__objects_16) $(am__objects_17) \ - $(am__objects_18) $(am__objects_19) + $(am__objects_18) $(am__objects_19) $(am__objects_20) \ + $(am__objects_21) $(am__objects_22) libfreetype_plugin_la_OBJECTS = $(am_libfreetype_plugin_la_OBJECTS) @HAVE_FREETYPE_TRUE@am_libfreetype_plugin_la_rpath = -rpath $(textdir) libfreeze_plugin_la_LIBADD = @@ -1952,10 +1959,10 @@ libgestures_plugin_la_OBJECTS = $(am_libgestures_plugin_la_OBJECTS) libgl_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_8) -am__objects_20 = video_output/opengl/libgl_plugin_la-vout_helper.lo \ +am__objects_23 = video_output/opengl/libgl_plugin_la-vout_helper.lo \ video_output/opengl/libgl_plugin_la-fragment_shaders.lo \ video_output/opengl/libgl_plugin_la-converter_sw.lo -am_libgl_plugin_la_OBJECTS = $(am__objects_20) \ +am_libgl_plugin_la_OBJECTS = $(am__objects_23) \ video_output/opengl/libgl_plugin_la-display.lo libgl_plugin_la_OBJECTS = $(am_libgl_plugin_la_OBJECTS) libgl_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1987,9 +1994,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_21 = video_output/opengl/libglconv_vaapi_drm_plugin_la-converter_vaapi.lo \ +am__objects_24 = 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_21) +am_libglconv_vaapi_drm_plugin_la_OBJECTS = $(am__objects_24) 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 \ @@ -2013,9 +2020,9 @@ libglconv_vaapi_x11_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__objects_22 = video_output/opengl/libglconv_vaapi_x11_plugin_la-converter_vaapi.lo \ +am__objects_25 = 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_22) +am_libglconv_vaapi_x11_plugin_la_OBJECTS = $(am__objects_25) 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 \ @@ -2037,11 +2044,11 @@ @HAVE_GL_TRUE@@HAVE_VDPAU_TRUE@ -rpath $(voutdir) libgles2_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_5) -am__objects_23 = \ +am__objects_26 = \ 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_23) \ +am_libgles2_plugin_la_OBJECTS = $(am__objects_26) \ 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 \ @@ -2068,11 +2075,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_24 = \ +am__objects_27 = \ 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_24) \ +am_libglwin32_plugin_la_OBJECTS = $(am__objects_27) \ video_output/win32/libglwin32_plugin_la-glwin32.lo \ video_output/win32/libglwin32_plugin_la-common.lo \ video_output/win32/libglwin32_plugin_la-events.lo \ @@ -2282,14 +2289,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_25 = video_output/android/libiomx_plugin_la-utils.lo -am__objects_26 = codec/omxil/libiomx_plugin_la-utils.lo \ +@HAVE_ANDROID_TRUE@am__objects_28 = video_output/android/libiomx_plugin_la-utils.lo +am__objects_29 = 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_25) -am_libiomx_plugin_la_OBJECTS = $(am__objects_26) + codec/omxil/libiomx_plugin_la-omxil_core.lo $(am__objects_28) +am_libiomx_plugin_la_OBJECTS = $(am__objects_29) 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) \ @@ -2427,7 +2434,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_27 = lua/libs/liblua_plugin_la-win.lo +@HAVE_WIN32_TRUE@am__objects_30 = 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 \ @@ -2455,7 +2462,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_27) + lua/libs/liblua_plugin_la-errno.lo $(am__objects_30) 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) \ @@ -2889,14 +2896,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_28 = video_output/android/libomxil_plugin_la-utils.lo +@HAVE_ANDROID_TRUE@am__objects_31 = 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_28) + codec/omxil/libomxil_plugin_la-omxil_core.lo $(am__objects_31) 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) \ @@ -3279,7 +3286,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_29 = gui/qt/libqt_plugin_la-main_interface_win32.lo +@HAVE_WIN32_TRUE@am__objects_32 = 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 \ @@ -3353,9 +3360,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_29) -@HAVE_WIN32_TRUE@am__objects_30 = gui/qt/libqt_plugin_la-main_interface_win32.moc.lo -@ENABLE_VLM_TRUE@am__objects_31 = \ + gui/qt/styles/libqt_plugin_la-seekstyle.lo $(am__objects_32) +@HAVE_WIN32_TRUE@am__objects_33 = gui/qt/libqt_plugin_la-main_interface_win32.moc.lo +@ENABLE_VLM_TRUE@am__objects_34 = \ @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 \ @@ -3426,8 +3433,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_30) gui/qt/libqt_plugin_la-resources.lo \ - $(am__objects_31) + $(am__objects_33) gui/qt/libqt_plugin_la-resources.lo \ + $(am__objects_34) libqt_plugin_la_OBJECTS = $(am_libqt_plugin_la_OBJECTS) \ $(nodist_libqt_plugin_la_OBJECTS) libqt_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ @@ -3543,9 +3550,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_32 = \ +am__objects_35 = \ audio_filter/libscaletempo_pitch_plugin_la-scaletempo.lo -am_libscaletempo_pitch_plugin_la_OBJECTS = $(am__objects_32) +am_libscaletempo_pitch_plugin_la_OBJECTS = $(am__objects_35) libscaletempo_pitch_plugin_la_OBJECTS = \ $(am_libscaletempo_pitch_plugin_la_OBJECTS) libscaletempo_pitch_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -3572,10 +3579,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_33 = access/screen/win32.lo -@HAVE_MAC_SCREEN_TRUE@am__objects_34 = access/screen/mac.lo +@HAVE_WIN32_DESKTOP_TRUE@am__objects_36 = access/screen/win32.lo +@HAVE_MAC_SCREEN_TRUE@am__objects_37 = access/screen/mac.lo am_libscreen_plugin_la_OBJECTS = access/screen/screen.lo \ - $(am__objects_33) $(am__objects_34) + $(am__objects_36) $(am__objects_37) 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) \ @@ -3664,7 +3671,7 @@ audio_filter/channel_mixer/simple.c \ audio_filter/channel_mixer/simple_neon.h am_libsimple_channel_mixer_plugin_la_OBJECTS = audio_filter/channel_mixer/libsimple_channel_mixer_plugin_la-simple.lo \ - $(am__objects_12) + $(am__objects_15) libsimple_channel_mixer_plugin_la_OBJECTS = \ $(am_libsimple_channel_mixer_plugin_la_OBJECTS) libsimple_channel_mixer_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) \ @@ -3862,7 +3869,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_35 = gui/skins2/win32/libskins2_plugin_la-win32_dragdrop.lo \ +@HAVE_WIN32_TRUE@am__objects_38 = 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 \ @@ -3870,8 +3877,8 @@ @HAVE_WIN32_TRUE@ gui/skins2/win32/libskins2_plugin_la-win32_timer.lo \ @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_12) -@HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@am__objects_36 = gui/skins2/os2/libskins2_plugin_la-os2_dragdrop.lo \ +@HAVE_WIN32_TRUE@ $(am__objects_15) +@HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@am__objects_39 = 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 \ @@ -3879,8 +3886,8 @@ @HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ gui/skins2/os2/libskins2_plugin_la-os2_timer.lo \ @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_12) -@HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@am__objects_37 = gui/skins2/x11/libskins2_plugin_la-x11_display.lo \ +@HAVE_OS2_TRUE@@HAVE_WIN32_FALSE@ $(am__objects_15) +@HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@am__objects_40 = 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 \ @@ -3889,7 +3896,7 @@ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/libskins2_plugin_la-x11_timer.lo \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/libskins2_plugin_la-x11_window.lo \ @HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ gui/skins2/x11/libskins2_plugin_la-x11_tooltip.lo \ -@HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ $(am__objects_12) +@HAVE_OS2_FALSE@@HAVE_WIN32_FALSE@ $(am__objects_15) am_libskins2_plugin_la_OBJECTS = \ gui/skins2/commands/libskins2_plugin_la-async_queue.lo \ gui/skins2/commands/libskins2_plugin_la-cmd_add_item.lo \ @@ -3973,7 +3980,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_35) $(am__objects_36) $(am__objects_37) + $(am__objects_38) $(am__objects_39) $(am__objects_40) 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) \ @@ -4331,8 +4338,7 @@ @ENABLE_SOUT_TRUE@am_libt140_plugin_la_rpath = -rpath $(codecdir) libtaglib_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libtaglib_plugin_la_OBJECTS = \ - meta_engine/libtaglib_plugin_la-taglib.lo \ - demux/xiph_metadata.lo + meta_engine/libtaglib_plugin_la-taglib.lo libtaglib_plugin_la_OBJECTS = $(am_libtaglib_plugin_la_OBJECTS) libtaglib_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ @@ -4414,6 +4420,7 @@ demux/mpeg/libts_plugin_la-ts_sl.lo \ demux/mpeg/libts_plugin_la-ts_metadata.lo \ demux/mpeg/libts_plugin_la-ts_hotfixes.lo \ + demux/mpeg/libts_plugin_la-ts_pes.lo \ mux/mpeg/libts_plugin_la-csa.lo \ mux/mpeg/libts_plugin_la-tables.lo \ mux/mpeg/libts_plugin_la-tsutil.lo \ @@ -4518,7 +4525,8 @@ $(LDFLAGS) -o $@ @HAVE_VAAPI_TRUE@am_libvaapi_filters_plugin_la_rpath = -rpath \ @HAVE_VAAPI_TRUE@ $(vaapidir) -libvaapi_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libvaapi_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libvaapi_plugin_la_OBJECTS = \ codec/avcodec/libvaapi_plugin_la-vaapi.lo \ hw/vaapi/libvaapi_plugin_la-vlc_vaapi.lo @@ -4757,10 +4765,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_38 = \ +@HAVE_DARWIN_TRUE@am__objects_41 = \ @HAVE_DARWIN_TRUE@ control/libvlc_motion_la-unimotion.lo am_libvlc_motion_la_OBJECTS = control/libvlc_motion_la-motionlib.lo \ - $(am__objects_38) + $(am__objects_41) 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) \ @@ -4843,12 +4851,12 @@ $(libvorbis_plugin_la_CFLAGS) $(CFLAGS) \ $(libvorbis_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libvout_ios_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_5) -am__objects_39 = \ +am__objects_42 = \ 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_39) + $(am__objects_42) 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) \ @@ -4863,12 +4871,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_40 = \ +am__objects_43 = \ 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_40) +@HAVE_OSX_TRUE@ video_output/macosx.lo $(am__objects_43) libvout_macosx_plugin_la_OBJECTS = \ $(am_libvout_macosx_plugin_la_OBJECTS) libvout_macosx_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) \ @@ -4917,25 +4925,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_41 = codec/webvtt/libwebvtt_plugin_la-CSSGrammar.lo \ +@ENABLE_CSS_TRUE@am__objects_44 = 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_41) + demux/libwebvtt_plugin_la-webvtt.lo $(am__objects_44) 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_42 = video_output/opengl/libwgl_plugin_la-vout_helper.lo \ +am__objects_45 = 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_42) + video_output/win32/libwgl_plugin_la-wgl.lo $(am__objects_45) 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) \ @@ -5201,16 +5209,16 @@ demux/adaptive/test/test.$(OBJEXT) adaptive_test_OBJECTS = $(am_adaptive_test_OBJECTS) adaptive_test_DEPENDENCIES = libvlc_adaptive.la -am__objects_43 = video_chroma/chroma_copy_sse_test-copy.$(OBJEXT) -am_chroma_copy_sse_test_OBJECTS = $(am__objects_43) +am__objects_46 = video_chroma/chroma_copy_sse_test-copy.$(OBJEXT) +am_chroma_copy_sse_test_OBJECTS = $(am__objects_46) 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_44 = video_chroma/chroma_copy_test-copy.$(OBJEXT) -am_chroma_copy_test_OBJECTS = $(am__objects_44) +am__objects_47 = video_chroma/chroma_copy_test-copy.$(OBJEXT) +am_chroma_copy_test_OBJECTS = $(am__objects_47) 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 \ @@ -5240,8 +5248,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_45 = access/http/hpackenc_test-hpack.$(OBJEXT) -am_hpackenc_test_OBJECTS = $(am__objects_45) \ +am__objects_48 = access/http/hpackenc_test-hpack.$(OBJEXT) +am_hpackenc_test_OBJECTS = $(am__objects_48) \ access/http/hpackenc_test-hpackenc.$(OBJEXT) hpackenc_test_OBJECTS = $(am_hpackenc_test_OBJECTS) hpackenc_test_LDADD = $(LDADD) @@ -5609,8 +5617,8 @@ control/globalhotkeys/$(DEPDIR)/win32.Plo \ demux/$(DEPDIR)/aiff.Plo demux/$(DEPDIR)/au.Plo \ demux/$(DEPDIR)/caf.Plo demux/$(DEPDIR)/demuxdump.Plo \ - demux/$(DEPDIR)/directory.Plo demux/$(DEPDIR)/gme.Plo \ - demux/$(DEPDIR)/image.Plo \ + demux/$(DEPDIR)/directory.Plo demux/$(DEPDIR)/dmxmus.Plo \ + demux/$(DEPDIR)/gme.Plo demux/$(DEPDIR)/image.Plo \ demux/$(DEPDIR)/libdemux_cdg_plugin_la-cdg.Plo \ demux/$(DEPDIR)/libdemux_stl_plugin_la-stl.Plo \ demux/$(DEPDIR)/libdiracsys_plugin_la-dirac.Plo \ @@ -5751,6 +5759,7 @@ demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_decoders.Plo \ demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_hotfixes.Plo \ demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_metadata.Plo \ + demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pes.Plo \ demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pid.Plo \ demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_psi.Plo \ demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_psip.Plo \ @@ -6387,6 +6396,7 @@ video_filter/$(DEPDIR)/adjust.Plo \ video_filter/$(DEPDIR)/adjust_sat_hue.Plo \ video_filter/$(DEPDIR)/alphamask.Plo \ + video_filter/$(DEPDIR)/amf_frc.Plo \ video_filter/$(DEPDIR)/amf_vqenhancer.Plo \ video_filter/$(DEPDIR)/anaglyph.Plo \ video_filter/$(DEPDIR)/antiflicker.Plo \ @@ -6729,7 +6739,7 @@ $(libdirectdraw_plugin_la_SOURCES) \ $(libdirectory_demux_plugin_la_SOURCES) \ $(libdirectsound_plugin_la_SOURCES) \ - $(libdmo_plugin_la_SOURCES) \ + $(libdmo_plugin_la_SOURCES) $(libdmxmus_plugin_la_SOURCES) \ $(libdolby_surround_decoder_plugin_la_SOURCES) \ $(libdrawable_plugin_la_SOURCES) $(libdshow_plugin_la_SOURCES) \ $(libdsm_plugin_la_SOURCES) $(libdtv_plugin_la_SOURCES) \ @@ -7128,7 +7138,7 @@ $(libdirectdraw_plugin_la_SOURCES) \ $(libdirectory_demux_plugin_la_SOURCES) \ $(libdirectsound_plugin_la_SOURCES) \ - $(libdmo_plugin_la_SOURCES) \ + $(libdmo_plugin_la_SOURCES) $(libdmxmus_plugin_la_SOURCES) \ $(libdolby_surround_decoder_plugin_la_SOURCES) \ $(libdrawable_plugin_la_SOURCES) $(libdshow_plugin_la_SOURCES) \ $(libdsm_plugin_la_SOURCES) \ @@ -7999,6 +8009,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -8154,7 +8166,6 @@ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` -AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) TEST_SUITE_LOG = test-suite.log TEST_EXTENSIONS = @EXEEXT@ .test @@ -8426,8 +8437,6 @@ CPPFLAGS_vpx = @CPPFLAGS_vpx@ CPPFLAGS_x265 = @CPPFLAGS_x265@ CPPFLAGS_xml = @CPPFLAGS_xml@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -8471,14 +8480,12 @@ EGL_CFLAGS = @EGL_CFLAGS@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ -ETAGS = @ETAGS@ EVAS_CFLAGS = @EVAS_CFLAGS@ EVAS_LIBS = @EVAS_LIBS@ EXEEXT = @EXEEXT@ FDKAAC_CFLAGS = @FDKAAC_CFLAGS@ FDKAAC_LIBS = @FDKAAC_LIBS@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@ FLAC_CFLAGS = @FLAC_CFLAGS@ @@ -8551,6 +8558,7 @@ LIBCDDB_LIBS = @LIBCDDB_LIBS@ LIBCOM = @LIBCOM@ LIBDL = @LIBDL@ +LIBEXECINFO = @LIBEXECINFO@ LIBEXT = @LIBEXT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -8841,6 +8849,7 @@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DIR = @PACKAGE_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -8952,9 +8961,11 @@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ WAYLAND_PROTOCOLS = @WAYLAND_PROTOCOLS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ +WIN32_PATH_CMD = @WIN32_PATH_CMD@ WINDOWS_ARCH = @WINDOWS_ARCH@ WINDRES = @WINDRES@ WINE_SDK_PATH = @WINE_SDK_PATH@ +WIXPATH = @WIXPATH@ X262_CFLAGS = @X262_CFLAGS@ X262_LIBS = @X262_LIBS@ X26410b_CFLAGS = @X26410b_CFLAGS@ @@ -9062,8 +9073,8 @@ libvlc_adaptive.la libchroma_copy.la libdeinterlace_common.la \ libevent_thread.la check_LTLIBRARIES = libaccesstweaks_plugin.la -pkglib_LTLIBRARIES = $(am__append_58) $(am__append_151) \ - $(am__append_230) +pkglib_LTLIBRARIES = $(am__append_58) $(am__append_154) \ + $(am__append_233) ### OpenMAX ### noinst_HEADERS = codec/omxil/OMX_Broadcom.h \ @@ -9214,18 +9225,18 @@ libchroma_omx_plugin.la libcvpx_plugin.la \ libopencv_wrapper_plugin.la libpostproc_plugin.la \ libopencv_example_plugin.la libgles2_plugin.la \ - $(am__append_240) libdirect3d11_plugin.la $(am__append_247) \ + $(am__append_243) libdirect3d11_plugin.la $(am__append_250) \ libfb_plugin.la libaa_plugin.la libcaca_plugin.la \ libgoom_plugin.la libprojectm_plugin.la libvsxu_plugin.la \ - $(am__append_259) + $(am__append_262) AUTOMAKE_OPTIONS = subdir-objects NULL = pluginsdir = $(vlclibdir)/plugins BUILT_SOURCES = $(am__append_78) $(am__append_127) $(am__append_143) \ - $(am__append_236) $(am__append_265) dummy.cpp \ - $(am__append_268) + $(am__append_239) $(am__append_268) dummy.cpp \ + $(am__append_271) CLEANFILES = $(BUILT_SOURCES) $(nodist_libwl_shm_plugin_la_SOURCES) \ - $(am__append_264) $(am__append_269) + $(am__append_267) $(am__append_272) LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la # Module name from object or executable file name. @@ -9240,7 +9251,7 @@ AM_YFLAGS = -d # Wayland -SUFFIXES = .l .y .xib .ui .h .hpp .moc.cpp $(am__append_263) \ +SUFFIXES = .l .y .xib .ui .h .hpp .moc.cpp $(am__append_266) \ -client-protocol.h -protocol.c .xml accessdir = $(pluginsdir)/access @@ -9397,7 +9408,7 @@ libdvdread_plugin_la_LIBADD = $(DVDREAD_LIBS) libdvdread_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' \ $(am__append_30) -liblibbluray_plugin_la_SOURCES = access/bluray.c +liblibbluray_plugin_la_SOURCES = access/bluray.c demux/mpeg/timestamps.h liblibbluray_plugin_la_CFLAGS = $(AM_CFLAGS) $(BLURAY_CFLAGS) liblibbluray_plugin_la_LIBADD = $(BLURAY_LIBS) liblibbluray_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' @@ -9732,6 +9743,9 @@ $(am__append_64) $(am__append_65) $(am__append_66) \ $(am__append_67) $(am__append_68) $(am__append_69) \ $(am__append_70) $(LTLIBtizen_audio) +# Install the pkglib/pkglibexec first before relinking the modules. +# This ensures libtool re-linking is not racy. +installaoutLTLIBRARIES = install-aoutLTLIBRARIES libopensles_android_plugin_la_SOURCES = audio_output/opensles_android.c libopensles_android_plugin_la_LIBADD = $(LIBDL) $(LIBM) libandroid_audiotrack_plugin_la_SOURCES = audio_output/audiotrack.c \ @@ -10043,7 +10057,7 @@ libvaapi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS) -libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) +libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(AVCODEC_LIBS) libd3d9_common_la_SOURCES = video_chroma/d3d9_fmt.c video_chroma/d3d9_fmt.h \ video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h @@ -10226,15 +10240,17 @@ libsubtitle_plugin.la libty_plugin.la libvobsub_plugin.la \ libvoc_plugin.la libxa_plugin.la libnuv_plugin.la \ libnsc_plugin.la $(LTLIBmpc) libtta_plugin.la libvc1_plugin.la \ - 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_113) \ + libdemux_cdg_plugin.la libsmf_plugin.la libdmxmus_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_113) \ libdirectory_demux_plugin.la libes_plugin.la libh26x_plugin.la \ $(LTLIBmkv) libmp4_plugin.la libmpgv_plugin.la \ libplaylist_plugin.la $(am__append_119) libadaptive_plugin.la \ - libnoseek_plugin.la $(am__append_267) -libxiph_metadata_la_SOURCES = demux/xiph_metadata.h demux/xiph_metadata.c + libnoseek_plugin.la $(am__append_270) +libxiph_metadata_la_SOURCES = demux/xiph_metadata.h demux/xiph_metadata.c \ + meta_engine/ID3Pictures.h + libxiph_metadata_la_LDFLAGS = -static libflacsys_plugin_la_SOURCES = demux/flac.c packetizer/flac.h libflacsys_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) @@ -10280,6 +10296,7 @@ libdemux_cdg_plugin_la_SOURCES = demux/cdg.c libdemux_cdg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libsmf_plugin_la_SOURCES = demux/smf.c +libdmxmus_plugin_la_SOURCES = demux/dmxmus.c libgme_plugin_la_SOURCES = demux/gme.c libgme_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)' libgme_plugin_la_LIBADD = $(LIBS_gme) @@ -10386,6 +10403,7 @@ demux/mpeg/ts_metadata.c demux/mpeg/ts_metadata.h \ demux/mpeg/ts_hotfixes.c demux/mpeg/ts_hotfixes.h \ demux/mpeg/ts_strings.h demux/mpeg/ts_streams_private.h \ + demux/mpeg/ts_pes.c demux/mpeg/ts_pes.h \ demux/mpeg/pes.h \ demux/mpeg/timestamps.h \ demux/dvb-text.h \ @@ -10500,6 +10518,7 @@ demux/adaptive/StreamFormat.cpp \ demux/adaptive/StreamFormat.hpp demux/adaptive/Streams.cpp \ demux/adaptive/Streams.hpp demux/adaptive/Time.hpp \ + demux/adaptive/tools/Compatibility.hpp \ demux/adaptive/tools/Conversions.hpp \ demux/adaptive/tools/Conversions.cpp \ demux/adaptive/tools/Debug.hpp \ @@ -11340,7 +11359,8 @@ gui/macosx/Resources/vlc.scriptTerminology @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 \ +libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DQT_USE_QSTRINGBUILDER \ + -DQT_NO_CAST_FROM_BYTEARRAY -I$(srcdir)/gui/qt \ -I$(builddir)/gui/qt $(am__append_132) $(am__append_136) libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt) \ $(am__append_129) $(am__append_131) $(am__append_133) @@ -11858,7 +11878,8 @@ libdirect3d11_filters_plugin_la_SOURCES = hw/d3d11/d3d11_filters.h \ hw/d3d11/d3d11_filters.c hw/d3d11/d3d11_deinterlace.c \ hw/d3d11/d3d11_surface.c hw/d3d11/d3d11_instance.c \ - $(am__append_150) + $(am__append_150) $(am__append_151) $(am__append_152) \ + $(am__append_153) 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_149) @@ -11873,6 +11894,9 @@ libvaapi_filters_plugin_la_LIBADD = libchroma_copy.la $(AM_LIBADD) $(LIBVA_LIBS) @HAVE_VAAPI_TRUE@vaapi_LTLIBRARIES = libvaapi_filters_plugin.la vdpaudir = $(pluginsdir)/vdpau +# Install the pkglib/pkglibexec first before relinking the modules. +# This ensures libtool re-linking is not racy. +installvpdauLTLIBRARIES = install-vdpauLTLIBRARIES libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h hw/vdpau/instance.c libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS) libvlc_vdpau_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) -lX11 \ @@ -11911,18 +11935,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_152) \ -@HAVE_VDPAU_TRUE@ $(am__append_153) +@HAVE_VDPAU_TRUE@ libvdpau_chroma_plugin.la $(am__append_155) \ +@HAVE_VDPAU_TRUE@ $(am__append_156) 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_156) $(LTLIBsecret) \ + libfile_keystore_plugin.la $(am__append_159) $(LTLIBsecret) \ $(LTLIBkwallet) libfile_keystore_plugin_la_SOURCES = keystore/file.c \ keystore/file_crypt.h keystore/list_util.c \ - keystore/list_util.h $(am__append_154) $(am__append_155) + keystore/list_util.h $(am__append_157) $(am__append_158) @HAVE_WIN32_TRUE@libfile_keystore_plugin_la_LIBADD = -lcrypt32 libsecret_plugin_la_SOURCES = keystore/secret.c libsecret_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SECRET_CFLAGS) @@ -11939,8 +11963,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_157) $(am__append_158) \ - $(am__append_159) + libfile_logger_plugin.la $(am__append_160) $(am__append_161) \ + $(am__append_162) libsyslog_plugin_la_SOURCES = logger/syslog.c libsd_journal_plugin_la_SOURCES = logger/journal.c libsd_journal_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SYSTEMD_CFLAGS) @@ -11961,7 +11985,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_160) + $(am__append_163) 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 @@ -11969,7 +11993,7 @@ libfolder_plugin_la_SOURCES = meta_engine/folder.c meta_LTLIBRARIES = libfolder_plugin.la $(LTLIBtaglib) libtaglib_plugin_la_SOURCES = meta_engine/taglib.cpp \ - demux/xiph_metadata.h demux/xiph_metadata.c + meta_engine/ID3Pictures.h libtaglib_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(TAGLIB_CFLAGS) libtaglib_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(metadir)' @@ -11979,9 +12003,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_163) \ - $(am__append_164) $(am__append_165) $(am__append_166) \ - $(am__append_167) $(LTLIBxml) + libfingerprinter_plugin.la $(LTLIBgnutls) $(am__append_166) \ + $(am__append_167) $(am__append_168) $(am__append_169) \ + $(am__append_170) $(LTLIBxml) libaudioscrobbler_plugin_la_SOURCES = misc/audioscrobbler.c libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD) libexport_plugin_la_SOURCES = \ @@ -12000,9 +12024,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_161) +libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS) $(am__append_164) libgnutls_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(miscdir)' \ - $(am__append_162) + $(am__append_165) @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) @@ -12084,13 +12108,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_168) + $(NULL) $(am__append_171) sddir = $(pluginsdir)/services_discovery sd_LTLIBRARIES = libmediadirs_plugin.la libpodcast_plugin.la \ libsap_plugin.la $(LTLIBavahi) $(LTLIBmtp) $(LTLIBupnp) \ - $(am__append_170) $(LTLIBudev) $(am__append_173) \ - $(am__append_174) $(am__append_175) $(LTLIBmicrodns) \ - $(am__append_177) + $(am__append_173) $(LTLIBudev) $(am__append_176) \ + $(am__append_177) $(am__append_178) $(LTLIBmicrodns) \ + $(am__append_180) libmediadirs_plugin_la_SOURCES = services_discovery/mediadirs.c libpodcast_plugin_la_SOURCES = services_discovery/podcast.c libpodcast_plugin_la_LIBADD = $(LIBPTHREAD) @@ -12108,15 +12132,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_169) + $(am__append_172) 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_171) -libudev_plugin_la_LIBADD = $(UDEV_LIBS) $(am__append_172) + $(am__append_174) +libudev_plugin_la_LIBADD = $(UDEV_LIBS) $(am__append_175) 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) @@ -12126,7 +12150,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_176) + $(am__append_179) libmicrodns_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)' libbonjour_plugin_la_SOURCES = services_discovery/bonjour.m libbonjour_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc @@ -12137,7 +12161,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_178) $(am__append_179) + librss_plugin.la $(am__append_181) $(am__append_182) # sub sources libaudiobargraph_v_plugin_la_SOURCES = spu/audiobargraph_v.c @@ -12159,8 +12183,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_180) $(am__append_181) \ - $(am__append_182) libhds_plugin.la librecord_plugin.la \ + libcache_block_plugin.la $(am__append_183) $(am__append_184) \ + $(am__append_185) 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 @@ -12191,24 +12215,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_197) $(LTLIBsvg) \ - $(am__append_198) $(am__append_199) +text_LTLIBRARIES = libtdummy_plugin.la $(am__append_200) $(LTLIBsvg) \ + $(am__append_201) $(am__append_202) 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_183) \ - $(am__append_184) $(am__append_187) $(am__append_190) \ - $(am__append_191) + text_renderer/freetype/text_layout.h $(am__append_186) \ + $(am__append_187) $(am__append_190) $(am__append_193) \ + $(am__append_194) libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS) \ - $(am__append_188) $(am__append_193) $(am__append_195) -libfreetype_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM) $(am__append_185) \ - $(am__append_186) $(am__append_189) $(am__append_194) \ - $(am__append_196) $(FREETYPE_LIBS) + $(am__append_191) $(am__append_196) $(am__append_198) +libfreetype_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM) $(am__append_188) \ + $(am__append_189) $(am__append_192) $(am__append_197) \ + $(am__append_199) $(FREETYPE_LIBS) libfreetype_plugin_la_LDFLAGS = $(FREETYPE_LDFLAGS) -rpath \ - '$(textdir)' $(am__append_192) + '$(textdir)' $(am__append_195) @HAVE_WIN32_FALSE@libfreetype_plugin_la_LINK = $(LINK) \ @HAVE_WIN32_FALSE@ $(libfreetype_plugin_la_LDFLAGS) @HAVE_WIN32_TRUE@libfreetype_plugin_la_LINK = $(CXXLINK) \ @@ -12271,8 +12295,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_200) \ - $(am__append_201) $(am__append_202) $(LTLIBcvpx) + libyuvp_plugin.la $(LTLIBswscale) $(am__append_203) \ + $(am__append_204) $(am__append_205) $(LTLIBcvpx) # AltiVec libi420_yuy2_altivec_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h @@ -12376,7 +12400,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_205) + '$(video_filterdir)' $(am__append_208) libscale_plugin_la_SOURCES = video_filter/scale.c libscene_plugin_la_SOURCES = video_filter/scene.c libscene_plugin_la_LIBADD = $(LIBM) @@ -12402,7 +12426,7 @@ 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_206) $(am__append_207) \ + librotate_plugin.la $(am__append_209) $(am__append_210) \ libdeinterlace_plugin.la $(LTLIBopencv_wrapper) \ $(LTLIBpostproc) libblend_plugin.la $(LTLIBopencv_example) @@ -12433,11 +12457,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_208) \ - $(am__append_210) + video_filter/deinterlace/algo_ivtc.h $(am__append_211) \ + $(am__append_213) # inline ASM doesn't build with -O0 -libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2 $(am__append_209) \ - $(am__append_211) $(am__append_212) +libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2 $(am__append_212) \ + $(am__append_214) $(am__append_215) 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) @@ -12456,25 +12480,28 @@ libopencv_example_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' splitterdir = $(pluginsdir)/video_splitter splitter_LTLIBRARIES = libclone_plugin.la libwall_plugin.la \ - $(am__append_213) $(am__append_216) + $(am__append_216) $(am__append_219) 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_214) -libpanoramix_plugin_la_LIBADD = $(LIBM) $(am__append_215) +libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS) $(am__append_217) +libpanoramix_plugin_la_LIBADD = $(LIBM) $(am__append_218) voutdir = $(pluginsdir)/video_output -vout_LTLIBRARIES = $(am__append_217) $(am__append_218) \ - $(am__append_221) $(am__append_222) $(LTLIBgles2) \ - $(am__append_225) $(am__append_226) $(am__append_227) \ - $(am__append_228) $(am__append_229) $(am__append_231) \ - $(am__append_233) $(am__append_234) $(am__append_235) \ - $(am__append_237) $(am__append_238) $(am__append_239) \ - $(am__append_241) $(LTLIBdirect3d11) $(am__append_246) \ - $(am__append_248) $(am__append_249) $(am__append_250) \ +vout_LTLIBRARIES = $(am__append_220) $(am__append_221) \ + $(am__append_224) $(am__append_225) $(LTLIBgles2) \ + $(am__append_228) $(am__append_229) $(am__append_230) \ + $(am__append_231) $(am__append_232) $(am__append_234) \ + $(am__append_236) $(am__append_237) $(am__append_238) \ + $(am__append_240) $(am__append_241) $(am__append_242) \ + $(am__append_244) $(LTLIBdirect3d11) $(am__append_249) \ $(am__append_251) $(am__append_252) $(am__append_253) \ - $(LTLIBfb) $(LTLIBaa) $(LTLIBcaca) $(am__append_256) \ + $(am__append_254) $(am__append_255) $(am__append_256) \ + $(LTLIBfb) $(LTLIBaa) $(LTLIBcaca) $(am__append_259) \ libflaschen_plugin.la libvdummy_plugin.la libvmem_plugin.la \ libyuv_plugin.la +# Install the pkglib/pkglibexec first before relinking the modules. +# This ensures libtool re-linking is not racy. +installvoutLTLIBRARIES = install-voutLTLIBRARIES 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 \ @@ -12492,7 +12519,7 @@ libglconv_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ -Wl,-framework,IOSurface \ -Wl,-framework,Foundation,-framework,CoreVideo \ - $(am__append_219) $(am__append_220) + $(am__append_222) $(am__append_223) @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) @@ -12522,9 +12549,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_223) + $(OPENGL_COMMONCLFAGS) $(am__append_226) libgl_plugin_la_LIBADD = $(LIBM) $(OPENGL_COMMONLIBS) \ - $(am__append_224) + $(am__append_227) 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 @@ -12587,7 +12614,7 @@ libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_xcb_window) \ $(XPROTO_CFLAGS) $(XCB_CFLAGS) $(XCB_KEYSYMS_CFLAGS) \ - $(am__append_232) + $(am__append_235) 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 @@ -12655,13 +12682,13 @@ video_output/win32/d3d11_scaler.cpp \ video_output/win32/d3d11_scaler.h \ video_output/win32/d3d11_tonemap.cpp \ - video_output/win32/d3d11_tonemap.h $(am__append_242) \ - $(am__append_245) + video_output/win32/d3d11_tonemap.h $(am__append_245) \ + $(am__append_248) libdirect3d11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_direct3d11 libdirect3d11_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la \ - $(LIBCOM) -luuid $(am__append_243) $(am__append_244) + $(LIBCOM) -luuid $(am__append_246) $(am__append_247) 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 \ @@ -12733,14 +12760,14 @@ ### ASCII Art ### libaa_plugin_la_SOURCES = video_output/aa.c -libaa_plugin_la_LIBADD = libevent_thread.la -laa $(am__append_254) +libaa_plugin_la_LIBADD = libevent_thread.la -laa $(am__append_257) 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_255) + $(am__append_258) libcaca_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' ### EFL Evas video output ### @@ -12760,7 +12787,7 @@ libevent_thread_la_LDFLAGS = -static visudir = $(pluginsdir)/visualization -visu_LTLIBRARIES = $(am__append_257) $(LTLIBgoom) $(LTLIBprojectm) \ +visu_LTLIBRARIES = $(am__append_260) $(LTLIBgoom) $(LTLIBprojectm) \ libvisual_plugin.la $(LTLIBvsxu) libglspectrum_plugin_la_SOURCES = \ visualization/glspectrum.c \ @@ -12801,7 +12828,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_258) \ +@ENABLE_SOUT_TRUE@ $(am__append_261) \ @ENABLE_SOUT_TRUE@ $(LTLIBaccess_output_shout) \ @ENABLE_SOUT_TRUE@ $(LTLIBaccess_output_srt) \ @ENABLE_SOUT_TRUE@ libaccess_output_rist_plugin.la @@ -12845,7 +12872,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_260) +@ENABLE_SOUT_TRUE@ $(LTLIBmux_ogg) $(am__append_263) @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)' @@ -12908,15 +12935,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_266) +@ENABLE_SOUT_TRUE@ $(am__append_269) @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_261) +@ENABLE_SOUT_TRUE@ $(am__append_264) @ENABLE_SOUT_TRUE@libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS) \ -@ENABLE_SOUT_TRUE@ $(LIBPTHREAD) $(am__append_262) +@ENABLE_SOUT_TRUE@ $(LIBPTHREAD) $(am__append_265) @ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@SRTP_CFLAGS = -I$(srcdir)/access/rtp @ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@SRTP_LIBS = libvlc_srtp.la @@ -15201,6 +15228,8 @@ hw/d3d11/$(DEPDIR)/$(am__dirstamp) video_filter/amf_vqenhancer.lo: video_filter/$(am__dirstamp) \ video_filter/$(DEPDIR)/$(am__dirstamp) +video_filter/amf_frc.lo: video_filter/$(am__dirstamp) \ + video_filter/$(DEPDIR)/$(am__dirstamp) hw/amf/$(am__dirstamp): @$(MKDIR_P) hw/amf @: > hw/amf/$(am__dirstamp) @@ -15326,6 +15355,10 @@ libdmo_plugin.la: $(libdmo_plugin_la_OBJECTS) $(libdmo_plugin_la_DEPENDENCIES) $(EXTRA_libdmo_plugin_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libdmo_plugin_la_rpath) $(libdmo_plugin_la_OBJECTS) $(libdmo_plugin_la_LIBADD) $(LIBS) +demux/dmxmus.lo: demux/$(am__dirstamp) demux/$(DEPDIR)/$(am__dirstamp) + +libdmxmus_plugin.la: $(libdmxmus_plugin_la_OBJECTS) $(libdmxmus_plugin_la_DEPENDENCIES) $(EXTRA_libdmxmus_plugin_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) -rpath $(demuxdir) $(libdmxmus_plugin_la_OBJECTS) $(libdmxmus_plugin_la_LIBADD) $(LIBS) audio_filter/channel_mixer/$(am__dirstamp): @$(MKDIR_P) audio_filter/channel_mixer @: > audio_filter/channel_mixer/$(am__dirstamp) @@ -18655,8 +18688,6 @@ meta_engine/libtaglib_plugin_la-taglib.lo: \ meta_engine/$(am__dirstamp) \ meta_engine/$(DEPDIR)/$(am__dirstamp) -demux/xiph_metadata.lo: demux/$(am__dirstamp) \ - demux/$(DEPDIR)/$(am__dirstamp) libtaglib_plugin.la: $(libtaglib_plugin_la_OBJECTS) $(libtaglib_plugin_la_DEPENDENCIES) $(EXTRA_libtaglib_plugin_la_DEPENDENCIES) $(AM_V_CXXLD)$(libtaglib_plugin_la_LINK) $(libtaglib_plugin_la_OBJECTS) $(libtaglib_plugin_la_LIBADD) $(LIBS) @@ -18746,6 +18777,8 @@ demux/mpeg/$(DEPDIR)/$(am__dirstamp) demux/mpeg/libts_plugin_la-ts_hotfixes.lo: demux/mpeg/$(am__dirstamp) \ demux/mpeg/$(DEPDIR)/$(am__dirstamp) +demux/mpeg/libts_plugin_la-ts_pes.lo: demux/mpeg/$(am__dirstamp) \ + demux/mpeg/$(DEPDIR)/$(am__dirstamp) mux/mpeg/libts_plugin_la-csa.lo: mux/mpeg/$(am__dirstamp) \ mux/mpeg/$(DEPDIR)/$(am__dirstamp) mux/mpeg/libts_plugin_la-tables.lo: mux/mpeg/$(am__dirstamp) \ @@ -19683,6 +19716,8 @@ libxdg_shell_plugin.la: $(libxdg_shell_plugin_la_OBJECTS) $(libxdg_shell_plugin_la_DEPENDENCIES) $(EXTRA_libxdg_shell_plugin_la_DEPENDENCIES) $(AM_V_CCLD)$(libxdg_shell_plugin_la_LINK) $(am_libxdg_shell_plugin_la_rpath) $(libxdg_shell_plugin_la_OBJECTS) $(libxdg_shell_plugin_la_LIBADD) $(LIBS) +demux/xiph_metadata.lo: demux/$(am__dirstamp) \ + demux/$(DEPDIR)/$(am__dirstamp) libxiph_metadata.la: $(libxiph_metadata_la_OBJECTS) $(libxiph_metadata_la_DEPENDENCIES) $(EXTRA_libxiph_metadata_la_DEPENDENCIES) $(AM_V_CCLD)$(libxiph_metadata_la_LINK) $(libxiph_metadata_la_OBJECTS) $(libxiph_metadata_la_LIBADD) $(LIBS) @@ -20555,6 +20590,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@demux/$(DEPDIR)/caf.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/$(DEPDIR)/demuxdump.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/$(DEPDIR)/directory.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@demux/$(DEPDIR)/dmxmus.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/$(DEPDIR)/gme.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/$(DEPDIR)/image.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/$(DEPDIR)/libdemux_cdg_plugin_la-cdg.Plo@am__quote@ # am--include-marker @@ -20712,6 +20748,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_decoders.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_hotfixes.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_metadata.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pes.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pid.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_psi.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_psip.Plo@am__quote@ # am--include-marker @@ -21368,6 +21405,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@video_filter/$(DEPDIR)/adjust.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_filter/$(DEPDIR)/adjust_sat_hue.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_filter/$(DEPDIR)/alphamask.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@video_filter/$(DEPDIR)/amf_frc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_filter/$(DEPDIR)/amf_vqenhancer.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_filter/$(DEPDIR)/anaglyph.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video_filter/$(DEPDIR)/antiflicker.Plo@am__quote@ # am--include-marker @@ -23973,6 +24011,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) $(libts_plugin_la_CFLAGS) $(CFLAGS) -c -o demux/mpeg/libts_plugin_la-ts_hotfixes.lo `test -f 'demux/mpeg/ts_hotfixes.c' || echo '$(srcdir)/'`demux/mpeg/ts_hotfixes.c +demux/mpeg/libts_plugin_la-ts_pes.lo: demux/mpeg/ts_pes.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) $(libts_plugin_la_CFLAGS) $(CFLAGS) -MT demux/mpeg/libts_plugin_la-ts_pes.lo -MD -MP -MF demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pes.Tpo -c -o demux/mpeg/libts_plugin_la-ts_pes.lo `test -f 'demux/mpeg/ts_pes.c' || echo '$(srcdir)/'`demux/mpeg/ts_pes.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pes.Tpo demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pes.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='demux/mpeg/ts_pes.c' object='demux/mpeg/libts_plugin_la-ts_pes.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) $(libts_plugin_la_CFLAGS) $(CFLAGS) -c -o demux/mpeg/libts_plugin_la-ts_pes.lo `test -f 'demux/mpeg/ts_pes.c' || echo '$(srcdir)/'`demux/mpeg/ts_pes.c + mux/mpeg/libts_plugin_la-csa.lo: mux/mpeg/csa.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) $(libts_plugin_la_CFLAGS) $(CFLAGS) -MT mux/mpeg/libts_plugin_la-csa.lo -MD -MP -MF mux/mpeg/$(DEPDIR)/libts_plugin_la-csa.Tpo -c -o mux/mpeg/libts_plugin_la-csa.lo `test -f 'mux/mpeg/csa.c' || echo '$(srcdir)/'`mux/mpeg/csa.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mux/mpeg/$(DEPDIR)/libts_plugin_la-csa.Tpo mux/mpeg/$(DEPDIR)/libts_plugin_la-csa.Plo @@ -28582,7 +28627,7 @@ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -28735,6 +28780,7 @@ @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -28806,8 +28852,7 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive +install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -29506,6 +29551,7 @@ -rm -f demux/$(DEPDIR)/caf.Plo -rm -f demux/$(DEPDIR)/demuxdump.Plo -rm -f demux/$(DEPDIR)/directory.Plo + -rm -f demux/$(DEPDIR)/dmxmus.Plo -rm -f demux/$(DEPDIR)/gme.Plo -rm -f demux/$(DEPDIR)/image.Plo -rm -f demux/$(DEPDIR)/libdemux_cdg_plugin_la-cdg.Plo @@ -29663,6 +29709,7 @@ -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_decoders.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_hotfixes.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_metadata.Plo + -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pes.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pid.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_psi.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_psip.Plo @@ -30319,6 +30366,7 @@ -rm -f video_filter/$(DEPDIR)/adjust.Plo -rm -f video_filter/$(DEPDIR)/adjust_sat_hue.Plo -rm -f video_filter/$(DEPDIR)/alphamask.Plo + -rm -f video_filter/$(DEPDIR)/amf_frc.Plo -rm -f video_filter/$(DEPDIR)/amf_vqenhancer.Plo -rm -f video_filter/$(DEPDIR)/anaglyph.Plo -rm -f video_filter/$(DEPDIR)/antiflicker.Plo @@ -30913,6 +30961,7 @@ -rm -f demux/$(DEPDIR)/caf.Plo -rm -f demux/$(DEPDIR)/demuxdump.Plo -rm -f demux/$(DEPDIR)/directory.Plo + -rm -f demux/$(DEPDIR)/dmxmus.Plo -rm -f demux/$(DEPDIR)/gme.Plo -rm -f demux/$(DEPDIR)/image.Plo -rm -f demux/$(DEPDIR)/libdemux_cdg_plugin_la-cdg.Plo @@ -31070,6 +31119,7 @@ -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_decoders.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_hotfixes.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_metadata.Plo + -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pes.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_pid.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_psi.Plo -rm -f demux/mpeg/$(DEPDIR)/libts_plugin_la-ts_psip.Plo @@ -31726,6 +31776,7 @@ -rm -f video_filter/$(DEPDIR)/adjust.Plo -rm -f video_filter/$(DEPDIR)/adjust_sat_hue.Plo -rm -f video_filter/$(DEPDIR)/alphamask.Plo + -rm -f video_filter/$(DEPDIR)/amf_frc.Plo -rm -f video_filter/$(DEPDIR)/amf_vqenhancer.Plo -rm -f video_filter/$(DEPDIR)/anaglyph.Plo -rm -f video_filter/$(DEPDIR)/antiflicker.Plo @@ -31934,7 +31985,7 @@ uninstall-voutLTLIBRARIES .MAKE: $(am__recursive_targets) all check check-am install install-am \ - install-exec install-strip + install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-TESTS check-am clean \ @@ -32009,9 +32060,10 @@ .PRECIOUS: Makefile +$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES .xib.nib: - $(AM_V_at)mkdir -p -- gui/macosx/UI + $(AM_V_at)$(MKDIR_P) -- gui/macosx/UI $(xib_verbose)$(XIB) --errors --warnings --notices \ --module VLC --auto-activate-custom-fonts --target-device mac \ --minimum-deployment-target 10.7 --output-format human-readable-text \ @@ -32033,6 +32085,8 @@ gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES) $(AM_V_GEN)$(RCC) -name vlc -o $@ $< +$(installvpdauLTLIBRARIES): install-pkglibLTLIBRARIES +$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES video_output/wayland/viewporter-client-protocol.h: \ $(WAYLAND_PROTOCOLS)/stable/viewporter/viewporter.xml diff -Nru vlc-3.0.21/modules/access/Makefile.am vlc-3.0.22/modules/access/Makefile.am --- vlc-3.0.21/modules/access/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -252,7 +252,7 @@ access_LTLIBRARIES += $(LTLIBdvdread) EXTRA_LTLIBRARIES += libdvdread_plugin.la -liblibbluray_plugin_la_SOURCES = access/bluray.c +liblibbluray_plugin_la_SOURCES = access/bluray.c demux/mpeg/timestamps.h liblibbluray_plugin_la_CFLAGS = $(AM_CFLAGS) $(BLURAY_CFLAGS) liblibbluray_plugin_la_LIBADD = $(BLURAY_LIBS) liblibbluray_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' diff -Nru vlc-3.0.21/modules/access/bluray.c vlc-3.0.22/modules/access/bluray.c --- vlc-3.0.21/modules/access/bluray.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/bluray.c 2025-11-13 22:17:54.000000000 +0000 @@ -391,8 +391,6 @@ static void blurayRestartParser(demux_t *p_demux, bool, bool); static void notifyDiscontinuityToParser( demux_sys_t *p_sys ); -#define FROM_TICKS(a) ((a)*CLOCK_FREQ / INT64_C(90000)) -#define TO_TICKS(a) ((a)*INT64_C(90000)/CLOCK_FREQ) #define STILL_IMAGE_NOT_SET 0 #define STILL_IMAGE_INFINITE -1 @@ -2067,7 +2065,7 @@ static void blurayUpdateTitleInfo(input_title_t *t, BLURAY_TITLE_INFO *title_info) { - t->i_length = FROM_TICKS(title_info->duration); + t->i_length = FROM_SCALE_NZ(title_info->duration); for (int i = 0; i < t->i_seekpoint; i++) vlc_seekpoint_Delete( t->seekpoint[i] ); @@ -2082,7 +2080,7 @@ if (!s) { break; } - s->i_time_offset = FROM_TICKS(title_info->chapters[j].start); + s->i_time_offset = FROM_SCALE_NZ(title_info->chapters[j].start); TAB_APPEND(t->i_seekpoint, t->seekpoint, s); } @@ -2371,7 +2369,7 @@ case DEMUX_SET_TIME: { int64_t i_time = va_arg(args, int64_t); - bd_seek_time(p_sys->bluray, TO_TICKS(i_time)); + bd_seek_time(p_sys->bluray, TO_SCALE_NZ(i_time)); blurayRestartParser(p_demux, true, true); notifyDiscontinuityToParser(p_sys); p_sys->b_draining = false; @@ -2384,7 +2382,7 @@ if( p_demux->info.i_title < (int) p_sys->i_title && (CURRENT_TITLE->i_flags & INPUT_TITLE_INTERACTIVE)) return VLC_EGENERIC; - *pi_time = (int64_t)FROM_TICKS(bd_tell_time(p_sys->bluray)); + *pi_time = FROM_SCALE_NZ(bd_tell_time(p_sys->bluray)); return VLC_SUCCESS; } @@ -2395,13 +2393,13 @@ (CURRENT_TITLE->i_flags & INPUT_TITLE_INTERACTIVE)) return VLC_EGENERIC; *pf_position = p_demux->info.i_title < (int) p_sys->i_title && CUR_LENGTH > 0 ? - (double)FROM_TICKS(bd_tell_time(p_sys->bluray))/CUR_LENGTH : 0.0; + (double)FROM_SCALE_NZ(bd_tell_time(p_sys->bluray))/CUR_LENGTH : 0.0; return VLC_SUCCESS; } case DEMUX_SET_POSITION: { double f_position = va_arg(args, double); - bd_seek_time(p_sys->bluray, TO_TICKS(f_position*CUR_LENGTH)); + bd_seek_time(p_sys->bluray, TO_SCALE_NZ(f_position*CUR_LENGTH)); blurayRestartParser(p_demux, true, true); notifyDiscontinuityToParser(p_sys); p_sys->b_draining = false; diff -Nru vlc-3.0.21/modules/access/dcp/dcp.cpp vlc-3.0.22/modules/access/dcp/dcp.cpp --- vlc-3.0.21/modules/access/dcp/dcp.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/dcp/dcp.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -733,7 +733,7 @@ if( p_sys->i_chans_to_reorder ) aout_ChannelReorder( p_audio_frame->p_buffer, p_audio_frame->i_buffer, - p_sys->i_channels, + p_sys->i_chans_to_reorder, p_sys->pi_chan_table, VLC_CODEC_S24L ); p_audio_frame->i_buffer = AudioFrameBuff.Size(); diff -Nru vlc-3.0.21/modules/access/decklink.cpp vlc-3.0.22/modules/access/decklink.cpp --- vlc-3.0.21/modules/access/decklink.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/decklink.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -437,6 +437,7 @@ return VLC_EGENERIC; } + free(opt); if (sys->config->SetInt(bmdDeckLinkConfigAudioInputConnection, c) != S_OK) { msg_Err(demux, "Failed to set audio input connection"); return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/access/dtv/bdagraph.cpp vlc-3.0.22/modules/access/dtv/bdagraph.cpp --- vlc-3.0.21/modules/access/dtv/bdagraph.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/dtv/bdagraph.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,7 +29,7 @@ # include #endif -#include +#include #include #include @@ -340,7 +340,7 @@ vlc_mutex_locker l( &lock ); - vlc_tick_t i_deadline = mdate() + ms * 1000; + vlc_tick_t i_deadline = mdate() + VLC_TICK_FROM_MS( ms ); while( !p_first ) { if( vlc_cond_timedwait( &wait, &lock, i_deadline ) ) diff -Nru vlc-3.0.21/modules/access/dvb/linux_dvb.c vlc-3.0.22/modules/access/dvb/linux_dvb.c --- vlc-3.0.21/modules/access/dvb/linux_dvb.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/dvb/linux_dvb.c 2025-11-13 22:17:54.000000000 +0000 @@ -713,7 +713,7 @@ return VLC_EGENERIC; } - msleep(15000 + cmd.wait * 1000); + msleep(VLC_TICK_FROM_MS(15 + cmd.wait)); /* A or B simple diseqc ("diseqc-compatible") */ if( ioctl( p_sys->i_frontend_handle, FE_DISEQC_SEND_BURST, diff -Nru vlc-3.0.21/modules/access/dvdnav.c vlc-3.0.22/modules/access/dvdnav.c --- vlc-3.0.21/modules/access/dvdnav.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/dvdnav.c 2025-11-13 22:17:54.000000000 +0000 @@ -1443,7 +1443,7 @@ } default: { - int i_id = ps_pkt_id( p_pkt ); + int i_id = ps_pkt_id( p_pkt, PS_SOURCE_VOB ); if( i_id >= 0xc0 ) { ps_track_t *tk = &p_sys->tk[ps_id_to_tk(i_id)]; @@ -1518,7 +1518,7 @@ if( tk->b_configured ) return; - if( ps_track_fill( tk, 0, i_id, NULL, true ) ) + if( ps_track_fill( tk, NULL, i_id, NULL, true ) ) { msg_Warn( p_demux, "unknown codec for id=0x%x", i_id ); return; diff -Nru vlc-3.0.21/modules/access/dvdread.c vlc-3.0.22/modules/access/dvdread.c --- vlc-3.0.21/modules/access/dvdread.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/dvdread.c 2025-11-13 22:17:54.000000000 +0000 @@ -651,7 +651,7 @@ } default: { - int i_id = ps_pkt_id( p_pkt ); + int i_id = ps_pkt_id( p_pkt, /*p_sys->type == DVD_A ? PS_SOURCE_AOB :*/ PS_SOURCE_VOB ); if( i_id >= 0xc0 ) { ps_track_t *tk = &p_sys->tk[ps_id_to_tk(i_id)]; @@ -696,7 +696,7 @@ if( tk->b_configured ) return; - if( ps_track_fill( tk, 0, i_id, NULL, true ) ) + if( ps_track_fill( tk, NULL, i_id, NULL, true ) ) { msg_Warn( p_demux, "unknown codec for id=0x%x", i_id ); return; @@ -968,17 +968,17 @@ switch( p_vts->vtsi_mat->vts_audio_attr[i - 1].audio_format ) { case 0x00: /* A52 */ - i_id = (0x80 + i_position) | 0xbd00; + i_id = (0x80 + i_position) | PS_PACKET_ID_MASK_VOB; break; case 0x02: case 0x03: /* MPEG audio */ i_id = 0xc000 + i_position; break; case 0x04: /* LPCM */ - i_id = (0xa0 + i_position) | 0xbd00; + i_id = (0xa0 + i_position) | PS_PACKET_ID_MASK_VOB; break; case 0x06: /* DTS */ - i_id = (0x88 + i_position) | 0xbd00; + i_id = (0x88 + i_position) | PS_PACKET_ID_MASK_VOB; break; default: i_id = 0; @@ -1034,7 +1034,7 @@ i_position = ( spu_control >> 24 ) & 0x7F; } - i_id = (0x20 + i_position) | 0xbd00; + i_id = (0x20 + i_position) | PS_PACKET_ID_MASK_VOB; ESNew( p_demux, i_id, p_sys->p_vts_file->vtsi_mat-> vts_subp_attr[i - 1].lang_code ); diff -Nru vlc-3.0.21/modules/access/http/message.h vlc-3.0.22/modules/access/http/message.h --- vlc-3.0.21/modules/access/http/message.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/http/message.h 2025-11-13 22:17:54.000000000 +0000 @@ -401,7 +401,7 @@ * or NULL on error */ char *vlc_http_msg_format(const struct vlc_http_msg *m, size_t *restrict lenp, - bool proxied) VLC_USED; + bool proxied) VLC_USED VLC_MALLOC; /** * Parses an HTTP 1.1 message header. diff -Nru vlc-3.0.21/modules/access/live555.cpp vlc-3.0.22/modules/access/live555.cpp --- vlc-3.0.21/modules/access/live555.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/live555.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -198,6 +198,10 @@ #define CAP_SUBSESSION_PAUSE (1 << 3) #define CAPS_DEFAULT CAP_RATE_CONTROL +#if LIVEMEDIA_LIBRARY_VERSION_INT < 1732752000 // 2024.11.28 +typedef char EventLoopWatchVariable; +#endif + struct demux_sys_t { char *p_sdp; /* XXX mallocated */ @@ -236,8 +240,8 @@ bool b_no_data; /* if we never received any data */ int i_no_data_ti; /* consecutive number of TaskInterrupt */ - char event_rtsp; - char event_data; + EventLoopWatchVariable event_rtsp; + EventLoopWatchVariable event_data; bool b_get_param; /* Does the server support GET_PARAMETER */ bool b_paused; /* Are we paused? */ diff -Nru vlc-3.0.21/modules/access/mms/mmstu.c vlc-3.0.22/modules/access/mms/mmstu.c --- vlc-3.0.21/modules/access/mms/mmstu.c 2024-06-05 15:57:01.000000000 +0000 +++ vlc-3.0.22/modules/access/mms/mmstu.c 2025-11-13 22:17:54.000000000 +0000 @@ -42,6 +42,7 @@ # include #endif +#include #include #include #include @@ -484,8 +485,8 @@ var_buffer_t buffer; char *tmp; - const uint16_t *p; - const uint8_t *p_cmdend; + const uint8_t *p; + const uint8_t *p_cmdend; uint32_t i_server_version; uint32_t i_tool_version; uint32_t i_update_player_url; @@ -590,38 +591,32 @@ i_tool_version = GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 36 ); i_update_player_url = GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 40 ); i_encryption_type = GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 44 ); - p = (uint16_t*)( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 48 ); + p = p_sys->p_cmd + MMS_CMD_HEADERSIZE + 48; p_cmdend = &p_sys->p_cmd[p_sys->i_cmd]; -#define GETUTF16( psz, size ) \ - if( (UINT32_MAX == size) || \ - ((uintptr_t) p / sizeof(uint16_t) < size) || \ - ((UINTPTR_MAX - (uintptr_t) p_cmdend) / sizeof(uint16_t)) < size )\ +#define GETUTF16( fmt, size ) \ +do \ +{ \ + if( (p_cmdend - p) / 2u < (size) ) \ {\ var_buffer_free( &buffer );\ MMSClose( p_access );\ return VLC_EBADVAR;\ }\ - if( (psz = malloc(size + 1)) )\ - {\ - for( size_t i = 0; i < size; i++ ) \ - { \ - psz[i] = p[i]; \ - } \ - psz[size] = '\0'; \ - p += ( size ); \ - } - GETUTF16( p_sys->psz_server_version, i_server_version ); - GETUTF16( p_sys->psz_tool_version, i_tool_version ); - GETUTF16( p_sys->psz_update_player_url, i_update_player_url ); - GETUTF16( p_sys->psz_encryption_type, i_encryption_type ); + char *str = FromCharset( "UTF-16LE", p, (size) * 2 ); \ + p += (size) * 2; \ + if( str != NULL ) \ + { \ + msg_Dbg( p_access, fmt " %s", str ); \ + free( str ); \ + } \ +} while (0) + + GETUTF16( "server version: ", i_server_version ); + GETUTF16( "tool version: ", i_tool_version ); + GETUTF16( "update player URL:", i_update_player_url ); + GETUTF16( "encryption type: ", i_encryption_type ); #undef GETUTF16 - msg_Dbg( p_access, - "0x01 --> server_version:\"%s\" tool_version:\"%s\" update_player_url:\"%s\" encryption_type:\"%s\"", - p_sys->psz_server_version, - p_sys->psz_tool_version, - p_sys->psz_update_player_url, - p_sys->psz_encryption_type ); /* *** should make an 18 command to make data timing *** */ @@ -998,11 +993,6 @@ FREENULL( p_sys->p_media ); FREENULL( p_sys->p_header ); p_sys->i_header = 0; - - FREENULL( p_sys->psz_server_version ); - FREENULL( p_sys->psz_tool_version ); - FREENULL( p_sys->psz_update_player_url ); - FREENULL( p_sys->psz_encryption_type ); } /**************************************************************************** @@ -1142,14 +1132,14 @@ i_tcp_read = recv( p_sys->i_handle_tcp, p_sys->buffer_tcp + p_sys->i_buffer_tcp, - i_tcp + MMS_BUFFER_SIZE/2, 0 ); + MMS_BUFFER_SIZE - p_sys->i_buffer_tcp, 0 ); } if( i_udp > 0 && ufd[i_tcp > 0].revents ) { i_udp_read = recv( p_sys->i_handle_udp, p_sys->buffer_udp + p_sys->i_buffer_udp, - i_udp + MMS_BUFFER_SIZE/2, 0 ); + MMS_BUFFER_SIZE - p_sys->i_buffer_udp, 0 ); } #ifdef MMS_DEBUG @@ -1187,23 +1177,13 @@ uint32_t i_id; free( p_sys->p_cmd ); - if( (p_sys->p_cmd = malloc( i_data )) ) - { - p_sys->i_cmd = i_data; - memcpy( p_sys->p_cmd, p_data, i_data ); - *pi_used = i_data; /* by default */ - } - else - { - *pi_used = p_sys->i_cmd = 0; - p_sys->i_command = 0; - return -1; - } - + p_sys->p_cmd = NULL; + p_sys->i_cmd = 0; + p_sys->i_command = 0; + *pi_used = 0; if( i_data < MMS_CMD_HEADERSIZE ) { msg_Warn( p_access, "truncated command (header incomplete)" ); - p_sys->i_command = 0; return -1; } i_id = GetDWLE( p_data + 4 ); @@ -1213,23 +1193,27 @@ { msg_Err( p_access, "incorrect command header (0x%"PRIx32")", i_id ); - p_sys->i_command = 0; return -1; } - if( i_length > p_sys->i_cmd ) + if( i_length > i_data ) { msg_Warn( p_access, "truncated command (missing %zu bytes)", (size_t)i_length - i_data ); - p_sys->i_command = 0; return -1; } - else if( i_length < p_sys->i_cmd ) + + if( (p_sys->p_cmd = malloc( i_length )) ) + { + memcpy( p_sys->p_cmd, p_data, i_length ); + } + else { - p_sys->i_cmd = i_length; - *pi_used = i_length; + return -1; } + p_sys->i_cmd = i_length; + *pi_used = i_length; msg_Dbg( p_access, "recv command start_sequence:0x%8.8x command_id:0x%8.8x length:%d len8:%d sequence 0x%8.8x len8_II:%d dir_comm:0x%8.8x", diff -Nru vlc-3.0.21/modules/access/mms/mmstu.h vlc-3.0.22/modules/access/mms/mmstu.h --- vlc-3.0.21/modules/access/mms/mmstu.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/mms/mmstu.h 2025-11-13 22:17:54.000000000 +0000 @@ -79,12 +79,6 @@ /* extracted information */ int i_command; - /* from 0x01 answer (not yet set) */ - char *psz_server_version; - char *psz_tool_version; - char *psz_update_player_url; - char *psz_encryption_type; - /* from 0x06 answer */ uint32_t i_flags_broadcast; uint32_t i_media_length; diff -Nru vlc-3.0.21/modules/access/nfs.c vlc-3.0.22/modules/access/nfs.c --- vlc-3.0.21/modules/access/nfs.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/nfs.c 2025-11-13 22:17:54.000000000 +0000 @@ -189,7 +189,8 @@ else { p_sys->res.read.i_len = i_status; - memcpy(p_sys->res.read.p_buf, p_data, i_status); + if (p_sys->res.read.p_buf != NULL && p_data != NULL) + memcpy(p_sys->res.read.p_buf, p_data, i_status); } } @@ -209,9 +210,15 @@ return 0; p_sys->res.read.i_len = 0; +#ifdef LIBNFS_API_V2 + p_sys->res.read.p_buf = NULL; + if (nfs_read_async(p_sys->p_nfs, p_sys->p_nfsfh, p_buf, i_len, nfs_read_cb, + p_access) < 0) +#else p_sys->res.read.p_buf = p_buf; if (nfs_read_async(p_sys->p_nfs, p_sys->p_nfsfh, i_len, nfs_read_cb, p_access) < 0) +#endif { msg_Err(p_access, "nfs_read_async failed"); return 0; diff -Nru vlc-3.0.21/modules/access/sftp.c vlc-3.0.22/modules/access/sftp.c --- vlc-3.0.21/modules/access/sftp.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/sftp.c 2025-11-13 22:17:54.000000000 +0000 @@ -547,7 +547,7 @@ { access_sys_t *sys = p_access->p_sys; - libssh2_sftp_seek( sys->file, i_pos ); + libssh2_sftp_seek64( sys->file, i_pos ); return VLC_SUCCESS; } diff -Nru vlc-3.0.21/modules/access/smb2.c vlc-3.0.22/modules/access/smb2.c --- vlc-3.0.21/modules/access/smb2.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/smb2.c 2025-11-13 22:17:54.000000000 +0000 @@ -407,7 +407,7 @@ return VLC_SUCCESS; } -static char * +VLC_MALLOC static char * vlc_smb2_get_url(vlc_url_t *url, const char *file) { /* smb2://? */ diff -Nru vlc-3.0.21/modules/access/v4l2/demux.c vlc-3.0.22/modules/access/v4l2/demux.c --- vlc-3.0.21/modules/access/v4l2/demux.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access/v4l2/demux.c 2025-11-13 22:17:54.000000000 +0000 @@ -155,10 +155,13 @@ // { V4L2_PIX_FMT_NV12MT, }, // { V4L2_PIX_FMT_M420, }, + { V4L2_PIX_FMT_ABGR32, VLC_CODEC_BGRA, 4, 0, 0, 0 }, + /* Packed RGB */ #ifdef WORDS_BIGENDIAN { V4L2_PIX_FMT_RGB32, VLC_CODEC_RGB32, 4, 0xFF00, 0xFF0000, 0xFF000000 }, { V4L2_PIX_FMT_BGR32, VLC_CODEC_RGB32, 4, 0xFF000000, 0xFF0000, 0xFF00 }, + { V4L2_PIX_FMT_XBGR32, VLC_CODEC_RGB32, 4, 0xFF000000, 0xFF0000, 0xFF00 }, { V4L2_PIX_FMT_RGB24, VLC_CODEC_RGB24, 3, 0xFF0000, 0x00FF00, 0x0000FF }, { V4L2_PIX_FMT_BGR24, VLC_CODEC_RGB24, 3, 0x0000FF, 0x00FF00, 0xFF0000 }, // { V4L2_PIX_FMT_BGR666, }, @@ -170,6 +173,7 @@ #else { V4L2_PIX_FMT_RGB32, VLC_CODEC_RGB32, 4, 0x0000FF, 0x00FF00, 0xFF0000 }, { V4L2_PIX_FMT_BGR32, VLC_CODEC_RGB32, 4, 0xFF0000, 0x00FF00, 0x0000FF }, + { V4L2_PIX_FMT_XBGR32, VLC_CODEC_RGB32, 4, 0xFF0000, 0x00FF00, 0x0000FF }, { V4L2_PIX_FMT_RGB24, VLC_CODEC_RGB24, 3, 0x0000FF, 0x00FF00, 0xFF0000 }, { V4L2_PIX_FMT_BGR24, VLC_CODEC_RGB24, 3, 0xFF0000, 0x00FF00, 0x0000FF }, // { V4L2_PIX_FMT_BGR666, }, diff -Nru vlc-3.0.21/modules/access_output/livehttp.c vlc-3.0.22/modules/access_output/livehttp.c --- vlc-3.0.21/modules/access_output/livehttp.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/access_output/livehttp.c 2025-11-13 22:17:54.000000000 +0000 @@ -282,6 +282,8 @@ if( p_sys->psz_keyfile && ( LoadCryptFile( p_access ) < 0 ) ) { + free( p_sys->key_uri ); + free( p_sys->psz_keyfile ); free( p_sys->psz_indexUrl ); free( p_sys->psz_indexPath ); free( p_sys ); @@ -290,6 +292,7 @@ } else if( !p_sys->psz_keyfile && ( CryptSetup( p_access, NULL ) < 0 ) ) { + free( p_sys->key_uri ); free( p_sys->psz_indexUrl ); free( p_sys->psz_indexPath ); free( p_sys ); @@ -817,6 +820,7 @@ destroySegment( segment ); } + free( p_sys->psz_keyfile ); free( p_sys->psz_indexUrl ); free( p_sys->psz_indexPath ); free( p_sys ); diff -Nru vlc-3.0.21/modules/access_output/udp.c vlc-3.0.22/modules/access_output/udp.c --- vlc-3.0.21/modules/access_output/udp.c 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/access_output/udp.c 2025-11-13 22:17:54.000000000 +0000 @@ -204,8 +204,8 @@ } shutdown( i_handle, SHUT_RD ); - p_sys->i_caching = UINT64_C(1000) - * var_GetInteger( p_access, SOUT_CFG_PREFIX "caching"); + p_sys->i_caching = VLC_TICK_FROM_MS( + var_GetInteger( p_access, SOUT_CFG_PREFIX "caching") ); p_sys->i_handle = i_handle; p_sys->i_mtu = var_CreateGetInteger( p_this, "mtu" ); p_sys->b_mtu_warning = false; diff -Nru vlc-3.0.21/modules/audio_filter/audiobargraph_a.c vlc-3.0.22/modules/audio_filter/audiobargraph_a.c --- vlc-3.0.21/modules/audio_filter/audiobargraph_a.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/audio_filter/audiobargraph_a.c 2025-11-13 22:17:54.000000000 +0000 @@ -97,9 +97,9 @@ bool bargraph; int bargraph_repetition; bool silence; - int64_t time_window; + vlc_tick_t time_window; float alarm_threshold; - int64_t repetition_time; + vlc_tick_t repetition_time; int counter; ValueDate_t* first; ValueDate_t* last; @@ -126,9 +126,9 @@ p_sys->bargraph = !!var_CreateGetInteger(p_filter, CFG_PREFIX "bargraph"); p_sys->bargraph_repetition = var_CreateGetInteger(p_filter, CFG_PREFIX "bargraph_repetition"); p_sys->silence = !!var_CreateGetInteger(p_filter, CFG_PREFIX "silence"); - p_sys->time_window = var_CreateGetInteger(p_filter, CFG_PREFIX "time_window") * 1000; + p_sys->time_window = VLC_TICK_FROM_MS( var_CreateGetInteger(p_filter, CFG_PREFIX "time_window") ); p_sys->alarm_threshold = var_CreateGetFloat(p_filter, CFG_PREFIX "alarm_threshold"); - p_sys->repetition_time = var_CreateGetInteger(p_filter, CFG_PREFIX "repetition_time") * 1000; + p_sys->repetition_time = VLC_TICK_FROM_MS( var_CreateGetInteger(p_filter, CFG_PREFIX "repetition_time") ); p_sys->counter = 0; p_sys->first = NULL; p_sys->last = NULL; diff -Nru vlc-3.0.21/modules/audio_filter/channel_mixer/spatialaudio.cpp vlc-3.0.22/modules/audio_filter/channel_mixer/spatialaudio.cpp --- vlc-3.0.21/modules/audio_filter/channel_mixer/spatialaudio.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/audio_filter/channel_mixer/spatialaudio.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -28,7 +28,7 @@ # include "config.h" #endif -#include +#include #include #include diff -Nru vlc-3.0.21/modules/audio_output/Makefile.am vlc-3.0.22/modules/audio_output/Makefile.am --- vlc-3.0.21/modules/audio_output/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/audio_output/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -1,5 +1,9 @@ aoutdir = $(pluginsdir)/audio_output aout_LTLIBRARIES = +# Install the pkglib/pkglibexec first before relinking the modules. +# This ensures libtool re-linking is not racy. +installaoutLTLIBRARIES = install-aoutLTLIBRARIES +$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES libopensles_android_plugin_la_SOURCES = audio_output/opensles_android.c libopensles_android_plugin_la_LIBADD = $(LIBDL) $(LIBM) diff -Nru vlc-3.0.21/modules/audio_output/waveout.c vlc-3.0.22/modules/audio_output/waveout.c --- vlc-3.0.21/modules/audio_output/waveout.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/audio_output/waveout.c 2025-11-13 22:17:54.000000000 +0000 @@ -356,7 +356,7 @@ if( block && p_aout->sys->chans_to_reorder ) { aout_ChannelReorder( block->p_buffer, block->i_buffer, - p_aout->sys->waveformat.Format.nChannels, + p_aout->sys->chans_to_reorder, p_aout->sys->chan_table, p_aout->sys->format ); } while( PlayWaveOut( p_aout, p_aout->sys->h_waveout, p_waveheader, block, diff -Nru vlc-3.0.21/modules/codec/Makefile.am vlc-3.0.22/modules/codec/Makefile.am --- vlc-3.0.21/modules/codec/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -416,7 +416,7 @@ codec/avcodec/vaapi.c hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h libvaapi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS) -libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) +libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(AVCODEC_LIBS) if HAVE_AVCODEC_VAAPI if HAVE_VAAPI_DRM codec_LTLIBRARIES += libvaapi_drm_plugin.la diff -Nru vlc-3.0.21/modules/codec/a52.c vlc-3.0.22/modules/codec/a52.c --- vlc-3.0.21/modules/codec/a52.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/a52.c 2025-11-13 22:17:54.000000000 +0000 @@ -32,6 +32,8 @@ * be subject to the terms of that later license. *****************************************************************************/ +#warning This module is not officially supported anymore + #ifdef HAVE_CONFIG_H # include "config.h" #endif diff -Nru vlc-3.0.21/modules/codec/aes3.c vlc-3.0.22/modules/codec/aes3.c --- vlc-3.0.21/modules/codec/aes3.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/aes3.c 2025-11-13 22:17:54.000000000 +0000 @@ -268,6 +268,9 @@ { decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != AUDIO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_302M ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/codec/aom.c vlc-3.0.22/modules/codec/aom.c --- vlc-3.0.21/modules/codec/aom.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/aom.c 2025-11-13 22:17:54.000000000 +0000 @@ -89,38 +89,43 @@ vlc_fourcc_t i_chroma; enum aom_img_fmt i_chroma_id; uint8_t i_bitdepth; - uint8_t i_needs_hack; - + enum aom_transfer_characteristics transfer_characteristics; + enum aom_color_primaries color_primaries; + enum aom_matrix_coefficients matrix_coefficients; } chroma_table[] = { - { VLC_CODEC_I420, AOM_IMG_FMT_I420, 8, 0 }, - { VLC_CODEC_I422, AOM_IMG_FMT_I422, 8, 0 }, - { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, 0 }, + /* Transfer characteristic-dependent mappings must come first */ + { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, AOM_CICP_TC_SRGB, AOM_CICP_CP_BT_709, AOM_CICP_MC_IDENTITY }, + { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, AOM_CICP_TC_SRGB , AOM_CICP_CP_BT_709, AOM_CICP_MC_IDENTITY }, - { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 }, + { VLC_CODEC_I420, AOM_IMG_FMT_I420, 8, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, + { VLC_CODEC_I422, AOM_IMG_FMT_I422, 8, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, + { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, - { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 }, - { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 }, + { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, - { VLC_CODEC_I420_10L, AOM_IMG_FMT_I42016, 10, 0 }, - { VLC_CODEC_I422_10L, AOM_IMG_FMT_I42216, 10, 0 }, - { VLC_CODEC_I444_10L, AOM_IMG_FMT_I44416, 10, 0 }, + { VLC_CODEC_I420_10L, AOM_IMG_FMT_I42016, 10, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, + { VLC_CODEC_I422_10L, AOM_IMG_FMT_I42216, 10, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, + { VLC_CODEC_I444_10L, AOM_IMG_FMT_I44416, 10, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, - { VLC_CODEC_I420_12L, AOM_IMG_FMT_I42016, 12, 0 }, - { VLC_CODEC_I422_12L, AOM_IMG_FMT_I42216, 12, 0 }, - { VLC_CODEC_I444_12L, AOM_IMG_FMT_I44416, 12, 0 }, + { VLC_CODEC_I420_12L, AOM_IMG_FMT_I42016, 12, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, + { VLC_CODEC_I422_12L, AOM_IMG_FMT_I42216, 12, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, + { VLC_CODEC_I444_12L, AOM_IMG_FMT_I44416, 12, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, - { VLC_CODEC_I444_16L, AOM_IMG_FMT_I44416, 16, 0 }, + { VLC_CODEC_I444_16L, AOM_IMG_FMT_I44416, 16, AOM_CICP_TC_UNSPECIFIED, AOM_CICP_CP_UNSPECIFIED, AOM_CICP_MC_UNSPECIFIED }, }; static vlc_fourcc_t FindVlcChroma( struct aom_image *img ) { - uint8_t hack = (img->fmt & AOM_IMG_FMT_I444) && (img->tc == AOM_CICP_TC_SRGB); - for( unsigned int i = 0; i < ARRAY_SIZE(chroma_table); i++ ) if( chroma_table[i].i_chroma_id == img->fmt && chroma_table[i].i_bitdepth == img->bit_depth && - chroma_table[i].i_needs_hack == hack ) + ( chroma_table[i].transfer_characteristics == AOM_CICP_TC_UNSPECIFIED || + chroma_table[i].transfer_characteristics == img->tc ) && + ( chroma_table[i].color_primaries == AOM_CICP_CP_UNSPECIFIED || + chroma_table[i].color_primaries == img->cp ) && + ( chroma_table[i].matrix_coefficients == AOM_CICP_MC_UNSPECIFIED || + chroma_table[i].matrix_coefficients == img->mc ) ) return chroma_table[i].i_chroma; return 0; diff -Nru vlc-3.0.21/modules/codec/avcodec/audio.c vlc-3.0.22/modules/codec/avcodec/audio.c --- vlc-3.0.21/modules/codec/avcodec/audio.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/audio.c 2025-11-13 22:17:54.000000000 +0000 @@ -41,8 +41,13 @@ #include #include -#include +#define API_CHANNEL_LAYOUT_STRUCT (LIBAVCODEC_VERSION_CHECK(59, 24, 100)) // AVCodecContext.ch_layout +#define API_CHANNEL_LAYOUT (LIBAV_UTIL_VERSION_CHECK( 52, 2, 6, 0, 100)) + +#if API_CHANNEL_LAYOUT +# include +#endif /***************************************************************************** * decoder_sys_t : decoder descriptor @@ -139,7 +144,11 @@ } ctx->sample_rate = p_dec->fmt_in.audio.i_rate; +#if API_CHANNEL_LAYOUT_STRUCT && LIBAVUTIL_VERSION_CHECK(57, 24, 100) + av_channel_layout_default( &ctx->ch_layout, p_dec->fmt_in.audio.i_channels ); +#else ctx->channels = p_dec->fmt_in.audio.i_channels; +#endif ctx->block_align = p_dec->fmt_in.audio.i_blockalign; ctx->bit_rate = p_dec->fmt_in.i_bitrate; ctx->bits_per_coded_sample = p_dec->fmt_in.audio.i_bitspersample; @@ -302,7 +311,12 @@ && !avcodec_is_open( ctx ) ) { InitDecoderConfig( p_dec, ctx ); - OpenAudioCodec( p_dec ); + if( OpenAudioCodec( p_dec ) < 0 ) + { + if( pp_block != NULL && *pp_block != NULL ) + block_Release( *pp_block ); + return VLCDEC_ECRITICAL; + } } if( !avcodec_is_open( ctx ) ) @@ -395,12 +409,17 @@ ret = avcodec_receive_frame( ctx, frame ); if( ret == 0 ) { +#if LIBAVUTIL_VERSION_CHECK(57, 24, 100) + int channels = frame->ch_layout.nb_channels; +#else + int channels = ctx->channels; +#endif /* checks and init from first decoded frame */ - if( ctx->channels <= 0 || ctx->channels > INPUT_CHAN_MAX + if( channels <= 0 || channels > INPUT_CHAN_MAX || ctx->sample_rate <= 0 ) { msg_Warn( p_dec, "invalid audio properties channels count %d, sample rate %d", - ctx->channels, ctx->sample_rate ); + channels, ctx->sample_rate ); goto drop; } else if( p_dec->fmt_out.audio.i_rate != (unsigned int)ctx->sample_rate ) @@ -484,15 +503,15 @@ /* Interleave audio if required */ if( av_sample_fmt_is_planar( ctx->sample_fmt ) ) { - p_block = block_Alloc(frame->linesize[0] * ctx->channels); + p_block = block_Alloc(frame->linesize[0] * p_dec->fmt_out.audio.i_channels ); if ( likely(p_block) ) { - const void *planes[ctx->channels]; - for (int i = 0; i < ctx->channels; i++) + const void *planes[p_dec->fmt_out.audio.i_channels]; + for (int i = 0; i < p_dec->fmt_out.audio.i_channels; i++) planes[i] = frame->extended_data[i]; aout_Interleave(p_block->p_buffer, planes, frame->nb_samples, - ctx->channels, p_dec->fmt_out.audio.i_format); + p_dec->fmt_out.audio.i_channels, p_dec->fmt_out.audio.i_format); p_block->i_nb_samples = frame->nb_samples; } av_frame_free(&frame); @@ -511,7 +530,7 @@ { aout_ChannelExtract( p_buffer->p_buffer, p_dec->fmt_out.audio.i_channels, - p_block->p_buffer, ctx->channels, + p_block->p_buffer, p_dec->fmt_out.audio.i_channels, p_block->i_nb_samples, p_sys->pi_extraction, p_dec->fmt_out.audio.i_bitspersample ); p_buffer->i_nb_samples = p_block->i_nb_samples; @@ -541,7 +560,7 @@ [AV_SAMPLE_FMT_FLTP] = VLC_CODEC_FL32, [AV_SAMPLE_FMT_DBLP] = VLC_CODEC_FL64, }; - if( (sizeof(fcc) / sizeof(fcc[0])) > (unsigned)fmt ) + if( ARRAY_SIZE(fcc) > (unsigned)fmt ) return fcc[fmt]; return VLC_CODEC_S16N; } @@ -568,6 +587,7 @@ { AV_CH_TOP_BACK_RIGHT, 0 }, { AV_CH_STEREO_LEFT, 0 }, { AV_CH_STEREO_RIGHT, 0 }, + { 0, 0 }, }; static void SetupOutputFormat( decoder_t *p_dec, bool b_trust ) @@ -580,6 +600,16 @@ p_dec->fmt_out.audio.i_rate = p_sys->p_context->sample_rate; /* */ +#if API_CHANNEL_LAYOUT_STRUCT + if( p_sys->i_previous_channels == p_sys->p_context->ch_layout.nb_channels && + p_sys->i_previous_layout == p_sys->p_context->ch_layout.u.mask ) + return; + if( b_trust ) + { + p_sys->i_previous_channels = p_sys->p_context->ch_layout.nb_channels; + p_sys->i_previous_layout = p_sys->p_context->ch_layout.u.mask; + } +#elif API_CHANNEL_LAYOUT if( p_sys->i_previous_channels == p_sys->p_context->channels && p_sys->i_previous_layout == p_sys->p_context->channel_layout ) return; @@ -588,25 +618,35 @@ p_sys->i_previous_channels = p_sys->p_context->channels; p_sys->i_previous_layout = p_sys->p_context->channel_layout; } +#endif - const unsigned i_order_max = sizeof(pi_channels_map)/sizeof(*pi_channels_map); - uint32_t pi_order_src[i_order_max]; + uint32_t pi_order_src[AOUT_CHAN_MAX] = { 0 }; - int i_channels_src = 0; - int64_t channel_layout = + int i_channels_src = 0, channel_count; + uint64_t channel_layout_mask; +#if API_CHANNEL_LAYOUT_STRUCT + channel_layout_mask = p_sys->p_context->ch_layout.u.mask; + channel_count = p_sys->p_context->ch_layout.nb_channels; +#elif API_CHANNEL_LAYOUT + channel_layout_mask = p_sys->p_context->channel_layout ? p_sys->p_context->channel_layout : - av_get_default_channel_layout( p_sys->p_context->channels ); + (uint64_t)av_get_default_channel_layout( p_sys->p_context->channels ); + channel_count = p_sys->p_context->channels; +#else + channel_layout_mask = NULL; + channel_count = p_sys->p_context->channels; +#endif - if( channel_layout ) + if( channel_layout_mask ) { - for( unsigned i = 0; i < i_order_max - && i_channels_src < p_sys->p_context->channels; i++ ) + for( unsigned i = 0; pi_channels_map[i][0] + && i_channels_src < channel_count; i++ ) { - if( channel_layout & pi_channels_map[i][0] ) + if( channel_layout_mask & pi_channels_map[i][0] ) pi_order_src[i_channels_src++] = pi_channels_map[i][1]; } - if( i_channels_src != p_sys->p_context->channels && b_trust ) + if( i_channels_src != channel_count && b_trust ) msg_Err( p_dec, "Channel layout not understood" ); /* Detect special dual mono case */ @@ -638,7 +678,7 @@ { msg_Warn( p_dec, "no channel layout found"); p_dec->fmt_out.audio.i_physical_channels = 0; - p_dec->fmt_out.audio.i_channels = p_sys->p_context->channels; + p_dec->fmt_out.audio.i_channels = channel_count; } aout_FormatPrepare( &p_dec->fmt_out.audio ); diff -Nru vlc-3.0.21/modules/codec/avcodec/avcommon.h vlc-3.0.22/modules/codec/avcodec/avcommon.h --- vlc-3.0.21/modules/codec/avcodec/avcommon.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/avcommon.h 2025-11-13 22:17:54.000000000 +0000 @@ -106,7 +106,7 @@ avformat_network_init(); -#if (LIBAVFORMAT_VERSION_MICRO < 100) || (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)) +#if (LIBAVFORMAT_VERSION_MICRO < 100) || !(LIBAVFORMAT_VERSION_CHECK(58, 9, 100)) av_register_all(); #endif @@ -123,7 +123,7 @@ vlc_init_avutil(obj); -#if (LIBAVFORMAT_VERSION_MICRO < 100) || (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)) +#if (LIBAVFORMAT_VERSION_MICRO < 100) || !(LIBAVCODEC_VERSION_CHECK(58, 10, 100)) avcodec_register_all(); #endif diff -Nru vlc-3.0.21/modules/codec/avcodec/avcommon_compat.h vlc-3.0.22/modules/codec/avcodec/avcommon_compat.h --- vlc-3.0.21/modules/codec/avcodec/avcommon_compat.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/avcommon_compat.h 2025-11-13 22:17:54.000000000 +0000 @@ -30,11 +30,15 @@ #ifdef HAVE_LIBAVCODEC_AVCODEC_H #include -/* LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg +/* check the FFmpeg libavutil version */ +#define LIBAVCODEC_VERSION_CHECK( a, d, e ) \ + (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) + +/* LIBAV_CODEC_VERSION_CHECK checks for the right version of libav and FFmpeg * a is the major version * b and c the minor and micro versions of libav * d and e the minor and micro versions of FFmpeg */ -#define LIBAVCODEC_VERSION_CHECK( a, b, c, d, e ) \ +#define LIBAV_CODEC_VERSION_CHECK( a, b, c, d, e ) \ ( (LIBAVCODEC_VERSION_MICRO < 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) @@ -77,21 +81,31 @@ #ifndef FF_MAX_B_FRAMES # define FF_MAX_B_FRAMES 16 // FIXME: remove this #endif +#ifndef FF_API_AVIO_WRITE_NONCONST // removed in ffmpeg 7 +# define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61) +#endif +#ifndef FF_API_STRUCT_VAAPI_CONTEXT +# define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* HAVE_LIBAVCODEC_AVCODEC_H */ #ifdef HAVE_LIBAVUTIL_AVUTIL_H # include -/* LIBAVUTIL_VERSION_CHECK checks for the right version of libav and FFmpeg +/* check the FFmpeg libavutil version */ +#define LIBAVUTIL_VERSION_CHECK( a, d, e ) \ + (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) + +/* LIBAV_UTIL_VERSION_CHECK checks for the right libavutil version of libav and FFmpeg * a is the major version * b and c the minor and micro versions of libav * d and e the minor and micro versions of FFmpeg */ -#define LIBAVUTIL_VERSION_CHECK( a, b, c, d, e ) \ +#define LIBAV_UTIL_VERSION_CHECK( a, b, c, d, e ) \ ( (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) -#if !LIBAVUTIL_VERSION_CHECK( 52, 11, 0, 32, 100 ) +#if !LIBAV_UTIL_VERSION_CHECK( 52, 11, 0, 32, 100 ) # define AV_PIX_FMT_FLAG_HWACCEL PIX_FMT_HWACCEL #endif @@ -119,7 +133,15 @@ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H # include -#define LIBAVFORMAT_VERSION_CHECK( a, b, c, d, e ) \ +/* check the FFmpeg libavformat version */ +#define LIBAVFORMAT_VERSION_CHECK( a, d, e ) \ + (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) + +/* LIBAV_FORMAT_VERSION_CHECK checks for the right libavformat version of libav and FFmpeg + * a is the major version + * b and c the minor and micro versions of libav + * d and e the minor and micro versions of FFmpeg */ +#define LIBAV_FORMAT_VERSION_CHECK( a, b, c, d, e ) \ ( (LIBAVFORMAT_VERSION_MICRO < 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) diff -Nru vlc-3.0.21/modules/codec/avcodec/chroma.c vlc-3.0.22/modules/codec/avcodec/chroma.c --- vlc-3.0.21/modules/codec/avcodec/chroma.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/chroma.c 2025-11-13 22:17:54.000000000 +0000 @@ -86,7 +86,7 @@ {VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE, 0, 0, 0 }, {VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE, 0, 0, 0 }, {VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE, 0, 0, 0 }, -#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 17, 100 ) ) +#if LIBAVUTIL_VERSION_CHECK( 54, 17, 100 ) {VLC_CODEC_I420_12L, AV_PIX_FMT_YUV420P12LE, 0, 0, 0 }, {VLC_CODEC_I420_12B, AV_PIX_FMT_YUV420P12BE, 0, 0, 0 }, #endif @@ -100,7 +100,7 @@ {VLC_CODEC_I422_9B, AV_PIX_FMT_YUV422P9BE, 0, 0, 0 }, {VLC_CODEC_I422_10L, AV_PIX_FMT_YUV422P10LE, 0, 0, 0 }, {VLC_CODEC_I422_10B, AV_PIX_FMT_YUV422P10BE, 0, 0, 0 }, -#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 17, 100 ) ) +#if LIBAVUTIL_VERSION_CHECK( 54, 17, 100 ) {VLC_CODEC_I422_12L, AV_PIX_FMT_YUV422P12LE, 0, 0, 0 }, {VLC_CODEC_I422_12B, AV_PIX_FMT_YUV422P12BE, 0, 0, 0 }, #endif @@ -111,12 +111,17 @@ {VLC_CODEC_YUVA_444_10L, AV_PIX_FMT_YUVA444P10LE, 0, 0, 0 }, {VLC_CODEC_YUVA_444_10B, AV_PIX_FMT_YUVA444P10BE, 0, 0, 0 }, + /* FFmpeg only */ +#if LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 24, 101) + {VLC_CODEC_YUVA_444_12L, AV_PIX_FMT_YUVA444P12LE, 0, 0, 0 }, + {VLC_CODEC_YUVA_444_12B, AV_PIX_FMT_YUVA444P12BE, 0, 0, 0 }, +#endif {VLC_CODEC_I444_9L, AV_PIX_FMT_YUV444P9LE, 0, 0, 0 }, {VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE, 0, 0, 0 }, {VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE, 0, 0, 0 }, {VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE, 0, 0, 0 }, -#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 17, 100 ) ) +#if LIBAVUTIL_VERSION_CHECK( 54, 17, 100 ) {VLC_CODEC_I444_12L, AV_PIX_FMT_YUV444P12LE, 0, 0, 0 }, {VLC_CODEC_I444_12B, AV_PIX_FMT_YUV444P12BE, 0, 0, 0 }, #endif @@ -145,7 +150,7 @@ VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_0RGB32, 0x000000ff, 0x0000ff00, 0x00ff0000 ) #endif -#if (LIBAVUTIL_VERSION_MICRO == 0 || LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 0, 100 ) ) +#if (LIBAVUTIL_VERSION_MICRO == 0 || LIBAVUTIL_VERSION_CHECK( 55, 0, 100 ) ) #ifdef WORDS_BIGENDIAN {VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64BE, 0, 0, 0 }, #else /* !WORDS_BIGENDIAN */ @@ -180,7 +185,7 @@ {VLC_CODEC_GBR_PLANAR_16B, AV_PIX_FMT_GBRP16BE, 0, 0, 0 }, /* XYZ */ -#if LIBAVUTIL_VERSION_CHECK(52, 10, 0, 25, 100) +#if LIBAV_UTIL_VERSION_CHECK(52, 10, 0, 25, 100) {VLC_CODEC_XYZ12, AV_PIX_FMT_XYZ12, 0xfff0, 0xfff0, 0xfff0}, #endif { 0, 0, 0, 0, 0 } diff -Nru vlc-3.0.21/modules/codec/avcodec/d3d11va.c vlc-3.0.22/modules/codec/avcodec/d3d11va.c --- vlc-3.0.21/modules/codec/avcodec/d3d11va.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/d3d11va.c 2025-11-13 22:17:54.000000000 +0000 @@ -55,6 +55,10 @@ #define D3D_DecoderSurface ID3D11VideoDecoderOutputView #include "directx_va.h" +#ifndef FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO +# define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 // moved to libavcodec/dxva2_internal.h :/ +#endif + 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 **); @@ -72,7 +76,7 @@ * So we get the surfaces from the decoder pool when needed. We don't need to * extract the decoded surface into the decoder picture anymore. */ -#define D3D11_DIRECT_DECODE LIBAVCODEC_VERSION_CHECK( 57, 30, 3, 72, 101 ) +#define D3D11_DIRECT_DECODE LIBAV_CODEC_VERSION_CHECK( 57, 30, 3, 72, 101 ) #include /* must be last included to not redefine existing GUIDs */ @@ -760,7 +764,7 @@ assert(texDesc.Format == sys->render); assert(texDesc.BindFlags & D3D11_BIND_DECODER); -#if !LIBAVCODEC_VERSION_CHECK( 57, 27, 2, 61, 102 ) +#if !LIBAV_CODEC_VERSION_CHECK( 57, 27, 2, 61, 102 ) if (pic->p_sys->slice_index != surface_idx) { msg_Warn(va, "d3d11va requires decoding slices to be the first in the texture (%d/%d)", diff -Nru vlc-3.0.21/modules/codec/avcodec/directx_va.c vlc-3.0.22/modules/codec/avcodec/directx_va.c --- vlc-3.0.21/modules/codec/avcodec/directx_va.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/directx_va.c 2025-11-13 22:17:54.000000000 +0000 @@ -100,11 +100,13 @@ MS_GUID (DXVA2_ModeMPEG2_MoComp, 0xe6a9f44b, 0x61b0, 0x4563, 0x9e, 0xa4, 0x63, 0xd2, 0xa3, 0xc6, 0xfe, 0x66); MS_GUID (DXVA2_ModeMPEG2_IDCT, 0xbf22ad00, 0x03ea, 0x4690, 0x80, 0x77, 0x47, 0x33, 0x46, 0x20, 0x9b, 0x7e); MS_GUID (DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28, 0x4e65, 0xbe, 0xea, 0x1d, 0x26, 0xb5, 0x08, 0xad, 0xc9); +#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 13 DEFINE_GUID(DXVA_ModeMPEG1_A, 0x1b81be09, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); DEFINE_GUID(DXVA_ModeMPEG2_A, 0x1b81be0A, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); DEFINE_GUID(DXVA_ModeMPEG2_B, 0x1b81be0B, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); DEFINE_GUID(DXVA_ModeMPEG2_C, 0x1b81be0C, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); DEFINE_GUID(DXVA_ModeMPEG2_D, 0x1b81be0D, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); +#endif DEFINE_GUID(DXVA2_ModeMPEG2and1_VLD, 0x86695f12, 0x340e, 0x4f04, 0x9f, 0xd3, 0x92, 0x53, 0xdd, 0x32, 0x74, 0x60); DEFINE_GUID(DXVA2_ModeMPEG1_VLD, 0x6f3ec719, 0x3735, 0x42cc, 0x80, 0x63, 0x65, 0xcc, 0x3c, 0xb3, 0x66, 0x16); @@ -115,7 +117,9 @@ MS_GUID (DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); MS_GUID (DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); DEFINE_GUID(DXVA_ModeH264_VLD_Multiview, 0x9901CCD3, 0xca12, 0x4b7e, 0x86, 0x7a, 0xe2, 0x22, 0x3d, 0x92, 0x55, 0xc3); // MVC +#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 13 DEFINE_GUID(DXVA_ModeH264_VLD_WithFMOASO_NoFGT, 0xd5f04ff9, 0x3418, 0x45d8, 0x95, 0x61, 0x32, 0xa7, 0x6a, 0xae, 0x2d, 0xdd); +#endif DEFINE_GUID(DXVADDI_Intel_ModeH264_A, 0x604F8E64, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6); DEFINE_GUID(DXVADDI_Intel_ModeH264_C, 0x604F8E66, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6); DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6); @@ -137,23 +141,28 @@ DEFINE_GUID(DXVA_Intel_VC1_ClearVideo_2, 0xE07EC519, 0xE651, 0x4CD6, 0xAC, 0x84, 0x13, 0x70, 0xCC, 0xEE, 0xC8, 0x51); DEFINE_GUID(DXVA_nVidia_MPEG4_ASP, 0x9947EC6F, 0x689B, 0x11DC, 0xA3, 0x20, 0x00, 0x19, 0xDB, 0xBC, 0x41, 0x84); +#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 13 DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_Simple, 0xefd64d74, 0xc9e8, 0x41d7, 0xa5, 0xe9, 0xe9, 0xb0, 0xe3, 0x9f, 0xa3, 0x19); DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0xed418a9f, 0x010d, 0x4eda, 0x9a, 0xe3, 0x9a, 0x65, 0x35, 0x8d, 0x8d, 0x2e); DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0xab998b5b, 0x4258, 0x44a9, 0x9f, 0xeb, 0x94, 0xe5, 0x97, 0xa6, 0xba, 0xae); +#endif DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 0x7C74ADC6, 0xe2ba, 0x4ade, 0x86, 0xde, 0x30, 0xbe, 0xab, 0xb4, 0x0c, 0xc1); +#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 13 DEFINE_GUID(DXVA_ModeHEVC_VLD_Main, 0x5b11d51b, 0x2f4c, 0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0); DEFINE_GUID(DXVA_ModeHEVC_VLD_Main10, 0x107af0e0, 0xef1a, 0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13); DEFINE_GUID(DXVA_ModeH264_VLD_Stereo_Progressive_NoFGT, 0xd79be8da, 0x0cf1, 0x4c81,0xb8,0x2a,0x69,0xa4,0xe2,0x36,0xf4,0x3d); DEFINE_GUID(DXVA_ModeH264_VLD_Stereo_NoFGT, 0xf9aaccbb, 0xc2b6, 0x4cfc,0x87,0x79,0x57,0x07,0xb1,0x76,0x05,0x52); DEFINE_GUID(DXVA_ModeH264_VLD_Multiview_NoFGT, 0x705b9d82, 0x76cf, 0x49d6,0xb7,0xe6,0xac,0x88,0x72,0xdb,0x01,0x3c); +#endif DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Scalable_Baseline, 0xc30700c4, 0xe384, 0x43e0, 0xb9, 0x82, 0x2d, 0x89, 0xee, 0x7f, 0x77, 0xc4); DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 0x9b8175d4, 0xd670, 0x4cf2, 0xa9, 0xf0, 0xfa, 0x56, 0xdf, 0x71, 0xa1, 0xae); DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Scalable_High, 0x728012c9, 0x66a8, 0x422f, 0x97, 0xe9, 0xb5, 0xe3, 0x9b, 0x51, 0xc0, 0x53); DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Restricted_Scalable_High_Progressive, 0x8efa5926, 0xbd9e, 0x4b04, 0x8b, 0x72, 0x8f, 0x97, 0x7d, 0xc4, 0x4c, 0x36); +#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 13 DEFINE_GUID(DXVA_ModeH261_A, 0x1b81be01, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); DEFINE_GUID(DXVA_ModeH261_B, 0x1b81be02, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); @@ -167,6 +176,7 @@ DEFINE_GUID(DXVA_ModeVP8_VLD, 0x90b899ea, 0x3a62, 0x4705, 0x88, 0xb3, 0x8d, 0xf0, 0x4b, 0x27, 0x44, 0xe7); DEFINE_GUID(DXVA_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0, 0x4585, 0x87, 0x6d, 0x83, 0xaa, 0x6d, 0x60, 0xb8, 0x9e); DEFINE_GUID(DXVA_ModeVP9_VLD_10bit_Profile2, 0xa4c749ef, 0x6ecf, 0x48aa, 0x84, 0x48, 0x50, 0xa7, 0xa1, 0x16, 0x5f, 0xf7); +#endif DEFINE_GUID(DXVA_ModeVP9_VLD_Intel, 0x76988a52, 0xdf13, 0x419a, 0x8e, 0x64, 0xff, 0xcf, 0x4a, 0x33, 0x6c, 0xf5); #ifndef _DIRECTX_AV1_VA_ @@ -274,7 +284,7 @@ /* VPx */ { "VP8", &DXVA_ModeVP8_VLD, 8, 0, NULL }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 57, 17, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100 +#if LIBAVCODEC_VERSION_CHECK( 57, 17, 100 ) { "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 @@ -284,7 +294,7 @@ { "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 +#if LIBAVCODEC_VERSION_CHECK( 58, 112, 103 ) { "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 }, diff -Nru vlc-3.0.21/modules/codec/avcodec/dxva2.c vlc-3.0.22/modules/codec/avcodec/dxva2.c --- vlc-3.0.21/modules/codec/avcodec/dxva2.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/dxva2.c 2025-11-13 22:17:54.000000000 +0000 @@ -43,6 +43,10 @@ #define D3D_DecoderSurface IDirect3DSurface9 #include "directx_va.h" +#ifndef FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO +# define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 // moved to libavcodec/dxva2_internal.h :/ +#endif + 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 **); diff -Nru vlc-3.0.21/modules/codec/avcodec/encoder.c vlc-3.0.22/modules/codec/avcodec/encoder.c --- vlc-3.0.21/modules/codec/avcodec/encoder.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/encoder.c 2025-11-13 22:17:54.000000000 +0000 @@ -43,12 +43,15 @@ #include #include -#include #include "avcodec.h" #include "avcommon.h" -#if LIBAVUTIL_VERSION_CHECK( 52,2,6,0,0 ) +#define API_CHANNEL_LAYOUT_STRUCT (LIBAVCODEC_VERSION_CHECK(59, 24, 100)) // AVCodecContext.ch_layout + +#define API_CHANNEL_LAYOUT (LIBAV_UTIL_VERSION_CHECK( 52, 2, 6, 0, 100)) + +#if API_CHANNEL_LAYOUT # include #endif @@ -60,8 +63,7 @@ #define RAW_AUDIO_FRAME_SIZE (2048) -#if LIBAVCODEC_VERSION_MICRO >= 100 && \ - LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 0, 100) +#if LIBAVCODEC_VERSION_CHECK(59, 0, 100) # define AVC_MAYBE_CONST const #else # define AVC_MAYBE_CONST @@ -157,6 +159,7 @@ /* Taken from audio.c*/ +#if API_CHANNEL_LAYOUT static const uint64_t pi_channels_map[][2] = { { AV_CH_FRONT_LEFT, AOUT_CHAN_LEFT }, @@ -181,6 +184,7 @@ { AV_CH_STEREO_RIGHT, 0 }, }; +# if !API_CHANNEL_LAYOUT_STRUCT static const uint32_t channel_mask[][2] = { {0,0}, {AOUT_CHAN_CENTER, AV_CH_LAYOUT_MONO}, @@ -193,6 +197,8 @@ {AOUT_CHANS_7_1, AV_CH_LAYOUT_7POINT1}, {AOUT_CHANS_8_1, AV_CH_LAYOUT_OCTAGONAL}, }; +# endif +#endif static const char *const ppsz_enc_options[] = { "keyint", "bframes", "vt", "qmin", "qmax", "codec", "hq", @@ -252,19 +258,29 @@ ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4V ? 25 : CLOCK_FREQ ); msg_Dbg( p_enc, "Time base for probing set to %d/%d", p_context->time_base.num, p_context->time_base.den ); - if( p_codec->supported_framerates ) + + const AVRational *supported_framerates; +#if LIBAVCODEC_VERSION_CHECK( 61, 13, 100 ) + if (avcodec_get_supported_config(p_context, p_codec, AV_CODEC_CONFIG_FRAME_RATE, 0, + (const void **)&supported_framerates, NULL) < 0) + supported_framerates = NULL; +#else + supported_framerates = p_codec->supported_framerates; +#endif + + if( supported_framerates ) { /* We are finding fps values so 1/time_base */ AVRational target = { .num = p_context->time_base.den, .den = p_context->time_base.num }; - int idx = av_find_nearest_q_idx(target, p_codec->supported_framerates); + int idx = av_find_nearest_q_idx(target, supported_framerates); - p_context->time_base.num = p_codec->supported_framerates[idx].den ? - p_codec->supported_framerates[idx].den : 1; - p_context->time_base.den = p_codec->supported_framerates[idx].den ? - p_codec->supported_framerates[idx].num : CLOCK_FREQ; + p_context->time_base.num = supported_framerates[idx].den ? + supported_framerates[idx].den : 1; + p_context->time_base.den = supported_framerates[idx].den ? + supported_framerates[idx].num : CLOCK_FREQ; /* If we have something reasonable on supported framerates, use that*/ if( p_context->time_base.den && p_context->time_base.den < CLOCK_FREQ ) @@ -553,7 +569,16 @@ p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec; GetFfmpegChroma( &p_context->pix_fmt, &p_enc->fmt_in.video ); - if( p_codec->pix_fmts ) + const enum AVPixelFormat *pix_fmts; +#if LIBAVCODEC_VERSION_CHECK( 61, 13, 100 ) + if (avcodec_get_supported_config(p_context, p_codec, AV_CODEC_CONFIG_PIX_FORMAT, 0, + (const void **)&pix_fmts, NULL) < 0) + pix_fmts = NULL; +#else + pix_fmts = p_codec->pix_fmts; +#endif + + if( pix_fmts ) { static const enum AVPixelFormat vlc_pix_fmts[] = { AV_PIX_FMT_YUV420P, @@ -561,8 +586,8 @@ AV_PIX_FMT_RGB24, }; bool found = false; - const enum PixelFormat *p = p_codec->pix_fmts; - for( ; !found && *p != -1; p++ ) + const enum AVPixelFormat *p = pix_fmts; + for( ; !found && *p != AV_PIX_FMT_NONE; p++ ) { for( size_t i = 0; i < ARRAY_SIZE(vlc_pix_fmts); ++i ) { @@ -574,7 +599,7 @@ } } } - if (!found) p_context->pix_fmt = p_codec->pix_fmts[0]; + if (!found) p_context->pix_fmt = pix_fmts[0]; GetVlcChroma( &p_enc->fmt_in.video, p_context->pix_fmt ); p_enc->fmt_in.i_codec = p_enc->fmt_in.video.i_chroma; } @@ -699,22 +724,29 @@ } else if( p_enc->fmt_in.i_cat == AUDIO_ES ) { + const enum AVSampleFormat *sample_fmts; +#if LIBAVCODEC_VERSION_CHECK( 61, 13, 100 ) + if (avcodec_get_supported_config(p_context, p_codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, + (const void **)&sample_fmts, NULL) < 0) + sample_fmts = NULL; +#else + sample_fmts = p_codec->sample_fmts; +#endif + p_context->codec_type = AVMEDIA_TYPE_AUDIO; - p_context->sample_fmt = p_codec->sample_fmts ? - p_codec->sample_fmts[0] : - AV_SAMPLE_FMT_S16; + p_context->sample_fmt = sample_fmts ? sample_fmts[0] : AV_SAMPLE_FMT_S16; /* Try to match avcodec input format to vlc format so we could avoid one format conversion */ if( GetVlcAudioFormat( p_context->sample_fmt ) != p_enc->fmt_in.i_codec - && p_codec->sample_fmts ) + && sample_fmts ) { msg_Dbg( p_enc, "Trying to find more suitable sample format instead of %s", av_get_sample_fmt_name( p_context->sample_fmt ) ); - for( unsigned int i=0; p_codec->sample_fmts[i] != -1; i++ ) + for( unsigned int i=0; sample_fmts[i] != AV_SAMPLE_FMT_NONE; i++ ) { - if( GetVlcAudioFormat( p_codec->sample_fmts[i] ) == p_enc->fmt_in.i_codec ) + if( GetVlcAudioFormat( sample_fmts[i] ) == p_enc->fmt_in.i_codec ) { - p_context->sample_fmt = p_codec->sample_fmts[i]; + p_context->sample_fmt = sample_fmts[i]; msg_Dbg( p_enc, "Using %s as new sample format", av_get_sample_fmt_name( p_context->sample_fmt ) ); break; } @@ -723,14 +755,14 @@ p_sys->b_planar = av_sample_fmt_is_planar( p_context->sample_fmt ); // Try if we can use interleaved format for codec input as VLC doesn't really do planar audio yet // FIXME: Remove when planar/interleaved audio in vlc is equally supported - if( p_sys->b_planar && p_codec->sample_fmts ) + if( p_sys->b_planar && sample_fmts ) { msg_Dbg( p_enc, "Trying to find packet sample format instead of planar %s", av_get_sample_fmt_name( p_context->sample_fmt ) ); - for( unsigned int i=0; p_codec->sample_fmts[i] != -1; i++ ) + for( unsigned int i=0; sample_fmts[i] != AV_SAMPLE_FMT_NONE; i++ ) { - if( !av_sample_fmt_is_planar( p_codec->sample_fmts[i] ) ) + if( !av_sample_fmt_is_planar( sample_fmts[i] ) ) { - p_context->sample_fmt = p_codec->sample_fmts[i]; + p_context->sample_fmt = sample_fmts[i]; msg_Dbg( p_enc, "Changing to packet format %s as new sample format", av_get_sample_fmt_name( p_context->sample_fmt ) ); break; } @@ -745,57 +777,46 @@ date_Set( &p_sys->buffer_date, AV_NOPTS_VALUE ); p_context->time_base.num = 1; p_context->time_base.den = p_context->sample_rate; - p_context->channels = p_enc->fmt_out.audio.i_channels; -#if LIBAVUTIL_VERSION_CHECK( 52, 2, 6, 0, 0) - p_context->channel_layout = channel_mask[p_context->channels][1]; - /* Setup Channel ordering for multichannel audio + /* Setup Channel ordering for audio * as VLC channel order isn't same as libavcodec expects */ p_sys->i_channels_to_reorder = 0; - /* Specified order + /* Create channel layout for avcodec * Copied from audio.c */ - const unsigned i_order_max = 8 * sizeof(p_context->channel_layout); - uint32_t pi_order_dst[AOUT_CHAN_MAX] = { }; +#if API_CHANNEL_LAYOUT + uint32_t pi_order_dst[AOUT_CHAN_MAX] = { 0 }; uint32_t order_mask = 0; int i_channels_src = 0; - - if( p_context->channel_layout ) - { - msg_Dbg( p_enc, "Creating channel order for reordering"); - for( unsigned i = 0; i < sizeof(pi_channels_map)/sizeof(*pi_channels_map); i++ ) - { - if( p_context->channel_layout & pi_channels_map[i][0] ) - { - msg_Dbg( p_enc, "%d %"PRIx64" mapped to %"PRIx64"", i_channels_src, pi_channels_map[i][0], pi_channels_map[i][1]); - pi_order_dst[i_channels_src++] = pi_channels_map[i][1]; - order_mask |= pi_channels_map[i][1]; - } - } - } - else + msg_Dbg( p_enc, "Creating channel order for reordering"); +# if API_CHANNEL_LAYOUT_STRUCT && LIBAVUTIL_VERSION_CHECK(57, 24, 100) + av_channel_layout_default( &p_context->ch_layout, p_enc->fmt_out.audio.i_channels ); + uint64_t channel_mask = p_context->ch_layout.u.mask; +# else + p_context->channels = p_enc->fmt_out.audio.i_channels; + p_context->channel_layout = channel_mask[p_context->channels][1]; + uint64_t channel_mask = p_context->channel_layout; +# endif + for( unsigned i = 0; i < sizeof(pi_channels_map)/sizeof(*pi_channels_map); i++ ) { - msg_Dbg( p_enc, "Creating default channel order for reordering"); - /* Create default order */ - for( unsigned int i = 0; i < __MIN( i_order_max, (unsigned)p_sys->p_context->channels ); i++ ) + if( channel_mask & pi_channels_map[i][0] ) { - if( i < sizeof(pi_channels_map)/sizeof(*pi_channels_map) ) - { - msg_Dbg( p_enc, "%d channel is %"PRIx64"", i_channels_src, pi_channels_map[i][1]); - pi_order_dst[i_channels_src++] = pi_channels_map[i][1]; - order_mask |= pi_channels_map[i][1]; - } + msg_Dbg( p_enc, "%d %"PRIx64" mapped to %"PRIx64"", i_channels_src, pi_channels_map[i][0], pi_channels_map[i][1]); + pi_order_dst[i_channels_src++] = pi_channels_map[i][1]; + order_mask |= pi_channels_map[i][1]; } } - if( i_channels_src != p_context->channels ) + if( i_channels_src != p_enc->fmt_out.audio.i_channels ) msg_Err( p_enc, "Channel layout not understood" ); p_sys->i_channels_to_reorder = aout_CheckChannelReorder( NULL, pi_order_dst, order_mask, p_sys->pi_reorder_layout ); +#else + p_context->channels = p_enc->fmt_out.audio.i_channels; #endif if ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4A ) @@ -897,7 +918,7 @@ if( ret ) { if( p_enc->fmt_in.i_cat != AUDIO_ES || - (p_context->channels <= 2 && i_codec_id != AV_CODEC_ID_MP2 + (p_enc->fmt_out.audio.i_channels <= 2 && i_codec_id != AV_CODEC_ID_MP2 && i_codec_id != AV_CODEC_ID_MP3) ) errmsg: { @@ -922,11 +943,16 @@ goto error; } - if( p_context->channels > 2 ) + if( p_enc->fmt_out.audio.i_channels > 2 ) { +#if API_CHANNEL_LAYOUT_STRUCT && LIBAVUTIL_VERSION_CHECK(57, 24, 100) + av_channel_layout_default( &p_context->ch_layout, 2 ); +#else p_context->channels = 2; +# if API_CHANNEL_LAYOUT p_context->channel_layout = channel_mask[p_context->channels][1]; - +# endif +#endif /* Change fmt_in in order to ask for a channels conversion */ p_enc->fmt_in.audio.i_channels = p_enc->fmt_out.audio.i_channels = 2; @@ -1028,7 +1054,7 @@ p_context->frame_size : AV_INPUT_BUFFER_MIN_SIZE; p_sys->i_buffer_out = av_samples_get_buffer_size(NULL, - p_sys->p_context->channels, p_sys->i_frame_size, + p_enc->fmt_out.audio.i_channels, p_sys->i_frame_size, p_sys->p_context->sample_fmt, DEFAULT_ALIGN); p_sys->p_buffer = av_malloc( p_sys->i_buffer_out ); if ( unlikely( p_sys->p_buffer == NULL ) ) @@ -1227,8 +1253,19 @@ frame->pict_type = 0; frame->repeat_pict = p_pict->i_nb_fields - 2; +#if LIBAVUTIL_VERSION_CHECK( 58, 7, 100 ) + if (p_pict->b_progressive) + frame->flags &= ~AV_FRAME_FLAG_INTERLACED; + else + frame->flags |= AV_FRAME_FLAG_INTERLACED; + if (p_pict->b_top_field_first) + frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; + else + frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST; +#else frame->interlaced_frame = !p_pict->b_progressive; frame->top_field_first = !!p_pict->b_top_field_first; +#endif frame->format = p_sys->p_context->pix_fmt; frame->width = p_sys->p_context->width; @@ -1278,13 +1315,17 @@ { block_t *p_block = NULL; //How much we need to copy from new packet - const size_t leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes; + const size_t leftover = leftover_samples * p_enc->fmt_out.audio.i_channels * p_sys->i_sample_bytes; av_frame_unref( p_sys->frame ); p_sys->frame->format = p_sys->p_context->sample_fmt; p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay; +#if API_CHANNEL_LAYOUT_STRUCT && LIBAVUTIL_VERSION_CHECK(57, 24, 100) + av_channel_layout_copy(&p_sys->frame->ch_layout, &p_sys->p_context->ch_layout); +#else p_sys->frame->channel_layout = p_sys->p_context->channel_layout; p_sys->frame->channels = p_sys->p_context->channels; +#endif p_sys->frame->pts = date_Get( &p_sys->buffer_date ) * p_sys->p_context->time_base.den / CLOCK_FREQ / p_sys->p_context->time_base.num; @@ -1301,7 +1342,7 @@ // We need to deinterleave from p_aout_buf to p_buffer the leftover bytes if( p_sys->b_planar ) aout_Deinterleave( p_sys->p_interleave_buf, p_sys->p_buffer, - p_sys->i_frame_size, p_sys->p_context->channels, p_enc->fmt_in.i_codec ); + p_sys->i_frame_size, p_enc->fmt_out.audio.i_channels, p_enc->fmt_in.i_codec ); else memcpy( p_sys->p_buffer + buffer_delay, p_aout_buf->p_buffer, leftover); @@ -1319,7 +1360,7 @@ memset( p_sys->p_buffer + (leftover+buffer_delay), 0, padding_size ); buffer_delay += padding_size; } - if( avcodec_fill_audio_frame( p_sys->frame, p_sys->p_context->channels, + if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_out.audio.i_channels, p_sys->p_context->sample_fmt, p_sys->b_planar ? p_sys->p_interleave_buf : p_sys->p_buffer, p_sys->i_buffer_out, DEFAULT_ALIGN) < 0 ) @@ -1349,7 +1390,7 @@ //i_bytes_left is amount of bytes we get i_samples_left = p_aout_buf ? p_aout_buf->i_nb_samples : 0; - buffer_delay = p_sys->i_samples_delay * p_sys->i_sample_bytes * p_sys->p_context->channels; + buffer_delay = p_sys->i_samples_delay * p_sys->i_sample_bytes * p_enc->fmt_out.audio.i_channels; //p_sys->i_buffer_out = p_sys->i_frame_size * chan * p_sys->i_sample_bytes //Calculate how many bytes we would need from current buffer to fill frame @@ -1414,16 +1455,20 @@ p_sys->frame->pts = date_Get( &p_sys->buffer_date ) * p_sys->p_context->time_base.den / CLOCK_FREQ / p_sys->p_context->time_base.num; +#if API_CHANNEL_LAYOUT_STRUCT && LIBAVUTIL_VERSION_CHECK(57, 24, 100) + av_channel_layout_copy(&p_sys->frame->ch_layout, &p_sys->p_context->ch_layout); +#else p_sys->frame->channel_layout = p_sys->p_context->channel_layout; p_sys->frame->channels = p_sys->p_context->channels; +#endif const int in_bytes = p_sys->frame->nb_samples * - p_sys->p_context->channels * p_sys->i_sample_bytes; + p_enc->fmt_out.audio.i_channels* p_sys->i_sample_bytes; if( p_sys->b_planar ) { aout_Deinterleave( p_sys->p_buffer, p_aout_buf->p_buffer, - p_sys->frame->nb_samples, p_sys->p_context->channels, p_enc->fmt_in.i_codec ); + p_sys->frame->nb_samples, p_enc->fmt_out.audio.i_channels, p_enc->fmt_in.i_codec ); } else @@ -1431,7 +1476,7 @@ memcpy(p_sys->p_buffer, p_aout_buf->p_buffer, in_bytes); } - if( avcodec_fill_audio_frame( p_sys->frame, p_sys->p_context->channels, + if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_out.audio.i_channels, p_sys->p_context->sample_fmt, p_sys->p_buffer, p_sys->i_buffer_out, @@ -1457,7 +1502,7 @@ if( p_aout_buf->i_nb_samples > 0 ) { memcpy( p_sys->p_buffer + buffer_delay, p_aout_buf->p_buffer, - p_aout_buf->i_nb_samples * p_sys->i_sample_bytes * p_sys->p_context->channels); + p_aout_buf->i_nb_samples * p_sys->i_sample_bytes * p_enc->fmt_out.audio.i_channels); p_sys->i_samples_delay += p_aout_buf->i_nb_samples; } @@ -1475,9 +1520,8 @@ av_frame_free( &p_sys->frame ); vlc_avcodec_lock(); - avcodec_close( p_sys->p_context ); - vlc_avcodec_unlock(); avcodec_free_context( &p_sys->p_context ); + vlc_avcodec_unlock(); av_free( p_sys->p_interleave_buf ); diff -Nru vlc-3.0.21/modules/codec/avcodec/fourcc.c vlc-3.0.22/modules/codec/avcodec/fourcc.c --- vlc-3.0.21/modules/codec/avcodec/fourcc.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/fourcc.c 2025-11-13 22:17:54.000000000 +0000 @@ -182,7 +182,9 @@ /* AV_CODEC_ID_V210X */ { VLC_CODEC_TMV, AV_CODEC_ID_TMV }, { VLC_CODEC_V210, AV_CODEC_ID_V210 }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100 +#if LIBAVCODEC_VERSION_CHECK( 59, 42, 102 ) + { VLC_CODEC_VUYA, AV_CODEC_ID_RAWVIDEO }, +#elif LIBAVCODEC_VERSION_CHECK( 54, 50, 100 ) { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV }, #endif /* AV_CODEC_ID_DPX */ @@ -226,7 +228,7 @@ { VLC_CODEC_CLLC, AV_CODEC_ID_CLLC }, { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2 }, { VLC_CODEC_VP9, AV_CODEC_ID_VP9 }, -#if LIBAVCODEC_VERSION_CHECK( 57, 26, 0, 83, 101 ) +#if LIBAV_CODEC_VERSION_CHECK( 57, 26, 0, 83, 101 ) { VLC_CODEC_AV1, AV_CODEC_ID_AV1 }, #endif { VLC_CODEC_ICOD, AV_CODEC_ID_AIC }, @@ -281,19 +283,19 @@ /* ffmpeg only: AV_CODEC_ID_SNOW */ /* ffmpeg only: AV_CODEC_ID_SMVJPEG */ -#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 24, 102 ) +#if LIBAVCODEC_VERSION_CHECK( 57, 24, 102 ) { VLC_CODEC_CINEFORM, AV_CODEC_ID_CFHD }, #endif -#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 70, 100 ) +#if LIBAVCODEC_VERSION_CHECK( 57, 70, 100 ) { VLC_CODEC_PIXLET, AV_CODEC_ID_PIXLET }, #endif -#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 101 ) +#if LIBAVCODEC_VERSION_CHECK( 57, 71, 101 ) { VLC_CODEC_SPEEDHQ, AV_CODEC_ID_SPEEDHQ }, #endif -#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 79, 100 ) +#if LIBAVCODEC_VERSION_CHECK( 57, 79, 100 ) { VLC_CODEC_FMVC, AV_CODEC_ID_FMVC }, #endif }; @@ -410,7 +412,7 @@ /* AV_CODEC_ID_WESTWOOD_SND1 */ { VLC_CODEC_GSM, AV_CODEC_ID_GSM }, { VLC_CODEC_QDM2, AV_CODEC_ID_QDM2 }, -#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 ) +#if LIBAVCODEC_VERSION_CHECK( 57, 71, 100 ) { VLC_CODEC_QDMC, AV_CODEC_ID_QDMC }, #endif { VLC_CODEC_COOK, AV_CODEC_ID_COOK }, @@ -478,7 +480,7 @@ { VLC_CODEC_SSA, AV_CODEC_ID_SSA }, /* AV_CODEC_ID_MOV_TEXT */ { VLC_CODEC_BD_PG, AV_CODEC_ID_HDMV_PGS_SUBTITLE }, -#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 ) +#if LIBAVCODEC_VERSION_CHECK( 57, 71, 100 ) { VLC_CODEC_BD_TEXT, AV_CODEC_ID_HDMV_TEXT_SUBTITLE }, #endif { VLC_CODEC_TELETEXT, AV_CODEC_ID_DVB_TELETEXT }, diff -Nru vlc-3.0.21/modules/codec/avcodec/subtitle.c vlc-3.0.22/modules/codec/avcodec/subtitle.c --- vlc-3.0.21/modules/codec/avcodec/subtitle.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/subtitle.c 2025-11-13 22:17:54.000000000 +0000 @@ -297,8 +297,8 @@ //msg_Err(dec, "%lld %d %d", // pts, ffsub->start_display_time, ffsub->end_display_time); - spu->i_start = pts + ffsub->start_display_time * INT64_C(1000); - spu->i_stop = pts + ffsub->end_display_time * INT64_C(1000); + spu->i_start = pts + VLC_TICK_FROM_MS(ffsub->start_display_time); + spu->i_stop = pts + VLC_TICK_FROM_MS(ffsub->end_display_time); spu->b_absolute = true; /* We have offset and size for subtitle */ spu->b_ephemer = dec->p_sys->b_need_ephemer; /* We only show subtitle for i_stop time only */ diff -Nru vlc-3.0.21/modules/codec/avcodec/va.c vlc-3.0.22/modules/codec/avcodec/va.c --- vlc-3.0.21/modules/codec/avcodec/va.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/va.c 2025-11-13 22:17:54.000000000 +0000 @@ -58,7 +58,7 @@ } break; -#if LIBAVUTIL_VERSION_CHECK(54, 13, 1, 24, 100) +#if LIBAV_UTIL_VERSION_CHECK(54, 13, 1, 24, 100) case AV_PIX_FMT_D3D11VA_VLD: switch (swfmt) { diff -Nru vlc-3.0.21/modules/codec/avcodec/vaapi.c vlc-3.0.22/modules/codec/avcodec/vaapi.c --- vlc-3.0.21/modules/codec/avcodec/vaapi.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/vaapi.c 2025-11-13 22:17:54.000000000 +0000 @@ -42,12 +42,25 @@ # include #endif #include +#if FF_API_STRUCT_VAAPI_CONTEXT #include +#else +#include +#endif #include "avcodec.h" #include "va.h" #include "../../hw/vaapi/vlc_vaapi.h" +#if !FF_API_STRUCT_VAAPI_CONTEXT +struct vaapi_context +{ + VADisplay display; + VAConfigID config_id; + VAContextID context_id; +}; +#endif + struct vlc_va_sys_t { struct vlc_vaapi_instance *va_inst; @@ -145,8 +158,10 @@ (void) hwctx; - vlc_vaapi_DestroyContext(o, sys->hw_ctx.display, sys->hw_ctx.context_id); - vlc_vaapi_DestroyConfig(o, sys->hw_ctx.display, sys->hw_ctx.config_id); + if (sys->hw_ctx.context_id != VA_INVALID_ID) + vlc_vaapi_DestroyContext(o, sys->hw_ctx.display, sys->hw_ctx.context_id); + if (sys->hw_ctx.config_id != VA_INVALID_ID) + vlc_vaapi_DestroyConfig(o, sys->hw_ctx.display, sys->hw_ctx.config_id); vlc_vaapi_ReleaseInstance(sys->va_inst); free(sys); } @@ -196,6 +211,7 @@ sys->hw_ctx.config_id = VA_INVALID_ID; sys->hw_ctx.context_id = VA_INVALID_ID; +#if FF_API_STRUCT_VAAPI_CONTEXT sys->hw_ctx.config_id = vlc_vaapi_CreateConfigChecked(o, sys->hw_ctx.display, i_profile, VAEntrypointVLD, i_vlc_chroma); @@ -211,6 +227,24 @@ goto error; ctx->hwaccel_context = &sys->hw_ctx; +#else + AVBufferRef *hwdev_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI); + if (hwdev_ref == NULL) + goto error; + + AVHWDeviceContext *hwdev_ctx = (void *) hwdev_ref->data; + AVVAAPIDeviceContext *vadev_ctx = hwdev_ctx->hwctx; + vadev_ctx->display = va_dpy; + + if (av_hwdevice_ctx_init(hwdev_ref) < 0) + { + av_buffer_unref(&hwdev_ref); + goto error; + } + + ctx->hw_device_ctx = hwdev_ref; +#endif + va->sys = sys; va->description = vaQueryVendorString(sys->hw_ctx.display); va->get = Get; diff -Nru vlc-3.0.21/modules/codec/avcodec/video.c vlc-3.0.22/modules/codec/avcodec/video.c --- vlc-3.0.21/modules/codec/avcodec/video.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/avcodec/video.c 2025-11-13 22:17:54.000000000 +0000 @@ -39,7 +39,8 @@ #include #include #include -#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 16, 101 ) ) +#include "avcommon_compat.h" +#if LIBAVUTIL_VERSION_CHECK( 55, 16, 101 ) #include #endif @@ -204,8 +205,7 @@ else if (ctx->time_base.num > 0 && ctx->time_base.den > 0) { fmt->i_frame_rate = ctx->time_base.den; - fmt->i_frame_rate_base = ctx->time_base.num - * __MAX(ctx->ticks_per_frame, 1); + fmt->i_frame_rate_base = ctx->time_base.num; } /* FIXME we should only set the known values and let the core decide @@ -257,12 +257,12 @@ case AVCOL_TRC_BT2020_12: fmt->transfer = TRANSFER_FUNC_BT2020; break; -#if LIBAVUTIL_VERSION_CHECK( 55, 14, 0, 31, 100) +#if LIBAV_UTIL_VERSION_CHECK( 55, 14, 0, 31, 100) case AVCOL_TRC_ARIB_STD_B67: fmt->transfer = TRANSFER_FUNC_ARIB_B67; break; #endif -#if LIBAVUTIL_VERSION_CHECK( 55, 17, 0, 37, 100) +#if LIBAV_UTIL_VERSION_CHECK( 55, 17, 0, 37, 100) case AVCOL_TRC_SMPTE2084: fmt->transfer = TRANSFER_FUNC_SMPTE_ST2084; break; @@ -327,12 +327,10 @@ /* always have date in fields/ticks units */ if(dec->p_sys->pts.i_divider_num) - date_Change(&dec->p_sys->pts, fmt_out.i_frame_rate * - __MAX(ctx->ticks_per_frame, 1), + date_Change(&dec->p_sys->pts, fmt_out.i_frame_rate, fmt_out.i_frame_rate_base); else - date_Init(&dec->p_sys->pts, fmt_out.i_frame_rate * - __MAX(ctx->ticks_per_frame, 1), + date_Init(&dec->p_sys->pts, fmt_out.i_frame_rate, fmt_out.i_frame_rate_base); fmt_out.p_palette = dec->fmt_out.video.p_palette; @@ -687,7 +685,7 @@ static const enum PixelFormat hwfmts[] = { #ifdef _WIN32 -#if LIBAVUTIL_VERSION_CHECK(54, 13, 1, 24, 100) +#if LIBAV_UTIL_VERSION_CHECK(54, 13, 1, 24, 100) AV_PIX_FMT_D3D11VA_VLD, #endif AV_PIX_FMT_DXVA2_VLD, @@ -760,6 +758,7 @@ int InitVideoHwDec( vlc_object_t *obj ) { +#ifdef _WIN32 decoder_t *p_dec = container_of(obj, decoder_t, obj); if (p_dec->fmt_in.i_codec != VLC_CODEC_AV1) @@ -804,6 +803,7 @@ failed: avcodec_free_context( &p_context ); free(p_sys); +#endif return VLC_EGENERIC; } @@ -945,9 +945,11 @@ p_sys->pts.i_divider_num == 0 ) return VLC_TICK_INVALID; +#if LIBAVCODEC_VERSION_CHECK( 60, 12, 100 ) + int i_tick = p_context->codec_descriptor->props & AV_CODEC_PROP_FIELDS ? 2 : 1; +#else int i_tick = p_context->ticks_per_frame; - if( i_tick <= 0 ) - i_tick = 1; +#endif /* interpolate the next PTS */ return date_Increment( &p_sys->pts, i_tick + frame->repeat_pict ); @@ -995,7 +997,7 @@ decoder_sys_t *p_sys = p_dec->p_sys; bool format_changed = false; -#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 16, 101 ) ) +#if LIBAVUTIL_VERSION_CHECK( 55, 16, 101 ) #define FROM_AVRAT(default_factor, avrat) \ (uint64_t)(default_factor) * (avrat).num / (avrat).den const AVFrameSideData *metadata = @@ -1050,7 +1052,7 @@ #undef FROM_AVRAT } #endif -#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 60, 100 ) ) +#if LIBAVUTIL_VERSION_CHECK( 55, 60, 100 ) const AVFrameSideData *metadata_lt = av_frame_get_side_data( frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL ); @@ -1113,17 +1115,20 @@ bool eos_spotted = false; - block_t *p_block; + block_t *p_block = pp_block ? *pp_block : NULL; vlc_tick_t current_time; if( !p_context->extradata_size && p_dec->fmt_in.i_extra ) { ffmpeg_InitCodec( p_dec ); - if( !avcodec_is_open( p_context ) ) - OpenVideoCodec( p_dec ); + if( !avcodec_is_open( p_context ) && OpenVideoCodec(p_dec) < 0 ) + { + if( p_block != NULL ) + block_Release( p_block ); + return NULL; + } } - p_block = pp_block ? *pp_block : NULL; if(!p_block && !(p_sys->p_codec->capabilities & AV_CODEC_CAP_DELAY) ) return NULL; @@ -1306,7 +1311,7 @@ } /* Compute the PTS */ -#if LIBAVCODEC_VERSION_CHECK(57, 24, 0, 61, 100) +#if LIBAV_CODEC_VERSION_CHECK(57, 24, 0, 61, 100) # if LIBAVCODEC_VERSION_MICRO >= 100 vlc_tick_t i_pts = frame->best_effort_timestamp; # else @@ -1823,8 +1828,7 @@ if (!can_hwaccel) return swfmt; -#if (LIBAVCODEC_VERSION_MICRO >= 100) \ - && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 83, 101)) +#if (LIBAVCODEC_VERSION_MICRO >= 100) && !(LIBAVCODEC_VERSION_CHECK(57, 83, 101)) if (p_context->active_thread_type) { msg_Warn(p_dec, "thread type %d: disabling hardware acceleration", diff -Nru vlc-3.0.21/modules/codec/cc.h vlc-3.0.22/modules/codec/cc.h --- vlc-3.0.21/modules/codec/cc.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/cc.h 2025-11-13 22:17:54.000000000 +0000 @@ -259,6 +259,8 @@ * 0x00: field 1 * 0x01: field 2 */ + if(i_src < 1) + return; const uint8_t *cc = &p_src[0]; const int i_count_cc = cc[0]&0x1f; int i; @@ -297,9 +299,11 @@ * u8 cc_data_1 * u8 cc_data_2 */ + if(i_src < 6) + return; const int b_truncate = p_src[4] & 0x01; const int i_field_first = (p_src[4] & 0x80) ? 0 : 1; - const int i_count_cc2 = (p_src[4] >> 1) & 0xf; + const int i_count_cc2 = ((p_src[4] >> 1) & 0x1f) + b_truncate; const uint8_t *cc = &p_src[5]; int i; @@ -326,6 +330,8 @@ } else if( i_payload_type == CC_PAYLOAD_REPLAYTV ) { + if(i_src < 1) + return; const uint8_t *cc = &p_src[0]; for( int i_cc_count = i_src >> 2; i_cc_count > 0; i_cc_count--, cc += 4 ) @@ -353,6 +359,8 @@ * un additional_realtimevideodata * un reserved */ + if(i_src < 2) + return; bs_t s; bs_init( &s, &p_src[2], i_src - 2 ); const int i_cc_count = bs_read( &s, 5 ); diff -Nru vlc-3.0.21/modules/codec/cea708.c vlc-3.0.22/modules/codec/cea708.c --- vlc-3.0.21/modules/codec/cea708.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/cea708.c 2025-11-13 22:17:54.000000000 +0000 @@ -556,7 +556,7 @@ uint8_t i_min = CEA708_WINDOW_MAX_COLS; for( int i=p_w->i_firstrow; i <= p_w->i_lastrow; i++ ) { - const cea708_text_row_t *p_row = p_w->rows[p_w->row]; + const cea708_text_row_t *p_row = p_w->rows[i]; if( p_row && p_row->firstcol < i_min ) i_min = p_row->firstcol; } @@ -568,7 +568,7 @@ uint8_t i_max = 0; for( int i=p_w->i_firstrow; i <= p_w->i_lastrow; i++ ) { - const cea708_text_row_t *p_row = p_w->rows[p_w->row]; + const cea708_text_row_t *p_row = p_w->rows[i]; if( p_row && p_row->lastcol > i_max ) i_max = p_row->lastcol; } @@ -600,6 +600,8 @@ for( int i=p_w->i_firstrow; i <= p_w->i_lastrow; i++ ) { cea708_text_row_t *row = p_w->rows[i]; + if (!row) + continue; if( row->lastcol == i_max ) { if( row->firstcol >= row->lastcol ) @@ -611,6 +613,12 @@ else if( i == p_w->i_lastrow ) p_w->i_lastrow--; } + else + { + /* Drop rightmost column */ + row->lastcol--; + } + } } } @@ -621,6 +629,8 @@ for( int i=p_w->i_firstrow; i <= p_w->i_lastrow; i++ ) { cea708_text_row_t *row = p_w->rows[i]; + if (!row) + continue; if( row->firstcol == i_min ) { if( row->firstcol >= row->lastcol ) @@ -632,6 +642,12 @@ else if( i == p_w->i_lastrow ) p_w->i_lastrow--; } + else + { + /* Drop leftmost column */ + row->firstcol++; + } + } } } @@ -662,15 +678,20 @@ { case CEA708_WA_DIRECTION_LTR: /* Move RIGHT */ - if( CEA708_Window_MaxCol( p_w ) == CEA708_WINDOW_MAX_ROWS - 1 ) + if( CEA708_Window_MaxCol( p_w ) == CEA708_WINDOW_MAX_COLS - 1 ) CEA708_Window_Truncate( p_w, CEA708_WA_DIRECTION_LTR ); for( int i=p_w->i_firstrow; i <= p_w->i_lastrow; i++ ) { cea708_text_row_t *row = p_w->rows[i]; + if( !row ) + continue; if( row->lastcol < row->firstcol ) /* should not happen */ continue; - memmove( &row->characters[row->firstcol + 1], &row->characters[row->firstcol], - (row->lastcol - row->firstcol + 1) * 4U ); + + size_t start = (size_t) row->firstcol * 4U; + size_t count = (size_t) (row->lastcol - row->firstcol + 1) * 4U; + memmove( &row->characters[start + 4U], &row->characters[start], + count ); memmove( &row->styles[row->firstcol + 1], &row->styles[row->firstcol], (row->lastcol - row->firstcol + 1) * sizeof(cea708_pen_style_t) ); row->firstcol++; @@ -684,14 +705,21 @@ for( int i=p_w->i_firstrow; i <= p_w->i_lastrow; i++ ) { cea708_text_row_t *row = p_w->rows[i]; + if( !row ) + continue; if( row->lastcol < row->firstcol ) /* should not happen */ continue; - memmove( &row->characters[row->firstcol - 1], &row->characters[row->firstcol], - (row->lastcol - row->firstcol + 1) * 4U ); - memmove( &row->styles[row->firstcol - 1], &row->styles[row->firstcol], - (row->lastcol - row->firstcol + 1) * sizeof(cea708_pen_style_t) ); - row->firstcol--; - row->lastcol--; + if( row->firstcol > 0 ) + { + size_t start = (size_t) row->firstcol * 4U; + size_t count = (size_t) (row->lastcol - row->firstcol + 1) * 4U; + memmove( &row->characters[start -4U], &row->characters[start], + count ); + memmove( &row->styles[row->firstcol - 1], &row->styles[row->firstcol], + (row->lastcol - row->firstcol + 1) * sizeof(cea708_pen_style_t) ); + row->firstcol--; + row->lastcol--; + } } break; case CEA708_WA_DIRECTION_TB: @@ -1375,7 +1403,7 @@ case CEA708_C1_DLY: REQUIRE_ARGS_AND_POP_COMMAND(1); p_cea708->suspended_deadline = p_cea708->i_clock + - cea708_input_buffer_get( ib ) * 100 * 1000; + VLC_TICK_FROM_MS( cea708_input_buffer_get( ib ) * 100 ); Debug(printf("[DLY]")); break; case CEA708_C1_DLC: diff -Nru vlc-3.0.21/modules/codec/cvdsub.c vlc-3.0.22/modules/codec/cvdsub.c --- vlc-3.0.21/modules/codec/cvdsub.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/cvdsub.c 2025-11-13 22:17:54.000000000 +0000 @@ -110,6 +110,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != SPU_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_CVD ) return VLC_EGENERIC; @@ -239,6 +242,7 @@ 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"); + block_Release( p_block ); return NULL; } @@ -311,9 +315,11 @@ p_sys->i_spu_size = (p[0] << 8) + p[1] + 4; p += 2; - /* FIXME: check data sanity */ p_sys->metadata_offset = (p[0] << 8) + p[1]; p +=2; - p_sys->metadata_length = p_sys->i_spu_size - p_sys->metadata_offset; + if ( p_sys->i_spu_size > p_sys->metadata_offset ) + p_sys->metadata_length = p_sys->i_spu_size - p_sys->metadata_offset; + else + p_sys->metadata_length = 0; // unusable metadata p_sys->i_image_offset = 4; p_sys->i_image_length = p_sys->metadata_offset - p_sys->i_image_offset; @@ -344,7 +350,7 @@ uint8_t *p = p_spu->p_buffer + p_sys->metadata_offset; uint8_t *p_end = p + p_sys->metadata_length; - for( ; p < p_end; p += 4 ) + for( ; &p[3] < p_end; p += 4 ) { switch( p[0] ) { diff -Nru vlc-3.0.21/modules/codec/daala.c vlc-3.0.22/modules/codec/daala.c --- vlc-3.0.21/modules/codec/daala.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/daala.c 2025-11-13 22:17:54.000000000 +0000 @@ -164,6 +164,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_DAALA ) { return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/codec/dav1d.c vlc-3.0.22/modules/codec/dav1d.c --- vlc-3.0.21/modules/codec/dav1d.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/dav1d.c 2025-11-13 22:17:54.000000000 +0000 @@ -53,6 +53,8 @@ #define THREAD_FRAMES_LONGTEXT N_( "Max number of threads used for frame decoding, default 0=auto" ) #define THREAD_TILES_TEXT N_("Tiles Threads") #define THREAD_TILES_LONGTEXT N_( "Max number of threads used for tile decoding, default 0=auto" ) +#define LAYERS_TEXT N_("All Layers") +#define LAYERS_LONGTEXT N_( "Whether or not to display all spatial layers, default false" ) vlc_module_begin () @@ -73,6 +75,7 @@ add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) #endif + add_bool( "dav1d-all-layers", false, LAYERS_TEXT, LAYERS_LONGTEXT, false) vlc_module_end () /***************************************************************************** @@ -84,43 +87,34 @@ Dav1dContext *c; }; -static const struct -{ - vlc_fourcc_t i_chroma; - enum Dav1dPixelLayout i_chroma_id; - uint8_t i_bitdepth; - enum Dav1dTransferCharacteristics transfer_characteristics; -} chroma_table[] = -{ - /* 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) { + static const vlc_fourcc_t chroma_table_rgb[] = { VLC_CODEC_GBR_PLANAR, VLC_CODEC_GBR_PLANAR_10L }; + static const vlc_fourcc_t chroma_table[][3] = { + [DAV1D_PIXEL_LAYOUT_I400] = { VLC_CODEC_GREY, VLC_CODEC_GREY_10L, VLC_CODEC_GREY_12L }, + [DAV1D_PIXEL_LAYOUT_I420] = { VLC_CODEC_I420, VLC_CODEC_I420_10L, VLC_CODEC_I420_12L }, + [DAV1D_PIXEL_LAYOUT_I422] = { VLC_CODEC_I422, VLC_CODEC_I422_10L, VLC_CODEC_I422_12L }, + [DAV1D_PIXEL_LAYOUT_I444] = { VLC_CODEC_I444, VLC_CODEC_I444_10L, VLC_CODEC_I444_12L }, + }; + + // AV1 signals RGB with the combination of the identity matrix, the BT.709 primaries and the sRGB/YCC transfer function. + // See: "5.5.2. Color config syntax" from https://aomediacodec.github.io/av1-spec/av1-spec.pdf + if( img->p.layout == DAV1D_PIXEL_LAYOUT_I444 && + img->seq_hdr->mtrx == DAV1D_MC_IDENTITY && + img->seq_hdr->pri == DAV1D_COLOR_PRI_BT709 && + img->seq_hdr->trc == DAV1D_TRC_SRGB ) + { + if( img->seq_hdr->hbd < 0 || img->seq_hdr->hbd >= (int)ARRAY_SIZE(chroma_table_rgb) ) + return 0; + return chroma_table_rgb[img->seq_hdr->hbd]; + } - 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].transfer_characteristics == DAV1D_TRC_UNKNOWN || - chroma_table[i].transfer_characteristics == img->seq_hdr->trc)) - return chroma_table[i].i_chroma; + if( img->seq_hdr->layout < 0 || img->seq_hdr->layout >= (int)ARRAY_SIZE(chroma_table) ) + return 0; + if( img->seq_hdr->hbd < 0 || img->seq_hdr->hbd >= (int)ARRAY_SIZE(chroma_table[0]) ) + return 0; - return 0; + return chroma_table[img->seq_hdr->layout][img->seq_hdr->hbd]; } static int NewPicture(Dav1dPicture *img, void *cookie) @@ -179,6 +173,8 @@ v->multiview_mode = dec->fmt_in.video.multiview_mode; v->pose = dec->fmt_in.video.pose; dec->fmt_out.video.i_chroma = dec->fmt_out.i_codec = FindVlcChroma(img); + if (dec->fmt_out.i_codec == 0) + return -1; if (decoder_UpdateVideoFormat(dec) == VLC_SUCCESS) { @@ -370,6 +366,7 @@ if (p_sys->s.n_frame_threads == 0) p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; #endif + p_sys->s.all_layers = var_InheritBool( p_this, "dav1d-all-layers" ); p_sys->s.allocator.cookie = dec; p_sys->s.allocator.alloc_picture_callback = NewPicture; p_sys->s.allocator.release_picture_callback = FreePicture; diff -Nru vlc-3.0.21/modules/codec/dca.c vlc-3.0.22/modules/codec/dca.c --- vlc-3.0.21/modules/codec/dca.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/dca.c 2025-11-13 22:17:54.000000000 +0000 @@ -30,6 +30,8 @@ * be subject to the terms of that later license. *****************************************************************************/ +#warning This module is not officially supported anymore + #ifdef HAVE_CONFIG_H # include "config.h" #endif diff -Nru vlc-3.0.21/modules/codec/dvbsub.c vlc-3.0.22/modules/codec/dvbsub.c --- vlc-3.0.21/modules/codec/dvbsub.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/dvbsub.c 2025-11-13 22:17:54.000000000 +0000 @@ -199,6 +199,7 @@ dvbsub_color_t c_2b[4]; dvbsub_color_t c_4b[16]; dvbsub_color_t c_8b[256]; + bool b_color_range_full; struct dvbsub_clut_s *p_next; @@ -546,6 +547,7 @@ /* 256 entries CLUT */ memset( p_sys->default_clut.c_8b, 0xFF, 256 * sizeof(dvbsub_color_t) ); + p_sys->default_clut.b_color_range_full = false; } static void decode_segment( decoder_t *p_dec, bs_t *s ) @@ -710,7 +712,8 @@ bs_skip( s, 4 ); - if( bs_read( s, 1 ) ) + p_clut->b_color_range_full = bs_read( s, 1 ) != 0; + if( p_clut->b_color_range_full ) { y = bs_read( s, 8 ); cr = bs_read( s, 8 ); @@ -1614,6 +1617,7 @@ fmt.p_palette->palette[j][2] = p_color[j].Cr; /* V == Cr */ fmt.p_palette->palette[j][3] = 0xff - p_color[j].T; } + fmt.b_color_range_full = p_clut->b_color_range_full; p_spu_region = subpicture_region_New( &fmt ); fmt.p_palette = NULL; /* was stack var */ diff -Nru vlc-3.0.21/modules/codec/kate.c vlc-3.0.22/modules/codec/kate.c --- vlc-3.0.21/modules/codec/kate.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/kate.c 2025-11-13 22:17:54.000000000 +0000 @@ -339,6 +339,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != SPU_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_KATE ) { return VLC_EGENERIC; @@ -876,6 +879,10 @@ fmt.i_height = fmt.i_visible_height = p_fmt_src->i_height; fmt.i_x_offset = fmt.i_y_offset = 0; + fmt.transfer = TRANSFER_FUNC_SRGB; + fmt.primaries = COLOR_PRIMARIES_SRGB; + fmt.space = COLOR_SPACE_SRGB; + fmt.b_color_range_full = true; subpicture_region_t *p_r = subpicture_region_New( &fmt ); if( !p_r ) diff -Nru vlc-3.0.21/modules/codec/libass.c vlc-3.0.22/modules/codec/libass.c --- vlc-3.0.21/modules/codec/libass.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/libass.c 2025-11-13 22:17:54.000000000 +0000 @@ -505,13 +505,17 @@ /* Allocate the regions and draw them */ subpicture_region_t **pp_region_last = &p_subpic->p_region; + video_format_t fmt_region; + fmt_region = fmt; + fmt_region.transfer = TRANSFER_FUNC_SRGB; + fmt_region.primaries = COLOR_PRIMARIES_SRGB; + fmt_region.space = COLOR_SPACE_SRGB; + fmt_region.b_color_range_full = true; for( int i = 0; i < i_region; i++ ) { subpicture_region_t *r; - video_format_t fmt_region; /* */ - fmt_region = fmt; fmt_region.i_width = fmt_region.i_visible_width = region[i].x1 - region[i].x0; fmt_region.i_height = diff -Nru vlc-3.0.21/modules/codec/libmpeg2.c vlc-3.0.22/modules/codec/libmpeg2.c --- vlc-3.0.21/modules/codec/libmpeg2.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/libmpeg2.c 2025-11-13 22:17:54.000000000 +0000 @@ -33,6 +33,9 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#warning This module is not officially supported anymore + #ifdef HAVE_CONFIG_H # include "config.h" #endif diff -Nru vlc-3.0.21/modules/codec/lpcm.c vlc-3.0.22/modules/codec/lpcm.c --- vlc-3.0.21/modules/codec/lpcm.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/lpcm.c 2025-11-13 22:17:54.000000000 +0000 @@ -220,6 +220,9 @@ int i_type; int i_header_size; + if( p_dec->fmt_in.i_cat != AUDIO_ES ) + return VLC_EGENERIC; + switch( p_dec->fmt_in.i_codec ) { /* DVD LPCM */ diff -Nru vlc-3.0.21/modules/codec/mft.c vlc-3.0.22/modules/codec/mft.c --- vlc-3.0.21/modules/codec/mft.c 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/codec/mft.c 2025-11-13 22:17:54.000000000 +0000 @@ -24,8 +24,12 @@ # include "config.h" #endif -#undef WINVER -#define WINVER 0x0601 +#if _WIN32_WINNT < 0x0601 // _WIN32_WINNT_WIN7 +# define MFT_USES_LOAD_LIBRARY +# undef _WIN32_WINNT +# define _WIN32_WINNT _WIN32_WINNT_WIN7 +# undef WINVER +#endif /* Needed for many mingw macros. */ #define COBJMACROS @@ -1090,7 +1094,7 @@ static int LoadMFTLibrary(MFHandle *mf) { -#if _WIN32_WINNT < _WIN32_WINNT_WIN7 || VLC_WINSTORE_APP +#if defined(MFT_USES_LOAD_LIBRARY) || VLC_WINSTORE_APP mf->mfplat_dll = LoadLibrary(TEXT("mfplat.dll")); if (!mf->mfplat_dll) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/codec/oggspots.c vlc-3.0.22/modules/codec/oggspots.c --- vlc-3.0.21/modules/codec/oggspots.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/oggspots.c 2025-11-13 22:17:54.000000000 +0000 @@ -103,6 +103,9 @@ decoder_t* p_dec = (decoder_t*)p_this; decoder_sys_t* p_sys; + if (p_dec->fmt_in.i_cat != VIDEO_ES) + return VLC_EGENERIC; + if (p_dec->fmt_in.i_codec != VLC_CODEC_OGGSPOTS) { return VLC_EGENERIC; } @@ -351,6 +354,12 @@ goto error; } + if (i_img_offset > p_block->i_buffer) { + msg_Dbg(p_dec, "Invalid byte offset: %u exceeds packet size %zu", + i_img_offset, p_block->i_buffer); + goto error; + } + /* Image format */ if ( !memcmp(&p_block->p_buffer[4], "PNG", 3) ) { p_dec->fmt_in.video.i_chroma = VLC_CODEC_PNG; diff -Nru vlc-3.0.21/modules/codec/omxil/mediacodec.c vlc-3.0.22/modules/codec/omxil/mediacodec.c --- vlc-3.0.21/modules/codec/omxil/mediacodec.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/omxil/mediacodec.c 2025-11-13 22:17:54.000000000 +0000 @@ -497,6 +497,50 @@ args.video.p_surface = p_sys->video.p_surface; args.video.p_jsurface = p_sys->video.p_jsurface; + + if (p_dec->fmt_out.video.b_color_range_full) + args.video.color_range = MC_COLOR_RANGE_FULL; + else + args.video.color_range = MC_COLOR_RANGE_LIMITED; + + switch (p_dec->fmt_out.video.primaries) + { + case COLOR_PRIMARIES_BT601_525: + args.video.color_standard = MC_COLOR_STANDARD_BT601_NTSC; + break; + case COLOR_PRIMARIES_BT601_625: + args.video.color_standard = MC_COLOR_STANDARD_BT601_PAL; + break; + case COLOR_PRIMARIES_BT709: + args.video.color_standard = MC_COLOR_STANDARD_BT709; + break; + case COLOR_PRIMARIES_BT2020: + args.video.color_standard = MC_COLOR_STANDARD_BT2020; + break; + default: + args.video.color_standard = MC_COLOR_STANDARD_UNSPECIFIED; + break; + } + + switch (p_dec->fmt_out.video.transfer) + { + case TRANSFER_FUNC_LINEAR: + args.video.color_transfer = MC_COLOR_TRANSFER_LINEAR; + break; + case TRANSFER_FUNC_SMPTE_ST2084: + args.video.color_transfer = MC_COLOR_TRANSFER_ST2084; + break; + case TRANSFER_FUNC_HLG: + args.video.color_transfer = MC_COLOR_TRANSFER_HLG; + break; + case TRANSFER_FUNC_BT709: + args.video.color_transfer = MC_COLOR_TRANSFER_SDR_VIDEO; + break; + default: + args.video.color_transfer = MC_COLOR_TRANSFER_UNSPECIFIED; + break; + } + args.video.b_tunneled_playback = args.video.p_surface ? var_InheritBool(p_dec, CFG_PREFIX "tunneled-playback") : false; if (p_sys->b_adaptive) diff -Nru vlc-3.0.21/modules/codec/omxil/mediacodec.h vlc-3.0.22/modules/codec/omxil/mediacodec.h --- vlc-3.0.21/modules/codec/omxil/mediacodec.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/omxil/mediacodec.h 2025-11-13 22:17:54.000000000 +0000 @@ -49,6 +49,33 @@ #define MC_API_VIDEO_QUIRKS_ADAPTIVE 0x1000 #define MC_API_VIDEO_QUIRKS_IGNORE_SIZE 0x2000 +/* cf. https://github.com/FFmpeg/FFmpeg/blob/00f5a34c9a5f0adee28aca11971918d6aca48745/libavcodec/mediacodec_wrapper.h#L348 + * cf. https://developer.android.com/reference/android/media/MediaFormat#constants_1*/ +enum mc_media_format_color_range_t +{ + MC_COLOR_RANGE_UNSPECIFIED = 0x0, + MC_COLOR_RANGE_FULL = 0x1, + MC_COLOR_RANGE_LIMITED = 0x2, +}; + +enum mc_media_format_color_standard_t +{ + MC_COLOR_STANDARD_UNSPECIFIED = 0x0, + MC_COLOR_STANDARD_BT709 = 0x1, + MC_COLOR_STANDARD_BT601_PAL = 0x2, + MC_COLOR_STANDARD_BT601_NTSC = 0x4, + MC_COLOR_STANDARD_BT2020 = 0x6, +}; + +enum mc_media_format_color_transfer_t +{ + MC_COLOR_TRANSFER_UNSPECIFIED = 0x0, + MC_COLOR_TRANSFER_LINEAR = 0x1, + MC_COLOR_TRANSFER_SDR_VIDEO = 0x3, + MC_COLOR_TRANSFER_ST2084 = 0x6, + MC_COLOR_TRANSFER_HLG = 0x7, +}; + struct mc_api_out { enum { @@ -99,6 +126,9 @@ int i_angle; bool b_tunneled_playback; bool b_adaptive_playback; + enum mc_media_format_color_transfer_t color_transfer; + enum mc_media_format_color_range_t color_range; + enum mc_media_format_color_standard_t color_standard; } video; struct { diff -Nru vlc-3.0.21/modules/codec/omxil/mediacodec_jni.c vlc-3.0.22/modules/codec/omxil/mediacodec_jni.c --- vlc-3.0.21/modules/codec/omxil/mediacodec_jni.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/omxil/mediacodec_jni.c 2025-11-13 22:17:54.000000000 +0000 @@ -638,6 +638,10 @@ if (p_args->video.i_angle != 0) SET_INTEGER(jformat, "rotation-degrees", p_args->video.i_angle); + SET_INTEGER(jformat, "color-range", p_args->video.color_range); + SET_INTEGER(jformat, "color-standard", p_args->video.color_standard); + SET_INTEGER(jformat, "color-transfer", p_args->video.color_transfer); + if (b_direct_rendering) { /* feature-tunneled-playback available since API 21 */ diff -Nru vlc-3.0.21/modules/codec/omxil/mediacodec_ndk.c vlc-3.0.22/modules/codec/omxil/mediacodec_ndk.c --- vlc-3.0.21/modules/codec/omxil/mediacodec_ndk.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/omxil/mediacodec_ndk.c 2025-11-13 22:17:54.000000000 +0000 @@ -356,6 +356,11 @@ syms.AMediaFormat.setInt32(p_sys->p_format, "width", p_args->video.i_width); syms.AMediaFormat.setInt32(p_sys->p_format, "height", p_args->video.i_height); syms.AMediaFormat.setInt32(p_sys->p_format, "rotation-degrees", p_args->video.i_angle); + + syms.AMediaFormat.setInt32(p_sys->p_format, "color-range", p_args->video.color_range); + syms.AMediaFormat.setInt32(p_sys->p_format, "color-standard", p_args->video.color_standard); + syms.AMediaFormat.setInt32(p_sys->p_format, "color-transfer", p_args->video.color_transfer); + if (p_args->video.p_surface) { p_anw = p_args->video.p_surface; diff -Nru vlc-3.0.21/modules/codec/opus_header.c vlc-3.0.22/modules/codec/opus_header.c --- vlc-3.0.21/modules/codec/opus_header.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/opus_header.c 2025-11-13 22:17:54.000000000 +0000 @@ -205,7 +205,7 @@ h->nb_coupled = ch; /* Multi-stream support */ - if(h->channel_mapping == 2) + if(h->channel_mapping <= 2) { if (h->nb_coupled + h->nb_streams > 255) return 0; diff -Nru vlc-3.0.21/modules/codec/rawvideo.c vlc-3.0.22/modules/codec/rawvideo.c --- vlc-3.0.21/modules/codec/rawvideo.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/rawvideo.c 2025-11-13 22:17:54.000000000 +0000 @@ -78,6 +78,9 @@ */ static int OpenCommon( decoder_t *p_dec ) { + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + const vlc_chroma_description_t *dsc = vlc_fourcc_GetChromaDescription( p_dec->fmt_in.i_codec ); if( dsc == NULL || dsc->plane_count == 0 ) diff -Nru vlc-3.0.21/modules/codec/speex.c vlc-3.0.22/modules/codec/speex.c --- vlc-3.0.21/modules/codec/speex.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/speex.c 2025-11-13 22:17:54.000000000 +0000 @@ -210,6 +210,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != AUDIO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_SPEEX ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/codec/spudec/parse.c vlc-3.0.22/modules/codec/spudec/parse.c --- vlc-3.0.21/modules/codec/spudec/parse.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/spudec/parse.c 2025-11-13 22:17:54.000000000 +0000 @@ -73,8 +73,8 @@ static int ParseControlSeq( decoder_t *, vlc_tick_t i_pts, int(*pf_queue)(decoder_t *, subpicture_t *) ); static int ParseRLE ( decoder_t *, subpicture_data_t *, - const spu_properties_t *, uint16_t * ); -static int Render ( decoder_t *, subpicture_t *, const uint16_t *, + const spu_properties_t *, uint16_t *, size_t * ); +static int Render ( decoder_t *, subpicture_t *, const uint16_t *, size_t, const subpicture_data_t *, const spu_properties_t * ); /***************************************************************************** @@ -109,6 +109,9 @@ static void ParsePXCTLI( decoder_t *p_dec, const subpicture_data_t *p_spu_data, subpicture_t *p_spu ) { + if (p_spu->p_region == NULL) + return; + plane_t *p_plane = &p_spu->p_region->p_picture->p[0]; video_palette_t *p_palette = p_spu->p_region->fmt.p_palette; @@ -232,9 +235,11 @@ */ p_pixeldata = vlc_alloc( p_sys->i_rle_size, sizeof(*p_pixeldata) * 2 * 2 ); + size_t pixeldata_size = p_sys->i_rle_size * 2 * 2; // in 16-bit + /* We try to display it */ subpicture_data_t render_spu_data = *p_spu_data; /* Need a copy */ - if( ParseRLE( p_dec, &render_spu_data, p_spu_properties, p_pixeldata ) ) + if( ParseRLE( p_dec, &render_spu_data, p_spu_properties, p_pixeldata, &pixeldata_size ) ) { /* There was a parse error, delete the subpicture */ subpicture_Delete( p_spu ); @@ -248,7 +253,7 @@ render_spu_data.pi_offset[0], render_spu_data.pi_offset[1] ); #endif - if( Render( p_dec, p_spu, p_pixeldata, &render_spu_data, p_spu_properties ) ) + if( Render( p_dec, p_spu, p_pixeldata, pixeldata_size, &render_spu_data, p_spu_properties ) ) { subpicture_Delete( p_spu ); free( p_pixeldata ); @@ -390,7 +395,7 @@ b_cmd_offset = false; b_cmd_alpha = false; /* Get the control sequence date */ - date = (vlc_tick_t)GetWBE( &p_sys->buffer[i_index] ) * 11000; + date = VLC_TICK_FROM_MS(GetWBE( &p_sys->buffer[i_index] ) * 11); /* Next offset */ i_cur_seq = i_index; @@ -603,7 +608,7 @@ static int ParseRLE( decoder_t *p_dec, subpicture_data_t *p_spu_data, const spu_properties_t *p_spu_properties, - uint16_t *p_pixeldata ) + uint16_t *p_pixeldata, size_t * pixeldata_size ) { decoder_sys_t *p_sys = p_dec->p_sys; @@ -612,6 +617,14 @@ unsigned int i_x, i_y; uint16_t *p_dest = p_pixeldata; + size_t dest_left = *pixeldata_size; +#define WRITE_CODE(x) \ + if (dest_left == 0) \ + break; \ + do { \ + *p_dest++ = (x); \ + dest_left--; \ + } while(0) /* The subtitles are interlaced, we need two offsets */ unsigned int i_id = 0; /* Start on the even SPU layer */ @@ -630,17 +643,17 @@ pi_table[ 0 ] = p_spu_data->pi_offset[ 0 ] << 1; pi_table[ 1 ] = p_spu_data->pi_offset[ 1 ] << 1; - for( i_y = 0 ; i_y < i_height ; i_y++ ) + for( i_y = 0 ; i_y < i_height && dest_left != 0 ; i_y++ ) { unsigned int i_code; pi_offset = pi_table + i_id; - for( i_x = 0 ; i_x < i_width ; i_x += i_code >> 2 ) + for( i_x = 0 ; i_x < i_width && dest_left != 0 ; i_x += i_code >> 2 ) { i_code = 0; for( unsigned int i_min = 1; i_min <= 0x40 && i_code < i_min; i_min <<= 2 ) { - if( (*pi_offset >> 1) >= p_sys->i_spu_size ) + if( (*pi_offset >> 1) + 4 >= p_sys->i_spu_size ) { msg_Err( p_dec, "out of bounds while reading rle" ); return VLC_EGENERIC; @@ -698,14 +711,14 @@ { /* We can't be sure the current lines will be skipped, * so we store the code just in case. */ - *p_dest++ = i_code; + WRITE_CODE( i_code ); i_skipped_bottom++; } } else { /* We got a valid code, store it */ - *p_dest++ = i_code; + WRITE_CODE( i_code ); /* Valid code means no blank line */ b_empty_top = false; @@ -714,7 +727,7 @@ } else { - *p_dest++ = i_code; + WRITE_CODE( i_code ); } } @@ -745,7 +758,7 @@ /* Skip them just in case */ while( i_y < i_height ) { - *p_dest++ = i_width << 2; + WRITE_CODE( i_width << 2 ); i_y++; } @@ -832,20 +845,28 @@ #endif } + *pixeldata_size = *pixeldata_size - dest_left; + return VLC_SUCCESS; } static int Render( decoder_t *p_dec, subpicture_t *p_spu, - const uint16_t *p_pixeldata, + const uint16_t *p_pixeldata, size_t pixeldata_size, const subpicture_data_t *p_spu_data, const spu_properties_t *p_spu_properties ) { uint8_t *p_p; int i_x, i_y, i_len, i_color, i_pitch; const uint16_t *p_source = p_pixeldata; + size_t source_left = pixeldata_size; video_format_t fmt; video_palette_t palette; + if (p_spu_properties->i_width <= 0) + return VLC_SUCCESS; + if (p_spu_properties->i_height <= (p_spu_data->i_y_top_offset + p_spu_data->i_y_bottom_offset)) + return VLC_SUCCESS; + /* Create a new subpicture region */ video_format_Init( &fmt, VLC_CODEC_YUVP ); fmt.i_sar_num = 0; /* 0 means use aspect ratio of background video */ @@ -863,6 +884,7 @@ fmt.p_palette->palette[i_x][2] = p_spu_data->pi_yuv[i_x][2]; fmt.p_palette->palette[i_x][3] = p_spu_data->pi_alpha[i_x] * 0x11; } + fmt.b_color_range_full = false; p_spu->p_region = subpicture_region_New( &fmt ); if( !p_spu->p_region ) @@ -884,9 +906,17 @@ /* Draw until we reach the end of the line */ for( i_x = 0 ; i_x < (int)fmt.i_width; i_x += i_len ) { + if( source_left == 0 ) + { + msg_Err( p_dec, "missing RLE data" ); + subpicture_region_Delete( p_spu->p_region ); + p_spu->p_region = NULL; + return VLC_EGENERIC; + } /* Get the RLE part, then draw the line */ i_color = *p_source & 0x3; i_len = *p_source++ >> 2; + source_left--; memset( p_p + i_x + i_y, i_color, i_len ); } } diff -Nru vlc-3.0.21/modules/codec/spudec/spudec.c vlc-3.0.22/modules/codec/spudec/spudec.c --- vlc-3.0.21/modules/codec/spudec/spudec.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/spudec/spudec.c 2025-11-13 22:17:54.000000000 +0000 @@ -80,6 +80,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != SPU_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_SPU ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/codec/substx3g.c vlc-3.0.22/modules/codec/substx3g.c --- vlc-3.0.21/modules/codec/substx3g.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/substx3g.c 2025-11-13 22:17:54.000000000 +0000 @@ -1,5 +1,5 @@ /***************************************************************************** - * substx3gsub.c : MP4 tx3g subtitles decoder + * substx3g.c : MP4 tx3g subtitles decoder ***************************************************************************** * Copyright (C) 2014 VLC authors and VideoLAN * @@ -334,20 +334,19 @@ if ( i_psz_bytelength > 2 && ( !memcmp( p_pszstart, "\xFE\xFF", 2 ) || !memcmp( p_pszstart, "\xFF\xFE", 2 ) ) ) - { psz_subtitle = FromCharset( "UTF-16", p_pszstart, i_psz_bytelength ); - if ( !psz_subtitle ) - return VLCDEC_SUCCESS; - } else - { psz_subtitle = strndup( (const char*) p_pszstart, i_psz_bytelength ); - if ( !psz_subtitle ) - return VLCDEC_SUCCESS; + + if ( !psz_subtitle ) + { + block_Release( p_block ); + return VLCDEC_SUCCESS; } + p_buf += i_psz_bytelength + sizeof(uint16_t); - for( uint16_t i=0; i < i_psz_bytelength; i++ ) + for( size_t i=0; psz_subtitle[i] != '\0'; i++ ) if ( psz_subtitle[i] == '\r' ) psz_subtitle[i] = '\n'; tx3g_segment_t *p_segment3g = tx3g_segment_New( psz_subtitle ); @@ -358,6 +357,7 @@ { text_segment_Delete( p_segment3g->s ); free( p_segment3g ); + block_Release( p_block ); return VLCDEC_SUCCESS; } @@ -367,6 +367,7 @@ { text_segment_Delete( p_segment3g->s ); free( p_segment3g ); + block_Release( p_block ); return VLCDEC_SUCCESS; } subpicture_updater_sys_t *p_spu_sys = p_spu->updater.p_sys; diff -Nru vlc-3.0.21/modules/codec/svcdsub.c vlc-3.0.22/modules/codec/svcdsub.c --- vlc-3.0.21/modules/codec/svcdsub.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/svcdsub.c 2025-11-13 22:17:54.000000000 +0000 @@ -116,6 +116,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != SPU_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_OGT ) return VLC_EGENERIC; @@ -176,6 +179,7 @@ /* Parse and decode */ subpicture_t *p_spu = DecodePacket( p_dec, p_block ); + block_Release( p_block ); if( p_spu != NULL ) decoder_QueueSub( p_dec, p_spu ); return VLCDEC_SUCCESS; @@ -545,7 +549,7 @@ i_color = bs_read( &bs, 2 ); if( i_color == 0 && (i_count = bs_read( &bs, 2 )) ) { - i_count = __MIN( i_count, p_sys->i_width - i_column ); + i_count = __MIN( i_count, p_sys->i_width - i_column - 1 ); memset( &p_dest[i_row * p_region->p_picture->Y_PITCH + i_column], 0, i_count + 1 ); i_column += i_count; diff -Nru vlc-3.0.21/modules/codec/textst.c vlc-3.0.22/modules/codec/textst.c --- vlc-3.0.21/modules/codec/textst.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/textst.c 2025-11-13 22:17:54.000000000 +0000 @@ -179,7 +179,7 @@ i_size = i_data = __MIN(i_data, i_size); while (i_data > 4) { - p_dec->p_sys->palette[p_data[0]] = /* YCrCbT to ARGB */ + p_dec->p_sys->palette[p_data[0]] = /* YCrCbT limited range to ARGB full range */ ( (uint32_t)((float)p_data[1] +1.402f * (p_data[2]-128)) << 16 ) | ( (uint32_t)((float)p_data[1] -0.34414 * (p_data[3]-128) -0.71414 * (p_data[2]-128)) << 8 ) | ( (uint32_t)((float)p_data[1] +1.722 * (p_data[3]-128)) ) | diff -Nru vlc-3.0.21/modules/codec/theora.c vlc-3.0.22/modules/codec/theora.c --- vlc-3.0.21/modules/codec/theora.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/theora.c 2025-11-24 23:00:36.000000000 +0000 @@ -151,6 +151,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_THEORA ) { return VLC_EGENERIC; @@ -797,6 +800,7 @@ if( xiph_AppendHeaders( &p_enc->fmt_out.i_extra, &p_enc->fmt_out.p_extra, header.bytes, header.packet ) ) { + free(p_enc->fmt_out.p_extra); p_enc->fmt_out.i_extra = 0; p_enc->fmt_out.p_extra = NULL; } diff -Nru vlc-3.0.21/modules/codec/ttml/ttml.c vlc-3.0.22/modules/codec/ttml/ttml.c --- vlc-3.0.21/modules/codec/ttml/ttml.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/ttml/ttml.c 2025-11-13 22:17:54.000000000 +0000 @@ -114,7 +114,7 @@ if( *psz_end == 'm' ) { if( *(psz_end + 1) == 's' ) - t.base = 1000 * v; + t.base = VLC_TICK_FROM_MS(v); else t.base = CLOCK_FREQ * 60 * v; } diff -Nru vlc-3.0.21/modules/codec/videotoolbox.m vlc-3.0.22/modules/codec/videotoolbox.m --- vlc-3.0.21/modules/codec/videotoolbox.m 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/videotoolbox.m 2025-11-13 22:17:54.000000000 +0000 @@ -1024,11 +1024,6 @@ case VLC_CODEC_MP4V: { - if (p_dec->fmt_in.i_original_fourcc == VLC_FOURCC( 'X','V','I','D' )) { - msg_Warn(p_dec, "XVID decoding not implemented, fallback on software"); - return -1; - } - msg_Dbg(p_dec, "Will decode MP4V with original FourCC '%4.4s'", (char *)&p_dec->fmt_in.i_original_fourcc); return kCMVideoCodecType_MPEG4Video; } diff -Nru vlc-3.0.21/modules/codec/vorbis.c vlc-3.0.22/modules/codec/vorbis.c --- vlc-3.0.21/modules/codec/vorbis.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/vorbis.c 2025-11-24 23:00:36.000000000 +0000 @@ -235,6 +235,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != AUDIO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_VORBIS ) return VLC_EGENERIC; @@ -859,6 +862,7 @@ if( xiph_AppendHeaders( &p_enc->fmt_out.i_extra, &p_enc->fmt_out.p_extra, header[i].bytes, header[i].packet ) ) { + free(p_enc->fmt_out.p_extra); p_enc->fmt_out.i_extra = 0; p_enc->fmt_out.p_extra = NULL; } diff -Nru vlc-3.0.21/modules/codec/webvtt/CSSGrammar.c vlc-3.0.22/modules/codec/webvtt/CSSGrammar.c --- vlc-3.0.21/modules/codec/webvtt/CSSGrammar.c 2024-06-05 16:03:42.000000000 +0000 +++ vlc-3.0.22/modules/codec/webvtt/CSSGrammar.c 2025-11-24 23:11:41.000000000 +0000 @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.8.2. */ +/* A Bison parser, made by GNU Bison 3.5.1. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -34,10 +34,6 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ -/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, - especially those whose name start with YY_ or yy_. They are - private implementation details that can be changed or removed. */ - /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -45,11 +41,14 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output, and Bison version. */ -#define YYBISON 30802 +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + +/* Identify Bison output. */ +#define YYBISON 1 -/* Bison version string. */ -#define YYBISON_VERSION "3.8.2" +/* Bison version. */ +#define YYBISON_VERSION "3.5.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -67,7 +66,7 @@ /* First part of user prologue. */ -#line 36 "../../modules/codec/webvtt/CSSGrammar.y" +#line 36 "codec/webvtt/CSSGrammar.y" #ifdef HAVE_CONFIG_H # include "config.h" @@ -80,7 +79,7 @@ typedef void* yyscan_t; #endif -#line 84 "codec/webvtt/CSSGrammar.c" +#line 83 "codec/webvtt/CSSGrammar.c" # ifndef YY_CAST # ifdef __cplusplus @@ -103,6 +102,14 @@ # endif # endif +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + /* Use api.header.include to #include this header instead of duplicating it here. */ #ifndef YY_YY_CODEC_WEBVTT_CSSGRAMMAR_H_INCLUDED @@ -115,51 +122,44 @@ extern int yydebug; #endif -/* Token kinds. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - YYEMPTY = -2, - TOKEN_EOF = 0, /* TOKEN_EOF */ - YYerror = 256, /* error */ - YYUNDEF = 257, /* "invalid token" */ - LOWEST_PREC = 258, /* LOWEST_PREC */ - UNIMPORTANT_TOK = 259, /* UNIMPORTANT_TOK */ - WHITESPACE = 260, /* WHITESPACE */ - SGML_CD = 261, /* SGML_CD */ - INCLUDES = 262, /* INCLUDES */ - DASHMATCH = 263, /* DASHMATCH */ - BEGINSWITH = 264, /* BEGINSWITH */ - ENDSWITH = 265, /* ENDSWITH */ - CONTAINS = 266, /* CONTAINS */ - STRING = 267, /* STRING */ - IDENT = 268, /* IDENT */ - IDSEL = 269, /* IDSEL */ - HASH = 270, /* HASH */ - FONT_FACE_SYM = 271, /* FONT_FACE_SYM */ - CHARSET_SYM = 272, /* CHARSET_SYM */ - IMPORTANT_SYM = 273, /* IMPORTANT_SYM */ - CDO = 274, /* CDO */ - CDC = 275, /* CDC */ - LENGTH = 276, /* LENGTH */ - ANGLE = 277, /* ANGLE */ - TIME = 278, /* TIME */ - FREQ = 279, /* FREQ */ - DIMEN = 280, /* DIMEN */ - PERCENTAGE = 281, /* PERCENTAGE */ - NUMBER = 282, /* NUMBER */ - URI = 283, /* URI */ - FUNCTION = 284, /* FUNCTION */ - UNICODERANGE = 285 /* UNICODERANGE */ + TOKEN_EOF = 0, + LOWEST_PREC = 258, + UNIMPORTANT_TOK = 259, + WHITESPACE = 260, + SGML_CD = 261, + INCLUDES = 262, + DASHMATCH = 263, + BEGINSWITH = 264, + ENDSWITH = 265, + CONTAINS = 266, + STRING = 267, + IDENT = 268, + IDSEL = 269, + HASH = 270, + FONT_FACE_SYM = 271, + CHARSET_SYM = 272, + IMPORTANT_SYM = 273, + CDO = 274, + CDC = 275, + LENGTH = 276, + ANGLE = 277, + TIME = 278, + FREQ = 279, + DIMEN = 280, + PERCENTAGE = 281, + NUMBER = 282, + URI = 283, + FUNCTION = 284, + UNICODERANGE = 285 }; - typedef enum yytokentype yytoken_kind_t; #endif -/* Token kinds. */ -#define YYEMPTY -2 +/* Tokens. */ #define TOKEN_EOF 0 -#define YYerror 256 -#define YYUNDEF 257 #define LOWEST_PREC 258 #define UNIMPORTANT_TOK 259 #define WHITESPACE 260 @@ -193,7 +193,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 49 "../../modules/codec/webvtt/CSSGrammar.y" +#line 49 "codec/webvtt/CSSGrammar.y" bool boolean; char character; @@ -219,113 +219,12 @@ - int yyparse (yyscan_t scanner, vlc_css_parser_t *css_parser); - #endif /* !YY_YY_CODEC_WEBVTT_CSSGRAMMAR_H_INCLUDED */ -/* Symbol kind. */ -enum yysymbol_kind_t -{ - YYSYMBOL_YYEMPTY = -2, - YYSYMBOL_YYEOF = 0, /* TOKEN_EOF */ - YYSYMBOL_YYerror = 1, /* error */ - YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ - YYSYMBOL_LOWEST_PREC = 3, /* LOWEST_PREC */ - YYSYMBOL_UNIMPORTANT_TOK = 4, /* UNIMPORTANT_TOK */ - YYSYMBOL_WHITESPACE = 5, /* WHITESPACE */ - YYSYMBOL_SGML_CD = 6, /* SGML_CD */ - YYSYMBOL_INCLUDES = 7, /* INCLUDES */ - YYSYMBOL_DASHMATCH = 8, /* DASHMATCH */ - YYSYMBOL_BEGINSWITH = 9, /* BEGINSWITH */ - YYSYMBOL_ENDSWITH = 10, /* ENDSWITH */ - YYSYMBOL_CONTAINS = 11, /* CONTAINS */ - YYSYMBOL_STRING = 12, /* STRING */ - YYSYMBOL_IDENT = 13, /* IDENT */ - YYSYMBOL_IDSEL = 14, /* IDSEL */ - YYSYMBOL_HASH = 15, /* HASH */ - YYSYMBOL_16_ = 16, /* ':' */ - YYSYMBOL_17_ = 17, /* '.' */ - YYSYMBOL_18_ = 18, /* '[' */ - YYSYMBOL_19_ = 19, /* '*' */ - YYSYMBOL_20_ = 20, /* '|' */ - YYSYMBOL_FONT_FACE_SYM = 21, /* FONT_FACE_SYM */ - YYSYMBOL_CHARSET_SYM = 22, /* CHARSET_SYM */ - YYSYMBOL_IMPORTANT_SYM = 23, /* IMPORTANT_SYM */ - YYSYMBOL_CDO = 24, /* CDO */ - YYSYMBOL_CDC = 25, /* CDC */ - YYSYMBOL_LENGTH = 26, /* LENGTH */ - YYSYMBOL_ANGLE = 27, /* ANGLE */ - YYSYMBOL_TIME = 28, /* TIME */ - YYSYMBOL_FREQ = 29, /* FREQ */ - YYSYMBOL_DIMEN = 30, /* DIMEN */ - YYSYMBOL_PERCENTAGE = 31, /* PERCENTAGE */ - YYSYMBOL_NUMBER = 32, /* NUMBER */ - YYSYMBOL_URI = 33, /* URI */ - YYSYMBOL_FUNCTION = 34, /* FUNCTION */ - YYSYMBOL_UNICODERANGE = 35, /* UNICODERANGE */ - YYSYMBOL_36_ = 36, /* '}' */ - YYSYMBOL_37_ = 37, /* ';' */ - YYSYMBOL_38_ = 38, /* '{' */ - YYSYMBOL_39_ = 39, /* '+' */ - YYSYMBOL_40_ = 40, /* '~' */ - YYSYMBOL_41_ = 41, /* '>' */ - YYSYMBOL_42_ = 42, /* '-' */ - YYSYMBOL_43_ = 43, /* ',' */ - YYSYMBOL_44_ = 44, /* ']' */ - YYSYMBOL_45_ = 45, /* '=' */ - YYSYMBOL_46_ = 46, /* ')' */ - YYSYMBOL_47_ = 47, /* '/' */ - YYSYMBOL_48_ = 48, /* '#' */ - YYSYMBOL_49_ = 49, /* '%' */ - YYSYMBOL_YYACCEPT = 50, /* $accept */ - YYSYMBOL_stylesheet = 51, /* stylesheet */ - YYSYMBOL_maybe_space = 52, /* maybe_space */ - YYSYMBOL_maybe_sgml = 53, /* maybe_sgml */ - YYSYMBOL_maybe_charset = 54, /* maybe_charset */ - YYSYMBOL_closing_brace = 55, /* closing_brace */ - YYSYMBOL_charset = 56, /* charset */ - YYSYMBOL_ignored_charset = 57, /* ignored_charset */ - YYSYMBOL_rule_list = 58, /* rule_list */ - YYSYMBOL_valid_rule = 59, /* valid_rule */ - YYSYMBOL_rule = 60, /* rule */ - YYSYMBOL_font_face = 61, /* font_face */ - YYSYMBOL_combinator = 62, /* combinator */ - YYSYMBOL_maybe_unary_operator = 63, /* maybe_unary_operator */ - YYSYMBOL_unary_operator = 64, /* unary_operator */ - YYSYMBOL_ruleset = 65, /* ruleset */ - YYSYMBOL_selector_list = 66, /* selector_list */ - YYSYMBOL_selector_with_trailing_whitespace = 67, /* selector_with_trailing_whitespace */ - YYSYMBOL_selector = 68, /* selector */ - YYSYMBOL_simple_selector = 69, /* simple_selector */ - YYSYMBOL_element_name = 70, /* element_name */ - YYSYMBOL_specifier_list = 71, /* specifier_list */ - YYSYMBOL_specifier = 72, /* specifier */ - YYSYMBOL_class = 73, /* class */ - YYSYMBOL_attr_name = 74, /* attr_name */ - YYSYMBOL_attrib = 75, /* attrib */ - YYSYMBOL_match = 76, /* match */ - YYSYMBOL_ident_or_string = 77, /* ident_or_string */ - YYSYMBOL_pseudo = 78, /* pseudo */ - YYSYMBOL_declaration_list = 79, /* declaration_list */ - YYSYMBOL_decl_list = 80, /* decl_list */ - YYSYMBOL_declaration = 81, /* declaration */ - YYSYMBOL_property = 82, /* property */ - YYSYMBOL_prio = 83, /* prio */ - YYSYMBOL_expr = 84, /* expr */ - YYSYMBOL_operator = 85, /* operator */ - YYSYMBOL_term = 86, /* term */ - YYSYMBOL_unary_term = 87, /* unary_term */ - YYSYMBOL_function = 88, /* function */ - YYSYMBOL_invalid_rule = 89, /* invalid_rule */ - YYSYMBOL_invalid_block = 90, /* invalid_block */ - YYSYMBOL_invalid_block_list = 91 /* invalid_block_list */ -}; -typedef enum yysymbol_kind_t yysymbol_kind_t; - /* Second part of user prologue. */ -#line 65 "../../modules/codec/webvtt/CSSGrammar.y" +#line 65 "codec/webvtt/CSSGrammar.y" /* See bison pure calling */ int yylex(union YYSTYPE *, yyscan_t, vlc_css_parser_t *); @@ -337,7 +236,7 @@ } -#line 341 "codec/webvtt/CSSGrammar.c" +#line 240 "codec/webvtt/CSSGrammar.c" #ifdef short @@ -377,18 +276,6 @@ typedef short yytype_int16; #endif -/* Work around bug in HP-UX 11.23, which defines these macros - incorrectly for preprocessor constants. This workaround can likely - be removed in 2023, as HPE has promised support for HP-UX 11.23 - (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of - . */ -#ifdef __hpux -# undef UINT_LEAST8_MAX -# undef UINT_LEAST16_MAX -# define UINT_LEAST8_MAX 255 -# define UINT_LEAST16_MAX 65535 -#endif - #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ typedef __UINT_LEAST8_TYPE__ yytype_uint8; #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ @@ -448,7 +335,6 @@ #define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) - /* Stored state numbers (used for stacks). */ typedef yytype_uint8 yy_state_t; @@ -467,7 +353,6 @@ # endif #endif - #ifndef YY_ATTRIBUTE_PURE # if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) # define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) @@ -486,23 +371,17 @@ /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YY_USE(E) ((void) (E)) +# define YYUSE(E) ((void) (E)) #else -# define YY_USE(E) /* empty */ +# define YYUSE(E) /* empty */ #endif +#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ -#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ -# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") -# else -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# endif # define YY_IGNORE_MAYBE_UNINITIALIZED_END \ _Pragma ("GCC diagnostic pop") #else @@ -531,7 +410,7 @@ #define YY_ASSERT(E) ((void) (0 && (E))) -#if !defined yyoverflow +#if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -596,7 +475,8 @@ # endif # endif # endif -#endif /* !defined yyoverflow */ +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + #if (! defined yyoverflow \ && (! defined __cplusplus \ @@ -672,16 +552,14 @@ /* YYNSTATES -- Number of states. */ #define YYNSTATES 230 -/* YYMAXUTOK -- Last valid token kind. */ +#define YYUNDEFTOK 2 #define YYMAXUTOK 285 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM as returned by yylex, with out-of-bounds checking. */ -#define YYTRANSLATE(YYX) \ - (0 <= (YYX) && (YYX) <= YYMAXUTOK \ - ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ - : YYSYMBOL_YYUNDEF) +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM as returned by yylex. */ @@ -719,7 +597,7 @@ }; #if YYDEBUG -/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { 0, 176, 176, 180, 181, 184, 186, 187, 190, 192, @@ -731,52 +609,52 @@ 438, 451, 454, 457, 460, 463, 466, 472, 473, 477, 481, 486, 495, 509, 519, 522, 527, 530, 533, 536, 539, 545, 548, 552, 556, 559, 562, 570, 573, 579, - 588, 593, 602, 609, 614, 620, 626, 634, 640, 641, - 645, 650, 655, 659, 663, 670, 673, 676, 682, 683, - 687, 688, 690, 691, 692, 693, 694, 695, 696, 698, - 701, 707, 708, 709, 710, 711, 712, 716, 722, 727, - 732, 742, 760, 761, 765, 766 + 592, 597, 606, 613, 618, 624, 630, 638, 644, 645, + 649, 654, 659, 663, 667, 674, 677, 680, 686, 687, + 691, 692, 694, 695, 696, 697, 698, 699, 700, 702, + 705, 711, 712, 713, 714, 715, 716, 720, 726, 731, + 736, 746, 764, 765, 769, 770 }; #endif -/** Accessing symbol of state STATE. */ -#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) - -#if YYDEBUG || 0 -/* The user-facing name of the symbol whose (internal) number is - YYSYMBOL. No bounds checking. */ -static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; - +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "TOKEN_EOF", "error", "\"invalid token\"", "LOWEST_PREC", - "UNIMPORTANT_TOK", "WHITESPACE", "SGML_CD", "INCLUDES", "DASHMATCH", - "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING", "IDENT", "IDSEL", "HASH", - "':'", "'.'", "'['", "'*'", "'|'", "FONT_FACE_SYM", "CHARSET_SYM", - "IMPORTANT_SYM", "CDO", "CDC", "LENGTH", "ANGLE", "TIME", "FREQ", - "DIMEN", "PERCENTAGE", "NUMBER", "URI", "FUNCTION", "UNICODERANGE", - "'}'", "';'", "'{'", "'+'", "'~'", "'>'", "'-'", "','", "']'", "'='", - "')'", "'/'", "'#'", "'%'", "$accept", "stylesheet", "maybe_space", - "maybe_sgml", "maybe_charset", "closing_brace", "charset", - "ignored_charset", "rule_list", "valid_rule", "rule", "font_face", - "combinator", "maybe_unary_operator", "unary_operator", "ruleset", - "selector_list", "selector_with_trailing_whitespace", "selector", - "simple_selector", "element_name", "specifier_list", "specifier", - "class", "attr_name", "attrib", "match", "ident_or_string", "pseudo", - "declaration_list", "decl_list", "declaration", "property", "prio", - "expr", "operator", "term", "unary_term", "function", "invalid_rule", - "invalid_block", "invalid_block_list", YY_NULLPTR + "TOKEN_EOF", "error", "$undefined", "LOWEST_PREC", "UNIMPORTANT_TOK", + "WHITESPACE", "SGML_CD", "INCLUDES", "DASHMATCH", "BEGINSWITH", + "ENDSWITH", "CONTAINS", "STRING", "IDENT", "IDSEL", "HASH", "':'", "'.'", + "'['", "'*'", "'|'", "FONT_FACE_SYM", "CHARSET_SYM", "IMPORTANT_SYM", + "CDO", "CDC", "LENGTH", "ANGLE", "TIME", "FREQ", "DIMEN", "PERCENTAGE", + "NUMBER", "URI", "FUNCTION", "UNICODERANGE", "'}'", "';'", "'{'", "'+'", + "'~'", "'>'", "'-'", "','", "']'", "'='", "')'", "'/'", "'#'", "'%'", + "$accept", "stylesheet", "maybe_space", "maybe_sgml", "maybe_charset", + "closing_brace", "charset", "ignored_charset", "rule_list", "valid_rule", + "rule", "font_face", "combinator", "maybe_unary_operator", + "unary_operator", "ruleset", "selector_list", + "selector_with_trailing_whitespace", "selector", "simple_selector", + "element_name", "specifier_list", "specifier", "class", "attr_name", + "attrib", "match", "ident_or_string", "pseudo", "declaration_list", + "decl_list", "declaration", "property", "prio", "expr", "operator", + "term", "unary_term", "function", "invalid_rule", "invalid_block", + "invalid_block_list", YY_NULLPTR }; - -static const char * -yysymbol_name (yysymbol_kind_t yysymbol) -{ - return yytname[yysymbol]; -} #endif +# ifdef YYPRINT +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ +static const yytype_int16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 58, 46, 91, 42, + 124, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 280, 281, 282, 283, 284, 285, 125, 59, 123, 43, + 126, 62, 45, 44, 93, 61, 41, 47, 35, 37 +}; +# endif + #define YYPACT_NINF (-126) #define yypact_value_is_default(Yyn) \ @@ -787,8 +665,8 @@ #define yytable_value_is_error(Yyn) \ 0 -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int16 yypact[] = { -126, 10, 88, -126, -126, 290, -126, -126, 68, 6, @@ -816,9 +694,9 @@ 70, 70, 70, -126, -126, -24, 70, -126, -126, 70 }; -/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE does not specify something else to do. Zero - means the default is an error. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { 3, 0, 8, 1, 4, 0, 5, 9, 0, 0, @@ -846,7 +724,7 @@ 98, 106, 105, 92, 101, 103, 129, 128, 3, 127 }; -/* YYPGOTO[NTERM-NUM]. */ + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { -126, -126, -5, 85, -126, -72, -126, -126, -126, -126, @@ -856,19 +734,19 @@ 29, -17 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_uint8 yydefgoto[] = + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = { - 0, 1, 2, 10, 6, 48, 7, 30, 17, 31, + -1, 1, 2, 10, 6, 48, 7, 30, 17, 31, 32, 33, 71, 98, 180, 34, 35, 36, 37, 38, 39, 40, 41, 42, 80, 43, 108, 143, 44, 114, 115, 116, 117, 211, 181, 212, 182, 183, 184, 45, 49, 213 }; -/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { 9, 50, 62, 92, 4, 4, 76, 4, 4, 19, @@ -973,8 +851,8 @@ 29, 30, 31, 32 }; -/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of - state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_int8 yystos[] = { 0, 51, 52, 0, 5, 22, 54, 56, 1, 52, @@ -1002,7 +880,7 @@ 52, 52, 52, 1, 86, 1, 52, 0, 46, 52 }; -/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_int8 yyr1[] = { 0, 50, 51, 52, 52, 53, 53, 53, 54, 54, @@ -1021,7 +899,7 @@ 88, 89, 90, 90, 91, 91 }; -/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_int8 yyr2[] = { 0, 2, 4, 0, 2, 0, 2, 2, 0, 1, @@ -1041,15 +919,14 @@ }; -enum { YYENOMEM = -2 }; - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab -#define YYNOMEM goto yyexhaustedlab #define YYRECOVERING() (!!yyerrstatus) @@ -1071,9 +948,10 @@ } \ while (0) -/* Backward compatibility with an undocumented macro. - Use YYerror or YYUNDEF. */ -#define YYERRCODE YYUNDEF +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 + /* Enable debugging if requested. */ @@ -1090,16 +968,19 @@ YYFPRINTF Args; \ } while (0) +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif - -# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ - Kind, Value, scanner, css_parser); \ + Type, Value, scanner, css_parser); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) @@ -1110,17 +991,20 @@ `-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyo, - yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, yyscan_t scanner, vlc_css_parser_t *css_parser) +yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, yyscan_t scanner, vlc_css_parser_t *css_parser) { FILE *yyoutput = yyo; - YY_USE (yyoutput); - YY_USE (scanner); - YY_USE (css_parser); + YYUSE (yyoutput); + YYUSE (scanner); + YYUSE (css_parser); if (!yyvaluep) return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyo, yytoknum[yytype], *yyvaluep); +# endif YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YY_USE (yykind); + YYUSE (yytype); YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1130,13 +1014,12 @@ `---------------------------*/ static void -yy_symbol_print (FILE *yyo, - yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, yyscan_t scanner, vlc_css_parser_t *css_parser) +yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, yyscan_t scanner, vlc_css_parser_t *css_parser) { YYFPRINTF (yyo, "%s %s (", - yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - yy_symbol_value_print (yyo, yykind, yyvaluep, scanner, css_parser); + yy_symbol_value_print (yyo, yytype, yyvaluep, scanner, css_parser); YYFPRINTF (yyo, ")"); } @@ -1169,8 +1052,7 @@ `------------------------------------------------*/ static void -yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, - int yyrule, yyscan_t scanner, vlc_css_parser_t *css_parser) +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule, yyscan_t scanner, vlc_css_parser_t *css_parser) { int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; @@ -1182,8 +1064,9 @@ { YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, - YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), - &yyvsp[(yyi + 1) - (yynrhs)], scanner, css_parser); + yystos[+yyssp[yyi + 1 - yynrhs]], + &yyvsp[(yyi + 1) - (yynrhs)] + , scanner, css_parser); YYFPRINTF (stderr, "\n"); } } @@ -1198,8 +1081,8 @@ multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) ((void) 0) -# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -1222,272 +1105,499 @@ #endif +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S))) +# else +/* Return the length of YYSTR. */ +static YYPTRDIFF_T +yystrlen (const char *yystr) +{ + YYPTRDIFF_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +static char * +yystpcpy (char *yydest, const char *yysrc) +{ + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYPTRDIFF_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYPTRDIFF_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + else + goto append; + + append: + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (yyres) + return yystpcpy (yyres, yystr) - yyres; + else + return yystrlen (yystr); +} +# endif + +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, + yy_state_t *yyssp, int yytoken) +{ + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULLPTR; + /* Arguments of yyformat: reported tokens (one for the "unexpected", + one per "expected"). */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Actual size of YYARG. */ + int yycount = 0; + /* Cumulated lengths of YYARG. */ + YYPTRDIFF_T yysize = 0; + + /* There are many possibilities here to consider: + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) + { + int yyn = yypact[+*yyssp]; + YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); + yysize = yysize0; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + { + YYPTRDIFF_T yysize1 + = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else + return 2; + } + } + } + } + + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + default: /* Avoid compiler warnings. */ + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } + { + /* Don't count the "%s"s in the final size, but reserve room for + the terminator. */ + YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1; + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else + return 2; + } + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; + } + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + ++yyp; + ++yyformat; + } + } + return 0; +} +#endif /* YYERROR_VERBOSE */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ static void -yydestruct (const char *yymsg, - yysymbol_kind_t yykind, YYSTYPE *yyvaluep, yyscan_t scanner, vlc_css_parser_t *css_parser) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, yyscan_t scanner, vlc_css_parser_t *css_parser) { - YY_USE (yyvaluep); - YY_USE (scanner); - YY_USE (css_parser); + YYUSE (yyvaluep); + YYUSE (scanner); + YYUSE (css_parser); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - switch (yykind) + switch (yytype) { - case YYSYMBOL_STRING: /* STRING */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 12: /* STRING */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1251 "codec/webvtt/CSSGrammar.c" +#line 1361 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_IDENT: /* IDENT */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 13: /* IDENT */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1257 "codec/webvtt/CSSGrammar.c" +#line 1367 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_IDSEL: /* IDSEL */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 14: /* IDSEL */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1263 "codec/webvtt/CSSGrammar.c" +#line 1373 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_HASH: /* HASH */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 15: /* HASH */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1269 "codec/webvtt/CSSGrammar.c" +#line 1379 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_LENGTH: /* LENGTH */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 26: /* LENGTH */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1275 "codec/webvtt/CSSGrammar.c" +#line 1385 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_ANGLE: /* ANGLE */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 27: /* ANGLE */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1281 "codec/webvtt/CSSGrammar.c" +#line 1391 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_TIME: /* TIME */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 28: /* TIME */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1287 "codec/webvtt/CSSGrammar.c" +#line 1397 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_FREQ: /* FREQ */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 29: /* FREQ */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1293 "codec/webvtt/CSSGrammar.c" +#line 1403 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_DIMEN: /* DIMEN */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 30: /* DIMEN */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1299 "codec/webvtt/CSSGrammar.c" +#line 1409 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_PERCENTAGE: /* PERCENTAGE */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 31: /* PERCENTAGE */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1305 "codec/webvtt/CSSGrammar.c" +#line 1415 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_NUMBER: /* NUMBER */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 32: /* NUMBER */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1311 "codec/webvtt/CSSGrammar.c" +#line 1421 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_URI: /* URI */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 33: /* URI */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1317 "codec/webvtt/CSSGrammar.c" +#line 1427 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_FUNCTION: /* FUNCTION */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 34: /* FUNCTION */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1323 "codec/webvtt/CSSGrammar.c" +#line 1433 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_UNICODERANGE: /* UNICODERANGE */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 35: /* UNICODERANGE */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1329 "codec/webvtt/CSSGrammar.c" +#line 1439 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_charset: /* charset */ -#line 134 "../../modules/codec/webvtt/CSSGrammar.y" + case 56: /* charset */ +#line 134 "codec/webvtt/CSSGrammar.y" { vlc_css_rules_Delete(((*yyvaluep).rule)); } -#line 1335 "codec/webvtt/CSSGrammar.c" +#line 1445 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_ignored_charset: /* ignored_charset */ -#line 134 "../../modules/codec/webvtt/CSSGrammar.y" + case 57: /* ignored_charset */ +#line 134 "codec/webvtt/CSSGrammar.y" { vlc_css_rules_Delete(((*yyvaluep).rule)); } -#line 1341 "codec/webvtt/CSSGrammar.c" +#line 1451 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_valid_rule: /* valid_rule */ -#line 134 "../../modules/codec/webvtt/CSSGrammar.y" + case 59: /* valid_rule */ +#line 134 "codec/webvtt/CSSGrammar.y" { vlc_css_rules_Delete(((*yyvaluep).rule)); } -#line 1347 "codec/webvtt/CSSGrammar.c" +#line 1457 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_rule: /* rule */ -#line 134 "../../modules/codec/webvtt/CSSGrammar.y" + case 60: /* rule */ +#line 134 "codec/webvtt/CSSGrammar.y" { vlc_css_rules_Delete(((*yyvaluep).rule)); } -#line 1353 "codec/webvtt/CSSGrammar.c" +#line 1463 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_font_face: /* font_face */ -#line 134 "../../modules/codec/webvtt/CSSGrammar.y" + case 61: /* font_face */ +#line 134 "codec/webvtt/CSSGrammar.y" { vlc_css_rules_Delete(((*yyvaluep).rule)); } -#line 1359 "codec/webvtt/CSSGrammar.c" +#line 1469 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_ruleset: /* ruleset */ -#line 134 "../../modules/codec/webvtt/CSSGrammar.y" + case 65: /* ruleset */ +#line 134 "codec/webvtt/CSSGrammar.y" { vlc_css_rules_Delete(((*yyvaluep).rule)); } -#line 1365 "codec/webvtt/CSSGrammar.c" +#line 1475 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_selector_list: /* selector_list */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 66: /* selector_list */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selectorList)); } -#line 1371 "codec/webvtt/CSSGrammar.c" +#line 1481 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_selector_with_trailing_whitespace: /* selector_with_trailing_whitespace */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 67: /* selector_with_trailing_whitespace */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selector)); } -#line 1377 "codec/webvtt/CSSGrammar.c" +#line 1487 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_selector: /* selector */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 68: /* selector */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selector)); } -#line 1383 "codec/webvtt/CSSGrammar.c" +#line 1493 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_simple_selector: /* simple_selector */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 69: /* simple_selector */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selector)); } -#line 1389 "codec/webvtt/CSSGrammar.c" +#line 1499 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_element_name: /* element_name */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 70: /* element_name */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1395 "codec/webvtt/CSSGrammar.c" +#line 1505 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_specifier_list: /* specifier_list */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 71: /* specifier_list */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selector)); } -#line 1401 "codec/webvtt/CSSGrammar.c" +#line 1511 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_specifier: /* specifier */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 72: /* specifier */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selector)); } -#line 1407 "codec/webvtt/CSSGrammar.c" +#line 1517 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_class: /* class */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 73: /* class */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selector)); } -#line 1413 "codec/webvtt/CSSGrammar.c" +#line 1523 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_attr_name: /* attr_name */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 74: /* attr_name */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1419 "codec/webvtt/CSSGrammar.c" +#line 1529 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_attrib: /* attrib */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 75: /* attrib */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selector)); } -#line 1425 "codec/webvtt/CSSGrammar.c" +#line 1535 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_ident_or_string: /* ident_or_string */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 77: /* ident_or_string */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1431 "codec/webvtt/CSSGrammar.c" +#line 1541 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_pseudo: /* pseudo */ -#line 148 "../../modules/codec/webvtt/CSSGrammar.y" + case 78: /* pseudo */ +#line 148 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete(((*yyvaluep).selector)); } -#line 1437 "codec/webvtt/CSSGrammar.c" +#line 1547 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_declaration_list: /* declaration_list */ -#line 153 "../../modules/codec/webvtt/CSSGrammar.y" + case 79: /* declaration_list */ +#line 153 "codec/webvtt/CSSGrammar.y" { vlc_css_declarations_Delete(((*yyvaluep).declarationList)); } -#line 1443 "codec/webvtt/CSSGrammar.c" +#line 1553 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_decl_list: /* decl_list */ -#line 153 "../../modules/codec/webvtt/CSSGrammar.y" + case 80: /* decl_list */ +#line 153 "codec/webvtt/CSSGrammar.y" { vlc_css_declarations_Delete(((*yyvaluep).declarationList)); } -#line 1449 "codec/webvtt/CSSGrammar.c" +#line 1559 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_declaration: /* declaration */ -#line 153 "../../modules/codec/webvtt/CSSGrammar.y" + case 81: /* declaration */ +#line 153 "codec/webvtt/CSSGrammar.y" { vlc_css_declarations_Delete(((*yyvaluep).declaration)); } -#line 1455 "codec/webvtt/CSSGrammar.c" +#line 1565 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_property: /* property */ -#line 171 "../../modules/codec/webvtt/CSSGrammar.y" + case 82: /* property */ +#line 171 "codec/webvtt/CSSGrammar.y" { free(((*yyvaluep).string)); } -#line 1461 "codec/webvtt/CSSGrammar.c" +#line 1571 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_expr: /* expr */ -#line 166 "../../modules/codec/webvtt/CSSGrammar.y" + case 84: /* expr */ +#line 166 "codec/webvtt/CSSGrammar.y" { vlc_css_expression_Delete(((*yyvaluep).expr)); } -#line 1467 "codec/webvtt/CSSGrammar.c" +#line 1577 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_term: /* term */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 86: /* term */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1473 "codec/webvtt/CSSGrammar.c" +#line 1583 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_unary_term: /* unary_term */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 87: /* unary_term */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1479 "codec/webvtt/CSSGrammar.c" +#line 1589 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_function: /* function */ -#line 119 "../../modules/codec/webvtt/CSSGrammar.y" + case 88: /* function */ +#line 119 "codec/webvtt/CSSGrammar.y" { vlc_css_term_Clean(((*yyvaluep).term)); } -#line 1485 "codec/webvtt/CSSGrammar.c" +#line 1595 "codec/webvtt/CSSGrammar.c" break; - case YYSYMBOL_invalid_rule: /* invalid_rule */ -#line 134 "../../modules/codec/webvtt/CSSGrammar.y" + case 89: /* invalid_rule */ +#line 134 "codec/webvtt/CSSGrammar.y" { vlc_css_rules_Delete(((*yyvaluep).rule)); } -#line 1491 "codec/webvtt/CSSGrammar.c" +#line 1601 "codec/webvtt/CSSGrammar.c" break; default: @@ -1499,8 +1609,6 @@ - - /*----------. | yyparse. | `----------*/ @@ -1508,7 +1616,7 @@ int yyparse (yyscan_t scanner, vlc_css_parser_t *css_parser) { -/* Lookahead token kind. */ +/* The lookahead symbol. */ int yychar; @@ -1519,38 +1627,45 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); /* Number of syntax errors so far. */ - int yynerrs = 0; + int yynerrs; - yy_state_fast_t yystate = 0; + yy_state_fast_t yystate; /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus = 0; + int yyerrstatus; - /* Refer to the stacks through separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* The stacks and their tools: + 'yyss': related to states. + 'yyvs': related to semantic values. - /* Their size. */ - YYPTRDIFF_T yystacksize = YYINITDEPTH; + Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The state stack: array, bottom, top. */ + /* The state stack. */ yy_state_t yyssa[YYINITDEPTH]; - yy_state_t *yyss = yyssa; - yy_state_t *yyssp = yyss; + yy_state_t *yyss; + yy_state_t *yyssp; - /* The semantic value stack: array, bottom, top. */ + /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp = yyvs; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; + + YYPTRDIFF_T yystacksize; int yyn; - /* The return value of yyparse. */ int yyresult; - /* Lookahead symbol kind. */ - yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; + /* Lookahead token as an internal (translated) token number. */ + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; - +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf; +#endif #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) @@ -1558,10 +1673,16 @@ Keep to zero when no symbol should be popped. */ int yylen = 0; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - goto yysetstate; @@ -1583,11 +1704,10 @@ YY_IGNORE_USELESS_CAST_BEGIN *yyssp = YY_CAST (yy_state_t, yystate); YY_IGNORE_USELESS_CAST_END - YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) #if !defined yyoverflow && !defined YYSTACK_RELOCATE - YYNOMEM; + goto yyexhaustedlab; #else { /* Get the current used size of the three stacks, in elements. */ @@ -1615,7 +1735,7 @@ # else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - YYNOMEM; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; @@ -1626,10 +1746,10 @@ YY_CAST (union yyalloc *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); if (! yyptr) - YYNOMEM; + goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } @@ -1648,7 +1768,6 @@ } #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - if (yystate == YYFINAL) YYACCEPT; @@ -1669,29 +1788,18 @@ /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token\n")); + YYDPRINTF ((stderr, "Reading a token: ")); yychar = yylex (&yylval, scanner, css_parser); } - if (yychar <= TOKEN_EOF) + if (yychar <= YYEOF) { - yychar = TOKEN_EOF; - yytoken = YYSYMBOL_YYEOF; + yychar = yytoken = YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } - else if (yychar == YYerror) - { - /* The scanner already issued an error message, process directly - to error recovery. But do not keep the error token as - lookahead, it is too special and may lead us to an endless - loop in error recovery. */ - yychar = YYUNDEF; - yytoken = YYSYMBOL_YYerror; - goto yyerrlab1; - } else { yytoken = YYTRANSLATE (yychar); @@ -1760,145 +1868,145 @@ YY_REDUCE_PRINT (yyn); switch (yyn) { - case 9: /* maybe_charset: charset */ -#line 192 "../../modules/codec/webvtt/CSSGrammar.y" + case 9: +#line 192 "codec/webvtt/CSSGrammar.y" { vlc_css_rules_Delete((yyvsp[0].rule)); } -#line 1769 "codec/webvtt/CSSGrammar.c" +#line 1877 "codec/webvtt/CSSGrammar.c" break; - case 12: /* charset: CHARSET_SYM maybe_space STRING maybe_space ';' */ -#line 203 "../../modules/codec/webvtt/CSSGrammar.y" + case 12: +#line 203 "codec/webvtt/CSSGrammar.y" { free( (yyvsp[-2].string) ); (yyval.rule) = 0; } -#line 1778 "codec/webvtt/CSSGrammar.c" +#line 1886 "codec/webvtt/CSSGrammar.c" break; - case 13: /* charset: CHARSET_SYM error invalid_block */ -#line 207 "../../modules/codec/webvtt/CSSGrammar.y" + case 13: +#line 207 "codec/webvtt/CSSGrammar.y" { (yyval.rule) = 0; } -#line 1786 "codec/webvtt/CSSGrammar.c" +#line 1894 "codec/webvtt/CSSGrammar.c" break; - case 14: /* charset: CHARSET_SYM error ';' */ -#line 210 "../../modules/codec/webvtt/CSSGrammar.y" + case 14: +#line 210 "codec/webvtt/CSSGrammar.y" { (yyval.rule) = 0; } -#line 1794 "codec/webvtt/CSSGrammar.c" +#line 1902 "codec/webvtt/CSSGrammar.c" break; - case 15: /* ignored_charset: CHARSET_SYM maybe_space STRING maybe_space ';' */ -#line 216 "../../modules/codec/webvtt/CSSGrammar.y" + case 15: +#line 216 "codec/webvtt/CSSGrammar.y" { // Ignore any @charset rule not at the beginning of the style sheet. free( (yyvsp[-2].string) ); (yyval.rule) = 0; } -#line 1804 "codec/webvtt/CSSGrammar.c" +#line 1912 "codec/webvtt/CSSGrammar.c" break; - case 16: /* ignored_charset: CHARSET_SYM maybe_space ';' */ -#line 221 "../../modules/codec/webvtt/CSSGrammar.y" + case 16: +#line 221 "codec/webvtt/CSSGrammar.y" { (yyval.rule) = 0; } -#line 1812 "codec/webvtt/CSSGrammar.c" +#line 1920 "codec/webvtt/CSSGrammar.c" break; - case 18: /* rule_list: rule_list rule maybe_sgml */ -#line 228 "../../modules/codec/webvtt/CSSGrammar.y" + case 18: +#line 228 "codec/webvtt/CSSGrammar.y" { if( (yyvsp[-1].rule) ) vlc_css_parser_AddRule( css_parser, (yyvsp[-1].rule) ); } -#line 1821 "codec/webvtt/CSSGrammar.c" +#line 1929 "codec/webvtt/CSSGrammar.c" break; - case 21: /* rule: valid_rule */ -#line 240 "../../modules/codec/webvtt/CSSGrammar.y" + case 21: +#line 240 "codec/webvtt/CSSGrammar.y" { (yyval.rule) = (yyvsp[0].rule); if((yyval.rule)) (yyval.rule)->b_valid = true; } -#line 1831 "codec/webvtt/CSSGrammar.c" +#line 1939 "codec/webvtt/CSSGrammar.c" break; - case 24: /* font_face: FONT_FACE_SYM maybe_space '{' maybe_space declaration_list closing_brace */ -#line 251 "../../modules/codec/webvtt/CSSGrammar.y" + case 24: +#line 251 "codec/webvtt/CSSGrammar.y" { vlc_css_declarations_Delete( (yyvsp[-1].declarationList) ); (yyval.rule) = NULL; } -#line 1840 "codec/webvtt/CSSGrammar.c" +#line 1948 "codec/webvtt/CSSGrammar.c" break; - case 25: /* font_face: FONT_FACE_SYM error invalid_block */ -#line 255 "../../modules/codec/webvtt/CSSGrammar.y" + case 25: +#line 255 "codec/webvtt/CSSGrammar.y" { (yyval.rule) = NULL; } -#line 1848 "codec/webvtt/CSSGrammar.c" +#line 1956 "codec/webvtt/CSSGrammar.c" break; - case 26: /* font_face: FONT_FACE_SYM error ';' */ -#line 258 "../../modules/codec/webvtt/CSSGrammar.y" + case 26: +#line 258 "codec/webvtt/CSSGrammar.y" { (yyval.rule) = NULL; } -#line 1856 "codec/webvtt/CSSGrammar.c" +#line 1964 "codec/webvtt/CSSGrammar.c" break; - case 27: /* combinator: '+' maybe_space */ -#line 264 "../../modules/codec/webvtt/CSSGrammar.y" + case 27: +#line 264 "codec/webvtt/CSSGrammar.y" { (yyval.relation) = RELATION_DIRECTADJACENT; } -#line 1862 "codec/webvtt/CSSGrammar.c" +#line 1970 "codec/webvtt/CSSGrammar.c" break; - case 28: /* combinator: '~' maybe_space */ -#line 265 "../../modules/codec/webvtt/CSSGrammar.y" + case 28: +#line 265 "codec/webvtt/CSSGrammar.y" { (yyval.relation) = RELATION_INDIRECTADJACENT; } -#line 1868 "codec/webvtt/CSSGrammar.c" +#line 1976 "codec/webvtt/CSSGrammar.c" break; - case 29: /* combinator: '>' maybe_space */ -#line 266 "../../modules/codec/webvtt/CSSGrammar.y" + case 29: +#line 266 "codec/webvtt/CSSGrammar.y" { (yyval.relation) = RELATION_CHILD; } -#line 1874 "codec/webvtt/CSSGrammar.c" +#line 1982 "codec/webvtt/CSSGrammar.c" break; - case 30: /* maybe_unary_operator: unary_operator */ -#line 270 "../../modules/codec/webvtt/CSSGrammar.y" + case 30: +#line 270 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = (yyvsp[0].integer); } -#line 1880 "codec/webvtt/CSSGrammar.c" +#line 1988 "codec/webvtt/CSSGrammar.c" break; - case 31: /* maybe_unary_operator: %empty */ -#line 271 "../../modules/codec/webvtt/CSSGrammar.y" + case 31: +#line 271 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = 1; } -#line 1886 "codec/webvtt/CSSGrammar.c" +#line 1994 "codec/webvtt/CSSGrammar.c" break; - case 32: /* unary_operator: '-' */ -#line 275 "../../modules/codec/webvtt/CSSGrammar.y" + case 32: +#line 275 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = -1; } -#line 1892 "codec/webvtt/CSSGrammar.c" +#line 2000 "codec/webvtt/CSSGrammar.c" break; - case 33: /* unary_operator: '+' */ -#line 276 "../../modules/codec/webvtt/CSSGrammar.y" + case 33: +#line 276 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = 1; } -#line 1898 "codec/webvtt/CSSGrammar.c" +#line 2006 "codec/webvtt/CSSGrammar.c" break; - case 34: /* ruleset: selector_list '{' maybe_space declaration_list closing_brace */ -#line 280 "../../modules/codec/webvtt/CSSGrammar.y" + case 34: +#line 280 "codec/webvtt/CSSGrammar.y" { (yyval.rule) = vlc_css_rule_New(); if((yyval.rule)) @@ -1907,21 +2015,21 @@ (yyval.rule)->p_declarations = (yyvsp[-1].declarationList); } } -#line 1911 "codec/webvtt/CSSGrammar.c" +#line 2019 "codec/webvtt/CSSGrammar.c" break; - case 35: /* selector_list: selector */ -#line 291 "../../modules/codec/webvtt/CSSGrammar.y" + case 35: +#line 291 "codec/webvtt/CSSGrammar.y" { if ((yyvsp[0].selector)) { (yyval.selectorList) = (yyvsp[0].selector); } } -#line 1921 "codec/webvtt/CSSGrammar.c" +#line 2029 "codec/webvtt/CSSGrammar.c" break; - case 36: /* selector_list: selector_list ',' maybe_space selector */ -#line 296 "../../modules/codec/webvtt/CSSGrammar.y" + case 36: +#line 296 "codec/webvtt/CSSGrammar.y" { if ((yyvsp[-3].selectorList) && (yyvsp[0].selector) ) { @@ -1935,90 +2043,90 @@ (yyval.selectorList) = NULL; } } -#line 1939 "codec/webvtt/CSSGrammar.c" +#line 2047 "codec/webvtt/CSSGrammar.c" break; - case 37: /* selector_list: selector_list error */ -#line 309 "../../modules/codec/webvtt/CSSGrammar.y" + case 37: +#line 309 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete( (yyvsp[-1].selectorList) ); (yyval.selectorList) = NULL; } -#line 1948 "codec/webvtt/CSSGrammar.c" +#line 2056 "codec/webvtt/CSSGrammar.c" break; - case 38: /* selector_with_trailing_whitespace: selector WHITESPACE */ -#line 316 "../../modules/codec/webvtt/CSSGrammar.y" + case 38: +#line 316 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = (yyvsp[-1].selector); } -#line 1956 "codec/webvtt/CSSGrammar.c" +#line 2064 "codec/webvtt/CSSGrammar.c" break; - case 39: /* selector: simple_selector */ -#line 322 "../../modules/codec/webvtt/CSSGrammar.y" + case 39: +#line 322 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = (yyvsp[0].selector); } -#line 1964 "codec/webvtt/CSSGrammar.c" +#line 2072 "codec/webvtt/CSSGrammar.c" break; - case 40: /* selector: selector_with_trailing_whitespace */ -#line 326 "../../modules/codec/webvtt/CSSGrammar.y" + case 40: +#line 326 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = (yyvsp[0].selector); } -#line 1972 "codec/webvtt/CSSGrammar.c" +#line 2080 "codec/webvtt/CSSGrammar.c" break; - case 41: /* selector: selector_with_trailing_whitespace simple_selector */ -#line 330 "../../modules/codec/webvtt/CSSGrammar.y" + case 41: +#line 330 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = (yyvsp[-1].selector); - if ((yyval.selector)) + if ((yyval.selector) && (yyvsp[0].selector)) { vlc_css_selector_AddSpecifier( (yyval.selector), (yyvsp[0].selector) ); (yyvsp[0].selector)->combinator = RELATION_DESCENDENT; } else (yyval.selector) = (yyvsp[0].selector); } -#line 1986 "codec/webvtt/CSSGrammar.c" +#line 2094 "codec/webvtt/CSSGrammar.c" break; - case 42: /* selector: selector combinator simple_selector */ -#line 339 "../../modules/codec/webvtt/CSSGrammar.y" + case 42: +#line 339 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = (yyvsp[-2].selector); - if ((yyval.selector)) + if ((yyval.selector) && (yyvsp[0].selector)) { vlc_css_selector_AddSpecifier( (yyval.selector), (yyvsp[0].selector) ); (yyvsp[0].selector)->combinator = (yyvsp[-1].relation); } else (yyval.selector) = (yyvsp[0].selector); } -#line 2000 "codec/webvtt/CSSGrammar.c" +#line 2108 "codec/webvtt/CSSGrammar.c" break; - case 43: /* selector: selector error */ -#line 348 "../../modules/codec/webvtt/CSSGrammar.y" + case 43: +#line 348 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete( (yyvsp[-1].selector) ); (yyval.selector) = NULL; } -#line 2009 "codec/webvtt/CSSGrammar.c" +#line 2117 "codec/webvtt/CSSGrammar.c" break; - case 44: /* simple_selector: element_name */ -#line 355 "../../modules/codec/webvtt/CSSGrammar.y" + case 44: +#line 355 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = vlc_css_selector_New( SELECTOR_SIMPLE, (yyvsp[0].string) ); free( (yyvsp[0].string) ); } -#line 2018 "codec/webvtt/CSSGrammar.c" +#line 2126 "codec/webvtt/CSSGrammar.c" break; - case 45: /* simple_selector: element_name specifier_list */ -#line 359 "../../modules/codec/webvtt/CSSGrammar.y" + case 45: +#line 359 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = vlc_css_selector_New( SELECTOR_SIMPLE, (yyvsp[-1].string) ); if( (yyval.selector) && (yyvsp[0].selector) ) @@ -2031,33 +2139,33 @@ } free( (yyvsp[-1].string) ); } -#line 2035 "codec/webvtt/CSSGrammar.c" +#line 2143 "codec/webvtt/CSSGrammar.c" break; - case 46: /* simple_selector: specifier_list */ -#line 371 "../../modules/codec/webvtt/CSSGrammar.y" + case 46: +#line 371 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = (yyvsp[0].selector); } -#line 2043 "codec/webvtt/CSSGrammar.c" +#line 2151 "codec/webvtt/CSSGrammar.c" break; - case 48: /* element_name: '*' */ -#line 378 "../../modules/codec/webvtt/CSSGrammar.y" + case 48: +#line 378 "codec/webvtt/CSSGrammar.y" { (yyval.string) = strdup("*"); } -#line 2049 "codec/webvtt/CSSGrammar.c" +#line 2157 "codec/webvtt/CSSGrammar.c" break; - case 49: /* specifier_list: specifier */ -#line 382 "../../modules/codec/webvtt/CSSGrammar.y" + case 49: +#line 382 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = (yyvsp[0].selector); } -#line 2057 "codec/webvtt/CSSGrammar.c" +#line 2165 "codec/webvtt/CSSGrammar.c" break; - case 50: /* specifier_list: specifier_list specifier */ -#line 385 "../../modules/codec/webvtt/CSSGrammar.y" + case 50: +#line 385 "codec/webvtt/CSSGrammar.y" { if( (yyvsp[-1].selector) ) { @@ -2068,29 +2176,29 @@ } else (yyval.selector) = (yyvsp[0].selector); } -#line 2072 "codec/webvtt/CSSGrammar.c" +#line 2180 "codec/webvtt/CSSGrammar.c" break; - case 51: /* specifier_list: specifier_list error */ -#line 395 "../../modules/codec/webvtt/CSSGrammar.y" + case 51: +#line 395 "codec/webvtt/CSSGrammar.y" { vlc_css_selectors_Delete( (yyvsp[-1].selector) ); (yyval.selector) = NULL; } -#line 2081 "codec/webvtt/CSSGrammar.c" +#line 2189 "codec/webvtt/CSSGrammar.c" break; - case 52: /* specifier: IDSEL */ -#line 402 "../../modules/codec/webvtt/CSSGrammar.y" + case 52: +#line 402 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = vlc_css_selector_New( SPECIFIER_ID, (yyvsp[0].string) ); free( (yyvsp[0].string) ); } -#line 2090 "codec/webvtt/CSSGrammar.c" +#line 2198 "codec/webvtt/CSSGrammar.c" break; - case 53: /* specifier: HASH */ -#line 407 "../../modules/codec/webvtt/CSSGrammar.y" + case 53: +#line 407 "codec/webvtt/CSSGrammar.y" { if ((yyvsp[0].string)[0] >= '0' && (yyvsp[0].string)[0] <= '9') { (yyval.selector) = NULL; @@ -2099,40 +2207,40 @@ } free( (yyvsp[0].string) ); } -#line 2103 "codec/webvtt/CSSGrammar.c" +#line 2211 "codec/webvtt/CSSGrammar.c" break; - case 57: /* class: '.' IDENT */ -#line 421 "../../modules/codec/webvtt/CSSGrammar.y" + case 57: +#line 421 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = vlc_css_selector_New( SPECIFIER_CLASS, (yyvsp[0].string) ); free( (yyvsp[0].string) ); } -#line 2112 "codec/webvtt/CSSGrammar.c" +#line 2220 "codec/webvtt/CSSGrammar.c" break; - case 58: /* attr_name: IDENT maybe_space */ -#line 428 "../../modules/codec/webvtt/CSSGrammar.y" + case 58: +#line 428 "codec/webvtt/CSSGrammar.y" { (yyval.string) = (yyvsp[-1].string); } -#line 2120 "codec/webvtt/CSSGrammar.c" +#line 2228 "codec/webvtt/CSSGrammar.c" break; - case 59: /* attrib: '[' maybe_space attr_name ']' */ -#line 434 "../../modules/codec/webvtt/CSSGrammar.y" + case 59: +#line 434 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = vlc_css_selector_New( SPECIFIER_ATTRIB, (yyvsp[-1].string) ); free( (yyvsp[-1].string) ); } -#line 2129 "codec/webvtt/CSSGrammar.c" +#line 2237 "codec/webvtt/CSSGrammar.c" break; - case 60: /* attrib: '[' maybe_space attr_name match maybe_space ident_or_string maybe_space ']' */ -#line 438 "../../modules/codec/webvtt/CSSGrammar.y" + case 60: +#line 438 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = vlc_css_selector_New( SPECIFIER_ATTRIB, (yyvsp[-5].string) ); - if( (yyval.selector) ) + if( (yyval.selector) && (yyval.selector) ) { (yyval.selector)->match = (yyvsp[-4].integer); (yyval.selector)->p_matchsel = vlc_css_selector_New( SPECIFIER_ID, (yyvsp[-2].string) ); @@ -2140,77 +2248,77 @@ free( (yyvsp[-5].string) ); free( (yyvsp[-2].string) ); } -#line 2144 "codec/webvtt/CSSGrammar.c" +#line 2252 "codec/webvtt/CSSGrammar.c" break; - case 61: /* match: '=' */ -#line 451 "../../modules/codec/webvtt/CSSGrammar.y" + case 61: +#line 451 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = MATCH_EQUALS; } -#line 2152 "codec/webvtt/CSSGrammar.c" +#line 2260 "codec/webvtt/CSSGrammar.c" break; - case 62: /* match: INCLUDES */ -#line 454 "../../modules/codec/webvtt/CSSGrammar.y" + case 62: +#line 454 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = MATCH_INCLUDES; } -#line 2160 "codec/webvtt/CSSGrammar.c" +#line 2268 "codec/webvtt/CSSGrammar.c" break; - case 63: /* match: DASHMATCH */ -#line 457 "../../modules/codec/webvtt/CSSGrammar.y" + case 63: +#line 457 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = MATCH_DASHMATCH; } -#line 2168 "codec/webvtt/CSSGrammar.c" +#line 2276 "codec/webvtt/CSSGrammar.c" break; - case 64: /* match: BEGINSWITH */ -#line 460 "../../modules/codec/webvtt/CSSGrammar.y" + case 64: +#line 460 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = MATCH_BEGINSWITH; } -#line 2176 "codec/webvtt/CSSGrammar.c" +#line 2284 "codec/webvtt/CSSGrammar.c" break; - case 65: /* match: ENDSWITH */ -#line 463 "../../modules/codec/webvtt/CSSGrammar.y" + case 65: +#line 463 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = MATCH_ENDSWITH; } -#line 2184 "codec/webvtt/CSSGrammar.c" +#line 2292 "codec/webvtt/CSSGrammar.c" break; - case 66: /* match: CONTAINS */ -#line 466 "../../modules/codec/webvtt/CSSGrammar.y" + case 66: +#line 466 "codec/webvtt/CSSGrammar.y" { (yyval.integer) = MATCH_CONTAINS; } -#line 2192 "codec/webvtt/CSSGrammar.c" +#line 2300 "codec/webvtt/CSSGrammar.c" break; - case 69: /* pseudo: ':' IDENT */ -#line 477 "../../modules/codec/webvtt/CSSGrammar.y" + case 69: +#line 477 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = vlc_css_selector_New( SELECTOR_PSEUDOCLASS, (yyvsp[0].string) ); free( (yyvsp[0].string) ); } -#line 2201 "codec/webvtt/CSSGrammar.c" +#line 2309 "codec/webvtt/CSSGrammar.c" break; - case 70: /* pseudo: ':' ':' IDENT */ -#line 481 "../../modules/codec/webvtt/CSSGrammar.y" + case 70: +#line 481 "codec/webvtt/CSSGrammar.y" { (yyval.selector) = vlc_css_selector_New( SELECTOR_PSEUDOELEMENT, (yyvsp[0].string) ); free( (yyvsp[0].string) ); } -#line 2210 "codec/webvtt/CSSGrammar.c" +#line 2318 "codec/webvtt/CSSGrammar.c" break; - case 71: /* pseudo: ':' FUNCTION maybe_space maybe_unary_operator NUMBER maybe_space ')' */ -#line 486 "../../modules/codec/webvtt/CSSGrammar.y" + case 71: +#line 486 "codec/webvtt/CSSGrammar.y" { if(*(yyvsp[-5].string) != 0) (yyvsp[-5].string)[strlen((yyvsp[-5].string)) - 1] = 0; @@ -2219,11 +2327,11 @@ free( (yyvsp[-5].string) ); vlc_css_term_Clean( (yyvsp[-2].term) ); } -#line 2223 "codec/webvtt/CSSGrammar.c" +#line 2331 "codec/webvtt/CSSGrammar.c" break; - case 72: /* pseudo: ':' ':' FUNCTION maybe_space selector maybe_space ')' */ -#line 495 "../../modules/codec/webvtt/CSSGrammar.y" + case 72: +#line 495 "codec/webvtt/CSSGrammar.y" { if(*(yyvsp[-4].string) != 0) (yyvsp[-4].string)[strlen((yyvsp[-4].string)) - 1] = 0; @@ -2237,11 +2345,11 @@ else vlc_css_selectors_Delete( (yyvsp[-2].selector) ); } -#line 2241 "codec/webvtt/CSSGrammar.c" +#line 2349 "codec/webvtt/CSSGrammar.c" break; - case 73: /* pseudo: ':' FUNCTION maybe_space IDENT maybe_space ')' */ -#line 509 "../../modules/codec/webvtt/CSSGrammar.y" + case 73: +#line 509 "codec/webvtt/CSSGrammar.y" { if(*(yyvsp[-4].string) != 0) (yyvsp[-4].string)[strlen((yyvsp[-4].string)) - 1] = 0; @@ -2249,111 +2357,111 @@ free( (yyvsp[-4].string) ); free( (yyvsp[-2].string) ); } -#line 2253 "codec/webvtt/CSSGrammar.c" +#line 2361 "codec/webvtt/CSSGrammar.c" break; - case 74: /* declaration_list: declaration */ -#line 519 "../../modules/codec/webvtt/CSSGrammar.y" + case 74: +#line 519 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = (yyvsp[0].declaration); } -#line 2261 "codec/webvtt/CSSGrammar.c" +#line 2369 "codec/webvtt/CSSGrammar.c" break; - case 75: /* declaration_list: decl_list declaration */ -#line 522 "../../modules/codec/webvtt/CSSGrammar.y" + case 75: +#line 522 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = (yyvsp[-1].declarationList); if( (yyval.declarationList) ) vlc_css_declarations_Append( (yyval.declarationList), (yyvsp[0].declaration) ); } -#line 2271 "codec/webvtt/CSSGrammar.c" +#line 2379 "codec/webvtt/CSSGrammar.c" break; - case 76: /* declaration_list: decl_list */ -#line 527 "../../modules/codec/webvtt/CSSGrammar.y" + case 76: +#line 527 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = (yyvsp[0].declarationList); } -#line 2279 "codec/webvtt/CSSGrammar.c" +#line 2387 "codec/webvtt/CSSGrammar.c" break; - case 77: /* declaration_list: error invalid_block_list error */ -#line 530 "../../modules/codec/webvtt/CSSGrammar.y" + case 77: +#line 530 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = NULL; } -#line 2287 "codec/webvtt/CSSGrammar.c" +#line 2395 "codec/webvtt/CSSGrammar.c" break; - case 78: /* declaration_list: error */ -#line 533 "../../modules/codec/webvtt/CSSGrammar.y" + case 78: +#line 533 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = NULL; } -#line 2295 "codec/webvtt/CSSGrammar.c" +#line 2403 "codec/webvtt/CSSGrammar.c" break; - case 79: /* declaration_list: decl_list error */ -#line 536 "../../modules/codec/webvtt/CSSGrammar.y" + case 79: +#line 536 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = (yyvsp[-1].declarationList); } -#line 2303 "codec/webvtt/CSSGrammar.c" +#line 2411 "codec/webvtt/CSSGrammar.c" break; - case 80: /* declaration_list: decl_list invalid_block_list */ -#line 539 "../../modules/codec/webvtt/CSSGrammar.y" + case 80: +#line 539 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = (yyvsp[-1].declarationList); } -#line 2311 "codec/webvtt/CSSGrammar.c" +#line 2419 "codec/webvtt/CSSGrammar.c" break; - case 81: /* decl_list: declaration ';' maybe_space */ -#line 545 "../../modules/codec/webvtt/CSSGrammar.y" + case 81: +#line 545 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = (yyvsp[-2].declaration); } -#line 2319 "codec/webvtt/CSSGrammar.c" +#line 2427 "codec/webvtt/CSSGrammar.c" break; - case 82: /* decl_list: declaration invalid_block_list maybe_space */ -#line 548 "../../modules/codec/webvtt/CSSGrammar.y" + case 82: +#line 548 "codec/webvtt/CSSGrammar.y" { vlc_css_declarations_Delete( (yyvsp[-2].declaration) ); (yyval.declarationList) = NULL; } -#line 2328 "codec/webvtt/CSSGrammar.c" +#line 2436 "codec/webvtt/CSSGrammar.c" break; - case 83: /* decl_list: declaration invalid_block_list ';' maybe_space */ -#line 552 "../../modules/codec/webvtt/CSSGrammar.y" + case 83: +#line 552 "codec/webvtt/CSSGrammar.y" { vlc_css_declarations_Delete( (yyvsp[-3].declaration) ); (yyval.declarationList) = NULL; } -#line 2337 "codec/webvtt/CSSGrammar.c" +#line 2445 "codec/webvtt/CSSGrammar.c" break; - case 84: /* decl_list: error ';' maybe_space */ -#line 556 "../../modules/codec/webvtt/CSSGrammar.y" + case 84: +#line 556 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = NULL; } -#line 2345 "codec/webvtt/CSSGrammar.c" +#line 2453 "codec/webvtt/CSSGrammar.c" break; - case 85: /* decl_list: error invalid_block_list error ';' maybe_space */ -#line 559 "../../modules/codec/webvtt/CSSGrammar.y" + case 85: +#line 559 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = NULL; } -#line 2353 "codec/webvtt/CSSGrammar.c" +#line 2461 "codec/webvtt/CSSGrammar.c" break; - case 86: /* decl_list: decl_list declaration ';' maybe_space */ -#line 562 "../../modules/codec/webvtt/CSSGrammar.y" + case 86: +#line 562 "codec/webvtt/CSSGrammar.y" { if( (yyvsp[-3].declarationList) ) { @@ -2362,49 +2470,53 @@ } else (yyval.declarationList) = (yyvsp[-2].declaration); } -#line 2366 "codec/webvtt/CSSGrammar.c" +#line 2474 "codec/webvtt/CSSGrammar.c" break; - case 87: /* decl_list: decl_list error ';' maybe_space */ -#line 570 "../../modules/codec/webvtt/CSSGrammar.y" + case 87: +#line 570 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = (yyvsp[-3].declarationList); } -#line 2374 "codec/webvtt/CSSGrammar.c" +#line 2482 "codec/webvtt/CSSGrammar.c" break; - case 88: /* decl_list: decl_list error invalid_block_list error ';' maybe_space */ -#line 573 "../../modules/codec/webvtt/CSSGrammar.y" + case 88: +#line 573 "codec/webvtt/CSSGrammar.y" { (yyval.declarationList) = (yyvsp[-5].declarationList); } -#line 2382 "codec/webvtt/CSSGrammar.c" +#line 2490 "codec/webvtt/CSSGrammar.c" break; - case 89: /* declaration: property ':' maybe_space expr prio */ -#line 579 "../../modules/codec/webvtt/CSSGrammar.y" + case 89: +#line 579 "codec/webvtt/CSSGrammar.y" { - (yyval.declaration) = vlc_css_declaration_New( (yyvsp[-4].string) ); - if( (yyval.declaration) ) - (yyval.declaration)->expr = (yyvsp[-1].expr); - else - vlc_css_expression_Delete( (yyvsp[-1].expr) ); + if( (yyvsp[-1].expr) ) + { + (yyval.declaration) = vlc_css_declaration_New( (yyvsp[-4].string) ); + if( (yyval.declaration) ) + (yyval.declaration)->expr = (yyvsp[-1].expr); + else + vlc_css_expression_Delete( (yyvsp[-1].expr) ); + } + else (yyval.declaration) = NULL; free( (yyvsp[-4].string) ); } -#line 2395 "codec/webvtt/CSSGrammar.c" +#line 2507 "codec/webvtt/CSSGrammar.c" break; - case 90: /* declaration: property error */ -#line 588 "../../modules/codec/webvtt/CSSGrammar.y" + case 90: +#line 592 "codec/webvtt/CSSGrammar.y" { free( (yyvsp[-1].string) ); (yyval.declaration) = NULL; } -#line 2404 "codec/webvtt/CSSGrammar.c" +#line 2516 "codec/webvtt/CSSGrammar.c" break; - case 91: /* declaration: property ':' maybe_space error expr prio */ -#line 593 "../../modules/codec/webvtt/CSSGrammar.y" + case 91: +#line 597 "codec/webvtt/CSSGrammar.y" { free( (yyvsp[-5].string) ); vlc_css_expression_Delete( (yyvsp[-1].expr) ); @@ -2413,286 +2525,286 @@ up and deleting the shifted expr. */ (yyval.declaration) = NULL; } -#line 2417 "codec/webvtt/CSSGrammar.c" +#line 2529 "codec/webvtt/CSSGrammar.c" break; - case 92: /* declaration: property ':' maybe_space expr prio error */ -#line 602 "../../modules/codec/webvtt/CSSGrammar.y" + case 92: +#line 606 "codec/webvtt/CSSGrammar.y" { free( (yyvsp[-5].string) ); vlc_css_expression_Delete( (yyvsp[-2].expr) ); /* When we encounter something like p {color: red !important fail;} we should drop the declaration */ (yyval.declaration) = NULL; } -#line 2428 "codec/webvtt/CSSGrammar.c" +#line 2540 "codec/webvtt/CSSGrammar.c" break; - case 93: /* declaration: IMPORTANT_SYM maybe_space */ -#line 609 "../../modules/codec/webvtt/CSSGrammar.y" + case 93: +#line 613 "codec/webvtt/CSSGrammar.y" { /* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */ (yyval.declaration) = NULL; } -#line 2437 "codec/webvtt/CSSGrammar.c" +#line 2549 "codec/webvtt/CSSGrammar.c" break; - case 94: /* declaration: property ':' maybe_space */ -#line 614 "../../modules/codec/webvtt/CSSGrammar.y" + case 94: +#line 618 "codec/webvtt/CSSGrammar.y" { free( (yyvsp[-2].string) ); /* div { font-family: } Just reduce away this property with no value. */ (yyval.declaration) = NULL; } -#line 2447 "codec/webvtt/CSSGrammar.c" +#line 2559 "codec/webvtt/CSSGrammar.c" break; - case 95: /* declaration: property ':' maybe_space error */ -#line 620 "../../modules/codec/webvtt/CSSGrammar.y" + case 95: +#line 624 "codec/webvtt/CSSGrammar.y" { free( (yyvsp[-3].string) ); /* if we come across rules with invalid values like this case: p { weight: *; }, just discard the rule */ (yyval.declaration) = NULL; } -#line 2457 "codec/webvtt/CSSGrammar.c" +#line 2569 "codec/webvtt/CSSGrammar.c" break; - case 96: /* declaration: property invalid_block */ -#line 626 "../../modules/codec/webvtt/CSSGrammar.y" + case 96: +#line 630 "codec/webvtt/CSSGrammar.y" { /* if we come across: div { color{;color:maroon} }, ignore everything within curly brackets */ free( (yyvsp[-1].string) ); (yyval.declaration) = NULL; } -#line 2467 "codec/webvtt/CSSGrammar.c" +#line 2579 "codec/webvtt/CSSGrammar.c" break; - case 97: /* property: IDENT maybe_space */ -#line 634 "../../modules/codec/webvtt/CSSGrammar.y" + case 97: +#line 638 "codec/webvtt/CSSGrammar.y" { (yyval.string) = (yyvsp[-1].string); } -#line 2475 "codec/webvtt/CSSGrammar.c" +#line 2587 "codec/webvtt/CSSGrammar.c" break; - case 98: /* prio: IMPORTANT_SYM maybe_space */ -#line 640 "../../modules/codec/webvtt/CSSGrammar.y" + case 98: +#line 644 "codec/webvtt/CSSGrammar.y" { (yyval.boolean) = true; } -#line 2481 "codec/webvtt/CSSGrammar.c" +#line 2593 "codec/webvtt/CSSGrammar.c" break; - case 99: /* prio: %empty */ -#line 641 "../../modules/codec/webvtt/CSSGrammar.y" + case 99: +#line 645 "codec/webvtt/CSSGrammar.y" { (yyval.boolean) = false; } -#line 2487 "codec/webvtt/CSSGrammar.c" +#line 2599 "codec/webvtt/CSSGrammar.c" break; - case 100: /* expr: term */ -#line 645 "../../modules/codec/webvtt/CSSGrammar.y" + case 100: +#line 649 "codec/webvtt/CSSGrammar.y" { (yyval.expr) = vlc_css_expression_New( (yyvsp[0].term) ); if( !(yyval.expr) ) vlc_css_term_Clean( (yyvsp[0].term) ); } -#line 2497 "codec/webvtt/CSSGrammar.c" +#line 2609 "codec/webvtt/CSSGrammar.c" break; - case 101: /* expr: expr operator term */ -#line 650 "../../modules/codec/webvtt/CSSGrammar.y" + case 101: +#line 654 "codec/webvtt/CSSGrammar.y" { (yyval.expr) = (yyvsp[-2].expr); if( !(yyvsp[-2].expr) || !vlc_css_expression_AddTerm((yyvsp[-2].expr), (yyvsp[-1].character), (yyvsp[0].term)) ) vlc_css_term_Clean( (yyvsp[0].term) ); } -#line 2507 "codec/webvtt/CSSGrammar.c" +#line 2619 "codec/webvtt/CSSGrammar.c" break; - case 102: /* expr: expr invalid_block_list */ -#line 655 "../../modules/codec/webvtt/CSSGrammar.y" + case 102: +#line 659 "codec/webvtt/CSSGrammar.y" { vlc_css_expression_Delete( (yyvsp[-1].expr) ); (yyval.expr) = NULL; } -#line 2516 "codec/webvtt/CSSGrammar.c" +#line 2628 "codec/webvtt/CSSGrammar.c" break; - case 103: /* expr: expr invalid_block_list error */ -#line 659 "../../modules/codec/webvtt/CSSGrammar.y" + case 103: +#line 663 "codec/webvtt/CSSGrammar.y" { vlc_css_expression_Delete( (yyvsp[-2].expr) ); (yyval.expr) = NULL; } -#line 2525 "codec/webvtt/CSSGrammar.c" +#line 2637 "codec/webvtt/CSSGrammar.c" break; - case 104: /* expr: expr error */ -#line 663 "../../modules/codec/webvtt/CSSGrammar.y" + case 104: +#line 667 "codec/webvtt/CSSGrammar.y" { vlc_css_expression_Delete( (yyvsp[-1].expr) ); (yyval.expr) = NULL; } -#line 2534 "codec/webvtt/CSSGrammar.c" +#line 2646 "codec/webvtt/CSSGrammar.c" break; - case 105: /* operator: '/' maybe_space */ -#line 670 "../../modules/codec/webvtt/CSSGrammar.y" + case 105: +#line 674 "codec/webvtt/CSSGrammar.y" { (yyval.character) = '/'; } -#line 2542 "codec/webvtt/CSSGrammar.c" +#line 2654 "codec/webvtt/CSSGrammar.c" break; - case 106: /* operator: ',' maybe_space */ -#line 673 "../../modules/codec/webvtt/CSSGrammar.y" + case 106: +#line 677 "codec/webvtt/CSSGrammar.y" { (yyval.character) = ','; } -#line 2550 "codec/webvtt/CSSGrammar.c" +#line 2662 "codec/webvtt/CSSGrammar.c" break; - case 107: /* operator: %empty */ -#line 676 "../../modules/codec/webvtt/CSSGrammar.y" + case 107: +#line 680 "codec/webvtt/CSSGrammar.y" { (yyval.character) = 0; } -#line 2558 "codec/webvtt/CSSGrammar.c" +#line 2670 "codec/webvtt/CSSGrammar.c" break; - case 108: /* term: unary_term */ -#line 682 "../../modules/codec/webvtt/CSSGrammar.y" + case 108: +#line 686 "codec/webvtt/CSSGrammar.y" { (yyval.term) = (yyvsp[0].term); } -#line 2564 "codec/webvtt/CSSGrammar.c" +#line 2676 "codec/webvtt/CSSGrammar.c" break; - case 109: /* term: unary_operator unary_term */ -#line 683 "../../modules/codec/webvtt/CSSGrammar.y" + case 109: +#line 687 "codec/webvtt/CSSGrammar.y" { (yyval.term) = (yyvsp[0].term); (yyval.term).val *= (yyvsp[-1].integer); } -#line 2573 "codec/webvtt/CSSGrammar.c" +#line 2685 "codec/webvtt/CSSGrammar.c" break; - case 110: /* term: STRING maybe_space */ -#line 687 "../../modules/codec/webvtt/CSSGrammar.y" + case 110: +#line 691 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_STRING; (yyval.term).psz = (yyvsp[-1].string); } -#line 2579 "codec/webvtt/CSSGrammar.c" +#line 2691 "codec/webvtt/CSSGrammar.c" break; - case 111: /* term: IDENT maybe_space */ -#line 688 "../../modules/codec/webvtt/CSSGrammar.y" + case 111: +#line 692 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_IDENTIFIER; (yyval.term).psz = (yyvsp[-1].string); } -#line 2585 "codec/webvtt/CSSGrammar.c" +#line 2697 "codec/webvtt/CSSGrammar.c" break; - case 112: /* term: DIMEN maybe_space */ -#line 690 "../../modules/codec/webvtt/CSSGrammar.y" + case 112: +#line 694 "codec/webvtt/CSSGrammar.y" { (yyval.term) = (yyvsp[-1].term); } -#line 2591 "codec/webvtt/CSSGrammar.c" +#line 2703 "codec/webvtt/CSSGrammar.c" break; - case 113: /* term: unary_operator DIMEN maybe_space */ -#line 691 "../../modules/codec/webvtt/CSSGrammar.y" + case 113: +#line 695 "codec/webvtt/CSSGrammar.y" { (yyval.term) = (yyvsp[-1].term); } -#line 2597 "codec/webvtt/CSSGrammar.c" +#line 2709 "codec/webvtt/CSSGrammar.c" break; - case 114: /* term: URI maybe_space */ -#line 692 "../../modules/codec/webvtt/CSSGrammar.y" + case 114: +#line 696 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_URI; (yyval.term).psz = (yyvsp[-1].string); } -#line 2603 "codec/webvtt/CSSGrammar.c" +#line 2715 "codec/webvtt/CSSGrammar.c" break; - case 115: /* term: UNICODERANGE maybe_space */ -#line 693 "../../modules/codec/webvtt/CSSGrammar.y" + case 115: +#line 697 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_UNICODERANGE; (yyval.term).psz = (yyvsp[-1].string); } -#line 2609 "codec/webvtt/CSSGrammar.c" +#line 2721 "codec/webvtt/CSSGrammar.c" break; - case 116: /* term: IDSEL maybe_space */ -#line 694 "../../modules/codec/webvtt/CSSGrammar.y" + case 116: +#line 698 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_HEXCOLOR; (yyval.term).psz = (yyvsp[-1].string); } -#line 2615 "codec/webvtt/CSSGrammar.c" +#line 2727 "codec/webvtt/CSSGrammar.c" break; - case 117: /* term: HASH maybe_space */ -#line 695 "../../modules/codec/webvtt/CSSGrammar.y" + case 117: +#line 699 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_HEXCOLOR; (yyval.term).psz = (yyvsp[-1].string); } -#line 2621 "codec/webvtt/CSSGrammar.c" +#line 2733 "codec/webvtt/CSSGrammar.c" break; - case 118: /* term: '#' maybe_space */ -#line 696 "../../modules/codec/webvtt/CSSGrammar.y" + case 118: +#line 700 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_HEXCOLOR; (yyval.term).psz = NULL; } -#line 2627 "codec/webvtt/CSSGrammar.c" +#line 2739 "codec/webvtt/CSSGrammar.c" break; - case 119: /* term: function */ -#line 698 "../../modules/codec/webvtt/CSSGrammar.y" + case 119: +#line 702 "codec/webvtt/CSSGrammar.y" { (yyval.term) = (yyvsp[0].term); } -#line 2635 "codec/webvtt/CSSGrammar.c" +#line 2747 "codec/webvtt/CSSGrammar.c" break; - case 120: /* term: '%' maybe_space */ -#line 701 "../../modules/codec/webvtt/CSSGrammar.y" + case 120: +#line 705 "codec/webvtt/CSSGrammar.y" { /* Handle width: %; */ (yyval.term).type = TYPE_PERCENT; (yyval.term).val = 0; } -#line 2643 "codec/webvtt/CSSGrammar.c" +#line 2755 "codec/webvtt/CSSGrammar.c" break; - case 127: /* function: FUNCTION maybe_space expr ')' maybe_space */ -#line 716 "../../modules/codec/webvtt/CSSGrammar.y" + case 127: +#line 720 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_FUNCTION; (yyval.term).function = (yyvsp[-2].expr); (yyval.term).psz = (yyvsp[-4].string); if(*(yyval.term).psz != 0) (yyval.term).psz[strlen((yyval.term).psz) - 1] = 0; } -#line 2654 "codec/webvtt/CSSGrammar.c" +#line 2766 "codec/webvtt/CSSGrammar.c" break; - case 128: /* function: FUNCTION maybe_space expr TOKEN_EOF */ -#line 722 "../../modules/codec/webvtt/CSSGrammar.y" + case 128: +#line 726 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_FUNCTION; (yyval.term).function = (yyvsp[-1].expr); (yyval.term).psz = (yyvsp[-3].string); if(*(yyval.term).psz != 0) (yyval.term).psz[strlen((yyval.term).psz) - 1] = 0; } -#line 2664 "codec/webvtt/CSSGrammar.c" +#line 2776 "codec/webvtt/CSSGrammar.c" break; - case 129: /* function: FUNCTION maybe_space ')' maybe_space */ -#line 727 "../../modules/codec/webvtt/CSSGrammar.y" + case 129: +#line 731 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_FUNCTION; (yyval.term).function = NULL; (yyval.term).psz = (yyvsp[-3].string); if(*(yyval.term).psz != 0) (yyval.term).psz[strlen((yyval.term).psz) - 1] = 0; } -#line 2674 "codec/webvtt/CSSGrammar.c" +#line 2786 "codec/webvtt/CSSGrammar.c" break; - case 130: /* function: FUNCTION maybe_space error */ -#line 732 "../../modules/codec/webvtt/CSSGrammar.y" + case 130: +#line 736 "codec/webvtt/CSSGrammar.y" { (yyval.term).type = TYPE_FUNCTION; (yyval.term).function = NULL; (yyval.term).psz = (yyvsp[-2].string); if(*(yyval.term).psz != 0) (yyval.term).psz[strlen((yyval.term).psz) - 1] = 0; } -#line 2684 "codec/webvtt/CSSGrammar.c" +#line 2796 "codec/webvtt/CSSGrammar.c" break; - case 131: /* invalid_rule: error invalid_block */ -#line 742 "../../modules/codec/webvtt/CSSGrammar.y" + case 131: +#line 746 "codec/webvtt/CSSGrammar.y" { (yyval.rule) = NULL; } -#line 2692 "codec/webvtt/CSSGrammar.c" +#line 2804 "codec/webvtt/CSSGrammar.c" break; -#line 2696 "codec/webvtt/CSSGrammar.c" +#line 2808 "codec/webvtt/CSSGrammar.c" default: break; } @@ -2707,10 +2819,11 @@ case of YYERROR or YYBACKUP, subsequent parser actions might lead to an incorrect destructor call or verbose syntax error message before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -2734,23 +2847,59 @@ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; +#if ! YYERROR_VERBOSE yyerror (scanner, css_parser, YY_("syntax error")); +#else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) + { + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc))); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (scanner, css_parser, yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; + } +# undef YYSYNTAX_ERROR +#endif } + + if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ - if (yychar <= TOKEN_EOF) + if (yychar <= YYEOF) { /* Return failure if at end of input. */ - if (yychar == TOKEN_EOF) + if (yychar == YYEOF) YYABORT; } else @@ -2774,7 +2923,6 @@ label yyerrorlab therefore never appears in user code. */ if (0) YYERROR; - ++yynerrs; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ @@ -2791,14 +2939,13 @@ yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ - /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) { - yyn += YYSYMBOL_YYerror; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) { yyn = yytable[yyn]; if (0 < yyn) @@ -2812,7 +2959,7 @@ yydestruct ("Error: popping", - YY_ACCESSING_SYMBOL (yystate), yyvsp, scanner, css_parser); + yystos[yystate], yyvsp, scanner, css_parser); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -2824,7 +2971,7 @@ /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -2835,7 +2982,7 @@ `-------------------------------------*/ yyacceptlab: yyresult = 0; - goto yyreturnlab; + goto yyreturn; /*-----------------------------------. @@ -2843,22 +2990,24 @@ `-----------------------------------*/ yyabortlab: yyresult = 1; - goto yyreturnlab; + goto yyreturn; -/*-----------------------------------------------------------. -| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | -`-----------------------------------------------------------*/ +#if !defined yyoverflow || YYERROR_VERBOSE +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ yyexhaustedlab: yyerror (scanner, css_parser, YY_("memory exhausted")); yyresult = 2; - goto yyreturnlab; + /* Fall through. */ +#endif -/*----------------------------------------------------------. -| yyreturnlab -- parsing is finished, clean up and return. | -`----------------------------------------------------------*/ -yyreturnlab: +/*-----------------------------------------------------. +| yyreturn -- parsing is finished, return the result. | +`-----------------------------------------------------*/ +yyreturn: if (yychar != YYEMPTY) { /* Make sure we have latest lookahead translation. See comments at @@ -2874,18 +3023,20 @@ while (yyssp != yyss) { yydestruct ("Cleanup: popping", - YY_ACCESSING_SYMBOL (+*yyssp), yyvsp, scanner, css_parser); + yystos[+*yyssp], yyvsp, scanner, css_parser); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif - +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif return yyresult; } - -#line 769 "../../modules/codec/webvtt/CSSGrammar.y" +#line 773 "codec/webvtt/CSSGrammar.y" #ifdef YYDEBUG diff -Nru vlc-3.0.21/modules/codec/webvtt/CSSGrammar.h vlc-3.0.22/modules/codec/webvtt/CSSGrammar.h --- vlc-3.0.21/modules/codec/webvtt/CSSGrammar.h 2024-06-05 16:03:42.000000000 +0000 +++ vlc-3.0.22/modules/codec/webvtt/CSSGrammar.h 2025-11-24 23:11:41.000000000 +0000 @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.8.2. */ +/* A Bison parser, made by GNU Bison 3.5.1. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -31,9 +31,8 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, - especially those whose name start with YY_ or yy_. They are - private implementation details that can be changed or removed. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ #ifndef YY_YY_CODEC_WEBVTT_CSSGRAMMAR_H_INCLUDED # define YY_YY_CODEC_WEBVTT_CSSGRAMMAR_H_INCLUDED @@ -45,51 +44,44 @@ extern int yydebug; #endif -/* Token kinds. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - YYEMPTY = -2, - TOKEN_EOF = 0, /* TOKEN_EOF */ - YYerror = 256, /* error */ - YYUNDEF = 257, /* "invalid token" */ - LOWEST_PREC = 258, /* LOWEST_PREC */ - UNIMPORTANT_TOK = 259, /* UNIMPORTANT_TOK */ - WHITESPACE = 260, /* WHITESPACE */ - SGML_CD = 261, /* SGML_CD */ - INCLUDES = 262, /* INCLUDES */ - DASHMATCH = 263, /* DASHMATCH */ - BEGINSWITH = 264, /* BEGINSWITH */ - ENDSWITH = 265, /* ENDSWITH */ - CONTAINS = 266, /* CONTAINS */ - STRING = 267, /* STRING */ - IDENT = 268, /* IDENT */ - IDSEL = 269, /* IDSEL */ - HASH = 270, /* HASH */ - FONT_FACE_SYM = 271, /* FONT_FACE_SYM */ - CHARSET_SYM = 272, /* CHARSET_SYM */ - IMPORTANT_SYM = 273, /* IMPORTANT_SYM */ - CDO = 274, /* CDO */ - CDC = 275, /* CDC */ - LENGTH = 276, /* LENGTH */ - ANGLE = 277, /* ANGLE */ - TIME = 278, /* TIME */ - FREQ = 279, /* FREQ */ - DIMEN = 280, /* DIMEN */ - PERCENTAGE = 281, /* PERCENTAGE */ - NUMBER = 282, /* NUMBER */ - URI = 283, /* URI */ - FUNCTION = 284, /* FUNCTION */ - UNICODERANGE = 285 /* UNICODERANGE */ + TOKEN_EOF = 0, + LOWEST_PREC = 258, + UNIMPORTANT_TOK = 259, + WHITESPACE = 260, + SGML_CD = 261, + INCLUDES = 262, + DASHMATCH = 263, + BEGINSWITH = 264, + ENDSWITH = 265, + CONTAINS = 266, + STRING = 267, + IDENT = 268, + IDSEL = 269, + HASH = 270, + FONT_FACE_SYM = 271, + CHARSET_SYM = 272, + IMPORTANT_SYM = 273, + CDO = 274, + CDC = 275, + LENGTH = 276, + ANGLE = 277, + TIME = 278, + FREQ = 279, + DIMEN = 280, + PERCENTAGE = 281, + NUMBER = 282, + URI = 283, + FUNCTION = 284, + UNICODERANGE = 285 }; - typedef enum yytokentype yytoken_kind_t; #endif -/* Token kinds. */ -#define YYEMPTY -2 +/* Tokens. */ #define TOKEN_EOF 0 -#define YYerror 256 -#define YYUNDEF 257 #define LOWEST_PREC 258 #define UNIMPORTANT_TOK 259 #define WHITESPACE 260 @@ -123,7 +115,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 49 "../../modules/codec/webvtt/CSSGrammar.y" +#line 49 "codec/webvtt/CSSGrammar.y" bool boolean; char character; @@ -139,7 +131,7 @@ vlc_css_selector_t *selector; vlc_css_selector_t *selectorList; -#line 143 "codec/webvtt/CSSGrammar.h" +#line 135 "codec/webvtt/CSSGrammar.h" }; typedef union YYSTYPE YYSTYPE; @@ -149,8 +141,6 @@ - int yyparse (yyscan_t scanner, vlc_css_parser_t *css_parser); - #endif /* !YY_YY_CODEC_WEBVTT_CSSGRAMMAR_H_INCLUDED */ diff -Nru vlc-3.0.21/modules/codec/webvtt/CSSGrammar.y vlc-3.0.22/modules/codec/webvtt/CSSGrammar.y --- vlc-3.0.21/modules/codec/webvtt/CSSGrammar.y 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/webvtt/CSSGrammar.y 2025-11-13 22:17:54.000000000 +0000 @@ -329,7 +329,7 @@ | selector_with_trailing_whitespace simple_selector { $$ = $1; - if ($$) + if ($$ && $2) { vlc_css_selector_AddSpecifier( $$, $2 ); $2->combinator = RELATION_DESCENDENT; @@ -338,7 +338,7 @@ } | selector combinator simple_selector { $$ = $1; - if ($$) + if ($$ && $3) { vlc_css_selector_AddSpecifier( $$, $3 ); $3->combinator = $2; @@ -437,7 +437,7 @@ } | '[' maybe_space attr_name match maybe_space ident_or_string maybe_space ']' { $$ = vlc_css_selector_New( SPECIFIER_ATTRIB, $3 ); - if( $$ ) + if( $$ && $$ ) { $$->match = $4; $$->p_matchsel = vlc_css_selector_New( SPECIFIER_ID, $6 ); @@ -577,11 +577,15 @@ declaration: property ':' maybe_space expr prio { - $$ = vlc_css_declaration_New( $1 ); - if( $$ ) - $$->expr = $4; - else - vlc_css_expression_Delete( $4 ); + if( $4 ) + { + $$ = vlc_css_declaration_New( $1 ); + if( $$ ) + $$->expr = $4; + else + vlc_css_expression_Delete( $4 ); + } + else $$ = NULL; free( $1 ); } | diff -Nru vlc-3.0.21/modules/codec/webvtt/CSSLexer.c vlc-3.0.22/modules/codec/webvtt/CSSLexer.c --- vlc-3.0.21/modules/codec/webvtt/CSSLexer.c 2024-06-05 16:04:57.000000000 +0000 +++ vlc-3.0.22/modules/codec/webvtt/CSSLexer.c 2025-11-24 23:11:50.000000000 +0000 @@ -1406,7 +1406,7 @@ #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -#line 1 "../../modules/codec/webvtt/CSSLexer.l" +#line 1 "codec/webvtt/CSSLexer.l" /***************************************************************************** * CSSLexer.l : lexer for simplified CSS, based on W3C spec ***************************************************************************** @@ -1427,7 +1427,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #define YY_NO_INPUT 1 -#line 30 "../../modules/codec/webvtt/CSSLexer.l" +#line 30 "codec/webvtt/CSSLexer.l" #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -1710,7 +1710,7 @@ } { -#line 59 "../../modules/codec/webvtt/CSSLexer.l" +#line 59 "codec/webvtt/CSSLexer.l" #line 1717 "codec/webvtt/CSSLexer.c" @@ -1769,196 +1769,196 @@ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 61 "../../modules/codec/webvtt/CSSLexer.l" +#line 61 "codec/webvtt/CSSLexer.l" {return WHITESPACE;} YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 63 "../../modules/codec/webvtt/CSSLexer.l" +#line 63 "codec/webvtt/CSSLexer.l" /* ignore comments */ YY_BREAK case 3: YY_RULE_SETUP -#line 65 "../../modules/codec/webvtt/CSSLexer.l" +#line 65 "codec/webvtt/CSSLexer.l" {return CDO;} YY_BREAK case 4: YY_RULE_SETUP -#line 66 "../../modules/codec/webvtt/CSSLexer.l" +#line 66 "codec/webvtt/CSSLexer.l" {return CDC;} YY_BREAK case 5: YY_RULE_SETUP -#line 67 "../../modules/codec/webvtt/CSSLexer.l" +#line 67 "codec/webvtt/CSSLexer.l" {return INCLUDES;} YY_BREAK case 6: YY_RULE_SETUP -#line 68 "../../modules/codec/webvtt/CSSLexer.l" +#line 68 "codec/webvtt/CSSLexer.l" {return DASHMATCH;} YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 70 "../../modules/codec/webvtt/CSSLexer.l" +#line 70 "codec/webvtt/CSSLexer.l" { yylval->string = vlc_css_unquotedunescaped(yytext); return STRING;} YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 72 "../../modules/codec/webvtt/CSSLexer.l" +#line 72 "codec/webvtt/CSSLexer.l" { yylval->string = vlc_css_unescaped(yytext); return IDENT;} YY_BREAK case 9: YY_RULE_SETUP -#line 74 "../../modules/codec/webvtt/CSSLexer.l" +#line 74 "codec/webvtt/CSSLexer.l" {return FONT_FACE_SYM;} YY_BREAK case 10: YY_RULE_SETUP -#line 76 "../../modules/codec/webvtt/CSSLexer.l" +#line 76 "codec/webvtt/CSSLexer.l" {return IMPORTANT_SYM;} YY_BREAK case 11: YY_RULE_SETUP -#line 78 "../../modules/codec/webvtt/CSSLexer.l" +#line 78 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d), EMS ); return LENGTH;} YY_BREAK case 12: YY_RULE_SETUP -#line 79 "../../modules/codec/webvtt/CSSLexer.l" +#line 79 "codec/webvtt/CSSLexer.l" { VAL( atoi(yytext), EXS ); return LENGTH;} YY_BREAK case 13: YY_RULE_SETUP -#line 80 "../../modules/codec/webvtt/CSSLexer.l" +#line 80 "codec/webvtt/CSSLexer.l" { VAL( atoi(yytext), PIXELS ); return LENGTH;} YY_BREAK case 14: YY_RULE_SETUP -#line 81 "../../modules/codec/webvtt/CSSLexer.l" +#line 81 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d) * 10, MILLIMETERS ); return LENGTH;} YY_BREAK case 15: YY_RULE_SETUP -#line 82 "../../modules/codec/webvtt/CSSLexer.l" +#line 82 "codec/webvtt/CSSLexer.l" { VAL( atoi(yytext), MILLIMETERS ); return LENGTH;} YY_BREAK case 16: YY_RULE_SETUP -#line 83 "../../modules/codec/webvtt/CSSLexer.l" +#line 83 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d) * 25.4, MILLIMETERS ); return LENGTH;} YY_BREAK case 17: YY_RULE_SETUP -#line 84 "../../modules/codec/webvtt/CSSLexer.l" +#line 84 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d), POINTS ); return LENGTH;} YY_BREAK case 18: YY_RULE_SETUP -#line 85 "../../modules/codec/webvtt/CSSLexer.l" +#line 85 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d), POINTS ); return LENGTH;} YY_BREAK case 19: YY_RULE_SETUP -#line 86 "../../modules/codec/webvtt/CSSLexer.l" +#line 86 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d), DEGREES ); return ANGLE;} YY_BREAK case 20: YY_RULE_SETUP -#line 87 "../../modules/codec/webvtt/CSSLexer.l" +#line 87 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d) * 0.0174533, DEGREES ); return ANGLE;} YY_BREAK case 21: YY_RULE_SETUP -#line 88 "../../modules/codec/webvtt/CSSLexer.l" +#line 88 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d) * 1.1111111, DEGREES ); return ANGLE;} YY_BREAK case 22: YY_RULE_SETUP -#line 89 "../../modules/codec/webvtt/CSSLexer.l" +#line 89 "codec/webvtt/CSSLexer.l" { VAL( atoi(yytext), MILLISECONDS ); return TIME;} YY_BREAK case 23: YY_RULE_SETUP -#line 90 "../../modules/codec/webvtt/CSSLexer.l" +#line 90 "codec/webvtt/CSSLexer.l" { VAL( atoi(yytext) * 1000, MILLISECONDS ); return TIME;} YY_BREAK case 24: YY_RULE_SETUP -#line 91 "../../modules/codec/webvtt/CSSLexer.l" +#line 91 "codec/webvtt/CSSLexer.l" { VAL( atoi(yytext), HERTZ ); return FREQ;} YY_BREAK case 25: YY_RULE_SETUP -#line 92 "../../modules/codec/webvtt/CSSLexer.l" +#line 92 "codec/webvtt/CSSLexer.l" { VAL( atoi(yytext) * 1000, HERTZ ); return FREQ;} YY_BREAK case 26: /* rule 26 can match eol */ YY_RULE_SETUP -#line 93 "../../modules/codec/webvtt/CSSLexer.l" +#line 93 "codec/webvtt/CSSLexer.l" { VAL( 0, DIMENSION ); return DIMEN;} YY_BREAK case 27: YY_RULE_SETUP -#line 94 "../../modules/codec/webvtt/CSSLexer.l" +#line 94 "codec/webvtt/CSSLexer.l" { VAL( atoi(yytext), PERCENT ); return PERCENTAGE;} YY_BREAK case 28: YY_RULE_SETUP -#line 95 "../../modules/codec/webvtt/CSSLexer.l" +#line 95 "codec/webvtt/CSSLexer.l" { VAL( us_strtof(yytext, &d), NONE ); return NUMBER;} YY_BREAK case 29: /* rule 29 can match eol */ YY_RULE_SETUP -#line 97 "../../modules/codec/webvtt/CSSLexer.l" +#line 97 "codec/webvtt/CSSLexer.l" { yylval->string = vlc_css_unquotedunescaped(yytext); return URI;} YY_BREAK case 30: /* rule 30 can match eol */ YY_RULE_SETUP -#line 98 "../../modules/codec/webvtt/CSSLexer.l" +#line 98 "codec/webvtt/CSSLexer.l" { yylval->string = vlc_css_unquotedunescaped(yytext); return URI;} YY_BREAK case 31: /* rule 31 can match eol */ YY_RULE_SETUP -#line 99 "../../modules/codec/webvtt/CSSLexer.l" +#line 99 "codec/webvtt/CSSLexer.l" { yylval->string = vlc_css_unescaped(yytext); return FUNCTION;} YY_BREAK case 32: /* rule 32 can match eol */ YY_RULE_SETUP -#line 100 "../../modules/codec/webvtt/CSSLexer.l" +#line 100 "codec/webvtt/CSSLexer.l" {yylval->string = vlc_css_unescaped(yytext); return IDSEL;} YY_BREAK case 33: /* rule 33 can match eol */ YY_RULE_SETUP -#line 101 "../../modules/codec/webvtt/CSSLexer.l" +#line 101 "codec/webvtt/CSSLexer.l" {yylval->string = vlc_css_unescaped(yytext); return HASH;} YY_BREAK case 34: YY_RULE_SETUP -#line 103 "../../modules/codec/webvtt/CSSLexer.l" +#line 103 "codec/webvtt/CSSLexer.l" { yylval->string = strdup(yytext); return UNICODERANGE;} YY_BREAK case 35: YY_RULE_SETUP -#line 104 "../../modules/codec/webvtt/CSSLexer.l" +#line 104 "codec/webvtt/CSSLexer.l" { yylval->string = strdup(yytext); return UNICODERANGE;} YY_BREAK case 36: YY_RULE_SETUP -#line 106 "../../modules/codec/webvtt/CSSLexer.l" +#line 106 "codec/webvtt/CSSLexer.l" {return *yytext;} YY_BREAK case 37: YY_RULE_SETUP -#line 108 "../../modules/codec/webvtt/CSSLexer.l" +#line 108 "codec/webvtt/CSSLexer.l" ECHO; YY_BREAK #line 1965 "codec/webvtt/CSSLexer.c" @@ -3105,4 +3105,4 @@ #define YYTABLES_NAME "yytables" -#line 108 "../../modules/codec/webvtt/CSSLexer.l" +#line 108 "codec/webvtt/CSSLexer.l" diff -Nru vlc-3.0.21/modules/codec/webvtt/css_parser.c vlc-3.0.22/modules/codec/webvtt/css_parser.c --- vlc-3.0.21/modules/codec/webvtt/css_parser.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/webvtt/css_parser.c 2025-11-13 22:17:54.000000000 +0000 @@ -114,7 +114,7 @@ vlc_css_expr_t * vlc_css_expression_New( vlc_css_term_t term ) { vlc_css_expr_t *p_expr = calloc(1, sizeof(*p_expr)); - if(!vlc_css_expression_AddTerm( p_expr, 0, term )) + if(p_expr && !vlc_css_expression_AddTerm( p_expr, 0, term )) { free(p_expr); p_expr = NULL; @@ -150,7 +150,15 @@ vlc_css_declaration_t * vlc_css_declaration_New( const char *psz ) { vlc_css_declaration_t *p_decl = calloc(1, sizeof(*p_decl)); - p_decl->psz_property = strdup(psz); + if (likely(p_decl != NULL)) + { + p_decl->psz_property = strdup(psz); + if (unlikely( p_decl->psz_property == NULL )) + { + free(p_decl); + p_decl = NULL; + } + } return p_decl; } @@ -194,6 +202,8 @@ vlc_css_selector_t * vlc_css_selector_New( int type, const char *psz ) { vlc_css_selector_t *p_sel = calloc(1, sizeof(*p_sel)); + if (unlikely(p_sel == NULL)) + return NULL; p_sel->psz_name = strdup(psz); p_sel->type = type; p_sel->combinator = RELATION_SELF; diff -Nru vlc-3.0.21/modules/codec/webvtt/css_style.c vlc-3.0.22/modules/codec/webvtt/css_style.c --- vlc-3.0.21/modules/codec/webvtt/css_style.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/webvtt/css_style.c 2025-11-13 22:17:54.000000000 +0000 @@ -31,6 +31,9 @@ int *color, uint8_t *alpha, uint16_t *feat, int cflag, int aflag ) { + if( unlikely( term.psz == NULL ) ) + return; + if( term.type == TYPE_FUNCTION ) { if( term.function ) /* func( expr ) */ @@ -103,7 +106,7 @@ return; /* Only support simple expressions for now */ - if( p_decl->expr->i_count < 1 ) + if( !p_decl->expr || p_decl->expr->i_count < 1 ) return; vlc_css_term_t term0 = p_decl->expr->seq[0].term; diff -Nru vlc-3.0.21/modules/codec/webvtt/subsvtt.c vlc-3.0.22/modules/codec/webvtt/subsvtt.c --- vlc-3.0.21/modules/codec/webvtt/subsvtt.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/webvtt/subsvtt.c 2025-11-13 22:17:54.000000000 +0000 @@ -48,6 +48,11 @@ //#define SUBSVTT_DEBUG +// maximum recursions in GetTimedTags() +#define MAX_TIMED_TAGS_RECURSION 50 +// maximum recursions in ConvertNodesToSegments() +#define MAX_TIMED_NODE_SEGMENTS_RECURSION 50 + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -443,24 +448,7 @@ #define webvtt_domnode_Debug(a,b) webvtt_domnode_Debug((webvtt_dom_node_t *)a,b) #endif -static void webvtt_domnode_ChainDelete( webvtt_dom_node_t *p_node ); static void webvtt_dom_cue_Delete( webvtt_dom_cue_t *p_cue ); -static void webvtt_region_Delete( webvtt_region_t *p_region ); - -static void webvtt_dom_text_Delete( webvtt_dom_text_t *p_node ) -{ - free( p_node->psz_text ); - free( p_node ); -} - -static void webvtt_dom_tag_Delete( webvtt_dom_tag_t *p_node ) -{ - text_style_Delete( p_node->p_cssstyle ); - free( p_node->psz_attrs ); - free( p_node->psz_tag ); - webvtt_domnode_ChainDelete( p_node->p_child ); - free( p_node ); -} static void webvtt_domnode_AppendLast( webvtt_dom_node_t **pp_append, webvtt_dom_node_t *p_node ) @@ -473,23 +461,72 @@ #define webvtt_domnode_AppendLast( a, b ) \ webvtt_domnode_AppendLast( (webvtt_dom_node_t **) a, (webvtt_dom_node_t *) b ) + +static void webvtt_domnode_DeleteNode( webvtt_dom_node_t *p_node ) +{ + if( p_node->type == NODE_TAG ) + { + webvtt_dom_tag_t *p_tag_node = (webvtt_dom_tag_t *) p_node; + text_style_Delete( p_tag_node->p_cssstyle ); + free( p_tag_node->psz_attrs ); + free( p_tag_node->psz_tag ); + } + else if( p_node->type == NODE_TEXT ) + { + webvtt_dom_text_t *p_text_node = (webvtt_dom_text_t *)p_node; + free( p_text_node->psz_text ); + } + else if( p_node->type == NODE_CUE ) + { + webvtt_dom_cue_t *p_cue_node = (webvtt_dom_cue_t *)p_node; + text_style_Delete( p_cue_node->p_cssstyle ); + webvtt_cue_settings_Clean( &p_cue_node->settings ); + free( p_cue_node->psz_id ); + } + else if( p_node->type == NODE_REGION ) + { + webvtt_region_t *p_region_node = (webvtt_region_t *)p_node; + text_style_Delete( p_region_node->p_cssstyle ); + free( p_region_node->psz_id ); + } + free( p_node ); +} + +static webvtt_dom_node_t * webvtt_domnode_getFirstChild( webvtt_dom_node_t *p_node ); + static void webvtt_domnode_ChainDelete( webvtt_dom_node_t *p_node ) { + vlc_array_t stack; + vlc_array_init( &stack ); + while( p_node ) { + webvtt_dom_node_t *p_child = webvtt_domnode_getFirstChild( p_node ); webvtt_dom_node_t *p_next = p_node->p_next; + /* delete current node, then go to child, and then siblings */ + webvtt_domnode_DeleteNode( p_node ); + p_node = p_child; + if( p_next ) + { + if( p_child ) /* go to child, process sibling later */ + vlc_array_append( &stack, p_next ); + else + p_node = p_next; + } - if( p_node->type == NODE_TAG ) - webvtt_dom_tag_Delete( (webvtt_dom_tag_t *) p_node ); - else if( p_node->type == NODE_TEXT ) - webvtt_dom_text_Delete( (webvtt_dom_text_t *) p_node ); - else if( p_node->type == NODE_CUE ) - webvtt_dom_cue_Delete( (webvtt_dom_cue_t *) p_node ); - else if( p_node->type == NODE_REGION ) - webvtt_region_Delete( (webvtt_region_t *) p_node ); - - p_node = p_next; + if( !p_node ) + { + /* pop saved next node */ + size_t idx = vlc_array_count( &stack ); + if( idx ) + { + p_node = vlc_array_item_at_index( &stack, idx - 1 ); + vlc_array_remove( &stack, idx - 1 ); + } + } } + + vlc_array_clear( &stack ); } static webvtt_dom_text_t * webvtt_dom_text_New( webvtt_dom_node_t *p_parent ) @@ -602,10 +639,10 @@ static bool webvtt_domnode_Match_Class( const webvtt_dom_node_t *p_node, const char *psz ) { const size_t i_len = strlen( psz ); - if( p_node->type == NODE_TAG ) + if( i_len && p_node->type == NODE_TAG ) { const webvtt_dom_tag_t *p_tagnode = (webvtt_dom_tag_t *) p_node; - for( const char *p = p_tagnode->psz_attrs; p && psz; p++ ) + for( const char *p = p_tagnode->psz_attrs; p && *p; p++ ) { p = strstr( p, psz ); if( !p ) @@ -713,8 +750,9 @@ { const webvtt_dom_tag_t *p_tagnode = (webvtt_dom_tag_t *) p_node; - if( ( !strcmp( p_tagnode->psz_tag, "v" ) && !strcmp( psz, "voice" ) ) || /* v = only voice */ - ( !strcmp( p_tagnode->psz_tag, "lang" ) && !strcmp( psz, "lang" ) ) ) + if( p_tagnode->psz_attrs != NULL && + ( ( !strcmp( p_tagnode->psz_tag, "v" ) && !strcmp( psz, "voice" ) ) || /* v = only voice */ + ( !strcmp( p_tagnode->psz_tag, "lang" ) && !strcmp( psz, "lang" ) ) ) ) { const char *psz_start = NULL; /* skip classes decl */ @@ -1096,12 +1134,6 @@ return i_lines; } -static void webvtt_region_ClearCues( webvtt_region_t *p_region ) -{ - webvtt_domnode_ChainDelete( p_region->p_child ); - p_region->p_child = NULL; -} - static void ClearCuesByTime( webvtt_dom_node_t **pp_next, vlc_tick_t i_nztime ) { while( *pp_next ) @@ -1131,13 +1163,13 @@ } /* Remove top most line/cue for bottom insert */ -static void webvtt_region_Reduce( webvtt_region_t *p_region ) +static bool webvtt_region_Reduce( webvtt_region_t *p_region ) { if( p_region->p_child ) { assert( p_region->p_child->type == NODE_CUE ); if( p_region->p_child->type != NODE_CUE ) - return; + return false; webvtt_dom_cue_t *p_cue = (webvtt_dom_cue_t *)p_region->p_child; if( p_cue->i_lines == 1 || webvtt_dom_cue_Reduced( p_cue ) < 1 ) @@ -1145,8 +1177,10 @@ p_region->p_child = p_cue->p_next; p_cue->p_next = NULL; webvtt_dom_cue_Delete( p_cue ); + return true; } } + return false; } static void webvtt_region_AddCue( webvtt_region_t *p_region, @@ -1165,8 +1199,8 @@ ( i_lines > WEBVTT_REGION_LINES_COUNT || (p_region->b_scroll_up && i_lines > p_region->i_lines_max_scroll)) ) { - webvtt_region_Reduce( p_region ); /* scrolls up */ - assert( webvtt_region_CountLines( p_region ) < i_lines ); + if (!webvtt_region_Reduce( p_region )) /* scrolls up */ + break; } else break; } @@ -1175,7 +1209,8 @@ static void webvtt_region_Delete( webvtt_region_t *p_region ) { text_style_Delete( p_region->p_cssstyle ); - webvtt_region_ClearCues( p_region ); + webvtt_domnode_ChainDelete( p_region->p_child ); + p_region->p_child = NULL; free( p_region->psz_id ); free( p_region ); } @@ -1513,8 +1548,12 @@ static text_segment_t *ConvertNodesToSegments( decoder_t *p_dec, struct render_variables_s *p_vars, const webvtt_dom_cue_t *p_cue, - const webvtt_dom_node_t *p_node ) + const webvtt_dom_node_t *p_node, + size_t depth ) { + if (depth > MAX_TIMED_NODE_SEGMENTS_RECURSION) + return NULL; + text_segment_t *p_head = NULL; text_segment_t **pp_append = &p_head; for( ; p_node ; p_node = p_node->p_next ) @@ -1540,7 +1579,7 @@ { const webvtt_dom_tag_t *p_tag = (const webvtt_dom_tag_t *)p_node; *pp_append = ConvertNodesToSegments( p_dec, p_vars, p_cue, - p_tag->p_child ); + p_tag->p_child, depth+1 ); } } return p_head; @@ -1550,7 +1589,7 @@ struct render_variables_s *p_vars, const webvtt_dom_cue_t *p_cue ) { - return ConvertNodesToSegments( p_dec, p_vars, p_cue, p_cue->p_child ); + return ConvertNodesToSegments( p_dec, p_vars, p_cue, p_cue->p_child, 0 ); } static text_segment_t * ConvertCuesToSegments( decoder_t *p_dec, vlc_tick_t i_nzstart, vlc_tick_t i_nzstop, @@ -1590,6 +1629,8 @@ } *pp_append = p_new; + while( *pp_append ) + pp_append = &((*pp_append)->p_next); if( p_cue->settings.vertical == WEBVTT_ALIGN_LEFT ) { @@ -1603,8 +1644,12 @@ } static void GetTimedTags( const webvtt_dom_node_t *p_node, - vlc_tick_t i_nzstart, vlc_tick_t i_nzstop, vlc_array_t *p_times ) + vlc_tick_t i_nzstart, vlc_tick_t i_nzstop, vlc_array_t *p_times, + size_t depth ) { + if (depth > MAX_TIMED_TAGS_RECURSION) + return; + for( ; p_node; p_node = p_node->p_next ) { switch( p_node->type ) @@ -1614,12 +1659,12 @@ const webvtt_dom_tag_t *p_tag = (const webvtt_dom_tag_t *) p_node; if( p_tag->i_nzstart > -1 && p_tag->i_nzstart >= i_nzstart && p_tag->i_nzstart < i_nzstop ) (void) vlc_array_append( p_times, (void *) p_tag ); - GetTimedTags( p_tag->p_child, i_nzstart, i_nzstop, p_times ); + GetTimedTags( p_tag->p_child, i_nzstart, i_nzstop, p_times, depth+1 ); } break; case NODE_REGION: case NODE_CUE: GetTimedTags( webvtt_domnode_getFirstChild( p_node ), - i_nzstart, i_nzstop, p_times ); + i_nzstart, i_nzstop, p_times, depth+1 ); break; default: break; @@ -1653,9 +1698,46 @@ { if( webvtt_domnode_supportsCSSStyle( p_node ) ) webvtt_domnode_setCSSStyle( p_node, NULL ); - webvtt_dom_node_t *p_child = webvtt_domnode_getFirstChild( p_node ); - for ( ; p_child ; p_child = p_child->p_next ) - ClearCSSStyles( p_child ); + + /* start from leaves */ + p_node = webvtt_domnode_getFirstChild( p_node ); + if( !p_node ) + return; + + vlc_array_t stack; + vlc_array_init( &stack ); + + while( p_node ) + { + if( webvtt_domnode_supportsCSSStyle( p_node ) ) + webvtt_domnode_setCSSStyle( p_node, NULL ); + + webvtt_dom_node_t *p_child = webvtt_domnode_getFirstChild( p_node ); + if( p_child ) /* explore first */ + { + if( p_node->p_next ) + vlc_array_append( &stack, p_node->p_next ); + p_node = p_child; + } + else + { + p_node = p_node->p_next; + + if( !p_node ) + { + /* continue on parent sibling */ + size_t idx = vlc_array_count( &stack ); + if( idx ) + { + p_node = vlc_array_item_at_index( &stack, idx - 1 ); + vlc_array_remove( &stack, idx - 1 ); + p_node = p_node->p_next; + } + } + } + } + + vlc_array_clear( &stack ); } #ifdef HAVE_CSS @@ -1835,7 +1917,7 @@ vlc_array_t timedtags; vlc_array_init( &timedtags ); - GetTimedTags( p_sys->p_root->p_child, i_nzstart, i_nzstop, &timedtags ); + GetTimedTags( p_sys->p_root->p_child, i_nzstart, i_nzstop, &timedtags, 0 ); if( timedtags.i_count ) qsort( timedtags.pp_elems, timedtags.i_count, sizeof(*timedtags.pp_elems), timedtagsArrayCmp ); @@ -1966,7 +2048,7 @@ #ifdef HAVE_CSS else if( ctx->b_css_memstream_opened ) { - if( vlc_memstream_close( &ctx->css ) == VLC_SUCCESS ) + if( vlc_memstream_close( &ctx->css ) == 0 ) { vlc_css_parser_t p; vlc_css_parser_Init(&p); diff -Nru vlc-3.0.21/modules/codec/webvtt/webvtt.c vlc-3.0.22/modules/codec/webvtt/webvtt.c --- vlc-3.0.21/modules/codec/webvtt/webvtt.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/webvtt/webvtt.c 2025-11-13 22:17:54.000000000 +0000 @@ -80,7 +80,7 @@ webvtt_cue_t *p_cue; }; -static vlc_tick_t MakeTime( unsigned t[4] ) +static vlc_tick_t MakeTime( int t[4] ) { return t[0] * 3600 * CLOCK_FREQ + t[1] * 60 * CLOCK_FREQ + @@ -90,15 +90,15 @@ bool webvtt_scan_time( const char *psz, vlc_tick_t *p_time ) { - unsigned t[4]; - if( sscanf( psz, "%2u:%2u.%3u", + int t[4]; + if( sscanf( psz, "%2d:%2d.%3d", &t[1], &t[2], &t[3] ) == 3 ) { t[0] = 0; *p_time = MakeTime( t ); return true; } - else if( sscanf( psz, "%u:%2u:%2u.%3u", + else if( sscanf( psz, "%d:%2d:%2d.%3d", &t[0], &t[1], &t[2], &t[3] ) == 4 ) { *p_time = MakeTime( t ); diff -Nru vlc-3.0.21/modules/codec/x265.c vlc-3.0.22/modules/codec/x265.c --- vlc-3.0.21/modules/codec/x265.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/codec/x265.c 2025-11-13 22:17:54.000000000 +0000 @@ -36,6 +36,13 @@ #include +#ifndef X265_MAX_FRAME_THREADS +# define X265_MAX_FRAME_THREADS 16 +#endif +#if X265_BUILD > 210 && X265_BUILD <= 214 +#define X265_OUTPUT_ARRAY 1 +#endif + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -70,6 +77,11 @@ x265_picture pic; x265_picture_init(&p_sys->param, &pic); +#ifdef X265_OUTPUT_ARRAY + /* Handle API changes for scalable layers output in x265 4.0 */ + x265_picture *pics[MAX_SCALABLE_LAYERS] = {NULL}; + pics[0] = &pic; +#endif if (likely(p_pict)) { pic.pts = p_pict->date; @@ -88,8 +100,13 @@ x265_nal *nal; uint32_t i_nal = 0; +#ifdef X265_OUTPUT_ARRAY + x265_encoder_encode(p_sys->h, &nal, &i_nal, + likely(p_pict) ? &pic : NULL, pics); +#else x265_encoder_encode(p_sys->h, &nal, &i_nal, likely(p_pict) ? &pic : NULL, &pic); +#endif if (!i_nal) return NULL; @@ -156,6 +173,8 @@ x265_param_default(param); param->frameNumThreads = vlc_GetCPUCount(); + if(param->frameNumThreads > X265_MAX_FRAME_THREADS) + param->frameNumThreads = X265_MAX_FRAME_THREADS; param->bEnableWavefront = 0; // buggy in x265, use frame threading for now param->maxCUSize = 16; /* use smaller macroblock */ diff -Nru vlc-3.0.21/modules/control/dbus/dbus.c vlc-3.0.22/modules/control/dbus/dbus.c --- vlc-3.0.21/modules/control/dbus/dbus.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/control/dbus/dbus.c 2025-11-24 23:00:36.000000000 +0000 @@ -659,6 +659,10 @@ break; case SIGNAL_STATE: vlc_dictionary_insert( &player_properties, "PlaybackStatus", NULL ); + if ( p_intf->p_sys->b_can_play ) + { + vlc_dictionary_insert( &player_properties, "CanPlay", NULL ); + } break; case SIGNAL_RATE: vlc_dictionary_insert( &player_properties, "Rate", NULL ); diff -Nru vlc-3.0.21/modules/control/ntservice.c vlc-3.0.22/modules/control/ntservice.c --- vlc-3.0.21/modules/control/ntservice.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/control/ntservice.c 2025-11-13 22:17:54.000000000 +0000 @@ -140,9 +140,9 @@ static void *Run( void *data ) { intf_thread_t *p_intf = data; - SERVICE_TABLE_ENTRY dispatchTable[] = + const SERVICE_TABLE_ENTRYA dispatchTable[] = { - { (WCHAR*) TEXT(VLCSERVICENAME), (LPSERVICE_MAIN_FUNCTION) &ServiceDispatch }, + { (LPSTR)VLCSERVICENAME, (LPSERVICE_MAIN_FUNCTIONA) &ServiceDispatch }, { NULL, NULL } }; @@ -165,7 +165,7 @@ return NULL; } - if( StartServiceCtrlDispatcher( dispatchTable ) == 0 ) + if( StartServiceCtrlDispatcherA( dispatchTable ) == 0 ) { msg_Err( p_intf, "StartServiceCtrlDispatcher failed" ); /* str review */ } @@ -185,7 +185,7 @@ intf_sys_t *p_sys = p_intf->p_sys; char *psz_extra; struct vlc_memstream path_stream; - TCHAR psz_pathtmp[MAX_PATH]; + WCHAR psz_pathtmp[MAX_PATH]; SC_HANDLE handle = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS ); if( handle == NULL ) @@ -204,14 +204,7 @@ /* Find out the filename of ourselves so we can install it to the * service control manager */ GetModuleFileName( NULL, psz_pathtmp, MAX_PATH ); - psz_extra = FromT( psz_pathtmp ); - if ( !psz_extra ) - { - CloseServiceHandle( handle ); - return VLC_ENOMEM; - } - vlc_memstream_printf( &path_stream, "\"%s\" -I ntservice", psz_extra ); - free(psz_extra); + vlc_memstream_printf( &path_stream, "\"%ls\" -I ntservice", psz_pathtmp ); psz_extra = var_InheritString( p_intf, "ntservice-extraintf" ); if( psz_extra && *psz_extra ) diff -Nru vlc-3.0.21/modules/demux/Makefile.am vlc-3.0.22/modules/demux/Makefile.am --- vlc-3.0.21/modules/demux/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -1,7 +1,8 @@ demuxdir = $(pluginsdir)/demux demux_LTLIBRARIES = -libxiph_metadata_la_SOURCES = demux/xiph_metadata.h demux/xiph_metadata.c +libxiph_metadata_la_SOURCES = demux/xiph_metadata.h demux/xiph_metadata.c \ + meta_engine/ID3Pictures.h libxiph_metadata_la_LDFLAGS = -static noinst_LTLIBRARIES += libxiph_metadata.la @@ -104,6 +105,9 @@ libsmf_plugin_la_SOURCES = demux/smf.c demux_LTLIBRARIES += libsmf_plugin.la +libdmxmus_plugin_la_SOURCES = demux/dmxmus.c +demux_LTLIBRARIES += libdmxmus_plugin.la + libgme_plugin_la_SOURCES = demux/gme.c libgme_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)' libgme_plugin_la_LIBADD = $(LIBS_gme) @@ -260,6 +264,7 @@ demux/mpeg/ts_metadata.c demux/mpeg/ts_metadata.h \ demux/mpeg/ts_hotfixes.c demux/mpeg/ts_hotfixes.h \ demux/mpeg/ts_strings.h demux/mpeg/ts_streams_private.h \ + demux/mpeg/ts_pes.c demux/mpeg/ts_pes.h \ demux/mpeg/pes.h \ demux/mpeg/timestamps.h \ demux/dvb-text.h \ @@ -381,6 +386,7 @@ demux/adaptive/Streams.cpp \ demux/adaptive/Streams.hpp \ demux/adaptive/Time.hpp \ + demux/adaptive/tools/Compatibility.hpp \ demux/adaptive/tools/Conversions.hpp \ demux/adaptive/tools/Conversions.cpp \ demux/adaptive/tools/Debug.hpp \ diff -Nru vlc-3.0.21/modules/demux/adaptive/PlaylistManager.cpp vlc-3.0.22/modules/demux/adaptive/PlaylistManager.cpp --- vlc-3.0.21/modules/demux/adaptive/PlaylistManager.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/PlaylistManager.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -90,8 +90,8 @@ delete streamFactory; unsetPeriod(); delete playlist; - delete logic; delete resources; + delete logic; delete bufferingLogic; vlc_cond_destroy(&waitcond); vlc_mutex_destroy(&lock); @@ -144,8 +144,8 @@ if(!set->getLang().empty()) st->setLanguage(set->getLang()); - if(!set->description.Get().empty()) - st->setDescription(set->description.Get()); + if(!set->description.empty()) + st->setDescription(set->description); } } return true; @@ -158,8 +158,8 @@ if(!setupPeriod()) return false; - playlist->playbackStart.Set(time(nullptr)); - nextPlaylistupdate = playlist->playbackStart.Get(); + playlist->playbackStart = time(nullptr); + nextPlaylistupdate = playlist->playbackStart; if(b_preparsing) preparsePlaylist(); @@ -644,7 +644,7 @@ bool accurate = va_arg(args, int); vlc_tick_t seekTime = cached.playlistStart + cached.playlistLength * pos; - SeekDebug(msg_Dbg(p_demux, "Seek %f to %ld plstart %ld duration %ld", + SeekDebug(msg_Dbg(p_demux, "Seek %f to %" PRId64 " plstart %" PRId64 " duration %" PRId64, pos, seekTime, cached.playlistEnd, cached.playlistLength)); if(!setPosition(seekTime, pos, accurate)) @@ -800,8 +800,8 @@ Times currentTimes = getTimes(); cached.b_live = playlist->isLive(); - SeekDebug(msg_Dbg(p_demux, "playlist Start/End %ld/%ld len %ld" - "rap pl/demux (%ld/%ld)", + SeekDebug(msg_Dbg(p_demux, "playlist Start/End %" PRId64 "/%" PRId64 " len %" PRId64 + "rap pl/demux (%" PRId64 "/%" PRId64 ")", cached.playlistStart, cached.playlistEnd, cached.playlistEnd, startTimes.segment.media, startTimes.segment.demux)); @@ -832,8 +832,8 @@ } else { - if(playlist->duration.Get() > cached.playlistLength) - cached.playlistLength = playlist->duration.Get(); + if(playlist->duration > cached.playlistLength) + cached.playlistLength = playlist->duration; if(cached.playlistLength && currentTimes.segment.media != VLC_TICK_INVALID) { @@ -846,7 +846,7 @@ } } - SeekDebug(msg_Dbg(p_demux, "cached.i_time (%ld) cur %ld rap start (pl %ld/dmx %ld) pos %f", + SeekDebug(msg_Dbg(p_demux, "cached.i_time (%" PRId64 ") cur %" PRId64 " rap start (pl %" PRId64 "/dmx %" PRId64 ") pos %f", cached.i_time, currentTimes.continuous, startTimes.segment.media, startTimes.segment.demux, cached.f_position)); } diff -Nru vlc-3.0.21/modules/demux/adaptive/SegmentTracker.cpp vlc-3.0.22/modules/demux/adaptive/SegmentTracker.cpp --- vlc-3.0.21/modules/demux/adaptive/SegmentTracker.cpp 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/SegmentTracker.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -296,7 +296,7 @@ bool b_gap = true; ISegment *datasegment = pos.rep->getNextMediaSegment(pos.number, &pos.number, &b_gap); - if(!datasegment) + if(!datasegment && (!pos.rep->needsIndex() || pos.index_sent)) return ChunkEntry(); ISegment *segment = nullptr; @@ -322,12 +322,12 @@ if(!segmentChunk) return ChunkEntry(); - if(segment != datasegment) /* need to set for init */ + if(segment != datasegment && datasegment) /* need to set for init */ segmentChunk->discontinuitySequenceNumber = datasegment->getDiscontinuitySequenceNumber(); vlc_tick_t startTime = VLC_TICK_INVALID; vlc_tick_t duration = 0; - vlc_tick_t displayTime = datasegment->getDisplayTime(); + vlc_tick_t displayTime = datasegment ? datasegment->getDisplayTime() : VLC_TICK_INVALID; /* timings belong to timeline and are not set on the segment or need profile timescale */ if(pos.rep->getPlaybackTimeDurationBySegmentNumber(pos.number, &startTime, &duration)) startTime += VLC_TICK_0; diff -Nru vlc-3.0.21/modules/demux/adaptive/Streams.cpp vlc-3.0.22/modules/demux/adaptive/Streams.cpp --- vlc-3.0.21/modules/demux/adaptive/Streams.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/Streams.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -462,7 +462,7 @@ } else { - msg_Dbg(p_realdemux, "Waiting sync reference for seq %ld", currentSequence); + msg_Dbg(p_realdemux, "Waiting sync reference for seq %" PRIu64, currentSequence); vlc_mutex_unlock(&lock); return BufferingStatus::Suspended; } @@ -625,11 +625,14 @@ { const bool b_restarting = fakeEsOut()->restarting(); ChunkInterface *ck = segmentTracker->getNextChunk(!b_restarting); + if(ck && !fakeEsOut()->hasSegmentStartTimes()) fakeEsOut()->setSegmentStartTimes(startTimeContext); if(ck && !fakeEsOut()->hasSynchronizationReference()) { + if(!fakeEsOut()->hasSegmentStartTimes()) + return ck; assert(fakeEsOut()->hasSegmentStartTimes()); SynchronizationReference r; if(segmentTracker->getSynchronizationReference(currentSequence, startTimeContext.media, r)) diff -Nru vlc-3.0.21/modules/demux/adaptive/http/Chunk.cpp vlc-3.0.22/modules/demux/adaptive/http/Chunk.cpp --- vlc-3.0.21/modules/demux/adaptive/http/Chunk.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/http/Chunk.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -37,6 +37,8 @@ using namespace adaptive::http; +static std::string EmptyStr = ""; + AbstractChunkSource::AbstractChunkSource(ChunkType t, const BytesRange &range) { type = t; @@ -57,9 +59,9 @@ return bytesRange; } -std::string AbstractChunkSource::getContentType() const +const std::string & AbstractChunkSource::getContentType() const { - return std::string(); + return EmptyStr; } RequestStatus AbstractChunkSource::getRequestStatus() const @@ -88,7 +90,7 @@ source->recycle(); } -std::string AbstractChunk::getContentType() const +const std::string & AbstractChunk::getContentType() const { return source->getContentType(); } @@ -264,13 +266,13 @@ return std::to_string(r.getStartByte())+ std::to_string(r.getEndByte()) + '@' + s; } -std::string HTTPChunkSource::getContentType() const +const std::string & HTTPChunkSource::getContentType() const { vlc_mutex_locker locker(&lock); if(connection) return connection->getContentType(); else - return std::string(); + return EmptyStr; } void HTTPChunkSource::setIdentifier(const std::string &s, const BytesRange &r) @@ -529,7 +531,7 @@ copied += toconsume; readsize -= toconsume; inblockreadoffset += toconsume; - if(inblockreadoffset >= p_head->i_buffer) + if(inblockreadoffset >= p_read->i_buffer) { p_read = p_read->p_next; inblockreadoffset = 0; @@ -570,7 +572,7 @@ delete source; } -std::string ProbeableChunk::getContentType() const +const std::string & ProbeableChunk::getContentType() const { return source->getContentType(); } diff -Nru vlc-3.0.21/modules/demux/adaptive/http/Chunk.h vlc-3.0.22/modules/demux/adaptive/http/Chunk.h --- vlc-3.0.21/modules/demux/adaptive/http/Chunk.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/http/Chunk.h 2025-11-13 22:17:54.000000000 +0000 @@ -55,7 +55,7 @@ { public: virtual ~ChunkInterface() = default; - virtual std::string getContentType () const = 0; + virtual const std::string & getContentType () const = 0; virtual RequestStatus getRequestStatus() const = 0; virtual block_t * readBlock () = 0; @@ -74,7 +74,7 @@ const BytesRange & getBytesRange () const; ChunkType getChunkType () const; const StorageID & getStorageID () const; - virtual std::string getContentType () const override; + virtual const std::string & getContentType () const override; virtual RequestStatus getRequestStatus() const override; virtual void recycle() = 0; @@ -93,7 +93,7 @@ public: virtual ~AbstractChunk(); - virtual std::string getContentType () const override; + virtual const std::string & getContentType () const override; virtual RequestStatus getRequestStatus () const override; virtual size_t getBytesRead () const override; virtual bool hasMoreData () const override; @@ -124,7 +124,7 @@ virtual block_t * read (size_t) override; virtual bool hasMoreData () const override; virtual size_t getBytesRead () const override; - virtual std::string getContentType () const override; + virtual const std::string & getContentType() const override; virtual void recycle() override; static const size_t CHUNK_SIZE = 32768; @@ -203,7 +203,7 @@ ProbeableChunk(ChunkInterface *); virtual ~ProbeableChunk(); - virtual std::string getContentType () const override; + virtual const std::string & getContentType () const override; virtual RequestStatus getRequestStatus() const override; virtual block_t * readBlock () override; diff -Nru vlc-3.0.21/modules/demux/adaptive/http/ConnectionParams.cpp vlc-3.0.22/modules/demux/adaptive/http/ConnectionParams.cpp --- vlc-3.0.21/modules/demux/adaptive/http/ConnectionParams.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/http/ConnectionParams.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -70,8 +70,8 @@ if(!hostname.empty()) { os << hostname; - if( (port != 80 && scheme != "http") || - (port != 443 && scheme != "https") ) + if( (port != 80 && scheme == "http") || + (port != 443 && scheme == "https") ) os << ":" << port; } os << path; diff -Nru vlc-3.0.21/modules/demux/adaptive/http/HTTPConnectionManager.cpp vlc-3.0.22/modules/demux/adaptive/http/HTTPConnectionManager.cpp --- vlc-3.0.21/modules/demux/adaptive/http/HTTPConnectionManager.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/http/HTTPConnectionManager.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -176,7 +176,7 @@ { cache.remove(s); cache_total -= s->contentLength; - CacheDebug(msg_Dbg(p_object, "Cache GET '%s' usage %u bytes", + CacheDebug(msg_Dbg(p_object, "Cache GET '%s' usage %zu bytes", storageid.c_str(), cache_total)); return s; } @@ -216,13 +216,13 @@ HTTPChunkBufferedSource *purged = cache.back(); cache.pop_back(); cache_total -= purged->contentLength; - CacheDebug(msg_Dbg(p_object, "Cache DEL '%s' usage %u bytes", + CacheDebug(msg_Dbg(p_object, "Cache DEL '%s' usage %zu bytes", purged->getStorageID().c_str(), cache_total)); deleteSource(purged); } cache.push_front(buf); cache_total += buf->contentLength; - CacheDebug(msg_Dbg(p_object, "Cache PUT '%s' usage %u bytes", + CacheDebug(msg_Dbg(p_object, "Cache PUT '%s' usage %zu bytes", buf->getStorageID().c_str(), cache_total)); } else diff -Nru vlc-3.0.21/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp vlc-3.0.22/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp --- vlc-3.0.21/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -38,10 +38,6 @@ maxheight = std::numeric_limits::max(); } -AbstractAdaptationLogic::~AbstractAdaptationLogic () -{ -} - void AbstractAdaptationLogic::updateDownloadRate (const adaptive::ID &, size_t, mtime_t, mtime_t) { diff -Nru vlc-3.0.21/modules/demux/adaptive/logic/AbstractAdaptationLogic.h vlc-3.0.22/modules/demux/adaptive/logic/AbstractAdaptationLogic.h --- vlc-3.0.21/modules/demux/adaptive/logic/AbstractAdaptationLogic.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/logic/AbstractAdaptationLogic.h 2025-11-13 22:17:54.000000000 +0000 @@ -44,8 +44,9 @@ public SegmentTrackerListenerInterface { public: + AbstractAdaptationLogic () = delete; AbstractAdaptationLogic (vlc_object_t *); - virtual ~AbstractAdaptationLogic (); + virtual ~AbstractAdaptationLogic () = default; virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) = 0; virtual void updateDownloadRate (const ID &, size_t, diff -Nru vlc-3.0.21/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h vlc-3.0.22/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h --- vlc-3.0.21/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h 2025-11-13 22:17:54.000000000 +0000 @@ -35,6 +35,7 @@ { public: AlwaysBestAdaptationLogic (vlc_object_t *); + virtual ~AlwaysBestAdaptationLogic() = default; virtual BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) override; diff -Nru vlc-3.0.21/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp vlc-3.0.22/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp --- vlc-3.0.21/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -30,6 +30,7 @@ { public: AlwaysLowestAdaptationLogic(vlc_object_t *); + virtual ~AlwaysLowestAdaptationLogic() = default; virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) override; diff -Nru vlc-3.0.21/modules/demux/adaptive/logic/BufferingLogic.cpp vlc-3.0.22/modules/demux/adaptive/logic/BufferingLogic.cpp --- vlc-3.0.21/modules/demux/adaptive/logic/BufferingLogic.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/logic/BufferingLogic.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -90,7 +90,7 @@ if(!profile) return 0; uint64_t num = profile->getStartSegmentNumber(); - vlc_tick_t offset = rep->getPlaylist()->presentationStartOffset.Get(); + vlc_tick_t offset = rep->getPlaylist()->presentationStartOffset; if(offset > 0) { vlc_tick_t startTime, duration; @@ -132,12 +132,12 @@ return getMinBuffering(p); vlc_tick_t delay = userLiveDelay ? userLiveDelay : DEFAULT_LIVE_BUFFERING; - if(p->suggestedPresentationDelay.Get()) - delay = p->suggestedPresentationDelay.Get(); - else if(p->presentationStartOffset.Get()) - delay = p->presentationStartOffset.Get(); - if(p->timeShiftBufferDepth.Get()) - delay = std::min(delay, p->timeShiftBufferDepth.Get()); + if(p->suggestedPresentationDelay) + delay = p->suggestedPresentationDelay; + else if(p->presentationStartOffset) + delay = p->presentationStartOffset; + if(p->timeShiftBufferDepth) + delay = std::min(delay, p->timeShiftBufferDepth); return std::max(delay, getMinBuffering(p)); } @@ -202,7 +202,7 @@ if(unlikely(!b_ret)) return 0; - if(playlist->timeShiftBufferDepth.Get()) + if(playlist->timeShiftBufferDepth) { stime_t edgetime; b_ret = timeline->getScaledPlaybackTimeDurationBySegmentNumber(timeline->maxElementNumber(), @@ -210,7 +210,7 @@ if(unlikely(!b_ret)) return 0; edgetime += duration - 1; - stime_t timeshiftdepth = timescale.ToScaled(playlist->timeShiftBufferDepth.Get()); + stime_t timeshiftdepth = timescale.ToScaled(playlist->timeShiftBufferDepth); if(safestarttime + timeshiftdepth < edgetime) { safestarttime = edgetime - timeshiftdepth; @@ -243,7 +243,7 @@ /* Compute playback offset and effective finished segment from wall time */ vlc_tick_t now = CLOCK_FREQ * time(nullptr); vlc_tick_t playbacktime = now - i_buffering; - vlc_tick_t minavailtime = playlist->availabilityStartTime.Get() + rep->getPeriodStart(); + vlc_tick_t minavailtime = playlist->availabilityStartTime + rep->getPeriodStart(); const uint64_t startnumber = mediaSegmentTemplate->inheritStartNumber(); const Timescale timescale = mediaSegmentTemplate->inheritTimescale(); if(!timescale) @@ -253,13 +253,13 @@ return startnumber; /* restrict to DVR window */ - if(playlist->timeShiftBufferDepth.Get()) + if(playlist->timeShiftBufferDepth) { vlc_tick_t elapsed = now - minavailtime; elapsed = elapsed - (elapsed % duration); /* align to last segment */ vlc_tick_t alignednow = minavailtime + elapsed; - if(playlist->timeShiftBufferDepth.Get() < elapsed) - minavailtime = alignednow - playlist->timeShiftBufferDepth.Get(); + if(playlist->timeShiftBufferDepth < elapsed) + minavailtime = alignednow - playlist->timeShiftBufferDepth; if(playbacktime < minavailtime) playbacktime = minavailtime; @@ -292,14 +292,14 @@ /* working around HLS discontinuities by using durations */ stime_t totallistduration = 0; for(auto it = list.begin(); it != list.end(); ++it) - totallistduration += (*it)->duration.Get(); + totallistduration += (*it)->duration; /* Apply timeshift restrictions */ stime_t availableduration; - if(playlist->timeShiftBufferDepth.Get()) + if(playlist->timeShiftBufferDepth) { availableduration = std::min(totallistduration, - timescale.ToScaled(playlist->timeShiftBufferDepth.Get())); + timescale.ToScaled(playlist->timeShiftBufferDepth)); } else availableduration = totallistduration; @@ -310,9 +310,9 @@ for(auto it = list.begin(); it != list.end(); ++it) { availableliststartnumber = (*it)->getSequenceNumber(); - if(offset < (*it)->duration.Get()) + if(offset < (*it)->duration) break; - offset -= (*it)->duration.Get(); + offset -= (*it)->duration; } } @@ -335,9 +335,9 @@ if((*it)->getSequenceNumber() < safestartnumber) continue; if((*it)->getSequenceNumber() <= safeedgenumber) - maxbufferizable += (*it)->duration.Get(); + maxbufferizable += (*it)->duration; else - safeedgeduration += (*it)->duration.Get(); + safeedgeduration += (*it)->duration; } stime_t tobuffer = std::min(maxbufferizable, timescale.ToScaled(i_buffering)); @@ -346,9 +346,9 @@ for(auto it = list.begin(); it != list.end(); ++it) { start = (*it)->getSequenceNumber(); - if((*it)->duration.Get() > skipduration) + if((*it)->duration > skipduration) break; - skipduration -= (*it)->duration.Get(); + skipduration -= (*it)->duration; } return start; @@ -363,7 +363,7 @@ if(!timescale.isValid()) return std::numeric_limits::max(); const Segment *back = list.back(); - const stime_t bufferingstart = back->startTime.Get() + back->duration.Get() - + const stime_t bufferingstart = back->startTime + back->duration - timescale.ToScaled(i_buffering); uint64_t start = AbstractSegmentBaseType::findSegmentNumberByScaledTime(list, bufferingstart); @@ -388,7 +388,5 @@ bool DefaultBufferingLogic::isLowLatency(const BasePlaylist *p) const { - if(userLowLatency.isSet()) - return userLowLatency.value(); - return p->isLowLatency(); + return userLowLatency.value_or(p->isLowLatency()); } diff -Nru vlc-3.0.21/modules/demux/adaptive/logic/BufferingLogic.hpp vlc-3.0.22/modules/demux/adaptive/logic/BufferingLogic.hpp --- vlc-3.0.21/modules/demux/adaptive/logic/BufferingLogic.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/logic/BufferingLogic.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -22,7 +22,9 @@ #include #include -#include "../tools/Properties.hpp" +#include + +#include "../tools/Compatibility.hpp" namespace adaptive { @@ -60,7 +62,7 @@ vlc_tick_t userMinBuffering; vlc_tick_t userMaxBuffering; vlc_tick_t userLiveDelay; - Undef userLowLatency; + optional userLowLatency; }; class DefaultBufferingLogic : public AbstractBufferingLogic diff -Nru vlc-3.0.21/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp vlc-3.0.22/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp --- vlc-3.0.21/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -153,7 +153,7 @@ } } - BwDebug( msg_Info(p_obj, "buffering level %.2f% rep %ld kBps %zu kBps", + BwDebug( msg_Info(p_obj, "buffering level %.2f%% rep %" PRId64 " kBps %u kBps", (float) 100 * ctxcopy.buffering_level / ctxcopy.buffering_target, m->getBandwidth()/8000, bps / 8000); ); return m; @@ -220,7 +220,7 @@ usedBps -= event.prev->getBandwidth(); if(event.next) usedBps += event.next->getBandwidth(); - BwDebug(msg_Info(p_obj, "New total bandwidth usage %zu kBps", (usedBps / 8000))); + BwDebug(msg_Info(p_obj, "New total bandwidth usage %u kBps", (usedBps / 8000))); vlc_mutex_unlock(&lock); } break; diff -Nru vlc-3.0.21/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp vlc-3.0.22/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp --- vlc-3.0.21/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -136,7 +136,7 @@ BwDebug( for(it=streams.begin(); it != streams.end(); ++it) { const PredictiveStats &s = (*it).second; - msg_Info(p_obj, "Stream %s buffering level %.2f%", + msg_Info(p_obj, "Stream %s buffering level %.2f%%", (*it).first.str().c_str(), (double) s.buffering_level / s.buffering_target); } ); @@ -191,7 +191,7 @@ if(event.next) usedBps += event.next->getBandwidth(); - BwDebug(msg_Info(p_obj, "New total bandwidth usage %zu KiB/s", (usedBps / 8000))); + BwDebug(msg_Info(p_obj, "New total bandwidth usage %u KiB/s", (usedBps / 8000))); vlc_mutex_unlock(&lock); } break; diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp vlc-3.0.22/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -112,12 +112,12 @@ bool BaseAdaptationSet::isSegmentAligned() const { - return !segmentAligned.isSet() || segmentAligned.value(); + return segmentAligned.value_or(true); } bool BaseAdaptationSet::isBitSwitchable() const { - return bitswitchAble.isSet() && segmentAligned.value(); + return bitswitchAble.has_value() && isSegmentAligned(); } void BaseAdaptationSet::setRole(const Role &r) diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/BaseAdaptationSet.h vlc-3.0.22/modules/demux/adaptive/playlist/BaseAdaptationSet.h --- vlc-3.0.21/modules/demux/adaptive/playlist/BaseAdaptationSet.h 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/BaseAdaptationSet.h 2025-11-13 22:17:54.000000000 +0000 @@ -62,14 +62,14 @@ const std::string& getLang() const; void setLang( const std::string &lang ); void debug(vlc_object_t *,int = 0) const; - Property description; + std::string description; protected: Role role; std::vector representations; std::string lang; - Undef segmentAligned; - Undef bitswitchAble; + optional segmentAligned; + optional bitswitchAble; }; } } diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/BasePeriod.cpp vlc-3.0.22/modules/demux/adaptive/playlist/BasePeriod.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/BasePeriod.cpp 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/BasePeriod.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -41,8 +41,8 @@ BasePeriod::BasePeriod(BasePlaylist *playlist_) : SegmentInformation( playlist_ ) { - duration.Set(0); - startTime.Set(0); + duration = 0; + startTime = 0; playlist = playlist_; } @@ -96,10 +96,10 @@ vlc_tick_t BasePeriod::getPeriodStart() const { - return startTime.Get(); + return startTime; } vlc_tick_t BasePeriod::getPeriodDuration() const { - return duration.Get(); + return duration; } diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/BasePeriod.h vlc-3.0.22/modules/demux/adaptive/playlist/BasePeriod.h --- vlc-3.0.21/modules/demux/adaptive/playlist/BasePeriod.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/BasePeriod.h 2025-11-13 22:17:54.000000000 +0000 @@ -28,7 +28,6 @@ #include "BaseAdaptationSet.h" #include "SegmentInformation.hpp" -#include "../tools/Properties.hpp" namespace adaptive { @@ -49,8 +48,8 @@ virtual vlc_tick_t getPeriodDuration() const override; virtual BasePlaylist *getPlaylist() const override; - Property duration; - Property startTime; + vlc_tick_t duration; + vlc_tick_t startTime; private: std::vector adaptationSets; diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/BasePlaylist.cpp vlc-3.0.22/modules/demux/adaptive/playlist/BasePlaylist.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/BasePlaylist.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/BasePlaylist.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -37,17 +37,17 @@ ICanonicalUrl(), AttrsNode(Type::Playlist), p_object(p_object_) { - playbackStart.Set(0); - availabilityStartTime.Set( 0 ); - availabilityEndTime.Set( 0 ); - duration.Set( 0 ); - minUpdatePeriod.Set( 2 * CLOCK_FREQ ); - maxSegmentDuration.Set( 0 ); + playbackStart = 0; + availabilityStartTime = 0; + availabilityEndTime = 0; + duration = 0; + minUpdatePeriod = 2 * CLOCK_FREQ; + maxSegmentDuration = 0; minBufferTime = 0; maxBufferTime = 0; - timeShiftBufferDepth.Set( 0 ); - suggestedPresentationDelay.Set( 0 ); - presentationStartOffset.Set( 0 ); + timeShiftBufferDepth = 0; + suggestedPresentationDelay = 0; + presentationStartOffset = 0; b_needsUpdates = true; } @@ -161,7 +161,7 @@ void BasePlaylist::updateWith(BasePlaylist *updatedPlaylist) { - availabilityEndTime.Set(updatedPlaylist->availabilityEndTime.Get()); + availabilityEndTime = updatedPlaylist->availabilityEndTime; for(size_t i = 0; i < periods.size() && i < updatedPlaylist->periods.size(); i++) periods.at(i)->updateWith(updatedPlaylist->periods.at(i)); diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/BasePlaylist.hpp vlc-3.0.22/modules/demux/adaptive/playlist/BasePlaylist.hpp --- vlc-3.0.21/modules/demux/adaptive/playlist/BasePlaylist.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/BasePlaylist.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -26,7 +26,6 @@ #include "ICanonicalUrl.hpp" #include "Inheritables.hpp" -#include "../tools/Properties.hpp" namespace adaptive { @@ -65,15 +64,15 @@ bool needsUpdates() const; void updateWith(BasePlaylist *); - Property duration; - Property playbackStart; - Property availabilityEndTime; - Property availabilityStartTime; - Property minUpdatePeriod; - Property maxSegmentDuration; - Property timeShiftBufferDepth; - Property suggestedPresentationDelay; - Property presentationStartOffset; + vlc_tick_t duration; + time_t playbackStart; + vlc_tick_t availabilityEndTime; + vlc_tick_t availabilityStartTime; + vlc_tick_t minUpdatePeriod; + vlc_tick_t maxSegmentDuration; + vlc_tick_t timeShiftBufferDepth; + vlc_tick_t suggestedPresentationDelay; + vlc_tick_t presentationStartOffset; protected: vlc_object_t *p_object; diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/BaseRepresentation.cpp vlc-3.0.22/modules/demux/adaptive/playlist/BaseRepresentation.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/BaseRepresentation.cpp 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/BaseRepresentation.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -109,7 +109,7 @@ for(auto it = codecs.cbegin(); it != codecs.cend(); ++it) { CodecDescription *dsc = makeCodecDescription(*it); - dsc->setDescription(adaptationSet->description.Get()); + dsc->setDescription(adaptationSet->description); dsc->setLanguage(adaptationSet->getLang()); if(getWidth() > 0 && getHeight() > 0) dsc->setDimensions(getWidth(), getHeight()); @@ -250,8 +250,8 @@ else if( mediaSegmentTemplate->inheritDuration() ) { *rangeEnd = 0; - *rangeBegin = -1 * getPlaylist()->timeShiftBufferDepth.Get(); - *rangeLength = getPlaylist()->timeShiftBufferDepth.Get(); + *rangeBegin = -1 * getPlaylist()->timeShiftBufferDepth; + *rangeLength = getPlaylist()->timeShiftBufferDepth; return true; } } @@ -262,8 +262,8 @@ const Timescale timescale = segmentList->inheritTimescale(); const std::vector &list = segmentList->getSegments(); const ISegment *back = list.back(); - const stime_t startTime = list.front()->startTime.Get(); - const stime_t endTime = back->startTime.Get() + back->duration.Get(); + const stime_t startTime = list.front()->startTime; + const stime_t endTime = back->startTime + back->duration; *rangeBegin = timescale.ToTime(startTime); *rangeEnd = timescale.ToTime(endTime); *rangeLength = timescale.ToTime(segmentList->getTotalLength()); @@ -279,8 +279,8 @@ const Timescale timescale = inheritTimescale(); const Segment *back = list.back(); - const stime_t startTime = list.front()->startTime.Get(); - const stime_t endTime = back->startTime.Get() + back->duration.Get(); + const stime_t startTime = list.front()->startTime; + const stime_t endTime = back->startTime + back->duration; *rangeBegin = timescale.ToTime(startTime); *rangeEnd = timescale.ToTime(endTime); *rangeLength = 0; diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/CommonAttributesElements.h vlc-3.0.22/modules/demux/adaptive/playlist/CommonAttributesElements.h --- vlc-3.0.21/modules/demux/adaptive/playlist/CommonAttributesElements.h 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/CommonAttributesElements.h 2025-11-13 22:17:54.000000000 +0000 @@ -24,6 +24,7 @@ #ifndef COMMONATTRIBUTESELEMENTS_H #define COMMONATTRIBUTESELEMENTS_H +#include "../tools/Compatibility.hpp" #include "../tools/Properties.hpp" #include diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/Segment.cpp vlc-3.0.22/modules/demux/adaptive/playlist/Segment.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/Segment.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/Segment.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -46,8 +46,8 @@ endByte (0) { debugName = "Segment"; - startTime.Set(0); - duration.Set(0); + startTime = 0; + duration = 0; sequence = 0; discontinuitySequenceNumber = std::numeric_limits::max(); templated = false; @@ -162,9 +162,9 @@ ss << " url=" << getUrlSegment().toString(); if(startByte!=endByte) ss << " @" << startByte << ".." << endByte; - if(startTime.Get() > 0) - ss << " stime " << startTime.Get(); - ss << " duration " << duration.Get(); + if(startTime > 0) + ss << " stime " << startTime; + ss << " duration " << duration; if(discontinuity) { ss << " dty"; diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/Segment.h vlc-3.0.22/modules/demux/adaptive/playlist/Segment.h --- vlc-3.0.21/modules/demux/adaptive/playlist/Segment.h 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/Segment.h 2025-11-13 22:17:54.000000000 +0000 @@ -31,7 +31,6 @@ #include "ICanonicalUrl.hpp" #include "../http/Chunk.h" #include "../encryption/CommonEncryption.hpp" -#include "../tools/Properties.hpp" #include "../Time.hpp" namespace adaptive @@ -72,8 +71,8 @@ void setEncryption (CommonEncryption &); void setDisplayTime (vlc_tick_t); vlc_tick_t getDisplayTime () const; - Property startTime; - Property duration; + stime_t startTime; + stime_t duration; bool discontinuity; protected: diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/SegmentBase.cpp vlc-3.0.22/modules/demux/adaptive/playlist/SegmentBase.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/SegmentBase.cpp 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/SegmentBase.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -55,7 +55,7 @@ stime_t minTime = 0; std::for_each(subsegments.cbegin() + curnum + 1, subsegments.cend(), [&minTime](const Segment * seg){ - minTime += seg->duration.Get(); + minTime += seg->duration; }); return timescale.ToTime(minTime); @@ -97,8 +97,8 @@ const ISegment *segment = getMediaSegment(number); if( segment ) { - *time = timescale.ToTime(segment->startTime.Get()); - *dur = timescale.ToTime(segment->duration.Get()); + *time = timescale.ToTime(segment->startTime); + *dur = timescale.ToTime(segment->duration); return true; } return false; diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/SegmentBaseType.cpp vlc-3.0.22/modules/demux/adaptive/playlist/SegmentBaseType.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/SegmentBaseType.cpp 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/SegmentBaseType.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -33,7 +33,7 @@ Segment * AbstractSegmentBaseType::findSegmentByScaledTime(const std::vector &segments, stime_t time) { - if(segments.empty() || (segments.size() > 1 && segments[1]->startTime.Get() == 0) ) + if(segments.empty() || (segments.size() > 1 && segments[1]->startTime == 0) ) return nullptr; Segment *ret = nullptr; @@ -41,7 +41,7 @@ while(it != segments.end()) { Segment *seg = *it; - if(seg->startTime.Get() > time) + if(seg->startTime > time) { if(it == segments.begin()) return nullptr; @@ -77,20 +77,20 @@ InitSegment *AbstractSegmentBaseType::getInitSegment() const { - return initialisationSegment.Get(); + return initialisationSegment; } IndexSegment *AbstractSegmentBaseType::getIndexSegment() const { - return indexSegment.Get(); + return indexSegment; } void AbstractSegmentBaseType::debug(vlc_object_t *obj, int indent) const { - if(initialisationSegment.Get()) - initialisationSegment.Get()->debug(obj, indent); - if(indexSegment.Get()) - indexSegment.Get()->debug(obj, indent); + if(initialisationSegment) + initialisationSegment->debug(obj, indent); + if(indexSegment) + indexSegment->debug(obj, indent); } AbstractMultipleSegmentBaseType::AbstractMultipleSegmentBaseType(SegmentInformation *parent, diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/SegmentInformation.cpp vlc-3.0.22/modules/demux/adaptive/playlist/SegmentInformation.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/SegmentInformation.cpp 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/SegmentInformation.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -57,12 +57,12 @@ void SegmentInformation::init() { - baseUrl.Set(nullptr); + baseUrl = nullptr; } SegmentInformation::~SegmentInformation() { - delete baseUrl.Get(); + delete baseUrl; } BasePlaylist * SegmentInformation::getPlaylist() const @@ -258,8 +258,8 @@ if(end == 0 || container->contains(end)) { SubSegment *subsegment = new SubSegment(container, start, (end != 0) ? end : 0); - subsegment->startTime.Set(time); - subsegment->duration.Set(duration); + subsegment->startTime = time; + subsegment->duration = duration; container->addSubSegment(subsegment); } } @@ -299,15 +299,15 @@ Url SegmentInformation::getUrlSegment() const { - if(baseUrl.Get() && baseUrl.Get()->hasScheme()) + if(baseUrl && baseUrl->hasScheme()) { - return *(baseUrl.Get()); + return *(baseUrl); } else { Url ret = getParentUrlSegment(); - if (baseUrl.Get()) - ret.append(*(baseUrl.Get())); + if (baseUrl) + ret.append(*baseUrl); return ret; } } diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/SegmentInformation.hpp vlc-3.0.22/modules/demux/adaptive/playlist/SegmentInformation.hpp --- vlc-3.0.21/modules/demux/adaptive/playlist/SegmentInformation.hpp 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/SegmentInformation.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -23,7 +23,6 @@ #include "ICanonicalUrl.hpp" #include "Inheritables.hpp" #include "Segment.h" -#include "../tools/Properties.hpp" #include "../encryption/CommonEncryption.hpp" #include #include @@ -88,7 +87,7 @@ void updateSegmentList(SegmentList *, bool = false); void setSegmentTemplate(SegmentTemplate *); virtual Url getUrlSegment() const override; - Property baseUrl; + Url * baseUrl; const AbstractSegmentBaseType * inheritSegmentProfile() const; private: diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/SegmentList.cpp vlc-3.0.22/modules/demux/adaptive/playlist/SegmentList.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/SegmentList.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/SegmentList.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -85,7 +85,7 @@ { seg->setParent(AbstractSegmentBaseType::parent); segments.push_back(seg); - totalLength += seg->duration.Get(); + totalLength += seg->duration; } void SegmentList::updateWith(AbstractMultipleSegmentBaseType *updated_, @@ -125,14 +125,14 @@ for(auto it = updated->segments.begin(); it != updated->segments.end(); ++it) { Segment *cur = *it; - cur->startTime.Set(prevSegment->startTime.Get() + prevSegment->duration.Get()); + cur->startTime = prevSegment->startTime + prevSegment->duration; /* not continuous */ if(cur->getSequenceNumber() != prevSegment->getSequenceNumber() + 1) { assert(prevSegment->getSequenceNumber() < cur->getSequenceNumber()); assert(duration); uint64_t gap = cur->getSequenceNumber() - prevSegment->getSequenceNumber() - 1; - cur->startTime.Set(cur->startTime.Get() + duration * gap); + cur->startTime = cur->startTime + duration * gap; } prevSegment = cur; addSegment(cur); @@ -162,7 +162,7 @@ if(seg->getSequenceNumber() >= tobelownum) break; - totalLength -= (*it)->duration.Get(); + totalLength -= (*it)->duration; delete *it; it = segments.erase(it); } @@ -198,15 +198,15 @@ return false; bool found = false; - stime = first->startTime.Get(); + stime = first->startTime; sduration = 0; std::vector::const_iterator it = segments.begin(); for(it = segments.begin(); it != segments.end(); ++it) { const Segment *seg = *it; - if(seg->duration.Get()) - sduration = seg->duration.Get(); + if(seg->duration) + sduration = seg->duration; else sduration = inheritDuration(); @@ -258,7 +258,7 @@ { const Segment *seg = *it; if(seg->getSequenceNumber() > curnum) - minTime += timescale.ToTime(seg->duration.Get()); + minTime += timescale.ToTime(seg->duration); } return minTime; } diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/SegmentTemplate.cpp vlc-3.0.22/modules/demux/adaptive/playlist/SegmentTemplate.cpp --- vlc-3.0.21/modules/demux/adaptive/playlist/SegmentTemplate.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/SegmentTemplate.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -58,7 +58,7 @@ SegmentTemplate::SegmentTemplate( SegmentTemplateSegment *seg, SegmentInformation *parent ) : AbstractMultipleSegmentBaseType( parent, AbstractAttr::Type::SegmentTemplate ) { - initialisationSegment.Set( nullptr ); + initialisationSegment = nullptr; parentSegmentInformation = parent; virtualsegment = seg; virtualsegment->setParent( parentSegmentInformation ); @@ -103,7 +103,7 @@ if(abs) { vlc_tick_t streamstart = - parentSegmentInformation->getPlaylist()->availabilityStartTime.Get(); + parentSegmentInformation->getPlaylist()->availabilityStartTime; streamstart += parentSegmentInformation->getPeriodStart(); playbacktime -= streamstart; } @@ -150,8 +150,8 @@ if(getScaledPlaybackTimeDurationBySegmentNumber(pos, &startTime, &duration, ×cale)) { - virtualsegment->startTime.Set(startTime); - virtualsegment->duration.Set(duration); + virtualsegment->startTime = startTime; + virtualsegment->duration = duration; } } @@ -189,7 +189,7 @@ const stime_t segmentduration = inheritDuration(); vlc_tick_t totalduration = parentSegmentInformation->getPeriodDuration(); if(totalduration == 0) - totalduration = playlist->duration.Get(); + totalduration = playlist->duration; if(totalduration && segmentduration) { uint64_t endnum = inheritStartNumber() + @@ -233,9 +233,9 @@ if( playlist->isLive() ) { vlc_tick_t now = CLOCK_FREQ * ::time(nullptr); - if(time >= playlist->availabilityStartTime.Get() && time < now) + if(time >= playlist->availabilityStartTime && time < now) *ret = getLiveTemplateNumber(time, true); - else if(now - playlist->availabilityStartTime.Get() > time) + else if(now - playlist->availabilityStartTime > time) *ret = getLiveTemplateNumber(time, false); else return false; } diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/SegmentTemplate.h vlc-3.0.22/modules/demux/adaptive/playlist/SegmentTemplate.h --- vlc-3.0.21/modules/demux/adaptive/playlist/SegmentTemplate.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/SegmentTemplate.h 2025-11-13 22:17:54.000000000 +0000 @@ -25,7 +25,6 @@ #define SEGMENTTEMPLATE_H #include "Segment.h" -#include "../tools/Properties.hpp" #include "SegmentBaseType.hpp" namespace adaptive diff -Nru vlc-3.0.21/modules/demux/adaptive/playlist/Templates.hpp vlc-3.0.22/modules/demux/adaptive/playlist/Templates.hpp --- vlc-3.0.21/modules/demux/adaptive/playlist/Templates.hpp 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/playlist/Templates.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -28,29 +28,23 @@ template class Initializable { public: - Initializable() - { - initialisationSegment.Set(nullptr); - } + Initializable() = default; ~Initializable() { - delete initialisationSegment.Get(); + delete initialisationSegment; } - Property initialisationSegment; + T * initialisationSegment = nullptr; }; template class Indexable { public: - Indexable() - { - indexSegment.Set(nullptr); - } + Indexable() = default; ~Indexable() { - delete indexSegment.Get(); + delete indexSegment; } - Property indexSegment; + T *indexSegment = nullptr; }; } diff -Nru vlc-3.0.21/modules/demux/adaptive/test/SegmentTracker.cpp vlc-3.0.22/modules/demux/adaptive/test/SegmentTracker.cpp --- vlc-3.0.21/modules/demux/adaptive/test/SegmentTracker.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/test/SegmentTracker.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -73,7 +73,7 @@ : AbstractChunkSource(t, range), data(v), offset(0), contentType(content) {} virtual ~DummyChunkSource() = default; virtual void recycle() override { delete this; } - virtual std::string getContentType () const override + virtual const std::string & getContentType () const override { return contentType; } @@ -298,8 +298,8 @@ Segment *seg = new Segment(rep0); seg->setSequenceNumber(123 + i); seg->setDiscontinuitySequenceNumber(456); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; seg->setSourceUrl(i < 2 ? "sample/aac" : "sample/ac3"); segmentList->addSegment(seg); } @@ -391,8 +391,8 @@ Segment *seg = new Segment(rep0); seg->setSequenceNumber(123 + i); seg->setDiscontinuitySequenceNumber(456); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; seg->setSourceUrl("sample/aac"); segmentList->addSegment(seg); } @@ -488,8 +488,8 @@ Segment *seg = new Segment(rep0); seg->setSequenceNumber(123 + i); seg->setDiscontinuitySequenceNumber(456); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; seg->setSourceUrl("sample/aac"); segmentList->addSegment(seg); } @@ -514,8 +514,8 @@ Segment *seg = new Segment(rep1); seg->setSequenceNumber(123 + i); seg->setDiscontinuitySequenceNumber(456); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; seg->setSourceUrl("sample/aac"); segmentList->addSegment(seg); } @@ -528,7 +528,7 @@ /* have some init segment on rep1 */ InitSegment *initSegment = new InitSegment(rep1); initSegment->setSourceUrl("sample/aacinit"); - segmentList->initialisationSegment.Set(initSegment); + segmentList->initialisationSegment = initSegment; Expect(adaptSet->isSegmentAligned()); Expect(adaptSet->getRepresentations().size() == 2); @@ -668,8 +668,8 @@ { Segment *seg = new Segment(rep0); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; seg->setSourceUrl("sample/aac"); segmentList->addSegment(seg); } @@ -692,8 +692,8 @@ { Segment *seg = new Segment(rep1); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 250 * i); - seg->duration.Set(250); + seg->startTime = START + 250 * i; + seg->duration = 250; seg->setSourceUrl("sample/aac"); segmentList->addSegment(seg); } diff -Nru vlc-3.0.21/modules/demux/adaptive/test/logic/BufferingLogic.cpp vlc-3.0.22/modules/demux/adaptive/test/logic/BufferingLogic.cpp --- vlc-3.0.21/modules/demux/adaptive/test/logic/BufferingLogic.cpp 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/test/logic/BufferingLogic.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -101,7 +101,7 @@ uint64_t number = 22; Segment *seg = new Segment(rep); seg->setSequenceNumber(number); - seg->duration.Set(segmentduration); + seg->duration = segmentduration; segmentList->addSegment(seg); Expect(bufferinglogic.getStartSegmentNumber(rep) == number); @@ -152,7 +152,7 @@ { seg = new Segment(rep); seg->setSequenceNumber(++number); - seg->duration.Set(segmentduration); + seg->duration = segmentduration; segmentList->addSegment(seg); } diff -Nru vlc-3.0.21/modules/demux/adaptive/test/playlist/M3U8.cpp vlc-3.0.22/modules/demux/adaptive/test/playlist/M3U8.cpp --- vlc-3.0.21/modules/demux/adaptive/test/playlist/M3U8.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/test/playlist/M3U8.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -45,9 +45,6 @@ using namespace adaptive::playlist; using namespace hls::playlist; -#define vlc_tick_from_sec(a) (CLOCK_FREQ * (a)) -#define SEC_FROM_VLC_TICK(a) ((a)/CLOCK_FREQ) - static M3U8 * ParseM3U8(vlc_object_t *obj, const char *psz, size_t isz) { M3U8Parser parser(nullptr); @@ -309,7 +306,7 @@ Segment *seg = rep->getMediaSegment(number); Expect(seg); Expect(seg->getSequenceNumber() == 10); - Expect(seg->startTime.Get() == (stime_t) 0); + Expect(seg->startTime == (stime_t) 0); vlc_tick_t begin, end; Expect(rep->getMediaPlaybackRange(&begin, &end, &duration)); @@ -343,7 +340,7 @@ BaseRepresentation *rep = m3u->getFirstPeriod()->getAdaptationSets().front()-> getRepresentations().front(); Expect(rep->getProfile()->getStartSegmentNumber() == 10); - Expect(m3u->duration.Get()); + Expect(m3u->duration); Timescale timescale = rep->inheritTimescale(); Expect(timescale.isValid()); @@ -355,7 +352,7 @@ Expect(number == 12); Expect(!discont); Expect(seg->getSequenceNumber() == 12); - Expect(seg->startTime.Get() == timescale.ToScaled(vlc_tick_from_sec(20))); + Expect(seg->startTime == timescale.ToScaled(vlc_tick_from_sec(20))); vlc_tick_t begin, end, duration; Expect(rep->getMediaPlaybackRange(&begin, &end, &duration)); @@ -496,11 +493,11 @@ { Expect(m3u); Expect(m3u->isLive() == false); - Expect(m3u->presentationStartOffset.Get() == ((50 - 11.5) * CLOCK_FREQ)); + Expect(m3u->presentationStartOffset == ((50 - 11.5) * CLOCK_FREQ)); BaseRepresentation *rep = m3u->getFirstPeriod()->getAdaptationSets().front()-> getRepresentations().front(); Expect(bufferingLogic.getStartSegmentNumber(rep) == 13); - m3u->presentationStartOffset.Set(11.5 * CLOCK_FREQ); + m3u->presentationStartOffset = 11.5 * CLOCK_FREQ; Expect(bufferingLogic.getStartSegmentNumber(rep) == 11); delete m3u; @@ -546,5 +543,47 @@ return 1; } + + /* Manifest 6 */ + const char manifest6[] = + "#EXTM3U\n" + "#EXT-X-MEDIA-SEQUENCE:10\n" + "#EXTINF:1\n" + "#EXT-X-BYTERANGE:1000@0\n" + "foobar.ts\n" + "#EXT-X-BYTERANGE:4000@2000\n" + "foobar.ts\n" + "#EXT-X-BYTERANGE:500\n" + "foobar.ts\n" + "#EXT-X-BYTERANGE:1000@0\n" + "foobar.ts\n"; + + m3u = ParseM3U8(obj, manifest6, sizeof(manifest6)); + try + { + Expect(m3u); + BaseRepresentation *rep = m3u->getFirstPeriod()->getAdaptationSets().front()-> + getRepresentations().front(); + Segment *seg = rep->getMediaSegment(10); + Expect(seg); + Expect(seg->getOffset() == 0); + seg = rep->getMediaSegment(11); + Expect(seg); + Expect(seg->getOffset() == 2000); + seg = rep->getMediaSegment(12); + Expect(seg); + Expect(seg->getOffset() == 6000); + seg = rep->getMediaSegment(13); + Expect(seg); + Expect(seg->getOffset() == 0); + delete m3u; + } + catch (...) + { + delete m3u; + return 1; + } + + return 0; } diff -Nru vlc-3.0.21/modules/demux/adaptive/test/playlist/SegmentBase.cpp vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentBase.cpp --- vlc-3.0.21/modules/demux/adaptive/test/playlist/SegmentBase.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentBase.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -72,7 +72,7 @@ segmentBase->setByteRange(111, 2000); - segmentBase->duration.Set(100 * 10); + segmentBase->duration = 100 * 10; rep->SplitUsingIndex(splitlist); Expect(segmentBase->subSegments().size()); Expect(segmentBase->getMediaSegment(0) != nullptr); diff -Nru vlc-3.0.21/modules/demux/adaptive/test/playlist/SegmentList.cpp vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentList.cpp --- vlc-3.0.21/modules/demux/adaptive/test/playlist/SegmentList.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentList.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -59,8 +59,8 @@ const stime_t START = 1337; Segment *seg = new Segment(nullptr); seg->setSequenceNumber(123); - seg->startTime.Set(START); - seg->duration.Set(100); + seg->startTime = START; + seg->duration = 100; segmentList->addSegment(seg); Expect(segmentList->getTotalLength() == 100); @@ -73,7 +73,7 @@ seg = segmentList->getMediaSegment(123); Expect(seg); Expect(seg->getSequenceNumber() == 123); - Expect(seg->startTime.Get() == START); + Expect(seg->startTime == START); seg = segmentList->getNextMediaSegment(123, &number, &discont); Expect(seg); Expect(number == 123); @@ -89,8 +89,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList->addSegment(seg); } @@ -109,8 +109,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList2->addSegment(seg); } segmentList->updateWith(segmentList2); @@ -122,8 +122,8 @@ seg = segmentList->getMediaSegment(123 + i); Expect(seg); Expect(seg->getSequenceNumber() == (uint64_t) 123 + i); - Expect(seg->startTime.Get() == START + 100 * i); - Expect(seg->duration.Get() == 100); + Expect(seg->startTime == START + 100 * i); + Expect(seg->duration == 100); } /* prune */ @@ -148,8 +148,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList->addSegment(seg); } segmentList2 = new SegmentList(nullptr, true); @@ -157,8 +157,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(128 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList2->addSegment(seg); } segmentList->updateWith(segmentList2); @@ -166,8 +166,8 @@ Expect(segmentList->getSegments().size() == 2); Expect(segmentList->getSegments().at(0)->getSequenceNumber() == 128); Expect(segmentList->getSegments().at(1)->getSequenceNumber() == 129); - Expect(segmentList->getSegments().at(0)->startTime.Get() == START + 100 * (128 - 123)); - Expect(segmentList->getSegments().at(1)->startTime.Get() == START + 100 * (129 - 123)); + Expect(segmentList->getSegments().at(0)->startTime == START + 100 * (128 - 123)); + Expect(segmentList->getSegments().at(1)->startTime == START + 100 * (129 - 123)); delete segmentList; delete segmentList2; @@ -182,8 +182,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList->addSegment(seg); } segmentList2 = new SegmentList(nullptr, true); @@ -191,8 +191,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList2->addSegment(seg); } segmentList->updateWith(segmentList2); @@ -214,8 +214,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList->addSegment(seg); } segmentList2 = new SegmentList(nullptr, false); @@ -223,8 +223,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList2->addSegment(seg); } segmentList->updateWith(segmentList2); @@ -232,8 +232,8 @@ Expect(segmentList->getSegments().size() == 2); Expect(segmentList->getSegments().at(0)->getSequenceNumber() == 128); Expect(segmentList->getSegments().at(1)->getSequenceNumber() == 129); - Expect(segmentList->getSegments().at(0)->startTime.Get() == START + 100 * (128 - 123)); - Expect(segmentList->getSegments().at(1)->startTime.Get() == START + 100 * (129 - 123)); + Expect(segmentList->getSegments().at(0)->startTime == START + 100 * (128 - 123)); + Expect(segmentList->getSegments().at(1)->startTime == START + 100 * (129 - 123)); delete segmentList; delete segmentList2; @@ -246,8 +246,8 @@ { seg = new Segment(nullptr); seg->setSequenceNumber(123 + i); - seg->startTime.Set(START + 100 * i); - seg->duration.Set(100); + seg->startTime = START + 100 * i; + seg->duration = 100; segmentList->addSegment(seg); } const std::vector&allsegments = segmentList->getSegments(); diff -Nru vlc-3.0.21/modules/demux/adaptive/test/playlist/SegmentTemplate.cpp vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentTemplate.cpp --- vlc-3.0.21/modules/demux/adaptive/test/playlist/SegmentTemplate.cpp 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/test/playlist/SegmentTemplate.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -89,16 +89,16 @@ /* start/end, duration known */ vlc_tick_t now = timescale.ToTime(1000000); - pl->availabilityStartTime.Set(now); - pl->availabilityEndTime.Set(now + timescale.ToTime(100 * 20)); + pl->availabilityStartTime = now; + pl->availabilityEndTime = now + timescale.ToTime(100 * 20); Expect(templ->getLiveTemplateNumber(now, true) == templ->getStartSegmentNumber()); //Expect(templ->getLiveTemplateNumber(now / 2, true) == std::numeric_limits::max()); Expect(templ->getLiveTemplateNumber(now + timescale.ToTime(100) * 2 + 1, true) == templ->getStartSegmentNumber() + 1); /* reset */ - pl->availabilityStartTime.Set(0); - pl->availabilityEndTime.Set(0); + pl->availabilityStartTime = 0; + pl->availabilityEndTime = 0; /* timeline */ const stime_t START = 1337; diff -Nru vlc-3.0.21/modules/demux/adaptive/test/plumbing/CommandsQueue.cpp vlc-3.0.22/modules/demux/adaptive/test/plumbing/CommandsQueue.cpp --- vlc-3.0.21/modules/demux/adaptive/test/plumbing/CommandsQueue.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/test/plumbing/CommandsQueue.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -37,8 +37,6 @@ using OutputVal = std::pair; -#define vlc_tick_from_sec(a) (CLOCK_FREQ * (a)) - class TestEsOut : public AbstractFakeEsOut { public: diff -Nru vlc-3.0.21/modules/demux/adaptive/test/tools/Conversions.cpp vlc-3.0.22/modules/demux/adaptive/test/tools/Conversions.cpp --- vlc-3.0.21/modules/demux/adaptive/test/tools/Conversions.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/test/tools/Conversions.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -26,8 +26,6 @@ #include "../test.hpp" #include -#define vlc_tick_from_sec(a) (CLOCK_FREQ * (a)) -#define VLC_TICK_FROM_MS(a) (1000 * (a)) int Conversions_test() { diff -Nru vlc-3.0.21/modules/demux/adaptive/tools/Compatibility.hpp vlc-3.0.22/modules/demux/adaptive/tools/Compatibility.hpp --- vlc-3.0.21/modules/demux/adaptive/tools/Compatibility.hpp 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/tools/Compatibility.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,214 @@ +/* + * Compatibility.hpp + ***************************************************************************** + * Copyright (C) 2025 - VideoLabs, VideoLAN and VLC Authors + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ +#ifndef COMPATIBILITY_HPP +#define COMPATIBILITY_HPP + +/* Provide std::optional compatibility for builds with c++17 or + incomplete/bogus c++17 with MacOS <= 10.13 and iOS < 12 */ + +#ifdef __APPLE__ +# include +# if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 120000) || \ + (TARGET_OS_MAC && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) +# define IOS_INCOMPLETE_CPP17 +# endif +#endif + +#if __cplusplus >= 201703L && !defined(IOS_INCOMPLETE_CPP17) +# include +#else +# include +# include +# include +#endif + +namespace adaptive +{ + +#if __cplusplus >= 201703L && !defined(IOS_INCOMPLETE_CPP17) + +template +using optional = std::optional; +using nullopt_t = std::nullopt_t; +constexpr auto nullopt = std::nullopt; +using in_place_t = std::in_place_t; +constexpr auto in_place = std::in_place; +using bad_optional_access = std::bad_optional_access; +#else + +struct nullopt_t { + explicit nullopt_t() = default; +}; +constexpr nullopt_t nullopt{}; + +struct in_place_t { + explicit in_place_t() = default; +}; +constexpr in_place_t in_place{}; + +class bad_optional_access : public std::exception { +public: + const char* what() const noexcept override { + return "Bad optional access"; + } +}; + +template +class optional +{ +private: + alignas(T) unsigned char storage[sizeof(T)]; + bool has_value_ = false; + + T* ptr() noexcept + { + return reinterpret_cast(storage); + } + const T* ptr() const noexcept + { + return reinterpret_cast(storage); + } + + void destroy() noexcept(std::is_nothrow_destructible::value) + { + if (has_value_) + { + ptr()->~T(); + has_value_ = false; + } + } + +public: + optional() noexcept = default; + + optional(nullopt_t) noexcept : optional() {} + + optional(const T& value) : has_value_(true) + { + new (storage) T(value); + } + optional(T&& value) : has_value_(true) + { + new (storage) T(std::move(value)); + } + optional(optional&& other) noexcept(std::is_nothrow_move_constructible::value) + : has_value_(other.has_value_) { + if (has_value_) { new (storage) T(std::move(*other.ptr())); other.destroy(); } + } + + ~optional() {destroy();} + + optional& operator=(const optional& other) + { + if (this != &other) + { + destroy(); + has_value_ = other.has_value_; + if (has_value_) + new (storage) T(*other.ptr()); + } + return *this; + } + + optional& operator=(optional&& other) noexcept( + std::is_nothrow_move_constructible::value && + std::is_nothrow_move_assignable::value) + { + if (this != &other) + { + destroy(); + has_value_ = other.has_value_; + if (has_value_) + { + new (storage) T(std::move(*other.ptr())); + other.destroy(); + } + } + return *this; + } + + optional& operator=(nullopt_t) noexcept + { + destroy(); + return *this; + } + + optional& operator=(const T& value) + { + destroy(); + has_value_ = true; + new (storage) T(value); + return *this; + } + optional& operator=(T&& value) + { + destroy(); + has_value_ = true; + new (storage) T(std::move(value)); + return *this; + } + + template + void emplace(Args&&... args) + { + destroy(); + has_value_ = true; + new (storage) T(std::forward(args)...); + } + + explicit operator bool() const noexcept { return has_value_; } + bool has_value() const noexcept { return has_value_; } + + T& value() + { + if (!has_value_) throw bad_optional_access{}; + return *ptr(); + } + const T& value() const + { + if (!has_value_) throw bad_optional_access{}; + return *ptr(); + } + + T* operator->() { return ptr(); } + const T* operator->() const { return ptr(); } + T& operator*() { return *ptr(); } + const T& operator*() const { return *ptr(); } + + template + T value_or(U&& default_value) const& { + return has_value_ ? *ptr() : static_cast(std::forward(default_value)); + } + template + T value_or(U&& default_value) && { + return has_value_ ? std::move(*ptr()) : static_cast(std::forward(default_value)); + } + + void reset() noexcept + { + destroy(); + } +}; + +#endif // #if __cplusplus < 201703L + +} + +#endif // COMPATIBILITY_HPP diff -Nru vlc-3.0.21/modules/demux/adaptive/tools/Properties.hpp vlc-3.0.22/modules/demux/adaptive/tools/Properties.hpp --- vlc-3.0.21/modules/demux/adaptive/tools/Properties.hpp 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/tools/Properties.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -20,43 +20,6 @@ #ifndef PROPERTIES_HPP #define PROPERTIES_HPP -template class Property -{ - public: - Property() {} - - T & Set(const T &i) - { - return value = i; - } - - T const & Get() const - { - return value; - } - - private: - T value; -}; - -template class Undef -{ - public: - Undef() { undef = true; } - - bool isSet() const - { - return !undef; - } - - void operator =(const T &v) { val = v; undef = false; } - const T& value() const { return val; } - - private: - bool undef; - T val; -}; - template class Ratio { public: diff -Nru vlc-3.0.21/modules/demux/adaptive/xml/Node.cpp vlc-3.0.22/modules/demux/adaptive/xml/Node.cpp --- vlc-3.0.21/modules/demux/adaptive/xml/Node.cpp 2017-11-24 15:29:17.000000000 +0000 +++ vlc-3.0.22/modules/demux/adaptive/xml/Node.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -28,8 +28,7 @@ #include "Node.h" #include -#include -#include +#include using namespace adaptive::xml; diff -Nru vlc-3.0.21/modules/demux/asf/asf.c vlc-3.0.22/modules/demux/asf/asf.c --- vlc-3.0.21/modules/demux/asf/asf.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/asf/asf.c 2025-11-13 22:17:54.000000000 +0000 @@ -214,8 +214,8 @@ } while( !p_sys->b_eos && ( p_sys->i_sendtime - p_sys->i_time - CHUNK < 0 || - ( p_sys->i_sendtime - p_sys->i_time - CHUNK ) / - UINT64_C( 1000 ) < p_sys->p_fp->i_preroll ) ) + ( p_sys->i_sendtime - p_sys->i_time - CHUNK ) < + p_sys->p_fp->i_preroll ) ) { /* Read and demux a packet */ if( DemuxASFPacket( &p_sys->packet_sys, @@ -236,7 +236,15 @@ msg_Warn( p_demux, "found a new ASF header" ); } else + { p_sys->b_eof = true; + for ( int i=0; itrack[i]; + if ( tk && tk->info.p_frame ) + Packet_Enqueue( &p_sys->packet_sys, i, &tk->info.p_frame ); + } + } } if ( p_sys->i_time == VLC_TICK_INVALID ) @@ -244,8 +252,8 @@ } if( p_sys->b_eos || ( p_sys->i_sendtime - p_sys->i_time - CHUNK >= 0 && - ( p_sys->i_sendtime - p_sys->i_time - CHUNK ) / - UINT64_C( 1000 ) >= p_sys->p_fp->i_preroll ) ) + ( p_sys->i_sendtime - p_sys->i_time - CHUNK ) >= + p_sys->p_fp->i_preroll ) ) { bool b_data = Block_Dequeue( p_demux, p_sys->i_time + CHUNK ); @@ -371,7 +379,7 @@ if( i_date < 0 ) i_date = p_sys->i_length * f_pos; - p_sys->i_preroll_start = i_date - (int64_t) p_sys->p_fp->i_preroll; + p_sys->i_preroll_start = i_date - p_sys->p_fp->i_preroll; if ( p_sys->i_preroll_start < 0 ) p_sys->i_preroll_start = 0; p_index = ASF_FindObject( p_sys->p_root, &asf_object_simple_index_guid, 0 ); @@ -723,11 +731,7 @@ ASF_FindObject( p_hdr, &asf_object_advanced_mutual_exclusion, 0 ); if (! p_mutex ) return; -#if ( UINT_MAX > SIZE_MAX / 2 ) - if ( p_sys->i_track > (size_t)SIZE_MAX / sizeof(uint16_t) ) - return; -#endif - p_prios->pi_stream_numbers = vlc_alloc( p_sys->i_track, sizeof(uint16_t) ); + p_prios->pi_stream_numbers = vlc_alloc( p_sys->i_track, sizeof(*p_prios->pi_stream_numbers) ); if ( !p_prios->pi_stream_numbers ) return; if ( p_mutex->i_stream_number_count ) @@ -750,11 +754,7 @@ ASF_FindObject( p_hdr, &asf_object_bitrate_mutual_exclusion_guid, 0 ); if (! p_bitrate_mutex ) return; -#if ( UINT_MAX > SIZE_MAX / 2 ) - if ( p_sys->i_track > (size_t)SIZE_MAX / sizeof(uint16_t) ) - return; -#endif - p_prios->pi_stream_numbers = vlc_alloc( p_sys->i_track, sizeof( uint16_t ) ); + p_prios->pi_stream_numbers = vlc_alloc( p_sys->i_track, sizeof(*p_prios->pi_stream_numbers) ); if ( !p_prios->pi_stream_numbers ) return; if ( p_bitrate_mutex->i_stream_number_count ) @@ -784,6 +784,8 @@ static int DemuxInit( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; + asf_es_priorities_t fmt_priorities_ex = { NULL, 0 }; + asf_es_priorities_t fmt_priorities_bitrate_ex = { NULL, 0 }; /* init context */ p_sys->i_time = VLC_TICK_INVALID; @@ -855,8 +857,6 @@ &asf_object_header_extension_guid, 0 ); asf_object_language_list_t *p_languages = NULL; - asf_es_priorities_t fmt_priorities_ex = { NULL, 0 }; - asf_es_priorities_t fmt_priorities_bitrate_ex = { NULL, 0 }; if( p_hdr_ext ) { @@ -1214,9 +1214,6 @@ es_format_Clean( &fmt ); } - free( fmt_priorities_ex.pi_stream_numbers ); - free( fmt_priorities_bitrate_ex.pi_stream_numbers ); - p_sys->i_data_begin = p_sys->p_root->p_data->i_object_pos + 50; if( p_sys->p_root->p_data->i_object_size > 50 ) /* see libasf ASF_OBJECT_DATA <= 50 handling */ { /* local file */ @@ -1251,7 +1248,7 @@ /* calculate the time duration in micro-s */ p_sys->i_length = (vlc_tick_t)p_sys->p_fp->i_play_duration / 10 * (vlc_tick_t)i_count / - (vlc_tick_t)p_sys->p_fp->i_data_packets_count - p_sys->p_fp->i_preroll * 1000; + (vlc_tick_t)p_sys->p_fp->i_data_packets_count - p_sys->p_fp->i_preroll; if( p_sys->i_length < 0 ) p_sys->i_length = 0; @@ -1349,6 +1346,8 @@ } } #endif + free( fmt_priorities_ex.pi_stream_numbers ); + free( fmt_priorities_bitrate_ex.pi_stream_numbers ); p_sys->packet_sys.pi_preroll = &p_sys->p_fp->i_preroll; p_sys->packet_sys.pi_preroll_start = &p_sys->i_preroll_start; @@ -1356,6 +1355,8 @@ return VLC_SUCCESS; error: + free( fmt_priorities_ex.pi_stream_numbers ); + free( fmt_priorities_bitrate_ex.pi_stream_numbers ); DemuxEnd( p_demux ); return VLC_EGENERIC; } @@ -1431,4 +1432,3 @@ p_sys->track[i] = 0; } } - diff -Nru vlc-3.0.21/modules/demux/asf/asfpacket.c vlc-3.0.22/modules/demux/asf/asfpacket.c --- vlc-3.0.21/modules/demux/asf/asfpacket.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/asf/asfpacket.c 2025-11-13 22:17:54.000000000 +0000 @@ -35,7 +35,7 @@ uint32_t property; uint32_t length; uint32_t padding_length; - uint32_t send_time; + vlc_tick_t send_time; bool multiple; int length_type; @@ -106,8 +106,7 @@ static void ParsePayloadExtensions( asf_packet_sys_t *p_packetsys, const asf_track_info_t *p_tkinfo, const uint8_t *p_data, size_t i_data, - bool *b_keyframe, - int64_t *pi_extension_pts ) + bool *b_keyframe ) { demux_t *p_demux = p_packetsys->p_demux; @@ -166,9 +165,7 @@ else if ( guidcmp( &p_ext->i_extension_id, &asf_dvr_sampleextension_timing_rep_data_guid ) ) { if ( i_payload_extensions_size != 48 ) goto sizeerror; - const int64_t i_pts = GetQWLE(&p_data[8]); - if(i_pts != -1) - *pi_extension_pts = i_pts / 10000; + /* const int64_t i_pts = GetQWLE(&p_data[8]); */ } #if 0 else @@ -210,16 +207,15 @@ if (GetValue2b(&i_replicated_data_length, pkt->p_peek, &pkt->i_skip, pkt->left - pkt->i_skip, pkt->property) < 0) return -1; - int64_t i_pkt_time; - uint8_t i_pkt_time_delta = 0; - int64_t i_extension_pts = -1; + vlc_tick_t i_pkt_time; + vlc_tick_t i_pkt_time_delta = 0; uint32_t i_payload_data_length = 0; uint32_t i_temp_payload_length = 0; *p_packetsys->pi_preroll = __MIN( *p_packetsys->pi_preroll, INT64_MAX ); /* First packet, in case we do not have index to guess preroll start time */ if ( *p_packetsys->pi_preroll_start == ASFPACKET_PREROLL_FROM_CURRENT ) - *p_packetsys->pi_preroll_start = pkt->send_time * 1000; + *p_packetsys->pi_preroll_start = pkt->send_time; asf_track_info_t *p_tkinfo = p_packetsys->pf_gettrackinfo( p_packetsys, i_stream_number ); if ( !p_tkinfo ) @@ -234,32 +230,29 @@ if( i_replicated_data_length > 7 ) // should be at least 8 bytes { /* Followed by 2 optional DWORDS, offset in media and *media* presentation time */ - i_pkt_time = (vlc_tick_t)GetDWLE( pkt->p_peek + pkt->i_skip + 4 ); + i_pkt_time = VLC_TICK_FROM_MS(GetDWLE( pkt->p_peek + pkt->i_skip + 4 )); /* Parsing extensions, See 7.3.1 */ ParsePayloadExtensions( p_packetsys, p_tkinfo, &pkt->p_peek[pkt->i_skip + 8], i_replicated_data_length - 8, - &b_packet_keyframe, - &i_extension_pts ); + &b_packet_keyframe ); i_pkt_time -= *p_packetsys->pi_preroll; - if(i_extension_pts != -1) - i_extension_pts -= *p_packetsys->pi_preroll; pkt->i_skip += i_replicated_data_length; } else if ( i_replicated_data_length == 0 ) { /* optional DWORDS missing */ - i_pkt_time = (vlc_tick_t)pkt->send_time; + i_pkt_time = pkt->send_time; } /* Compressed payload */ else if( i_replicated_data_length == 1 ) { /* i_media_object_offset is *media* presentation time */ /* Next byte is *media* Presentation Time Delta */ - i_pkt_time_delta = pkt->p_peek[pkt->i_skip]; + i_pkt_time_delta = VLC_TICK_FROM_MS(pkt->p_peek[pkt->i_skip]); b_ignore_pts = false; - i_pkt_time = (vlc_tick_t)i_media_object_offset; + i_pkt_time = VLC_TICK_FROM_MS(i_media_object_offset); i_pkt_time -= *p_packetsys->pi_preroll; pkt->i_skip++; i_media_object_offset = 0; @@ -278,10 +271,9 @@ if( ! pkt->left || pkt->i_skip >= pkt->left ) return -1; - bool b_preroll_done = ( pkt->send_time > (*p_packetsys->pi_preroll_start/1000 + *p_packetsys->pi_preroll) ); + bool b_preroll_done = ( pkt->send_time > (*p_packetsys->pi_preroll_start + *p_packetsys->pi_preroll) ); if (i_pkt_time < 0) i_pkt_time = 0; // FIXME? - i_pkt_time *= 1000; if( pkt->multiple ) { if (GetValue2b(&i_temp_payload_length, pkt->p_peek, &pkt->i_skip, pkt->left - pkt->i_skip, pkt->length_type) < 0) @@ -302,8 +294,8 @@ i_payload + 1, i_stream_number, i_media_object_number, i_media_object_offset, i_replicated_data_length, i_payload_data_length ); msg_Dbg( p_demux, - " extpts=%"PRId64" pkttime=%"PRId64" st=%"PRIu32, - (i_extension_pts >= 0) ? i_extension_pts * 1000 : -1, i_pkt_time, pkt->send_time ); + " pkttime=%"PRId64" st=%"PRId64, + i_pkt_time, MS_FROM_VLC_TICK(pkt->send_time) ); #endif if( ! i_payload_data_length || i_payload_data_length > pkt->left ) @@ -325,7 +317,7 @@ } if( p_packetsys->pf_updatesendtime ) - p_packetsys->pf_updatesendtime( p_packetsys, INT64_C(1000) * pkt->send_time ); + p_packetsys->pf_updatesendtime( p_packetsys, pkt->send_time ); uint32_t i_subpayload_count = 0; while (i_payload_data_length && pkt->i_skip < pkt->left ) @@ -342,19 +334,9 @@ SkipBytes( p_demux->s, pkt->i_skip ); vlc_tick_t i_payload_pts; -#if 0 - if( i_extension_pts != -1 ) - { - i_payload_pts = i_extension_pts * 1000; - b_ignore_pts = false; - } - else -#endif - { - i_payload_pts = i_pkt_time + (vlc_tick_t)i_pkt_time_delta * i_subpayload_count * 1000; - if ( p_tkinfo->p_sp ) - i_payload_pts -= p_tkinfo->p_sp->i_time_offset * 10; - } + i_payload_pts = i_pkt_time + i_pkt_time_delta * i_subpayload_count; + if ( p_tkinfo->p_sp ) + i_payload_pts -= p_tkinfo->p_sp->i_time_offset * 10; vlc_tick_t i_payload_dts = i_pkt_time; @@ -377,8 +359,8 @@ ssize_t i_return = vlc_stream_Peek( p_demux->s, &pkt->p_peek, pkt->left ); if ( i_return <= 0 || (size_t) i_return < pkt->left ) { - msg_Warn( p_demux, "cannot peek, EOF ?" ); - return -1; + msg_Warn( p_demux, "unexpected end of file" ); + return -1; } } @@ -413,7 +395,7 @@ ssize_t i_return = vlc_stream_Peek( p_demux->s, &p_peek,i_data_packet_min ); if( i_return <= 0 || (size_t) i_return < i_data_packet_min ) { - msg_Warn( p_demux, "cannot peek while getting new packet, EOF ?" ); + msg_Warn( p_demux, "unexpected end of file" ); return 0; } unsigned int i_skip = 0; @@ -474,7 +456,7 @@ if( i_skip + 4 > i_data_packet_min ) goto loop_error_recovery; - pkt.send_time = GetDWLE( p_peek + i_skip ); i_skip += 4; + pkt.send_time = VLC_TICK_FROM_MS(GetDWLE( p_peek + i_skip )); i_skip += 4; /* uint16_t i_packet_duration = GetWLE( p_peek + i_skip ); */ i_skip += 2; if( i_data_end && @@ -489,7 +471,7 @@ i_return = vlc_stream_Peek( p_demux->s, &p_peek, pkt.length ); if( i_return <= 0 || pkt.length == 0 || (size_t)i_return < pkt.length ) { - msg_Warn( p_demux, "cannot peek, EOF ?" ); + msg_Warn( p_demux, "unexpected end of file" ); return 0; } diff -Nru vlc-3.0.21/modules/demux/asf/asfpacket.h vlc-3.0.22/modules/demux/asf/asfpacket.h --- vlc-3.0.21/modules/demux/asf/asfpacket.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/asf/asfpacket.h 2025-11-13 22:17:54.000000000 +0000 @@ -43,8 +43,8 @@ demux_t *p_demux; /* global stream info */ - uint64_t *pi_preroll; - int64_t *pi_preroll_start; + vlc_tick_t *pi_preroll; + vlc_tick_t *pi_preroll_start; /* callbacks */ void (*pf_send)(asf_packet_sys_t *, uint8_t, block_t **); diff -Nru vlc-3.0.21/modules/demux/asf/libasf.c vlc-3.0.22/modules/demux/asf/libasf.c --- vlc-3.0.21/modules/demux/asf/libasf.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/asf/libasf.c 2025-11-13 22:17:54.000000000 +0000 @@ -323,7 +323,10 @@ p_fp->i_data_packets_count = GetQWLE( p_peek + 56 ); p_fp->i_play_duration = GetQWLE( p_peek + 64 ); p_fp->i_send_duration = GetQWLE( p_peek + 72 ); - p_fp->i_preroll = GetQWLE( p_peek + 80 ); + uint64_t preroll = GetQWLE( p_peek + 80 ); + if (unlikely(preroll > INT32_MAX)) // sanity check on "appropriate" value + return VLC_EBADVAR; + p_fp->i_preroll = VLC_TICK_FROM_MS(preroll); p_fp->i_flags = GetDWLE( p_peek + 88 ); p_fp->i_min_data_packet_size = __MAX( GetDWLE( p_peek + 92 ), (uint32_t) 1 ); p_fp->i_max_data_packet_size = __MAX( GetDWLE( p_peek + 96 ), (uint32_t) 1 ); @@ -333,13 +336,13 @@ msg_Dbg( s, "read \"file properties object\" file_id:" GUID_FMT " file_size:%"PRId64" creation_date:%"PRId64" data_packets_count:" - "%"PRId64" play_duration:%"PRId64" send_duration:%"PRId64" preroll:%"PRId64 + "%"PRId64" play_duration:%"PRId64" send_duration:%"PRId64" preroll:%"PRIu64 " flags:%d min_data_packet_size:%d " " max_data_packet_size:%d max_bitrate:%d", GUID_PRINT( p_fp->i_file_id ), p_fp->i_file_size, p_fp->i_creation_date, p_fp->i_data_packets_count, p_fp->i_play_duration, p_fp->i_send_duration, - p_fp->i_preroll, p_fp->i_flags, + preroll, p_fp->i_flags, p_fp->i_min_data_packet_size, p_fp->i_max_data_packet_size, p_fp->i_max_bitrate ); #endif @@ -957,9 +960,9 @@ p_data += 64; p_esp->pi_stream_name_language = calloc( p_esp->i_stream_name_count, - sizeof(uint16_t) ); + sizeof(*p_esp->pi_stream_name_language) ); p_esp->ppsz_stream_name = calloc( p_esp->i_stream_name_count, - sizeof(char*) ); + sizeof(*p_esp->ppsz_stream_name) ); if( !p_esp->pi_stream_name_language || !p_esp->ppsz_stream_name ) { @@ -1081,7 +1084,7 @@ ASF_SKIP( 16 ); p_ae->i_stream_number_count = ASF_READ2(); - p_ae->pi_stream_number = calloc( p_ae->i_stream_number_count, sizeof(uint16_t) ); + p_ae->pi_stream_number = calloc( p_ae->i_stream_number_count, sizeof(*p_ae->pi_stream_number) ); if ( !p_ae->pi_stream_number ) { p_ae->i_stream_number_count = 0; @@ -1134,9 +1137,10 @@ p_sp->i_priority_count = ASF_READ2(); - p_sp->pi_priority_flag = calloc( p_sp->i_priority_count, sizeof(uint16_t) ); - p_sp->pi_priority_stream_number = - calloc( p_sp->i_priority_count, sizeof(uint16_t) ); + p_sp->pi_priority_flag = calloc( p_sp->i_priority_count, + sizeof(*p_sp->pi_priority_flag) ); + p_sp->pi_priority_stream_number = calloc( p_sp->i_priority_count, + sizeof(*p_sp->pi_priority_stream_number) ); if( !p_sp->pi_priority_flag || !p_sp->pi_priority_stream_number ) { @@ -1195,7 +1199,7 @@ ASF_SKIP( 16 ); p_ex->i_stream_number_count = ASF_READ2(); - p_ex->pi_stream_numbers = calloc( p_ex->i_stream_number_count, sizeof(uint16_t) ); + p_ex->pi_stream_numbers = calloc( p_ex->i_stream_number_count, sizeof(*p_ex->pi_stream_numbers) ); if ( ! p_ex->pi_stream_numbers ) { p_ex->i_stream_number_count = 0; @@ -1454,7 +1458,7 @@ ASF_ReadObject_metadata, ASF_FreeObject_metadata}, { &asf_object_codec_list_guid, ASF_OBJECT_CODEC_LIST, ASF_ReadObject_codec_list, ASF_FreeObject_codec_list }, - { &asf_object_marker_guid, ASF_OBJECT_MARKER, + { &asf_object_marker_guid, ASF_OBJECT_MARKER, ASF_ReadObject_marker, ASF_FreeObject_marker }, { &asf_object_padding, ASF_OBJECT_PADDING, NULL, NULL }, { &asf_object_compatibility_guid, ASF_OBJECT_OTHER, NULL, NULL }, diff -Nru vlc-3.0.21/modules/demux/asf/libasf.h vlc-3.0.22/modules/demux/asf/libasf.h --- vlc-3.0.21/modules/demux/asf/libasf.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/asf/libasf.h 2025-11-13 22:17:54.000000000 +0000 @@ -106,7 +106,7 @@ uint64_t i_data_packets_count; uint64_t i_play_duration; uint64_t i_send_duration; - uint64_t i_preroll; + vlc_tick_t i_preroll; uint32_t i_flags; uint32_t i_min_data_packet_size; uint32_t i_max_data_packet_size; diff -Nru vlc-3.0.21/modules/demux/avformat/demux.c vlc-3.0.22/modules/demux/avformat/demux.c --- vlc-3.0.21/modules/demux/avformat/demux.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/avformat/demux.c 2025-11-13 22:17:54.000000000 +0000 @@ -52,8 +52,7 @@ # define HAVE_AVUTIL_CODEC_ATTACHMENT 1 -#if LIBAVFORMAT_VERSION_MICRO >= 100 && \ - LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 0, 100) +#if LIBAVFORMAT_VERSION_CHECK(59, 0, 100) # define AVF_MAYBE_CONST const #else # define AVF_MAYBE_CONST @@ -112,18 +111,63 @@ #endif } +static inline void* GetStreamSideData(const AVStream *s, enum AVPacketSideDataType type) +{ +#if LIBAVCODEC_VERSION_CHECK( 60, 29, 100 ) + const AVCodecParameters *cp = s->codecpar; + const AVPacketSideData *psd = + av_packet_side_data_get(cp->coded_side_data, cp->nb_coded_side_data, type); + return psd ? psd->data : NULL; +#else + return av_stream_get_side_data(s, type, NULL); +#endif +} + /***************************************************************************** * Open *****************************************************************************/ -static void get_rotation(es_format_t *fmt, AVStream *s) +static void get_rotation(es_format_t *fmt, const AVStream *s) { char const *kRotateKey = "rotate"; AVDictionaryEntry *rotation = av_dict_get(s->metadata, kRotateKey, NULL, 0); long angle = 0; - if( rotation ) - { + int32_t *matrix = GetStreamSideData(s, AV_PKT_DATA_DISPLAYMATRIX); + if( matrix ) { + bool flipped = (int64_t)matrix[0] * matrix[4] < (int64_t)matrix[1] * matrix[3]; + if (flipped) { + /* Flip the matrix to decouple flip and rotation operations. + * Always assume an horizontal flip for simplicity, + * it can be changed later if rotation is 180º. */ + av_display_matrix_flip(matrix, 1, 0); + } + angle = lround(av_display_rotation_get(matrix)); + + if (angle > 45 && angle < 135) + fmt->video.orientation = ORIENT_ROTATED_270; + + else if (angle > 135 || angle < -135) { + if (flipped) + fmt->video.orientation = ORIENT_VFLIPPED; + else + fmt->video.orientation = ORIENT_ROTATED_180; + } + else if (angle < -45 && angle > -135) + fmt->video.orientation = ORIENT_ROTATED_90; + + else + fmt->video.orientation = ORIENT_NORMAL; + + /* Flip is already applied to the 180º case. */ + if (flipped && !(angle > 135 || angle < -135)) { + video_transform_t transform = (video_transform_t)fmt->video.orientation; + /* Flip first then rotate */ + fmt->video.orientation = ORIENT_HFLIPPED; + video_format_TransformBy(&fmt->video, transform); + } + + } else if( rotation ) { angle = strtol(rotation->value, NULL, 10); if (angle > 45 && angle < 135) @@ -138,21 +182,18 @@ else fmt->video.orientation = ORIENT_NORMAL; } - int32_t *matrix = (int32_t *)av_stream_get_side_data(s, AV_PKT_DATA_DISPLAYMATRIX, NULL); - if( matrix ) { - angle = lround(av_display_rotation_get(matrix)); - - if (angle > 45 && angle < 135) - fmt->video.orientation = ORIENT_ROTATED_270; - - else if (angle > 135 || angle < -135) - fmt->video.orientation = ORIENT_ROTATED_180; - - else if (angle < -45 && angle > -135) - fmt->video.orientation = ORIENT_ROTATED_90; +} - else - fmt->video.orientation = ORIENT_NORMAL; +static void get_palette(es_format_t *fmt, const AVStream *s) +{ + const uint8_t *pal = GetStreamSideData(s, AV_PKT_DATA_PALETTE); + if (pal) { + video_palette_t *p_palette = fmt->video.p_palette; + for (size_t i=0; ipalette); i++) + { + memcpy(p_palette->palette[i], pal, sizeof(p_palette->palette[0])); + pal += sizeof(p_palette->palette[0]); + } } } @@ -401,7 +442,11 @@ es_format_Init( &es_fmt, AUDIO_ES, fcc ); es_fmt.i_original_fourcc = CodecTagToFourcc( cp->codec_tag ); es_fmt.i_bitrate = cp->bit_rate; +#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) + es_fmt.audio.i_channels = cp->ch_layout.nb_channels; +#else es_fmt.audio.i_channels = cp->channels; +#endif es_fmt.audio.i_rate = cp->sample_rate; es_fmt.audio.i_bitspersample = cp->bits_per_coded_sample; es_fmt.audio.i_blockalign = cp->block_align; @@ -447,8 +492,8 @@ es_fmt.video.i_visible_height = es_fmt.video.i_height; get_rotation(&es_fmt, s); + get_palette(&es_fmt, s); -# warning FIXME: implement palette transmission psz_type = "video"; AVRational rate; diff -Nru vlc-3.0.21/modules/demux/avformat/mux.c vlc-3.0.22/modules/demux/avformat/mux.c --- vlc-3.0.21/modules/demux/avformat/mux.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/avformat/mux.c 2025-11-13 22:17:54.000000000 +0000 @@ -61,7 +61,7 @@ bool b_write_header; bool b_write_keyframe; bool b_error; -#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAV_FORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) bool b_header_done; #endif }; @@ -74,11 +74,20 @@ static void DelStream( sout_mux_t *, sout_input_t * ); static int Mux ( sout_mux_t * ); +#if FF_API_AVIO_WRITE_NONCONST static int IOWrite( void *opaque, uint8_t *buf, int buf_size ); +#else +static int IOWrite( void *opaque, const uint8_t *buf, int buf_size ); +#endif static int64_t IOSeek( void *opaque, int64_t offset, int whence ); -#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAV_FORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) +# if FF_API_AVIO_WRITE_NONCONST static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, enum AVIODataMarkerType type, int64_t time); +# else +int IOWriteTyped(void *opaque, const uint8_t *buf, int buf_size, + enum AVIODataMarkerType type, int64_t time); +# endif #endif /***************************************************************************** @@ -86,8 +95,7 @@ *****************************************************************************/ int avformat_OpenMux( vlc_object_t *p_this ) { -#if LIBAVFORMAT_VERSION_MICRO >= 100 && \ - LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 0, 100) +#if LIBAVFORMAT_VERSION_CHECK(59, 0, 100) const AVOutputFormat *file_oformat; #else AVOutputFormat *file_oformat; @@ -95,8 +103,7 @@ sout_mux_t *p_mux = (sout_mux_t*)p_this; bool dummy = !strcmp( p_mux->p_access->psz_access, "dummy"); -#if ( (LIBAVFORMAT_VERSION_MICRO >= 100) \ - && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 7, 100)) ) +#if LIBAVFORMAT_VERSION_MICRO >= 100 && !(LIBAVFORMAT_VERSION_CHECK(58, 7, 100)) if( dummy && strlen(p_mux->p_access->psz_path) >= sizeof (((AVFormatContext *)NULL)->filename) ) return VLC_EGENERIC; @@ -135,8 +142,7 @@ p_sys->oc->oformat = file_oformat; /* If we use dummy access, let avformat write output */ if( dummy ) -#if ( (LIBAVFORMAT_VERSION_MICRO >= 100) \ - && (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 7, 100)) ) +#if LIBAVFORMAT_VERSION_CHECK(58, 7, 100) p_sys->oc->url = av_strdup(p_mux->p_access->psz_path); #else strcpy( p_sys->oc->filename, p_mux->p_access->psz_path ); @@ -159,7 +165,7 @@ p_sys->b_write_header = true; p_sys->b_write_keyframe = false; p_sys->b_error = false; -#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAV_FORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) p_sys->io->write_data_type = IOWriteTyped; p_sys->b_header_done = false; #endif @@ -267,7 +273,11 @@ { case AUDIO_ES: codecpar->codec_type = AVMEDIA_TYPE_AUDIO; +#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) && LIBAVUTIL_VERSION_CHECK(57, 24, 100) + av_channel_layout_default( &codecpar->ch_layout, fmt->audio.i_channels ); +#else codecpar->channels = fmt->audio.i_channels; +#endif codecpar->sample_rate = fmt->audio.i_rate; stream->time_base = (AVRational){1, codecpar->sample_rate}; if (fmt->i_bitrate == 0) { @@ -384,7 +394,7 @@ pkt->dts = p_data->i_dts * p_stream->time_base.den / CLOCK_FREQ / p_stream->time_base.num; -#if LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 2, 103) +#if LIBAVFORMAT_VERSION_MICRO >= 100 && !(LIBAVFORMAT_VERSION_CHECK(59, 2, 103)) /* this is another hack to prevent libavformat from triggering the "non monotone timestamps" check in avformat/utils.c */ p_stream->cur_dts = ( p_data->i_dts * p_stream->time_base.den / CLOCK_FREQ / p_stream->time_base.num ) - 1; @@ -406,9 +416,14 @@ return VLC_SUCCESS; } -#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAV_FORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) +# if FF_API_AVIO_WRITE_NONCONST int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, enum AVIODataMarkerType type, int64_t time) +# else +int IOWriteTyped(void *opaque, const uint8_t *buf, int buf_size, + enum AVIODataMarkerType type, int64_t time) +# endif { VLC_UNUSED(time); @@ -508,7 +523,11 @@ /***************************************************************************** * I/O wrappers for libavformat *****************************************************************************/ +#if FF_API_AVIO_WRITE_NONCONST static int IOWrite( void *opaque, uint8_t *buf, int buf_size ) +#else +static int IOWrite( void *opaque, const uint8_t *buf, int buf_size ) +#endif { sout_mux_t *p_mux = opaque; sout_mux_sys_t *p_sys = p_mux->p_sys; @@ -523,7 +542,7 @@ if( p_sys->b_write_header ) p_buf->i_flags |= BLOCK_FLAG_HEADER; -#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAV_FORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) if( !p_sys->b_header_done ) p_buf->i_flags |= BLOCK_FLAG_HEADER; #endif diff -Nru vlc-3.0.21/modules/demux/avi/avi.c vlc-3.0.22/modules/demux/avi/avi.c --- vlc-3.0.21/modules/demux/avi/avi.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/avi/avi.c 2025-11-13 22:17:54.000000000 +0000 @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -431,6 +432,11 @@ "found %d stream but %d are declared", i_track, p_avih->i_streams ); } + if( i_track > AVIF_MAX_STREAMS ) + { + msg_Err( p_demux, "Invalid number of streams %u", i_track ); + goto error; + } if( i_track == 0 ) { msg_Err( p_demux, "no stream defined!" ); @@ -713,12 +719,13 @@ } else { - tk->fmt.i_codec = p_bih->biCompression; + tk->fmt.i_codec = vlc_fourcc_GetCodec(VIDEO_ES, p_bih->biCompression); if( tk->fmt.i_codec == VLC_CODEC_MP4V && !strncasecmp( (char*)&p_strh->i_handler, "XVID", 4 ) ) { tk->fmt.i_codec = tk->fmt.i_original_fourcc = VLC_FOURCC( 'X', 'V', 'I', 'D' ); + tk->fmt.b_packetized = false; } /* Shitty files storing chroma in biCompression */ @@ -737,7 +744,8 @@ tk->fmt.video.i_width = p_bih->biWidth; tk->fmt.video.i_visible_height = tk->fmt.video.i_height = p_bih->biHeight; - tk->fmt.video.i_bits_per_pixel = p_bih->biBitCount; + if( p_bih->biBitCount <= 32 ) + tk->fmt.video.i_bits_per_pixel = p_bih->biBitCount; tk->fmt.video.i_frame_rate = tk->i_rate; tk->fmt.video.i_frame_rate_base = tk->i_scale; @@ -1112,7 +1120,21 @@ if( *psz_osd != 0 ) { psz_osd[23] = 0; - if( !psz_title || strncmp( psz_osd, psz_title, 24 ) ) + { + char *str = psz_osd; + ssize_t n; + uint32_t cp; + + while ((n = vlc_towc(str, &cp)) != 0) + if (likely(n != -1)) + str += n; + else + { + *str = '\0'; + break; + } + } + if( psz_osd[0] && ( !psz_title || strncmp( psz_osd, psz_title, 24 ) ) ) { vlc_meta_Set( p_sys->meta, vlc_meta_Title, psz_osd ); p_sys->updates |= INPUT_UPDATE_META; @@ -1242,7 +1264,7 @@ else if ( i_dpts > -2 * CLOCK_FREQ ) /* don't send a too early dts (low fps video) */ { int64_t i_chunks_count = AVI_PTSToChunk( tk, i_dpts ); - if( i_dpts > 0 && AVI_GetDPTS( tk, i_chunks_count ) < i_dpts ) + if( i_chunks_count > 0 && AVI_GetDPTS( tk, i_chunks_count ) < i_dpts ) { /* AVI code is crap. toread is either bytes, or here, chunk count. * That does not even work when reading amount < scale / rate */ @@ -1921,38 +1943,59 @@ * Function to convert pts to chunk or byte *****************************************************************************/ -static int64_t AVI_Rescale( int64_t i_value, uint32_t i_timescale, uint32_t i_newscale ) +static bool AVI_Rescale( vlc_tick_t *out, vlc_tick_t i_value, + uint32_t i_timescale, uint32_t i_newscale ) { /* TODO: replace (and mp4) with better global helper (recursive checks) */ if( i_timescale == i_newscale ) - return i_value; + { + *out = i_value; + return false; + } - if( (i_value >= 0 && i_value <= INT64_MAX / i_newscale) || - (i_value < 0 && i_value >= INT64_MIN / i_newscale) ) - return i_value * i_newscale / i_timescale; + int64_t res; + if( !ckd_mul( &res, i_value, i_newscale ) ) + { + *out = res / i_timescale; + return false; + } - /* overflow */ + /* overflow, try: q * i_newscale + r * i_newscale / i_timescale */ int64_t q = i_value / i_timescale; int64_t r = i_value % i_timescale; - return q * i_newscale + r * i_newscale / i_timescale; + + int64_t scaled_q, scaled_r; + if( ckd_mul( &scaled_q, q, i_newscale ) ) + return true; + if( ckd_mul( &scaled_r, r, i_newscale ) ) + return true; + if( ckd_add( &res, scaled_q, scaled_r / i_timescale ) ) + return true; + + *out = res; + return false; } static int64_t AVI_PTSToChunk( avi_track_t *tk, vlc_tick_t i_pts ) { - if( !tk->i_scale ) - return 0; + if( !tk->i_scale || !tk->i_rate ) + return -1; - i_pts = AVI_Rescale( i_pts, tk->i_scale, tk->i_rate ); - return i_pts / CLOCK_FREQ; + vlc_tick_t res; + if( AVI_Rescale( &res, i_pts, tk->i_scale, tk->i_rate ) ) + return -1; + return res / CLOCK_FREQ; } static int64_t AVI_PTSToByte( avi_track_t *tk, vlc_tick_t i_pts ) { - if( !tk->i_scale || !tk->i_samplesize ) - return 0; + if( !tk->i_scale || !tk->i_samplesize || !tk->i_rate ) + return -1; - i_pts = AVI_Rescale( i_pts, tk->i_scale, tk->i_rate ); - return i_pts / CLOCK_FREQ * tk->i_samplesize; + vlc_tick_t res; + if( AVI_Rescale( &res, i_pts, tk->i_scale, tk->i_rate ) ) + return -1; + return res / CLOCK_FREQ * tk->i_samplesize; } static vlc_tick_t AVI_GetDPTS( avi_track_t *tk, int64_t i_count ) @@ -1962,8 +2005,11 @@ if( !tk->i_rate ) return i_dpts; - if( tk->i_scale ) - i_dpts = AVI_Rescale( CLOCK_FREQ * i_count, tk->i_rate, tk->i_scale ); + if( !tk->i_scale ) + return 0; + + if( AVI_Rescale( &i_dpts, CLOCK_FREQ * i_count, tk->i_rate, tk->i_scale ) ) + return 0; if( tk->i_samplesize ) { @@ -2171,7 +2217,10 @@ if( !tk->i_samplesize ) { - if( AVI_StreamChunkSet( p_demux, tk, AVI_PTSToChunk( tk, i_date ) ) ) + int64_t idxpos = AVI_PTSToChunk( tk, i_date ); + if ( unlikely( idxpos < 0 || idxpos > UINT_MAX ) ) + return VLC_EGENERIC; + if( AVI_StreamChunkSet( p_demux, tk, idxpos ) ) { return VLC_EGENERIC; } @@ -2227,7 +2276,10 @@ } else { - if( AVI_StreamBytesSet( p_demux, tk, AVI_PTSToByte( tk, i_date ) ) ) + int64_t toread = AVI_PTSToByte( tk, i_date ); + if ( toread < 0) + return VLC_EGENERIC; + if( AVI_StreamBytesSet( p_demux, tk, toread ) ) { return VLC_EGENERIC; } @@ -2315,7 +2367,7 @@ if( c1 < '0' || c1 > '9' || c2 < '0' || c2 > '9' ) { - *pi_number = 100; /* > max stream number */ + *pi_number = AVIF_MAX_STREAMS; /* > max stream number */ *pi_type = UNKNOWN_ES; } else @@ -2733,7 +2785,6 @@ demux_sys_t *p_sys = p_demux->p_sys; /* Load indexes */ - assert( p_sys->i_track <= 100 ); avi_index_t p_idx_indx[p_sys->i_track]; avi_index_t p_idx_idx1[p_sys->i_track]; for( unsigned i = 0; i < p_sys->i_track; i++ ) diff -Nru vlc-3.0.21/modules/demux/avi/libavi.c vlc-3.0.22/modules/demux/avi/libavi.c --- vlc-3.0.21/modules/demux/avi/libavi.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/avi/libavi.c 2025-11-13 22:17:54.000000000 +0000 @@ -87,8 +87,8 @@ if( p_father && AVI_ChunkEnd( p_chk ) > AVI_ChunkEnd( p_father ) ) { - msg_Warn( s, "chunk %4.4s does not fit into parent %ld", - (char*)&p_chk->common.i_chunk_fourcc, AVI_ChunkEnd( p_father ) ); + msg_Warn( s, "chunk %4.4s does not fit into parent %"PRIu64, + (char*)&p_chk->common.i_chunk_fourcc, AVI_ChunkEnd( p_father ) ); /* How hard is to produce files with the correct declared size ? */ if( p_father->common.i_chunk_fourcc != AVIFOURCC_RIFF || @@ -516,7 +516,7 @@ if ( !p_bih->biClrUsed ) { if( p_bih->biBitCount < 32 ) - p_bih->biClrUsed = (1 << p_bih->biBitCount); + p_bih->biClrUsed = (UINT32_C(1) << p_bih->biBitCount); else p_bih->biBitCount = UINT16_MAX; } diff -Nru vlc-3.0.21/modules/demux/avi/libavi.h vlc-3.0.22/modules/demux/avi/libavi.h --- vlc-3.0.21/modules/demux/avi/libavi.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/avi/libavi.h 2025-11-13 22:17:54.000000000 +0000 @@ -20,6 +20,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#define AVIF_MAX_STREAMS 100 /* chunk storage index is twocc + 2 digits */ + /* and is a de-facto limit of 100 tracks */ + /* biCompression / Others are FourCC */ #define BI_RGB 0x0000 #define BI_RLE8 0x0001 diff -Nru vlc-3.0.21/modules/demux/caf.c vlc-3.0.22/modules/demux/caf.c --- vlc-3.0.21/modules/demux/caf.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/caf.c 2025-11-13 22:17:54.000000000 +0000 @@ -718,7 +718,7 @@ int error = ProcessAACCookie( p_demux, p_peek, i_size ); if( error ) return error; } - else + else if( p_sys->fmt.i_codec != 0 ) { p_sys->fmt.i_extra = (int)i_size; p_sys->fmt.p_extra = malloc( i_size ); diff -Nru vlc-3.0.21/modules/demux/dash/DASHManager.cpp vlc-3.0.22/modules/demux/dash/DASHManager.cpp --- vlc-3.0.21/modules/demux/dash/DASHManager.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/dash/DASHManager.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -69,8 +69,8 @@ vlc_tick_t minbuffer = getMinAheadTime() / 2; - if(playlist->minUpdatePeriod.Get() > minbuffer) - minbuffer = playlist->minUpdatePeriod.Get(); + if(playlist->minUpdatePeriod > minbuffer) + minbuffer = playlist->minUpdatePeriod; if(minbuffer < 5 * CLOCK_FREQ) minbuffer = 5 * CLOCK_FREQ; @@ -141,7 +141,7 @@ if(!mpd) return VLC_EGENERIC; - if(!mpd->programInfo.Get()) + if(!mpd->programInfo) break; vlc_meta_t *p_meta = va_arg (args, vlc_meta_t *); @@ -149,17 +149,17 @@ if (meta == nullptr) return VLC_EGENERIC; - if(!mpd->programInfo.Get()->getTitle().empty()) - vlc_meta_SetTitle(meta, mpd->programInfo.Get()->getTitle().c_str()); + if(!mpd->programInfo->getTitle().empty()) + vlc_meta_SetTitle(meta, mpd->programInfo->getTitle().c_str()); - if(!mpd->programInfo.Get()->getSource().empty()) - vlc_meta_SetPublisher(meta, mpd->programInfo.Get()->getSource().c_str()); + if(!mpd->programInfo->getSource().empty()) + vlc_meta_SetPublisher(meta, mpd->programInfo->getSource().c_str()); - if(!mpd->programInfo.Get()->getCopyright().empty()) - vlc_meta_SetCopyright(meta, mpd->programInfo.Get()->getCopyright().c_str()); + if(!mpd->programInfo->getCopyright().empty()) + vlc_meta_SetCopyright(meta, mpd->programInfo->getCopyright().c_str()); - if(!mpd->programInfo.Get()->getMoreInformationUrl().empty()) - vlc_meta_SetURL(meta, mpd->programInfo.Get()->getMoreInformationUrl().c_str()); + if(!mpd->programInfo->getMoreInformationUrl().empty()) + vlc_meta_SetURL(meta, mpd->programInfo->getMoreInformationUrl().c_str()); vlc_meta_Merge(p_meta, meta); vlc_meta_Delete(meta); diff -Nru vlc-3.0.21/modules/demux/dash/mpd/IsoffMainParser.cpp vlc-3.0.22/modules/demux/dash/mpd/IsoffMainParser.cpp --- vlc-3.0.21/modules/demux/dash/mpd/IsoffMainParser.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/dash/mpd/IsoffMainParser.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -114,7 +114,7 @@ it = attr.find("mediaPresentationDuration"); if(it != attr.end()) - mpd->duration.Set(IsoTime(it->second)); + mpd->duration = IsoTime(it->second); it = attr.find("minBufferTime"); if(it != attr.end()) @@ -125,12 +125,12 @@ { vlc_tick_t minupdate = IsoTime(it->second); if(minupdate > 0) - mpd->minUpdatePeriod.Set(minupdate); + mpd->minUpdatePeriod = minupdate; } it = attr.find("maxSegmentDuration"); if(it != attr.end()) - mpd->maxSegmentDuration.Set(IsoTime(it->second)); + mpd->maxSegmentDuration = IsoTime(it->second); it = attr.find("type"); if(it != attr.end()) @@ -138,19 +138,19 @@ it = attr.find("availabilityStartTime"); if(it != attr.end()) - mpd->availabilityStartTime.Set(UTCTime(it->second).mtime()); + mpd->availabilityStartTime = UTCTime(it->second).mtime(); it = attr.find("availabilityEndTime"); if(it != attr.end()) - mpd->availabilityEndTime.Set(UTCTime(it->second).mtime()); + mpd->availabilityEndTime = UTCTime(it->second).mtime(); it = attr.find("timeShiftBufferDepth"); if(it != attr.end()) - mpd->timeShiftBufferDepth.Set(IsoTime(it->second)); + mpd->timeShiftBufferDepth = IsoTime(it->second); it = attr.find("suggestedPresentationDelay"); if(it != attr.end()) - mpd->suggestedPresentationDelay.Set(IsoTime(it->second)); + mpd->suggestedPresentationDelay = IsoTime(it->second); } void IsoffMainParser::parsePeriods(MPD *mpd, Node *root) @@ -166,13 +166,13 @@ continue; parseSegmentInformation(mpd, *it, period, &nextid); if((*it)->hasAttribute("start")) - period->startTime.Set(IsoTime((*it)->getAttributeValue("start"))); + period->startTime = IsoTime((*it)->getAttributeValue("start")); if((*it)->hasAttribute("duration")) - period->duration.Set(IsoTime((*it)->getAttributeValue("duration"))); + period->duration = IsoTime((*it)->getAttributeValue("duration")); std::vector baseUrls = DOMHelper::getChildElementByTagName(*it, "BaseURL"); if(!baseUrls.empty()) { - period->baseUrl.Set( new Url( baseUrls.front()->getText() ) ); + period->baseUrl = new Url( baseUrls.front()->getText() ); parseAvailability(mpd, baseUrls.front(), period); } @@ -196,7 +196,7 @@ if(index) { index->setByteRange(start, end); - base->indexSegment.Set(index); + base->indexSegment = index; /* index must be before data, so data starts at index end */ if(dynamic_cast(base)) dynamic_cast(base)->setByteRange(end + 1, 0); @@ -252,8 +252,8 @@ if(!initurl.empty() && (initTemplate = new (std::nothrow) SegmentTemplateInit(mediaTemplate, info))) { initTemplate->setSourceUrl(initurl); - delete mediaTemplate->initialisationSegment.Get(); - mediaTemplate->initialisationSegment.Set(initTemplate); + delete mediaTemplate->initialisationSegment; + mediaTemplate->initialisationSegment = initTemplate; } } @@ -309,7 +309,7 @@ if(baseUrl) { parseAvailability(mpd, baseUrl, adaptationSet); - adaptationSet->baseUrl.Set(new Url(baseUrl->getText())); + adaptationSet->baseUrl = new Url(baseUrl->getText()); } Node *role = DOMHelper::getFirstChildElementByName((*it), "Role"); @@ -319,7 +319,7 @@ if(uri == "urn:mpeg:dash:role:2011") { const std::string &rolevalue = role->getAttributeValue("value"); - adaptationSet->description.Set(rolevalue); + adaptationSet->description = rolevalue; if(rolevalue == "main") adaptationSet->setRole(Role::Value::Main); else if(rolevalue == "alternate") @@ -337,14 +337,19 @@ } } #ifdef ADAPTATIVE_ADVANCED_DEBUG - if(adaptationSet->description.Get().empty()) - adaptationSet->description.Set(adaptationSet->getMimeType()); + if(adaptationSet->description.empty()) + adaptationSet->description = adaptationSet->getMimeType(); #endif parseSegmentInformation(mpd, *it, adaptationSet, &nextid); parseRepresentations(mpd, (*it), adaptationSet); +#ifdef ADAPTATIVE_ADVANCED_DEBUG + if(adaptationSet->description.empty()) + adaptationSet->description = adaptationSet->getID().str(); +#endif + if(!adaptationSet->getRepresentations().empty()) period->addAdaptationSet(adaptationSet); else @@ -364,7 +369,7 @@ std::vector baseUrls = DOMHelper::getChildElementByTagName(repNode, "BaseURL"); if(!baseUrls.empty()) { - currentRepresentation->baseUrl.Set(new Url(baseUrls.front()->getText())); + currentRepresentation->baseUrl = new Url(baseUrls.front()->getText()); parseAvailability(mpd, baseUrls.front(), currentRepresentation); } @@ -389,7 +394,7 @@ size_t i_total = parseSegmentInformation(mpd, repNode, currentRepresentation, &nextid); /* Empty Representation with just baseurl (ex: subtitles) */ if(i_total == 0 && - (currentRepresentation->baseUrl.Get() && !currentRepresentation->baseUrl.Get()->empty()) && + (currentRepresentation->baseUrl && !currentRepresentation->baseUrl->empty()) && adaptationSet->getMediaSegment(0) == nullptr) { SegmentBase *base = new (std::nothrow) SegmentBase(currentRepresentation); @@ -411,12 +416,12 @@ parseAvailability(mpd, segmentBaseNode, info); - if(!base->initialisationSegment.Get() && base->indexSegment.Get() && base->indexSegment.Get()->getOffset()) + if(!base->initialisationSegment && base->indexSegment && base->indexSegment->getOffset()) { InitSegment *initSeg = new InitSegment( info ); initSeg->setSourceUrl(base->getUrlSegment().toString()); - initSeg->setByteRange(0, base->indexSegment.Get()->getOffset() - 1); - base->initialisationSegment.Set(initSeg); + initSeg->setByteRange(0, base->indexSegment->getOffset() - 1); + base->initialisationSegment = initSeg; } info->addAttribute(base); @@ -463,8 +468,8 @@ seg->setByteRange(atoi(range.substr(0, pos).c_str()), atoi(range.substr(pos + 1, range.size()).c_str())); } - seg->startTime.Set(nzStartTime); - seg->duration.Set(duration); + seg->startTime = nzStartTime; + seg->duration = duration; nzStartTime += duration; seg->setSequenceNumber(sequenceNumber++); @@ -494,7 +499,7 @@ seg->setByteRange(atoi(range.substr(0, pos).c_str()), atoi(range.substr(pos + 1, range.size()).c_str())); } - init->initialisationSegment.Set(seg); + init->initialisationSegment = seg; } void IsoffMainParser::parseTimeline(Node *node, AbstractMultipleSegmentBaseType *base) @@ -566,7 +571,7 @@ if(node->hasAttribute("moreInformationURL")) info->setMoreInformationUrl(node->getAttributeValue("moreInformationURL")); - mpd->programInfo.Set(info); + mpd->programInfo = info; } } diff -Nru vlc-3.0.21/modules/demux/dash/mpd/MPD.cpp vlc-3.0.22/modules/demux/dash/mpd/MPD.cpp --- vlc-3.0.21/modules/demux/dash/mpd/MPD.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/dash/mpd/MPD.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -41,13 +41,13 @@ BasePlaylist(p_object), profile( profile_ ) { - programInfo.Set( nullptr ); + programInfo = nullptr; lowLatency = false; } MPD::~MPD() { - delete(programInfo.Get()); + delete programInfo; } bool MPD::isLive() const @@ -81,7 +81,7 @@ msg_Dbg(p_object, "MPD profile=%s mediaPresentationDuration=%" PRId64 " minBufferTime=%" PRId64, static_cast(getProfile()).c_str(), - duration.Get() / CLOCK_FREQ, + duration / CLOCK_FREQ, minBufferTime / CLOCK_FREQ); msg_Dbg(p_object, "BaseUrl=%s", getUrlSegment().toString().c_str()); diff -Nru vlc-3.0.21/modules/demux/dash/mpd/MPD.h vlc-3.0.22/modules/demux/dash/mpd/MPD.h --- vlc-3.0.21/modules/demux/dash/mpd/MPD.h 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/dash/mpd/MPD.h 2025-11-13 22:17:54.000000000 +0000 @@ -52,7 +52,7 @@ void setLowLatency(bool); virtual void debug() const override; - Property programInfo; + ProgramInformation * programInfo; private: Profile profile; diff -Nru vlc-3.0.21/modules/demux/dmxmus.c vlc-3.0.22/modules/demux/dmxmus.c --- vlc-3.0.21/modules/demux/dmxmus.c 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/modules/demux/dmxmus.c 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,408 @@ +/***************************************************************************** + * dmxmus.c : DMX audio music (.mus) demux module for vlc + ***************************************************************************** + * Copyright © 2019 Rémi Denis-Courmont + * + * Perusing documentation by Vladimir Arnost and Adam Nielsen. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include +#include +#include + +struct demux_sys_t +{ + es_out_id_t *es; + date_t pts; /*< Play timestamp */ + vlc_tick_t tick; /*< Last tick timestamp */ + unsigned end_offset:17; /*< End byte offset of music events */ + unsigned primaries:4; /*< Number of primary channels (0-9) */ + unsigned secondaries:3; /*< Number of secondary channels (10-14) */ + unsigned char volume[16]; /*< Volume of last note on each channel */ +}; + +enum { + MUS_EV_RELEASE, + MUS_EV_PLAY, + MUS_EV_PITCH, + MUS_EV_CONTROL, + MUS_EV_CONTROL_VALUE, + MUS_EV_MEASURE_END, + MUS_EV_TRACK_END, + MUS_EV_DUMMY, +}; + +#define MUS_EV(byte) (((byte) >> 4) & 0x7) + +enum { + MUS_CTRL_PROGRAM_CHANGE, + MUS_CTRL_BANK_SELECT, + MUS_CTRL_MODULATION, + MUS_CTRL_VOLUME, + MUS_CTRL_PAN, + MUS_CTRL_EXPRESSION, + MUS_CTRL_REVERB, + MUS_CTRL_CHORUS, + MUS_CTRL_PEDAL_HOLD, + MUS_CTRL_PEDAL_SOFT, + MUS_CTRL_SOUND_OFF, + MUS_CTRL_NOTES_OFF, + MUS_CTRL_MONO, + MUS_CTRL_POLY, + MUS_CTRL_RESET, + MUS_CTRL_EVENT, +}; + +#define MUS_FREQ 140 + +static int GetByte(demux_t *demux) +{ + unsigned char c; + + return (vlc_stream_Read(demux->s, &c, 1) < 1) ? -1 : c; +} + +/** + * Reads one event from the bit stream. + */ +static int ReadEvent(demux_t *demux, unsigned char *buf, + unsigned *restrict delay) +{ + int byte = GetByte(demux); + if (byte < 0) + return -1; + + uint_fast8_t type = MUS_EV(byte); + + buf[0] = byte; + + if (likely(type != MUS_EV_MEASURE_END && type != MUS_EV_TRACK_END)) { + int c = GetByte(demux); + if (c < 0) + return -1; + + buf[1] = c; + + switch (type) { + case MUS_EV_PLAY: + if (c & 0x80) { + case MUS_EV_CONTROL_VALUE: + c = GetByte(demux); + if (c < 0) + return -1; + + buf[2] = c; + } + break; + } + } + + /* Compute delay until next event */ + *delay = 0; + + while (byte & 0x80) { + byte = GetByte(demux); + + if (byte < 0) + return -1; + + *delay <<= 7; + *delay |= byte & 0x7f; + } + + return 0; +} + +static block_t *Event2(uint8_t type, uint8_t channel, uint8_t data) +{ + block_t *ev = block_Alloc(2); + if (likely(ev != NULL)) { + ev->p_buffer[0] = type | channel; + ev->p_buffer[1] = data; + } + return ev; +} + +static block_t *Event3(uint8_t type, uint8_t channel, + uint8_t data, uint8_t data2) +{ + block_t *ev = block_Alloc(3); + if (likely(ev != NULL)) { + ev->p_buffer[0] = type | channel; + ev->p_buffer[1] = data; + ev->p_buffer[2] = data2; + } + return ev; +} + +static block_t *HandleControl(demux_t *demux, uint8_t channel, uint8_t num) +{ + block_t *ev = NULL; + + switch (num & 0x7f) { + case MUS_CTRL_SOUND_OFF: + return Event3(0xB0, channel, 120, 0); + + case MUS_CTRL_NOTES_OFF: + return Event3(0xB0, channel, 123, 0); + + case MUS_CTRL_MONO: + case MUS_CTRL_POLY: + break; /* only meaningful for OPL3, not soft synth */ + + case MUS_CTRL_RESET: + return Event3(0xB0, channel, 121, 0); + + case MUS_CTRL_EVENT: + break; + + default: + msg_Warn(demux, "unknown control %u", num & 0x7f); + } + + return ev; +} + +static block_t *HandleControlValue(demux_t *demux, uint8_t channel, + uint8_t num, uint8_t val) +{ + val &= 0x7f; + + switch (num & 0x7f) { + case MUS_CTRL_PROGRAM_CHANGE: + return Event2(0xC0, channel, val); + + case MUS_CTRL_BANK_SELECT: + return NULL; + + case MUS_CTRL_MODULATION: + return Event3(0xB0, channel, 1, val); + + case MUS_CTRL_VOLUME: + return Event3(0xB0, channel, 7, val); + + case MUS_CTRL_PAN: + return Event3(0xB0, channel, 10, val); + + case MUS_CTRL_EXPRESSION: + return Event3(0xB0, channel, 11, val); + + case MUS_CTRL_REVERB: + return Event3(0xB0, channel, 91, val); + + case MUS_CTRL_CHORUS: + return Event3(0xB0, channel, 93, val); + + case MUS_CTRL_PEDAL_HOLD: + return Event3(0xB0, channel, 64, val); + + case MUS_CTRL_PEDAL_SOFT: + return Event3(0xB0, channel, 67, val); + + default: + return HandleControl(demux, channel, num); + } +} + +static int Demux(demux_t *demux) +{ + stream_t *stream = demux->s; + demux_sys_t *sys = demux->p_sys; + + if (vlc_stream_Tell(stream) >= sys->end_offset) + return VLC_DEMUXER_EOF; + /* We might overflow the end offset by 2 bytes. Not really a problem. */ + + /* Inject the MIDI Tick every 10 ms */ + if (sys->tick < date_Get(&sys->pts)) { + block_t *tick = block_Alloc(1); + if (unlikely(tick == NULL)) + return VLC_ENOMEM; + + tick->p_buffer[0] = 0xF9; + tick->i_dts = tick->i_pts = sys->tick; + + es_out_Send(demux->out, sys->es, tick); + es_out_SetPCR(demux->out, sys->tick); + + sys->tick += VLC_TICK_FROM_MS(10); + return VLC_DEMUXER_SUCCESS; + } + + /* Read one MIDI event */ + block_t *ev = NULL; + unsigned char buf[3]; + unsigned delay; + + if (ReadEvent(demux, buf, &delay)) + return VLC_DEMUXER_EGENERIC; + + uint_fast8_t channel = buf[0] & 0xf; + + if (channel >= ((channel < 10) ? sys->primaries : (10 + sys->secondaries))) + channel = 9; + + switch (MUS_EV(buf[0])) { + case MUS_EV_RELEASE: + ev = Event2(0x80, channel, buf[1] & 0x7f); + break; + + case MUS_EV_PLAY: + if (buf[1] & 0x80) + sys->volume[channel] = buf[2] & 0x7f; + + ev = Event3(0x90, channel, buf[1] & 0x7f, sys->volume[channel]); + break; + + case MUS_EV_PITCH: + ev = Event3(0xE0, channel, (buf[1] << 6) & 0x7f, + (buf[1] >> 1) & 0x7f); + break; + + case MUS_EV_CONTROL: + ev = HandleControl(demux, channel, buf[1]); + break; + + case MUS_EV_CONTROL_VALUE: + ev = HandleControlValue(demux, channel, buf[1], buf[2]); + break; + + case MUS_EV_MEASURE_END: + break; + + case MUS_EV_TRACK_END: + return VLC_DEMUXER_EOF; + + case MUS_EV_DUMMY: + break; + + default: + vlc_assert_unreachable(); + } + + if (ev != NULL) { + ev->i_pts = ev->i_dts = date_Get(&sys->pts); + es_out_Send(demux->out, sys->es, ev); + } + + date_Increment(&sys->pts, delay); + return VLC_DEMUXER_SUCCESS; +} + +static int Control(demux_t *demux, int query, va_list args) +{ + demux_sys_t *sys = demux->p_sys; + + switch (query) { + case DEMUX_CAN_SEEK: + *va_arg(args, bool *) = false; /* TODO */ + break; + + case DEMUX_GET_POSITION: + case DEMUX_SET_POSITION: + case DEMUX_GET_LENGTH: + return VLC_EGENERIC; + + case DEMUX_GET_TIME: + *va_arg(args, vlc_tick_t *) = date_Get(&sys->pts) - VLC_TICK_0; + break; + + case DEMUX_SET_TIME: + return VLC_EGENERIC; + + case DEMUX_CAN_PAUSE: + case DEMUX_SET_PAUSE_STATE: + case DEMUX_CAN_CONTROL_PACE: + case DEMUX_GET_PTS_DELAY: + return demux_vaControlHelper(demux->s, 0, -1, 0, 1, query, args); + + default: + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + +static int Open(vlc_object_t *obj) +{ + demux_t *demux = (demux_t *)obj; + stream_t *stream = demux->s; + const uint8_t *hdr; + + if (vlc_stream_Peek(stream, &hdr, 16) < 16) + return VLC_EGENERIC; + if (memcmp(hdr, "MUS\x1A", 4)) + return VLC_EGENERIC; + + uint_fast16_t length = GetWLE(hdr + 4); + uint_fast16_t offset = GetWLE(hdr + 6); + uint_fast16_t primaries = GetWLE(hdr + 8); + uint_fast16_t secondaries = GetWLE(hdr + 10); + + if (primaries > 8 || secondaries > 5) + return VLC_EGENERIC; + + /* Ignore the patch list and jump to the event offset. */ + size_t instc = GetWLE(hdr + 12); + size_t hdrlen = 16 + 2 * instc; + + if (offset < hdrlen + || vlc_stream_Read(stream, NULL, offset) < (ssize_t)offset) + return VLC_EGENERIC; + + msg_Dbg(demux, "MIDI channels: %u primary, %u secondary", + GetWLE(hdr + 8), GetWLE(hdr + 10)); + + demux_sys_t *sys = vlc_obj_malloc(obj, sizeof (*sys)); + if (unlikely(sys == NULL)) + return VLC_ENOMEM; + + sys->end_offset = (uint_fast32_t)offset + (uint_fast32_t)length; + sys->primaries = primaries; + sys->secondaries = secondaries; + memset(sys->volume, 0, sizeof (sys->volume)); + + es_format_t fmt; + + es_format_Init(&fmt, AUDIO_ES, VLC_CODEC_MIDI); + fmt.audio.i_channels = 2; + fmt.audio.i_rate = 44100; + sys->es = es_out_Add(demux->out, &fmt); + + date_Init(&sys->pts, MUS_FREQ, 1); + date_Set(&sys->pts, VLC_TICK_0); + sys->tick = VLC_TICK_0; + + demux->p_sys = sys; + demux->pf_demux = Demux; + demux->pf_control = Control; + return VLC_SUCCESS; +} + +vlc_module_begin() + set_description(N_("DMX music demuxer")) + set_category(CAT_INPUT) + set_subcategory(SUBCAT_INPUT_DEMUX) + set_capability("demux", 20) + set_callbacks(Open, NULL) +vlc_module_end() diff -Nru vlc-3.0.21/modules/demux/flac.c vlc-3.0.22/modules/demux/flac.c --- vlc-3.0.21/modules/demux/flac.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/flac.c 2025-11-13 22:17:54.000000000 +0000 @@ -341,7 +341,7 @@ if( !b_found ) { - if( i_highpos < i_lowpos || i_highpos - i_lowpos < i_frame_size ) + if( i_highpos < i_lowpos || i_highpos - i_lowpos <= i_frame_size ) break; if( VLC_SUCCESS != vlc_stream_Seek( p_demux->s, i_start_pos ) ) diff -Nru vlc-3.0.21/modules/demux/gme.c vlc-3.0.22/modules/demux/gme.c --- vlc-3.0.21/modules/demux/gme.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/gme.c 2025-11-13 22:17:54.000000000 +0000 @@ -128,6 +128,12 @@ fmt.i_bitrate = RATE * 4; sys->es = es_out_Add (demux->out, &fmt); + if (unlikely(sys->es == NULL)) + { + gme_delete (sys->emu); + free (sys); + return VLC_ENOMEM; + } date_Init (&sys->pts, RATE, 1); date_Set (&sys->pts, 0); diff -Nru vlc-3.0.21/modules/demux/hls/playlist/HLSRepresentation.cpp vlc-3.0.22/modules/demux/hls/playlist/HLSRepresentation.cpp --- vlc-3.0.21/modules/demux/hls/playlist/HLSRepresentation.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/hls/playlist/HLSRepresentation.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -208,8 +208,8 @@ if(!segmentList->hasRelativeMediaTimes()) { - const stime_t wantedTimeIn = fromSeg->startTime.Get(); - const stime_t wantedTimeOut = wantedTimeIn + fromSeg->duration.Get(); + const stime_t wantedTimeIn = fromSeg->startTime; + const stime_t wantedTimeOut = wantedTimeIn + fromSeg->duration; const std::vector &list = segmentList->getSegments(); std::vector::const_iterator it; @@ -219,8 +219,8 @@ /* Must be in the same sequence */ if(seg->getDiscontinuitySequenceNumber() < discontinuitySequence) continue; - const stime_t segTimeIn = seg->startTime.Get(); - const stime_t segTimeOut = segTimeIn + seg->duration.Get(); + const stime_t segTimeIn = seg->startTime; + const stime_t segTimeOut = segTimeIn + seg->duration; if(wantedTimeIn >= segTimeIn && wantedTimeIn < segTimeOut) return seg->getSequenceNumber(); /* approx / gap */ @@ -234,12 +234,12 @@ if(fromList) { stime_t length = fromList->getTotalLength(); - stime_t first = fromList->getSegments().front()->startTime.Get(); - stime_t now = fromSeg->startTime.Get(); + stime_t first = fromList->getSegments().front()->startTime; + stime_t now = fromSeg->startTime; double relpos = ((double)(now - first)) / length; const std::vector &list = segmentList->getSegments(); - stime_t lookup = list.front()->startTime.Get() + + stime_t lookup = list.front()->startTime + segmentList->getTotalLength() * relpos; std::vector::const_iterator it; for(it=list.begin(); it != list.end(); ++it) @@ -248,8 +248,8 @@ /* Must be in the same sequence */ if(seg->getDiscontinuitySequenceNumber() < discontinuitySequence) continue; - const stime_t segTimeIn = seg->startTime.Get(); - const stime_t segTimeOut = segTimeIn + seg->duration.Get(); + const stime_t segTimeIn = seg->startTime; + const stime_t segTimeOut = segTimeIn + seg->duration; if(lookup >= segTimeIn && lookup < segTimeOut) return seg->getSequenceNumber(); } diff -Nru vlc-3.0.21/modules/demux/hls/playlist/M3U8.cpp vlc-3.0.22/modules/demux/hls/playlist/M3U8.cpp --- vlc-3.0.21/modules/demux/hls/playlist/M3U8.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/hls/playlist/M3U8.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -31,7 +31,7 @@ M3U8::M3U8 (vlc_object_t *p_object) : BasePlaylist(p_object) { - minUpdatePeriod.Set( 5 * CLOCK_FREQ ); + minUpdatePeriod = 5 * CLOCK_FREQ; } M3U8::~M3U8() diff -Nru vlc-3.0.21/modules/demux/hls/playlist/Parser.cpp vlc-3.0.22/modules/demux/hls/playlist/Parser.cpp --- vlc-3.0.21/modules/demux/hls/playlist/Parser.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/hls/playlist/Parser.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -120,7 +120,7 @@ { uri = Helper::getDirectoryPath(uri); if(!uri.empty()) - rep->baseUrl.Set(new Url(uri.append("/"))); + rep->baseUrl = new Url(uri.append("/")); } } @@ -218,7 +218,7 @@ if(!desc.empty()) { - altAdaptSet->description.Set(desc); + altAdaptSet->description = desc; altAdaptSet->setID(ID(desc)); } } @@ -348,8 +348,8 @@ nzDuration = CLOCK_FREQ * durAttribute->floatingPoint(); ctx_extinf = nullptr; } - segment->duration.Set(timescale.ToScaled(nzDuration)); - segment->startTime.Set(timescale.ToScaled(nzStartTime)); + segment->duration = timescale.ToScaled(nzDuration); + segment->startTime = timescale.ToScaled(nzStartTime); nzStartTime += nzDuration; totalduration += nzDuration; if(absReferenceTime > VLC_TICK_INVALID) @@ -362,11 +362,11 @@ if(ctx_byterange) { - std::pair range = ctx_byterange->getValue().getByteRange(); - if(range.first == 0) /* first == size, second = offset */ + ByteRange range = ctx_byterange->getValue().getByteRange(); + if(!range.first.has_value()) /* first == offset, second = length */ range.first = prevbyterangeoffset; - prevbyterangeoffset = range.first + range.second; - segment->setByteRange(range.first, prevbyterangeoffset - 1); + prevbyterangeoffset = range.first.value() + range.second; + segment->setByteRange(range.first.value(), prevbyterangeoffset - 1); ctx_byterange = nullptr; } segment->setDiscontinuitySequenceNumber(discontinuitySequence); @@ -399,7 +399,7 @@ vlc_tick_t tempTime = absReferenceTime; for(auto it = segmentstoappend.crbegin(); it != segmentstoappend.crend(); ++it) { - vlc_tick_t duration = timescale.ToTime((*it)->duration.Get()); + vlc_tick_t duration = timescale.ToTime((*it)->duration); if( duration < tempTime - VLC_TICK_0 ) tempTime -= duration; else @@ -419,7 +419,7 @@ const AttributesTag *keytag = static_cast(tag); const Attribute *uriAttr; if(keytag && (uriAttr = keytag->getAttributeByName("URI")) && - !segmentList->initialisationSegment.Get()) /* FIXME: handle discontinuities */ + !segmentList->initialisationSegment) /* FIXME: handle discontinuities */ { InitSegment *initSegment = new (std::nothrow) InitSegment(rep); if(initSegment) @@ -428,10 +428,10 @@ const Attribute *byterangeAttr = keytag->getAttributeByName("BYTERANGE"); if(byterangeAttr) { - const std::pair range = byterangeAttr->unescapeQuotes().getByteRange(); - initSegment->setByteRange(range.first, range.first + range.second - 1); + const ByteRange range = byterangeAttr->unescapeQuotes().getByteRange(); + initSegment->setByteRange(range.first.value_or(0), range.first.value_or(0) + range.second - 1); } - segmentList->initialisationSegment.Set(initSegment); + segmentList->initialisationSegment = initSegment; } } } @@ -457,11 +457,11 @@ if(rep->isLive()) { - rep->getPlaylist()->duration.Set(0); + rep->getPlaylist()->duration = 0; } - else if(totalduration > rep->getPlaylist()->duration.Get()) + else if(totalduration > rep->getPlaylist()->duration) { - rep->getPlaylist()->duration.Set(totalduration); + rep->getPlaylist()->duration = totalduration; } rep->updateSegmentList(segmentList, true); @@ -656,10 +656,10 @@ for(auto codec: info.codecs) rep->addCodecs(codec.codec); - if(adaptSet->description.Get().empty() && + if(adaptSet->description.empty() && info.tag->getAttributeByName("NAME")) { - adaptSet->description.Set(info.tag->getAttributeByName("NAME")->quotedString()); + adaptSet->description = info.tag->getAttributeByName("NAME")->quotedString(); } adaptSet->addRepresentation(rep); @@ -791,11 +791,11 @@ if(xstartTag->getAttributeByName("TIME-OFFSET")) { float offset = xstartTag->getAttributeByName("TIME-OFFSET")->floatingPoint(); - if(offset > 0 && (offset * CLOCK_FREQ) <= playlist->duration.Get()) - playlist->presentationStartOffset.Set(CLOCK_FREQ * offset); - else if(offset < 0 && (-offset * CLOCK_FREQ) <= playlist->duration.Get()) - playlist->presentationStartOffset.Set(playlist->duration.Get() + - CLOCK_FREQ * offset); + if(offset > 0 && (offset * CLOCK_FREQ) <= playlist->duration) + playlist->presentationStartOffset = CLOCK_FREQ * offset; + else if(offset < 0 && (-offset * CLOCK_FREQ) <= playlist->duration) + playlist->presentationStartOffset = playlist->duration + + CLOCK_FREQ * offset; } } diff -Nru vlc-3.0.21/modules/demux/hls/playlist/Tags.cpp vlc-3.0.22/modules/demux/hls/playlist/Tags.cpp --- vlc-3.0.21/modules/demux/hls/playlist/Tags.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/hls/playlist/Tags.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -72,10 +72,18 @@ return ret; } -std::pair Attribute::getByteRange() const +static inline std::istream& operator>>(std::istream& is, adaptive::optional& data) { - std::size_t length = 0; - std::size_t offset = 0; + size_t val; + is >> val; + data = val; + return is; +} + +ByteRange Attribute::getByteRange() const +{ + std::size_t length; + adaptive::optional offset; std::istringstream is(value); is.imbue(std::locale("C")); @@ -90,7 +98,7 @@ } } - return std::make_pair(offset, length); + return ByteRange(std::move(offset), length); } std::pair Attribute::getResolution() const diff -Nru vlc-3.0.21/modules/demux/hls/playlist/Tags.hpp vlc-3.0.22/modules/demux/hls/playlist/Tags.hpp --- vlc-3.0.21/modules/demux/hls/playlist/Tags.hpp 2022-02-15 17:24:38.000000000 +0000 +++ vlc-3.0.22/modules/demux/hls/playlist/Tags.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -20,6 +20,8 @@ #ifndef TAGS_HPP #define TAGS_HPP +#include "../../adaptive/tools/Compatibility.hpp" + #include #include @@ -32,6 +34,7 @@ namespace playlist { + using ByteRange = std::pair,std::size_t>; class Attribute { @@ -43,7 +46,7 @@ std::string quotedString() const; double floatingPoint() const; std::vector hexSequence() const; - std::pair getByteRange() const; + ByteRange getByteRange() const; std::pair getResolution() const; std::string name; diff -Nru vlc-3.0.21/modules/demux/image.c vlc-3.0.22/modules/demux/image.c --- vlc-3.0.21/modules/demux/image.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/image.c 2025-11-13 22:17:54.000000000 +0000 @@ -392,7 +392,7 @@ static bool IsJfif(stream_t *s) { const uint8_t *header; - ssize_t peek = vlc_stream_Peek(s, &header, 256); + ssize_t peek = vlc_stream_Peek(s, &header, 4096); if(peek < 256) return false; size_t size = (size_t) peek; @@ -400,6 +400,16 @@ if (FindJpegMarker(&position, header, size) != 0xd8) return false; + if (FindJpegMarker(&position, header, size) == 0xe2) // ICC Profile + { + size_t icc_size = GetWBE(&header[position]); + position += 2; + if (position + 12 > size) + return false; + if (memcmp(&header[position], "ICC_PROFILE\0", 12)) + return false; + position += icc_size - 2; + } if (FindJpegMarker(&position, header, size) != 0xe0) return false; position += 2; /* Skip size */ diff -Nru vlc-3.0.21/modules/demux/mjpeg.c vlc-3.0.22/modules/demux/mjpeg.c --- vlc-3.0.21/modules/demux/mjpeg.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mjpeg.c 2025-11-13 22:17:54.000000000 +0000 @@ -482,7 +482,8 @@ } i = 0; - i_size = strlen( p_sys->psz_separator ) + 2; + size_t sep_len = strlen(p_sys->psz_separator); + i_size = sep_len + 2; if( p_sys->i_data_peeked < i_size ) { msg_Warn( p_demux, "data shortage" ); @@ -509,13 +510,22 @@ } } + /* peek is located now at "--", check if we have enough data for the + * separator */ + while (i + 2 + sep_len > (size_t)p_sys->i_data_peeked) + { + if (!Peek(p_demux, false)) + { + msg_Warn( p_demux, "data shortage" ); + return VLC_DEMUXER_EOF; + } + } + /* Handle old and new style of separators */ - if (!strncmp(p_sys->psz_separator, (char *)(p_sys->p_peek + i + 2), - strlen( p_sys->psz_separator )) - || ((strlen(p_sys->psz_separator) > 4) + if (!strncmp(p_sys->psz_separator, (char *)(p_sys->p_peek + i + 2), sep_len) + || (sep_len > 4 && !strncmp(p_sys->psz_separator, "--", 2) - && !strncmp(p_sys->psz_separator, (char *)(p_sys->p_peek + i), - strlen( p_sys->psz_separator)))) + && !strncmp(p_sys->psz_separator, (char *)(p_sys->p_peek + i), sep_len))) { break; } diff -Nru vlc-3.0.21/modules/demux/mkv/demux.cpp vlc-3.0.22/modules/demux/mkv/demux.cpp --- vlc-3.0.21/modules/demux/mkv/demux.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mkv/demux.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -458,20 +458,28 @@ /* verify the EBML Header... it shouldn't be bigger than 1kB */ p_l0 = p_stream1->estream.FindNextID(EBML_INFO(EbmlHead), 1024); - if (p_l0 == NULL) + if (p_l0 == nullptr || p_l0->IsDummy()) { msg_Err( p_demux, "No EBML header found" ); + delete p_l0; return false; } /* verify we can read this Segment */ try { - p_l0->Read( p_stream1->estream, EBML_CLASS_CONTEXT(EbmlHead), i_upper_lvl, p_l0, true); + EbmlElement *el = nullptr; + p_l0->Read( p_stream1->estream, EBML_CLASS_CONTEXT(EbmlHead), i_upper_lvl, el, true); + if (i_upper_lvl != 0) + { + assert(el != nullptr); + delete el; + } } catch(...) { msg_Err(p_demux, "EBML Header Read failed"); + delete p_l0; return false; } @@ -479,6 +487,7 @@ if (std::string(doc_type) != "matroska" && std::string(doc_type) != "webm" ) { msg_Err( p_demux, "Not a Matroska file : DocType = %s ", std::string(doc_type).c_str()); + delete p_l0; return false; } @@ -486,6 +495,7 @@ if (uint64(doc_read_version) > 5) { msg_Err( p_demux, "matroska file needs version %" PRId64 " but only versions 1 to 4 supported", uint64(doc_read_version)); + delete p_l0; return false; } @@ -494,13 +504,14 @@ // find all segments in this file p_l0 = p_stream1->estream.FindNextID(EBML_INFO(KaxSegment), UINT64_MAX); - if (p_l0 == NULL) + if (p_l0 == nullptr || p_l0->IsDummy()) { msg_Err( p_demux, "No segment found" ); + delete p_l0; return false; } - while (p_l0 != 0) + while (p_l0 != nullptr) { bool b_l0_handled = false; @@ -535,10 +546,15 @@ { p_l0->SkipData(p_stream1->estream, KaxMatroska_Context); p_l0 = p_stream1->estream.FindNextID(EBML_INFO(KaxSegment), UINT64_MAX); + if (p_l0 != nullptr && p_l0->IsDummy()) + { + delete p_l0; + p_l0 = nullptr; + } } else { - p_l0 = NULL; + p_l0 = nullptr; } if( b_l0_handled == false ) @@ -722,6 +738,9 @@ bool demux_sys_t::PreparePlayback( virtual_segment_c & new_vsegment, vlc_tick_t i_mk_date ) { + if ( !new_vsegment.CurrentSegment() ) + return false; + if ( p_current_vsegment != &new_vsegment ) { if ( p_current_vsegment->CurrentSegment() != NULL ) diff -Nru vlc-3.0.21/modules/demux/mkv/matroska_segment.cpp vlc-3.0.22/modules/demux/mkv/matroska_segment.cpp --- vlc-3.0.21/modules/demux/mkv/matroska_segment.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mkv/matroska_segment.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -713,10 +713,11 @@ es.I_O().setFilePointer( i_element_position, seek_beginning ); el = es.FindNextID( ClassInfos, 0xFFFFFFFFL); - if( el == NULL ) + if( el == nullptr || el->IsDummy() ) { msg_Err( &sys.demuxer, "cannot load some cues/chapters/tags etc. (broken seekhead or file)" ); es.I_O().setFilePointer( i_sav_position, seek_beginning ); + delete el; return false; } @@ -1258,8 +1259,16 @@ return; } + filepos_t read = 0; + try { + read = ksblock.ReadData( vars.obj->es.I_O() ); + } catch(...) { + } + if (read == 0 && ksblock.GetSize() != 0) { + msg_Err( vars.p_demuxer,"Error while reading %s", EBML_NAME(&ksblock) ); + return; + } vars.simpleblock = &ksblock; - vars.simpleblock->ReadData( vars.obj->es.I_O() ); vars.simpleblock->SetParent( *vars.obj->cluster ); if( ksblock.IsKeyframe() ) @@ -1278,8 +1287,16 @@ E_CASE( KaxBlock, kblock ) { + filepos_t read = 0; + try { + read = kblock.ReadData( vars.obj->es.I_O() ); + } catch(...) { + } + if (unlikely(read == 0) && kblock.GetSize() != 0) { + msg_Err( vars.p_demuxer,"Error while reading %s", EBML_NAME(&kblock) ); + return; + } vars.block = &kblock; - vars.block->ReadData( vars.obj->es.I_O() ); vars.block->SetParent( *vars.obj->cluster ); const mkv_track_t *p_track = vars.obj->FindTrackByBlock( &kblock, NULL ); @@ -1293,14 +1310,11 @@ } E_CASE( KaxBlockAdditions, kadditions ) { - EbmlElement *el; - int i_upper_level = 0; - try + if ( vars.obj->ReadMaster( kadditions ) ) { - kadditions.Read( vars.obj->es, EBML_CONTEXT(&kadditions), i_upper_level, el, false ); vars.additions = &kadditions; vars.ep->Keep (); - } catch (...) {} + } } E_CASE( KaxBlockDuration, kduration ) { @@ -1465,3 +1479,30 @@ } } } + +bool matroska_segment_c::ReadMaster(EbmlMaster & m, ScopeMode scope) +{ + if( unlikely( m.IsFiniteSize() && m.GetSize() >= SIZE_MAX ) ) + { + msg_Err( VLC_OBJECT(&sys.demuxer), "%s too big, aborting", EBML_NAME(&m) ); + return false; + } + try + { + EbmlElement *el; + int i_upper_level = 0; + m.Read( es, EBML_CONTEXT(&m), i_upper_level, el, true, scope ); + if (i_upper_level != 0) + { + assert(el != nullptr); + delete el; + } + } + catch(...) + { + msg_Err( VLC_OBJECT(&sys.demuxer), "Couldn't read %s", EBML_NAME(&m) ); + return false; + } + + return true; +} diff -Nru vlc-3.0.21/modules/demux/mkv/matroska_segment.hpp vlc-3.0.22/modules/demux/mkv/matroska_segment.hpp --- vlc-3.0.21/modules/demux/mkv/matroska_segment.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mkv/matroska_segment.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -156,6 +156,9 @@ bool SameFamily( const matroska_segment_c & of_segment ) const; + // read a whole EBML master element at once + bool ReadMaster(EbmlMaster & m, ScopeMode scope = SCOPE_ALL_DATA); + private: void LoadCues( KaxCues *cues ); void LoadTags( KaxTags *tags ); diff -Nru vlc-3.0.21/modules/demux/mkv/matroska_segment_parse.cpp vlc-3.0.22/modules/demux/mkv/matroska_segment_parse.cpp --- vlc-3.0.21/modules/demux/mkv/matroska_segment_parse.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mkv/matroska_segment_parse.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -56,12 +56,12 @@ if( unlikely( !p_tk->fmt.p_extra ) ) return; p_tk->fmt.i_extra = p_tk->i_extra_data + 12; uint8_t *p_extra = static_cast( p_tk->fmt.p_extra ); - /* See "ALAC Specific Info (36 bytes) (required)" from - alac.macosforge.org/trac/browser/trunk/ALACMagicCookieDescription.txt */ + /* 12 bytes + "ALAC Specific Info (24 bytes) (required)" from + https://github.com/macosforge/alac/blob/master/ALACMagicCookieDescription.txt */ SetDWBE( p_extra, p_tk->fmt.i_extra ); memcpy( p_extra + 4, "alac", 4 ); - SetDWBE( p_extra + 8, 0 ); - memcpy( p_extra + 12, p_tk->p_extra_data, p_tk->fmt.i_extra - 12 ); + SetDWBE( p_extra + 8, p_tk->i_extra_data ); + memcpy( p_extra + 12, p_tk->p_extra_data, p_tk->i_extra_data ); } static inline void fill_extra_data( mkv_track_t *p_tk, unsigned int offset ) @@ -391,13 +391,13 @@ E_CASE( KaxCodecDelay, codecdelay ) { vars.tk->i_codec_delay = static_cast( codecdelay ) / 1000; - msg_Dbg( vars.p_demuxer, "| | | + Track Codec Delay =%" PRIu64, + msg_Dbg( vars.p_demuxer, "| | | + Track Codec Delay=%" PRIu64, vars.tk->i_codec_delay ); } E_CASE( KaxSeekPreRoll, spr ) { vars.tk->i_seek_preroll = static_cast( spr ) / 1000; - debug( vars, "Track Seek Preroll =%" PRIu64, vars.tk->i_seek_preroll ); + debug( vars, "Track Seek Preroll=%" PRIu64, vars.tk->i_seek_preroll ); } #endif E_CASE( KaxContentEncodings, cencs ) @@ -922,24 +922,9 @@ *****************************************************************************/ void matroska_segment_c::ParseTracks( KaxTracks *tracks ) { - EbmlElement *el; - int i_upper_level = 0; - /* Master elements */ - if( unlikely( tracks->IsFiniteSize() && tracks->GetSize() >= SIZE_MAX ) ) - { - msg_Err( &sys.demuxer, "Track too big, aborting" ); - return; - } - try - { - tracks->Read( es, EBML_CONTEXT(tracks), i_upper_level, el, true ); - } - catch(...) - { - msg_Err( &sys.demuxer, "Couldn't read tracks" ); + if ( !ReadMaster( *tracks ) ) return; - } struct Capture { matroska_segment_c * obj; @@ -978,35 +963,17 @@ *****************************************************************************/ void matroska_segment_c::ParseInfo( KaxInfo *info ) { - EbmlElement *el; - EbmlMaster *m; - int i_upper_level = 0; + EbmlMaster *m = info; - /* Master elements */ - m = static_cast(info); - if( unlikely( m->IsFiniteSize() && m->GetSize() >= SIZE_MAX ) ) - { - msg_Err( &sys.demuxer, "Info too big, aborting" ); - return; - } - try - { - m->Read( es, EBML_CONTEXT(info), i_upper_level, el, true ); - } - catch(...) - { - msg_Err( &sys.demuxer, "Couldn't read info" ); + if ( !ReadMaster( *info ) ) return; - } struct InfoHandlerPayload { demux_t * p_demuxer; matroska_segment_c * obj; - EbmlElement *& el; EbmlMaster *& m; - int& i_upper_level; - } captures = { &sys.demuxer, this, el, m, i_upper_level }; + } captures = { &sys.demuxer, this, m }; MKV_SWITCH_CREATE(EbmlTypeDispatcher, InfoHandlers, InfoHandlerPayload) { @@ -1114,13 +1081,8 @@ }; try { - if( unlikely( trans.IsFiniteSize() && trans.GetSize() >= SIZE_MAX ) ) - { - msg_Err( vars.p_demuxer, "Chapter translate too big, aborting" ); + if ( !vars.obj->ReadMaster( trans ) ) return; - } - - trans.Read( vars.obj->es, EBML_CONTEXT(&trans), vars.i_upper_level, vars.el, true ); chapter_translation_c *p_translate = new chapter_translation_c(); @@ -1257,6 +1219,9 @@ { debug( vars, "ChapterProcess" ); + if ( !var_InheritBool( vars.p_demuxer, "mkv-use-chapter-codec") ) + return; + chapter_codec_cmds_c *p_ccodec = NULL; for( size_t j = 0; j < cp.ListSize(); j++ ) @@ -1307,23 +1272,8 @@ *****************************************************************************/ void matroska_segment_c::ParseAttachments( KaxAttachments *attachments ) { - EbmlElement *el; - int i_upper_level = 0; - - if( unlikely( attachments->IsFiniteSize() && attachments->GetSize() >= SIZE_MAX ) ) - { - msg_Err( &sys.demuxer, "Attachments too big, aborting" ); - return; - } - try - { - attachments->Read( es, EBML_CONTEXT(attachments), i_upper_level, el, true ); - } - catch(...) - { - msg_Err( &sys.demuxer, "Error while reading attachments" ); + if ( !ReadMaster( *attachments )) return; - } KaxAttached *attachedFile = FindChild( *attachments ); @@ -1369,22 +1319,9 @@ *****************************************************************************/ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) { - if( unlikely( chapters->IsFiniteSize() && chapters->GetSize() >= SIZE_MAX ) ) - { - msg_Err( &sys.demuxer, "Chapters too big, aborting" ); + if ( !ReadMaster( *chapters ) ) return; - } - try - { - EbmlElement *el; - int i_upper_level = 0; - chapters->Read( es, EBML_CONTEXT(chapters), i_upper_level, el, true ); - } - catch(...) - { - msg_Err( &sys.demuxer, "Error while reading chapters" ); - return; - } + MKV_SWITCH_CREATE( EbmlTypeDispatcher, KaxChapterHandler, matroska_segment_c ) { MKV_SWITCH_INIT(); @@ -1452,29 +1389,13 @@ bool matroska_segment_c::ParseCluster( KaxCluster *cluster, bool b_update_start_time, ScopeMode read_fully ) { - if( unlikely( cluster->IsFiniteSize() && cluster->GetSize() >= SIZE_MAX ) ) - { - msg_Err( &sys.demuxer, "Cluster too big, aborting" ); - return false; - } - bool b_seekable; vlc_stream_Control( sys.demuxer.s, STREAM_CAN_SEEK, &b_seekable ); if (!b_seekable) return false; - try - { - EbmlElement *el; - int i_upper_level = 0; - - cluster->Read( es, EBML_CONTEXT(cluster), i_upper_level, el, true, read_fully ); - } - catch(...) - { - msg_Err( &sys.demuxer, "Error while reading cluster" ); + if ( !ReadMaster( *cluster, read_fully ) ) return false; - } bool b_has_timecode = false; @@ -1618,6 +1539,8 @@ vars.p_tk->b_pts_only = true; fill_extra_data( vars.p_tk, 0 ); + if (vars.p_fmt->i_extra <= 4) + vars.p_fmt->b_packetized = false; // force full extradata by the packetizer } S_CASE("V_MPEG4/MS/V3") { vars.p_fmt->i_codec = VLC_CODEC_DIV3; @@ -1800,6 +1723,11 @@ vars.p_fmt->i_codec = VLC_CODEC_A52; vars.p_fmt->b_packetized = false; } + S_CASE("A_ATRAC/AT1") { + ONLY_FMT(AUDIO); + vars.p_fmt->i_codec = VLC_CODEC_ATRAC1; + vars.p_tk->fmt.audio.i_blockalign = vars.p_tk->fmt.audio.i_channels * 212; + } S_CASE("A_EAC3") { vars.p_fmt->i_codec = VLC_CODEC_EAC3; vars.p_fmt->b_packetized = false; @@ -2031,7 +1959,7 @@ } S_CASE("A_QUICKTIME/QDMC") { vars.p_fmt->i_cat = AUDIO_ES; - vars.p_fmt->i_codec = VLC_FOURCC('Q','D','M','C'); + vars.p_fmt->i_codec = VLC_CODEC_QDMC; fill_extra_data( vars.p_tk, 0 ); } @@ -2063,7 +1991,7 @@ } S_CASE("S_TEXT/USF") { ONLY_FMT(SPU); - vars.p_tk->fmt.i_codec = VLC_FOURCC( 'u', 's', 'f', ' ' ); + vars.p_tk->fmt.i_codec = VLC_CODEC_USF; vars.p_tk->fmt.subs.psz_encoding = strdup( "UTF-8" ); fill_extra_data( vars.p_tk, 0 ); } diff -Nru vlc-3.0.21/modules/demux/mkv/matroska_segment_seeker.cpp vlc-3.0.22/modules/demux/mkv/matroska_segment_seeker.cpp --- vlc-3.0.21/modules/demux/mkv/matroska_segment_seeker.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mkv/matroska_segment_seeker.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -366,7 +366,11 @@ if( ms.BlockGet( block, simpleblock, additions, &b_key_picture, &b_discardable_picture, &i_block_duration ) ) + { + delete additions; break; + } + delete additions; if( simpleblock ) { block_pos = simpleblock->GetElementPosition(); @@ -482,11 +486,16 @@ while( ms.cluster == NULL || ( ms.cluster->IsFiniteSize() && ms.cluster->GetEndPosition() < fpos ) ) { - if( !( ms.cluster = static_cast( ms.ep.Get() ) ) ) + EbmlElement *el = ms.ep.Get(); + if( el == nullptr ) { msg_Err( &ms.sys.demuxer, "unable to read KaxCluster during seek, giving up" ); return; } + if (!MKV_IS_ID( el, KaxCluster )) + continue; // look for the next element + + ms.cluster = static_cast( el ); i_cluster_pos = ms.cluster->GetElementPosition(); @@ -501,16 +510,22 @@ while( EbmlElement * el = ms.ep.Get() ) { - if( MKV_CHECKED_PTR_DECL( p_tc, KaxClusterTimecode, el ) ) - { - p_tc->ReadData( ms.es.I_O(), SCOPE_ALL_DATA ); - ms.cluster->InitTimecode( static_cast( *p_tc ), ms.i_timescale ); - add_cluster(ms.cluster); - break; + try { + if( MKV_CHECKED_PTR_DECL( p_tc, KaxClusterTimecode, el ) ) + { + p_tc->ReadData( ms.es.I_O(), SCOPE_ALL_DATA ); + ms.cluster->InitTimecode( static_cast( *p_tc ), ms.i_timescale ); + add_cluster(ms.cluster); + break; + } + else if( MKV_CHECKED_PTR_DECL( p_tc, EbmlCrc32, el ) ) + { + p_tc->ReadData( ms.es.I_O(), SCOPE_ALL_DATA ); /* avoid a skip that may fail */ + } } - else if( MKV_CHECKED_PTR_DECL( p_tc, EbmlCrc32, el ) ) + catch(...) { - p_tc->ReadData( ms.es.I_O(), SCOPE_ALL_DATA ); /* avoid a skip that may fail */ + msg_Err( &ms.sys.demuxer,"Error while reading %s", EBML_NAME(el) ); } } diff -Nru vlc-3.0.21/modules/demux/mkv/mkv.cpp vlc-3.0.22/modules/demux/mkv/mkv.cpp --- vlc-3.0.21/modules/demux/mkv/mkv.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mkv/mkv.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -487,8 +487,8 @@ } /* Needed by matroska_segment::Seek() and Seek */ -void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock, - KaxBlockAdditions *additions, +static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock, + const KaxBlockAdditions *additions, vlc_tick_t i_pts, int64_t i_duration, bool b_key_picture, bool b_discardable_picture ) { @@ -613,10 +613,10 @@ size_t i_addition = 0; if(additions) { - KaxBlockMore *blockmore = FindChild(*additions); + auto blockmore = FindChild(*additions); if(blockmore) { - KaxBlockAdditional *addition = FindChild(*blockmore); + auto addition = FindChild(*blockmore); if(addition) { i_addition = static_cast(addition->GetSize()); diff -Nru vlc-3.0.21/modules/demux/mkv/mkv.hpp vlc-3.0.22/modules/demux/mkv/mkv.hpp --- vlc-3.0.21/modules/demux/mkv/mkv.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mkv/mkv.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -117,13 +117,21 @@ #define MKV_CHECKED_PTR_DECL( name, type, src ) type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL #define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL +#if LIBEBML_VERSION < 0x020000 +template +Type * FindChild(const EbmlMaster & Master) +{ + return static_cast(Master.FindFirstElt(EBML_INFO(Type))); +} -using namespace LIBMATROSKA_NAMESPACE; +template +Type * FindNextChild(const EbmlMaster & Master, const Type & PastElt) +{ + return static_cast(Master.FindNextElt(PastElt)); +} +#endif -void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock, - KaxBlockAdditions *additions, - vlc_tick_t i_pts, vlc_tick_t i_duration, bool b_key_picture, - bool b_discardable_picture ); +using namespace LIBMATROSKA_NAMESPACE; class attachment_c { diff -Nru vlc-3.0.21/modules/demux/mkv/util.cpp vlc-3.0.22/modules/demux/mkv/util.cpp --- vlc-3.0.21/modules/demux/mkv/util.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mkv/util.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -356,7 +356,7 @@ if( p_tk->fmt.i_cat == AUDIO_ES && p_tk->i_chans_to_reorder ) { aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer, - p_tk->fmt.audio.i_channels, + p_tk->i_chans_to_reorder, p_tk->pi_chan_table, p_tk->fmt.i_codec ); } diff -Nru vlc-3.0.21/modules/demux/mp4/essetup.c vlc-3.0.22/modules/demux/mp4/essetup.c --- vlc-3.0.21/modules/demux/mp4/essetup.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mp4/essetup.c 2025-11-13 22:17:54.000000000 +0000 @@ -545,6 +545,8 @@ BOXDATA(p_av1C)->i_av1C ); p_track->fmt.i_extra = BOXDATA(p_av1C)->i_av1C; } + if (p_track->fmt.i_extra <= 4) + p_track->fmt.b_packetized = false; // force full extradata by the packetizer } } break; @@ -691,7 +693,7 @@ case ATOM_H264: case VLC_FOURCC('W','V','C','1'): { - MP4_Box_t *p_strf = MP4_BoxGet( p_sample, "strf", 0 ); + MP4_Box_t *p_strf = MP4_BoxGet( p_sample, "strf" ); if ( p_strf && BOXDATA(p_strf) ) { p_track->fmt.video.i_width = BOXDATA(p_strf)->bmiHeader.biWidth; @@ -929,7 +931,7 @@ } case ATOM_fLaC: { - const MP4_Box_t *p_dfLa = MP4_BoxGet( p_sample, "dfLa", 0 ); + const MP4_Box_t *p_dfLa = MP4_BoxGet( p_sample, "dfLa" ); if( p_dfLa && p_dfLa->data.p_binary->i_blob > 4 && GetDWBE(p_dfLa->data.p_binary->p_blob) == 0 ) /* fullbox header, avoids creating dedicated parser */ { @@ -946,6 +948,35 @@ } break; } + case ATOM_Opus: + { + const MP4_Box_t *p_dOps = MP4_BoxGet( p_sample, "dOps" ); + if( p_dOps && p_dOps->data.p_binary->i_blob > 10 ) + { + size_t i_src = p_dOps->data.p_binary->i_blob; + const uint8_t *p_src = p_dOps->data.p_binary->p_blob; + if(p_src[0] != 0x00 || (SIZE_MAX - p_dOps->data.p_binary->i_blob < 26)) + break; + size_t i_dst = 2 + 8 + p_dOps->data.p_binary->i_blob + 8 + 8; + uint8_t *p_dst = malloc(i_dst); + if( likely( p_dst ) ) + { + p_dst[0] = 0x01; + p_dst[1] = 8 + i_src; + memcpy(&p_dst[2], "OpusHead", 8); + memcpy(&p_dst[10], p_src, i_src); + p_dst[10] = 0x01; // set version != ISOBMFF mapping + SetWLE(&p_dst[12], GetWBE(&p_dst[12])); // swap endianness for PreSkip + SetDWLE(&p_dst[14], GetDWBE(&p_dst[14])); // swap endianness for InputSampleRate + SetWLE(&p_dst[18], GetWBE(&p_dst[18])); // swap endianness for OutputGain + memcpy(&p_dst[10 + i_src], "OpusTags\x00\x00\x00\x00\x00\x00\x00", 16); + p_track->fmt.i_extra = i_dst; + p_track->fmt.p_extra = p_dst; + p_track->fmt.i_codec = VLC_CODEC_OPUS; + } + } + break; + } case( ATOM_eac3 ): { p_track->fmt.i_codec = VLC_CODEC_EAC3; @@ -954,7 +985,7 @@ p_track->fmt.audio.i_channels = 0; p_track->fmt.audio.i_bitspersample = 0; - const MP4_Box_t *p_dec3 = MP4_BoxGet( p_sample, "dec3", 0 ); + const MP4_Box_t *p_dec3 = MP4_BoxGet( p_sample, "dec3" ); if( p_dec3 && BOXDATA(p_dec3) ) { p_track->fmt.i_bitrate = BOXDATA(p_dec3)->i_data_rate * 1000; @@ -970,7 +1001,7 @@ p_track->fmt.audio.i_channels = 0; p_track->fmt.audio.i_bitspersample = 0; - MP4_Box_t *p_dac3 = MP4_BoxGet( p_sample, "dac3", 0 ); + MP4_Box_t *p_dac3 = MP4_BoxGet( p_sample, "dac3" ); if( p_dac3 && BOXDATA(p_dac3) ) { static const int pi_bitrate[] = { @@ -1179,11 +1210,12 @@ } } rgi_chans_sequence[i_channels] = 0; - if( aout_CheckChannelReorder( rgi_chans_sequence, NULL, i_vlc_mapping, - p_track->rgi_chans_reordering ) && - aout_BitsPerSample( p_track->fmt.i_codec ) ) + if( aout_BitsPerSample( p_track->fmt.i_codec ) ) { - p_track->b_chans_reorder = true; + p_track->i_chans_to_reorder = + aout_CheckChannelReorder( rgi_chans_sequence, NULL, + i_vlc_mapping, + p_track->rgi_chans_reordering ); p_track->fmt.audio.i_channels = i_channels; p_track->fmt.audio.i_physical_channels = i_vlc_mapping; } diff -Nru vlc-3.0.21/modules/demux/mp4/libmp4.c vlc-3.0.22/modules/demux/mp4/libmp4.c --- vlc-3.0.21/modules/demux/mp4/libmp4.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mp4/libmp4.c 2025-11-13 22:17:54.000000000 +0000 @@ -3224,8 +3224,6 @@ for( uint32_t i = 0; i < count; i++ ) { MP4_GET4BYTES( p_box->data.p_stss->i_sample_number[i] ); - /* XXX in libmp4 sample begin at 0 */ - p_box->data.p_stss->i_sample_number[i]--; } #ifdef MP4_VERBOSE @@ -3288,7 +3286,7 @@ MP4_GETVERSIONFLAGS( p_box->data.p_stdp ); p_box->data.p_stdp->i_priority = - calloc( i_read / 2, sizeof(uint16_t) ); + calloc( i_read / 2, sizeof(*p_box->data.p_stdp->i_priority) ); if( unlikely( !p_box->data.p_stdp->i_priority ) ) MP4_READBOX_EXIT( 0 ); @@ -4280,9 +4278,9 @@ p_tfra->i_length_size_of_trun_num = ( i_lengths & 0x0c ) >> 2; p_tfra->i_length_size_of_sample_num = i_lengths & 0x03; - size_t size = 4 + 4*p_tfra->i_version; /* size in {4, 8} */ - p_tfra->p_time = calloc( i_number_of_entries, size ); - p_tfra->p_moof_offset = calloc( i_number_of_entries, size ); + size_t size; + p_tfra->p_time = calloc( i_number_of_entries, sizeof(*p_tfra->p_time) ); + p_tfra->p_moof_offset = calloc( i_number_of_entries, sizeof(*p_tfra->p_moof_offset) ); size = 1 + p_tfra->i_length_size_of_traf_num; /* size in [|1, 4|] */ if ( size == 3 ) size++; @@ -4310,8 +4308,8 @@ { if ( i_read < i_fields_length + 16 ) break; - MP4_GET8BYTES( *((uint64_t *)&p_tfra->p_time[i*2]) ); - MP4_GET8BYTES( *((uint64_t *)&p_tfra->p_moof_offset[i*2]) ); + MP4_GET8BYTES( p_tfra->p_time[i] ); + MP4_GET8BYTES( p_tfra->p_moof_offset[i] ); } else { @@ -4335,22 +4333,11 @@ #ifdef MP4_ULTRA_VERBOSE for( i = 0; i < i_number_of_entries; i++ ) { - if( p_tfra->i_version == 0 ) - { - msg_Dbg( p_stream, "tfra[%"PRIu32"] time[%"PRIu32"]: %"PRIu32", " - "moof_offset[%"PRIu32"]: %"PRIu32"", - p_tfra->i_track_ID, - i, p_tfra->p_time[i], - i, p_tfra->p_moof_offset[i] ); - } - else - { - msg_Dbg( p_stream, "tfra[%"PRIu32"] time[%"PRIu32"]: %"PRIu64", " - "moof_offset[%"PRIu32"]: %"PRIu64"", - p_tfra->i_track_ID, - i, ((uint64_t *)(p_tfra->p_time))[i], - i, ((uint64_t *)(p_tfra->p_moof_offset))[i] ); - } + msg_Dbg( p_stream, "tfra[%"PRIu32"] time[%"PRIu32"]: %"PRIu64", " + "moof_offset[%"PRIu32"]: %"PRIu64"", + p_tfra->i_track_ID, + i, p_tfra->p_time[i], + i, p_tfra->p_moof_offset[i] ); } #endif #ifdef MP4_VERBOSE @@ -5176,7 +5163,7 @@ ** ***************************************************************************** *****************************************************************************/ -static bool get_token( char **ppsz_path, char **ppsz_token, int *pi_number ) +static bool get_token( const char **ppsz_path, char **ppsz_token, int *pi_number ) { size_t i_len ; if( !*ppsz_path[0] ) @@ -5224,11 +5211,9 @@ return true; } -static void MP4_BoxGet_Internal( const MP4_Box_t **pp_result, const MP4_Box_t *p_box, - const char *psz_fmt, va_list args) +static void MP4_BoxGet_Path( const MP4_Box_t **pp_result, const MP4_Box_t *p_box, + const char *psz_path) { - char *psz_dup; - char *psz_path; char *psz_token = NULL; if( !p_box ) @@ -5237,18 +5222,9 @@ return; } - if( vasprintf( &psz_path, psz_fmt, args ) == -1 ) - psz_path = NULL; - - if( !psz_path || !psz_path[0] ) - { - free( psz_path ); - *pp_result = NULL; - return; - } + assert( psz_path && psz_path[0] ); // fprintf( stderr, "path:'%s'\n", psz_path ); - psz_dup = psz_path; /* keep this pointer, as it need to be unallocated */ for( ; ; ) { int i_number; @@ -5259,7 +5235,6 @@ // psz_path,psz_token,i_number ); if( !psz_token ) { - free( psz_dup ); *pp_result = p_box; return; } @@ -5345,11 +5320,36 @@ error_box: free( psz_token ); - free( psz_dup ); *pp_result = NULL; return; } +static void MP4_BoxGet_Internal( const MP4_Box_t **pp_result, const MP4_Box_t *p_box, + const char *psz_fmt, va_list args) +{ + char *psz_path; + + if( !p_box ) + { + *pp_result = NULL; + return; + } + + if( vasprintf( &psz_path, psz_fmt, args ) == -1 ) + psz_path = NULL; + + if( !psz_path || !psz_path[0] ) + { + free( psz_path ); + *pp_result = NULL; + return; + } + + MP4_BoxGet_Path( pp_result, p_box, psz_path ); + + free( psz_path ); +} + /***************************************************************************** * MP4_BoxGet: find a box given a path relative to p_box ***************************************************************************** @@ -5359,7 +5359,7 @@ * ex: /moov/trak[12] * ../mdia *****************************************************************************/ -MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt, ... ) +MP4_Box_t *MP4_BoxGetVa( const MP4_Box_t *p_box, const char *psz_fmt, ... ) { va_list args; const MP4_Box_t *p_result; @@ -5371,6 +5371,15 @@ return( (MP4_Box_t *) p_result ); } +MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt ) +{ + const MP4_Box_t *p_result; + + MP4_BoxGet_Path( &p_result, p_box, psz_fmt ); + + return( (MP4_Box_t *) p_result ); +} + /***************************************************************************** * MP4_BoxCount: count box given a path relative to p_box ***************************************************************************** @@ -5380,7 +5389,7 @@ * ex: /moov/trak[12] * ../mdia *****************************************************************************/ -unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt, ... ) +unsigned MP4_BoxCountVa( const MP4_Box_t *p_box, const char *psz_fmt, ... ) { va_list args; unsigned i_count; @@ -5392,6 +5401,28 @@ if( !p_result ) { return( 0 ); + } + + i_count = 1; + for( p_next = p_result->p_next; p_next != NULL; p_next = p_next->p_next) + { + if( p_next->i_type == p_result->i_type) + { + i_count++; + } + } + return( i_count ); +} + +unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt ) +{ + unsigned i_count; + const MP4_Box_t *p_result, *p_next; + + MP4_BoxGet_Path( &p_result, p_box, psz_fmt ); + if( !p_result ) + { + return( 0 ); } i_count = 1; diff -Nru vlc-3.0.21/modules/demux/mp4/libmp4.h vlc-3.0.22/modules/demux/mp4/libmp4.h --- vlc-3.0.21/modules/demux/mp4/libmp4.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mp4/libmp4.h 2025-11-13 22:17:54.000000000 +0000 @@ -1577,8 +1577,8 @@ uint8_t i_length_size_of_trun_num; uint8_t i_length_size_of_sample_num; - uint32_t *p_time; - uint32_t *p_moof_offset; + uint64_t *p_time; + uint64_t *p_moof_offset; uint8_t *p_traf_number; uint8_t *p_trun_number; uint8_t *p_sample_number; @@ -1928,7 +1928,7 @@ void MP4_BoxDumpStructure( stream_t *p_input, const MP4_Box_t *p_box ); /***************************************************************************** - * MP4_BoxGet: find a box given a path relative to p_box + * MP4_BoxGetVa: find a box given a path relative to p_box ***************************************************************************** * Path Format: . .. / as usual * [number] to specifie box number ex: trak[12] @@ -1936,10 +1936,20 @@ * ex: /moov/trak[12] * ../mdia *****************************************************************************/ -MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt, ... ); +MP4_Box_t *MP4_BoxGetVa( const MP4_Box_t *p_box, const char *psz_fmt, ... ) VLC_FORMAT(2, 3); /***************************************************************************** - * MP4_BoxCount: find number of box given a path relative to p_box + * MP4_BoxGet: find a box given a path relative to p_box + ***************************************************************************** + * Path Format: . .. / as usual + * + * ex: /moov/mvex + * ../mdia + *****************************************************************************/ +MP4_Box_t *MP4_BoxGet( const MP4_Box_t *p_box, const char *psz_fmt) ; + +/***************************************************************************** + * MP4_BoxCountVa: find number of box given a path relative to p_box ***************************************************************************** * Path Format: . .. / as usual * [number] to specifie box number ex: trak[12] @@ -1947,7 +1957,17 @@ * ex: /moov/trak * ../mdia *****************************************************************************/ -unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt, ... ); +unsigned MP4_BoxCountVa( const MP4_Box_t *p_box, const char *psz_fmt, ... ) VLC_FORMAT(2, 3); + +/***************************************************************************** + * MP4_BoxCount: find number of box given a path relative to p_box + ***************************************************************************** + * Path Format: . .. / as usual + * + * ex: /moov/mvex + * ../mdia + *****************************************************************************/ +unsigned MP4_BoxCount( const MP4_Box_t *p_box, const char *psz_fmt ); MP4_Box_t * MP4_BoxExtract( MP4_Box_t **pp_chain, uint32_t i_type ); diff -Nru vlc-3.0.21/modules/demux/mp4/mp4.c vlc-3.0.22/modules/demux/mp4/mp4.c --- vlc-3.0.21/modules/demux/mp4/mp4.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mp4/mp4.c 2025-11-13 22:17:54.000000000 +0000 @@ -32,6 +32,7 @@ #include /* EnsureUTF8 */ #include #include +#include // realloc_or_free #include #include #include @@ -113,8 +114,8 @@ /* ASF in MP4 */ asf_packet_sys_t asfpacketsys; - uint64_t i_preroll; /* foobar */ - int64_t i_preroll_start; + vlc_tick_t i_preroll; /* foobar */ + vlc_tick_t i_preroll_start; struct { @@ -705,10 +706,10 @@ if( p_block == NULL ) return; - if ( p_track->b_chans_reorder ) + if ( p_track->i_chans_to_reorder ) { aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer, - p_track->fmt.audio.i_channels, + p_track->i_chans_to_reorder, p_track->rgi_chans_reordering, p_track->fmt.i_codec ); } @@ -876,10 +877,12 @@ } p_mvhd = MP4_BoxGet( p_sys->p_moov, "mvhd" ); - if( p_mvhd && BOXDATA(p_mvhd) && BOXDATA(p_mvhd)->i_timescale ) + if( p_mvhd && BOXDATA(p_mvhd) && BOXDATA(p_mvhd)->i_timescale && + BOXDATA(p_mvhd)->i_duration < INT64_MAX ) { p_sys->i_timescale = BOXDATA(p_mvhd)->i_timescale; - p_sys->i_moov_duration = p_sys->i_duration = BOXDATA(p_mvhd)->i_duration; + p_sys->i_moov_duration = + p_sys->i_duration = p_sys->i_cumulated_duration = BOXDATA(p_mvhd)->i_duration; } else @@ -903,7 +906,7 @@ for( i = 0; i < i_count; i++ ) { - MP4_Box_t *p_rdrf = MP4_BoxGet( p_rmra, "rmda[%d]/rdrf", i ); + MP4_Box_t *p_rdrf = MP4_BoxGetVa( p_rmra, "rmda[%d]/rdrf", i ); char *psz_ref; uint32_t i_ref_type; @@ -1010,14 +1013,14 @@ b_enabled_es = false; for( unsigned i = 0; i < p_sys->i_tracks; i++ ) { - MP4_Box_t *p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i ); + MP4_Box_t *p_trak = MP4_BoxGetVa( p_sys->p_root, "/moov/trak[%u]", i ); MP4_Box_t *p_tkhd = MP4_BoxGet( p_trak, "tkhd" ); if( p_tkhd && BOXDATA(p_tkhd) && (BOXDATA(p_tkhd)->i_flags&MP4_TRACK_ENABLED) ) b_enabled_es = true; - MP4_Box_t *p_chap = MP4_BoxGet( p_trak, "tref/chap", i ); + MP4_Box_t *p_chap = MP4_BoxGet( p_trak, "tref/chap" ); if( p_chap && p_chap->data.p_tref_generic && p_chap->data.p_tref_generic->i_entry_count > 0 && !p_sys->p_tref_chap ) p_sys->p_tref_chap = p_chap; @@ -1030,7 +1033,7 @@ /* now process each track and extract all useful information */ for( unsigned i = 0; i < p_sys->i_tracks; i++ ) { - MP4_Box_t *p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%u]", i ); + MP4_Box_t *p_trak = MP4_BoxGetVa( p_sys->p_root, "/moov/trak[%u]", i ); MP4_TrackSetup( p_demux, &p_sys->track[i], p_trak, true, !b_enabled_es ); if( p_sys->track[i].b_ok && !p_sys->track[i].b_chapters_source ) @@ -1666,7 +1669,7 @@ return 0; } -static int FragSeekLoadFragment( demux_t *p_demux, uint32_t i_moox, stime_t i_moox_time ) +static int FragSeekLoadFragment( demux_t *p_demux, uint32_t i_moox ) { demux_sys_t *p_sys = p_demux->p_sys; MP4_Box_t *p_moox; @@ -1700,15 +1703,6 @@ p_sys->context.p_fragment_atom = p_moox; p_sys->context.i_current_box_type = i_moox; - if( i_moox == ATOM_moof ) - { - FragPrepareChunk( p_demux, p_moox, NULL, i_moox_time, true ); - p_sys->context.i_lastseqnumber = FragGetMoofSequenceNumber( p_moox ); - - p_sys->i_nztime = FragGetDemuxTimeFromTracksTime( p_sys ); - p_sys->i_pcr = VLC_TICK_INVALID; - } - msg_Dbg( p_demux, "seeked to %4.4s at pos %" PRIu64, (char *) &i_moox, p_moox->i_pos ); return VLC_SUCCESS; } @@ -1855,11 +1849,23 @@ } /* Context is killed on success */ - if( FragSeekLoadFragment( p_demux, i_segment_type, i_segment_time ) != VLC_SUCCESS ) + if( FragSeekLoadFragment( p_demux, i_segment_type ) != VLC_SUCCESS ) { p_sys->b_error = (vlc_stream_Seek( p_demux->s, i_backup_pos ) != VLC_SUCCESS); return VLC_EGENERIC; } + if( i_segment_type == ATOM_moof ) + { + MP4_Box_t *p_moox = p_sys->context.p_fragment_atom; + FragPrepareChunk( p_demux, p_moox, NULL, i_segment_time, true ); + p_sys->context.i_lastseqnumber = FragGetMoofSequenceNumber( p_moox ); + + p_sys->i_nztime = FragGetDemuxTimeFromTracksTime( p_sys ); + } + else + { + p_sys->i_nztime = i_sync_time; + } p_sys->i_pcr = VLC_TICK_INVALID; @@ -1868,7 +1874,6 @@ if( i_segment_type == ATOM_moov ) { MP4_TrackSeek( p_demux, &p_sys->track[i], i_sync_time ); - p_sys->i_nztime = i_sync_time; p_sys->i_pcr = VLC_TICK_INVALID; } else @@ -2800,12 +2805,12 @@ int64_t i_ctsdelta = ctts->pi_sample_offset[i_index] + i_cts_shift; if( i_ctsdelta < 0 ) /* should not */ i_ctsdelta = 0; + ck->p_sample_offset_pts[i] = i_ctsdelta; if ( i_current_index_samples_left ) { if ( i_current_index_samples_left > i_sample_count ) { ck->p_sample_count_pts[i] = i_sample_count; - ck->p_sample_offset_pts[i] = i_ctsdelta; i_current_index_samples_left -= i_sample_count; i_sample_count = 0; assert( i == ck->i_entries_pts - 1 ); @@ -2814,7 +2819,6 @@ else { ck->p_sample_count_pts[i] = i_current_index_samples_left; - ck->p_sample_offset_pts[i] = i_ctsdelta; i_sample_count -= i_current_index_samples_left; i_current_index_samples_left = 0; i_index++; @@ -2825,7 +2829,6 @@ if ( ctts->pi_sample_count[i_index] > i_sample_count ) { ck->p_sample_count_pts[i] = i_sample_count; - ck->p_sample_offset_pts[i] = i_ctsdelta; i_current_index_samples_left = ctts->pi_sample_count[i_index] - i_sample_count; i_sample_count = 0; assert( i == ck->i_entries_pts - 1 ); @@ -2834,13 +2837,10 @@ else { ck->p_sample_count_pts[i] = ctts->pi_sample_count[i_index]; - ck->p_sample_offset_pts[i] = i_ctsdelta; i_sample_count -= ctts->pi_sample_count[i_index]; i_index++; } } - - } } } @@ -2933,7 +2933,7 @@ return VLC_EGENERIC; } - MP4_Box_t *p_sample = MP4_BoxGet( p_track->p_stsd, "[%d]", + MP4_Box_t *p_sample = MP4_BoxGetVa( p_track->p_stsd, "[%u]", i_sample_description_index - 1 ); if( !p_sample || @@ -3026,15 +3026,18 @@ const MP4_Box_t *p_stss; if( ( p_stss = MP4_BoxGet( p_track->p_stbl, "stss" ) ) ) { + /* XXX in libmp4 sample begin at 0 */ + const uint32_t stts_sample = i_sample + 1; const MP4_Box_data_stss_t *p_stss_data = BOXDATA(p_stss); msg_Dbg( p_demux, "track[Id 0x%x] using Sync Sample Box (stss)", p_track->i_track_ID ); for( unsigned i_index = 0; i_index < p_stss_data->i_entry_count; i_index++ ) { - if( i_index >= p_stss_data->i_entry_count - 1 || - i_sample < p_stss_data->i_sample_number[i_index+1] ) + if(( i_index == p_stss_data->i_entry_count - 1 || + stts_sample < p_stss_data->i_sample_number[i_index+1] ) && + p_stss_data->i_sample_number[i_index] != 0 ) { - *pi_sync_sample = p_stss_data->i_sample_number[i_index]; + *pi_sync_sample = p_stss_data->i_sample_number[i_index] - 1; msg_Dbg( p_demux, "stss gives %d --> %" PRIu32 " (sample number)", i_sample, *pi_sync_sample ); i_ret = VLC_SUCCESS; @@ -4244,10 +4247,10 @@ } *p_duration = i_traf_duration; - break; + return true; } - return true; + return false; } static int ProbeFragments( demux_t *p_demux, bool b_force, bool *pb_fragmented ) @@ -4296,29 +4299,25 @@ for( unsigned i=0; ii_tracks; i++ ) { - stime_t i_duration = 0; MP4_Box_t *p_tfdt = NULL; MP4_Box_t *p_traf = MP4_GetTrafByTrackID( p_moof, p_sys->track[i].i_track_ID ); if( p_traf ) p_tfdt = MP4_BoxGet( p_traf, "tfdt" ); - /* Set first fragment time offset from moov */ - if( index == 0 ) - pi_track_times[i] = GetMoovTrackDuration( p_sys, p_sys->track[i].i_track_ID ); - if( p_tfdt && BOXDATA(p_tfdt) ) { pi_track_times[i] = p_tfdt->data.p_tfdt->i_base_media_decode_time; } else if( index == 0 ) /* Set first fragment time offset from moov */ { - i_duration = GetMoovTrackDuration( p_sys, p_sys->track[i].i_track_ID ); + stime_t i_duration = GetMoovTrackDuration( p_sys, p_sys->track[i].i_track_ID ); pi_track_times[i] = MP4_rescale( i_duration, p_sys->i_timescale, p_sys->track[i].i_timescale ); } stime_t i_movietime = MP4_rescale( pi_track_times[i], p_sys->track[i].i_timescale, p_sys->i_timescale ); p_sys->p_fragsindex->p_times[index * p_sys->i_tracks + i] = i_movietime; + stime_t i_duration = 0; if( GetMoofTrackDuration( p_sys->p_moov, p_moof, p_sys->track[i].i_track_ID, &i_duration ) ) pi_track_times[i] += i_duration; } @@ -4658,7 +4657,7 @@ continue; const MP4_Box_t *p_tfhd = MP4_BoxGet( p_traf, "tfhd" ); - const uint32_t i_trun_count = MP4_BoxCount( p_traf, "trun" ); + uint32_t i_trun_count = MP4_BoxCount( p_traf, "trun" ); if ( !p_tfhd || !i_trun_count ) continue; @@ -4666,9 +4665,12 @@ if( !p_track ) continue; - p_track->context.runs.p_array = calloc(i_trun_count, sizeof(mp4_run_t)); + p_track->context.runs.p_array = realloc_or_free(p_track->context.runs.p_array, + (i_trun_count + p_track->context.runs.i_count) * sizeof(mp4_run_t)); if(!p_track->context.runs.p_array) continue; + memset(&p_track->context.runs.p_array[i_trun_count], 0, p_track->context.runs.i_count * sizeof(mp4_run_t)); + i_trun_count += p_track->context.runs.i_count; /* Get defaults for this/these RUN */ uint32_t i_track_defaultsamplesize = 0; @@ -4746,8 +4748,10 @@ { if( i_moof_time != INT64_MAX ) i_traf_start_time = MP4_rescale( i_moof_time, p_sys->i_timescale, p_track->i_timescale ); - else /* That should not happen */ + else if ( p_sys->i_nztime != INT64_MAX ) /* That should not happen */ i_traf_start_time = MP4_rescale_qtime( p_sys->i_nztime, p_track->i_timescale ); + else /* That should not happen */ + i_traf_start_time = p_track->i_time; } } @@ -4822,6 +4826,7 @@ MP4_rescale_mtime( i_trun_dts, p_track->i_timescale ), i_trun_data_offset ); #endif //************ + assert(p_track->context.runs.i_count < i_trun_count); mp4_run_t *p_run = &p_track->context.runs.p_array[p_track->context.runs.i_count++]; p_run->i_first_dts = i_trun_dts; p_run->i_offset = i_trun_data_offset; @@ -4910,18 +4915,8 @@ stime_t i_track_target_time = MP4_rescale_qtime( i_target_time, p_track->i_timescale ); for ( uint32_t i = 0; ii_number_of_entries; i += ( p_data->i_version == 1 ) ? 2 : 1 ) { - vlc_tick_t i_time; - uint64_t i_offset; - if ( p_data->i_version == 1 ) - { - i_time = *((uint64_t *)(p_data->p_time + i)); - i_offset = *((uint64_t *)(p_data->p_moof_offset + i)); - } - else - { - i_time = p_data->p_time[i]; - i_offset = p_data->p_moof_offset[i]; - } + stime_t i_time = p_data->p_time[i]; + uint64_t i_offset = p_data->p_moof_offset[i]; if ( i_time >= i_track_target_time ) { diff -Nru vlc-3.0.21/modules/demux/mp4/mp4.h vlc-3.0.22/modules/demux/mp4/mp4.h --- vlc-3.0.21/modules/demux/mp4/mp4.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mp4/mp4.h 2025-11-13 22:17:54.000000000 +0000 @@ -92,7 +92,7 @@ uint32_t i_block_flags; uint32_t i_next_block_flags; uint8_t rgi_chans_reordering[AOUT_CHAN_MAX]; - bool b_chans_reorder; + uint8_t i_chans_to_reorder; es_out_id_t *p_es; /* display size only ! */ diff -Nru vlc-3.0.21/modules/demux/mpeg/es.c vlc-3.0.22/modules/demux/mpeg/es.c --- vlc-3.0.21/modules/demux/mpeg/es.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/es.c 2025-11-13 22:17:54.000000000 +0000 @@ -872,7 +872,7 @@ { const uint32_t i_bytesdev = bs_read(&p_cur->br, p_sys->mllt.i_bits_per_bytes_dev); const uint32_t i_msdev = bs_read(&p_cur->br, p_sys->mllt.i_bits_per_ms_dev); - const vlc_tick_t i_deltatime = (p_sys->mllt.i_ms_btw_refs + i_msdev) * INT64_C(1000); + const vlc_tick_t i_deltatime = VLC_TICK_FROM_MS(p_sys->mllt.i_ms_btw_refs + i_msdev); if( p_cur->i_time + i_deltatime > *pi_time ) break; p_cur->i_time += i_deltatime; diff -Nru vlc-3.0.21/modules/demux/mpeg/pes.h vlc-3.0.22/modules/demux/mpeg/pes.h --- vlc-3.0.21/modules/demux/mpeg/pes.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/pes.h 2025-11-13 22:17:54.000000000 +0000 @@ -20,7 +20,9 @@ #ifndef VLC_MPEG_PES_H #define VLC_MPEG_PES_H -static inline bool ExtractPESTimestamp( const uint8_t *p_data, uint8_t i_flags, vlc_tick_t *ret ) +#include "timestamps.h" + +static inline bool ExtractPESTimestamp( const uint8_t *p_data, uint8_t i_flags, ts_90khz_t *ret ) { /* !warn broken muxers set incorrect flags. see #17773 and #19140 */ /* check marker bits, and i_flags = b 0010, 0011 or 0001 */ @@ -32,29 +34,29 @@ return false; - *ret = ((vlc_tick_t)(p_data[ 0]&0x0e ) << 29)| - (vlc_tick_t)(p_data[1] << 22)| - ((vlc_tick_t)(p_data[2]&0xfe) << 14)| - (vlc_tick_t)(p_data[3] << 7)| - (vlc_tick_t)(p_data[4] >> 1); + *ret = ((ts_90khz_t)(p_data[ 0]&0x0e ) << 29)| + (ts_90khz_t)(p_data[1] << 22)| + ((ts_90khz_t)(p_data[2]&0xfe) << 14)| + (ts_90khz_t)(p_data[3] << 7)| + (ts_90khz_t)(p_data[4] >> 1); return true; } /* PS SCR timestamp as defined in H222 2.5.3.2 */ -static inline vlc_tick_t ExtractPackHeaderTimestamp( const uint8_t *p_data ) +static inline ts_90khz_t ExtractPackHeaderTimestamp( const uint8_t *p_data ) { - return ((vlc_tick_t)(p_data[ 0]&0x38 ) << 27)| - ((vlc_tick_t)(p_data[0]&0x03 ) << 28)| - (vlc_tick_t)(p_data[1] << 20)| - ((vlc_tick_t)(p_data[2]&0xf8 ) << 12)| - ((vlc_tick_t)(p_data[2]&0x03 ) << 13)| - (vlc_tick_t)(p_data[3] << 5) | - (vlc_tick_t)(p_data[4] >> 3); + return ((ts_90khz_t)(p_data[0]&0x38 ) << 27)| + ((ts_90khz_t)(p_data[0]&0x03 ) << 28)| + (ts_90khz_t)(p_data[1] << 20)| + ((ts_90khz_t)(p_data[2]&0xf8 ) << 12)| + ((ts_90khz_t)(p_data[2]&0x03 ) << 13)| + (ts_90khz_t)(p_data[3] << 5) | + (ts_90khz_t)(p_data[4] >> 3); } inline static int ParsePESHeader( vlc_object_t *p_object, const uint8_t *p_header, size_t i_header, - unsigned *pi_skip, vlc_tick_t *pi_dts, vlc_tick_t *pi_pts, + unsigned *pi_skip, ts_90khz_t *pi_dts, ts_90khz_t *pi_pts, uint8_t *pi_stream_id, bool *pb_pes_scambling ) { unsigned i_skip; @@ -82,6 +84,8 @@ if( ( p_header[6]&0xC0 ) == 0x80 ) { /* mpeg2 PES */ + // 9 = syncword(3), stream ID(1), length(2), MPEG2 PES(1), flags(1), header_len(1) + // p_header[8] = header_len(1) i_skip = p_header[8] + 9; if( pb_pes_scambling ) diff -Nru vlc-3.0.21/modules/demux/mpeg/ps.c vlc-3.0.22/modules/demux/mpeg/ps.c --- vlc-3.0.21/modules/demux/mpeg/ps.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ps.c 2025-11-13 22:17:54.000000000 +0000 @@ -110,6 +110,7 @@ CDXA_PS, PSMF_PS, } format; + enum ps_source source; }; static int Demux ( demux_t *p_demux ); @@ -224,6 +225,19 @@ p_sys->b_seekable = false; p_sys->format = format; + p_sys->source = PS_SOURCE_UNKNOWN; + if ( likely(p_demux->s->psz_url != NULL) ) + { + size_t url_len = strlen( p_demux->s->psz_url ); + if ( url_len >= 4 ) + { + if ( !strncasecmp( &p_demux->s->psz_url[url_len-4], ".AOB", 4 )) + p_sys->source = PS_SOURCE_AOB; + if ( !strncasecmp( &p_demux->s->psz_url[url_len-4], ".VOB", 4 )) + p_sys->source = PS_SOURCE_VOB; + } + } + vlc_stream_Control( p_demux->s, STREAM_CAN_SEEK, &p_sys->b_seekable ); ps_psm_init( &p_sys->psm ); @@ -296,7 +310,7 @@ return VLC_DEMUXER_EOF; } - i_id = ps_pkt_id( p_pkt ); + i_id = ps_pkt_id( p_pkt, p_sys->source ); if( i_id >= 0xc0 ) { ps_track_t *tk = &p_sys->tk[ps_id_to_tk(i_id)]; @@ -508,18 +522,18 @@ case PS_STREAM_ID_PRIVATE_STREAM1: case PS_STREAM_ID_EXTENDED: { - int i_id = ps_pkt_id( p_pkt ); + int i_id = ps_pkt_id( p_pkt, p_sys->source ); /* Small heuristic to improve MLP detection from AOB */ - if( i_id == 0xa001 && + if( i_id == PS_AOB_PACKET_ID_MLP && p_sys->i_aob_mlp_count < 500 ) { p_sys->i_aob_mlp_count++; } - else if( i_id == 0xbda1 && + else if( i_id == PS_VOB_PACKET_ID_MLP && p_sys->i_aob_mlp_count > 0 ) { p_sys->i_aob_mlp_count--; - i_id = 0xa001; + i_id = PS_AOB_PACKET_ID_MLP; } bool b_new = false; diff -Nru vlc-3.0.21/modules/demux/mpeg/ps.h vlc-3.0.22/modules/demux/mpeg/ps.h --- vlc-3.0.21/modules/demux/mpeg/ps.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ps.h 2025-11-13 22:17:54.000000000 +0000 @@ -35,18 +35,32 @@ #define PS_STREAM_ID_EXTENDED 0xFD #define PS_STREAM_ID_DIRECTORY 0xFF -/* 256-0xC0 for normal stream, 256 for 0xbd stream, 256 for 0xfd stream, 8 for 0xa0 AOB stream */ +#define PS_PACKET_ID_MASK_VOB 0xBD00 +#define PS_PACKET_ID_MASK_AOB 0xA000 +#define PS_PACKET_ID_MASK_EXTENDED 0xFD00 + +#define PS_AOB_PACKET_ID_LPCM (PS_PACKET_ID_MASK_AOB | 0x00) +#define PS_AOB_PACKET_ID_MLP (PS_PACKET_ID_MASK_AOB | 0x01) +#define PS_VOB_PACKET_ID_MLP (PS_PACKET_ID_MASK_VOB | 0xA1) + +enum ps_source { + PS_SOURCE_UNKNOWN, // any PS/PES source + PS_SOURCE_VOB, // when reading a DVD-Video + PS_SOURCE_AOB, // when reading a DVD-Audio +}; + +/* 256-0xC0 for normal stream, 256 for VOB stream, 256 for EVOB stream, 8 for AOB stream */ #define PS_TK_COUNT (256+256+256+8 - 0xc0) static inline int ps_id_to_tk( unsigned i_id ) { if( i_id <= 0xff ) return i_id - 0xc0; - else if( (i_id & 0xff00) == 0xbd00 ) + if( (i_id & 0xff00) == PS_PACKET_ID_MASK_VOB ) return 256-0xC0 + (i_id & 0xff); - else if( (i_id & 0xff00) == 0xfd00 ) + if( (i_id & 0xff00) == PS_PACKET_ID_MASK_EXTENDED ) return 512-0xc0 + (i_id & 0xff); - else - return 768-0xc0 + (i_id & 0x07); + assert( (i_id & 0xff00) == PS_PACKET_ID_MASK_AOB ); + return 768-0xc0 + (i_id & 0x07); } typedef struct ps_psm_t ps_psm_t; @@ -125,7 +139,7 @@ tk->i_skip = 0; tk->i_id = i_id; - if( ( i_id&0xff00 ) == 0xbd00 ) /* 0xBD00 -> 0xBDFF, Private Stream 1 */ + if( ( i_id&0xff00 ) == PS_PACKET_ID_MASK_VOB ) /* 0xBD00 -> 0xBDFF, VOB Private Stream 1 */ { if( ( i_id&0xf8 ) == 0x88 || /* 0x88 -> 0x8f - Can be DTS-HD primary audio in evob */ ( i_id&0xf8 ) == 0x98 ) /* 0x98 -> 0x9f - Can be DTS-HD secondary audio in evob */ @@ -192,7 +206,7 @@ return VLC_EGENERIC; } } - else if( (i_id&0xff00) == 0xfd00 ) /* 0xFD00 -> 0xFDFF */ + else if( (i_id&0xff00) == PS_PACKET_ID_MASK_EXTENDED ) /* EVOB: 0xFD00 -> 0xFDFF */ { uint8_t i_sub_id = i_id & 0xff; if( ( i_sub_id >= 0x55 && i_sub_id <= 0x5f ) || /* Can be primary VC-1 in evob */ @@ -206,7 +220,7 @@ return VLC_EGENERIC; } } - else if( (i_id&0xff00) == 0xa000 ) /* 0xA000 -> 0xA0FF */ + else if( (i_id&0xff00) == PS_PACKET_ID_MASK_AOB ) /* AOB: 0xA000 -> 0xA0FF */ { uint8_t i_sub_id = i_id & 0x07; if( i_sub_id == 0 ) @@ -316,9 +330,9 @@ } /* return the id of a PES (should be valid) */ -static inline int ps_pkt_id( block_t *p_pkt ) +static inline int ps_pkt_id( block_t *p_pkt, enum ps_source source ) { - if( p_pkt->p_buffer[3] == 0xbd ) + if( p_pkt->p_buffer[3] == PS_STREAM_ID_PRIVATE_STREAM1 ) { uint8_t i_sub_id = 0; if( p_pkt->i_buffer >= 9 && @@ -327,22 +341,26 @@ const unsigned i_start = 9 + p_pkt->p_buffer[8]; i_sub_id = p_pkt->p_buffer[i_start]; - if( (i_sub_id & 0xfe) == 0xa0 && + if( i_sub_id == 0xa0 && p_pkt->i_buffer >= i_start + 7 && - ( p_pkt->p_buffer[i_start + 5] >= 0xc0 || - p_pkt->p_buffer[i_start + 6] != 0x80 ) ) + p_pkt->p_buffer[i_start + 6] != 0x80 ) + { + /* AOB LPCM extension */ + return PS_PACKET_ID_MASK_AOB | (i_sub_id & 0x01); + } + + if( i_sub_id == 0xa1 && + source == PS_SOURCE_AOB ) { - /* AOB LPCM/MLP extension - * XXX for MLP I think that the !=0x80 test is not good and - * will fail for some valid files */ - return 0xa000 | (i_sub_id & 0x01); + /* AOB MLP extension */ + return PS_PACKET_ID_MASK_AOB | (i_sub_id & 0x01); } } /* VOB extension */ - return 0xbd00 | i_sub_id; + return PS_PACKET_ID_MASK_VOB | i_sub_id; } - else if( p_pkt->p_buffer[3] == 0xfd && + if( p_pkt->p_buffer[3] == PS_STREAM_ID_EXTENDED && p_pkt->i_buffer >= 9 && (p_pkt->p_buffer[6]&0xC0) == 0x80 && /* mpeg2 */ (p_pkt->p_buffer[7]&0x01) == 0x01 ) /* extension_flag */ @@ -391,7 +409,7 @@ { int i_stream_id_extension_flag = (p_pkt->p_buffer[i_skip+1] >> 7)&0x1; if( i_stream_id_extension_flag == 0 ) - return 0xfd00 | (p_pkt->p_buffer[i_skip+1]&0x7f); + return PS_PACKET_ID_MASK_EXTENDED | (p_pkt->p_buffer[i_skip+1]&0x7f); } } } @@ -415,7 +433,7 @@ { if( i_peek >= 14 && (p[4] >> 6) == 0x01 ) return 14 + (p[13]&0x07); - else if( i_peek >= 12 && (p[4] >> 4) == 0x02 ) + if( i_peek >= 12 && (p[4] >> 4) == 0x02 ) return 12; } break; @@ -442,9 +460,10 @@ } else if( p_pkt->i_buffer >= 12 && (p[4] >> 4) == 0x02 ) /* MPEG-1 Pack SCR, same bits as PES/PTS */ { - if(!ExtractPESTimestamp( &p[4], 0x02, pi_scr )) + ts_90khz_t i_scr; + if(!ExtractPESTimestamp( &p[4], 0x02, &i_scr )) return VLC_EGENERIC; - *pi_scr = FROM_SCALE_NZ( *pi_scr ); + *pi_scr = FROM_SCALE_NZ( i_scr ); *pi_mux_rate = ( ( p[9]&0x7f )<< 15 )|( p[10] << 7 )|( p[11] >> 1); } else @@ -494,8 +513,8 @@ static inline int ps_pkt_parse_pes( vlc_object_t *p_object, block_t *p_pes, int i_skip_extra ) { unsigned int i_skip = 0; - vlc_tick_t i_pts = -1; - vlc_tick_t i_dts = -1; + ts_90khz_t i_pts = TS_90KHZ_INVALID; + ts_90khz_t i_dts = TS_90KHZ_INVALID; uint8_t i_stream_id = 0; bool b_pes_scrambling = false; @@ -509,7 +528,8 @@ if( i_skip_extra >= 0 ) i_skip += i_skip_extra; else if( p_pes->i_buffer > i_skip + 3 && - ( ps_pkt_id( p_pes ) == 0xa001 || ps_pkt_id( p_pes ) == 0xbda1 ) ) + ( ps_pkt_id( p_pes, PS_SOURCE_AOB ) == PS_AOB_PACKET_ID_MLP || + ps_pkt_id( p_pes, PS_SOURCE_VOB ) == PS_VOB_PACKET_ID_MLP ) ) i_skip += 4 + p_pes->p_buffer[i_skip+3]; if( p_pes->i_buffer <= i_skip ) @@ -521,12 +541,12 @@ p_pes->i_buffer -= i_skip; /* ISO/IEC 13818-1 2.7.5: if no pts and no dts, then dts == pts */ - if( i_pts >= 0 && i_dts < 0 ) + if( i_pts != TS_90KHZ_INVALID && i_dts == TS_90KHZ_INVALID ) i_dts = i_pts; - if( i_dts >= 0 ) + if( i_dts != TS_90KHZ_INVALID ) p_pes->i_dts = FROM_SCALE( i_dts ); - if( i_pts >= 0 ) + if( i_pts != TS_90KHZ_INVALID ) p_pes->i_pts = FROM_SCALE( i_pts ); return VLC_SUCCESS; diff -Nru vlc-3.0.21/modules/demux/mpeg/timestamps.h vlc-3.0.22/modules/demux/mpeg/timestamps.h --- vlc-3.0.21/modules/demux/mpeg/timestamps.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/timestamps.h 2025-11-13 22:17:54.000000000 +0000 @@ -19,19 +19,32 @@ #ifndef VLC_MPEG_TIMESTAMPS_H #define VLC_MPEG_TIMESTAMPS_H -#define FROM_SCALE_NZ(x) ((x) * 100 / 9) +#define FROM_SCALE_NZ(x) (((vlc_tick_t)(x) * 100 / 9)) #define TO_SCALE_NZ(x) ((x) * 9 / 100) #define FROM_SCALE(x) (VLC_TICK_0 + FROM_SCALE_NZ(x)) #define TO_SCALE(x) TO_SCALE_NZ((x) - VLC_TICK_0) -static inline int64_t TimeStampWrapAround( int64_t i_first_pcr, int64_t i_time ) +typedef int64_t ts_90khz_t; +#define TS_90KHZ_INVALID -1 + + +#define TS_33BITS_ROLL_NZ FROM_SCALE_NZ(0x1FFFFFFFF) +#define TS_33BITS_HALF_ROLL_NZ FROM_SCALE_NZ(0x0FFFFFFFF) + +static inline vlc_tick_t TimeStampWrapAround( vlc_tick_t i_past_pcr, vlc_tick_t i_time ) { - int64_t i_adjust = 0; - if( i_first_pcr > 0x0FFFFFFFF && i_time < 0x0FFFFFFFF ) - i_adjust = 0x1FFFFFFFF; + if( i_past_pcr == VLC_TICK_INVALID || i_time >= i_past_pcr ) + return i_time; + + vlc_tick_t delta = i_past_pcr - i_time; + if( delta >= TS_33BITS_HALF_ROLL_NZ ) + { + vlc_tick_t rolls = (delta + TS_33BITS_ROLL_NZ - 1) / TS_33BITS_ROLL_NZ; + i_time += rolls * TS_33BITS_ROLL_NZ; + } - return i_time + i_adjust; + return i_time; } #endif diff -Nru vlc-3.0.21/modules/demux/mpeg/ts.c vlc-3.0.22/modules/demux/mpeg/ts.c --- vlc-3.0.21/modules/demux/mpeg/ts.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts.c 2025-11-13 22:17:54.000000000 +0000 @@ -39,6 +39,7 @@ #include "ts_pid.h" #include "ts_streams.h" #include "ts_streams_private.h" +#include "ts_pes.h" #include "ts_psi.h" #include "ts_si.h" #include "ts_psip.h" @@ -188,17 +189,17 @@ { return ( (p->p_buffer[1]&0x1f)<<8 )|p->p_buffer[2]; } -static vlc_tick_t GetPCR( const block_t * ); +static ts_90khz_t GetPCR( const block_t * ); static block_t * ProcessTSPacket( demux_t *p_demux, ts_pid_t *pid, block_t *p_pkt, int * ); -static bool GatherPESData( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk, size_t ); static bool GatherSectionsData( demux_t *p_demux, ts_pid_t *, block_t *, size_t ); +static bool GatherPESData( demux_t *p_demux, ts_pid_t *, block_t *, size_t ); static void ProgramSetPCR( demux_t *p_demux, ts_pmt_t *p_prg, vlc_tick_t i_pcr ); static block_t* ReadTSPacket( demux_t *p_demux ); -static int SeekToTime( demux_t *p_demux, const ts_pmt_t *, int64_t time ); +static int SeekToTime( demux_t *p_demux, const ts_pmt_t *, vlc_tick_t time ); static void ReadyQueuesPostSeek( demux_t *p_demux ); -static void PCRHandle( demux_t *p_demux, ts_pid_t *, vlc_tick_t ); +static void PCRHandle( demux_t *p_demux, ts_pid_t *, ts_90khz_t ); static void PCRFixHandle( demux_t *, ts_pmt_t *, block_t * ); #define TS_PACKET_SIZE_188 188 @@ -409,7 +410,7 @@ vlc_dictionary_init( &p_sys->attachments, 0 ); - p_sys->patfix.i_first_dts = -1; + p_sys->patfix.i_first_dts = VLC_TICK_INVALID; p_sys->patfix.i_timesourcepid = 0; p_sys->patfix.status = var_CreateGetBool( p_demux, "ts-patfix" ) ? PAT_WAITING : PAT_FIXTRIED; @@ -690,8 +691,8 @@ } /* Adaptation field cannot be scrambled */ - vlc_tick_t i_pcr = GetPCR( p_pkt ); - if( i_pcr > VLC_TICK_INVALID ) + ts_90khz_t i_pcr = GetPCR( p_pkt ); + if( i_pcr != TS_90KHZ_INVALID ) PCRHandle( p_demux, p_pid, i_pcr ); /* Probe streams to build PAT/PMT after MIN_PAT_INTERVAL in case we don't see any PAT */ @@ -930,14 +931,13 @@ if( !p_sys->b_ignore_time_for_positions && p_pmt && - p_pmt->pcr.i_first > -1 && p_pmt->i_last_dts > VLC_TICK_INVALID && - p_pmt->pcr.i_current > -1 ) + p_pmt->pcr.i_first != VLC_TICK_INVALID && + p_pmt->i_last_dts != VLC_TICK_INVALID && + p_pmt->pcr.i_current != VLC_TICK_INVALID ) { - double i_length = TimeStampWrapAround( p_pmt->pcr.i_first, - p_pmt->i_last_dts ) - p_pmt->pcr.i_first; + double i_length = p_pmt->i_last_dts - p_pmt->pcr.i_first; i_length += p_pmt->pcr.i_pcroffset; - double i_pos = TimeStampWrapAround( p_pmt->pcr.i_first, - p_pmt->pcr.i_current ) - p_pmt->pcr.i_first; + double i_pos = p_pmt->pcr.i_current - p_pmt->pcr.i_first; if( i_length > 0 ) { *pf = i_pos / i_length; @@ -963,30 +963,30 @@ if( p_sys->b_access_control && !p_sys->b_ignore_time_for_positions && b_bool && p_pmt ) { - time_t i_time, i_length; + time_t i_time, i_length = 0; + vlc_tick_t i_seektime = VLC_TICK_0 + vlc_tick_from_sec( i_length * f ); if( !EITCurrentEventTime( p_pmt, p_sys, &i_time, &i_length ) && - i_length > 0 && !SeekToTime( p_demux, p_pmt, (int64_t)(TO_SCALE(i_length * CLOCK_FREQ) * f) ) ) + i_length > 0 && !SeekToTime( p_demux, p_pmt, i_seektime ) ) { ReadyQueuesPostSeek( p_demux ); - es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, - (int64_t)(TO_SCALE(i_length * CLOCK_FREQ) * f) ); + es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, i_seektime ); return VLC_SUCCESS; } } if( !p_sys->b_ignore_time_for_positions && b_bool && p_pmt && - p_pmt->pcr.i_first > -1 && p_pmt->i_last_dts > VLC_TICK_INVALID && - p_pmt->pcr.i_current > -1 ) + p_pmt->pcr.i_first != VLC_TICK_INVALID && + p_pmt->i_last_dts != VLC_TICK_INVALID && + p_pmt->pcr.i_current != VLC_TICK_INVALID ) { - int64_t i_length = TimeStampWrapAround( p_pmt->pcr.i_first, - p_pmt->i_last_dts ) - p_pmt->pcr.i_first; - i64 = p_pmt->pcr.i_first + (int64_t)(i_length * f); + vlc_tick_t i_length = p_pmt->i_last_dts - p_pmt->pcr.i_first; + i64 = p_pmt->pcr.i_first + i_length * f; if( i64 <= p_pmt->i_last_dts ) { if( !SeekToTime( p_demux, p_pmt, i64 ) ) { ReadyQueuesPostSeek( p_demux ); - es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, FROM_SCALE(i64) ); + es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, i64 ); return VLC_SUCCESS; } } @@ -1004,12 +1004,12 @@ case DEMUX_SET_TIME: i64 = va_arg( args, int64_t ); - if( p_sys->b_canseek && p_pmt && p_pmt->pcr.i_first > -1 && - !SeekToTime( p_demux, p_pmt, p_pmt->pcr.i_first + TO_SCALE(i64) ) ) + if( p_sys->b_canseek && p_pmt && p_pmt->pcr.i_first != VLC_TICK_INVALID && + !SeekToTime( p_demux, p_pmt, p_pmt->pcr.i_first + i64 ) ) { ReadyQueuesPostSeek( p_demux ); es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, - FROM_SCALE(p_pmt->pcr.i_first) + i64 - VLC_TICK_0 ); + p_pmt->pcr.i_first + i64 - VLC_TICK_0 ); return VLC_SUCCESS; } break; @@ -1027,10 +1027,9 @@ } } - if( p_pmt && p_pmt->pcr.i_current > -1 && p_pmt->pcr.i_first > -1 ) + if( p_pmt && p_pmt->pcr.i_current != VLC_TICK_INVALID && p_pmt->pcr.i_first != VLC_TICK_INVALID ) { - int64_t i_pcr = TimeStampWrapAround( p_pmt->pcr.i_first, p_pmt->pcr.i_current ); - *pi64 = FROM_SCALE(i_pcr - p_pmt->pcr.i_first); + *pi64 = p_pmt->pcr.i_current - p_pmt->pcr.i_first; return VLC_SUCCESS; } break; @@ -1050,14 +1049,14 @@ if( !p_sys->b_ignore_time_for_positions && p_pmt && - ( p_pmt->pcr.i_first > -1 || p_pmt->pcr.i_first_dts > VLC_TICK_INVALID ) && - p_pmt->i_last_dts > 0 ) + ( p_pmt->pcr.i_first != VLC_TICK_INVALID || p_pmt->pcr.i_first_dts != VLC_TICK_INVALID ) && + p_pmt->i_last_dts != VLC_TICK_INVALID ) { - int64_t i_start = (p_pmt->pcr.i_first > -1) ? p_pmt->pcr.i_first : - TO_SCALE(p_pmt->pcr.i_first_dts); - int64_t i_last = TimeStampWrapAround( p_pmt->pcr.i_first, p_pmt->i_last_dts ); + vlc_tick_t i_start = (p_pmt->pcr.i_first != VLC_TICK_INVALID) ? p_pmt->pcr.i_first : + p_pmt->pcr.i_first_dts; + vlc_tick_t i_last = p_pmt->i_last_dts; i_last += p_pmt->pcr.i_pcroffset; - *pi64 = FROM_SCALE(i_last - i_start); + *pi64 = i_last - i_start; return VLC_SUCCESS; } break; @@ -1304,7 +1303,7 @@ uint16_t i_den = GetWBE( &p_buf[8] ); uint16_t i_num = GetWBE( &p_buf[10] ); - if( i_den == 0 ) + if( i_den == 0 || i_num == 0 ) goto invalid; p_block->i_length = CLOCK_FREQ * i_den / i_num; @@ -1319,6 +1318,33 @@ return NULL; } +static vlc_tick_t GetTimeForUntimed( const ts_pmt_t *p_pmt ) +{ + vlc_tick_t i_ts = p_pmt->pcr.i_current; + const ts_stream_t *p_cand = NULL; + for( int i=0; i< p_pmt->e_streams.i_size; i++ ) + { + const ts_pid_t *p_pid = p_pmt->e_streams.p_elems[i]; + if( (p_pid->i_flags & FLAG_FILTERED) && SEEN(p_pid) && + p_pid->type == TYPE_STREAM && + p_pid->u.p_stream->p_es && + p_pid->u.p_stream->i_last_dts != VLC_TICK_INVALID ) + { + const ts_es_t *p_es = p_pid->u.p_stream->p_es; + if( p_es->fmt.i_cat == VIDEO_ES || p_es->fmt.i_cat == AUDIO_ES ) + { + if( !p_cand || (p_es->fmt.i_cat == VIDEO_ES && + p_cand->p_es->fmt.i_cat != VIDEO_ES) ) + { + p_cand = p_pid->u.p_stream; + i_ts = p_cand->i_last_dts; + } + } + } + } + return i_ts; +} + static block_t * ConvertPESBlock( demux_t *p_demux, ts_es_t *p_es, size_t i_pes_size, uint8_t i_stream_id, block_t *p_block ) @@ -1339,13 +1365,21 @@ } else if( p_es->fmt.i_codec == VLC_CODEC_TELETEXT ) { - if( p_block->i_pts <= VLC_TICK_INVALID ) + const ts_pmt_t *p_pmt = p_es->p_program; + if( p_block->i_pts != VLC_TICK_INVALID && + p_pmt->pcr.i_current != VLC_TICK_INVALID ) + { + /* Teletext can have totally offset timestamps... RAI1, German */ + if( p_pmt->pcr.i_current < p_block->i_pts || p_pmt->pcr.i_current - p_block->i_pts > CLOCK_FREQ ) + p_block->i_dts = p_block->i_pts = VLC_TICK_INVALID; + } + if( p_block->i_pts == VLC_TICK_INVALID ) { /* Teletext may have missing PTS (ETSI EN 300 472 Annexe A) * In this case use the last PCR + 40ms */ - vlc_tick_t i_pcr = p_es->p_program->pcr.i_current; - if( i_pcr > VLC_TICK_INVALID ) - p_block->i_pts = FROM_SCALE(i_pcr) + 40000; + vlc_tick_t i_ts = GetTimeForUntimed( p_es->p_program ); + if( i_ts != VLC_TICK_INVALID ) + p_block->i_dts = p_block->i_pts = i_ts + VLC_TICK_FROM_MS(40); } } else if( p_es->fmt.i_codec == VLC_CODEC_ARIB_A || @@ -1448,14 +1482,16 @@ * gathering stuff ****************************************************************************/ static void ParsePESDataChain( demux_t *p_demux, ts_pid_t *pid, block_t *p_pes, - int64_t i_append_pcr ) + ts_90khz_t i_append_pcr ) { uint8_t header[34]; unsigned i_pes_size = 0; unsigned i_skip = 0; - vlc_tick_t i_dts = -1; - vlc_tick_t i_pts = -1; - vlc_tick_t i_length = 0; + ts_90khz_t i_pktdts = TS_90KHZ_INVALID; + ts_90khz_t i_pktpts = TS_90KHZ_INVALID; + ts_90khz_t i_length = 0; + vlc_tick_t i_dts = VLC_TICK_INVALID; + vlc_tick_t i_pts = VLC_TICK_INVALID; uint8_t i_stream_id; bool b_pes_scrambling = false; const es_mpeg4_descriptor_t *p_mpeg4desc = NULL; @@ -1486,17 +1522,17 @@ ts_es_t *p_es = pid->u.p_stream->p_es; if( ParsePESHeader( VLC_OBJECT(p_demux), (uint8_t*)&header, i_max, &i_skip, - &i_dts, &i_pts, &i_stream_id, &b_pes_scrambling ) == VLC_EGENERIC ) + &i_pktdts, &i_pktpts, &i_stream_id, &b_pes_scrambling ) == VLC_EGENERIC ) { block_ChainRelease( p_pes ); return; } else { - if( i_pts != -1 && p_es->p_program ) - i_pts = TimeStampWrapAround( p_es->p_program->pcr.i_first, i_pts ); - if( i_dts != -1 && p_es->p_program ) - i_dts = TimeStampWrapAround( p_es->p_program->pcr.i_first, i_dts ); + if( i_pktpts != TS_90KHZ_INVALID && p_es->p_program ) + i_pts = TimeStampWrapAround( p_es->p_program->pcr.i_first, FROM_SCALE(i_pktpts) ); + if( i_pktdts != TS_90KHZ_INVALID && p_es->p_program ) + i_dts = TimeStampWrapAround( p_es->p_program->pcr.i_first, FROM_SCALE(i_pktdts) ); if( b_pes_scrambling ) p_pes->i_flags |= BLOCK_FLAG_SCRAMBLED; } @@ -1555,9 +1591,12 @@ } /* ISO/IEC 13818-1 2.7.5: if no pts and no dts, then dts == pts */ - if( i_pts >= 0 && i_dts < 0 ) + if( i_pts != VLC_TICK_INVALID && i_dts == VLC_TICK_INVALID ) i_dts = i_pts; + if( i_dts != VLC_TICK_INVALID ) + pid->u.p_stream->i_last_dts = i_dts; + if( p_pes ) { ts_pmt_t *p_pmt = p_es->p_program; @@ -1567,11 +1606,11 @@ return; } - if( i_dts >= 0 ) - p_pes->i_dts = FROM_SCALE(i_dts); + if( i_dts != VLC_TICK_INVALID ) + p_pes->i_dts = i_dts; - if( i_pts >= 0 ) - p_pes->i_pts = FROM_SCALE(i_pts); + if( i_pts != VLC_TICK_INVALID ) + p_pes->i_pts = i_pts; p_pes->i_length = FROM_SCALE_NZ(i_length); @@ -1585,7 +1624,7 @@ if( !p_pmt->pcr.b_fix_done ) /* Not seen yet */ PCRFixHandle( p_demux, p_pmt, p_block ); - if( p_es->id && (p_pmt->pcr.i_current > -1 || p_pmt->pcr.b_disable) ) + if( p_es->id && (p_pmt->pcr.i_current != VLC_TICK_INVALID || p_pmt->pcr.b_disable) ) { if( pid->u.p_stream->prepcr.p_head ) { @@ -1603,34 +1642,31 @@ if ( p_pmt->pcr.b_disable && p_block->i_dts > VLC_TICK_INVALID && ( p_pmt->i_pid_pcr == pid->i_pid || p_pmt->i_pid_pcr == 0x1FFF ) ) { - ProgramSetPCR( p_demux, p_pmt, TO_SCALE(p_block->i_dts) - 120000 ); + ProgramSetPCR( p_demux, p_pmt, p_block->i_dts - 120000 ); } /* Compute PCR/DTS offset if any */ - int64_t i_pcrref = i_append_pcr > VLC_TICK_INVALID ? i_append_pcr : p_pmt->pcr.i_first; - if( p_pmt->pcr.i_pcroffset == -1 && p_block->i_dts > VLC_TICK_INVALID && - i_pcrref > VLC_TICK_INVALID && - (p_es->fmt.i_cat == VIDEO_ES || p_es->fmt.i_cat == AUDIO_ES) ) + vlc_tick_t i_pcrref = (i_append_pcr != TS_90KHZ_INVALID) ? FROM_SCALE(i_append_pcr) : p_pmt->pcr.i_first; + if( p_pmt->pcr.i_pcroffset == -1 && p_block->i_dts != VLC_TICK_INVALID && + i_pcrref != VLC_TICK_INVALID && + (p_es->fmt.i_cat == VIDEO_ES || p_es->fmt.i_cat == AUDIO_ES) ) { - int64_t i_dts27 = TO_SCALE(p_block->i_dts); - i_dts27 = TimeStampWrapAround( i_pcrref, i_dts27 ); - i_pcrref = TimeStampWrapAround( p_pmt->pcr.i_first, i_pcrref ); - if( i_dts27 + (CLOCK_FREQ/90000) < i_pcrref ) + if( p_block->i_dts + FROM_SCALE_NZ(CLOCK_FREQ/90000) < i_pcrref ) { - p_pmt->pcr.i_pcroffset = i_pcrref - i_dts27 + TO_SCALE_NZ(80000); + p_pmt->pcr.i_pcroffset = i_pcrref - p_block->i_dts + VLC_TICK_FROM_MS(80); msg_Warn( p_demux, "Broken stream: pid %d sends packets with dts %"PRId64 "us later than pcr, applying delay", - pid->i_pid, FROM_SCALE_NZ(i_pcrref - i_dts27) ); + pid->i_pid, i_pcrref - p_block->i_dts ); } else p_pmt->pcr.i_pcroffset = 0; } if( p_pmt->pcr.i_pcroffset != -1 ) { - if( p_block->i_dts > VLC_TICK_INVALID ) - p_block->i_dts += FROM_SCALE_NZ(p_pmt->pcr.i_pcroffset); - if( p_block->i_pts > VLC_TICK_INVALID ) - p_block->i_pts += FROM_SCALE_NZ(p_pmt->pcr.i_pcroffset); + if( p_block->i_dts != VLC_TICK_INVALID ) + p_block->i_dts += p_pmt->pcr.i_pcroffset; + if( p_block->i_pts != VLC_TICK_INVALID ) + p_block->i_pts += p_pmt->pcr.i_pcroffset; } /*** From here, block can become a chain again though conversion below ***/ @@ -1657,7 +1693,7 @@ block_ChainLastAppend( &pid->u.p_stream->prepcr.pp_last, p_block ); /* PCR Seen and no es->id, cleanup current and prepcr blocks */ - if( p_pmt->pcr.i_current > -1) + if( p_pmt->pcr.i_current != VLC_TICK_INVALID ) { block_ChainRelease( pid->u.p_stream->prepcr.p_head ); pid->u.p_stream->prepcr.p_head = NULL; @@ -1672,49 +1708,9 @@ } } -static bool PushPESBlock( demux_t *p_demux, ts_pid_t *pid, block_t *p_pkt, bool b_unit_start, - int64_t i_append_pcr ) +static void PESDataChainHandle( vlc_object_t *p_obj, void *priv, block_t *p_data, ts_90khz_t i_append_pcr ) { - bool b_ret = false; - ts_stream_t *p_pes = pid->u.p_stream; - - if ( b_unit_start && p_pes->gather.p_data ) - { - block_t *p_datachain = p_pes->gather.p_data; - /* Flush the pes from pid */ - p_pes->gather.p_data = NULL; - p_pes->gather.i_data_size = 0; - p_pes->gather.i_gathered = 0; - p_pes->gather.pp_last = &p_pes->gather.p_data; - ParsePESDataChain( p_demux, pid, p_datachain, p_pes->gather.i_append_pcr ); - b_ret = true; - } - - if( b_unit_start ) - p_pes->gather.i_append_pcr = i_append_pcr; - - if( p_pkt == NULL ) - return b_ret; - - if( !b_unit_start && p_pes->gather.p_data == NULL ) - { - /* msg_Dbg( p_demux, "broken packet" ); */ - block_Release( p_pkt ); - return b_ret; - } - - block_ChainLastAppend( &p_pes->gather.pp_last, p_pkt ); - p_pes->gather.i_gathered += p_pkt->i_buffer; - - if( p_pes->gather.i_data_size > 0 && - p_pes->gather.i_gathered >= p_pes->gather.i_data_size ) - { - /* re-enter in Flush above */ - assert(p_pes->gather.p_data); - return PushPESBlock( p_demux, pid, NULL, true, i_append_pcr ); - } - - return b_ret; + ParsePESDataChain( (demux_t *)p_obj, (ts_pid_t *) priv, p_data, i_append_pcr ); } static block_t* ReadTSPacket( demux_t *p_demux ) @@ -1795,11 +1791,11 @@ return p_pkt; } -static vlc_tick_t GetPCR( const block_t *p_pkt ) +static ts_90khz_t GetPCR( const block_t *p_pkt ) { const uint8_t *p = p_pkt->p_buffer; - vlc_tick_t i_pcr = -1; + ts_90khz_t i_pcr = TS_90KHZ_INVALID; if(unlikely(p_pkt->i_buffer < 12)) return i_pcr; @@ -1812,11 +1808,11 @@ ( p[5] & 0x10 ) ) /* PCR carry flag */ { /* PCR is 33 bits */ - i_pcr = ( (vlc_tick_t)p[6] << 25 ) | - ( (vlc_tick_t)p[7] << 17 ) | - ( (vlc_tick_t)p[8] << 9 ) | - ( (vlc_tick_t)p[9] << 1 ) | - ( (vlc_tick_t)p[10] >> 7 ); + i_pcr = ( (ts_90khz_t)p[6] << 25 ) | + ( (ts_90khz_t)p[7] << 17 ) | + ( (ts_90khz_t)p[8] << 9 ) | + ( (ts_90khz_t)p[9] << 1 ) | + ( (ts_90khz_t)p[10] >> 7 ); } return i_pcr; } @@ -1882,7 +1878,7 @@ for( ts_es_t *p_es = p_pes->p_es; p_es; p_es = p_es->p_next ) p_es->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY; - pid->i_cc = 0xff; + pid->u.p_stream->i_last_dts = VLC_TICK_INVALID; if( pid->u.p_stream->prepcr.p_head ) { @@ -1896,16 +1892,16 @@ FlushESBuffer( pid->u.p_stream ); } - p_pmt->pcr.i_current = -1; + p_pmt->pcr.i_current = VLC_TICK_INVALID; } } -static int SeekToTime( demux_t *p_demux, const ts_pmt_t *p_pmt, int64_t i_scaledtime ) +static int SeekToTime( demux_t *p_demux, const ts_pmt_t *p_pmt, vlc_tick_t i_seektime ) { demux_sys_t *p_sys = p_demux->p_sys; /* Deal with common but worst binary search case */ - if( p_pmt->pcr.i_first == i_scaledtime && p_sys->b_canseek ) + if( p_pmt->pcr.i_first == i_seektime && p_sys->b_canseek ) return vlc_stream_Seek( p_sys->stream, 0 ); const int64_t i_stream_size = stream_Size( p_sys->stream ); @@ -1934,7 +1930,7 @@ uint64_t i_pos = i_splitpos; while( i_pos < i_tail_pos ) { - int64_t i_pcr = -1; + ts_90khz_t i_pktpcr = TS_90KHZ_INVALID; block_t *p_pkt = ReadTSPacket( p_demux ); if( !p_pkt ) { @@ -1954,37 +1950,37 @@ if( p_pkt->i_buffer >= 4 + 2 + 5 ) { if( p_pmt->i_pid_pcr == i_pid ) - i_pcr = GetPCR( p_pkt ); + i_pktpcr = GetPCR( p_pkt ); i_skip += 1 + __MIN(p_pkt->p_buffer[4], 182); } } - if( i_pcr == -1 && p_pid->type == TYPE_STREAM && + if( i_pktpcr == TS_90KHZ_INVALID && p_pid->type == TYPE_STREAM && ts_stream_Find_es( p_pid->u.p_stream, p_pmt ) && (p_pkt->p_buffer[1] & 0xC0) == 0x40 && /* Payload start but not corrupt */ (p_pkt->p_buffer[3] & 0xD0) == 0x10 /* Has payload but is not encrypted */ ) { - vlc_tick_t i_dts = -1; - vlc_tick_t i_pts = -1; + ts_90khz_t i_pktdts = TS_90KHZ_INVALID; + ts_90khz_t i_pktpts = TS_90KHZ_INVALID; uint8_t i_stream_id; if ( VLC_SUCCESS == ParsePESHeader( VLC_OBJECT(p_demux), &p_pkt->p_buffer[i_skip], p_pkt->i_buffer - i_skip, &i_skip, - &i_dts, &i_pts, &i_stream_id, NULL ) ) + &i_pktdts, &i_pktpts, &i_stream_id, NULL ) ) { - if( i_dts > -1 ) - i_pcr = i_dts; + if( i_pktdts != TS_90KHZ_INVALID ) + i_pktpcr = i_pktdts; } } } block_Release( p_pkt ); - if( i_pcr != -1 ) + if( i_pktpcr != TS_90KHZ_INVALID ) { - int64_t i_diff = i_scaledtime - TimeStampWrapAround( p_pmt->pcr.i_first, i_pcr ); + vlc_tick_t i_diff = i_seektime - TimeStampWrapAround( p_pmt->pcr.i_first, FROM_SCALE(i_pktpcr) ); if ( i_diff < 0 ) i_tail_pos = (i_splitpos >= p_sys->i_packet_size) ? i_splitpos - p_sys->i_packet_size : 0; - else if( i_diff < TO_SCALE(VLC_TICK_0 + CLOCK_FREQ / 2) ) // 500ms + else if( i_diff < CLOCK_FREQ / 2 ) // 500ms b_found = true; else i_head_pos = i_pos; @@ -2005,7 +2001,7 @@ return VLC_SUCCESS; } -static int ProbeChunk( demux_t *p_demux, int i_program, bool b_end, int64_t *pi_pcr, bool *pb_found ) +static int ProbeChunk( demux_t *p_demux, int i_program, bool b_end, ts_90khz_t *pi_pcr, bool *pb_found ) { demux_sys_t *p_sys = p_demux->p_sys; int i_count = 0; @@ -2013,7 +2009,7 @@ for( ;; ) { - *pi_pcr = -1; + *pi_pcr = TS_90KHZ_INVALID; if( i_count++ > PROBE_CHUNK_COUNT || !( p_pkt = ReadTSPacket( p_demux ) ) ) { @@ -2040,7 +2036,7 @@ if( b_adaptfield && p_pkt->i_buffer >= 4 + 2 + 5 ) *pi_pcr = GetPCR( p_pkt ); - if( *pi_pcr == -1 && + if( *pi_pcr == TS_90KHZ_INVALID && (p_pkt->p_buffer[1] & 0xC0) == 0x40 && /* payload start */ (p_pkt->p_buffer[3] & 0xD0) == 0x10 && /* Has payload but is not encrypted */ p_pid->type == TYPE_STREAM && @@ -2048,8 +2044,8 @@ ) { b_pcrresult = false; - vlc_tick_t i_dts = -1; - vlc_tick_t i_pts = -1; + ts_90khz_t i_dts = TS_90KHZ_INVALID; + ts_90khz_t i_pts = TS_90KHZ_INVALID; uint8_t i_stream_id; unsigned i_skip = 4; if ( b_adaptfield ) // adaptation field @@ -2059,14 +2055,14 @@ p_pkt->i_buffer - i_skip, &i_skip, &i_dts, &i_pts, &i_stream_id, NULL ) ) { - if( i_dts != -1 ) + if( i_dts != TS_90KHZ_INVALID ) *pi_pcr = i_dts; - else if( i_pts != -1 ) + else if( i_pts != TS_90KHZ_INVALID ) *pi_pcr = i_pts; } } - if( *pi_pcr != -1 ) + if( *pi_pcr != TS_90KHZ_INVALID ) { ts_pat_t *p_pat = GetPID(p_sys, 0)->u.p_pat; for( int i=0; iprograms.i_size; i++ ) @@ -2079,15 +2075,15 @@ { if( b_end ) { - p_pmt->i_last_dts = *pi_pcr; + p_pmt->i_last_dts = FROM_SCALE(*pi_pcr); p_pmt->i_last_dts_byte = vlc_stream_Tell( p_sys->stream ); } /* Start, only keep first */ - else if( b_pcrresult && p_pmt->pcr.i_first == -1 ) + else if( b_pcrresult && p_pmt->pcr.i_first == VLC_TICK_INVALID ) { - p_pmt->pcr.i_first = *pi_pcr; + p_pmt->pcr.i_first = FROM_SCALE(*pi_pcr); } - else if( p_pmt->pcr.i_first_dts < VLC_TICK_0 ) + else if( p_pmt->pcr.i_first_dts == VLC_TICK_INVALID ) { p_pmt->pcr.i_first_dts = FROM_SCALE(*pi_pcr); } @@ -2113,7 +2109,7 @@ int i_probe_count = 0; int64_t i_pos; - vlc_tick_t i_pcr = -1; + ts_90khz_t i_pcr = TS_90KHZ_INVALID; bool b_found = false; do @@ -2145,7 +2141,7 @@ int i_probe_count = PROBE_CHUNK_COUNT; int64_t i_pos; - vlc_tick_t i_pcr = -1; + ts_90khz_t i_pcr = TS_90KHZ_INVALID; bool b_found = false; do @@ -2175,9 +2171,9 @@ /* Check if we have enqueued blocks waiting the/before the PCR barrier, and then adapt pcr so they have valid PCR when dequeuing */ - if( p_pmt->pcr.i_current == -1 && p_pmt->pcr.b_fix_done ) + if( p_pmt->pcr.i_current == VLC_TICK_INVALID && p_pmt->pcr.b_fix_done ) { - vlc_tick_t i_mindts = -1; + vlc_tick_t i_mindts = VLC_TS_INVALID; ts_pat_t *p_pat = GetPID(p_sys, 0)->u.p_pat; for( int i=0; i< p_pat->programs.i_size; i++ ) @@ -2190,7 +2186,7 @@ while( p_block && p_block->i_dts == VLC_TICK_INVALID ) p_block = p_block->p_next; - if( p_block && ( i_mindts == -1 || p_block->i_dts < i_mindts ) ) + if( p_block && ( i_mindts == VLC_TS_INVALID || p_block->i_dts < i_mindts ) ) i_mindts = p_block->i_dts; } } @@ -2198,20 +2194,21 @@ if( i_mindts > VLC_TICK_INVALID ) { msg_Dbg( p_demux, "Program %d PCR prequeue fixup %"PRId64"->%"PRId64, - p_pmt->i_number, TO_SCALE(i_mindts), i_pcr ); - i_pcr = TO_SCALE(i_mindts); + p_pmt->i_number, i_mindts, i_pcr ); + i_pcr = i_mindts; } } p_pmt->pcr.i_current = i_pcr; - if( p_pmt->pcr.i_first == -1 ) + + if( p_pmt->pcr.i_first == VLC_TICK_INVALID ) { p_pmt->pcr.i_first = i_pcr; // now seen } if ( p_sys->i_pmt_es ) { - es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR, p_pmt->i_number, FROM_SCALE(i_pcr) ); + es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR, p_pmt->i_number, i_pcr ); /* growing files/named fifo handling */ if( p_sys->b_access_control == false && vlc_stream_Tell( p_sys->stream ) > p_pmt->i_last_dts_byte ) @@ -2279,40 +2276,45 @@ continue; unsigned i_skip = 0; - vlc_tick_t i_dts = -1; - vlc_tick_t i_pts = -1; + ts_90khz_t i_pktdts = TS_90KHZ_INVALID; + ts_90khz_t i_pktpts = TS_90KHZ_INVALID; + vlc_tick_t i_dts = VLC_TICK_INVALID; + vlc_tick_t i_pts = VLC_TICK_INVALID; uint8_t i_stream_id; if( ParsePESHeader( VLC_OBJECT(p_demux), (uint8_t*)&header, i_max, &i_skip, - &i_dts, &i_pts, &i_stream_id, NULL ) == VLC_EGENERIC ) + &i_pktdts, &i_pktpts, &i_stream_id, NULL ) == VLC_EGENERIC ) continue; + if( i_pktdts != TS_90KHZ_INVALID ) + i_dts = TimeStampWrapAround( i_pcr, FROM_SCALE(i_pktdts) ); + if( i_pktpts != TS_90KHZ_INVALID ) + i_pts = TimeStampWrapAround( i_pcr, FROM_SCALE(i_pktpts) ); + if (p_pmt->pcr.i_pcroffset > 0) { - if( i_dts > VLC_TICK_INVALID ) + if( i_dts != VLC_TICK_INVALID ) i_dts += p_pmt->pcr.i_pcroffset; - if( i_pts > VLC_TICK_INVALID ) + if( i_pts != VLC_TICK_INVALID ) i_pts += p_pmt->pcr.i_pcroffset; } - if( i_dts > VLC_TICK_INVALID ) - i_dts = TimeStampWrapAround( i_pcr, i_dts ); - if( i_pts > VLC_TICK_INVALID ) - i_pts = TimeStampWrapAround( i_pcr, i_pts ); - - if(( i_dts > VLC_TICK_INVALID && i_dts <= i_pcr ) || - ( i_pts > VLC_TICK_INVALID && i_pts <= i_pcr )) + if(( i_dts != VLC_TICK_INVALID && i_dts <= i_pcr ) || + ( i_pts != VLC_TICK_INVALID && i_pts <= i_pcr )) { if( IsVideoEnd( p_pid ) ) { msg_Warn( p_demux, "send queued data for pid %d: TS %"PRId64" <= PCR %"PRId64"\n", - p_pid->i_pid, i_dts > VLC_TICK_INVALID ? i_dts : i_pts, i_pcr); - PushPESBlock( p_demux, p_pid, NULL, true, VLC_TICK_INVALID ); /* Flush */ + p_pid->i_pid, i_dts != VLC_TICK_INVALID ? i_dts : i_pts, i_pcr); + ts_pes_parse_callback cb = { .p_obj = VLC_OBJECT(p_demux), + .priv = p_pid, + .pf_parse = PESDataChainHandle }; + ts_pes_Drain( &cb, p_pes ); } } } } -static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, vlc_tick_t i_pcr ) +static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, ts_90khz_t i_pcr ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -2331,7 +2333,12 @@ ts_pmt_t *p_pmt = p_pat->programs.p_elems[i]->u.p_pmt; if( p_pmt->pcr.b_disable ) continue; - vlc_tick_t i_program_pcr = TimeStampWrapAround( p_pmt->pcr.i_first, i_pcr ); + + vlc_tick_t i_past_pcr = p_pmt->pcr.i_current; + if( i_past_pcr == VLC_TICK_INVALID ) + i_past_pcr = p_pmt->pcr.i_first; + + vlc_tick_t i_program_pcr = TimeStampWrapAround( i_past_pcr, FROM_SCALE(i_pcr) ); if( p_pmt->i_pid_pcr == 0x1FFF ) /* That program has no dedicated PCR pid ISO/IEC 13818-1 2.4.4.9 */ { @@ -2347,7 +2354,7 @@ if( p_pmt->i_pid_pcr == pid->i_pid ) /* If that program references current pid as PCR */ { /* We've found a target group for update */ - PCRCheckDTS( p_demux, p_pmt, i_pcr ); + PCRCheckDTS( p_demux, p_pmt, FROM_SCALE(i_pcr) ); ProgramSetPCR( p_demux, p_pmt, i_program_pcr ); } } @@ -2407,13 +2414,13 @@ return; } /* Record the first data packet timestamp in case there won't be any PCR */ - else if( !p_pmt->pcr.i_first_dts ) + else if( p_pmt->pcr.i_first_dts == VLC_TICK_INVALID ) { p_pmt->pcr.i_first_dts = p_block->i_dts; } - else if( p_block->i_dts - p_pmt->pcr.i_first_dts > CLOCK_FREQ / 2 ) /* "PCR repeat rate shall not exceed 100ms" */ + else if( p_block->i_dts - p_pmt->pcr.i_first_dts > VLC_TICK_FROM_MS(500) ) /* "PCR repeat rate shall not exceed 100ms" */ { - if( p_pmt->pcr.i_current < 0 && + if( p_pmt->pcr.i_current == VLC_TICK_INVALID && GetPID( p_demux->p_sys, p_pmt->i_pid_pcr )->probed.i_pcr_count == 0 ) { int i_cand = FindPCRCandidate( p_pmt ); @@ -2571,216 +2578,27 @@ return p_pkt; } -/* Avoids largest memcpy */ -static bool block_Split( block_t **pp_block, block_t **pp_remain, size_t i_offset ) -{ - block_t *p_block = *pp_block; - block_t *p_split = NULL; - *pp_remain = NULL; - - size_t i_tocopy = p_block->i_buffer - i_offset; - if( i_tocopy > i_offset ) /* make new block for head */ - { - if( i_offset > 0 ) - { - p_split = block_Alloc( i_offset ); - if( p_split == NULL ) - return false; - memcpy( p_split->p_buffer, p_block->p_buffer, i_offset ); - p_block->p_buffer += i_offset; - p_block->i_buffer -= i_offset; - } - *pp_remain = p_block; - *pp_block = p_split; - } - else /* other gets the tail of our split */ - { - if( i_tocopy > 0 ) - { - p_split = block_Alloc( i_tocopy ); - if( p_split == NULL ) - return false; - memcpy( p_split->p_buffer, &p_block->p_buffer[i_offset], i_tocopy ); - p_block->i_buffer -= i_tocopy; - } - *pp_remain = p_split; - } - return true; -} - -static uint8_t *FindNextPESHeader( uint8_t *p_buf, size_t i_buffer ) -{ - const uint8_t *p_end = &p_buf[i_buffer]; - unsigned i_bitflow = 0; - for( ; p_buf != p_end; p_buf++ ) - { - i_bitflow <<= 1; - if( !*p_buf ) - { - i_bitflow |= 1; - } - else if( *p_buf == 0x01 && (i_bitflow & 0x06) == 0x06 ) /* >= two zero prefixed 1 */ - { - return p_buf - 2; - } - } - return NULL; -} - -static const uint8_t pes_sync[] = { 0, 0, 1 }; - -static bool MayHaveStartCodeOnEnd( const uint8_t *p_buf, size_t i_buf ) -{ - assert(i_buf > 2); - return !( *(--p_buf) > 1 || *(--p_buf) > 0 || *(--p_buf) > 0 ); -} - -static bool GatherPESData( demux_t *p_demux, ts_pid_t *pid, block_t *p_pkt, size_t i_skip ) +static bool GatherPESData( demux_t *p_demux, ts_pid_t *p_pid, block_t *p_pkt, size_t i_skip ) { + demux_sys_t *p_sys = p_demux->p_sys; + ts_pes_parse_callback cb = { .p_obj = VLC_OBJECT(p_demux), + .priv = p_pid, + .pf_parse = PESDataChainHandle }; const bool b_unit_start = p_pkt->p_buffer[1]&0x40; - bool b_ret = false; - ts_stream_t *p_pes = pid->u.p_stream; - const ts_es_t *p_es = p_pes->p_es; - int64_t i_append_pcr = ( p_es && p_es->p_program ) ? p_es->p_program->pcr.i_current : -1; - /* We have to gather it */ - p_pkt->p_buffer += i_skip; + p_pkt->p_buffer += i_skip; /* point to PES */ p_pkt->i_buffer -= i_skip; - bool b_single_payload = b_unit_start; /* Single payload in case of unit start */ - bool b_aligned_ts_payload = true; - - if( unlikely(p_pes->b_broken_PUSI_conformance) ) - { - /* Stream does not conform to payload_unit_start flag - * applied to PES packets (AdTech private_stream_1) */ - b_aligned_ts_payload = false; - b_single_payload = false; - - } - - /* We'll cannot parse any pes data */ - if( (p_pkt->i_flags & BLOCK_FLAG_SCRAMBLED) && p_demux->p_sys->b_valid_scrambling ) - { - block_Release( p_pkt ); - return PushPESBlock( p_demux, pid, NULL, true, i_append_pcr ); - } - - /* Data discontinuity, we need to drop or output currently - * gathered data as it can't match the target size or can - * have dropped next sync code */ - if( p_pkt->i_flags & BLOCK_FLAG_DISCONTINUITY ) - { - p_pes->gather.i_saved = 0; - /* Flush/output current */ - b_ret |= PushPESBlock( p_demux, pid, NULL, true, i_append_pcr ); - /* Propagate to output block to notify packetizers/decoders */ - if( p_pes->p_es ) - p_pes->p_es->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY; - } - - if ( unlikely(p_pes->gather.i_saved > 0) ) - { - /* Saved from previous packet end */ - assert(p_pes->gather.i_saved < 6); - if( !b_aligned_ts_payload ) - { - p_pkt = block_Realloc( p_pkt, p_pes->gather.i_saved, p_pkt->i_buffer ); - if( p_pkt ) - memcpy( p_pkt->p_buffer, p_pes->gather.saved, p_pes->gather.i_saved ); - } - p_pes->gather.i_saved = 0; - } - - for( bool b_first_sync_done = false; p_pkt; ) - { - assert( p_pes->gather.i_saved == 0 ); - - if( p_pes->gather.p_data == NULL && !b_first_sync_done && p_pkt->i_buffer >= 6 ) - { - if( likely(b_aligned_ts_payload) ) - { - if( memcmp( p_pkt->p_buffer, pes_sync, 3 ) ) - { - block_Release( p_pkt ); - return b_ret; - } - } - else - { - /* Need to find sync code */ - uint8_t *p_buf = FindNextPESHeader( p_pkt->p_buffer, p_pkt->i_buffer - 3 ); - if( p_buf == NULL ) - { - /* no first sync code */ - if( MayHaveStartCodeOnEnd( p_pkt->p_buffer, p_pkt->i_buffer ) ) - { - /* Drop everything except last bytes for next packet */ - p_pkt->p_buffer += p_pkt->i_buffer - 3; - p_pes->gather.i_saved = p_pkt->i_buffer = 3; - memcpy(p_pes->gather.saved, p_pkt->p_buffer, p_pkt->i_buffer); - } - block_Release( p_pkt ); - return b_ret; - } - p_pkt->i_buffer -= p_buf - p_pkt->p_buffer; - p_pkt->p_buffer = p_buf; - } - /* now points to PES header */ - p_pes->gather.i_data_size = GetWBE(&p_pkt->p_buffer[4]); - if( p_pes->gather.i_data_size > 0 ) - p_pes->gather.i_data_size += 6; - b_first_sync_done = true; /* Because if size is 0, we woud not look for second sync */ - } - else - { - assert( p_pes->gather.i_data_size > p_pes->gather.i_gathered || - p_pes->gather.i_data_size == 0 ); - - /* If we started reading a fixed size */ - if( p_pes->gather.i_data_size > p_pes->gather.i_gathered ) - { - const size_t i_remain = p_pes->gather.i_data_size - p_pes->gather.i_gathered; - /* Append whole block */ - if( likely(p_pkt->i_buffer <= i_remain || b_single_payload) ) - { - b_ret |= PushPESBlock( p_demux, pid, p_pkt, p_pes->gather.p_data == NULL, i_append_pcr ); - p_pkt = NULL; - } - else /* p_pkt->i_buffer > i_remain */ - { - block_t *p_split; - if( !block_Split( &p_pkt, &p_split, i_remain ) ) - { - block_Release( p_pkt ); - return false; - } - b_ret |= PushPESBlock( p_demux, pid, p_pkt, p_pes->gather.p_data == NULL, i_append_pcr ); - p_pkt = p_split; - b_first_sync_done = false; - } - } - else /* if( p_pes->gather.i_data_size == 0 ) // see next packet */ - { - /* Append or finish current/start new PES depending on unit_start */ - b_ret |= PushPESBlock( p_demux, pid, p_pkt, b_unit_start, i_append_pcr ); - p_pkt = NULL; - } - } - - if( unlikely(p_pkt && p_pkt->i_buffer < 6) ) - { - /* save and prepend to next packet */ - assert(!b_single_payload); - assert(p_pes->gather.i_saved == 0); - p_pes->gather.i_saved = p_pkt->i_buffer; - memcpy(p_pes->gather.saved, p_pkt->p_buffer, p_pkt->i_buffer); - block_Release( p_pkt ); - p_pkt = NULL; - } - } + const ts_es_t *p_es = p_pid->u.p_stream->p_es; + ts_90khz_t i_append_pcr = ( p_es && p_es->p_program && p_es->p_program->pcr.i_current != VLC_TICK_INVALID ) + ? TO_SCALE(p_es->p_program->pcr.i_current) + : TS_90KHZ_INVALID; + + return ts_pes_Gather( &cb, p_pid->u.p_stream, + p_pkt, b_unit_start, + p_sys->b_valid_scrambling, + i_append_pcr ); - return b_ret; } static bool GatherSectionsData( demux_t *p_demux, ts_pid_t *p_pid, block_t *p_pkt, size_t i_skip ) diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_arib.c vlc-3.0.22/modules/demux/mpeg/ts_arib.c --- vlc-3.0.21/modules/demux/mpeg/ts_arib.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_arib.c 2025-11-13 22:17:54.000000000 +0000 @@ -23,6 +23,7 @@ #include #include +#include "timestamps.h" #include "ts_pid.h" #include "ts.h" diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_hotfixes.c vlc-3.0.22/modules/demux/mpeg/ts_hotfixes.c --- vlc-3.0.21/modules/demux/mpeg/ts_hotfixes.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_hotfixes.c 2025-11-13 22:17:54.000000000 +0000 @@ -82,7 +82,7 @@ return; size_t i_pesextoffset = 8; - vlc_tick_t i_dts = -1; + ts_90khz_t i_dts = TS_90KHZ_INVALID; if( p_pes[7] & 0x80 ) // PTS { i_pesextoffset += 5; @@ -192,15 +192,15 @@ } /* Track timestamps and flag missing PAT */ - if( !p_sys->patfix.i_timesourcepid && i_dts > -1 ) + if( !p_sys->patfix.i_timesourcepid && i_dts != TS_90KHZ_INVALID ) { - p_sys->patfix.i_first_dts = i_dts; + p_sys->patfix.i_first_dts = FROM_SCALE(i_dts); p_sys->patfix.i_timesourcepid = pid->i_pid; } - else if( p_sys->patfix.i_timesourcepid == pid->i_pid && i_dts > -1 && + else if( p_sys->patfix.i_timesourcepid == pid->i_pid && i_dts != TS_90KHZ_INVALID && p_sys->patfix.status == PAT_WAITING ) { - if( i_dts - p_sys->patfix.i_first_dts > TO_SCALE(MIN_PAT_INTERVAL) ) + if( FROM_SCALE(i_dts) - p_sys->patfix.i_first_dts > MIN_PAT_INTERVAL ) p_sys->patfix.status = PAT_MISSING; } diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_pes.c vlc-3.0.22/modules/demux/mpeg/ts_pes.c --- vlc-3.0.21/modules/demux/mpeg/ts_pes.c 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_pes.c 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,306 @@ +/***************************************************************************** + * ts_pes.c: Transport Stream input module for VLC. + ***************************************************************************** + * Copyright (C) 2004-2019 VLC authors and VideoLAN + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include "ts_streams.h" +#include "ts_pid.h" +#include "ts_streams_private.h" + +#include "ts_pes.h" + +#include + +/* Avoids largest memcpy */ +static bool block_Split( block_t **pp_block, block_t **pp_remain, size_t i_offset ) +{ + block_t *p_block = *pp_block; + block_t *p_split = NULL; + *pp_remain = NULL; + + size_t i_tocopy = p_block->i_buffer - i_offset; + if( i_tocopy > i_offset ) /* make new block for head */ + { + if( i_offset > 0 ) + { + p_split = block_Alloc( i_offset ); + if( p_split == NULL ) + return false; + memcpy( p_split->p_buffer, p_block->p_buffer, i_offset ); + p_block->p_buffer += i_offset; + p_block->i_buffer -= i_offset; + } + *pp_remain = p_block; + *pp_block = p_split; + } + else /* other gets the tail of our split */ + { + if( i_tocopy > 0 ) + { + p_split = block_Alloc( i_tocopy ); + if( p_split == NULL ) + return false; + memcpy( p_split->p_buffer, &p_block->p_buffer[i_offset], i_tocopy ); + p_block->i_buffer -= i_tocopy; + } + *pp_remain = p_split; + } + return true; +} + +static const uint8_t pes_sync[] = { 0, 0, 1 }; + +static bool MayHaveStartCodeOnEnd( const uint8_t *p_buf, size_t i_buf ) +{ + assert(i_buf > 2); + return !( *(--p_buf) > 1 || *(--p_buf) > 0 || *(--p_buf) > 0 ); +} + +static uint8_t *FindNextPESHeader( uint8_t *p_buf, size_t i_buffer ) +{ + const uint8_t *p_end = &p_buf[i_buffer]; + unsigned i_bitflow = 0; + for( ; p_buf != p_end; p_buf++ ) + { + i_bitflow <<= 1; + if( !*p_buf ) + { + i_bitflow |= 1; + } + else if( *p_buf == 0x01 && (i_bitflow & 0x06) == 0x06 ) /* >= two zero prefixed 1 */ + { + return p_buf - 2; + } + } + return NULL; +} + +static bool ts_pes_Push( ts_pes_parse_callback *cb, + ts_stream_t *p_pes, block_t *p_pkt, + bool b_unit_start, ts_90khz_t i_append_pcr ) +{ + bool b_ret = false; + + if ( b_unit_start && p_pes->gather.p_data ) + { + block_t *p_datachain = p_pes->gather.p_data; + /* Flush the pes from pid */ + p_pes->gather.p_data = NULL; + p_pes->gather.i_data_size = 0; + p_pes->gather.i_gathered = 0; + p_pes->gather.pp_last = &p_pes->gather.p_data; + cb->pf_parse( cb->p_obj, cb->priv, p_datachain, p_pes->gather.i_append_pcr ); + b_ret = true; + } + + if( b_unit_start ) + p_pes->gather.i_append_pcr = i_append_pcr; + + if( p_pkt == NULL ) + return b_ret; + + if( p_pkt->i_buffer == 0 ) + { + block_Release( p_pkt ); + return b_ret; + } + + if( !b_unit_start && p_pes->gather.p_data == NULL ) + { + /* msg_Dbg( p_demux, "broken packet" ); */ + block_Release( p_pkt ); + return b_ret; + } + + block_ChainLastAppend( &p_pes->gather.pp_last, p_pkt ); + p_pes->gather.i_gathered += p_pkt->i_buffer; + + if( p_pes->gather.i_data_size > 0 && + p_pes->gather.i_gathered >= p_pes->gather.i_data_size ) + { + /* re-enter in Flush above */ + assert(p_pes->gather.p_data); + return ts_pes_Push( cb, p_pes, NULL, true, i_append_pcr ); + } + + return b_ret; +} + +bool ts_pes_Drain( ts_pes_parse_callback *cb, ts_stream_t *p_pes ) +{ + return ts_pes_Push( cb, p_pes, NULL, true, TS_90KHZ_INVALID ); +} + +bool ts_pes_Gather( ts_pes_parse_callback *cb, + ts_stream_t *p_pes, block_t *p_pkt, + bool b_unit_start, bool b_valid_scrambling, + ts_90khz_t i_append_pcr ) +{ + bool b_ret = false; + bool b_single_payload = b_unit_start; /* Single payload in case of unit start */ + bool b_aligned_ts_payload = true; + + if( unlikely(p_pes->b_broken_PUSI_conformance) ) + { + /* Stream does not conform to payload_unit_start flag + * applied to PES packets (AdTech private_stream_1) */ + b_aligned_ts_payload = false; + b_single_payload = false; + + } + + /* We'll cannot parse any pes data */ + if( (p_pkt->i_flags & BLOCK_FLAG_SCRAMBLED) && b_valid_scrambling ) + { + block_Release( p_pkt ); + return ts_pes_Push( cb, p_pes, NULL, true, i_append_pcr ); + } + + /* Data discontinuity, we need to drop or output currently + * gathered data as it can't match the target size or can + * have dropped next sync code */ + if( p_pkt->i_flags & BLOCK_FLAG_DISCONTINUITY ) + { + p_pes->gather.i_saved = 0; + /* Flush/output current */ + b_ret |= ts_pes_Push( cb, p_pes, NULL, true, i_append_pcr ); + /* Propagate to output block to notify packetizers/decoders */ + if( p_pes->p_es ) + p_pes->p_es->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY; + } + + if ( unlikely(p_pes->gather.i_saved > 0) ) + { + /* Saved from previous packet end */ + assert(p_pes->gather.i_saved < 6); + if( !b_aligned_ts_payload ) + { + p_pkt = block_Realloc( p_pkt, p_pes->gather.i_saved, p_pkt->i_buffer ); + if( p_pkt ) + memcpy( p_pkt->p_buffer, p_pes->gather.saved, p_pes->gather.i_saved ); + } + p_pes->gather.i_saved = 0; + } + + for( bool b_first_sync_done = false; p_pkt; ) + { + assert( p_pes->gather.i_saved == 0 ); + + if( p_pes->gather.p_data == NULL && b_unit_start && !b_first_sync_done && p_pkt->i_buffer >= 6 ) + { + if( likely(b_aligned_ts_payload) ) + { + if( memcmp( p_pkt->p_buffer, pes_sync, 3 ) ) + { + block_Release( p_pkt ); + return b_ret; + } + } + else + { + /* Need to find sync code */ + uint8_t *p_buf = FindNextPESHeader( p_pkt->p_buffer, p_pkt->i_buffer - 3 ); + if( p_buf == NULL ) + { + /* no first sync code */ + if( MayHaveStartCodeOnEnd( p_pkt->p_buffer, p_pkt->i_buffer ) ) + { + /* Drop everything except last bytes for next packet */ + p_pkt->p_buffer += p_pkt->i_buffer - 3; + p_pes->gather.i_saved = p_pkt->i_buffer = 3; + memcpy(p_pes->gather.saved, p_pkt->p_buffer, p_pkt->i_buffer); + } + block_Release( p_pkt ); + return b_ret; + } + p_pkt->i_buffer -= p_buf - p_pkt->p_buffer; + p_pkt->p_buffer = p_buf; + } + /* now points to PES header */ + p_pes->gather.i_data_size = GetWBE(&p_pkt->p_buffer[4]); + if( p_pes->gather.i_data_size > 0 ) + p_pes->gather.i_data_size += 6; + b_first_sync_done = true; /* Because if size is 0, we woud not look for second sync */ + } + else + { + assert( p_pes->gather.i_data_size > p_pes->gather.i_gathered || + p_pes->gather.i_data_size == 0 ); + + /* If we started reading a fixed size */ + if( p_pes->gather.i_data_size > p_pes->gather.i_gathered && !b_single_payload ) + { + const size_t i_remain = p_pes->gather.i_data_size - p_pes->gather.i_gathered; + /* Append whole block */ + if( likely(p_pkt->i_buffer <= i_remain) ) + { + b_ret |= ts_pes_Push( cb, p_pes, p_pkt, p_pes->gather.p_data == NULL, i_append_pcr ); + p_pkt = NULL; + } + else /* p_pkt->i_buffer > i_remain */ + { + block_t *p_split; + if( !block_Split( &p_pkt, &p_split, i_remain ) ) + { + block_Release( p_pkt ); + return false; + } + b_ret |= ts_pes_Push( cb, p_pes, p_pkt, p_pes->gather.p_data == NULL, i_append_pcr ); + p_pkt = p_split; + b_first_sync_done = false; + } + } + else /* if( p_pes->gather.i_data_size == 0 ) // see next packet */ + { + if( likely(b_aligned_ts_payload) && b_unit_start ) + { + b_ret |= ts_pes_Push( cb, p_pes, NULL, true, i_append_pcr ); + /* now points to PES header */ + if( p_pkt->i_buffer >= 6 ) + { + p_pes->gather.i_data_size = GetWBE(&p_pkt->p_buffer[4]); + if( p_pes->gather.i_data_size > 0 ) + p_pes->gather.i_data_size += 6; + } + } + /* Append or finish current/start new PES depending on unit_start */ + b_ret |= ts_pes_Push( cb, p_pes, p_pkt, b_unit_start, i_append_pcr ); + p_pkt = NULL; + } + } + + if( unlikely(p_pkt && p_pkt->i_buffer < 6) ) + { + /* save and prepend to next packet */ + assert(!b_single_payload); + assert(p_pes->gather.i_saved == 0); + p_pes->gather.i_saved = p_pkt->i_buffer; + memcpy(p_pes->gather.saved, p_pkt->p_buffer, p_pkt->i_buffer); + block_Release( p_pkt ); + p_pkt = NULL; + } + } + + return b_ret; +} diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_pes.h vlc-3.0.22/modules/demux/mpeg/ts_pes.h --- vlc-3.0.21/modules/demux/mpeg/ts_pes.h 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_pes.h 2025-11-13 22:17:54.000000000 +0000 @@ -0,0 +1,40 @@ +/***************************************************************************** + * ts_pes.h: Transport Stream input module for VLC. + ***************************************************************************** + * Copyright (C) 2004-2019 VLC authors and VideoLAN + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ +#ifndef VLC_TS_PES_H +#define VLC_TS_PES_H + +#include "timestamps.h" + +typedef struct +{ + vlc_object_t *p_obj; + void *priv; + void(*pf_parse)(vlc_object_t *, void *, block_t *, ts_90khz_t ); +} ts_pes_parse_callback; + +bool ts_pes_Drain( ts_pes_parse_callback *cb, ts_stream_t *p_pes ); + +bool ts_pes_Gather( ts_pes_parse_callback *cb, + ts_stream_t *p_pes, block_t *p_pkt, + bool b_unit_start, bool b_valid_scrambling, + ts_90khz_t i_append_pcr ); + + +#endif diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_pid.c vlc-3.0.22/modules/demux/mpeg/ts_pid.c --- vlc-3.0.21/modules/demux/mpeg/ts_pid.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_pid.c 2025-11-13 22:17:54.000000000 +0000 @@ -25,6 +25,7 @@ #include "ts_pid.h" #include "ts_streams.h" +#include "timestamps.h" #include "ts.h" diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_psi.c vlc-3.0.22/modules/demux/mpeg/ts_psi.c --- vlc-3.0.21/modules/demux/mpeg/ts_psi.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_psi.c 2025-11-13 22:17:54.000000000 +0000 @@ -2028,11 +2028,14 @@ UpdatePESFilters( p_demux, p_demux->p_sys->seltype == PROGRAM_ALL ); /* Probe Boundaries */ - if( p_sys->b_canfastseek && p_pmt->i_last_dts == -1 ) + if( p_sys->b_canfastseek && p_pmt->i_last_dts == VLC_TICK_INVALID ) { - p_pmt->i_last_dts = 0; + p_pmt->i_last_dts = VLC_TICK_INVALID; ProbeStart( p_demux, p_pmt->i_number ); ProbeEnd( p_demux, p_pmt->i_number ); + if( p_pmt->i_last_dts != VLC_TICK_INVALID && + p_pmt->i_last_dts < p_pmt->pcr.i_first_dts ) + p_pmt->i_last_dts = TimeStampWrapAround( p_pmt->pcr.i_first_dts, p_pmt->i_last_dts ); } dvbpsi_pmt_delete( p_dvbpsipmt ); diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_psip.c vlc-3.0.22/modules/demux/mpeg/ts_psip.c --- vlc-3.0.21/modules/demux/mpeg/ts_psip.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_psip.c 2025-11-13 22:17:54.000000000 +0000 @@ -43,6 +43,7 @@ #include "ts_decoders.h" #include "ts_psip_dvbpsi_fixes.h" +#include "timestamps.h" #include "ts_pid.h" #include "ts.h" #include "ts_streams_private.h" diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_scte.c vlc-3.0.22/modules/demux/mpeg/ts_scte.c --- vlc-3.0.21/modules/demux/mpeg/ts_scte.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_scte.c 2025-11-13 22:17:54.000000000 +0000 @@ -61,10 +61,9 @@ continue; const ts_pmt_t *p_pmt = p_es->p_program; - const vlc_tick_t i_date = TimeStampWrapAround( p_pmt->pcr.i_first, p_pmt->pcr.i_current ); block_t *p_block = block_Alloc( p_section->p_payload_end - p_section->p_payload_start ); memcpy( p_block->p_buffer, p_section->p_payload_start, i_payload ); - p_block->i_dts = p_block->i_pts = FROM_SCALE( i_date ); + p_block->i_dts = p_block->i_pts = p_pmt->pcr.i_current; es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, p_es->id, true ); es_out_Send( p_demux->out, p_es->id, p_block ); @@ -102,16 +101,16 @@ bool is_immediate = p_content->p_buffer[i_offset + 3] & 0x40; if( !is_immediate ) { - vlc_tick_t i_display_in = GetDWBE( &p_content->p_buffer[i_offset + 4] ); + vlc_tick_t i_display_in = FROM_SCALE(GetDWBE( &p_content->p_buffer[i_offset + 4] )); if( i_display_in < i_date ) - i_date = i_display_in + (1ll << 32); + i_date = i_display_in + FROM_SCALE_NZ(1ll << 32); else i_date = i_display_in; } } - p_content->i_dts = p_content->i_pts = VLC_TICK_0 + i_date * 100 / 9; + p_content->i_dts = p_content->i_pts = i_date; //PCRFixHandle( p_demux, p_pmt, p_content ); if( p_pes->p_es->id ) diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_streams.c vlc-3.0.22/modules/demux/mpeg/ts_streams.c --- vlc-3.0.21/modules/demux/mpeg/ts_streams.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_streams.c 2025-11-13 22:17:54.000000000 +0000 @@ -122,14 +122,14 @@ pmt->od.i_version = -1; ARRAY_INIT( pmt->od.objects ); - pmt->i_last_dts = -1; + pmt->i_last_dts = VLC_TICK_INVALID; pmt->i_last_dts_byte = 0; pmt->p_atsc_si_basepid = NULL; pmt->p_si_sdt_pid = NULL; - pmt->pcr.i_current = -1; - pmt->pcr.i_first = -1; + pmt->pcr.i_current = VLC_TICK_INVALID; + pmt->pcr.i_first = VLC_TICK_INVALID; pmt->pcr.b_disable = false; pmt->pcr.i_first_dts = VLC_TICK_INVALID; pmt->pcr.i_pcroffset = -1; @@ -286,13 +286,14 @@ pes->gather.p_data = NULL; pes->gather.pp_last = &pes->gather.p_data; pes->gather.i_saved = 0; - pes->gather.i_append_pcr = VLC_TICK_INVALID; + pes->gather.i_append_pcr = TS_90KHZ_INVALID; pes->b_broken_PUSI_conformance = false; pes->b_always_receive = false; pes->p_sections_proc = NULL; pes->p_proc = NULL; pes->prepcr.p_head = NULL; pes->prepcr.pp_last = &pes->prepcr.p_head; + pes->i_last_dts = VLC_TICK_INVALID; return pes; } diff -Nru vlc-3.0.21/modules/demux/mpeg/ts_streams_private.h vlc-3.0.22/modules/demux/mpeg/ts_streams_private.h --- vlc-3.0.21/modules/demux/mpeg/ts_streams_private.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/mpeg/ts_streams_private.h 2025-11-13 22:17:54.000000000 +0000 @@ -23,6 +23,7 @@ typedef struct ts_sections_processor_t ts_sections_processor_t; #include "mpeg4_iod.h" +#include "timestamps.h" #include #include @@ -58,7 +59,7 @@ struct { vlc_tick_t i_current; - vlc_tick_t i_first; // seen <> != -1 + vlc_tick_t i_first; // seen <> != TS_TICK_UNKNOWN /* broken PCR handling */ vlc_tick_t i_first_dts; vlc_tick_t i_pcroffset; @@ -125,7 +126,7 @@ block_t **pp_last; uint8_t saved[5]; size_t i_saved; - int64_t i_append_pcr; + ts_90khz_t i_append_pcr; } gather; bool b_always_receive; @@ -138,6 +139,8 @@ block_t *p_head; block_t **pp_last; } prepcr; + + vlc_tick_t i_last_dts; }; typedef struct ts_si_context_t ts_si_context_t; diff -Nru vlc-3.0.21/modules/demux/nsv.c vlc-3.0.22/modules/demux/nsv.c --- vlc-3.0.21/modules/demux/nsv.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/nsv.c 2025-11-13 22:17:54.000000000 +0000 @@ -249,7 +249,7 @@ { p++; } - if( *p == 0 && p + 1 < &p_frame->p_buffer[p_frame->i_buffer] ) + if( p + 1 < &p_frame->p_buffer[p_frame->i_buffer] && *p == 0 ) { p_frame->i_buffer -= p + 1 - p_frame->p_buffer; p_frame->p_buffer = p + 1; @@ -620,4 +620,3 @@ return VLC_SUCCESS; } - diff -Nru vlc-3.0.21/modules/demux/ogg.c vlc-3.0.22/modules/demux/ogg.c --- vlc-3.0.21/modules/demux/ogg.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/ogg.c 2025-11-24 23:00:36.000000000 +0000 @@ -1343,7 +1343,7 @@ } /* Backup the ogg packet (likely an header packet) */ - if( !b_xiph ) + if( !b_xiph && p_stream->i_headers ) { uint8_t *p_realloc = realloc( p_stream->p_headers, p_stream->i_headers + p_oggpacket->bytes ); if( p_realloc ) @@ -1362,6 +1362,7 @@ else if( xiph_AppendHeaders( &p_stream->i_headers, &p_stream->p_headers, p_oggpacket->bytes, p_oggpacket->packet ) ) { + free(p_stream->p_headers); p_stream->i_headers = 0; p_stream->p_headers = NULL; } @@ -2424,9 +2425,11 @@ int i_new_stream_count; int i_old_coupled_count; int i_new_coupled_count; + size_t i_old_map_size, i_new_map_size; p_old_head = pp_old_data[0]; i_old_channel_count = i_old_stream_count = i_old_coupled_count = 0; p_old_map = default_map; + i_old_map_size = ARRAY_SIZE(default_map); if( pi_old_size[0] >= 19 && p_old_head[8] <= 15 ) { i_old_channel_count = p_old_head[9]; @@ -2442,6 +2445,7 @@ i_old_stream_count = p_old_head[19]; i_old_coupled_count = p_old_head[20]; p_old_map = p_old_head + 21; + i_old_map_size = i_old_channel_count; } break; } @@ -2449,6 +2453,7 @@ p_new_head = (unsigned char *)pp_new_data[0]; i_new_channel_count = i_new_stream_count = i_new_coupled_count = 0; p_new_map = default_map; + i_new_map_size = ARRAY_SIZE(default_map); if( pi_new_size[0] >= 19 && p_new_head[8] <= 15 ) { i_new_channel_count = p_new_head[9]; @@ -2464,6 +2469,7 @@ i_new_stream_count = p_new_head[19]; i_new_coupled_count = p_new_head[20]; p_new_map = p_new_head+21; + i_new_map_size = i_new_channel_count; } break; } @@ -2471,8 +2477,9 @@ b_match = i_old_channel_count == i_new_channel_count && i_old_stream_count == i_new_stream_count && i_old_coupled_count == i_new_coupled_count && + i_old_map_size == i_new_map_size && memcmp(p_old_map, p_new_map, - i_new_channel_count*sizeof(*p_new_map)) == 0; + i_new_map_size*sizeof(*p_new_map)) == 0; } return b_match; diff -Nru vlc-3.0.21/modules/demux/playlist/asx.c vlc-3.0.22/modules/demux/playlist/asx.c --- vlc-3.0.21/modules/demux/playlist/asx.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/playlist/asx.c 2025-11-13 22:17:54.000000000 +0000 @@ -439,7 +439,7 @@ * - make tags and attributes upercase * - escape strings when required */ -static char* ASXToXML( char* psz_source ) +VLC_MALLOC static char* ASXToXML( char* psz_source ) { bool b_in_string= false; char *psz_source_cur = psz_source; @@ -614,7 +614,11 @@ else { //strip xml prologue to avoid double conversion - char *tmp = strstr( psz_source, "?>" ) + 2; + char *tmp = strstr( psz_source, "?>" ); + if ( tmp ) + tmp += 2; + else + tmp = psz_source; tmp = FromCharset( encoding, tmp, strlen( tmp ) ); free( psz_source ); free( encoding ); diff -Nru vlc-3.0.21/modules/demux/playlist/xspf.c vlc-3.0.22/modules/demux/playlist/xspf.c --- vlc-3.0.21/modules/demux/playlist/xspf.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/playlist/xspf.c 2025-11-13 22:17:54.000000000 +0000 @@ -525,7 +525,7 @@ else if (!strcmp(psz_name, "trackNum")) input_item_SetTrackNum(p_input, psz_value); else if (!strcmp(psz_name, "duration")) - p_input->i_duration = atol(psz_value) * INT64_C(1000); + p_input->i_duration = VLC_TICK_FROM_MS(atol(psz_value)); else if (!strcmp(psz_name, "annotation")) input_item_SetDescription(p_input, psz_value); else if (!strcmp(psz_name, "info")) diff -Nru vlc-3.0.21/modules/demux/pva.c vlc-3.0.22/modules/demux/pva.c --- vlc-3.0.21/modules/demux/pva.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/pva.c 2025-11-13 22:17:54.000000000 +0000 @@ -32,6 +32,7 @@ #include #include #include +#include "mpeg/timestamps.h" /***************************************************************************** * Module descriptor @@ -390,19 +391,19 @@ { demux_sys_t *p_sys = p_demux->p_sys; block_t *p_pes = p_sys->p_pes; - uint8_t hdr[30]; + uint8_t hdr[20]; unsigned i_skip; - vlc_tick_t i_dts = -1; - vlc_tick_t i_pts = -1; + ts_90khz_t i_dts; + ts_90khz_t i_pts; p_sys->p_pes = NULL; /* FIXME find real max size */ - block_ChainExtract( p_pes, hdr, 30 ); + size_t hdr_read = block_ChainExtract( p_pes, hdr, ARRAY_SIZE(hdr) ); /* See §2.4.3.6 of ISO 13818-1 */ - if( hdr[0] != 0 || hdr[1] != 0 || hdr[2] != 1 ) + if( hdr_read < 9 || hdr[0] != 0 || hdr[1] != 0 || hdr[2] != 1 ) { msg_Warn( p_demux, "invalid hdr [0x%2.2x:%2.2x:%2.2x:%2.2x]", hdr[0], hdr[1],hdr[2],hdr[3] ); @@ -414,23 +415,6 @@ /* we assume mpeg2 PES */ i_skip = hdr[8] + 9; - if( hdr[7]&0x80 ) /* has pts */ - { - i_pts = ((vlc_tick_t)(hdr[ 9]&0x0e ) << 29)| - (vlc_tick_t)(hdr[10] << 22)| - ((vlc_tick_t)(hdr[11]&0xfe) << 14)| - (vlc_tick_t)(hdr[12] << 7)| - (vlc_tick_t)(hdr[12] >> 1); - - if( hdr[7]&0x40 ) /* has dts */ - { - i_dts = ((vlc_tick_t)(hdr[14]&0x0e ) << 29)| - (vlc_tick_t)(hdr[15] << 22)| - ((vlc_tick_t)(hdr[16]&0xfe) << 14)| - (vlc_tick_t)(hdr[17] << 7)| - (vlc_tick_t)(hdr[18] >> 1); - } - } p_pes = block_ChainGather( p_pes ); if( unlikely(p_pes == NULL) ) @@ -444,10 +428,25 @@ p_pes->i_buffer -= i_skip; p_pes->p_buffer += i_skip; - if( i_dts >= 0 ) - p_pes->i_dts = VLC_TICK_0 + i_dts * 100 / 9; - if( i_pts >= 0 ) - p_pes->i_pts = VLC_TICK_0 + i_pts * 100 / 9; + if( hdr[7]&0x80 && hdr_read >= (9+1+5) ) /* has pts */ + { + i_pts = ((ts_90khz_t)(hdr[ 9]&0x0e ) << 29)| + (ts_90khz_t)(hdr[10] << 22)| + ((ts_90khz_t)(hdr[11]&0xfe) << 14)| + (ts_90khz_t)(hdr[12] << 7)| + (ts_90khz_t)(hdr[13] >> 1); + p_pes->i_pts = FROM_SCALE(i_pts); + + if( hdr[7]&0x40 && hdr_read >= (14+1+5) ) /* has dts */ + { + i_dts = ((ts_90khz_t)(hdr[14]&0x0e ) << 29)| + (ts_90khz_t)(hdr[15] << 22)| + ((ts_90khz_t)(hdr[16]&0xfe) << 14)| + (ts_90khz_t)(hdr[17] << 7)| + (ts_90khz_t)(hdr[18] >> 1); + p_pes->i_dts = FROM_SCALE(i_dts); + } + } /* Set PCR */ if( p_pes->i_pts > 0 ) diff -Nru vlc-3.0.21/modules/demux/real.c vlc-3.0.22/modules/demux/real.c --- vlc-3.0.21/modules/demux/real.c 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/demux/real.c 2025-11-13 22:17:54.000000000 +0000 @@ -306,7 +306,7 @@ //const int i_version = GetWBE( &header[0] ); const size_t i_size = GetWBE( &header[2] ) - 12; const int i_id = GetWBE( &header[4] ); - const int64_t i_pts = VLC_TICK_0 + 1000 * GetDWBE( &header[6] ); + const vlc_tick_t i_pts = VLC_TICK_0 + VLC_TICK_FROM_MS(GetDWBE( &header[6] )); const int i_flags= header[11]; /* flags 0x02 -> keyframe */ p_sys->i_data_packets++; diff -Nru vlc-3.0.21/modules/demux/smooth/SmoothManager.cpp vlc-3.0.22/modules/demux/smooth/SmoothManager.cpp --- vlc-3.0.21/modules/demux/smooth/SmoothManager.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/smooth/SmoothManager.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -123,8 +123,8 @@ vlc_tick_t minbuffer = getMinAheadTime() / 2; - if(playlist->minUpdatePeriod.Get() > minbuffer) - minbuffer = playlist->minUpdatePeriod.Get(); + if(playlist->minUpdatePeriod > minbuffer) + minbuffer = playlist->minUpdatePeriod; if(minbuffer < 5 * CLOCK_FREQ) minbuffer = 5 * CLOCK_FREQ; diff -Nru vlc-3.0.21/modules/demux/smooth/playlist/ForgedInitSegment.cpp vlc-3.0.22/modules/demux/smooth/playlist/ForgedInitSegment.cpp --- vlc-3.0.21/modules/demux/smooth/playlist/ForgedInitSegment.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/smooth/playlist/ForgedInitSegment.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -47,7 +47,7 @@ InitSegment(parent) { type = type_; - duration.Set(duration_); + duration = duration_; extradata = nullptr; i_extradata = 0; timescale = timescale_; @@ -211,7 +211,7 @@ mp4mux_trackinfo_Init(&trackinfo, 0x01, /* Will always be 1st and unique track; tfhd patched on block read */ (uint32_t) timescale); - trackinfo.i_read_duration = duration.Get(); + trackinfo.i_read_duration = duration; trackinfo.i_trex_default_length = 1; trackinfo.i_trex_default_size = 1; @@ -276,7 +276,7 @@ if(mp4mux_CanMux( nullptr, &trackinfo.fmt )) box = mp4mux_GetMoovBox(nullptr, &p_tracks, 1, - timescale.ToTime(duration.Get()), + timescale.ToTime(duration), true, false, false, false); mp4mux_trackinfo_Clear(&trackinfo); diff -Nru vlc-3.0.21/modules/demux/smooth/playlist/Manifest.cpp vlc-3.0.22/modules/demux/smooth/playlist/Manifest.cpp --- vlc-3.0.21/modules/demux/smooth/playlist/Manifest.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/smooth/playlist/Manifest.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -32,7 +32,7 @@ Manifest::Manifest (vlc_object_t *p_object) : BasePlaylist(p_object) { - minUpdatePeriod.Set( 5 * CLOCK_FREQ ); + minUpdatePeriod = 5 * CLOCK_FREQ; addAttribute(new TimescaleAttr(Timescale(10000000))); // 100ns b_live = false; } diff -Nru vlc-3.0.21/modules/demux/smooth/playlist/QualityLevel.cpp vlc-3.0.22/modules/demux/smooth/playlist/QualityLevel.cpp --- vlc-3.0.21/modules/demux/smooth/playlist/QualityLevel.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/smooth/playlist/QualityLevel.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -45,8 +45,8 @@ InitSegment * QualityLevel::getInitSegment() const { - if(initialisationSegment.Get()) - return initialisationSegment.Get(); + if(initialisationSegment) + return initialisationSegment; else return BaseRepresentation::getInitSegment(); } diff -Nru vlc-3.0.21/modules/demux/smooth/playlist/SmoothParser.cpp vlc-3.0.22/modules/demux/smooth/playlist/SmoothParser.cpp --- vlc-3.0.21/modules/demux/smooth/playlist/SmoothParser.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/smooth/playlist/SmoothParser.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -172,7 +172,7 @@ ForgedInitSegment *initSegment = new (std::nothrow) ForgedInitSegment(rep, type, timescale, - adaptSet->getPlaylist()->duration.Get()); + adaptSet->getPlaylist()->duration); if(initSegment) { initSegment->setTrackID(trackid); @@ -209,7 +209,7 @@ initSegment->setSourceUrl("forged://"); - rep->initialisationSegment.Set(initSegment); + rep->initialisationSegment = initSegment; } } } @@ -224,7 +224,7 @@ adaptSet->setLang(streamIndexNode->getAttributeValue("Language")); if(streamIndexNode->hasAttribute("Name")) - adaptSet->description.Set(streamIndexNode->getAttributeValue("Name")); + adaptSet->description = streamIndexNode->getAttributeValue("Name"); Timescale timescale(10000000); if(streamIndexNode->hasAttribute("TimeScale")) @@ -279,13 +279,13 @@ if(root->hasAttribute("Duration")) { stime_t time = Integer(root->getAttributeValue("Duration")); - manifest->duration.Set(timescale.ToTime(time)); + manifest->duration = timescale.ToTime(time); } if(root->hasAttribute("DVRWindowLength")) { stime_t time = Integer(root->getAttributeValue("DVRWindowLength")); - manifest->timeShiftBufferDepth.Set(timescale.ToTime(time)); + manifest->timeShiftBufferDepth = timescale.ToTime(time); } if(root->hasAttribute("IsLive") && root->getAttributeValue("IsLive") == "TRUE") @@ -295,7 +295,7 @@ BasePeriod *period = new (std::nothrow) BasePeriod(manifest); if(period) { - period->duration.Set(manifest->duration.Get()); + period->duration = manifest->duration; unsigned nextid = 1; std::vector streamIndexes = DOMHelper::getElementByTagName(root, "StreamIndex", true); std::vector::const_iterator it; diff -Nru vlc-3.0.21/modules/demux/smooth/playlist/SmoothSegment.cpp vlc-3.0.22/modules/demux/smooth/playlist/SmoothSegment.cpp --- vlc-3.0.21/modules/demux/smooth/playlist/SmoothSegment.cpp 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/demux/smooth/playlist/SmoothSegment.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -53,12 +53,12 @@ /* If timeshift depth is present, we use it for expiring segments as we never update playlist itself */ - if(rep->getPlaylist()->timeShiftBufferDepth.Get()) + if(rep->getPlaylist()->timeShiftBufferDepth) { vlc_tick_t start, end, length; if(rep->getMediaPlaybackRange(&start, &end, &length)) { - start = std::max(start, end - rep->getPlaylist()->timeShiftBufferDepth.Get()); + start = std::max(start, end - rep->getPlaylist()->timeShiftBufferDepth); rep->pruneByPlaybackTime(start); } } diff -Nru vlc-3.0.21/modules/demux/subtitle.c vlc-3.0.22/modules/demux/subtitle.c --- vlc-3.0.21/modules/demux/subtitle.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/subtitle.c 2025-11-13 22:17:54.000000000 +0000 @@ -157,7 +157,7 @@ bool b_inited; float f_total; - float f_factor; + int i_factor; } mpsub; struct @@ -172,6 +172,7 @@ es_out_id_t *es; bool b_slave; bool b_first_time; + bool b_sorted; int64_t i_next_demux_date; @@ -255,6 +256,9 @@ static block_t *ToTextBlock( const subtitle_t *p_subtitle ) { + if ( p_subtitle->psz_text == NULL ) + return NULL; + block_t *p_block; size_t i_len = strlen( p_subtitle->psz_text ) + 1; @@ -268,6 +272,9 @@ static block_t *ToEIA608Block( const subtitle_t *p_subtitle ) { + if ( p_subtitle->psz_text == NULL ) + return NULL; + block_t *p_block; const size_t i_len = strlen( p_subtitle->psz_text ); const size_t i_block = (1 + i_len / 5) * 3; @@ -321,6 +328,7 @@ p_sys->b_slave = false; p_sys->b_first_time = true; + p_sys->b_sorted = false; p_sys->i_next_demux_date = 0; p_sys->pf_convert = ToTextBlock; @@ -847,6 +855,9 @@ { demux_sys_t *p_sys = p_demux->p_sys; + if ( !p_sys->b_slave ) + Fix( p_demux ); + int64_t i_barrier = p_sys->i_next_demux_date - var_GetInteger( p_demux->obj.parent, "spu-delay" ); if( i_barrier < 0 ) i_barrier = p_sys->i_next_demux_date; @@ -905,9 +916,12 @@ static void Fix( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; + if (p_sys->b_sorted) + return; /* *** fix order (to be sure...) *** */ qsort( p_sys->subtitles.p_array, p_sys->subtitles.i_count, sizeof( p_sys->subtitles.p_array[0] ), subtitle_cmp); + p_sys->b_sorted = true; } static int TextLoad( text_t *txt, stream_t *s ) @@ -1028,8 +1042,8 @@ } /* */ - p_subtitle->i_start = i_start * p_props->i_microsecperframe; - p_subtitle->i_stop = i_stop >= 0 ? (i_stop * p_props->i_microsecperframe) : -1; + p_subtitle->i_start = VLC_TICK_0 + i_start * p_props->i_microsecperframe; + p_subtitle->i_stop = i_stop >= 0 ? (VLC_TICK_0 + i_stop * p_props->i_microsecperframe) : -1; p_subtitle->psz_text = psz_text; return VLC_SUCCESS; } @@ -1074,31 +1088,28 @@ } /* Now read text until an empty line */ - psz_text = strdup(""); - if( !psz_text ) - return VLC_ENOMEM; - + size_t i_old = 0; + psz_text = NULL; for( ;; ) { const char *s = TextGetLine( txt ); size_t i_len; - size_t i_old; i_len = s ? strlen( s ) : 0; - if( i_len <= 0 ) + if( i_len == 0 ) { p_subtitle->psz_text = psz_text; return VLC_SUCCESS; } - i_old = strlen( psz_text ); psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) - { return VLC_ENOMEM; - } - strcat( psz_text, s ); - strcat( psz_text, "\n" ); + + memcpy( &psz_text[i_old], s, i_len ); + psz_text[i_old + i_len + 0] = '\n'; + psz_text[i_old + i_len + 1] = '\0'; + i_old += i_len + 1; /* replace [br] by \n */ if( b_replace_br ) @@ -1109,6 +1120,7 @@ { *p++ = '\n'; memmove( p, &p[3], strlen(&p[3])+1 ); + i_old -= 3; } } } @@ -1129,10 +1141,8 @@ sscanf( s, "%d:%d:%d", &h1, &m1, &s1) == 3 ) { - (*timing_value) = ( (int64_t)h1 * 3600 * 1000 + - (int64_t)m1 * 60 * 1000 + - (int64_t)s1 * 1000 + - (int64_t)d1 ) * 1000; + (*timing_value) = vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1) + + VLC_TICK_FROM_MS( d1 ); return VLC_SUCCESS; } @@ -1186,15 +1196,11 @@ if( sscanf( s, "%d:%d:%d.%d,%d:%d:%d.%d", &h1, &m1, &s1, &d1, &h2, &m2, &s2, &d2) == 8 ) { - p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + - (int64_t)m1 * 60*1000 + - (int64_t)s1 * 1000 + - (int64_t)d1 ) * 1000; - - p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 + - (int64_t)m2 * 60*1000 + - (int64_t)s2 * 1000 + - (int64_t)d2 ) * 1000; + p_subtitle->i_start = vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1) + + VLC_TICK_FROM_MS( d1 ) + VLC_TICK_0; + + p_subtitle->i_stop = vlc_tick_from_sec( h2 * 3600 + m2 * 60 + s2 ) + + VLC_TICK_FROM_MS( d2 ) + VLC_TICK_0; return VLC_SUCCESS; } return VLC_EGENERIC; @@ -1279,14 +1285,10 @@ psz_text = psz_temp; } - p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + - (int64_t)m1 * 60*1000 + - (int64_t)s1 * 1000 + - (int64_t)c1 * 10 ) * 1000; - p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 + - (int64_t)m2 * 60*1000 + - (int64_t)s2 * 1000 + - (int64_t)c2 * 10 ) * 1000; + p_subtitle->i_start = vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1 ) + + VLC_TICK_FROM_MS( c1 * 10 ) + VLC_TICK_0; + p_subtitle->i_stop = vlc_tick_from_sec( h2 * 3600 + m2 * 60 + s2 ) + + VLC_TICK_FROM_MS( c2 * 10 ) + VLC_TICK_0; p_subtitle->psz_text = psz_text; return VLC_SUCCESS; } @@ -1335,9 +1337,7 @@ if( sscanf( s, "%d:%d:%d%*c%[^\r\n]", &h1, &m1, &s1, psz_text ) == 4 ) { - p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + - (int64_t)m1 * 60*1000 + - (int64_t)s1 * 1000 ) * 1000; + p_subtitle->i_start = VLC_TICK_0 + vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1 ); p_subtitle->i_stop = -1; break; } @@ -1454,7 +1454,7 @@ } } - p_subtitle->i_start = i_start * 1000; + p_subtitle->i_start = VLC_TICK_0 + VLC_TICK_FROM_MS(i_start); p_subtitle->i_stop = -1; p_subtitle->psz_text = strdup( text ); @@ -1498,24 +1498,20 @@ "{T %d:%d:%d:%d", &h1, &m1, &s1, &c1 ) == 4 ) { - p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + - (int64_t)m1 * 60*1000 + - (int64_t)s1 * 1000 + - (int64_t)c1 * 10) * 1000; + p_subtitle->i_start = vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1 ) + + VLC_TICK_FROM_MS( c1 * 10 ) + VLC_TICK_0; p_subtitle->i_stop = -1; break; } } /* Now read text until a line containing "}" */ - psz_text = strdup(""); - if( !psz_text ) - return VLC_ENOMEM; + size_t i_old = 0; + psz_text = NULL; for( ;; ) { const char *s = TextGetLine( txt ); - int i_len; - int i_old; + size_t i_len; if( !s ) { @@ -1526,16 +1522,19 @@ i_len = strlen( s ); if( i_len == 1 && s[0] == '}') { + if (psz_text) + psz_text[i_old] = '\0'; p_subtitle->psz_text = psz_text; return VLC_SUCCESS; } - i_old = strlen( psz_text ); psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) return VLC_ENOMEM; - strcat( psz_text, s ); - strcat( psz_text, "\n" ); + + memcpy( &psz_text[i_old], s, i_len ); + psz_text[i_old + i_len + 0] = '\n'; + i_old += i_len + 1; } } @@ -1571,8 +1570,8 @@ if( sscanf( s, "[%d][] %[^\r\n]", &i_start, psz_text ) == 2 || sscanf( s, "[%d][%d] %[^\r\n]", &i_start, &i_stop, psz_text ) == 3) { - p_subtitle->i_start = (int64_t)i_start * 100000; - p_subtitle->i_stop = i_stop >= 0 ? ((int64_t)i_stop * 100000) : -1; + p_subtitle->i_start = VLC_TICK_0 + VLC_TICK_FROM_MS(i_start * 100); + p_subtitle->i_stop = i_stop >= 0 ? VLC_TICK_0 + VLC_TICK_FROM_MS(i_stop * 100) : -1; break; } free( psz_text ); @@ -1600,8 +1599,9 @@ VLC_UNUSED(p_props); VLC_UNUSED( i_idx ); - char *psz_text = strdup( "" ); - int i_old = 0; + char *psz_text = NULL; + size_t i_old = 0; + size_t i_len; int i_firstline = 1; for( ;; ) @@ -1622,29 +1622,33 @@ /* Starting of a subtitle */ if( i_firstline ) { - p_subtitle->i_start = t * p_props->i_microsecperframe; + p_subtitle->i_start = VLC_TICK_0 + t * p_props->i_microsecperframe; i_firstline = 0; } /* We have been too far: end of the subtitle, begin of next */ else { - p_subtitle->i_stop = t * p_props->i_microsecperframe; + p_subtitle->i_stop = VLC_TICK_0 + t * p_props->i_microsecperframe; break; } } /* Text Lines */ else { - i_old = strlen( psz_text ) + 1; - psz_text = realloc_or_free( psz_text, i_old + strlen( s ) + 1 ); + i_len = strlen( s ); + psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) return VLC_ENOMEM; - strcat( psz_text, s ); - strcat( psz_text, "\n" ); + + memcpy( &psz_text[i_old], s, i_len ); + psz_text[i_old + i_len + 0] = '\n'; + i_old += i_len + 1; if( txt->i_line == txt->i_line_count ) break; } } + if (psz_text) + psz_text[i_old] = '\0'; p_subtitle->psz_text = psz_text; return VLC_SUCCESS; } @@ -1675,8 +1679,8 @@ if( sscanf (s, "%d,%d,\"%[^\n\r]", &t1, &t2, psz_text ) == 3 ) { /* 1/10th of second ? Frame based ? FIXME */ - p_subtitle->i_start = 10 * t1; - p_subtitle->i_stop = 10 * t2; + p_subtitle->i_start = VLC_TICK_0 + 10 * t1; + p_subtitle->i_stop = VLC_TICK_0 + 10 * t2; /* Remove latest " */ psz_text[ strlen(psz_text) - 1 ] = '\0'; @@ -1702,70 +1706,62 @@ { VLC_UNUSED( i_idx ); - char *psz_text = strdup( "" ); - if( !p_props->mpsub.b_inited ) { p_props->mpsub.f_total = 0.0; - p_props->mpsub.f_factor = 0.0; + p_props->mpsub.i_factor = 0; p_props->mpsub.b_inited = true; } for( ;; ) { - char p_dummy; - char *psz_temp; - const char *s = TextGetLine( txt ); if( !s ) { - free( psz_text ); return VLC_EGENERIC; } - if( strstr( s, "FORMAT" ) ) + if ( *s =='#' || *s == '\0' ) + continue; + + /* Data Lines */ + float wait, duration; + if( sscanf( s, "%f %f", &wait, &duration ) == 2 ) { - if( sscanf (s, "FORMAT=TIM%c", &p_dummy ) == 1 && p_dummy == 'E') - { - p_props->mpsub.f_factor = 100.0; - break; - } + float f1 = wait; + float f2 = duration; + p_props->mpsub.f_total += f1 * p_props->mpsub.i_factor; + p_subtitle->i_start = VLC_TICK_0 + llroundf(10000.f * p_props->mpsub.f_total); + p_props->mpsub.f_total += f2 * p_props->mpsub.i_factor; + p_subtitle->i_stop = VLC_TICK_0 + llroundf(10000.f * p_props->mpsub.f_total); + break; + } - psz_temp = malloc( strlen(s) ); - if( !psz_temp ) + if( !strncmp( s, "FORMAT=", strlen("FORMAT=") ) ) + { + const char *psz_format = s + strlen( "FORMAT=" ); + if( !strncmp( psz_format, "TIME", strlen("TIME") ) && (psz_format[4] == '\0' || psz_format[4] == ' ') ) { - free( psz_text ); - return VLC_ENOMEM; + // FORMAT=TIME may be followed by a comment + p_props->mpsub.i_factor = 100; } - - if( sscanf( s, "FORMAT=%[^\r\n]", psz_temp ) ) + else { - float f_fps = us_strtof( psz_temp, NULL ); - - if( f_fps > 0.f && var_GetFloat( p_obj, "sub-fps" ) <= 0.f ) - var_SetFloat( p_obj, "sub-fps", f_fps ); + float f_fps; + if( sscanf( psz_format, "%f", &f_fps ) == 1 ) + { + if( f_fps > 0.f && var_GetFloat( p_obj, "sub-fps" ) <= 0.f ) + var_SetFloat( p_obj, "sub-fps", f_fps ); - p_props->mpsub.f_factor = 1.f; - free( psz_temp ); - break; + p_props->mpsub.i_factor = 1; + } } - free( psz_temp ); - } - - /* Data Lines */ - float f1 = us_strtof( s, &psz_temp ); - if( *psz_temp ) - { - float f2 = us_strtof( psz_temp, NULL ); - p_props->mpsub.f_total += f1 * p_props->mpsub.f_factor; - p_subtitle->i_start = llroundf(10000.f * p_props->mpsub.f_total); - p_props->mpsub.f_total += f2 * p_props->mpsub.f_factor; - p_subtitle->i_stop = llroundf(10000.f * p_props->mpsub.f_total); - break; } } + char *psz_text = NULL; + size_t i_old = 0; for( ;; ) { const char *s = TextGetLine( txt ); @@ -1780,16 +1776,17 @@ if( i_len == 0 ) break; - size_t i_old = strlen( psz_text ); - psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) return VLC_ENOMEM; - strcat( psz_text, s ); - strcat( psz_text, "\n" ); + memcpy( &psz_text[i_old], s, i_len ); + psz_text[i_old + i_len + 0] = '\n'; + i_old += i_len + 1; } + if (psz_text) + psz_text[i_old] = '\0'; p_subtitle->psz_text = psz_text; return VLC_SUCCESS; } @@ -1828,21 +1825,19 @@ if( sscanf( s, "%d:%d:%d.%d %d:%d:%d.%d %[^\n\r]", &h1, &m1, &s1, &f1, &h2, &m2, &s2, &f2, psz_text ) == 9 ) { - p_subtitle->i_start = ( ( (int64_t) h1 *3600 + m1 * 60 + s1 ) + - (int64_t)( ( f1 + p_props->jss.i_time_shift ) / p_props->jss.i_time_resolution ) ) - * 1000000; - p_subtitle->i_stop = ( ( (int64_t) h2 *3600 + m2 * 60 + s2 ) + - (int64_t)( ( f2 + p_props->jss.i_time_shift ) / p_props->jss.i_time_resolution ) ) - * 1000000; + p_subtitle->i_start = VLC_TICK_0 + vlc_tick_from_sec( ( h1 *3600 + m1 * 60 + s1 ) + + (int64_t)( ( f1 + p_props->jss.i_time_shift ) / p_props->jss.i_time_resolution ) ); + p_subtitle->i_stop = VLC_TICK_0 + vlc_tick_from_sec( ( h2 *3600 + m2 * 60 + s2 ) + + (int64_t)( ( f2 + p_props->jss.i_time_shift ) / p_props->jss.i_time_resolution ) ); break; } /* Short time lines */ else if( sscanf( s, "@%d @%d %[^\n\r]", &f1, &f2, psz_text ) == 3 ) { - p_subtitle->i_start = ((int64_t) - ( f1 + p_props->jss.i_time_shift ) / p_props->jss.i_time_resolution * 1000000.0 ); - p_subtitle->i_stop = ((int64_t) - ( f2 + p_props->jss.i_time_shift ) / p_props->jss.i_time_resolution * 1000000.0 ); + p_subtitle->i_start = VLC_TICK_0 + + vlc_tick_from_sec( (f1 + p_props->jss.i_time_shift ) / p_props->jss.i_time_resolution ); + p_subtitle->i_stop = VLC_TICK_0 + + vlc_tick_from_sec( (f2 + p_props->jss.i_time_shift ) / p_props->jss.i_time_resolution ); break; } /* General Directive lines */ @@ -2067,12 +2062,8 @@ if( sscanf( s, "{%d:%d:%d}{%d:%d:%d}%[^\r\n]", &h1, &m1, &s1, &h2, &m2, &s2, psz_text ) == 7 ) { - p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + - (int64_t)m1 * 60*1000 + - (int64_t)s1 * 1000 ) * 1000; - p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 + - (int64_t)m2 * 60*1000 + - (int64_t)s2 * 1000 ) * 1000; + p_subtitle->i_start = VLC_TICK_0 + vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1 ); + p_subtitle->i_stop = VLC_TICK_0 + vlc_tick_from_sec( h2 * 3600 + m2 * 60 + s2 ); break; } free( psz_text ); @@ -2088,19 +2079,36 @@ return VLC_SUCCESS; } -static int64_t ParseRealTime( char *psz, int *h, int *m, int *s, int *f ) +static vlc_tick_t ParseRealTime( const char *psz ) { - if( *psz == '\0' ) return 0; - if( sscanf( psz, "%d:%d:%d.%d", h, m, s, f ) == 4 || - sscanf( psz, "%d:%d.%d", m, s, f ) == 3 || - sscanf( psz, "%d.%d", s, f ) == 2 || - sscanf( psz, "%d:%d", m, s ) == 2 || - sscanf( psz, "%d", s ) == 1 ) + if( *psz == '\0' ) return VLC_TICK_0; + int h, m, s, f; + if( sscanf( psz, "%d:%d:%d.%d", &h, &m, &s, &f ) == 4 ) + { + return vlc_tick_from_sec((( h * 60 + m ) * 60 ) + s ) + + VLC_TICK_FROM_MS(f * 10) + VLC_TICK_0; + } + if( sscanf( psz, "%d:%d.%d", &m, &s, &f ) == 3 ) + { + return vlc_tick_from_sec(( m * 60 ) + s ) + + VLC_TICK_FROM_MS(f * 10) + VLC_TICK_0; + } + if( sscanf( psz, "%d.%d", &s, &f ) == 2 ) + { + return vlc_tick_from_sec( s ) + + VLC_TICK_FROM_MS(f * 10) + VLC_TICK_0; + } + if( sscanf( psz, "%d:%d", &m, &s ) == 2 ) + { + return vlc_tick_from_sec(( m * 60 ) + s ) + + VLC_TICK_0; + } + if( sscanf( psz, "%d", &s ) == 1 ) { - return (int64_t)((( *h * 60 + *m ) * 60 ) + *s ) * 1000 * 1000 - + (int64_t)*f * 10 * 1000; + return vlc_tick_from_sec( s ) + + VLC_TICK_0; } - else return VLC_EGENERIC; + return -1; } static int ParseRealText( vlc_object_t *p_obj, subs_properties_t *p_props, @@ -2113,8 +2121,6 @@ for( ;; ) { - int h1 = 0, m1 = 0, s1 = 0, f1 = 0; - int h2 = 0, m2 = 0, s2 = 0, f2 = 0; const char *s = TextGetLine( txt ); free( psz_text ); @@ -2131,30 +2137,39 @@ if( psz_temp != NULL ) { char psz_end[12], psz_begin[12]; + vlc_tick_t end = -1; /* Line has begin and end */ - if( ( sscanf( psz_temp, + if( sscanf( psz_temp, "<%*[t|T]ime %*[b|B]egin=\"%11[^\"]\" %*[e|E]nd=\"%11[^\"]%*[^>]%[^\n\r]", - psz_begin, psz_end, psz_text) != 3 ) && - /* Line has begin and no end */ - ( sscanf( psz_temp, - "<%*[t|T]ime %*[b|B]egin=\"%11[^\"]\"%*[^>]%[^\n\r]", - psz_begin, psz_text ) != 2) ) + psz_begin, psz_end, psz_text) == 3 ) + { + end = ParseRealTime( psz_end ); + } + else if ( sscanf( psz_temp, + "<%*[t|T]ime %*[b|B]egin=\"%11[^\"]\"%*[^>]%[^\n\r]", + psz_begin, psz_text ) != 2) /* Line is not recognized */ { continue; } /* Get the times */ - int64_t i_time = ParseRealTime( psz_begin, &h1, &m1, &s1, &f1 ); - p_subtitle->i_start = i_time >= 0 ? i_time : 0; + vlc_tick_t i_time = ParseRealTime( psz_begin ); + if (i_time != -1) + p_subtitle->i_start = i_time; + else + p_subtitle->i_start = -1; - i_time = ParseRealTime( psz_end, &h2, &m2, &s2, &f2 ); - p_subtitle->i_stop = i_time >= 0 ? i_time : -1; + if (end != -1) + p_subtitle->i_stop = end; + else + p_subtitle->i_stop = -1; break; } } /* Get the following Lines */ + size_t i_old = strlen( psz_text ); for( ;; ) { const char *s = TextGetLine( txt ); @@ -2175,16 +2190,16 @@ break; } - size_t i_old = strlen( psz_text ); - psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) return VLC_ENOMEM; - strcat( psz_text, s ); - strcat( psz_text, "\n" ); + memcpy( &psz_text[i_old], s, i_len ); + psz_text[i_old + i_len + 0] = '\n'; + i_old += i_len + 1; } + psz_text[i_old] = '\0'; /* Remove the starting ">" that remained after the sscanf */ memmove( &psz_text[0], &psz_text[1], strlen( psz_text ) ); @@ -2218,9 +2233,7 @@ if( sscanf( s, "[%d:%d:%d]%[^\r\n]", &h1, &m1, &s1, psz_text ) == 4 ) { - p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + - (int64_t)m1 * 60*1000 + - (int64_t)s1 * 1000 ) * 1000; + p_subtitle->i_start = VLC_TICK_0 + vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1 ); s = TextGetLine( txt ); if( !s ) @@ -2230,9 +2243,7 @@ } if( sscanf( s, "[%d:%d:%d]", &h2, &m2, &s2 ) == 3 ) - p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 + - (int64_t)m2 * 60*1000 + - (int64_t)s2 * 1000 ) * 1000; + p_subtitle->i_stop = vlc_tick_from_sec(h2 * 3600 + m2 * 60 + s2 ); else p_subtitle->i_stop = -1; break; @@ -2271,9 +2282,7 @@ if( sscanf( s, "[%d:%d:%d]", &h1, &m1, &s1 ) == 3 ) { - p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + - (int64_t)m1 * 60*1000 + - (int64_t)s1 * 1000 ) * 1000; + p_subtitle->i_start = VLC_TICK_0 + vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1 ); s = TextGetLine( txt ); if( !s ) @@ -2291,9 +2300,7 @@ } if( sscanf( s, "[%d:%d:%d]", &h2, &m2, &s2 ) == 3 ) - p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 + - (int64_t)m2 * 60*1000 + - (int64_t)s2 * 1000 ) * 1000; + p_subtitle->i_stop = vlc_tick_from_sec( h2 * 3600 + m2 * 60 + s2 ); else p_subtitle->i_stop = -1; @@ -2327,45 +2334,40 @@ &h1, &m1, &s1, &d1, &h2, &m2, &s2, &d2 ) == 8 ) { - p_subtitle->i_start = ( (int64_t)h1 * 3600 * 1000 + - (int64_t)m1 * 60 * 1000 + - (int64_t)s1 * 1000 + - (int64_t)d1 ) * 1000; - - p_subtitle->i_stop = ( (int64_t)h2 * 3600 * 1000 + - (int64_t)m2 * 60 * 1000 + - (int64_t)s2 * 1000 + - (int64_t)d2 ) * 1000; + p_subtitle->i_start = vlc_tick_from_sec( h1 * 3600 + m1 * 60 + s1 ) + + VLC_TICK_FROM_MS( d1 ) + VLC_TICK_0; + + p_subtitle->i_stop = vlc_tick_from_sec( h2 * 3600 + m2 * 60 + s2 ) + + VLC_TICK_FROM_MS( d2 ) + VLC_TICK_0; if( p_subtitle->i_start < p_subtitle->i_stop ) break; } } /* Now read text until an empty line */ - psz_text = strdup(""); - if( !psz_text ) - return VLC_ENOMEM; - + size_t i_old = 0; + psz_text = NULL; for( ;; ) { const char *s = TextGetLine( txt ); size_t i_len; - size_t i_old; i_len = s ? strlen( s ) : 0; if( i_len <= 0 ) { + if (psz_text) + psz_text[i_old] = '\0'; p_subtitle->psz_text = psz_text; return VLC_SUCCESS; } - i_old = strlen( psz_text ); psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) return VLC_ENOMEM; - strcat( psz_text, s ); - strcat( psz_text, "\n" ); + memcpy( &psz_text[i_old], s, i_len ); + psz_text[i_old + i_len + 0] = '\n'; + i_old += i_len + 1; } } @@ -2418,7 +2420,7 @@ continue; /* convert everything to seconds */ - vlc_tick_t i_frames = h * 3600 + m * 60 + s; + uint64_t i_frames = h * 3600 + m * 60 + s; if( c == ';' && p_rate->b_drop_allowed ) /* dropframe */ { @@ -2433,7 +2435,7 @@ /* convert to frame # at 29.97 */ i_frames = i_frames * framerates[3].rate.num / framerates[3].rate.den + f; } - p_subtitle->i_start = VLC_TICK_0 + i_frames * CLOCK_FREQ * + p_subtitle->i_start = VLC_TICK_0 + vlc_tick_from_sec(i_frames)* p_rate->rate.den / p_rate->rate.num; p_subtitle->i_stop = -1; diff -Nru vlc-3.0.21/modules/demux/ttml.c vlc-3.0.22/modules/demux/ttml.c --- vlc-3.0.21/modules/demux/ttml.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/ttml.c 2025-11-13 22:17:54.000000000 +0000 @@ -377,7 +377,7 @@ tt_node_ToText( &stream, (tt_basenode_t *) p_sys->p_rootnode, &p_sys->times.p_array[p_sys->times.i_current] ); - if( vlc_memstream_close( &stream ) == VLC_SUCCESS ) + if( vlc_memstream_close( &stream ) == 0 ) { block_t* p_block = block_heap_Alloc( stream.ptr, stream.length ); if( p_block ) @@ -523,7 +523,7 @@ vlc_memstream_putc( &stream, '\0' ); - if( vlc_memstream_close( &stream ) == VLC_SUCCESS ) + if( vlc_memstream_close( &stream ) == 0 ) { msg_Dbg( p_demux, "%s", stream.ptr ); free( stream.ptr ); diff -Nru vlc-3.0.21/modules/demux/ty.c vlc-3.0.22/modules/demux/ty.c --- vlc-3.0.21/modules/demux/ty.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/ty.c 2025-11-13 22:17:54.000000000 +0000 @@ -39,6 +39,8 @@ # include "config.h" #endif +#include + #include #include #include @@ -46,6 +48,7 @@ #include #include #include "../codec/cc.h" +#include "mpeg/timestamps.h" #include @@ -111,6 +114,9 @@ #define TIVO_PES_FILEID ( 0xf5467abd ) #define TIVO_PART_LENGTH ( 0x20000000 ) /* 536,870,912 bytes */ #define CHUNK_SIZE ( 128 * 1024 ) +#define REC_SIZE 16 +#define CHUNK_HEADER_SIZE 4 +#define MAX_NUM_RECS ((CHUNK_SIZE - CHUNK_HEADER_SIZE) / REC_SIZE) typedef struct { @@ -259,15 +265,15 @@ static int get_chunk_header(demux_t *); static vlc_tick_t get_pts( const uint8_t *buf ); static int find_es_header( const uint8_t *header, - const uint8_t *buffer, int i_search_len ); + const uint8_t *buffer, size_t buffer_len, size_t i_search_len ); static int ty_stream_seek_pct(demux_t *p_demux, double seek_pct); static int ty_stream_seek_time(demux_t *, uint64_t); static ty_rec_hdr_t *parse_chunk_headers( const uint8_t *p_buf, int i_num_recs, int *pi_payload_size); static int probe_stream(demux_t *p_demux); -static void analyze_chunk(demux_t *p_demux, const uint8_t *p_chunk); -static void parse_master(demux_t *p_demux); +static int analyze_chunk(demux_t *p_demux, const uint8_t *p_chunk); +static int parse_master(demux_t *p_demux); static int DemuxRecVideo( demux_t *p_demux, ty_rec_hdr_t *rec_hdr, block_t *p_block_in ); static int DemuxRecAudio( demux_t *p_demux, ty_rec_hdr_t *rec_hdr, block_t *p_block_in ); @@ -349,6 +355,7 @@ if (probe_stream(p_demux) != VLC_SUCCESS) { //TyClose(p_demux); + free(p_sys); return VLC_EGENERIC; } @@ -443,6 +450,12 @@ /* read in this record's payload */ if( !( p_block_in = vlc_stream_Block( p_demux->s, l_rec_size ) ) ) return 0; + if (p_block_in->i_buffer != (unsigned long) l_rec_size) + { + msg_Err(p_demux, "Unexpected EOF"); + block_Release(p_block_in); + return 0; + } /* set these as 'unknown' for now */ p_block_in->i_pts = @@ -558,13 +571,13 @@ * Assume buf points to beginning of PTS */ static vlc_tick_t get_pts( const uint8_t *buf ) { - vlc_tick_t i_pts; + ts_90khz_t i_pts; - i_pts = ((vlc_tick_t)(buf[0]&0x0e ) << 29)| - (vlc_tick_t)(buf[1] << 22)| - ((vlc_tick_t)(buf[2]&0xfe) << 14)| - (vlc_tick_t)(buf[3] << 7)| - (vlc_tick_t)(buf[4] >> 1); + i_pts = ((ts_90khz_t)(buf[0]&0x0e ) << 29)| + (ts_90khz_t)(buf[1] << 22)| + ((ts_90khz_t)(buf[2]&0xfe) << 14)| + (ts_90khz_t)(buf[3] << 7)| + (ts_90khz_t)(buf[4] >> 1); i_pts *= 100 / 9; /* convert PTS (90Khz clock) to microseconds */ return i_pts; } @@ -572,11 +585,11 @@ /* =========================================================================== */ static int find_es_header( const uint8_t *header, - const uint8_t *buffer, int i_search_len ) + const uint8_t *buffer, size_t buffer_len, size_t i_search_len ) { - int count; + size_t count; - for( count = 0; count < i_search_len; count++ ) + for( count = 0; count < i_search_len && count + 4 < buffer_len; count++ ) { if( !memcmp( &buffer[count], header, 4 ) ) return count; @@ -686,7 +699,8 @@ /* get the PTS from this packet if it has one. * on S1, only 0x06 has PES. On S2, however, most all do. * Do NOT Pass the PES Header to the MPEG2 codec */ - esOffset1 = find_es_header( ty_VideoPacket, p_block_in->p_buffer, 5 ); + size_t search_len = __MIN(l_rec_size - sizeof(ty_VideoPacket), 5); + esOffset1 = find_es_header( ty_VideoPacket, p_block_in->p_buffer, p_block_in->i_buffer, search_len ); if( esOffset1 != -1 ) { //msg_Dbg(p_demux, "Video PES hdr in pkt type 0x%02x at offset %d", @@ -857,10 +871,10 @@ /* get the PTS out of this PES header (MPEG or AC3) */ if (p_sys->audio_type == TIVO_AUDIO_MPEG) esOffset1 = find_es_header(ty_MPEGAudioPacket, - p_sys->pes_buffer, 5); + p_sys->pes_buffer, ARRAY_SIZE(p_sys->pes_buffer), 5); else esOffset1 = find_es_header(ty_AC3AudioPacket, - p_sys->pes_buffer, 5); + p_sys->pes_buffer, ARRAY_SIZE(p_sys->pes_buffer), 5); if (esOffset1 < 0) { /* god help us; something's really wrong */ @@ -896,7 +910,7 @@ /* MPEG Audio with PES Header, either SA or DTiVo */ /* ================================================ */ esOffset1 = find_es_header( ty_MPEGAudioPacket, - p_block_in->p_buffer, 5 ); + p_block_in->p_buffer, p_block_in->i_buffer, 5 ); /*msg_Dbg(p_demux, "buffer has %#02x %#02x %#02x %#02x", p_block_in->p_buffer[0], p_block_in->p_buffer[1], @@ -905,7 +919,7 @@ /* SA PES Header, No Audio Data */ /* ================================================ */ - if ( ( esOffset1 == 0 ) && ( l_rec_size == 16 ) ) + if ( ( esOffset1 == 0 ) && ( l_rec_size == REC_SIZE ) ) { p_sys->lastAudioPTS = VLC_TICK_0 + get_pts( &p_block_in->p_buffer[ SA_PTS_OFFSET ] ); @@ -957,7 +971,7 @@ /* DTiVo AC3 Audio Data with PES Header */ /* ================================================ */ esOffset1 = find_es_header( ty_AC3AudioPacket, - p_block_in->p_buffer, 5 ); + p_block_in->p_buffer, p_block_in->i_buffer, 5 ); #if 0 msg_Dbg(p_demux, "buffer has " @@ -1051,12 +1065,12 @@ p_sys->i_cur_chunk = seek_pos / CHUNK_SIZE; /* try to read the part header (master chunk) if it's there */ - if ( vlc_stream_Seek( p_demux->s, i_cur_part * TIVO_PART_LENGTH )) + if (vlc_stream_Seek( p_demux->s, i_cur_part * TIVO_PART_LENGTH ) || + parse_master(p_demux) != VLC_SUCCESS) { /* can't seek stream */ return VLC_EGENERIC; } - parse_master(p_demux); /* now for the actual chunk */ if ( vlc_stream_Seek( p_demux->s, p_sys->i_cur_chunk * CHUNK_SIZE)) @@ -1080,8 +1094,9 @@ l_skip_amt = 0; for ( int i=0; ii_cur_rec; i++) l_skip_amt += p_sys->rec_hdrs[i].l_rec_size; - vlc_stream_Seek(p_demux->s, ((p_sys->i_cur_chunk-1) * CHUNK_SIZE) + - (p_sys->i_num_recs * 16) + l_skip_amt + 4); + if( vlc_stream_Seek(p_demux->s, ((p_sys->i_cur_chunk-1) * CHUNK_SIZE) + + (p_sys->i_num_recs * REC_SIZE) + l_skip_amt + 4) != VLC_SUCCESS ) + return VLC_EGENERIC; /* to hell with syncing any audio or video, just start reading records... :) */ /*p_sys->lastAudioPTS = p_sys->lastVideoPTS = VLC_TICK_INVALID;*/ @@ -1488,13 +1503,15 @@ msg_Dbg(p_demux, "skipping to prior segment."); /* load previous part */ if (i_cur_part == 0) { - vlc_stream_Seek(p_demux->s, l_cur_pos); + p_sys->eof = (vlc_stream_Seek(p_demux->s, l_cur_pos) != VLC_SUCCESS); msg_Err(p_demux, "Attempt to seek past BOF"); return VLC_EGENERIC; } - vlc_stream_Seek(p_demux->s, (i_cur_part - 1) * TIVO_PART_LENGTH); + if(vlc_stream_Seek(p_demux->s, (i_cur_part - 1) * TIVO_PART_LENGTH) != VLC_SUCCESS) + return VLC_EGENERIC; i_cur_part--; - parse_master(p_demux); + if(parse_master(p_demux) != VLC_SUCCESS) + return VLC_EGENERIC; } /* maybe we need to go forward */ while (l_seek_time > p_sys->l_final_ty_pts) { @@ -1502,13 +1519,15 @@ /* load next part */ if ((i_cur_part + 1) * TIVO_PART_LENGTH > p_sys->i_stream_size) { /* error; restore previous file position */ - vlc_stream_Seek(p_demux->s, l_cur_pos); + p_sys->eof = (vlc_stream_Seek(p_demux->s, l_cur_pos) != VLC_SUCCESS); msg_Err(p_demux, "seek error"); return VLC_EGENERIC; } - vlc_stream_Seek(p_demux->s, (i_cur_part + 1) * TIVO_PART_LENGTH); + if(vlc_stream_Seek(p_demux->s, (i_cur_part + 1) * TIVO_PART_LENGTH) != VLC_SUCCESS) + return VLC_EGENERIC; i_cur_part++; - parse_master(p_demux); + if(parse_master(p_demux) != VLC_SUCCESS) + return VLC_EGENERIC; } /* our target is somewhere within this part; @@ -1532,13 +1551,15 @@ if (i == p_sys->i_seq_table_size) { if ((i_cur_part + 1) * TIVO_PART_LENGTH > p_sys->i_stream_size) { /* error; restore previous file position */ - vlc_stream_Seek(p_demux->s, l_cur_pos); + p_sys->eof = (vlc_stream_Seek(p_demux->s, l_cur_pos) != VLC_SUCCESS); msg_Err(p_demux, "seek error"); return VLC_EGENERIC; } - vlc_stream_Seek(p_demux->s, (i_cur_part + 1) * TIVO_PART_LENGTH); + if(vlc_stream_Seek(p_demux->s, (i_cur_part + 1) * TIVO_PART_LENGTH) != VLC_SUCCESS) + return VLC_EGENERIC; i_cur_part++; - parse_master(p_demux); + if(parse_master(p_demux) != VLC_SUCCESS) + return VLC_EGENERIC; i_seq_entry = 0; } @@ -1553,8 +1574,9 @@ /* check this chunk's SEQ header timestamp */ msg_Dbg(p_demux, "has SEQ. seeking to chunk at 0x%"PRIu64, (i_cur_part * TIVO_PART_LENGTH) + l_chunk_offset); - vlc_stream_Seek(p_demux->s, (i_cur_part * TIVO_PART_LENGTH) + - l_chunk_offset); + if(vlc_stream_Seek(p_demux->s, (i_cur_part * TIVO_PART_LENGTH) + + l_chunk_offset) != VLC_SUCCESS) + return VLC_EGENERIC; // TODO: we don't have to parse the full header set; // just test the seq_rec entry for its timestamp p_sys->i_stuff_cnt = 0; @@ -1563,7 +1585,8 @@ if (p_sys->i_seq_rec < 0 || p_sys->i_seq_rec > p_sys->i_num_recs) { msg_Err(p_demux, "no SEQ hdr in chunk; table had one."); /* Seek to beginning of original chunk & reload it */ - vlc_stream_Seek(p_demux->s, (l_cur_pos / CHUNK_SIZE) * CHUNK_SIZE); + if(vlc_stream_Seek(p_demux->s, (l_cur_pos / CHUNK_SIZE) * CHUNK_SIZE) != VLC_SUCCESS) + p_sys->eof = true; p_sys->i_stuff_cnt = 0; get_chunk_header(p_demux); return VLC_EGENERIC; @@ -1596,7 +1619,8 @@ i_skip_cnt = 0; for (int j=0; ji_seq_rec; j++) i_skip_cnt += p_sys->rec_hdrs[j].l_rec_size; - vlc_stream_Read(p_demux->s, NULL, i_skip_cnt); + if(vlc_stream_Read(p_demux->s, NULL, i_skip_cnt) != i_skip_cnt) + return VLC_EGENERIC; p_sys->i_cur_rec = p_sys->i_seq_rec; //p_sys->l_last_ty_pts = p_sys->rec_hdrs[p_sys->i_seq_rec].l_ty_pts; //p_sys->l_last_ty_pts_sync = p_sys->lastAudioPTS; @@ -1608,7 +1632,7 @@ /* parse a master chunk, filling the SEQ table and other variables. * We assume the stream is currently pointing to it. */ -static void parse_master(demux_t *p_demux) +static int parse_master(demux_t *p_demux) { demux_sys_t *p_sys = p_demux->p_sys; uint8_t mst_buf[32]; @@ -1625,7 +1649,8 @@ free(p_sys->seq_table); /* parse header info */ - vlc_stream_Read(p_demux->s, mst_buf, 32); + if( vlc_stream_Read(p_demux->s, mst_buf, 32) != 32 ) + return VLC_EGENERIC; uint32_t i_map_size = U32_AT(&mst_buf[20]); /* size of bitmask, in bytes */ uint32_t i = U32_AT(&mst_buf[28]); /* size of SEQ table, in bytes */ @@ -1636,24 +1661,33 @@ if(p_sys->i_seq_table_size == 0) { p_sys->seq_table = NULL; - return; + return VLC_SUCCESS; } +#if (UINT32_MAX > SSIZE_MAX) + if (i_map_size > SSIZE_MAX) + return VLC_EGENERIC; +#endif + /* parse all the entries */ p_sys->seq_table = calloc(p_sys->i_seq_table_size, sizeof(ty_seq_table_t)); if (p_sys->seq_table == NULL) { p_sys->i_seq_table_size = 0; - return; + return VLC_SUCCESS; } for (unsigned j=0; ji_seq_table_size; j++) { - vlc_stream_Read(p_demux->s, mst_buf, 8); + if(vlc_stream_Read(p_demux->s, mst_buf, 8) != 8) + return VLC_EGENERIC; p_sys->seq_table[j].l_timestamp = U64_AT(&mst_buf[0]); if (i_map_size > 8) { msg_Err(p_demux, "Unsupported SEQ bitmap size in master chunk"); - vlc_stream_Read(p_demux->s, NULL, i_map_size); + if (vlc_stream_Read(p_demux->s, NULL, i_map_size) != i_map_size ) + return VLC_EGENERIC; } else { - vlc_stream_Read(p_demux->s, mst_buf + 8, i_map_size); + if (vlc_stream_Read(p_demux->s, mst_buf + 8, i_map_size) + < (ssize_t)i_map_size) + return VLC_EGENERIC; memcpy(p_sys->seq_table[j].chunk_bitmask, &mst_buf[8], i_map_size); } } @@ -1674,10 +1708,11 @@ i_pts_secs / 3600, (i_pts_secs / 60) % 60, i_pts_secs % 60 ); /* seek past this chunk */ - vlc_stream_Seek(p_demux->s, i_save_pos + CHUNK_SIZE); + return vlc_stream_Seek(p_demux->s, i_save_pos + CHUNK_SIZE); } + /* ======================================================================== */ /* "Peek" at some chunks. Skip over the Part header if we find it. * We parse the peeked data and determine audio type, @@ -1701,7 +1736,10 @@ /* the real work: analyze this chunk */ for (i = 0; i < CHUNK_PEEK_COUNT; i++) { - analyze_chunk(p_demux, p_buf); + int ret = analyze_chunk(p_demux, p_buf); + if (ret != 0) + return VLC_EGENERIC; + if (p_sys->tivo_series != TIVO_SERIES_UNKNOWN && p_sys->audio_type != TIVO_AUDIO_UNKNOWN && p_sys->tivo_type != TIVO_TYPE_UNKNOWN) @@ -1728,29 +1766,33 @@ /* ======================================================================== */ /* gather statistics for this chunk & set our tivo-type vars accordingly */ -static void analyze_chunk(demux_t *p_demux, const uint8_t *p_chunk) +static int analyze_chunk(demux_t *p_demux, const uint8_t *p_chunk) { demux_sys_t *p_sys = p_demux->p_sys; int i_num_recs, i; + size_t chunk_size = CHUNK_SIZE; ty_rec_hdr_t *p_hdrs; int i_num_6e0, i_num_be0, i_num_9c0, i_num_3c0; int i_payload_size; /* skip if it's a Part header */ if( U32_AT( &p_chunk[ 0 ] ) == TIVO_PES_FILEID ) - return; + return VLC_SUCCESS; /* number of records in chunk (we ignore high order byte; * rarely are there > 256 chunks & we don't need that many anyway) */ i_num_recs = p_chunk[0]; - if (i_num_recs < 5) { + if (i_num_recs < 5 || i_num_recs >= MAX_NUM_RECS) { /* try again with the next chunk. Sometimes there are dead ones */ - return; + return VLC_SUCCESS; } - p_chunk += 4; /* skip past rec count & SEQ bytes */ + p_chunk += CHUNK_HEADER_SIZE; /* skip past rec count & SEQ bytes */ + chunk_size -= CHUNK_HEADER_SIZE; //msg_Dbg(p_demux, "probe: chunk has %d recs", i_num_recs); p_hdrs = parse_chunk_headers(p_chunk, i_num_recs, &i_payload_size); + if (unlikely(p_hdrs == NULL)) + return VLC_ENOMEM; /* scan headers. * 1. check video packets. Presence of 0x6e0 means S1. * No 6e0 but have be0 means S2. @@ -1805,18 +1847,19 @@ /* if tivo_type still unknown, we can check PTS location * in MPEG packets to determine tivo_type */ if (p_sys->tivo_type == TIVO_TYPE_UNKNOWN) { - uint32_t i_data_offset = (16 * i_num_recs); + uint32_t i_data_offset = (REC_SIZE * i_num_recs); for (i=0; i 15) { /* first make sure we're aligned */ int i_pes_offset = find_es_header(ty_MPEGAudioPacket, - &p_chunk[i_data_offset], 5); + &p_chunk[i_data_offset], chunk_size - i_data_offset, 5); if (i_pes_offset >= 0) { /* pes found. on SA, PES has hdr data at offset 6, not PTS. */ //msg_Dbg(p_demux, "probe: mpeg es header found in rec %d at offset %d", //i, i_pes_offset); - if ((p_chunk[i_data_offset + 6 + i_pes_offset] & 0x80) == 0x80) { + if (i_data_offset + 6 + i_pes_offset < chunk_size && + (p_chunk[i_data_offset + 6 + i_pes_offset] & 0x80) == 0x80) { /* S1SA or S2(any) Mpeg Audio (PES hdr, not a PTS start) */ if (p_sys->tivo_series == TIVO_SERIES1) msg_Dbg(p_demux, "detected Stand-Alone Tivo" ); @@ -1832,9 +1875,15 @@ } } i_data_offset += p_hdrs[i].l_rec_size; + if (i_data_offset > chunk_size) + { + msg_Dbg(p_demux, "rec[%d] overflows the size of the records %ld, aborting", i, p_hdrs[i].l_rec_size); + break; + } } } free(p_hdrs); + return VLC_SUCCESS; } @@ -1851,7 +1900,8 @@ /* if we have left-over filler space from the last chunk, get that */ if (p_sys->i_stuff_cnt > 0) { - vlc_stream_Read( p_demux->s, NULL, p_sys->i_stuff_cnt); + if(vlc_stream_Read(p_demux->s, NULL, p_sys->i_stuff_cnt) != p_sys->i_stuff_cnt) + return 0; p_sys->i_stuff_cnt = 0; } @@ -1870,7 +1920,8 @@ if( U32_AT( &p_peek[ 0 ] ) == TIVO_PES_FILEID ) { /* parse master chunk */ - parse_master(p_demux); + if(parse_master(p_demux) != VLC_SUCCESS) + return 0; return get_chunk_header(p_demux); } @@ -1891,6 +1942,10 @@ p_sys->i_num_recs = i_num_recs = p_peek[0]; p_sys->i_seq_rec = p_peek[1]; } + + if (i_num_recs >= MAX_NUM_RECS) + return 0; + p_sys->i_cur_rec = 0; p_sys->b_first_chunk = false; @@ -1900,22 +1955,29 @@ p_sys->rec_hdrs = NULL; /* skip past the 4 bytes we "peeked" earlier */ - vlc_stream_Read( p_demux->s, NULL, 4 ); + if(vlc_stream_Read(p_demux->s, NULL, 4) != 4) + return 0; /* read the record headers into a temp buffer */ - p_hdr_buf = xmalloc(i_num_recs * 16); - if (vlc_stream_Read(p_demux->s, p_hdr_buf, i_num_recs * 16) < i_num_recs * 16) { + p_hdr_buf = malloc(i_num_recs * REC_SIZE); + if (p_hdr_buf == NULL) + return VLC_ENOMEM; + if (vlc_stream_Read(p_demux->s, p_hdr_buf, i_num_recs * REC_SIZE) < i_num_recs * REC_SIZE) { free( p_hdr_buf ); p_sys->eof = true; return 0; } /* parse them */ - p_sys->rec_hdrs = parse_chunk_headers(p_hdr_buf, i_num_recs, - &i_payload_size); + p_sys->rec_hdrs = parse_chunk_headers(p_hdr_buf, i_num_recs, &i_payload_size); free(p_hdr_buf); + if (unlikely(p_sys->rec_hdrs == NULL)) + { + p_sys->i_num_recs = 0; + return VLC_ENOMEM; + } p_sys->i_stuff_cnt = CHUNK_SIZE - 4 - - (p_sys->i_num_recs * 16) - i_payload_size; + (p_sys->i_num_recs * REC_SIZE) - i_payload_size; if (p_sys->i_stuff_cnt > 0) msg_Dbg( p_demux, "chunk has %d stuff bytes at end", p_sys->i_stuff_cnt ); @@ -1930,11 +1992,14 @@ ty_rec_hdr_t *p_hdrs, *p_rec_hdr; *pi_payload_size = 0; - p_hdrs = xmalloc(i_num_recs * sizeof(ty_rec_hdr_t)); + p_hdrs = vlc_alloc(i_num_recs, sizeof(ty_rec_hdr_t)); + if (unlikely(p_hdrs == NULL)) + return NULL; + long total_l_rec_size = 0; for (i = 0; i < i_num_recs; i++) { - const uint8_t *record_header = p_buf + (i * 16); + const uint8_t *record_header = p_buf + (i * REC_SIZE); p_rec_hdr = &p_hdrs[i]; /* for brevity */ p_rec_hdr->rec_type = record_header[3]; p_rec_hdr->subrec_type = record_header[2] & 0x0f; @@ -1957,6 +2022,12 @@ { p_rec_hdr->l_rec_size = ( record_header[ 0 ] << 8 | record_header[ 1 ] ) << 4 | ( record_header[ 2 ] >> 4 ); + total_l_rec_size += p_rec_hdr->l_rec_size; + if (total_l_rec_size > (CHUNK_SIZE - CHUNK_HEADER_SIZE)) + { + free(p_hdrs); + return NULL; + } *pi_payload_size += p_rec_hdr->l_rec_size; p_rec_hdr->b_ext = false; p_rec_hdr->l_ty_pts = U64_AT( &record_header[ 8 ] ); diff -Nru vlc-3.0.21/modules/demux/vobsub.c vlc-3.0.22/modules/demux/vobsub.c --- vlc-3.0.21/modules/demux/vobsub.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/vobsub.c 2025-11-13 22:17:54.000000000 +0000 @@ -590,10 +590,7 @@ i_sign = -1; h = -h; } - i_start = (int64_t) ( h * 3600*1000 + - m * 60*1000 + - s * 1000 + - ms ) * 1000; + i_start = vlc_tick_from_sec( h * 3600 + m * 60 + s ) + VLC_TICK_FROM_MS( ms ); i_location = loc; current_tk->i_subtitles++; @@ -630,10 +627,7 @@ i_sign = -1; h = -h; } - i_gap = (int64_t) ( h * 3600*1000 + - m * 60*1000 + - s * 1000 + - ms ) * 1000; + i_gap = vlc_tick_from_sec( h * 3600 + m * 60 + s ) + VLC_TICK_FROM_MS( ms ); current_tk->i_delay = current_tk->i_delay + (i_gap * i_sign); msg_Dbg( p_demux, "sign: %+d gap: %+"PRId64" global delay: %+"PRId64"", @@ -691,7 +685,7 @@ memcpy( p_pkt->p_buffer, p, i_size); p += i_size; - i_id = ps_pkt_id( p_pkt ); + i_id = ps_pkt_id( p_pkt, PS_SOURCE_VOB ); if( (i_id&0xffe0) != 0xbd20 || ps_pkt_parse_pes( VLC_OBJECT(p_demux), p_pkt, 1 ) ) { @@ -723,4 +717,3 @@ return VLC_SUCCESS; } - diff -Nru vlc-3.0.21/modules/demux/voc.c vlc-3.0.22/modules/demux/voc.c --- vlc-3.0.21/modules/demux/voc.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/voc.c 2025-11-13 22:17:54.000000000 +0000 @@ -29,6 +29,8 @@ # include "config.h" #endif +#include + #include #include #include @@ -230,15 +232,13 @@ } new_fmt.audio.i_channels = 1; - new_fmt.audio.i_bytes_per_frame *= new_fmt.audio.i_channels; new_fmt.audio.i_blockalign = new_fmt.audio.i_bytes_per_frame; new_fmt.audio.i_frame_length = new_fmt.audio.i_bytes_per_frame * 8 / new_fmt.audio.i_bitspersample; new_fmt.audio.i_rate = fix_voc_sr( 1000000L / (256L - buf[0]) ); - new_fmt.i_bitrate = new_fmt.audio.i_rate * new_fmt.audio.i_bitspersample - * new_fmt.audio.i_channels; + new_fmt.i_bitrate = new_fmt.audio.i_rate * new_fmt.audio.i_bitspersample; break; @@ -309,6 +309,7 @@ } new_fmt.i_codec = VLC_CODEC_U8; + static_assert( INPUT_CHAN_MAX > 32, "INPUT_CHAN_MAX too small" ); if (buf[3] >= 32) goto corrupt; new_fmt.audio.i_channels = buf[3] + 1; /* can't be nul */ @@ -352,6 +353,8 @@ goto corrupt; new_fmt.audio.i_rate = GetDWLE( buf ); + if( new_fmt.audio.i_rate == 0 || new_fmt.audio.i_rate > 768000 ) + goto corrupt; new_fmt.audio.i_bitspersample = buf[4]; new_fmt.audio.i_channels = buf[5]; @@ -403,6 +406,11 @@ msg_Err( p_demux, "0 channels detected" ); return VLC_EGENERIC; } + if ( new_fmt.audio.i_channels > INPUT_CHAN_MAX ) + { + msg_Err( p_demux, "too many channels detected %" PRIu8, new_fmt.audio.i_channels ); + return VLC_EGENERIC; + } new_fmt.audio.i_bytes_per_frame = new_fmt.audio.i_channels * (new_fmt.audio.i_bitspersample / 8); @@ -450,6 +458,8 @@ memcpy( &p_sys->fmt, &new_fmt, sizeof( p_sys->fmt ) ); date_Change( &p_sys->pts, p_sys->fmt.audio.i_rate, 1 ); p_sys->p_es = es_out_Add( p_demux->out, &p_sys->fmt ); + if( unlikely(p_sys->p_es == NULL) ) + return VLC_ENOMEM; } } @@ -515,6 +525,7 @@ p_block->i_nb_samples = i_read_frames * p_sys->fmt.audio.i_frame_length; date_Increment( &p_sys->pts, p_block->i_nb_samples ); es_out_SetPCR( p_demux->out, p_block->i_pts ); + assert(p_sys->p_es != NULL); es_out_Send( p_demux->out, p_sys->p_es, p_block ); return 1; diff -Nru vlc-3.0.21/modules/demux/wav.c vlc-3.0.22/modules/demux/wav.c --- vlc-3.0.21/modules/demux/wav.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/wav.c 2025-11-13 22:17:54.000000000 +0000 @@ -71,7 +71,7 @@ int64_t i_data_size; unsigned int i_frame_size; - int i_frame_samples; + unsigned int i_frame_samples; date_t pts; @@ -82,11 +82,11 @@ static int ChunkFind( demux_t *, const char *, unsigned int * ); -static int FrameInfo_IMA_ADPCM( unsigned int *, int *, const es_format_t * ); -static int FrameInfo_MS_ADPCM ( unsigned int *, int *, const es_format_t * ); -static int FrameInfo_Creative_ADPCM( unsigned int *, int *, const es_format_t * ); -static int FrameInfo_PCM ( unsigned int *, int *, const es_format_t * ); -static int FrameInfo_MSGSM ( unsigned int *, int *, const es_format_t * ); +static int FrameInfo_IMA_ADPCM( unsigned int *, unsigned *, const es_format_t * ); +static int FrameInfo_MS_ADPCM ( unsigned int *, unsigned *, const es_format_t * ); +static int FrameInfo_Creative_ADPCM( unsigned int *, unsigned *, const es_format_t * ); +static int FrameInfo_PCM ( unsigned int *, unsigned *, const es_format_t * ); +static int FrameInfo_MSGSM ( unsigned int *, unsigned *, const es_format_t * ); /***************************************************************************** * Open: check file and initializes structures @@ -126,6 +126,7 @@ es_format_Init( &p_sys->fmt, AUDIO_ES, 0 ); p_sys->p_es = NULL; p_sys->i_data_size = 0; + p_sys->i_frame_samples = 0; p_sys->i_chans_to_reorder = 0; p_sys->i_channel_mask = 0; @@ -167,9 +168,9 @@ goto error; } i_size += 2; - if( i_size < sizeof( WAVEFORMATEX ) ) + if( i_size < sizeof( WAVEFORMATEX ) || i_size > (sizeof( WAVEFORMATEX ) + UINT16_MAX ) ) { - msg_Err( p_demux, "invalid 'fmt ' chunk" ); + msg_Err( p_demux, "invalid 'fmt ' chunk of size %" PRIu32, i_size ); goto error; } if( vlc_stream_Read( p_demux->s, NULL, 8 ) != 8 ) @@ -392,15 +393,14 @@ goto error; } - if( p_sys->i_frame_size <= 0 || p_sys->i_frame_samples <= 0 ) + if( p_sys->i_frame_size == 0 || p_sys->i_frame_samples == 0 ) { - msg_Dbg( p_demux, "invalid frame size: %i %i", p_sys->i_frame_size, - p_sys->i_frame_samples ); + msg_Dbg( p_demux, "invalid frame size: 0 0" ); goto error; } if( p_sys->fmt.audio.i_rate == 0 ) { - msg_Dbg( p_demux, "invalid sample rate: %i", p_sys->fmt.audio.i_rate ); + msg_Dbg( p_demux, "invalid sample rate: 0" ); goto error; } @@ -482,7 +482,7 @@ /* Do the channel reordering */ if( p_sys->i_chans_to_reorder ) aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer, - p_sys->fmt.audio.i_channels, + p_sys->i_chans_to_reorder, p_sys->pi_chan_table, p_sys->fmt.i_codec ); es_out_Send( p_demux->out, p_sys->p_es, p_block ); @@ -559,7 +559,7 @@ } } -static int FrameInfo_PCM( unsigned int *pi_size, int *pi_samples, +static int FrameInfo_PCM( unsigned int *pi_size, unsigned *pi_samples, const es_format_t *p_fmt ) { int i_bytes; @@ -586,12 +586,15 @@ return VLC_SUCCESS; } -static int FrameInfo_MS_ADPCM( unsigned int *pi_size, int *pi_samples, +static int FrameInfo_MS_ADPCM( unsigned int *pi_size, unsigned *pi_samples, const es_format_t *p_fmt ) { if( p_fmt->audio.i_channels == 0 ) return VLC_EGENERIC; + if( p_fmt->audio.i_blockalign < 7 * p_fmt->audio.i_channels ) + return VLC_EGENERIC; + *pi_samples = 2 + 2 * ( p_fmt->audio.i_blockalign - 7 * p_fmt->audio.i_channels ) / p_fmt->audio.i_channels; *pi_size = p_fmt->audio.i_blockalign; @@ -599,12 +602,15 @@ return VLC_SUCCESS; } -static int FrameInfo_IMA_ADPCM( unsigned int *pi_size, int *pi_samples, +static int FrameInfo_IMA_ADPCM( unsigned int *pi_size, unsigned *pi_samples, const es_format_t *p_fmt ) { if( p_fmt->audio.i_channels == 0 ) return VLC_EGENERIC; + if( p_fmt->audio.i_blockalign < 4 * p_fmt->audio.i_channels ) + return VLC_EGENERIC; + *pi_samples = 2 * ( p_fmt->audio.i_blockalign - 4 * p_fmt->audio.i_channels ) / p_fmt->audio.i_channels; *pi_size = p_fmt->audio.i_blockalign; @@ -612,7 +618,7 @@ return VLC_SUCCESS; } -static int FrameInfo_Creative_ADPCM( unsigned int *pi_size, int *pi_samples, +static int FrameInfo_Creative_ADPCM( unsigned int *pi_size, unsigned *pi_samples, const es_format_t *p_fmt ) { if( p_fmt->audio.i_channels == 0 ) @@ -625,7 +631,7 @@ return VLC_SUCCESS; } -static int FrameInfo_MSGSM( unsigned int *pi_size, int *pi_samples, +static int FrameInfo_MSGSM( unsigned int *pi_size, unsigned *pi_samples, const es_format_t *p_fmt ) { if( p_fmt->i_bitrate <= 0 ) diff -Nru vlc-3.0.21/modules/demux/webvtt.c vlc-3.0.22/modules/demux/webvtt.c --- vlc-3.0.21/modules/demux/webvtt.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/webvtt.c 2025-11-13 22:17:54.000000000 +0000 @@ -29,6 +29,7 @@ #include #include #include +#include #include "../codec/webvtt/webvtt.h" @@ -81,8 +82,8 @@ *****************************************************************************/ static int cue_Compare( const void *a_, const void *b_ ) { - webvtt_cue_t *a = (webvtt_cue_t *)a_; - webvtt_cue_t *b = (webvtt_cue_t *)b_; + const webvtt_cue_t *a = a_; + const webvtt_cue_t *b = b_; if( a->i_start == b->i_start ) { if( a->i_stop > b->i_stop ) @@ -132,10 +133,9 @@ vlc_memstream_write( &stream, paylbox, 8 ); vlc_memstream_write( &stream, p_cue->psz_text, paylsize - 8 ); - if( vlc_memstream_close( &stream ) == VLC_SUCCESS ) + if( vlc_memstream_close( &stream ) == 0 ) return block_heap_Alloc( stream.ptr, stream.length ); - else - return NULL; + return NULL; } struct memstream_wrap @@ -155,13 +155,8 @@ static void memstream_Grab( struct memstream_wrap *mw, void **pp, size_t *pi ) { - if( mw->b_opened && vlc_memstream_close( &mw->memstream ) == VLC_SUCCESS ) + if( mw->b_opened && vlc_memstream_close( &mw->memstream ) == 0 ) { - if( mw->memstream.length == 0 ) - { - free( mw->memstream.ptr ); - mw->memstream.ptr = NULL; - } *pp = mw->memstream.ptr; *pi = mw->memstream.length; } @@ -325,6 +320,10 @@ { demux_sys_t *p_sys = p_demux->p_sys; + if( p_sys->index.i_count == 0 ) + return; + assert( p_sys->index.p_array != NULL ); + /* Order time entries ascending, start time before end time */ qsort( p_sys->index.p_array, p_sys->index.i_count, sizeof(struct index_entry_s), index_Compare ); @@ -418,7 +417,7 @@ p_sys->regions_headers.i_data ); vlc_memstream_write( &extradata, p_sys->styles_headers.p_data, p_sys->styles_headers.i_data ); - if( vlc_memstream_close( &extradata ) == VLC_SUCCESS ) + if( vlc_memstream_close( &extradata ) == 0 ) { if( extradata.length ) { @@ -738,5 +737,8 @@ webvtt_text_parser_Delete( p_sys->p_streamparser ); } + free( p_sys->regions_headers.p_data ); + free( p_sys->styles_headers.p_data ); + free( p_sys ); } diff -Nru vlc-3.0.21/modules/demux/xiph_metadata.c vlc-3.0.22/modules/demux/xiph_metadata.c --- vlc-3.0.21/modules/demux/xiph_metadata.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/demux/xiph_metadata.c 2025-11-13 22:17:54.000000000 +0000 @@ -34,35 +34,11 @@ #include #include #include "xiph_metadata.h" +#include "../meta_engine/ID3Pictures.h" input_attachment_t* ParseFlacPicture( const uint8_t *p_data, size_t size, int i_attachments, int *i_cover_score, int *i_cover_idx ) { - /* TODO: Merge with ID3v2 copy in modules/meta_engine/taglib.cpp. */ - static const char pi_cover_score[] = { - 0, /* Other */ - 5, /* 32x32 PNG image that should be used as the file icon */ - 4, /* File icon of a different size or format. */ - 20, /* Front cover image of the album. */ - 19, /* Back cover image of the album. */ - 13, /* Inside leaflet page of the album. */ - 18, /* Image from the album itself. */ - 17, /* Picture of the lead artist or soloist. */ - 16, /* Picture of the artist or performer. */ - 14, /* Picture of the conductor. */ - 15, /* Picture of the band or orchestra. */ - 9, /* Picture of the composer. */ - 8, /* Picture of the lyricist or text writer. */ - 7, /* Picture of the recording location or studio. */ - 10, /* Picture of the artists during recording. */ - 11, /* Picture of the artists during performance. */ - 6, /* Picture from a movie or video related to the track. */ - 1, /* Picture of a large, coloured fish. */ - 12, /* Illustration related to the track. */ - 3, /* Logo of the band or performer. */ - 2 /* Logo of the publisher (record company). */ - }; - uint32_t type, len; if( size < 8 ) @@ -136,11 +112,11 @@ p_attachment = vlc_input_attachment_New( name, mime, description, p_data, size /* XXX: len instead? */ ); - if( type < ARRAY_SIZE(pi_cover_score) && - *i_cover_score < pi_cover_score[type] ) + if( type < ARRAY_SIZE(ID3v2_cover_scores) && + *i_cover_score < ID3v2_cover_scores[type] ) { *i_cover_idx = i_attachments; - *i_cover_score = pi_cover_score[type]; + *i_cover_score = ID3v2_cover_scores[type]; } error: @@ -423,11 +399,19 @@ hasMetaFlags |= XIPHMETA_##var; \ } -#define IF_EXTRACT_ONCE(txt,var) \ +#define IF_EXTRACT_ONCE_NUMBER(txt,var) \ if( !strncasecmp(psz_comment, txt, strlen(txt)) && !(hasMetaFlags & XIPHMETA_##var) ) \ { \ - vlc_meta_Set( p_meta, vlc_meta_ ## var, &psz_comment[strlen(txt)] ); \ - hasMetaFlags |= XIPHMETA_##var; \ + bool isnum = true; \ + const char *num_str = &psz_comment[strlen(txt)], *c; \ + for (c = num_str; isnum && *c != '\0'; c++) { \ + isnum = *c >= '0' && *c <= '9'; \ + } \ + if (isnum) \ + { \ + vlc_meta_Set( p_meta, vlc_meta_ ## var, num_str ); \ + hasMetaFlags |= XIPHMETA_##var; \ + } \ } #define IF_EXTRACT_FMT(txt,var,fmt,target) \ @@ -466,8 +450,8 @@ } } } - else IF_EXTRACT_ONCE("TRACKTOTAL=", TrackTotal ) - else IF_EXTRACT_ONCE("TOTALTRACKS=", TrackTotal ) + else IF_EXTRACT_ONCE_NUMBER("TRACKTOTAL=", TrackTotal ) + else IF_EXTRACT_ONCE_NUMBER("TOTALTRACKS=", TrackTotal ) else IF_EXTRACT("DESCRIPTION=", Description ) else IF_EXTRACT("COMMENT=", Description ) else IF_EXTRACT("COMMENTS=", Description ) @@ -539,8 +523,7 @@ { p_seekpoint = getChapterEntry( i_chapt, &chapters_array ); if ( ! p_seekpoint ) goto next_comment; - p_seekpoint->i_time_offset = - (((int64_t)h * 3600 + (int64_t)m * 60 + (int64_t)s) * 1000 + ms) * 1000; + p_seekpoint->i_time_offset = vlc_tick_from_sec(h * 3600 + m * 60 + s) + VLC_TICK_FROM_MS(ms); } } } @@ -587,4 +570,3 @@ } return N_("Unknown category"); } - diff -Nru vlc-3.0.21/modules/gui/eject.c vlc-3.0.22/modules/gui/eject.c --- vlc-3.0.21/modules/gui/eject.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/eject.c 2025-11-13 22:17:54.000000000 +0000 @@ -124,14 +124,12 @@ VLC_UNUSED(p_this); #if defined(_WIN32) - MCI_OPEN_PARMS op; + MCI_OPEN_PARMSA op = {}; DWORD i_flags; - TCHAR psz_drive[4]; + CHAR psz_drive[] = "X:"; - memset( &op, 0, sizeof(MCI_OPEN_PARMS) ); - op.lpstrDeviceType = (LPCTSTR)MCI_DEVTYPE_CD_AUDIO; + op.lpstrDeviceType = (LPCSTR)MCI_DEVTYPE_CD_AUDIO; - _tcscpy( psz_drive, TEXT("X:") ); psz_drive[0] = psz_device[0]; op.lpstrElementName = psz_drive; @@ -139,7 +137,7 @@ i_flags = MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID | MCI_OPEN_ELEMENT | MCI_OPEN_SHAREABLE; - if( mciSendCommand( 0, MCI_OPEN, i_flags, (uintptr_t)&op ) ) + if( mciSendCommandA( 0, MCI_OPEN, i_flags, (uintptr_t)&op ) ) return VLC_EGENERIC; /* Eject disc */ diff -Nru vlc-3.0.21/modules/gui/macosx/Makefile.am vlc-3.0.22/modules/gui/macosx/Makefile.am --- vlc-3.0.21/modules/gui/macosx/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/macosx/Makefile.am 2025-11-24 23:00:36.000000000 +0000 @@ -195,7 +195,7 @@ xib_verbose__0 = $(xib_verbose_0) .xib.nib: - $(AM_V_at)mkdir -p -- gui/macosx/UI + $(AM_V_at)$(MKDIR_P) -- gui/macosx/UI $(xib_verbose)$(XIB) --errors --warnings --notices \ --module VLC --auto-activate-custom-fonts --target-device mac \ --minimum-deployment-target 10.7 --output-format human-readable-text \ diff -Nru vlc-3.0.21/modules/gui/macosx/VLCMain.m vlc-3.0.22/modules/gui/macosx/VLCMain.m --- vlc-3.0.21/modules/gui/macosx/VLCMain.m 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/macosx/VLCMain.m 2025-11-13 22:17:54.000000000 +0000 @@ -272,8 +272,6 @@ if (dayOfYear >= 354) [[VLCApplication sharedApplication] setApplicationIconImage: [NSImage imageNamed:@"VLC-Xmas"]]; - else - [[VLCApplication sharedApplication] setApplicationIconImage: [NSImage imageNamed:@"VLC"]]; } } diff -Nru vlc-3.0.21/modules/gui/macosx/VLCPLItem.m vlc-3.0.22/modules/gui/macosx/VLCPLItem.m --- vlc-3.0.21/modules/gui/macosx/VLCPLItem.m 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/macosx/VLCPLItem.m 2025-11-24 23:00:36.000000000 +0000 @@ -75,6 +75,7 @@ - (void)addChild:(VLCPLItem *)item atPos:(int)pos { + pos = VLC_CLIP(pos, 0, (int)_children.count); [_children insertObject:item atIndex:pos]; [item setParent: self]; diff -Nru vlc-3.0.21/modules/gui/macosx/VLCSlider.m vlc-3.0.22/modules/gui/macosx/VLCSlider.m --- vlc-3.0.21/modules/gui/macosx/VLCSlider.m 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/macosx/VLCSlider.m 2025-11-13 22:17:54.000000000 +0000 @@ -37,6 +37,13 @@ _isScrollable = YES; if (@available(macOS 10.14, *)) { [self viewDidChangeEffectiveAppearance]; + +#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 140000) + // While this is available back to 10.9, it defaulted to + // true in macOS 13 and earlier so setting it starting + // in macOS 10.14+ is fine. + [self setClipsToBounds:YES]; +#endif } else { [self setSliderStyleLight]; } diff -Nru vlc-3.0.21/modules/gui/qt/Makefile.am vlc-3.0.22/modules/gui/qt/Makefile.am --- vlc-3.0.21/modules/gui/qt/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/Makefile.am 2025-11-13 22:17:54.000000000 +0000 @@ -12,6 +12,8 @@ SUFFIXES += .ui .h .hpp .moc.cpp libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ + -DQT_USE_QSTRINGBUILDER \ + -DQT_NO_CAST_FROM_BYTEARRAY \ -I$(srcdir)/gui/qt -I$(builddir)/gui/qt libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt) libqt_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt) $(LIBM) diff -Nru vlc-3.0.21/modules/gui/qt/actions_manager.cpp vlc-3.0.22/modules/gui/qt/actions_manager.cpp --- vlc-3.0.21/modules/gui/qt/actions_manager.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/actions_manager.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -38,6 +38,8 @@ #include "components/extended_panels.hpp" #include "menus.hpp" +#include + ActionsManager::ActionsManager( intf_thread_t * _p_i ) : p_intf( _p_i ) , m_scanning( false ) diff -Nru vlc-3.0.21/modules/gui/qt/adapters/chromaprint.cpp vlc-3.0.22/modules/gui/qt/adapters/chromaprint.cpp --- vlc-3.0.21/modules/gui/qt/adapters/chromaprint.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/adapters/chromaprint.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -23,7 +23,6 @@ #endif #include "chromaprint.hpp" -#include #include Chromaprint::Chromaprint( intf_thread_t *_p_intf ) : p_intf( _p_intf ) diff -Nru vlc-3.0.21/modules/gui/qt/components/complete_preferences.cpp vlc-3.0.22/modules/gui/qt/components/complete_preferences.cpp --- vlc-3.0.21/modules/gui/qt/components/complete_preferences.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/complete_preferences.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -132,7 +132,7 @@ current_item->setIcon( 0 , icon ); //current_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) ); current_item->setData( 0, Qt::UserRole, - qVariantFromValue( data ) ); + QVariant::fromValue( data ) ); addTopLevelItem( current_item ); expandItem( current_item ); break; @@ -182,7 +182,7 @@ QTreeWidgetItem *subcat_item = new QTreeWidgetItem(); subcat_item->setText( 0, data_sub->name ); subcat_item->setData( 0, Qt::UserRole, - qVariantFromValue( data_sub ) ); + QVariant::fromValue( data_sub ) ); //subcat_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) ); /* Add it to the parent */ @@ -622,7 +622,7 @@ /* Widgets now */ global_layout = new QVBoxLayout(); - global_layout->setMargin( 2 ); + global_layout->setContentsMargins( 2, 2, 2, 2 ); QString head; QString help; diff -Nru vlc-3.0.21/modules/gui/qt/components/controller.cpp vlc-3.0.22/modules/gui/qt/components/controller.cpp --- vlc-3.0.21/modules/gui/qt/components/controller.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/controller.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -52,6 +52,9 @@ #include #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) +#include +#endif //#define DEBUG_LAYOUT 1 @@ -114,7 +117,13 @@ void AbstractController::parseAndCreate( const QString& config, QBoxLayout *newControlLayout ) { - QStringList list = config.split( ";", QString::SkipEmptyParts ) ; + QStringList list = config.split( ";", + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); for( int i = 0; i < list.count(); i++ ) { QStringList list2 = list.at( i ).split( "-" ); @@ -536,12 +545,12 @@ QFrame *discFrame = new QFrame( this ); QHBoxLayout *discLayout = new QHBoxLayout( discFrame ); - discLayout->setSpacing( 0 ); discLayout->setMargin( 0 ); + discLayout->setSpacing( 0 ); discLayout->setContentsMargins( 0, 0, 0, 0 ); QFrame *chapFrame = new QFrame( discFrame ); QHBoxLayout *chapLayout = new QHBoxLayout( chapFrame ); - chapLayout->setSpacing( 0 ); chapLayout->setMargin( 0 ); + chapLayout->setSpacing( 0 ); chapLayout->setContentsMargins( 0, 0, 0, 0 ); QToolButton *prevSectionButton = new QToolButton( chapFrame ); setupButton( prevSectionButton ); @@ -560,7 +569,7 @@ QFrame *menuFrame = new QFrame( discFrame ); QHBoxLayout *menuLayout = new QHBoxLayout( menuFrame ); - menuLayout->setSpacing( 0 ); menuLayout->setMargin( 0 ); + menuLayout->setSpacing( 0 ); menuLayout->setContentsMargins( 0, 0, 0, 0 ); QToolButton *menuButton = new QToolButton( menuFrame ); setupButton( menuButton ); @@ -594,7 +603,7 @@ **/ QFrame *telexFrame = new QFrame( this ); QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame ); - telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 ); + telexLayout->setSpacing( 0 ); telexLayout->setContentsMargins( 0, 0, 0, 0 ); CONNECT( THEMIM->getIM(), teletextPossible( bool ), telexFrame, setVisible( bool ) ); @@ -715,19 +724,18 @@ #ifdef DEBUG_LAYOUT setStyleSheet( "background: red "); #endif - setAttribute( Qt::WA_MacBrushedMetal); controlLayout = new QVBoxLayout( this ); controlLayout->setContentsMargins( 3, 1, 0, 1 ); controlLayout->setSpacing( 0 ); QHBoxLayout *controlLayout1 = new QHBoxLayout; - controlLayout1->setSpacing( 0 ); controlLayout1->setMargin( 0 ); + controlLayout1->setSpacing( 0 ); controlLayout1->setContentsMargins( 0, 0, 0, 0 ); QString line1 = getSettings()->value( "MainWindow/MainToolbar1", MAIN_TB1_DEFAULT ) .toString(); parseAndCreate( line1, controlLayout1 ); QHBoxLayout *controlLayout2 = new QHBoxLayout; - controlLayout2->setSpacing( 0 ); controlLayout2->setMargin( 0 ); + controlLayout2->setSpacing( 0 ); controlLayout2->setContentsMargins( 0, 0, 0, 0 ); QString line2 = getSettings()->value( "MainWindow/MainToolbar2", MAIN_TB2_DEFAULT ) .toString(); parseAndCreate( line2, controlLayout2 ); @@ -760,7 +768,7 @@ { RTL_UNAFFECTED_WIDGET controlLayout = new QHBoxLayout( this ); - controlLayout->setMargin( 0 ); + controlLayout->setContentsMargins( 0, 0, 0, 0 ); controlLayout->setSpacing( 0 ); #ifdef DEBUG_LAYOUT setStyleSheet( "background: orange "); @@ -777,7 +785,7 @@ { RTL_UNAFFECTED_WIDGET controlLayout = new QHBoxLayout( this ); - controlLayout->setMargin( 0 ); + controlLayout->setContentsMargins( 0, 0, 0, 0 ); controlLayout->setSpacing( 0 ); #ifdef DEBUG_LAYOUT setStyleSheet( "background: green "); @@ -888,7 +896,7 @@ if ( targetScreen() < 0 ) return; - QRect currentRes = QApplication::desktop()->screenGeometry( targetScreen() ); + QRect currentRes = QGuiApplication::screens()[ targetScreen() ]->geometry(); QWindow *wh = windowHandle(); if ( wh != Q_NULLPTR ) { @@ -924,7 +932,7 @@ void FullscreenControllerWidget::centerFSC( int number ) { - QRect currentRes = QApplication::desktop()->screenGeometry( number ); + QRect currentRes = QGuiApplication::screens()[ number ]->geometry(); /* screen has changed, calculate new position */ QPoint pos = QPoint( currentRes.x() + (currentRes.width() / 2) - (width() / 2), @@ -998,7 +1006,7 @@ void FullscreenControllerWidget::updateFullwidthGeometry( int number ) { - QRect screenGeometry = QApplication::desktop()->screenGeometry( number ); + QRect screenGeometry = QGuiApplication::screens()[ number ]->geometry(); setMinimumWidth( screenGeometry.width() ); setGeometry( screenGeometry.x(), screenGeometry.y() + screenGeometry.height() - height(), screenGeometry.width(), height() ); adjustSize(); @@ -1021,8 +1029,23 @@ int FullscreenControllerWidget::targetScreen() { - if( i_screennumber < 0 || i_screennumber >= QApplication::desktop()->screenCount() ) + if( i_screennumber < 0 || i_screennumber >= QGuiApplication::screens().length() ) + { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + auto *screen = QGuiApplication::screenAt( p_intf->p_sys->p_mi->pos() ); + if (screen != nullptr) + { + for (qsizetype i = 0; i < QGuiApplication::screens().length(); i++) + { + if (screen == QGuiApplication::screens()[i]) + return i; + } + } + return -1; +#else return QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi ); +#endif + } return i_screennumber; } @@ -1107,18 +1130,23 @@ if( i_mouse_last_x == -1 || i_mouse_last_y == -1 ) return; - int i_moveX = event->globalX() - i_mouse_last_x; - int i_moveY = event->globalY() - i_mouse_last_y; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + const auto pos = event->globalPosition(); +#else + const auto pos = event->globalPos(); +#endif + int i_moveX = pos.x() - i_mouse_last_x; + int i_moveY = pos.y() - i_mouse_last_y; - const QRect screenRect = QApplication::desktop()->screenGeometry( targetScreen() ); + const QRect screenRect = QGuiApplication::screens()[ targetScreen() ]->geometry(); const int i_x = qBound( screenRect.left(), x() + i_moveX, screenRect.right() - width() ); const int i_y = qBound( screenRect.top(), y() + i_moveY, screenRect.bottom() - height() ); move( i_x, i_y ); - i_mouse_last_x = event->globalX(); - i_mouse_last_y = event->globalY(); + i_mouse_last_x = pos.x(); + i_mouse_last_y = pos.y(); } } @@ -1129,8 +1157,13 @@ void FullscreenControllerWidget::mousePressEvent( QMouseEvent *event ) { if( isWideFSC ) return; - i_mouse_last_x = event->globalX(); - i_mouse_last_y = event->globalY(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + auto pos = event->globalPosition(); +#else + auto pos = event->globalPos(); +#endif + i_mouse_last_x = pos.x(); + i_mouse_last_y = pos.y(); event->accept(); } @@ -1148,7 +1181,11 @@ /** * On mouse go above FSC */ +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +void FullscreenControllerWidget::enterEvent( QEnterEvent *event ) +#else void FullscreenControllerWidget::enterEvent( QEvent *event ) +#endif { b_mouse_over = true; diff -Nru vlc-3.0.21/modules/gui/qt/components/controller.hpp vlc-3.0.22/modules/gui/qt/components/controller.hpp --- vlc-3.0.21/modules/gui/qt/components/controller.hpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/controller.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -277,7 +277,11 @@ void mouseMoveEvent( QMouseEvent *event ) Q_DECL_OVERRIDE; void mousePressEvent( QMouseEvent *event ) Q_DECL_OVERRIDE; void mouseReleaseEvent( QMouseEvent *event ) Q_DECL_OVERRIDE; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + void enterEvent( QEnterEvent *event ) Q_DECL_OVERRIDE; +#else void enterEvent( QEvent *event ) Q_DECL_OVERRIDE; +#endif void leaveEvent( QEvent *event ) Q_DECL_OVERRIDE; void keyPressEvent( QKeyEvent *event ) Q_DECL_OVERRIDE; diff -Nru vlc-3.0.21/modules/gui/qt/components/controller_widget.cpp vlc-3.0.22/modules/gui/qt/components/controller_widget.cpp --- vlc-3.0.21/modules/gui/qt/components/controller_widget.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/controller_widget.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -49,7 +49,7 @@ { /* We need a layout for this widget */ QHBoxLayout *layout = new QHBoxLayout( this ); - layout->setSpacing( 0 ); layout->setMargin( 0 ); + layout->setSpacing( 0 ); layout->setContentsMargins( 0, 0, 0, 0 ); /* We need a Label for the pix */ volMuteLabel = new QLabel; diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGChannels.cpp vlc-3.0.22/modules/gui/qt/components/epg/EPGChannels.cpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGChannels.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGChannels.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,9 +29,7 @@ #include "EPGView.hpp" #include -#include #include -#include EPGChannels::EPGChannels( QWidget *parent, EPGView *m_epgView ) : QWidget( parent ), m_epgView( m_epgView ), m_offset( 0 ) @@ -50,7 +48,7 @@ if ( !programsList.contains( program ) ) { programsList << program; - qSort(programsList.begin(), programsList.end(), EPGProgram::lessThan); + std::sort(programsList.begin(), programsList.end(), EPGProgram::lessThan); update(); } } @@ -82,7 +80,11 @@ p.drawText( 0, - m_offset + ( i++ + 0.5 ) * TRACKS_HEIGHT - 4, width(), height(), Qt::AlignLeft, text ); +#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) + int i_width = fontMetrics().horizontalAdvance( text ); +#else int i_width = fontMetrics().width( text ); +#endif if( width() < i_width ) setMinimumWidth( i_width ); } diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGChannels.hpp vlc-3.0.22/modules/gui/qt/components/epg/EPGChannels.hpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGChannels.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGChannels.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -42,7 +42,7 @@ void reset(); protected: - void paintEvent( QPaintEvent *event ) Q_DECL_OVERRIDE; + void paintEvent( QPaintEvent *event ) override; private: EPGView *m_epgView; diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGItem.cpp vlc-3.0.22/modules/gui/qt/components/epg/EPGItem.cpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGItem.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGItem.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,6 +29,7 @@ #include #include #include +#include #include "EPGItem.hpp" #include "EPGView.hpp" @@ -152,7 +153,11 @@ bool EPGItem::setData( const vlc_epg_event_t *data ) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) + QDateTime newtime = QDateTime::fromSecsSinceEpoch( data->i_start, QTimeZone::systemTimeZone() ); +#else QDateTime newtime = QDateTime::fromTime_t( data->i_start ); +#endif QString newname = qfu( data->psz_name ); QString newdesc = qfu( data->psz_description ); QString newshortdesc = qfu( data->psz_short_description ); diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGItem.hpp vlc-3.0.22/modules/gui/qt/components/epg/EPGItem.hpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGItem.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGItem.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -40,8 +40,8 @@ public: EPGItem( const vlc_epg_event_t *data, EPGView *view, EPGProgram * ); - QRectF boundingRect() const Q_DECL_OVERRIDE; - void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 ) Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 ) override; const QDateTime& start() const; QDateTime end() const; @@ -60,10 +60,10 @@ const QList> &descriptionItems() const; protected: - void focusInEvent( QFocusEvent * event ) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * ) Q_DECL_OVERRIDE; - void hoverEnterEvent ( QGraphicsSceneHoverEvent * ) Q_DECL_OVERRIDE; - void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ) Q_DECL_OVERRIDE; + void focusInEvent( QFocusEvent * event ) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * ) override; + void hoverEnterEvent ( QGraphicsSceneHoverEvent * ) override; + void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ) override; private: EPGProgram *program; diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGProgram.cpp vlc-3.0.22/modules/gui/qt/components/epg/EPGProgram.cpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGProgram.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGProgram.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -21,7 +21,7 @@ #include "EPGItem.hpp" #include "EPGView.hpp" -#include +#include EPGProgram::EPGProgram( EPGView *view_, const vlc_epg_t *p_epg ) : QObject( view_ ) { @@ -98,7 +98,11 @@ for( size_t i=0; i= QT_VERSION_CHECK(5, 8, 0) + QDateTime eventStart = QDateTime::fromSecsSinceEpoch( p_event->i_start, QTimeZone::systemTimeZone() ); +#else QDateTime eventStart = QDateTime::fromTime_t( p_event->i_start ); +#endif if( !mindate->isValid() || eventStart < *mindate ) *mindate = eventStart; diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGRuler.hpp vlc-3.0.22/modules/gui/qt/components/epg/EPGRuler.hpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGRuler.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGRuler.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -43,7 +43,7 @@ void setOffset( int offset ); protected: - void paintEvent( QPaintEvent *event ) Q_DECL_OVERRIDE; + void paintEvent( QPaintEvent *event ) override; private: qreal m_scale; diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGView.cpp vlc-3.0.22/modules/gui/qt/components/epg/EPGView.cpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGView.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGView.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,8 +29,6 @@ #include "EPGItem.hpp" #include -#include -#include #include EPGGraphicsScene::EPGGraphicsScene( QObject *parent ) : QGraphicsScene( parent ) @@ -48,7 +46,12 @@ /* day change */ QDateTime rectstarttime = epgView->startTime().addSecs( rect.left() ); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QDateTime nextdaylimit = rectstarttime.date().startOfDay(); +#else QDateTime nextdaylimit = QDateTime( rectstarttime.date() ); +#endif + QRectF area( rect ); while( area.left() < width() ) { @@ -95,9 +98,9 @@ void EPGView::setScale( double scaleFactor ) { m_scaleFactor = scaleFactor; - QMatrix matrix; + QTransform matrix; matrix.scale( scaleFactor, 1 ); - setMatrix( matrix ); + setTransform( matrix ); } const QDateTime& EPGView::startTime() const diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGView.hpp vlc-3.0.22/modules/gui/qt/components/epg/EPGView.hpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGView.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGView.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -32,7 +32,6 @@ #include #include -#include #include #include diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGWidget.cpp vlc-3.0.22/modules/gui/qt/components/epg/EPGWidget.cpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGWidget.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGWidget.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -27,11 +27,11 @@ #include "input_manager.hpp" #include -#include +#include #include #include -#include #include +#include #include "EPGWidget.hpp" #include "EPGRuler.hpp" @@ -111,7 +111,11 @@ vlc_mutex_lock( & p_input_item->lock ); m_epgView->updateEPG( p_input_item->pp_epg, p_input_item->i_epg ); m_epgView->setEpgTime( ( p_input_item->i_epg_time ) ? +#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) + QDateTime::fromSecsSinceEpoch( p_input_item->i_epg_time, QTimeZone::systemTimeZone() ) : +#else QDateTime::fromTime_t( p_input_item->i_epg_time ) : +#endif QDateTime() ); vlc_mutex_unlock( & p_input_item->lock ); diff -Nru vlc-3.0.21/modules/gui/qt/components/epg/EPGWidget.hpp vlc-3.0.22/modules/gui/qt/components/epg/EPGWidget.hpp --- vlc-3.0.21/modules/gui/qt/components/epg/EPGWidget.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/epg/EPGWidget.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,7 +29,8 @@ #include #include -#include + +class QStackedWidget; class EPGView; class EPGItem; diff -Nru vlc-3.0.21/modules/gui/qt/components/extended_panels.cpp vlc-3.0.22/modules/gui/qt/components/extended_panels.cpp --- vlc-3.0.21/modules/gui/qt/components/extended_panels.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/extended_panels.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include @@ -60,7 +60,14 @@ static bool filterIsPresent( const QString &filters, const QString &filter ) { - QStringList list = filters.split( ':', QString::SplitBehavior::SkipEmptyParts ); + QStringList list = filters.split( ':', + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); + foreach( const QString &filterCmp, list ) { if( filterCmp.compare( filter ) == 0 ) @@ -102,8 +109,8 @@ { /* Gruik ? ... nah */ return obj->objectName() - .remove( QRegExp( "Slider|Combo|Dial|Check|Spin|Text" ) ) - .replace( QRegExp( "([A-Z])" ), "-\\1" ) + .remove( QRegularExpression( "Slider|Combo|Dial|Check|Spin|Text" ) ) + .replace( QRegularExpression( "([A-Z])" ), "-\\1" ) .toLower(); } @@ -296,7 +303,13 @@ char* psz_chain = var_GetString( THEPL, psz_filter_type ); QString const chain = QString( psz_chain ? psz_chain : "" ); - QStringList list = chain.split( ':', QString::SplitBehavior::SkipEmptyParts ); + QStringList list = chain.split( ':', + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); if( b_add && std::find(list.begin(), list.end(), psz_name) == list.end() ) list << psz_name; @@ -1034,7 +1047,13 @@ char *psz_bands = var_GetString( p_aout, qtu(p_data->name) ); if ( psz_bands ) { - bands = QString( psz_bands ).split( " ", QString::SkipEmptyParts ); + bands = QString( psz_bands ).split( " ", + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); free( psz_bands ); } } @@ -1050,7 +1069,13 @@ char *psz_bands = config_GetPsz( p_intf, qtu(p_data->name) ); if ( psz_bands ) { - bands = QString( psz_bands ).split( " ", QString::SkipEmptyParts ); + bands = QString( psz_bands ).split( " ", + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); free( psz_bands ); } @@ -1154,8 +1179,13 @@ connectConfigChanged( preamp ); /* fix sliders spacing accurately */ +#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) + int i_width = qMax( QFontMetrics( smallFont ).horizontalAdvance( "500 Hz" ), + QFontMetrics( smallFont ).horizontalAdvance( "-20.0 dB" ) ); +#else int i_width = qMax( QFontMetrics( smallFont ).width( "500 Hz" ), QFontMetrics( smallFont ).width( "-20.0 dB" ) ); +#endif int i = 0; foreach( const FilterSliderData::slider_data_t &data, controls ) { diff -Nru vlc-3.0.21/modules/gui/qt/components/extended_panels.hpp vlc-3.0.22/modules/gui/qt/components/extended_panels.hpp --- vlc-3.0.21/modules/gui/qt/components/extended_panels.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/extended_panels.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -35,7 +35,7 @@ #include "ui/equalizer.h" #include "ui/video_effects.h" -#include +class QTabWidget; #define BANDS 10 @@ -74,7 +74,7 @@ public: ExtV4l2( intf_thread_t *, QWidget * ); - void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; + void showEvent( QShowEvent *event ) override; private: intf_thread_t *p_intf; @@ -162,13 +162,13 @@ const slider_data_t *p_data, int index ); protected: - float initialValue() Q_DECL_OVERRIDE; + float initialValue() override; int index; QStringList getBandsFromAout() const; - void writeToConfig(); + void writeToConfig() override; public slots: - void onValueChanged( int i ) Q_DECL_OVERRIDE; + void onValueChanged( int i ) override; }; class Equalizer: public AudioFilterControlWidget @@ -179,7 +179,7 @@ Equalizer( intf_thread_t *, QWidget * ); protected: - void build() Q_DECL_OVERRIDE; + void build() override; private: FilterSliderData *preamp; diff -Nru vlc-3.0.21/modules/gui/qt/components/info_panels.cpp vlc-3.0.22/modules/gui/qt/components/info_panels.cpp --- vlc-3.0.21/modules/gui/qt/components/info_panels.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/info_panels.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -34,19 +34,19 @@ #include "dialogs/fingerprintdialog.hpp" #include "adapters/chromaprint.hpp" -#include +#include #include #include #include #include #include -#include #include #include #include #include #include +#include /************************************************************************ * Single panels @@ -255,7 +255,7 @@ { currentURL = newURL; lblURL->setText( "" + - currentURL.remove( QRegExp( ".*://") ) + "" ); + currentURL.remove( QRegularExpression( ".*://") ) + "" ); } } free( psz_meta ); @@ -516,7 +516,7 @@ current_item->addChild(child_item); } - InfoTree->setItemExpanded( current_item, true); + current_item->setExpanded(true); } } @@ -548,7 +548,7 @@ QLabel *topLabel = new QLabel( qtr( "Current" " media / stream " "statistics") ); topLabel->setWordWrap( true ); - layout->addWidget( topLabel, 0, 0 ); + layout->addWidget( topLabel, 0 ); StatsTree = new QTreeWidget(this); StatsTree->setColumnCount( 3 ); @@ -611,7 +611,7 @@ StatsTree->resizeColumnToContents( 0 ); StatsTree->setColumnWidth( 1 , 200 ); - layout->addWidget(StatsTree, 4, 0 ); + layout->addWidget(StatsTree, 4 ); statsView = new VLCStatsView( this ); statsView->setFrameStyle( QFrame::NoFrame ); @@ -648,13 +648,13 @@ #define UPDATE_INT( widget, calc... ) \ { widget->setText( 1, QString::number( (qulonglong)calc ) ); } -#define UPDATE_FLOAT( widget, format, calc... ) \ - { QString str; widget->setText( 1 , str.sprintf( format, ## calc ) ); } +#define UPDATE_FLOAT( widget, calc ) \ + widget->setText( 1 , QString().setNum(calc, 'f', 0).leftJustified(6) ) UPDATE_INT( read_media_stat, (p_item->p_stats->i_read_bytes / 1024 ) ); - UPDATE_FLOAT( input_bitrate_stat, "%6.0f", (float)(p_item->p_stats->f_input_bitrate * 8000 )); + UPDATE_FLOAT( input_bitrate_stat, (float)(p_item->p_stats->f_input_bitrate * 8000 )); UPDATE_INT( demuxed_stat, (p_item->p_stats->i_demux_read_bytes / 1024 ) ); - UPDATE_FLOAT( stream_bitrate_stat, "%6.0f", (float)(p_item->p_stats->f_demux_bitrate * 8000 )); + UPDATE_FLOAT( stream_bitrate_stat, (float)(p_item->p_stats->f_demux_bitrate * 8000 )); UPDATE_INT( corrupted_stat, p_item->p_stats->i_demux_corrupted ); UPDATE_INT( discontinuity_stat, p_item->p_stats->i_demux_discontinuity ); diff -Nru vlc-3.0.21/modules/gui/qt/components/info_panels.hpp vlc-3.0.22/modules/gui/qt/components/info_panels.hpp --- vlc-3.0.21/modules/gui/qt/components/info_panels.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/info_panels.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -113,7 +113,7 @@ public: InputStatsPanel( QWidget * ); protected: - void hideEvent( QHideEvent * ) Q_DECL_OVERRIDE; + void hideEvent( QHideEvent * ) override; private: QTreeWidget *StatsTree; QTreeWidgetItem *input; diff -Nru vlc-3.0.21/modules/gui/qt/components/info_widgets.cpp vlc-3.0.22/modules/gui/qt/components/info_widgets.cpp --- vlc-3.0.21/modules/gui/qt/components/info_widgets.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/info_widgets.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -21,14 +21,12 @@ #include "qt.hpp" #include "info_widgets.hpp" -#include #include #include #include #include #include #include -#include #define STATS_LENGTH 60 #define ADD_LABEL(row, color, text) \ diff -Nru vlc-3.0.21/modules/gui/qt/components/info_widgets.hpp vlc-3.0.22/modules/gui/qt/components/info_widgets.hpp --- vlc-3.0.21/modules/gui/qt/components/info_widgets.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/info_widgets.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -22,7 +22,6 @@ #include -class QGraphicsView; class QGraphicsScene; class QGraphicsPolygonItem; class QGraphicsLineItem; diff -Nru vlc-3.0.21/modules/gui/qt/components/interface_widgets.cpp vlc-3.0.22/modules/gui/qt/components/interface_widgets.cpp --- vlc-3.0.21/modules/gui/qt/components/interface_widgets.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/interface_widgets.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -37,19 +37,20 @@ #include #include -#include #include -#include -#include -#include -#include +#include #include -#include #include #include -#include -#include #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include + +static inline int qrand() { + auto * q = QRandomGenerator::system(); + return q->generate(); +} +#endif #if defined (QT5_HAS_X11) # include @@ -69,7 +70,7 @@ #endif #include -#include +#include #include #include @@ -89,6 +90,7 @@ layout->setContentsMargins( 0, 0, 0, 0 ); stable = NULL; p_window = NULL; + qApp->installNativeEventFilter(this); show(); } @@ -268,7 +270,11 @@ sync(); } -bool VideoWidget::nativeEvent( const QByteArray& eventType, void* message, long* ) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool VideoWidget::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *) +#else +bool VideoWidget::nativeEventFilter(const QByteArray &eventType, void *message, long *) +#endif { #if defined(QT5_HAS_X11) # if defined(QT5_HAS_XCB) @@ -558,7 +564,7 @@ EasterEggBackgroundWidget::EasterEggBackgroundWidget( intf_thread_t *p_intf ) : BackgroundWidget( p_intf ) { - flakes = new QLinkedList(); + flakes = new std::list(); i_rate = 2; i_speed = 1; b_enabled = false; @@ -611,7 +617,7 @@ int i_spawn = ( (double) qrand() / RAND_MAX ) * i_rate; - QLinkedList::iterator it = flakes->begin(); + auto it = flakes->begin(); while( it != flakes->end() ) { flake *current = *it; @@ -631,15 +637,16 @@ flake *f = new flake; f->point.setX( qrand() * w ); f->b_fat = ( qrand() < ( RAND_MAX * .33 ) ); - flakes->append( f ); + flakes->push_back( f ); } update(); } void EasterEggBackgroundWidget::reset() { - while ( !flakes->isEmpty() ) - delete flakes->takeFirst(); + for(flake* f: *flakes) + delete f; + flakes->clear(); } void EasterEggBackgroundWidget::paintEvent( QPaintEvent *e ) @@ -649,8 +656,8 @@ painter.setBrush( QBrush( QColor(Qt::white) ) ); painter.setPen( QPen(Qt::white) ); - QLinkedList::const_iterator it = flakes->constBegin(); - while( it != flakes->constEnd() ) + auto it = flakes->cbegin(); + while( it != flakes->cend() ) { const flake * const f = *(it++); if ( f->b_fat ) @@ -982,7 +989,19 @@ CONNECT( THEMIM->getIM(), remainingTimeChanged( bool ), this, setRemainingTime( bool ) ); - setStyleSheet( "QLabel { padding-left: 4px; padding-right: 4px; }" ); + + auto updateStyle = [this]() { + setStyleSheet( "TimeLabel { padding-left: 4px; padding-right: 4px; }" ); + }; + + updateStyle(); + +//same as Qt::AA_UseStyleSheetPropagationInWidgetStyles +#if !HAS_QT57 + connect(qApp, &QApplication::paletteChanged, this, [this, updateStyle](){ + updateStyle(); + }); +#endif } void TimeLabel::setRemainingTime( bool remainingTime ) diff -Nru vlc-3.0.21/modules/gui/qt/components/interface_widgets.hpp vlc-3.0.22/modules/gui/qt/components/interface_widgets.hpp --- vlc-3.0.21/modules/gui/qt/components/interface_widgets.hpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/interface_widgets.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -43,7 +43,7 @@ #include #include #include -#include +#include class QMenu; class QSlider; @@ -52,7 +52,7 @@ struct vout_window_t; /******************** Video Widget ****************/ -class VideoWidget : public QFrame +class VideoWidget : public QFrame, public QAbstractNativeEventFilter { Q_OBJECT public: @@ -69,7 +69,11 @@ return NULL; } - bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; +#endif virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; @@ -151,7 +155,7 @@ bool b_fat; }; QTimer *timer; - QLinkedList *flakes; + std::list *flakes; int i_rate; int i_speed; bool b_enabled; @@ -162,7 +166,7 @@ { Q_OBJECT public: - void mouseDoubleClickEvent( QMouseEvent *event ) Q_DECL_OVERRIDE + void mouseDoubleClickEvent( QMouseEvent *event ) override { Q_UNUSED( event ); emit doubleClicked(); diff -Nru vlc-3.0.21/modules/gui/qt/components/open_panels.cpp vlc-3.0.22/modules/gui/qt/components/open_panels.cpp --- vlc-3.0.21/modules/gui/qt/components/open_panels.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/open_panels.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -39,20 +39,17 @@ #include #include #include -#ifdef _WIN32 - #include /* FromWide for Win32 */ -#endif #include #include #include #include #include -#include #include #include #include #include +#include #define I_DEVICE_TOOLTIP \ I_DIR_OR_FOLDER( N_("Select a device or a VIDEO_TS directory"), \ @@ -68,7 +65,7 @@ targetCombo ## StringList << QString( ppsz_devlist[ i ] ); \ targetCombo->addItems( QDir( "/dev/" )\ .entryList( targetCombo ## StringList, QDir::System )\ - .replaceInStrings( QRegExp("^"), "/dev/" ) \ + .replaceInStrings( QRegularExpression("^"), "/dev/" ) \ ); static const char psz_devModule[][8] = { "v4l2", "pvr", "dtv", @@ -85,21 +82,6 @@ setAcceptDrops( true ); - /* Set Filters for file selection */ -/* QString fileTypes = ""; - ADD_FILTER_MEDIA( fileTypes ); - ADD_FILTER_VIDEO( fileTypes ); - ADD_FILTER_AUDIO( fileTypes ); - ADD_FILTER_PLAYLIST( fileTypes ); - ADD_FILTER_ALL( fileTypes ); - fileTypes.replace( QString(";*"), QString(" *")); */ - - -/* lineFileEdit = ui.fileEdit; - //TODO later: fill the fileCompleteList with previous items played. - QCompleter *fileCompleter = new QCompleter( fileCompleteList, this ); - fileCompleter->setModel( new QDirModel( fileCompleter ) ); - lineFileEdit->setCompleter( fileCompleter );*/ if( var_InheritBool( p_intf, "qt-embedded-open" ) ) { ui.tempWidget->hide(); @@ -161,7 +143,7 @@ /* Change the text that was uncool in the usual box */ listLabel[2]->setText( qtr( "Filter:" ) ); - dialogBox->layout()->setMargin( 0 ); + dialogBox->layout()->setContentsMargins(0, 0, 0, 0); dialogBox->layout()->setSizeConstraint( QLayout::SetNoConstraint ); /** END of QFileDialog tweaking **/ @@ -351,7 +333,7 @@ QComboBox *discCombo = ui.deviceCombo; /* avoid namespacing in macro */ POPULATE_WITH_DEVS( ppsz_discdevices, discCombo ); char *psz_config = config_GetPsz( p_intf, "dvd" ); - int temp = ui.deviceCombo->findData( psz_config, Qt::UserRole, Qt::MatchStartsWith ); + int temp = ui.deviceCombo->findData( { const_cast( psz_config ) }, Qt::UserRole, Qt::MatchStartsWith ); free( psz_config ); if( temp != -1 ) ui.deviceCombo->setCurrentIndex( temp ); @@ -396,16 +378,14 @@ wchar_t psz_name[512] = L""; GetVolumeInformationW( drive, psz_name, 511, NULL, NULL, NULL, NULL, 0 ); - char *psz_drive = FromWide( drive ); + QString psz_drive = QString::fromWCharArray( drive ); QString displayName = psz_drive; - char *psz_title = FromWide( psz_name ); - if( !EMPTY_STR(psz_title)) { + QString psz_title = QString::fromWCharArray( psz_name ); + if( !psz_title.isEmpty()) { displayName = displayName + " - " + psz_title; } ui.deviceCombo->addItem( displayName, psz_drive ); - free( psz_drive ); - free( psz_title ); } /* go to next drive */ @@ -415,7 +395,7 @@ } char *psz_config = config_GetPsz( p_intf, "dvd" ); - int temp = ui.deviceCombo->findData( psz_config, Qt::UserRole, Qt::MatchStartsWith ); + int temp = ui.deviceCombo->findData( qfu(psz_config), Qt::UserRole, Qt::MatchStartsWith ); free( psz_config ); if( temp != -1 ) ui.deviceCombo->setCurrentIndex( temp ); @@ -854,9 +834,9 @@ QStringList nodes = QDir( "/dev/snd" ).entryList( patterns, QDir::System ); - QStringList names = nodes.replaceInStrings( QRegExp("^pcmC"), "hw:" ) - .replaceInStrings( QRegExp("c$"), "" ) - .replaceInStrings( QRegExp("D"), "," ); + QStringList names = nodes.replaceInStrings( QRegularExpression("^pcmC"), "hw:" ) + .replaceInStrings( QRegularExpression("c$"), "" ) + .replaceInStrings( QRegularExpression("D"), "," ); v4l2AudioDevice->addItems( names ); } v4l2AudioDevice->clearEditText(); @@ -1075,9 +1055,9 @@ QStringList nodes = QDir( "/dev/snd" ).entryList( patterns, QDir::System ); - QStringList names = nodes.replaceInStrings( QRegExp("^pcmC"), "hw:" ) - .replaceInStrings( QRegExp("c$"), "" ) - .replaceInStrings( QRegExp("D"), "," ); + QStringList names = nodes.replaceInStrings( QRegularExpression("^pcmC"), "hw:" ) + .replaceInStrings( QRegularExpression("c$"), "" ) + .replaceInStrings( QRegularExpression("D"), "," ); pvrAudioDevice->addItems( names ); } pvrAudioDevice->clearEditText(); diff -Nru vlc-3.0.21/modules/gui/qt/components/open_panels.hpp vlc-3.0.22/modules/gui/qt/components/open_panels.hpp --- vlc-3.0.21/modules/gui/qt/components/open_panels.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/open_panels.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -177,9 +177,9 @@ void clear() Q_DECL_OVERRIDE; virtual void accept(); #if defined( _WIN32 ) || defined( __OS2__ ) - virtual void onFocus(); + void onFocus() override; #endif - virtual void updateContext(int) Q_DECL_OVERRIDE; + void updateContext(int) Q_DECL_OVERRIDE; private: Ui::OpenDisk ui; char *psz_dvddiscpath, *psz_vcddiscpath, *psz_cddadiscpath; diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/playlist.cpp vlc-3.0.22/modules/gui/qt/components/playlist/playlist.cpp --- vlc-3.0.21/modules/gui/qt/components/playlist/playlist.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/playlist.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -53,7 +53,7 @@ setContentsMargins( 0, 3, 0, 3 ); QGridLayout *layout = new QGridLayout( this ); - layout->setMargin( 0 ); layout->setSpacing( 0 ); + layout->setContentsMargins( 0, 0, 0, 0 ); layout->setSpacing( 0 ); /******************* * Left * diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/playlist_model.cpp vlc-3.0.22/modules/gui/qt/components/playlist/playlist_model.cpp --- vlc-3.0.21/modules/gui/qt/components/playlist/playlist_model.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/playlist_model.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -38,10 +38,11 @@ #include "sorting.h" -#include +#include #include #include #include +#include /************************************************************************* * Playlist model implementation @@ -126,7 +127,7 @@ list.append(index); } - qSort(list.begin(), list.end(), modelIndexLessThen); + std::sort(list.begin(), list.end(), modelIndexLessThen); AbstractPLItem *item = NULL; foreach( const QModelIndex &index, list ) { diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/playlist_model.hpp vlc-3.0.22/modules/gui/qt/components/playlist/playlist_model.hpp --- vlc-3.0.21/modules/gui/qt/components/playlist/playlist_model.hpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/playlist_model.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -42,6 +42,7 @@ #include #include #include +#include class PLItem; class PlMimeData; diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/selector.cpp vlc-3.0.22/modules/gui/qt/components/playlist/selector.cpp --- vlc-3.0.21/modules/gui/qt/components/playlist/selector.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/selector.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -424,7 +424,20 @@ new QTreeWidgetItem( parentItem ) : new QTreeWidgetItem( this ); PLSelItem *selItem = new PLSelItem( item, qtr( str ) ); - if ( bold ) selItem->setStyleSheet( "font-weight: bold;" ); + + + if ( bold ) { + auto updateStyle = [selItem]() { + selItem->setStyleSheet( "font-weight: bold;" ); + }; + updateStyle(); +//same as Qt::AA_UseStyleSheetPropagationInWidgetStyles +#if !HAS_QT57 + connect(qApp, &QApplication::paletteChanged, selItem, [selItem, updateStyle](){ + updateStyle(); + }); +#endif + } setItemWidget( item, 0, selItem ); item->setData( 0, TYPE_ROLE, (int)type ); if( !drop ) item->setFlags( item->flags() & ~Qt::ItemIsDropEnabled ); @@ -640,8 +653,8 @@ void PLSelector::wheelEvent( QWheelEvent *e ) { if( verticalScrollBar()->isVisible() && ( - (verticalScrollBar()->value() != verticalScrollBar()->minimum() && e->delta() >= 0 ) || - (verticalScrollBar()->value() != verticalScrollBar()->maximum() && e->delta() < 0 ) + (verticalScrollBar()->value() != verticalScrollBar()->minimum() && e->angleDelta().y() >= 0 ) || + (verticalScrollBar()->value() != verticalScrollBar()->maximum() && e->angleDelta().y() < 0 ) ) ) QApplication::sendEvent(verticalScrollBar(), e); diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/selector.hpp vlc-3.0.22/modules/gui/qt/components/playlist/selector.hpp --- vlc-3.0.21/modules/gui/qt/components/playlist/selector.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/selector.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -58,7 +58,7 @@ LONGNAME_ROLE, //QString PL_ITEM_ROLE, //playlist_item_t* PL_ITEM_ID_ROLE, //playlist_item_t->i_id - IN_ITEM_ROLE, //input_item_t->i_id + IN_ITEM_ROLE, //input_item_t* SPECIAL_ROLE, //SpecialData CAP_SEARCH_ROLE, SD_CATEGORY_ROLE, @@ -99,7 +99,11 @@ void action( PLSelItem* ); private: +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + inline void enterEvent( QEnterEvent* ){ showAction(); } +#else inline void enterEvent( QEvent* ){ showAction(); } +#endif inline void leaveEvent( QEvent* ){ hideAction(); } QTreeWidgetItem* qitem; diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/sorting.h vlc-3.0.22/modules/gui/qt/components/playlist/sorting.h --- vlc-3.0.21/modules/gui/qt/components/playlist/sorting.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/sorting.h 2025-11-13 22:17:54.000000000 +0000 @@ -136,26 +136,4 @@ } } -/* Return the media library query select type */ -static inline ml_select_e meta_to_mlmeta( uint32_t i_column ) -{ - switch( i_column ) - { - case COLUMN_NUMBER: return ML_ID; - case COLUMN_TITLE: return ML_TITLE; - case COLUMN_DURATION: return ML_DURATION; - case COLUMN_ARTIST: return ML_ARTIST; - case COLUMN_GENRE: return ML_GENRE; - case COLUMN_ALBUM: return ML_ALBUM; - case COLUMN_TRACK_NUMBER: return ML_TRACK_NUMBER; - case COLUMN_DESCRIPTION: return ML_EXTRA; - case COLUMN_URI: return ML_URI; - case COLUMN_RATING: return ML_VOTE; - case COLUMN_COVER: return ML_COVER; - case COLUMN_DISC_NUMBER: return ML_DISC_NUMBER; - case COLUMN_DATE: return ML_YEAR; - default: abort(); - } -} - #endif diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/standardpanel.cpp vlc-3.0.22/modules/gui/qt/components/playlist/standardpanel.cpp --- vlc-3.0.21/modules/gui/qt/components/playlist/standardpanel.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/standardpanel.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -70,6 +70,7 @@ #include #include #include +#include #include @@ -89,7 +90,7 @@ p_selector( _p_selector ) { viewStack = new QStackedLayout( this ); - viewStack->setSpacing( 0 ); viewStack->setMargin( 0 ); + viewStack->setSpacing( 0 ); viewStack->setContentsMargins( 0, 0, 0, 0 ); setMinimumWidth( 300 ); iconView = NULL; @@ -537,7 +538,7 @@ void StandardPLPanel::wheelEvent( QWheelEvent *e ) { if( e->modifiers() & Qt::ControlModifier ) { - int numSteps = e->delta() / 8 / 15; + int numSteps = e->angleDelta().y() / QWheelEvent::DefaultDeltasPerStep; if( numSteps > 0) increaseZoom(); else if( numSteps < 0) diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/views.cpp vlc-3.0.22/modules/gui/qt/components/playlist/views.cpp --- vlc-3.0.21/modules/gui/qt/components/playlist/views.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/views.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -477,7 +477,7 @@ PicFlowView::PicFlowView( QAbstractItemModel *p_model, QWidget *parent ) : QAbstractItemView( parent ) { QHBoxLayout *layout = new QHBoxLayout( this ); - layout->setMargin( 0 ); + layout->setContentsMargins( 0, 0, 0, 0 ); picFlow = new PictureFlow( this, p_model ); picFlow->setContextMenuPolicy( Qt::CustomContextMenu ); connect( picFlow, SIGNAL(customContextMenuRequested( const QPoint & )), diff -Nru vlc-3.0.21/modules/gui/qt/components/playlist/vlc_model.cpp vlc-3.0.22/modules/gui/qt/components/playlist/vlc_model.cpp --- vlc-3.0.21/modules/gui/qt/components/playlist/vlc_model.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/playlist/vlc_model.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -83,7 +83,7 @@ QString key = artUrl + QString("%1%2").arg(size.width()).arg(size.height()); - if( !QPixmapCache::find( key, artPix )) + if( !QPixmapCache::find( key, &artPix )) { if( artUrl.isEmpty() == false ) { @@ -97,7 +97,7 @@ } } key = QString("noart%1%2").arg(size.width()).arg(size.height()); - if( !QPixmapCache::find( key, artPix ) ) + if( !QPixmapCache::find( key, &artPix ) ) { artPix = QPixmap( ":/noart" ).scaled( size, Qt::KeepAspectRatio, @@ -206,7 +206,7 @@ QModelIndex child; for( int row = 0 ; row < nbnodes ; row++ ) { - child = index.child( row, COLUMN_COVER ); + child = index.model()->index( row, COLUMN_COVER ); if ( child.isValid() && child.data().toString().isEmpty() ) THEMIM->getIM()->requestArtUpdate( getInputItem( child ), false ); } diff -Nru vlc-3.0.21/modules/gui/qt/components/preferences_widgets.cpp vlc-3.0.22/modules/gui/qt/components/preferences_widgets.cpp --- vlc-3.0.21/modules/gui/qt/components/preferences_widgets.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/preferences_widgets.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -273,10 +273,10 @@ l->addWidget( label, line, 0 ); l->setColumnMinimumWidth( 1, 10 ); QHBoxLayout *textAndButton = new QHBoxLayout(); - textAndButton->setMargin( 0 ); + textAndButton->setContentsMargins( 0, 0, 0, 0 ); textAndButton->addWidget( text, 2 ); textAndButton->addWidget( browse, 0 ); - l->addLayout( textAndButton, line, LAST_COLUMN, 0 ); + l->addLayout( textAndButton, line, LAST_COLUMN ); } FileConfigControl::FileConfigControl( vlc_object_t *_p_this, @@ -524,7 +524,7 @@ void ModuleConfigControl::fillGrid( QGridLayout *l, int line ) { l->addWidget( label, line, 0 ); - l->addWidget( combo, line, LAST_COLUMN, 0 ); + l->addWidget( combo, line, LAST_COLUMN ); } ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, @@ -622,8 +622,6 @@ ModuleListConfigControl::~ModuleListConfigControl() { - foreach ( checkBoxListItem *it, modules ) - free( it->psz_module ); qDeleteAll( modules ); modules.clear(); delete groupBox; @@ -632,9 +630,15 @@ void ModuleListConfigControl::checkbox_lists( module_t *p_parser ) { const char *help = module_get_help( p_parser ); - checkbox_lists( qtr( module_GetLongName( p_parser ) ), + const char *module_name = module_GetLongName( p_parser ); + const char *module_shortcut = module_get_object( p_parser ); + + if ( !strcmp(module_name, "AMD VQ Enhancer")) + module_shortcut = "amf_vqenhancer"; + + checkbox_lists( qtr( module_name ), help != NULL ? qtr( help ): "", - module_get_object( p_parser ) ); + module_shortcut ); } void ModuleListConfigControl::checkbox_lists( QString label, QString help, const char* psz_module ) @@ -647,10 +651,10 @@ cb->setToolTip( formatTooltip( help ) ); cbl->checkBox = cb; - cbl->psz_module = strdup( psz_module ); + cbl->psz_module = qfu( psz_module ); modules.append( cbl ); - if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) ) + if( p_item->value.psz && strstr( p_item->value.psz, psz_module ) ) cbl->checkBox->setChecked( true ); } @@ -934,7 +938,7 @@ void BoolConfigControl::fillGrid( QGridLayout *l, int line ) { - l->addWidget( checkbox, line, 0, 1, -1, 0 ); + l->addWidget( checkbox, line, 0, 1, -1 ); } BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, @@ -1199,7 +1203,7 @@ p_config = module_config_get (p_main, &confsize); - QMap global_keys; + QMultiMap global_keys; for (size_t i = 0; i < confsize; i++) { module_config_t *p_config_item = p_config + i; @@ -1224,7 +1228,7 @@ treeItem->setText( HOTKEY_COL, keys ); treeItem->setToolTip( HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") ); treeItem->setToolTip( GLOBAL_HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") ); - treeItem->setData( HOTKEY_COL, Qt::UserRole, QVariant( p_config_item->value.psz ) ); + treeItem->setData( HOTKEY_COL, Qt::UserRole, QVariant( qfu( p_config_item->value.psz ) ) ); table->addTopLevelItem( treeItem ); continue; } @@ -1234,11 +1238,11 @@ && !EMPTY_STR( p_config_item->psz_text ) && !EMPTY_STR( p_config_item->value.psz ) ) { - global_keys.insertMulti( qtr( p_config_item->psz_text ), qfu( p_config_item->value.psz ) ); + global_keys.insert( qtr( p_config_item->psz_text ), qfu( p_config_item->value.psz ) ); } } - QMap::const_iterator i = global_keys.constBegin(); + auto i = global_keys.constBegin(); while (i != global_keys.constEnd()) { QList list = @@ -1398,7 +1402,7 @@ existingkeys = NULL; table = _table; - setWindowTitle( ( b_global ? qtr( "Global" ) + QString(" ") : "" ) + setWindowTitle( ( b_global ? qtr( "Global" ) + QString(" ") : QStringLiteral("") ) + qtr( "Hotkey change" ) ); setWindowRole( "vlc-key-input" ); diff -Nru vlc-3.0.21/modules/gui/qt/components/preferences_widgets.hpp vlc-3.0.22/modules/gui/qt/components/preferences_widgets.hpp --- vlc-3.0.21/modules/gui/qt/components/preferences_widgets.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/preferences_widgets.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -31,7 +31,7 @@ #endif #include "qt.hpp" -#include +#include #include @@ -116,8 +116,8 @@ Q_OBJECT public: virtual int getValue() const = 0; - virtual int getType() const Q_DECL_OVERRIDE; - virtual void doApply() Q_DECL_OVERRIDE; + virtual int getType() const override; + void doApply() override; protected: VIntConfigControl( vlc_object_t *a, module_config_t *b ) : ConfigControl(a,b) {} @@ -252,8 +252,8 @@ Q_OBJECT public: virtual float getValue() const = 0; - int getType() const Q_DECL_OVERRIDE; - void doApply() Q_DECL_OVERRIDE; + int getType() const override; + void doApply() override; protected: VFloatConfigControl( vlc_object_t *a, module_config_t *b ) : ConfigControl(a,b) {}; @@ -301,8 +301,8 @@ Q_OBJECT public: virtual QString getValue() const = 0; - int getType() const Q_DECL_OVERRIDE; - void doApply() Q_DECL_OVERRIDE; + int getType() const override; + void doApply() override; protected: VStringConfigControl( vlc_object_t *a, module_config_t *b ) : ConfigControl(a,b) {} @@ -407,7 +407,7 @@ struct checkBoxListItem { QCheckBox *checkBox; - char *psz_module; + QString psz_module; }; class ModuleListConfigControl : public VStringConfigControl diff -Nru vlc-3.0.21/modules/gui/qt/components/simple_preferences.cpp vlc-3.0.22/modules/gui/qt/components/simple_preferences.cpp --- vlc-3.0.21/modules/gui/qt/components/simple_preferences.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/simple_preferences.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -27,6 +27,7 @@ # include "config.h" #endif +#include "qt.hpp" #include "components/simple_preferences.hpp" #include "components/preferences_widgets.hpp" @@ -47,7 +48,7 @@ #include #include #include -#include +#include #include #define ICON_HEIGHT 48 @@ -260,7 +261,7 @@ #undef ADD_CATEGORY SPrefsInterface->setChecked( true ); - layout->setMargin( 0 ); + layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing( 1 ); setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Preferred); @@ -355,7 +356,7 @@ QVBoxLayout *panel_layout = new QVBoxLayout(); QWidget *panel = new QWidget(); - panel_layout->setMargin( 3 ); + panel_layout->setContentsMargins(3, 3, 3, 3); // Title Label QLabel *panel_label = new QLabel; @@ -612,7 +613,14 @@ setEnabled( bool ) ); char* psz = config_GetPsz( p_intf, "audio-filter" ); - qs_filter = qfu( psz ).split( ':', QString::SkipEmptyParts ); + qs_filter = qfu( psz ).split( ':', + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); + free( psz ); bool b_enabled = ( qs_filter.contains( "normvol" ) ); @@ -634,18 +642,21 @@ "for DVD, VCD, and CDDA are set.\n" "You can define a unique one or configure them \n" "individually in the advanced preferences." ) ); - char *psz_dvddiscpath = config_GetPsz( p_intf, "dvd" ); - char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" ); - char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" ); - if( psz_dvddiscpath && psz_vcddiscpath && psz_cddadiscpath ) - if( !strcmp( psz_cddadiscpath, psz_dvddiscpath ) && - !strcmp( psz_dvddiscpath, psz_vcddiscpath ) ) + bool have_cdda = module_exists( "cdda" ); + char *dvd_discpath = config_GetPsz( p_intf, "dvd" ); + char *vcd_discpath = config_GetPsz( p_intf, "vcd" ); + char *cdda_discpath = have_cdda ? config_GetPsz( p_intf, "cd-audio" ) : nullptr; + if( dvd_discpath && vcd_discpath && ( !have_cdda || cdda_discpath ) ) { - ui.DVDDeviceComboBox->setEditText( qfu( psz_dvddiscpath ) ); + if( !strcmp( dvd_discpath, vcd_discpath ) && + ( !have_cdda || !strcmp( cdda_discpath, dvd_discpath ) ) ) + { + ui.DVDDeviceComboBox->setEditText( qfu( dvd_discpath ) ); + } } - free( psz_cddadiscpath ); - free( psz_dvddiscpath ); - free( psz_vcddiscpath ); + free( cdda_discpath ); + free( dvd_discpath ); + free( vcd_discpath ); } #ifndef _WIN32 QStringList DVDDeviceComboBoxStringList = QStringList(); @@ -653,7 +664,7 @@ << "dvd*" << "scd*" << "sr*" << "sg*" << "cd*"; ui.DVDDeviceComboBox->addItems( QDir( "/dev/" ) .entryList( DVDDeviceComboBoxStringList, QDir::System ) - .replaceInStrings( QRegExp("^"), "/dev/" ) + .replaceInStrings( QRegularExpression("^"), "/dev/" ) ); #endif CONFIG_GENERIC( "dvd", String, ui.DVDLabel, @@ -742,7 +753,7 @@ DWORD len = 256; if( RegQueryValueEx( h_key, TEXT("Lang"), NULL, NULL, (LPBYTE) &szData, &len ) == ERROR_SUCCESS ) { langReg = FromWide( szData ); - ui.langCombo->setCurrentIndex( ui.langCombo->findData(langReg) ); + ui.langCombo->setCurrentIndex( ui.langCombo->findData(qfu(langReg)) ); } } free( langReg); @@ -771,11 +782,15 @@ /* defaults to qt */ ui.qt->setChecked( true ); } + + if ( var_InheritBool( p_intf, "qt-dark-palette" ) ) + ui.qtdark->setChecked( true ); /*dark palette*/ + free( psz_intf ); optionWidgets["skinRB"] = ui.skins; optionWidgets["qtRB"] = ui.qt; -#if !defined( _WIN32) + ui.stylesCombo->addItem( qtr("System's default") ); ui.stylesCombo->addItems( QStyleFactory::keys() ); ui.stylesCombo->setCurrentIndex( ui.stylesCombo->findText( @@ -786,10 +801,7 @@ CONNECT( ui.stylesCombo, currentIndexChanged( QString ), this, changeStyle( QString ) ); optionWidgets["styleCB"] = ui.stylesCombo; -#else - ui.stylesCombo->hide(); - ui.stylesLabel->hide(); -#endif + radioGroup = new QButtonGroup(this); radioGroup->addButton( ui.qt, 0 ); radioGroup->addButton( ui.skins, 1 ); @@ -797,6 +809,20 @@ ui.styleStackedWidget, setCurrentIndex( int ) ); ui.styleStackedWidget->setCurrentIndex( radioGroup->checkedId() ); + CONFIG_BOOL( "qt-dark-palette", qtdark ); + // Connecting the stateChanged signal of the checkbox + connect(ui.qtdark, &QCheckBox::stateChanged, ui.stylesCombo, [combobox = ui.stylesCombo](const int state) { + if (state == Qt::CheckState::Checked) { + // Set the current style to "Fusion" + combobox->setCurrentText(QStringLiteral("Fusion")); + // Apply the dark palette + applyDarkPalette(); + } else { + // Remove the custom palette and revert to the default + QApplication::setPalette(QApplication::style()->standardPalette()); + } + }); + CONNECT( ui.minimalviewBox, toggled( bool ), ui.mainPreview, setNormalPreview( bool ) ); CONFIG_BOOL( "qt-minimal-view", minimalviewBox ); @@ -1069,9 +1095,10 @@ qobject_cast(optionWidgets["inputLE"])->currentText().toUtf8(); if( devicepath.size() > 0 ) { - config_PutPsz( p_intf, "dvd", devicepath ); - config_PutPsz( p_intf, "vcd", devicepath ); - config_PutPsz( p_intf, "cd-audio", devicepath ); + config_PutPsz( p_intf, "dvd", devicepath.constData() ); + config_PutPsz( p_intf, "vcd", devicepath.constData() ); + if( module_exists( "cdda" ) ) + config_PutPsz( p_intf, "cd-audio", devicepath.constData() ); } #define CaC( name, factor ) config_PutInt( p_intf, name, i_comboValue * factor ) diff -Nru vlc-3.0.21/modules/gui/qt/components/sout/profile_selector.cpp vlc-3.0.22/modules/gui/qt/components/sout/profile_selector.cpp --- vlc-3.0.21/modules/gui/qt/components/sout/profile_selector.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/sout/profile_selector.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -32,14 +32,14 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #define CATPROP2NAME( val ) QString("valueholder_%1").arg( val ) @@ -199,9 +199,9 @@ void VLCProfileSelector::updateOptions( int i ) { QString options = profileBox->itemData( i ).toString(); - QRegExp rx(OLDFORMAT); + QRegularExpression rx(OLDFORMAT); if ( !options.contains( ";" ) ) return; - if ( rx.indexIn( options ) != -1 ) + if ( rx.match( options ).hasMatch() ) return updateOptionsOldFormat( i ); transcode = ""; @@ -659,8 +659,8 @@ void VLCProfileEditor::fillProfile( const QString& qs ) { - QRegExp rx(OLDFORMAT); - if ( rx.indexIn( qs ) != -1 ) return fillProfileOldFormat( qs ); + QRegularExpression rx(OLDFORMAT); + if ( rx.match( qs ).hasMatch() ) return fillProfileOldFormat( qs ); QStringList tuples = qs.split( ";" ); foreach ( const QString &tuple, tuples ) diff -Nru vlc-3.0.21/modules/gui/qt/components/sout/sout_widgets.cpp vlc-3.0.22/modules/gui/qt/components/sout/sout_widgets.cpp --- vlc-3.0.21/modules/gui/qt/components/sout/sout_widgets.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/components/sout/sout_widgets.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -35,6 +35,7 @@ #include #include #include +#include #define I_FILE_SLASH_DIR \ I_DIR_OR_FOLDER( N_("File/Directory"), N_("File/Folder") ) @@ -150,11 +151,11 @@ QString outputfile = fileEdit->text(); if( !mux.isEmpty() ) { - if( outputfile.contains( QRegExp("\\..{2,4}$")) && + if( outputfile.contains( QRegularExpression("\\..{2,4}$")) && !outputfile.endsWith(mux) ) { /* Replace the extension according to muxer */ - outputfile.replace(QRegExp("\\..{2,4}$"),"."+mux); + outputfile.replace(QRegularExpression("\\..{2,4}$"),"."+mux); } else if (!outputfile.endsWith( mux ) ) { m.option( "mux", mux ); @@ -220,7 +221,7 @@ /* Path-extension is primary muxer to use if possible, otherwise check for mux-choise and see that it isn't mp4 then fallback to flv*/ - if ( !path.contains(QRegExp("\\..{2,3}$") ) ) + if ( !path.contains(QRegularExpression("\\..{2,3}$") ) ) { if( !mux.isEmpty() && mux.compare("mp4") ) m.option( "mux", mux ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/bookmarks.cpp vlc-3.0.22/modules/gui/qt/dialogs/bookmarks.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/bookmarks.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/bookmarks.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -146,7 +146,7 @@ QStringList row; row << QString( qfu( pp_bookmarks[i]->psz_name ) ); row << qfu("-"); - row << QString().sprintf( "%02u:%02u:%06.3f", hours, minutes, seconds ); + row << QString( "%1:%2:%3" ).arg( hours, 2, 10, QChar('0')).arg( minutes, 2, 10, QChar('0')).arg(seconds, 10, 'f', 3, QChar('0')); QTreeWidgetItem *item = new QTreeWidgetItem( bookmarksList, row ); item->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEditable | @@ -186,7 +186,7 @@ b_ignore_updates = true; /* Sort needed to make sure that selected elements are deleted in descending order, otherwise the indexes might change and wrong bookmarks are deleted. */ - qSort( selected.begin(), selected.end() ); + std::sort( selected.begin(), selected.end() ); QModelIndexList::Iterator it = selected.end(); for( --it; it != selected.begin(); it-- ) { @@ -242,7 +242,13 @@ } else if( column == 2 ) { - fields = item->text( column ).split( ":", QString::SkipEmptyParts ); + fields = item->text( column ).split( ":", + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); if( fields.count() == 1 ) p_seekpoint->i_time_offset = 1000000 * ( fields[0].toFloat() ); else if( fields.count() == 2 ) diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/convert.cpp vlc-3.0.22/modules/gui/qt/dialogs/convert.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/convert.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/convert.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -156,7 +156,7 @@ void ConvertDialog::fileBrowse() { - QString fileExtension = ( ! profile->isEnabled() ) ? ".*" : "." + profile->getMux(); + QString fileExtension = ( ! profile->isEnabled() ) ? QStringLiteral(".*") : QStringLiteral(".") + profile->getMux(); outgoingMRL = QFileDialog::getSaveFileUrl( this, qtr( "Save file..." ), p_intf->p_sys->filepath, @@ -208,7 +208,7 @@ // Multiple, use the convention. else { - QString fileExtension = ( ! profile->isEnabled() ) ? ".*" : "." + profile->getMux(); + QString fileExtension = ( ! profile->isEnabled() ) ? QStringLiteral(".*") : QStringLiteral(".") + profile->getMux(); newFileName = incomingMRLs->at(i); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/convert.hpp vlc-3.0.22/modules/gui/qt/dialogs/convert.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/convert.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/convert.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -24,6 +24,8 @@ #ifndef QVLC_CONVERT_DIALOG_H_ #define QVLC_CONVERT_DIALOG_H_ 1 +#include + #include "util/qvlcframe.hpp" class QLineEdit; diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/epg.cpp vlc-3.0.22/modules/gui/qt/dialogs/epg.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/epg.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/epg.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include #include +#include #include "qt.hpp" #include "input_manager.hpp" @@ -49,7 +49,7 @@ setWindowTitle( qtr( "Program Guide" ) ); QVBoxLayout *layout = new QVBoxLayout( this ); - layout->setMargin( 0 ); + layout->setContentsMargins(0, 0, 0, 0); epg = new EPGWidget( this ); QGroupBox *descBox = new QGroupBox( qtr( "Description" ), this ); @@ -146,8 +146,9 @@ QDateTime enddate = epgItem->start().addSecs( epgItem->duration() ); QString start, end; + QLocale locale; if( epgItem->start().daysTo(now) != 0 ) - start = epgItem->start().toString( Qt::SystemLocaleLongDate ); + start = locale.toString(epgItem->start()); else start = epgItem->start().time().toString( "hh:mm" ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/epg.hpp vlc-3.0.22/modules/gui/qt/dialogs/epg.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/epg.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/epg.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -37,7 +37,7 @@ { Q_OBJECT protected: - virtual void showEvent(QShowEvent * event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent * event) override; private: EpgDialog( intf_thread_t * ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/extended.cpp vlc-3.0.22/modules/gui/qt/dialogs/extended.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/extended.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/extended.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -25,7 +25,7 @@ # include "config.h" #endif -#include +#include #include "dialogs/extended.hpp" diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/extensions.cpp vlc-3.0.22/modules/gui/qt/dialogs/extensions.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/extensions.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/extensions.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -37,7 +37,6 @@ #include #include #include -#include #include #include "util/customwidgets.hpp" diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/extensions.hpp vlc-3.0.22/modules/gui/qt/dialogs/extensions.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/extensions.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/extensions.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -27,7 +27,7 @@ #include "qt.hpp" #include -#include "assert.h" +#include #include class QObject; @@ -105,8 +105,8 @@ void DestroyWidget( extension_widget_t *p_widget, bool b_cond = true ); protected: - void closeEvent( QCloseEvent* ) Q_DECL_OVERRIDE; - void keyPressEvent( QKeyEvent* ) Q_DECL_OVERRIDE; + void closeEvent( QCloseEvent* ) override; + void keyPressEvent( QKeyEvent* ) override; private slots: int TriggerClick( QObject *object ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/external.cpp vlc-3.0.22/modules/gui/qt/dialogs/external.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/external.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/external.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -35,6 +35,8 @@ #include #include #include +#include +#include DialogHandler::DialogHandler (intf_thread_t *p_intf, QObject *_parent) : QObject( _parent ), p_intf (p_intf) @@ -190,7 +192,7 @@ dialog->setWindowTitle (title); dialog->setWindowRole ("vlc-login"); dialog->setModal(true); - layout->setMargin (2); + layout->setContentsMargins( 2, 2, 2, 2 ); /* Username and password fields */ QWidget *panel = new QWidget (dialog); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/fingerprintdialog.cpp vlc-3.0.22/modules/gui/qt/dialogs/fingerprintdialog.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/fingerprintdialog.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/fingerprintdialog.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -22,11 +22,9 @@ #include "ui/fingerprintdialog.h" #include "adapters/chromaprint.hpp" -#include #include #include -#include FingerprintDialog::FingerprintDialog(QWidget *parent, intf_thread_t *p_intf, input_item_t *p_item ) : diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/fingerprintdialog.hpp vlc-3.0.22/modules/gui/qt/dialogs/fingerprintdialog.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/fingerprintdialog.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/fingerprintdialog.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -27,7 +27,6 @@ #include "qt.hpp" #include -#include #include namespace Ui { diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/firstrun.cpp vlc-3.0.22/modules/gui/qt/dialogs/firstrun.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/firstrun.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/firstrun.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -30,7 +30,7 @@ #include FirstRun::FirstRun( QWidget *_p, intf_thread_t *_p_intf ) - : QWidget( _p ), p_intf( _p_intf ) + : QVLCDialog( _p, _p_intf), p_intf( _p_intf ) { msg_Dbg( p_intf, "Boring first Run Wizard" ); buildPrivDialog(); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/firstrun.hpp vlc-3.0.22/modules/gui/qt/dialogs/firstrun.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/firstrun.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/firstrun.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -22,12 +22,10 @@ *****************************************************************************/ #include "qt.hpp" - -#include -#include +#include "util/qvlcframe.hpp" class QCheckBox; -class FirstRun : public QWidget +class FirstRun : public QVLCDialog { Q_OBJECT public: diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/gototime.cpp vlc-3.0.22/modules/gui/qt/dialogs/gototime.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/gototime.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/gototime.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -28,12 +28,11 @@ #include "input_manager.hpp" -#include #include #include -#include #include #include +#include GotoTimeDialog::GotoTimeDialog( intf_thread_t *_p_intf) : QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf ) diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/gototime.hpp vlc-3.0.22/modules/gui/qt/dialogs/gototime.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/gototime.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/gototime.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -37,8 +37,8 @@ virtual ~GotoTimeDialog(); QTimeEdit *timeEdit; private slots: - void close() Q_DECL_OVERRIDE; - void cancel() Q_DECL_OVERRIDE; + void close() override; + void cancel() override; void reset(); friend class Singleton; diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/help.cpp vlc-3.0.22/modules/gui/qt/dialogs/help.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/help.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/help.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -38,15 +38,13 @@ #endif #include -#include -#include #include #include #include #include #include -#include +#include HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) @@ -87,12 +85,23 @@ setWindowRole( "vlc-about" ); setWindowModality( Qt::WindowModal ); - ui.version->setText(qfu( " " VERSION_MESSAGE ) ); - ui.title->setText("

" + qtr( "VLC media player" ) + "

"); + QString linkColor; + if ( var_InheritBool( p_intf, "qt-dark-palette" ) ) { + ui.horizontalFrame->setStyleSheet("background-color: rgb(10, 10, 10);"); + ui.footer->setStyleSheet("background-color: rgb(25, 25, 25);"); + linkColor = "#ffa851"; + } else { + ui.horizontalFrame->setStyleSheet("background-color: rgb(230, 230, 230);"); + ui.footer->setStyleSheet("background-color: rgb(245, 245, 245);"); + linkColor = "#0057ae"; + } - ui.MainBlabla->setText("" + - qtr( "

VLC media player is a free and open source media player, encoder, and streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on essentially every popular platform, and can read almost all files, CDs, DVDs, network streams, capture cards and other media formats!

Help and join us!" ) + - "

"); + ui.version->setText(qfu( " " VERSION_MESSAGE ) ); + ui.title->setText("

" + qtr( "VLC media player" ) + "

"); + QString translatedString = qtr( "

VLC media player is a free and open source media player, encoder, and streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on essentially every popular platform, and can read almost all files, CDs, DVDs, network streams, capture cards and other media formats!

Help and join us!" ); + if ( var_InheritBool( p_intf, "qt-dark-palette" ) ) + translatedString.remove(QLatin1String("#0057ae")); + ui.MainBlabla->setText("" + translatedString + "

"); #if 0 if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) ) @@ -116,15 +125,17 @@ /* People who wrote the software */ ui.authorsPage->setText( qfu( psz_authors ) ); - ui.licenseButton->setText( "

"+qtr( "License" )+"

"); - ui.licenseButton->installEventFilter( this ); - - ui.authorsButton->setText( "

"+qtr( "Authors" )+"

"); - ui.authorsButton->installEventFilter( this ); - - ui.creditsButton->setText( "

"+qtr( "Credits" )+"

"); - ui.creditsButton->installEventFilter( this ); - + ui.licenseButton->setText(QString("

%2

") + .arg(linkColor, qtr("License"))); + ui.licenseButton->installEventFilter(this); + + ui.authorsButton->setText(QString("

%2

") + .arg(linkColor, qtr("Authors"))); + ui.authorsButton->installEventFilter(this); + + ui.creditsButton->setText(QString("

%2

") + .arg(linkColor, qtr("Credits"))); + ui.creditsButton->installEventFilter(this); ui.version->installEventFilter( this ); } @@ -295,7 +306,7 @@ .arg( QString::number( p_release->i_major ) ) .arg( QString::number( p_release->i_minor ) ) .arg( QString::number( p_release->i_revision ) ) - .arg( p_release->i_extra == 0 ? "" : "." + QString::number( p_release->i_extra ) ); + .arg( p_release->i_extra == 0 ? QStringLiteral("") : QStringLiteral(".") + QString::number( p_release->i_extra ) ); ui.updateNotifyLabel->setText( message ); message = qfu( p_release->psz_desc ).replace( "\n", "
" ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/help.hpp vlc-3.0.22/modules/gui/qt/dialogs/help.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/help.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/help.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -61,8 +61,8 @@ friend class Singleton; protected: - virtual bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; - virtual void showEvent ( QShowEvent * ) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; + void showEvent ( QShowEvent * ) Q_DECL_OVERRIDE; private: bool b_advanced; diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/mediainfo.hpp vlc-3.0.22/modules/gui/qt/dialogs/mediainfo.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/mediainfo.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/mediainfo.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -71,7 +71,7 @@ void updateAllTabs( input_item_t * ); void clearAllTabs(); - void close() Q_DECL_OVERRIDE; + void close() override; void saveMeta(); void updateButtons( int i_tab ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/messages.cpp vlc-3.0.22/modules/gui/qt/dialogs/messages.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/messages.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/messages.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -30,16 +30,13 @@ #include #include #include -#include #include #include -#include -#include #include #include #include -#include +#include #include #include diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/messages.hpp vlc-3.0.22/modules/gui/qt/dialogs/messages.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/messages.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/messages.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -27,11 +27,9 @@ #include "util/qvlcframe.hpp" #include "util/singleton.hpp" #include "ui/messages_panel.h" -#include #include -#include +#include -class QPushButton; class QTreeWidget; class QTreeWidgetItem; class MsgEvent; @@ -49,7 +47,7 @@ void sinkMessage( const MsgEvent * ); bool matchFilter( const QString& ); - QAtomicInt verbosity; + std::atomic verbosity; static void MsgCallback( void *, int, const vlc_log_t *, const char *, va_list ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/open.cpp vlc-3.0.22/modules/gui/qt/dialogs/open.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/open.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/open.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,10 +29,11 @@ #include "recents.hpp" #include "util/qt_dirs.hpp" -#include -#include +#include #include +#include + #ifndef NDEBUG # define DEBUG_QT 1 #endif @@ -412,7 +413,7 @@ toggleVisible(); /* Dbg and send :D */ - msg_Dbg( p_intf, "MRL(s) passed to the Sout: %i", soutMRLS.length() ); + msg_Dbg( p_intf, "MRL(s) passed to the Sout: %zu", static_cast( soutMRLS.length() ) ); for(int i = 0; i < soutMRLS.length(); i++) { msg_Dbg( p_intf, "MRL(s) passed to the Sout: %s", qtu( soutMRLS[i] ) ); @@ -477,7 +478,7 @@ int index = 0; while( index < entries.count() ) { - int delim_pos = entries.indexOf( QRegExp( "\\s+|\"" ), index ); + int delim_pos = entries.indexOf( QRegularExpression( "\\s+|\"" ), index ); if( delim_pos < 0 ) delim_pos = entries.count() - 1; entry += entries.mid( index, delim_pos - index + 1 ); index = delim_pos + 1; diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/openurl.cpp vlc-3.0.22/modules/gui/qt/dialogs/openurl.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/openurl.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/openurl.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -33,12 +33,11 @@ #include #include #include -#include -#include #include #include +#include -#include +#include OpenUrlDialog::OpenUrlDialog( intf_thread_t *_p_intf, bool _bClipboard ) : diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/openurl.hpp vlc-3.0.22/modules/gui/qt/dialogs/openurl.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/openurl.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/openurl.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -53,10 +53,10 @@ QString url() const; bool shouldEnqueue() const; - virtual void showEvent( QShowEvent *ev ) Q_DECL_OVERRIDE; + void showEvent( QShowEvent *ev ) override; public slots: - void close() Q_DECL_OVERRIDE { play(); } + void close() override { play(); } }; diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/plugins.cpp vlc-3.0.22/modules/gui/qt/dialogs/plugins.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/plugins.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/plugins.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -34,7 +34,7 @@ #include "util/animators.hpp" #include "util/imagehelper.hpp" -#include +#include #include @@ -48,10 +48,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -67,6 +65,7 @@ #include #include #include +#include //match the image source (width/height) #define SCORE_ICON_WIDTH_SCALE 4 @@ -354,7 +353,7 @@ QVBoxLayout *layout = new QVBoxLayout( rightPane ); // Left Pane - leftPane->layout()->setMargin(0); + leftPane->layout()->setContentsMargins(0, 0, 0, 0); leftPane->layout()->setSpacing(0); SearchLineEdit *searchInput = new SearchLineEdit(); @@ -406,7 +405,7 @@ ADDON_EXTENSION ); // Right Pane - rightPane->layout()->setMargin(0); + rightPane->layout()->setContentsMargins(0, 0, 0, 0); rightPane->layout()->setSpacing(0); // Splitter sizes init @@ -847,7 +846,7 @@ returnval = QVariant( (int) p_entry->i_score ); break; case VersionRole: - returnval = QVariant( p_entry->psz_version ); + returnval = QVariant( qfu(p_entry->psz_version) ); break; case AuthorRole: returnval = qfu( p_entry->psz_author ); @@ -1286,7 +1285,7 @@ QPushButton *infoButton; editorWidget->setLayout( new QHBoxLayout() ); - editorWidget->layout()->setMargin( 0 ); + editorWidget->layout()->setContentsMargins(0, 0, 0, 0); infoButton = new QPushButton( QIcon( ":/menu/info.svg" ), qtr( "More information..." ) ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/plugins.hpp vlc-3.0.22/modules/gui/qt/dialogs/plugins.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/plugins.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/plugins.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -143,7 +143,7 @@ private: AddonsTab( intf_thread_t *p_intf ); virtual ~AddonsTab(); - bool eventFilter ( QObject * watched, QEvent * event ); + bool eventFilter ( QObject * watched, QEvent * event ) override; enum { diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/preferences.cpp vlc-3.0.22/modules/gui/qt/dialogs/preferences.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/preferences.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/preferences.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -72,7 +72,7 @@ types = new QGroupBox( qtr("Show settings") ); types->setAlignment( Qt::AlignHCenter ); QHBoxLayout *types_l = new QHBoxLayout; - types_l->setSpacing( 3 ); types_l->setMargin( 3 ); + types_l->setSpacing( 3 ); types_l->setContentsMargins(3, 3, 3, 3); simple = new QRadioButton( qtr( "Simple" ), types ); simple->setToolTip( qtr( "Switch to simple preferences view" ) ); types_l->addWidget( simple ); @@ -112,7 +112,7 @@ simple_split_widget->layout()->addWidget( simple_tree_panel ); simple_split_widget->layout()->addWidget( simple_panels_stack ); - simple_split_widget->layout()->setMargin( 0 ); + simple_split_widget->layout()->setContentsMargins(0, 0, 0, 0); advanced_split_widget->addWidget( advanced_tree_panel ); advanced_split_widget->addWidget( advanced_panels_stack ); @@ -122,11 +122,11 @@ main_layout->addWidget( types, 3, 0, 2, 1 ); main_layout->addWidget( buttonsBox, 4, 2, 1 ,1 ); main_layout->setRowStretch( 2, 4 ); - main_layout->setMargin( 9 ); + main_layout->setContentsMargins(9, 9, 9, 9); setLayout( main_layout ); /* Margins */ - simple_tree_panel->layout()->setMargin( 1 ); + simple_tree_panel->layout()->setContentsMargins( 1, 1, 1, 1 ); simple_panels_stack->layout()->setContentsMargins( 6, 0, 0, 3 ); for( int i = 0; i < SPrefsMax ; i++ ) simple_panels[i] = NULL; diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/sout.cpp vlc-3.0.22/modules/gui/qt/dialogs/sout.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/sout.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/sout.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -32,10 +32,8 @@ #include "components/sout/sout_widgets.hpp" #include -#include -#include -#include -#include + +#include SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString& inputMRL ) : QWizard( parent ) diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/toolbar.cpp vlc-3.0.22/modules/gui/qt/dialogs/toolbar.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/toolbar.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/toolbar.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -333,7 +333,7 @@ if ( !strcmp( item->widget()->metaObject()->className(), "QLabel" ) ) { QPainter eraser( &pixmaps[i] ); - eraser.fillRect( item->geometry(), palette().background() ); + eraser.fillRect( item->geometry(), palette().window() ); eraser.end(); } } @@ -497,7 +497,7 @@ QWidget *discFrame = new QWidget( this ); //discFrame->setLineWidth( 1 ); QHBoxLayout *discLayout = new QHBoxLayout( discFrame ); - discLayout->setSpacing( 0 ); discLayout->setMargin( 0 ); + discLayout->setSpacing( 0 ); discLayout->setContentsMargins( 0, 0, 0, 0 ); QToolButton *prevSectionButton = new QToolButton( discFrame ); prevSectionButton->setIcon( QIcon( ":/toolbar/dvd_prev.svg" ) ); @@ -522,7 +522,7 @@ { QWidget *telexFrame = new QWidget( this ); QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame ); - telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 ); + telexLayout->setSpacing( 0 ); telexLayout->setContentsMargins( 0, 0, 0, 0 ); QToolButton *telexOn = new QToolButton( telexFrame ); telexOn->setIcon( QIcon( ":/toolbar/tv.svg" ) ); @@ -638,7 +638,7 @@ setAcceptDrops( true ); controlLayout = new QHBoxLayout( this ); controlLayout->setSpacing( 5 ); - controlLayout->setMargin( 0 ); + controlLayout->setContentsMargins( 0, 0, 0, 0 ); setFrameShape( QFrame::StyledPanel ); setFrameShadow( QFrame::Raised ); setMinimumHeight( 20 ); diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/vlm.cpp vlc-3.0.22/modules/gui/qt/dialogs/vlm.cpp --- vlc-3.0.21/modules/gui/qt/dialogs/vlm.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/vlm.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -34,22 +34,16 @@ #include "util/qt_dirs.hpp" #include -#include #include -#include #include #include #include -#include -#include #include #include #include -#include #include #include #include -#include #include @@ -692,7 +686,14 @@ vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); - QStringList options = inputOptions.split( " :", QString::SkipEmptyParts ); + QStringList options = inputOptions.split( " :", + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); + for( int i = 0; i < options.count(); i++ ) { command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\""; @@ -779,7 +780,13 @@ vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); - QStringList options = inputOptions.split( " :", QString::SkipEmptyParts ); + QStringList options = inputOptions.split( " :", + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); for( int i = 0; i < options.count(); i++ ) { command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\""; @@ -838,7 +845,13 @@ vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); - QStringList options = inputOptions.split( " :", QString::SkipEmptyParts ); + QStringList options = inputOptions.split( " :", + #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts + #else + QString::SkipEmptyParts + #endif + ); for( int i = 0; i < options.count(); i++ ) { command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\""; @@ -876,14 +889,14 @@ if( _scherepeatnumber > 0 ) { - command = "setup \"" + name + "\" repeat \"" + _scherepeatnumber + "\""; + command = "setup \"" + name + "\" repeat \"" + QString::number(_scherepeatnumber) + "\""; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); } if( _repeatDays > 0 ) { - command = "setup \"" + name + "\" period \"" + _repeatDays + "\""; + command = "setup \"" + name + "\" period \"" + QString::number(_repeatDays) + "\""; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); } diff -Nru vlc-3.0.21/modules/gui/qt/dialogs/vlm.hpp vlc-3.0.22/modules/gui/qt/dialogs/vlm.hpp --- vlc-3.0.21/modules/gui/qt/dialogs/vlm.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs/vlm.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -181,7 +181,7 @@ VLMBroadcast( VLMWrapper *, const QString& name, const QString& input, const QString& inputOptions, const QString& output, bool _enable, bool _loop, VLMDialog *parent ); - void update() Q_DECL_OVERRIDE; + void update() override; private: bool b_looped; bool b_playing; diff -Nru vlc-3.0.21/modules/gui/qt/dialogs_provider.hpp vlc-3.0.22/modules/gui/qt/dialogs_provider.hpp --- vlc-3.0.21/modules/gui/qt/dialogs_provider.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/dialogs_provider.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,7 +29,7 @@ # include "config.h" #endif -#include +#include #include "qt.hpp" diff -Nru vlc-3.0.21/modules/gui/qt/extensions_manager.cpp vlc-3.0.22/modules/gui/qt/extensions_manager.cpp --- vlc-3.0.21/modules/gui/qt/extensions_manager.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/extensions_manager.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -26,7 +26,7 @@ #include "dialogs/extensions.hpp" #include -#include "assert.h" +#include #include #include diff -Nru vlc-3.0.21/modules/gui/qt/extensions_manager.hpp vlc-3.0.22/modules/gui/qt/extensions_manager.hpp --- vlc-3.0.21/modules/gui/qt/extensions_manager.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/extensions_manager.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -33,8 +33,9 @@ #include "qt.hpp" #include -#include -#include + +class QMenu; +class QSignalMapper; class ExtensionsDialogProvider; diff -Nru vlc-3.0.21/modules/gui/qt/main_interface.cpp vlc-3.0.22/modules/gui/qt/main_interface.cpp --- vlc-3.0.21/modules/gui/qt/main_interface.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/main_interface.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -65,6 +64,10 @@ #include #endif +#ifndef QT_NO_STATUSBAR +# include +#endif + #if ! HAS_QT510 && defined(QT5_HAS_X11) # include # include @@ -168,11 +171,13 @@ createMainWidget( settings ); +#ifndef QT_NO_STATUSBAR /************** * Status Bar * **************/ createStatusBar(); setStatusBarVisibility( getSettings()->value( "MainWindow/status-bar-visible", false ).toBool() ); +#endif /********************************* * Create the Systray Management * @@ -364,7 +369,7 @@ resumePanel = new QWidget( w ); resumePanel->hide(); QHBoxLayout *resumePanelLayout = new QHBoxLayout( resumePanel ); - resumePanelLayout->setSpacing( 0 ); resumePanelLayout->setMargin( 0 ); + resumePanelLayout->setSpacing( 0 ); resumePanelLayout->setContentsMargins( 0, 0, 0, 0 ); QLabel *continuePixmapLabel = new QLabel(); continuePixmapLabel->setPixmap( ImageHelper::loadSvgToPixmap( ":/menu/help.svg" , fontMetrics().height(), fontMetrics().height()) ); @@ -458,7 +463,7 @@ setCentralWidget( main ); mainLayout = new QVBoxLayout( main ); main->setContentsMargins( 0, 0, 0, 0 ); - mainLayout->setSpacing( 0 ); mainLayout->setMargin( 0 ); + mainLayout->setSpacing( 0 ); mainLayout->setContentsMargins( 0, 0, 0, 0 ); createResumePanel( main ); /* */ @@ -550,6 +555,7 @@ createSystray(); } +#ifndef QT_NO_STATUSBAR inline void MainInterface::createStatusBar() { /**************** @@ -568,12 +574,22 @@ timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel ); speedLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel ); nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel); - timeLabel->setStyleSheet( - "QLabel:hover { background-color: rgba(255, 255, 255, 50%) }" ); - speedLabel->setStyleSheet( - "QLabel:hover { background-color: rgba(255, 255, 255, 50%) }" ); - /* pad both label and its tooltip */ - nameLabel->setStyleSheet( "padding-left: 5px; padding-right: 5px;" ); + auto updateStyle = [=]() { + timeLabel->setStyleSheet( + "QLabel:hover { color: black; background-color: rgba(255, 255, 255, 50%) }" ); + speedLabel->setStyleSheet( + "QLabel:hover { color: black; background-color: rgba(255, 255, 255, 50%) }" ); + /* pad both label and its tooltip */ + nameLabel->setStyleSheet( "padding-left: 5px; padding-right: 5px;" ); + + }; + updateStyle(); +//same as Qt::AA_UseStyleSheetPropagationInWidgetStyles +#if !HAS_QT57 + connect(qApp, &QApplication::paletteChanged, this, [this, updateStyle](){ + updateStyle(); + }); +#endif /* and adding those */ statusBarr->addWidget( nameLabel, 8 ); @@ -587,8 +603,10 @@ elapsed time.*/ CONNECT( timeLabel, doubleClicked(), THEDP, gotoTimeDialog() ); +#ifndef QT_NO_STATUSBAR CONNECT( THEMIM->getIM(), encryptionChanged( bool ), this, showCryptedLabel( bool ) ); +#endif /* This shouldn't be necessary, but for somehow reason, the statusBarr starts at height of 20px and when a text is shown it needs more space. @@ -598,6 +616,7 @@ */ statusBarr->setFixedHeight( statusBarr->sizeHint().height() + 2 ); } +#endif /********************************************************************** * Handling of sizing of the components @@ -812,7 +831,7 @@ */ if (b_autoresize) { - QRect screen = QApplication::desktop()->availableGeometry(); + QRect screen = QGuiApplication::primaryScreen()->availableGeometry(); #if HAS_QT56 float factor = videoWidget->devicePixelRatioF(); #else @@ -828,8 +847,10 @@ h -= menuBar()->height(); if( controls->isVisible() ) h -= controls->height(); +#ifndef QT_NO_STATUSBAR if( statusBar()->isVisible() ) h -= statusBar()->height(); +#endif if( inputC->isVisible() ) h -= inputC->height(); } @@ -864,12 +885,12 @@ { int numscreen = var_InheritInteger( p_intf, "qt-fullscreen-screennumber" ); - if ( numscreen >= 0 && numscreen < QApplication::desktop()->screenCount() ) + if ( numscreen >= 0 && numscreen < QGuiApplication::screens().length() ) { if( fullscreenControls ) fullscreenControls->setTargetScreen( numscreen ); - QRect screenres = QApplication::desktop()->screenGeometry( numscreen ); + QRect screenres = QGuiApplication::screens()[ numscreen ]->geometry(); lastWinScreen = windowHandle()->screen(); #ifdef QT5_HAS_WAYLAND if( !b_hasWayland ) @@ -1116,7 +1137,9 @@ { menuBar()->setVisible( false ); controls->setVisible( false ); +#ifndef QT_NO_STATUSBAR statusBar()->setVisible( false ); +#endif inputC->setVisible( false ); } @@ -1128,7 +1151,9 @@ { bool b_menuBarVisible = menuBar()->isVisible(); bool b_controlsVisible = controls->isVisible(); +#ifndef QT_NO_STATUSBAR bool b_statusBarVisible = statusBar()->isVisible(); +#endif bool b_inputCVisible = inputC->isVisible(); if( !isFullScreen() && !isMaximized() && b_minimal && !b_isWindowTiled ) @@ -1139,8 +1164,10 @@ i_heightChange += menuBar()->height(); if( b_controlsVisible ) i_heightChange += controls->height(); +#ifndef QT_NO_STATUSBAR if( b_statusBarVisible ) i_heightChange += statusBar()->height(); +#endif if( b_inputCVisible ) i_heightChange += inputC->height(); @@ -1150,7 +1177,9 @@ menuBar()->setVisible( !b_minimal ); controls->setVisible( !b_minimal ); +#ifndef QT_NO_STATUSBAR statusBar()->setVisible( !b_minimal && b_statusbarVisible ); +#endif inputC->setVisible( !b_minimal ); if( !isFullScreen() && !isMaximized() && !b_minimal && !b_isWindowTiled ) @@ -1161,8 +1190,10 @@ i_heightChange += menuBar()->height(); if( !b_controlsVisible && controls->isVisible() ) i_heightChange += controls->height(); +#ifndef QT_NO_STATUSBAR if( !b_statusBarVisible && statusBar()->isVisible() ) i_heightChange += statusBar()->height(); +#endif if( !b_inputCVisible && inputC->isVisible() ) i_heightChange += inputC->height(); @@ -1230,9 +1261,11 @@ void MainInterface::setStatusBarVisibility( bool b_visible ) { +#ifndef QT_NO_STATUSBAR statusBar()->setVisible( b_visible ); b_statusbarVisible = b_visible; if( controls ) controls->setGripVisible( !b_statusbarVisible ); +#endif } @@ -1250,10 +1283,12 @@ void MainInterface::setName( const QString& name ) { input_name = name; /* store it for the QSystray use */ +#ifndef QT_NO_STATUSBAR /* Display it in the status bar, but also as a Tooltip in case it doesn't fit in the label */ nameLabel->setText( name ); nameLabel->setToolTip( name ); +#endif // QT_NO_STATUSBAR } /** @@ -1274,22 +1309,20 @@ void MainInterface::showCryptedLabel( bool b_show ) { +#ifndef QT_NO_STATUSBAR if( cryptedLabel == NULL ) { cryptedLabel = new QLabel; // The lock icon is not the right one for DRM protection/scrambled. //cryptedLabel->setPixmap( QPixmap( ":/lock.svg" ) ); cryptedLabel->setText( "DRM" ); +#ifndef QT_NO_STATUSBAR statusBar()->addWidget( cryptedLabel ); +#endif } cryptedLabel->setVisible( b_show ); -} - -void MainInterface::showBuffering( float f_cache ) -{ - QString amount = QString("Buffering: %1%").arg( (int)(100*f_cache) ); - statusBar()->showMessage( amount, 1000 ); +#endif } /***************************************************************************** diff -Nru vlc-3.0.21/modules/gui/qt/main_interface.hpp vlc-3.0.22/modules/gui/qt/main_interface.hpp --- vlc-3.0.21/modules/gui/qt/main_interface.hpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/main_interface.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -237,8 +237,6 @@ void handleKeyPress( QKeyEvent * ); - void showBuffering( float ); - void resizeStack( int w, int h ) { if( !isFullScreen() && !isMaximized() && !b_isWindowTiled ) diff -Nru vlc-3.0.21/modules/gui/qt/main_interface_win32.cpp vlc-3.0.22/modules/gui/qt/main_interface_win32.cpp --- vlc-3.0.21/modules/gui/qt/main_interface_win32.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/main_interface_win32.cpp 2025-11-24 23:00:36.000000000 +0000 @@ -35,7 +35,7 @@ #include -#include +#include #include #include @@ -91,6 +91,7 @@ taskbar_wmsg = RegisterWindowMessage(TEXT("TaskbarButtonCreated")); if (taskbar_wmsg == 0) msg_Warn( p_intf, "Failed to register TaskbarButtonCreated message" ); + qApp->installNativeEventFilter(this); } MainInterfaceWin32::~MainInterfaceWin32() @@ -215,13 +216,14 @@ changeThumbbarButtons( THEMIM->getIM()->playingStatus() ); } -bool MainInterfaceWin32::nativeEvent(const QByteArray &, void *message, long *result) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool MainInterfaceWin32::nativeEventFilter(const QByteArray &, void *message, qintptr *result) +#else +bool MainInterfaceWin32::nativeEventFilter(const QByteArray &, void *message, long *result) +#endif { - return winEvent( static_cast( message ), result ); -} + MSG * msg = static_cast( message ); -bool MainInterfaceWin32::winEvent ( MSG * msg, long * result ) -{ if (msg->message == taskbar_wmsg) { //We received the taskbarbuttoncreated, now we can really create the buttons @@ -246,6 +248,7 @@ THEMIM->next(); break; } + return true; } break; case WM_APPCOMMAND: diff -Nru vlc-3.0.21/modules/gui/qt/main_interface_win32.hpp vlc-3.0.22/modules/gui/qt/main_interface_win32.hpp --- vlc-3.0.21/modules/gui/qt/main_interface_win32.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/main_interface_win32.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -27,7 +27,9 @@ #include "main_interface.hpp" -class MainInterfaceWin32 : public MainInterface +#include + +class MainInterfaceWin32 : public MainInterface, public QAbstractNativeEventFilter { Q_OBJECT @@ -36,8 +38,11 @@ virtual ~MainInterfaceWin32(); private: - virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; - virtual bool winEvent( MSG *, long * ); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; +#endif virtual void toggleUpdateSystrayMenuWhenVisible() Q_DECL_OVERRIDE; protected: diff -Nru vlc-3.0.21/modules/gui/qt/menus.cpp vlc-3.0.22/modules/gui/qt/menus.cpp --- vlc-3.0.21/modules/gui/qt/menus.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/menus.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -54,7 +54,10 @@ #include #include #include -#include + +#ifndef QT_NO_STATUSBAR +# include +#endif /* This file defines the main menus and the pop-up menu (right-click menu) @@ -531,10 +534,12 @@ action->setChecked( true ); action->setEnabled(mi->isAdvancedWidgetAvailable()); +#ifndef QT_NO_STATUSBAR action = menu->addAction( qtr( "Status Bar" ) ); action->setCheckable( true ); action->setChecked( mi->statusBar()->isVisible() ); CONNECT( action, triggered( bool ), mi, setStatusBarVisibility( bool) ); +#endif #if 0 /* For Visualisations. Not yet working */ adv = menu->addAction( qtr( "Visualizations selector" ), mi, SLOT( visual() ) ); @@ -846,20 +851,20 @@ action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ), ":/toolbar/previous_b.svg", SLOT( prev() ), true ); action->setEnabled( !bPlaylistEmpty ); - action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD ); + action->setData( static_cast(ACTION_NO_CLEANUP | ACTION_DELETE_ON_REBUILD) ); CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) ); action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ), ":/toolbar/next_b.svg", SLOT( next() ), true ); action->setEnabled( !bPlaylistEmpty ); - action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD ); + action->setData( static_cast(ACTION_NO_CLEANUP | ACTION_DELETE_ON_REBUILD) ); CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) ); action = menu->addAction( qtr( "Record" ), THEAM, SLOT( record() ) ); action->setIcon( QIcon( ":/toolbar/record.svg" ) ); if( !p_input ) action->setEnabled( false ); - action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD ); + action->setData( static_cast(ACTION_NO_CLEANUP | ACTION_DELETE_ON_REBUILD) ); menu->addSeparator(); } @@ -1438,7 +1443,7 @@ case VLC_VAR_FLOAT: var_Get( p_object, psz_var, &val ); if( CURTEXT ) menutext = qfue( CURTEXT ); - else menutext.sprintf( "%.2f", CURVAL.f_float ); + else menutext.setNum(CURVAL.f_float, 'f', 2); CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND, p_object, CURVAL, i_type, CURVAL.f_float == val.f_float ); @@ -1559,7 +1564,7 @@ for( int i = 0; i < i_result; i++ ) { action = new QAction( qfue( names[i] ), actionGroup ); - action->setData( ids[i] ); + action->setData( qfu(ids[i]) ); action->setCheckable( true ); if( (selected && !strcmp( ids[i], selected ) ) || (selected == NULL && ids[i] && ids[i][0] == '\0' ) ) diff -Nru vlc-3.0.21/modules/gui/qt/qt.cpp vlc-3.0.22/modules/gui/qt/qt.cpp --- vlc-3.0.21/modules/gui/qt/qt.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/qt.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -121,6 +121,9 @@ #define ERROR_TEXT N_( "Show unimportant error and warnings dialogs" ) +#define QT_DARK_TEXT N_( "Enable Dark Mode" ) +#define QT_DARK_LONGTEXT N_( "Applies a dark theme to the style." ) + #define UPDATER_TEXT N_( "Activate the updates availability notification" ) #define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \ "versions of the software. It runs once every " \ @@ -256,6 +259,8 @@ RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false ) add_integer( "qt-continue", 1, CONTINUE_PLAYBACK_TEXT, CONTINUE_PLAYBACK_TEXT, false ) change_integer_list(i_continue_list, psz_continue_list_text ) + add_bool( "qt-dark-palette", false, QT_DARK_TEXT, + QT_DARK_LONGTEXT, false ) #ifdef UPDATE_CHECK add_bool( "qt-updates-notif", true, UPDATER_TEXT, @@ -403,6 +408,57 @@ } #endif +bool isDarkPaletteEnabled(intf_thread_t *p_intf) { + static const bool darkPalette = var_InheritBool( p_intf, "qt-dark-palette" ); + return darkPalette; +} + +void applyDarkPalette() { + QPalette darkPalette; + QColor darkColor("#2d2d2d"); + QColor gray("#808080"); + QColor lightGray("#aaaaaa"); + QColor baseColor("#191919"); + + // Active group (the currently focused window) + darkPalette.setColor(QPalette::Active, QPalette::Window, darkColor); + darkPalette.setColor(QPalette::Active, QPalette::WindowText, Qt::white); + darkPalette.setColor(QPalette::Active, QPalette::Base, baseColor); + darkPalette.setColor(QPalette::Active, QPalette::AlternateBase, darkColor); + darkPalette.setColor(QPalette::Active, QPalette::Button, darkColor); + darkPalette.setColor(QPalette::Active, QPalette::ButtonText, Qt::white); + darkPalette.setColor(QPalette::Active, QPalette::Text, Qt::white); + darkPalette.setColor(QPalette::Active, QPalette::Highlight, QColor("#2A82DA")); + darkPalette.setColor(QPalette::Active, QPalette::HighlightedText, Qt::white); + darkPalette.setColor(QPalette::Active, QPalette::Link, QColor("#FFA851")); + + // Inactive group (unfocused window) + darkPalette.setColor(QPalette::Inactive, QPalette::Window, darkColor); + darkPalette.setColor(QPalette::Inactive, QPalette::WindowText, lightGray); + darkPalette.setColor(QPalette::Inactive, QPalette::Base, baseColor); + darkPalette.setColor(QPalette::Inactive, QPalette::AlternateBase, darkColor); + darkPalette.setColor(QPalette::Inactive, QPalette::Button, darkColor); + darkPalette.setColor(QPalette::Inactive, QPalette::ButtonText, lightGray); + darkPalette.setColor(QPalette::Inactive, QPalette::Text, lightGray); + darkPalette.setColor(QPalette::Inactive, QPalette::Highlight, QColor("#2A82DA")); + darkPalette.setColor(QPalette::Inactive, QPalette::HighlightedText, lightGray); + + // Disabled group (grayed-out widgets) + darkPalette.setColor(QPalette::Disabled, QPalette::Window, darkColor); + darkPalette.setColor(QPalette::Disabled, QPalette::WindowText, lightGray); + darkPalette.setColor(QPalette::Disabled, QPalette::Base, baseColor); + darkPalette.setColor(QPalette::Disabled, QPalette::AlternateBase, darkColor); + darkPalette.setColor(QPalette::Disabled, QPalette::Button, lightGray.darker()); + darkPalette.setColor(QPalette::Disabled, QPalette::ButtonText, gray); + darkPalette.setColor(QPalette::Disabled, QPalette::Text, gray); + darkPalette.setColor(QPalette::Disabled, QPalette::Highlight, gray); + darkPalette.setColor(QPalette::Disabled, QPalette::HighlightedText, gray); + darkPalette.setColor(QPalette::Disabled, QPalette::Light, darkColor); + + // Apply the dark palette globally + QApplication::setPalette(darkPalette); +} + /* Open Interface */ static int Open( vlc_object_t *p_this, bool isDialogProvider ) { @@ -528,6 +584,9 @@ QApplication::setAttribute( Qt::AA_EnableHighDpiScaling ); QApplication::setAttribute( Qt::AA_UseHighDpiPixmaps ); #endif +#if HAS_QT57 + QApplication::setAttribute( Qt::AA_UseStyleSheetPropagationInWidgetStyles, true); +#endif /* Start the QApplication here */ QVLCApp app( argc, argv ); @@ -637,9 +696,13 @@ /* Loads and tries to apply the preferred QStyle */ QString s_style = getSettings()->value( "MainWindow/QtStyle", "" ).toString(); - if( s_style.compare("") != 0 ) + if (!s_style.isEmpty()) QApplication::setStyle( s_style ); + // Apply dark palette only if dark palette is enabled + if (isDarkPaletteEnabled(p_intf)) + applyDarkPalette(); + /* Launch */ app.exec(); diff -Nru vlc-3.0.21/modules/gui/qt/qt.hpp vlc-3.0.22/modules/gui/qt/qt.hpp --- vlc-3.0.21/modules/gui/qt/qt.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/qt.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -48,6 +48,7 @@ #endif #define HAS_QT56 ( QT_VERSION >= 0x050600 ) +#define HAS_QT57 ( QT_VERSION >= 0x050700 ) #define HAS_QT510 ( QT_VERSION >= 0x051000 ) enum { @@ -63,6 +64,9 @@ NOTIFICATION_ALWAYS = 2, }; +bool isDarkPaletteEnabled(intf_thread_t *); +void applyDarkPalette(); + struct intf_sys_t { vlc_thread_t thread; diff -Nru vlc-3.0.21/modules/gui/qt/recents.cpp vlc-3.0.22/modules/gui/qt/recents.cpp --- vlc-3.0.21/modules/gui/qt/recents.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/recents.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,7 +29,7 @@ #include "util/qt_dirs.hpp" #include -#include +#include #include #ifdef _WIN32 @@ -65,7 +65,7 @@ /* Load the filter psz */ char* psz_tmp = var_InheritString( p_intf, "qt-recentplay-filter" ); if( psz_tmp && *psz_tmp ) - filter = new QRegExp( psz_tmp, Qt::CaseInsensitive ); + filter = new QRegularExpression( psz_tmp, QRegularExpression::CaseInsensitiveOption ); else filter = NULL; free( psz_tmp ); @@ -83,7 +83,7 @@ void RecentsMRL::addRecent( const QString &mrl ) { - if ( !isActive || ( filter && filter->indexIn( mrl ) >= 0 ) ) + if ( !isActive || ( filter && filter->match( mrl ).hasMatch() ) ) return; #ifdef _WIN32 @@ -143,7 +143,7 @@ /* And filter the regexp on the list */ for( int i = 0; i < list.count(); ++i ) { - if ( !filter || filter->indexIn( list.at(i) ) == -1 ) { + if ( !filter || !filter->match( list.at(i) ).hasMatch() ) { recents.append( list.at(i) ); times.append( list2.value(i, "-1" ) ); } diff -Nru vlc-3.0.21/modules/gui/qt/recents.hpp vlc-3.0.22/modules/gui/qt/recents.hpp --- vlc-3.0.21/modules/gui/qt/recents.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/recents.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -class QRegExp; +class QRegularExpression; class QSignalMapper; #define RECENTS_LIST_SIZE 30 @@ -72,7 +72,7 @@ QStringList recents; QStringList times; - QRegExp *filter; + QRegularExpression *filter; bool isActive; void load(); diff -Nru vlc-3.0.21/modules/gui/qt/ui/about.ui vlc-3.0.22/modules/gui/qt/ui/about.ui --- vlc-3.0.21/modules/gui/qt/ui/about.ui 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/ui/about.ui 2025-11-13 22:17:54.000000000 +0000 @@ -65,10 +65,6 @@ 0 - - background-color: rgb(245, 245, 245); -color:rgb(0,0,0); - @@ -288,9 +284,6 @@ 60 - - background-color: rgb(230, 230, 230);color:rgb(0,0,0); - 0 diff -Nru vlc-3.0.21/modules/gui/qt/ui/open.ui vlc-3.0.22/modules/gui/qt/ui/open.ui --- vlc-3.0.21/modules/gui/qt/ui/open.ui 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/ui/open.ui 2025-11-13 22:17:54.000000000 +0000 @@ -249,9 +249,6 @@ HH'H':mm'm':ss's'.zzz - - Qt::LocalTime - @@ -268,9 +265,6 @@ HH'H':mm'm':ss's'.zzz - - Qt::LocalTime - diff -Nru vlc-3.0.21/modules/gui/qt/ui/podcast_configuration.ui vlc-3.0.22/modules/gui/qt/ui/podcast_configuration.ui --- vlc-3.0.21/modules/gui/qt/ui/podcast_configuration.ui 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/ui/podcast_configuration.ui 2025-11-13 22:17:54.000000000 +0000 @@ -1,6 +1,6 @@ PodcastConfiguration - + 0 diff -Nru vlc-3.0.21/modules/gui/qt/ui/sprefs_audio.ui vlc-3.0.22/modules/gui/qt/ui/sprefs_audio.ui --- vlc-3.0.21/modules/gui/qt/ui/sprefs_audio.ui 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/ui/sprefs_audio.ui 2025-11-13 22:17:54.000000000 +0000 @@ -264,7 +264,7 @@ HDMI/SPDIF audio passthrough - mmdevicePassthrough + mmdevicePassthroughBox diff -Nru vlc-3.0.21/modules/gui/qt/ui/sprefs_interface.ui vlc-3.0.22/modules/gui/qt/ui/sprefs_interface.ui --- vlc-3.0.21/modules/gui/qt/ui/sprefs_interface.ui 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/ui/sprefs_interface.ui 2025-11-13 22:17:54.000000000 +0000 @@ -284,6 +284,13 @@ + + + + Use a dark palette + + + diff -Nru vlc-3.0.21/modules/gui/qt/util/animators.cpp vlc-3.0.22/modules/gui/qt/util/animators.cpp --- vlc-3.0.21/modules/gui/qt/util/animators.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/animators.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -22,10 +22,10 @@ #include "qt.hpp" #include "util/imagehelper.hpp" -#include -#include #include +class QWidget; + BasicAnimator::BasicAnimator( QObject *parent ) : QAbstractAnimation( parent ), current_frame( 0 ) { diff -Nru vlc-3.0.21/modules/gui/qt/util/animators.hpp vlc-3.0.22/modules/gui/qt/util/animators.hpp --- vlc-3.0.21/modules/gui/qt/util/animators.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/animators.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -31,7 +31,6 @@ #include class QWidget; -class QPixmap; class QAbstractItemView; class BasicAnimator : public QAbstractAnimation diff -Nru vlc-3.0.21/modules/gui/qt/util/customwidgets.cpp vlc-3.0.22/modules/gui/qt/util/customwidgets.cpp --- vlc-3.0.21/modules/gui/qt/util/customwidgets.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/customwidgets.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,14 +29,12 @@ #endif #include "customwidgets.hpp" -#include "qt.hpp" /* needed for qtr, but not necessary */ #include // for wheel deadzone calculation #include #include #include #include -#include #include #include @@ -111,7 +109,7 @@ /*************************************************************************** * Hotkeys converters ***************************************************************************/ -int qtKeyModifiersToVLC( QInputEvent* e ) +int qtKeyModifiersToVLC( const QInputEvent* e ) { int i_keyModifiers = 0; if( e->modifiers() & Qt::ShiftModifier ) i_keyModifiers |= KEY_MODIFIER_SHIFT; @@ -267,7 +265,7 @@ return *q - m->qt; } -int qtEventToVLCKey( QKeyEvent *e ) +int qtEventToVLCKey( const QKeyEvent *e ) { int qtk = e->key(); uint32_t i_vlck = 0; @@ -296,7 +294,7 @@ return i_vlck; } -int qtWheelEventToVLCKey( QWheelEvent *e ) +int qtWheelEventToVLCKey( const QWheelEvent *e ) { const qreal v_cos_deadzone = 0.45; // ~63 degrees const qreal h_cos_deadzone = 0.95; // ~15 degrees @@ -419,7 +417,8 @@ YesNoCheckBox::YesNoCheckBox( QWidget *parent ) : QCheckBox( parent ) { setEnabled( false ); - setStyleSheet("\ + auto updateStyle = [this]() { + setStyleSheet("\ QCheckBox::indicator:unchecked:hover,\ QCheckBox::indicator:unchecked {\ image: url(:/toolbar/clear.svg);\ @@ -429,4 +428,105 @@ image: url(:/valid.svg);\ }\ "); + }; + updateStyle(); +//same as Qt::AA_UseStyleSheetPropagationInWidgetStyles +#if !HAS_QT57 + connect(qApp, &QApplication::paletteChanged, this, [this, updateStyle](){ + updateStyle(); + }); +#endif +} + +Qt::Orientations WheelToVLCConverter::getWheelOrientation(int x, int y) +{ + const qreal v_cos_deadzone = 0.45; // ~63 degrees + const qreal h_cos_deadzone = 0.95; // ~15 degrees + + if (x == 0 && y == 0) + return Qt::Orientations{}; + + qreal cos = qFabs(x)/qSqrt(x*x + y*y); + if (cos < v_cos_deadzone) + return Qt::Vertical; + else if (cos > h_cos_deadzone) + return Qt::Horizontal; + return Qt::Orientations{}; +} + +void WheelToVLCConverter::wheelEvent( const QWheelEvent* e ) +{ + if (!e) + return; + + const int deltaPerStep = QWheelEvent::DefaultDeltasPerStep; + + if (e->modifiers() != m_modifiers) + { + m_scrollAmount = {}; + m_modifiers = e->modifiers(); + } + if (e->buttons() != m_buttons) + { + m_scrollAmount = {}; + m_buttons = e->buttons(); + } + + QPoint p = e->angleDelta(); +#if HAS_QT57 + if (e->inverted()) + { + const Qt::Orientations preliminaryOrientation = getWheelOrientation(p.x(), p.y()); + if (preliminaryOrientation == Qt::Vertical) + p.setY(-p.y()); + else if (preliminaryOrientation == Qt::Horizontal) + p.setX(-p.x()); + } +#endif + p += m_scrollAmount; + + if (p.isNull()) + return; + + int i_vlck = qtKeyModifiersToVLC(e); // Handle modifiers + Qt::Orientations orientation = getWheelOrientation(p.x(), p.y()); + if (orientation == Qt::Vertical && qAbs(p.y()) >= deltaPerStep) + { + if (p.y() > 0) + i_vlck |= KEY_MOUSEWHEELUP; + else + i_vlck |= KEY_MOUSEWHEELDOWN; + + const int steps = p.y() / deltaPerStep; + + emit wheelUpDown(steps, e->modifiers()); + //in practice this will emit once + for (int i = 0; i < qAbs(steps); i++) + emit vlcWheelKey(i_vlck); + + m_scrollAmount.setX(0); + m_scrollAmount.setY(p.y() % deltaPerStep); + + } + else if (orientation == Qt::Horizontal && qAbs(p.x()) >= deltaPerStep) + { + if (p.x() > 0) + i_vlck |= KEY_MOUSEWHEELLEFT; + else + i_vlck |= KEY_MOUSEWHEELRIGHT; + + const int steps = p.x() / deltaPerStep; + + emit wheelLeftRight(steps, e->modifiers()); + //in practice this will emit once + for (int i = 0; i < qAbs(steps); i++) + emit vlcWheelKey(i_vlck); + + m_scrollAmount.setY(0); + m_scrollAmount.setX(p.x() % deltaPerStep); + } + else + { + m_scrollAmount = p; + } } diff -Nru vlc-3.0.21/modules/gui/qt/util/customwidgets.hpp vlc-3.0.22/modules/gui/qt/util/customwidgets.hpp --- vlc-3.0.21/modules/gui/qt/util/customwidgets.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/customwidgets.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -27,13 +27,11 @@ #ifndef VLC_QT_CUSTOMWIDGETS_HPP_ #define VLC_QT_CUSTOMWIDGETS_HPP_ -#include #include #include #include #include #include -#include #include #include @@ -146,9 +144,53 @@ class QWheelEvent; class QInputEvent; -int qtKeyModifiersToVLC( QInputEvent* e ); -int qtEventToVLCKey( QKeyEvent *e ); -int qtWheelEventToVLCKey( QWheelEvent *e ); +int qtKeyModifiersToVLC( const QInputEvent* e ); +int qtEventToVLCKey( const QKeyEvent *e ); +int qtWheelEventToVLCKey( const QWheelEvent *e ); QString VLCKeyToString( unsigned val, bool ); +/** + * @brief The WheelToVLCConverter class aggregates wheel events and + * emit a signal once it gathers a full scroll step, as VLC doesn't handle + * fractionnal scroll events + */ +class WheelToVLCConverter : public QObject +{ + Q_OBJECT + +public: + using QObject::QObject; + +public: + Qt::Orientations getWheelOrientation(int x, int y); + +signals: + /** + * @param vlcKey the VLC hotkey representation + */ + void vlcWheelKey(int vlcKey); + /** + * @param steps: positive value indicated UP wheel events, negative DOWN wheel event + * @param modifiers are keyboard pressed modifiers + */ + void wheelUpDown(int steps, Qt::KeyboardModifiers modifiers); + /** + * @param steps: positive value indicated UP wheel events, negative DOWN wheel event + * @param modifiers are keyboard pressed modifiers + */ + void wheelLeftRight(int steps, Qt::KeyboardModifiers modifiers); + +public slots: + /** + * @brief qmlWheelEvent handles wheel events as emitted by QWidget + * @param e the wheel event + */ + void wheelEvent(const QWheelEvent* e); + +private: + QPoint m_scrollAmount = {}; + Qt::KeyboardModifiers m_modifiers = {}; + Qt::MouseButtons m_buttons = {}; +}; + #endif diff -Nru vlc-3.0.21/modules/gui/qt/util/input_slider.cpp vlc-3.0.22/modules/gui/qt/util/input_slider.cpp --- vlc-3.0.21/modules/gui/qt/util/input_slider.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/input_slider.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -34,6 +34,8 @@ #include "adapters/seekpoints.hpp" #include "input_manager.hpp" #include "imagehelper.hpp" +#include "customwidgets.hpp" +#include #include #include @@ -169,6 +171,31 @@ CONNECT( hideHandleTimer, timeout(), this, hideHandle() ); CONNECT( startAnimLoadingTimer, timeout(), this, startAnimLoading() ); mTimeTooltip->installEventFilter( this ); + + connect(&wheelEventConverter, &WheelToVLCConverter::vlcWheelKey, this, [this](int vlcButton){ + vlc_tick_t i_size = var_InheritInteger( this->p_intf->obj.libvlc, "short-jump-size" ); + int i_mode = var_InheritInteger( this->p_intf->obj.libvlc, "hotkeys-x-wheel-mode" ); + + //ignore modifiers + switch (vlcButton & 0x00FF0000) { + case KEY_MOUSEWHEELDOWN: + case KEY_MOUSEWHEELLEFT: + if (i_mode != 3) + i_size = - i_size; + break; + case KEY_MOUSEWHEELUP: + case KEY_MOUSEWHEELRIGHT: + if (i_mode == 3) + i_size = - i_size; + break; + default: + break; + } + + float posOffset = static_cast( i_size ) / static_cast( inputLength ); + setValue( value() + posOffset * maximum() ); + emit sliderDragged( value() / static_cast( maximum() ) ); + }); } SeekSlider::~SeekSlider() @@ -281,7 +308,7 @@ void SeekSlider::mouseReleaseEvent( QMouseEvent *event ) { - if ( event->button() != Qt::LeftButton && event->button() != Qt::MidButton ) + if ( event->button() != Qt::LeftButton && event->button() != Qt::MiddleButton ) { QSlider::mouseReleaseEvent( event ); return; @@ -294,7 +321,7 @@ { /* Right-click */ if ( !isEnabled() || - ( event->button() != Qt::LeftButton && event->button() != Qt::MidButton ) + ( event->button() != Qt::LeftButton && event->button() != Qt::MiddleButton ) ) { QSlider::mousePressEvent( event ); @@ -348,7 +375,7 @@ void SeekSlider::mouseMoveEvent( QMouseEvent *event ) { - if ( ! ( event->buttons() & ( Qt::LeftButton | Qt::MidButton ) ) ) + if ( ! ( event->buttons() & ( Qt::LeftButton | Qt::MiddleButton ) ) ) { /* Handle button release when mouserelease has been hijacked by popup */ processReleasedButton(); @@ -386,7 +413,12 @@ } } - QPoint target( event->globalX() - ( event->x() - posX ), +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + const auto pos = event->globalPosition(); +#else + const auto pos = event->globalPos(); +#endif + QPoint target( pos.x() - ( event->x() - posX ), QWidget::mapToGlobal( QPoint( 0, 0 ) ).y() ); if( likely( size().width() > handleLength() ) ) { secstotimestr( psz_length, getValuePercentageFromXPos( event->x() ) * inputLength ); @@ -400,19 +432,15 @@ { /* Don't do anything if we are for somehow reason sliding */ if( !isSliding && isEnabled() ) - { - vlc_tick_t i_size = var_InheritInteger( p_intf->obj.libvlc, "short-jump-size" ); - int i_mode = var_InheritInteger( p_intf->obj.libvlc, "hotkeys-x-wheel-mode" ); - if ( ( event->delta() < 0 && i_mode != 3 ) || ( event->delta() > 0 && i_mode == 3 ) ) - i_size = - i_size; - float posOffset = static_cast( i_size ) / static_cast( inputLength ); - setValue( value() + posOffset * maximum() ); - emit sliderDragged( value() / static_cast( maximum() ) ); - } + wheelEventConverter.wheelEvent(event); event->accept(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +void SeekSlider::enterEvent( QEnterEvent * ) +#else void SeekSlider::enterEvent( QEvent * ) +#endif { /* Cancel the fade-out timer */ hideHandleTimer->stop(); @@ -670,15 +698,33 @@ pixGradient.setMask( mask ); pixGradient2.setMask( mask ); + + connect(&wheelEventConverter, &WheelToVLCConverter::vlcWheelKey, this, [this](int vlcButton){ + int newvalue = 0; + //ignore modifiers + switch (vlcButton & 0x00FF0000) { + case KEY_MOUSEWHEELDOWN: + case KEY_MOUSEWHEELLEFT: + newvalue = value() - f_step; + break; + case KEY_MOUSEWHEELUP: + case KEY_MOUSEWHEELRIGHT: + newvalue = value() + f_step; + break; + default: + return; + } + + setValue( __MIN( __MAX( minimum(), newvalue ), maximum() ) ); + emit sliderMoved( value() ); + }); } void SoundSlider::wheelEvent( QWheelEvent *event ) { - int newvalue = value() + event->delta() / ( 8 * 15 ) * f_step; - setValue( __MIN( __MAX( minimum(), newvalue ), maximum() ) ); - + wheelEventConverter.wheelEvent(event); + event->accept(); emit sliderReleased(); - emit sliderMoved( value() ); } void SoundSlider::mousePressEvent( QMouseEvent *event ) diff -Nru vlc-3.0.21/modules/gui/qt/util/input_slider.hpp vlc-3.0.22/modules/gui/qt/util/input_slider.hpp --- vlc-3.0.21/modules/gui/qt/util/input_slider.hpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/input_slider.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -31,6 +31,7 @@ #endif #include "styles/seekstyle.hpp" +#include "customwidgets.hpp" #include #include @@ -65,7 +66,11 @@ void mousePressEvent( QMouseEvent* event ) Q_DECL_OVERRIDE; void mouseReleaseEvent( QMouseEvent *event ) Q_DECL_OVERRIDE; void wheelEvent( QWheelEvent *event ) Q_DECL_OVERRIDE; - void enterEvent( QEvent * ) Q_DECL_OVERRIDE; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + void enterEvent( QEnterEvent *event ) Q_DECL_OVERRIDE; +#else + void enterEvent( QEvent *event ) Q_DECL_OVERRIDE; +#endif void leaveEvent( QEvent * ) Q_DECL_OVERRIDE; void hideEvent( QHideEvent * ) Q_DECL_OVERRIDE; void paintEvent(QPaintEvent *ev) Q_DECL_OVERRIDE; @@ -117,6 +122,8 @@ QTimer *hideHandleTimer; QTimer *startAnimLoadingTimer; + WheelToVLCConverter wheelEventConverter; + public slots: void setPosition( float, int64_t, int ); void setSeekable( bool b ) { b_seekable = b ; } @@ -171,6 +178,8 @@ QFont textfont; QRect textrect; + WheelToVLCConverter wheelEventConverter; + void changeValue( int x ); /* Function to modify the value from pixel x() */ }; diff -Nru vlc-3.0.21/modules/gui/qt/util/pictureflow.cpp vlc-3.0.22/modules/gui/qt/util/pictureflow.cpp --- vlc-3.0.21/modules/gui/qt/util/pictureflow.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/pictureflow.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -34,6 +34,7 @@ #include #include #include +#include // for wheel deadzone calculation #include #include #include @@ -861,15 +862,32 @@ QWidget::resizeEvent(event); } +static Qt::Orientations getWheelOrientation(int x, int y) +{ + const qreal v_cos_deadzone = 0.45; // ~63 degrees + const qreal h_cos_deadzone = 0.95; // ~15 degrees + + if (x == 0 && y == 0) + return Qt::Orientations{}; + + qreal cos = qFabs(x)/qSqrt(x*x + y*y); + if (cos < v_cos_deadzone) + return Qt::Vertical; + if (cos > h_cos_deadzone) + return Qt::Horizontal; + return Qt::Orientations{}; +} + void PictureFlow::wheelEvent(QWheelEvent * event) { - if (event->orientation() == Qt::Horizontal) + QPoint p = event->angleDelta(); + if (getWheelOrientation(p.x(), p.y()) == Qt::Horizontal) { event->ignore(); } else { - int numSteps = -((event->delta() / 8) / 15); + int numSteps = -(p.y() / QWheelEvent::DefaultDeltasPerStep); if (numSteps > 0) { diff -Nru vlc-3.0.21/modules/gui/qt/util/qvlcapp.hpp vlc-3.0.22/modules/gui/qt/util/qvlcapp.hpp --- vlc-3.0.21/modules/gui/qt/util/qvlcapp.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/qvlcapp.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -26,7 +26,6 @@ #define VLC_QT_QVLCAPP_HPP_ #include -#include #if defined(Q_OS_WIN) # include "qt.hpp" diff -Nru vlc-3.0.21/modules/gui/qt/util/qvlcframe.hpp vlc-3.0.22/modules/gui/qt/util/qvlcframe.hpp --- vlc-3.0.21/modules/gui/qt/util/qvlcframe.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/qvlcframe.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -26,16 +26,56 @@ #include #include -#include #include #include #include -#include +#include #include #include #include "qt.hpp" +#ifdef _WIN32 + #include + #include + + inline bool setImmersiveDarkModeAttribute(HWND hwnd, bool enable) { + typedef HRESULT(WINAPI *DwmSetWindowAttributeFunc)(HWND, DWORD, LPCVOID, DWORD); + static const auto dwmSetWindowAttributeFunc = []() -> DwmSetWindowAttributeFunc { + HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32.dll")); + if (GetProcAddress(hKernel32, "GetSystemCpuSetInformation") == NULL) + return nullptr; + + QLibrary dwmapidll("dwmapi"); + return reinterpret_cast(dwmapidll.resolve("DwmSetWindowAttribute")); + }(); + + if (!dwmSetWindowAttributeFunc || !hwnd) + return false; + + const BOOL pvAttribute = enable ? TRUE : FALSE; + + enum Attribute : DWORD { + DWMWA_USE_IMMERSIVE_DARK_MODE = 20, + DWMWA_USE_DARK_MODE_UNDOCUMENTED = 19 + }; + + return SUCCEEDED(dwmSetWindowAttributeFunc(hwnd, Attribute::DWMWA_USE_IMMERSIVE_DARK_MODE, &pvAttribute, sizeof(pvAttribute))) + || SUCCEEDED(dwmSetWindowAttributeFunc(hwnd, Attribute::DWMWA_USE_DARK_MODE_UNDOCUMENTED, &pvAttribute, sizeof(pvAttribute))); + } + + // Overloaded function to apply dark mode to QWidget* + inline bool setImmersiveDarkModeAttribute(QWidget *widget) { + if (widget->isWindow()) { + widget->ensurePolished(); + HWND hwnd = (HWND)widget->winId(); // Get native window handle + return setImmersiveDarkModeAttribute(hwnd,true); // Call the HWND version + } + return false; + } + +#endif + class QVLCTools { public: @@ -75,7 +115,7 @@ widget->resize(defSize); if(defPos.x() == 0 && defPos.y()==0) - widget->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, widget->size(), qApp->desktop()->availableGeometry())); + widget->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, widget->size(), QGuiApplication::primaryScreen()->availableGeometry())); return true; } return false; @@ -102,7 +142,12 @@ { public: QVLCFrame( intf_thread_t *_p_intf ) : QWidget( NULL ), p_intf( _p_intf ) - {}; + { +#ifdef Q_OS_WIN + if (isDarkPaletteEnabled(p_intf)) + setImmersiveDarkModeAttribute(this); +#endif + }; virtual ~QVLCFrame() {}; void toggleVisible() @@ -155,6 +200,10 @@ { setWindowFlags( Qt::Dialog|Qt::WindowMinMaxButtonsHint| Qt::WindowSystemMenuHint|Qt::WindowCloseButtonHint ); +#ifdef Q_OS_WIN + if (isDarkPaletteEnabled(p_intf)) + setImmersiveDarkModeAttribute(this); +#endif } virtual ~QVLCDialog() {}; void toggleVisible() @@ -191,7 +240,13 @@ class QVLCMW : public QMainWindow { public: - QVLCMW( intf_thread_t *_p_intf ) : QMainWindow( NULL ), p_intf( _p_intf ){} + QVLCMW( intf_thread_t *_p_intf ) : QMainWindow( NULL ), p_intf( _p_intf ) + { +#ifdef Q_OS_WIN + if (isDarkPaletteEnabled(p_intf)) + setImmersiveDarkModeAttribute(this); +#endif + } void toggleVisible() { if( isVisible() ) hide(); diff -Nru vlc-3.0.21/modules/gui/qt/util/searchlineedit.cpp vlc-3.0.22/modules/gui/qt/util/searchlineedit.cpp --- vlc-3.0.21/modules/gui/qt/util/searchlineedit.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/searchlineedit.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -51,16 +52,24 @@ CONNECT( clearButton, clicked(), this, clear() ); - int frameWidth = style()->pixelMetric( QStyle::PM_DefaultFrameWidth, 0, this ); - - QFontMetrics metrics( font() ); - QString styleSheet = QString( "min-height: %1px; " - "padding-top: 1px; " - "padding-bottom: 1px; " - "padding-right: %2px;" ) - .arg( metrics.height() + ( 2 * frameWidth ) ) - .arg( clearButton->sizeHint().width() + 6 ); - setStyleSheet( styleSheet ); + auto updateStyle = [=]() { + int frameWidth = style()->pixelMetric( QStyle::PM_DefaultFrameWidth, 0, this ); + QFontMetrics metrics( font() ); + QString styleSheet = QString( "min-height: %1px; " + "padding-top: 1px; " + "padding-bottom: 1px; " + "padding-right: %2px;" ) + .arg( metrics.height() + ( 2 * frameWidth ) ) + .arg( clearButton->sizeHint().width() + 6 ); + setStyleSheet( styleSheet ); + }; + updateStyle(); +//same as Qt::AA_UseStyleSheetPropagationInWidgetStyles +#if !HAS_QT57 + connect(qApp, &QApplication::paletteChanged, this, [this, updateStyle](){ + updateStyle(); + }); +#endif setMessageVisible( true ); diff -Nru vlc-3.0.21/modules/gui/qt/util/timetooltip.cpp vlc-3.0.22/modules/gui/qt/util/timetooltip.cpp --- vlc-3.0.21/modules/gui/qt/util/timetooltip.cpp 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/timetooltip.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -25,7 +25,11 @@ #include #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) #include +#else +#include +#endif #define TIP_HEIGHT 5 @@ -76,7 +80,14 @@ #endif // Keep the tooltip on the same screen if possible +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QRect screen{}; + auto *screenAt = QGuiApplication::screenAt( mTarget ); + if (screenAt != nullptr) + screen = screenAt->geometry(); +#else QRect screen = QApplication::desktop()->screenGeometry( mTarget ); +#endif position.setX( qMax( screen.left(), qMin( position.x(), screen.left() + screen.width() - size.width() ) ) ); position.setY( qMax( screen.top(), qMin( position.y(), @@ -142,7 +153,7 @@ void TimeTooltip::paintEvent( QPaintEvent * ) { QPainter p( this ); - p.setRenderHints( QPainter::HighQualityAntialiasing | QPainter::TextAntialiasing ); + p.setRenderHints( QPainter::TextAntialiasing ); p.setPen( Qt::black ); p.setBrush( qApp->palette().base() ); diff -Nru vlc-3.0.21/modules/gui/qt/util/validators.hpp vlc-3.0.22/modules/gui/qt/util/validators.hpp --- vlc-3.0.21/modules/gui/qt/util/validators.hpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/qt/util/validators.hpp 2025-11-13 22:17:54.000000000 +0000 @@ -30,8 +30,8 @@ Q_OBJECT public: UrlValidator( QObject *parent ) : QValidator( parent ) { } - QValidator::State validate( QString&, int& ) const Q_DECL_OVERRIDE; - void fixup ( QString & input ) const Q_DECL_OVERRIDE; + QValidator::State validate( QString&, int& ) const override; + void fixup ( QString & input ) const override; }; #endif // VALIDATORS_HPP diff -Nru vlc-3.0.21/modules/gui/skins2/controls/ctrl_generic.cpp vlc-3.0.22/modules/gui/skins2/controls/ctrl_generic.cpp --- vlc-3.0.21/modules/gui/skins2/controls/ctrl_generic.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/skins2/controls/ctrl_generic.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -29,7 +29,7 @@ #include "../utils/position.hpp" #include "../utils/var_bool.hpp" -#include +#include CtrlGeneric::CtrlGeneric( intf_thread_t *pIntf, const UString &rHelp, diff -Nru vlc-3.0.21/modules/gui/skins2/src/vlcproc.cpp vlc-3.0.22/modules/gui/skins2/src/vlcproc.cpp --- vlc-3.0.21/modules/gui/skins2/src/vlcproc.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/skins2/src/vlcproc.cpp 2025-11-13 22:17:54.000000000 +0000 @@ -56,7 +56,7 @@ #include "../utils/var_string.hpp" #include -#include +#include VlcProc *VlcProc::instance( intf_thread_t *pIntf ) { diff -Nru vlc-3.0.21/modules/gui/skins2/win32/win32_factory.cpp vlc-3.0.22/modules/gui/skins2/win32/win32_factory.cpp --- vlc-3.0.21/modules/gui/skins2/win32/win32_factory.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/skins2/win32/win32_factory.cpp 2025-11-13 22:17:55.000000000 +0000 @@ -215,7 +215,7 @@ m_trayIcon.uFlags = NIF_ICON|NIF_TIP|NIF_MESSAGE; m_trayIcon.uCallbackMessage = MY_WM_TRAYACTION; m_trayIcon.hIcon = LoadIcon( m_hInst, vlc_icon ); - _tcscpy( m_trayIcon.szTip, vlc_name ); + wcscpy( m_trayIcon.szTip, vlc_name ); // Show the systray icon if needed if( var_InheritBool( getIntf(), "skins2-systray" ) ) diff -Nru vlc-3.0.21/modules/gui/skins2/win32/win32_graphics.cpp vlc-3.0.22/modules/gui/skins2/win32/win32_graphics.cpp --- vlc-3.0.21/modules/gui/skins2/win32/win32_graphics.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/skins2/win32/win32_graphics.cpp 2025-11-13 22:17:55.000000000 +0000 @@ -24,8 +24,6 @@ #ifdef WIN32_SKINS -#define WINVER 0x500 - #include "win32_factory.hpp" #include "win32_graphics.hpp" #include "win32_window.hpp" diff -Nru vlc-3.0.21/modules/gui/skins2/x11/x11_window.cpp vlc-3.0.22/modules/gui/skins2/x11/x11_window.cpp --- vlc-3.0.21/modules/gui/skins2/x11/x11_window.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/gui/skins2/x11/x11_window.cpp 2025-11-13 22:17:55.000000000 +0000 @@ -35,7 +35,7 @@ #include "x11_dragdrop.hpp" #include "x11_factory.hpp" -#include +#include #include #include @@ -334,7 +334,7 @@ event.format = 32; event.data.l[ 0 ] = 1; event.data.l[ 1 ] = NET_WM_STATE_FULLSCREEN; - + XSendEvent( XDISPLAY, DefaultRootWindow( XDISPLAY ), False, SubstructureNotifyMask|SubstructureRedirectMask, diff -Nru vlc-3.0.21/modules/hw/amf/amf_helper.c vlc-3.0.22/modules/hw/amf/amf_helper.c --- vlc-3.0.21/modules/hw/amf/amf_helper.c 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/modules/hw/amf/amf_helper.c 2025-11-13 22:17:55.000000000 +0000 @@ -21,12 +21,12 @@ if (hLib == NULL) return (-ENOTSUP); - amf_uint64 version = 0; + c->Version = 0; AMF_RESULT res; AMFQueryVersion_Fn queryVersion = (AMFQueryVersion_Fn)GetProcAddress(hLib, AMF_QUERY_VERSION_FUNCTION_NAME); if (unlikely(queryVersion == NULL)) goto error; - res = queryVersion(&version); + res = queryVersion(&c->Version); if (unlikely(res != AMF_OK)) goto error; @@ -34,7 +34,7 @@ c->Context = NULL; AMFInit_Fn init = (AMFInit_Fn)GetProcAddress(hLib, AMF_INIT_FUNCTION_NAME); - res = init(version, &c->pFactory); + res = init(AMF_FULL_VERSION, &c->pFactory); if (unlikely(res != AMF_OK)) goto error; diff -Nru vlc-3.0.21/modules/hw/amf/amf_helper.h vlc-3.0.22/modules/hw/amf/amf_helper.h --- vlc-3.0.21/modules/hw/amf/amf_helper.h 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/modules/hw/amf/amf_helper.h 2025-11-13 22:17:55.000000000 +0000 @@ -29,6 +29,7 @@ { AMT_TYPE(AMFFactory) *pFactory; AMT_TYPE(AMFContext) *Context; + amf_uint64 Version; void *Private; }; diff -Nru vlc-3.0.21/modules/hw/d3d11/Makefile.am vlc-3.0.22/modules/hw/d3d11/Makefile.am --- vlc-3.0.21/modules/hw/d3d11/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/hw/d3d11/Makefile.am 2025-11-13 22:17:55.000000000 +0000 @@ -12,10 +12,22 @@ endif if HAVE_AMF_ENHANCER -libdirect3d11_filters_plugin_la_SOURCES += video_filter/amf_vqenhancer.c \ - hw/amf/amf_helper.c hw/amf/amf_helper.h +libdirect3d11_filters_plugin_la_SOURCES += video_filter/amf_vqenhancer.c endif +if HAVE_AMF_FRC +libdirect3d11_filters_plugin_la_SOURCES += video_filter/amf_frc.c +endif + +if HAVE_AMF_ENHANCER +libdirect3d11_filters_plugin_la_SOURCES += hw/amf/amf_helper.c hw/amf/amf_helper.h +else +if HAVE_AMF_FRC +libdirect3d11_filters_plugin_la_SOURCES += hw/amf/amf_helper.c hw/amf/amf_helper.h +endif +endif + + d3d11_LTLIBRARIES = $(LTLIBdirect3d11_filters) EXTRA_LTLIBRARIES += libdirect3d11_filters_plugin.la diff -Nru vlc-3.0.21/modules/hw/d3d11/d3d11_deinterlace.c vlc-3.0.22/modules/hw/d3d11/d3d11_deinterlace.c --- vlc-3.0.21/modules/hw/d3d11/d3d11_deinterlace.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/hw/d3d11/d3d11_deinterlace.c 2025-11-13 22:17:55.000000000 +0000 @@ -307,7 +307,7 @@ fmt.i_width = dstDesc.Width; fmt.i_height = dstDesc.Height; if (AllocateTextures(p_filter, &p_filter->p_sys->d3d_dev, cfg, - &fmt, 1, pic->p_sys->texture) != VLC_SUCCESS) + &fmt, false, false, 1, pic->p_sys->texture) != VLC_SUCCESS) { free(pic->p_sys); return NULL; @@ -369,9 +369,6 @@ return VLC_ENOOBJ; } - if (D3D11_Create(filter, &sys->hd3d, false) != VLC_SUCCESS) - goto error; - hr = ID3D11Device_QueryInterface(sys->d3d_dev.d3ddevice, &IID_ID3D11VideoDevice, (void **)&sys->d3dviddev); if (FAILED(hr)) { msg_Err(filter, "Could not Query ID3D11VideoDevice Interface. (hr=0x%lX)", hr); diff -Nru vlc-3.0.21/modules/hw/d3d11/d3d11_filters.c vlc-3.0.22/modules/hw/d3d11/d3d11_filters.c --- vlc-3.0.21/modules/hw/d3d11/d3d11_filters.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/hw/d3d11/d3d11_filters.c 2025-11-13 22:17:55.000000000 +0000 @@ -69,6 +69,7 @@ struct filter_level Hue; struct filter_level Saturation; + d3d11_handle_t hd3d; d3d11_device_t d3d_dev; ID3D11VideoDevice *d3dviddev; ID3D11VideoContext *d3dvidctx; @@ -360,11 +361,19 @@ return VLC_ENOMEM; memset(sys, 0, sizeof (*sys)); + if ( unlikely(D3D11_Create(filter, &sys->hd3d, false) != VLC_SUCCESS )) + { + msg_Err(filter, "Could not access the d3d11."); + free(sys); + return VLC_EGENERIC; + } + D3D11_TEXTURE2D_DESC dstDesc; D3D11_FilterHoldInstance(filter, &sys->d3d_dev, &dstDesc); if (unlikely(sys->d3d_dev.d3dcontext==NULL)) { msg_Dbg(filter, "Filter without a context"); + D3D11_Destroy(&sys->hd3d); free(sys); return VLC_ENOOBJ; } @@ -596,6 +605,7 @@ if (sys->d3d_dev.d3dcontext) D3D11_FilterReleaseInstance(&sys->d3d_dev); d3d11_device_unlock(&sys->d3d_dev); + D3D11_Destroy(&sys->hd3d); free(sys); return VLC_EGENERIC; @@ -629,6 +639,7 @@ ID3D11VideoDevice_Release(sys->d3dviddev); D3D11_FilterReleaseInstance(&sys->d3d_dev); + D3D11_Destroy(&sys->hd3d); free(sys); } @@ -668,9 +679,16 @@ #ifdef HAVE_AMF_ENHANCER add_submodule() set_description(N_("AMD VQ Enhancer")) - add_shortcut(N_("amf_vqenhancer")) + add_shortcut("amf_vqenhancer") set_callbacks( D3D11CreateAMFVQE, D3D11CloseAMFVQE ) #endif +#ifdef HAVE_AMF_FRC + add_submodule() + set_description(N_("AMD Frame Rate Doubler")) + add_shortcut("amf_frc") + set_callbacks( D3D11CreateAMFFRC, D3D11CloseAMFFRC ) + add_bool( "frc-indicator", false, N_("Show indicator"), NULL, false ) +#endif add_submodule() set_capability( "video converter", 10 ) diff -Nru vlc-3.0.21/modules/hw/d3d11/d3d11_filters.h vlc-3.0.22/modules/hw/d3d11/d3d11_filters.h --- vlc-3.0.21/modules/hw/d3d11/d3d11_filters.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/hw/d3d11/d3d11_filters.h 2025-11-13 22:17:55.000000000 +0000 @@ -35,6 +35,8 @@ void D3D11CloseCPUConverter(vlc_object_t *); int D3D11CreateAMFVQE(vlc_object_t *); void D3D11CloseAMFVQE(vlc_object_t *); +int D3D11CreateAMFFRC(vlc_object_t *); +void D3D11CloseAMFFRC(vlc_object_t *); void D3D11_FilterHoldInstance(filter_t *, d3d11_device_t *, D3D11_TEXTURE2D_DESC *); void D3D11_FilterReleaseInstance(d3d11_device_t *); diff -Nru vlc-3.0.21/modules/hw/d3d11/d3d11_instance.c vlc-3.0.22/modules/hw/d3d11/d3d11_instance.c --- vlc-3.0.21/modules/hw/d3d11/d3d11_instance.c 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/hw/d3d11/d3d11_instance.c 2025-11-13 22:17:55.000000000 +0000 @@ -83,6 +83,12 @@ { ID3D11DeviceContext_AddRef(out->d3dcontext); ID3D11Device_AddRef(out->d3ddevice); + IDXGIAdapter *adap = D3D11DeviceAdapter(out->d3ddevice); + if (adap != NULL) + { + IDXGIAdapter_GetDesc(adap, &out->adapterDesc); + IDXGIAdapter_Release(adap); + } D3D11_GetDriverVersion(filter, out); } diff -Nru vlc-3.0.21/modules/hw/mmal/Makefile.in vlc-3.0.22/modules/hw/mmal/Makefile.in --- vlc-3.0.21/modules/hw/mmal/Makefile.in 2024-06-05 16:02:19.000000000 +0000 +++ vlc-3.0.22/modules/hw/mmal/Makefile.in 2025-11-24 23:10:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -244,6 +244,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/autotools/depcomp \ $(top_srcdir)/modules/common.am @@ -439,8 +441,6 @@ CPPFLAGS_vpx = @CPPFLAGS_vpx@ CPPFLAGS_x265 = @CPPFLAGS_x265@ CPPFLAGS_xml = @CPPFLAGS_xml@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -484,14 +484,12 @@ EGL_CFLAGS = @EGL_CFLAGS@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ -ETAGS = @ETAGS@ EVAS_CFLAGS = @EVAS_CFLAGS@ EVAS_LIBS = @EVAS_LIBS@ EXEEXT = @EXEEXT@ FDKAAC_CFLAGS = @FDKAAC_CFLAGS@ FDKAAC_LIBS = @FDKAAC_LIBS@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FILE_LIBVLCCORE_DLL = @FILE_LIBVLCCORE_DLL@ FILE_LIBVLC_DLL = @FILE_LIBVLC_DLL@ FLAC_CFLAGS = @FLAC_CFLAGS@ @@ -564,6 +562,7 @@ LIBCDDB_LIBS = @LIBCDDB_LIBS@ LIBCOM = @LIBCOM@ LIBDL = @LIBDL@ +LIBEXECINFO = @LIBEXECINFO@ LIBEXT = @LIBEXT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -854,6 +853,7 @@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DIR = @PACKAGE_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -965,9 +965,11 @@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ WAYLAND_PROTOCOLS = @WAYLAND_PROTOCOLS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ +WIN32_PATH_CMD = @WIN32_PATH_CMD@ WINDOWS_ARCH = @WINDOWS_ARCH@ WINDRES = @WINDRES@ WINE_SDK_PATH = @WINE_SDK_PATH@ +WIXPATH = @WIXPATH@ X262_CFLAGS = @X262_CFLAGS@ X262_LIBS = @X262_LIBS@ X26410b_CFLAGS = @X26410b_CFLAGS@ @@ -1316,6 +1318,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -1359,8 +1362,7 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-exec-am +install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1470,7 +1472,7 @@ uninstall-am: uninstall-mmalLTLIBRARIES -.MAKE: all check install install-am install-exec install-strip +.MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libtool clean-mmalLTLIBRARIES \ diff -Nru vlc-3.0.21/modules/hw/vdpau/Makefile.am vlc-3.0.22/modules/hw/vdpau/Makefile.am --- vlc-3.0.21/modules/hw/vdpau/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/hw/vdpau/Makefile.am 2025-11-13 22:17:55.000000000 +0000 @@ -1,4 +1,9 @@ vdpaudir = $(pluginsdir)/vdpau +# Install the pkglib/pkglibexec first before relinking the modules. +# This ensures libtool re-linking is not racy. +installvpdauLTLIBRARIES = install-vdpauLTLIBRARIES +$(installvpdauLTLIBRARIES): install-pkglibLTLIBRARIES + libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h hw/vdpau/instance.c libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS) diff -Nru vlc-3.0.21/modules/keystore/kwallet.c vlc-3.0.22/modules/keystore/kwallet.c --- vlc-3.0.21/modules/keystore/kwallet.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/keystore/kwallet.c 2025-11-13 22:17:55.000000000 +0000 @@ -109,7 +109,7 @@ /* takes all values in the values of vlc_keystore_entry * * and formats them in a url key */ -static char* +VLC_MALLOC static char* values2key( const char* const* ppsz_values, bool b_search ) { char* psz_b64_realm = NULL; diff -Nru vlc-3.0.21/modules/lua/extension.c vlc-3.0.22/modules/lua/extension.c --- vlc-3.0.21/modules/lua/extension.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/lua/extension.c 2025-11-13 22:17:55.000000000 +0000 @@ -761,8 +761,8 @@ { /* Get table size */ size_t i_size = lua_objlen( L, -1 ); - *pppsz_titles = ( char** ) calloc( i_size+1, sizeof( char* ) ); - *ppi_ids = ( uint16_t* ) calloc( i_size+1, sizeof( uint16_t ) ); + *pppsz_titles = ( char** ) calloc( i_size+1, sizeof( **pppsz_titles ) ); + *ppi_ids = ( uint16_t* ) calloc( i_size+1, sizeof( **ppi_ids ) ); /* Walk table */ size_t i_idx = 0; @@ -971,7 +971,10 @@ i_ret = VLC_EGENERIC; } - i_ret |= lua_DialogFlush( L ); + if (i_ret != VLC_SUCCESS) + lua_DialogFlush( L ); + else + i_ret = lua_DialogFlush( L ); exit: return i_ret; @@ -1013,7 +1016,10 @@ i_ret = VLC_EGENERIC; } - i_ret |= lua_DialogFlush( L ); + if (i_ret != VLC_SUCCESS) + lua_DialogFlush( L ); + else + i_ret = lua_DialogFlush( L ); if( i_ret < VLC_SUCCESS ) { msg_Dbg( p_mgr, "Something went wrong in %s (%s:%d)", diff -Nru vlc-3.0.21/modules/lua/extension_thread.c vlc-3.0.22/modules/lua/extension_thread.c --- vlc-3.0.21/modules/lua/extension_thread.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/lua/extension_thread.c 2025-11-13 22:17:55.000000000 +0000 @@ -91,28 +91,27 @@ return VLC_SUCCESS; } -/** Recursively drop and free commands starting from "command" */ static void FreeCommands( struct command_t *command ) { - if( !command ) return; - struct command_t *next = command->next; - switch( command->i_command ) - { - case CMD_ACTIVATE: - case CMD_DEACTIVATE: - case CMD_CLICK: // Arg1 must not be freed - break; - - case CMD_TRIGGERMENU: - case CMD_PLAYING_CHANGED: - free( command->data[0] ); // Arg1 is int*, to free - break; - - default: - break; + while (command) { + struct command_t *next = command->next; + switch( command->i_command ) + { + case CMD_ACTIVATE: + case CMD_DEACTIVATE: + case CMD_CLICK: + /* No extra memory to free */ + break; + case CMD_TRIGGERMENU: + case CMD_PLAYING_CHANGED: + free( command->data[0] ); // free allocated data + break; + default: + break; + } + free(command); + command = next; } - free( command ); - FreeCommands( next ); } bool QueueDeactivateCommand( extension_t *p_ext ) diff -Nru vlc-3.0.21/modules/meta_engine/ID3Pictures.h vlc-3.0.22/modules/meta_engine/ID3Pictures.h --- vlc-3.0.21/modules/meta_engine/ID3Pictures.h 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/modules/meta_engine/ID3Pictures.h 2025-11-13 22:17:55.000000000 +0000 @@ -0,0 +1,78 @@ +/***************************************************************************** + * ID3Pictures.h : ID3v2 Pictures definitions + ***************************************************************************** + * Copyright (C) 2016-2024 VLC authors and VideoLAN + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ +#ifndef ID3PICTURES_H +#define ID3PICTURES_H + +enum +{ + ID3_PICTURE_OTHER = 0x00, // Other + ID3_PICTURE_FILE_ICON = 0x01, // 32x32 PNG image that should be used as the file icon + ID3_PICTURE_OTHER_FILE_ICON = 0x02, // File icon of a different size or format. + ID3_PICTURE_FRONT_COVER = 0x03, // Front cover image of the album. + ID3_PICTURE_BACK_COVER = 0x04, // Back cover image of the album + ID3_PICTURE_LEAFLET_PAGE = 0x05, // Inside leaflet page of the album + ID3_PICTURE_MEDIA = 0x06, // Image from the album itself + ID3_PICTURE_LEAD_ARTIST = 0x07, // Picture of the lead artist or soloist + ID3_PICTURE_ARTIST = 0x08, // Picture of the artist or performer + ID3_PICTURE_CONDUCTOR = 0x09, // Picture of the conductor + ID3_PICTURE_BAND = 0x0A, // Picture of the band or orchestra + ID3_PICTURE_COMPOSER = 0x0B, // Picture of the composer + ID3_PICTURE_LYRICIST = 0x0C, // Picture of the lyricist or text writer + ID3_PICTURE_RECORDING_LOCATION = 0x0D, // Picture of the recording location or studio + ID3_PICTURE_DURING_RECORDING = 0x0E, // Picture of the artists during recording + ID3_PICTURE_DURING_PERFORMANCE = 0x0F, // Picture of the artists during performance + ID3_PICTURE_MOVIE_SCREEN_CAPTURE = 0x10, // Picture from a movie or video related to the track + ID3_PICTURE_COLORED_FISH = 0x11, // Picture of a large, coloured fish + ID3_PICTURE_ILLUSTRATION = 0x12, // Illustration related to the track + ID3_PICTURE_BAND_LOGO = 0x13, // Logo of the band or performer + ID3_PICTURE_PUBLISHER_LOGO = 0x14, // Logo of the publisher (record company) + ID3_PICTURE_COUNT +}; + +/* Preferred type of image + * The 21 types are defined in id3v2 standard: + * http://www.id3.org/id3v2.4.0-frames */ +static const char ID3v2_cover_scores[] = { + [ID3_PICTURE_OTHER] = 0, + [ID3_PICTURE_FILE_ICON] = 1, + [ID3_PICTURE_OTHER_FILE_ICON] = 4, + [ID3_PICTURE_FRONT_COVER] = 20, + [ID3_PICTURE_BACK_COVER] = 19, + [ID3_PICTURE_LEAFLET_PAGE] = 13, + [ID3_PICTURE_MEDIA] = 18, + [ID3_PICTURE_LEAD_ARTIST] = 17, + [ID3_PICTURE_ARTIST] = 16, + [ID3_PICTURE_CONDUCTOR] = 14, + [ID3_PICTURE_BAND] = 15, + [ID3_PICTURE_COMPOSER] = 9, + [ID3_PICTURE_LYRICIST] = 8, + [ID3_PICTURE_RECORDING_LOCATION] = 7, + [ID3_PICTURE_DURING_RECORDING] = 10, + [ID3_PICTURE_DURING_PERFORMANCE] = 11, + [ID3_PICTURE_MOVIE_SCREEN_CAPTURE] = 6, + [ID3_PICTURE_COLORED_FISH] = 1, + [ID3_PICTURE_ILLUSTRATION] = 12, + [ID3_PICTURE_BAND_LOGO] = 3, + [ID3_PICTURE_PUBLISHER_LOGO] = 2 +}; + +static_assert(ARRAY_SIZE(ID3v2_cover_scores) == ID3_PICTURE_COUNT, "mismatched scoring table size"); + +#endif diff -Nru vlc-3.0.21/modules/meta_engine/Makefile.am vlc-3.0.22/modules/meta_engine/Makefile.am --- vlc-3.0.21/modules/meta_engine/Makefile.am 2017-11-24 15:29:18.000000000 +0000 +++ vlc-3.0.22/modules/meta_engine/Makefile.am 2025-11-13 22:17:55.000000000 +0000 @@ -4,7 +4,7 @@ meta_LTLIBRARIES = libfolder_plugin.la libtaglib_plugin_la_SOURCES = meta_engine/taglib.cpp \ - demux/xiph_metadata.h demux/xiph_metadata.c + meta_engine/ID3Pictures.h libtaglib_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(TAGLIB_CFLAGS) libtaglib_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(metadir)' libtaglib_plugin_la_LIBADD = $(TAGLIB_LIBS) -lz diff -Nru vlc-3.0.21/modules/meta_engine/taglib.cpp vlc-3.0.22/modules/meta_engine/taglib.cpp --- vlc-3.0.21/modules/meta_engine/taglib.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/meta_engine/taglib.cpp 2025-11-13 22:17:55.000000000 +0000 @@ -35,6 +35,7 @@ #include /* vlc_uri2path */ #include /* mime type */ #include +#include #include @@ -75,13 +76,14 @@ #include #include #include +#include #include #include #include #include #include #include -#include "../demux/xiph_metadata.h" +#include "ID3Pictures.h" #include #include @@ -99,16 +101,28 @@ #include +#include + +#if TAGLIB_VERSION >= VERSION_INT(1, 13, 0) +#define USE_IOSTREAM_RESOLVER 1 +#endif namespace VLCTagLib { template +#ifdef USE_IOSTREAM_RESOLVER + class ExtResolver : public FileRef::StreamTypeResolver +#else class ExtResolver : public FileRef::FileTypeResolver +#endif { public: ExtResolver(const std::string &); ~ExtResolver() {} virtual File *createFile(FileName, bool, AudioProperties::ReadStyle) const; +#ifdef USE_IOSTREAM_RESOLVER + virtual File *createFileFromStream(IOStream*, bool, AudioProperties::ReadStyle) const; +#endif protected: std::string ext; @@ -116,7 +130,7 @@ } template -VLCTagLib::ExtResolver::ExtResolver(const std::string & ext) : FileTypeResolver() +VLCTagLib::ExtResolver::ExtResolver(const std::string & ext) { this->ext = ext; std::transform(this->ext.begin(), this->ext.end(), this->ext.begin(), ::toupper); @@ -125,7 +139,11 @@ template File *VLCTagLib::ExtResolver::createFile(FileName fileName, bool, AudioProperties::ReadStyle) const { +#if defined(_WIN32) && TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + std::string filename = fileName.toString().to8Bit(true); +#else std::string filename = std::string(fileName); +#endif std::size_t namesize = filename.size(); if (namesize > ext.length()) @@ -136,13 +154,35 @@ return new T(fileName, false, AudioProperties::Fast); } - return 0; + return nullptr; +} + +#ifdef USE_IOSTREAM_RESOLVER +template +File* VLCTagLib::ExtResolver::createFileFromStream(IOStream* s, bool, AudioProperties::ReadStyle) const +{ +#if defined(_WIN32) && TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + std::string filename = s->name().toString().to8Bit(true); +#else + std::string filename = std::string(s->name()); +#endif + std::size_t namesize = filename.size(); + + if (namesize > ext.length()) + { + std::string fext = filename.substr(namesize - ext.length(), ext.length()); + std::transform(fext.begin(), fext.end(), fext.begin(), ::toupper); + if(fext == ext) + return new T(s, ID3v2::FrameFactory::instance(), false, AudioProperties::Fast); + } + + return nullptr; } +#endif #if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 static VLCTagLib::ExtResolver aacresolver(".aac"); #endif -static VLCTagLib::ExtResolver m4vresolver(".m4v"); static bool b_extensions_registered = false; // taglib is not thread safe @@ -167,6 +207,9 @@ VlcIostream(stream_t* p_stream) : m_stream( p_stream ) , m_previousPos( 0 ) + , m_borked( false ) + , m_seqReadLength( 0 ) + , m_seqReadLimit( std::numeric_limits::max() ) { } @@ -177,17 +220,27 @@ FileName name() const { - return m_stream->psz_location; + // Taglib only cares about the file name part, so it doesn't matter + // whether we include the mrl scheme or not + return m_stream->psz_url; } +#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + ByteVector readBlock(size_t length) +#else ByteVector readBlock(ulong length) +#endif { + if(m_borked || m_seqReadLength >= m_seqReadLimit) + return {}; ByteVector res(length, 0); ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length); if (i_read < 0) - return ByteVector::null; + return {}; else if ((size_t)i_read != length) res.resize(i_read); + m_previousPos += i_read; + m_seqReadLength += i_read; return res; } @@ -196,11 +249,19 @@ // Let's stay Read-Only for now } +#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + void insert(const ByteVector&, offset_t, size_t) +#else void insert(const ByteVector&, ulong, ulong) +#endif { } +#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + void removeBlock(offset_t, size_t) +#else void removeBlock(ulong, ulong) +#endif { } @@ -214,22 +275,43 @@ return true; } + void setMaxSequentialRead(long s) + { + m_seqReadLimit = s; + } + +#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + void seek(offset_t offset, Position p) +#else void seek(long offset, Position p) +#endif { uint64_t pos = 0; + long len; switch (p) { case Current: pos = m_previousPos; break; case End: - pos = length(); + len = length(); + if(len > -1) + { + pos = len; + } + else + { + m_borked = true; + return; + } break; default: break; } - if (vlc_stream_Seek( m_stream, pos + offset ) == 0) + m_borked = (vlc_stream_Seek( m_stream, pos + offset ) != 0); + if(!m_borked) m_previousPos = pos + offset; + m_seqReadLength = 0; } void clear() @@ -237,12 +319,20 @@ return; } +#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + offset_t tell() const +#else long tell() const +#endif { return m_previousPos; } +#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + offset_t length() +#else long length() +#endif { uint64_t i_size; if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS) @@ -250,13 +340,20 @@ return i_size; } +#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + void truncate(offset_t) +#else void truncate(long) +#endif { } private: stream_t* m_stream; int64_t m_previousPos; + bool m_borked; + long m_seqReadLength; + long m_seqReadLimit; }; #endif /* TAGLIB_VERSION_1_11 */ @@ -461,11 +558,127 @@ } } +static void AddAPICToAttachments( demux_meta_t* p_demux_meta, + vlc_meta_t* p_meta, + const String &mimeType, + const String &description, + const char *p_data, + size_t i_data, + bool b_default = false ) +{ + char *psz_name; + if( asprintf( &psz_name, "%i", p_demux_meta->i_attachments ) == -1 ) + return; + + input_attachment_t *p_attachment = + vlc_input_attachment_New( psz_name, + mimeType.toCString(), + description.toCString(), + p_data, i_data ); + free( psz_name ); + if( !p_attachment ) + return; + + msg_Dbg( p_demux_meta, "Found embedded art: %s (%zu bytes)", + p_attachment->psz_mime, p_attachment->i_data ); + + TAB_APPEND_CAST( (input_attachment_t**), + p_demux_meta->i_attachments, p_demux_meta->attachments, + p_attachment ); + + if( b_default ) + { + char *psz_url; + if( asprintf( &psz_url, "attachment://%s", + p_attachment->psz_name ) == -1 ) + return; + vlc_meta_SetArtURL( p_meta, psz_url ); + free( psz_url ); + } +} + +/** + * Fills attachments list from ID3 APIC tags + * @param tag: the APIC tags list + * @param p_demux_meta: the demuxer meta + * @param p_meta: the meta + */ + +template + const T * getDefaultPic(const L &list) +{ + const T *defaultPic = nullptr; + int bestscore = 0; + for( auto iter = list.begin(); iter != list.end(); ++iter ) + { + const T* p = static_cast(*iter); + if( !p ) + continue; + int score = p->type() >= ARRAY_SIZE(ID3v2_cover_scores) ? 0 : ID3v2_cover_scores[p->type()]; + if(defaultPic == nullptr || score > bestscore) + { + defaultPic = p; + bestscore = score; + } + } + return defaultPic; +} + +static void ProcessAPICListFromId3v2( const ID3v2::FrameList &list, + demux_meta_t* p_demux_meta, vlc_meta_t* p_meta ) +{ + const ID3v2::AttachedPictureFrame *defaultPic = + getDefaultPic(list); + + for( auto iter = list.begin(); iter != list.end(); ++iter ) + { + const ID3v2::AttachedPictureFrame* p = + dynamic_cast(*iter); + if( !p ) + continue; + // Get the mime and description of the image. + String description = p->description(); + String mimeType = p->mimeType(); + + /* some old iTunes version not only sets incorrectly the mime type + * or the description of the image, + * but also embeds incorrectly the image. + * Recent versions seem to behave correctly */ + if( mimeType == "PNG" || description == "\xC2\x89PNG" ) + { + msg_Warn( p_demux_meta, "Invalid picture embedded by broken iTunes version" ); + continue; + } + + AddAPICToAttachments( p_demux_meta, p_meta, + mimeType, description, + p->picture().data(), p->picture().size(), + p == defaultPic ); + } +} + +static void ProcessAPICListFromFLAC( const List< FLAC::Picture * > &list, + demux_meta_t* p_demux_meta, vlc_meta_t* p_meta ) +{ + const FLAC::Picture *defaultPic = + getDefaultPic>(list); + + for( auto iter = list.begin(); iter != list.end(); ++iter ) + { + const FLAC::Picture* p = static_cast(*iter); + if( !p ) + continue; + AddAPICToAttachments( p_demux_meta, p_meta, + p->mimeType(), p->description(), + p->data().data(), p->data().size(), + p == defaultPic ); + } +} static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest) { #define SET( accessor, meta ) \ - if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \ + if( !tag->accessor().isEmpty() ) \ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) ) #define SETINT( accessor, meta ) \ if( tag->accessor() ) \ @@ -511,7 +724,7 @@ * but in our case it will be a '\0' * terminated string */ char psz_ufid[64]; - int max_size = __MIN( p_ufid->identifier().size(), 63); + int max_size = std::min( p_ufid->identifier().size(), 63); strncpy( psz_ufid, p_ufid->identifier().data(), max_size ); psz_ufid[max_size] = '\0'; vlc_meta_SetTrackID( p_meta, psz_ufid ); @@ -580,115 +793,12 @@ vlc_meta_DiscNumber, vlc_meta_DiscTotal ); } - /* Preferred type of image - * The 21 types are defined in id3v2 standard: - * http://www.id3.org/id3v2.4.0-frames */ - static const int pi_cover_score[] = { - 0, /* Other */ - 5, /* 32x32 PNG image that should be used as the file icon */ - 4, /* File icon of a different size or format. */ - 20, /* Front cover image of the album. */ - 19, /* Back cover image of the album. */ - 13, /* Inside leaflet page of the album. */ - 18, /* Image from the album itself. */ - 17, /* Picture of the lead artist or soloist. */ - 16, /* Picture of the artist or performer. */ - 14, /* Picture of the conductor. */ - 15, /* Picture of the band or orchestra. */ - 9, /* Picture of the composer. */ - 8, /* Picture of the lyricist or text writer. */ - 7, /* Picture of the recording location or studio. */ - 10, /* Picture of the artists during recording. */ - 11, /* Picture of the artists during performance. */ - 6, /* Picture from a movie or video related to the track. */ - 1, /* Picture of a large, coloured fish. */ - 12, /* Illustration related to the track. */ - 3, /* Logo of the band or performer. */ - 2 /* Logo of the publisher (record company). */ - }; - #define PI_COVER_SCORE_SIZE (sizeof (pi_cover_score) / sizeof (pi_cover_score[0])) - int i_score = -1; - // Try now to get embedded art list = tag->frameListMap()[ "APIC" ]; - if( list.isEmpty() ) - return; - - for( iter = list.begin(); iter != list.end(); iter++ ) - { - ID3v2::AttachedPictureFrame* p_apic = - dynamic_cast(*iter); - if( !p_apic ) - continue; - input_attachment_t *p_attachment; - - const char *psz_mime; - char *psz_name, *psz_description; - - // Get the mime and description of the image. - // If the description is empty, take the type as a description - psz_mime = p_apic->mimeType().toCString( true ); - if( p_apic->description().size() > 0 ) - psz_description = strdup( p_apic->description().toCString( true ) ); - else - { - if( asprintf( &psz_description, "%i", p_apic->type() ) == -1 ) - psz_description = NULL; - } - - if( !psz_description ) - continue; - psz_name = psz_description; - - /* some old iTunes version not only sets incorrectly the mime type - * or the description of the image, - * but also embeds incorrectly the image. - * Recent versions seem to behave correctly */ - if( !strncmp( psz_mime, "PNG", 3 ) || - !strncmp( psz_name, "\xC2\x89PNG", 5 ) ) - { - msg_Warn( p_demux_meta, "Invalid picture embedded by broken iTunes version" ); - free( psz_description ); - continue; - } - - const ByteVector picture = p_apic->picture(); - const char *p_data = picture.data(); - const unsigned i_data = picture.size(); - - msg_Dbg( p_demux_meta, "Found embedded art: %s (%s) is %u bytes", - psz_name, psz_mime, i_data ); - - p_attachment = vlc_input_attachment_New( psz_name, psz_mime, - psz_description, p_data, i_data ); - if( !p_attachment ) - { - free( psz_description ); - continue; - } - TAB_APPEND_CAST( (input_attachment_t**), - p_demux_meta->i_attachments, p_demux_meta->attachments, - p_attachment ); - free( psz_description ); - - unsigned i_pic_type = p_apic->type(); - if( i_pic_type >= PI_COVER_SCORE_SIZE ) - i_pic_type = 0; // Defaults to "Other" - - if( pi_cover_score[i_pic_type] > i_score ) - { - i_score = pi_cover_score[i_pic_type]; - char *psz_url; - if( asprintf( &psz_url, "attachment://%s", - p_attachment->psz_name ) == -1 ) - continue; - vlc_meta_SetArtURL( p_meta, psz_url ); - free( psz_url ); - } - } + if( !list.isEmpty() ) + ProcessAPICListFromId3v2( list, p_demux_meta, p_meta ); } - /** * Read the meta information from XiphComments * @param tag: the Xiph Comment @@ -697,17 +807,20 @@ */ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta ) { - StringList list; bool hasTrackTotal = false; -#define SET( keyName, metaName ) \ - list = tag->fieldListMap()[keyName]; \ - if( !list.isEmpty() ) \ - vlc_meta_Set##metaName( p_meta, (*list.begin()).toCString( true ) ); +#define SET( keyName, metaName ) \ + { \ + StringList tmp_list { tag->fieldListMap()[keyName] }; \ + if( !tmp_list.isEmpty() ) \ + vlc_meta_Set##metaName( p_meta, (*tmp_list.begin()).toCString( true ) ); \ + } #define SET_EXTRA( keyName, metaName ) \ - list = tag->fieldListMap()[keyName]; \ - if( !list.isEmpty() ) \ - vlc_meta_AddExtra( p_meta, keyName, (*list.begin()).toCString( true ) ); + { \ + StringList tmp_list = tag->fieldListMap()[keyName]; \ + if( !tmp_list.isEmpty() ) \ + vlc_meta_AddExtra( p_meta, keyName, (*tmp_list.begin()).toCString( true ) ); \ + } SET( "COPYRIGHT", Copyright ); SET( "ORGANIZATION", Publisher ); @@ -723,77 +836,30 @@ #undef SET #undef SET_EXTRA - list = tag->fieldListMap()["TRACKNUMBER"]; - if( !list.isEmpty() ) + StringList track_number_list = tag->fieldListMap()["TRACKNUMBER"]; + if( !track_number_list.isEmpty() ) { - int i_values = ExtractCoupleNumberValues( p_meta, (*list.begin()).toCString( true ), + int i_values = ExtractCoupleNumberValues( p_meta, (*track_number_list.begin()).toCString( true ), vlc_meta_TrackNumber, vlc_meta_TrackTotal ); hasTrackTotal = i_values == 2; } if( !hasTrackTotal ) { - list = tag->fieldListMap()["TRACKTOTAL"]; - if( list.isEmpty() ) - list = tag->fieldListMap()["TOTALTRACKS"]; - if( !list.isEmpty() ) - vlc_meta_SetTrackTotal( p_meta, (*list.begin()).toCString( true ) ); - } - - // Try now to get embedded art - StringList mime_list = tag->fieldListMap()[ "COVERARTMIME" ]; - StringList art_list = tag->fieldListMap()[ "COVERART" ]; - - input_attachment_t *p_attachment; - - if( mime_list.size() != 0 && art_list.size() != 0 ) - { - // We get only the first cover art - if( mime_list.size() > 1 || art_list.size() > 1 ) - msg_Warn( p_demux_meta, "Found %i embedded arts, so using only the first one", - art_list.size() ); - - const char* psz_name = "cover"; - const char* psz_mime = mime_list[0].toCString(true); - const char* psz_description = "cover"; - - uint8_t *p_data; - int i_data = vlc_b64_decode_binary( &p_data, art_list[0].toCString(true) ); - - msg_Dbg( p_demux_meta, "Found embedded art: %s (%s) is %i bytes", - psz_name, psz_mime, i_data ); - - p_attachment = vlc_input_attachment_New( psz_name, psz_mime, - psz_description, p_data, i_data ); - free( p_data ); - } - else - { - art_list = tag->fieldListMap()[ "METADATA_BLOCK_PICTURE" ]; - if( art_list.size() == 0 ) - return; - - uint8_t *p_data; - int i_cover_score; - int i_cover_idx; - int i_data = vlc_b64_decode_binary( &p_data, art_list[0].toCString(true) ); - i_cover_score = i_cover_idx = 0; - /* TODO: Use i_cover_score / i_cover_idx to select the picture. */ - p_attachment = ParseFlacPicture( p_data, i_data, 0, - &i_cover_score, &i_cover_idx ); - free( p_data ); - } - - if (p_attachment) { - TAB_APPEND_CAST( (input_attachment_t**), - p_demux_meta->i_attachments, p_demux_meta->attachments, - p_attachment ); - - char *psz_url; - if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) != -1 ) { - vlc_meta_SetArtURL( p_meta, psz_url ); - free( psz_url ); + StringList track_total_list { tag->fieldListMap()["TRACKTOTAL"] }; + if( track_total_list.isEmpty() ) + { + StringList total_tracks_list { tag->fieldListMap()["TOTALTRACKS"] }; + if( !total_tracks_list.isEmpty() ) + vlc_meta_SetTrackTotal( p_meta, (*total_tracks_list.begin()).toCString( true ) ); + } + else + { + vlc_meta_SetTrackTotal( p_meta, (*track_total_list.begin()).toCString( true ) ); } } + + // Taglib extracts if(key == "METADATA_BLOCK_PICTURE" || key == "COVERART") + ProcessAPICListFromFLAC( tag->pictureList(), p_demux_meta, p_meta ); } /** @@ -806,15 +872,15 @@ { MP4::Item list; #define SET( keyName, metaName ) \ - if( tag->itemListMap().contains(keyName) ) \ + if( tag->contains(keyName) ) \ { \ - list = tag->itemListMap()[keyName]; \ + list = tag->item(keyName); \ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \ } #define SET_EXTRA( keyName, metaName ) \ - if( tag->itemListMap().contains(keyName) ) \ - { \ - list = tag->itemListMap()[keyName]; \ + if( tag->contains(keyName) ) \ + { \ + list = tag->item(keyName); \ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \ } @@ -824,17 +890,17 @@ #undef SET #undef SET_EXTRA - if( tag->itemListMap().contains("covr") ) + if( tag->contains("covr") ) { - MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList(); - const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg"; + MP4::CoverArtList cover_list = tag->item("covr").toCoverArtList(); + const char *psz_format = cover_list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg"; msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes", - psz_format, list[0].data().size() ); + psz_format, cover_list[0].data().size() ); input_attachment_t *p_attachment = vlc_input_attachment_New( "cover", psz_format, "cover", - list[0].data().data(), list[0].data().size() ); + cover_list[0].data().data(), cover_list[0].data().size() ); if( p_attachment ) { TAB_APPEND_CAST( (input_attachment_t**), @@ -867,6 +933,23 @@ return VLC_SUCCESS; } +static bool isSchemeCompatible( const char *psz_uri ) +{ + const char *p = strstr( psz_uri, "://" ); + if( p == NULL ) + return false; + + size_t i_len = p - psz_uri; + const char * compatibleschemes[] = + { + "file", "smb", + }; + for( size_t i=0; i= TAGLIB_VERSION_1_11 - if( psz_path == NULL ) + if( !isSchemeCompatible( psz_uri ) ) { free( psz_uri ); return VLC_EGENERIC; } - free( psz_path ); + if( !b_extensions_registered ) + { +#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 + FileRef::addFileTypeResolver( &aacresolver ); +#endif + b_extensions_registered = true; + } + +#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 stream_t *p_stream = vlc_access_NewMRL( p_this, psz_uri ); free( psz_uri ); if( p_stream == NULL ) return VLC_EGENERIC; + stream_t* p_filter = vlc_stream_FilterNew( p_stream, "prefetch,cache" ); + if( p_filter ) + p_stream = p_filter; VlcIostream s( p_stream ); - f = FileRef( &s ); -#else /* VLC_WINSTORE_APP */ +#ifndef VLC_PATCHED_TAGLIB_ID3V2_READSTYLE + uint64_t dummy; + if( vlc_stream_GetSize( p_stream, &dummy ) != VLC_SUCCESS ) + s.setMaxSequentialRead( 2048 ); + else + s.setMaxSequentialRead( 1024 * 2048 ); +#endif + f = FileRef( &s, false, AudioProperties::ReadStyle::Fast ); +#else // !TAGLIB_VERSION_1_11 + char *psz_path = vlc_uri2path( psz_uri ); free( psz_uri ); if( psz_path == NULL ) return VLC_EGENERIC; - if( !b_extensions_registered ) - { -#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 - FileRef::addFileTypeResolver( &aacresolver ); -#endif - FileRef::addFileTypeResolver( &m4vresolver ); - b_extensions_registered = true; - } - #if defined(_WIN32) wchar_t *wpath = ToWide( psz_path ); if( wpath == NULL ) @@ -922,23 +1013,13 @@ free( psz_path ); return VLC_EGENERIC; } -#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 - FileStream stream( wpath, true ); - f = FileRef( &stream ); -#else /* TAGLIB_VERSION */ f = FileRef( wpath ); -#endif /* TAGLIB_VERSION */ free( wpath ); #else /* _WIN32 */ -#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 - FileStream stream( psz_path, true ); - f = FileRef( &stream ); -#else /* TAGLIB_VERSION */ f = FileRef( psz_path ); -#endif /* TAGLIB_VERSION */ #endif /* _WIN32 */ free( psz_path ); -#endif /* VLC_WINSTORE_APP */ +#endif // !TAGLIB_VERSION_1_11 if( f.isNull() ) return VLC_EGENERIC; @@ -980,6 +1061,7 @@ ReadMetaFromId3v2( flac->ID3v2Tag(), p_demux_meta, p_meta ); else if( flac->xiphComment() ) ReadMetaFromXiph( flac->xiphComment(), p_demux_meta, p_meta ); + ProcessAPICListFromFLAC( flac->pictureList(), p_demux_meta, p_meta ); } else if( MP4::File *mp4 = dynamic_cast(f.file()) ) { @@ -1144,7 +1226,7 @@ fclose( p_file ); return; } - off_t file_size = st.st_size; + auto file_size = st.st_size; free( psz_path ); @@ -1337,7 +1419,11 @@ if( RIFF::AIFF::File* riff_aiff = dynamic_cast(f.file()) ) WriteMetaToId3v2( riff_aiff->tag(), p_item ); else if( RIFF::WAV::File* riff_wav = dynamic_cast(f.file()) ) +#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0) + WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item ); +#else WriteMetaToId3v2( riff_wav->tag(), p_item ); +#endif } else if( TrueAudio::File* trueaudio = dynamic_cast(f.file()) ) { diff -Nru vlc-3.0.21/modules/misc/gnutls.c vlc-3.0.22/modules/misc/gnutls.c --- vlc-3.0.21/modules/misc/gnutls.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/misc/gnutls.c 2025-11-13 22:17:55.000000000 +0000 @@ -399,9 +399,6 @@ gnutls_session_t session = priv->session; - /* minimum DH prime bits */ - gnutls_dh_set_prime_bits (session, 1024); - if (likely(hostname != NULL)) /* fill Server Name Indication */ gnutls_server_name_set (session, GNUTLS_NAME_DNS, diff -Nru vlc-3.0.21/modules/misc/webservices/musicbrainz.c vlc-3.0.22/modules/misc/webservices/musicbrainz.c --- vlc-3.0.21/modules/misc/webservices/musicbrainz.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/misc/webservices/musicbrainz.c 2025-11-13 22:17:55.000000000 +0000 @@ -56,7 +56,11 @@ { p_lookup->root = json_parse_document(p_obj, p_buffer); if (!p_lookup->root) + { msg_Dbg(p_obj, "No results"); + musicbrainz_lookup_release(p_lookup); + p_lookup = NULL; + } } free(p_buffer); return p_lookup; diff -Nru vlc-3.0.21/modules/packetizer/a52.c vlc-3.0.22/modules/packetizer/a52.c --- vlc-3.0.21/modules/packetizer/a52.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/a52.c 2025-11-13 22:17:55.000000000 +0000 @@ -324,6 +324,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != AUDIO_ES ) + return VLC_EGENERIC; + switch( p_dec->fmt_in.i_codec ) { case VLC_CODEC_EAC3: diff -Nru vlc-3.0.21/modules/packetizer/av1.c vlc-3.0.22/modules/packetizer/av1.c --- vlc-3.0.21/modules/packetizer/av1.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/av1.c 2025-11-13 22:17:55.000000000 +0000 @@ -156,10 +156,12 @@ { free(p_dec->fmt_out.p_extra); p_dec->fmt_out.i_extra = 0; + p_dec->fmt_out.p_extra = NULL; } - if(!p_dec->fmt_in.i_extra && !p_dec->fmt_out.i_extra) + if(p_dec->fmt_out.i_extra <= 4) { + free(p_dec->fmt_out.p_extra); p_dec->fmt_out.i_extra = AV1_create_DecoderConfigurationRecord((uint8_t **)&p_dec->fmt_out.p_extra, p_sys->p_sequence_header, @@ -540,6 +542,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if (p_dec->fmt_in.i_cat != VIDEO_ES) + return VLC_EGENERIC; + if (p_dec->fmt_in.i_codec != VLC_CODEC_AV1) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/packetizer/avparser.c vlc-3.0.22/modules/packetizer/avparser.c --- vlc-3.0.21/modules/packetizer/avparser.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/avparser.c 2025-11-13 22:17:55.000000000 +0000 @@ -86,6 +86,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + /* Restrict to VP9 for now */ if( p_dec->fmt_in.i_codec != VLC_CODEC_VP9 ) return VLC_EGENERIC; @@ -104,7 +107,7 @@ if( !p_ctx ) return VLC_EGENERIC; - AVCodec * p_codec = avcodec_find_decoder( i_avcodec_id ); + const AVCodec * p_codec = avcodec_find_decoder( i_avcodec_id ); if( unlikely( !p_codec ) ) { av_parser_close( p_ctx ); diff -Nru vlc-3.0.21/modules/packetizer/dirac.c vlc-3.0.22/modules/packetizer/dirac.c --- vlc-3.0.21/modules/packetizer/dirac.c 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/dirac.c 2025-11-13 22:17:55.000000000 +0000 @@ -1370,6 +1370,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_DIRAC ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/packetizer/dts.c vlc-3.0.22/modules/packetizer/dts.c --- vlc-3.0.21/modules/packetizer/dts.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/dts.c 2025-11-13 22:17:55.000000000 +0000 @@ -91,6 +91,8 @@ static block_t *GetOutBuffer( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; + if (p_sys->i_input_size == 0) + return NULL; if( !p_sys->b_date_set || p_dec->fmt_out.audio.i_rate != p_sys->first.i_rate ) @@ -205,7 +207,8 @@ /* Check if frame is valid and get frame info */ if( vlc_dts_header_Parse( &p_sys->first, p_header, - VLC_DTS_HEADER_SIZE ) != VLC_SUCCESS ) + VLC_DTS_HEADER_SIZE ) != VLC_SUCCESS + || p_sys->first.i_frame_size == 0 ) { msg_Dbg( p_dec, "emulated sync word" ); block_SkipByte( &p_sys->bytestream ); @@ -249,11 +252,14 @@ * CORE...SUBSTREAM is regular extension. * SUBSTREAM...CORE is sync issue. */ - p_dec->fmt_out.i_profile = PROFILE_DTS_EXPRESS; - p_sys->first.i_rate = xssheader.i_rate; - p_sys->first.i_frame_length = xssheader.i_frame_length; - p_sys->i_state = STATE_NEXT_SYNC; - break; + if (xssheader.i_rate != 0 && xssheader.i_frame_length != 0) + { + p_dec->fmt_out.i_profile = PROFILE_DTS_EXPRESS; + p_sys->first.i_rate = xssheader.i_rate; + p_sys->first.i_frame_length = xssheader.i_frame_length; + p_sys->i_state = STATE_NEXT_SYNC; + break; + } } msg_Warn( p_dec, "substream without the paired core stream, skip it" ); @@ -299,8 +305,8 @@ vlc_dts_header_IsSync( p_header, VLC_DTS_HEADER_SIZE ) ) { p_sys->i_input_size = p_sys->i_next_offset = p_sys->first.i_frame_size - 1; - /* reenter */ - break; + if(p_sys->i_input_size >= VLC_DTS_HEADER_SIZE) + break; /* reenter */ } msg_Dbg( p_dec, "emulated sync word " "(no sync on following frame)" ); @@ -399,6 +405,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != AUDIO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_DTS ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/packetizer/dts_header.c vlc-3.0.22/modules/packetizer/dts_header.c --- vlc-3.0.21/modules/packetizer/dts_header.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/dts_header.c 2025-11-13 22:17:55.000000000 +0000 @@ -342,6 +342,7 @@ bs_skip( &s, 16 ); uint16_t nLBRScaledBitRate_LSW = bs_read( &s, 16 ); p_header->i_bitrate = nLBRScaledBitRate_LSW | ((nLBRBitRateMSnybbles & 0xF0) << 12); + p_header->i_frame_size = 0; return VLC_SUCCESS; } diff -Nru vlc-3.0.21/modules/packetizer/flac.c vlc-3.0.22/modules/packetizer/flac.c --- vlc-3.0.21/modules/packetizer/flac.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/flac.c 2025-11-13 22:17:55.000000000 +0000 @@ -581,6 +581,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if (p_dec->fmt_in.i_cat != AUDIO_ES) + return VLC_EGENERIC; + if (p_dec->fmt_in.i_codec != VLC_CODEC_FLAC) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/packetizer/flac.h vlc-3.0.22/modules/packetizer/flac.h --- vlc-3.0.21/modules/packetizer/flac.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/flac.h 2025-11-13 22:17:55.000000000 +0000 @@ -64,16 +64,16 @@ stream_info->total_samples = GetQWBE(&p_buf[4+6]) & ((INT64_C(1)<<36)-1); } -/* Will return INT64_MAX for an invalid utf-8 sequence */ -static inline int64_t read_utf8(const uint8_t *p_buf, unsigned i_buf, int *pi_read) +/* Will return UINT64_MAX for an invalid utf-8 sequence */ +static inline uint64_t read_utf8(const uint8_t *p_buf, unsigned i_buf, int *pi_read) { /* Max coding bits is 56 - 8 */ /* Value max precision is 36 bits */ - int64_t i_result = 0; + uint64_t i_result = 0; unsigned i; if(i_buf < 1) - return INT64_MAX; + return UINT64_MAX; if (!(p_buf[0] & 0x80)) { /* 0xxxxxxx */ i_result = p_buf[0]; @@ -97,15 +97,15 @@ i_result = 0; i = 6; } else { - return INT64_MAX; + return UINT64_MAX; } if(i_buf < i + 1) - return INT64_MAX; + return UINT64_MAX; for (unsigned j = 1; j <= i; j++) { if (!(p_buf[j] & 0x80) || (p_buf[j] & 0x40)) { /* 10xxxxxx */ - return INT64_MAX; + return UINT64_MAX; } i_result <<= 6; i_result |= (p_buf[j] & 0x3F); @@ -239,8 +239,14 @@ /* Check Sample/Frame number */ int i_read; - int64_t i_fsnumber = read_utf8(&p_buf[i_header++], i_buf - 4, &i_read); - if ( i_fsnumber == INT64_MAX ) + uint64_t i_fsnumber = read_utf8(&p_buf[i_header++], i_buf - 4, &i_read); + + /* Invalid UTF-8 */ + if (i_fsnumber == UINT64_MAX) + return 0; + + /* Invalid Sample/Frame number */ + if (!stream_info || stream_info->total_samples != 0 && i_fsnumber > stream_info->total_samples) return 0; i_header += i_read; diff -Nru vlc-3.0.21/modules/packetizer/h264.c vlc-3.0.22/modules/packetizer/h264.c --- vlc-3.0.21/modules/packetizer/h264.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/h264.c 2025-11-13 22:17:55.000000000 +0000 @@ -152,6 +152,10 @@ static block_t * PacketizeDrain( void *p_private ); static block_t *ParseNALBlock( decoder_t *, bool *pb_ts_used, block_t * ); +static inline block_t *ParseNALBlockW( void *opaque, bool *pb_ts_used, block_t *p_frag ) +{ + return ParseNALBlock( (decoder_t *) opaque, pb_ts_used, p_frag ); +} static block_t *OutputPicture( decoder_t *p_dec ); static void PutSPS( decoder_t *p_dec, block_t *p_frag ); @@ -326,6 +330,9 @@ decoder_sys_t *p_sys; int i; + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + const bool b_avc = (p_dec->fmt_in.i_original_fourcc == VLC_FOURCC( 'a', 'v', 'c', '1' )); if( p_dec->fmt_in.i_codec != VLC_CODEC_H264 ) @@ -530,8 +537,9 @@ { decoder_sys_t *p_sys = p_dec->p_sys; - return PacketizeXXC1( p_dec, p_sys->i_avcC_length_size, - pp_block, ParseNALBlock ); + return PacketizeXXC1( p_dec, VLC_OBJECT(p_dec), + p_sys->i_avcC_length_size, pp_block, + ParseNALBlockW, PacketizeDrain ); } /***************************************************************************** diff -Nru vlc-3.0.21/modules/packetizer/h264_nal.c vlc-3.0.22/modules/packetizer/h264_nal.c --- vlc-3.0.21/modules/packetizer/h264_nal.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/h264_nal.c 2025-11-13 22:17:55.000000000 +0000 @@ -325,6 +325,8 @@ { /* delta_scale */ i_tmp = bs_read_se( p_bs ); + if(i_tmp < -128 || i_tmp > 127) + return false; i_nextscale = ( i_lastscale + i_tmp + 256 ) % 256; /* useDefaultScalingMatrixFlag = ... */ } @@ -591,8 +593,11 @@ } } - bs_read_ue( p_bs ); /* num_ref_idx_l0_default_active_minus1 */ - bs_read_ue( p_bs ); /* num_ref_idx_l1_default_active_minus1 */ + p_pps->num_ref_idx_l01_default_active_minus1[0] = bs_read_ue( p_bs ); + p_pps->num_ref_idx_l01_default_active_minus1[1] = bs_read_ue( p_bs ); + if (p_pps->num_ref_idx_l01_default_active_minus1[0] > 31 || + p_pps->num_ref_idx_l01_default_active_minus1[1] > 31) + return false; p_pps->weighted_pred_flag = bs_read( p_bs, 1 ); p_pps->weighted_bipred_idc = bs_read( p_bs, 2 ); bs_read_se( p_bs ); /* pic_init_qp_minus26 */ diff -Nru vlc-3.0.21/modules/packetizer/h264_nal.h vlc-3.0.22/modules/packetizer/h264_nal.h --- vlc-3.0.21/modules/packetizer/h264_nal.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/h264_nal.h 2025-11-13 22:17:55.000000000 +0000 @@ -150,6 +150,7 @@ uint8_t i_redundant_pic_present_flag; uint8_t weighted_pred_flag; uint8_t weighted_bipred_idc; + uint32_t num_ref_idx_l01_default_active_minus1[2]; }; struct h264_sequence_parameter_set_extension_t diff -Nru vlc-3.0.21/modules/packetizer/h264_slice.c vlc-3.0.22/modules/packetizer/h264_slice.c --- vlc-3.0.21/modules/packetizer/h264_slice.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/h264_slice.c 2025-11-13 22:17:55.000000000 +0000 @@ -101,7 +101,8 @@ if( p_pps->i_redundant_pic_present_flag ) bs_read_ue( &s ); /* redudant_pic_count */ - unsigned num_ref_idx_l01_active_minus1[2] = {0 , 0}; + uint32_t num_ref_idx_l01_active_minus1[2] = { p_pps->num_ref_idx_l01_default_active_minus1[0], + p_pps->num_ref_idx_l01_default_active_minus1[1] }; if( i_slice_type == 1 || i_slice_type == 6 ) /* B slices */ bs_read1( &s ); /* direct_spatial_mv_pred_flag */ @@ -112,8 +113,14 @@ if( bs_read1( &s ) ) /* num_ref_idx_active_override_flag */ { num_ref_idx_l01_active_minus1[0] = bs_read_ue( &s ); + if (num_ref_idx_l01_active_minus1[0] > 31) + num_ref_idx_l01_active_minus1[0] = p_pps->num_ref_idx_l01_default_active_minus1[0]; if( i_slice_type == 1 || i_slice_type == 6 ) /* B slices */ + { num_ref_idx_l01_active_minus1[1] = bs_read_ue( &s ); + if (num_ref_idx_l01_active_minus1[1] > 31) + num_ref_idx_l01_active_minus1[1] = p_pps->num_ref_idx_l01_default_active_minus1[1]; + } } } diff -Nru vlc-3.0.21/modules/packetizer/hevc.c vlc-3.0.22/modules/packetizer/hevc.c --- vlc-3.0.21/modules/packetizer/hevc.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/hevc.c 2025-11-13 22:17:55.000000000 +0000 @@ -69,6 +69,10 @@ static void PacketizeReset(void *p_private, bool b_broken); static block_t *PacketizeParse(void *p_private, bool *pb_ts_used, block_t *); static block_t *ParseNALBlock(decoder_t *, bool *pb_ts_used, block_t *); +static inline block_t *ParseNALBlockW( void *opaque, bool *pb_ts_used, block_t *p_frag ) +{ + return ParseNALBlock( (decoder_t *) opaque, pb_ts_used, p_frag ); +} static int PacketizeValidate(void *p_private, block_t *); static block_t * PacketizeDrain(void *); static bool ParseSEICallback( const hxxx_sei_data_t *, void * ); @@ -170,6 +174,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if (p_dec->fmt_in.i_cat != VIDEO_ES) + return VLC_EGENERIC; + if (p_dec->fmt_in.i_codec != VLC_CODEC_HEVC) return VLC_EGENERIC; @@ -297,8 +304,9 @@ { decoder_sys_t *p_sys = p_dec->p_sys; - return PacketizeXXC1( p_dec, p_sys->i_nal_length_size, - pp_block, ParseNALBlock ); + return PacketizeXXC1( p_dec, VLC_OBJECT(p_dec), + p_sys->i_nal_length_size, pp_block, + ParseNALBlockW, PacketizeDrain ); } static block_t *PacketizeAnnexB(decoder_t *p_dec, block_t **pp_block) diff -Nru vlc-3.0.21/modules/packetizer/hevc_nal.c vlc-3.0.22/modules/packetizer/hevc_nal.c --- vlc-3.0.21/modules/packetizer/hevc_nal.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/hevc_nal.c 2025-11-13 22:17:55.000000000 +0000 @@ -355,7 +355,7 @@ if(i_buf < (size_t)i_nalu_length + 2) return 0; - i_total += i_nalu_length + i_nal_length_size; + i_total += i_nalu_length + 4; // annexb_startcode4; p_buf += i_nalu_length + 2; i_buf -= i_nalu_length + 2; } diff -Nru vlc-3.0.21/modules/packetizer/hxxx_common.c vlc-3.0.22/modules/packetizer/hxxx_common.c --- vlc-3.0.21/modules/packetizer/hxxx_common.c 2023-01-01 22:21:52.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/hxxx_common.c 2025-11-13 22:17:55.000000000 +0000 @@ -110,14 +110,19 @@ * Will always use 4 byte 0 0 0 1 startcodes * Will prepend a SPS and PPS before each keyframe ****************************************************************************/ -block_t *PacketizeXXC1( decoder_t *p_dec, uint8_t i_nal_length_size, - block_t **pp_block, pf_annexb_nal_packetizer pf_nal_parser ) +block_t *PacketizeXXC1( void *p_private, vlc_object_t *p_obj, + uint8_t i_nal_length_size, block_t **pp_block, + pf_annexb_nal_parse pf_nal_parser, + pf_annexb_nal_drain pf_nal_drain ) { block_t *p_block; block_t *p_ret = NULL; uint8_t *p; - if( !pp_block || !*pp_block ) + if( !pp_block ) + return pf_nal_drain ? pf_nal_drain( p_private ) : NULL; + + if( !*pp_block ) return NULL; if( (*pp_block)->i_flags&(BLOCK_FLAG_CORRUPTED) ) { @@ -145,7 +150,7 @@ if( i_size <= 0 || i_size > ( p_block->p_buffer + p_block->i_buffer - p ) ) { - msg_Err( p_dec, "Broken frame : size %d is too big", i_size ); + msg_Err( p_obj, "Broken frame : size %d is too big", i_size ); break; } @@ -184,7 +189,7 @@ /* Parse the NAL */ block_t *p_pic; - if( ( p_pic = pf_nal_parser( p_dec, &b_dummy, p_nal ) ) ) + if( ( p_pic = pf_nal_parser( p_private, &b_dummy, p_nal ) ) ) { block_ChainAppend( &p_ret, p_pic ); } diff -Nru vlc-3.0.21/modules/packetizer/hxxx_common.h vlc-3.0.22/modules/packetizer/hxxx_common.h --- vlc-3.0.21/modules/packetizer/hxxx_common.h 2017-11-24 15:29:18.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/hxxx_common.h 2025-11-13 22:17:55.000000000 +0000 @@ -37,8 +37,11 @@ /* */ -typedef block_t * (*pf_annexb_nal_packetizer)(decoder_t *, bool *, block_t *); -block_t *PacketizeXXC1( decoder_t *, uint8_t, block_t **, pf_annexb_nal_packetizer ); +typedef block_t * (*pf_annexb_nal_parse)(void *, bool *, block_t *); +typedef block_t * (*pf_annexb_nal_drain)(void *); +block_t *PacketizeXXC1( void *, vlc_object_t *obj, + uint8_t, block_t **, + pf_annexb_nal_parse, pf_annexb_nal_drain ); #endif // HXXX_COMMON_H diff -Nru vlc-3.0.21/modules/packetizer/mlp.c vlc-3.0.22/modules/packetizer/mlp.c --- vlc-3.0.21/modules/packetizer/mlp.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/mlp.c 2025-11-13 22:17:55.000000000 +0000 @@ -473,6 +473,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != AUDIO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_MLP && p_dec->fmt_in.i_codec != VLC_CODEC_TRUEHD ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/packetizer/mpeg4audio.c vlc-3.0.22/modules/packetizer/mpeg4audio.c --- vlc-3.0.21/modules/packetizer/mpeg4audio.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/mpeg4audio.c 2025-11-13 22:17:55.000000000 +0000 @@ -204,6 +204,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if (p_dec->fmt_in.i_cat != AUDIO_ES) + return VLC_EGENERIC; + if (p_dec->fmt_in.i_codec != VLC_CODEC_MP4A) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/packetizer/mpeg4video.c vlc-3.0.22/modules/packetizer/mpeg4video.c --- vlc-3.0.21/modules/packetizer/mpeg4video.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/mpeg4video.c 2025-11-13 22:17:55.000000000 +0000 @@ -136,6 +136,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4V ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/packetizer/mpegaudio.c vlc-3.0.22/modules/packetizer/mpegaudio.c --- vlc-3.0.21/modules/packetizer/mpegaudio.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/mpegaudio.c 2025-11-13 22:17:55.000000000 +0000 @@ -615,6 +615,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != AUDIO_ES ) + return VLC_EGENERIC; + if(( p_dec->fmt_in.i_codec != VLC_CODEC_MPGA ) && ( p_dec->fmt_in.i_codec != VLC_CODEC_MP3 ) ) { diff -Nru vlc-3.0.21/modules/packetizer/mpegvideo.c vlc-3.0.22/modules/packetizer/mpegvideo.c --- vlc-3.0.21/modules/packetizer/mpegvideo.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/mpegvideo.c 2025-11-13 22:17:55.000000000 +0000 @@ -196,6 +196,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_MPGV ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/packetizer/vc1.c vlc-3.0.22/modules/packetizer/vc1.c --- vlc-3.0.21/modules/packetizer/vc1.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/packetizer/vc1.c 2025-11-13 22:17:55.000000000 +0000 @@ -143,6 +143,9 @@ decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; + if( p_dec->fmt_in.i_cat != VIDEO_ES ) + return VLC_EGENERIC; + if( p_dec->fmt_in.i_codec != VLC_CODEC_VC1 ) return VLC_EGENERIC; diff -Nru vlc-3.0.21/modules/services_discovery/mtp.c vlc-3.0.22/modules/services_discovery/mtp.c --- vlc-3.0.21/modules/services_discovery/mtp.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/services_discovery/mtp.c 2025-11-13 22:17:55.000000000 +0000 @@ -267,7 +267,7 @@ free( psz_string ); } input_item_SetDate( p_input, p_track->date ); - p_input->i_duration = p_track->duration * INT64_C(1000); + p_input->i_duration = VLC_TICK_FROM_MS(p_track->duration); services_discovery_AddItem( p_sd, p_input ); p_sd->p_sys->pp_items[p_sd->p_sys->i_count++] = p_input; } diff -Nru vlc-3.0.21/modules/services_discovery/upnp.cpp vlc-3.0.22/modules/services_discovery/upnp.cpp --- vlc-3.0.21/modules/services_discovery/upnp.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/services_discovery/upnp.cpp 2025-11-13 22:17:55.000000000 +0000 @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include @@ -73,14 +73,7 @@ const char* CONTENT_DIRECTORY_SERVICE_TYPE = "urn:schemas-upnp-org:service:ContentDirectory:1"; const char* SATIP_SERVER_DEVICE_TYPE = "urn:ses-com:device:SatIPServer:1"; -#define SATIP_CHANNEL_LIST N_("SAT>IP channel list") #define SATIP_CHANNEL_LIST_URL N_("Custom SAT>IP channel list URL") -static const char *const ppsz_satip_channel_lists[] = { - "auto", "ASTRA_19_2E", "ASTRA_28_2E", "ASTRA_23_5E", "MasterList", "ServerList", "CustomList" -}; -static const char *const ppsz_readible_satip_channel_lists[] = { - N_("Auto"), "Astra 19.2°E", "Astra 28.2°E", "Astra 23.5°E", N_("Master List"), N_("Server List"), N_("Custom List") -}; /* * VLC handle @@ -128,9 +121,7 @@ set_capability( "services_discovery", 0 ); set_callbacks( SD::Open, SD::Close ); - add_string( "satip-channelist", "auto", SATIP_CHANNEL_LIST, - SATIP_CHANNEL_LIST, false ) - change_string_list( ppsz_satip_channel_lists, ppsz_readible_satip_channel_lists ) + add_obsolete_string( "satip-channelist" ) /* since 3.0.22 */ add_string( "satip-channellist-url", NULL, SATIP_CHANNEL_LIST_URL, SATIP_CHANNEL_LIST_URL, false ) @@ -606,114 +597,60 @@ { SD::MediaServerDesc* p_server = NULL; - char *psz_satip_channellist = var_InheritString( m_sd, "satip-channelist"); - - /* In Auto mode, default to MasterList list from satip.info */ - bool automode = false; - if( !psz_satip_channellist || /* On lookup failure or empty string, use auto mode */ - strcmp(psz_satip_channellist, "auto") == 0 || - strcmp(psz_satip_channellist, "Auto") == 0 ) /* for backwards compatibility */ - { - automode = true; - if( psz_satip_channellist ) - free(psz_satip_channellist); - psz_satip_channellist = strdup( "MasterList" ); - if( unlikely( !psz_satip_channellist ) ) - return; - } - vlc_url_t url; vlc_UrlParse( &url, psz_base_url ); /* Part 1: a user may have provided a custom playlist url */ - if (strcmp(psz_satip_channellist, "CustomList") == 0) { - char *psz_satip_playlist_url = var_InheritString( m_sd, "satip-channellist-url" ); - if ( psz_satip_playlist_url ) { - p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, psz_friendly_name, psz_satip_playlist_url, iconUrl ); - - if( likely( p_server ) ) { - p_server->satIpHost = url.psz_host; - p_server->isSatIp = true; - if( !addServer( p_server ) ) { - delete p_server; - } - } + char *psz_satip_playlist_url = var_InheritString( m_sd, "satip-channellist-url" ); + if ( psz_satip_playlist_url ) { + p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, psz_friendly_name, psz_satip_playlist_url, iconUrl ); - /* to comply with the SAT>IP specification, we don't fall back on another channel list if this path failed */ - free( psz_satip_channellist ); - free( psz_satip_playlist_url ); - vlc_UrlClean( &url ); - return; + if ( likely( p_server ) ) { + p_server->satIpHost = url.psz_host; + p_server->isSatIp = true; + if( !addServer( p_server ) ) { + delete p_server; + } } + + /* to comply with the SAT>IP specification, we don't fall back on another channel list if this path failed */ + free( psz_satip_playlist_url ); + vlc_UrlClean( &url ); + return; } /* Part 2: device playlist * In Automatic mode, or if requested by the user, check for a SAT>IP m3u list on the device */ - if (automode || strcmp(psz_satip_channellist, "ServerList") == 0) { - const char* psz_m3u_url = xml_getChildElementValue( p_device_element, "satip:X_SATIPM3U" ); - if ( psz_m3u_url ) { - if ( strncmp( "http", psz_m3u_url, 4) ) - { - char* psz_url = NULL; - if ( UpnpResolveURL2( psz_base_url, psz_m3u_url, &psz_url ) == UPNP_E_SUCCESS ) - { - p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, psz_friendly_name, psz_url, iconUrl ); - free(psz_url); - } - } else { - p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, psz_friendly_name, psz_m3u_url, iconUrl ); - } - - if ( unlikely( !p_server ) ) + const char* psz_m3u_url = xml_getChildElementValue( p_device_element, "satip:X_SATIPM3U" ); + if ( psz_m3u_url ) { + if ( strncmp( "http", psz_m3u_url, 4) ) + { + char* psz_url = NULL; + if ( UpnpResolveURL2( psz_base_url, psz_m3u_url, &psz_url ) == UPNP_E_SUCCESS ) { - free( psz_satip_channellist ); - vlc_UrlClean( &url ); - return; + p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, psz_friendly_name, psz_url, iconUrl ); + free(psz_url); } - - p_server->satIpHost = url.psz_host; - p_server->isSatIp = true; - if ( !addServer( p_server ) ) - delete p_server; } else { - msg_Dbg( m_sd, "SAT>IP server '%s' did not provide a playlist", url.psz_host); + p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, psz_friendly_name, psz_m3u_url, iconUrl ); } - if (!automode) { - /* to comply with the SAT>IP specifications, we don't fallback on another channel list if this path failed, - * but in Automatic mode, we continue */ - free(psz_satip_channellist); + if ( unlikely( !p_server ) ) { vlc_UrlClean( &url ); return; } - } - - /* Part 3: satip.info playlist - * In the normal case, fetch a playlist from the satip website, - * which will be processed by a lua script a bit later, to make it work sanely - * MasterList is a list of usual Satellites */ - - char *psz_url; - if (asprintf( &psz_url, "http://www.satip.info/Playlists/%s.m3u", - psz_satip_channellist ) < 0 ) { - vlc_UrlClean( &url ); - free( psz_satip_channellist ); - return; - } - p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, - psz_friendly_name, psz_url, iconUrl ); - - if( likely( p_server ) ) { p_server->satIpHost = url.psz_host; p_server->isSatIp = true; - if( !addServer( p_server ) ) { + if ( !addServer( p_server ) ) { delete p_server; + } else { + msg_Err( m_sd, "SAT>IP server '%s' did not provide a playlist", url.psz_host); } + + /* to comply with the SAT>IP specifications, we don't fallback on another channel list if this path failed */ + vlc_UrlClean( &url ); } - free( psz_url ); - free( psz_satip_channellist ); - vlc_UrlClean( &url ); } void MediaServerList::removeServer( const std::string& udn ) diff -Nru vlc-3.0.21/modules/services_discovery/windrive.c vlc-3.0.22/modules/services_discovery/windrive.c --- vlc-3.0.21/modules/services_discovery/windrive.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/services_discovery/windrive.c 2025-11-13 22:17:55.000000000 +0000 @@ -60,19 +60,19 @@ LONG drives = GetLogicalDrives (); char mrl[12] = "file:///A:/", name[3] = "A:"; - TCHAR path[4] = TEXT("A:\\"); + CHAR path[4] = "A:\\"; for (char d = 0; d < 26; d++) { input_item_t *item; - char letter = 'A' + d; + CHAR letter = 'A' + d; /* Does this drive actually exist? */ if (!(drives & (1 << d))) continue; /* Is it a disc drive? */ path[0] = letter; - if (GetDriveType (path) != DRIVE_CDROM) + if (GetDriveTypeA (path) != DRIVE_CDROM) continue; mrl[8] = name[0] = letter; diff -Nru vlc-3.0.21/modules/spu/logo.c vlc-3.0.22/modules/spu/logo.c --- vlc-3.0.21/modules/spu/logo.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/spu/logo.c 2025-11-13 22:17:55.000000000 +0000 @@ -740,8 +740,8 @@ logo_t *p_logo = LogoListCurrent( p_list ); - p_list->i_next_pic = i_date + ( p_logo->i_delay != -1 ? - p_logo->i_delay : p_list->i_delay ) * 1000; + p_list->i_next_pic = i_date + VLC_TICK_FROM_MS( p_logo->i_delay != -1 ? + p_logo->i_delay : p_list->i_delay ); return p_logo; } /** diff -Nru vlc-3.0.21/modules/stream_extractor/archive.c vlc-3.0.22/modules/stream_extractor/archive.c --- vlc-3.0.21/modules/stream_extractor/archive.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_extractor/archive.c 2025-11-13 22:17:55.000000000 +0000 @@ -131,7 +131,7 @@ static la_int64_t libarchive_skip_cb( libarchive_t* p_arc, void* p_obj, - off_t i_request ) + la_int64_t i_request ) { VLC_UNUSED( p_arc ); @@ -454,7 +454,10 @@ } const magicbytes[] = { /* keep heaviest at top */ { 257, 5, "ustar" }, //TAR - { 0, 7, "Rar!\x1A\x07" }, //RAR +#if ARCHIVE_VERSION_NUMBER >= 3004000 + { 0, 8, "Rar!\x1A\x07\x01" }, //RAR5.0 +#endif + { 0, 7, "Rar!\x1A\x07" }, //RAR4.x { 0, 6, "7z\xBC\xAF\x27\x1C" }, //7z { 0, 4, "xar!" }, //XAR { 0, 4, "PK\x03\x04" }, //ZIP @@ -606,16 +609,16 @@ return 0; } -static int archive_skip_decompressed( stream_extractor_t* p_extractor, uint64_t i_skip ) +static int archive_skip_decompressed( stream_extractor_t* p_extractor, uint64_t *pi_skip ) { - while( i_skip ) + while( *pi_skip ) { - ssize_t i_read = Read( p_extractor, NULL, i_skip ); + ssize_t i_read = Read( p_extractor, NULL, *pi_skip ); if( i_read < 1 ) return VLC_EGENERIC; - i_skip -= i_read; + *pi_skip -= i_read; } return VLC_SUCCESS; @@ -660,9 +663,13 @@ i_skip = i_req; i_offset = 0; } - - if( archive_skip_decompressed( p_extractor, i_skip ) ) - msg_Dbg( p_extractor, "failed to skip to seek position" ); + if( archive_skip_decompressed( p_extractor, &i_skip ) ) + { + msg_Warn( p_extractor, "failed to skip to seek position %" PRIu64 "/%" PRId64, + i_req, archive_entry_size( p_sys->p_entry ) ); + p_sys->i_offset += i_skip; + return VLC_EGENERIC; + } } p_sys->i_offset = i_req; diff -Nru vlc-3.0.21/modules/stream_filter/aribcam.c vlc-3.0.22/modules/stream_filter/aribcam.c --- vlc-3.0.21/modules/stream_filter/aribcam.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_filter/aribcam.c 2025-11-13 22:17:55.000000000 +0000 @@ -197,7 +197,7 @@ else { if ( i_srcread < 0 ) - msg_Err( p_stream, "Can't read %lu bytes from source stream: %d", i_toread, i_srcread ); + msg_Err( p_stream, "Can't read %zu bytes from source stream: %d", i_toread, i_srcread ); return 0; } diff -Nru vlc-3.0.21/modules/stream_filter/hds/hds.c vlc-3.0.22/modules/stream_filter/hds/hds.c --- vlc-3.0.21/modules/stream_filter/hds/hds.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_filter/hds/hds.c 2025-11-13 22:17:55.000000000 +0000 @@ -1557,7 +1557,7 @@ new_stream->metadata_len = medias[i].metadata_len; } - if( ! sys->live ) + if( ! sys->live && bootstraps[j].data ) { parse_BootstrapData( (vlc_object_t*)s, new_stream, @@ -1579,7 +1579,7 @@ total_duration += chunk->duration; } } - else + else if( bootstraps[j].url ) { if( !(new_stream->abst_url = strdup( bootstraps[j].url ) ) ) { diff -Nru vlc-3.0.21/modules/stream_out/bridge.c vlc-3.0.22/modules/stream_out/bridge.c --- vlc-3.0.21/modules/stream_out/bridge.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_out/bridge.c 2025-11-13 22:17:55.000000000 +0000 @@ -396,7 +396,7 @@ p_sys->i_id_offset = val.i_int; var_Get( p_stream, SOUT_CFG_PREFIX_IN "delay", &val ); - p_sys->i_delay = (vlc_tick_t)val.i_int * 1000; + p_sys->i_delay = VLC_TICK_FROM_MS(val.i_int); var_Get( p_stream, SOUT_CFG_PREFIX_IN "name", &val ); if( asprintf( &p_sys->psz_name, "bridge-struct-%s", val.psz_string )<0 ) @@ -416,7 +416,7 @@ p_sys->i_state = placeholder_on; var_Get( p_stream, SOUT_CFG_PREFIX_IN "placeholder-delay", &val ); - p_sys->i_placeholder_delay = (vlc_tick_t)val.i_int * 1000; + p_sys->i_placeholder_delay = VLC_TICK_FROM_MS(val.i_int); p_sys->i_last_video = VLC_TICK_INVALID; p_sys->i_last_audio = VLC_TICK_INVALID; diff -Nru vlc-3.0.21/modules/stream_out/chromecast/chromecast_demux.cpp vlc-3.0.22/modules/stream_out/chromecast/chromecast_demux.cpp --- vlc-3.0.21/modules/stream_out/chromecast/chromecast_demux.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_out/chromecast/chromecast_demux.cpp 2025-11-13 22:17:55.000000000 +0000 @@ -34,7 +34,7 @@ #include "chromecast_common.h" -#include +#include #include static void on_paused_changed_cb(void *data, bool paused); diff -Nru vlc-3.0.21/modules/stream_out/delay.c vlc-3.0.22/modules/stream_out/delay.c --- vlc-3.0.21/modules/stream_out/delay.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_out/delay.c 2025-11-13 22:17:55.000000000 +0000 @@ -106,7 +106,7 @@ p_stream->p_cfg ); p_sys->i_id = var_GetInteger( p_stream, SOUT_CFG_PREFIX "id" ); - p_sys->i_delay = 1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "delay" ); + p_sys->i_delay = VLC_TICK_FROM_MS(var_GetInteger( p_stream, SOUT_CFG_PREFIX "delay" )); p_stream->pf_add = Add; p_stream->pf_del = Del; diff -Nru vlc-3.0.21/modules/stream_out/es.c vlc-3.0.22/modules/stream_out/es.c --- vlc-3.0.21/modules/stream_out/es.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_out/es.c 2025-11-13 22:17:55.000000000 +0000 @@ -209,8 +209,8 @@ sout_mux_t *p_mux; }; -static char * es_print_url( const char *psz_fmt, vlc_fourcc_t i_fourcc, int i_count, - const char *psz_access, const char *psz_mux ) +VLC_MALLOC static char * es_print_url( const char *psz_fmt, vlc_fourcc_t i_fourcc, int i_count, + const char *psz_access, const char *psz_mux ) { struct vlc_memstream stream; unsigned char c; diff -Nru vlc-3.0.21/modules/stream_out/rtp.c vlc-3.0.22/modules/stream_out/rtp.c --- vlc-3.0.21/modules/stream_out/rtp.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_out/rtp.c 2025-11-13 22:17:55.000000000 +0000 @@ -981,7 +981,7 @@ id->b_first_packet = true; id->i_caching = - (int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching"); + VLC_TICK_FROM_MS(var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching")); vlc_rand_bytes (&id->i_sequence, sizeof (id->i_sequence)); vlc_rand_bytes (id->ssrc, sizeof (id->ssrc)); diff -Nru vlc-3.0.21/modules/stream_out/transcode/video.c vlc-3.0.22/modules/stream_out/transcode/video.c --- vlc-3.0.21/modules/stream_out/transcode/video.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/stream_out/transcode/video.c 2025-11-13 22:17:55.000000000 +0000 @@ -658,17 +658,20 @@ void transcode_video_close( sout_stream_t *p_stream, sout_stream_id_sys_t *id ) { - if( p_stream->p_sys->i_threads >= 1 && !p_stream->p_sys->b_abort ) + if( p_stream->p_sys->i_threads >= 1 ) { - vlc_mutex_lock( &p_stream->p_sys->lock_out ); - p_stream->p_sys->b_abort = true; - vlc_cond_signal( &p_stream->p_sys->cond ); - vlc_mutex_unlock( &p_stream->p_sys->lock_out ); + if (!p_stream->p_sys->b_abort) + { + vlc_mutex_lock( &p_stream->p_sys->lock_out ); + p_stream->p_sys->b_abort = true; + vlc_cond_signal( &p_stream->p_sys->cond ); + vlc_mutex_unlock( &p_stream->p_sys->lock_out ); - vlc_join( p_stream->p_sys->thread, NULL ); + vlc_join( p_stream->p_sys->thread, NULL ); + block_ChainRelease( p_stream->p_sys->p_buffers ); + } picture_fifo_Delete( p_stream->p_sys->pp_pics ); - block_ChainRelease( p_stream->p_sys->p_buffers ); } if( p_stream->p_sys->i_threads >= 1 ) @@ -906,7 +909,7 @@ vlc_join( p_stream->p_sys->thread, NULL ); vlc_mutex_lock( &p_sys->lock_out ); - *out = p_sys->p_buffers; + block_ChainAppend(out, p_sys->p_buffers); p_sys->p_buffers = NULL; vlc_mutex_unlock( &p_sys->lock_out ); diff -Nru vlc-3.0.21/modules/text_renderer/freetype/fonts/win32.c vlc-3.0.22/modules/text_renderer/freetype/fonts/win32.c --- vlc-3.0.21/modules/text_renderer/freetype/fonts/win32.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/text_renderer/freetype/fonts/win32.c 2025-11-13 22:17:55.000000000 +0000 @@ -169,8 +169,9 @@ wchar_t wdir[MAX_PATH]; if( S_OK != SHGetFolderPathW( NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT, wdir ) ) { - GetWindowsDirectoryW( wdir, MAX_PATH ); - wcscat( wdir, L"\\fonts" ); + UINT wdirlen = GetWindowsDirectoryW( wdir, MAX_PATH ); + if ( wdirlen + 1 + wcslen(L"\\fonts") <= MAX_PATH ) + wcscpy( &wdir[wdirlen], L"\\fonts" ); } return FromWide( wdir ); } @@ -422,7 +423,7 @@ lf.lfCharSet = DEFAULT_CHARSET; LPTSTR psz_fbuffer = ToT( psz_family ); - _tcsncpy( (LPTSTR)&lf.lfFaceName, psz_fbuffer, LF_FACESIZE ); + _tcsncpy( lf.lfFaceName, psz_fbuffer, ARRAY_SIZE(lf.lfFaceName) ); free( psz_fbuffer ); /* */ @@ -477,7 +478,7 @@ psz_fbuffer = ToT( psz_family ); if( !psz_fbuffer ) goto error; - _tcsncpy( ( LPTSTR ) &lf.lfFaceName, psz_fbuffer, LF_FACESIZE ); + _tcsncpy( lf.lfFaceName, psz_fbuffer, ARRAY_SIZE(lf.lfFaceName) ); free( psz_fbuffer ); lf.lfCharSet = DEFAULT_CHARSET; diff -Nru vlc-3.0.21/modules/text_renderer/freetype/platform_fonts.c vlc-3.0.22/modules/text_renderer/freetype/platform_fonts.c --- vlc-3.0.21/modules/text_renderer/freetype/platform_fonts.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/text_renderer/freetype/platform_fonts.c 2025-11-13 22:17:55.000000000 +0000 @@ -464,7 +464,11 @@ } else if ( p_style->f_font_relsize ) { - i_font_size = (int) p_filter->fmt_out.video.i_height * p_style->f_font_relsize / 100; + unsigned area_height = p_filter->fmt_out.video.i_height; + if (p_filter->fmt_out.video.i_height > p_filter->fmt_out.video.i_width ) + // portrait mode leads to very large text + area_height = p_filter->fmt_out.video.i_width; + i_font_size = (int) area_height * p_style->f_font_relsize / 100; } if( p_sys->i_scale != 100 ) diff -Nru vlc-3.0.21/modules/text_renderer/svg.c vlc-3.0.22/modules/text_renderer/svg.c --- vlc-3.0.21/modules/text_renderer/svg.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/text_renderer/svg.c 2025-11-13 22:17:55.000000000 +0000 @@ -80,9 +80,6 @@ set_callbacks( Create, Destroy ) vlc_module_end () -static void svg_RescaletoFit ( filter_t *, int *width, int *height, float * ); -static picture_t * svg_RenderPicture ( filter_t *p_filter, const char * ); - static void svg_LoadTemplate( filter_t *p_filter ) { filter_sys_t *p_sys = p_filter->p_sys; @@ -133,6 +130,7 @@ { msg_Err( p_filter, "'%s' not found in SVG template", SVG_TEMPLATE_BODY_TOKEN ); free( psz_template ); + psz_template = NULL; } else *((char*)p_sys->psz_token) = 0; } @@ -256,6 +254,10 @@ fmt.i_chroma = VLC_CODEC_BGRA; fmt.i_width = fmt.i_visible_width = dim.width; fmt.i_height = fmt.i_visible_height = dim.height; + fmt.transfer = TRANSFER_FUNC_SRGB; + fmt.primaries = COLOR_PRIMARIES_SRGB; + fmt.space = COLOR_SPACE_SRGB; + fmt.b_color_range_full = true; picture_t *p_picture = picture_NewFromFormat( &fmt ); if( !p_picture ) diff -Nru vlc-3.0.21/modules/video_chroma/d3d11_fmt.c vlc-3.0.22/modules/video_chroma/d3d11_fmt.c --- vlc-3.0.21/modules/video_chroma/d3d11_fmt.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_chroma/d3d11_fmt.c 2025-11-13 22:17:55.000000000 +0000 @@ -147,7 +147,6 @@ static HKEY GetAdapterRegistry(vlc_object_t *obj, DXGI_ADAPTER_DESC *adapterDesc) { HKEY hDisplayKey, hKey; - CHAR key[128]; CHAR szData[256], lookup[256]; DWORD len = 256; LSTATUS ret; @@ -194,7 +193,7 @@ return NULL; } -void D3D11_GetDriverVersion(vlc_object_t *obj, d3d11_device_t *d3d_dev) +static void D3D11_GetSystemDriver(vlc_object_t *obj, d3d11_device_t *d3d_dev) { memset(&d3d_dev->WDDM, 0, sizeof(d3d_dev->WDDM)); @@ -236,7 +235,7 @@ } } #else /* VLC_WINSTORE_APP */ -void D3D11_GetDriverVersion(vlc_object_t *obj, d3d11_device_t *d3d_dev) +static void D3D11_GetSystemDriver(vlc_object_t *obj, d3d11_device_t *d3d_dev) { VLC_UNUSED(obj); VLC_UNUSED(d3d_dev); @@ -244,6 +243,36 @@ } #endif /* VLC_WINSTORE_APP */ +void D3D11_GetDriverVersion(vlc_object_t *obj, d3d11_device_t *d3d_dev) +{ + memset(&d3d_dev->WDDM, 0, sizeof(d3d_dev->WDDM)); + + LARGE_INTEGER driver = { 0 }; + HRESULT hr; + IDXGIAdapter *pAdapter = D3D11DeviceAdapter(d3d_dev->d3ddevice); + hr = IDXGIAdapter_CheckInterfaceSupport(pAdapter, &IID_IDXGIDevice, &driver); + + if (FAILED(hr)) + { + msg_Dbg(obj, "failed to get interface version. (hr=0x%lX)", hr); + D3D11_GetSystemDriver(obj, d3d_dev); + } + else if (HIWORD(driver.HighPart) < 23) + // starting with WDDM 2.3 driver versions must be coherent + // https://learn.microsoft.com/en-us/windows/win32/api/dxgi/nf-dxgi-idxgiadapter-checkinterfacesupport#parameters + { + msg_Dbg(obj, "unsupported interface version %" PRIx64, driver.QuadPart); + D3D11_GetSystemDriver(obj, d3d_dev); + } + else + { + d3d_dev->WDDM.wddm = HIWORD(driver.HighPart); + d3d_dev->WDDM.d3d_features = LOWORD(driver.LowPart); + d3d_dev->WDDM.revision = HIWORD(driver.LowPart); + d3d_dev->WDDM.build = LOWORD(driver.LowPart); + } +} + void D3D11_ReleaseDevice(d3d11_device_t *d3d_dev) { if (d3d_dev->d3dcontext) @@ -571,6 +600,7 @@ #undef AllocateTextures int AllocateTextures( vlc_object_t *obj, d3d11_device_t *d3d_dev, const d3d_format_t *cfg, const video_format_t *fmt, + bool for_decoder, bool shared, unsigned pool_size, ID3D11Texture2D *textures[] ) { plane_t planes[PICTURE_PLANE_MAX]; @@ -584,7 +614,8 @@ texDesc.MiscFlags = 0; //D3D11_RESOURCE_MISC_SHARED; texDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE; if (is_d3d11_opaque(fmt->i_chroma)) { - texDesc.BindFlags |= D3D11_BIND_DECODER; + if (for_decoder) + texDesc.BindFlags |= D3D11_BIND_DECODER; texDesc.Usage = D3D11_USAGE_DEFAULT; texDesc.CPUAccessFlags = 0; } else { @@ -592,6 +623,8 @@ texDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; } texDesc.ArraySize = pool_size; + if (shared) + texDesc.MiscFlags |= D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_NTHANDLE; const vlc_chroma_description_t *p_chroma_desc = vlc_fourcc_GetChromaDescription( fmt->i_chroma ); if( !p_chroma_desc ) diff -Nru vlc-3.0.21/modules/video_chroma/d3d11_fmt.h vlc-3.0.22/modules/video_chroma/d3d11_fmt.h --- vlc-3.0.21/modules/video_chroma/d3d11_fmt.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_chroma/d3d11_fmt.h 2025-11-13 22:17:55.000000000 +0000 @@ -159,8 +159,9 @@ } int AllocateTextures(vlc_object_t *, d3d11_device_t *, const d3d_format_t *, - const video_format_t *, unsigned pool_size, ID3D11Texture2D *textures[]); -#define AllocateTextures(a,b,c,d,e,f) AllocateTextures(VLC_OBJECT(a),b,c,d,e,f) + const video_format_t *, bool decoder, bool shared, + unsigned pool_size, ID3D11Texture2D *textures[]); +#define AllocateTextures(a,b,c,d,e,f,g,h) AllocateTextures(VLC_OBJECT(a),b,c,d,e,f,g,h) #ifndef NDEBUG void D3D11_LogProcessorSupport(vlc_object_t*, ID3D11VideoProcessorEnumerator*); diff -Nru vlc-3.0.21/modules/video_filter/amf_frc.c vlc-3.0.22/modules/video_filter/amf_frc.c --- vlc-3.0.21/modules/video_filter/amf_frc.c 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.22/modules/video_filter/amf_frc.c 2025-11-13 22:17:55.000000000 +0000 @@ -0,0 +1,342 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/***************************************************************************** + * amf_frc: Frame Rate doubler video with low frame rate + ***************************************************************************** + * Copyright © 2024 Videolabs, VLC authors and VideoLAN + * + * Authors: Steve Lhomme + *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include + +#define COBJMACROS +#include "../hw/amf/amf_helper.h" +#include + +#include "../video_chroma/d3d11_fmt.h" +#include "../hw/d3d11/d3d11_filters.h" + +#include + +static GUID AMFVLCTextureArrayIndexGUID = { 0x28115527, 0xe7c3, 0x4b66, {0x99, 0xd3, 0x4f, 0x2a, 0xe6, 0xb4, 0x7f, 0xaf} }; + +static const char *const ppsz_filter_options[] = { + "frc-indicator", NULL +}; + +struct filter_sys_t +{ + d3d11_handle_t hd3d; + d3d11_device_t d3d_dev; + + struct vlc_amf_context amf; + AMFComponent *amf_frc; + const d3d_format_t *cfg; + + enum AMF_FRC_MODE_TYPE mode; + bool source_rate; + date_t next_output_pts; +}; + +static picture_t *PictureFromTexture(filter_t *filter, d3d11_device_t *d3d_dev, ID3D11Texture2D *out) +{ + picture_t *p_outpic = filter_NewPicture( filter ); + if( !p_outpic ) + { + return NULL; + } + picture_sys_t *src_sys = ActivePictureSys(p_outpic); + if (unlikely(!src_sys)) + { + /* the output filter configuration may have changed since the filter + * was opened */ + picture_Release(p_outpic); + return NULL; + } + + d3d11_device_lock( d3d_dev ); + ID3D11DeviceContext_CopySubresourceRegion(src_sys->context, + src_sys->resource[KNOWN_DXGI_INDEX], + src_sys->slice_index, + 0, 0, 0, + (ID3D11Resource*)out, + 0, + NULL); + d3d11_device_unlock( d3d_dev ); + return p_outpic; +} + +static picture_t * Filter(filter_t *filter, picture_t *p_pic) +{ + struct filter_sys_t *sys = filter->p_sys; + + picture_sys_t *src_sys = ActivePictureSys(p_pic); + + AMF_RESULT res; + AMFSurface *submitSurface = NULL; + + struct filter_sys_t *dev_sys = sys; + + res = sys->amf.Context->pVtbl->CreateSurfaceFromDX11Native(sys->amf.Context, (void*)src_sys->resource[KNOWN_DXGI_INDEX], &submitSurface, NULL); + if (res != AMF_OK) + { + msg_Err(filter, "filter surface allocation failed (err=%d)", res); + if (submitSurface) + submitSurface->pVtbl->Release(submitSurface); + return p_pic; + } + amf_int subResourceIndex = src_sys->slice_index; + ID3D11Resource_SetPrivateData(src_sys->resource[KNOWN_DXGI_INDEX], &AMFVLCTextureArrayIndexGUID, sizeof(subResourceIndex), &subResourceIndex); + + res = sys->amf_frc->pVtbl->SubmitInput(sys->amf_frc, (AMFData*)submitSurface); + submitSurface->pVtbl->Release(submitSurface); + if (res == AMF_INPUT_FULL) + { + msg_Dbg(filter, "filter input full, skip this frame"); + return p_pic; + } + if (res != AMF_OK) + { + msg_Err(filter, "filter input failed (err=%d)", res); + return p_pic; + } + + date_Set( &sys->next_output_pts, p_pic->date ); + bool got_output = sys->mode != FRC_x2_PRESENT; + do { + AMFData *amfOutput = NULL; + d3d11_device_lock( &dev_sys->d3d_dev ); // may consider to connect with AMFContext::LockDX11()/UnlockDX11() + res = sys->amf_frc->pVtbl->QueryOutput(sys->amf_frc, &amfOutput); + d3d11_device_unlock( &dev_sys->d3d_dev ); + if (res != AMF_OK && res != AMF_REPEAT) + { + msg_Err(filter, "filter gave no output (err=%d)", res); + break; + } + + AMFSurface *amfOutputSurface = (AMFSurface*)amfOutput; + AMFPlane *packed = amfOutputSurface->pVtbl->GetPlane(amfOutputSurface, AMF_PLANE_PACKED); + + assert(amfOutput->pVtbl->GetMemoryType(amfOutput) == AMF_MEMORY_DX11); + ID3D11Texture2D *out = packed->pVtbl->GetNative(packed); + picture_t *dst = PictureFromTexture(filter, &dev_sys->d3d_dev, out); + amfOutput->pVtbl->Release(amfOutput); + if (dst == NULL) + break; + + picture_CopyProperties(dst, p_pic); + if (!got_output) + { + picture_Release(p_pic); + p_pic = dst; + got_output = true; + } + else + { + if (sys->mode == FRC_x2_PRESENT) + { + // teh first frame is the interpolated one with the previous frame + dst->date = date_Get( &sys->next_output_pts ); + p_pic->date = date_Decrement( &sys->next_output_pts, 1 ); + p_pic->p_next = dst; + } + else + { + // past interpolated then source + dst->p_next = p_pic; + dst->date = date_Decrement( &sys->next_output_pts, 1 ); + p_pic = dst; + } + } + } while (res == AMF_REPEAT); + + return p_pic; +} + +void D3D11CloseAMFFRC(vlc_object_t *p_this) +{ + filter_t *filter = container_of(p_this, filter_t, obj); + struct filter_sys_t *sys = filter->p_sys; + sys->amf_frc->pVtbl->Release(sys->amf_frc); + if (sys->d3d_dev.d3dcontext) + D3D11_FilterReleaseInstance(&sys->d3d_dev); + D3D11_Destroy(&sys->hd3d); +} + +int D3D11CreateAMFFRC(vlc_object_t *p_this) +{ + filter_t *filter = container_of(p_this, filter_t, obj); + if (!is_d3d11_opaque(filter->fmt_in.video.i_chroma)) + return VLC_EGENERIC; + if (!video_format_IsSimilar(&filter->fmt_in.video, &filter->fmt_out.video)) + return VLC_EGENERIC; + + struct filter_sys_t *sys = vlc_obj_calloc(VLC_OBJECT(filter), 1, sizeof(*sys)); + if (unlikely(sys == NULL)) + return VLC_ENOMEM; + + if ( unlikely(D3D11_Create(filter, &sys->hd3d, false) != VLC_SUCCESS )) + { + msg_Err(filter, "Could not access the d3d11."); + goto error; + } + + D3D11_TEXTURE2D_DESC dstDesc; + D3D11_FilterHoldInstance(filter, &sys->d3d_dev, &dstDesc); + if (unlikely(sys->d3d_dev.d3dcontext==NULL)) + { + msg_Dbg(filter, "Filter without a context"); + return VLC_ENOOBJ; + } + + struct filter_sys_t *dev_sys = sys; + + if (dev_sys->d3d_dev.adapterDesc.VendorId != GPU_MANUFACTURER_AMD) + { + msg_Err(filter, "AMF filter only supported with AMD GPUs"); + D3D11_FilterReleaseInstance(&sys->d3d_dev); + D3D11_Destroy(&sys->hd3d); + return VLC_EGENERIC; + } + + config_ChainParse( filter, "", ppsz_filter_options, filter->p_cfg ); + + sys->mode = FRC_x2_PRESENT; //FRC_ONLY_INTERPOLATED; + + DXGI_FORMAT input_format = dstDesc.Format; + const d3d_format_t *cfg; + for (cfg = GetRenderFormatList(); cfg->name != NULL; ++cfg) + { + if (cfg->formatTexture == input_format && + is_d3d11_opaque(cfg->fourcc)) + break; + } + assert(cfg != NULL); + + AMF_SURFACE_FORMAT amf_fmt = DXGIToAMF(input_format); + if (amf_fmt == AMF_SURFACE_UNKNOWN) + { + msg_Err(filter, "Unsupported DXGI format %s", cfg->name); + return VLC_EGENERIC; + } + + int err = vlc_AMFCreateContext(&sys->amf); + if (err != VLC_SUCCESS) + return err; + +#if 0 + if (sys->amf.Version < AMF_MAKE_FULL_VERSION(1,4,34,0)) + { + msg_Dbg(filter, "AMF version %u.%u.%u too old for FRC (1.4.34 needed)", + (unsigned)AMF_GET_MAJOR_VERSION(sys->amf.Version), + (unsigned)AMF_GET_MINOR_VERSION(sys->amf.Version), + (unsigned)AMF_GET_SUBMINOR_VERSION(sys->amf.Version)); + goto error; + } +#endif + + AMF_RESULT res; + res = sys->amf.Context->pVtbl->InitDX11(sys->amf.Context, dev_sys->d3d_dev.d3ddevice, AMF_DX11_0); + if (res != AMF_OK) + goto error; + + res = sys->amf.pFactory->pVtbl->CreateComponent(sys->amf.pFactory, sys->amf.Context, AMFFRC, &sys->amf_frc); + if (res != AMF_OK || sys->amf_frc == NULL) + goto error; + +// TODO AMF_STREAM_VIDEO_FRAME_RATE + + AMFVariantStruct val; + val.int64Value = FRC_ENGINE_DX11; + val.type = AMF_VARIANT_INT64; + res = sys->amf_frc->pVtbl->SetProperty(sys->amf_frc, AMF_FRC_ENGINE_TYPE, val); + if (unlikely(res != AMF_OK)) + { + msg_Err(filter, "Failed to set D3D11 engine type (err=%d)", res); + goto error; + } + + val.boolValue = false; + val.type = AMF_VARIANT_BOOL; + res = sys->amf_frc->pVtbl->SetProperty(sys->amf_frc, AMF_FRC_ENABLE_FALLBACK, val); + if (unlikely(res != AMF_OK)) + { + msg_Err(filter, "Failed to disable fallback (err=%d)", res); + goto error; + } + + val.int64Value = FRC_PROFILE_HIGH; + val.type = AMF_VARIANT_INT64; + res = sys->amf_frc->pVtbl->SetProperty(sys->amf_frc, AMF_FRC_PROFILE, val); + if (unlikely(res != AMF_OK)) + { + msg_Err(filter, "Failed to set FRC profile to %" PRId64 " (err=%d)", val.int64Value, res); + goto error; + } + + val.int64Value = FRC_MV_SEARCH_NATIVE; + val.type = AMF_VARIANT_INT64; + res = sys->amf_frc->pVtbl->SetProperty(sys->amf_frc, AMF_FRC_MV_SEARCH_MODE, val); + if (unlikely(res != AMF_OK)) + { + msg_Err(filter, "Failed to set FRC mv search to %" PRId64 " (err=%d)", val.int64Value, res); + goto error; + } + + val.int64Value = sys->mode; + val.type = AMF_VARIANT_INT64; + res = sys->amf_frc->pVtbl->SetProperty(sys->amf_frc, AMF_FRC_MODE, val); + if (unlikely(res != AMF_OK)) + { + msg_Err(filter, "Failed to set FRC mode to %" PRId64 " (err=%d)", val.int64Value, res); + goto error; + } + + val.boolValue = var_GetBool (filter, "frc-indicator"); + val.type = AMF_VARIANT_BOOL; + res = sys->amf_frc->pVtbl->SetProperty(sys->amf_frc, AMF_FRC_INDICATOR, val); + if (res != AMF_OK) + goto error; + + res = sys->amf_frc->pVtbl->Init(sys->amf_frc, amf_fmt, + filter->fmt_in.video.i_width, + filter->fmt_in.video.i_height); + if (res != AMF_OK) + goto error; + + sys->cfg = cfg; + filter->pf_video_filter = Filter; + filter->p_sys = sys; + + sys->source_rate = filter->fmt_out.video.i_frame_rate_base != 0 && + filter->fmt_out.video.i_frame_rate != 0; + + if (!sys->source_rate) + { + msg_Warn( filter, "Missing frame rate, assuming 25fps source" ); + filter->fmt_out.video.i_frame_rate = 25; + filter->fmt_out.video.i_frame_rate_base = 1; + } + + filter->fmt_out.video.i_frame_rate = 2 * filter->fmt_out.video.i_frame_rate; + + date_Init( &sys->next_output_pts, + filter->fmt_out.video.i_frame_rate, filter->fmt_out.video.i_frame_rate_base ); + + return VLC_SUCCESS; +error: + if (sys->d3d_dev.d3dcontext) + D3D11_FilterReleaseInstance(&sys->d3d_dev); + if (sys->amf_frc != NULL) + sys->amf_frc->pVtbl->Release(sys->amf_frc); + vlc_AMFReleaseContext(&sys->amf); + D3D11_Destroy(&sys->hd3d); + return VLC_EGENERIC; +} diff -Nru vlc-3.0.21/modules/video_filter/amf_vqenhancer.c vlc-3.0.22/modules/video_filter/amf_vqenhancer.c --- vlc-3.0.21/modules/video_filter/amf_vqenhancer.c 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/modules/video_filter/amf_vqenhancer.c 2025-11-13 22:17:55.000000000 +0000 @@ -175,6 +175,16 @@ return VLC_ENOOBJ; } + struct filter_sys_t *dev_sys = sys; + + if (dev_sys->d3d_dev.adapterDesc.VendorId != GPU_MANUFACTURER_AMD) + { + msg_Err(filter, "AMF filter only supported with AMD GPUs"); + D3D11_FilterReleaseInstance(&sys->d3d_dev); + D3D11_Destroy(&sys->hd3d); + return VLC_EGENERIC; + } + DXGI_FORMAT input_format = dstDesc.Format; const d3d_format_t *cfg; for (cfg = GetRenderFormatList(); cfg->name != NULL; ++cfg) @@ -192,8 +202,6 @@ return VLC_EGENERIC; } - struct filter_sys_t *dev_sys = sys; - HRESULT hr; HANDLE context_lock = INVALID_HANDLE_VALUE; UINT dataSize = sizeof(context_lock); diff -Nru vlc-3.0.21/modules/video_filter/canvas.c vlc-3.0.22/modules/video_filter/canvas.c --- vlc-3.0.21/modules/video_filter/canvas.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_filter/canvas.c 2025-11-24 23:00:36.000000000 +0000 @@ -329,10 +329,12 @@ fmt.video.i_height = p_filter->fmt_in.video.i_height * fmt.video.i_visible_height / p_filter->fmt_in.video.i_visible_height; filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, &fmt ); + es_format_Clean( &fmt ); /* Append scaling module */ if ( filter_chain_AppendConverter( p_sys->p_chain, NULL, NULL ) ) { msg_Err( p_filter, "Could not append scaling filter" ); + filter_chain_Delete( p_sys->p_chain ); free( p_sys ); return VLC_EGENERIC; } diff -Nru vlc-3.0.21/modules/video_filter/magnify.c vlc-3.0.22/modules/video_filter/magnify.c --- vlc-3.0.21/modules/video_filter/magnify.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_filter/magnify.c 2025-11-13 22:17:55.000000000 +0000 @@ -244,6 +244,11 @@ /* */ fmt_out = p_filter->fmt_out.video; p_converted = image_Convert( p_sys->p_image, p_pic, &fmt_in, &fmt_out ); + if (unlikely(!p_converted)) + { + picture_Release( p_outpic ); + return NULL; + } memcpy(p_pic->p, orig_planes, sizeof orig_planes); picture_CopyPixels( p_outpic, p_converted ); @@ -267,6 +272,11 @@ fmt_out.i_height = fmt_out.i_visible_height = (fmt_out.i_visible_height/VIS_ZOOM) & ~1; p_converted = image_Convert( p_sys->p_image, p_pic, &p_pic->format, &fmt_out ); + if (unlikely(!p_converted)) + { + picture_Release( p_outpic ); + return NULL; + } /* It will put only what can be copied at the top left */ picture_CopyVisiblePixels( p_outpic, p_converted ); diff -Nru vlc-3.0.21/modules/video_filter/opencv_wrapper.c vlc-3.0.22/modules/video_filter/opencv_wrapper.c --- vlc-3.0.21/modules/video_filter/opencv_wrapper.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_filter/opencv_wrapper.c 2025-11-13 22:17:55.000000000 +0000 @@ -444,9 +444,16 @@ p_filter->p_sys->p_proc_image, &(p_filter->p_sys->p_proc_image->format), &fmt_out ); - - picture_CopyPixels( p_outpic, p_outpic_tmp ); - CopyInfoAndRelease( p_outpic, p_outpic_tmp ); + if (unlikely(!p_outpic_tmp)) + { + picture_Release(p_outpic); + p_outpic = NULL; + } + else + { + picture_CopyPixels( p_outpic, p_outpic_tmp ); + CopyInfoAndRelease( p_outpic, p_outpic_tmp ); + } } else if( p_filter->p_sys->i_internal_chroma == CINPUT ) { picture_CopyPixels( p_outpic, p_filter->p_sys->p_proc_image ); picture_CopyProperties( p_outpic, p_filter->p_sys->p_proc_image ); diff -Nru vlc-3.0.21/modules/video_output/Makefile.am vlc-3.0.22/modules/video_output/Makefile.am --- vlc-3.0.21/modules/video_output/Makefile.am 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_output/Makefile.am 2025-11-13 22:17:55.000000000 +0000 @@ -1,5 +1,9 @@ voutdir = $(pluginsdir)/video_output vout_LTLIBRARIES = +# Install the pkglib/pkglibexec first before relinking the modules. +# This ensures libtool re-linking is not racy. +installvoutLTLIBRARIES = install-voutLTLIBRARIES +$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES EXTRA_DIST += video_output/README diff -Nru vlc-3.0.21/modules/video_output/android/display.c vlc-3.0.22/modules/video_output/android/display.c --- vlc-3.0.21/modules/video_output/android/display.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_output/android/display.c 2025-11-13 22:17:55.000000000 +0000 @@ -430,8 +430,7 @@ } static int AndroidWindow_SetupANWP(vout_display_sys_t *sys, - android_window *p_window, - bool b_java_configured) + android_window *p_window) { unsigned int i_max_buffer_count = 0; @@ -444,8 +443,7 @@ if (sys->anwp.setUsage(p_window->p_surface_priv, false, 0) != 0) goto error; - if (!b_java_configured - && sys->anwp.setBuffersGeometry(p_window->p_surface_priv, + if (sys->anwp.setBuffersGeometry(p_window->p_surface_priv, p_window->fmt.i_width, p_window->fmt.i_height, p_window->i_android_hal) != 0) @@ -483,39 +481,13 @@ return -1; } -static int AndroidWindow_ConfigureJavaSurface(vout_display_sys_t *sys, - android_window *p_window, - bool *p_java_configured) -{ - /* setBuffersGeometry is broken before ics. Use - * AJavaWindow_setBuffersGeometry to configure the surface on the java side - * synchronously. AJavaWindow_setBuffersGeometry return en error when you - * don't need to call it (ie, after ics). if this call succeed, you need to - * get a new surface handle. That's why AndroidWindow_DisconnectSurface is - * called here. */ - if (AWindowHandler_setBuffersGeometry(sys->p_awh, p_window->id, - p_window->fmt.i_width, - p_window->fmt.i_height, - p_window->i_android_hal) == VLC_SUCCESS) - { - *p_java_configured = true; - AndroidWindow_DisconnectSurface(sys, p_window); - if (AndroidWindow_ConnectSurface(sys, p_window) != 0) - return -1; - } else - *p_java_configured = false; - - return 0; -} - static int AndroidWindow_SetupANW(vout_display_sys_t *sys, - android_window *p_window, - bool b_java_configured) + android_window *p_window) { p_window->i_pic_count = 1; p_window->i_min_undequeued = 0; - if (!b_java_configured && sys->anw->setBuffersGeometry) + if (sys->anw->setBuffersGeometry) return sys->anw->setBuffersGeometry(p_window->p_surface, p_window->fmt.i_width, p_window->fmt.i_height, @@ -528,8 +500,6 @@ android_window *p_window, unsigned int i_pic_count) { - bool b_java_configured = false; - if (i_pic_count != 0) p_window->i_pic_count = i_pic_count; @@ -543,13 +513,9 @@ p_window->fmt.i_width = (p_pic->format.i_width + align_pixels) & ~align_pixels; picture_Release(p_pic); - if (AndroidWindow_ConfigureJavaSurface(sys, p_window, - &b_java_configured) != 0) - return -1; - if (!p_window->b_use_priv - || AndroidWindow_SetupANWP(sys, p_window, b_java_configured) != 0) { - if (AndroidWindow_SetupANW(sys, p_window, b_java_configured) != 0) + || AndroidWindow_SetupANWP(sys, p_window) != 0) { + if (AndroidWindow_SetupANW(sys, p_window) != 0) return -1; } } else { @@ -860,6 +826,8 @@ { if (sys->b_displayed) ClearSurface(vd); + if (!sys->p_window->b_opaque && !sys->p_window->b_use_priv) + sys->anw->setBuffersGeometry(sys->p_window->p_surface, 0, 0, 0); AndroidWindow_Destroy(vd, sys->p_window); } diff -Nru vlc-3.0.21/modules/video_output/android/utils.c vlc-3.0.22/modules/video_output/android/utils.c --- vlc-3.0.21/modules/video_output/android/utils.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_output/android/utils.c 2025-11-13 22:17:55.000000000 +0000 @@ -80,7 +80,6 @@ jmethodID getSubtitlesSurface; jmethodID registerNative; jmethodID unregisterNative; - jmethodID setBuffersGeometry; jmethodID setVideoLayout; } AndroidNativeWindow; struct { @@ -455,8 +454,6 @@ "registerNative", "(J)I", true); GET_METHOD(AndroidNativeWindow.unregisterNative, "unregisterNative", "()V", true); - GET_METHOD(AndroidNativeWindow.setBuffersGeometry, - "setBuffersGeometry", "(Landroid/view/Surface;III)Z", true); GET_METHOD(AndroidNativeWindow.setVideoLayout, "setVideoLayout", "(IIIIII)V", true); @@ -716,24 +713,6 @@ p_awh->event.cb.on_new_window_size(p_awh->wnd, width, height); } -int -AWindowHandler_setBuffersGeometry(AWindowHandler *p_awh, enum AWindow_ID id, - int i_width, int i_height, int i_format) -{ - jobject jsurf; - JNIEnv *p_env = AWindowHandler_getEnv(p_awh); - if (!p_env) - return VLC_EGENERIC; - - jsurf = AWindowHandler_getSurface(p_awh, id); - if (!jsurf) - return VLC_EGENERIC; - - return JNI_ANWCALL(CallBooleanMethod, setBuffersGeometry, - jsurf, i_width, i_height, i_format) ? VLC_SUCCESS - : VLC_EGENERIC; -} - bool AWindowHandler_canSetVideoLayout(AWindowHandler *p_awh) { diff -Nru vlc-3.0.21/modules/video_output/android/utils.h vlc-3.0.22/modules/video_output/android/utils.h --- vlc-3.0.21/modules/video_output/android/utils.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_output/android/utils.h 2025-11-13 22:17:55.000000000 +0000 @@ -150,16 +150,6 @@ */ void AWindowHandler_releaseANativeWindow(AWindowHandler *p_awh, enum AWindow_ID id); -/** - * Pre-ICS hack of ANativeWindow_setBuffersGeometry - * - * This function is a fix up of ANativeWindow_setBuffersGeometry that doesn't - * work before Android ICS. It configures the Surface from the Android - * MainThread via a SurfaceHolder. It returns VLC_SUCCESS if the Surface was - * configured (it returns VLC_EGENERIC after Android ICS). - */ -int AWindowHandler_setBuffersGeometry(AWindowHandler *p_awh, enum AWindow_ID id, - int i_width, int i_height, int i_format); /** * Returns true if the video layout can be changed diff -Nru vlc-3.0.21/modules/video_output/opengl/converter_vaapi.c vlc-3.0.22/modules/video_output/opengl/converter_vaapi.c --- vlc-3.0.21/modules/video_output/opengl/converter_vaapi.c 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/modules/video_output/opengl/converter_vaapi.c 2025-11-13 22:17:55.000000000 +0000 @@ -196,38 +196,40 @@ if (pic == priv->last.pic) { #if VA_CHECK_VERSION(1, 1, 0) - va_surface_descriptor = priv->last.va_surface_descriptor; + for (unsigned i = 0; i < priv->last.va_surface_descriptor.num_layers; ++i) #else - va_image = priv->last.va_image; + for (unsigned i = 0; i < priv->last.va_image.num_planes; ++i) #endif - for (unsigned i = 0; i < priv->last.num_planes; ++i) - egl_images[i] = priv->last.egl_images[i]; + { + tc->vt->BindTexture(tc->tex_target, textures[i]); + priv->glEGLImageTargetTexture2DOES(tc->tex_target, egl_images[i]); + } + return VLC_SUCCESS; } - else - { -#if VA_CHECK_VERSION(1, 1, 0) - if (vlc_vaapi_ExportSurfaceHandle(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic), - VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, 0, - &va_surface_descriptor)) - goto error; - release_image = true; -#else - if (vlc_vaapi_DeriveImage(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic), - &va_image)) - goto error; - release_image = true; - assert(va_image.format.fourcc == priv->fourcc); - va_buffer_info = (VABufferInfo) { - .mem_type = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME - }; - if (vlc_vaapi_AcquireBufferHandle(o, priv->vadpy, va_image.buf, - &va_buffer_info)) - goto error; +#if VA_CHECK_VERSION(1, 1, 0) + if (vlc_vaapi_ExportSurfaceHandle(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic), + VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, 0, + &va_surface_descriptor)) + goto error; + release_image = true; +#else + if (vlc_vaapi_DeriveImage(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic), + &va_image)) + goto error; + release_image = true; + + assert(va_image.format.fourcc == priv->fourcc); + + va_buffer_info = (VABufferInfo) { + .mem_type = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME + }; + if (vlc_vaapi_AcquireBufferHandle(o, priv->vadpy, va_image.buf, + &va_buffer_info)) + goto error; #endif - release_buffer_info = true; - } + release_buffer_info = true; #if VA_CHECK_VERSION(1, 1, 0) num_planes = va_surface_descriptor.num_layers; @@ -273,22 +275,20 @@ } #endif - if (pic != priv->last.pic) - { - if (priv->last.pic != NULL) - vaegl_release_last_pic(tc, priv); - priv->last.pic = picture_Hold(pic); + if (priv->last.pic != NULL) + vaegl_release_last_pic(tc, priv); + priv->last.pic = picture_Hold(pic); #if VA_CHECK_VERSION(1, 1, 0) - priv->last.va_surface_descriptor = va_surface_descriptor; + priv->last.va_surface_descriptor = va_surface_descriptor; #else - priv->last.va_image = va_image; - priv->last.va_buffer_info = va_buffer_info; + priv->last.va_image = va_image; + priv->last.va_buffer_info = va_buffer_info; #endif - priv->last.num_planes = num_planes; + priv->last.num_planes = num_planes; + + for (unsigned i = 0; i < num_planes; ++i) + priv->last.egl_images[i] = egl_images[i]; - for (unsigned i = 0; i < num_planes; ++i) - priv->last.egl_images[i] = egl_images[i]; - } return VLC_SUCCESS; diff -Nru vlc-3.0.21/modules/video_output/win32/d3d11_quad.c vlc-3.0.22/modules/video_output/win32/d3d11_quad.c --- vlc-3.0.21/modules/video_output/win32/d3d11_quad.c 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/modules/video_output/win32/d3d11_quad.c 2025-11-13 22:17:55.000000000 +0000 @@ -74,7 +74,7 @@ /* force unbinding the input texture, otherwise we get: * OMSetRenderTargets: Resource being set to OM RenderTarget slot 0 is still bound on input! */ - ID3D11RenderTargetView *reset[D3D11_MAX_SHADER_VIEW] = { 0 }; + ID3D11ShaderResourceView *reset[D3D11_MAX_SHADER_VIEW] = { 0 }; ID3D11DeviceContext_PSSetShaderResources(d3d_dev->d3dcontext, 0, quad->resourceCount, reset); } diff -Nru vlc-3.0.21/modules/video_output/win32/d3d11_scaler.cpp vlc-3.0.22/modules/video_output/win32/d3d11_scaler.cpp --- vlc-3.0.21/modules/video_output/win32/d3d11_scaler.cpp 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_output/win32/d3d11_scaler.cpp 2025-11-13 22:17:55.000000000 +0000 @@ -444,10 +444,18 @@ scaleProc->picsys.processorOutput->Release(); scaleProc->picsys.processorOutput = NULL; } + if (scaleProc->picsys.context) + { + scaleProc->picsys.context->Release(); + scaleProc->picsys.context = nullptr; + } + scaleProc->picsys.texture[0] = upscaled.Get(); for (size_t i=0; ipicsys.resourceView); i++) scaleProc->picsys.resourceView[i] = scaleProc->SRVs[i]; scaleProc->picsys.formatTexture = texDesc.Format; + scaleProc->picsys.context = d3d_dev->d3dcontext; + scaleProc->picsys.context->AddRef(); } #ifdef HAVE_AMF_SCALER @@ -653,14 +661,17 @@ auto packedStaging = scaleProc->amfInput->GetPlane(amf::AMF_PLANE_PACKED); ID3D11Texture2D *amfStaging = reinterpret_cast(packedStaging->GetNative()); -#ifndef NDEBUG D3D11_TEXTURE2D_DESC stagingDesc, inputDesc; amfStaging->GetDesc(&stagingDesc); p_sys->texture[KNOWN_DXGI_INDEX]->GetDesc(&inputDesc); - assert(stagingDesc.Width == inputDesc.Width); - assert(stagingDesc.Height == inputDesc.Height); + assert(stagingDesc.Width <= inputDesc.Width); + assert(stagingDesc.Height <= inputDesc.Height); assert(stagingDesc.Format == inputDesc.Format); -#endif + + D3D11_BOX box = {}; + box.bottom = stagingDesc.Height, + box.right = stagingDesc.Width, + box.back = 1, // copy source into staging as it may not be shared d3d11_device_lock( scaleProc->d3d_dev ); @@ -669,7 +680,7 @@ 0, 0, 0, p_sys->texture[KNOWN_DXGI_INDEX], p_sys->slice_index, - NULL); + &box); d3d11_device_unlock( scaleProc->d3d_dev ); submitSurface = scaleProc->amfInput; @@ -719,6 +730,26 @@ return (-ENOTSUP); } + if (scaleProc->picsys.processorInput) + { + scaleProc->picsys.processorInput->Release(); + scaleProc->picsys.processorInput = NULL; + } + if (scaleProc->picsys.processorOutput) + { + scaleProc->picsys.processorOutput->Release(); + scaleProc->picsys.processorOutput = NULL; + } + if (scaleProc->picsys.context) + { + scaleProc->picsys.context->Release(); + scaleProc->picsys.context = nullptr; + } + scaleProc->picsys.texture[0] = out; + scaleProc->picsys.formatTexture = inputDesc.Format; + scaleProc->picsys.context = scaleProc->d3d_dev->d3dcontext; + scaleProc->picsys.context->AddRef(); + amfOutput->Release(); return VLC_SUCCESS; diff -Nru vlc-3.0.21/modules/video_output/win32/d3d11_tonemap.cpp vlc-3.0.22/modules/video_output/win32/d3d11_tonemap.cpp --- vlc-3.0.21/modules/video_output/win32/d3d11_tonemap.cpp 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/modules/video_output/win32/d3d11_tonemap.cpp 2025-11-13 22:17:55.000000000 +0000 @@ -117,6 +117,7 @@ if (!available) { + msg_Warn(vd, "True HDR not supported"); d3d11_device_unlock(d3d_dev); goto error; } diff -Nru vlc-3.0.21/modules/video_output/win32/direct3d11.c vlc-3.0.22/modules/video_output/win32/direct3d11.c --- vlc-3.0.21/modules/video_output/win32/direct3d11.c 2024-06-05 15:32:15.000000000 +0000 +++ vlc-3.0.22/modules/video_output/win32/direct3d11.c 2025-11-13 22:17:55.000000000 +0000 @@ -39,7 +39,7 @@ #define COBJMACROS #include -#include +#include #ifdef HAVE_DXGI1_6_H # include #else @@ -155,6 +155,7 @@ #endif picture_sys_t stagingSys; + HANDLE sharedHandle; ID3D11RenderTargetView *d3drenderTargetView; ID3D11DepthStencilView *d3ddepthStencilView; @@ -360,6 +361,7 @@ } else vd->info.subpicture_chromas = NULL; + sys->sharedHandle = INVALID_HANDLE_VALUE; vd->pool = Pool; vd->prepare = Prepare; @@ -435,7 +437,7 @@ /* only provide enough for the filters, we can still do direct rendering */ slices = __MIN(slices, 6); - if (AllocateTextures(vd, &sys->d3d_dev, sys->pool_d3dfmt, &sys->pool_fmt, slices, textures)) + if (AllocateTextures(vd, &sys->d3d_dev, sys->pool_d3dfmt, &sys->pool_fmt, true, false, slices, textures)) goto error; pictures = calloc(pool_size, sizeof(*pictures)); @@ -1009,6 +1011,51 @@ } } +static int CreateStaging(vout_display_t *vd, ID3D11DeviceContext *shared_context) +{ + vout_display_sys_t *sys = vd->sys; + ID3D11Texture2D *textures[D3D11_MAX_SHADER_VIEW] = {0}; + video_format_t surface_fmt = sys->pool_fmt; + surface_fmt.i_width = sys->picQuad.i_width; + surface_fmt.i_height = sys->picQuad.i_height; + + if (AllocateTextures(vd, &sys->d3d_dev, sys->picQuad.formatInfo, &surface_fmt, + false, shared_context != NULL, 1, textures)) + { + msg_Err(vd, "Failed to allocate the staging texture"); + return VLC_EGENERIC; + } + + sys->picQuad.resourceCount = DxgiResourceCount(sys->picQuad.formatInfo); + if (D3D11_AllocateShaderView(vd, sys->d3d_dev.d3ddevice, sys->picQuad.formatInfo, + textures, 0, sys->stagingSys.resourceView)) + { + msg_Err(vd, "Failed to allocate the staging shader view"); + return VLC_EGENERIC; + } + + for (unsigned plane = 0; plane < D3D11_MAX_SHADER_VIEW; plane++) + sys->stagingSys.texture[plane] = textures[plane]; + + + if (shared_context) + { + assert(sys->sharedHandle == INVALID_HANDLE_VALUE); + HRESULT hr; + IDXGIResource1* sharedResource = NULL; + ID3D11Resource_QueryInterface(sys->stagingSys.resource[0], &IID_IDXGIResource1, (void**)&sharedResource); + hr = IDXGIResource1_CreateSharedHandle(sharedResource, NULL, DXGI_SHARED_RESOURCE_READ|DXGI_SHARED_RESOURCE_WRITE, NULL, &sys->sharedHandle); + IDXGIResource1_Release(sharedResource); + if (FAILED(hr)) + { + msg_Err(vd, "Failed to get the shared handle"); + return VLC_EGENERIC; + } + } + + return VLC_SUCCESS; +} + static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture) { vout_display_sys_t *sys = vd->sys; @@ -1073,6 +1120,47 @@ D3D11_TEXTURE2D_DESC srcDesc; ID3D11Texture2D_GetDesc(p_sys->texture[KNOWN_DXGI_INDEX], &srcDesc); + ID3D11DeviceContext* copyContext = sys->d3d_dev.d3dcontext; + ID3D11Resource* copyResource = p_sys->resource[KNOWN_DXGI_INDEX]; + ID3D11Resource* newResource = NULL; + + if (is_d3d11_opaque(picture->format.i_chroma) && sys->d3d_dev.d3dcontext != p_sys->context) + { + if (sys->stagingSys.texture[0] == NULL) + { + sys->legacy_shader = true; // force using staging + int ret = CreateStaging(vd, p_sys->context); + if (unlikely(ret != VLC_SUCCESS)) + { + if (is_d3d11_opaque(picture->format.i_chroma)) + d3d11_device_unlock( &sys->d3d_dev ); + return; + } + } + + HRESULT hr; + + ID3D11Device *psysDev; + ID3D11Device1 *d3d11VLC1; + ID3D11DeviceContext_GetDevice(p_sys->context, &psysDev); + hr = ID3D11Device_QueryInterface(psysDev, &IID_ID3D11Device1, (void**)&d3d11VLC1); + if (SUCCEEDED(hr)) + { + hr = ID3D11Device1_OpenSharedResource1(d3d11VLC1, sys->sharedHandle, &IID_ID3D11Resource, (void**)&newResource); + ID3D11Device1_Release(d3d11VLC1); + } + ID3D11Device_Release(psysDev); + if (FAILED(hr)) + { + if (is_d3d11_opaque(picture->format.i_chroma)) + d3d11_device_unlock( &sys->d3d_dev ); + return; + } + + copyResource = newResource; + copyContext = p_sys->context; + } + if (!is_d3d11_opaque(picture->format.i_chroma) || sys->legacy_shader) { D3D11_TEXTURE2D_DESC texDesc; if (!is_d3d11_opaque(picture->format.i_chroma)) @@ -1085,8 +1173,8 @@ .right = __MIN(srcDesc.Width, texDesc.Width), .back = 1, }; - ID3D11DeviceContext_CopySubresourceRegion(sys->d3d_dev.d3dcontext, - sys->stagingSys.resource[KNOWN_DXGI_INDEX], + ID3D11DeviceContext_CopySubresourceRegion(copyContext, + copyResource, 0, 0, 0, 0, p_sys->resource[KNOWN_DXGI_INDEX], p_sys->slice_index, &box); @@ -1113,6 +1201,10 @@ UpdateSize(vd); } } + + if (newResource != NULL) + // shared resource + ID3D11Resource_Release(newResource); } if (subpicture) { @@ -1300,6 +1392,29 @@ } #endif +static IDXGIOutput *GetDXGIOutput(IDXGISwapChain1 *dxgiswapChain, d3d11_device_t *d3d_dev) +{ + IDXGIOutput *dxgiOutput = NULL; + if (FAILED(IDXGISwapChain_GetContainingOutput( dxgiswapChain, &dxgiOutput ))) + { + // GetContainingOutput fails in UWP + IDXGIAdapter *dxgiadapter = D3D11DeviceAdapter(d3d_dev->d3ddevice); + if (likely(dxgiadapter!=NULL)) { + // Get the first usable output (monitor) + for (UINT adapter=0;;adapter++) + { + HRESULT hr = IDXGIAdapter_EnumOutputs(dxgiadapter, adapter, &dxgiOutput); + if (SUCCEEDED(hr)) + break; + if (hr == DXGI_ERROR_NOT_FOUND) // no more adapters + break; + } + IDXGIAdapter_Release(dxgiadapter); + } + } + return dxgiOutput; +} + static void D3D11SetColorSpace(vout_display_t *vd) { vout_display_sys_t *sys = vd->sys; @@ -1371,7 +1486,7 @@ #ifdef HAVE_DXGI1_6_H if (sys->hdrMode == hdr_Auto || sys->hdrMode == hdr_Fake) // match the screen - if (SUCCEEDED(IDXGISwapChain_GetContainingOutput( sys->dxgiswapChain, &dxgiOutput ))) + if ((dxgiOutput = GetDXGIOutput( sys->dxgiswapChain, &sys->d3d_dev )) != NULL) { IDXGIOutput6 *dxgiOutput6 = NULL; if (SUCCEEDED(IDXGIOutput_QueryInterface( dxgiOutput, &IID_IDXGIOutput6, (void **)&dxgiOutput6 ))) @@ -1622,6 +1737,22 @@ } #endif } + else + { + HRESULT hr = S_OK; + IDXGIAdapter *adap = D3D11DeviceAdapter(sys->d3d_dev.d3ddevice); + if (adap == NULL) + hr = E_FAIL; + else + { + hr = IDXGIAdapter_GetDesc(adap, &sys->d3d_dev.adapterDesc); + IDXGIAdapter_Release(adap); + } + if (hr) + msg_Warn(vd, "can't get adapter description"); + + D3D11_GetDriverVersion(vd, &sys->d3d_dev); + } IDXGISwapChain_QueryInterface( sys->dxgiswapChain, &IID_IDXGISwapChain4, (void **)&sys->dxgiswapChain4); @@ -1686,7 +1817,7 @@ } video_format_Clean(&vd->fmt); - vd->fmt = sys->pool_fmt; + video_format_Copy(&vd->fmt, &sys->pool_fmt); sys->log_level = var_InheritInteger(vd, "verbose"); @@ -1892,27 +2023,9 @@ if (!is_d3d11_opaque(fmt->i_chroma) || sys->legacy_shader) { /* we need a staging texture */ - ID3D11Texture2D *textures[D3D11_MAX_SHADER_VIEW] = {0}; - video_format_t surface_fmt = sys->pool_fmt; - surface_fmt.i_width = sys->picQuad.i_width; - surface_fmt.i_height = sys->picQuad.i_height; - - if (AllocateTextures(vd, &sys->d3d_dev, sys->picQuad.formatInfo, &surface_fmt, 1, textures)) - { - msg_Err(vd, "Failed to allocate the staging texture"); - return VLC_EGENERIC; - } - - sys->picQuad.resourceCount = DxgiResourceCount(sys->picQuad.formatInfo); - if (D3D11_AllocateShaderView(vd, sys->d3d_dev.d3ddevice, sys->picQuad.formatInfo, - textures, 0, sys->stagingSys.resourceView)) - { - msg_Err(vd, "Failed to allocate the staging shader view"); - return VLC_EGENERIC; - } - - for (unsigned plane = 0; plane < D3D11_MAX_SHADER_VIEW; plane++) - sys->stagingSys.texture[plane] = textures[plane]; + int ret = CreateStaging(vd, NULL); + if (ret != VLC_SUCCESS) + return ret; } #endif @@ -2109,6 +2222,8 @@ sys->d3dregion_count = 0; ReleasePictureSys(&sys->stagingSys); + CloseHandle(sys->sharedHandle); + sys->sharedHandle = INVALID_HANDLE_VALUE; if (sys->tonemapProc != NULL) { @@ -2240,7 +2355,7 @@ if (unlikely(d3dquad==NULL)) { continue; } - if (AllocateTextures(vd, &sys->d3d_dev, sys->d3dregion_format, &r->p_picture->format, 1, d3dquad->picSys.texture)) { + if (AllocateTextures(vd, &sys->d3d_dev, sys->d3dregion_format, &r->p_picture->format, false, false, 1, d3dquad->picSys.texture)) { msg_Err(vd, "Failed to allocate %dx%d texture for OSD", r->fmt.i_visible_width, r->fmt.i_visible_height); for (int j=0; jp_sys; + if (!sys->isVistaOrGreater) + SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + else +#endif + SetThreadExecutionState( ES_CONTINUOUS ); } static void* Run(void* obj) @@ -62,6 +70,14 @@ vlc_inhibit_sys_t *sys = ih->p_sys; EXECUTION_STATE prev_state = ES_CONTINUOUS; +#if _WIN32_WINNT < 0x0600 // _WIN32_WINNT_VISTA + HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32.dll")); + if (likely(hKernel32 != NULL)) + sys->isVistaOrGreater = GetProcAddress(hKernel32, "EnumResourceLanguagesExW") != NULL; + else + sys->isVistaOrGreater = false; +#endif + vlc_sem_post(&sys->sem); while (true) { @@ -82,15 +98,23 @@ if (suspend) { /* Prevent monitor from powering off */ - prev_state = SetThreadExecutionState( ES_DISPLAY_REQUIRED | +#if _WIN32_WINNT < 0x0600 // _WIN32_WINNT_VISTA + if (!sys->isVistaOrGreater) + SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); + else +#endif + prev_state = SetThreadExecutionState( ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED | ES_CONTINUOUS ); - SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, 0, NULL, 0); } else { - SetThreadExecutionState( prev_state ); - SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, 1, NULL, 0); +#if _WIN32_WINNT < 0x0600 // _WIN32_WINNT_VISTA + if (!sys->isVistaOrGreater) + SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + else +#endif + SetThreadExecutionState( prev_state ); } } vlc_assert_unreachable(); diff -Nru vlc-3.0.21/modules/video_output/win32/win32touch.h vlc-3.0.22/modules/video_output/win32/win32touch.h --- vlc-3.0.21/modules/video_output/win32/win32touch.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_output/win32/win32touch.h 2025-11-13 22:17:55.000000000 +0000 @@ -31,8 +31,8 @@ #if _WIN32_WINNT < 0x0601 // _WIN32_WINNT_WIN7 # undef _WIN32_WINNT # define _WIN32_WINNT _WIN32_WINNT_WIN7 +# undef WINVER #endif -#define WINVER _WIN32_WINNT_WIN7 #include diff -Nru vlc-3.0.21/modules/video_output/win32/wingdi.c vlc-3.0.22/modules/video_output/win32/wingdi.c --- vlc-3.0.21/modules/video_output/win32/wingdi.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/video_output/win32/wingdi.c 2025-11-13 22:17:55.000000000 +0000 @@ -164,6 +164,8 @@ rect_src_clipped.right - rect_src_clipped.left || rect_dest_clipped.bottom - rect_dest_clipped.top != rect_src_clipped.bottom - rect_src_clipped.top) { + SetStretchBltMode(hdc, COLORONCOLOR); + StretchBlt(hdc, rect_dst.left, rect_dst.top, rect_dst.right, rect_dst.bottom, sys->off_dc, diff -Nru vlc-3.0.21/modules/visualization/glspectrum.c vlc-3.0.22/modules/visualization/glspectrum.c --- vlc-3.0.21/modules/visualization/glspectrum.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/visualization/glspectrum.c 2025-11-13 22:17:55.000000000 +0000 @@ -58,6 +58,8 @@ #define HEIGHT_TEXT N_("Video height") #define HEIGHT_LONGTEXT N_("The height of the visualization window, in pixels.") +#define LOG_OFFSET 0.1 + vlc_module_begin() set_shortname(N_("glSpectrum")) set_description(N_("3D OpenGL spectrum visualization")) @@ -381,7 +383,7 @@ float p_output[FFT_BUFFER_SIZE]; /* Raw FFT Result */ int16_t p_buffer1[FFT_BUFFER_SIZE]; /* Buffer on which we perform the FFT (first channel) */ - int16_t p_dest[FFT_BUFFER_SIZE]; /* Adapted FFT result */ + uint16_t p_dest[FFT_BUFFER_SIZE]; /* Adapted FFT result */ float *p_buffl = (float*)block->p_buffer; /* Original buffer */ int16_t *p_buffs; /* int16_t converted buffer */ @@ -445,9 +447,11 @@ window_scale_in_place (p_buffer1, &wind_ctx); fft_perform (p_buffer1, p_output, p_state); - for (i = 0; i< FFT_BUFFER_SIZE; ++i) - p_dest[i] = p_output[i] * (2 ^ 16) - / ((FFT_BUFFER_SIZE / 2 * 32768) ^ 2); + for( i = 0; i< FFT_BUFFER_SIZE ; i++ ) + { + /* Scale the output between 0 and UINT16MAX */ + p_dest[i] = p_output[i] * UINT16_MAX / FFT_SCALING_VALUE; + } for (i = 0 ; i < NB_BANDS; i++) { @@ -464,8 +468,9 @@ if (p_dest[j] > y) y = p_dest[j]; } - /* Calculate the height of the bar */ - float new_height = y != 0 ? logf(y) * 0.4f : 0; + /* Calculate the height of the bar + This log_offset makes it possible to display low values */ + float new_height = y != 0 ? logf( y + LOG_OFFSET ) * 0.4f : 0; height[i] = new_height > height[i] ? new_height : height[i]; } diff -Nru vlc-3.0.21/modules/visualization/visual/effects.c vlc-3.0.22/modules/visualization/visual/effects.c --- vlc-3.0.21/modules/visualization/visual/effects.c 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/visualization/visual/effects.c 2025-11-13 22:17:55.000000000 +0000 @@ -46,6 +46,8 @@ #define GRAD_ANGLE_MAX 0.5 #define GRAD_INCR 0.01 +#define LOG_OFFSET 0.1 + /***************************************************************************** * dummy_Run *****************************************************************************/ @@ -109,7 +111,7 @@ int i , j , y , k; int i_line; - int16_t p_dest[FFT_BUFFER_SIZE]; /* Adapted FFT result */ + uint16_t p_dest[FFT_BUFFER_SIZE]; /* Adapted FFT result */ int16_t p_buffer1[FFT_BUFFER_SIZE]; /* Buffer on which we perform the FFT (first channel) */ @@ -214,7 +216,10 @@ window_scale_in_place( p_buffer1, &wind_ctx ); fft_perform( p_buffer1, p_output, p_state); for( i = 0; i< FFT_BUFFER_SIZE ; i++ ) - p_dest[i] = p_output[i] * ( 2 ^ 16 ) / ( ( FFT_BUFFER_SIZE / 2 * 32768 ) ^ 2 ); + { + /* Scale the output between 0 and UINT16MAX */ + p_dest[i] = p_output[i] * UINT16_MAX / FFT_SCALING_VALUE; + } /* Compute the horizontal position of the first band */ i_band_width = floor( p_effect->i_width / i_nb_bands); @@ -228,10 +233,11 @@ if ( p_dest[j] > y ) y = p_dest[j]; } - /* Calculate the height of the bar */ + /* Calculate the height of the bar + This log_offset makes it possible to display low values */ if( y != 0 ) { - height[i] = log( y ) * 30; + height[i] = log( y + LOG_OFFSET ) * 30; if( height[i] > 380 ) height[i] = 380; } @@ -447,7 +453,7 @@ int i , j , k; int i_line = 0; - int16_t p_dest[FFT_BUFFER_SIZE]; /* Adapted FFT result */ + uint16_t p_dest[FFT_BUFFER_SIZE]; /* Adapted FFT result */ int16_t p_buffer1[FFT_BUFFER_SIZE]; /* Buffer on which we perform the FFT (first channel) */ float *p_buffl = /* Original buffer */ diff -Nru vlc-3.0.21/modules/visualization/visual/fft.h vlc-3.0.22/modules/visualization/visual/fft.h --- vlc-3.0.21/modules/visualization/visual/fft.h 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/modules/visualization/visual/fft.h 2025-11-13 22:17:55.000000000 +0000 @@ -29,6 +29,10 @@ #define FFT_BUFFER_SIZE (1 << FFT_BUFFER_SIZE_LOG) +#define FFT_MAX_VALUE_OUTPUT ((uint64_t)(FFT_BUFFER_SIZE/2 * INT16_MAX)) + +#define FFT_SCALING_VALUE (FFT_MAX_VALUE_OUTPUT * FFT_MAX_VALUE_OUTPUT * 2) + /* sound sample - should be an signed 16 bit value */ typedef short int sound_sample; diff -Nru vlc-3.0.21/po/LINGUAS vlc-3.0.22/po/LINGUAS --- vlc-3.0.21/po/LINGUAS 2024-06-05 15:31:41.000000000 +0000 +++ vlc-3.0.22/po/LINGUAS 2025-11-13 22:17:55.000000000 +0000 @@ -4,7 +4,7 @@ am_ET an ar -as_IN +as ast be bg diff -Nru vlc-3.0.21/po/POTFILES.in vlc-3.0.22/po/POTFILES.in --- vlc-3.0.21/po/POTFILES.in 2024-06-05 16:02:04.000000000 +0000 +++ vlc-3.0.22/po/POTFILES.in 2025-11-24 23:10:09.000000000 +0000 @@ -1265,7 +1265,7 @@ modules/visualization/visual/visual.c modules/visualization/visual/window_presets.h modules/visualization/vsxu.cpp -share/vlc.appdata.xml.in.in +share/org.videolan.vlc.appdata.xml.in.in share/lua/http/dialogs/batch_window.html share/lua/http/dialogs/browse_window.html share/lua/http/dialogs/create_stream.html @@ -1287,6 +1287,7 @@ modules/gui/qt/ui/about.h modules/gui/qt/ui/equalizer.h +modules/gui/qt/ui/fingerprintdialog.h modules/gui/qt/ui/messages_panel.h modules/gui/qt/ui/open.h modules/gui/qt/ui/open_capture.h Binary files /srv/release.debian.org/tmp/qI0ihXFLtg/vlc-3.0.21/po/ach.gmo and /srv/release.debian.org/tmp/zLmv0avFEi/vlc-3.0.22/po/ach.gmo differ diff -Nru vlc-3.0.21/po/ach.po vlc-3.0.22/po/ach.po --- vlc-3.0.21/po/ach.po 2024-06-05 15:56:07.000000000 +0000 +++ vlc-3.0.22/po/ach.po 2025-11-24 23:15:39.000000000 +0000 @@ -6,9 +6,9 @@ # Alfred John , 2011 msgid "" msgstr "" -"Project-Id-Version: vlc 3.0.13\n" +"Project-Id-Version: vlc 3.0.22-rc1\n" "Report-Msgid-Bugs-To: vlc-devel@videolan.org\n" -"POT-Creation-Date: 2024-06-05 17:42+0200\n" +"POT-Creation-Date: 2025-11-24 23:15+0000\n" "PO-Revision-Date: 2017-12-10 22:48+0000\n" "Last-Translator: Michał Trzebiatowski , 2017\n" "Language-Team: Acoli (https://app.transifex.com/yaron/teams/16553/ach/)\n" @@ -18,7 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: include/vlc_common.h:1053 +#: include/vlc_common.h:1055 msgid "" "This program comes with NO WARRANTY, to the extent permitted by law.\n" "You may redistribute it under the terms of the GNU General Public License;\n" @@ -36,8 +36,8 @@ #: include/vlc_config_cat.h:38 #: modules/gui/macosx/VLCSimplePrefsController.m:241 -#: modules/gui/qt/components/simple_preferences.cpp:247 -#: modules/gui/qt/menus.cpp:1094 +#: modules/gui/qt/components/simple_preferences.cpp:248 +#: modules/gui/qt/menus.cpp:1099 msgid "Interface" msgstr "Ka anena" @@ -77,8 +77,8 @@ #: modules/gui/macosx/VLCPlaylistInfo.m:91 #: modules/gui/macosx/VLCSimplePrefsController.m:243 #: modules/gui/qt/components/info_panels.cpp:572 -#: modules/gui/qt/components/simple_preferences.cpp:249 -#: modules/gui/qt/qt.cpp:213 modules/services_discovery/mediadirs.c:77 +#: modules/gui/qt/components/simple_preferences.cpp:250 +#: modules/gui/qt/qt.cpp:216 modules/services_discovery/mediadirs.c:77 #: modules/stream_out/es.c:94 modules/stream_out/transcode/transcode.c:182 #: share/lua/http/dialogs/create_stream.html:150 #: modules/gui/qt/ui/profiles.h:719 modules/gui/qt/ui/profiles.h:750 @@ -142,8 +142,8 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:245 #: modules/gui/macosx/VLCSimplePrefsController.m:388 #: modules/gui/qt/components/info_panels.cpp:573 -#: modules/gui/qt/components/simple_preferences.cpp:251 -#: modules/gui/qt/qt.cpp:213 modules/services_discovery/mediadirs.c:70 +#: modules/gui/qt/components/simple_preferences.cpp:252 +#: modules/gui/qt/qt.cpp:216 modules/services_discovery/mediadirs.c:70 #: modules/stream_out/es.c:102 modules/stream_out/transcode/transcode.c:153 #: share/lua/http/dialogs/create_stream.html:147 #: modules/gui/qt/ui/profiles.h:720 modules/gui/qt/ui/profiles.h:724 @@ -331,7 +331,7 @@ #: modules/gui/qt/components/controller.hpp:109 #: modules/gui/qt/components/playlist/playlist.cpp:165 #: modules/gui/qt/components/playlist/selector.cpp:227 -#: modules/gui/qt/dialogs/playlist.cpp:39 modules/gui/qt/menus.cpp:1121 +#: modules/gui/qt/dialogs/playlist.cpp:39 modules/gui/qt/menus.cpp:1126 msgid "Playlist" msgstr "Nying latuku" @@ -434,7 +434,7 @@ #: modules/gui/macosx/VLCMainMenu.m:1340 modules/gui/macosx/VLCMainMenu.m:1341 #: modules/gui/macosx/VLCPlaylist.m:223 #: modules/gui/qt/components/controller.hpp:107 -#: modules/gui/qt/dialogs/vlm.cpp:538 modules/gui/qt/ui/open.h:258 +#: modules/gui/qt/dialogs/vlm.cpp:532 modules/gui/qt/ui/open.h:256 msgid "Play" msgstr "Tuki" @@ -520,7 +520,7 @@ msgstr "Gwok Nying jami me otuku i &Fail..." #: include/vlc_intf_strings.h:91 modules/gui/macosx/VLCMainWindow.m:194 -#: modules/gui/qt/components/preferences_widgets.cpp:1129 +#: modules/gui/qt/components/preferences_widgets.cpp:1133 msgid "Search" msgstr "Yeny" @@ -544,19 +544,19 @@ "

For all the saving, converting, transcoding, encoding, muxing and " "streaming tasks, you should find useful information in the Streaming Documentation.

If you are unsure about terminology, please consult the knowledge base.

To understand the main keyboard shortcuts, read the shortcuts page.

Help

Before " -"asking any question, please refer yourself to the FAQ.

You might then get (and give) " -"help on the Forums, the mailing-lists or our IRC " -"channel (#videolan on irc.freenode.net).

Contribute to the " -"project

You can help the VideoLAN project giving some of your time to " -"help the community, to design skins, to translate the documentation, to test " -"and to code. You can also give funds and material to help us. And of course, " -"you can promote VLC media player.

" +"a>.

If you are unsure about terminology, please consult the knowledge base.

To " +"understand the main keyboard shortcuts, read the shortcuts page.

Help

Before asking " +"any question, please refer yourself to the FAQ.

You might then get (and give) help on the " +"Forums, the mailing-lists or our IRC channel " +"(#videolan on irc.freenode.net).

Contribute to the project

You can help the VideoLAN project giving some of your time to help the " +"community, to design skins, to translate the documentation, to test and to " +"code. You can also give funds and material to help us. And of course, you " +"can promote VLC media player.

" msgstr "" #: src/audio_output/filters.c:267 @@ -670,8 +670,8 @@ #: modules/access/dtv/access.c:113 modules/access/dtv/access.c:122 #: modules/access/dtv/access.c:130 modules/access/dtv/access.c:139 #: modules/access/dtv/access.c:147 modules/access/dtv/access.c:169 -#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:991 -#: modules/gui/qt/components/simple_preferences.cpp:394 +#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:971 +#: modules/gui/qt/components/simple_preferences.cpp:395 msgid "Automatic" msgstr "" @@ -829,7 +829,7 @@ msgstr "" #: src/input/decoder.c:1922 src/input/decoder.c:2205 -#: modules/codec/avcodec/encoder.c:378 modules/codec/avcodec/encoder.c:918 +#: modules/codec/avcodec/encoder.c:394 modules/codec/avcodec/encoder.c:939 #: modules/stream_out/es.c:349 modules/stream_out/es.c:362 msgid "Streaming / Transcoding failed" msgstr "" @@ -844,7 +844,7 @@ msgstr "" #: src/input/es_out.c:956 src/input/es_out.c:961 src/libvlc-module.c:239 -#: modules/gui/qt/components/open_panels.cpp:547 +#: modules/gui/qt/components/open_panels.cpp:527 msgid "Track" msgstr "Wer" @@ -869,7 +869,7 @@ msgstr "" #: src/input/es_out.c:1463 modules/keystore/keychain.m:41 -#: modules/lua/extension.c:1193 +#: modules/lua/extension.c:1199 msgid "Yes" msgstr "" @@ -898,7 +898,7 @@ #: src/input/es_out.c:3151 src/input/meta.c:66 modules/access/imem.c:71 #: modules/gui/macosx/VLCPlaylist.m:98 #: modules/gui/macosx/VLCSimplePrefsController.m:325 -#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:527 +#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:533 msgid "Language" msgstr "Leb" @@ -912,7 +912,7 @@ #: src/input/es_out.c:3160 src/input/es_out.c:3204 src/input/es_out.c:3394 #: modules/gui/macosx/VLCAddonsWindowController.m:133 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:185 -#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1495 +#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1494 msgid "Type" msgstr "Kite" @@ -1178,8 +1178,8 @@ #: modules/gui/macosx/VLCOpenWindowController.m:178 #: modules/gui/macosx/VLCOpenWindowController.m:180 #: modules/gui/macosx/VLCPlaylist.m:91 modules/gui/macosx/VLCPlaylistInfo.m:59 -#: modules/gui/qt/components/open_panels.cpp:507 -#: modules/gui/qt/components/open_panels.cpp:521 +#: modules/gui/qt/components/open_panels.cpp:487 +#: modules/gui/qt/components/open_panels.cpp:501 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56 #: modules/gui/qt/ui/open_disk.h:306 msgid "Title" @@ -1424,8 +1424,8 @@ msgid "" "You can select \"additional interfaces\" for VLC. They will be launched in " "the background in addition to the default interface. Use a colon separated " -"list of interface modules. (common values are \"rc\" (remote control), " -"\"http\", \"gestures\" ...)" +"list of interface modules. (common values are \"rc\" (remote control), \"http" +"\", \"gestures\" ...)" msgstr "" #: src/libvlc-module.c:83 @@ -1507,7 +1507,7 @@ msgstr "" #: src/libvlc-module.c:132 modules/gui/macosx/VLCSimplePrefsController.m:281 -#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:407 +#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:408 msgid "Enable audio" msgstr "Ket me awinya" @@ -1619,10 +1619,9 @@ #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:957 #: modules/audio_output/kai.c:106 modules/codec/subsdec.c:167 #: modules/codec/x264.c:434 modules/demux/adaptive/adaptive.cpp:122 -#: modules/demux/mpeg/ts.c:131 modules/gui/macosx/VLCSimplePrefsController.m:54 -#: modules/gui/qt/components/simple_preferences.cpp:68 +#: modules/demux/mpeg/ts.c:132 modules/gui/macosx/VLCSimplePrefsController.m:54 +#: modules/gui/qt/components/simple_preferences.cpp:69 #: modules/gui/qt/components/sout/profile_selector.cpp:590 -#: modules/services_discovery/upnp.cpp:82 #: modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62 #: modules/video_output/win32/direct3d11.c:88 @@ -1648,8 +1647,8 @@ msgstr "" #: src/libvlc-module.c:195 src/misc/actions.c:112 -#: modules/gui/qt/components/preferences_widgets.cpp:1417 -#: modules/gui/qt/util/customwidgets.cpp:330 +#: modules/gui/qt/components/preferences_widgets.cpp:1421 +#: modules/gui/qt/util/customwidgets.cpp:328 msgid "Unset" msgstr "Kwany ter" @@ -2334,7 +2333,7 @@ #: src/libvlc-module.c:540 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:215 #: modules/gui/macosx/VLCSidebarDataSource.m:209 -#: modules/gui/qt/components/extended_panels.cpp:949 +#: modules/gui/qt/components/extended_panels.cpp:962 #: modules/gui/qt/ui/equalizer.h:130 modules/gui/qt/ui/vlm.h:286 msgid "Enable" msgstr "Ket itic" @@ -2616,10 +2615,10 @@ #: src/libvlc-module.c:690 msgid "" -"This option allows you to set the title according to what's being " -"played
$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: " -"Genre
$n: Track num
$p: Now playing
$A: Date
$D: Duration
$Z: " -"\"Now playing\" (Fall back on Title - Artist)" +"This option allows you to set the title according to what's being played
" +"$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: Genre
$n: " +"Track num
$p: Now playing
$A: Date
$D: Duration
$Z: \"Now playing" +"\" (Fall back on Title - Artist)" msgstr "" #: src/libvlc-module.c:695 @@ -3294,7 +3293,7 @@ msgid "Tell VLC that it is being launched due to a file association in the OS" msgstr "" -#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:547 +#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:554 msgid "Use only one instance when started from file manager" msgstr "" @@ -3312,7 +3311,7 @@ "machine." msgstr "" -#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:550 +#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:557 msgid "Enqueue items into playlist in one instance mode" msgstr "" @@ -3356,7 +3355,7 @@ #: src/libvlc-module.c:1126 modules/gui/macosx/VLCSimplePrefsController.m:342 #: modules/gui/qt/dialogs/firstrun.cpp:95 -#: modules/gui/qt/ui/sprefs_interface.h:562 +#: modules/gui/qt/ui/sprefs_interface.h:569 msgid "Allow metadata network access" msgstr "" @@ -3494,7 +3493,7 @@ "VLC." msgstr "" -#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:548 +#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:555 msgid "Display playlist tree" msgstr "" @@ -3616,11 +3615,11 @@ msgid "Select the hotkey to set the playback rate back to normal." msgstr "" -#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:884 +#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:889 msgid "Faster (fine)" msgstr "Me oyoto(fine)" -#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:892 +#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:897 msgid "Slower (fine)" msgstr "Motmot (fine)" @@ -3631,7 +3630,7 @@ #: modules/gui/macosx/VLCMainMenu.m:396 modules/gui/macosx/VLCMainMenu.m:499 #: modules/gui/macosx/VLCMainMenu.m:507 #: modules/gui/qt/components/controller.hpp:112 -#: modules/gui/qt/dialogs/sout.cpp:93 modules/notify/notify.c:335 +#: modules/gui/qt/dialogs/sout.cpp:91 modules/notify/notify.c:335 #: modules/gui/qt/ui/streampanel.h:179 msgid "Next" msgstr "Malubo kore" @@ -3658,7 +3657,7 @@ #: modules/gui/macosx/VLCMainMenu.m:498 modules/gui/macosx/VLCMainMenu.m:505 #: modules/gui/macosx/VLCMainWindowControlsBar.m:65 #: modules/gui/qt/components/controller.hpp:107 -#: modules/gui/qt/dialogs/vlm.cpp:544 modules/gui/qt/ui/streampanel.h:178 +#: modules/gui/qt/dialogs/vlm.cpp:538 modules/gui/qt/ui/streampanel.h:178 msgid "Stop" msgstr "Cung" @@ -3787,8 +3786,8 @@ #: src/libvlc-module.c:1293 modules/control/hotkeys.c:361 #: modules/gui/macosx/VLCStatusBarIcon.m:116 #: modules/gui/qt/components/controller.hpp:111 -#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:955 -#: modules/gui/qt/menus.cpp:1141 modules/gui/skins2/commands/cmd_quit.cpp:45 +#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:960 +#: modules/gui/qt/menus.cpp:1146 modules/gui/skins2/commands/cmd_quit.cpp:45 msgid "Quit" msgstr "Wek woko" @@ -4096,7 +4095,7 @@ msgstr "" #: src/libvlc-module.c:1373 -#: modules/gui/qt/components/playlist/standardpanel.cpp:246 +#: modules/gui/qt/components/playlist/standardpanel.cpp:247 msgid "Clear the playlist" msgstr "" @@ -4274,7 +4273,7 @@ #: src/libvlc-module.c:1423 modules/gui/macosx/VLCMainMenu.m:387 #: modules/gui/qt/components/controller.hpp:110 -#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:858 +#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:863 #: modules/stream_out/record.c:60 msgid "Record" msgstr "Rekod" @@ -4434,7 +4433,7 @@ msgid "Special modules" msgstr "" -#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:90 +#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:89 msgid "Plugins" msgstr "Rwak iyie" @@ -4701,7 +4700,7 @@ msgid "Media View" msgstr "" -#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:568 +#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:577 msgid "Menu" msgstr "Lacim" @@ -4734,8 +4733,8 @@ #: modules/gui/macosx/VLCFSPanelController.m:251 #: modules/gui/macosx/VLCMainMenu.m:1346 modules/gui/macosx/VLCMainMenu.m:1347 #: modules/gui/macosx/VLCMainMenu.m:1348 -#: modules/gui/qt/components/playlist/standardpanel.cpp:196 -#: modules/gui/qt/menus.cpp:832 +#: modules/gui/qt/components/playlist/standardpanel.cpp:197 +#: modules/gui/qt/menus.cpp:837 msgid "Pause" msgstr "Cung manok" @@ -4826,7 +4825,7 @@ msgstr "" #: src/misc/update.c:596 src/misc/update.c:726 modules/access/dvb/scan.c:826 -#: modules/demux/avi/avi.c:2827 +#: modules/demux/avi/avi.c:2878 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:513 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:571 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:854 @@ -4851,10 +4850,10 @@ #: modules/gui/macosx/VLCVideoEffectsWindowController.m:791 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:860 #: modules/gui/macosx/prefs.m:189 -#: modules/gui/qt/components/open_panels.cpp:1381 -#: modules/gui/qt/components/preferences_widgets.cpp:1416 +#: modules/gui/qt/components/open_panels.cpp:1361 +#: modules/gui/qt/components/preferences_widgets.cpp:1420 #: modules/gui/qt/components/sout/profile_selector.cpp:452 -#: modules/gui/qt/dialogs/sout.cpp:92 +#: modules/gui/qt/dialogs/sout.cpp:90 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "Cancel" msgstr "Jwik woko" @@ -5780,79 +5779,79 @@ msgid "Blu-ray Disc support (libbluray)" msgstr "" -#: modules/access/bluray.c:849 +#: modules/access/bluray.c:847 msgid "Path doesn't appear to be a Blu-ray" msgstr "" -#: modules/access/bluray.c:864 +#: modules/access/bluray.c:862 msgid "" "This Blu-ray Disc needs a library for AACS decoding, and your system does " "not have it." msgstr "" -#: modules/access/bluray.c:870 +#: modules/access/bluray.c:868 msgid "Blu-ray Disc is corrupted." msgstr "" -#: modules/access/bluray.c:872 +#: modules/access/bluray.c:870 msgid "Missing AACS configuration file!" msgstr "" -#: modules/access/bluray.c:874 +#: modules/access/bluray.c:872 msgid "No valid processing key found in AACS config file." msgstr "" -#: modules/access/bluray.c:876 +#: modules/access/bluray.c:874 msgid "No valid host certificate found in AACS config file." msgstr "" -#: modules/access/bluray.c:878 +#: modules/access/bluray.c:876 msgid "AACS Host certificate revoked." msgstr "" -#: modules/access/bluray.c:880 +#: modules/access/bluray.c:878 msgid "AACS MMC failed." msgstr "" -#: modules/access/bluray.c:890 +#: modules/access/bluray.c:888 msgid "" "This Blu-ray Disc needs a library for BD+ decoding, and your system does not " "have it." msgstr "" -#: modules/access/bluray.c:893 +#: modules/access/bluray.c:891 msgid "Your system BD+ decoding library does not work. Missing configuration?" msgstr "" -#: modules/access/bluray.c:926 +#: modules/access/bluray.c:924 msgid "Java required" msgstr "" -#: modules/access/bluray.c:927 +#: modules/access/bluray.c:925 #, c-format msgid "" "This Blu-ray disc requires Java for menus support.%s\n" "The disc will be played without menus." msgstr "" -#: modules/access/bluray.c:928 +#: modules/access/bluray.c:926 msgid "Java was not found on your system." msgstr "" -#: modules/access/bluray.c:951 +#: modules/access/bluray.c:949 msgid "Failed to start bluray playback. Please try without menu support." msgstr "" -#: modules/access/bluray.c:992 modules/access/bluray.c:2825 -#: modules/access/bluray.c:2830 +#: modules/access/bluray.c:990 modules/access/bluray.c:2823 +#: modules/access/bluray.c:2828 msgid "Blu-ray error" msgstr "" -#: modules/access/bluray.c:2115 +#: modules/access/bluray.c:2113 msgid "Top Menu" msgstr "" -#: modules/access/bluray.c:2118 +#: modules/access/bluray.c:2116 msgid "First Play" msgstr "" @@ -6051,7 +6050,7 @@ msgid "10 bits" msgstr "" -#: modules/access/decklink.cpp:358 modules/demux/ty.c:769 +#: modules/access/decklink.cpp:358 modules/demux/ty.c:783 msgid "Closed captions 1" msgstr "" @@ -6087,7 +6086,7 @@ msgstr "" #: modules/access/dshow/dshow.cpp:130 -#: modules/gui/qt/components/open_panels.cpp:838 +#: modules/gui/qt/components/open_panels.cpp:818 msgid "Video device name" msgstr "Nying giketo cinema" @@ -6098,8 +6097,8 @@ msgstr "" #: modules/access/dshow/dshow.cpp:135 -#: modules/gui/qt/components/open_panels.cpp:846 -#: modules/gui/qt/components/open_panels.cpp:1067 +#: modules/gui/qt/components/open_panels.cpp:826 +#: modules/gui/qt/components/open_panels.cpp:1047 msgid "Audio device name" msgstr "Nying giketo gin awinya" @@ -6110,7 +6109,7 @@ msgstr "" #: modules/access/dshow/dshow.cpp:140 -#: modules/gui/qt/components/open_panels.cpp:813 +#: modules/gui/qt/components/open_panels.cpp:793 msgid "Video size" msgstr "Kit Video" @@ -6183,8 +6182,8 @@ msgstr "" #: modules/access/dshow/dshow.cpp:168 -#: modules/gui/qt/components/open_panels.cpp:866 -#: modules/gui/qt/components/open_panels.cpp:1087 +#: modules/gui/qt/components/open_panels.cpp:846 +#: modules/gui/qt/components/open_panels.cpp:1067 msgid "Video standard" msgstr "" @@ -6378,7 +6377,7 @@ "frequency. This is required to tune the receiver." msgstr "" -#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:987 +#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:967 msgid "Modulation / Constellation" msgstr "" @@ -6882,8 +6881,8 @@ #: modules/audio_output/file.c:113 #: modules/gui/macosx/VLCOpenWindowController.m:140 #: modules/gui/macosx/VLCOutput.m:64 modules/gui/macosx/VLCOutput.m:175 -#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1429 -#: modules/gui/qt/dialogs/sout.cpp:69 modules/gui/qt/dialogs/sout.cpp:121 +#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1428 +#: modules/gui/qt/dialogs/sout.cpp:67 modules/gui/qt/dialogs/sout.cpp:119 #: share/lua/http/dialogs/create_stream.html:204 #: share/lua/http/dialogs/stream_config_window.html:36 #: share/lua/http/dialogs/stream_window.html:95 @@ -6909,7 +6908,7 @@ #: modules/access_output/http.c:52 #: modules/gui/macosx/VLCCoreDialogProvider.m:191 #: modules/gui/macosx/VLCSimplePrefsController.m:286 -#: modules/gui/qt/dialogs/external.cpp:203 modules/misc/audioscrobbler.c:114 +#: modules/gui/qt/dialogs/external.cpp:205 modules/misc/audioscrobbler.c:114 #: modules/stream_out/rtp.c:173 msgid "Username" msgstr "" @@ -6928,7 +6927,7 @@ #: modules/gui/macosx/VLCCoreDialogProvider.m:192 #: modules/gui/macosx/VLCSimplePrefsController.m:285 #: modules/gui/macosx/VLCSimplePrefsController.m:348 -#: modules/gui/qt/dialogs/external.cpp:208 modules/lua/vlc.c:54 +#: modules/gui/qt/dialogs/external.cpp:210 modules/lua/vlc.c:54 #: modules/lua/vlc.c:70 modules/misc/audioscrobbler.c:116 #: modules/stream_out/rtp.c:176 msgid "Password" @@ -7120,7 +7119,7 @@ #: modules/demux/rawvid.c:47 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:239 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167 -#: modules/gui/qt/components/extended_panels.cpp:1318 modules/spu/mosaic.c:94 +#: modules/gui/qt/components/extended_panels.cpp:1348 modules/spu/mosaic.c:94 #: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108 #: modules/gui/qt/ui/profiles.h:741 msgid "Width" @@ -7189,7 +7188,7 @@ #: modules/access/imem.c:113 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:236 -#: modules/gui/qt/components/extended_panels.cpp:1317 +#: modules/gui/qt/components/extended_panels.cpp:1347 msgid "Size" msgstr "" @@ -7217,7 +7216,7 @@ msgid "Read the audio stream at VLC pace rather than Jack pace." msgstr "" -#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:918 +#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:898 msgid "Auto connection" msgstr "Kube matime kene" @@ -7382,19 +7381,19 @@ msgid "Port to use for tunneling the RTSP/RTP over HTTP." msgstr "" -#: modules/access/live555.cpp:673 +#: modules/access/live555.cpp:677 msgid "RTSP authentication" msgstr "" -#: modules/access/live555.cpp:674 +#: modules/access/live555.cpp:678 msgid "Please enter a valid login name and a password." msgstr "" -#: modules/access/live555.cpp:699 +#: modules/access/live555.cpp:703 msgid "RTSP connection failed" msgstr "" -#: modules/access/live555.cpp:700 +#: modules/access/live555.cpp:704 msgid "Access to the stream is denied by the server configuration." msgstr "" @@ -7733,7 +7732,7 @@ msgstr "" #: modules/access/screen/screen.c:45 -#: modules/gui/qt/components/open_panels.cpp:1124 +#: modules/gui/qt/components/open_panels.cpp:1104 msgid "Desired frame rate for the capture." msgstr "Rwom me purem mamite me mako." @@ -7988,9 +7987,8 @@ msgstr "" #: modules/access/srt.c:446 modules/access_output/srt.c:480 -#, fuzzy msgid " SRT Stream ID" -msgstr "Yab RTP?UDP mapol" +msgstr "" #: modules/access/srt_common.c:26 msgid "16 bytes" @@ -8098,7 +8096,7 @@ msgid "Radio tuner device node." msgstr "" -#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1094 +#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1074 msgid "Frequency" msgstr "Dwiro ne" @@ -8277,7 +8275,7 @@ msgstr "" #: modules/access/v4l2/v4l2.c:137 -#: modules/gui/qt/components/extended_panels.cpp:1107 +#: modules/gui/qt/components/extended_panels.cpp:1132 msgid "60 Hz" msgstr "" @@ -8436,7 +8434,7 @@ #: modules/control/hotkeys.c:395 #: modules/gui/macosx/VLCAddonsWindowController.m:100 #: modules/gui/qt/dialogs/convert.cpp:164 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/dialogs/plugins.cpp:382 #: modules/gui/qt/dialogs/preferences.cpp:79 msgid "All" msgstr "Weng" @@ -8802,9 +8800,9 @@ #: modules/access_output/livehttp.c:98 msgid "" -"File is read when segment starts and is assumed to be in format: key-" -"uri\\nkey-file. File is read on the segment opening and values are used on " -"that segment." +"File is read when segment starts and is assumed to be in format: key-uri" +"\\nkey-file. File is read on the segment opening and values are used on that " +"segment." msgstr "" #: modules/access_output/livehttp.c:102 @@ -8865,7 +8863,7 @@ msgstr "" #: modules/access_output/rist.c:842 modules/access_output/shout.c:64 -#: modules/gui/qt/components/sout/sout_widgets.cpp:385 +#: modules/gui/qt/components/sout/sout_widgets.cpp:386 #: share/lua/http/dialogs/create_stream.html:139 msgid "Stream name" msgstr "" @@ -9239,7 +9237,7 @@ #: modules/audio_filter/chorus_flanger.c:80 #: modules/audio_filter/stereo_widen.c:57 -#: modules/gui/qt/components/extended_panels.cpp:1337 +#: modules/gui/qt/components/extended_panels.cpp:1367 msgid "Delay time" msgstr "" @@ -9267,7 +9265,7 @@ #: modules/audio_filter/chorus_flanger.c:89 #: modules/audio_filter/stereo_widen.c:60 -#: modules/gui/qt/components/extended_panels.cpp:1338 +#: modules/gui/qt/components/extended_panels.cpp:1368 msgid "Feedback gain" msgstr "" @@ -9293,7 +9291,7 @@ #: modules/audio_filter/compressor.c:155 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:225 -#: modules/gui/qt/components/extended_panels.cpp:1295 +#: modules/gui/qt/components/extended_panels.cpp:1325 msgid "RMS/peak" msgstr "" @@ -9327,7 +9325,7 @@ #: modules/audio_filter/compressor.c:167 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:229 -#: modules/gui/qt/components/extended_panels.cpp:1299 +#: modules/gui/qt/components/extended_panels.cpp:1329 msgid "Ratio" msgstr "" @@ -9744,19 +9742,19 @@ #: modules/audio_filter/spatializer/spatializer.cpp:61 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:241 -#: modules/gui/qt/components/extended_panels.cpp:1319 +#: modules/gui/qt/components/extended_panels.cpp:1349 msgid "Wet" msgstr "" #: modules/audio_filter/spatializer/spatializer.cpp:64 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:242 -#: modules/gui/qt/components/extended_panels.cpp:1320 +#: modules/gui/qt/components/extended_panels.cpp:1350 msgid "Dry" msgstr "" #: modules/audio_filter/spatializer/spatializer.cpp:67 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:243 -#: modules/gui/qt/components/extended_panels.cpp:1321 +#: modules/gui/qt/components/extended_panels.cpp:1351 msgid "Damp" msgstr "" @@ -9790,7 +9788,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:64 -#: modules/gui/qt/components/extended_panels.cpp:1339 +#: modules/gui/qt/components/extended_panels.cpp:1369 msgid "Crossfeed" msgstr "" @@ -9802,7 +9800,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:68 -#: modules/gui/qt/components/extended_panels.cpp:1340 +#: modules/gui/qt/components/extended_panels.cpp:1370 msgid "Dry mix" msgstr "" @@ -10040,7 +10038,7 @@ msgid "K Audio Interface audio output" msgstr "" -#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:416 +#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:417 msgid "HDMI/SPDIF audio passthrough" msgstr "" @@ -10130,11 +10128,11 @@ "output mode (which is not well supported by some soundcards)." msgstr "" -#: modules/codec/a52.c:70 +#: modules/codec/a52.c:72 msgid "A/52 dynamic range compression" msgstr "" -#: modules/codec/a52.c:72 modules/codec/dca.c:63 +#: modules/codec/a52.c:74 modules/codec/dca.c:65 msgid "" "Dynamic range compression makes the loud sounds softer, and the soft sounds " "louder, so you can more easily listen to the stream in a noisy environment " @@ -10142,7 +10140,7 @@ "playback will be more adapted to a movie theater or a listening room." msgstr "" -#: modules/codec/a52.c:80 +#: modules/codec/a52.c:82 msgid "ATSC A/52 (AC-3) audio decoder" msgstr "" @@ -10614,15 +10612,15 @@ "enabled libavcodec" msgstr "" -#: modules/codec/avcodec/d3d11va.c:63 +#: modules/codec/avcodec/d3d11va.c:67 msgid "Direct3D11 Video Acceleration" msgstr "" -#: modules/codec/avcodec/dxva2.c:51 +#: modules/codec/avcodec/dxva2.c:55 msgid "DirectX Video Acceleration (DXVA) 2.0" msgstr "" -#: modules/codec/avcodec/encoder.c:383 +#: modules/codec/avcodec/encoder.c:399 #, c-format msgid "" "It seems your Libav/FFmpeg (libavcodec) installation lacks the following " @@ -10634,32 +10632,32 @@ "Do not contact the VideoLAN project about this issue.\n" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "unknown" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "video" msgstr "" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "audio" msgstr "" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "subpicture" msgstr "" -#: modules/codec/avcodec/encoder.c:919 +#: modules/codec/avcodec/encoder.c:940 #, c-format msgid "VLC could not open the %4.4s %s encoder." msgstr "" -#: modules/codec/avcodec/vaapi.c:354 +#: modules/codec/avcodec/vaapi.c:388 msgid "VA-API video decoder via DRM" msgstr "" -#: modules/codec/avcodec/vaapi.c:359 +#: modules/codec/avcodec/vaapi.c:393 msgid "VA-API video decoder" msgstr "" @@ -10756,15 +10754,23 @@ msgid "Max number of threads used for tile decoding, default 0=auto" msgstr "" -#: modules/codec/dav1d.c:60 +#: modules/codec/dav1d.c:56 +msgid "All Layers" +msgstr "" + +#: modules/codec/dav1d.c:57 +msgid "Whether or not to display all spatial layers, default false" +msgstr "" + +#: modules/codec/dav1d.c:62 msgid "Dav1d video decoder" msgstr "" -#: modules/codec/dca.c:61 +#: modules/codec/dca.c:63 msgid "DTS dynamic range compression" msgstr "" -#: modules/codec/dca.c:73 +#: modules/codec/dca.c:75 msgid "DTS Coherent Acoustics audio decoder" msgstr "" @@ -11280,7 +11286,7 @@ "This should take less than a minute." msgstr "" -#: modules/codec/libmpeg2.c:137 +#: modules/codec/libmpeg2.c:140 msgid "MPEG I/II video decoder (using libmpeg2)" msgstr "" @@ -11300,7 +11306,7 @@ msgid "MPEG audio layer I/II/III decoder" msgstr "" -#: modules/codec/mft.c:62 +#: modules/codec/mft.c:66 msgid "Media Foundation Transform decoder" msgstr "" @@ -11966,7 +11972,7 @@ msgid "S/PDIF pass-through decoder" msgstr "" -#: modules/codec/speex.c:59 modules/codec/speex.c:907 +#: modules/codec/speex.c:59 modules/codec/speex.c:910 #: modules/gui/macosx/VLCOpenWindowController.m:195 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:259 #: modules/gui/qt/ui/sprefs_video.h:325 modules/gui/qt/ui/video_effects.h:1282 @@ -12292,7 +12298,7 @@ #. #. This MUST be a valid iconv character set. If unsure, please refer #. the VideoLAN translators mailing list. -#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:98 +#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:99 msgctxt "GetACP" msgid "CP1252" msgstr "" @@ -13295,8 +13301,8 @@ #: modules/codec/x264.c:429 modules/gui/macosx/VLCMainMenu.m:290 #: modules/gui/macosx/VLCMainMenu.m:392 #: modules/gui/macosx/VLCSimplePrefsController.m:711 -#: modules/gui/qt/components/simple_preferences.cpp:703 -#: modules/misc/gnutls.c:778 modules/text_renderer/freetype/freetype.c:124 +#: modules/gui/qt/components/simple_preferences.cpp:714 +#: modules/misc/gnutls.c:775 modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:143 msgid "Normal" msgstr "Majwi" @@ -13353,7 +13359,7 @@ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)" msgstr "" -#: modules/codec/x265.c:46 +#: modules/codec/x265.c:53 msgid "H.265/HEVC encoder (x265)" msgstr "" @@ -13429,14 +13435,14 @@ #: modules/gui/macosx/VLCMainWindow.m:587 #: modules/gui/macosx/VLCMainWindow.m:1030 #: modules/gui/macosx/VLCStatusBarIcon.m:378 modules/gui/ncurses.c:1026 -#: modules/gui/qt/dialogs/help.cpp:91 modules/gui/qt/main_interface.cpp:1267 -#: modules/gui/qt/main_interface.cpp:1271 -#: modules/gui/qt/main_interface.cpp:1310 -#: modules/gui/qt/main_interface.cpp:1312 -#: modules/gui/qt/main_interface.cpp:1420 -#: modules/gui/qt/main_interface.cpp:1437 -#: modules/gui/qt/main_interface.cpp:1445 -#: modules/gui/qt/main_interface.cpp:1468 modules/lua/libs/httpd.c:80 +#: modules/gui/qt/dialogs/help.cpp:100 modules/gui/qt/main_interface.cpp:1302 +#: modules/gui/qt/main_interface.cpp:1306 +#: modules/gui/qt/main_interface.cpp:1343 +#: modules/gui/qt/main_interface.cpp:1345 +#: modules/gui/qt/main_interface.cpp:1453 +#: modules/gui/qt/main_interface.cpp:1470 +#: modules/gui/qt/main_interface.cpp:1478 +#: modules/gui/qt/main_interface.cpp:1501 modules/lua/libs/httpd.c:80 #: modules/notify/osx_notifications.m:302 #: modules/video_output/wayland/shell.c:348 #: modules/video_output/wayland/xdg-shell.c:291 @@ -13489,7 +13495,7 @@ #: modules/control/globalhotkeys/win32.c:47 #: modules/control/globalhotkeys/xcb.c:50 -#: modules/gui/qt/components/preferences_widgets.cpp:1137 +#: modules/gui/qt/components/preferences_widgets.cpp:1141 msgid "Global Hotkeys" msgstr "" @@ -13500,8 +13506,8 @@ #: modules/control/hotkeys.c:100 #: modules/gui/macosx/VLCSimplePrefsController.m:251 -#: modules/gui/qt/components/preferences_widgets.cpp:1136 -#: modules/gui/qt/components/simple_preferences.cpp:257 +#: modules/gui/qt/components/preferences_widgets.cpp:1140 +#: modules/gui/qt/components/simple_preferences.cpp:258 msgid "Hotkeys" msgstr "Lagony muywek" @@ -14189,7 +14195,7 @@ msgstr "" #: modules/demux/adaptive/adaptive.cpp:85 -#: modules/gui/qt/components/simple_preferences.cpp:702 +#: modules/gui/qt/components/simple_preferences.cpp:713 msgid "Low latency" msgstr "Lyeto matidi" @@ -14241,11 +14247,11 @@ msgid "ASF/WMV demuxer" msgstr "" -#: modules/demux/asf/asf.c:277 modules/demux/asf/asf.c:834 +#: modules/demux/asf/asf.c:285 modules/demux/asf/asf.c:836 msgid "Could not demux ASF stream" msgstr "" -#: modules/demux/asf/asf.c:278 +#: modules/demux/asf/asf.c:286 msgid "VLC failed to load the ASF header." msgstr "" @@ -14289,41 +14295,41 @@ msgid "Internal libavcodec format name" msgstr "" -#: modules/demux/avi/avi.c:55 +#: modules/demux/avi/avi.c:56 msgid "Force interleaved method" msgstr "" -#: modules/demux/avi/avi.c:57 +#: modules/demux/avi/avi.c:58 msgid "Force index creation" msgstr "" -#: modules/demux/avi/avi.c:59 +#: modules/demux/avi/avi.c:60 msgid "" "Recreate a index for the AVI file. Use this if your AVI file is damaged or " "incomplete (not seekable)." msgstr "" -#: modules/demux/avi/avi.c:67 +#: modules/demux/avi/avi.c:68 msgid "Ask for action" msgstr "" -#: modules/demux/avi/avi.c:68 +#: modules/demux/avi/avi.c:69 msgid "Always fix" msgstr "" -#: modules/demux/avi/avi.c:69 +#: modules/demux/avi/avi.c:70 msgid "Never fix" msgstr "" -#: modules/demux/avi/avi.c:70 +#: modules/demux/avi/avi.c:71 msgid "Fix when necessary" msgstr "" -#: modules/demux/avi/avi.c:74 +#: modules/demux/avi/avi.c:75 msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:902 modules/demux/mp4/mp4.c:4375 +#: modules/demux/avi/avi.c:910 modules/demux/mp4/mp4.c:4374 msgid "" "Because this file index is broken or missing, seeking will not work " "correctly.\n" @@ -14333,27 +14339,27 @@ "What do you want to do?" msgstr "" -#: modules/demux/avi/avi.c:910 +#: modules/demux/avi/avi.c:918 msgid "Do not play" msgstr "" -#: modules/demux/avi/avi.c:911 +#: modules/demux/avi/avi.c:919 msgid "Build index then play" msgstr "" -#: modules/demux/avi/avi.c:912 +#: modules/demux/avi/avi.c:920 msgid "Play as is" msgstr "" -#: modules/demux/avi/avi.c:913 modules/demux/mp4/mp4.c:4386 +#: modules/demux/avi/avi.c:921 modules/demux/mp4/mp4.c:4385 msgid "Broken or missing Index" msgstr "" -#: modules/demux/avi/avi.c:2828 +#: modules/demux/avi/avi.c:2879 msgid "Broken or missing AVI Index" msgstr "" -#: modules/demux/avi/avi.c:2829 +#: modules/demux/avi/avi.c:2880 msgid "Fixing AVI Index..." msgstr "" @@ -14510,7 +14516,7 @@ "good for broken files)." msgstr "" -#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:112 +#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:113 msgid "Seek based on percent not time" msgstr "" @@ -14760,27 +14766,27 @@ msgid "Clean" msgstr "" -#: modules/demux/mp4/mp4.c:50 +#: modules/demux/mp4/mp4.c:51 msgid "M4A audio only" msgstr "" -#: modules/demux/mp4/mp4.c:51 +#: modules/demux/mp4/mp4.c:52 msgid "Ignore non audio tracks from iTunes audio files" msgstr "" -#: modules/demux/mp4/mp4.c:56 +#: modules/demux/mp4/mp4.c:57 msgid "MP4 stream demuxer" msgstr "" -#: modules/demux/mp4/mp4.c:57 +#: modules/demux/mp4/mp4.c:58 msgid "MP4" msgstr "" -#: modules/demux/mp4/mp4.c:4383 +#: modules/demux/mp4/mp4.c:4382 msgid "Do not seek" msgstr "" -#: modules/demux/mp4/mp4.c:4384 +#: modules/demux/mp4/mp4.c:4383 msgid "Build index" msgstr "" @@ -14841,89 +14847,89 @@ msgid "PS" msgstr "" -#: modules/demux/mpeg/ts.c:83 +#: modules/demux/mpeg/ts.c:84 msgid "Extra PMT" msgstr "" -#: modules/demux/mpeg/ts.c:85 +#: modules/demux/mpeg/ts.c:86 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." msgstr "" -#: modules/demux/mpeg/ts.c:87 +#: modules/demux/mpeg/ts.c:88 msgid "Set id of ES to PID" msgstr "" -#: modules/demux/mpeg/ts.c:88 +#: modules/demux/mpeg/ts.c:89 msgid "" "Set the internal ID of each elementary stream handled by VLC to the same " "value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do " "'#duplicate{..., select=\"es=\"}'." msgstr "" -#: modules/demux/mpeg/ts.c:93 modules/mux/mpeg/ts.c:173 +#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:173 msgid "CSA Key" msgstr "" -#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:174 +#: modules/demux/mpeg/ts.c:95 modules/mux/mpeg/ts.c:174 msgid "" "CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:97 modules/mux/mpeg/ts.c:177 +#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:177 msgid "Second CSA Key" msgstr "" -#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:178 +#: modules/demux/mpeg/ts.c:99 modules/mux/mpeg/ts.c:178 msgid "" "The even CSA encryption key. This must be a 16 char string (8 hexadecimal " "bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:102 +#: modules/demux/mpeg/ts.c:103 msgid "Packet size in bytes to decrypt" msgstr "" -#: modules/demux/mpeg/ts.c:103 +#: modules/demux/mpeg/ts.c:104 msgid "" "Specify the size of the TS packet to decrypt. The decryption routines " "subtract the TS-header from the value before decrypting." msgstr "" -#: modules/demux/mpeg/ts.c:107 +#: modules/demux/mpeg/ts.c:108 msgid "Separate sub-streams" msgstr "" -#: modules/demux/mpeg/ts.c:109 +#: modules/demux/mpeg/ts.c:110 msgid "" "Separate teletex/dvbs pages into independent ES. It can be useful to turn " "off this option when using stream output." msgstr "" -#: modules/demux/mpeg/ts.c:114 +#: modules/demux/mpeg/ts.c:115 msgid "" "Seek and position based on a percent byte position, not a PCR generated time " "position. If seeking doesn't work property, turn on this option." msgstr "" -#: modules/demux/mpeg/ts.c:125 +#: modules/demux/mpeg/ts.c:126 msgid "Trust in-stream PCR" msgstr "" -#: modules/demux/mpeg/ts.c:126 +#: modules/demux/mpeg/ts.c:127 msgid "Use the stream PCR as a reference." msgstr "" -#: modules/demux/mpeg/ts.c:133 modules/mux/mpeg/ts.c:100 +#: modules/demux/mpeg/ts.c:134 modules/mux/mpeg/ts.c:100 msgid "Digital TV Standard" msgstr "" -#: modules/demux/mpeg/ts.c:134 +#: modules/demux/mpeg/ts.c:135 msgid "" "Selects mode for digital TV standard. This feature affects EPG information " "and subtitles." msgstr "" -#: modules/demux/mpeg/ts.c:138 +#: modules/demux/mpeg/ts.c:139 msgid "MPEG Transport Stream demuxer" msgstr "" @@ -15144,7 +15150,7 @@ msgid "Total duration" msgstr "" -#: modules/demux/pva.c:43 +#: modules/demux/pva.c:44 msgid "PVA demuxer" msgstr "" @@ -15274,23 +15280,23 @@ msgid "TTA demuxer" msgstr "" -#: modules/demux/ty.c:59 +#: modules/demux/ty.c:62 msgid "TY" msgstr "" -#: modules/demux/ty.c:60 +#: modules/demux/ty.c:63 msgid "TY Stream audio/video demux" msgstr "" -#: modules/demux/ty.c:770 +#: modules/demux/ty.c:784 msgid "Closed captions 2" msgstr "" -#: modules/demux/ty.c:771 +#: modules/demux/ty.c:785 msgid "Closed captions 3" msgstr "" -#: modules/demux/ty.c:772 +#: modules/demux/ty.c:786 msgid "Closed captions 4" msgstr "" @@ -15306,7 +15312,7 @@ msgid "Vobsub subtitles parser" msgstr "" -#: modules/demux/voc.c:43 +#: modules/demux/voc.c:45 msgid "VOC demuxer" msgstr "" @@ -15318,7 +15324,7 @@ msgid "XA demuxer" msgstr "" -#: modules/demux/xiph_metadata.c:588 +#: modules/demux/xiph_metadata.c:571 msgid "Unknown category" msgstr "" @@ -15372,17 +15378,17 @@ msgstr "Mamako gi tuku wer me VLC" #: modules/gui/macosx/VLCAboutWindowController.m:97 -#: modules/gui/qt/dialogs/help.cpp:125 +#: modules/gui/qt/dialogs/help.cpp:137 msgid "Credits" msgstr "" #: modules/gui/macosx/VLCAboutWindowController.m:99 -#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:119 +#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:129 msgid "License" msgstr "Lancec" #: modules/gui/macosx/VLCAboutWindowController.m:101 -#: modules/gui/qt/dialogs/help.cpp:122 +#: modules/gui/qt/dialogs/help.cpp:133 msgid "Authors" msgstr "Lucoc" @@ -15398,33 +15404,33 @@ "\">VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" +"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:105 #: modules/gui/macosx/VLCAddonsWindowController.m:357 -#: modules/gui/qt/dialogs/plugins.cpp:389 +#: modules/gui/qt/dialogs/plugins.cpp:388 #: modules/gui/qt/managers/addons_manager.cpp:88 msgid "Playlist parsers" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:107 #: modules/gui/macosx/VLCAddonsWindowController.m:359 -#: modules/gui/qt/dialogs/plugins.cpp:393 +#: modules/gui/qt/dialogs/plugins.cpp:392 #: modules/gui/qt/managers/addons_manager.cpp:90 msgid "Service Discovery" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:109 -#: modules/gui/qt/dialogs/plugins.cpp:397 +#: modules/gui/qt/dialogs/plugins.cpp:396 #: modules/gui/qt/managers/addons_manager.cpp:92 msgid "Interfaces" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:111 -#: modules/gui/qt/dialogs/plugins.cpp:400 +#: modules/gui/qt/dialogs/plugins.cpp:399 #: modules/gui/qt/managers/addons_manager.cpp:94 msgid "Art and meta fetchers" msgstr "" @@ -15432,7 +15438,7 @@ #: modules/gui/macosx/VLCAddonsWindowController.m:113 #: modules/gui/macosx/VLCAddonsWindowController.m:361 #: modules/gui/macosx/VLCMainMenu.m:343 modules/gui/macosx/VLCMainMenu.m:344 -#: modules/gui/qt/dialogs/plugins.cpp:403 +#: modules/gui/qt/dialogs/plugins.cpp:402 #: modules/gui/qt/managers/addons_manager.cpp:96 msgid "Extensions" msgstr "Nyayo" @@ -15442,30 +15448,30 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:118 -#: modules/gui/qt/dialogs/plugins.cpp:431 +#: modules/gui/qt/dialogs/plugins.cpp:430 msgid "Find more addons online" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:128 -#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:86 +#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:85 msgid "Addons Manager" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:130 -#: modules/gui/qt/dialogs/plugins.cpp:1173 -#: modules/gui/qt/dialogs/plugins.cpp:1186 +#: modules/gui/qt/dialogs/plugins.cpp:1172 +#: modules/gui/qt/dialogs/plugins.cpp:1185 msgid "Installed" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:131 #: modules/gui/macosx/VLCBookmarksWindowController.m:87 -#: modules/gui/qt/dialogs/plugins.cpp:128 modules/mux/avi.c:54 +#: modules/gui/qt/dialogs/plugins.cpp:127 modules/mux/avi.c:54 msgid "Name" msgstr "Nying" #: modules/gui/macosx/VLCAddonsWindowController.m:132 -#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1405 -#: modules/gui/qt/dialogs/plugins.cpp:1510 modules/mux/asf.c:58 +#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1404 +#: modules/gui/qt/dialogs/plugins.cpp:1509 modules/mux/asf.c:58 msgid "Author" msgstr "Lacoc" @@ -15474,7 +15480,7 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:355 -#: modules/gui/qt/dialogs/plugins.cpp:385 +#: modules/gui/qt/dialogs/plugins.cpp:384 #: modules/gui/qt/managers/addons_manager.cpp:86 #: modules/gui/skins2/src/skin_main.cpp:535 msgid "Skins" @@ -15491,7 +15497,7 @@ msgstr "Okato 2" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:219 -#: modules/gui/qt/components/extended_panels.cpp:1132 +#: modules/gui/qt/components/extended_panels.cpp:1157 #: modules/gui/qt/ui/equalizer.h:133 msgid "Preamp" msgstr "Ma pe giketo dwon malo" @@ -15504,22 +15510,22 @@ #: modules/gui/macosx/VLCAudioEffectsWindowController.m:235 #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:49 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:210 -#: modules/gui/qt/dialogs/gototime.cpp:66 +#: modules/gui/qt/dialogs/gototime.cpp:65 msgid "Reset" msgstr "Ter nitit" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:226 -#: modules/gui/qt/components/extended_panels.cpp:1296 +#: modules/gui/qt/components/extended_panels.cpp:1326 msgid "Attack" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:227 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "Release" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:228 -#: modules/gui/qt/components/extended_panels.cpp:1298 +#: modules/gui/qt/components/extended_panels.cpp:1328 msgid "Threshold" msgstr "" @@ -15673,7 +15679,7 @@ #: modules/gui/macosx/VLCOutput.m:60 modules/gui/macosx/VLCPlaylistInfo.m:337 #: modules/gui/macosx/VLCSimplePrefsController.m:295 #: modules/gui/macosx/VLCTimeSelectionPanelController.m:51 -#: modules/gui/qt/components/open_panels.cpp:1380 +#: modules/gui/qt/components/open_panels.cpp:1360 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "OK" msgstr "Eyo" @@ -15698,8 +15704,8 @@ #: modules/gui/macosx/VLCBookmarksWindowController.m:213 msgid "" -"Input has changed, unable to save bookmark. Suspending playback with " -"\"Pause\" while editing bookmarks to ensure to keep the same input." +"Input has changed, unable to save bookmark. Suspending playback with \"Pause" +"\" while editing bookmarks to ensure to keep the same input." msgstr "" #: modules/gui/macosx/VLCControlsBarCommon.m:84 @@ -15788,10 +15794,10 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:381 #: modules/gui/macosx/prefs_widgets.m:1126 #: modules/gui/qt/components/preferences_widgets.cpp:264 -#: modules/gui/qt/components/simple_preferences.cpp:471 -#: modules/gui/qt/components/sout/sout_widgets.cpp:135 -#: modules/gui/qt/ui/open.h:279 modules/gui/qt/ui/open_disk.h:304 -#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:414 +#: modules/gui/qt/components/simple_preferences.cpp:472 +#: modules/gui/qt/components/sout/sout_widgets.cpp:136 +#: modules/gui/qt/ui/open.h:277 modules/gui/qt/ui/open_disk.h:304 +#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:415 #: modules/gui/qt/ui/sprefs_input.h:365 modules/gui/qt/ui/sprefs_video.h:329 msgid "Browse..." msgstr "Yeny..." @@ -15812,7 +15818,7 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:149 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:392 #: modules/gui/macosx/VLCOutput.m:65 modules/gui/macosx/VLCOutput.m:194 -#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:94 +#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:92 msgid "Stream" msgstr "Makato kore kore " @@ -15885,10 +15891,10 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:186 #: modules/gui/macosx/VLCOpenWindowController.m:197 #: modules/gui/macosx/VLCOutput.m:68 -#: modules/gui/qt/components/sout/sout_widgets.cpp:241 -#: modules/gui/qt/components/sout/sout_widgets.cpp:328 -#: modules/gui/qt/components/sout/sout_widgets.cpp:370 -#: modules/gui/qt/components/sout/sout_widgets.cpp:425 +#: modules/gui/qt/components/sout/sout_widgets.cpp:242 +#: modules/gui/qt/components/sout/sout_widgets.cpp:329 +#: modules/gui/qt/components/sout/sout_widgets.cpp:371 +#: modules/gui/qt/components/sout/sout_widgets.cpp:426 msgid "Address" msgstr "Address" @@ -15900,11 +15906,11 @@ #: modules/gui/macosx/VLCOpenWindowController.m:185 #: modules/gui/macosx/VLCOpenWindowController.m:187 #: modules/gui/macosx/VLCOutput.m:69 -#: modules/gui/qt/components/sout/sout_widgets.cpp:187 -#: modules/gui/qt/components/sout/sout_widgets.cpp:242 -#: modules/gui/qt/components/sout/sout_widgets.cpp:283 -#: modules/gui/qt/components/sout/sout_widgets.cpp:329 -#: modules/gui/qt/components/sout/sout_widgets.cpp:426 modules/lua/vlc.c:67 +#: modules/gui/qt/components/sout/sout_widgets.cpp:188 +#: modules/gui/qt/components/sout/sout_widgets.cpp:243 +#: modules/gui/qt/components/sout/sout_widgets.cpp:284 +#: modules/gui/qt/components/sout/sout_widgets.cpp:330 +#: modules/gui/qt/components/sout/sout_widgets.cpp:427 modules/lua/vlc.c:67 #: modules/stream_out/rtp.c:114 #: share/lua/http/dialogs/stream_config_window.html:32 #: share/lua/http/dialogs/stream_window.html:91 @@ -15996,7 +16002,7 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:705 #: modules/gui/macosx/VLCSimplePrefsController.m:733 #: modules/gui/macosx/VLCSimplePrefsController.m:1266 -#: modules/gui/qt/components/simple_preferences.cpp:700 +#: modules/gui/qt/components/simple_preferences.cpp:711 msgid "Custom" msgstr "Lakite meri" @@ -16035,7 +16041,7 @@ #: modules/gui/macosx/VLCFSPanelController.m:140 #: modules/gui/macosx/VLCMainWindowControlsBar.m:80 -#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:408 +#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:409 msgid "Volume" msgstr "Dwon" @@ -16069,7 +16075,7 @@ msgstr "" #: modules/gui/macosx/VLCLogWindowController.m:94 -#: modules/gui/qt/dialogs/messages.cpp:80 +#: modules/gui/qt/dialogs/messages.cpp:77 #: modules/gui/qt/ui/messages_panel.h:136 #: modules/gui/qt/ui/messages_panel.h:140 msgid "Messages" @@ -16433,8 +16439,8 @@ msgid "Bring All to Front" msgstr "Kelgi weng Inyim" -#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:54 -#: modules/gui/qt/menus.cpp:951 modules/gui/qt/menus.cpp:1138 +#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:52 +#: modules/gui/qt/menus.cpp:956 modules/gui/qt/menus.cpp:1143 msgid "Help" msgstr "kony" @@ -16497,13 +16503,13 @@ #: modules/gui/macosx/VLCMainWindow.m:220 #: modules/gui/macosx/VLCMainWindow.m:226 -#: modules/gui/qt/components/playlist/selector.cpp:580 +#: modules/gui/qt/components/playlist/selector.cpp:593 msgid "Subscribe" msgstr "Kwa pi kube" #: modules/gui/macosx/VLCMainWindow.m:221 #: modules/gui/macosx/VLCMainWindow.m:232 -#: modules/gui/qt/components/playlist/selector.cpp:597 +#: modules/gui/qt/components/playlist/selector.cpp:610 msgid "Unsubscribe" msgstr "Aa woko ki ikube" @@ -16513,7 +16519,7 @@ msgstr "Kube pi video" #: modules/gui/macosx/VLCMainWindow.m:225 -#: modules/gui/qt/components/playlist/selector.cpp:581 +#: modules/gui/qt/components/playlist/selector.cpp:594 msgid "Enter URL of the podcast to subscribe to:" msgstr "Ket URL pi video ma imito kube pire:" @@ -16550,7 +16556,7 @@ msgstr "" #: modules/gui/macosx/VLCMainWindowControlsBar.m:71 -#: modules/gui/qt/dialogs/vlm.cpp:548 share/lua/http/index.html:259 +#: modules/gui/qt/dialogs/vlm.cpp:542 share/lua/http/index.html:259 msgid "Repeat" msgstr "" @@ -16636,7 +16642,7 @@ #: modules/gui/macosx/VLCOpenWindowController.m:152 #: modules/gui/macosx/VLCOpenWindowController.m:349 #: modules/gui/macosx/VLCSimplePrefsController.m:353 -#: modules/gui/qt/ui/sprefs_interface.h:545 +#: modules/gui/qt/ui/sprefs_interface.h:552 msgid "Choose..." msgstr "Yer..." @@ -16869,10 +16875,9 @@ msgstr "" #: modules/gui/macosx/VLCPlaylist.m:231 -#: modules/gui/qt/components/playlist/standardpanel.cpp:273 -#, fuzzy +#: modules/gui/qt/components/playlist/standardpanel.cpp:274 msgid "Shuffle playlist" -msgstr "Gwok nying otuku" +msgstr "" #: modules/gui/macosx/VLCPlaylistInfo.m:54 #: modules/gui/qt/dialogs/mediainfo.cpp:54 @@ -16942,8 +16947,8 @@ msgid "VLC was unable to save the meta data." msgstr "VCL pe okano jami man." -#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:194 -#: modules/gui/qt/ui/sprefs_interface.h:551 +#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:197 +#: modules/gui/qt/ui/sprefs_interface.h:558 msgid "Continue playback?" msgstr "" @@ -16987,27 +16992,27 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:241 -#: modules/gui/qt/components/simple_preferences.cpp:247 -#: modules/gui/qt/components/simple_preferences.cpp:727 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/components/simple_preferences.cpp:248 +#: modules/gui/qt/components/simple_preferences.cpp:738 +#: modules/gui/qt/dialogs/plugins.cpp:382 msgid "Interface Settings" msgstr "Kite pa Kaneno" #: modules/gui/macosx/VLCSimplePrefsController.m:243 -#: modules/gui/qt/components/simple_preferences.cpp:249 -#: modules/gui/qt/components/simple_preferences.cpp:446 +#: modules/gui/qt/components/simple_preferences.cpp:250 +#: modules/gui/qt/components/simple_preferences.cpp:447 msgid "Audio Settings" msgstr "Kite me yiko Wer" #: modules/gui/macosx/VLCSimplePrefsController.m:245 -#: modules/gui/qt/components/simple_preferences.cpp:251 -#: modules/gui/qt/components/simple_preferences.cpp:379 +#: modules/gui/qt/components/simple_preferences.cpp:252 +#: modules/gui/qt/components/simple_preferences.cpp:380 msgid "Video Settings" msgstr "Kite me yiko Video" #: modules/gui/macosx/VLCSimplePrefsController.m:247 -#: modules/gui/qt/components/simple_preferences.cpp:253 -#: modules/gui/qt/components/simple_preferences.cpp:868 +#: modules/gui/qt/components/simple_preferences.cpp:254 +#: modules/gui/qt/components/simple_preferences.cpp:894 msgid "Subtitle & On Screen Display Settings" msgstr "" @@ -17036,12 +17041,12 @@ msgstr "Gwok wer iyi akina jami" #: modules/gui/macosx/VLCSimplePrefsController.m:289 -#: modules/gui/qt/ui/sprefs_audio.h:410 +#: modules/gui/qt/ui/sprefs_audio.h:411 msgid "Always reset audio start level to:" msgstr "Jwii dwok rwom me wer meri naka:" #: modules/gui/macosx/VLCSimplePrefsController.m:292 -#: modules/gui/qt/dialogs/vlm.cpp:492 +#: modules/gui/qt/dialogs/vlm.cpp:486 msgid "Change" msgstr "Lok woko" @@ -17054,7 +17059,7 @@ msgstr "Yer kite me loko kadiyo ne:" #: modules/gui/macosx/VLCSimplePrefsController.m:298 -#: modules/gui/qt/components/preferences_widgets.cpp:1141 +#: modules/gui/qt/components/preferences_widgets.cpp:1145 msgid "Action" msgstr "Keto I tic" @@ -17080,7 +17085,7 @@ msgstr "Kite me Gwoko Majwi" #: modules/gui/macosx/VLCSimplePrefsController.m:307 -#: modules/gui/qt/ui/open.h:263 +#: modules/gui/qt/ui/open.h:261 msgid "Caching" msgstr "Mako" @@ -17164,7 +17169,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:341 -#: modules/gui/qt/ui/sprefs_interface.h:553 +#: modules/gui/qt/ui/sprefs_interface.h:560 msgid "Privacy / Network Interaction" msgstr "Imung me Kube ki Lakub" @@ -17239,7 +17244,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:370 -#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:178 +#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:181 msgid "Pause the video playback when minimized" msgstr "" @@ -17420,12 +17425,12 @@ msgstr "Ceken." #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:50 -#: modules/gui/qt/components/extended_panels.cpp:1412 modules/gui/qt/qt.cpp:213 +#: modules/gui/qt/components/extended_panels.cpp:1442 modules/gui/qt/qt.cpp:216 msgid "Audio/Video" msgstr "Wer/Video" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:51 -#: modules/gui/qt/components/extended_panels.cpp:1416 +#: modules/gui/qt/components/extended_panels.cpp:1446 msgid "Audio track synchronization:" msgstr "" @@ -17434,12 +17439,12 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:54 -#: modules/gui/qt/components/extended_panels.cpp:1424 +#: modules/gui/qt/components/extended_panels.cpp:1454 msgid "Subtitles/Video" msgstr "Wie matino/Video" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:55 -#: modules/gui/qt/components/extended_panels.cpp:1428 +#: modules/gui/qt/components/extended_panels.cpp:1458 msgid "Subtitle track synchronization:" msgstr "" @@ -17448,31 +17453,31 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:58 -#: modules/gui/qt/components/extended_panels.cpp:1435 +#: modules/gui/qt/components/extended_panels.cpp:1465 msgid "Subtitle speed:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:60 -#: modules/gui/qt/components/extended_panels.cpp:1449 +#: modules/gui/qt/components/extended_panels.cpp:1479 msgid "Subtitle duration factor:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:68 -#: modules/gui/qt/components/extended_panels.cpp:1560 +#: modules/gui/qt/components/extended_panels.cpp:1590 msgid "" "Extend subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:72 -#: modules/gui/qt/components/extended_panels.cpp:1565 +#: modules/gui/qt/components/extended_panels.cpp:1595 msgid "" "Multiply subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:76 -#: modules/gui/qt/components/extended_panels.cpp:1570 +#: modules/gui/qt/components/extended_panels.cpp:1600 msgid "" "Recalculate subtitle duration according\n" "to their content and this value.\n" @@ -17857,17 +17862,17 @@ " By default, interface resize to the native video size." msgstr "" -#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:180 +#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:183 msgid "" "With this option enabled, the playback will be automatically paused when " "minimizing the window." msgstr "" -#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:182 +#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:185 msgid "Allow automatic icon changes" msgstr "" -#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:184 +#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:187 msgid "" "This option allows the interface to change its icon on various occasions." msgstr "" @@ -17925,21 +17930,21 @@ "open one of those, playback will continue." msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:206 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:209 msgid "Ask" msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/keystore/keychain.m:50 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/keystore/keychain.m:50 msgid "Always" msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/gui/qt/qt.cpp:213 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/gui/qt/qt.cpp:216 msgid "Never" msgstr "" -#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:186 +#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:189 msgid "Maximum Volume displayed" msgstr "" @@ -18282,27 +18287,27 @@ msgid "Find: %s" msgstr "" -#: modules/gui/qt/components/controller.cpp:343 +#: modules/gui/qt/components/controller.cpp:352 msgid "Shift+L" msgstr "Shift+L" -#: modules/gui/qt/components/controller.cpp:448 +#: modules/gui/qt/components/controller.cpp:457 msgid "Click to toggle between loop all, loop one and no loop" msgstr "" -#: modules/gui/qt/components/controller.cpp:549 +#: modules/gui/qt/components/controller.cpp:558 msgid "Previous Chapter/Title" msgstr "Tyeng/Wie mukato" -#: modules/gui/qt/components/controller.cpp:555 +#: modules/gui/qt/components/controller.cpp:564 msgid "Next Chapter/Title" msgstr "Tyeng/Wie mabino" -#: modules/gui/qt/components/controller.cpp:604 +#: modules/gui/qt/components/controller.cpp:613 msgid "Teletext Activation" msgstr "Mito Teletext tic" -#: modules/gui/qt/components/controller.cpp:620 +#: modules/gui/qt/components/controller.cpp:629 msgid "Toggle Transparency" msgstr "" @@ -18421,7 +18426,7 @@ msgstr "Gitic iyi wer mabino" #: modules/gui/qt/components/controller.hpp:126 -#: modules/gui/qt/components/open_panels.cpp:259 +#: modules/gui/qt/components/open_panels.cpp:241 msgid "Open subtitle file" msgstr "" @@ -18466,21 +18471,21 @@ msgid "No EPG Data Available" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:380 #: modules/gui/qt/components/extended_panels.cpp:393 +#: modules/gui/qt/components/extended_panels.cpp:406 msgid "Image Files" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:382 modules/spu/logo.c:49 +#: modules/gui/qt/components/extended_panels.cpp:395 modules/spu/logo.c:49 msgid "Logo filenames" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:395 +#: modules/gui/qt/components/extended_panels.cpp:408 #: modules/video_filter/erase.c:55 msgid "Image mask" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:645 +#: modules/gui/qt/components/extended_panels.cpp:658 msgid "" "No v4l2 instance found.\n" "Please check that the device has been opened with VLC and is playing.\n" @@ -18488,133 +18493,133 @@ "Controls will automatically appear here." msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1107 -#: modules/gui/qt/components/extended_panels.cpp:1108 -#: modules/gui/qt/components/extended_panels.cpp:1109 -#: modules/gui/qt/components/extended_panels.cpp:1110 -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1112 -#: modules/gui/qt/components/extended_panels.cpp:1113 -#: modules/gui/qt/components/extended_panels.cpp:1114 -#: modules/gui/qt/components/extended_panels.cpp:1115 -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1120 -#: modules/gui/qt/components/extended_panels.cpp:1121 -#: modules/gui/qt/components/extended_panels.cpp:1122 -#: modules/gui/qt/components/extended_panels.cpp:1123 -#: modules/gui/qt/components/extended_panels.cpp:1124 -#: modules/gui/qt/components/extended_panels.cpp:1125 -#: modules/gui/qt/components/extended_panels.cpp:1126 -#: modules/gui/qt/components/extended_panels.cpp:1127 -#: modules/gui/qt/components/extended_panels.cpp:1128 -#: modules/gui/qt/components/extended_panels.cpp:1129 #: modules/gui/qt/components/extended_panels.cpp:1132 -#: modules/gui/qt/components/extended_panels.cpp:1298 -#: modules/gui/qt/components/extended_panels.cpp:1300 -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1133 +#: modules/gui/qt/components/extended_panels.cpp:1134 +#: modules/gui/qt/components/extended_panels.cpp:1135 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1137 +#: modules/gui/qt/components/extended_panels.cpp:1138 +#: modules/gui/qt/components/extended_panels.cpp:1139 +#: modules/gui/qt/components/extended_panels.cpp:1140 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1145 +#: modules/gui/qt/components/extended_panels.cpp:1146 +#: modules/gui/qt/components/extended_panels.cpp:1147 +#: modules/gui/qt/components/extended_panels.cpp:1148 +#: modules/gui/qt/components/extended_panels.cpp:1149 +#: modules/gui/qt/components/extended_panels.cpp:1150 +#: modules/gui/qt/components/extended_panels.cpp:1151 +#: modules/gui/qt/components/extended_panels.cpp:1152 +#: modules/gui/qt/components/extended_panels.cpp:1153 +#: modules/gui/qt/components/extended_panels.cpp:1154 +#: modules/gui/qt/components/extended_panels.cpp:1157 +#: modules/gui/qt/components/extended_panels.cpp:1328 +#: modules/gui/qt/components/extended_panels.cpp:1330 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "dB" msgstr "dB" -#: modules/gui/qt/components/extended_panels.cpp:1108 +#: modules/gui/qt/components/extended_panels.cpp:1133 msgid "170 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1109 +#: modules/gui/qt/components/extended_panels.cpp:1134 msgid "310 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1110 +#: modules/gui/qt/components/extended_panels.cpp:1135 msgid "600 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1125 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1150 msgid "1 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1112 +#: modules/gui/qt/components/extended_panels.cpp:1137 msgid "3 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1113 +#: modules/gui/qt/components/extended_panels.cpp:1138 msgid "6 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1114 +#: modules/gui/qt/components/extended_panels.cpp:1139 msgid "12 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1115 +#: modules/gui/qt/components/extended_panels.cpp:1140 msgid "14 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1129 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1154 msgid "16 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1120 +#: modules/gui/qt/components/extended_panels.cpp:1145 msgid "31 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1121 +#: modules/gui/qt/components/extended_panels.cpp:1146 msgid "63 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1122 +#: modules/gui/qt/components/extended_panels.cpp:1147 msgid "125 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1123 +#: modules/gui/qt/components/extended_panels.cpp:1148 msgid "250 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1124 +#: modules/gui/qt/components/extended_panels.cpp:1149 msgid "500 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1126 +#: modules/gui/qt/components/extended_panels.cpp:1151 msgid "2 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1127 +#: modules/gui/qt/components/extended_panels.cpp:1152 msgid "4 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1128 +#: modules/gui/qt/components/extended_panels.cpp:1153 msgid "8 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1296 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1326 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "ms" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1300 +#: modules/gui/qt/components/extended_panels.cpp:1330 msgid "" "Knee\n" "radius" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "" "Makeup\n" "gain" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1354 +#: modules/gui/qt/components/extended_panels.cpp:1384 msgid "Adjust pitch" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1388 +#: modules/gui/qt/components/extended_panels.cpp:1418 msgid "(Hastened)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1390 +#: modules/gui/qt/components/extended_panels.cpp:1420 msgid "(Delayed)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1477 +#: modules/gui/qt/components/extended_panels.cpp:1507 msgid "Force update of this dialog's values" msgstr "Dii lamed me ka miyo tam man" @@ -18709,7 +18714,7 @@ msgid "Overall" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:676 +#: modules/gui/qt/components/interface_widgets.cpp:683 msgid "" "Current playback speed: %1\n" "Click to adjust" @@ -18717,136 +18722,136 @@ "Cipid me tuku ma kombedi:%1\n" "Dii wek i yub" -#: modules/gui/qt/components/interface_widgets.cpp:749 +#: modules/gui/qt/components/interface_widgets.cpp:756 msgid "Revert to normal play speed" msgstr "Dwok iyi cipid me tuku" -#: modules/gui/qt/components/interface_widgets.cpp:856 +#: modules/gui/qt/components/interface_widgets.cpp:863 msgid "Download cover art" msgstr "Kwany gi umo cal" -#: modules/gui/qt/components/interface_widgets.cpp:860 +#: modules/gui/qt/components/interface_widgets.cpp:867 msgid "Add cover art from file" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:926 +#: modules/gui/qt/components/interface_widgets.cpp:933 msgid "Choose Cover Art" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:927 +#: modules/gui/qt/components/interface_widgets.cpp:934 msgid "Image Files (*.gif *.jpg *.jpeg *.png)" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:954 +#: modules/gui/qt/components/interface_widgets.cpp:961 #: modules/gui/qt/dialogs/toolbar.cpp:573 msgid "Elapsed time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:958 +#: modules/gui/qt/components/interface_widgets.cpp:965 #: modules/gui/qt/dialogs/toolbar.cpp:577 msgid "Total/Remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:960 +#: modules/gui/qt/components/interface_widgets.cpp:967 msgid "Click to toggle between total and remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:966 +#: modules/gui/qt/components/interface_widgets.cpp:973 msgid "Click to toggle between elapsed and remaining time" msgstr "Dii wek inyik ikin caa mukato ke caa ma odong" -#: modules/gui/qt/components/interface_widgets.cpp:968 +#: modules/gui/qt/components/interface_widgets.cpp:975 msgid "Double click to jump to a chosen time position" msgstr "Dii tyen aryo wek i pye naka iyi caa ma iyero" -#: modules/gui/qt/components/open_panels.cpp:58 +#: modules/gui/qt/components/open_panels.cpp:55 msgid "Select a device or a VIDEO_TS directory" msgstr "Yer gitic nyo kagwoko VIDEO_TS" -#: modules/gui/qt/components/open_panels.cpp:59 +#: modules/gui/qt/components/open_panels.cpp:56 msgid "Select a device or a VIDEO_TS folder" msgstr "Yer gitic nyo gigwoko VIDEO_TS" -#: modules/gui/qt/components/open_panels.cpp:145 -#: modules/gui/qt/components/open_panels.cpp:224 +#: modules/gui/qt/components/open_panels.cpp:127 +#: modules/gui/qt/components/open_panels.cpp:206 msgid "Select one or multiple files" msgstr "Yer fail acel nyo mapol" -#: modules/gui/qt/components/open_panels.cpp:160 +#: modules/gui/qt/components/open_panels.cpp:142 msgid "File names:" msgstr "Nying fail:" -#: modules/gui/qt/components/open_panels.cpp:162 -#: modules/gui/qt/ui/sprefs_interface.h:558 +#: modules/gui/qt/components/open_panels.cpp:144 +#: modules/gui/qt/ui/sprefs_interface.h:565 msgid "Filter:" msgstr "Kii:" -#: modules/gui/qt/components/open_panels.cpp:367 +#: modules/gui/qt/components/open_panels.cpp:349 msgid "Eject the disc" msgstr "Yab gigwoko man" -#: modules/gui/qt/components/open_panels.cpp:534 +#: modules/gui/qt/components/open_panels.cpp:514 msgid "Entry" msgstr "Donyo" -#: modules/gui/qt/components/open_panels.cpp:893 +#: modules/gui/qt/components/open_panels.cpp:873 msgid "Channels:" msgstr "Yoo:" -#: modules/gui/qt/components/open_panels.cpp:904 +#: modules/gui/qt/components/open_panels.cpp:884 msgid "Selected ports:" msgstr "Yoo magiyero:" -#: modules/gui/qt/components/open_panels.cpp:907 +#: modules/gui/qt/components/open_panels.cpp:887 msgid ".*" msgstr "*" -#: modules/gui/qt/components/open_panels.cpp:914 +#: modules/gui/qt/components/open_panels.cpp:894 msgid "Use VLC pace" msgstr "Tii ki VLC" -#: modules/gui/qt/components/open_panels.cpp:934 +#: modules/gui/qt/components/open_panels.cpp:914 msgid "TV - digital" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:937 +#: modules/gui/qt/components/open_panels.cpp:917 msgid "Tuner card" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:938 +#: modules/gui/qt/components/open_panels.cpp:918 msgid "Delivery system" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:968 +#: modules/gui/qt/components/open_panels.cpp:948 msgid "Transponder/multiplex frequency" msgstr "Gi kwano/ teko me dwiro" -#: modules/gui/qt/components/open_panels.cpp:978 +#: modules/gui/qt/components/open_panels.cpp:958 msgid "Transponder symbol rate" msgstr "Cipid me ginno" -#: modules/gui/qt/components/open_panels.cpp:1011 +#: modules/gui/qt/components/open_panels.cpp:991 msgid "Bandwidth" msgstr "Cipid" -#: modules/gui/qt/components/open_panels.cpp:1055 +#: modules/gui/qt/components/open_panels.cpp:1035 msgid "TV - analog" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1058 +#: modules/gui/qt/components/open_panels.cpp:1038 msgid "Device name" msgstr "Nying nyonyo me tic" -#: modules/gui/qt/components/open_panels.cpp:1118 +#: modules/gui/qt/components/open_panels.cpp:1098 msgid "Your display will be opened and played in order to stream or save it." msgstr "" #. xgettext: frames per second -#: modules/gui/qt/components/open_panels.cpp:1132 +#: modules/gui/qt/components/open_panels.cpp:1112 msgid " f/s" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1347 +#: modules/gui/qt/components/open_panels.cpp:1327 msgid "Advanced Options" msgstr "Yore madito" @@ -18878,11 +18883,11 @@ msgid "Internet" msgstr "" -#: modules/gui/qt/components/playlist/selector.cpp:443 +#: modules/gui/qt/components/playlist/selector.cpp:456 msgid "Remove this podcast subscription" msgstr "Kwany kube pi video man woko" -#: modules/gui/qt/components/playlist/selector.cpp:594 +#: modules/gui/qt/components/playlist/selector.cpp:607 msgid "Do you really want to unsubscribe from %1?" msgstr "Imito aa woko ki ikube cako ki %1?" @@ -18922,35 +18927,35 @@ msgid "Enter a new name for the folder:" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:254 +#: modules/gui/qt/components/playlist/standardpanel.cpp:255 msgid "Sort by" msgstr "Yik malube ki" -#: modules/gui/qt/components/playlist/standardpanel.cpp:261 +#: modules/gui/qt/components/playlist/standardpanel.cpp:262 msgid "Ascending" msgstr "Malube ki dito" -#: modules/gui/qt/components/playlist/standardpanel.cpp:265 +#: modules/gui/qt/components/playlist/standardpanel.cpp:266 msgid "Descending" msgstr "Malube ki tidi" -#: modules/gui/qt/components/playlist/standardpanel.cpp:278 +#: modules/gui/qt/components/playlist/standardpanel.cpp:279 msgid "Display size" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:279 +#: modules/gui/qt/components/playlist/standardpanel.cpp:280 msgid "Increase" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:280 +#: modules/gui/qt/components/playlist/standardpanel.cpp:281 msgid "Decrease" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:413 +#: modules/gui/qt/components/playlist/standardpanel.cpp:414 msgid "Playlist View Mode" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:592 +#: modules/gui/qt/components/playlist/standardpanel.cpp:593 msgid "" "Playlist is currently empty.\n" "Drop a file here or select a media source from the left." @@ -18976,91 +18981,91 @@ msgid "Select File" msgstr "Yer fail" -#: modules/gui/qt/components/preferences_widgets.cpp:1125 +#: modules/gui/qt/components/preferences_widgets.cpp:1129 msgid "" "Select or double click an action to change the associated hotkey. Use delete " "key to remove hotkeys." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1132 +#: modules/gui/qt/components/preferences_widgets.cpp:1136 msgid "in" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1134 +#: modules/gui/qt/components/preferences_widgets.cpp:1138 msgid "Any field" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1135 +#: modules/gui/qt/components/preferences_widgets.cpp:1139 msgid "Actions" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1142 +#: modules/gui/qt/components/preferences_widgets.cpp:1146 msgid "Hotkey" msgstr "Kadiyo pire" -#: modules/gui/qt/components/preferences_widgets.cpp:1143 +#: modules/gui/qt/components/preferences_widgets.cpp:1147 msgid "Application level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1144 -#: modules/gui/qt/components/preferences_widgets.cpp:1401 +#: modules/gui/qt/components/preferences_widgets.cpp:1148 +#: modules/gui/qt/components/preferences_widgets.cpp:1405 msgid "Global" msgstr "Pi wilobo weng" -#: modules/gui/qt/components/preferences_widgets.cpp:1145 +#: modules/gui/qt/components/preferences_widgets.cpp:1149 msgid "Desktop level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1225 -#: modules/gui/qt/components/preferences_widgets.cpp:1226 +#: modules/gui/qt/components/preferences_widgets.cpp:1229 +#: modules/gui/qt/components/preferences_widgets.cpp:1230 msgid "" "Double click to change.\n" "Delete key to remove." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1402 +#: modules/gui/qt/components/preferences_widgets.cpp:1406 msgid "Hotkey change" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1406 +#: modules/gui/qt/components/preferences_widgets.cpp:1410 msgid "Press the new key or combination for " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1415 +#: modules/gui/qt/components/preferences_widgets.cpp:1419 msgid "Assign" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1450 +#: modules/gui/qt/components/preferences_widgets.cpp:1454 msgid "Warning: this key or combination is already assigned to " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1462 +#: modules/gui/qt/components/preferences_widgets.cpp:1466 msgid "Warning: %1 is already an application menu shortcut" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1485 +#: modules/gui/qt/components/preferences_widgets.cpp:1489 msgid "Key or combination: " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1494 +#: modules/gui/qt/components/preferences_widgets.cpp:1498 msgid "Key: " msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:255 -#: modules/gui/qt/components/simple_preferences.cpp:628 +#: modules/gui/qt/components/simple_preferences.cpp:256 +#: modules/gui/qt/components/simple_preferences.cpp:636 msgid "Input & Codecs Settings" msgstr "Laket & Kite me yiko Codecs" -#: modules/gui/qt/components/simple_preferences.cpp:257 -#: modules/gui/qt/components/simple_preferences.cpp:912 +#: modules/gui/qt/components/simple_preferences.cpp:258 +#: modules/gui/qt/components/simple_preferences.cpp:938 msgid "Configure Hotkeys" msgstr "Yik Kadiyo pire" -#: modules/gui/qt/components/simple_preferences.cpp:454 +#: modules/gui/qt/components/simple_preferences.cpp:455 msgid "Device:" msgstr "Gitic:" -#: modules/gui/qt/components/simple_preferences.cpp:633 +#: modules/gui/qt/components/simple_preferences.cpp:641 msgid "" "If this property is blank, different values\n" "for DVD, VCD, and CDDA are set.\n" @@ -19068,57 +19073,57 @@ "individually in the advanced preferences." msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:701 +#: modules/gui/qt/components/simple_preferences.cpp:712 msgid "Lowest latency" msgstr "Lyeto matidi maloyo" -#: modules/gui/qt/components/simple_preferences.cpp:704 +#: modules/gui/qt/components/simple_preferences.cpp:715 msgid "High latency" msgstr "Lyeto madit" -#: modules/gui/qt/components/simple_preferences.cpp:705 +#: modules/gui/qt/components/simple_preferences.cpp:716 msgid "Higher latency" msgstr "Lyeto madit maloyo" -#: modules/gui/qt/components/simple_preferences.cpp:753 +#: modules/gui/qt/components/simple_preferences.cpp:764 msgid "This is VLC's skinnable interface. You can download other skins at" msgstr "Man naneno VLC. Itwero kwanyo kite me neno mukene iyi" -#: modules/gui/qt/components/simple_preferences.cpp:755 +#: modules/gui/qt/components/simple_preferences.cpp:766 msgid "VLC skins website" msgstr "Ot me kite meneno VLC" -#: modules/gui/qt/components/simple_preferences.cpp:779 +#: modules/gui/qt/components/simple_preferences.cpp:794 msgid "System's default" msgstr "Kite pa gitic kit majwii" -#: modules/gui/qt/components/simple_preferences.cpp:1317 +#: modules/gui/qt/components/simple_preferences.cpp:1344 msgid "File associations" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1326 +#: modules/gui/qt/components/simple_preferences.cpp:1353 #: modules/gui/qt/dialogs_provider.hpp:42 msgid "Audio Files" msgstr "Fail me wer" -#: modules/gui/qt/components/simple_preferences.cpp:1327 +#: modules/gui/qt/components/simple_preferences.cpp:1354 #: modules/gui/qt/dialogs_provider.hpp:41 msgid "Video Files" msgstr "Fail me video" -#: modules/gui/qt/components/simple_preferences.cpp:1328 +#: modules/gui/qt/components/simple_preferences.cpp:1355 #: modules/gui/qt/dialogs_provider.hpp:43 msgid "Playlist Files" msgstr "Buk me wer" -#: modules/gui/qt/components/simple_preferences.cpp:1393 +#: modules/gui/qt/components/simple_preferences.cpp:1420 msgid "&Apply" msgstr "&Ket" -#: modules/gui/qt/components/simple_preferences.cpp:1394 +#: modules/gui/qt/components/simple_preferences.cpp:1421 #: modules/gui/qt/dialogs/convert.cpp:137 -#: modules/gui/qt/dialogs/gototime.cpp:49 modules/gui/qt/dialogs/open.cpp:108 -#: modules/gui/qt/dialogs/openurl.cpp:60 +#: modules/gui/qt/dialogs/gototime.cpp:48 modules/gui/qt/dialogs/open.cpp:109 +#: modules/gui/qt/dialogs/openurl.cpp:59 #: modules/gui/qt/dialogs/podcast_configuration.cpp:37 #: modules/gui/qt/dialogs/preferences.cpp:97 #: modules/gui/qt/dialogs/toolbar.cpp:198 @@ -19162,84 +19167,84 @@ msgid "You must set a name for the profile." msgstr "Myero iter nying pi lok ikome" -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Directory" msgstr "Fail/Kagwoko" -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Folder" msgstr "Fail/Kagwoko" -#: modules/gui/qt/components/sout/sout_widgets.cpp:47 +#: modules/gui/qt/components/sout/sout_widgets.cpp:48 #: modules/gui/qt/ui/sout.h:199 msgid "Source" msgstr "Ka ma oa iye" -#: modules/gui/qt/components/sout/sout_widgets.cpp:50 +#: modules/gui/qt/components/sout/sout_widgets.cpp:51 msgid "Source:" msgstr "Ka ma oa iye:" -#: modules/gui/qt/components/sout/sout_widgets.cpp:59 +#: modules/gui/qt/components/sout/sout_widgets.cpp:60 msgid "Type:" msgstr "kwone:" -#: modules/gui/qt/components/sout/sout_widgets.cpp:127 +#: modules/gui/qt/components/sout/sout_widgets.cpp:128 msgid "This module writes the transcoded stream to a file." msgstr "Rwom man coyo jami weng iyi fail." -#: modules/gui/qt/components/sout/sout_widgets.cpp:129 +#: modules/gui/qt/components/sout/sout_widgets.cpp:130 msgid "Filename" msgstr "Nying fail" -#: modules/gui/qt/components/sout/sout_widgets.cpp:173 +#: modules/gui/qt/components/sout/sout_widgets.cpp:174 #: modules/gui/qt/dialogs/convert.cpp:161 msgid "Save file..." msgstr "Kan fail..." -#: modules/gui/qt/components/sout/sout_widgets.cpp:174 +#: modules/gui/qt/components/sout/sout_widgets.cpp:175 msgid "" "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:184 +#: modules/gui/qt/components/sout/sout_widgets.cpp:185 msgid "This module outputs the transcoded stream to a network via HTTP." msgstr "Rwom man keto adwogi me jami man iyi kakube mabeyo ki HTTP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:186 -#: modules/gui/qt/components/sout/sout_widgets.cpp:282 +#: modules/gui/qt/components/sout/sout_widgets.cpp:187 +#: modules/gui/qt/components/sout/sout_widgets.cpp:283 msgid "Path" msgstr "Yoo" -#: modules/gui/qt/components/sout/sout_widgets.cpp:238 +#: modules/gui/qt/components/sout/sout_widgets.cpp:239 msgid "" "This module outputs the transcoded stream to a network via the mms protocol." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:280 +#: modules/gui/qt/components/sout/sout_widgets.cpp:281 msgid "This module outputs the transcoded stream to a network via RTSP." msgstr "Rwom man keto jami iyi kakube beyo ki RTSP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:326 +#: modules/gui/qt/components/sout/sout_widgets.cpp:327 msgid "This module outputs the transcoded stream to a network via UDP." msgstr "Rwom man keto jami ma gigonyo iyi kakube beyo ki UDP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:368 +#: modules/gui/qt/components/sout/sout_widgets.cpp:369 msgid "This module outputs the transcoded stream to a network via RTP." msgstr "Rwom man keto jami ma gigonyo iyi kakube beyo ki RTP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:375 +#: modules/gui/qt/components/sout/sout_widgets.cpp:376 msgid "Base port" msgstr "Ka Majwii" -#: modules/gui/qt/components/sout/sout_widgets.cpp:423 +#: modules/gui/qt/components/sout/sout_widgets.cpp:424 msgid "This module outputs the transcoded stream to an Icecast server." msgstr "Rwom man keto jami ma gigonyo iyi lagab me Icecast." -#: modules/gui/qt/components/sout/sout_widgets.cpp:442 +#: modules/gui/qt/components/sout/sout_widgets.cpp:443 msgid "Mount Point" msgstr "Ka Keto" -#: modules/gui/qt/components/sout/sout_widgets.cpp:443 +#: modules/gui/qt/components/sout/sout_widgets.cpp:444 msgid "Login:pass" msgstr "Dony:pass" @@ -19265,13 +19270,13 @@ #: modules/gui/qt/dialogs/bookmarks.cpp:62 modules/gui/qt/dialogs/epg.cpp:92 #: modules/gui/qt/dialogs/errors.cpp:49 modules/gui/qt/dialogs/extended.cpp:130 -#: modules/gui/qt/dialogs/help.cpp:66 modules/gui/qt/dialogs/help.cpp:212 +#: modules/gui/qt/dialogs/help.cpp:64 modules/gui/qt/dialogs/help.cpp:223 #: modules/gui/qt/dialogs/mediainfo.cpp:80 -#: modules/gui/qt/dialogs/messages.cpp:84 modules/gui/qt/dialogs/plugins.cpp:94 -#: modules/gui/qt/dialogs/plugins.cpp:1438 -#: modules/gui/qt/dialogs/plugins.cpp:1551 +#: modules/gui/qt/dialogs/messages.cpp:81 modules/gui/qt/dialogs/plugins.cpp:93 +#: modules/gui/qt/dialogs/plugins.cpp:1437 +#: modules/gui/qt/dialogs/plugins.cpp:1550 #: modules/gui/qt/dialogs/podcast_configuration.cpp:36 -#: modules/gui/qt/dialogs/vlm.cpp:136 +#: modules/gui/qt/dialogs/vlm.cpp:130 msgid "&Close" msgstr "&Wek" @@ -19291,7 +19296,7 @@ msgid "Destination" msgstr "Ka ceto" -#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:413 +#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:414 msgid "Destination file:" msgstr "Ka gik pa fail:" @@ -19331,16 +19336,16 @@ msgid "Containers" msgstr "" -#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:431 +#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:434 msgid "Program Guide" msgstr "Lakub wi Puruguram" -#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:286 -#: modules/gui/qt/ui/about.h:287 +#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:283 +#: modules/gui/qt/ui/about.h:284 msgid "Update" msgstr "Mi ngec manyen" -#: modules/gui/qt/dialogs/epg.cpp:161 +#: modules/gui/qt/dialogs/epg.cpp:162 msgid " (%1+ rated)" msgstr "" @@ -19377,7 +19382,7 @@ msgid "&Save" msgstr "&Gwoki" -#: modules/gui/qt/dialogs/external.cpp:216 +#: modules/gui/qt/dialogs/external.cpp:218 msgid "Store the Password" msgstr "" @@ -19408,60 +19413,60 @@ msgid "Regularly check for VLC updates" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:42 +#: modules/gui/qt/dialogs/gototime.cpp:41 msgid "Go to Time" msgstr "Cet wa i Cawa" -#: modules/gui/qt/dialogs/gototime.cpp:48 +#: modules/gui/qt/dialogs/gototime.cpp:47 msgid "&Go" msgstr "&Ceti" -#: modules/gui/qt/dialogs/gototime.cpp:56 +#: modules/gui/qt/dialogs/gototime.cpp:55 msgid "Go to time" msgstr "Cet wa i cawa" -#: modules/gui/qt/dialogs/help.cpp:86 modules/gui/qt/dialogs/plugins.cpp:1376 -#: modules/gui/qt/dialogs/plugins.cpp:1459 +#: modules/gui/qt/dialogs/help.cpp:84 modules/gui/qt/dialogs/plugins.cpp:1375 +#: modules/gui/qt/dialogs/plugins.cpp:1458 msgid "About" msgstr "Ikom" -#: modules/gui/qt/dialogs/help.cpp:94 +#: modules/gui/qt/dialogs/help.cpp:101 msgid "" "

VLC media player is a free and open source media player, encoder, and " "streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:214 +#: modules/gui/qt/dialogs/help.cpp:225 msgid "&Recheck version" msgstr "&Nwo roto cik manyen" -#: modules/gui/qt/dialogs/help.cpp:217 +#: modules/gui/qt/dialogs/help.cpp:228 msgid "&Yes" msgstr "&Eyo" -#: modules/gui/qt/dialogs/help.cpp:219 +#: modules/gui/qt/dialogs/help.cpp:230 msgid "&No" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:222 modules/gui/qt/ui/update.h:144 +#: modules/gui/qt/dialogs/help.cpp:233 modules/gui/qt/ui/update.h:144 msgid "VLC media player updates" msgstr "Lamed me giwer me VLC" -#: modules/gui/qt/dialogs/help.cpp:294 +#: modules/gui/qt/dialogs/help.cpp:305 msgid "A new version of VLC (%1.%2.%3%4) is available." msgstr "" -#: modules/gui/qt/dialogs/help.cpp:319 +#: modules/gui/qt/dialogs/help.cpp:330 msgid "You have the latest version of VLC media player." msgstr "Yin itye ki cik anyen ma okato me latuku kabeo pa VLC." -#: modules/gui/qt/dialogs/help.cpp:326 +#: modules/gui/qt/dialogs/help.cpp:337 msgid "An error occurred while checking for updates..." msgstr "Bal otime kun itye karoto ngec..." @@ -19493,23 +19498,23 @@ msgid "Location:" msgstr "Kabedo:" -#: modules/gui/qt/dialogs/messages.cpp:91 +#: modules/gui/qt/dialogs/messages.cpp:88 msgid "Saves all the displayed logs to a file" msgstr "Gwoko dul ma kiteno weng i fail" -#: modules/gui/qt/dialogs/messages.cpp:259 +#: modules/gui/qt/dialogs/messages.cpp:256 msgid "Save log file as..." msgstr "Gwok dul fail macalo..." -#: modules/gui/qt/dialogs/messages.cpp:261 +#: modules/gui/qt/dialogs/messages.cpp:258 msgid "Texts/Logs (*.log *.txt);; All (*.*)" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:267 +#: modules/gui/qt/dialogs/messages.cpp:264 msgid "Application" msgstr "Gi tic" -#: modules/gui/qt/dialogs/messages.cpp:268 +#: modules/gui/qt/dialogs/messages.cpp:265 msgid "" "Cannot write to file %1:\n" "%2." @@ -19517,179 +19522,179 @@ "Pe romo coyo i fail %1:\n" "%2." -#: modules/gui/qt/dialogs/messages.cpp:334 +#: modules/gui/qt/dialogs/messages.cpp:331 msgid "Update the tree" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:335 +#: modules/gui/qt/dialogs/messages.cpp:332 msgid "Clear the messages" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:78 modules/gui/qt/menus.cpp:935 -#: modules/gui/qt/menus.cpp:1132 +#: modules/gui/qt/dialogs/open.cpp:79 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:1137 msgid "Open Media" msgstr "Yab Yore me kube" -#: modules/gui/qt/dialogs/open.cpp:90 +#: modules/gui/qt/dialogs/open.cpp:91 msgid "&File" msgstr "&Fail" -#: modules/gui/qt/dialogs/open.cpp:92 +#: modules/gui/qt/dialogs/open.cpp:93 msgid "&Disc" msgstr "&Disc" -#: modules/gui/qt/dialogs/open.cpp:94 +#: modules/gui/qt/dialogs/open.cpp:95 msgid "&Network" msgstr "&Gi kube" -#: modules/gui/qt/dialogs/open.cpp:96 +#: modules/gui/qt/dialogs/open.cpp:97 msgid "Capture &Device" msgstr "Mak &Nyonyo" -#: modules/gui/qt/dialogs/open.cpp:111 +#: modules/gui/qt/dialogs/open.cpp:112 msgid "&Select" msgstr "&Yer" -#: modules/gui/qt/dialogs/open.cpp:115 modules/gui/qt/dialogs/open.cpp:210 -#: modules/gui/qt/dialogs/openurl.cpp:57 +#: modules/gui/qt/dialogs/open.cpp:116 modules/gui/qt/dialogs/open.cpp:211 +#: modules/gui/qt/dialogs/openurl.cpp:56 msgid "&Enqueue" msgstr "&Kit matiyo ki nyukta ma nono" -#: modules/gui/qt/dialogs/open.cpp:117 modules/gui/qt/dialogs/open.cpp:214 -#: modules/gui/qt/dialogs/openurl.cpp:54 modules/gui/qt/menus.cpp:824 +#: modules/gui/qt/dialogs/open.cpp:118 modules/gui/qt/dialogs/open.cpp:215 +#: modules/gui/qt/dialogs/openurl.cpp:53 modules/gui/qt/menus.cpp:829 msgid "&Play" msgstr "&Tuki" -#: modules/gui/qt/dialogs/open.cpp:119 modules/gui/qt/dialogs/open.cpp:204 +#: modules/gui/qt/dialogs/open.cpp:120 modules/gui/qt/dialogs/open.cpp:205 msgid "&Stream" msgstr "&Nam" -#: modules/gui/qt/dialogs/open.cpp:121 +#: modules/gui/qt/dialogs/open.cpp:122 msgid "C&onvert" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:207 +#: modules/gui/qt/dialogs/open.cpp:208 msgid "C&onvert / Save" msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:47 +#: modules/gui/qt/dialogs/openurl.cpp:46 msgid "Open URL" msgstr "Yab URL" -#: modules/gui/qt/dialogs/openurl.cpp:64 +#: modules/gui/qt/dialogs/openurl.cpp:63 msgid "Enter URL here..." msgstr "Ket URL kany..." -#: modules/gui/qt/dialogs/openurl.cpp:67 +#: modules/gui/qt/dialogs/openurl.cpp:66 msgid "Please enter the URL or path to the media you want to play." msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:71 +#: modules/gui/qt/dialogs/openurl.cpp:70 msgid "" "If your clipboard contains a valid URL\n" "or the path to a file on your computer,\n" "it will be automatically selected." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:80 +#: modules/gui/qt/dialogs/plugins.cpp:79 msgid "Plugins and extensions" msgstr "Roo iyie ki nyayo ne" -#: modules/gui/qt/dialogs/plugins.cpp:88 +#: modules/gui/qt/dialogs/plugins.cpp:87 msgid "Active Extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Capability" msgstr "Romo" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Score" msgstr "Mato" -#: modules/gui/qt/dialogs/plugins.cpp:141 +#: modules/gui/qt/dialogs/plugins.cpp:140 msgid "&Search:" msgstr "&Yeny:" -#: modules/gui/qt/dialogs/plugins.cpp:259 -#: modules/gui/qt/dialogs/plugins.cpp:1292 +#: modules/gui/qt/dialogs/plugins.cpp:258 +#: modules/gui/qt/dialogs/plugins.cpp:1291 msgid "More information..." msgstr "Ngec madwong maloyo..." -#: modules/gui/qt/dialogs/plugins.cpp:267 +#: modules/gui/qt/dialogs/plugins.cpp:266 msgid "Reload extensions" msgstr "Nwo keto nyayo" -#: modules/gui/qt/dialogs/plugins.cpp:386 +#: modules/gui/qt/dialogs/plugins.cpp:385 msgid "" "Skins customize player's appearance. You can activate them through " "preferences." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:390 +#: modules/gui/qt/dialogs/plugins.cpp:389 msgid "" "Playlist parsers add new capabilities to read internet streams or extract " "meta data." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:394 +#: modules/gui/qt/dialogs/plugins.cpp:393 msgid "" "Service discoveries adds new sources to your playlist such as web radios, " "video websites, ..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:401 +#: modules/gui/qt/dialogs/plugins.cpp:400 msgid "Retrieves extra info and art for playlist items" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:404 +#: modules/gui/qt/dialogs/plugins.cpp:403 msgid "" "Extensions brings various enhancements. Check descriptions for more details" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:425 +#: modules/gui/qt/dialogs/plugins.cpp:424 msgid "Only installed" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:531 +#: modules/gui/qt/dialogs/plugins.cpp:530 msgid "Retrieving addons..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:542 +#: modules/gui/qt/dialogs/plugins.cpp:541 msgid "No addons found" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:821 +#: modules/gui/qt/dialogs/plugins.cpp:820 msgid "This addon has been installed manually. VLC can't manage it by itself." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1204 +#: modules/gui/qt/dialogs/plugins.cpp:1203 msgid "Version %1" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1232 +#: modules/gui/qt/dialogs/plugins.cpp:1231 msgid "%1 downloads" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1301 +#: modules/gui/qt/dialogs/plugins.cpp:1300 msgid "&Uninstall" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1304 +#: modules/gui/qt/dialogs/plugins.cpp:1303 msgid "&Install" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1399 -#: modules/gui/qt/dialogs/plugins.cpp:1502 +#: modules/gui/qt/dialogs/plugins.cpp:1398 +#: modules/gui/qt/dialogs/plugins.cpp:1501 msgid "Version" msgstr "Cik " -#: modules/gui/qt/dialogs/plugins.cpp:1419 -#: modules/gui/qt/dialogs/plugins.cpp:1529 +#: modules/gui/qt/dialogs/plugins.cpp:1418 +#: modules/gui/qt/dialogs/plugins.cpp:1528 msgid "Website" msgstr "Kakube me Wilobo" -#: modules/gui/qt/dialogs/plugins.cpp:1541 modules/gui/qt/ui/sprefs_input.h:363 +#: modules/gui/qt/dialogs/plugins.cpp:1540 modules/gui/qt/ui/sprefs_input.h:363 msgid "Files" msgstr "Fail" @@ -19749,11 +19754,11 @@ msgid "Are you sure you want to reset your VLC media player preferences?" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:45 modules/gui/qt/ui/sout.h:198 +#: modules/gui/qt/dialogs/sout.cpp:43 modules/gui/qt/ui/sout.h:198 msgid "Stream Output" msgstr "Ket jami ma imaro" -#: modules/gui/qt/dialogs/sout.cpp:51 +#: modules/gui/qt/dialogs/sout.cpp:49 msgid "" "This wizard will allow you to stream or convert your media for use locally, " "on your private network, or on the Internet.\n" @@ -19761,14 +19766,14 @@ "be and then press the \"Next\" button to continue.\n" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:58 +#: modules/gui/qt/dialogs/sout.cpp:56 msgid "" "Stream output string.\n" "This is automatically generated when you change the above settings,\n" "but you can change it manually." msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:91 +#: modules/gui/qt/dialogs/sout.cpp:89 msgid "Back" msgstr "Lacen" @@ -19900,67 +19905,67 @@ msgid "Speed selector" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:73 +#: modules/gui/qt/dialogs/vlm.cpp:67 msgid "Broadcast" msgstr "Cwal kwena iwi yamo" -#: modules/gui/qt/dialogs/vlm.cpp:74 +#: modules/gui/qt/dialogs/vlm.cpp:68 msgid "Schedule" msgstr "Makiyiko" -#: modules/gui/qt/dialogs/vlm.cpp:75 +#: modules/gui/qt/dialogs/vlm.cpp:69 msgid "Video On Demand ( VOD )" msgstr "Cal anena Mamite (VOD)" -#: modules/gui/qt/dialogs/vlm.cpp:80 +#: modules/gui/qt/dialogs/vlm.cpp:74 msgid "Hours / Minutes / Seconds:" msgstr "Cawa /Dakika / Ceken:" -#: modules/gui/qt/dialogs/vlm.cpp:82 +#: modules/gui/qt/dialogs/vlm.cpp:76 msgid "Day / Month / Year:" msgstr "Nino /Dwe / Mwaka:" -#: modules/gui/qt/dialogs/vlm.cpp:84 +#: modules/gui/qt/dialogs/vlm.cpp:78 msgid "Repeat:" msgstr "Nwo:" -#: modules/gui/qt/dialogs/vlm.cpp:86 +#: modules/gui/qt/dialogs/vlm.cpp:80 msgid "Repeat delay:" msgstr "Nwo gale:" -#: modules/gui/qt/dialogs/vlm.cpp:111 modules/gui/qt/ui/sprefs_interface.h:555 +#: modules/gui/qt/dialogs/vlm.cpp:105 modules/gui/qt/ui/sprefs_interface.h:562 msgid " days" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:130 +#: modules/gui/qt/dialogs/vlm.cpp:124 msgid "I&mport" msgstr "K&el iyie" -#: modules/gui/qt/dialogs/vlm.cpp:133 +#: modules/gui/qt/dialogs/vlm.cpp:127 msgid "E&xport" msgstr "C&wal woko" -#: modules/gui/qt/dialogs/vlm.cpp:264 +#: modules/gui/qt/dialogs/vlm.cpp:258 msgid "Save VLM configuration as..." msgstr "Gwok cano VLM macalo..." -#: modules/gui/qt/dialogs/vlm.cpp:266 modules/gui/qt/dialogs/vlm.cpp:335 +#: modules/gui/qt/dialogs/vlm.cpp:260 modules/gui/qt/dialogs/vlm.cpp:329 msgid "VLM conf (*.vlm);;All (*)" msgstr "VLC conf (*.vlm);;All (*)" -#: modules/gui/qt/dialogs/vlm.cpp:333 +#: modules/gui/qt/dialogs/vlm.cpp:327 msgid "Open VLM configuration..." msgstr "Yab cano ma otude pi VLM..." -#: modules/gui/qt/dialogs/vlm.cpp:532 +#: modules/gui/qt/dialogs/vlm.cpp:526 msgid "Broadcast: " msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:605 +#: modules/gui/qt/dialogs/vlm.cpp:599 msgid "Schedule: " msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:629 +#: modules/gui/qt/dialogs/vlm.cpp:623 msgid "VOD: " msgstr "" @@ -20018,339 +20023,339 @@ msgid "Deactivate" msgstr "" -#: modules/gui/qt/main_interface.cpp:373 +#: modules/gui/qt/main_interface.cpp:378 msgid "Do you want to restart the playback where left off?" msgstr "" -#: modules/gui/qt/main_interface.cpp:379 +#: modules/gui/qt/main_interface.cpp:384 msgid "&Continue" msgstr "" -#: modules/gui/qt/main_interface.cpp:1421 +#: modules/gui/qt/main_interface.cpp:1454 msgid "Control menu for the player" msgstr "Yik lakubpa gituku wer" -#: modules/gui/qt/main_interface.cpp:1465 +#: modules/gui/qt/main_interface.cpp:1498 msgid "Paused" msgstr "Ki juko" -#: modules/gui/qt/menus.cpp:331 +#: modules/gui/qt/menus.cpp:334 msgid "&Media" msgstr "&Gitic" -#: modules/gui/qt/menus.cpp:334 +#: modules/gui/qt/menus.cpp:337 msgid "P&layback" msgstr "T&uko" -#: modules/gui/qt/menus.cpp:335 modules/gui/qt/menus.cpp:1050 +#: modules/gui/qt/menus.cpp:338 modules/gui/qt/menus.cpp:1055 msgid "&Audio" msgstr "&Wer" -#: modules/gui/qt/menus.cpp:336 modules/gui/qt/menus.cpp:1057 +#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1062 msgid "&Video" msgstr "&Video" -#: modules/gui/qt/menus.cpp:337 modules/gui/qt/menus.cpp:1064 +#: modules/gui/qt/menus.cpp:340 modules/gui/qt/menus.cpp:1069 msgid "Subti&tle" msgstr "" -#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1080 +#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1085 msgid "Tool&s" msgstr "" -#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1087 +#: modules/gui/qt/menus.cpp:345 modules/gui/qt/menus.cpp:1092 msgid "V&iew" msgstr "N&en" -#: modules/gui/qt/menus.cpp:344 modules/gui/qt/menus.cpp:788 +#: modules/gui/qt/menus.cpp:347 modules/gui/qt/menus.cpp:793 msgid "&Help" msgstr "&Kony" -#: modules/gui/qt/menus.cpp:357 +#: modules/gui/qt/menus.cpp:360 msgid "Open &File..." msgstr "" -#: modules/gui/qt/menus.cpp:359 +#: modules/gui/qt/menus.cpp:362 msgid "&Open Multiple Files..." msgstr "" -#: modules/gui/qt/menus.cpp:363 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:366 modules/gui/qt/menus.cpp:945 msgid "Open &Disc..." msgstr "Yan &Gituko..." -#: modules/gui/qt/menus.cpp:365 +#: modules/gui/qt/menus.cpp:368 msgid "Open &Network Stream..." msgstr "Yab Ka cwalo pa &Gikube..." -#: modules/gui/qt/menus.cpp:367 modules/gui/qt/menus.cpp:944 +#: modules/gui/qt/menus.cpp:370 modules/gui/qt/menus.cpp:949 msgid "Open &Capture Device..." msgstr "yab &Ka mako Gitic..." -#: modules/gui/qt/menus.cpp:370 +#: modules/gui/qt/menus.cpp:373 msgid "Open &Location from clipboard" msgstr "Yab &Kabedo ki iyi kagwoko" -#: modules/gui/qt/menus.cpp:374 +#: modules/gui/qt/menus.cpp:377 msgid "Open &Recent Media" msgstr "" -#: modules/gui/qt/menus.cpp:387 +#: modules/gui/qt/menus.cpp:390 msgid "Conve&rt / Save..." msgstr "Lo&k/Gwok..." -#: modules/gui/qt/menus.cpp:389 +#: modules/gui/qt/menus.cpp:392 msgid "&Stream..." msgstr "" -#: modules/gui/qt/menus.cpp:394 +#: modules/gui/qt/menus.cpp:397 msgid "Quit at the end of playlist" msgstr "" -#: modules/gui/qt/menus.cpp:401 +#: modules/gui/qt/menus.cpp:404 msgid "Close to systray" msgstr "" -#: modules/gui/qt/menus.cpp:405 modules/gui/qt/menus.cpp:1194 +#: modules/gui/qt/menus.cpp:408 modules/gui/qt/menus.cpp:1199 msgid "&Quit" msgstr "&Wek" -#: modules/gui/qt/menus.cpp:415 +#: modules/gui/qt/menus.cpp:418 msgid "&Effects and Filters" msgstr "&Mamako kede Kiyo" -#: modules/gui/qt/menus.cpp:418 +#: modules/gui/qt/menus.cpp:421 msgid "&Track Synchronization" msgstr "&Lub Yiko" -#: modules/gui/qt/menus.cpp:437 +#: modules/gui/qt/menus.cpp:440 msgid "Plu&gins and extensions" msgstr "La&med kede wie" -#: modules/gui/qt/menus.cpp:442 +#: modules/gui/qt/menus.cpp:445 msgid "Customi&ze Interface..." msgstr "Yi&k Kaneno" -#: modules/gui/qt/menus.cpp:445 +#: modules/gui/qt/menus.cpp:448 msgid "&Preferences" msgstr "&Kite" -#: modules/gui/qt/menus.cpp:466 +#: modules/gui/qt/menus.cpp:469 msgid "&View" msgstr "&Nen" -#: modules/gui/qt/menus.cpp:487 +#: modules/gui/qt/menus.cpp:490 msgid "Play&list" msgstr "Nyig&wer" -#: modules/gui/qt/menus.cpp:488 +#: modules/gui/qt/menus.cpp:491 msgid "Ctrl+L" msgstr "Ctrl+L" -#: modules/gui/qt/menus.cpp:491 +#: modules/gui/qt/menus.cpp:494 msgid "Docked Playlist" msgstr "Nyig wer ma gigwoko maber" -#: modules/gui/qt/menus.cpp:501 +#: modules/gui/qt/menus.cpp:504 msgid "Always on &top" msgstr "" -#: modules/gui/qt/menus.cpp:509 +#: modules/gui/qt/menus.cpp:512 msgid "Mi&nimal Interface" msgstr "" -#: modules/gui/qt/menus.cpp:510 +#: modules/gui/qt/menus.cpp:513 msgid "Ctrl+H" msgstr "Ctrl+H" -#: modules/gui/qt/menus.cpp:519 +#: modules/gui/qt/menus.cpp:522 msgid "&Fullscreen Interface" msgstr "&Neno Madit" -#: modules/gui/qt/menus.cpp:527 +#: modules/gui/qt/menus.cpp:530 msgid "&Advanced Controls" msgstr "&Yiko me rwom mamalu" -#: modules/gui/qt/menus.cpp:534 +#: modules/gui/qt/menus.cpp:538 msgid "Status Bar" msgstr "" -#: modules/gui/qt/menus.cpp:539 +#: modules/gui/qt/menus.cpp:544 msgid "Visualizations selector" msgstr "Giyero neno" -#: modules/gui/qt/menus.cpp:597 +#: modules/gui/qt/menus.cpp:602 msgid "&Increase Volume" msgstr "" -#: modules/gui/qt/menus.cpp:600 +#: modules/gui/qt/menus.cpp:605 msgid "D&ecrease Volume" msgstr "" -#: modules/gui/qt/menus.cpp:603 +#: modules/gui/qt/menus.cpp:608 msgid "&Mute" msgstr "" -#: modules/gui/qt/menus.cpp:619 +#: modules/gui/qt/menus.cpp:624 msgid "Audio &Device" msgstr "Gituko &Wer" -#: modules/gui/qt/menus.cpp:623 +#: modules/gui/qt/menus.cpp:628 msgid "Audio &Track" msgstr "&Moo Wer" -#: modules/gui/qt/menus.cpp:625 +#: modules/gui/qt/menus.cpp:630 msgid "&Stereo Mode" msgstr "" -#: modules/gui/qt/menus.cpp:628 +#: modules/gui/qt/menus.cpp:633 msgid "&Visualizations" msgstr "&Neno" -#: modules/gui/qt/menus.cpp:654 +#: modules/gui/qt/menus.cpp:659 msgid "Add &Subtitle File..." msgstr "" -#: modules/gui/qt/menus.cpp:656 +#: modules/gui/qt/menus.cpp:661 msgid "Sub &Track" msgstr "" -#: modules/gui/qt/menus.cpp:678 +#: modules/gui/qt/menus.cpp:683 msgid "Video &Track" msgstr "&Moyo Video" -#: modules/gui/qt/menus.cpp:682 +#: modules/gui/qt/menus.cpp:687 msgid "&Fullscreen" msgstr "Madit weng" -#: modules/gui/qt/menus.cpp:683 +#: modules/gui/qt/menus.cpp:688 msgid "Always Fit &Window" msgstr "" -#: modules/gui/qt/menus.cpp:684 +#: modules/gui/qt/menus.cpp:689 msgid "Set as Wall&paper" msgstr "" -#: modules/gui/qt/menus.cpp:688 +#: modules/gui/qt/menus.cpp:693 msgid "&Zoom" msgstr "&Loko caji" -#: modules/gui/qt/menus.cpp:689 +#: modules/gui/qt/menus.cpp:694 msgid "&Aspect Ratio" msgstr "&Pimo rwom" -#: modules/gui/qt/menus.cpp:690 +#: modules/gui/qt/menus.cpp:695 msgid "&Crop" msgstr "&Koti apita" -#: modules/gui/qt/menus.cpp:694 +#: modules/gui/qt/menus.cpp:699 msgid "&Deinterlace" msgstr "&Kwany kube" -#: modules/gui/qt/menus.cpp:695 +#: modules/gui/qt/menus.cpp:700 msgid "&Deinterlace mode" msgstr "&Iyi kite me kwanyo kube" -#: modules/gui/qt/menus.cpp:699 +#: modules/gui/qt/menus.cpp:704 msgid "Take &Snapshot" msgstr "" -#: modules/gui/qt/menus.cpp:718 +#: modules/gui/qt/menus.cpp:723 msgid "T&itle" msgstr "W&ie madito" -#: modules/gui/qt/menus.cpp:719 +#: modules/gui/qt/menus.cpp:724 msgid "&Chapter" msgstr "Dul" -#: modules/gui/qt/menus.cpp:721 +#: modules/gui/qt/menus.cpp:726 msgid "&Program" msgstr "&Puruguram" -#: modules/gui/qt/menus.cpp:725 +#: modules/gui/qt/menus.cpp:730 msgid "&Manage" msgstr "" -#: modules/gui/qt/menus.cpp:791 +#: modules/gui/qt/menus.cpp:796 msgid "Check for &Updates..." msgstr "Rot pi &Ngec manyen..." -#: modules/gui/qt/menus.cpp:838 +#: modules/gui/qt/menus.cpp:843 msgid "&Stop" msgstr "&Cung" -#: modules/gui/qt/menus.cpp:846 +#: modules/gui/qt/menus.cpp:851 msgid "Pre&vious" msgstr "Mu&kato" -#: modules/gui/qt/menus.cpp:852 +#: modules/gui/qt/menus.cpp:857 msgid "Ne&xt" msgstr "Ma&ubo kore" -#: modules/gui/qt/menus.cpp:870 +#: modules/gui/qt/menus.cpp:875 msgid "Sp&eed" msgstr "" -#: modules/gui/qt/menus.cpp:876 +#: modules/gui/qt/menus.cpp:881 msgid "&Faster" msgstr "&Oyoto" -#: modules/gui/qt/menus.cpp:888 +#: modules/gui/qt/menus.cpp:893 msgid "N&ormal Speed" msgstr "Dwiro m&arom" -#: modules/gui/qt/menus.cpp:898 +#: modules/gui/qt/menus.cpp:903 msgid "Slo&wer" msgstr "M&otmot" -#: modules/gui/qt/menus.cpp:913 +#: modules/gui/qt/menus.cpp:918 msgid "&Jump Forward" msgstr "&Pyee Lanyim" -#: modules/gui/qt/menus.cpp:920 +#: modules/gui/qt/menus.cpp:925 msgid "Jump Bac&kward" msgstr "Pyee idok C&en" -#: modules/gui/qt/menus.cpp:927 +#: modules/gui/qt/menus.cpp:932 msgid "Ctrl+T" msgstr "" -#: modules/gui/qt/menus.cpp:942 +#: modules/gui/qt/menus.cpp:947 msgid "Open &Network..." msgstr "Yab &Kakube..." -#: modules/gui/qt/menus.cpp:1036 +#: modules/gui/qt/menus.cpp:1041 msgid "Leave Fullscreen" msgstr "Wek Neno lung" -#: modules/gui/qt/menus.cpp:1070 +#: modules/gui/qt/menus.cpp:1075 msgid "&Playback" msgstr "&Tuk i dok cen" -#: modules/gui/qt/menus.cpp:1175 +#: modules/gui/qt/menus.cpp:1180 msgid "&Hide VLC media player in taskbar" msgstr "" -#: modules/gui/qt/menus.cpp:1181 +#: modules/gui/qt/menus.cpp:1186 msgid "Sho&w VLC media player" msgstr "" -#: modules/gui/qt/menus.cpp:1192 +#: modules/gui/qt/menus.cpp:1197 msgid "&Open Media" msgstr "" -#: modules/gui/qt/menus.cpp:1622 +#: modules/gui/qt/menus.cpp:1627 msgid "&Clear" msgstr "&Ywe" -#: modules/gui/qt/menus.cpp:1630 +#: modules/gui/qt/menus.cpp:1635 msgid "&Renderer" msgstr "" -#: modules/gui/qt/menus.cpp:1634 +#: modules/gui/qt/menus.cpp:1639 msgid "" msgstr "" -#: modules/gui/qt/menus.cpp:1647 +#: modules/gui/qt/menus.cpp:1652 msgid "Scanning..." msgstr "" @@ -20427,41 +20432,49 @@ msgstr "Nyut bal mapire pe tek ki canduk ma kwenyoro" #: modules/gui/qt/qt.cpp:124 +msgid "Enable Dark Mode" +msgstr "" + +#: modules/gui/qt/qt.cpp:125 +msgid "Applies a dark theme to the style." +msgstr "" + +#: modules/gui/qt/qt.cpp:127 msgid "Activate the updates availability notification" msgstr "Ket kwenyoro pi tye a ngec manyen" -#: modules/gui/qt/qt.cpp:125 +#: modules/gui/qt/qt.cpp:128 msgid "" "Activate the automatic notification of new versions of the software. It runs " "once every two weeks." msgstr "" -#: modules/gui/qt/qt.cpp:128 +#: modules/gui/qt/qt.cpp:131 msgid "Number of days between two update checks" msgstr "Namba me nino iyi akina roto ngec manyen aryo" -#: modules/gui/qt/qt.cpp:130 +#: modules/gui/qt/qt.cpp:133 msgid "Ask for network policy at start" msgstr "Peny pi cik mamako kube iyi acaki" -#: modules/gui/qt/qt.cpp:132 +#: modules/gui/qt/qt.cpp:135 msgid "Save the recently played items in the menu" msgstr "Gwok jami ma i tuko macegi iyi lacim" -#: modules/gui/qt/qt.cpp:134 +#: modules/gui/qt/qt.cpp:137 msgid "List of words separated by | to filter" msgstr "Nying coc ma opoke ki | iyi lakic" -#: modules/gui/qt/qt.cpp:135 +#: modules/gui/qt/qt.cpp:138 msgid "" "Regular expression used to filter the recent items played in the player." msgstr "" -#: modules/gui/qt/qt.cpp:138 +#: modules/gui/qt/qt.cpp:141 msgid "Define the colors of the volume slider" msgstr "" -#: modules/gui/qt/qt.cpp:139 +#: modules/gui/qt/qt.cpp:142 msgid "" "Define the colors of the volume slider\n" "By specifying the 12 numbers separated by a ';'\n" @@ -20469,11 +20482,11 @@ "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255'" msgstr "" -#: modules/gui/qt/qt.cpp:144 +#: modules/gui/qt/qt.cpp:147 msgid "Selection of the starting mode and look" msgstr "" -#: modules/gui/qt/qt.cpp:145 +#: modules/gui/qt/qt.cpp:148 msgid "" "Start VLC with:\n" " - normal mode\n" @@ -20481,57 +20494,57 @@ " - minimal mode with limited controls" msgstr "" -#: modules/gui/qt/qt.cpp:151 +#: modules/gui/qt/qt.cpp:154 msgid "Show a controller in fullscreen mode" msgstr "Nyut lagwok ne iyi kit lanyut lung" -#: modules/gui/qt/qt.cpp:152 +#: modules/gui/qt/qt.cpp:155 msgid "Embed the file browser in open dialog" msgstr "Ket kayenyo fail iyi boc ma giyabo" -#: modules/gui/qt/qt.cpp:154 +#: modules/gui/qt/qt.cpp:157 msgid "Define which screen fullscreen goes" msgstr "Yer lanyut ma lanyut lung ceto iye" -#: modules/gui/qt/qt.cpp:155 +#: modules/gui/qt/qt.cpp:158 msgid "Screennumber of fullscreen, instead of same screen where interface is." msgstr "" -#: modules/gui/qt/qt.cpp:158 +#: modules/gui/qt/qt.cpp:161 msgid "Load extensions on startup" msgstr "Ket nyayo ne ki kom acaki" -#: modules/gui/qt/qt.cpp:159 +#: modules/gui/qt/qt.cpp:162 msgid "Automatically load the extensions module on startup." msgstr "" -#: modules/gui/qt/qt.cpp:162 +#: modules/gui/qt/qt.cpp:165 msgid "Start in minimal view (without menus)" msgstr "Cak i neno maromrom(Labongo acaki)" -#: modules/gui/qt/qt.cpp:164 +#: modules/gui/qt/qt.cpp:167 msgid "Display background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:165 +#: modules/gui/qt/qt.cpp:168 msgid "" "Display background cone or current album art when not playing. Can be " "disabled to prevent burning screen." msgstr "" -#: modules/gui/qt/qt.cpp:168 +#: modules/gui/qt/qt.cpp:171 msgid "Expanding background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:169 +#: modules/gui/qt/qt.cpp:172 msgid "Background art fits window's size." msgstr "" -#: modules/gui/qt/qt.cpp:171 +#: modules/gui/qt/qt.cpp:174 msgid "Ignore keyboard volume buttons." msgstr "" -#: modules/gui/qt/qt.cpp:173 +#: modules/gui/qt/qt.cpp:176 msgid "" "With this option checked, the volume up, volume down and mute buttons on " "your keyboard will always change your system volume. With this option " @@ -20539,41 +20552,41 @@ "and change the system volume when VLC is not selected." msgstr "" -#: modules/gui/qt/qt.cpp:188 +#: modules/gui/qt/qt.cpp:191 msgid "When to raise the interface" msgstr "" -#: modules/gui/qt/qt.cpp:189 +#: modules/gui/qt/qt.cpp:192 msgid "" "This option allows the interface to be raised automatically when a video/" "audio playback starts, or never." msgstr "" -#: modules/gui/qt/qt.cpp:192 +#: modules/gui/qt/qt.cpp:195 msgid "Fullscreen controller mouse sensitivity" msgstr "" -#: modules/gui/qt/qt.cpp:200 +#: modules/gui/qt/qt.cpp:203 msgid "When minimized" msgstr "" -#: modules/gui/qt/qt.cpp:218 +#: modules/gui/qt/qt.cpp:221 msgid "Qt interface" msgstr "Qt kaneno" -#: modules/gui/qt/util/customwidgets.cpp:82 +#: modules/gui/qt/util/customwidgets.cpp:80 msgid "errors" msgstr "" -#: modules/gui/qt/util/customwidgets.cpp:83 +#: modules/gui/qt/util/customwidgets.cpp:81 msgid "warnings" msgstr "" -#: modules/gui/qt/util/customwidgets.cpp:84 +#: modules/gui/qt/util/customwidgets.cpp:82 msgid "debug" msgstr "" -#: modules/gui/qt/util/searchlineedit.cpp:49 +#: modules/gui/qt/util/searchlineedit.cpp:50 msgctxt "Tooltip|Clear" msgid "Clear" msgstr "" @@ -20670,72 +20683,76 @@ msgid "Open skin..." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:86 modules/hw/d3d9/d3d9_filters.c:68 +#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:68 #: modules/video_filter/adjust.c:61 msgid "Brightness threshold" msgstr "Tic me lengo" -#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:69 +#: modules/hw/d3d11/d3d11_filters.c:88 modules/hw/d3d9/d3d9_filters.c:69 #: modules/video_filter/adjust.c:62 msgid "" "When this mode is enabled, pixels will be shown as black or white. The " "threshold value will be the brightness defined below." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:90 modules/hw/d3d9/d3d9_filters.c:72 +#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:72 #: modules/video_filter/adjust.c:65 msgid "Image contrast (0-2)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:73 +#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:73 #: modules/video_filter/adjust.c:66 msgid "Set the image contrast, between 0 and 2. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:74 +#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:74 msgid "Image hue (0-360)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:75 +#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:75 msgid "Set the image hue, between 0 and 360. Defaults to 0." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:76 +#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:76 #: modules/video_filter/adjust.c:69 msgid "Image saturation (0-3)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:77 +#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:77 #: modules/video_filter/adjust.c:70 msgid "Set the image saturation, between 0 and 3. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:78 +#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:78 #: modules/video_filter/adjust.c:71 msgid "Image brightness (0-2)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:79 +#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:79 #: modules/video_filter/adjust.c:72 msgid "Set the image brightness, between 0 and 2. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:80 +#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:80 #: modules/video_filter/adjust.c:73 msgid "Image gamma (0-10)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:81 +#: modules/hw/d3d11/d3d11_filters.c:100 modules/hw/d3d9/d3d9_filters.c:81 #: modules/video_filter/adjust.c:74 msgid "Set the image gamma, between 0.01 and 10. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:670 +#: modules/hw/d3d11/d3d11_filters.c:681 msgid "AMD VQ Enhancer" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:671 -msgid "amf_vqenhancer" +#: modules/hw/d3d11/d3d11_filters.c:687 +msgid "AMD Frame Rate Doubler" +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:690 +msgid "Show indicator" msgstr "" #: modules/hw/d3d9/d3d9_filters.c:454 @@ -21116,11 +21133,11 @@ msgid "System logger (syslog)" msgstr "" -#: modules/lua/extension.c:1194 +#: modules/lua/extension.c:1200 msgid "Extension not responding!" msgstr "" -#: modules/lua/extension.c:1195 +#: modules/lua/extension.c:1201 #, c-format msgid "" "Extension '%s' does not respond.\n" @@ -21148,8 +21165,8 @@ #: modules/lua/vlc.c:53 msgid "" -"Lua interface configuration string. Format is: '[\"\"] = {

For all the saving, converting, transcoding, encoding, muxing and " "streaming tasks, you should find useful information in the Streaming Documentation.

If you are unsure about terminology, please consult the knowledge base.

To understand the main keyboard shortcuts, read the shortcuts page.

Help

Before " -"asking any question, please refer yourself to the FAQ.

You might then get (and give) " -"help on the Forums, the mailing-lists or our IRC " -"channel (#videolan on irc.freenode.net).

Contribute to the " -"project

You can help the VideoLAN project giving some of your time to " -"help the community, to design skins, to translate the documentation, to test " -"and to code. You can also give funds and material to help us. And of course, " -"you can promote VLC media player.

" +"a>.

If you are unsure about terminology, please consult the knowledge base.

To " +"understand the main keyboard shortcuts, read the shortcuts page.

Help

Before asking " +"any question, please refer yourself to the FAQ.

You might then get (and give) help on the " +"Forums, the mailing-lists or our IRC channel " +"(#videolan on irc.freenode.net).

Contribute to the project

You can help the VideoLAN project giving some of your time to help the " +"community, to design skins, to translate the documentation, to test and to " +"code. You can also give funds and material to help us. And of course, you " +"can promote VLC media player.

" msgstr "" "

Welkom by VLC-mediaspeler-hulp

Dokumentasie

U kan VLC-dokumentasie op VideoLAN se wiki-webwerf vind.

Indien u VLC " -"vir die eerste keer gebruik, lees asb. die
Inleiding tot VLC-mediaspeler.

U sal inligting oor hoe om die speler te gebruik in die
\"Hoe om lêers " -"met VLC-mediaspeler te speel\"-dokument kry.

U sal inligting " -"vir al die stoor-, omskakelings-, transkoderings-, enkoderings-, muks en " +"h2>

Dokumentasie

U kan VLC-dokumentasie op VideoLAN se wiki-webwerf vind.

Indien u VLC vir " +"die eerste keer gebruik, lees asb. die
Inleiding tot VLC-mediaspeler.

U sal inligting oor hoe om die speler te gebruik in die
\"Hoe om lêers met " +"VLC-mediaspeler te speel\"-dokument kry.

U sal inligting vir " +"al die stoor-, omskakelings-, transkoderings-, enkoderings-, muks en " "stroomtake in die Stroomdokumentasie vind.

Indien die terminologie " "onduidelik is, konsulteer asb. die $a: Artist
$b: Album
$c: Copyright
$t: Title
$g: " -"Genre
$n: Track num
$p: Now playing
$A: Date
$D: Duration
$Z: " -"\"Now playing\" (Fall back on Title - Artist)" +"This option allows you to set the title according to what's being played
" +"$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: Genre
$n: " +"Track num
$p: Now playing
$A: Date
$D: Duration
$Z: \"Now playing" +"\" (Fall back on Title - Artist)" msgstr "" #: src/libvlc-module.c:695 @@ -3389,7 +3388,7 @@ msgid "Tell VLC that it is being launched due to a file association in the OS" msgstr "" -#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:547 +#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:554 msgid "Use only one instance when started from file manager" msgstr "" @@ -3407,7 +3406,7 @@ "machine." msgstr "" -#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:550 +#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:557 msgid "Enqueue items into playlist in one instance mode" msgstr "" @@ -3451,7 +3450,7 @@ #: src/libvlc-module.c:1126 modules/gui/macosx/VLCSimplePrefsController.m:342 #: modules/gui/qt/dialogs/firstrun.cpp:95 -#: modules/gui/qt/ui/sprefs_interface.h:562 +#: modules/gui/qt/ui/sprefs_interface.h:569 msgid "Allow metadata network access" msgstr "" @@ -3589,7 +3588,7 @@ "VLC." msgstr "" -#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:548 +#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:555 msgid "Display playlist tree" msgstr "" @@ -3711,11 +3710,11 @@ msgid "Select the hotkey to set the playback rate back to normal." msgstr "" -#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:884 +#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:889 msgid "Faster (fine)" msgstr "" -#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:892 +#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:897 msgid "Slower (fine)" msgstr "" @@ -3726,7 +3725,7 @@ #: modules/gui/macosx/VLCMainMenu.m:396 modules/gui/macosx/VLCMainMenu.m:499 #: modules/gui/macosx/VLCMainMenu.m:507 #: modules/gui/qt/components/controller.hpp:112 -#: modules/gui/qt/dialogs/sout.cpp:93 modules/notify/notify.c:335 +#: modules/gui/qt/dialogs/sout.cpp:91 modules/notify/notify.c:335 #: modules/gui/qt/ui/streampanel.h:179 msgid "Next" msgstr "Volgende" @@ -3753,7 +3752,7 @@ #: modules/gui/macosx/VLCMainMenu.m:498 modules/gui/macosx/VLCMainMenu.m:505 #: modules/gui/macosx/VLCMainWindowControlsBar.m:65 #: modules/gui/qt/components/controller.hpp:107 -#: modules/gui/qt/dialogs/vlm.cpp:544 modules/gui/qt/ui/streampanel.h:178 +#: modules/gui/qt/dialogs/vlm.cpp:538 modules/gui/qt/ui/streampanel.h:178 msgid "Stop" msgstr "Stop" @@ -3882,8 +3881,8 @@ #: src/libvlc-module.c:1293 modules/control/hotkeys.c:361 #: modules/gui/macosx/VLCStatusBarIcon.m:116 #: modules/gui/qt/components/controller.hpp:111 -#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:955 -#: modules/gui/qt/menus.cpp:1141 modules/gui/skins2/commands/cmd_quit.cpp:45 +#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:960 +#: modules/gui/qt/menus.cpp:1146 modules/gui/skins2/commands/cmd_quit.cpp:45 msgid "Quit" msgstr "Sluit af" @@ -4191,7 +4190,7 @@ msgstr "" #: src/libvlc-module.c:1373 -#: modules/gui/qt/components/playlist/standardpanel.cpp:246 +#: modules/gui/qt/components/playlist/standardpanel.cpp:247 msgid "Clear the playlist" msgstr "" @@ -4369,7 +4368,7 @@ #: src/libvlc-module.c:1423 modules/gui/macosx/VLCMainMenu.m:387 #: modules/gui/qt/components/controller.hpp:110 -#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:858 +#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:863 #: modules/stream_out/record.c:60 msgid "Record" msgstr "Neem op" @@ -4529,7 +4528,7 @@ msgid "Special modules" msgstr "Spesiale modules" -#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:90 +#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:89 msgid "Plugins" msgstr "Inproppe" @@ -4796,7 +4795,7 @@ msgid "Media View" msgstr "" -#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:568 +#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:577 msgid "Menu" msgstr "Kieslys" @@ -4829,8 +4828,8 @@ #: modules/gui/macosx/VLCFSPanelController.m:251 #: modules/gui/macosx/VLCMainMenu.m:1346 modules/gui/macosx/VLCMainMenu.m:1347 #: modules/gui/macosx/VLCMainMenu.m:1348 -#: modules/gui/qt/components/playlist/standardpanel.cpp:196 -#: modules/gui/qt/menus.cpp:832 +#: modules/gui/qt/components/playlist/standardpanel.cpp:197 +#: modules/gui/qt/menus.cpp:837 msgid "Pause" msgstr "Laat wag" @@ -4921,7 +4920,7 @@ msgstr "" #: src/misc/update.c:596 src/misc/update.c:726 modules/access/dvb/scan.c:826 -#: modules/demux/avi/avi.c:2827 +#: modules/demux/avi/avi.c:2878 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:513 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:571 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:854 @@ -4946,10 +4945,10 @@ #: modules/gui/macosx/VLCVideoEffectsWindowController.m:791 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:860 #: modules/gui/macosx/prefs.m:189 -#: modules/gui/qt/components/open_panels.cpp:1381 -#: modules/gui/qt/components/preferences_widgets.cpp:1416 +#: modules/gui/qt/components/open_panels.cpp:1361 +#: modules/gui/qt/components/preferences_widgets.cpp:1420 #: modules/gui/qt/components/sout/profile_selector.cpp:452 -#: modules/gui/qt/dialogs/sout.cpp:92 +#: modules/gui/qt/dialogs/sout.cpp:90 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "Cancel" msgstr "Kanselleer" @@ -5875,79 +5874,79 @@ msgid "Blu-ray Disc support (libbluray)" msgstr "" -#: modules/access/bluray.c:849 +#: modules/access/bluray.c:847 msgid "Path doesn't appear to be a Blu-ray" msgstr "" -#: modules/access/bluray.c:864 +#: modules/access/bluray.c:862 msgid "" "This Blu-ray Disc needs a library for AACS decoding, and your system does " "not have it." msgstr "" -#: modules/access/bluray.c:870 +#: modules/access/bluray.c:868 msgid "Blu-ray Disc is corrupted." msgstr "" -#: modules/access/bluray.c:872 +#: modules/access/bluray.c:870 msgid "Missing AACS configuration file!" msgstr "" -#: modules/access/bluray.c:874 +#: modules/access/bluray.c:872 msgid "No valid processing key found in AACS config file." msgstr "" -#: modules/access/bluray.c:876 +#: modules/access/bluray.c:874 msgid "No valid host certificate found in AACS config file." msgstr "" -#: modules/access/bluray.c:878 +#: modules/access/bluray.c:876 msgid "AACS Host certificate revoked." msgstr "" -#: modules/access/bluray.c:880 +#: modules/access/bluray.c:878 msgid "AACS MMC failed." msgstr "" -#: modules/access/bluray.c:890 +#: modules/access/bluray.c:888 msgid "" "This Blu-ray Disc needs a library for BD+ decoding, and your system does not " "have it." msgstr "" -#: modules/access/bluray.c:893 +#: modules/access/bluray.c:891 msgid "Your system BD+ decoding library does not work. Missing configuration?" msgstr "" -#: modules/access/bluray.c:926 +#: modules/access/bluray.c:924 msgid "Java required" msgstr "" -#: modules/access/bluray.c:927 +#: modules/access/bluray.c:925 #, c-format msgid "" "This Blu-ray disc requires Java for menus support.%s\n" "The disc will be played without menus." msgstr "" -#: modules/access/bluray.c:928 +#: modules/access/bluray.c:926 msgid "Java was not found on your system." msgstr "" -#: modules/access/bluray.c:951 +#: modules/access/bluray.c:949 msgid "Failed to start bluray playback. Please try without menu support." msgstr "" -#: modules/access/bluray.c:992 modules/access/bluray.c:2825 -#: modules/access/bluray.c:2830 +#: modules/access/bluray.c:990 modules/access/bluray.c:2823 +#: modules/access/bluray.c:2828 msgid "Blu-ray error" msgstr "" -#: modules/access/bluray.c:2115 +#: modules/access/bluray.c:2113 msgid "Top Menu" msgstr "" -#: modules/access/bluray.c:2118 +#: modules/access/bluray.c:2116 msgid "First Play" msgstr "" @@ -5974,9 +5973,8 @@ msgstr "" #: modules/access/cdda.c:1023 -#, fuzzy msgid "Address of the musicbrainz server to use." -msgstr "Adres van die CDDB-bediener om te gebruik." +msgstr "" #: modules/access/cdda.c:1025 msgid "CDDB Server" @@ -6147,7 +6145,7 @@ msgid "10 bits" msgstr "" -#: modules/access/decklink.cpp:358 modules/demux/ty.c:769 +#: modules/access/decklink.cpp:358 modules/demux/ty.c:783 msgid "Closed captions 1" msgstr "" @@ -6183,7 +6181,7 @@ msgstr "" #: modules/access/dshow/dshow.cpp:130 -#: modules/gui/qt/components/open_panels.cpp:838 +#: modules/gui/qt/components/open_panels.cpp:818 msgid "Video device name" msgstr "Videotoestelnaam" @@ -6194,8 +6192,8 @@ msgstr "" #: modules/access/dshow/dshow.cpp:135 -#: modules/gui/qt/components/open_panels.cpp:846 -#: modules/gui/qt/components/open_panels.cpp:1067 +#: modules/gui/qt/components/open_panels.cpp:826 +#: modules/gui/qt/components/open_panels.cpp:1047 msgid "Audio device name" msgstr "Oudiotoestelnaam" @@ -6206,7 +6204,7 @@ msgstr "" #: modules/access/dshow/dshow.cpp:140 -#: modules/gui/qt/components/open_panels.cpp:813 +#: modules/gui/qt/components/open_panels.cpp:793 msgid "Video size" msgstr "Videogrootte" @@ -6279,8 +6277,8 @@ msgstr "" #: modules/access/dshow/dshow.cpp:168 -#: modules/gui/qt/components/open_panels.cpp:866 -#: modules/gui/qt/components/open_panels.cpp:1087 +#: modules/gui/qt/components/open_panels.cpp:846 +#: modules/gui/qt/components/open_panels.cpp:1067 msgid "Video standard" msgstr "" @@ -6474,7 +6472,7 @@ "frequency. This is required to tune the receiver." msgstr "" -#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:987 +#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:967 msgid "Modulation / Constellation" msgstr "" @@ -6978,8 +6976,8 @@ #: modules/audio_output/file.c:113 #: modules/gui/macosx/VLCOpenWindowController.m:140 #: modules/gui/macosx/VLCOutput.m:64 modules/gui/macosx/VLCOutput.m:175 -#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1429 -#: modules/gui/qt/dialogs/sout.cpp:69 modules/gui/qt/dialogs/sout.cpp:121 +#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1428 +#: modules/gui/qt/dialogs/sout.cpp:67 modules/gui/qt/dialogs/sout.cpp:119 #: share/lua/http/dialogs/create_stream.html:204 #: share/lua/http/dialogs/stream_config_window.html:36 #: share/lua/http/dialogs/stream_window.html:95 @@ -7005,7 +7003,7 @@ #: modules/access_output/http.c:52 #: modules/gui/macosx/VLCCoreDialogProvider.m:191 #: modules/gui/macosx/VLCSimplePrefsController.m:286 -#: modules/gui/qt/dialogs/external.cpp:203 modules/misc/audioscrobbler.c:114 +#: modules/gui/qt/dialogs/external.cpp:205 modules/misc/audioscrobbler.c:114 #: modules/stream_out/rtp.c:173 msgid "Username" msgstr "" @@ -7024,7 +7022,7 @@ #: modules/gui/macosx/VLCCoreDialogProvider.m:192 #: modules/gui/macosx/VLCSimplePrefsController.m:285 #: modules/gui/macosx/VLCSimplePrefsController.m:348 -#: modules/gui/qt/dialogs/external.cpp:208 modules/lua/vlc.c:54 +#: modules/gui/qt/dialogs/external.cpp:210 modules/lua/vlc.c:54 #: modules/lua/vlc.c:70 modules/misc/audioscrobbler.c:116 #: modules/stream_out/rtp.c:176 msgid "Password" @@ -7216,7 +7214,7 @@ #: modules/demux/rawvid.c:47 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:239 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167 -#: modules/gui/qt/components/extended_panels.cpp:1318 modules/spu/mosaic.c:94 +#: modules/gui/qt/components/extended_panels.cpp:1348 modules/spu/mosaic.c:94 #: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108 #: modules/gui/qt/ui/profiles.h:741 msgid "Width" @@ -7285,7 +7283,7 @@ #: modules/access/imem.c:113 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:236 -#: modules/gui/qt/components/extended_panels.cpp:1317 +#: modules/gui/qt/components/extended_panels.cpp:1347 msgid "Size" msgstr "Grootte" @@ -7313,7 +7311,7 @@ msgid "Read the audio stream at VLC pace rather than Jack pace." msgstr "" -#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:918 +#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:898 msgid "Auto connection" msgstr "" @@ -7478,19 +7476,19 @@ msgid "Port to use for tunneling the RTSP/RTP over HTTP." msgstr "" -#: modules/access/live555.cpp:673 +#: modules/access/live555.cpp:677 msgid "RTSP authentication" msgstr "" -#: modules/access/live555.cpp:674 +#: modules/access/live555.cpp:678 msgid "Please enter a valid login name and a password." msgstr "" -#: modules/access/live555.cpp:699 +#: modules/access/live555.cpp:703 msgid "RTSP connection failed" msgstr "" -#: modules/access/live555.cpp:700 +#: modules/access/live555.cpp:704 msgid "Access to the stream is denied by the server configuration." msgstr "" @@ -7829,7 +7827,7 @@ msgstr "" #: modules/access/screen/screen.c:45 -#: modules/gui/qt/components/open_panels.cpp:1124 +#: modules/gui/qt/components/open_panels.cpp:1104 msgid "Desired frame rate for the capture." msgstr "" @@ -8084,9 +8082,8 @@ msgstr "" #: modules/access/srt.c:446 modules/access_output/srt.c:480 -#, fuzzy msgid " SRT Stream ID" -msgstr "Stroom %d" +msgstr "" #: modules/access/srt_common.c:26 msgid "16 bytes" @@ -8194,7 +8191,7 @@ msgid "Radio tuner device node." msgstr "" -#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1094 +#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1074 msgid "Frequency" msgstr "Frekwensie" @@ -8373,7 +8370,7 @@ msgstr "50 Hz" #: modules/access/v4l2/v4l2.c:137 -#: modules/gui/qt/components/extended_panels.cpp:1107 +#: modules/gui/qt/components/extended_panels.cpp:1132 msgid "60 Hz" msgstr "60 Hz" @@ -8532,7 +8529,7 @@ #: modules/control/hotkeys.c:395 #: modules/gui/macosx/VLCAddonsWindowController.m:100 #: modules/gui/qt/dialogs/convert.cpp:164 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/dialogs/plugins.cpp:382 #: modules/gui/qt/dialogs/preferences.cpp:79 msgid "All" msgstr "" @@ -8900,9 +8897,9 @@ #: modules/access_output/livehttp.c:98 msgid "" -"File is read when segment starts and is assumed to be in format: key-" -"uri\\nkey-file. File is read on the segment opening and values are used on " -"that segment." +"File is read when segment starts and is assumed to be in format: key-uri" +"\\nkey-file. File is read on the segment opening and values are used on that " +"segment." msgstr "" #: modules/access_output/livehttp.c:102 @@ -8963,7 +8960,7 @@ msgstr "" #: modules/access_output/rist.c:842 modules/access_output/shout.c:64 -#: modules/gui/qt/components/sout/sout_widgets.cpp:385 +#: modules/gui/qt/components/sout/sout_widgets.cpp:386 #: share/lua/http/dialogs/create_stream.html:139 msgid "Stream name" msgstr "" @@ -9337,7 +9334,7 @@ #: modules/audio_filter/chorus_flanger.c:80 #: modules/audio_filter/stereo_widen.c:57 -#: modules/gui/qt/components/extended_panels.cpp:1337 +#: modules/gui/qt/components/extended_panels.cpp:1367 msgid "Delay time" msgstr "Vertragingstyd" @@ -9365,7 +9362,7 @@ #: modules/audio_filter/chorus_flanger.c:89 #: modules/audio_filter/stereo_widen.c:60 -#: modules/gui/qt/components/extended_panels.cpp:1338 +#: modules/gui/qt/components/extended_panels.cpp:1368 msgid "Feedback gain" msgstr "" @@ -9391,7 +9388,7 @@ #: modules/audio_filter/compressor.c:155 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:225 -#: modules/gui/qt/components/extended_panels.cpp:1295 +#: modules/gui/qt/components/extended_panels.cpp:1325 msgid "RMS/peak" msgstr "" @@ -9425,7 +9422,7 @@ #: modules/audio_filter/compressor.c:167 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:229 -#: modules/gui/qt/components/extended_panels.cpp:1299 +#: modules/gui/qt/components/extended_panels.cpp:1329 msgid "Ratio" msgstr "" @@ -9842,19 +9839,19 @@ #: modules/audio_filter/spatializer/spatializer.cpp:61 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:241 -#: modules/gui/qt/components/extended_panels.cpp:1319 +#: modules/gui/qt/components/extended_panels.cpp:1349 msgid "Wet" msgstr "Nat" #: modules/audio_filter/spatializer/spatializer.cpp:64 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:242 -#: modules/gui/qt/components/extended_panels.cpp:1320 +#: modules/gui/qt/components/extended_panels.cpp:1350 msgid "Dry" msgstr "Droog" #: modules/audio_filter/spatializer/spatializer.cpp:67 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:243 -#: modules/gui/qt/components/extended_panels.cpp:1321 +#: modules/gui/qt/components/extended_panels.cpp:1351 msgid "Damp" msgstr "Klam" @@ -9888,7 +9885,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:64 -#: modules/gui/qt/components/extended_panels.cpp:1339 +#: modules/gui/qt/components/extended_panels.cpp:1369 msgid "Crossfeed" msgstr "" @@ -9900,7 +9897,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:68 -#: modules/gui/qt/components/extended_panels.cpp:1340 +#: modules/gui/qt/components/extended_panels.cpp:1370 msgid "Dry mix" msgstr "" @@ -10138,7 +10135,7 @@ msgid "K Audio Interface audio output" msgstr "" -#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:416 +#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:417 msgid "HDMI/SPDIF audio passthrough" msgstr "" @@ -10228,11 +10225,11 @@ "output mode (which is not well supported by some soundcards)." msgstr "" -#: modules/codec/a52.c:70 +#: modules/codec/a52.c:72 msgid "A/52 dynamic range compression" msgstr "" -#: modules/codec/a52.c:72 modules/codec/dca.c:63 +#: modules/codec/a52.c:74 modules/codec/dca.c:65 msgid "" "Dynamic range compression makes the loud sounds softer, and the soft sounds " "louder, so you can more easily listen to the stream in a noisy environment " @@ -10240,7 +10237,7 @@ "playback will be more adapted to a movie theater or a listening room." msgstr "" -#: modules/codec/a52.c:80 +#: modules/codec/a52.c:82 msgid "ATSC A/52 (AC-3) audio decoder" msgstr "" @@ -10718,15 +10715,15 @@ "enabled libavcodec" msgstr "" -#: modules/codec/avcodec/d3d11va.c:63 +#: modules/codec/avcodec/d3d11va.c:67 msgid "Direct3D11 Video Acceleration" msgstr "" -#: modules/codec/avcodec/dxva2.c:51 +#: modules/codec/avcodec/dxva2.c:55 msgid "DirectX Video Acceleration (DXVA) 2.0" msgstr "" -#: modules/codec/avcodec/encoder.c:383 +#: modules/codec/avcodec/encoder.c:399 #, c-format msgid "" "It seems your Libav/FFmpeg (libavcodec) installation lacks the following " @@ -10738,32 +10735,32 @@ "Do not contact the VideoLAN project about this issue.\n" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "unknown" msgstr "onbekend" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "video" msgstr "video" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "audio" msgstr "oudio" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "subpicture" msgstr "subbeeld" -#: modules/codec/avcodec/encoder.c:919 +#: modules/codec/avcodec/encoder.c:940 #, c-format msgid "VLC could not open the %4.4s %s encoder." msgstr "VLC kon nie die %4.4s %s-enkodeerder open nie." -#: modules/codec/avcodec/vaapi.c:354 +#: modules/codec/avcodec/vaapi.c:388 msgid "VA-API video decoder via DRM" msgstr "VA-API videodekodeerder via DRM" -#: modules/codec/avcodec/vaapi.c:359 +#: modules/codec/avcodec/vaapi.c:393 msgid "VA-API video decoder" msgstr "" @@ -10860,15 +10857,23 @@ msgid "Max number of threads used for tile decoding, default 0=auto" msgstr "" -#: modules/codec/dav1d.c:60 +#: modules/codec/dav1d.c:56 +msgid "All Layers" +msgstr "" + +#: modules/codec/dav1d.c:57 +msgid "Whether or not to display all spatial layers, default false" +msgstr "" + +#: modules/codec/dav1d.c:62 msgid "Dav1d video decoder" msgstr "" -#: modules/codec/dca.c:61 +#: modules/codec/dca.c:63 msgid "DTS dynamic range compression" msgstr "" -#: modules/codec/dca.c:73 +#: modules/codec/dca.c:75 msgid "DTS Coherent Acoustics audio decoder" msgstr "" @@ -11387,7 +11392,7 @@ "This should take less than a minute." msgstr "" -#: modules/codec/libmpeg2.c:137 +#: modules/codec/libmpeg2.c:140 msgid "MPEG I/II video decoder (using libmpeg2)" msgstr "" @@ -11407,7 +11412,7 @@ msgid "MPEG audio layer I/II/III decoder" msgstr "" -#: modules/codec/mft.c:62 +#: modules/codec/mft.c:66 msgid "Media Foundation Transform decoder" msgstr "" @@ -12079,7 +12084,7 @@ msgid "S/PDIF pass-through decoder" msgstr "" -#: modules/codec/speex.c:59 modules/codec/speex.c:907 +#: modules/codec/speex.c:59 modules/codec/speex.c:910 #: modules/gui/macosx/VLCOpenWindowController.m:195 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:259 #: modules/gui/qt/ui/sprefs_video.h:325 modules/gui/qt/ui/video_effects.h:1282 @@ -12407,7 +12412,7 @@ #. #. This MUST be a valid iconv character set. If unsure, please refer #. the VideoLAN translators mailing list. -#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:98 +#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:99 msgctxt "GetACP" msgid "CP1252" msgstr "" @@ -13412,8 +13417,8 @@ #: modules/codec/x264.c:429 modules/gui/macosx/VLCMainMenu.m:290 #: modules/gui/macosx/VLCMainMenu.m:392 #: modules/gui/macosx/VLCSimplePrefsController.m:711 -#: modules/gui/qt/components/simple_preferences.cpp:703 -#: modules/misc/gnutls.c:778 modules/text_renderer/freetype/freetype.c:124 +#: modules/gui/qt/components/simple_preferences.cpp:714 +#: modules/misc/gnutls.c:775 modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:143 msgid "Normal" msgstr "Normaal" @@ -13470,7 +13475,7 @@ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)" msgstr "" -#: modules/codec/x265.c:46 +#: modules/codec/x265.c:53 msgid "H.265/HEVC encoder (x265)" msgstr "" @@ -13546,14 +13551,14 @@ #: modules/gui/macosx/VLCMainWindow.m:587 #: modules/gui/macosx/VLCMainWindow.m:1030 #: modules/gui/macosx/VLCStatusBarIcon.m:378 modules/gui/ncurses.c:1026 -#: modules/gui/qt/dialogs/help.cpp:91 modules/gui/qt/main_interface.cpp:1267 -#: modules/gui/qt/main_interface.cpp:1271 -#: modules/gui/qt/main_interface.cpp:1310 -#: modules/gui/qt/main_interface.cpp:1312 -#: modules/gui/qt/main_interface.cpp:1420 -#: modules/gui/qt/main_interface.cpp:1437 -#: modules/gui/qt/main_interface.cpp:1445 -#: modules/gui/qt/main_interface.cpp:1468 modules/lua/libs/httpd.c:80 +#: modules/gui/qt/dialogs/help.cpp:100 modules/gui/qt/main_interface.cpp:1302 +#: modules/gui/qt/main_interface.cpp:1306 +#: modules/gui/qt/main_interface.cpp:1343 +#: modules/gui/qt/main_interface.cpp:1345 +#: modules/gui/qt/main_interface.cpp:1453 +#: modules/gui/qt/main_interface.cpp:1470 +#: modules/gui/qt/main_interface.cpp:1478 +#: modules/gui/qt/main_interface.cpp:1501 modules/lua/libs/httpd.c:80 #: modules/notify/osx_notifications.m:302 #: modules/video_output/wayland/shell.c:348 #: modules/video_output/wayland/xdg-shell.c:291 @@ -13606,7 +13611,7 @@ #: modules/control/globalhotkeys/win32.c:47 #: modules/control/globalhotkeys/xcb.c:50 -#: modules/gui/qt/components/preferences_widgets.cpp:1137 +#: modules/gui/qt/components/preferences_widgets.cpp:1141 msgid "Global Hotkeys" msgstr "" @@ -13617,8 +13622,8 @@ #: modules/control/hotkeys.c:100 #: modules/gui/macosx/VLCSimplePrefsController.m:251 -#: modules/gui/qt/components/preferences_widgets.cpp:1136 -#: modules/gui/qt/components/simple_preferences.cpp:257 +#: modules/gui/qt/components/preferences_widgets.cpp:1140 +#: modules/gui/qt/components/simple_preferences.cpp:258 msgid "Hotkeys" msgstr "" @@ -14306,7 +14311,7 @@ msgstr "" #: modules/demux/adaptive/adaptive.cpp:85 -#: modules/gui/qt/components/simple_preferences.cpp:702 +#: modules/gui/qt/components/simple_preferences.cpp:713 msgid "Low latency" msgstr "" @@ -14358,11 +14363,11 @@ msgid "ASF/WMV demuxer" msgstr "" -#: modules/demux/asf/asf.c:277 modules/demux/asf/asf.c:834 +#: modules/demux/asf/asf.c:285 modules/demux/asf/asf.c:836 msgid "Could not demux ASF stream" msgstr "" -#: modules/demux/asf/asf.c:278 +#: modules/demux/asf/asf.c:286 msgid "VLC failed to load the ASF header." msgstr "" @@ -14406,41 +14411,41 @@ msgid "Internal libavcodec format name" msgstr "" -#: modules/demux/avi/avi.c:55 +#: modules/demux/avi/avi.c:56 msgid "Force interleaved method" msgstr "" -#: modules/demux/avi/avi.c:57 +#: modules/demux/avi/avi.c:58 msgid "Force index creation" msgstr "" -#: modules/demux/avi/avi.c:59 +#: modules/demux/avi/avi.c:60 msgid "" "Recreate a index for the AVI file. Use this if your AVI file is damaged or " "incomplete (not seekable)." msgstr "" -#: modules/demux/avi/avi.c:67 +#: modules/demux/avi/avi.c:68 msgid "Ask for action" msgstr "" -#: modules/demux/avi/avi.c:68 +#: modules/demux/avi/avi.c:69 msgid "Always fix" msgstr "" -#: modules/demux/avi/avi.c:69 +#: modules/demux/avi/avi.c:70 msgid "Never fix" msgstr "" -#: modules/demux/avi/avi.c:70 +#: modules/demux/avi/avi.c:71 msgid "Fix when necessary" msgstr "" -#: modules/demux/avi/avi.c:74 +#: modules/demux/avi/avi.c:75 msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:902 modules/demux/mp4/mp4.c:4375 +#: modules/demux/avi/avi.c:910 modules/demux/mp4/mp4.c:4374 msgid "" "Because this file index is broken or missing, seeking will not work " "correctly.\n" @@ -14450,27 +14455,27 @@ "What do you want to do?" msgstr "" -#: modules/demux/avi/avi.c:910 +#: modules/demux/avi/avi.c:918 msgid "Do not play" msgstr "" -#: modules/demux/avi/avi.c:911 +#: modules/demux/avi/avi.c:919 msgid "Build index then play" msgstr "" -#: modules/demux/avi/avi.c:912 +#: modules/demux/avi/avi.c:920 msgid "Play as is" msgstr "" -#: modules/demux/avi/avi.c:913 modules/demux/mp4/mp4.c:4386 +#: modules/demux/avi/avi.c:921 modules/demux/mp4/mp4.c:4385 msgid "Broken or missing Index" msgstr "" -#: modules/demux/avi/avi.c:2828 +#: modules/demux/avi/avi.c:2879 msgid "Broken or missing AVI Index" msgstr "" -#: modules/demux/avi/avi.c:2829 +#: modules/demux/avi/avi.c:2880 msgid "Fixing AVI Index..." msgstr "" @@ -14627,7 +14632,7 @@ "good for broken files)." msgstr "" -#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:112 +#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:113 msgid "Seek based on percent not time" msgstr "" @@ -14877,27 +14882,27 @@ msgid "Clean" msgstr "" -#: modules/demux/mp4/mp4.c:50 +#: modules/demux/mp4/mp4.c:51 msgid "M4A audio only" msgstr "" -#: modules/demux/mp4/mp4.c:51 +#: modules/demux/mp4/mp4.c:52 msgid "Ignore non audio tracks from iTunes audio files" msgstr "" -#: modules/demux/mp4/mp4.c:56 +#: modules/demux/mp4/mp4.c:57 msgid "MP4 stream demuxer" msgstr "" -#: modules/demux/mp4/mp4.c:57 +#: modules/demux/mp4/mp4.c:58 msgid "MP4" msgstr "MP4" -#: modules/demux/mp4/mp4.c:4383 +#: modules/demux/mp4/mp4.c:4382 msgid "Do not seek" msgstr "" -#: modules/demux/mp4/mp4.c:4384 +#: modules/demux/mp4/mp4.c:4383 msgid "Build index" msgstr "" @@ -14958,89 +14963,89 @@ msgid "PS" msgstr "" -#: modules/demux/mpeg/ts.c:83 +#: modules/demux/mpeg/ts.c:84 msgid "Extra PMT" msgstr "" -#: modules/demux/mpeg/ts.c:85 +#: modules/demux/mpeg/ts.c:86 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." msgstr "" -#: modules/demux/mpeg/ts.c:87 +#: modules/demux/mpeg/ts.c:88 msgid "Set id of ES to PID" msgstr "" -#: modules/demux/mpeg/ts.c:88 +#: modules/demux/mpeg/ts.c:89 msgid "" "Set the internal ID of each elementary stream handled by VLC to the same " "value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do " "'#duplicate{..., select=\"es=\"}'." msgstr "" -#: modules/demux/mpeg/ts.c:93 modules/mux/mpeg/ts.c:173 +#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:173 msgid "CSA Key" msgstr "" -#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:174 +#: modules/demux/mpeg/ts.c:95 modules/mux/mpeg/ts.c:174 msgid "" "CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:97 modules/mux/mpeg/ts.c:177 +#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:177 msgid "Second CSA Key" msgstr "" -#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:178 +#: modules/demux/mpeg/ts.c:99 modules/mux/mpeg/ts.c:178 msgid "" "The even CSA encryption key. This must be a 16 char string (8 hexadecimal " "bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:102 +#: modules/demux/mpeg/ts.c:103 msgid "Packet size in bytes to decrypt" msgstr "" -#: modules/demux/mpeg/ts.c:103 +#: modules/demux/mpeg/ts.c:104 msgid "" "Specify the size of the TS packet to decrypt. The decryption routines " "subtract the TS-header from the value before decrypting." msgstr "" -#: modules/demux/mpeg/ts.c:107 +#: modules/demux/mpeg/ts.c:108 msgid "Separate sub-streams" msgstr "" -#: modules/demux/mpeg/ts.c:109 +#: modules/demux/mpeg/ts.c:110 msgid "" "Separate teletex/dvbs pages into independent ES. It can be useful to turn " "off this option when using stream output." msgstr "" -#: modules/demux/mpeg/ts.c:114 +#: modules/demux/mpeg/ts.c:115 msgid "" "Seek and position based on a percent byte position, not a PCR generated time " "position. If seeking doesn't work property, turn on this option." msgstr "" -#: modules/demux/mpeg/ts.c:125 +#: modules/demux/mpeg/ts.c:126 msgid "Trust in-stream PCR" msgstr "" -#: modules/demux/mpeg/ts.c:126 +#: modules/demux/mpeg/ts.c:127 msgid "Use the stream PCR as a reference." msgstr "" -#: modules/demux/mpeg/ts.c:133 modules/mux/mpeg/ts.c:100 +#: modules/demux/mpeg/ts.c:134 modules/mux/mpeg/ts.c:100 msgid "Digital TV Standard" msgstr "" -#: modules/demux/mpeg/ts.c:134 +#: modules/demux/mpeg/ts.c:135 msgid "" "Selects mode for digital TV standard. This feature affects EPG information " "and subtitles." msgstr "" -#: modules/demux/mpeg/ts.c:138 +#: modules/demux/mpeg/ts.c:139 msgid "MPEG Transport Stream demuxer" msgstr "" @@ -15261,7 +15266,7 @@ msgid "Total duration" msgstr "" -#: modules/demux/pva.c:43 +#: modules/demux/pva.c:44 msgid "PVA demuxer" msgstr "" @@ -15391,23 +15396,23 @@ msgid "TTA demuxer" msgstr "" -#: modules/demux/ty.c:59 +#: modules/demux/ty.c:62 msgid "TY" msgstr "" -#: modules/demux/ty.c:60 +#: modules/demux/ty.c:63 msgid "TY Stream audio/video demux" msgstr "" -#: modules/demux/ty.c:770 +#: modules/demux/ty.c:784 msgid "Closed captions 2" msgstr "" -#: modules/demux/ty.c:771 +#: modules/demux/ty.c:785 msgid "Closed captions 3" msgstr "" -#: modules/demux/ty.c:772 +#: modules/demux/ty.c:786 msgid "Closed captions 4" msgstr "" @@ -15423,7 +15428,7 @@ msgid "Vobsub subtitles parser" msgstr "" -#: modules/demux/voc.c:43 +#: modules/demux/voc.c:45 msgid "VOC demuxer" msgstr "" @@ -15435,7 +15440,7 @@ msgid "XA demuxer" msgstr "" -#: modules/demux/xiph_metadata.c:588 +#: modules/demux/xiph_metadata.c:571 msgid "Unknown category" msgstr "" @@ -15489,17 +15494,17 @@ msgstr "Aangaande VLC-mediaspeler" #: modules/gui/macosx/VLCAboutWindowController.m:97 -#: modules/gui/qt/dialogs/help.cpp:125 +#: modules/gui/qt/dialogs/help.cpp:137 msgid "Credits" msgstr "" #: modules/gui/macosx/VLCAboutWindowController.m:99 -#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:119 +#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:129 msgid "License" msgstr "Lisensie" #: modules/gui/macosx/VLCAboutWindowController.m:101 -#: modules/gui/qt/dialogs/help.cpp:122 +#: modules/gui/qt/dialogs/help.cpp:133 msgid "Authors" msgstr "" @@ -15515,33 +15520,33 @@ "\">VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" +"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:105 #: modules/gui/macosx/VLCAddonsWindowController.m:357 -#: modules/gui/qt/dialogs/plugins.cpp:389 +#: modules/gui/qt/dialogs/plugins.cpp:388 #: modules/gui/qt/managers/addons_manager.cpp:88 msgid "Playlist parsers" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:107 #: modules/gui/macosx/VLCAddonsWindowController.m:359 -#: modules/gui/qt/dialogs/plugins.cpp:393 +#: modules/gui/qt/dialogs/plugins.cpp:392 #: modules/gui/qt/managers/addons_manager.cpp:90 msgid "Service Discovery" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:109 -#: modules/gui/qt/dialogs/plugins.cpp:397 +#: modules/gui/qt/dialogs/plugins.cpp:396 #: modules/gui/qt/managers/addons_manager.cpp:92 msgid "Interfaces" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:111 -#: modules/gui/qt/dialogs/plugins.cpp:400 +#: modules/gui/qt/dialogs/plugins.cpp:399 #: modules/gui/qt/managers/addons_manager.cpp:94 msgid "Art and meta fetchers" msgstr "" @@ -15549,7 +15554,7 @@ #: modules/gui/macosx/VLCAddonsWindowController.m:113 #: modules/gui/macosx/VLCAddonsWindowController.m:361 #: modules/gui/macosx/VLCMainMenu.m:343 modules/gui/macosx/VLCMainMenu.m:344 -#: modules/gui/qt/dialogs/plugins.cpp:403 +#: modules/gui/qt/dialogs/plugins.cpp:402 #: modules/gui/qt/managers/addons_manager.cpp:96 msgid "Extensions" msgstr "Uitbreidings" @@ -15559,30 +15564,30 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:118 -#: modules/gui/qt/dialogs/plugins.cpp:431 +#: modules/gui/qt/dialogs/plugins.cpp:430 msgid "Find more addons online" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:128 -#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:86 +#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:85 msgid "Addons Manager" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:130 -#: modules/gui/qt/dialogs/plugins.cpp:1173 -#: modules/gui/qt/dialogs/plugins.cpp:1186 +#: modules/gui/qt/dialogs/plugins.cpp:1172 +#: modules/gui/qt/dialogs/plugins.cpp:1185 msgid "Installed" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:131 #: modules/gui/macosx/VLCBookmarksWindowController.m:87 -#: modules/gui/qt/dialogs/plugins.cpp:128 modules/mux/avi.c:54 +#: modules/gui/qt/dialogs/plugins.cpp:127 modules/mux/avi.c:54 msgid "Name" msgstr "Naam" #: modules/gui/macosx/VLCAddonsWindowController.m:132 -#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1405 -#: modules/gui/qt/dialogs/plugins.cpp:1510 modules/mux/asf.c:58 +#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1404 +#: modules/gui/qt/dialogs/plugins.cpp:1509 modules/mux/asf.c:58 msgid "Author" msgstr "Outeur" @@ -15591,7 +15596,7 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:355 -#: modules/gui/qt/dialogs/plugins.cpp:385 +#: modules/gui/qt/dialogs/plugins.cpp:384 #: modules/gui/qt/managers/addons_manager.cpp:86 #: modules/gui/skins2/src/skin_main.cpp:535 msgid "Skins" @@ -15608,7 +15613,7 @@ msgstr "Dubbeloormonstering" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:219 -#: modules/gui/qt/components/extended_panels.cpp:1132 +#: modules/gui/qt/components/extended_panels.cpp:1157 #: modules/gui/qt/ui/equalizer.h:133 msgid "Preamp" msgstr "Voorafversterking" @@ -15621,22 +15626,22 @@ #: modules/gui/macosx/VLCAudioEffectsWindowController.m:235 #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:49 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:210 -#: modules/gui/qt/dialogs/gototime.cpp:66 +#: modules/gui/qt/dialogs/gototime.cpp:65 msgid "Reset" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:226 -#: modules/gui/qt/components/extended_panels.cpp:1296 +#: modules/gui/qt/components/extended_panels.cpp:1326 msgid "Attack" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:227 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "Release" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:228 -#: modules/gui/qt/components/extended_panels.cpp:1298 +#: modules/gui/qt/components/extended_panels.cpp:1328 msgid "Threshold" msgstr "" @@ -15790,7 +15795,7 @@ #: modules/gui/macosx/VLCOutput.m:60 modules/gui/macosx/VLCPlaylistInfo.m:337 #: modules/gui/macosx/VLCSimplePrefsController.m:295 #: modules/gui/macosx/VLCTimeSelectionPanelController.m:51 -#: modules/gui/qt/components/open_panels.cpp:1380 +#: modules/gui/qt/components/open_panels.cpp:1360 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "OK" msgstr "Goed" @@ -15817,8 +15822,8 @@ #: modules/gui/macosx/VLCBookmarksWindowController.m:213 msgid "" -"Input has changed, unable to save bookmark. Suspending playback with " -"\"Pause\" while editing bookmarks to ensure to keep the same input." +"Input has changed, unable to save bookmark. Suspending playback with \"Pause" +"\" while editing bookmarks to ensure to keep the same input." msgstr "" "Toevoer het verander, kon dus nie boekmerk stoor nie. Laat wag terugspeel " "met “Laat wag” terwyl u boekmerke redigeer om te verseker dat dieselfde " @@ -15910,10 +15915,10 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:381 #: modules/gui/macosx/prefs_widgets.m:1126 #: modules/gui/qt/components/preferences_widgets.cpp:264 -#: modules/gui/qt/components/simple_preferences.cpp:471 -#: modules/gui/qt/components/sout/sout_widgets.cpp:135 -#: modules/gui/qt/ui/open.h:279 modules/gui/qt/ui/open_disk.h:304 -#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:414 +#: modules/gui/qt/components/simple_preferences.cpp:472 +#: modules/gui/qt/components/sout/sout_widgets.cpp:136 +#: modules/gui/qt/ui/open.h:277 modules/gui/qt/ui/open_disk.h:304 +#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:415 #: modules/gui/qt/ui/sprefs_input.h:365 modules/gui/qt/ui/sprefs_video.h:329 msgid "Browse..." msgstr "Blaai..." @@ -15934,7 +15939,7 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:149 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:392 #: modules/gui/macosx/VLCOutput.m:65 modules/gui/macosx/VLCOutput.m:194 -#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:94 +#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:92 msgid "Stream" msgstr "Stroom" @@ -16007,10 +16012,10 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:186 #: modules/gui/macosx/VLCOpenWindowController.m:197 #: modules/gui/macosx/VLCOutput.m:68 -#: modules/gui/qt/components/sout/sout_widgets.cpp:241 -#: modules/gui/qt/components/sout/sout_widgets.cpp:328 -#: modules/gui/qt/components/sout/sout_widgets.cpp:370 -#: modules/gui/qt/components/sout/sout_widgets.cpp:425 +#: modules/gui/qt/components/sout/sout_widgets.cpp:242 +#: modules/gui/qt/components/sout/sout_widgets.cpp:329 +#: modules/gui/qt/components/sout/sout_widgets.cpp:371 +#: modules/gui/qt/components/sout/sout_widgets.cpp:426 msgid "Address" msgstr "Adres" @@ -16022,11 +16027,11 @@ #: modules/gui/macosx/VLCOpenWindowController.m:185 #: modules/gui/macosx/VLCOpenWindowController.m:187 #: modules/gui/macosx/VLCOutput.m:69 -#: modules/gui/qt/components/sout/sout_widgets.cpp:187 -#: modules/gui/qt/components/sout/sout_widgets.cpp:242 -#: modules/gui/qt/components/sout/sout_widgets.cpp:283 -#: modules/gui/qt/components/sout/sout_widgets.cpp:329 -#: modules/gui/qt/components/sout/sout_widgets.cpp:426 modules/lua/vlc.c:67 +#: modules/gui/qt/components/sout/sout_widgets.cpp:188 +#: modules/gui/qt/components/sout/sout_widgets.cpp:243 +#: modules/gui/qt/components/sout/sout_widgets.cpp:284 +#: modules/gui/qt/components/sout/sout_widgets.cpp:330 +#: modules/gui/qt/components/sout/sout_widgets.cpp:427 modules/lua/vlc.c:67 #: modules/stream_out/rtp.c:114 #: share/lua/http/dialogs/stream_config_window.html:32 #: share/lua/http/dialogs/stream_window.html:91 @@ -16118,7 +16123,7 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:705 #: modules/gui/macosx/VLCSimplePrefsController.m:733 #: modules/gui/macosx/VLCSimplePrefsController.m:1266 -#: modules/gui/qt/components/simple_preferences.cpp:700 +#: modules/gui/qt/components/simple_preferences.cpp:711 msgid "Custom" msgstr "" @@ -16157,7 +16162,7 @@ #: modules/gui/macosx/VLCFSPanelController.m:140 #: modules/gui/macosx/VLCMainWindowControlsBar.m:80 -#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:408 +#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:409 msgid "Volume" msgstr "Volume" @@ -16191,7 +16196,7 @@ msgstr "" #: modules/gui/macosx/VLCLogWindowController.m:94 -#: modules/gui/qt/dialogs/messages.cpp:80 +#: modules/gui/qt/dialogs/messages.cpp:77 #: modules/gui/qt/ui/messages_panel.h:136 #: modules/gui/qt/ui/messages_panel.h:140 msgid "Messages" @@ -16555,8 +16560,8 @@ msgid "Bring All to Front" msgstr "Bring Alle na Vore" -#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:54 -#: modules/gui/qt/menus.cpp:951 modules/gui/qt/menus.cpp:1138 +#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:52 +#: modules/gui/qt/menus.cpp:956 modules/gui/qt/menus.cpp:1143 msgid "Help" msgstr "Hulp" @@ -16619,13 +16624,13 @@ #: modules/gui/macosx/VLCMainWindow.m:220 #: modules/gui/macosx/VLCMainWindow.m:226 -#: modules/gui/qt/components/playlist/selector.cpp:580 +#: modules/gui/qt/components/playlist/selector.cpp:593 msgid "Subscribe" msgstr "Teken in" #: modules/gui/macosx/VLCMainWindow.m:221 #: modules/gui/macosx/VLCMainWindow.m:232 -#: modules/gui/qt/components/playlist/selector.cpp:597 +#: modules/gui/qt/components/playlist/selector.cpp:610 msgid "Unsubscribe" msgstr "Beëindig inskrywing" @@ -16635,7 +16640,7 @@ msgstr "Teken in vir ’n podsend" #: modules/gui/macosx/VLCMainWindow.m:225 -#: modules/gui/qt/components/playlist/selector.cpp:581 +#: modules/gui/qt/components/playlist/selector.cpp:594 msgid "Enter URL of the podcast to subscribe to:" msgstr "Voer die bronadres van die podsend om by in te teken:" @@ -16672,7 +16677,7 @@ msgstr "" #: modules/gui/macosx/VLCMainWindowControlsBar.m:71 -#: modules/gui/qt/dialogs/vlm.cpp:548 share/lua/http/index.html:259 +#: modules/gui/qt/dialogs/vlm.cpp:542 share/lua/http/index.html:259 msgid "Repeat" msgstr "" @@ -16758,7 +16763,7 @@ #: modules/gui/macosx/VLCOpenWindowController.m:152 #: modules/gui/macosx/VLCOpenWindowController.m:349 #: modules/gui/macosx/VLCSimplePrefsController.m:353 -#: modules/gui/qt/ui/sprefs_interface.h:545 +#: modules/gui/qt/ui/sprefs_interface.h:552 msgid "Choose..." msgstr "Kies..." @@ -16991,10 +16996,9 @@ msgstr "" #: modules/gui/macosx/VLCPlaylist.m:231 -#: modules/gui/qt/components/playlist/standardpanel.cpp:273 -#, fuzzy +#: modules/gui/qt/components/playlist/standardpanel.cpp:274 msgid "Shuffle playlist" -msgstr "Stoor afspeellys" +msgstr "" #: modules/gui/macosx/VLCPlaylistInfo.m:54 #: modules/gui/qt/dialogs/mediainfo.cpp:54 @@ -17064,8 +17068,8 @@ msgid "VLC was unable to save the meta data." msgstr "VLC kon nie die metadata stoor nie." -#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:194 -#: modules/gui/qt/ui/sprefs_interface.h:551 +#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:197 +#: modules/gui/qt/ui/sprefs_interface.h:558 msgid "Continue playback?" msgstr "" @@ -17109,27 +17113,27 @@ msgstr "INTERNET" #: modules/gui/macosx/VLCSimplePrefsController.m:241 -#: modules/gui/qt/components/simple_preferences.cpp:247 -#: modules/gui/qt/components/simple_preferences.cpp:727 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/components/simple_preferences.cpp:248 +#: modules/gui/qt/components/simple_preferences.cpp:738 +#: modules/gui/qt/dialogs/plugins.cpp:382 msgid "Interface Settings" msgstr "Koppelvlakinstellings" #: modules/gui/macosx/VLCSimplePrefsController.m:243 -#: modules/gui/qt/components/simple_preferences.cpp:249 -#: modules/gui/qt/components/simple_preferences.cpp:446 +#: modules/gui/qt/components/simple_preferences.cpp:250 +#: modules/gui/qt/components/simple_preferences.cpp:447 msgid "Audio Settings" msgstr "Oudio-instelings" #: modules/gui/macosx/VLCSimplePrefsController.m:245 -#: modules/gui/qt/components/simple_preferences.cpp:251 -#: modules/gui/qt/components/simple_preferences.cpp:379 +#: modules/gui/qt/components/simple_preferences.cpp:252 +#: modules/gui/qt/components/simple_preferences.cpp:380 msgid "Video Settings" msgstr "Video-instellings" #: modules/gui/macosx/VLCSimplePrefsController.m:247 -#: modules/gui/qt/components/simple_preferences.cpp:253 -#: modules/gui/qt/components/simple_preferences.cpp:868 +#: modules/gui/qt/components/simple_preferences.cpp:254 +#: modules/gui/qt/components/simple_preferences.cpp:894 msgid "Subtitle & On Screen Display Settings" msgstr "" @@ -17158,12 +17162,12 @@ msgstr "Hou oudiovlak tussen sessies" #: modules/gui/macosx/VLCSimplePrefsController.m:289 -#: modules/gui/qt/ui/sprefs_audio.h:410 +#: modules/gui/qt/ui/sprefs_audio.h:411 msgid "Always reset audio start level to:" msgstr "Herstel altyd die beginvlak vir oudio na:" #: modules/gui/macosx/VLCSimplePrefsController.m:292 -#: modules/gui/qt/dialogs/vlm.cpp:492 +#: modules/gui/qt/dialogs/vlm.cpp:486 msgid "Change" msgstr "" @@ -17176,7 +17180,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:298 -#: modules/gui/qt/components/preferences_widgets.cpp:1141 +#: modules/gui/qt/components/preferences_widgets.cpp:1145 msgid "Action" msgstr "" @@ -17202,7 +17206,7 @@ msgstr "Verstek kasvlak" #: modules/gui/macosx/VLCSimplePrefsController.m:307 -#: modules/gui/qt/ui/open.h:263 +#: modules/gui/qt/ui/open.h:261 msgid "Caching" msgstr "Kaswerk" @@ -17286,7 +17290,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:341 -#: modules/gui/qt/ui/sprefs_interface.h:553 +#: modules/gui/qt/ui/sprefs_interface.h:560 msgid "Privacy / Network Interaction" msgstr "Privaatheid / Netwerkinteraksie" @@ -17361,7 +17365,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:370 -#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:178 +#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:181 msgid "Pause the video playback when minimized" msgstr "" @@ -17548,12 +17552,12 @@ msgstr "sek." #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:50 -#: modules/gui/qt/components/extended_panels.cpp:1412 modules/gui/qt/qt.cpp:213 +#: modules/gui/qt/components/extended_panels.cpp:1442 modules/gui/qt/qt.cpp:216 msgid "Audio/Video" msgstr "Oudio/Video" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:51 -#: modules/gui/qt/components/extended_panels.cpp:1416 +#: modules/gui/qt/components/extended_panels.cpp:1446 msgid "Audio track synchronization:" msgstr "" @@ -17562,12 +17566,12 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:54 -#: modules/gui/qt/components/extended_panels.cpp:1424 +#: modules/gui/qt/components/extended_panels.cpp:1454 msgid "Subtitles/Video" msgstr "Onderskrifte/Video" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:55 -#: modules/gui/qt/components/extended_panels.cpp:1428 +#: modules/gui/qt/components/extended_panels.cpp:1458 msgid "Subtitle track synchronization:" msgstr "" @@ -17576,31 +17580,31 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:58 -#: modules/gui/qt/components/extended_panels.cpp:1435 +#: modules/gui/qt/components/extended_panels.cpp:1465 msgid "Subtitle speed:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:60 -#: modules/gui/qt/components/extended_panels.cpp:1449 +#: modules/gui/qt/components/extended_panels.cpp:1479 msgid "Subtitle duration factor:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:68 -#: modules/gui/qt/components/extended_panels.cpp:1560 +#: modules/gui/qt/components/extended_panels.cpp:1590 msgid "" "Extend subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:72 -#: modules/gui/qt/components/extended_panels.cpp:1565 +#: modules/gui/qt/components/extended_panels.cpp:1595 msgid "" "Multiply subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:76 -#: modules/gui/qt/components/extended_panels.cpp:1570 +#: modules/gui/qt/components/extended_panels.cpp:1600 msgid "" "Recalculate subtitle duration according\n" "to their content and this value.\n" @@ -17989,17 +17993,17 @@ " By default, interface resize to the native video size." msgstr "" -#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:180 +#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:183 msgid "" "With this option enabled, the playback will be automatically paused when " "minimizing the window." msgstr "" -#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:182 +#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:185 msgid "Allow automatic icon changes" msgstr "" -#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:184 +#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:187 msgid "" "This option allows the interface to change its icon on various occasions." msgstr "" @@ -18057,21 +18061,21 @@ "open one of those, playback will continue." msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:206 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:209 msgid "Ask" msgstr "Vra" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/keystore/keychain.m:50 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/keystore/keychain.m:50 msgid "Always" msgstr "Altyd" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/gui/qt/qt.cpp:213 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/gui/qt/qt.cpp:216 msgid "Never" msgstr "Nooit" -#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:186 +#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:189 msgid "Maximum Volume displayed" msgstr "" @@ -18416,27 +18420,27 @@ msgid "Find: %s" msgstr "" -#: modules/gui/qt/components/controller.cpp:343 +#: modules/gui/qt/components/controller.cpp:352 msgid "Shift+L" msgstr "Shift+L" -#: modules/gui/qt/components/controller.cpp:448 +#: modules/gui/qt/components/controller.cpp:457 msgid "Click to toggle between loop all, loop one and no loop" msgstr "" -#: modules/gui/qt/components/controller.cpp:549 +#: modules/gui/qt/components/controller.cpp:558 msgid "Previous Chapter/Title" msgstr "Vorige hoofstuk/titel" -#: modules/gui/qt/components/controller.cpp:555 +#: modules/gui/qt/components/controller.cpp:564 msgid "Next Chapter/Title" msgstr "Volgende hoofstuk/titel" -#: modules/gui/qt/components/controller.cpp:604 +#: modules/gui/qt/components/controller.cpp:613 msgid "Teletext Activation" msgstr "Teleteksaktivering" -#: modules/gui/qt/components/controller.cpp:620 +#: modules/gui/qt/components/controller.cpp:629 msgid "Toggle Transparency" msgstr "" @@ -18555,7 +18559,7 @@ msgstr "Volgende media in die afspeellys" #: modules/gui/qt/components/controller.hpp:126 -#: modules/gui/qt/components/open_panels.cpp:259 +#: modules/gui/qt/components/open_panels.cpp:241 msgid "Open subtitle file" msgstr "" @@ -18600,21 +18604,21 @@ msgid "No EPG Data Available" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:380 #: modules/gui/qt/components/extended_panels.cpp:393 +#: modules/gui/qt/components/extended_panels.cpp:406 msgid "Image Files" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:382 modules/spu/logo.c:49 +#: modules/gui/qt/components/extended_panels.cpp:395 modules/spu/logo.c:49 msgid "Logo filenames" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:395 +#: modules/gui/qt/components/extended_panels.cpp:408 #: modules/video_filter/erase.c:55 msgid "Image mask" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:645 +#: modules/gui/qt/components/extended_panels.cpp:658 msgid "" "No v4l2 instance found.\n" "Please check that the device has been opened with VLC and is playing.\n" @@ -18622,133 +18626,133 @@ "Controls will automatically appear here." msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1107 -#: modules/gui/qt/components/extended_panels.cpp:1108 -#: modules/gui/qt/components/extended_panels.cpp:1109 -#: modules/gui/qt/components/extended_panels.cpp:1110 -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1112 -#: modules/gui/qt/components/extended_panels.cpp:1113 -#: modules/gui/qt/components/extended_panels.cpp:1114 -#: modules/gui/qt/components/extended_panels.cpp:1115 -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1120 -#: modules/gui/qt/components/extended_panels.cpp:1121 -#: modules/gui/qt/components/extended_panels.cpp:1122 -#: modules/gui/qt/components/extended_panels.cpp:1123 -#: modules/gui/qt/components/extended_panels.cpp:1124 -#: modules/gui/qt/components/extended_panels.cpp:1125 -#: modules/gui/qt/components/extended_panels.cpp:1126 -#: modules/gui/qt/components/extended_panels.cpp:1127 -#: modules/gui/qt/components/extended_panels.cpp:1128 -#: modules/gui/qt/components/extended_panels.cpp:1129 #: modules/gui/qt/components/extended_panels.cpp:1132 -#: modules/gui/qt/components/extended_panels.cpp:1298 -#: modules/gui/qt/components/extended_panels.cpp:1300 -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1133 +#: modules/gui/qt/components/extended_panels.cpp:1134 +#: modules/gui/qt/components/extended_panels.cpp:1135 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1137 +#: modules/gui/qt/components/extended_panels.cpp:1138 +#: modules/gui/qt/components/extended_panels.cpp:1139 +#: modules/gui/qt/components/extended_panels.cpp:1140 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1145 +#: modules/gui/qt/components/extended_panels.cpp:1146 +#: modules/gui/qt/components/extended_panels.cpp:1147 +#: modules/gui/qt/components/extended_panels.cpp:1148 +#: modules/gui/qt/components/extended_panels.cpp:1149 +#: modules/gui/qt/components/extended_panels.cpp:1150 +#: modules/gui/qt/components/extended_panels.cpp:1151 +#: modules/gui/qt/components/extended_panels.cpp:1152 +#: modules/gui/qt/components/extended_panels.cpp:1153 +#: modules/gui/qt/components/extended_panels.cpp:1154 +#: modules/gui/qt/components/extended_panels.cpp:1157 +#: modules/gui/qt/components/extended_panels.cpp:1328 +#: modules/gui/qt/components/extended_panels.cpp:1330 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "dB" msgstr "dB" -#: modules/gui/qt/components/extended_panels.cpp:1108 +#: modules/gui/qt/components/extended_panels.cpp:1133 msgid "170 Hz" msgstr "170 Hz" -#: modules/gui/qt/components/extended_panels.cpp:1109 +#: modules/gui/qt/components/extended_panels.cpp:1134 msgid "310 Hz" msgstr "310 Hz" -#: modules/gui/qt/components/extended_panels.cpp:1110 +#: modules/gui/qt/components/extended_panels.cpp:1135 msgid "600 Hz" msgstr "600 Hz" -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1125 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1150 msgid "1 KHz" msgstr "1 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1112 +#: modules/gui/qt/components/extended_panels.cpp:1137 msgid "3 KHz" msgstr "3 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1113 +#: modules/gui/qt/components/extended_panels.cpp:1138 msgid "6 KHz" msgstr "6 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1114 +#: modules/gui/qt/components/extended_panels.cpp:1139 msgid "12 KHz" msgstr "12 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1115 +#: modules/gui/qt/components/extended_panels.cpp:1140 msgid "14 KHz" msgstr "14 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1129 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1154 msgid "16 KHz" msgstr "16 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1120 +#: modules/gui/qt/components/extended_panels.cpp:1145 msgid "31 Hz" msgstr "31 Hz" -#: modules/gui/qt/components/extended_panels.cpp:1121 +#: modules/gui/qt/components/extended_panels.cpp:1146 msgid "63 Hz" msgstr "63 Hz" -#: modules/gui/qt/components/extended_panels.cpp:1122 +#: modules/gui/qt/components/extended_panels.cpp:1147 msgid "125 Hz" msgstr "125 Hz" -#: modules/gui/qt/components/extended_panels.cpp:1123 +#: modules/gui/qt/components/extended_panels.cpp:1148 msgid "250 Hz" msgstr "250 Hz" -#: modules/gui/qt/components/extended_panels.cpp:1124 +#: modules/gui/qt/components/extended_panels.cpp:1149 msgid "500 Hz" msgstr "500 Hz" -#: modules/gui/qt/components/extended_panels.cpp:1126 +#: modules/gui/qt/components/extended_panels.cpp:1151 msgid "2 KHz" msgstr "2 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1127 +#: modules/gui/qt/components/extended_panels.cpp:1152 msgid "4 KHz" msgstr "4 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1128 +#: modules/gui/qt/components/extended_panels.cpp:1153 msgid "8 KHz" msgstr "8 KHz" -#: modules/gui/qt/components/extended_panels.cpp:1296 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1326 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "ms" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1300 +#: modules/gui/qt/components/extended_panels.cpp:1330 msgid "" "Knee\n" "radius" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "" "Makeup\n" "gain" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1354 +#: modules/gui/qt/components/extended_panels.cpp:1384 msgid "Adjust pitch" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1388 +#: modules/gui/qt/components/extended_panels.cpp:1418 msgid "(Hastened)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1390 +#: modules/gui/qt/components/extended_panels.cpp:1420 msgid "(Delayed)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1477 +#: modules/gui/qt/components/extended_panels.cpp:1507 msgid "Force update of this dialog's values" msgstr "Forseer bywerking van hierdie dialoogvenster se waardes" @@ -18843,7 +18847,7 @@ msgid "Overall" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:676 +#: modules/gui/qt/components/interface_widgets.cpp:683 msgid "" "Current playback speed: %1\n" "Click to adjust" @@ -18851,136 +18855,136 @@ "Huidige afspeelspoed: %1\n" "Klik om te verstel" -#: modules/gui/qt/components/interface_widgets.cpp:749 +#: modules/gui/qt/components/interface_widgets.cpp:756 msgid "Revert to normal play speed" msgstr "Gaan terug na normale speelspoed" -#: modules/gui/qt/components/interface_widgets.cpp:856 +#: modules/gui/qt/components/interface_widgets.cpp:863 msgid "Download cover art" msgstr "Laai dekbladkuns af" -#: modules/gui/qt/components/interface_widgets.cpp:860 +#: modules/gui/qt/components/interface_widgets.cpp:867 msgid "Add cover art from file" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:926 +#: modules/gui/qt/components/interface_widgets.cpp:933 msgid "Choose Cover Art" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:927 +#: modules/gui/qt/components/interface_widgets.cpp:934 msgid "Image Files (*.gif *.jpg *.jpeg *.png)" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:954 +#: modules/gui/qt/components/interface_widgets.cpp:961 #: modules/gui/qt/dialogs/toolbar.cpp:573 msgid "Elapsed time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:958 +#: modules/gui/qt/components/interface_widgets.cpp:965 #: modules/gui/qt/dialogs/toolbar.cpp:577 msgid "Total/Remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:960 +#: modules/gui/qt/components/interface_widgets.cpp:967 msgid "Click to toggle between total and remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:966 +#: modules/gui/qt/components/interface_widgets.cpp:973 msgid "Click to toggle between elapsed and remaining time" msgstr "Klik om te wissel tussen afgelope en oorblywende tyd" -#: modules/gui/qt/components/interface_widgets.cpp:968 +#: modules/gui/qt/components/interface_widgets.cpp:975 msgid "Double click to jump to a chosen time position" msgstr "Dubbelklik om te spring na ’n gekose tydposisie" -#: modules/gui/qt/components/open_panels.cpp:58 +#: modules/gui/qt/components/open_panels.cpp:55 msgid "Select a device or a VIDEO_TS directory" msgstr "Kies ’n toestel of ’n VIDEO_TS-gids" -#: modules/gui/qt/components/open_panels.cpp:59 +#: modules/gui/qt/components/open_panels.cpp:56 msgid "Select a device or a VIDEO_TS folder" msgstr "Kies ’n toestel of ’n VIDEO_TS-vouer" -#: modules/gui/qt/components/open_panels.cpp:145 -#: modules/gui/qt/components/open_panels.cpp:224 +#: modules/gui/qt/components/open_panels.cpp:127 +#: modules/gui/qt/components/open_panels.cpp:206 msgid "Select one or multiple files" msgstr "Kies een of meer lêers" -#: modules/gui/qt/components/open_panels.cpp:160 +#: modules/gui/qt/components/open_panels.cpp:142 msgid "File names:" msgstr "Lêername:" -#: modules/gui/qt/components/open_panels.cpp:162 -#: modules/gui/qt/ui/sprefs_interface.h:558 +#: modules/gui/qt/components/open_panels.cpp:144 +#: modules/gui/qt/ui/sprefs_interface.h:565 msgid "Filter:" msgstr "Filter:" -#: modules/gui/qt/components/open_panels.cpp:367 +#: modules/gui/qt/components/open_panels.cpp:349 msgid "Eject the disc" msgstr "Verwyder die skyf" -#: modules/gui/qt/components/open_panels.cpp:534 +#: modules/gui/qt/components/open_panels.cpp:514 msgid "Entry" msgstr "Inskrywing" -#: modules/gui/qt/components/open_panels.cpp:893 +#: modules/gui/qt/components/open_panels.cpp:873 msgid "Channels:" msgstr "Kanale:" -#: modules/gui/qt/components/open_panels.cpp:904 +#: modules/gui/qt/components/open_panels.cpp:884 msgid "Selected ports:" msgstr "Gekose poorte:" -#: modules/gui/qt/components/open_panels.cpp:907 +#: modules/gui/qt/components/open_panels.cpp:887 msgid ".*" msgstr ".*" -#: modules/gui/qt/components/open_panels.cpp:914 +#: modules/gui/qt/components/open_panels.cpp:894 msgid "Use VLC pace" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:934 +#: modules/gui/qt/components/open_panels.cpp:914 msgid "TV - digital" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:937 +#: modules/gui/qt/components/open_panels.cpp:917 msgid "Tuner card" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:938 +#: modules/gui/qt/components/open_panels.cpp:918 msgid "Delivery system" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:968 +#: modules/gui/qt/components/open_panels.cpp:948 msgid "Transponder/multiplex frequency" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:978 +#: modules/gui/qt/components/open_panels.cpp:958 msgid "Transponder symbol rate" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1011 +#: modules/gui/qt/components/open_panels.cpp:991 msgid "Bandwidth" msgstr "Bandwydte" -#: modules/gui/qt/components/open_panels.cpp:1055 +#: modules/gui/qt/components/open_panels.cpp:1035 msgid "TV - analog" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1058 +#: modules/gui/qt/components/open_panels.cpp:1038 msgid "Device name" msgstr "Toestelnaam" -#: modules/gui/qt/components/open_panels.cpp:1118 +#: modules/gui/qt/components/open_panels.cpp:1098 msgid "Your display will be opened and played in order to stream or save it." msgstr "" #. xgettext: frames per second -#: modules/gui/qt/components/open_panels.cpp:1132 +#: modules/gui/qt/components/open_panels.cpp:1112 msgid " f/s" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1347 +#: modules/gui/qt/components/open_panels.cpp:1327 msgid "Advanced Options" msgstr "Gevorderde keuses" @@ -19012,11 +19016,11 @@ msgid "Internet" msgstr "" -#: modules/gui/qt/components/playlist/selector.cpp:443 +#: modules/gui/qt/components/playlist/selector.cpp:456 msgid "Remove this podcast subscription" msgstr "Verwyder hierdie potsendintekening" -#: modules/gui/qt/components/playlist/selector.cpp:594 +#: modules/gui/qt/components/playlist/selector.cpp:607 msgid "Do you really want to unsubscribe from %1?" msgstr "Wil u regtig u intekening by %1 kanselleer?" @@ -19056,35 +19060,35 @@ msgid "Enter a new name for the folder:" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:254 +#: modules/gui/qt/components/playlist/standardpanel.cpp:255 msgid "Sort by" msgstr "Sorteer volgens" -#: modules/gui/qt/components/playlist/standardpanel.cpp:261 +#: modules/gui/qt/components/playlist/standardpanel.cpp:262 msgid "Ascending" msgstr "Stygend" -#: modules/gui/qt/components/playlist/standardpanel.cpp:265 +#: modules/gui/qt/components/playlist/standardpanel.cpp:266 msgid "Descending" msgstr "Dalend" -#: modules/gui/qt/components/playlist/standardpanel.cpp:278 +#: modules/gui/qt/components/playlist/standardpanel.cpp:279 msgid "Display size" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:279 +#: modules/gui/qt/components/playlist/standardpanel.cpp:280 msgid "Increase" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:280 +#: modules/gui/qt/components/playlist/standardpanel.cpp:281 msgid "Decrease" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:413 +#: modules/gui/qt/components/playlist/standardpanel.cpp:414 msgid "Playlist View Mode" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:592 +#: modules/gui/qt/components/playlist/standardpanel.cpp:593 msgid "" "Playlist is currently empty.\n" "Drop a file here or select a media source from the left." @@ -19110,91 +19114,91 @@ msgid "Select File" msgstr "Kies lêer" -#: modules/gui/qt/components/preferences_widgets.cpp:1125 +#: modules/gui/qt/components/preferences_widgets.cpp:1129 msgid "" "Select or double click an action to change the associated hotkey. Use delete " "key to remove hotkeys." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1132 +#: modules/gui/qt/components/preferences_widgets.cpp:1136 msgid "in" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1134 +#: modules/gui/qt/components/preferences_widgets.cpp:1138 msgid "Any field" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1135 +#: modules/gui/qt/components/preferences_widgets.cpp:1139 msgid "Actions" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1142 +#: modules/gui/qt/components/preferences_widgets.cpp:1146 msgid "Hotkey" msgstr "Snelsleutel" -#: modules/gui/qt/components/preferences_widgets.cpp:1143 +#: modules/gui/qt/components/preferences_widgets.cpp:1147 msgid "Application level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1144 -#: modules/gui/qt/components/preferences_widgets.cpp:1401 +#: modules/gui/qt/components/preferences_widgets.cpp:1148 +#: modules/gui/qt/components/preferences_widgets.cpp:1405 msgid "Global" msgstr "Globaal" -#: modules/gui/qt/components/preferences_widgets.cpp:1145 +#: modules/gui/qt/components/preferences_widgets.cpp:1149 msgid "Desktop level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1225 -#: modules/gui/qt/components/preferences_widgets.cpp:1226 +#: modules/gui/qt/components/preferences_widgets.cpp:1229 +#: modules/gui/qt/components/preferences_widgets.cpp:1230 msgid "" "Double click to change.\n" "Delete key to remove." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1402 +#: modules/gui/qt/components/preferences_widgets.cpp:1406 msgid "Hotkey change" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1406 +#: modules/gui/qt/components/preferences_widgets.cpp:1410 msgid "Press the new key or combination for " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1415 +#: modules/gui/qt/components/preferences_widgets.cpp:1419 msgid "Assign" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1450 +#: modules/gui/qt/components/preferences_widgets.cpp:1454 msgid "Warning: this key or combination is already assigned to " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1462 +#: modules/gui/qt/components/preferences_widgets.cpp:1466 msgid "Warning: %1 is already an application menu shortcut" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1485 +#: modules/gui/qt/components/preferences_widgets.cpp:1489 msgid "Key or combination: " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1494 +#: modules/gui/qt/components/preferences_widgets.cpp:1498 msgid "Key: " msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:255 -#: modules/gui/qt/components/simple_preferences.cpp:628 +#: modules/gui/qt/components/simple_preferences.cpp:256 +#: modules/gui/qt/components/simple_preferences.cpp:636 msgid "Input & Codecs Settings" msgstr "Toevoer en kodekinstellings" -#: modules/gui/qt/components/simple_preferences.cpp:257 -#: modules/gui/qt/components/simple_preferences.cpp:912 +#: modules/gui/qt/components/simple_preferences.cpp:258 +#: modules/gui/qt/components/simple_preferences.cpp:938 msgid "Configure Hotkeys" msgstr "Stel snelsleutels op" -#: modules/gui/qt/components/simple_preferences.cpp:454 +#: modules/gui/qt/components/simple_preferences.cpp:455 msgid "Device:" msgstr "Toestel:" -#: modules/gui/qt/components/simple_preferences.cpp:633 +#: modules/gui/qt/components/simple_preferences.cpp:641 msgid "" "If this property is blank, different values\n" "for DVD, VCD, and CDDA are set.\n" @@ -19202,57 +19206,57 @@ "individually in the advanced preferences." msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:701 +#: modules/gui/qt/components/simple_preferences.cpp:712 msgid "Lowest latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:704 +#: modules/gui/qt/components/simple_preferences.cpp:715 msgid "High latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:705 +#: modules/gui/qt/components/simple_preferences.cpp:716 msgid "Higher latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:753 +#: modules/gui/qt/components/simple_preferences.cpp:764 msgid "This is VLC's skinnable interface. You can download other skins at" msgstr "Hierdie is VLC se koppelvlak met eie velle. Laai ander velle af by" -#: modules/gui/qt/components/simple_preferences.cpp:755 +#: modules/gui/qt/components/simple_preferences.cpp:766 msgid "VLC skins website" msgstr "VLC-velwebwerf" -#: modules/gui/qt/components/simple_preferences.cpp:779 +#: modules/gui/qt/components/simple_preferences.cpp:794 msgid "System's default" msgstr "Stelselverstek" -#: modules/gui/qt/components/simple_preferences.cpp:1317 +#: modules/gui/qt/components/simple_preferences.cpp:1344 msgid "File associations" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1326 +#: modules/gui/qt/components/simple_preferences.cpp:1353 #: modules/gui/qt/dialogs_provider.hpp:42 msgid "Audio Files" msgstr "Oudiolêers" -#: modules/gui/qt/components/simple_preferences.cpp:1327 +#: modules/gui/qt/components/simple_preferences.cpp:1354 #: modules/gui/qt/dialogs_provider.hpp:41 msgid "Video Files" msgstr "Videolêers" -#: modules/gui/qt/components/simple_preferences.cpp:1328 +#: modules/gui/qt/components/simple_preferences.cpp:1355 #: modules/gui/qt/dialogs_provider.hpp:43 msgid "Playlist Files" msgstr "Afspeellyslêers" -#: modules/gui/qt/components/simple_preferences.cpp:1393 +#: modules/gui/qt/components/simple_preferences.cpp:1420 msgid "&Apply" msgstr "&Pas toe" -#: modules/gui/qt/components/simple_preferences.cpp:1394 +#: modules/gui/qt/components/simple_preferences.cpp:1421 #: modules/gui/qt/dialogs/convert.cpp:137 -#: modules/gui/qt/dialogs/gototime.cpp:49 modules/gui/qt/dialogs/open.cpp:108 -#: modules/gui/qt/dialogs/openurl.cpp:60 +#: modules/gui/qt/dialogs/gototime.cpp:48 modules/gui/qt/dialogs/open.cpp:109 +#: modules/gui/qt/dialogs/openurl.cpp:59 #: modules/gui/qt/dialogs/podcast_configuration.cpp:37 #: modules/gui/qt/dialogs/preferences.cpp:97 #: modules/gui/qt/dialogs/toolbar.cpp:198 @@ -19296,94 +19300,94 @@ msgid "You must set a name for the profile." msgstr "U moet ’n naam gee vir die profiel." -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Directory" msgstr "Lêer/Gids" -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Folder" msgstr "Lêer/Vouer" -#: modules/gui/qt/components/sout/sout_widgets.cpp:47 +#: modules/gui/qt/components/sout/sout_widgets.cpp:48 #: modules/gui/qt/ui/sout.h:199 msgid "Source" msgstr "Bron" -#: modules/gui/qt/components/sout/sout_widgets.cpp:50 +#: modules/gui/qt/components/sout/sout_widgets.cpp:51 msgid "Source:" msgstr "Bron:" -#: modules/gui/qt/components/sout/sout_widgets.cpp:59 +#: modules/gui/qt/components/sout/sout_widgets.cpp:60 msgid "Type:" msgstr "Tipe:" -#: modules/gui/qt/components/sout/sout_widgets.cpp:127 +#: modules/gui/qt/components/sout/sout_widgets.cpp:128 msgid "This module writes the transcoded stream to a file." msgstr "Dié module skryf die getranskodeerde stroom na ’n lêer." -#: modules/gui/qt/components/sout/sout_widgets.cpp:129 +#: modules/gui/qt/components/sout/sout_widgets.cpp:130 msgid "Filename" msgstr "Lêernaam" -#: modules/gui/qt/components/sout/sout_widgets.cpp:173 +#: modules/gui/qt/components/sout/sout_widgets.cpp:174 #: modules/gui/qt/dialogs/convert.cpp:161 msgid "Save file..." msgstr "Stoor lêer..." -#: modules/gui/qt/components/sout/sout_widgets.cpp:174 +#: modules/gui/qt/components/sout/sout_widgets.cpp:175 msgid "" "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:184 +#: modules/gui/qt/components/sout/sout_widgets.cpp:185 msgid "This module outputs the transcoded stream to a network via HTTP." msgstr "" "Dié module verskaf die getranskodeerde stroom as afvoer na ’n netwerk oor " "HTTP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:186 -#: modules/gui/qt/components/sout/sout_widgets.cpp:282 +#: modules/gui/qt/components/sout/sout_widgets.cpp:187 +#: modules/gui/qt/components/sout/sout_widgets.cpp:283 msgid "Path" msgstr "Pad" -#: modules/gui/qt/components/sout/sout_widgets.cpp:238 +#: modules/gui/qt/components/sout/sout_widgets.cpp:239 msgid "" "This module outputs the transcoded stream to a network via the mms protocol." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:280 +#: modules/gui/qt/components/sout/sout_widgets.cpp:281 msgid "This module outputs the transcoded stream to a network via RTSP." msgstr "" "Dié module verskaf die getranskodeerde stroom as afvoer na ’n netwerk oor " "RTSP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:326 +#: modules/gui/qt/components/sout/sout_widgets.cpp:327 msgid "This module outputs the transcoded stream to a network via UDP." msgstr "" "Dié module verskaf die getranskodeerde stroom as afvoer na ’n netwerk oor " "UDP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:368 +#: modules/gui/qt/components/sout/sout_widgets.cpp:369 msgid "This module outputs the transcoded stream to a network via RTP." msgstr "" "Dié module verskaf die getranskodeerde stroom as afvoer na ’n netwerk oor " "RTP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:375 +#: modules/gui/qt/components/sout/sout_widgets.cpp:376 msgid "Base port" msgstr "Basispoort" -#: modules/gui/qt/components/sout/sout_widgets.cpp:423 +#: modules/gui/qt/components/sout/sout_widgets.cpp:424 msgid "This module outputs the transcoded stream to an Icecast server." msgstr "" "Dié module verskaf die getranskodeerde stroom as afvoer na ’n Icecast-" "bediener." -#: modules/gui/qt/components/sout/sout_widgets.cpp:442 +#: modules/gui/qt/components/sout/sout_widgets.cpp:443 msgid "Mount Point" msgstr "Hegpunt" -#: modules/gui/qt/components/sout/sout_widgets.cpp:443 +#: modules/gui/qt/components/sout/sout_widgets.cpp:444 msgid "Login:pass" msgstr "" @@ -19409,13 +19413,13 @@ #: modules/gui/qt/dialogs/bookmarks.cpp:62 modules/gui/qt/dialogs/epg.cpp:92 #: modules/gui/qt/dialogs/errors.cpp:49 modules/gui/qt/dialogs/extended.cpp:130 -#: modules/gui/qt/dialogs/help.cpp:66 modules/gui/qt/dialogs/help.cpp:212 +#: modules/gui/qt/dialogs/help.cpp:64 modules/gui/qt/dialogs/help.cpp:223 #: modules/gui/qt/dialogs/mediainfo.cpp:80 -#: modules/gui/qt/dialogs/messages.cpp:84 modules/gui/qt/dialogs/plugins.cpp:94 -#: modules/gui/qt/dialogs/plugins.cpp:1438 -#: modules/gui/qt/dialogs/plugins.cpp:1551 +#: modules/gui/qt/dialogs/messages.cpp:81 modules/gui/qt/dialogs/plugins.cpp:93 +#: modules/gui/qt/dialogs/plugins.cpp:1437 +#: modules/gui/qt/dialogs/plugins.cpp:1550 #: modules/gui/qt/dialogs/podcast_configuration.cpp:36 -#: modules/gui/qt/dialogs/vlm.cpp:136 +#: modules/gui/qt/dialogs/vlm.cpp:130 msgid "&Close" msgstr "&Sluit" @@ -19435,7 +19439,7 @@ msgid "Destination" msgstr "Bestemming" -#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:413 +#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:414 msgid "Destination file:" msgstr "Teikenlêer:" @@ -19475,16 +19479,16 @@ msgid "Containers" msgstr "" -#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:431 +#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:434 msgid "Program Guide" msgstr "Programgids" -#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:286 -#: modules/gui/qt/ui/about.h:287 +#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:283 +#: modules/gui/qt/ui/about.h:284 msgid "Update" msgstr "Dateer op" -#: modules/gui/qt/dialogs/epg.cpp:161 +#: modules/gui/qt/dialogs/epg.cpp:162 msgid " (%1+ rated)" msgstr "" @@ -19521,7 +19525,7 @@ msgid "&Save" msgstr "Stoor" -#: modules/gui/qt/dialogs/external.cpp:216 +#: modules/gui/qt/dialogs/external.cpp:218 msgid "Store the Password" msgstr "" @@ -19552,60 +19556,60 @@ msgid "Regularly check for VLC updates" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:42 +#: modules/gui/qt/dialogs/gototime.cpp:41 msgid "Go to Time" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:48 +#: modules/gui/qt/dialogs/gototime.cpp:47 msgid "&Go" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:56 +#: modules/gui/qt/dialogs/gototime.cpp:55 msgid "Go to time" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:86 modules/gui/qt/dialogs/plugins.cpp:1376 -#: modules/gui/qt/dialogs/plugins.cpp:1459 +#: modules/gui/qt/dialogs/help.cpp:84 modules/gui/qt/dialogs/plugins.cpp:1375 +#: modules/gui/qt/dialogs/plugins.cpp:1458 msgid "About" msgstr "Oor" -#: modules/gui/qt/dialogs/help.cpp:94 +#: modules/gui/qt/dialogs/help.cpp:101 msgid "" "

VLC media player is a free and open source media player, encoder, and " "streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:214 +#: modules/gui/qt/dialogs/help.cpp:225 msgid "&Recheck version" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:217 +#: modules/gui/qt/dialogs/help.cpp:228 msgid "&Yes" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:219 +#: modules/gui/qt/dialogs/help.cpp:230 msgid "&No" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:222 modules/gui/qt/ui/update.h:144 +#: modules/gui/qt/dialogs/help.cpp:233 modules/gui/qt/ui/update.h:144 msgid "VLC media player updates" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:294 +#: modules/gui/qt/dialogs/help.cpp:305 msgid "A new version of VLC (%1.%2.%3%4) is available." msgstr "" -#: modules/gui/qt/dialogs/help.cpp:319 +#: modules/gui/qt/dialogs/help.cpp:330 msgid "You have the latest version of VLC media player." msgstr "" -#: modules/gui/qt/dialogs/help.cpp:326 +#: modules/gui/qt/dialogs/help.cpp:337 msgid "An error occurred while checking for updates..." msgstr "" @@ -19637,202 +19641,202 @@ msgid "Location:" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:91 +#: modules/gui/qt/dialogs/messages.cpp:88 msgid "Saves all the displayed logs to a file" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:259 +#: modules/gui/qt/dialogs/messages.cpp:256 msgid "Save log file as..." msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:261 +#: modules/gui/qt/dialogs/messages.cpp:258 msgid "Texts/Logs (*.log *.txt);; All (*.*)" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:267 +#: modules/gui/qt/dialogs/messages.cpp:264 msgid "Application" msgstr "Toepassing" -#: modules/gui/qt/dialogs/messages.cpp:268 +#: modules/gui/qt/dialogs/messages.cpp:265 msgid "" "Cannot write to file %1:\n" "%2." msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:334 +#: modules/gui/qt/dialogs/messages.cpp:331 msgid "Update the tree" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:335 +#: modules/gui/qt/dialogs/messages.cpp:332 msgid "Clear the messages" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:78 modules/gui/qt/menus.cpp:935 -#: modules/gui/qt/menus.cpp:1132 +#: modules/gui/qt/dialogs/open.cpp:79 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:1137 msgid "Open Media" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:90 +#: modules/gui/qt/dialogs/open.cpp:91 msgid "&File" msgstr "&Lêer" -#: modules/gui/qt/dialogs/open.cpp:92 +#: modules/gui/qt/dialogs/open.cpp:93 msgid "&Disc" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:94 +#: modules/gui/qt/dialogs/open.cpp:95 msgid "&Network" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:96 +#: modules/gui/qt/dialogs/open.cpp:97 msgid "Capture &Device" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:111 +#: modules/gui/qt/dialogs/open.cpp:112 msgid "&Select" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:115 modules/gui/qt/dialogs/open.cpp:210 -#: modules/gui/qt/dialogs/openurl.cpp:57 +#: modules/gui/qt/dialogs/open.cpp:116 modules/gui/qt/dialogs/open.cpp:211 +#: modules/gui/qt/dialogs/openurl.cpp:56 msgid "&Enqueue" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:117 modules/gui/qt/dialogs/open.cpp:214 -#: modules/gui/qt/dialogs/openurl.cpp:54 modules/gui/qt/menus.cpp:824 +#: modules/gui/qt/dialogs/open.cpp:118 modules/gui/qt/dialogs/open.cpp:215 +#: modules/gui/qt/dialogs/openurl.cpp:53 modules/gui/qt/menus.cpp:829 msgid "&Play" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:119 modules/gui/qt/dialogs/open.cpp:204 +#: modules/gui/qt/dialogs/open.cpp:120 modules/gui/qt/dialogs/open.cpp:205 msgid "&Stream" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:121 +#: modules/gui/qt/dialogs/open.cpp:122 msgid "C&onvert" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:207 +#: modules/gui/qt/dialogs/open.cpp:208 msgid "C&onvert / Save" msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:47 +#: modules/gui/qt/dialogs/openurl.cpp:46 msgid "Open URL" msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:64 +#: modules/gui/qt/dialogs/openurl.cpp:63 msgid "Enter URL here..." msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:67 +#: modules/gui/qt/dialogs/openurl.cpp:66 msgid "Please enter the URL or path to the media you want to play." msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:71 +#: modules/gui/qt/dialogs/openurl.cpp:70 msgid "" "If your clipboard contains a valid URL\n" "or the path to a file on your computer,\n" "it will be automatically selected." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:80 +#: modules/gui/qt/dialogs/plugins.cpp:79 msgid "Plugins and extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:88 +#: modules/gui/qt/dialogs/plugins.cpp:87 msgid "Active Extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Capability" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Score" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:141 +#: modules/gui/qt/dialogs/plugins.cpp:140 msgid "&Search:" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:259 -#: modules/gui/qt/dialogs/plugins.cpp:1292 +#: modules/gui/qt/dialogs/plugins.cpp:258 +#: modules/gui/qt/dialogs/plugins.cpp:1291 msgid "More information..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:267 +#: modules/gui/qt/dialogs/plugins.cpp:266 msgid "Reload extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:386 +#: modules/gui/qt/dialogs/plugins.cpp:385 msgid "" "Skins customize player's appearance. You can activate them through " "preferences." msgstr "" "Velle pas u speler se voorkoms aan. U kan dit in die voorkeure aktiveer." -#: modules/gui/qt/dialogs/plugins.cpp:390 +#: modules/gui/qt/dialogs/plugins.cpp:389 msgid "" "Playlist parsers add new capabilities to read internet streams or extract " "meta data." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:394 +#: modules/gui/qt/dialogs/plugins.cpp:393 msgid "" "Service discoveries adds new sources to your playlist such as web radios, " "video websites, ..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:401 +#: modules/gui/qt/dialogs/plugins.cpp:400 msgid "Retrieves extra info and art for playlist items" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:404 +#: modules/gui/qt/dialogs/plugins.cpp:403 msgid "" "Extensions brings various enhancements. Check descriptions for more details" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:425 +#: modules/gui/qt/dialogs/plugins.cpp:424 msgid "Only installed" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:531 +#: modules/gui/qt/dialogs/plugins.cpp:530 msgid "Retrieving addons..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:542 +#: modules/gui/qt/dialogs/plugins.cpp:541 msgid "No addons found" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:821 +#: modules/gui/qt/dialogs/plugins.cpp:820 msgid "This addon has been installed manually. VLC can't manage it by itself." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1204 +#: modules/gui/qt/dialogs/plugins.cpp:1203 msgid "Version %1" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1232 +#: modules/gui/qt/dialogs/plugins.cpp:1231 msgid "%1 downloads" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1301 +#: modules/gui/qt/dialogs/plugins.cpp:1300 msgid "&Uninstall" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1304 +#: modules/gui/qt/dialogs/plugins.cpp:1303 msgid "&Install" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1399 -#: modules/gui/qt/dialogs/plugins.cpp:1502 +#: modules/gui/qt/dialogs/plugins.cpp:1398 +#: modules/gui/qt/dialogs/plugins.cpp:1501 msgid "Version" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1419 -#: modules/gui/qt/dialogs/plugins.cpp:1529 +#: modules/gui/qt/dialogs/plugins.cpp:1418 +#: modules/gui/qt/dialogs/plugins.cpp:1528 msgid "Website" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1541 modules/gui/qt/ui/sprefs_input.h:363 +#: modules/gui/qt/dialogs/plugins.cpp:1540 modules/gui/qt/ui/sprefs_input.h:363 msgid "Files" msgstr "Lêers" @@ -19892,11 +19896,11 @@ msgid "Are you sure you want to reset your VLC media player preferences?" msgstr "Is u seker u wil u VLC-mediaspelervoorkeure herstel?" -#: modules/gui/qt/dialogs/sout.cpp:45 modules/gui/qt/ui/sout.h:198 +#: modules/gui/qt/dialogs/sout.cpp:43 modules/gui/qt/ui/sout.h:198 msgid "Stream Output" msgstr "Stroomafvoer" -#: modules/gui/qt/dialogs/sout.cpp:51 +#: modules/gui/qt/dialogs/sout.cpp:49 msgid "" "This wizard will allow you to stream or convert your media for use locally, " "on your private network, or on the Internet.\n" @@ -19904,7 +19908,7 @@ "be and then press the \"Next\" button to continue.\n" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:58 +#: modules/gui/qt/dialogs/sout.cpp:56 msgid "" "Stream output string.\n" "This is automatically generated when you change the above settings,\n" @@ -19915,7 +19919,7 @@ "verander,\n" "maar u kan dit handmatig verander." -#: modules/gui/qt/dialogs/sout.cpp:91 +#: modules/gui/qt/dialogs/sout.cpp:89 msgid "Back" msgstr "Terug" @@ -20047,67 +20051,67 @@ msgid "Speed selector" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:73 +#: modules/gui/qt/dialogs/vlm.cpp:67 msgid "Broadcast" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:74 +#: modules/gui/qt/dialogs/vlm.cpp:68 msgid "Schedule" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:75 +#: modules/gui/qt/dialogs/vlm.cpp:69 msgid "Video On Demand ( VOD )" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:80 +#: modules/gui/qt/dialogs/vlm.cpp:74 msgid "Hours / Minutes / Seconds:" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:82 +#: modules/gui/qt/dialogs/vlm.cpp:76 msgid "Day / Month / Year:" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:84 +#: modules/gui/qt/dialogs/vlm.cpp:78 msgid "Repeat:" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:86 +#: modules/gui/qt/dialogs/vlm.cpp:80 msgid "Repeat delay:" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:111 modules/gui/qt/ui/sprefs_interface.h:555 +#: modules/gui/qt/dialogs/vlm.cpp:105 modules/gui/qt/ui/sprefs_interface.h:562 msgid " days" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:130 +#: modules/gui/qt/dialogs/vlm.cpp:124 msgid "I&mport" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:133 +#: modules/gui/qt/dialogs/vlm.cpp:127 msgid "E&xport" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:264 +#: modules/gui/qt/dialogs/vlm.cpp:258 msgid "Save VLM configuration as..." msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:266 modules/gui/qt/dialogs/vlm.cpp:335 +#: modules/gui/qt/dialogs/vlm.cpp:260 modules/gui/qt/dialogs/vlm.cpp:329 msgid "VLM conf (*.vlm);;All (*)" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:333 +#: modules/gui/qt/dialogs/vlm.cpp:327 msgid "Open VLM configuration..." msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:532 +#: modules/gui/qt/dialogs/vlm.cpp:526 msgid "Broadcast: " msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:605 +#: modules/gui/qt/dialogs/vlm.cpp:599 msgid "Schedule: " msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:629 +#: modules/gui/qt/dialogs/vlm.cpp:623 msgid "VOD: " msgstr "" @@ -20165,339 +20169,339 @@ msgid "Deactivate" msgstr "" -#: modules/gui/qt/main_interface.cpp:373 +#: modules/gui/qt/main_interface.cpp:378 msgid "Do you want to restart the playback where left off?" msgstr "" -#: modules/gui/qt/main_interface.cpp:379 +#: modules/gui/qt/main_interface.cpp:384 msgid "&Continue" msgstr "" -#: modules/gui/qt/main_interface.cpp:1421 +#: modules/gui/qt/main_interface.cpp:1454 msgid "Control menu for the player" msgstr "Beheerkieslys vir die speler" -#: modules/gui/qt/main_interface.cpp:1465 +#: modules/gui/qt/main_interface.cpp:1498 msgid "Paused" msgstr "Wagtend" -#: modules/gui/qt/menus.cpp:331 +#: modules/gui/qt/menus.cpp:334 msgid "&Media" msgstr "&Media" -#: modules/gui/qt/menus.cpp:334 +#: modules/gui/qt/menus.cpp:337 msgid "P&layback" msgstr "&Afspeel" -#: modules/gui/qt/menus.cpp:335 modules/gui/qt/menus.cpp:1050 +#: modules/gui/qt/menus.cpp:338 modules/gui/qt/menus.cpp:1055 msgid "&Audio" msgstr "&Oudio" -#: modules/gui/qt/menus.cpp:336 modules/gui/qt/menus.cpp:1057 +#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1062 msgid "&Video" msgstr "&Video" -#: modules/gui/qt/menus.cpp:337 modules/gui/qt/menus.cpp:1064 +#: modules/gui/qt/menus.cpp:340 modules/gui/qt/menus.cpp:1069 msgid "Subti&tle" msgstr "" -#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1080 +#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1085 msgid "Tool&s" msgstr "" -#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1087 +#: modules/gui/qt/menus.cpp:345 modules/gui/qt/menus.cpp:1092 msgid "V&iew" msgstr "B&ekyk" -#: modules/gui/qt/menus.cpp:344 modules/gui/qt/menus.cpp:788 +#: modules/gui/qt/menus.cpp:347 modules/gui/qt/menus.cpp:793 msgid "&Help" msgstr "&Hulp" -#: modules/gui/qt/menus.cpp:357 +#: modules/gui/qt/menus.cpp:360 msgid "Open &File..." msgstr "" -#: modules/gui/qt/menus.cpp:359 +#: modules/gui/qt/menus.cpp:362 msgid "&Open Multiple Files..." msgstr "" -#: modules/gui/qt/menus.cpp:363 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:366 modules/gui/qt/menus.cpp:945 msgid "Open &Disc..." msgstr "Open &skyf..." -#: modules/gui/qt/menus.cpp:365 +#: modules/gui/qt/menus.cpp:368 msgid "Open &Network Stream..." msgstr "Open &netwerkstroom..." -#: modules/gui/qt/menus.cpp:367 modules/gui/qt/menus.cpp:944 +#: modules/gui/qt/menus.cpp:370 modules/gui/qt/menus.cpp:949 msgid "Open &Capture Device..." msgstr "Open &opneemtoestel..." -#: modules/gui/qt/menus.cpp:370 +#: modules/gui/qt/menus.cpp:373 msgid "Open &Location from clipboard" msgstr "Open &ligging vanaf knipbord" -#: modules/gui/qt/menus.cpp:374 +#: modules/gui/qt/menus.cpp:377 msgid "Open &Recent Media" msgstr "" -#: modules/gui/qt/menus.cpp:387 +#: modules/gui/qt/menus.cpp:390 msgid "Conve&rt / Save..." msgstr "Om&skep/Stoor…" -#: modules/gui/qt/menus.cpp:389 +#: modules/gui/qt/menus.cpp:392 msgid "&Stream..." msgstr "" -#: modules/gui/qt/menus.cpp:394 +#: modules/gui/qt/menus.cpp:397 msgid "Quit at the end of playlist" msgstr "" -#: modules/gui/qt/menus.cpp:401 +#: modules/gui/qt/menus.cpp:404 msgid "Close to systray" msgstr "" -#: modules/gui/qt/menus.cpp:405 modules/gui/qt/menus.cpp:1194 +#: modules/gui/qt/menus.cpp:408 modules/gui/qt/menus.cpp:1199 msgid "&Quit" msgstr "&Sluit af" -#: modules/gui/qt/menus.cpp:415 +#: modules/gui/qt/menus.cpp:418 msgid "&Effects and Filters" msgstr "&Effekte en filters" -#: modules/gui/qt/menus.cpp:418 +#: modules/gui/qt/menus.cpp:421 msgid "&Track Synchronization" msgstr "&Snitsinchronisering" -#: modules/gui/qt/menus.cpp:437 +#: modules/gui/qt/menus.cpp:440 msgid "Plu&gins and extensions" msgstr "In&proppe en uitbreidings" -#: modules/gui/qt/menus.cpp:442 +#: modules/gui/qt/menus.cpp:445 msgid "Customi&ze Interface..." msgstr "&Pasmaak die koppelvlak..." -#: modules/gui/qt/menus.cpp:445 +#: modules/gui/qt/menus.cpp:448 msgid "&Preferences" msgstr "&Voorkeure" -#: modules/gui/qt/menus.cpp:466 +#: modules/gui/qt/menus.cpp:469 msgid "&View" msgstr "&Bekyk" -#: modules/gui/qt/menus.cpp:487 +#: modules/gui/qt/menus.cpp:490 msgid "Play&list" msgstr "Afspeel&lys" -#: modules/gui/qt/menus.cpp:488 +#: modules/gui/qt/menus.cpp:491 msgid "Ctrl+L" msgstr "Ctrl+L" -#: modules/gui/qt/menus.cpp:491 +#: modules/gui/qt/menus.cpp:494 msgid "Docked Playlist" msgstr "" -#: modules/gui/qt/menus.cpp:501 +#: modules/gui/qt/menus.cpp:504 msgid "Always on &top" msgstr "" -#: modules/gui/qt/menus.cpp:509 +#: modules/gui/qt/menus.cpp:512 msgid "Mi&nimal Interface" msgstr "" -#: modules/gui/qt/menus.cpp:510 +#: modules/gui/qt/menus.cpp:513 msgid "Ctrl+H" msgstr "Ctrl+H" -#: modules/gui/qt/menus.cpp:519 +#: modules/gui/qt/menus.cpp:522 msgid "&Fullscreen Interface" msgstr "&Volskermkoppelvlak" -#: modules/gui/qt/menus.cpp:527 +#: modules/gui/qt/menus.cpp:530 msgid "&Advanced Controls" msgstr "&Gevorderde Kontroles" -#: modules/gui/qt/menus.cpp:534 +#: modules/gui/qt/menus.cpp:538 msgid "Status Bar" msgstr "" -#: modules/gui/qt/menus.cpp:539 +#: modules/gui/qt/menus.cpp:544 msgid "Visualizations selector" msgstr "Visualisaseringskieser" -#: modules/gui/qt/menus.cpp:597 +#: modules/gui/qt/menus.cpp:602 msgid "&Increase Volume" msgstr "" -#: modules/gui/qt/menus.cpp:600 +#: modules/gui/qt/menus.cpp:605 msgid "D&ecrease Volume" msgstr "" -#: modules/gui/qt/menus.cpp:603 +#: modules/gui/qt/menus.cpp:608 msgid "&Mute" msgstr "" -#: modules/gui/qt/menus.cpp:619 +#: modules/gui/qt/menus.cpp:624 msgid "Audio &Device" msgstr "Oudio&toestel" -#: modules/gui/qt/menus.cpp:623 +#: modules/gui/qt/menus.cpp:628 msgid "Audio &Track" msgstr "Oudio&snit" -#: modules/gui/qt/menus.cpp:625 +#: modules/gui/qt/menus.cpp:630 msgid "&Stereo Mode" msgstr "" -#: modules/gui/qt/menus.cpp:628 +#: modules/gui/qt/menus.cpp:633 msgid "&Visualizations" msgstr "&Visualiserings" -#: modules/gui/qt/menus.cpp:654 +#: modules/gui/qt/menus.cpp:659 msgid "Add &Subtitle File..." msgstr "" -#: modules/gui/qt/menus.cpp:656 +#: modules/gui/qt/menus.cpp:661 msgid "Sub &Track" msgstr "" -#: modules/gui/qt/menus.cpp:678 +#: modules/gui/qt/menus.cpp:683 msgid "Video &Track" msgstr "Video&snit" -#: modules/gui/qt/menus.cpp:682 +#: modules/gui/qt/menus.cpp:687 msgid "&Fullscreen" msgstr "&Volskerm" -#: modules/gui/qt/menus.cpp:683 +#: modules/gui/qt/menus.cpp:688 msgid "Always Fit &Window" msgstr "" -#: modules/gui/qt/menus.cpp:684 +#: modules/gui/qt/menus.cpp:689 msgid "Set as Wall&paper" msgstr "" -#: modules/gui/qt/menus.cpp:688 +#: modules/gui/qt/menus.cpp:693 msgid "&Zoom" msgstr "&Zoem" -#: modules/gui/qt/menus.cpp:689 +#: modules/gui/qt/menus.cpp:694 msgid "&Aspect Ratio" msgstr "&Aspekverhouding" -#: modules/gui/qt/menus.cpp:690 +#: modules/gui/qt/menus.cpp:695 msgid "&Crop" msgstr "&Sny by" -#: modules/gui/qt/menus.cpp:694 +#: modules/gui/qt/menus.cpp:699 msgid "&Deinterlace" msgstr "" -#: modules/gui/qt/menus.cpp:695 +#: modules/gui/qt/menus.cpp:700 msgid "&Deinterlace mode" msgstr "" -#: modules/gui/qt/menus.cpp:699 +#: modules/gui/qt/menus.cpp:704 msgid "Take &Snapshot" msgstr "" -#: modules/gui/qt/menus.cpp:718 +#: modules/gui/qt/menus.cpp:723 msgid "T&itle" msgstr "T&itel" -#: modules/gui/qt/menus.cpp:719 +#: modules/gui/qt/menus.cpp:724 msgid "&Chapter" msgstr "&Hoofstuk" -#: modules/gui/qt/menus.cpp:721 +#: modules/gui/qt/menus.cpp:726 msgid "&Program" msgstr "&Program" -#: modules/gui/qt/menus.cpp:725 +#: modules/gui/qt/menus.cpp:730 msgid "&Manage" msgstr "" -#: modules/gui/qt/menus.cpp:791 +#: modules/gui/qt/menus.cpp:796 msgid "Check for &Updates..." msgstr "Kontroleer vir &opdaterings…" -#: modules/gui/qt/menus.cpp:838 +#: modules/gui/qt/menus.cpp:843 msgid "&Stop" msgstr "&Stop" -#: modules/gui/qt/menus.cpp:846 +#: modules/gui/qt/menus.cpp:851 msgid "Pre&vious" msgstr "Vo&rige" -#: modules/gui/qt/menus.cpp:852 +#: modules/gui/qt/menus.cpp:857 msgid "Ne&xt" msgstr "Vo&lgende" -#: modules/gui/qt/menus.cpp:870 +#: modules/gui/qt/menus.cpp:875 msgid "Sp&eed" msgstr "" -#: modules/gui/qt/menus.cpp:876 +#: modules/gui/qt/menus.cpp:881 msgid "&Faster" msgstr "&Vinniger" -#: modules/gui/qt/menus.cpp:888 +#: modules/gui/qt/menus.cpp:893 msgid "N&ormal Speed" msgstr "N&ormale spoed" -#: modules/gui/qt/menus.cpp:898 +#: modules/gui/qt/menus.cpp:903 msgid "Slo&wer" msgstr "Sta&diger" -#: modules/gui/qt/menus.cpp:913 +#: modules/gui/qt/menus.cpp:918 msgid "&Jump Forward" msgstr "Spring &vorentoe" -#: modules/gui/qt/menus.cpp:920 +#: modules/gui/qt/menus.cpp:925 msgid "Jump Bac&kward" msgstr "Spring &agtertoe" -#: modules/gui/qt/menus.cpp:927 +#: modules/gui/qt/menus.cpp:932 msgid "Ctrl+T" msgstr "" -#: modules/gui/qt/menus.cpp:942 +#: modules/gui/qt/menus.cpp:947 msgid "Open &Network..." msgstr "Open &netwerk..." -#: modules/gui/qt/menus.cpp:1036 +#: modules/gui/qt/menus.cpp:1041 msgid "Leave Fullscreen" msgstr "Verlaat volskerm" -#: modules/gui/qt/menus.cpp:1070 +#: modules/gui/qt/menus.cpp:1075 msgid "&Playback" msgstr "&Afspeel" -#: modules/gui/qt/menus.cpp:1175 +#: modules/gui/qt/menus.cpp:1180 msgid "&Hide VLC media player in taskbar" msgstr "" -#: modules/gui/qt/menus.cpp:1181 +#: modules/gui/qt/menus.cpp:1186 msgid "Sho&w VLC media player" msgstr "" -#: modules/gui/qt/menus.cpp:1192 +#: modules/gui/qt/menus.cpp:1197 msgid "&Open Media" msgstr "" -#: modules/gui/qt/menus.cpp:1622 +#: modules/gui/qt/menus.cpp:1627 msgid "&Clear" msgstr "" -#: modules/gui/qt/menus.cpp:1630 +#: modules/gui/qt/menus.cpp:1635 msgid "&Renderer" msgstr "" -#: modules/gui/qt/menus.cpp:1634 +#: modules/gui/qt/menus.cpp:1639 msgid "" msgstr "" -#: modules/gui/qt/menus.cpp:1647 +#: modules/gui/qt/menus.cpp:1652 msgid "Scanning..." msgstr "" @@ -20576,41 +20580,49 @@ msgstr "" #: modules/gui/qt/qt.cpp:124 +msgid "Enable Dark Mode" +msgstr "" + +#: modules/gui/qt/qt.cpp:125 +msgid "Applies a dark theme to the style." +msgstr "" + +#: modules/gui/qt/qt.cpp:127 msgid "Activate the updates availability notification" msgstr "Aktiveer kennisgewing vir beskikbaarheid van opdaterings" -#: modules/gui/qt/qt.cpp:125 +#: modules/gui/qt/qt.cpp:128 msgid "" "Activate the automatic notification of new versions of the software. It runs " "once every two weeks." msgstr "" -#: modules/gui/qt/qt.cpp:128 +#: modules/gui/qt/qt.cpp:131 msgid "Number of days between two update checks" msgstr "Aantal dae tussen kontroles vir opdaterings" -#: modules/gui/qt/qt.cpp:130 +#: modules/gui/qt/qt.cpp:133 msgid "Ask for network policy at start" msgstr "Vra aan begin vir netwerkbeleid" -#: modules/gui/qt/qt.cpp:132 +#: modules/gui/qt/qt.cpp:135 msgid "Save the recently played items in the menu" msgstr "Stoor onlangs gespeelde items in die kieslys" -#: modules/gui/qt/qt.cpp:134 +#: modules/gui/qt/qt.cpp:137 msgid "List of words separated by | to filter" msgstr "Lys van woorde om te filter, geskei deur |" -#: modules/gui/qt/qt.cpp:135 +#: modules/gui/qt/qt.cpp:138 msgid "" "Regular expression used to filter the recent items played in the player." msgstr "" -#: modules/gui/qt/qt.cpp:138 +#: modules/gui/qt/qt.cpp:141 msgid "Define the colors of the volume slider" msgstr "" -#: modules/gui/qt/qt.cpp:139 +#: modules/gui/qt/qt.cpp:142 msgid "" "Define the colors of the volume slider\n" "By specifying the 12 numbers separated by a ';'\n" @@ -20618,11 +20630,11 @@ "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255'" msgstr "" -#: modules/gui/qt/qt.cpp:144 +#: modules/gui/qt/qt.cpp:147 msgid "Selection of the starting mode and look" msgstr "" -#: modules/gui/qt/qt.cpp:145 +#: modules/gui/qt/qt.cpp:148 msgid "" "Start VLC with:\n" " - normal mode\n" @@ -20630,57 +20642,57 @@ " - minimal mode with limited controls" msgstr "" -#: modules/gui/qt/qt.cpp:151 +#: modules/gui/qt/qt.cpp:154 msgid "Show a controller in fullscreen mode" msgstr "" -#: modules/gui/qt/qt.cpp:152 +#: modules/gui/qt/qt.cpp:155 msgid "Embed the file browser in open dialog" msgstr "" -#: modules/gui/qt/qt.cpp:154 +#: modules/gui/qt/qt.cpp:157 msgid "Define which screen fullscreen goes" msgstr "" -#: modules/gui/qt/qt.cpp:155 +#: modules/gui/qt/qt.cpp:158 msgid "Screennumber of fullscreen, instead of same screen where interface is." msgstr "" -#: modules/gui/qt/qt.cpp:158 +#: modules/gui/qt/qt.cpp:161 msgid "Load extensions on startup" msgstr "Laai uitbreidings by programbegin" -#: modules/gui/qt/qt.cpp:159 +#: modules/gui/qt/qt.cpp:162 msgid "Automatically load the extensions module on startup." msgstr "" -#: modules/gui/qt/qt.cpp:162 +#: modules/gui/qt/qt.cpp:165 msgid "Start in minimal view (without menus)" msgstr "Begin met minimale koppelvlak (sonder kieslyste)" -#: modules/gui/qt/qt.cpp:164 +#: modules/gui/qt/qt.cpp:167 msgid "Display background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:165 +#: modules/gui/qt/qt.cpp:168 msgid "" "Display background cone or current album art when not playing. Can be " "disabled to prevent burning screen." msgstr "" -#: modules/gui/qt/qt.cpp:168 +#: modules/gui/qt/qt.cpp:171 msgid "Expanding background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:169 +#: modules/gui/qt/qt.cpp:172 msgid "Background art fits window's size." msgstr "" -#: modules/gui/qt/qt.cpp:171 +#: modules/gui/qt/qt.cpp:174 msgid "Ignore keyboard volume buttons." msgstr "" -#: modules/gui/qt/qt.cpp:173 +#: modules/gui/qt/qt.cpp:176 msgid "" "With this option checked, the volume up, volume down and mute buttons on " "your keyboard will always change your system volume. With this option " @@ -20688,41 +20700,41 @@ "and change the system volume when VLC is not selected." msgstr "" -#: modules/gui/qt/qt.cpp:188 +#: modules/gui/qt/qt.cpp:191 msgid "When to raise the interface" msgstr "" -#: modules/gui/qt/qt.cpp:189 +#: modules/gui/qt/qt.cpp:192 msgid "" "This option allows the interface to be raised automatically when a video/" "audio playback starts, or never." msgstr "" -#: modules/gui/qt/qt.cpp:192 +#: modules/gui/qt/qt.cpp:195 msgid "Fullscreen controller mouse sensitivity" msgstr "" -#: modules/gui/qt/qt.cpp:200 +#: modules/gui/qt/qt.cpp:203 msgid "When minimized" msgstr "" -#: modules/gui/qt/qt.cpp:218 +#: modules/gui/qt/qt.cpp:221 msgid "Qt interface" msgstr "Qt-koppelvlak" -#: modules/gui/qt/util/customwidgets.cpp:82 +#: modules/gui/qt/util/customwidgets.cpp:80 msgid "errors" msgstr "foute" -#: modules/gui/qt/util/customwidgets.cpp:83 +#: modules/gui/qt/util/customwidgets.cpp:81 msgid "warnings" msgstr "waarskuwings" -#: modules/gui/qt/util/customwidgets.cpp:84 +#: modules/gui/qt/util/customwidgets.cpp:82 msgid "debug" msgstr "ontfout" -#: modules/gui/qt/util/searchlineedit.cpp:49 +#: modules/gui/qt/util/searchlineedit.cpp:50 msgctxt "Tooltip|Clear" msgid "Clear" msgstr "" @@ -20823,72 +20835,76 @@ msgid "Open skin..." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:86 modules/hw/d3d9/d3d9_filters.c:68 +#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:68 #: modules/video_filter/adjust.c:61 msgid "Brightness threshold" msgstr "Helderheiddrempel" -#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:69 +#: modules/hw/d3d11/d3d11_filters.c:88 modules/hw/d3d9/d3d9_filters.c:69 #: modules/video_filter/adjust.c:62 msgid "" "When this mode is enabled, pixels will be shown as black or white. The " "threshold value will be the brightness defined below." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:90 modules/hw/d3d9/d3d9_filters.c:72 +#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:72 #: modules/video_filter/adjust.c:65 msgid "Image contrast (0-2)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:73 +#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:73 #: modules/video_filter/adjust.c:66 msgid "Set the image contrast, between 0 and 2. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:74 +#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:74 msgid "Image hue (0-360)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:75 +#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:75 msgid "Set the image hue, between 0 and 360. Defaults to 0." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:76 +#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:76 #: modules/video_filter/adjust.c:69 msgid "Image saturation (0-3)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:77 +#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:77 #: modules/video_filter/adjust.c:70 msgid "Set the image saturation, between 0 and 3. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:78 +#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:78 #: modules/video_filter/adjust.c:71 msgid "Image brightness (0-2)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:79 +#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:79 #: modules/video_filter/adjust.c:72 msgid "Set the image brightness, between 0 and 2. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:80 +#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:80 #: modules/video_filter/adjust.c:73 msgid "Image gamma (0-10)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:81 +#: modules/hw/d3d11/d3d11_filters.c:100 modules/hw/d3d9/d3d9_filters.c:81 #: modules/video_filter/adjust.c:74 msgid "Set the image gamma, between 0.01 and 10. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:670 +#: modules/hw/d3d11/d3d11_filters.c:681 msgid "AMD VQ Enhancer" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:671 -msgid "amf_vqenhancer" +#: modules/hw/d3d11/d3d11_filters.c:687 +msgid "AMD Frame Rate Doubler" +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:690 +msgid "Show indicator" msgstr "" #: modules/hw/d3d9/d3d9_filters.c:454 @@ -21269,11 +21285,11 @@ msgid "System logger (syslog)" msgstr "" -#: modules/lua/extension.c:1194 +#: modules/lua/extension.c:1200 msgid "Extension not responding!" msgstr "" -#: modules/lua/extension.c:1195 +#: modules/lua/extension.c:1201 #, c-format msgid "" "Extension '%s' does not respond.\n" @@ -21304,8 +21320,8 @@ #: modules/lua/vlc.c:53 msgid "" -"Lua interface configuration string. Format is: '[\"\"] = {

For all the saving, converting, transcoding, encoding, muxing and " "streaming tasks, you should find useful information in the Streaming Documentation.

If you are unsure about terminology, please consult the knowledge base.

To understand the main keyboard shortcuts, read the shortcuts page.

Help

Before " -"asking any question, please refer yourself to the FAQ.

You might then get (and give) " -"help on the Forums, the mailing-lists or our IRC " -"channel (#videolan on irc.freenode.net).

Contribute to the " -"project

You can help the VideoLAN project giving some of your time to " -"help the community, to design skins, to translate the documentation, to test " -"and to code. You can also give funds and material to help us. And of course, " -"you can promote VLC media player.

" +"a>.

If you are unsure about terminology, please consult the knowledge base.

To " +"understand the main keyboard shortcuts, read the shortcuts page.

Help

Before asking " +"any question, please refer yourself to the FAQ.

You might then get (and give) help on the " +"Forums, the mailing-lists or our IRC channel " +"(#videolan on irc.freenode.net).

Contribute to the project

You can help the VideoLAN project giving some of your time to help the " +"community, to design skins, to translate the documentation, to test and to " +"code. You can also give funds and material to help us. And of course, you " +"can promote VLC media player.

" msgstr "" #: src/audio_output/filters.c:267 @@ -672,8 +672,8 @@ #: modules/access/dtv/access.c:113 modules/access/dtv/access.c:122 #: modules/access/dtv/access.c:130 modules/access/dtv/access.c:139 #: modules/access/dtv/access.c:147 modules/access/dtv/access.c:169 -#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:991 -#: modules/gui/qt/components/simple_preferences.cpp:394 +#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:971 +#: modules/gui/qt/components/simple_preferences.cpp:395 msgid "Automatic" msgstr "ራሱ በራሱ" @@ -831,7 +831,7 @@ msgstr "" #: src/input/decoder.c:1922 src/input/decoder.c:2205 -#: modules/codec/avcodec/encoder.c:378 modules/codec/avcodec/encoder.c:918 +#: modules/codec/avcodec/encoder.c:394 modules/codec/avcodec/encoder.c:939 #: modules/stream_out/es.c:349 modules/stream_out/es.c:362 msgid "Streaming / Transcoding failed" msgstr "" @@ -846,7 +846,7 @@ msgstr "" #: src/input/es_out.c:956 src/input/es_out.c:961 src/libvlc-module.c:239 -#: modules/gui/qt/components/open_panels.cpp:547 +#: modules/gui/qt/components/open_panels.cpp:527 msgid "Track" msgstr "ሙዚቃ " @@ -871,7 +871,7 @@ msgstr "" #: src/input/es_out.c:1463 modules/keystore/keychain.m:41 -#: modules/lua/extension.c:1193 +#: modules/lua/extension.c:1199 msgid "Yes" msgstr "" @@ -900,7 +900,7 @@ #: src/input/es_out.c:3151 src/input/meta.c:66 modules/access/imem.c:71 #: modules/gui/macosx/VLCPlaylist.m:98 #: modules/gui/macosx/VLCSimplePrefsController.m:325 -#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:527 +#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:533 msgid "Language" msgstr "ቋንቋ " @@ -914,7 +914,7 @@ #: src/input/es_out.c:3160 src/input/es_out.c:3204 src/input/es_out.c:3394 #: modules/gui/macosx/VLCAddonsWindowController.m:133 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:185 -#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1495 +#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1494 msgid "Type" msgstr "አይነት " @@ -1180,8 +1180,8 @@ #: modules/gui/macosx/VLCOpenWindowController.m:178 #: modules/gui/macosx/VLCOpenWindowController.m:180 #: modules/gui/macosx/VLCPlaylist.m:91 modules/gui/macosx/VLCPlaylistInfo.m:59 -#: modules/gui/qt/components/open_panels.cpp:507 -#: modules/gui/qt/components/open_panels.cpp:521 +#: modules/gui/qt/components/open_panels.cpp:487 +#: modules/gui/qt/components/open_panels.cpp:501 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56 #: modules/gui/qt/ui/open_disk.h:306 msgid "Title" @@ -1426,8 +1426,8 @@ msgid "" "You can select \"additional interfaces\" for VLC. They will be launched in " "the background in addition to the default interface. Use a colon separated " -"list of interface modules. (common values are \"rc\" (remote control), " -"\"http\", \"gestures\" ...)" +"list of interface modules. (common values are \"rc\" (remote control), \"http" +"\", \"gestures\" ...)" msgstr "" #: src/libvlc-module.c:83 @@ -1509,7 +1509,7 @@ msgstr "" #: src/libvlc-module.c:132 modules/gui/macosx/VLCSimplePrefsController.m:281 -#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:407 +#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:408 msgid "Enable audio" msgstr "ድምፅ ማስቻያ" @@ -1621,10 +1621,9 @@ #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:957 #: modules/audio_output/kai.c:106 modules/codec/subsdec.c:167 #: modules/codec/x264.c:434 modules/demux/adaptive/adaptive.cpp:122 -#: modules/demux/mpeg/ts.c:131 modules/gui/macosx/VLCSimplePrefsController.m:54 -#: modules/gui/qt/components/simple_preferences.cpp:68 +#: modules/demux/mpeg/ts.c:132 modules/gui/macosx/VLCSimplePrefsController.m:54 +#: modules/gui/qt/components/simple_preferences.cpp:69 #: modules/gui/qt/components/sout/profile_selector.cpp:590 -#: modules/services_discovery/upnp.cpp:82 #: modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62 #: modules/video_output/win32/direct3d11.c:88 @@ -1650,8 +1649,8 @@ msgstr "" #: src/libvlc-module.c:195 src/misc/actions.c:112 -#: modules/gui/qt/components/preferences_widgets.cpp:1417 -#: modules/gui/qt/util/customwidgets.cpp:330 +#: modules/gui/qt/components/preferences_widgets.cpp:1421 +#: modules/gui/qt/util/customwidgets.cpp:328 msgid "Unset" msgstr "ያልተዘጋጀ " @@ -2336,7 +2335,7 @@ #: src/libvlc-module.c:540 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:215 #: modules/gui/macosx/VLCSidebarDataSource.m:209 -#: modules/gui/qt/components/extended_panels.cpp:949 +#: modules/gui/qt/components/extended_panels.cpp:962 #: modules/gui/qt/ui/equalizer.h:130 modules/gui/qt/ui/vlm.h:286 msgid "Enable" msgstr "ማስቻያ " @@ -2618,10 +2617,10 @@ #: src/libvlc-module.c:690 msgid "" -"This option allows you to set the title according to what's being " -"played
$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: " -"Genre
$n: Track num
$p: Now playing
$A: Date
$D: Duration
$Z: " -"\"Now playing\" (Fall back on Title - Artist)" +"This option allows you to set the title according to what's being played
" +"$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: Genre
$n: " +"Track num
$p: Now playing
$A: Date
$D: Duration
$Z: \"Now playing" +"\" (Fall back on Title - Artist)" msgstr "" #: src/libvlc-module.c:695 @@ -3296,7 +3295,7 @@ msgid "Tell VLC that it is being launched due to a file association in the OS" msgstr "" -#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:547 +#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:554 msgid "Use only one instance when started from file manager" msgstr "" @@ -3314,7 +3313,7 @@ "machine." msgstr "" -#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:550 +#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:557 msgid "Enqueue items into playlist in one instance mode" msgstr "" @@ -3358,7 +3357,7 @@ #: src/libvlc-module.c:1126 modules/gui/macosx/VLCSimplePrefsController.m:342 #: modules/gui/qt/dialogs/firstrun.cpp:95 -#: modules/gui/qt/ui/sprefs_interface.h:562 +#: modules/gui/qt/ui/sprefs_interface.h:569 msgid "Allow metadata network access" msgstr "" @@ -3496,7 +3495,7 @@ "VLC." msgstr "" -#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:548 +#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:555 msgid "Display playlist tree" msgstr "" @@ -3618,11 +3617,11 @@ msgid "Select the hotkey to set the playback rate back to normal." msgstr "" -#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:884 +#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:889 msgid "Faster (fine)" msgstr "በጣም ፈጣን (በደንብ)" -#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:892 +#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:897 msgid "Slower (fine)" msgstr "ዝግ ያለ (ደህና) " @@ -3633,7 +3632,7 @@ #: modules/gui/macosx/VLCMainMenu.m:396 modules/gui/macosx/VLCMainMenu.m:499 #: modules/gui/macosx/VLCMainMenu.m:507 #: modules/gui/qt/components/controller.hpp:112 -#: modules/gui/qt/dialogs/sout.cpp:93 modules/notify/notify.c:335 +#: modules/gui/qt/dialogs/sout.cpp:91 modules/notify/notify.c:335 #: modules/gui/qt/ui/streampanel.h:179 msgid "Next" msgstr "ቀጣይ " @@ -3660,7 +3659,7 @@ #: modules/gui/macosx/VLCMainMenu.m:498 modules/gui/macosx/VLCMainMenu.m:505 #: modules/gui/macosx/VLCMainWindowControlsBar.m:65 #: modules/gui/qt/components/controller.hpp:107 -#: modules/gui/qt/dialogs/vlm.cpp:544 modules/gui/qt/ui/streampanel.h:178 +#: modules/gui/qt/dialogs/vlm.cpp:538 modules/gui/qt/ui/streampanel.h:178 msgid "Stop" msgstr "አቁም " @@ -3789,8 +3788,8 @@ #: src/libvlc-module.c:1293 modules/control/hotkeys.c:361 #: modules/gui/macosx/VLCStatusBarIcon.m:116 #: modules/gui/qt/components/controller.hpp:111 -#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:955 -#: modules/gui/qt/menus.cpp:1141 modules/gui/skins2/commands/cmd_quit.cpp:45 +#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:960 +#: modules/gui/qt/menus.cpp:1146 modules/gui/skins2/commands/cmd_quit.cpp:45 msgid "Quit" msgstr "ጨርስና አቁም" @@ -4098,7 +4097,7 @@ msgstr "" #: src/libvlc-module.c:1373 -#: modules/gui/qt/components/playlist/standardpanel.cpp:246 +#: modules/gui/qt/components/playlist/standardpanel.cpp:247 msgid "Clear the playlist" msgstr "" @@ -4276,7 +4275,7 @@ #: src/libvlc-module.c:1423 modules/gui/macosx/VLCMainMenu.m:387 #: modules/gui/qt/components/controller.hpp:110 -#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:858 +#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:863 #: modules/stream_out/record.c:60 msgid "Record" msgstr "መዝግብ " @@ -4436,7 +4435,7 @@ msgid "Special modules" msgstr "" -#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:90 +#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:89 msgid "Plugins" msgstr "ተሰኪዎች " @@ -4703,7 +4702,7 @@ msgid "Media View" msgstr "" -#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:568 +#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:577 msgid "Menu" msgstr "ምናሌ " @@ -4736,8 +4735,8 @@ #: modules/gui/macosx/VLCFSPanelController.m:251 #: modules/gui/macosx/VLCMainMenu.m:1346 modules/gui/macosx/VLCMainMenu.m:1347 #: modules/gui/macosx/VLCMainMenu.m:1348 -#: modules/gui/qt/components/playlist/standardpanel.cpp:196 -#: modules/gui/qt/menus.cpp:832 +#: modules/gui/qt/components/playlist/standardpanel.cpp:197 +#: modules/gui/qt/menus.cpp:837 msgid "Pause" msgstr "ፋታ" @@ -4828,7 +4827,7 @@ msgstr "" #: src/misc/update.c:596 src/misc/update.c:726 modules/access/dvb/scan.c:826 -#: modules/demux/avi/avi.c:2827 +#: modules/demux/avi/avi.c:2878 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:513 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:571 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:854 @@ -4853,10 +4852,10 @@ #: modules/gui/macosx/VLCVideoEffectsWindowController.m:791 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:860 #: modules/gui/macosx/prefs.m:189 -#: modules/gui/qt/components/open_panels.cpp:1381 -#: modules/gui/qt/components/preferences_widgets.cpp:1416 +#: modules/gui/qt/components/open_panels.cpp:1361 +#: modules/gui/qt/components/preferences_widgets.cpp:1420 #: modules/gui/qt/components/sout/profile_selector.cpp:452 -#: modules/gui/qt/dialogs/sout.cpp:92 +#: modules/gui/qt/dialogs/sout.cpp:90 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "Cancel" msgstr "ሰርዝ " @@ -5782,79 +5781,79 @@ msgid "Blu-ray Disc support (libbluray)" msgstr "" -#: modules/access/bluray.c:849 +#: modules/access/bluray.c:847 msgid "Path doesn't appear to be a Blu-ray" msgstr "" -#: modules/access/bluray.c:864 +#: modules/access/bluray.c:862 msgid "" "This Blu-ray Disc needs a library for AACS decoding, and your system does " "not have it." msgstr "" -#: modules/access/bluray.c:870 +#: modules/access/bluray.c:868 msgid "Blu-ray Disc is corrupted." msgstr "" -#: modules/access/bluray.c:872 +#: modules/access/bluray.c:870 msgid "Missing AACS configuration file!" msgstr "" -#: modules/access/bluray.c:874 +#: modules/access/bluray.c:872 msgid "No valid processing key found in AACS config file." msgstr "" -#: modules/access/bluray.c:876 +#: modules/access/bluray.c:874 msgid "No valid host certificate found in AACS config file." msgstr "" -#: modules/access/bluray.c:878 +#: modules/access/bluray.c:876 msgid "AACS Host certificate revoked." msgstr "" -#: modules/access/bluray.c:880 +#: modules/access/bluray.c:878 msgid "AACS MMC failed." msgstr "" -#: modules/access/bluray.c:890 +#: modules/access/bluray.c:888 msgid "" "This Blu-ray Disc needs a library for BD+ decoding, and your system does not " "have it." msgstr "" -#: modules/access/bluray.c:893 +#: modules/access/bluray.c:891 msgid "Your system BD+ decoding library does not work. Missing configuration?" msgstr "" -#: modules/access/bluray.c:926 +#: modules/access/bluray.c:924 msgid "Java required" msgstr "" -#: modules/access/bluray.c:927 +#: modules/access/bluray.c:925 #, c-format msgid "" "This Blu-ray disc requires Java for menus support.%s\n" "The disc will be played without menus." msgstr "" -#: modules/access/bluray.c:928 +#: modules/access/bluray.c:926 msgid "Java was not found on your system." msgstr "" -#: modules/access/bluray.c:951 +#: modules/access/bluray.c:949 msgid "Failed to start bluray playback. Please try without menu support." msgstr "" -#: modules/access/bluray.c:992 modules/access/bluray.c:2825 -#: modules/access/bluray.c:2830 +#: modules/access/bluray.c:990 modules/access/bluray.c:2823 +#: modules/access/bluray.c:2828 msgid "Blu-ray error" msgstr "" -#: modules/access/bluray.c:2115 +#: modules/access/bluray.c:2113 msgid "Top Menu" msgstr "" -#: modules/access/bluray.c:2118 +#: modules/access/bluray.c:2116 msgid "First Play" msgstr "" @@ -6053,7 +6052,7 @@ msgid "10 bits" msgstr "" -#: modules/access/decklink.cpp:358 modules/demux/ty.c:769 +#: modules/access/decklink.cpp:358 modules/demux/ty.c:783 msgid "Closed captions 1" msgstr "" @@ -6089,7 +6088,7 @@ msgstr "" #: modules/access/dshow/dshow.cpp:130 -#: modules/gui/qt/components/open_panels.cpp:838 +#: modules/gui/qt/components/open_panels.cpp:818 msgid "Video device name" msgstr "የቪድዮ መሳሪያ ስም " @@ -6100,8 +6099,8 @@ msgstr "" #: modules/access/dshow/dshow.cpp:135 -#: modules/gui/qt/components/open_panels.cpp:846 -#: modules/gui/qt/components/open_panels.cpp:1067 +#: modules/gui/qt/components/open_panels.cpp:826 +#: modules/gui/qt/components/open_panels.cpp:1047 msgid "Audio device name" msgstr "የተሰሚ መሳሪያ ስም " @@ -6112,7 +6111,7 @@ msgstr "" #: modules/access/dshow/dshow.cpp:140 -#: modules/gui/qt/components/open_panels.cpp:813 +#: modules/gui/qt/components/open_panels.cpp:793 msgid "Video size" msgstr "የቪድዮ መጠን " @@ -6185,8 +6184,8 @@ msgstr "" #: modules/access/dshow/dshow.cpp:168 -#: modules/gui/qt/components/open_panels.cpp:866 -#: modules/gui/qt/components/open_panels.cpp:1087 +#: modules/gui/qt/components/open_panels.cpp:846 +#: modules/gui/qt/components/open_panels.cpp:1067 msgid "Video standard" msgstr "" @@ -6380,7 +6379,7 @@ "frequency. This is required to tune the receiver." msgstr "" -#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:987 +#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:967 msgid "Modulation / Constellation" msgstr "" @@ -6884,8 +6883,8 @@ #: modules/audio_output/file.c:113 #: modules/gui/macosx/VLCOpenWindowController.m:140 #: modules/gui/macosx/VLCOutput.m:64 modules/gui/macosx/VLCOutput.m:175 -#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1429 -#: modules/gui/qt/dialogs/sout.cpp:69 modules/gui/qt/dialogs/sout.cpp:121 +#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1428 +#: modules/gui/qt/dialogs/sout.cpp:67 modules/gui/qt/dialogs/sout.cpp:119 #: share/lua/http/dialogs/create_stream.html:204 #: share/lua/http/dialogs/stream_config_window.html:36 #: share/lua/http/dialogs/stream_window.html:95 @@ -6911,7 +6910,7 @@ #: modules/access_output/http.c:52 #: modules/gui/macosx/VLCCoreDialogProvider.m:191 #: modules/gui/macosx/VLCSimplePrefsController.m:286 -#: modules/gui/qt/dialogs/external.cpp:203 modules/misc/audioscrobbler.c:114 +#: modules/gui/qt/dialogs/external.cpp:205 modules/misc/audioscrobbler.c:114 #: modules/stream_out/rtp.c:173 msgid "Username" msgstr "" @@ -6930,7 +6929,7 @@ #: modules/gui/macosx/VLCCoreDialogProvider.m:192 #: modules/gui/macosx/VLCSimplePrefsController.m:285 #: modules/gui/macosx/VLCSimplePrefsController.m:348 -#: modules/gui/qt/dialogs/external.cpp:208 modules/lua/vlc.c:54 +#: modules/gui/qt/dialogs/external.cpp:210 modules/lua/vlc.c:54 #: modules/lua/vlc.c:70 modules/misc/audioscrobbler.c:116 #: modules/stream_out/rtp.c:176 msgid "Password" @@ -7122,7 +7121,7 @@ #: modules/demux/rawvid.c:47 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:239 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167 -#: modules/gui/qt/components/extended_panels.cpp:1318 modules/spu/mosaic.c:94 +#: modules/gui/qt/components/extended_panels.cpp:1348 modules/spu/mosaic.c:94 #: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108 #: modules/gui/qt/ui/profiles.h:741 msgid "Width" @@ -7191,7 +7190,7 @@ #: modules/access/imem.c:113 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:236 -#: modules/gui/qt/components/extended_panels.cpp:1317 +#: modules/gui/qt/components/extended_panels.cpp:1347 msgid "Size" msgstr "" @@ -7219,7 +7218,7 @@ msgid "Read the audio stream at VLC pace rather than Jack pace." msgstr "" -#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:918 +#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:898 msgid "Auto connection" msgstr "ራስ አገናኝ " @@ -7384,19 +7383,19 @@ msgid "Port to use for tunneling the RTSP/RTP over HTTP." msgstr "" -#: modules/access/live555.cpp:673 +#: modules/access/live555.cpp:677 msgid "RTSP authentication" msgstr "" -#: modules/access/live555.cpp:674 +#: modules/access/live555.cpp:678 msgid "Please enter a valid login name and a password." msgstr "" -#: modules/access/live555.cpp:699 +#: modules/access/live555.cpp:703 msgid "RTSP connection failed" msgstr "" -#: modules/access/live555.cpp:700 +#: modules/access/live555.cpp:704 msgid "Access to the stream is denied by the server configuration." msgstr "" @@ -7735,7 +7734,7 @@ msgstr "" #: modules/access/screen/screen.c:45 -#: modules/gui/qt/components/open_panels.cpp:1124 +#: modules/gui/qt/components/open_panels.cpp:1104 msgid "Desired frame rate for the capture." msgstr "ለቀረጻው የሚፈለግ የንዑስ ክፈፍ ፍጥነት። " @@ -7990,9 +7989,8 @@ msgstr "" #: modules/access/srt.c:446 modules/access_output/srt.c:480 -#, fuzzy msgid " SRT Stream ID" -msgstr "አርቲፒ/ኡዲፒ ዥረት ክፈት " +msgstr "" #: modules/access/srt_common.c:26 msgid "16 bytes" @@ -8100,7 +8098,7 @@ msgid "Radio tuner device node." msgstr "" -#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1094 +#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1074 msgid "Frequency" msgstr "ድግግሞሽ " @@ -8279,7 +8277,7 @@ msgstr "" #: modules/access/v4l2/v4l2.c:137 -#: modules/gui/qt/components/extended_panels.cpp:1107 +#: modules/gui/qt/components/extended_panels.cpp:1132 msgid "60 Hz" msgstr "" @@ -8438,7 +8436,7 @@ #: modules/control/hotkeys.c:395 #: modules/gui/macosx/VLCAddonsWindowController.m:100 #: modules/gui/qt/dialogs/convert.cpp:164 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/dialogs/plugins.cpp:382 #: modules/gui/qt/dialogs/preferences.cpp:79 msgid "All" msgstr "ሁሉም " @@ -8804,9 +8802,9 @@ #: modules/access_output/livehttp.c:98 msgid "" -"File is read when segment starts and is assumed to be in format: key-" -"uri\\nkey-file. File is read on the segment opening and values are used on " -"that segment." +"File is read when segment starts and is assumed to be in format: key-uri" +"\\nkey-file. File is read on the segment opening and values are used on that " +"segment." msgstr "" #: modules/access_output/livehttp.c:102 @@ -8867,7 +8865,7 @@ msgstr "" #: modules/access_output/rist.c:842 modules/access_output/shout.c:64 -#: modules/gui/qt/components/sout/sout_widgets.cpp:385 +#: modules/gui/qt/components/sout/sout_widgets.cpp:386 #: share/lua/http/dialogs/create_stream.html:139 msgid "Stream name" msgstr "" @@ -9241,7 +9239,7 @@ #: modules/audio_filter/chorus_flanger.c:80 #: modules/audio_filter/stereo_widen.c:57 -#: modules/gui/qt/components/extended_panels.cpp:1337 +#: modules/gui/qt/components/extended_panels.cpp:1367 msgid "Delay time" msgstr "" @@ -9269,7 +9267,7 @@ #: modules/audio_filter/chorus_flanger.c:89 #: modules/audio_filter/stereo_widen.c:60 -#: modules/gui/qt/components/extended_panels.cpp:1338 +#: modules/gui/qt/components/extended_panels.cpp:1368 msgid "Feedback gain" msgstr "" @@ -9295,7 +9293,7 @@ #: modules/audio_filter/compressor.c:155 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:225 -#: modules/gui/qt/components/extended_panels.cpp:1295 +#: modules/gui/qt/components/extended_panels.cpp:1325 msgid "RMS/peak" msgstr "" @@ -9329,7 +9327,7 @@ #: modules/audio_filter/compressor.c:167 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:229 -#: modules/gui/qt/components/extended_panels.cpp:1299 +#: modules/gui/qt/components/extended_panels.cpp:1329 msgid "Ratio" msgstr "" @@ -9746,19 +9744,19 @@ #: modules/audio_filter/spatializer/spatializer.cpp:61 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:241 -#: modules/gui/qt/components/extended_panels.cpp:1319 +#: modules/gui/qt/components/extended_panels.cpp:1349 msgid "Wet" msgstr "" #: modules/audio_filter/spatializer/spatializer.cpp:64 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:242 -#: modules/gui/qt/components/extended_panels.cpp:1320 +#: modules/gui/qt/components/extended_panels.cpp:1350 msgid "Dry" msgstr "" #: modules/audio_filter/spatializer/spatializer.cpp:67 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:243 -#: modules/gui/qt/components/extended_panels.cpp:1321 +#: modules/gui/qt/components/extended_panels.cpp:1351 msgid "Damp" msgstr "" @@ -9792,7 +9790,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:64 -#: modules/gui/qt/components/extended_panels.cpp:1339 +#: modules/gui/qt/components/extended_panels.cpp:1369 msgid "Crossfeed" msgstr "" @@ -9804,7 +9802,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:68 -#: modules/gui/qt/components/extended_panels.cpp:1340 +#: modules/gui/qt/components/extended_panels.cpp:1370 msgid "Dry mix" msgstr "" @@ -10042,7 +10040,7 @@ msgid "K Audio Interface audio output" msgstr "" -#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:416 +#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:417 msgid "HDMI/SPDIF audio passthrough" msgstr "" @@ -10132,11 +10130,11 @@ "output mode (which is not well supported by some soundcards)." msgstr "" -#: modules/codec/a52.c:70 +#: modules/codec/a52.c:72 msgid "A/52 dynamic range compression" msgstr "" -#: modules/codec/a52.c:72 modules/codec/dca.c:63 +#: modules/codec/a52.c:74 modules/codec/dca.c:65 msgid "" "Dynamic range compression makes the loud sounds softer, and the soft sounds " "louder, so you can more easily listen to the stream in a noisy environment " @@ -10144,7 +10142,7 @@ "playback will be more adapted to a movie theater or a listening room." msgstr "" -#: modules/codec/a52.c:80 +#: modules/codec/a52.c:82 msgid "ATSC A/52 (AC-3) audio decoder" msgstr "" @@ -10616,15 +10614,15 @@ "enabled libavcodec" msgstr "" -#: modules/codec/avcodec/d3d11va.c:63 +#: modules/codec/avcodec/d3d11va.c:67 msgid "Direct3D11 Video Acceleration" msgstr "" -#: modules/codec/avcodec/dxva2.c:51 +#: modules/codec/avcodec/dxva2.c:55 msgid "DirectX Video Acceleration (DXVA) 2.0" msgstr "" -#: modules/codec/avcodec/encoder.c:383 +#: modules/codec/avcodec/encoder.c:399 #, c-format msgid "" "It seems your Libav/FFmpeg (libavcodec) installation lacks the following " @@ -10636,32 +10634,32 @@ "Do not contact the VideoLAN project about this issue.\n" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "unknown" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "video" msgstr "" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "audio" msgstr "" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "subpicture" msgstr "" -#: modules/codec/avcodec/encoder.c:919 +#: modules/codec/avcodec/encoder.c:940 #, c-format msgid "VLC could not open the %4.4s %s encoder." msgstr "" -#: modules/codec/avcodec/vaapi.c:354 +#: modules/codec/avcodec/vaapi.c:388 msgid "VA-API video decoder via DRM" msgstr "" -#: modules/codec/avcodec/vaapi.c:359 +#: modules/codec/avcodec/vaapi.c:393 msgid "VA-API video decoder" msgstr "" @@ -10758,15 +10756,23 @@ msgid "Max number of threads used for tile decoding, default 0=auto" msgstr "" -#: modules/codec/dav1d.c:60 +#: modules/codec/dav1d.c:56 +msgid "All Layers" +msgstr "" + +#: modules/codec/dav1d.c:57 +msgid "Whether or not to display all spatial layers, default false" +msgstr "" + +#: modules/codec/dav1d.c:62 msgid "Dav1d video decoder" msgstr "" -#: modules/codec/dca.c:61 +#: modules/codec/dca.c:63 msgid "DTS dynamic range compression" msgstr "" -#: modules/codec/dca.c:73 +#: modules/codec/dca.c:75 msgid "DTS Coherent Acoustics audio decoder" msgstr "" @@ -11282,7 +11288,7 @@ "This should take less than a minute." msgstr "" -#: modules/codec/libmpeg2.c:137 +#: modules/codec/libmpeg2.c:140 msgid "MPEG I/II video decoder (using libmpeg2)" msgstr "" @@ -11302,7 +11308,7 @@ msgid "MPEG audio layer I/II/III decoder" msgstr "" -#: modules/codec/mft.c:62 +#: modules/codec/mft.c:66 msgid "Media Foundation Transform decoder" msgstr "" @@ -11968,7 +11974,7 @@ msgid "S/PDIF pass-through decoder" msgstr "" -#: modules/codec/speex.c:59 modules/codec/speex.c:907 +#: modules/codec/speex.c:59 modules/codec/speex.c:910 #: modules/gui/macosx/VLCOpenWindowController.m:195 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:259 #: modules/gui/qt/ui/sprefs_video.h:325 modules/gui/qt/ui/video_effects.h:1282 @@ -12294,7 +12300,7 @@ #. #. This MUST be a valid iconv character set. If unsure, please refer #. the VideoLAN translators mailing list. -#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:98 +#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:99 msgctxt "GetACP" msgid "CP1252" msgstr "" @@ -13297,8 +13303,8 @@ #: modules/codec/x264.c:429 modules/gui/macosx/VLCMainMenu.m:290 #: modules/gui/macosx/VLCMainMenu.m:392 #: modules/gui/macosx/VLCSimplePrefsController.m:711 -#: modules/gui/qt/components/simple_preferences.cpp:703 -#: modules/misc/gnutls.c:778 modules/text_renderer/freetype/freetype.c:124 +#: modules/gui/qt/components/simple_preferences.cpp:714 +#: modules/misc/gnutls.c:775 modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:143 msgid "Normal" msgstr "መደበኛ " @@ -13355,7 +13361,7 @@ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)" msgstr "" -#: modules/codec/x265.c:46 +#: modules/codec/x265.c:53 msgid "H.265/HEVC encoder (x265)" msgstr "" @@ -13431,14 +13437,14 @@ #: modules/gui/macosx/VLCMainWindow.m:587 #: modules/gui/macosx/VLCMainWindow.m:1030 #: modules/gui/macosx/VLCStatusBarIcon.m:378 modules/gui/ncurses.c:1026 -#: modules/gui/qt/dialogs/help.cpp:91 modules/gui/qt/main_interface.cpp:1267 -#: modules/gui/qt/main_interface.cpp:1271 -#: modules/gui/qt/main_interface.cpp:1310 -#: modules/gui/qt/main_interface.cpp:1312 -#: modules/gui/qt/main_interface.cpp:1420 -#: modules/gui/qt/main_interface.cpp:1437 -#: modules/gui/qt/main_interface.cpp:1445 -#: modules/gui/qt/main_interface.cpp:1468 modules/lua/libs/httpd.c:80 +#: modules/gui/qt/dialogs/help.cpp:100 modules/gui/qt/main_interface.cpp:1302 +#: modules/gui/qt/main_interface.cpp:1306 +#: modules/gui/qt/main_interface.cpp:1343 +#: modules/gui/qt/main_interface.cpp:1345 +#: modules/gui/qt/main_interface.cpp:1453 +#: modules/gui/qt/main_interface.cpp:1470 +#: modules/gui/qt/main_interface.cpp:1478 +#: modules/gui/qt/main_interface.cpp:1501 modules/lua/libs/httpd.c:80 #: modules/notify/osx_notifications.m:302 #: modules/video_output/wayland/shell.c:348 #: modules/video_output/wayland/xdg-shell.c:291 @@ -13491,7 +13497,7 @@ #: modules/control/globalhotkeys/win32.c:47 #: modules/control/globalhotkeys/xcb.c:50 -#: modules/gui/qt/components/preferences_widgets.cpp:1137 +#: modules/gui/qt/components/preferences_widgets.cpp:1141 msgid "Global Hotkeys" msgstr "" @@ -13502,8 +13508,8 @@ #: modules/control/hotkeys.c:100 #: modules/gui/macosx/VLCSimplePrefsController.m:251 -#: modules/gui/qt/components/preferences_widgets.cpp:1136 -#: modules/gui/qt/components/simple_preferences.cpp:257 +#: modules/gui/qt/components/preferences_widgets.cpp:1140 +#: modules/gui/qt/components/simple_preferences.cpp:258 msgid "Hotkeys" msgstr "ማፍጠኛ ቁልፎች " @@ -14191,7 +14197,7 @@ msgstr "" #: modules/demux/adaptive/adaptive.cpp:85 -#: modules/gui/qt/components/simple_preferences.cpp:702 +#: modules/gui/qt/components/simple_preferences.cpp:713 msgid "Low latency" msgstr "ዝቅተኛ ቆይታ " @@ -14243,11 +14249,11 @@ msgid "ASF/WMV demuxer" msgstr "" -#: modules/demux/asf/asf.c:277 modules/demux/asf/asf.c:834 +#: modules/demux/asf/asf.c:285 modules/demux/asf/asf.c:836 msgid "Could not demux ASF stream" msgstr "" -#: modules/demux/asf/asf.c:278 +#: modules/demux/asf/asf.c:286 msgid "VLC failed to load the ASF header." msgstr "" @@ -14291,41 +14297,41 @@ msgid "Internal libavcodec format name" msgstr "" -#: modules/demux/avi/avi.c:55 +#: modules/demux/avi/avi.c:56 msgid "Force interleaved method" msgstr "" -#: modules/demux/avi/avi.c:57 +#: modules/demux/avi/avi.c:58 msgid "Force index creation" msgstr "" -#: modules/demux/avi/avi.c:59 +#: modules/demux/avi/avi.c:60 msgid "" "Recreate a index for the AVI file. Use this if your AVI file is damaged or " "incomplete (not seekable)." msgstr "" -#: modules/demux/avi/avi.c:67 +#: modules/demux/avi/avi.c:68 msgid "Ask for action" msgstr "" -#: modules/demux/avi/avi.c:68 +#: modules/demux/avi/avi.c:69 msgid "Always fix" msgstr "" -#: modules/demux/avi/avi.c:69 +#: modules/demux/avi/avi.c:70 msgid "Never fix" msgstr "" -#: modules/demux/avi/avi.c:70 +#: modules/demux/avi/avi.c:71 msgid "Fix when necessary" msgstr "" -#: modules/demux/avi/avi.c:74 +#: modules/demux/avi/avi.c:75 msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:902 modules/demux/mp4/mp4.c:4375 +#: modules/demux/avi/avi.c:910 modules/demux/mp4/mp4.c:4374 msgid "" "Because this file index is broken or missing, seeking will not work " "correctly.\n" @@ -14335,27 +14341,27 @@ "What do you want to do?" msgstr "" -#: modules/demux/avi/avi.c:910 +#: modules/demux/avi/avi.c:918 msgid "Do not play" msgstr "" -#: modules/demux/avi/avi.c:911 +#: modules/demux/avi/avi.c:919 msgid "Build index then play" msgstr "" -#: modules/demux/avi/avi.c:912 +#: modules/demux/avi/avi.c:920 msgid "Play as is" msgstr "" -#: modules/demux/avi/avi.c:913 modules/demux/mp4/mp4.c:4386 +#: modules/demux/avi/avi.c:921 modules/demux/mp4/mp4.c:4385 msgid "Broken or missing Index" msgstr "" -#: modules/demux/avi/avi.c:2828 +#: modules/demux/avi/avi.c:2879 msgid "Broken or missing AVI Index" msgstr "" -#: modules/demux/avi/avi.c:2829 +#: modules/demux/avi/avi.c:2880 msgid "Fixing AVI Index..." msgstr "" @@ -14512,7 +14518,7 @@ "good for broken files)." msgstr "" -#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:112 +#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:113 msgid "Seek based on percent not time" msgstr "" @@ -14762,27 +14768,27 @@ msgid "Clean" msgstr "" -#: modules/demux/mp4/mp4.c:50 +#: modules/demux/mp4/mp4.c:51 msgid "M4A audio only" msgstr "" -#: modules/demux/mp4/mp4.c:51 +#: modules/demux/mp4/mp4.c:52 msgid "Ignore non audio tracks from iTunes audio files" msgstr "" -#: modules/demux/mp4/mp4.c:56 +#: modules/demux/mp4/mp4.c:57 msgid "MP4 stream demuxer" msgstr "" -#: modules/demux/mp4/mp4.c:57 +#: modules/demux/mp4/mp4.c:58 msgid "MP4" msgstr "" -#: modules/demux/mp4/mp4.c:4383 +#: modules/demux/mp4/mp4.c:4382 msgid "Do not seek" msgstr "" -#: modules/demux/mp4/mp4.c:4384 +#: modules/demux/mp4/mp4.c:4383 msgid "Build index" msgstr "" @@ -14843,89 +14849,89 @@ msgid "PS" msgstr "" -#: modules/demux/mpeg/ts.c:83 +#: modules/demux/mpeg/ts.c:84 msgid "Extra PMT" msgstr "" -#: modules/demux/mpeg/ts.c:85 +#: modules/demux/mpeg/ts.c:86 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." msgstr "" -#: modules/demux/mpeg/ts.c:87 +#: modules/demux/mpeg/ts.c:88 msgid "Set id of ES to PID" msgstr "" -#: modules/demux/mpeg/ts.c:88 +#: modules/demux/mpeg/ts.c:89 msgid "" "Set the internal ID of each elementary stream handled by VLC to the same " "value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do " "'#duplicate{..., select=\"es=\"}'." msgstr "" -#: modules/demux/mpeg/ts.c:93 modules/mux/mpeg/ts.c:173 +#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:173 msgid "CSA Key" msgstr "" -#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:174 +#: modules/demux/mpeg/ts.c:95 modules/mux/mpeg/ts.c:174 msgid "" "CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:97 modules/mux/mpeg/ts.c:177 +#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:177 msgid "Second CSA Key" msgstr "" -#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:178 +#: modules/demux/mpeg/ts.c:99 modules/mux/mpeg/ts.c:178 msgid "" "The even CSA encryption key. This must be a 16 char string (8 hexadecimal " "bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:102 +#: modules/demux/mpeg/ts.c:103 msgid "Packet size in bytes to decrypt" msgstr "" -#: modules/demux/mpeg/ts.c:103 +#: modules/demux/mpeg/ts.c:104 msgid "" "Specify the size of the TS packet to decrypt. The decryption routines " "subtract the TS-header from the value before decrypting." msgstr "" -#: modules/demux/mpeg/ts.c:107 +#: modules/demux/mpeg/ts.c:108 msgid "Separate sub-streams" msgstr "" -#: modules/demux/mpeg/ts.c:109 +#: modules/demux/mpeg/ts.c:110 msgid "" "Separate teletex/dvbs pages into independent ES. It can be useful to turn " "off this option when using stream output." msgstr "" -#: modules/demux/mpeg/ts.c:114 +#: modules/demux/mpeg/ts.c:115 msgid "" "Seek and position based on a percent byte position, not a PCR generated time " "position. If seeking doesn't work property, turn on this option." msgstr "" -#: modules/demux/mpeg/ts.c:125 +#: modules/demux/mpeg/ts.c:126 msgid "Trust in-stream PCR" msgstr "" -#: modules/demux/mpeg/ts.c:126 +#: modules/demux/mpeg/ts.c:127 msgid "Use the stream PCR as a reference." msgstr "" -#: modules/demux/mpeg/ts.c:133 modules/mux/mpeg/ts.c:100 +#: modules/demux/mpeg/ts.c:134 modules/mux/mpeg/ts.c:100 msgid "Digital TV Standard" msgstr "" -#: modules/demux/mpeg/ts.c:134 +#: modules/demux/mpeg/ts.c:135 msgid "" "Selects mode for digital TV standard. This feature affects EPG information " "and subtitles." msgstr "" -#: modules/demux/mpeg/ts.c:138 +#: modules/demux/mpeg/ts.c:139 msgid "MPEG Transport Stream demuxer" msgstr "" @@ -15146,7 +15152,7 @@ msgid "Total duration" msgstr "" -#: modules/demux/pva.c:43 +#: modules/demux/pva.c:44 msgid "PVA demuxer" msgstr "" @@ -15276,23 +15282,23 @@ msgid "TTA demuxer" msgstr "" -#: modules/demux/ty.c:59 +#: modules/demux/ty.c:62 msgid "TY" msgstr "" -#: modules/demux/ty.c:60 +#: modules/demux/ty.c:63 msgid "TY Stream audio/video demux" msgstr "" -#: modules/demux/ty.c:770 +#: modules/demux/ty.c:784 msgid "Closed captions 2" msgstr "" -#: modules/demux/ty.c:771 +#: modules/demux/ty.c:785 msgid "Closed captions 3" msgstr "" -#: modules/demux/ty.c:772 +#: modules/demux/ty.c:786 msgid "Closed captions 4" msgstr "" @@ -15308,7 +15314,7 @@ msgid "Vobsub subtitles parser" msgstr "" -#: modules/demux/voc.c:43 +#: modules/demux/voc.c:45 msgid "VOC demuxer" msgstr "" @@ -15320,7 +15326,7 @@ msgid "XA demuxer" msgstr "" -#: modules/demux/xiph_metadata.c:588 +#: modules/demux/xiph_metadata.c:571 msgid "Unknown category" msgstr "" @@ -15374,17 +15380,17 @@ msgstr "ስለ ቪኤልሲ ማጫወቻ" #: modules/gui/macosx/VLCAboutWindowController.m:97 -#: modules/gui/qt/dialogs/help.cpp:125 +#: modules/gui/qt/dialogs/help.cpp:137 msgid "Credits" msgstr "" #: modules/gui/macosx/VLCAboutWindowController.m:99 -#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:119 +#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:129 msgid "License" msgstr "ፈቃድ " #: modules/gui/macosx/VLCAboutWindowController.m:101 -#: modules/gui/qt/dialogs/help.cpp:122 +#: modules/gui/qt/dialogs/help.cpp:133 msgid "Authors" msgstr "ደራሲዎች " @@ -15400,33 +15406,33 @@ "\">VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" +"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:105 #: modules/gui/macosx/VLCAddonsWindowController.m:357 -#: modules/gui/qt/dialogs/plugins.cpp:389 +#: modules/gui/qt/dialogs/plugins.cpp:388 #: modules/gui/qt/managers/addons_manager.cpp:88 msgid "Playlist parsers" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:107 #: modules/gui/macosx/VLCAddonsWindowController.m:359 -#: modules/gui/qt/dialogs/plugins.cpp:393 +#: modules/gui/qt/dialogs/plugins.cpp:392 #: modules/gui/qt/managers/addons_manager.cpp:90 msgid "Service Discovery" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:109 -#: modules/gui/qt/dialogs/plugins.cpp:397 +#: modules/gui/qt/dialogs/plugins.cpp:396 #: modules/gui/qt/managers/addons_manager.cpp:92 msgid "Interfaces" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:111 -#: modules/gui/qt/dialogs/plugins.cpp:400 +#: modules/gui/qt/dialogs/plugins.cpp:399 #: modules/gui/qt/managers/addons_manager.cpp:94 msgid "Art and meta fetchers" msgstr "" @@ -15434,7 +15440,7 @@ #: modules/gui/macosx/VLCAddonsWindowController.m:113 #: modules/gui/macosx/VLCAddonsWindowController.m:361 #: modules/gui/macosx/VLCMainMenu.m:343 modules/gui/macosx/VLCMainMenu.m:344 -#: modules/gui/qt/dialogs/plugins.cpp:403 +#: modules/gui/qt/dialogs/plugins.cpp:402 #: modules/gui/qt/managers/addons_manager.cpp:96 msgid "Extensions" msgstr "ቅጥያዎች " @@ -15444,30 +15450,30 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:118 -#: modules/gui/qt/dialogs/plugins.cpp:431 +#: modules/gui/qt/dialogs/plugins.cpp:430 msgid "Find more addons online" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:128 -#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:86 +#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:85 msgid "Addons Manager" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:130 -#: modules/gui/qt/dialogs/plugins.cpp:1173 -#: modules/gui/qt/dialogs/plugins.cpp:1186 +#: modules/gui/qt/dialogs/plugins.cpp:1172 +#: modules/gui/qt/dialogs/plugins.cpp:1185 msgid "Installed" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:131 #: modules/gui/macosx/VLCBookmarksWindowController.m:87 -#: modules/gui/qt/dialogs/plugins.cpp:128 modules/mux/avi.c:54 +#: modules/gui/qt/dialogs/plugins.cpp:127 modules/mux/avi.c:54 msgid "Name" msgstr "ስም " #: modules/gui/macosx/VLCAddonsWindowController.m:132 -#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1405 -#: modules/gui/qt/dialogs/plugins.cpp:1510 modules/mux/asf.c:58 +#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1404 +#: modules/gui/qt/dialogs/plugins.cpp:1509 modules/mux/asf.c:58 msgid "Author" msgstr "ደራሲ" @@ -15476,7 +15482,7 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:355 -#: modules/gui/qt/dialogs/plugins.cpp:385 +#: modules/gui/qt/dialogs/plugins.cpp:384 #: modules/gui/qt/managers/addons_manager.cpp:86 #: modules/gui/skins2/src/skin_main.cpp:535 msgid "Skins" @@ -15493,7 +15499,7 @@ msgstr "2 እለፍ " #: modules/gui/macosx/VLCAudioEffectsWindowController.m:219 -#: modules/gui/qt/components/extended_panels.cpp:1132 +#: modules/gui/qt/components/extended_panels.cpp:1157 #: modules/gui/qt/ui/equalizer.h:133 msgid "Preamp" msgstr "የድምፅ ጥራት መሳሪያ " @@ -15506,22 +15512,22 @@ #: modules/gui/macosx/VLCAudioEffectsWindowController.m:235 #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:49 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:210 -#: modules/gui/qt/dialogs/gototime.cpp:66 +#: modules/gui/qt/dialogs/gototime.cpp:65 msgid "Reset" msgstr "ዳግም አስጀምር" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:226 -#: modules/gui/qt/components/extended_panels.cpp:1296 +#: modules/gui/qt/components/extended_panels.cpp:1326 msgid "Attack" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:227 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "Release" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:228 -#: modules/gui/qt/components/extended_panels.cpp:1298 +#: modules/gui/qt/components/extended_panels.cpp:1328 msgid "Threshold" msgstr "" @@ -15675,7 +15681,7 @@ #: modules/gui/macosx/VLCOutput.m:60 modules/gui/macosx/VLCPlaylistInfo.m:337 #: modules/gui/macosx/VLCSimplePrefsController.m:295 #: modules/gui/macosx/VLCTimeSelectionPanelController.m:51 -#: modules/gui/qt/components/open_panels.cpp:1380 +#: modules/gui/qt/components/open_panels.cpp:1360 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "OK" msgstr "እሺ " @@ -15700,8 +15706,8 @@ #: modules/gui/macosx/VLCBookmarksWindowController.m:213 msgid "" -"Input has changed, unable to save bookmark. Suspending playback with " -"\"Pause\" while editing bookmarks to ensure to keep the same input." +"Input has changed, unable to save bookmark. Suspending playback with \"Pause" +"\" while editing bookmarks to ensure to keep the same input." msgstr "" #: modules/gui/macosx/VLCControlsBarCommon.m:84 @@ -15790,10 +15796,10 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:381 #: modules/gui/macosx/prefs_widgets.m:1126 #: modules/gui/qt/components/preferences_widgets.cpp:264 -#: modules/gui/qt/components/simple_preferences.cpp:471 -#: modules/gui/qt/components/sout/sout_widgets.cpp:135 -#: modules/gui/qt/ui/open.h:279 modules/gui/qt/ui/open_disk.h:304 -#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:414 +#: modules/gui/qt/components/simple_preferences.cpp:472 +#: modules/gui/qt/components/sout/sout_widgets.cpp:136 +#: modules/gui/qt/ui/open.h:277 modules/gui/qt/ui/open_disk.h:304 +#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:415 #: modules/gui/qt/ui/sprefs_input.h:365 modules/gui/qt/ui/sprefs_video.h:329 msgid "Browse..." msgstr "አስስ... " @@ -15814,7 +15820,7 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:149 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:392 #: modules/gui/macosx/VLCOutput.m:65 modules/gui/macosx/VLCOutput.m:194 -#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:94 +#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:92 msgid "Stream" msgstr "ልቀቅ " @@ -15887,10 +15893,10 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:186 #: modules/gui/macosx/VLCOpenWindowController.m:197 #: modules/gui/macosx/VLCOutput.m:68 -#: modules/gui/qt/components/sout/sout_widgets.cpp:241 -#: modules/gui/qt/components/sout/sout_widgets.cpp:328 -#: modules/gui/qt/components/sout/sout_widgets.cpp:370 -#: modules/gui/qt/components/sout/sout_widgets.cpp:425 +#: modules/gui/qt/components/sout/sout_widgets.cpp:242 +#: modules/gui/qt/components/sout/sout_widgets.cpp:329 +#: modules/gui/qt/components/sout/sout_widgets.cpp:371 +#: modules/gui/qt/components/sout/sout_widgets.cpp:426 msgid "Address" msgstr "አድራሻ" @@ -15902,11 +15908,11 @@ #: modules/gui/macosx/VLCOpenWindowController.m:185 #: modules/gui/macosx/VLCOpenWindowController.m:187 #: modules/gui/macosx/VLCOutput.m:69 -#: modules/gui/qt/components/sout/sout_widgets.cpp:187 -#: modules/gui/qt/components/sout/sout_widgets.cpp:242 -#: modules/gui/qt/components/sout/sout_widgets.cpp:283 -#: modules/gui/qt/components/sout/sout_widgets.cpp:329 -#: modules/gui/qt/components/sout/sout_widgets.cpp:426 modules/lua/vlc.c:67 +#: modules/gui/qt/components/sout/sout_widgets.cpp:188 +#: modules/gui/qt/components/sout/sout_widgets.cpp:243 +#: modules/gui/qt/components/sout/sout_widgets.cpp:284 +#: modules/gui/qt/components/sout/sout_widgets.cpp:330 +#: modules/gui/qt/components/sout/sout_widgets.cpp:427 modules/lua/vlc.c:67 #: modules/stream_out/rtp.c:114 #: share/lua/http/dialogs/stream_config_window.html:32 #: share/lua/http/dialogs/stream_window.html:91 @@ -15998,7 +16004,7 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:705 #: modules/gui/macosx/VLCSimplePrefsController.m:733 #: modules/gui/macosx/VLCSimplePrefsController.m:1266 -#: modules/gui/qt/components/simple_preferences.cpp:700 +#: modules/gui/qt/components/simple_preferences.cpp:711 msgid "Custom" msgstr "ብጁ " @@ -16037,7 +16043,7 @@ #: modules/gui/macosx/VLCFSPanelController.m:140 #: modules/gui/macosx/VLCMainWindowControlsBar.m:80 -#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:408 +#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:409 msgid "Volume" msgstr "የድምጽ መጠን " @@ -16071,7 +16077,7 @@ msgstr "" #: modules/gui/macosx/VLCLogWindowController.m:94 -#: modules/gui/qt/dialogs/messages.cpp:80 +#: modules/gui/qt/dialogs/messages.cpp:77 #: modules/gui/qt/ui/messages_panel.h:136 #: modules/gui/qt/ui/messages_panel.h:140 msgid "Messages" @@ -16435,8 +16441,8 @@ msgid "Bring All to Front" msgstr "ሁሉንም ወደ ቅርጸ ቁምፊ አምጣ " -#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:54 -#: modules/gui/qt/menus.cpp:951 modules/gui/qt/menus.cpp:1138 +#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:52 +#: modules/gui/qt/menus.cpp:956 modules/gui/qt/menus.cpp:1143 msgid "Help" msgstr "እገዛ " @@ -16499,13 +16505,13 @@ #: modules/gui/macosx/VLCMainWindow.m:220 #: modules/gui/macosx/VLCMainWindow.m:226 -#: modules/gui/qt/components/playlist/selector.cpp:580 +#: modules/gui/qt/components/playlist/selector.cpp:593 msgid "Subscribe" msgstr "ደንበኛ ሁን " #: modules/gui/macosx/VLCMainWindow.m:221 #: modules/gui/macosx/VLCMainWindow.m:232 -#: modules/gui/qt/components/playlist/selector.cpp:597 +#: modules/gui/qt/components/playlist/selector.cpp:610 msgid "Unsubscribe" msgstr "ደንበኛነትህን ተው" @@ -16515,7 +16521,7 @@ msgstr "ለፖድካስት ደንበኛ ሁን " #: modules/gui/macosx/VLCMainWindow.m:225 -#: modules/gui/qt/components/playlist/selector.cpp:581 +#: modules/gui/qt/components/playlist/selector.cpp:594 msgid "Enter URL of the podcast to subscribe to:" msgstr "ለ .. ደንበኛ ለመሆን የፖድካስቱን ዩአርል አስገባ " @@ -16552,7 +16558,7 @@ msgstr "" #: modules/gui/macosx/VLCMainWindowControlsBar.m:71 -#: modules/gui/qt/dialogs/vlm.cpp:548 share/lua/http/index.html:259 +#: modules/gui/qt/dialogs/vlm.cpp:542 share/lua/http/index.html:259 msgid "Repeat" msgstr "" @@ -16638,7 +16644,7 @@ #: modules/gui/macosx/VLCOpenWindowController.m:152 #: modules/gui/macosx/VLCOpenWindowController.m:349 #: modules/gui/macosx/VLCSimplePrefsController.m:353 -#: modules/gui/qt/ui/sprefs_interface.h:545 +#: modules/gui/qt/ui/sprefs_interface.h:552 msgid "Choose..." msgstr "ምረጥ... " @@ -16871,10 +16877,9 @@ msgstr "" #: modules/gui/macosx/VLCPlaylist.m:231 -#: modules/gui/qt/components/playlist/standardpanel.cpp:273 -#, fuzzy +#: modules/gui/qt/components/playlist/standardpanel.cpp:274 msgid "Shuffle playlist" -msgstr "የሙዚቃዎች ዝርዝሩን አስቀምጥ " +msgstr "" #: modules/gui/macosx/VLCPlaylistInfo.m:54 #: modules/gui/qt/dialogs/mediainfo.cpp:54 @@ -16944,8 +16949,8 @@ msgid "VLC was unable to save the meta data." msgstr "ቪኤልሲ ሜታ ዳታውን ማስቀመጥ አልቻለም " -#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:194 -#: modules/gui/qt/ui/sprefs_interface.h:551 +#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:197 +#: modules/gui/qt/ui/sprefs_interface.h:558 msgid "Continue playback?" msgstr "" @@ -16989,27 +16994,27 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:241 -#: modules/gui/qt/components/simple_preferences.cpp:247 -#: modules/gui/qt/components/simple_preferences.cpp:727 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/components/simple_preferences.cpp:248 +#: modules/gui/qt/components/simple_preferences.cpp:738 +#: modules/gui/qt/dialogs/plugins.cpp:382 msgid "Interface Settings" msgstr "የበይነገጽ ቅንብሮች " #: modules/gui/macosx/VLCSimplePrefsController.m:243 -#: modules/gui/qt/components/simple_preferences.cpp:249 -#: modules/gui/qt/components/simple_preferences.cpp:446 +#: modules/gui/qt/components/simple_preferences.cpp:250 +#: modules/gui/qt/components/simple_preferences.cpp:447 msgid "Audio Settings" msgstr "የተሰሚ ቅንብሮች " #: modules/gui/macosx/VLCSimplePrefsController.m:245 -#: modules/gui/qt/components/simple_preferences.cpp:251 -#: modules/gui/qt/components/simple_preferences.cpp:379 +#: modules/gui/qt/components/simple_preferences.cpp:252 +#: modules/gui/qt/components/simple_preferences.cpp:380 msgid "Video Settings" msgstr "የቪድዮ ቅንብሮች " #: modules/gui/macosx/VLCSimplePrefsController.m:247 -#: modules/gui/qt/components/simple_preferences.cpp:253 -#: modules/gui/qt/components/simple_preferences.cpp:868 +#: modules/gui/qt/components/simple_preferences.cpp:254 +#: modules/gui/qt/components/simple_preferences.cpp:894 msgid "Subtitle & On Screen Display Settings" msgstr "" @@ -17038,12 +17043,12 @@ msgstr "በክፍሎች መካከል የተሰሚ ደረጃ ጠብቅ " #: modules/gui/macosx/VLCSimplePrefsController.m:289 -#: modules/gui/qt/ui/sprefs_audio.h:410 +#: modules/gui/qt/ui/sprefs_audio.h:411 msgid "Always reset audio start level to:" msgstr "ሁልጊዜ የተሰሚ መጀመሪያ ደረጃን ዳግም አስጀምር፡ " #: modules/gui/macosx/VLCSimplePrefsController.m:292 -#: modules/gui/qt/dialogs/vlm.cpp:492 +#: modules/gui/qt/dialogs/vlm.cpp:486 msgid "Change" msgstr "ለውጥ " @@ -17056,7 +17061,7 @@ msgstr "የተጎዳኘውን ማፍጠኛ ቁልፍ ለመለወጥ አንድ ተግባር ምረጥ፡ " #: modules/gui/macosx/VLCSimplePrefsController.m:298 -#: modules/gui/qt/components/preferences_widgets.cpp:1141 +#: modules/gui/qt/components/preferences_widgets.cpp:1145 msgid "Action" msgstr "ተግባር " @@ -17082,7 +17087,7 @@ msgstr "ነባሪ መሸጎጫ ደረጃ " #: modules/gui/macosx/VLCSimplePrefsController.m:307 -#: modules/gui/qt/ui/open.h:263 +#: modules/gui/qt/ui/open.h:261 msgid "Caching" msgstr "መሸጎጥ " @@ -17166,7 +17171,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:341 -#: modules/gui/qt/ui/sprefs_interface.h:553 +#: modules/gui/qt/ui/sprefs_interface.h:560 msgid "Privacy / Network Interaction" msgstr "ብሕትውነት / የአውታረ መረብ እርስ በእርስ ግንኙነት " @@ -17241,7 +17246,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:370 -#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:178 +#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:181 msgid "Pause the video playback when minimized" msgstr "" @@ -17421,12 +17426,12 @@ msgstr "ሰከንድ " #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:50 -#: modules/gui/qt/components/extended_panels.cpp:1412 modules/gui/qt/qt.cpp:213 +#: modules/gui/qt/components/extended_panels.cpp:1442 modules/gui/qt/qt.cpp:216 msgid "Audio/Video" msgstr "ተሰሚ/ቪድዮ " #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:51 -#: modules/gui/qt/components/extended_panels.cpp:1416 +#: modules/gui/qt/components/extended_panels.cpp:1446 msgid "Audio track synchronization:" msgstr "" @@ -17435,12 +17440,12 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:54 -#: modules/gui/qt/components/extended_panels.cpp:1424 +#: modules/gui/qt/components/extended_panels.cpp:1454 msgid "Subtitles/Video" msgstr "ጽሁፋዊ ትርጉሞች/ቪድዮ" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:55 -#: modules/gui/qt/components/extended_panels.cpp:1428 +#: modules/gui/qt/components/extended_panels.cpp:1458 msgid "Subtitle track synchronization:" msgstr "" @@ -17449,31 +17454,31 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:58 -#: modules/gui/qt/components/extended_panels.cpp:1435 +#: modules/gui/qt/components/extended_panels.cpp:1465 msgid "Subtitle speed:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:60 -#: modules/gui/qt/components/extended_panels.cpp:1449 +#: modules/gui/qt/components/extended_panels.cpp:1479 msgid "Subtitle duration factor:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:68 -#: modules/gui/qt/components/extended_panels.cpp:1560 +#: modules/gui/qt/components/extended_panels.cpp:1590 msgid "" "Extend subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:72 -#: modules/gui/qt/components/extended_panels.cpp:1565 +#: modules/gui/qt/components/extended_panels.cpp:1595 msgid "" "Multiply subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:76 -#: modules/gui/qt/components/extended_panels.cpp:1570 +#: modules/gui/qt/components/extended_panels.cpp:1600 msgid "" "Recalculate subtitle duration according\n" "to their content and this value.\n" @@ -17858,17 +17863,17 @@ " By default, interface resize to the native video size." msgstr "" -#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:180 +#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:183 msgid "" "With this option enabled, the playback will be automatically paused when " "minimizing the window." msgstr "" -#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:182 +#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:185 msgid "Allow automatic icon changes" msgstr "" -#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:184 +#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:187 msgid "" "This option allows the interface to change its icon on various occasions." msgstr "" @@ -17926,21 +17931,21 @@ "open one of those, playback will continue." msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:206 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:209 msgid "Ask" msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/keystore/keychain.m:50 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/keystore/keychain.m:50 msgid "Always" msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/gui/qt/qt.cpp:213 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/gui/qt/qt.cpp:216 msgid "Never" msgstr "" -#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:186 +#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:189 msgid "Maximum Volume displayed" msgstr "" @@ -18283,27 +18288,27 @@ msgid "Find: %s" msgstr "" -#: modules/gui/qt/components/controller.cpp:343 +#: modules/gui/qt/components/controller.cpp:352 msgid "Shift+L" msgstr "መቀየሪያ ቁልፍ + ኤል " -#: modules/gui/qt/components/controller.cpp:448 +#: modules/gui/qt/components/controller.cpp:457 msgid "Click to toggle between loop all, loop one and no loop" msgstr "" -#: modules/gui/qt/components/controller.cpp:549 +#: modules/gui/qt/components/controller.cpp:558 msgid "Previous Chapter/Title" msgstr "ቀዳሚ ምዕራፍ/ርዕስ " -#: modules/gui/qt/components/controller.cpp:555 +#: modules/gui/qt/components/controller.cpp:564 msgid "Next Chapter/Title" msgstr "ቀጣይ ምዕራፍ/ርዕስ" -#: modules/gui/qt/components/controller.cpp:604 +#: modules/gui/qt/components/controller.cpp:613 msgid "Teletext Activation" msgstr "የቴሌቴክስት ትግበራ " -#: modules/gui/qt/components/controller.cpp:620 +#: modules/gui/qt/components/controller.cpp:629 msgid "Toggle Transparency" msgstr "" @@ -18422,7 +18427,7 @@ msgstr "በሙዚቃዎች ዝርዝሩ ላይ ቀጣይ ማህደረ መረጃ " #: modules/gui/qt/components/controller.hpp:126 -#: modules/gui/qt/components/open_panels.cpp:259 +#: modules/gui/qt/components/open_panels.cpp:241 msgid "Open subtitle file" msgstr "" @@ -18467,21 +18472,21 @@ msgid "No EPG Data Available" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:380 #: modules/gui/qt/components/extended_panels.cpp:393 +#: modules/gui/qt/components/extended_panels.cpp:406 msgid "Image Files" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:382 modules/spu/logo.c:49 +#: modules/gui/qt/components/extended_panels.cpp:395 modules/spu/logo.c:49 msgid "Logo filenames" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:395 +#: modules/gui/qt/components/extended_panels.cpp:408 #: modules/video_filter/erase.c:55 msgid "Image mask" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:645 +#: modules/gui/qt/components/extended_panels.cpp:658 msgid "" "No v4l2 instance found.\n" "Please check that the device has been opened with VLC and is playing.\n" @@ -18489,133 +18494,133 @@ "Controls will automatically appear here." msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1107 -#: modules/gui/qt/components/extended_panels.cpp:1108 -#: modules/gui/qt/components/extended_panels.cpp:1109 -#: modules/gui/qt/components/extended_panels.cpp:1110 -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1112 -#: modules/gui/qt/components/extended_panels.cpp:1113 -#: modules/gui/qt/components/extended_panels.cpp:1114 -#: modules/gui/qt/components/extended_panels.cpp:1115 -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1120 -#: modules/gui/qt/components/extended_panels.cpp:1121 -#: modules/gui/qt/components/extended_panels.cpp:1122 -#: modules/gui/qt/components/extended_panels.cpp:1123 -#: modules/gui/qt/components/extended_panels.cpp:1124 -#: modules/gui/qt/components/extended_panels.cpp:1125 -#: modules/gui/qt/components/extended_panels.cpp:1126 -#: modules/gui/qt/components/extended_panels.cpp:1127 -#: modules/gui/qt/components/extended_panels.cpp:1128 -#: modules/gui/qt/components/extended_panels.cpp:1129 #: modules/gui/qt/components/extended_panels.cpp:1132 -#: modules/gui/qt/components/extended_panels.cpp:1298 -#: modules/gui/qt/components/extended_panels.cpp:1300 -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1133 +#: modules/gui/qt/components/extended_panels.cpp:1134 +#: modules/gui/qt/components/extended_panels.cpp:1135 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1137 +#: modules/gui/qt/components/extended_panels.cpp:1138 +#: modules/gui/qt/components/extended_panels.cpp:1139 +#: modules/gui/qt/components/extended_panels.cpp:1140 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1145 +#: modules/gui/qt/components/extended_panels.cpp:1146 +#: modules/gui/qt/components/extended_panels.cpp:1147 +#: modules/gui/qt/components/extended_panels.cpp:1148 +#: modules/gui/qt/components/extended_panels.cpp:1149 +#: modules/gui/qt/components/extended_panels.cpp:1150 +#: modules/gui/qt/components/extended_panels.cpp:1151 +#: modules/gui/qt/components/extended_panels.cpp:1152 +#: modules/gui/qt/components/extended_panels.cpp:1153 +#: modules/gui/qt/components/extended_panels.cpp:1154 +#: modules/gui/qt/components/extended_panels.cpp:1157 +#: modules/gui/qt/components/extended_panels.cpp:1328 +#: modules/gui/qt/components/extended_panels.cpp:1330 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "dB" msgstr "ዲቢ " -#: modules/gui/qt/components/extended_panels.cpp:1108 +#: modules/gui/qt/components/extended_panels.cpp:1133 msgid "170 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1109 +#: modules/gui/qt/components/extended_panels.cpp:1134 msgid "310 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1110 +#: modules/gui/qt/components/extended_panels.cpp:1135 msgid "600 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1125 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1150 msgid "1 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1112 +#: modules/gui/qt/components/extended_panels.cpp:1137 msgid "3 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1113 +#: modules/gui/qt/components/extended_panels.cpp:1138 msgid "6 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1114 +#: modules/gui/qt/components/extended_panels.cpp:1139 msgid "12 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1115 +#: modules/gui/qt/components/extended_panels.cpp:1140 msgid "14 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1129 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1154 msgid "16 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1120 +#: modules/gui/qt/components/extended_panels.cpp:1145 msgid "31 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1121 +#: modules/gui/qt/components/extended_panels.cpp:1146 msgid "63 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1122 +#: modules/gui/qt/components/extended_panels.cpp:1147 msgid "125 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1123 +#: modules/gui/qt/components/extended_panels.cpp:1148 msgid "250 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1124 +#: modules/gui/qt/components/extended_panels.cpp:1149 msgid "500 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1126 +#: modules/gui/qt/components/extended_panels.cpp:1151 msgid "2 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1127 +#: modules/gui/qt/components/extended_panels.cpp:1152 msgid "4 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1128 +#: modules/gui/qt/components/extended_panels.cpp:1153 msgid "8 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1296 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1326 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "ms" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1300 +#: modules/gui/qt/components/extended_panels.cpp:1330 msgid "" "Knee\n" "radius" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "" "Makeup\n" "gain" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1354 +#: modules/gui/qt/components/extended_panels.cpp:1384 msgid "Adjust pitch" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1388 +#: modules/gui/qt/components/extended_panels.cpp:1418 msgid "(Hastened)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1390 +#: modules/gui/qt/components/extended_panels.cpp:1420 msgid "(Delayed)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1477 +#: modules/gui/qt/components/extended_panels.cpp:1507 msgid "Force update of this dialog's values" msgstr "የዚህ መገናኛን እሴቶች ዝመናን አስገድድ " @@ -18710,7 +18715,7 @@ msgid "Overall" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:676 +#: modules/gui/qt/components/interface_widgets.cpp:683 msgid "" "Current playback speed: %1\n" "Click to adjust" @@ -18718,136 +18723,136 @@ "የአሁን የመልሶ ማጫወት ፍጥነት፡ %1\n" " ለማስተካከል ጠቅ አድርግ " -#: modules/gui/qt/components/interface_widgets.cpp:749 +#: modules/gui/qt/components/interface_widgets.cpp:756 msgid "Revert to normal play speed" msgstr "ወደተለመደው የመጫወቻ ፍጥነት አድህር" -#: modules/gui/qt/components/interface_widgets.cpp:856 +#: modules/gui/qt/components/interface_widgets.cpp:863 msgid "Download cover art" msgstr "የሽፋን ጥበብ አውርድ " -#: modules/gui/qt/components/interface_widgets.cpp:860 +#: modules/gui/qt/components/interface_widgets.cpp:867 msgid "Add cover art from file" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:926 +#: modules/gui/qt/components/interface_widgets.cpp:933 msgid "Choose Cover Art" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:927 +#: modules/gui/qt/components/interface_widgets.cpp:934 msgid "Image Files (*.gif *.jpg *.jpeg *.png)" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:954 +#: modules/gui/qt/components/interface_widgets.cpp:961 #: modules/gui/qt/dialogs/toolbar.cpp:573 msgid "Elapsed time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:958 +#: modules/gui/qt/components/interface_widgets.cpp:965 #: modules/gui/qt/dialogs/toolbar.cpp:577 msgid "Total/Remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:960 +#: modules/gui/qt/components/interface_widgets.cpp:967 msgid "Click to toggle between total and remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:966 +#: modules/gui/qt/components/interface_widgets.cpp:973 msgid "Click to toggle between elapsed and remaining time" msgstr "ባለፈና በቀረ ሰአት መካከል ቀይርን ጠቅ አድርግ " -#: modules/gui/qt/components/interface_widgets.cpp:968 +#: modules/gui/qt/components/interface_widgets.cpp:975 msgid "Double click to jump to a chosen time position" msgstr "ወደ ተመረጠው የሰአት አቀማመጥ ለመዝለል ሁለቴ ጠቅ አድርግ" -#: modules/gui/qt/components/open_panels.cpp:58 +#: modules/gui/qt/components/open_panels.cpp:55 msgid "Select a device or a VIDEO_TS directory" msgstr "መሳሪያ ወይም VIDEO_TS ዕፀ ማውጫ ምረጥ " -#: modules/gui/qt/components/open_panels.cpp:59 +#: modules/gui/qt/components/open_panels.cpp:56 msgid "Select a device or a VIDEO_TS folder" msgstr "መሳሪያ ወይም VIDEO_TS አቃፊ ምረጥ " -#: modules/gui/qt/components/open_panels.cpp:145 -#: modules/gui/qt/components/open_panels.cpp:224 +#: modules/gui/qt/components/open_panels.cpp:127 +#: modules/gui/qt/components/open_panels.cpp:206 msgid "Select one or multiple files" msgstr "አን ድ ወይም ብዙ ፋይሎች ምረጥ " -#: modules/gui/qt/components/open_panels.cpp:160 +#: modules/gui/qt/components/open_panels.cpp:142 msgid "File names:" msgstr "የፋይል ስሞች፡ " -#: modules/gui/qt/components/open_panels.cpp:162 -#: modules/gui/qt/ui/sprefs_interface.h:558 +#: modules/gui/qt/components/open_panels.cpp:144 +#: modules/gui/qt/ui/sprefs_interface.h:565 msgid "Filter:" msgstr "ማጣሪያ፡ " -#: modules/gui/qt/components/open_panels.cpp:367 +#: modules/gui/qt/components/open_panels.cpp:349 msgid "Eject the disc" msgstr "ዲስኩን አስለቅቅ " -#: modules/gui/qt/components/open_panels.cpp:534 +#: modules/gui/qt/components/open_panels.cpp:514 msgid "Entry" msgstr "መግቢያ" -#: modules/gui/qt/components/open_panels.cpp:893 +#: modules/gui/qt/components/open_panels.cpp:873 msgid "Channels:" msgstr "ቻናሎች፡ " -#: modules/gui/qt/components/open_panels.cpp:904 +#: modules/gui/qt/components/open_panels.cpp:884 msgid "Selected ports:" msgstr "የተመረጡ ወደቦች " -#: modules/gui/qt/components/open_panels.cpp:907 +#: modules/gui/qt/components/open_panels.cpp:887 msgid ".*" msgstr ".*" -#: modules/gui/qt/components/open_panels.cpp:914 +#: modules/gui/qt/components/open_panels.cpp:894 msgid "Use VLC pace" msgstr "ቪኤልሲ ፍጥነትን ተጠቀም " -#: modules/gui/qt/components/open_panels.cpp:934 +#: modules/gui/qt/components/open_panels.cpp:914 msgid "TV - digital" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:937 +#: modules/gui/qt/components/open_panels.cpp:917 msgid "Tuner card" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:938 +#: modules/gui/qt/components/open_panels.cpp:918 msgid "Delivery system" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:968 +#: modules/gui/qt/components/open_panels.cpp:948 msgid "Transponder/multiplex frequency" msgstr "ትራንስፖንደር/ባለብዙ ድግግሞሽ " -#: modules/gui/qt/components/open_panels.cpp:978 +#: modules/gui/qt/components/open_panels.cpp:958 msgid "Transponder symbol rate" msgstr "የትራንስፖንደር ምልክት ፍጥነት" -#: modules/gui/qt/components/open_panels.cpp:1011 +#: modules/gui/qt/components/open_panels.cpp:991 msgid "Bandwidth" msgstr "መተላለፊያ ይዘት" -#: modules/gui/qt/components/open_panels.cpp:1055 +#: modules/gui/qt/components/open_panels.cpp:1035 msgid "TV - analog" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1058 +#: modules/gui/qt/components/open_panels.cpp:1038 msgid "Device name" msgstr "የመሳሪያ ስም" -#: modules/gui/qt/components/open_panels.cpp:1118 +#: modules/gui/qt/components/open_panels.cpp:1098 msgid "Your display will be opened and played in order to stream or save it." msgstr "" #. xgettext: frames per second -#: modules/gui/qt/components/open_panels.cpp:1132 +#: modules/gui/qt/components/open_panels.cpp:1112 msgid " f/s" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1347 +#: modules/gui/qt/components/open_panels.cpp:1327 msgid "Advanced Options" msgstr "የላቁ ምርጫዎች " @@ -18879,11 +18884,11 @@ msgid "Internet" msgstr "" -#: modules/gui/qt/components/playlist/selector.cpp:443 +#: modules/gui/qt/components/playlist/selector.cpp:456 msgid "Remove this podcast subscription" msgstr "ይህንን የፖድካስት የደንበኝነት ምዝገባ አስወግድ " -#: modules/gui/qt/components/playlist/selector.cpp:594 +#: modules/gui/qt/components/playlist/selector.cpp:607 msgid "Do you really want to unsubscribe from %1?" msgstr "ከ %1 ደንበኝነት መተው ትፈልጋለህ? " @@ -18923,35 +18928,35 @@ msgid "Enter a new name for the folder:" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:254 +#: modules/gui/qt/components/playlist/standardpanel.cpp:255 msgid "Sort by" msgstr "በ ... ደርድር " -#: modules/gui/qt/components/playlist/standardpanel.cpp:261 +#: modules/gui/qt/components/playlist/standardpanel.cpp:262 msgid "Ascending" msgstr "ሽቅብታ " -#: modules/gui/qt/components/playlist/standardpanel.cpp:265 +#: modules/gui/qt/components/playlist/standardpanel.cpp:266 msgid "Descending" msgstr "አቆልቋይ" -#: modules/gui/qt/components/playlist/standardpanel.cpp:278 +#: modules/gui/qt/components/playlist/standardpanel.cpp:279 msgid "Display size" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:279 +#: modules/gui/qt/components/playlist/standardpanel.cpp:280 msgid "Increase" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:280 +#: modules/gui/qt/components/playlist/standardpanel.cpp:281 msgid "Decrease" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:413 +#: modules/gui/qt/components/playlist/standardpanel.cpp:414 msgid "Playlist View Mode" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:592 +#: modules/gui/qt/components/playlist/standardpanel.cpp:593 msgid "" "Playlist is currently empty.\n" "Drop a file here or select a media source from the left." @@ -18977,91 +18982,91 @@ msgid "Select File" msgstr "ፋይል ምረጥ " -#: modules/gui/qt/components/preferences_widgets.cpp:1125 +#: modules/gui/qt/components/preferences_widgets.cpp:1129 msgid "" "Select or double click an action to change the associated hotkey. Use delete " "key to remove hotkeys." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1132 +#: modules/gui/qt/components/preferences_widgets.cpp:1136 msgid "in" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1134 +#: modules/gui/qt/components/preferences_widgets.cpp:1138 msgid "Any field" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1135 +#: modules/gui/qt/components/preferences_widgets.cpp:1139 msgid "Actions" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1142 +#: modules/gui/qt/components/preferences_widgets.cpp:1146 msgid "Hotkey" msgstr "ማፍጠኛ ቁልፍ " -#: modules/gui/qt/components/preferences_widgets.cpp:1143 +#: modules/gui/qt/components/preferences_widgets.cpp:1147 msgid "Application level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1144 -#: modules/gui/qt/components/preferences_widgets.cpp:1401 +#: modules/gui/qt/components/preferences_widgets.cpp:1148 +#: modules/gui/qt/components/preferences_widgets.cpp:1405 msgid "Global" msgstr "ለሁሉም " -#: modules/gui/qt/components/preferences_widgets.cpp:1145 +#: modules/gui/qt/components/preferences_widgets.cpp:1149 msgid "Desktop level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1225 -#: modules/gui/qt/components/preferences_widgets.cpp:1226 +#: modules/gui/qt/components/preferences_widgets.cpp:1229 +#: modules/gui/qt/components/preferences_widgets.cpp:1230 msgid "" "Double click to change.\n" "Delete key to remove." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1402 +#: modules/gui/qt/components/preferences_widgets.cpp:1406 msgid "Hotkey change" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1406 +#: modules/gui/qt/components/preferences_widgets.cpp:1410 msgid "Press the new key or combination for " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1415 +#: modules/gui/qt/components/preferences_widgets.cpp:1419 msgid "Assign" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1450 +#: modules/gui/qt/components/preferences_widgets.cpp:1454 msgid "Warning: this key or combination is already assigned to " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1462 +#: modules/gui/qt/components/preferences_widgets.cpp:1466 msgid "Warning: %1 is already an application menu shortcut" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1485 +#: modules/gui/qt/components/preferences_widgets.cpp:1489 msgid "Key or combination: " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1494 +#: modules/gui/qt/components/preferences_widgets.cpp:1498 msgid "Key: " msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:255 -#: modules/gui/qt/components/simple_preferences.cpp:628 +#: modules/gui/qt/components/simple_preferences.cpp:256 +#: modules/gui/qt/components/simple_preferences.cpp:636 msgid "Input & Codecs Settings" msgstr "ግቢትና ኮዴኮች ቅንብር" -#: modules/gui/qt/components/simple_preferences.cpp:257 -#: modules/gui/qt/components/simple_preferences.cpp:912 +#: modules/gui/qt/components/simple_preferences.cpp:258 +#: modules/gui/qt/components/simple_preferences.cpp:938 msgid "Configure Hotkeys" msgstr "ማፍጠኛ ቁልፎችን አዋቅር " -#: modules/gui/qt/components/simple_preferences.cpp:454 +#: modules/gui/qt/components/simple_preferences.cpp:455 msgid "Device:" msgstr "መሳሪያ፡ " -#: modules/gui/qt/components/simple_preferences.cpp:633 +#: modules/gui/qt/components/simple_preferences.cpp:641 msgid "" "If this property is blank, different values\n" "for DVD, VCD, and CDDA are set.\n" @@ -19069,57 +19074,57 @@ "individually in the advanced preferences." msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:701 +#: modules/gui/qt/components/simple_preferences.cpp:712 msgid "Lowest latency" msgstr "ዝቅተኛው ቆይታ " -#: modules/gui/qt/components/simple_preferences.cpp:704 +#: modules/gui/qt/components/simple_preferences.cpp:715 msgid "High latency" msgstr "ረጅም ቆይታ " -#: modules/gui/qt/components/simple_preferences.cpp:705 +#: modules/gui/qt/components/simple_preferences.cpp:716 msgid "Higher latency" msgstr "ከፍተኛ ቆይታ " -#: modules/gui/qt/components/simple_preferences.cpp:753 +#: modules/gui/qt/components/simple_preferences.cpp:764 msgid "This is VLC's skinnable interface. You can download other skins at" msgstr "ይህ የቪልሲ skinnable በይነገጽ ነው። ሌላ skins ልታወርድ ትችላለህ " -#: modules/gui/qt/components/simple_preferences.cpp:755 +#: modules/gui/qt/components/simple_preferences.cpp:766 msgid "VLC skins website" msgstr "ቪልሲ skins ድረ ገጽ " -#: modules/gui/qt/components/simple_preferences.cpp:779 +#: modules/gui/qt/components/simple_preferences.cpp:794 msgid "System's default" msgstr "የስርዓት ነባሪ " -#: modules/gui/qt/components/simple_preferences.cpp:1317 +#: modules/gui/qt/components/simple_preferences.cpp:1344 msgid "File associations" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1326 +#: modules/gui/qt/components/simple_preferences.cpp:1353 #: modules/gui/qt/dialogs_provider.hpp:42 msgid "Audio Files" msgstr "የተሰሚ ፋይሎች " -#: modules/gui/qt/components/simple_preferences.cpp:1327 +#: modules/gui/qt/components/simple_preferences.cpp:1354 #: modules/gui/qt/dialogs_provider.hpp:41 msgid "Video Files" msgstr "የቪድዮ ፋይሎች " -#: modules/gui/qt/components/simple_preferences.cpp:1328 +#: modules/gui/qt/components/simple_preferences.cpp:1355 #: modules/gui/qt/dialogs_provider.hpp:43 msgid "Playlist Files" msgstr "የሙዚቃዎች ዝርዝር ፋይሎች " -#: modules/gui/qt/components/simple_preferences.cpp:1393 +#: modules/gui/qt/components/simple_preferences.cpp:1420 msgid "&Apply" msgstr "&ተግብር " -#: modules/gui/qt/components/simple_preferences.cpp:1394 +#: modules/gui/qt/components/simple_preferences.cpp:1421 #: modules/gui/qt/dialogs/convert.cpp:137 -#: modules/gui/qt/dialogs/gototime.cpp:49 modules/gui/qt/dialogs/open.cpp:108 -#: modules/gui/qt/dialogs/openurl.cpp:60 +#: modules/gui/qt/dialogs/gototime.cpp:48 modules/gui/qt/dialogs/open.cpp:109 +#: modules/gui/qt/dialogs/openurl.cpp:59 #: modules/gui/qt/dialogs/podcast_configuration.cpp:37 #: modules/gui/qt/dialogs/preferences.cpp:97 #: modules/gui/qt/dialogs/toolbar.cpp:198 @@ -19163,84 +19168,84 @@ msgid "You must set a name for the profile." msgstr "ለመገለጫው ስም ማዘጋጀት አለብህ። " -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Directory" msgstr "ፋይል/ዕፀ ማውጫ " -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Folder" msgstr "ፋይል/አቃፊ " -#: modules/gui/qt/components/sout/sout_widgets.cpp:47 +#: modules/gui/qt/components/sout/sout_widgets.cpp:48 #: modules/gui/qt/ui/sout.h:199 msgid "Source" msgstr "ምንጭ " -#: modules/gui/qt/components/sout/sout_widgets.cpp:50 +#: modules/gui/qt/components/sout/sout_widgets.cpp:51 msgid "Source:" msgstr "ምንጭ፡ " -#: modules/gui/qt/components/sout/sout_widgets.cpp:59 +#: modules/gui/qt/components/sout/sout_widgets.cpp:60 msgid "Type:" msgstr "አይነት፡ " -#: modules/gui/qt/components/sout/sout_widgets.cpp:127 +#: modules/gui/qt/components/sout/sout_widgets.cpp:128 msgid "This module writes the transcoded stream to a file." msgstr "ይህ ሞዱል ትራንኮድ ልቀትን ወደ ፋይል ይጽፋል " -#: modules/gui/qt/components/sout/sout_widgets.cpp:129 +#: modules/gui/qt/components/sout/sout_widgets.cpp:130 msgid "Filename" msgstr "የፋይል ስም " -#: modules/gui/qt/components/sout/sout_widgets.cpp:173 +#: modules/gui/qt/components/sout/sout_widgets.cpp:174 #: modules/gui/qt/dialogs/convert.cpp:161 msgid "Save file..." msgstr "ፋይል አስቀምጥ ... " -#: modules/gui/qt/components/sout/sout_widgets.cpp:174 +#: modules/gui/qt/components/sout/sout_widgets.cpp:175 msgid "" "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:184 +#: modules/gui/qt/components/sout/sout_widgets.cpp:185 msgid "This module outputs the transcoded stream to a network via HTTP." msgstr "ይህ ሞዱል ትራንኮድ ልቀትን ወደ በይነ መረብ HTTP በኩል ውፅአት ያደርጋል " -#: modules/gui/qt/components/sout/sout_widgets.cpp:186 -#: modules/gui/qt/components/sout/sout_widgets.cpp:282 +#: modules/gui/qt/components/sout/sout_widgets.cpp:187 +#: modules/gui/qt/components/sout/sout_widgets.cpp:283 msgid "Path" msgstr "ዱካ " -#: modules/gui/qt/components/sout/sout_widgets.cpp:238 +#: modules/gui/qt/components/sout/sout_widgets.cpp:239 msgid "" "This module outputs the transcoded stream to a network via the mms protocol." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:280 +#: modules/gui/qt/components/sout/sout_widgets.cpp:281 msgid "This module outputs the transcoded stream to a network via RTSP." msgstr "ይህ ሞዱል ትራንኮድ ልቀትን ወደ በይነ መረብ RTSP በኩል ውፅአት ያደርጋል " -#: modules/gui/qt/components/sout/sout_widgets.cpp:326 +#: modules/gui/qt/components/sout/sout_widgets.cpp:327 msgid "This module outputs the transcoded stream to a network via UDP." msgstr "ይህ ሞዱል ትራንኮድ ልቀትን ወደ በይነ መረብ UDP በኩል ውፅአት ያደርጋል " -#: modules/gui/qt/components/sout/sout_widgets.cpp:368 +#: modules/gui/qt/components/sout/sout_widgets.cpp:369 msgid "This module outputs the transcoded stream to a network via RTP." msgstr "ይህ ሞዱል ትራንኮድ ልቀትን ወደ በይነ መረብ RTP በኩል ውፅአት ያደርጋል " -#: modules/gui/qt/components/sout/sout_widgets.cpp:375 +#: modules/gui/qt/components/sout/sout_widgets.cpp:376 msgid "Base port" msgstr "መሠረታዊ ዱካ " -#: modules/gui/qt/components/sout/sout_widgets.cpp:423 +#: modules/gui/qt/components/sout/sout_widgets.cpp:424 msgid "This module outputs the transcoded stream to an Icecast server." msgstr "ይህ ሞዱል ትራንኮድ ልቀትን ወደ Icecast አገልጋይ በኩል ውፅአት ያደርጋል " -#: modules/gui/qt/components/sout/sout_widgets.cpp:442 +#: modules/gui/qt/components/sout/sout_widgets.cpp:443 msgid "Mount Point" msgstr "ማጣበቂያ ነጥብ " -#: modules/gui/qt/components/sout/sout_widgets.cpp:443 +#: modules/gui/qt/components/sout/sout_widgets.cpp:444 msgid "Login:pass" msgstr " ግባ፡ እለፍ " @@ -19266,13 +19271,13 @@ #: modules/gui/qt/dialogs/bookmarks.cpp:62 modules/gui/qt/dialogs/epg.cpp:92 #: modules/gui/qt/dialogs/errors.cpp:49 modules/gui/qt/dialogs/extended.cpp:130 -#: modules/gui/qt/dialogs/help.cpp:66 modules/gui/qt/dialogs/help.cpp:212 +#: modules/gui/qt/dialogs/help.cpp:64 modules/gui/qt/dialogs/help.cpp:223 #: modules/gui/qt/dialogs/mediainfo.cpp:80 -#: modules/gui/qt/dialogs/messages.cpp:84 modules/gui/qt/dialogs/plugins.cpp:94 -#: modules/gui/qt/dialogs/plugins.cpp:1438 -#: modules/gui/qt/dialogs/plugins.cpp:1551 +#: modules/gui/qt/dialogs/messages.cpp:81 modules/gui/qt/dialogs/plugins.cpp:93 +#: modules/gui/qt/dialogs/plugins.cpp:1437 +#: modules/gui/qt/dialogs/plugins.cpp:1550 #: modules/gui/qt/dialogs/podcast_configuration.cpp:36 -#: modules/gui/qt/dialogs/vlm.cpp:136 +#: modules/gui/qt/dialogs/vlm.cpp:130 msgid "&Close" msgstr "&ዝጋ " @@ -19292,7 +19297,7 @@ msgid "Destination" msgstr "መድረሻ " -#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:413 +#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:414 msgid "Destination file:" msgstr "መድረሻ ፋይል፡ " @@ -19332,16 +19337,16 @@ msgid "Containers" msgstr "" -#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:431 +#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:434 msgid "Program Guide" msgstr "የፕሮግራም መመሪያ" -#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:286 -#: modules/gui/qt/ui/about.h:287 +#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:283 +#: modules/gui/qt/ui/about.h:284 msgid "Update" msgstr "አዘምን " -#: modules/gui/qt/dialogs/epg.cpp:161 +#: modules/gui/qt/dialogs/epg.cpp:162 msgid " (%1+ rated)" msgstr "" @@ -19378,7 +19383,7 @@ msgid "&Save" msgstr "&አስቀምጥ " -#: modules/gui/qt/dialogs/external.cpp:216 +#: modules/gui/qt/dialogs/external.cpp:218 msgid "Store the Password" msgstr "" @@ -19409,60 +19414,60 @@ msgid "Regularly check for VLC updates" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:42 +#: modules/gui/qt/dialogs/gototime.cpp:41 msgid "Go to Time" msgstr "ወደ ሰአት ሂድ " -#: modules/gui/qt/dialogs/gototime.cpp:48 +#: modules/gui/qt/dialogs/gototime.cpp:47 msgid "&Go" msgstr "&ሂድ " -#: modules/gui/qt/dialogs/gototime.cpp:56 +#: modules/gui/qt/dialogs/gototime.cpp:55 msgid "Go to time" msgstr "ወደ ሰአት ሂድ" -#: modules/gui/qt/dialogs/help.cpp:86 modules/gui/qt/dialogs/plugins.cpp:1376 -#: modules/gui/qt/dialogs/plugins.cpp:1459 +#: modules/gui/qt/dialogs/help.cpp:84 modules/gui/qt/dialogs/plugins.cpp:1375 +#: modules/gui/qt/dialogs/plugins.cpp:1458 msgid "About" msgstr "ስለ " -#: modules/gui/qt/dialogs/help.cpp:94 +#: modules/gui/qt/dialogs/help.cpp:101 msgid "" "

VLC media player is a free and open source media player, encoder, and " "streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:214 +#: modules/gui/qt/dialogs/help.cpp:225 msgid "&Recheck version" msgstr "&የዳግም ማጣሪያ ቅጂ " -#: modules/gui/qt/dialogs/help.cpp:217 +#: modules/gui/qt/dialogs/help.cpp:228 msgid "&Yes" msgstr "&አዎ " -#: modules/gui/qt/dialogs/help.cpp:219 +#: modules/gui/qt/dialogs/help.cpp:230 msgid "&No" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:222 modules/gui/qt/ui/update.h:144 +#: modules/gui/qt/dialogs/help.cpp:233 modules/gui/qt/ui/update.h:144 msgid "VLC media player updates" msgstr "የቪኤልሲ ማጫወቻ ዝመናዎች " -#: modules/gui/qt/dialogs/help.cpp:294 +#: modules/gui/qt/dialogs/help.cpp:305 msgid "A new version of VLC (%1.%2.%3%4) is available." msgstr "" -#: modules/gui/qt/dialogs/help.cpp:319 +#: modules/gui/qt/dialogs/help.cpp:330 msgid "You have the latest version of VLC media player." msgstr "የቅርብ የቪኤልሲ ማጫወቻ አለህ ። " -#: modules/gui/qt/dialogs/help.cpp:326 +#: modules/gui/qt/dialogs/help.cpp:337 msgid "An error occurred while checking for updates..." msgstr "ዝመናዎችን በሚያጣራበት ጊዜ ስህተት አጋጥሟል ... " @@ -19494,23 +19499,23 @@ msgid "Location:" msgstr "ቦታ" -#: modules/gui/qt/dialogs/messages.cpp:91 +#: modules/gui/qt/dialogs/messages.cpp:88 msgid "Saves all the displayed logs to a file" msgstr "ሁሉንም የታዩ ምዝግብ ማስታወሻዎችን ወደ ፋይል ያስቀጣል " -#: modules/gui/qt/dialogs/messages.cpp:259 +#: modules/gui/qt/dialogs/messages.cpp:256 msgid "Save log file as..." msgstr "ምዝግብ ማስታወሻ ፋይል እንደ ... አስቀምጥ " -#: modules/gui/qt/dialogs/messages.cpp:261 +#: modules/gui/qt/dialogs/messages.cpp:258 msgid "Texts/Logs (*.log *.txt);; All (*.*)" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:267 +#: modules/gui/qt/dialogs/messages.cpp:264 msgid "Application" msgstr "መተግበሪያ " -#: modules/gui/qt/dialogs/messages.cpp:268 +#: modules/gui/qt/dialogs/messages.cpp:265 msgid "" "Cannot write to file %1:\n" "%2." @@ -19518,179 +19523,179 @@ "ለ ፋይል %1:\n" " መጻፍ አልተቻለም " -#: modules/gui/qt/dialogs/messages.cpp:334 +#: modules/gui/qt/dialogs/messages.cpp:331 msgid "Update the tree" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:335 +#: modules/gui/qt/dialogs/messages.cpp:332 msgid "Clear the messages" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:78 modules/gui/qt/menus.cpp:935 -#: modules/gui/qt/menus.cpp:1132 +#: modules/gui/qt/dialogs/open.cpp:79 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:1137 msgid "Open Media" msgstr "ማህደረ መረጃ ክፈት " -#: modules/gui/qt/dialogs/open.cpp:90 +#: modules/gui/qt/dialogs/open.cpp:91 msgid "&File" msgstr "&ፋይል" -#: modules/gui/qt/dialogs/open.cpp:92 +#: modules/gui/qt/dialogs/open.cpp:93 msgid "&Disc" msgstr "&ዲስክ " -#: modules/gui/qt/dialogs/open.cpp:94 +#: modules/gui/qt/dialogs/open.cpp:95 msgid "&Network" msgstr "&አውታረ መረብ " -#: modules/gui/qt/dialogs/open.cpp:96 +#: modules/gui/qt/dialogs/open.cpp:97 msgid "Capture &Device" msgstr "መቅረጫ መሳሪያ " -#: modules/gui/qt/dialogs/open.cpp:111 +#: modules/gui/qt/dialogs/open.cpp:112 msgid "&Select" msgstr "&ምረጥ " -#: modules/gui/qt/dialogs/open.cpp:115 modules/gui/qt/dialogs/open.cpp:210 -#: modules/gui/qt/dialogs/openurl.cpp:57 +#: modules/gui/qt/dialogs/open.cpp:116 modules/gui/qt/dialogs/open.cpp:211 +#: modules/gui/qt/dialogs/openurl.cpp:56 msgid "&Enqueue" msgstr "&Enqueue" -#: modules/gui/qt/dialogs/open.cpp:117 modules/gui/qt/dialogs/open.cpp:214 -#: modules/gui/qt/dialogs/openurl.cpp:54 modules/gui/qt/menus.cpp:824 +#: modules/gui/qt/dialogs/open.cpp:118 modules/gui/qt/dialogs/open.cpp:215 +#: modules/gui/qt/dialogs/openurl.cpp:53 modules/gui/qt/menus.cpp:829 msgid "&Play" msgstr "&አጫውት " -#: modules/gui/qt/dialogs/open.cpp:119 modules/gui/qt/dialogs/open.cpp:204 +#: modules/gui/qt/dialogs/open.cpp:120 modules/gui/qt/dialogs/open.cpp:205 msgid "&Stream" msgstr "&ልቀቅ " -#: modules/gui/qt/dialogs/open.cpp:121 +#: modules/gui/qt/dialogs/open.cpp:122 msgid "C&onvert" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:207 +#: modules/gui/qt/dialogs/open.cpp:208 msgid "C&onvert / Save" msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:47 +#: modules/gui/qt/dialogs/openurl.cpp:46 msgid "Open URL" msgstr "ዩአርኤል ክፈት " -#: modules/gui/qt/dialogs/openurl.cpp:64 +#: modules/gui/qt/dialogs/openurl.cpp:63 msgid "Enter URL here..." msgstr "እዚህ... ዩአርኤል አስገባ " -#: modules/gui/qt/dialogs/openurl.cpp:67 +#: modules/gui/qt/dialogs/openurl.cpp:66 msgid "Please enter the URL or path to the media you want to play." msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:71 +#: modules/gui/qt/dialogs/openurl.cpp:70 msgid "" "If your clipboard contains a valid URL\n" "or the path to a file on your computer,\n" "it will be automatically selected." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:80 +#: modules/gui/qt/dialogs/plugins.cpp:79 msgid "Plugins and extensions" msgstr "ተሰኪዎችና ቅጥያዎች " -#: modules/gui/qt/dialogs/plugins.cpp:88 +#: modules/gui/qt/dialogs/plugins.cpp:87 msgid "Active Extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Capability" msgstr "ብቃት" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Score" msgstr "ነጥብ" -#: modules/gui/qt/dialogs/plugins.cpp:141 +#: modules/gui/qt/dialogs/plugins.cpp:140 msgid "&Search:" msgstr "&ፈልግ" -#: modules/gui/qt/dialogs/plugins.cpp:259 -#: modules/gui/qt/dialogs/plugins.cpp:1292 +#: modules/gui/qt/dialogs/plugins.cpp:258 +#: modules/gui/qt/dialogs/plugins.cpp:1291 msgid "More information..." msgstr "ተጨማሪ መረጃ... " -#: modules/gui/qt/dialogs/plugins.cpp:267 +#: modules/gui/qt/dialogs/plugins.cpp:266 msgid "Reload extensions" msgstr "ቅጥያዎችን ዳግም አስገባ" -#: modules/gui/qt/dialogs/plugins.cpp:386 +#: modules/gui/qt/dialogs/plugins.cpp:385 msgid "" "Skins customize player's appearance. You can activate them through " "preferences." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:390 +#: modules/gui/qt/dialogs/plugins.cpp:389 msgid "" "Playlist parsers add new capabilities to read internet streams or extract " "meta data." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:394 +#: modules/gui/qt/dialogs/plugins.cpp:393 msgid "" "Service discoveries adds new sources to your playlist such as web radios, " "video websites, ..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:401 +#: modules/gui/qt/dialogs/plugins.cpp:400 msgid "Retrieves extra info and art for playlist items" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:404 +#: modules/gui/qt/dialogs/plugins.cpp:403 msgid "" "Extensions brings various enhancements. Check descriptions for more details" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:425 +#: modules/gui/qt/dialogs/plugins.cpp:424 msgid "Only installed" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:531 +#: modules/gui/qt/dialogs/plugins.cpp:530 msgid "Retrieving addons..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:542 +#: modules/gui/qt/dialogs/plugins.cpp:541 msgid "No addons found" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:821 +#: modules/gui/qt/dialogs/plugins.cpp:820 msgid "This addon has been installed manually. VLC can't manage it by itself." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1204 +#: modules/gui/qt/dialogs/plugins.cpp:1203 msgid "Version %1" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1232 +#: modules/gui/qt/dialogs/plugins.cpp:1231 msgid "%1 downloads" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1301 +#: modules/gui/qt/dialogs/plugins.cpp:1300 msgid "&Uninstall" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1304 +#: modules/gui/qt/dialogs/plugins.cpp:1303 msgid "&Install" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1399 -#: modules/gui/qt/dialogs/plugins.cpp:1502 +#: modules/gui/qt/dialogs/plugins.cpp:1398 +#: modules/gui/qt/dialogs/plugins.cpp:1501 msgid "Version" msgstr "ቅጂ " -#: modules/gui/qt/dialogs/plugins.cpp:1419 -#: modules/gui/qt/dialogs/plugins.cpp:1529 +#: modules/gui/qt/dialogs/plugins.cpp:1418 +#: modules/gui/qt/dialogs/plugins.cpp:1528 msgid "Website" msgstr "ድረ ጣቢያ " -#: modules/gui/qt/dialogs/plugins.cpp:1541 modules/gui/qt/ui/sprefs_input.h:363 +#: modules/gui/qt/dialogs/plugins.cpp:1540 modules/gui/qt/ui/sprefs_input.h:363 msgid "Files" msgstr "ፋይሎች " @@ -19750,11 +19755,11 @@ msgid "Are you sure you want to reset your VLC media player preferences?" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:45 modules/gui/qt/ui/sout.h:198 +#: modules/gui/qt/dialogs/sout.cpp:43 modules/gui/qt/ui/sout.h:198 msgid "Stream Output" msgstr "ውጽአት ልቀቅ " -#: modules/gui/qt/dialogs/sout.cpp:51 +#: modules/gui/qt/dialogs/sout.cpp:49 msgid "" "This wizard will allow you to stream or convert your media for use locally, " "on your private network, or on the Internet.\n" @@ -19762,14 +19767,14 @@ "be and then press the \"Next\" button to continue.\n" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:58 +#: modules/gui/qt/dialogs/sout.cpp:56 msgid "" "Stream output string.\n" "This is automatically generated when you change the above settings,\n" "but you can change it manually." msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:91 +#: modules/gui/qt/dialogs/sout.cpp:89 msgid "Back" msgstr "መልስ " @@ -19901,67 +19906,67 @@ msgid "Speed selector" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:73 +#: modules/gui/qt/dialogs/vlm.cpp:67 msgid "Broadcast" msgstr "አሰራጭ " -#: modules/gui/qt/dialogs/vlm.cpp:74 +#: modules/gui/qt/dialogs/vlm.cpp:68 msgid "Schedule" msgstr "መርሃ ግብር አውጣ " -#: modules/gui/qt/dialogs/vlm.cpp:75 +#: modules/gui/qt/dialogs/vlm.cpp:69 msgid "Video On Demand ( VOD )" msgstr "ቪዲዮ በጥየቃ (ቪ ኦ ዲ) " -#: modules/gui/qt/dialogs/vlm.cpp:80 +#: modules/gui/qt/dialogs/vlm.cpp:74 msgid "Hours / Minutes / Seconds:" msgstr "ሰአቶች/ደቂቃዎች/ሰከንዶች፡ " -#: modules/gui/qt/dialogs/vlm.cpp:82 +#: modules/gui/qt/dialogs/vlm.cpp:76 msgid "Day / Month / Year:" msgstr "ቀን/ወር/አመት " -#: modules/gui/qt/dialogs/vlm.cpp:84 +#: modules/gui/qt/dialogs/vlm.cpp:78 msgid "Repeat:" msgstr "ድገም፡ " -#: modules/gui/qt/dialogs/vlm.cpp:86 +#: modules/gui/qt/dialogs/vlm.cpp:80 msgid "Repeat delay:" msgstr "ማዘግየቱን ድገመው፡ " -#: modules/gui/qt/dialogs/vlm.cpp:111 modules/gui/qt/ui/sprefs_interface.h:555 +#: modules/gui/qt/dialogs/vlm.cpp:105 modules/gui/qt/ui/sprefs_interface.h:562 msgid " days" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:130 +#: modules/gui/qt/dialogs/vlm.cpp:124 msgid "I&mport" msgstr "አስመጣ " -#: modules/gui/qt/dialogs/vlm.cpp:133 +#: modules/gui/qt/dialogs/vlm.cpp:127 msgid "E&xport" msgstr "ላ&ክ " -#: modules/gui/qt/dialogs/vlm.cpp:264 +#: modules/gui/qt/dialogs/vlm.cpp:258 msgid "Save VLM configuration as..." msgstr "ቪኤልኤም ውቅረቱን እንደ ... አስቀምጥ " -#: modules/gui/qt/dialogs/vlm.cpp:266 modules/gui/qt/dialogs/vlm.cpp:335 +#: modules/gui/qt/dialogs/vlm.cpp:260 modules/gui/qt/dialogs/vlm.cpp:329 msgid "VLM conf (*.vlm);;All (*)" msgstr "ቪኤልኤም ውቅረት (*.vlm);;ሁሉም (*)" -#: modules/gui/qt/dialogs/vlm.cpp:333 +#: modules/gui/qt/dialogs/vlm.cpp:327 msgid "Open VLM configuration..." msgstr "ቪኤሌም ውቅረትን ክፈት ..." -#: modules/gui/qt/dialogs/vlm.cpp:532 +#: modules/gui/qt/dialogs/vlm.cpp:526 msgid "Broadcast: " msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:605 +#: modules/gui/qt/dialogs/vlm.cpp:599 msgid "Schedule: " msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:629 +#: modules/gui/qt/dialogs/vlm.cpp:623 msgid "VOD: " msgstr "" @@ -20019,339 +20024,339 @@ msgid "Deactivate" msgstr "" -#: modules/gui/qt/main_interface.cpp:373 +#: modules/gui/qt/main_interface.cpp:378 msgid "Do you want to restart the playback where left off?" msgstr "" -#: modules/gui/qt/main_interface.cpp:379 +#: modules/gui/qt/main_interface.cpp:384 msgid "&Continue" msgstr "" -#: modules/gui/qt/main_interface.cpp:1421 +#: modules/gui/qt/main_interface.cpp:1454 msgid "Control menu for the player" msgstr "ለአጫዋቹ የመቆጣጠሪያ ምንአሌ " -#: modules/gui/qt/main_interface.cpp:1465 +#: modules/gui/qt/main_interface.cpp:1498 msgid "Paused" msgstr "ለጊዜው የቆመ " -#: modules/gui/qt/menus.cpp:331 +#: modules/gui/qt/menus.cpp:334 msgid "&Media" msgstr "&ማህደረ መረጃ " -#: modules/gui/qt/menus.cpp:334 +#: modules/gui/qt/menus.cpp:337 msgid "P&layback" msgstr "መልሰህ አጫውት " -#: modules/gui/qt/menus.cpp:335 modules/gui/qt/menus.cpp:1050 +#: modules/gui/qt/menus.cpp:338 modules/gui/qt/menus.cpp:1055 msgid "&Audio" msgstr "&ተሰሚ " -#: modules/gui/qt/menus.cpp:336 modules/gui/qt/menus.cpp:1057 +#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1062 msgid "&Video" msgstr "&ቪድዮ " -#: modules/gui/qt/menus.cpp:337 modules/gui/qt/menus.cpp:1064 +#: modules/gui/qt/menus.cpp:340 modules/gui/qt/menus.cpp:1069 msgid "Subti&tle" msgstr "" -#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1080 +#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1085 msgid "Tool&s" msgstr "" -#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1087 +#: modules/gui/qt/menus.cpp:345 modules/gui/qt/menus.cpp:1092 msgid "V&iew" msgstr "&እይ " -#: modules/gui/qt/menus.cpp:344 modules/gui/qt/menus.cpp:788 +#: modules/gui/qt/menus.cpp:347 modules/gui/qt/menus.cpp:793 msgid "&Help" msgstr "&እገዛ " -#: modules/gui/qt/menus.cpp:357 +#: modules/gui/qt/menus.cpp:360 msgid "Open &File..." msgstr "" -#: modules/gui/qt/menus.cpp:359 +#: modules/gui/qt/menus.cpp:362 msgid "&Open Multiple Files..." msgstr "" -#: modules/gui/qt/menus.cpp:363 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:366 modules/gui/qt/menus.cpp:945 msgid "Open &Disc..." msgstr "&ዲስክ ክፍት..." -#: modules/gui/qt/menus.cpp:365 +#: modules/gui/qt/menus.cpp:368 msgid "Open &Network Stream..." msgstr "&የአውታረ መረብ ዥረት ክፈት..." -#: modules/gui/qt/menus.cpp:367 modules/gui/qt/menus.cpp:944 +#: modules/gui/qt/menus.cpp:370 modules/gui/qt/menus.cpp:949 msgid "Open &Capture Device..." msgstr "&የመቅረጫ መሳሪያ ክፈት..." -#: modules/gui/qt/menus.cpp:370 +#: modules/gui/qt/menus.cpp:373 msgid "Open &Location from clipboard" msgstr "ቦታ ከቅንጥብ ሰሌዳ ክፈት " -#: modules/gui/qt/menus.cpp:374 +#: modules/gui/qt/menus.cpp:377 msgid "Open &Recent Media" msgstr "" -#: modules/gui/qt/menus.cpp:387 +#: modules/gui/qt/menus.cpp:390 msgid "Conve&rt / Save..." msgstr "ለውጥ/አስቀምጥ ..." -#: modules/gui/qt/menus.cpp:389 +#: modules/gui/qt/menus.cpp:392 msgid "&Stream..." msgstr "" -#: modules/gui/qt/menus.cpp:394 +#: modules/gui/qt/menus.cpp:397 msgid "Quit at the end of playlist" msgstr "" -#: modules/gui/qt/menus.cpp:401 +#: modules/gui/qt/menus.cpp:404 msgid "Close to systray" msgstr "" -#: modules/gui/qt/menus.cpp:405 modules/gui/qt/menus.cpp:1194 +#: modules/gui/qt/menus.cpp:408 modules/gui/qt/menus.cpp:1199 msgid "&Quit" msgstr "&ጨርስና አቁም " -#: modules/gui/qt/menus.cpp:415 +#: modules/gui/qt/menus.cpp:418 msgid "&Effects and Filters" msgstr "ተጽዕኖዎችና ማጣሪያዎች " -#: modules/gui/qt/menus.cpp:418 +#: modules/gui/qt/menus.cpp:421 msgid "&Track Synchronization" msgstr "&የሙዚቃ ስምሪያ " -#: modules/gui/qt/menus.cpp:437 +#: modules/gui/qt/menus.cpp:440 msgid "Plu&gins and extensions" msgstr "ተሰኪዎችና ቅጥያዎች " -#: modules/gui/qt/menus.cpp:442 +#: modules/gui/qt/menus.cpp:445 msgid "Customi&ze Interface..." msgstr "በይነገጽን አብጅ... " -#: modules/gui/qt/menus.cpp:445 +#: modules/gui/qt/menus.cpp:448 msgid "&Preferences" msgstr "ምርጫዎች" -#: modules/gui/qt/menus.cpp:466 +#: modules/gui/qt/menus.cpp:469 msgid "&View" msgstr "እይ " -#: modules/gui/qt/menus.cpp:487 +#: modules/gui/qt/menus.cpp:490 msgid "Play&list" msgstr "የሙዚቃዎች &ዝርዝር" -#: modules/gui/qt/menus.cpp:488 +#: modules/gui/qt/menus.cpp:491 msgid "Ctrl+L" msgstr "Ctrl+L" -#: modules/gui/qt/menus.cpp:491 +#: modules/gui/qt/menus.cpp:494 msgid "Docked Playlist" msgstr "ትክል የሙዚቃዎች ዝርዝር " -#: modules/gui/qt/menus.cpp:501 +#: modules/gui/qt/menus.cpp:504 msgid "Always on &top" msgstr "" -#: modules/gui/qt/menus.cpp:509 +#: modules/gui/qt/menus.cpp:512 msgid "Mi&nimal Interface" msgstr "" -#: modules/gui/qt/menus.cpp:510 +#: modules/gui/qt/menus.cpp:513 msgid "Ctrl+H" msgstr "Ctrl+H" -#: modules/gui/qt/menus.cpp:519 +#: modules/gui/qt/menus.cpp:522 msgid "&Fullscreen Interface" msgstr "& የሙሉማያ በይነገጽ " -#: modules/gui/qt/menus.cpp:527 +#: modules/gui/qt/menus.cpp:530 msgid "&Advanced Controls" msgstr "የላቁ መቆጣጠሪያዎች " -#: modules/gui/qt/menus.cpp:534 +#: modules/gui/qt/menus.cpp:538 msgid "Status Bar" msgstr "" -#: modules/gui/qt/menus.cpp:539 +#: modules/gui/qt/menus.cpp:544 msgid "Visualizations selector" msgstr "የማሳያዎች መምረጫ " -#: modules/gui/qt/menus.cpp:597 +#: modules/gui/qt/menus.cpp:602 msgid "&Increase Volume" msgstr "" -#: modules/gui/qt/menus.cpp:600 +#: modules/gui/qt/menus.cpp:605 msgid "D&ecrease Volume" msgstr "" -#: modules/gui/qt/menus.cpp:603 +#: modules/gui/qt/menus.cpp:608 msgid "&Mute" msgstr "" -#: modules/gui/qt/menus.cpp:619 +#: modules/gui/qt/menus.cpp:624 msgid "Audio &Device" msgstr "የተሰሚ መሳሪያ " -#: modules/gui/qt/menus.cpp:623 +#: modules/gui/qt/menus.cpp:628 msgid "Audio &Track" msgstr "የተሰሚ ሙዚቃ " -#: modules/gui/qt/menus.cpp:625 +#: modules/gui/qt/menus.cpp:630 msgid "&Stereo Mode" msgstr "" -#: modules/gui/qt/menus.cpp:628 +#: modules/gui/qt/menus.cpp:633 msgid "&Visualizations" msgstr "&ማሳያዎች " -#: modules/gui/qt/menus.cpp:654 +#: modules/gui/qt/menus.cpp:659 msgid "Add &Subtitle File..." msgstr "" -#: modules/gui/qt/menus.cpp:656 +#: modules/gui/qt/menus.cpp:661 msgid "Sub &Track" msgstr "" -#: modules/gui/qt/menus.cpp:678 +#: modules/gui/qt/menus.cpp:683 msgid "Video &Track" msgstr "የቪድዮ &ሙዚቃ " -#: modules/gui/qt/menus.cpp:682 +#: modules/gui/qt/menus.cpp:687 msgid "&Fullscreen" msgstr "&ሙሉ ማያ " -#: modules/gui/qt/menus.cpp:683 +#: modules/gui/qt/menus.cpp:688 msgid "Always Fit &Window" msgstr "" -#: modules/gui/qt/menus.cpp:684 +#: modules/gui/qt/menus.cpp:689 msgid "Set as Wall&paper" msgstr "" -#: modules/gui/qt/menus.cpp:688 +#: modules/gui/qt/menus.cpp:693 msgid "&Zoom" msgstr "&አጉላ " -#: modules/gui/qt/menus.cpp:689 +#: modules/gui/qt/menus.cpp:694 msgid "&Aspect Ratio" msgstr "ምጥጥነ ገፅታ" -#: modules/gui/qt/menus.cpp:690 +#: modules/gui/qt/menus.cpp:695 msgid "&Crop" msgstr "&ከርክም " -#: modules/gui/qt/menus.cpp:694 +#: modules/gui/qt/menus.cpp:699 msgid "&Deinterlace" msgstr "&ያልተቆላለፈ " -#: modules/gui/qt/menus.cpp:695 +#: modules/gui/qt/menus.cpp:700 msgid "&Deinterlace mode" msgstr "&የአለመቆለፍ ሁነታ" -#: modules/gui/qt/menus.cpp:699 +#: modules/gui/qt/menus.cpp:704 msgid "Take &Snapshot" msgstr "" -#: modules/gui/qt/menus.cpp:718 +#: modules/gui/qt/menus.cpp:723 msgid "T&itle" msgstr "ር ርዕስ " -#: modules/gui/qt/menus.cpp:719 +#: modules/gui/qt/menus.cpp:724 msgid "&Chapter" msgstr "&ምዕራፍ" -#: modules/gui/qt/menus.cpp:721 +#: modules/gui/qt/menus.cpp:726 msgid "&Program" msgstr "&ፕሮግራም " -#: modules/gui/qt/menus.cpp:725 +#: modules/gui/qt/menus.cpp:730 msgid "&Manage" msgstr "" -#: modules/gui/qt/menus.cpp:791 +#: modules/gui/qt/menus.cpp:796 msgid "Check for &Updates..." msgstr "ዝመናዎችን አጣራ... " -#: modules/gui/qt/menus.cpp:838 +#: modules/gui/qt/menus.cpp:843 msgid "&Stop" msgstr "&አቁም " -#: modules/gui/qt/menus.cpp:846 +#: modules/gui/qt/menus.cpp:851 msgid "Pre&vious" msgstr "ቀዳሚ" -#: modules/gui/qt/menus.cpp:852 +#: modules/gui/qt/menus.cpp:857 msgid "Ne&xt" msgstr "ቀጣ&ይ " -#: modules/gui/qt/menus.cpp:870 +#: modules/gui/qt/menus.cpp:875 msgid "Sp&eed" msgstr "" -#: modules/gui/qt/menus.cpp:876 +#: modules/gui/qt/menus.cpp:881 msgid "&Faster" msgstr "&ፈጣን " -#: modules/gui/qt/menus.cpp:888 +#: modules/gui/qt/menus.cpp:893 msgid "N&ormal Speed" msgstr "የተ&ለመደ ፍጥነት " -#: modules/gui/qt/menus.cpp:898 +#: modules/gui/qt/menus.cpp:903 msgid "Slo&wer" msgstr "ዝግ ያለ " -#: modules/gui/qt/menus.cpp:913 +#: modules/gui/qt/menus.cpp:918 msgid "&Jump Forward" msgstr "&ወደፊት ዝለል " -#: modules/gui/qt/menus.cpp:920 +#: modules/gui/qt/menus.cpp:925 msgid "Jump Bac&kward" msgstr "ወደኋላ ዝለል " -#: modules/gui/qt/menus.cpp:927 +#: modules/gui/qt/menus.cpp:932 msgid "Ctrl+T" msgstr "" -#: modules/gui/qt/menus.cpp:942 +#: modules/gui/qt/menus.cpp:947 msgid "Open &Network..." msgstr "&አውታረ መረብ ክፈት..." -#: modules/gui/qt/menus.cpp:1036 +#: modules/gui/qt/menus.cpp:1041 msgid "Leave Fullscreen" msgstr "ሙሉ ማያውን ተው " -#: modules/gui/qt/menus.cpp:1070 +#: modules/gui/qt/menus.cpp:1075 msgid "&Playback" msgstr "& መልሶ ማጫወት " -#: modules/gui/qt/menus.cpp:1175 +#: modules/gui/qt/menus.cpp:1180 msgid "&Hide VLC media player in taskbar" msgstr "" -#: modules/gui/qt/menus.cpp:1181 +#: modules/gui/qt/menus.cpp:1186 msgid "Sho&w VLC media player" msgstr "" -#: modules/gui/qt/menus.cpp:1192 +#: modules/gui/qt/menus.cpp:1197 msgid "&Open Media" msgstr "" -#: modules/gui/qt/menus.cpp:1622 +#: modules/gui/qt/menus.cpp:1627 msgid "&Clear" msgstr "&አጽዳ " -#: modules/gui/qt/menus.cpp:1630 +#: modules/gui/qt/menus.cpp:1635 msgid "&Renderer" msgstr "" -#: modules/gui/qt/menus.cpp:1634 +#: modules/gui/qt/menus.cpp:1639 msgid "" msgstr "" -#: modules/gui/qt/menus.cpp:1647 +#: modules/gui/qt/menus.cpp:1652 msgid "Scanning..." msgstr "" @@ -20428,41 +20433,49 @@ msgstr "ጠቃሚ ያልሆነ ስክተትና ማስጠንቀቂያ መገናኛዎችን አሳይ " #: modules/gui/qt/qt.cpp:124 +msgid "Enable Dark Mode" +msgstr "" + +#: modules/gui/qt/qt.cpp:125 +msgid "Applies a dark theme to the style." +msgstr "" + +#: modules/gui/qt/qt.cpp:127 msgid "Activate the updates availability notification" msgstr "የዝመናዎች መኖር ማስታወቂያን አግብር " -#: modules/gui/qt/qt.cpp:125 +#: modules/gui/qt/qt.cpp:128 msgid "" "Activate the automatic notification of new versions of the software. It runs " "once every two weeks." msgstr "" -#: modules/gui/qt/qt.cpp:128 +#: modules/gui/qt/qt.cpp:131 msgid "Number of days between two update checks" msgstr "በሁለት የዝመና ማጣሪያዎች መካከል ያሉ ቀኖች ቁጥር " -#: modules/gui/qt/qt.cpp:130 +#: modules/gui/qt/qt.cpp:133 msgid "Ask for network policy at start" msgstr "ከመጀመሪያው የአውታረ መረብ መመሪያ ጠይቅ " -#: modules/gui/qt/qt.cpp:132 +#: modules/gui/qt/qt.cpp:135 msgid "Save the recently played items in the menu" msgstr "በቅርብ የተጫወቱ ዝርዝሮችን በምናሌው ላይ አስቀምጥ " -#: modules/gui/qt/qt.cpp:134 +#: modules/gui/qt/qt.cpp:137 msgid "List of words separated by | to filter" msgstr "ለማጣራት በ | የተለዮ ቃላቶች ዝርዝር " -#: modules/gui/qt/qt.cpp:135 +#: modules/gui/qt/qt.cpp:138 msgid "" "Regular expression used to filter the recent items played in the player." msgstr "" -#: modules/gui/qt/qt.cpp:138 +#: modules/gui/qt/qt.cpp:141 msgid "Define the colors of the volume slider" msgstr "" -#: modules/gui/qt/qt.cpp:139 +#: modules/gui/qt/qt.cpp:142 msgid "" "Define the colors of the volume slider\n" "By specifying the 12 numbers separated by a ';'\n" @@ -20470,11 +20483,11 @@ "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255'" msgstr "" -#: modules/gui/qt/qt.cpp:144 +#: modules/gui/qt/qt.cpp:147 msgid "Selection of the starting mode and look" msgstr "" -#: modules/gui/qt/qt.cpp:145 +#: modules/gui/qt/qt.cpp:148 msgid "" "Start VLC with:\n" " - normal mode\n" @@ -20482,57 +20495,57 @@ " - minimal mode with limited controls" msgstr "" -#: modules/gui/qt/qt.cpp:151 +#: modules/gui/qt/qt.cpp:154 msgid "Show a controller in fullscreen mode" msgstr "ተቆጣጣሪን በሙሉ ማያ ዘዴ አሳይ " -#: modules/gui/qt/qt.cpp:152 +#: modules/gui/qt/qt.cpp:155 msgid "Embed the file browser in open dialog" msgstr "የፋይል ማሰሺያ በክፍት መገናኛው አካት " -#: modules/gui/qt/qt.cpp:154 +#: modules/gui/qt/qt.cpp:157 msgid "Define which screen fullscreen goes" msgstr "የትኛው ማያ ሙሉማያ እንደሚሄድ በይን " -#: modules/gui/qt/qt.cpp:155 +#: modules/gui/qt/qt.cpp:158 msgid "Screennumber of fullscreen, instead of same screen where interface is." msgstr "" -#: modules/gui/qt/qt.cpp:158 +#: modules/gui/qt/qt.cpp:161 msgid "Load extensions on startup" msgstr "በማስነሻው ቅጥያዎችን ጫን " -#: modules/gui/qt/qt.cpp:159 +#: modules/gui/qt/qt.cpp:162 msgid "Automatically load the extensions module on startup." msgstr "" -#: modules/gui/qt/qt.cpp:162 +#: modules/gui/qt/qt.cpp:165 msgid "Start in minimal view (without menus)" msgstr "በዝቅተኛ ማያ ጀምር (ከምናሌዎች ውጪ) " -#: modules/gui/qt/qt.cpp:164 +#: modules/gui/qt/qt.cpp:167 msgid "Display background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:165 +#: modules/gui/qt/qt.cpp:168 msgid "" "Display background cone or current album art when not playing. Can be " "disabled to prevent burning screen." msgstr "" -#: modules/gui/qt/qt.cpp:168 +#: modules/gui/qt/qt.cpp:171 msgid "Expanding background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:169 +#: modules/gui/qt/qt.cpp:172 msgid "Background art fits window's size." msgstr "" -#: modules/gui/qt/qt.cpp:171 +#: modules/gui/qt/qt.cpp:174 msgid "Ignore keyboard volume buttons." msgstr "" -#: modules/gui/qt/qt.cpp:173 +#: modules/gui/qt/qt.cpp:176 msgid "" "With this option checked, the volume up, volume down and mute buttons on " "your keyboard will always change your system volume. With this option " @@ -20540,41 +20553,41 @@ "and change the system volume when VLC is not selected." msgstr "" -#: modules/gui/qt/qt.cpp:188 +#: modules/gui/qt/qt.cpp:191 msgid "When to raise the interface" msgstr "" -#: modules/gui/qt/qt.cpp:189 +#: modules/gui/qt/qt.cpp:192 msgid "" "This option allows the interface to be raised automatically when a video/" "audio playback starts, or never." msgstr "" -#: modules/gui/qt/qt.cpp:192 +#: modules/gui/qt/qt.cpp:195 msgid "Fullscreen controller mouse sensitivity" msgstr "" -#: modules/gui/qt/qt.cpp:200 +#: modules/gui/qt/qt.cpp:203 msgid "When minimized" msgstr "" -#: modules/gui/qt/qt.cpp:218 +#: modules/gui/qt/qt.cpp:221 msgid "Qt interface" msgstr "ኪውቲ በይነገጽ " -#: modules/gui/qt/util/customwidgets.cpp:82 +#: modules/gui/qt/util/customwidgets.cpp:80 msgid "errors" msgstr "" -#: modules/gui/qt/util/customwidgets.cpp:83 +#: modules/gui/qt/util/customwidgets.cpp:81 msgid "warnings" msgstr "" -#: modules/gui/qt/util/customwidgets.cpp:84 +#: modules/gui/qt/util/customwidgets.cpp:82 msgid "debug" msgstr "" -#: modules/gui/qt/util/searchlineedit.cpp:49 +#: modules/gui/qt/util/searchlineedit.cpp:50 msgctxt "Tooltip|Clear" msgid "Clear" msgstr "አጽዳ " @@ -20671,72 +20684,76 @@ msgid "Open skin..." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:86 modules/hw/d3d9/d3d9_filters.c:68 +#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:68 #: modules/video_filter/adjust.c:61 msgid "Brightness threshold" msgstr "የብሩህነት መጀመሪያ " -#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:69 +#: modules/hw/d3d11/d3d11_filters.c:88 modules/hw/d3d9/d3d9_filters.c:69 #: modules/video_filter/adjust.c:62 msgid "" "When this mode is enabled, pixels will be shown as black or white. The " "threshold value will be the brightness defined below." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:90 modules/hw/d3d9/d3d9_filters.c:72 +#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:72 #: modules/video_filter/adjust.c:65 msgid "Image contrast (0-2)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:73 +#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:73 #: modules/video_filter/adjust.c:66 msgid "Set the image contrast, between 0 and 2. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:74 +#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:74 msgid "Image hue (0-360)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:75 +#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:75 msgid "Set the image hue, between 0 and 360. Defaults to 0." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:76 +#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:76 #: modules/video_filter/adjust.c:69 msgid "Image saturation (0-3)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:77 +#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:77 #: modules/video_filter/adjust.c:70 msgid "Set the image saturation, between 0 and 3. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:78 +#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:78 #: modules/video_filter/adjust.c:71 msgid "Image brightness (0-2)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:79 +#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:79 #: modules/video_filter/adjust.c:72 msgid "Set the image brightness, between 0 and 2. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:80 +#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:80 #: modules/video_filter/adjust.c:73 msgid "Image gamma (0-10)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:81 +#: modules/hw/d3d11/d3d11_filters.c:100 modules/hw/d3d9/d3d9_filters.c:81 #: modules/video_filter/adjust.c:74 msgid "Set the image gamma, between 0.01 and 10. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:670 +#: modules/hw/d3d11/d3d11_filters.c:681 msgid "AMD VQ Enhancer" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:671 -msgid "amf_vqenhancer" +#: modules/hw/d3d11/d3d11_filters.c:687 +msgid "AMD Frame Rate Doubler" +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:690 +msgid "Show indicator" msgstr "" #: modules/hw/d3d9/d3d9_filters.c:454 @@ -21117,11 +21134,11 @@ msgid "System logger (syslog)" msgstr "" -#: modules/lua/extension.c:1194 +#: modules/lua/extension.c:1200 msgid "Extension not responding!" msgstr "" -#: modules/lua/extension.c:1195 +#: modules/lua/extension.c:1201 #, c-format msgid "" "Extension '%s' does not respond.\n" @@ -21149,8 +21166,8 @@ #: modules/lua/vlc.c:53 msgid "" -"Lua interface configuration string. Format is: '[\"\"] = {

For all the saving, converting, transcoding, encoding, muxing and " "streaming tasks, you should find useful information in the Streaming Documentation.

If you are unsure about terminology, please consult the knowledge base.

To understand the main keyboard shortcuts, read the shortcuts page.

Help

Before " -"asking any question, please refer yourself to the FAQ.

You might then get (and give) " -"help on the Forums, the mailing-lists or our IRC " -"channel (#videolan on irc.freenode.net).

Contribute to the " -"project

You can help the VideoLAN project giving some of your time to " -"help the community, to design skins, to translate the documentation, to test " -"and to code. You can also give funds and material to help us. And of course, " -"you can promote VLC media player.

" +"a>.

If you are unsure about terminology, please consult the knowledge base.

To " +"understand the main keyboard shortcuts, read the shortcuts page.

Help

Before asking " +"any question, please refer yourself to the FAQ.

You might then get (and give) help on the " +"Forums, the mailing-lists or our IRC channel " +"(#videolan on irc.freenode.net).

Contribute to the project

You can help the VideoLAN project giving some of your time to help the " +"community, to design skins, to translate the documentation, to test and to " +"code. You can also give funds and material to help us. And of course, you " +"can promote VLC media player.

" msgstr "" #: src/audio_output/filters.c:267 @@ -672,8 +672,8 @@ #: modules/access/dtv/access.c:113 modules/access/dtv/access.c:122 #: modules/access/dtv/access.c:130 modules/access/dtv/access.c:139 #: modules/access/dtv/access.c:147 modules/access/dtv/access.c:169 -#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:991 -#: modules/gui/qt/components/simple_preferences.cpp:394 +#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:971 +#: modules/gui/qt/components/simple_preferences.cpp:395 msgid "Automatic" msgstr "ራሱ በራሱ" @@ -833,7 +833,7 @@ msgstr "decoder" #: src/input/decoder.c:1922 src/input/decoder.c:2205 -#: modules/codec/avcodec/encoder.c:378 modules/codec/avcodec/encoder.c:918 +#: modules/codec/avcodec/encoder.c:394 modules/codec/avcodec/encoder.c:939 #: modules/stream_out/es.c:349 modules/stream_out/es.c:362 msgid "Streaming / Transcoding failed" msgstr "" @@ -848,7 +848,7 @@ msgstr "" #: src/input/es_out.c:956 src/input/es_out.c:961 src/libvlc-module.c:239 -#: modules/gui/qt/components/open_panels.cpp:547 +#: modules/gui/qt/components/open_panels.cpp:527 msgid "Track" msgstr "ተረኛ" @@ -873,7 +873,7 @@ msgstr "ተቀላቅሏል" #: src/input/es_out.c:1463 modules/keystore/keychain.m:41 -#: modules/lua/extension.c:1193 +#: modules/lua/extension.c:1199 msgid "Yes" msgstr "አዎ" @@ -902,7 +902,7 @@ #: src/input/es_out.c:3151 src/input/meta.c:66 modules/access/imem.c:71 #: modules/gui/macosx/VLCPlaylist.m:98 #: modules/gui/macosx/VLCSimplePrefsController.m:325 -#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:527 +#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:533 msgid "Language" msgstr "ቋንቋ" @@ -916,7 +916,7 @@ #: src/input/es_out.c:3160 src/input/es_out.c:3204 src/input/es_out.c:3394 #: modules/gui/macosx/VLCAddonsWindowController.m:133 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:185 -#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1495 +#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1494 msgid "Type" msgstr "አይነት" @@ -1182,8 +1182,8 @@ #: modules/gui/macosx/VLCOpenWindowController.m:178 #: modules/gui/macosx/VLCOpenWindowController.m:180 #: modules/gui/macosx/VLCPlaylist.m:91 modules/gui/macosx/VLCPlaylistInfo.m:59 -#: modules/gui/qt/components/open_panels.cpp:507 -#: modules/gui/qt/components/open_panels.cpp:521 +#: modules/gui/qt/components/open_panels.cpp:487 +#: modules/gui/qt/components/open_panels.cpp:501 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56 #: modules/gui/qt/ui/open_disk.h:306 msgid "Title" @@ -1428,8 +1428,8 @@ msgid "" "You can select \"additional interfaces\" for VLC. They will be launched in " "the background in addition to the default interface. Use a colon separated " -"list of interface modules. (common values are \"rc\" (remote control), " -"\"http\", \"gestures\" ...)" +"list of interface modules. (common values are \"rc\" (remote control), \"http" +"\", \"gestures\" ...)" msgstr "" #: src/libvlc-module.c:83 @@ -1511,7 +1511,7 @@ msgstr "" #: src/libvlc-module.c:132 modules/gui/macosx/VLCSimplePrefsController.m:281 -#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:407 +#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:408 msgid "Enable audio" msgstr "ድምፅ ማስቻያ" @@ -1623,10 +1623,9 @@ #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:957 #: modules/audio_output/kai.c:106 modules/codec/subsdec.c:167 #: modules/codec/x264.c:434 modules/demux/adaptive/adaptive.cpp:122 -#: modules/demux/mpeg/ts.c:131 modules/gui/macosx/VLCSimplePrefsController.m:54 -#: modules/gui/qt/components/simple_preferences.cpp:68 +#: modules/demux/mpeg/ts.c:132 modules/gui/macosx/VLCSimplePrefsController.m:54 +#: modules/gui/qt/components/simple_preferences.cpp:69 #: modules/gui/qt/components/sout/profile_selector.cpp:590 -#: modules/services_discovery/upnp.cpp:82 #: modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62 #: modules/video_output/win32/direct3d11.c:88 @@ -1652,8 +1651,8 @@ msgstr "የ ስቴሪዮ ድምፅ ውጤት ዘዴ" #: src/libvlc-module.c:195 src/misc/actions.c:112 -#: modules/gui/qt/components/preferences_widgets.cpp:1417 -#: modules/gui/qt/util/customwidgets.cpp:330 +#: modules/gui/qt/components/preferences_widgets.cpp:1421 +#: modules/gui/qt/util/customwidgets.cpp:328 msgid "Unset" msgstr "ማጥፊያ" @@ -2338,7 +2337,7 @@ #: src/libvlc-module.c:540 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:215 #: modules/gui/macosx/VLCSidebarDataSource.m:209 -#: modules/gui/qt/components/extended_panels.cpp:949 +#: modules/gui/qt/components/extended_panels.cpp:962 #: modules/gui/qt/ui/equalizer.h:130 modules/gui/qt/ui/vlm.h:286 msgid "Enable" msgstr "ማስቻያ" @@ -2620,10 +2619,10 @@ #: src/libvlc-module.c:690 msgid "" -"This option allows you to set the title according to what's being " -"played
$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: " -"Genre
$n: Track num
$p: Now playing
$A: Date
$D: Duration
$Z: " -"\"Now playing\" (Fall back on Title - Artist)" +"This option allows you to set the title according to what's being played
" +"$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: Genre
$n: " +"Track num
$p: Now playing
$A: Date
$D: Duration
$Z: \"Now playing" +"\" (Fall back on Title - Artist)" msgstr "" #: src/libvlc-module.c:695 @@ -3298,7 +3297,7 @@ msgid "Tell VLC that it is being launched due to a file association in the OS" msgstr "" -#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:547 +#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:554 msgid "Use only one instance when started from file manager" msgstr "" @@ -3316,7 +3315,7 @@ "machine." msgstr "" -#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:550 +#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:557 msgid "Enqueue items into playlist in one instance mode" msgstr "" @@ -3360,7 +3359,7 @@ #: src/libvlc-module.c:1126 modules/gui/macosx/VLCSimplePrefsController.m:342 #: modules/gui/qt/dialogs/firstrun.cpp:95 -#: modules/gui/qt/ui/sprefs_interface.h:562 +#: modules/gui/qt/ui/sprefs_interface.h:569 msgid "Allow metadata network access" msgstr "" @@ -3498,7 +3497,7 @@ "VLC." msgstr "" -#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:548 +#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:555 msgid "Display playlist tree" msgstr "የ ማጫወቻ ዝርዝር በ ዛፍ ማስያ" @@ -3620,11 +3619,11 @@ msgid "Select the hotkey to set the playback rate back to normal." msgstr "" -#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:884 +#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:889 msgid "Faster (fine)" msgstr "በፍጥነት (ጥሩ)" -#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:892 +#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:897 msgid "Slower (fine)" msgstr "በዝግታ (ጥሩ)" @@ -3635,7 +3634,7 @@ #: modules/gui/macosx/VLCMainMenu.m:396 modules/gui/macosx/VLCMainMenu.m:499 #: modules/gui/macosx/VLCMainMenu.m:507 #: modules/gui/qt/components/controller.hpp:112 -#: modules/gui/qt/dialogs/sout.cpp:93 modules/notify/notify.c:335 +#: modules/gui/qt/dialogs/sout.cpp:91 modules/notify/notify.c:335 #: modules/gui/qt/ui/streampanel.h:179 msgid "Next" msgstr "ይቀጥሉ" @@ -3662,7 +3661,7 @@ #: modules/gui/macosx/VLCMainMenu.m:498 modules/gui/macosx/VLCMainMenu.m:505 #: modules/gui/macosx/VLCMainWindowControlsBar.m:65 #: modules/gui/qt/components/controller.hpp:107 -#: modules/gui/qt/dialogs/vlm.cpp:544 modules/gui/qt/ui/streampanel.h:178 +#: modules/gui/qt/dialogs/vlm.cpp:538 modules/gui/qt/ui/streampanel.h:178 msgid "Stop" msgstr "ማስቆሚያ" @@ -3791,8 +3790,8 @@ #: src/libvlc-module.c:1293 modules/control/hotkeys.c:361 #: modules/gui/macosx/VLCStatusBarIcon.m:116 #: modules/gui/qt/components/controller.hpp:111 -#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:955 -#: modules/gui/qt/menus.cpp:1141 modules/gui/skins2/commands/cmd_quit.cpp:45 +#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:960 +#: modules/gui/qt/menus.cpp:1146 modules/gui/skins2/commands/cmd_quit.cpp:45 msgid "Quit" msgstr "ማጥፊያ" @@ -4100,7 +4099,7 @@ msgstr "" #: src/libvlc-module.c:1373 -#: modules/gui/qt/components/playlist/standardpanel.cpp:246 +#: modules/gui/qt/components/playlist/standardpanel.cpp:247 msgid "Clear the playlist" msgstr "የ ማጫወቻ ዝርዝር ማጽጃ" @@ -4278,7 +4277,7 @@ #: src/libvlc-module.c:1423 modules/gui/macosx/VLCMainMenu.m:387 #: modules/gui/qt/components/controller.hpp:110 -#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:858 +#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:863 #: modules/stream_out/record.c:60 msgid "Record" msgstr "መቅረጫ" @@ -4438,7 +4437,7 @@ msgid "Special modules" msgstr "የ ተለዩ ክፍሎች" -#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:90 +#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:89 msgid "Plugins" msgstr "ተሰኪዎች" @@ -4705,7 +4704,7 @@ msgid "Media View" msgstr "መገናኛ መመልከቻ " -#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:568 +#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:577 msgid "Menu" msgstr "ዝርዝር" @@ -4738,8 +4737,8 @@ #: modules/gui/macosx/VLCFSPanelController.m:251 #: modules/gui/macosx/VLCMainMenu.m:1346 modules/gui/macosx/VLCMainMenu.m:1347 #: modules/gui/macosx/VLCMainMenu.m:1348 -#: modules/gui/qt/components/playlist/standardpanel.cpp:196 -#: modules/gui/qt/menus.cpp:832 +#: modules/gui/qt/components/playlist/standardpanel.cpp:197 +#: modules/gui/qt/menus.cpp:837 msgid "Pause" msgstr "ማስቆሚያ" @@ -4830,7 +4829,7 @@ msgstr "ለ መጻፍ \"%s\" መክፈት አልተቻለም" #: src/misc/update.c:596 src/misc/update.c:726 modules/access/dvb/scan.c:826 -#: modules/demux/avi/avi.c:2827 +#: modules/demux/avi/avi.c:2878 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:513 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:571 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:854 @@ -4855,10 +4854,10 @@ #: modules/gui/macosx/VLCVideoEffectsWindowController.m:791 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:860 #: modules/gui/macosx/prefs.m:189 -#: modules/gui/qt/components/open_panels.cpp:1381 -#: modules/gui/qt/components/preferences_widgets.cpp:1416 +#: modules/gui/qt/components/open_panels.cpp:1361 +#: modules/gui/qt/components/preferences_widgets.cpp:1420 #: modules/gui/qt/components/sout/profile_selector.cpp:452 -#: modules/gui/qt/dialogs/sout.cpp:92 +#: modules/gui/qt/dialogs/sout.cpp:90 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "Cancel" msgstr "መሰረዣ" @@ -5786,79 +5785,79 @@ msgid "Blu-ray Disc support (libbluray)" msgstr "የ ብሉ-ሬይ ዲስክ ድጋፍ (libbluray)" -#: modules/access/bluray.c:849 +#: modules/access/bluray.c:847 msgid "Path doesn't appear to be a Blu-ray" msgstr "" -#: modules/access/bluray.c:864 +#: modules/access/bluray.c:862 msgid "" "This Blu-ray Disc needs a library for AACS decoding, and your system does " "not have it." msgstr "" -#: modules/access/bluray.c:870 +#: modules/access/bluray.c:868 msgid "Blu-ray Disc is corrupted." msgstr "የ ብሉ-ሬይ ዲስክ የተበላሸ ነው" -#: modules/access/bluray.c:872 +#: modules/access/bluray.c:870 msgid "Missing AACS configuration file!" msgstr "" -#: modules/access/bluray.c:874 +#: modules/access/bluray.c:872 msgid "No valid processing key found in AACS config file." msgstr "" -#: modules/access/bluray.c:876 +#: modules/access/bluray.c:874 msgid "No valid host certificate found in AACS config file." msgstr "" -#: modules/access/bluray.c:878 +#: modules/access/bluray.c:876 msgid "AACS Host certificate revoked." msgstr "" -#: modules/access/bluray.c:880 +#: modules/access/bluray.c:878 msgid "AACS MMC failed." msgstr "" -#: modules/access/bluray.c:890 +#: modules/access/bluray.c:888 msgid "" "This Blu-ray Disc needs a library for BD+ decoding, and your system does not " "have it." msgstr "" -#: modules/access/bluray.c:893 +#: modules/access/bluray.c:891 msgid "Your system BD+ decoding library does not work. Missing configuration?" msgstr "" -#: modules/access/bluray.c:926 +#: modules/access/bluray.c:924 msgid "Java required" msgstr "" -#: modules/access/bluray.c:927 +#: modules/access/bluray.c:925 #, c-format msgid "" "This Blu-ray disc requires Java for menus support.%s\n" "The disc will be played without menus." msgstr "" -#: modules/access/bluray.c:928 +#: modules/access/bluray.c:926 msgid "Java was not found on your system." msgstr "" -#: modules/access/bluray.c:951 +#: modules/access/bluray.c:949 msgid "Failed to start bluray playback. Please try without menu support." msgstr "" -#: modules/access/bluray.c:992 modules/access/bluray.c:2825 -#: modules/access/bluray.c:2830 +#: modules/access/bluray.c:990 modules/access/bluray.c:2823 +#: modules/access/bluray.c:2828 msgid "Blu-ray error" msgstr "የ ብሉ-ሬይ ስህተት" -#: modules/access/bluray.c:2115 +#: modules/access/bluray.c:2113 msgid "Top Menu" msgstr "ዝርዝር ከ ላይ በኩል" -#: modules/access/bluray.c:2118 +#: modules/access/bluray.c:2116 msgid "First Play" msgstr "መጀመሪያ የሚጫወተው" @@ -6057,7 +6056,7 @@ msgid "10 bits" msgstr "10 ቢትስ" -#: modules/access/decklink.cpp:358 modules/demux/ty.c:769 +#: modules/access/decklink.cpp:358 modules/demux/ty.c:783 msgid "Closed captions 1" msgstr "" @@ -6093,7 +6092,7 @@ msgstr "DSS" #: modules/access/dshow/dshow.cpp:130 -#: modules/gui/qt/components/open_panels.cpp:838 +#: modules/gui/qt/components/open_panels.cpp:818 msgid "Video device name" msgstr "" @@ -6104,8 +6103,8 @@ msgstr "" #: modules/access/dshow/dshow.cpp:135 -#: modules/gui/qt/components/open_panels.cpp:846 -#: modules/gui/qt/components/open_panels.cpp:1067 +#: modules/gui/qt/components/open_panels.cpp:826 +#: modules/gui/qt/components/open_panels.cpp:1047 msgid "Audio device name" msgstr "" @@ -6116,7 +6115,7 @@ msgstr "" #: modules/access/dshow/dshow.cpp:140 -#: modules/gui/qt/components/open_panels.cpp:813 +#: modules/gui/qt/components/open_panels.cpp:793 msgid "Video size" msgstr "የ ቪዲዮ መጠን" @@ -6189,8 +6188,8 @@ msgstr "" #: modules/access/dshow/dshow.cpp:168 -#: modules/gui/qt/components/open_panels.cpp:866 -#: modules/gui/qt/components/open_panels.cpp:1087 +#: modules/gui/qt/components/open_panels.cpp:846 +#: modules/gui/qt/components/open_panels.cpp:1067 msgid "Video standard" msgstr "መደበኛ ቪዲዮ " @@ -6384,7 +6383,7 @@ "frequency. This is required to tune the receiver." msgstr "" -#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:987 +#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:967 msgid "Modulation / Constellation" msgstr "" @@ -6888,8 +6887,8 @@ #: modules/audio_output/file.c:113 #: modules/gui/macosx/VLCOpenWindowController.m:140 #: modules/gui/macosx/VLCOutput.m:64 modules/gui/macosx/VLCOutput.m:175 -#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1429 -#: modules/gui/qt/dialogs/sout.cpp:69 modules/gui/qt/dialogs/sout.cpp:121 +#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1428 +#: modules/gui/qt/dialogs/sout.cpp:67 modules/gui/qt/dialogs/sout.cpp:119 #: share/lua/http/dialogs/create_stream.html:204 #: share/lua/http/dialogs/stream_config_window.html:36 #: share/lua/http/dialogs/stream_window.html:95 @@ -6915,7 +6914,7 @@ #: modules/access_output/http.c:52 #: modules/gui/macosx/VLCCoreDialogProvider.m:191 #: modules/gui/macosx/VLCSimplePrefsController.m:286 -#: modules/gui/qt/dialogs/external.cpp:203 modules/misc/audioscrobbler.c:114 +#: modules/gui/qt/dialogs/external.cpp:205 modules/misc/audioscrobbler.c:114 #: modules/stream_out/rtp.c:173 msgid "Username" msgstr "የተጠቃሚ ስም" @@ -6934,7 +6933,7 @@ #: modules/gui/macosx/VLCCoreDialogProvider.m:192 #: modules/gui/macosx/VLCSimplePrefsController.m:285 #: modules/gui/macosx/VLCSimplePrefsController.m:348 -#: modules/gui/qt/dialogs/external.cpp:208 modules/lua/vlc.c:54 +#: modules/gui/qt/dialogs/external.cpp:210 modules/lua/vlc.c:54 #: modules/lua/vlc.c:70 modules/misc/audioscrobbler.c:116 #: modules/stream_out/rtp.c:176 msgid "Password" @@ -7126,7 +7125,7 @@ #: modules/demux/rawvid.c:47 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:239 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167 -#: modules/gui/qt/components/extended_panels.cpp:1318 modules/spu/mosaic.c:94 +#: modules/gui/qt/components/extended_panels.cpp:1348 modules/spu/mosaic.c:94 #: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108 #: modules/gui/qt/ui/profiles.h:741 msgid "Width" @@ -7195,7 +7194,7 @@ #: modules/access/imem.c:113 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:236 -#: modules/gui/qt/components/extended_panels.cpp:1317 +#: modules/gui/qt/components/extended_panels.cpp:1347 msgid "Size" msgstr "መጠን" @@ -7223,7 +7222,7 @@ msgid "Read the audio stream at VLC pace rather than Jack pace." msgstr "" -#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:918 +#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:898 msgid "Auto connection" msgstr "" @@ -7388,19 +7387,19 @@ msgid "Port to use for tunneling the RTSP/RTP over HTTP." msgstr "" -#: modules/access/live555.cpp:673 +#: modules/access/live555.cpp:677 msgid "RTSP authentication" msgstr "" -#: modules/access/live555.cpp:674 +#: modules/access/live555.cpp:678 msgid "Please enter a valid login name and a password." msgstr "" -#: modules/access/live555.cpp:699 +#: modules/access/live555.cpp:703 msgid "RTSP connection failed" msgstr "" -#: modules/access/live555.cpp:700 +#: modules/access/live555.cpp:704 msgid "Access to the stream is denied by the server configuration." msgstr "" @@ -7739,7 +7738,7 @@ msgstr "" #: modules/access/screen/screen.c:45 -#: modules/gui/qt/components/open_panels.cpp:1124 +#: modules/gui/qt/components/open_panels.cpp:1104 msgid "Desired frame rate for the capture." msgstr "" @@ -7994,9 +7993,8 @@ msgstr "" #: modules/access/srt.c:446 modules/access_output/srt.c:480 -#, fuzzy msgid " SRT Stream ID" -msgstr "ማስተላለፊያ %d" +msgstr "" #: modules/access/srt_common.c:26 msgid "16 bytes" @@ -8104,7 +8102,7 @@ msgid "Radio tuner device node." msgstr "" -#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1094 +#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1074 msgid "Frequency" msgstr "" @@ -8283,7 +8281,7 @@ msgstr "50 Hz" #: modules/access/v4l2/v4l2.c:137 -#: modules/gui/qt/components/extended_panels.cpp:1107 +#: modules/gui/qt/components/extended_panels.cpp:1132 msgid "60 Hz" msgstr "60 Hz" @@ -8442,7 +8440,7 @@ #: modules/control/hotkeys.c:395 #: modules/gui/macosx/VLCAddonsWindowController.m:100 #: modules/gui/qt/dialogs/convert.cpp:164 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/dialogs/plugins.cpp:382 #: modules/gui/qt/dialogs/preferences.cpp:79 msgid "All" msgstr "ሁሉንም " @@ -8808,9 +8806,9 @@ #: modules/access_output/livehttp.c:98 msgid "" -"File is read when segment starts and is assumed to be in format: key-" -"uri\\nkey-file. File is read on the segment opening and values are used on " -"that segment." +"File is read when segment starts and is assumed to be in format: key-uri" +"\\nkey-file. File is read on the segment opening and values are used on that " +"segment." msgstr "" #: modules/access_output/livehttp.c:102 @@ -8871,7 +8869,7 @@ msgstr "" #: modules/access_output/rist.c:842 modules/access_output/shout.c:64 -#: modules/gui/qt/components/sout/sout_widgets.cpp:385 +#: modules/gui/qt/components/sout/sout_widgets.cpp:386 #: share/lua/http/dialogs/create_stream.html:139 msgid "Stream name" msgstr "" @@ -9245,7 +9243,7 @@ #: modules/audio_filter/chorus_flanger.c:80 #: modules/audio_filter/stereo_widen.c:57 -#: modules/gui/qt/components/extended_panels.cpp:1337 +#: modules/gui/qt/components/extended_panels.cpp:1367 msgid "Delay time" msgstr "ማዘግያ ሰአት" @@ -9273,7 +9271,7 @@ #: modules/audio_filter/chorus_flanger.c:89 #: modules/audio_filter/stereo_widen.c:60 -#: modules/gui/qt/components/extended_panels.cpp:1338 +#: modules/gui/qt/components/extended_panels.cpp:1368 msgid "Feedback gain" msgstr "" @@ -9299,7 +9297,7 @@ #: modules/audio_filter/compressor.c:155 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:225 -#: modules/gui/qt/components/extended_panels.cpp:1295 +#: modules/gui/qt/components/extended_panels.cpp:1325 msgid "RMS/peak" msgstr "" @@ -9333,7 +9331,7 @@ #: modules/audio_filter/compressor.c:167 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:229 -#: modules/gui/qt/components/extended_panels.cpp:1299 +#: modules/gui/qt/components/extended_panels.cpp:1329 msgid "Ratio" msgstr "መጠን" @@ -9750,19 +9748,19 @@ #: modules/audio_filter/spatializer/spatializer.cpp:61 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:241 -#: modules/gui/qt/components/extended_panels.cpp:1319 +#: modules/gui/qt/components/extended_panels.cpp:1349 msgid "Wet" msgstr "እርጥብ" #: modules/audio_filter/spatializer/spatializer.cpp:64 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:242 -#: modules/gui/qt/components/extended_panels.cpp:1320 +#: modules/gui/qt/components/extended_panels.cpp:1350 msgid "Dry" msgstr "ደረቅ" #: modules/audio_filter/spatializer/spatializer.cpp:67 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:243 -#: modules/gui/qt/components/extended_panels.cpp:1321 +#: modules/gui/qt/components/extended_panels.cpp:1351 msgid "Damp" msgstr "" @@ -9796,7 +9794,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:64 -#: modules/gui/qt/components/extended_panels.cpp:1339 +#: modules/gui/qt/components/extended_panels.cpp:1369 msgid "Crossfeed" msgstr "" @@ -9808,7 +9806,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:68 -#: modules/gui/qt/components/extended_panels.cpp:1340 +#: modules/gui/qt/components/extended_panels.cpp:1370 msgid "Dry mix" msgstr "" @@ -10046,7 +10044,7 @@ msgid "K Audio Interface audio output" msgstr "" -#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:416 +#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:417 msgid "HDMI/SPDIF audio passthrough" msgstr "" @@ -10136,11 +10134,11 @@ "output mode (which is not well supported by some soundcards)." msgstr "" -#: modules/codec/a52.c:70 +#: modules/codec/a52.c:72 msgid "A/52 dynamic range compression" msgstr "" -#: modules/codec/a52.c:72 modules/codec/dca.c:63 +#: modules/codec/a52.c:74 modules/codec/dca.c:65 msgid "" "Dynamic range compression makes the loud sounds softer, and the soft sounds " "louder, so you can more easily listen to the stream in a noisy environment " @@ -10148,7 +10146,7 @@ "playback will be more adapted to a movie theater or a listening room." msgstr "" -#: modules/codec/a52.c:80 +#: modules/codec/a52.c:82 msgid "ATSC A/52 (AC-3) audio decoder" msgstr "" @@ -10620,15 +10618,15 @@ "enabled libavcodec" msgstr "" -#: modules/codec/avcodec/d3d11va.c:63 +#: modules/codec/avcodec/d3d11va.c:67 msgid "Direct3D11 Video Acceleration" msgstr "" -#: modules/codec/avcodec/dxva2.c:51 +#: modules/codec/avcodec/dxva2.c:55 msgid "DirectX Video Acceleration (DXVA) 2.0" msgstr "" -#: modules/codec/avcodec/encoder.c:383 +#: modules/codec/avcodec/encoder.c:399 #, c-format msgid "" "It seems your Libav/FFmpeg (libavcodec) installation lacks the following " @@ -10640,32 +10638,32 @@ "Do not contact the VideoLAN project about this issue.\n" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "unknown" msgstr "ያልታወቀ" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "video" msgstr "ቪዲዮ" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "audio" msgstr "ድምፅ" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "subpicture" msgstr "ንዑስ ስእል" -#: modules/codec/avcodec/encoder.c:919 +#: modules/codec/avcodec/encoder.c:940 #, c-format msgid "VLC could not open the %4.4s %s encoder." msgstr "" -#: modules/codec/avcodec/vaapi.c:354 +#: modules/codec/avcodec/vaapi.c:388 msgid "VA-API video decoder via DRM" msgstr "" -#: modules/codec/avcodec/vaapi.c:359 +#: modules/codec/avcodec/vaapi.c:393 msgid "VA-API video decoder" msgstr "" @@ -10762,15 +10760,23 @@ msgid "Max number of threads used for tile decoding, default 0=auto" msgstr "" -#: modules/codec/dav1d.c:60 +#: modules/codec/dav1d.c:56 +msgid "All Layers" +msgstr "" + +#: modules/codec/dav1d.c:57 +msgid "Whether or not to display all spatial layers, default false" +msgstr "" + +#: modules/codec/dav1d.c:62 msgid "Dav1d video decoder" msgstr "" -#: modules/codec/dca.c:61 +#: modules/codec/dca.c:63 msgid "DTS dynamic range compression" msgstr "" -#: modules/codec/dca.c:73 +#: modules/codec/dca.c:75 msgid "DTS Coherent Acoustics audio decoder" msgstr "" @@ -11286,7 +11292,7 @@ "This should take less than a minute." msgstr "" -#: modules/codec/libmpeg2.c:137 +#: modules/codec/libmpeg2.c:140 msgid "MPEG I/II video decoder (using libmpeg2)" msgstr "" @@ -11306,7 +11312,7 @@ msgid "MPEG audio layer I/II/III decoder" msgstr "" -#: modules/codec/mft.c:62 +#: modules/codec/mft.c:66 msgid "Media Foundation Transform decoder" msgstr "" @@ -11972,7 +11978,7 @@ msgid "S/PDIF pass-through decoder" msgstr "" -#: modules/codec/speex.c:59 modules/codec/speex.c:907 +#: modules/codec/speex.c:59 modules/codec/speex.c:910 #: modules/gui/macosx/VLCOpenWindowController.m:195 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:259 #: modules/gui/qt/ui/sprefs_video.h:325 modules/gui/qt/ui/video_effects.h:1282 @@ -12298,7 +12304,7 @@ #. #. This MUST be a valid iconv character set. If unsure, please refer #. the VideoLAN translators mailing list. -#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:98 +#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:99 msgctxt "GetACP" msgid "CP1252" msgstr "CP1252" @@ -13301,8 +13307,8 @@ #: modules/codec/x264.c:429 modules/gui/macosx/VLCMainMenu.m:290 #: modules/gui/macosx/VLCMainMenu.m:392 #: modules/gui/macosx/VLCSimplePrefsController.m:711 -#: modules/gui/qt/components/simple_preferences.cpp:703 -#: modules/misc/gnutls.c:778 modules/text_renderer/freetype/freetype.c:124 +#: modules/gui/qt/components/simple_preferences.cpp:714 +#: modules/misc/gnutls.c:775 modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:143 msgid "Normal" msgstr "መደበኛ" @@ -13359,7 +13365,7 @@ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)" msgstr "H.264/MPEG-4 Part 10/AVC encoder (x264)" -#: modules/codec/x265.c:46 +#: modules/codec/x265.c:53 msgid "H.265/HEVC encoder (x265)" msgstr "H.265/HEVC encoder (x265)" @@ -13435,14 +13441,14 @@ #: modules/gui/macosx/VLCMainWindow.m:587 #: modules/gui/macosx/VLCMainWindow.m:1030 #: modules/gui/macosx/VLCStatusBarIcon.m:378 modules/gui/ncurses.c:1026 -#: modules/gui/qt/dialogs/help.cpp:91 modules/gui/qt/main_interface.cpp:1267 -#: modules/gui/qt/main_interface.cpp:1271 -#: modules/gui/qt/main_interface.cpp:1310 -#: modules/gui/qt/main_interface.cpp:1312 -#: modules/gui/qt/main_interface.cpp:1420 -#: modules/gui/qt/main_interface.cpp:1437 -#: modules/gui/qt/main_interface.cpp:1445 -#: modules/gui/qt/main_interface.cpp:1468 modules/lua/libs/httpd.c:80 +#: modules/gui/qt/dialogs/help.cpp:100 modules/gui/qt/main_interface.cpp:1302 +#: modules/gui/qt/main_interface.cpp:1306 +#: modules/gui/qt/main_interface.cpp:1343 +#: modules/gui/qt/main_interface.cpp:1345 +#: modules/gui/qt/main_interface.cpp:1453 +#: modules/gui/qt/main_interface.cpp:1470 +#: modules/gui/qt/main_interface.cpp:1478 +#: modules/gui/qt/main_interface.cpp:1501 modules/lua/libs/httpd.c:80 #: modules/notify/osx_notifications.m:302 #: modules/video_output/wayland/shell.c:348 #: modules/video_output/wayland/xdg-shell.c:291 @@ -13495,7 +13501,7 @@ #: modules/control/globalhotkeys/win32.c:47 #: modules/control/globalhotkeys/xcb.c:50 -#: modules/gui/qt/components/preferences_widgets.cpp:1137 +#: modules/gui/qt/components/preferences_widgets.cpp:1141 msgid "Global Hotkeys" msgstr "" @@ -13506,8 +13512,8 @@ #: modules/control/hotkeys.c:100 #: modules/gui/macosx/VLCSimplePrefsController.m:251 -#: modules/gui/qt/components/preferences_widgets.cpp:1136 -#: modules/gui/qt/components/simple_preferences.cpp:257 +#: modules/gui/qt/components/preferences_widgets.cpp:1140 +#: modules/gui/qt/components/simple_preferences.cpp:258 msgid "Hotkeys" msgstr "ትኩስ ቁልፍ " @@ -14195,7 +14201,7 @@ msgstr "" #: modules/demux/adaptive/adaptive.cpp:85 -#: modules/gui/qt/components/simple_preferences.cpp:702 +#: modules/gui/qt/components/simple_preferences.cpp:713 msgid "Low latency" msgstr "" @@ -14247,11 +14253,11 @@ msgid "ASF/WMV demuxer" msgstr "" -#: modules/demux/asf/asf.c:277 modules/demux/asf/asf.c:834 +#: modules/demux/asf/asf.c:285 modules/demux/asf/asf.c:836 msgid "Could not demux ASF stream" msgstr "" -#: modules/demux/asf/asf.c:278 +#: modules/demux/asf/asf.c:286 msgid "VLC failed to load the ASF header." msgstr "" @@ -14295,41 +14301,41 @@ msgid "Internal libavcodec format name" msgstr "" -#: modules/demux/avi/avi.c:55 +#: modules/demux/avi/avi.c:56 msgid "Force interleaved method" msgstr "" -#: modules/demux/avi/avi.c:57 +#: modules/demux/avi/avi.c:58 msgid "Force index creation" msgstr "የ ማውጫ መፍጠሪያ ማስገደጃ" -#: modules/demux/avi/avi.c:59 +#: modules/demux/avi/avi.c:60 msgid "" "Recreate a index for the AVI file. Use this if your AVI file is damaged or " "incomplete (not seekable)." msgstr "" -#: modules/demux/avi/avi.c:67 +#: modules/demux/avi/avi.c:68 msgid "Ask for action" msgstr "" -#: modules/demux/avi/avi.c:68 +#: modules/demux/avi/avi.c:69 msgid "Always fix" msgstr "ሁል ጊዜ መጠገኛ" -#: modules/demux/avi/avi.c:69 +#: modules/demux/avi/avi.c:70 msgid "Never fix" msgstr "በፍጹም አትጠግን" -#: modules/demux/avi/avi.c:70 +#: modules/demux/avi/avi.c:71 msgid "Fix when necessary" msgstr "" -#: modules/demux/avi/avi.c:74 +#: modules/demux/avi/avi.c:75 msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:902 modules/demux/mp4/mp4.c:4375 +#: modules/demux/avi/avi.c:910 modules/demux/mp4/mp4.c:4374 msgid "" "Because this file index is broken or missing, seeking will not work " "correctly.\n" @@ -14339,27 +14345,27 @@ "What do you want to do?" msgstr "" -#: modules/demux/avi/avi.c:910 +#: modules/demux/avi/avi.c:918 msgid "Do not play" msgstr "አታጫውት" -#: modules/demux/avi/avi.c:911 +#: modules/demux/avi/avi.c:919 msgid "Build index then play" msgstr "ማውጫ መገንቢያ እና ማጫወቻ" -#: modules/demux/avi/avi.c:912 +#: modules/demux/avi/avi.c:920 msgid "Play as is" msgstr "" -#: modules/demux/avi/avi.c:913 modules/demux/mp4/mp4.c:4386 +#: modules/demux/avi/avi.c:921 modules/demux/mp4/mp4.c:4385 msgid "Broken or missing Index" msgstr "" -#: modules/demux/avi/avi.c:2828 +#: modules/demux/avi/avi.c:2879 msgid "Broken or missing AVI Index" msgstr "" -#: modules/demux/avi/avi.c:2829 +#: modules/demux/avi/avi.c:2880 msgid "Fixing AVI Index..." msgstr "" @@ -14516,7 +14522,7 @@ "good for broken files)." msgstr "" -#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:112 +#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:113 msgid "Seek based on percent not time" msgstr "" @@ -14766,27 +14772,27 @@ msgid "Clean" msgstr "ማጽጃ" -#: modules/demux/mp4/mp4.c:50 +#: modules/demux/mp4/mp4.c:51 msgid "M4A audio only" msgstr "" -#: modules/demux/mp4/mp4.c:51 +#: modules/demux/mp4/mp4.c:52 msgid "Ignore non audio tracks from iTunes audio files" msgstr "" -#: modules/demux/mp4/mp4.c:56 +#: modules/demux/mp4/mp4.c:57 msgid "MP4 stream demuxer" msgstr "" -#: modules/demux/mp4/mp4.c:57 +#: modules/demux/mp4/mp4.c:58 msgid "MP4" msgstr "MP4" -#: modules/demux/mp4/mp4.c:4383 +#: modules/demux/mp4/mp4.c:4382 msgid "Do not seek" msgstr "አትፈልግ" -#: modules/demux/mp4/mp4.c:4384 +#: modules/demux/mp4/mp4.c:4383 msgid "Build index" msgstr "ማውጫ መገንቢያ" @@ -14847,89 +14853,89 @@ msgid "PS" msgstr "PS" -#: modules/demux/mpeg/ts.c:83 +#: modules/demux/mpeg/ts.c:84 msgid "Extra PMT" msgstr "" -#: modules/demux/mpeg/ts.c:85 +#: modules/demux/mpeg/ts.c:86 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." msgstr "" -#: modules/demux/mpeg/ts.c:87 +#: modules/demux/mpeg/ts.c:88 msgid "Set id of ES to PID" msgstr "" -#: modules/demux/mpeg/ts.c:88 +#: modules/demux/mpeg/ts.c:89 msgid "" "Set the internal ID of each elementary stream handled by VLC to the same " "value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do " "'#duplicate{..., select=\"es=\"}'." msgstr "" -#: modules/demux/mpeg/ts.c:93 modules/mux/mpeg/ts.c:173 +#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:173 msgid "CSA Key" msgstr "CSA Key" -#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:174 +#: modules/demux/mpeg/ts.c:95 modules/mux/mpeg/ts.c:174 msgid "" "CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:97 modules/mux/mpeg/ts.c:177 +#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:177 msgid "Second CSA Key" msgstr "" -#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:178 +#: modules/demux/mpeg/ts.c:99 modules/mux/mpeg/ts.c:178 msgid "" "The even CSA encryption key. This must be a 16 char string (8 hexadecimal " "bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:102 +#: modules/demux/mpeg/ts.c:103 msgid "Packet size in bytes to decrypt" msgstr "" -#: modules/demux/mpeg/ts.c:103 +#: modules/demux/mpeg/ts.c:104 msgid "" "Specify the size of the TS packet to decrypt. The decryption routines " "subtract the TS-header from the value before decrypting." msgstr "" -#: modules/demux/mpeg/ts.c:107 +#: modules/demux/mpeg/ts.c:108 msgid "Separate sub-streams" msgstr "" -#: modules/demux/mpeg/ts.c:109 +#: modules/demux/mpeg/ts.c:110 msgid "" "Separate teletex/dvbs pages into independent ES. It can be useful to turn " "off this option when using stream output." msgstr "" -#: modules/demux/mpeg/ts.c:114 +#: modules/demux/mpeg/ts.c:115 msgid "" "Seek and position based on a percent byte position, not a PCR generated time " "position. If seeking doesn't work property, turn on this option." msgstr "" -#: modules/demux/mpeg/ts.c:125 +#: modules/demux/mpeg/ts.c:126 msgid "Trust in-stream PCR" msgstr "" -#: modules/demux/mpeg/ts.c:126 +#: modules/demux/mpeg/ts.c:127 msgid "Use the stream PCR as a reference." msgstr "" -#: modules/demux/mpeg/ts.c:133 modules/mux/mpeg/ts.c:100 +#: modules/demux/mpeg/ts.c:134 modules/mux/mpeg/ts.c:100 msgid "Digital TV Standard" msgstr "" -#: modules/demux/mpeg/ts.c:134 +#: modules/demux/mpeg/ts.c:135 msgid "" "Selects mode for digital TV standard. This feature affects EPG information " "and subtitles." msgstr "" -#: modules/demux/mpeg/ts.c:138 +#: modules/demux/mpeg/ts.c:139 msgid "MPEG Transport Stream demuxer" msgstr "" @@ -15150,7 +15156,7 @@ msgid "Total duration" msgstr "ጠቅላላ የሚፈጀው ጊዜ " -#: modules/demux/pva.c:43 +#: modules/demux/pva.c:44 msgid "PVA demuxer" msgstr "" @@ -15280,23 +15286,23 @@ msgid "TTA demuxer" msgstr "" -#: modules/demux/ty.c:59 +#: modules/demux/ty.c:62 msgid "TY" msgstr "TY" -#: modules/demux/ty.c:60 +#: modules/demux/ty.c:63 msgid "TY Stream audio/video demux" msgstr "" -#: modules/demux/ty.c:770 +#: modules/demux/ty.c:784 msgid "Closed captions 2" msgstr "" -#: modules/demux/ty.c:771 +#: modules/demux/ty.c:785 msgid "Closed captions 3" msgstr "" -#: modules/demux/ty.c:772 +#: modules/demux/ty.c:786 msgid "Closed captions 4" msgstr "" @@ -15312,7 +15318,7 @@ msgid "Vobsub subtitles parser" msgstr "" -#: modules/demux/voc.c:43 +#: modules/demux/voc.c:45 msgid "VOC demuxer" msgstr "" @@ -15324,7 +15330,7 @@ msgid "XA demuxer" msgstr "" -#: modules/demux/xiph_metadata.c:588 +#: modules/demux/xiph_metadata.c:571 msgid "Unknown category" msgstr "ያልታወቀ ምድብ" @@ -15378,17 +15384,17 @@ msgstr "" #: modules/gui/macosx/VLCAboutWindowController.m:97 -#: modules/gui/qt/dialogs/help.cpp:125 +#: modules/gui/qt/dialogs/help.cpp:137 msgid "Credits" msgstr "" #: modules/gui/macosx/VLCAboutWindowController.m:99 -#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:119 +#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:129 msgid "License" msgstr "" #: modules/gui/macosx/VLCAboutWindowController.m:101 -#: modules/gui/qt/dialogs/help.cpp:122 +#: modules/gui/qt/dialogs/help.cpp:133 msgid "Authors" msgstr "ደራሲዎቹ" @@ -15404,33 +15410,33 @@ "\">VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" +"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:105 #: modules/gui/macosx/VLCAddonsWindowController.m:357 -#: modules/gui/qt/dialogs/plugins.cpp:389 +#: modules/gui/qt/dialogs/plugins.cpp:388 #: modules/gui/qt/managers/addons_manager.cpp:88 msgid "Playlist parsers" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:107 #: modules/gui/macosx/VLCAddonsWindowController.m:359 -#: modules/gui/qt/dialogs/plugins.cpp:393 +#: modules/gui/qt/dialogs/plugins.cpp:392 #: modules/gui/qt/managers/addons_manager.cpp:90 msgid "Service Discovery" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:109 -#: modules/gui/qt/dialogs/plugins.cpp:397 +#: modules/gui/qt/dialogs/plugins.cpp:396 #: modules/gui/qt/managers/addons_manager.cpp:92 msgid "Interfaces" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:111 -#: modules/gui/qt/dialogs/plugins.cpp:400 +#: modules/gui/qt/dialogs/plugins.cpp:399 #: modules/gui/qt/managers/addons_manager.cpp:94 msgid "Art and meta fetchers" msgstr "" @@ -15438,7 +15444,7 @@ #: modules/gui/macosx/VLCAddonsWindowController.m:113 #: modules/gui/macosx/VLCAddonsWindowController.m:361 #: modules/gui/macosx/VLCMainMenu.m:343 modules/gui/macosx/VLCMainMenu.m:344 -#: modules/gui/qt/dialogs/plugins.cpp:403 +#: modules/gui/qt/dialogs/plugins.cpp:402 #: modules/gui/qt/managers/addons_manager.cpp:96 msgid "Extensions" msgstr "ተጨማሪዎች" @@ -15448,30 +15454,30 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:118 -#: modules/gui/qt/dialogs/plugins.cpp:431 +#: modules/gui/qt/dialogs/plugins.cpp:430 msgid "Find more addons online" msgstr "ተጨማሪ በ መስመር ላይ መፈለጊያ" #: modules/gui/macosx/VLCAddonsWindowController.m:128 -#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:86 +#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:85 msgid "Addons Manager" msgstr "የ ተጨማሪ አስተዳዳሪ" #: modules/gui/macosx/VLCAddonsWindowController.m:130 -#: modules/gui/qt/dialogs/plugins.cpp:1173 -#: modules/gui/qt/dialogs/plugins.cpp:1186 +#: modules/gui/qt/dialogs/plugins.cpp:1172 +#: modules/gui/qt/dialogs/plugins.cpp:1185 msgid "Installed" msgstr "ተገጥሟል" #: modules/gui/macosx/VLCAddonsWindowController.m:131 #: modules/gui/macosx/VLCBookmarksWindowController.m:87 -#: modules/gui/qt/dialogs/plugins.cpp:128 modules/mux/avi.c:54 +#: modules/gui/qt/dialogs/plugins.cpp:127 modules/mux/avi.c:54 msgid "Name" msgstr "ስም" #: modules/gui/macosx/VLCAddonsWindowController.m:132 -#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1405 -#: modules/gui/qt/dialogs/plugins.cpp:1510 modules/mux/asf.c:58 +#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1404 +#: modules/gui/qt/dialogs/plugins.cpp:1509 modules/mux/asf.c:58 msgid "Author" msgstr "ደራሲው" @@ -15480,7 +15486,7 @@ msgstr "ማጥፊያ" #: modules/gui/macosx/VLCAddonsWindowController.m:355 -#: modules/gui/qt/dialogs/plugins.cpp:385 +#: modules/gui/qt/dialogs/plugins.cpp:384 #: modules/gui/qt/managers/addons_manager.cpp:86 #: modules/gui/skins2/src/skin_main.cpp:535 msgid "Skins" @@ -15497,7 +15503,7 @@ msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:219 -#: modules/gui/qt/components/extended_panels.cpp:1132 +#: modules/gui/qt/components/extended_panels.cpp:1157 #: modules/gui/qt/ui/equalizer.h:133 msgid "Preamp" msgstr "" @@ -15510,22 +15516,22 @@ #: modules/gui/macosx/VLCAudioEffectsWindowController.m:235 #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:49 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:210 -#: modules/gui/qt/dialogs/gototime.cpp:66 +#: modules/gui/qt/dialogs/gototime.cpp:65 msgid "Reset" msgstr "እንደ ነበር መመለሻ" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:226 -#: modules/gui/qt/components/extended_panels.cpp:1296 +#: modules/gui/qt/components/extended_panels.cpp:1326 msgid "Attack" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:227 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "Release" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:228 -#: modules/gui/qt/components/extended_panels.cpp:1298 +#: modules/gui/qt/components/extended_panels.cpp:1328 msgid "Threshold" msgstr "" @@ -15679,7 +15685,7 @@ #: modules/gui/macosx/VLCOutput.m:60 modules/gui/macosx/VLCPlaylistInfo.m:337 #: modules/gui/macosx/VLCSimplePrefsController.m:295 #: modules/gui/macosx/VLCTimeSelectionPanelController.m:51 -#: modules/gui/qt/components/open_panels.cpp:1380 +#: modules/gui/qt/components/open_panels.cpp:1360 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "OK" msgstr "እሺ" @@ -15704,8 +15710,8 @@ #: modules/gui/macosx/VLCBookmarksWindowController.m:213 msgid "" -"Input has changed, unable to save bookmark. Suspending playback with " -"\"Pause\" while editing bookmarks to ensure to keep the same input." +"Input has changed, unable to save bookmark. Suspending playback with \"Pause" +"\" while editing bookmarks to ensure to keep the same input." msgstr "" #: modules/gui/macosx/VLCControlsBarCommon.m:84 @@ -15794,10 +15800,10 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:381 #: modules/gui/macosx/prefs_widgets.m:1126 #: modules/gui/qt/components/preferences_widgets.cpp:264 -#: modules/gui/qt/components/simple_preferences.cpp:471 -#: modules/gui/qt/components/sout/sout_widgets.cpp:135 -#: modules/gui/qt/ui/open.h:279 modules/gui/qt/ui/open_disk.h:304 -#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:414 +#: modules/gui/qt/components/simple_preferences.cpp:472 +#: modules/gui/qt/components/sout/sout_widgets.cpp:136 +#: modules/gui/qt/ui/open.h:277 modules/gui/qt/ui/open_disk.h:304 +#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:415 #: modules/gui/qt/ui/sprefs_input.h:365 modules/gui/qt/ui/sprefs_video.h:329 msgid "Browse..." msgstr "መቃኛ..." @@ -15818,7 +15824,7 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:149 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:392 #: modules/gui/macosx/VLCOutput.m:65 modules/gui/macosx/VLCOutput.m:194 -#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:94 +#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:92 msgid "Stream" msgstr "ማስተላለፊያ" @@ -15891,10 +15897,10 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:186 #: modules/gui/macosx/VLCOpenWindowController.m:197 #: modules/gui/macosx/VLCOutput.m:68 -#: modules/gui/qt/components/sout/sout_widgets.cpp:241 -#: modules/gui/qt/components/sout/sout_widgets.cpp:328 -#: modules/gui/qt/components/sout/sout_widgets.cpp:370 -#: modules/gui/qt/components/sout/sout_widgets.cpp:425 +#: modules/gui/qt/components/sout/sout_widgets.cpp:242 +#: modules/gui/qt/components/sout/sout_widgets.cpp:329 +#: modules/gui/qt/components/sout/sout_widgets.cpp:371 +#: modules/gui/qt/components/sout/sout_widgets.cpp:426 msgid "Address" msgstr "አድራሻ" @@ -15906,11 +15912,11 @@ #: modules/gui/macosx/VLCOpenWindowController.m:185 #: modules/gui/macosx/VLCOpenWindowController.m:187 #: modules/gui/macosx/VLCOutput.m:69 -#: modules/gui/qt/components/sout/sout_widgets.cpp:187 -#: modules/gui/qt/components/sout/sout_widgets.cpp:242 -#: modules/gui/qt/components/sout/sout_widgets.cpp:283 -#: modules/gui/qt/components/sout/sout_widgets.cpp:329 -#: modules/gui/qt/components/sout/sout_widgets.cpp:426 modules/lua/vlc.c:67 +#: modules/gui/qt/components/sout/sout_widgets.cpp:188 +#: modules/gui/qt/components/sout/sout_widgets.cpp:243 +#: modules/gui/qt/components/sout/sout_widgets.cpp:284 +#: modules/gui/qt/components/sout/sout_widgets.cpp:330 +#: modules/gui/qt/components/sout/sout_widgets.cpp:427 modules/lua/vlc.c:67 #: modules/stream_out/rtp.c:114 #: share/lua/http/dialogs/stream_config_window.html:32 #: share/lua/http/dialogs/stream_window.html:91 @@ -16002,7 +16008,7 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:705 #: modules/gui/macosx/VLCSimplePrefsController.m:733 #: modules/gui/macosx/VLCSimplePrefsController.m:1266 -#: modules/gui/qt/components/simple_preferences.cpp:700 +#: modules/gui/qt/components/simple_preferences.cpp:711 msgid "Custom" msgstr "ማስተካከያ" @@ -16041,7 +16047,7 @@ #: modules/gui/macosx/VLCFSPanelController.m:140 #: modules/gui/macosx/VLCMainWindowControlsBar.m:80 -#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:408 +#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:409 msgid "Volume" msgstr "መጠን" @@ -16075,7 +16081,7 @@ msgstr "" #: modules/gui/macosx/VLCLogWindowController.m:94 -#: modules/gui/qt/dialogs/messages.cpp:80 +#: modules/gui/qt/dialogs/messages.cpp:77 #: modules/gui/qt/ui/messages_panel.h:136 #: modules/gui/qt/ui/messages_panel.h:140 msgid "Messages" @@ -16439,8 +16445,8 @@ msgid "Bring All to Front" msgstr "" -#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:54 -#: modules/gui/qt/menus.cpp:951 modules/gui/qt/menus.cpp:1138 +#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:52 +#: modules/gui/qt/menus.cpp:956 modules/gui/qt/menus.cpp:1143 msgid "Help" msgstr "እርዳታ" @@ -16503,13 +16509,13 @@ #: modules/gui/macosx/VLCMainWindow.m:220 #: modules/gui/macosx/VLCMainWindow.m:226 -#: modules/gui/qt/components/playlist/selector.cpp:580 +#: modules/gui/qt/components/playlist/selector.cpp:593 msgid "Subscribe" msgstr "" #: modules/gui/macosx/VLCMainWindow.m:221 #: modules/gui/macosx/VLCMainWindow.m:232 -#: modules/gui/qt/components/playlist/selector.cpp:597 +#: modules/gui/qt/components/playlist/selector.cpp:610 msgid "Unsubscribe" msgstr "" @@ -16519,7 +16525,7 @@ msgstr "" #: modules/gui/macosx/VLCMainWindow.m:225 -#: modules/gui/qt/components/playlist/selector.cpp:581 +#: modules/gui/qt/components/playlist/selector.cpp:594 msgid "Enter URL of the podcast to subscribe to:" msgstr "" @@ -16556,7 +16562,7 @@ msgstr "" #: modules/gui/macosx/VLCMainWindowControlsBar.m:71 -#: modules/gui/qt/dialogs/vlm.cpp:548 share/lua/http/index.html:259 +#: modules/gui/qt/dialogs/vlm.cpp:542 share/lua/http/index.html:259 msgid "Repeat" msgstr "መድገሚያ" @@ -16642,7 +16648,7 @@ #: modules/gui/macosx/VLCOpenWindowController.m:152 #: modules/gui/macosx/VLCOpenWindowController.m:349 #: modules/gui/macosx/VLCSimplePrefsController.m:353 -#: modules/gui/qt/ui/sprefs_interface.h:545 +#: modules/gui/qt/ui/sprefs_interface.h:552 msgid "Choose..." msgstr "ይምረጡ" @@ -16875,10 +16881,9 @@ msgstr "ሁሉንም ማሳነሻ" #: modules/gui/macosx/VLCPlaylist.m:231 -#: modules/gui/qt/components/playlist/standardpanel.cpp:273 -#, fuzzy +#: modules/gui/qt/components/playlist/standardpanel.cpp:274 msgid "Shuffle playlist" -msgstr "የ ማጫወቻ ዝርዝር ማጽጃ" +msgstr "" #: modules/gui/macosx/VLCPlaylistInfo.m:54 #: modules/gui/qt/dialogs/mediainfo.cpp:54 @@ -16948,8 +16953,8 @@ msgid "VLC was unable to save the meta data." msgstr "" -#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:194 -#: modules/gui/qt/ui/sprefs_interface.h:551 +#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:197 +#: modules/gui/qt/ui/sprefs_interface.h:558 msgid "Continue playback?" msgstr "በ ድጋሚ ማጫወቻ ይቀጥል?" @@ -16993,27 +16998,27 @@ msgstr "ኢንተርኔት" #: modules/gui/macosx/VLCSimplePrefsController.m:241 -#: modules/gui/qt/components/simple_preferences.cpp:247 -#: modules/gui/qt/components/simple_preferences.cpp:727 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/components/simple_preferences.cpp:248 +#: modules/gui/qt/components/simple_preferences.cpp:738 +#: modules/gui/qt/dialogs/plugins.cpp:382 msgid "Interface Settings" msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:243 -#: modules/gui/qt/components/simple_preferences.cpp:249 -#: modules/gui/qt/components/simple_preferences.cpp:446 +#: modules/gui/qt/components/simple_preferences.cpp:250 +#: modules/gui/qt/components/simple_preferences.cpp:447 msgid "Audio Settings" msgstr "ድምፅ ማሰናጃዎች" #: modules/gui/macosx/VLCSimplePrefsController.m:245 -#: modules/gui/qt/components/simple_preferences.cpp:251 -#: modules/gui/qt/components/simple_preferences.cpp:379 +#: modules/gui/qt/components/simple_preferences.cpp:252 +#: modules/gui/qt/components/simple_preferences.cpp:380 msgid "Video Settings" msgstr "ቪዲዮ ማሰናጃዎች" #: modules/gui/macosx/VLCSimplePrefsController.m:247 -#: modules/gui/qt/components/simple_preferences.cpp:253 -#: modules/gui/qt/components/simple_preferences.cpp:868 +#: modules/gui/qt/components/simple_preferences.cpp:254 +#: modules/gui/qt/components/simple_preferences.cpp:894 msgid "Subtitle & On Screen Display Settings" msgstr "" @@ -17042,12 +17047,12 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:289 -#: modules/gui/qt/ui/sprefs_audio.h:410 +#: modules/gui/qt/ui/sprefs_audio.h:411 msgid "Always reset audio start level to:" msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:292 -#: modules/gui/qt/dialogs/vlm.cpp:492 +#: modules/gui/qt/dialogs/vlm.cpp:486 msgid "Change" msgstr "መቀየሪያ" @@ -17060,7 +17065,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:298 -#: modules/gui/qt/components/preferences_widgets.cpp:1141 +#: modules/gui/qt/components/preferences_widgets.cpp:1145 msgid "Action" msgstr "ተግባር" @@ -17086,7 +17091,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:307 -#: modules/gui/qt/ui/open.h:263 +#: modules/gui/qt/ui/open.h:261 msgid "Caching" msgstr "" @@ -17170,7 +17175,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:341 -#: modules/gui/qt/ui/sprefs_interface.h:553 +#: modules/gui/qt/ui/sprefs_interface.h:560 msgid "Privacy / Network Interaction" msgstr "" @@ -17245,7 +17250,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:370 -#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:178 +#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:181 msgid "Pause the video playback when minimized" msgstr "" @@ -17423,12 +17428,12 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:50 -#: modules/gui/qt/components/extended_panels.cpp:1412 modules/gui/qt/qt.cpp:213 +#: modules/gui/qt/components/extended_panels.cpp:1442 modules/gui/qt/qt.cpp:216 msgid "Audio/Video" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:51 -#: modules/gui/qt/components/extended_panels.cpp:1416 +#: modules/gui/qt/components/extended_panels.cpp:1446 msgid "Audio track synchronization:" msgstr "" @@ -17437,12 +17442,12 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:54 -#: modules/gui/qt/components/extended_panels.cpp:1424 +#: modules/gui/qt/components/extended_panels.cpp:1454 msgid "Subtitles/Video" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:55 -#: modules/gui/qt/components/extended_panels.cpp:1428 +#: modules/gui/qt/components/extended_panels.cpp:1458 msgid "Subtitle track synchronization:" msgstr "" @@ -17451,31 +17456,31 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:58 -#: modules/gui/qt/components/extended_panels.cpp:1435 +#: modules/gui/qt/components/extended_panels.cpp:1465 msgid "Subtitle speed:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:60 -#: modules/gui/qt/components/extended_panels.cpp:1449 +#: modules/gui/qt/components/extended_panels.cpp:1479 msgid "Subtitle duration factor:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:68 -#: modules/gui/qt/components/extended_panels.cpp:1560 +#: modules/gui/qt/components/extended_panels.cpp:1590 msgid "" "Extend subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:72 -#: modules/gui/qt/components/extended_panels.cpp:1565 +#: modules/gui/qt/components/extended_panels.cpp:1595 msgid "" "Multiply subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:76 -#: modules/gui/qt/components/extended_panels.cpp:1570 +#: modules/gui/qt/components/extended_panels.cpp:1600 msgid "" "Recalculate subtitle duration according\n" "to their content and this value.\n" @@ -17860,17 +17865,17 @@ " By default, interface resize to the native video size." msgstr "" -#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:180 +#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:183 msgid "" "With this option enabled, the playback will be automatically paused when " "minimizing the window." msgstr "" -#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:182 +#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:185 msgid "Allow automatic icon changes" msgstr "ራሱ በራሱ ምልክት መቀየሪያ ማስቻያ" -#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:184 +#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:187 msgid "" "This option allows the interface to change its icon on various occasions." msgstr "" @@ -17928,21 +17933,21 @@ "open one of those, playback will continue." msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:206 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:209 msgid "Ask" msgstr "ጠይቀኝ" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/keystore/keychain.m:50 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/keystore/keychain.m:50 msgid "Always" msgstr "ሁልጊዜ " -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/gui/qt/qt.cpp:213 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/gui/qt/qt.cpp:216 msgid "Never" msgstr "በፍጹም" -#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:186 +#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:189 msgid "Maximum Volume displayed" msgstr "" @@ -18285,27 +18290,27 @@ msgid "Find: %s" msgstr "" -#: modules/gui/qt/components/controller.cpp:343 +#: modules/gui/qt/components/controller.cpp:352 msgid "Shift+L" msgstr "" -#: modules/gui/qt/components/controller.cpp:448 +#: modules/gui/qt/components/controller.cpp:457 msgid "Click to toggle between loop all, loop one and no loop" msgstr "" -#: modules/gui/qt/components/controller.cpp:549 +#: modules/gui/qt/components/controller.cpp:558 msgid "Previous Chapter/Title" msgstr "" -#: modules/gui/qt/components/controller.cpp:555 +#: modules/gui/qt/components/controller.cpp:564 msgid "Next Chapter/Title" msgstr "" -#: modules/gui/qt/components/controller.cpp:604 +#: modules/gui/qt/components/controller.cpp:613 msgid "Teletext Activation" msgstr "" -#: modules/gui/qt/components/controller.cpp:620 +#: modules/gui/qt/components/controller.cpp:629 msgid "Toggle Transparency" msgstr "" @@ -18422,7 +18427,7 @@ msgstr "" #: modules/gui/qt/components/controller.hpp:126 -#: modules/gui/qt/components/open_panels.cpp:259 +#: modules/gui/qt/components/open_panels.cpp:241 msgid "Open subtitle file" msgstr "" @@ -18467,21 +18472,21 @@ msgid "No EPG Data Available" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:380 #: modules/gui/qt/components/extended_panels.cpp:393 +#: modules/gui/qt/components/extended_panels.cpp:406 msgid "Image Files" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:382 modules/spu/logo.c:49 +#: modules/gui/qt/components/extended_panels.cpp:395 modules/spu/logo.c:49 msgid "Logo filenames" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:395 +#: modules/gui/qt/components/extended_panels.cpp:408 #: modules/video_filter/erase.c:55 msgid "Image mask" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:645 +#: modules/gui/qt/components/extended_panels.cpp:658 msgid "" "No v4l2 instance found.\n" "Please check that the device has been opened with VLC and is playing.\n" @@ -18489,133 +18494,133 @@ "Controls will automatically appear here." msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1107 -#: modules/gui/qt/components/extended_panels.cpp:1108 -#: modules/gui/qt/components/extended_panels.cpp:1109 -#: modules/gui/qt/components/extended_panels.cpp:1110 -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1112 -#: modules/gui/qt/components/extended_panels.cpp:1113 -#: modules/gui/qt/components/extended_panels.cpp:1114 -#: modules/gui/qt/components/extended_panels.cpp:1115 -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1120 -#: modules/gui/qt/components/extended_panels.cpp:1121 -#: modules/gui/qt/components/extended_panels.cpp:1122 -#: modules/gui/qt/components/extended_panels.cpp:1123 -#: modules/gui/qt/components/extended_panels.cpp:1124 -#: modules/gui/qt/components/extended_panels.cpp:1125 -#: modules/gui/qt/components/extended_panels.cpp:1126 -#: modules/gui/qt/components/extended_panels.cpp:1127 -#: modules/gui/qt/components/extended_panels.cpp:1128 -#: modules/gui/qt/components/extended_panels.cpp:1129 #: modules/gui/qt/components/extended_panels.cpp:1132 -#: modules/gui/qt/components/extended_panels.cpp:1298 -#: modules/gui/qt/components/extended_panels.cpp:1300 -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1133 +#: modules/gui/qt/components/extended_panels.cpp:1134 +#: modules/gui/qt/components/extended_panels.cpp:1135 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1137 +#: modules/gui/qt/components/extended_panels.cpp:1138 +#: modules/gui/qt/components/extended_panels.cpp:1139 +#: modules/gui/qt/components/extended_panels.cpp:1140 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1145 +#: modules/gui/qt/components/extended_panels.cpp:1146 +#: modules/gui/qt/components/extended_panels.cpp:1147 +#: modules/gui/qt/components/extended_panels.cpp:1148 +#: modules/gui/qt/components/extended_panels.cpp:1149 +#: modules/gui/qt/components/extended_panels.cpp:1150 +#: modules/gui/qt/components/extended_panels.cpp:1151 +#: modules/gui/qt/components/extended_panels.cpp:1152 +#: modules/gui/qt/components/extended_panels.cpp:1153 +#: modules/gui/qt/components/extended_panels.cpp:1154 +#: modules/gui/qt/components/extended_panels.cpp:1157 +#: modules/gui/qt/components/extended_panels.cpp:1328 +#: modules/gui/qt/components/extended_panels.cpp:1330 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "dB" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1108 +#: modules/gui/qt/components/extended_panels.cpp:1133 msgid "170 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1109 +#: modules/gui/qt/components/extended_panels.cpp:1134 msgid "310 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1110 +#: modules/gui/qt/components/extended_panels.cpp:1135 msgid "600 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1125 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1150 msgid "1 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1112 +#: modules/gui/qt/components/extended_panels.cpp:1137 msgid "3 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1113 +#: modules/gui/qt/components/extended_panels.cpp:1138 msgid "6 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1114 +#: modules/gui/qt/components/extended_panels.cpp:1139 msgid "12 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1115 +#: modules/gui/qt/components/extended_panels.cpp:1140 msgid "14 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1129 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1154 msgid "16 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1120 +#: modules/gui/qt/components/extended_panels.cpp:1145 msgid "31 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1121 +#: modules/gui/qt/components/extended_panels.cpp:1146 msgid "63 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1122 +#: modules/gui/qt/components/extended_panels.cpp:1147 msgid "125 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1123 +#: modules/gui/qt/components/extended_panels.cpp:1148 msgid "250 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1124 +#: modules/gui/qt/components/extended_panels.cpp:1149 msgid "500 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1126 +#: modules/gui/qt/components/extended_panels.cpp:1151 msgid "2 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1127 +#: modules/gui/qt/components/extended_panels.cpp:1152 msgid "4 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1128 +#: modules/gui/qt/components/extended_panels.cpp:1153 msgid "8 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1296 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1326 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "ms" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1300 +#: modules/gui/qt/components/extended_panels.cpp:1330 msgid "" "Knee\n" "radius" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "" "Makeup\n" "gain" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1354 +#: modules/gui/qt/components/extended_panels.cpp:1384 msgid "Adjust pitch" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1388 +#: modules/gui/qt/components/extended_panels.cpp:1418 msgid "(Hastened)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1390 +#: modules/gui/qt/components/extended_panels.cpp:1420 msgid "(Delayed)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1477 +#: modules/gui/qt/components/extended_panels.cpp:1507 msgid "Force update of this dialog's values" msgstr "" @@ -18710,142 +18715,142 @@ msgid "Overall" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:676 +#: modules/gui/qt/components/interface_widgets.cpp:683 msgid "" "Current playback speed: %1\n" "Click to adjust" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:749 +#: modules/gui/qt/components/interface_widgets.cpp:756 msgid "Revert to normal play speed" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:856 +#: modules/gui/qt/components/interface_widgets.cpp:863 msgid "Download cover art" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:860 +#: modules/gui/qt/components/interface_widgets.cpp:867 msgid "Add cover art from file" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:926 +#: modules/gui/qt/components/interface_widgets.cpp:933 msgid "Choose Cover Art" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:927 +#: modules/gui/qt/components/interface_widgets.cpp:934 msgid "Image Files (*.gif *.jpg *.jpeg *.png)" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:954 +#: modules/gui/qt/components/interface_widgets.cpp:961 #: modules/gui/qt/dialogs/toolbar.cpp:573 msgid "Elapsed time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:958 +#: modules/gui/qt/components/interface_widgets.cpp:965 #: modules/gui/qt/dialogs/toolbar.cpp:577 msgid "Total/Remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:960 +#: modules/gui/qt/components/interface_widgets.cpp:967 msgid "Click to toggle between total and remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:966 +#: modules/gui/qt/components/interface_widgets.cpp:973 msgid "Click to toggle between elapsed and remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:968 +#: modules/gui/qt/components/interface_widgets.cpp:975 msgid "Double click to jump to a chosen time position" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:58 +#: modules/gui/qt/components/open_panels.cpp:55 msgid "Select a device or a VIDEO_TS directory" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:59 +#: modules/gui/qt/components/open_panels.cpp:56 msgid "Select a device or a VIDEO_TS folder" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:145 -#: modules/gui/qt/components/open_panels.cpp:224 +#: modules/gui/qt/components/open_panels.cpp:127 +#: modules/gui/qt/components/open_panels.cpp:206 msgid "Select one or multiple files" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:160 +#: modules/gui/qt/components/open_panels.cpp:142 msgid "File names:" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:162 -#: modules/gui/qt/ui/sprefs_interface.h:558 +#: modules/gui/qt/components/open_panels.cpp:144 +#: modules/gui/qt/ui/sprefs_interface.h:565 msgid "Filter:" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:367 +#: modules/gui/qt/components/open_panels.cpp:349 msgid "Eject the disc" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:534 +#: modules/gui/qt/components/open_panels.cpp:514 msgid "Entry" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:893 +#: modules/gui/qt/components/open_panels.cpp:873 msgid "Channels:" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:904 +#: modules/gui/qt/components/open_panels.cpp:884 msgid "Selected ports:" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:907 +#: modules/gui/qt/components/open_panels.cpp:887 msgid ".*" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:914 +#: modules/gui/qt/components/open_panels.cpp:894 msgid "Use VLC pace" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:934 +#: modules/gui/qt/components/open_panels.cpp:914 msgid "TV - digital" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:937 +#: modules/gui/qt/components/open_panels.cpp:917 msgid "Tuner card" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:938 +#: modules/gui/qt/components/open_panels.cpp:918 msgid "Delivery system" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:968 +#: modules/gui/qt/components/open_panels.cpp:948 msgid "Transponder/multiplex frequency" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:978 +#: modules/gui/qt/components/open_panels.cpp:958 msgid "Transponder symbol rate" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1011 +#: modules/gui/qt/components/open_panels.cpp:991 msgid "Bandwidth" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1055 +#: modules/gui/qt/components/open_panels.cpp:1035 msgid "TV - analog" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1058 +#: modules/gui/qt/components/open_panels.cpp:1038 msgid "Device name" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1118 +#: modules/gui/qt/components/open_panels.cpp:1098 msgid "Your display will be opened and played in order to stream or save it." msgstr "" #. xgettext: frames per second -#: modules/gui/qt/components/open_panels.cpp:1132 +#: modules/gui/qt/components/open_panels.cpp:1112 msgid " f/s" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1347 +#: modules/gui/qt/components/open_panels.cpp:1327 msgid "Advanced Options" msgstr "" @@ -18877,11 +18882,11 @@ msgid "Internet" msgstr "" -#: modules/gui/qt/components/playlist/selector.cpp:443 +#: modules/gui/qt/components/playlist/selector.cpp:456 msgid "Remove this podcast subscription" msgstr "" -#: modules/gui/qt/components/playlist/selector.cpp:594 +#: modules/gui/qt/components/playlist/selector.cpp:607 msgid "Do you really want to unsubscribe from %1?" msgstr "" @@ -18921,35 +18926,35 @@ msgid "Enter a new name for the folder:" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:254 +#: modules/gui/qt/components/playlist/standardpanel.cpp:255 msgid "Sort by" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:261 +#: modules/gui/qt/components/playlist/standardpanel.cpp:262 msgid "Ascending" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:265 +#: modules/gui/qt/components/playlist/standardpanel.cpp:266 msgid "Descending" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:278 +#: modules/gui/qt/components/playlist/standardpanel.cpp:279 msgid "Display size" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:279 +#: modules/gui/qt/components/playlist/standardpanel.cpp:280 msgid "Increase" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:280 +#: modules/gui/qt/components/playlist/standardpanel.cpp:281 msgid "Decrease" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:413 +#: modules/gui/qt/components/playlist/standardpanel.cpp:414 msgid "Playlist View Mode" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:592 +#: modules/gui/qt/components/playlist/standardpanel.cpp:593 msgid "" "Playlist is currently empty.\n" "Drop a file here or select a media source from the left." @@ -18975,91 +18980,91 @@ msgid "Select File" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1125 +#: modules/gui/qt/components/preferences_widgets.cpp:1129 msgid "" "Select or double click an action to change the associated hotkey. Use delete " "key to remove hotkeys." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1132 +#: modules/gui/qt/components/preferences_widgets.cpp:1136 msgid "in" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1134 +#: modules/gui/qt/components/preferences_widgets.cpp:1138 msgid "Any field" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1135 +#: modules/gui/qt/components/preferences_widgets.cpp:1139 msgid "Actions" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1142 +#: modules/gui/qt/components/preferences_widgets.cpp:1146 msgid "Hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1143 +#: modules/gui/qt/components/preferences_widgets.cpp:1147 msgid "Application level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1144 -#: modules/gui/qt/components/preferences_widgets.cpp:1401 +#: modules/gui/qt/components/preferences_widgets.cpp:1148 +#: modules/gui/qt/components/preferences_widgets.cpp:1405 msgid "Global" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1145 +#: modules/gui/qt/components/preferences_widgets.cpp:1149 msgid "Desktop level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1225 -#: modules/gui/qt/components/preferences_widgets.cpp:1226 +#: modules/gui/qt/components/preferences_widgets.cpp:1229 +#: modules/gui/qt/components/preferences_widgets.cpp:1230 msgid "" "Double click to change.\n" "Delete key to remove." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1402 +#: modules/gui/qt/components/preferences_widgets.cpp:1406 msgid "Hotkey change" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1406 +#: modules/gui/qt/components/preferences_widgets.cpp:1410 msgid "Press the new key or combination for " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1415 +#: modules/gui/qt/components/preferences_widgets.cpp:1419 msgid "Assign" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1450 +#: modules/gui/qt/components/preferences_widgets.cpp:1454 msgid "Warning: this key or combination is already assigned to " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1462 +#: modules/gui/qt/components/preferences_widgets.cpp:1466 msgid "Warning: %1 is already an application menu shortcut" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1485 +#: modules/gui/qt/components/preferences_widgets.cpp:1489 msgid "Key or combination: " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1494 +#: modules/gui/qt/components/preferences_widgets.cpp:1498 msgid "Key: " msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:255 -#: modules/gui/qt/components/simple_preferences.cpp:628 +#: modules/gui/qt/components/simple_preferences.cpp:256 +#: modules/gui/qt/components/simple_preferences.cpp:636 msgid "Input & Codecs Settings" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:257 -#: modules/gui/qt/components/simple_preferences.cpp:912 +#: modules/gui/qt/components/simple_preferences.cpp:258 +#: modules/gui/qt/components/simple_preferences.cpp:938 msgid "Configure Hotkeys" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:454 +#: modules/gui/qt/components/simple_preferences.cpp:455 msgid "Device:" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:633 +#: modules/gui/qt/components/simple_preferences.cpp:641 msgid "" "If this property is blank, different values\n" "for DVD, VCD, and CDDA are set.\n" @@ -19067,57 +19072,57 @@ "individually in the advanced preferences." msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:701 +#: modules/gui/qt/components/simple_preferences.cpp:712 msgid "Lowest latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:704 +#: modules/gui/qt/components/simple_preferences.cpp:715 msgid "High latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:705 +#: modules/gui/qt/components/simple_preferences.cpp:716 msgid "Higher latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:753 +#: modules/gui/qt/components/simple_preferences.cpp:764 msgid "This is VLC's skinnable interface. You can download other skins at" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:755 +#: modules/gui/qt/components/simple_preferences.cpp:766 msgid "VLC skins website" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:779 +#: modules/gui/qt/components/simple_preferences.cpp:794 msgid "System's default" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1317 +#: modules/gui/qt/components/simple_preferences.cpp:1344 msgid "File associations" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1326 +#: modules/gui/qt/components/simple_preferences.cpp:1353 #: modules/gui/qt/dialogs_provider.hpp:42 msgid "Audio Files" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1327 +#: modules/gui/qt/components/simple_preferences.cpp:1354 #: modules/gui/qt/dialogs_provider.hpp:41 msgid "Video Files" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1328 +#: modules/gui/qt/components/simple_preferences.cpp:1355 #: modules/gui/qt/dialogs_provider.hpp:43 msgid "Playlist Files" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1393 +#: modules/gui/qt/components/simple_preferences.cpp:1420 msgid "&Apply" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1394 +#: modules/gui/qt/components/simple_preferences.cpp:1421 #: modules/gui/qt/dialogs/convert.cpp:137 -#: modules/gui/qt/dialogs/gototime.cpp:49 modules/gui/qt/dialogs/open.cpp:108 -#: modules/gui/qt/dialogs/openurl.cpp:60 +#: modules/gui/qt/dialogs/gototime.cpp:48 modules/gui/qt/dialogs/open.cpp:109 +#: modules/gui/qt/dialogs/openurl.cpp:59 #: modules/gui/qt/dialogs/podcast_configuration.cpp:37 #: modules/gui/qt/dialogs/preferences.cpp:97 #: modules/gui/qt/dialogs/toolbar.cpp:198 @@ -19161,84 +19166,84 @@ msgid "You must set a name for the profile." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Directory" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Folder" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:47 +#: modules/gui/qt/components/sout/sout_widgets.cpp:48 #: modules/gui/qt/ui/sout.h:199 msgid "Source" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:50 +#: modules/gui/qt/components/sout/sout_widgets.cpp:51 msgid "Source:" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:59 +#: modules/gui/qt/components/sout/sout_widgets.cpp:60 msgid "Type:" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:127 +#: modules/gui/qt/components/sout/sout_widgets.cpp:128 msgid "This module writes the transcoded stream to a file." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:129 +#: modules/gui/qt/components/sout/sout_widgets.cpp:130 msgid "Filename" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:173 +#: modules/gui/qt/components/sout/sout_widgets.cpp:174 #: modules/gui/qt/dialogs/convert.cpp:161 msgid "Save file..." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:174 +#: modules/gui/qt/components/sout/sout_widgets.cpp:175 msgid "" "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:184 +#: modules/gui/qt/components/sout/sout_widgets.cpp:185 msgid "This module outputs the transcoded stream to a network via HTTP." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:186 -#: modules/gui/qt/components/sout/sout_widgets.cpp:282 +#: modules/gui/qt/components/sout/sout_widgets.cpp:187 +#: modules/gui/qt/components/sout/sout_widgets.cpp:283 msgid "Path" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:238 +#: modules/gui/qt/components/sout/sout_widgets.cpp:239 msgid "" "This module outputs the transcoded stream to a network via the mms protocol." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:280 +#: modules/gui/qt/components/sout/sout_widgets.cpp:281 msgid "This module outputs the transcoded stream to a network via RTSP." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:326 +#: modules/gui/qt/components/sout/sout_widgets.cpp:327 msgid "This module outputs the transcoded stream to a network via UDP." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:368 +#: modules/gui/qt/components/sout/sout_widgets.cpp:369 msgid "This module outputs the transcoded stream to a network via RTP." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:375 +#: modules/gui/qt/components/sout/sout_widgets.cpp:376 msgid "Base port" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:423 +#: modules/gui/qt/components/sout/sout_widgets.cpp:424 msgid "This module outputs the transcoded stream to an Icecast server." msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:442 +#: modules/gui/qt/components/sout/sout_widgets.cpp:443 msgid "Mount Point" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:443 +#: modules/gui/qt/components/sout/sout_widgets.cpp:444 msgid "Login:pass" msgstr "" @@ -19264,13 +19269,13 @@ #: modules/gui/qt/dialogs/bookmarks.cpp:62 modules/gui/qt/dialogs/epg.cpp:92 #: modules/gui/qt/dialogs/errors.cpp:49 modules/gui/qt/dialogs/extended.cpp:130 -#: modules/gui/qt/dialogs/help.cpp:66 modules/gui/qt/dialogs/help.cpp:212 +#: modules/gui/qt/dialogs/help.cpp:64 modules/gui/qt/dialogs/help.cpp:223 #: modules/gui/qt/dialogs/mediainfo.cpp:80 -#: modules/gui/qt/dialogs/messages.cpp:84 modules/gui/qt/dialogs/plugins.cpp:94 -#: modules/gui/qt/dialogs/plugins.cpp:1438 -#: modules/gui/qt/dialogs/plugins.cpp:1551 +#: modules/gui/qt/dialogs/messages.cpp:81 modules/gui/qt/dialogs/plugins.cpp:93 +#: modules/gui/qt/dialogs/plugins.cpp:1437 +#: modules/gui/qt/dialogs/plugins.cpp:1550 #: modules/gui/qt/dialogs/podcast_configuration.cpp:36 -#: modules/gui/qt/dialogs/vlm.cpp:136 +#: modules/gui/qt/dialogs/vlm.cpp:130 msgid "&Close" msgstr "" @@ -19290,7 +19295,7 @@ msgid "Destination" msgstr "" -#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:413 +#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:414 msgid "Destination file:" msgstr "" @@ -19330,16 +19335,16 @@ msgid "Containers" msgstr "" -#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:431 +#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:434 msgid "Program Guide" msgstr "" -#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:286 -#: modules/gui/qt/ui/about.h:287 +#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:283 +#: modules/gui/qt/ui/about.h:284 msgid "Update" msgstr "ማሻሻያ" -#: modules/gui/qt/dialogs/epg.cpp:161 +#: modules/gui/qt/dialogs/epg.cpp:162 msgid " (%1+ rated)" msgstr "" @@ -19376,7 +19381,7 @@ msgid "&Save" msgstr "" -#: modules/gui/qt/dialogs/external.cpp:216 +#: modules/gui/qt/dialogs/external.cpp:218 msgid "Store the Password" msgstr "" @@ -19407,60 +19412,60 @@ msgid "Regularly check for VLC updates" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:42 +#: modules/gui/qt/dialogs/gototime.cpp:41 msgid "Go to Time" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:48 +#: modules/gui/qt/dialogs/gototime.cpp:47 msgid "&Go" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:56 +#: modules/gui/qt/dialogs/gototime.cpp:55 msgid "Go to time" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:86 modules/gui/qt/dialogs/plugins.cpp:1376 -#: modules/gui/qt/dialogs/plugins.cpp:1459 +#: modules/gui/qt/dialogs/help.cpp:84 modules/gui/qt/dialogs/plugins.cpp:1375 +#: modules/gui/qt/dialogs/plugins.cpp:1458 msgid "About" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:94 +#: modules/gui/qt/dialogs/help.cpp:101 msgid "" "

VLC media player is a free and open source media player, encoder, and " "streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:214 +#: modules/gui/qt/dialogs/help.cpp:225 msgid "&Recheck version" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:217 +#: modules/gui/qt/dialogs/help.cpp:228 msgid "&Yes" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:219 +#: modules/gui/qt/dialogs/help.cpp:230 msgid "&No" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:222 modules/gui/qt/ui/update.h:144 +#: modules/gui/qt/dialogs/help.cpp:233 modules/gui/qt/ui/update.h:144 msgid "VLC media player updates" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:294 +#: modules/gui/qt/dialogs/help.cpp:305 msgid "A new version of VLC (%1.%2.%3%4) is available." msgstr "" -#: modules/gui/qt/dialogs/help.cpp:319 +#: modules/gui/qt/dialogs/help.cpp:330 msgid "You have the latest version of VLC media player." msgstr "" -#: modules/gui/qt/dialogs/help.cpp:326 +#: modules/gui/qt/dialogs/help.cpp:337 msgid "An error occurred while checking for updates..." msgstr "" @@ -19492,201 +19497,201 @@ msgid "Location:" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:91 +#: modules/gui/qt/dialogs/messages.cpp:88 msgid "Saves all the displayed logs to a file" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:259 +#: modules/gui/qt/dialogs/messages.cpp:256 msgid "Save log file as..." msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:261 +#: modules/gui/qt/dialogs/messages.cpp:258 msgid "Texts/Logs (*.log *.txt);; All (*.*)" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:267 +#: modules/gui/qt/dialogs/messages.cpp:264 msgid "Application" msgstr "መተግበሪያ" -#: modules/gui/qt/dialogs/messages.cpp:268 +#: modules/gui/qt/dialogs/messages.cpp:265 msgid "" "Cannot write to file %1:\n" "%2." msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:334 +#: modules/gui/qt/dialogs/messages.cpp:331 msgid "Update the tree" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:335 +#: modules/gui/qt/dialogs/messages.cpp:332 msgid "Clear the messages" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:78 modules/gui/qt/menus.cpp:935 -#: modules/gui/qt/menus.cpp:1132 +#: modules/gui/qt/dialogs/open.cpp:79 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:1137 msgid "Open Media" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:90 +#: modules/gui/qt/dialogs/open.cpp:91 msgid "&File" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:92 +#: modules/gui/qt/dialogs/open.cpp:93 msgid "&Disc" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:94 +#: modules/gui/qt/dialogs/open.cpp:95 msgid "&Network" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:96 +#: modules/gui/qt/dialogs/open.cpp:97 msgid "Capture &Device" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:111 +#: modules/gui/qt/dialogs/open.cpp:112 msgid "&Select" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:115 modules/gui/qt/dialogs/open.cpp:210 -#: modules/gui/qt/dialogs/openurl.cpp:57 +#: modules/gui/qt/dialogs/open.cpp:116 modules/gui/qt/dialogs/open.cpp:211 +#: modules/gui/qt/dialogs/openurl.cpp:56 msgid "&Enqueue" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:117 modules/gui/qt/dialogs/open.cpp:214 -#: modules/gui/qt/dialogs/openurl.cpp:54 modules/gui/qt/menus.cpp:824 +#: modules/gui/qt/dialogs/open.cpp:118 modules/gui/qt/dialogs/open.cpp:215 +#: modules/gui/qt/dialogs/openurl.cpp:53 modules/gui/qt/menus.cpp:829 msgid "&Play" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:119 modules/gui/qt/dialogs/open.cpp:204 +#: modules/gui/qt/dialogs/open.cpp:120 modules/gui/qt/dialogs/open.cpp:205 msgid "&Stream" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:121 +#: modules/gui/qt/dialogs/open.cpp:122 msgid "C&onvert" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:207 +#: modules/gui/qt/dialogs/open.cpp:208 msgid "C&onvert / Save" msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:47 +#: modules/gui/qt/dialogs/openurl.cpp:46 msgid "Open URL" msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:64 +#: modules/gui/qt/dialogs/openurl.cpp:63 msgid "Enter URL here..." msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:67 +#: modules/gui/qt/dialogs/openurl.cpp:66 msgid "Please enter the URL or path to the media you want to play." msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:71 +#: modules/gui/qt/dialogs/openurl.cpp:70 msgid "" "If your clipboard contains a valid URL\n" "or the path to a file on your computer,\n" "it will be automatically selected." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:80 +#: modules/gui/qt/dialogs/plugins.cpp:79 msgid "Plugins and extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:88 +#: modules/gui/qt/dialogs/plugins.cpp:87 msgid "Active Extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Capability" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Score" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:141 +#: modules/gui/qt/dialogs/plugins.cpp:140 msgid "&Search:" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:259 -#: modules/gui/qt/dialogs/plugins.cpp:1292 +#: modules/gui/qt/dialogs/plugins.cpp:258 +#: modules/gui/qt/dialogs/plugins.cpp:1291 msgid "More information..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:267 +#: modules/gui/qt/dialogs/plugins.cpp:266 msgid "Reload extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:386 +#: modules/gui/qt/dialogs/plugins.cpp:385 msgid "" "Skins customize player's appearance. You can activate them through " "preferences." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:390 +#: modules/gui/qt/dialogs/plugins.cpp:389 msgid "" "Playlist parsers add new capabilities to read internet streams or extract " "meta data." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:394 +#: modules/gui/qt/dialogs/plugins.cpp:393 msgid "" "Service discoveries adds new sources to your playlist such as web radios, " "video websites, ..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:401 +#: modules/gui/qt/dialogs/plugins.cpp:400 msgid "Retrieves extra info and art for playlist items" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:404 +#: modules/gui/qt/dialogs/plugins.cpp:403 msgid "" "Extensions brings various enhancements. Check descriptions for more details" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:425 +#: modules/gui/qt/dialogs/plugins.cpp:424 msgid "Only installed" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:531 +#: modules/gui/qt/dialogs/plugins.cpp:530 msgid "Retrieving addons..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:542 +#: modules/gui/qt/dialogs/plugins.cpp:541 msgid "No addons found" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:821 +#: modules/gui/qt/dialogs/plugins.cpp:820 msgid "This addon has been installed manually. VLC can't manage it by itself." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1204 +#: modules/gui/qt/dialogs/plugins.cpp:1203 msgid "Version %1" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1232 +#: modules/gui/qt/dialogs/plugins.cpp:1231 msgid "%1 downloads" msgstr "%1 የወረዱ" -#: modules/gui/qt/dialogs/plugins.cpp:1301 +#: modules/gui/qt/dialogs/plugins.cpp:1300 msgid "&Uninstall" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1304 +#: modules/gui/qt/dialogs/plugins.cpp:1303 msgid "&Install" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1399 -#: modules/gui/qt/dialogs/plugins.cpp:1502 +#: modules/gui/qt/dialogs/plugins.cpp:1398 +#: modules/gui/qt/dialogs/plugins.cpp:1501 msgid "Version" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1419 -#: modules/gui/qt/dialogs/plugins.cpp:1529 +#: modules/gui/qt/dialogs/plugins.cpp:1418 +#: modules/gui/qt/dialogs/plugins.cpp:1528 msgid "Website" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1541 modules/gui/qt/ui/sprefs_input.h:363 +#: modules/gui/qt/dialogs/plugins.cpp:1540 modules/gui/qt/ui/sprefs_input.h:363 msgid "Files" msgstr "" @@ -19746,11 +19751,11 @@ msgid "Are you sure you want to reset your VLC media player preferences?" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:45 modules/gui/qt/ui/sout.h:198 +#: modules/gui/qt/dialogs/sout.cpp:43 modules/gui/qt/ui/sout.h:198 msgid "Stream Output" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:51 +#: modules/gui/qt/dialogs/sout.cpp:49 msgid "" "This wizard will allow you to stream or convert your media for use locally, " "on your private network, or on the Internet.\n" @@ -19758,14 +19763,14 @@ "be and then press the \"Next\" button to continue.\n" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:58 +#: modules/gui/qt/dialogs/sout.cpp:56 msgid "" "Stream output string.\n" "This is automatically generated when you change the above settings,\n" "but you can change it manually." msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:91 +#: modules/gui/qt/dialogs/sout.cpp:89 msgid "Back" msgstr "" @@ -19897,67 +19902,67 @@ msgid "Speed selector" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:73 +#: modules/gui/qt/dialogs/vlm.cpp:67 msgid "Broadcast" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:74 +#: modules/gui/qt/dialogs/vlm.cpp:68 msgid "Schedule" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:75 +#: modules/gui/qt/dialogs/vlm.cpp:69 msgid "Video On Demand ( VOD )" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:80 +#: modules/gui/qt/dialogs/vlm.cpp:74 msgid "Hours / Minutes / Seconds:" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:82 +#: modules/gui/qt/dialogs/vlm.cpp:76 msgid "Day / Month / Year:" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:84 +#: modules/gui/qt/dialogs/vlm.cpp:78 msgid "Repeat:" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:86 +#: modules/gui/qt/dialogs/vlm.cpp:80 msgid "Repeat delay:" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:111 modules/gui/qt/ui/sprefs_interface.h:555 +#: modules/gui/qt/dialogs/vlm.cpp:105 modules/gui/qt/ui/sprefs_interface.h:562 msgid " days" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:130 +#: modules/gui/qt/dialogs/vlm.cpp:124 msgid "I&mport" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:133 +#: modules/gui/qt/dialogs/vlm.cpp:127 msgid "E&xport" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:264 +#: modules/gui/qt/dialogs/vlm.cpp:258 msgid "Save VLM configuration as..." msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:266 modules/gui/qt/dialogs/vlm.cpp:335 +#: modules/gui/qt/dialogs/vlm.cpp:260 modules/gui/qt/dialogs/vlm.cpp:329 msgid "VLM conf (*.vlm);;All (*)" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:333 +#: modules/gui/qt/dialogs/vlm.cpp:327 msgid "Open VLM configuration..." msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:532 +#: modules/gui/qt/dialogs/vlm.cpp:526 msgid "Broadcast: " msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:605 +#: modules/gui/qt/dialogs/vlm.cpp:599 msgid "Schedule: " msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:629 +#: modules/gui/qt/dialogs/vlm.cpp:623 msgid "VOD: " msgstr "" @@ -20015,339 +20020,339 @@ msgid "Deactivate" msgstr "" -#: modules/gui/qt/main_interface.cpp:373 +#: modules/gui/qt/main_interface.cpp:378 msgid "Do you want to restart the playback where left off?" msgstr "" -#: modules/gui/qt/main_interface.cpp:379 +#: modules/gui/qt/main_interface.cpp:384 msgid "&Continue" msgstr "" -#: modules/gui/qt/main_interface.cpp:1421 +#: modules/gui/qt/main_interface.cpp:1454 msgid "Control menu for the player" msgstr "" -#: modules/gui/qt/main_interface.cpp:1465 +#: modules/gui/qt/main_interface.cpp:1498 msgid "Paused" msgstr "" -#: modules/gui/qt/menus.cpp:331 +#: modules/gui/qt/menus.cpp:334 msgid "&Media" msgstr "" -#: modules/gui/qt/menus.cpp:334 +#: modules/gui/qt/menus.cpp:337 msgid "P&layback" msgstr "" -#: modules/gui/qt/menus.cpp:335 modules/gui/qt/menus.cpp:1050 +#: modules/gui/qt/menus.cpp:338 modules/gui/qt/menus.cpp:1055 msgid "&Audio" msgstr "" -#: modules/gui/qt/menus.cpp:336 modules/gui/qt/menus.cpp:1057 +#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1062 msgid "&Video" msgstr "" -#: modules/gui/qt/menus.cpp:337 modules/gui/qt/menus.cpp:1064 +#: modules/gui/qt/menus.cpp:340 modules/gui/qt/menus.cpp:1069 msgid "Subti&tle" msgstr "" -#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1080 +#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1085 msgid "Tool&s" msgstr "" -#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1087 +#: modules/gui/qt/menus.cpp:345 modules/gui/qt/menus.cpp:1092 msgid "V&iew" msgstr "" -#: modules/gui/qt/menus.cpp:344 modules/gui/qt/menus.cpp:788 +#: modules/gui/qt/menus.cpp:347 modules/gui/qt/menus.cpp:793 msgid "&Help" msgstr "" -#: modules/gui/qt/menus.cpp:357 +#: modules/gui/qt/menus.cpp:360 msgid "Open &File..." msgstr "" -#: modules/gui/qt/menus.cpp:359 +#: modules/gui/qt/menus.cpp:362 msgid "&Open Multiple Files..." msgstr "" -#: modules/gui/qt/menus.cpp:363 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:366 modules/gui/qt/menus.cpp:945 msgid "Open &Disc..." msgstr "" -#: modules/gui/qt/menus.cpp:365 +#: modules/gui/qt/menus.cpp:368 msgid "Open &Network Stream..." msgstr "" -#: modules/gui/qt/menus.cpp:367 modules/gui/qt/menus.cpp:944 +#: modules/gui/qt/menus.cpp:370 modules/gui/qt/menus.cpp:949 msgid "Open &Capture Device..." msgstr "" -#: modules/gui/qt/menus.cpp:370 +#: modules/gui/qt/menus.cpp:373 msgid "Open &Location from clipboard" msgstr "" -#: modules/gui/qt/menus.cpp:374 +#: modules/gui/qt/menus.cpp:377 msgid "Open &Recent Media" msgstr "" -#: modules/gui/qt/menus.cpp:387 +#: modules/gui/qt/menus.cpp:390 msgid "Conve&rt / Save..." msgstr "" -#: modules/gui/qt/menus.cpp:389 +#: modules/gui/qt/menus.cpp:392 msgid "&Stream..." msgstr "" -#: modules/gui/qt/menus.cpp:394 +#: modules/gui/qt/menus.cpp:397 msgid "Quit at the end of playlist" msgstr "" -#: modules/gui/qt/menus.cpp:401 +#: modules/gui/qt/menus.cpp:404 msgid "Close to systray" msgstr "" -#: modules/gui/qt/menus.cpp:405 modules/gui/qt/menus.cpp:1194 +#: modules/gui/qt/menus.cpp:408 modules/gui/qt/menus.cpp:1199 msgid "&Quit" msgstr "" -#: modules/gui/qt/menus.cpp:415 +#: modules/gui/qt/menus.cpp:418 msgid "&Effects and Filters" msgstr "" -#: modules/gui/qt/menus.cpp:418 +#: modules/gui/qt/menus.cpp:421 msgid "&Track Synchronization" msgstr "" -#: modules/gui/qt/menus.cpp:437 +#: modules/gui/qt/menus.cpp:440 msgid "Plu&gins and extensions" msgstr "" -#: modules/gui/qt/menus.cpp:442 +#: modules/gui/qt/menus.cpp:445 msgid "Customi&ze Interface..." msgstr "" -#: modules/gui/qt/menus.cpp:445 +#: modules/gui/qt/menus.cpp:448 msgid "&Preferences" msgstr "" -#: modules/gui/qt/menus.cpp:466 +#: modules/gui/qt/menus.cpp:469 msgid "&View" msgstr "" -#: modules/gui/qt/menus.cpp:487 +#: modules/gui/qt/menus.cpp:490 msgid "Play&list" msgstr "" -#: modules/gui/qt/menus.cpp:488 +#: modules/gui/qt/menus.cpp:491 msgid "Ctrl+L" msgstr "" -#: modules/gui/qt/menus.cpp:491 +#: modules/gui/qt/menus.cpp:494 msgid "Docked Playlist" msgstr "" -#: modules/gui/qt/menus.cpp:501 +#: modules/gui/qt/menus.cpp:504 msgid "Always on &top" msgstr "" -#: modules/gui/qt/menus.cpp:509 +#: modules/gui/qt/menus.cpp:512 msgid "Mi&nimal Interface" msgstr "" -#: modules/gui/qt/menus.cpp:510 +#: modules/gui/qt/menus.cpp:513 msgid "Ctrl+H" msgstr "" -#: modules/gui/qt/menus.cpp:519 +#: modules/gui/qt/menus.cpp:522 msgid "&Fullscreen Interface" msgstr "" -#: modules/gui/qt/menus.cpp:527 +#: modules/gui/qt/menus.cpp:530 msgid "&Advanced Controls" msgstr "" -#: modules/gui/qt/menus.cpp:534 +#: modules/gui/qt/menus.cpp:538 msgid "Status Bar" msgstr "" -#: modules/gui/qt/menus.cpp:539 +#: modules/gui/qt/menus.cpp:544 msgid "Visualizations selector" msgstr "" -#: modules/gui/qt/menus.cpp:597 +#: modules/gui/qt/menus.cpp:602 msgid "&Increase Volume" msgstr "" -#: modules/gui/qt/menus.cpp:600 +#: modules/gui/qt/menus.cpp:605 msgid "D&ecrease Volume" msgstr "" -#: modules/gui/qt/menus.cpp:603 +#: modules/gui/qt/menus.cpp:608 msgid "&Mute" msgstr "" -#: modules/gui/qt/menus.cpp:619 +#: modules/gui/qt/menus.cpp:624 msgid "Audio &Device" msgstr "" -#: modules/gui/qt/menus.cpp:623 +#: modules/gui/qt/menus.cpp:628 msgid "Audio &Track" msgstr "" -#: modules/gui/qt/menus.cpp:625 +#: modules/gui/qt/menus.cpp:630 msgid "&Stereo Mode" msgstr "" -#: modules/gui/qt/menus.cpp:628 +#: modules/gui/qt/menus.cpp:633 msgid "&Visualizations" msgstr "" -#: modules/gui/qt/menus.cpp:654 +#: modules/gui/qt/menus.cpp:659 msgid "Add &Subtitle File..." msgstr "" -#: modules/gui/qt/menus.cpp:656 +#: modules/gui/qt/menus.cpp:661 msgid "Sub &Track" msgstr "" -#: modules/gui/qt/menus.cpp:678 +#: modules/gui/qt/menus.cpp:683 msgid "Video &Track" msgstr "" -#: modules/gui/qt/menus.cpp:682 +#: modules/gui/qt/menus.cpp:687 msgid "&Fullscreen" msgstr "" -#: modules/gui/qt/menus.cpp:683 +#: modules/gui/qt/menus.cpp:688 msgid "Always Fit &Window" msgstr "" -#: modules/gui/qt/menus.cpp:684 +#: modules/gui/qt/menus.cpp:689 msgid "Set as Wall&paper" msgstr "" -#: modules/gui/qt/menus.cpp:688 +#: modules/gui/qt/menus.cpp:693 msgid "&Zoom" msgstr "" -#: modules/gui/qt/menus.cpp:689 +#: modules/gui/qt/menus.cpp:694 msgid "&Aspect Ratio" msgstr "" -#: modules/gui/qt/menus.cpp:690 +#: modules/gui/qt/menus.cpp:695 msgid "&Crop" msgstr "" -#: modules/gui/qt/menus.cpp:694 +#: modules/gui/qt/menus.cpp:699 msgid "&Deinterlace" msgstr "" -#: modules/gui/qt/menus.cpp:695 +#: modules/gui/qt/menus.cpp:700 msgid "&Deinterlace mode" msgstr "" -#: modules/gui/qt/menus.cpp:699 +#: modules/gui/qt/menus.cpp:704 msgid "Take &Snapshot" msgstr "" -#: modules/gui/qt/menus.cpp:718 +#: modules/gui/qt/menus.cpp:723 msgid "T&itle" msgstr "" -#: modules/gui/qt/menus.cpp:719 +#: modules/gui/qt/menus.cpp:724 msgid "&Chapter" msgstr "" -#: modules/gui/qt/menus.cpp:721 +#: modules/gui/qt/menus.cpp:726 msgid "&Program" msgstr "" -#: modules/gui/qt/menus.cpp:725 +#: modules/gui/qt/menus.cpp:730 msgid "&Manage" msgstr "" -#: modules/gui/qt/menus.cpp:791 +#: modules/gui/qt/menus.cpp:796 msgid "Check for &Updates..." msgstr "" -#: modules/gui/qt/menus.cpp:838 +#: modules/gui/qt/menus.cpp:843 msgid "&Stop" msgstr "" -#: modules/gui/qt/menus.cpp:846 +#: modules/gui/qt/menus.cpp:851 msgid "Pre&vious" msgstr "" -#: modules/gui/qt/menus.cpp:852 +#: modules/gui/qt/menus.cpp:857 msgid "Ne&xt" msgstr "" -#: modules/gui/qt/menus.cpp:870 +#: modules/gui/qt/menus.cpp:875 msgid "Sp&eed" msgstr "" -#: modules/gui/qt/menus.cpp:876 +#: modules/gui/qt/menus.cpp:881 msgid "&Faster" msgstr "" -#: modules/gui/qt/menus.cpp:888 +#: modules/gui/qt/menus.cpp:893 msgid "N&ormal Speed" msgstr "" -#: modules/gui/qt/menus.cpp:898 +#: modules/gui/qt/menus.cpp:903 msgid "Slo&wer" msgstr "" -#: modules/gui/qt/menus.cpp:913 +#: modules/gui/qt/menus.cpp:918 msgid "&Jump Forward" msgstr "" -#: modules/gui/qt/menus.cpp:920 +#: modules/gui/qt/menus.cpp:925 msgid "Jump Bac&kward" msgstr "" -#: modules/gui/qt/menus.cpp:927 +#: modules/gui/qt/menus.cpp:932 msgid "Ctrl+T" msgstr "" -#: modules/gui/qt/menus.cpp:942 +#: modules/gui/qt/menus.cpp:947 msgid "Open &Network..." msgstr "" -#: modules/gui/qt/menus.cpp:1036 +#: modules/gui/qt/menus.cpp:1041 msgid "Leave Fullscreen" msgstr "" -#: modules/gui/qt/menus.cpp:1070 +#: modules/gui/qt/menus.cpp:1075 msgid "&Playback" msgstr "" -#: modules/gui/qt/menus.cpp:1175 +#: modules/gui/qt/menus.cpp:1180 msgid "&Hide VLC media player in taskbar" msgstr "" -#: modules/gui/qt/menus.cpp:1181 +#: modules/gui/qt/menus.cpp:1186 msgid "Sho&w VLC media player" msgstr "" -#: modules/gui/qt/menus.cpp:1192 +#: modules/gui/qt/menus.cpp:1197 msgid "&Open Media" msgstr "" -#: modules/gui/qt/menus.cpp:1622 +#: modules/gui/qt/menus.cpp:1627 msgid "&Clear" msgstr "" -#: modules/gui/qt/menus.cpp:1630 +#: modules/gui/qt/menus.cpp:1635 msgid "&Renderer" msgstr "" -#: modules/gui/qt/menus.cpp:1634 +#: modules/gui/qt/menus.cpp:1639 msgid "" msgstr "" -#: modules/gui/qt/menus.cpp:1647 +#: modules/gui/qt/menus.cpp:1652 msgid "Scanning..." msgstr "" @@ -20424,41 +20429,49 @@ msgstr "" #: modules/gui/qt/qt.cpp:124 -msgid "Activate the updates availability notification" +msgid "Enable Dark Mode" msgstr "" #: modules/gui/qt/qt.cpp:125 +msgid "Applies a dark theme to the style." +msgstr "" + +#: modules/gui/qt/qt.cpp:127 +msgid "Activate the updates availability notification" +msgstr "" + +#: modules/gui/qt/qt.cpp:128 msgid "" "Activate the automatic notification of new versions of the software. It runs " "once every two weeks." msgstr "" -#: modules/gui/qt/qt.cpp:128 +#: modules/gui/qt/qt.cpp:131 msgid "Number of days between two update checks" msgstr "" -#: modules/gui/qt/qt.cpp:130 +#: modules/gui/qt/qt.cpp:133 msgid "Ask for network policy at start" msgstr "" -#: modules/gui/qt/qt.cpp:132 +#: modules/gui/qt/qt.cpp:135 msgid "Save the recently played items in the menu" msgstr "" -#: modules/gui/qt/qt.cpp:134 +#: modules/gui/qt/qt.cpp:137 msgid "List of words separated by | to filter" msgstr "" -#: modules/gui/qt/qt.cpp:135 +#: modules/gui/qt/qt.cpp:138 msgid "" "Regular expression used to filter the recent items played in the player." msgstr "" -#: modules/gui/qt/qt.cpp:138 +#: modules/gui/qt/qt.cpp:141 msgid "Define the colors of the volume slider" msgstr "" -#: modules/gui/qt/qt.cpp:139 +#: modules/gui/qt/qt.cpp:142 msgid "" "Define the colors of the volume slider\n" "By specifying the 12 numbers separated by a ';'\n" @@ -20466,11 +20479,11 @@ "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255'" msgstr "" -#: modules/gui/qt/qt.cpp:144 +#: modules/gui/qt/qt.cpp:147 msgid "Selection of the starting mode and look" msgstr "" -#: modules/gui/qt/qt.cpp:145 +#: modules/gui/qt/qt.cpp:148 msgid "" "Start VLC with:\n" " - normal mode\n" @@ -20478,57 +20491,57 @@ " - minimal mode with limited controls" msgstr "" -#: modules/gui/qt/qt.cpp:151 +#: modules/gui/qt/qt.cpp:154 msgid "Show a controller in fullscreen mode" msgstr "" -#: modules/gui/qt/qt.cpp:152 +#: modules/gui/qt/qt.cpp:155 msgid "Embed the file browser in open dialog" msgstr "" -#: modules/gui/qt/qt.cpp:154 +#: modules/gui/qt/qt.cpp:157 msgid "Define which screen fullscreen goes" msgstr "" -#: modules/gui/qt/qt.cpp:155 +#: modules/gui/qt/qt.cpp:158 msgid "Screennumber of fullscreen, instead of same screen where interface is." msgstr "" -#: modules/gui/qt/qt.cpp:158 +#: modules/gui/qt/qt.cpp:161 msgid "Load extensions on startup" msgstr "" -#: modules/gui/qt/qt.cpp:159 +#: modules/gui/qt/qt.cpp:162 msgid "Automatically load the extensions module on startup." msgstr "" -#: modules/gui/qt/qt.cpp:162 +#: modules/gui/qt/qt.cpp:165 msgid "Start in minimal view (without menus)" msgstr "" -#: modules/gui/qt/qt.cpp:164 +#: modules/gui/qt/qt.cpp:167 msgid "Display background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:165 +#: modules/gui/qt/qt.cpp:168 msgid "" "Display background cone or current album art when not playing. Can be " "disabled to prevent burning screen." msgstr "" -#: modules/gui/qt/qt.cpp:168 +#: modules/gui/qt/qt.cpp:171 msgid "Expanding background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:169 +#: modules/gui/qt/qt.cpp:172 msgid "Background art fits window's size." msgstr "" -#: modules/gui/qt/qt.cpp:171 +#: modules/gui/qt/qt.cpp:174 msgid "Ignore keyboard volume buttons." msgstr "" -#: modules/gui/qt/qt.cpp:173 +#: modules/gui/qt/qt.cpp:176 msgid "" "With this option checked, the volume up, volume down and mute buttons on " "your keyboard will always change your system volume. With this option " @@ -20536,41 +20549,41 @@ "and change the system volume when VLC is not selected." msgstr "" -#: modules/gui/qt/qt.cpp:188 +#: modules/gui/qt/qt.cpp:191 msgid "When to raise the interface" msgstr "" -#: modules/gui/qt/qt.cpp:189 +#: modules/gui/qt/qt.cpp:192 msgid "" "This option allows the interface to be raised automatically when a video/" "audio playback starts, or never." msgstr "" -#: modules/gui/qt/qt.cpp:192 +#: modules/gui/qt/qt.cpp:195 msgid "Fullscreen controller mouse sensitivity" msgstr "" -#: modules/gui/qt/qt.cpp:200 +#: modules/gui/qt/qt.cpp:203 msgid "When minimized" msgstr "" -#: modules/gui/qt/qt.cpp:218 +#: modules/gui/qt/qt.cpp:221 msgid "Qt interface" msgstr "" -#: modules/gui/qt/util/customwidgets.cpp:82 +#: modules/gui/qt/util/customwidgets.cpp:80 msgid "errors" msgstr "" -#: modules/gui/qt/util/customwidgets.cpp:83 +#: modules/gui/qt/util/customwidgets.cpp:81 msgid "warnings" msgstr "" -#: modules/gui/qt/util/customwidgets.cpp:84 +#: modules/gui/qt/util/customwidgets.cpp:82 msgid "debug" msgstr "" -#: modules/gui/qt/util/searchlineedit.cpp:49 +#: modules/gui/qt/util/searchlineedit.cpp:50 msgctxt "Tooltip|Clear" msgid "Clear" msgstr "" @@ -20667,72 +20680,76 @@ msgid "Open skin..." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:86 modules/hw/d3d9/d3d9_filters.c:68 +#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:68 #: modules/video_filter/adjust.c:61 msgid "Brightness threshold" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:69 +#: modules/hw/d3d11/d3d11_filters.c:88 modules/hw/d3d9/d3d9_filters.c:69 #: modules/video_filter/adjust.c:62 msgid "" "When this mode is enabled, pixels will be shown as black or white. The " "threshold value will be the brightness defined below." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:90 modules/hw/d3d9/d3d9_filters.c:72 +#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:72 #: modules/video_filter/adjust.c:65 msgid "Image contrast (0-2)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:73 +#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:73 #: modules/video_filter/adjust.c:66 msgid "Set the image contrast, between 0 and 2. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:74 +#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:74 msgid "Image hue (0-360)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:75 +#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:75 msgid "Set the image hue, between 0 and 360. Defaults to 0." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:76 +#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:76 #: modules/video_filter/adjust.c:69 msgid "Image saturation (0-3)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:77 +#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:77 #: modules/video_filter/adjust.c:70 msgid "Set the image saturation, between 0 and 3. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:78 +#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:78 #: modules/video_filter/adjust.c:71 msgid "Image brightness (0-2)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:79 +#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:79 #: modules/video_filter/adjust.c:72 msgid "Set the image brightness, between 0 and 2. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:80 +#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:80 #: modules/video_filter/adjust.c:73 msgid "Image gamma (0-10)" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:81 +#: modules/hw/d3d11/d3d11_filters.c:100 modules/hw/d3d9/d3d9_filters.c:81 #: modules/video_filter/adjust.c:74 msgid "Set the image gamma, between 0.01 and 10. Defaults to 1." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:670 +#: modules/hw/d3d11/d3d11_filters.c:681 msgid "AMD VQ Enhancer" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:671 -msgid "amf_vqenhancer" +#: modules/hw/d3d11/d3d11_filters.c:687 +msgid "AMD Frame Rate Doubler" +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:690 +msgid "Show indicator" msgstr "" #: modules/hw/d3d9/d3d9_filters.c:454 @@ -21113,11 +21130,11 @@ msgid "System logger (syslog)" msgstr "" -#: modules/lua/extension.c:1194 +#: modules/lua/extension.c:1200 msgid "Extension not responding!" msgstr "" -#: modules/lua/extension.c:1195 +#: modules/lua/extension.c:1201 #, c-format msgid "" "Extension '%s' does not respond.\n" @@ -21145,8 +21162,8 @@ #: modules/lua/vlc.c:53 msgid "" -"Lua interface configuration string. Format is: '[\"\"] = {

For all the saving, converting, transcoding, encoding, muxing and " "streaming tasks, you should find useful information in the Streaming Documentation.

If you are unsure about terminology, please consult the knowledge base.

To understand the main keyboard shortcuts, read the shortcuts page.

Help

Before " -"asking any question, please refer yourself to the FAQ.

You might then get (and give) " -"help on the Forums, the mailing-lists or our IRC " -"channel (#videolan on irc.freenode.net).

Contribute to the " -"project

You can help the VideoLAN project giving some of your time to " -"help the community, to design skins, to translate the documentation, to test " -"and to code. You can also give funds and material to help us. And of course, " -"you can promote VLC media player.

" +"a>.

If you are unsure about terminology, please consult the knowledge base.

To " +"understand the main keyboard shortcuts, read the shortcuts page.

Help

Before asking " +"any question, please refer yourself to the FAQ.

You might then get (and give) help on the " +"Forums, the mailing-lists or our IRC channel " +"(#videolan on irc.freenode.net).

Contribute to the project

You can help the VideoLAN project giving some of your time to help the " +"community, to design skins, to translate the documentation, to test and to " +"code. You can also give funds and material to help us. And of course, you " +"can promote VLC media player.

" msgstr "" "

Bienplegau en l'aduya d'o VLCDocumentación arredol d'o fluxo de datos." -"

Si tien problemas con a terminolochía, puet consultar a base de conoixencia.

Si tien problemas con a terminolochía, puet consultar a base de conoixencia.

Ta entender as teclas d'alcorce principals puet leyer a pachina de alcorces.

Ajuda

Antes de no fer una pregunta, comprebe as preguntas mas freqüents.

Tamién " -"puet obtener (u dar) aduya en os Foros, as listas de distribución u a nuestra canal IRC (#videolan en irc.freenode.net ).

Contribución en o prochecto

Puet colaborar-ie con o suyo " -"tiempo, disenyando l'apariencia, traducindo a documentación, fendo prebas u " -"programando. Tamién puet donar diners u material ta aduyar-nos. Y, pro a " -"fes, puet aduyar promocionando o reproductor VLC.

" +"puet obtener (u dar) aduya en os Foros, as listas " +"de distribución u a nuestra canal IRC (#videolan en irc.freenode.net ).

Contribución " +"en o prochecto

Puet colaborar-ie con o suyo tiempo, disenyando " +"l'apariencia, traducindo a documentación, fendo prebas u programando. Tamién " +"puet donar diners u material ta aduyar-nos. Y, pro a fes, puet aduyar " +"promocionando o reproductor VLC.

" #: src/audio_output/filters.c:267 msgid "Audio filtering failed" @@ -741,8 +741,8 @@ #: modules/access/dtv/access.c:113 modules/access/dtv/access.c:122 #: modules/access/dtv/access.c:130 modules/access/dtv/access.c:139 #: modules/access/dtv/access.c:147 modules/access/dtv/access.c:169 -#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:991 -#: modules/gui/qt/components/simple_preferences.cpp:394 +#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:971 +#: modules/gui/qt/components/simple_preferences.cpp:395 msgid "Automatic" msgstr "Automatica" @@ -943,7 +943,7 @@ msgstr "descodificador" #: src/input/decoder.c:1922 src/input/decoder.c:2205 -#: modules/codec/avcodec/encoder.c:378 modules/codec/avcodec/encoder.c:918 +#: modules/codec/avcodec/encoder.c:394 modules/codec/avcodec/encoder.c:939 #: modules/stream_out/es.c:349 modules/stream_out/es.c:362 msgid "Streaming / Transcoding failed" msgstr "Ha fallau a transmisión u a transcodificación" @@ -958,7 +958,7 @@ msgstr "O VLC no ha puesto ubrir o modulo de descodificación." #: src/input/es_out.c:956 src/input/es_out.c:961 src/libvlc-module.c:239 -#: modules/gui/qt/components/open_panels.cpp:547 +#: modules/gui/qt/components/open_panels.cpp:527 msgid "Track" msgstr "Pista" @@ -983,7 +983,7 @@ msgstr "Barrechau" #: src/input/es_out.c:1463 modules/keystore/keychain.m:41 -#: modules/lua/extension.c:1193 +#: modules/lua/extension.c:1199 msgid "Yes" msgstr "Sí" @@ -1012,7 +1012,7 @@ #: src/input/es_out.c:3151 src/input/meta.c:66 modules/access/imem.c:71 #: modules/gui/macosx/VLCPlaylist.m:98 #: modules/gui/macosx/VLCSimplePrefsController.m:325 -#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:527 +#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:533 msgid "Language" msgstr "Idioma" @@ -1026,7 +1026,7 @@ #: src/input/es_out.c:3160 src/input/es_out.c:3204 src/input/es_out.c:3394 #: modules/gui/macosx/VLCAddonsWindowController.m:133 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:185 -#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1495 +#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1494 msgid "Type" msgstr "Tipo" @@ -1293,8 +1293,8 @@ #: modules/gui/macosx/VLCOpenWindowController.m:178 #: modules/gui/macosx/VLCOpenWindowController.m:180 #: modules/gui/macosx/VLCPlaylist.m:91 modules/gui/macosx/VLCPlaylistInfo.m:59 -#: modules/gui/qt/components/open_panels.cpp:507 -#: modules/gui/qt/components/open_panels.cpp:521 +#: modules/gui/qt/components/open_panels.cpp:487 +#: modules/gui/qt/components/open_panels.cpp:501 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56 #: modules/gui/qt/ui/open_disk.h:306 msgid "Title" @@ -1546,8 +1546,8 @@ msgid "" "You can select \"additional interfaces\" for VLC. They will be launched in " "the background in addition to the default interface. Use a colon separated " -"list of interface modules. (common values are \"rc\" (remote control), " -"\"http\", \"gestures\" ...)" +"list of interface modules. (common values are \"rc\" (remote control), \"http" +"\", \"gestures\" ...)" msgstr "" "Ista opción permite trigar \"interficies adicionals\" emplegadas por o VLC. " "S'executan en segundo plan, adhibidas a la interficie por defecto. Emplegue " @@ -1646,7 +1646,7 @@ msgstr "" #: src/libvlc-module.c:132 modules/gui/macosx/VLCSimplePrefsController.m:281 -#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:407 +#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:408 msgid "Enable audio" msgstr "Activar l'audio" @@ -1769,10 +1769,9 @@ #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:957 #: modules/audio_output/kai.c:106 modules/codec/subsdec.c:167 #: modules/codec/x264.c:434 modules/demux/adaptive/adaptive.cpp:122 -#: modules/demux/mpeg/ts.c:131 modules/gui/macosx/VLCSimplePrefsController.m:54 -#: modules/gui/qt/components/simple_preferences.cpp:68 +#: modules/demux/mpeg/ts.c:132 modules/gui/macosx/VLCSimplePrefsController.m:54 +#: modules/gui/qt/components/simple_preferences.cpp:69 #: modules/gui/qt/components/sout/profile_selector.cpp:590 -#: modules/services_discovery/upnp.cpp:82 #: modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62 #: modules/video_output/win32/direct3d11.c:88 @@ -1798,8 +1797,8 @@ msgstr "" #: src/libvlc-module.c:195 src/misc/actions.c:112 -#: modules/gui/qt/components/preferences_widgets.cpp:1417 -#: modules/gui/qt/util/customwidgets.cpp:330 +#: modules/gui/qt/components/preferences_widgets.cpp:1421 +#: modules/gui/qt/util/customwidgets.cpp:328 msgid "Unset" msgstr "Sin establir" @@ -2590,7 +2589,7 @@ #: src/libvlc-module.c:540 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:215 #: modules/gui/macosx/VLCSidebarDataSource.m:209 -#: modules/gui/qt/components/extended_panels.cpp:949 +#: modules/gui/qt/components/extended_panels.cpp:962 #: modules/gui/qt/ui/equalizer.h:130 modules/gui/qt/ui/vlm.h:286 msgid "Enable" msgstr "Habilitar" @@ -2916,16 +2915,16 @@ #: src/libvlc-module.c:690 msgid "" -"This option allows you to set the title according to what's being " -"played
$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: " -"Genre
$n: Track num
$p: Now playing
$A: Date
$D: Duration
$Z: " -"\"Now playing\" (Fall back on Title - Artist)" +"This option allows you to set the title according to what's being played
" +"$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: Genre
$n: " +"Track num
$p: Now playing
$A: Date
$D: Duration
$Z: \"Now playing" +"\" (Fall back on Title - Artist)" msgstr "" "Ista opción permite establir o titol d'alcuerdo a o que se ye " "reproducindo
$a2: Artista
$b: Album
$c: Dreitos d'autor
$t: " -"Titol
$g: Chenero
$n: Numero de pista
$p: Reproducindo-se " -"agora
$A2: Calendata
$D: Duración
$Z: «Reproducindo-se agora» (Fer " -"servir Titol - Artista como alternativa)" +"Titol
$g: Chenero
$n: Numero de pista
$p: Reproducindo-se agora
" +"$A2: Calendata
$D: Duración
$Z: «Reproducindo-se agora» (Fer servir " +"Titol - Artista como alternativa)" #: src/libvlc-module.c:695 msgid "Disable all lua plugins" @@ -3707,7 +3706,7 @@ "Fer saber a VLC que ye estando lanzau a causa d'una asociación a fichero en " "o CHUS" -#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:547 +#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:554 msgid "Use only one instance when started from file manager" msgstr "" @@ -3731,7 +3730,7 @@ "tiempo de procesador y deixaría blocau tot o sistema, o qual puede requerir " "un reinicio d'a suya maquina." -#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:550 +#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:557 msgid "Enqueue items into playlist in one instance mode" msgstr "" @@ -3779,7 +3778,7 @@ #: src/libvlc-module.c:1126 modules/gui/macosx/VLCSimplePrefsController.m:342 #: modules/gui/qt/dialogs/firstrun.cpp:95 -#: modules/gui/qt/ui/sprefs_interface.h:562 +#: modules/gui/qt/ui/sprefs_interface.h:569 msgid "Allow metadata network access" msgstr "" @@ -3932,7 +3931,7 @@ "A biblioteca multimedia ye alzada automaticament y recargada cada vegada que " "s'encieta VLC." -#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:548 +#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:555 msgid "Display playlist tree" msgstr "Amostrar arbol de lista de reproducción" @@ -4059,11 +4058,11 @@ msgstr "" "Seleccione l'alcorce de teclau ta establir a reproducción a taxa normal." -#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:884 +#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:889 msgid "Faster (fine)" msgstr "Mas rapido (preciso)" -#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:892 +#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:897 msgid "Slower (fine)" msgstr "Mas lento (preciso)" @@ -4074,7 +4073,7 @@ #: modules/gui/macosx/VLCMainMenu.m:396 modules/gui/macosx/VLCMainMenu.m:499 #: modules/gui/macosx/VLCMainMenu.m:507 #: modules/gui/qt/components/controller.hpp:112 -#: modules/gui/qt/dialogs/sout.cpp:93 modules/notify/notify.c:335 +#: modules/gui/qt/dialogs/sout.cpp:91 modules/notify/notify.c:335 #: modules/gui/qt/ui/streampanel.h:179 msgid "Next" msgstr "Siguient" @@ -4105,7 +4104,7 @@ #: modules/gui/macosx/VLCMainMenu.m:498 modules/gui/macosx/VLCMainMenu.m:505 #: modules/gui/macosx/VLCMainWindowControlsBar.m:65 #: modules/gui/qt/components/controller.hpp:107 -#: modules/gui/qt/dialogs/vlm.cpp:544 modules/gui/qt/ui/streampanel.h:178 +#: modules/gui/qt/dialogs/vlm.cpp:538 modules/gui/qt/ui/streampanel.h:178 msgid "Stop" msgstr "Detener" @@ -4235,8 +4234,8 @@ #: src/libvlc-module.c:1293 modules/control/hotkeys.c:361 #: modules/gui/macosx/VLCStatusBarIcon.m:116 #: modules/gui/qt/components/controller.hpp:111 -#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:955 -#: modules/gui/qt/menus.cpp:1141 modules/gui/skins2/commands/cmd_quit.cpp:45 +#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:960 +#: modules/gui/qt/menus.cpp:1146 modules/gui/skins2/commands/cmd_quit.cpp:45 msgid "Quit" msgstr "Salir" @@ -4545,7 +4544,7 @@ "Seleccionar a tecla ta establir iste favorito de lista de reproducción." #: src/libvlc-module.c:1373 -#: modules/gui/qt/components/playlist/standardpanel.cpp:246 +#: modules/gui/qt/components/playlist/standardpanel.cpp:247 msgid "Clear the playlist" msgstr "" @@ -4723,7 +4722,7 @@ #: src/libvlc-module.c:1423 modules/gui/macosx/VLCMainMenu.m:387 #: modules/gui/qt/components/controller.hpp:110 -#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:858 +#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:863 #: modules/stream_out/record.c:60 msgid "Record" msgstr "Gravar" @@ -4883,7 +4882,7 @@ msgid "Special modules" msgstr "Modulos especials" -#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:90 +#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:89 msgid "Plugins" msgstr "Complementos" @@ -5157,7 +5156,7 @@ msgid "Media View" msgstr "Vista d'o meyo" -#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:568 +#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:577 msgid "Menu" msgstr "Menú" @@ -5190,8 +5189,8 @@ #: modules/gui/macosx/VLCFSPanelController.m:251 #: modules/gui/macosx/VLCMainMenu.m:1346 modules/gui/macosx/VLCMainMenu.m:1347 #: modules/gui/macosx/VLCMainMenu.m:1348 -#: modules/gui/qt/components/playlist/standardpanel.cpp:196 -#: modules/gui/qt/menus.cpp:832 +#: modules/gui/qt/components/playlist/standardpanel.cpp:197 +#: modules/gui/qt/menus.cpp:837 msgid "Pause" msgstr "Pausa" @@ -5282,7 +5281,7 @@ msgstr "Fallo en ubrir «%s» ta escribir" #: src/misc/update.c:596 src/misc/update.c:726 modules/access/dvb/scan.c:826 -#: modules/demux/avi/avi.c:2827 +#: modules/demux/avi/avi.c:2878 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:513 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:571 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:854 @@ -5307,10 +5306,10 @@ #: modules/gui/macosx/VLCVideoEffectsWindowController.m:791 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:860 #: modules/gui/macosx/prefs.m:189 -#: modules/gui/qt/components/open_panels.cpp:1381 -#: modules/gui/qt/components/preferences_widgets.cpp:1416 +#: modules/gui/qt/components/open_panels.cpp:1361 +#: modules/gui/qt/components/preferences_widgets.cpp:1420 #: modules/gui/qt/components/sout/profile_selector.cpp:452 -#: modules/gui/qt/dialogs/sout.cpp:92 +#: modules/gui/qt/dialogs/sout.cpp:90 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "Cancel" msgstr "Cancelar" @@ -6250,11 +6249,11 @@ msgid "Blu-ray Disc support (libbluray)" msgstr "Suporte de disco Blu-Ray (libbluray)" -#: modules/access/bluray.c:849 +#: modules/access/bluray.c:847 msgid "Path doesn't appear to be a Blu-ray" msgstr "A dirección no pareix que siga d'un Blu-Ray" -#: modules/access/bluray.c:864 +#: modules/access/bluray.c:862 msgid "" "This Blu-ray Disc needs a library for AACS decoding, and your system does " "not have it." @@ -6262,71 +6261,71 @@ "O Blu-Ray Disc amenista una librería ta o decodificador AACS, y pareix que o " "tuyo sistema no lo tiene." -#: modules/access/bluray.c:870 +#: modules/access/bluray.c:868 msgid "Blu-ray Disc is corrupted." msgstr "O disco Blu-Ray ye corrupto." -#: modules/access/bluray.c:872 +#: modules/access/bluray.c:870 msgid "Missing AACS configuration file!" msgstr "Falta o fichero de configuración de AACS!" -#: modules/access/bluray.c:874 +#: modules/access/bluray.c:872 msgid "No valid processing key found in AACS config file." msgstr "" -#: modules/access/bluray.c:876 +#: modules/access/bluray.c:874 msgid "No valid host certificate found in AACS config file." msgstr "" -#: modules/access/bluray.c:878 +#: modules/access/bluray.c:876 msgid "AACS Host certificate revoked." msgstr "" -#: modules/access/bluray.c:880 +#: modules/access/bluray.c:878 msgid "AACS MMC failed." msgstr "" -#: modules/access/bluray.c:890 +#: modules/access/bluray.c:888 msgid "" "This Blu-ray Disc needs a library for BD+ decoding, and your system does not " "have it." msgstr "" -#: modules/access/bluray.c:893 +#: modules/access/bluray.c:891 msgid "Your system BD+ decoding library does not work. Missing configuration?" msgstr "" "A suya librería de descodificación d'o sistema BD+ no funciona. " "Configuración desapareixidas?" -#: modules/access/bluray.c:926 +#: modules/access/bluray.c:924 msgid "Java required" msgstr "" -#: modules/access/bluray.c:927 +#: modules/access/bluray.c:925 #, c-format msgid "" "This Blu-ray disc requires Java for menus support.%s\n" "The disc will be played without menus." msgstr "" -#: modules/access/bluray.c:928 +#: modules/access/bluray.c:926 msgid "Java was not found on your system." msgstr "" -#: modules/access/bluray.c:951 +#: modules/access/bluray.c:949 msgid "Failed to start bluray playback. Please try without menu support." msgstr "" -#: modules/access/bluray.c:992 modules/access/bluray.c:2825 -#: modules/access/bluray.c:2830 +#: modules/access/bluray.c:990 modules/access/bluray.c:2823 +#: modules/access/bluray.c:2828 msgid "Blu-ray error" msgstr "Error de Blu-ray" -#: modules/access/bluray.c:2115 +#: modules/access/bluray.c:2113 msgid "Top Menu" msgstr "" -#: modules/access/bluray.c:2118 +#: modules/access/bluray.c:2116 msgid "First Play" msgstr "" @@ -6353,9 +6352,8 @@ msgstr "" #: modules/access/cdda.c:1023 -#, fuzzy msgid "Address of the musicbrainz server to use." -msgstr "Adreza de servidor CDDB a usar." +msgstr "" #: modules/access/cdda.c:1025 msgid "CDDB Server" @@ -6527,7 +6525,7 @@ msgid "10 bits" msgstr "" -#: modules/access/decklink.cpp:358 modules/demux/ty.c:769 +#: modules/access/decklink.cpp:358 modules/demux/ty.c:783 msgid "Closed captions 1" msgstr "Subtítulos 1" @@ -6563,7 +6561,7 @@ msgstr "DSS" #: modules/access/dshow/dshow.cpp:130 -#: modules/gui/qt/components/open_panels.cpp:838 +#: modules/gui/qt/components/open_panels.cpp:818 msgid "Video device name" msgstr "Nombre d'o dispositivo de video" @@ -6576,8 +6574,8 @@ "especifica brenca, usará o dispositivo predeterminau." #: modules/access/dshow/dshow.cpp:135 -#: modules/gui/qt/components/open_panels.cpp:846 -#: modules/gui/qt/components/open_panels.cpp:1067 +#: modules/gui/qt/components/open_panels.cpp:826 +#: modules/gui/qt/components/open_panels.cpp:1047 msgid "Audio device name" msgstr "Nombre d'o dispositivo d'audio" @@ -6588,7 +6586,7 @@ msgstr "" #: modules/access/dshow/dshow.cpp:140 -#: modules/gui/qt/components/open_panels.cpp:813 +#: modules/gui/qt/components/open_panels.cpp:793 msgid "Video size" msgstr "Grandaria d'o video" @@ -6671,8 +6669,8 @@ msgstr "Isto sobrescribe a canal. Mediu en Hz." #: modules/access/dshow/dshow.cpp:168 -#: modules/gui/qt/components/open_panels.cpp:866 -#: modules/gui/qt/components/open_panels.cpp:1087 +#: modules/gui/qt/components/open_panels.cpp:846 +#: modules/gui/qt/components/open_panels.cpp:1067 msgid "Video standard" msgstr "Video estandar" @@ -6882,7 +6880,7 @@ "frequency. This is required to tune the receiver." msgstr "" -#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:987 +#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:967 msgid "Modulation / Constellation" msgstr "Modulación / Contelación" @@ -7390,8 +7388,8 @@ #: modules/audio_output/file.c:113 #: modules/gui/macosx/VLCOpenWindowController.m:140 #: modules/gui/macosx/VLCOutput.m:64 modules/gui/macosx/VLCOutput.m:175 -#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1429 -#: modules/gui/qt/dialogs/sout.cpp:69 modules/gui/qt/dialogs/sout.cpp:121 +#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1428 +#: modules/gui/qt/dialogs/sout.cpp:67 modules/gui/qt/dialogs/sout.cpp:119 #: share/lua/http/dialogs/create_stream.html:204 #: share/lua/http/dialogs/stream_config_window.html:36 #: share/lua/http/dialogs/stream_window.html:95 @@ -7417,7 +7415,7 @@ #: modules/access_output/http.c:52 #: modules/gui/macosx/VLCCoreDialogProvider.m:191 #: modules/gui/macosx/VLCSimplePrefsController.m:286 -#: modules/gui/qt/dialogs/external.cpp:203 modules/misc/audioscrobbler.c:114 +#: modules/gui/qt/dialogs/external.cpp:205 modules/misc/audioscrobbler.c:114 #: modules/stream_out/rtp.c:173 msgid "Username" msgstr "Nombre d'usuario" @@ -7436,7 +7434,7 @@ #: modules/gui/macosx/VLCCoreDialogProvider.m:192 #: modules/gui/macosx/VLCSimplePrefsController.m:285 #: modules/gui/macosx/VLCSimplePrefsController.m:348 -#: modules/gui/qt/dialogs/external.cpp:208 modules/lua/vlc.c:54 +#: modules/gui/qt/dialogs/external.cpp:210 modules/lua/vlc.c:54 #: modules/lua/vlc.c:70 modules/misc/audioscrobbler.c:116 #: modules/stream_out/rtp.c:176 msgid "Password" @@ -7630,7 +7628,7 @@ #: modules/demux/rawvid.c:47 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:239 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167 -#: modules/gui/qt/components/extended_panels.cpp:1318 modules/spu/mosaic.c:94 +#: modules/gui/qt/components/extended_panels.cpp:1348 modules/spu/mosaic.c:94 #: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108 #: modules/gui/qt/ui/profiles.h:741 msgid "Width" @@ -7699,7 +7697,7 @@ #: modules/access/imem.c:113 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:236 -#: modules/gui/qt/components/extended_panels.cpp:1317 +#: modules/gui/qt/components/extended_panels.cpp:1347 msgid "Size" msgstr "Grandaria" @@ -7727,7 +7725,7 @@ msgid "Read the audio stream at VLC pace rather than Jack pace." msgstr "Leyer a emisión d'audio a ritmo de VLC en cuenta de ritmo Jack." -#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:918 +#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:898 msgid "Auto connection" msgstr "Autoconexión" @@ -7900,19 +7898,19 @@ msgid "Port to use for tunneling the RTSP/RTP over HTTP." msgstr "Puerto a usar ta túnel RTSP/RTP sobre HTTP." -#: modules/access/live555.cpp:673 +#: modules/access/live555.cpp:677 msgid "RTSP authentication" msgstr "Autenticación RTSP" -#: modules/access/live555.cpp:674 +#: modules/access/live555.cpp:678 msgid "Please enter a valid login name and a password." msgstr "Introduzca un nombre de connexión y una clau valido." -#: modules/access/live555.cpp:699 +#: modules/access/live555.cpp:703 msgid "RTSP connection failed" msgstr "" -#: modules/access/live555.cpp:700 +#: modules/access/live555.cpp:704 msgid "Access to the stream is denied by the server configuration." msgstr "" @@ -8263,7 +8261,7 @@ msgstr "" #: modules/access/screen/screen.c:45 -#: modules/gui/qt/components/open_panels.cpp:1124 +#: modules/gui/qt/components/open_panels.cpp:1104 msgid "Desired frame rate for the capture." msgstr "Taxa de fotogramas deseyada ta la captura." @@ -8523,9 +8521,8 @@ msgstr "" #: modules/access/srt.c:446 modules/access_output/srt.c:480 -#, fuzzy msgid " SRT Stream ID" -msgstr "Fluxo %d" +msgstr "" #: modules/access/srt_common.c:26 msgid "16 bytes" @@ -8633,7 +8630,7 @@ msgid "Radio tuner device node." msgstr "" -#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1094 +#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1074 msgid "Frequency" msgstr "Freqüencia" @@ -8812,7 +8809,7 @@ msgstr "50 Hz" #: modules/access/v4l2/v4l2.c:137 -#: modules/gui/qt/components/extended_panels.cpp:1107 +#: modules/gui/qt/components/extended_panels.cpp:1132 msgid "60 Hz" msgstr "60 Hz" @@ -8971,7 +8968,7 @@ #: modules/control/hotkeys.c:395 #: modules/gui/macosx/VLCAddonsWindowController.m:100 #: modules/gui/qt/dialogs/convert.cpp:164 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/dialogs/plugins.cpp:382 #: modules/gui/qt/dialogs/preferences.cpp:79 msgid "All" msgstr "Tot" @@ -9337,9 +9334,9 @@ #: modules/access_output/livehttp.c:98 msgid "" -"File is read when segment starts and is assumed to be in format: key-" -"uri\\nkey-file. File is read on the segment opening and values are used on " -"that segment." +"File is read when segment starts and is assumed to be in format: key-uri" +"\\nkey-file. File is read on the segment opening and values are used on that " +"segment." msgstr "" #: modules/access_output/livehttp.c:102 @@ -9400,7 +9397,7 @@ msgstr "" #: modules/access_output/rist.c:842 modules/access_output/shout.c:64 -#: modules/gui/qt/components/sout/sout_widgets.cpp:385 +#: modules/gui/qt/components/sout/sout_widgets.cpp:386 #: share/lua/http/dialogs/create_stream.html:139 msgid "Stream name" msgstr "Nombre d'emisión" @@ -9805,7 +9802,7 @@ #: modules/audio_filter/chorus_flanger.c:80 #: modules/audio_filter/stereo_widen.c:57 -#: modules/gui/qt/components/extended_panels.cpp:1337 +#: modules/gui/qt/components/extended_panels.cpp:1367 msgid "Delay time" msgstr "Tiempo de retardo" @@ -9833,7 +9830,7 @@ #: modules/audio_filter/chorus_flanger.c:89 #: modules/audio_filter/stereo_widen.c:60 -#: modules/gui/qt/components/extended_panels.cpp:1338 +#: modules/gui/qt/components/extended_panels.cpp:1368 msgid "Feedback gain" msgstr "" @@ -9859,7 +9856,7 @@ #: modules/audio_filter/compressor.c:155 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:225 -#: modules/gui/qt/components/extended_panels.cpp:1295 +#: modules/gui/qt/components/extended_panels.cpp:1325 msgid "RMS/peak" msgstr "" @@ -9893,7 +9890,7 @@ #: modules/audio_filter/compressor.c:167 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:229 -#: modules/gui/qt/components/extended_panels.cpp:1299 +#: modules/gui/qt/components/extended_panels.cpp:1329 msgid "Ratio" msgstr "Proporción" @@ -10319,19 +10316,19 @@ #: modules/audio_filter/spatializer/spatializer.cpp:61 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:241 -#: modules/gui/qt/components/extended_panels.cpp:1319 +#: modules/gui/qt/components/extended_panels.cpp:1349 msgid "Wet" msgstr "Mullau" #: modules/audio_filter/spatializer/spatializer.cpp:64 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:242 -#: modules/gui/qt/components/extended_panels.cpp:1320 +#: modules/gui/qt/components/extended_panels.cpp:1350 msgid "Dry" msgstr "Seco" #: modules/audio_filter/spatializer/spatializer.cpp:67 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:243 -#: modules/gui/qt/components/extended_panels.cpp:1321 +#: modules/gui/qt/components/extended_panels.cpp:1351 msgid "Damp" msgstr "Humido" @@ -10365,7 +10362,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:64 -#: modules/gui/qt/components/extended_panels.cpp:1339 +#: modules/gui/qt/components/extended_panels.cpp:1369 msgid "Crossfeed" msgstr "" @@ -10377,7 +10374,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:68 -#: modules/gui/qt/components/extended_panels.cpp:1340 +#: modules/gui/qt/components/extended_panels.cpp:1370 msgid "Dry mix" msgstr "" @@ -10632,7 +10629,7 @@ msgid "K Audio Interface audio output" msgstr "" -#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:416 +#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:417 msgid "HDMI/SPDIF audio passthrough" msgstr "" @@ -10726,11 +10723,11 @@ "A opción te permite habilitar u deshabilitar o modo de salida d'audio " "float32 de gran calidat (que qualques tarchetas de son no suportan bien)." -#: modules/codec/a52.c:70 +#: modules/codec/a52.c:72 msgid "A/52 dynamic range compression" msgstr "Compresión de rango dinamico A2/52" -#: modules/codec/a52.c:72 modules/codec/dca.c:63 +#: modules/codec/a52.c:74 modules/codec/dca.c:65 msgid "" "Dynamic range compression makes the loud sounds softer, and the soft sounds " "louder, so you can more easily listen to the stream in a noisy environment " @@ -10742,7 +10739,7 @@ "ruidoso sin emprenyar a dengún. Si deshabilita a compresión de rango " "dinamico, a reproducción será mas adaptada a un cine u una cambra acustica." -#: modules/codec/a52.c:80 +#: modules/codec/a52.c:82 msgid "ATSC A/52 (AC-3) audio decoder" msgstr "Decodificador d'audio ATSC A2/52 (AC-3)" @@ -11266,15 +11263,15 @@ "enabled libavcodec" msgstr "" -#: modules/codec/avcodec/d3d11va.c:63 +#: modules/codec/avcodec/d3d11va.c:67 msgid "Direct3D11 Video Acceleration" msgstr "" -#: modules/codec/avcodec/dxva2.c:51 +#: modules/codec/avcodec/dxva2.c:55 msgid "DirectX Video Acceleration (DXVA) 2.0" msgstr "" -#: modules/codec/avcodec/encoder.c:383 +#: modules/codec/avcodec/encoder.c:399 #, c-format msgid "" "It seems your Libav/FFmpeg (libavcodec) installation lacks the following " @@ -11286,32 +11283,32 @@ "Do not contact the VideoLAN project about this issue.\n" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "unknown" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "video" msgstr "" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "audio" msgstr "" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "subpicture" msgstr "" -#: modules/codec/avcodec/encoder.c:919 +#: modules/codec/avcodec/encoder.c:940 #, c-format msgid "VLC could not open the %4.4s %s encoder." msgstr "" -#: modules/codec/avcodec/vaapi.c:354 +#: modules/codec/avcodec/vaapi.c:388 msgid "VA-API video decoder via DRM" msgstr "" -#: modules/codec/avcodec/vaapi.c:359 +#: modules/codec/avcodec/vaapi.c:393 msgid "VA-API video decoder" msgstr "" @@ -11408,15 +11405,23 @@ msgid "Max number of threads used for tile decoding, default 0=auto" msgstr "" -#: modules/codec/dav1d.c:60 +#: modules/codec/dav1d.c:56 +msgid "All Layers" +msgstr "" + +#: modules/codec/dav1d.c:57 +msgid "Whether or not to display all spatial layers, default false" +msgstr "" + +#: modules/codec/dav1d.c:62 msgid "Dav1d video decoder" msgstr "" -#: modules/codec/dca.c:61 +#: modules/codec/dca.c:63 msgid "DTS dynamic range compression" msgstr "Compresión de rango dinamico DTS" -#: modules/codec/dca.c:73 +#: modules/codec/dca.c:75 msgid "DTS Coherent Acoustics audio decoder" msgstr "Decodificador d'audio d'acusticas coherents DTS" @@ -11968,7 +11973,7 @@ "Aspere mientres se reconstruye a caché de fuents.\n" "Habría de realizar-se en menos d'un menuto." -#: modules/codec/libmpeg2.c:137 +#: modules/codec/libmpeg2.c:140 msgid "MPEG I/II video decoder (using libmpeg2)" msgstr "Decodificador de video I/II (usando libmpeg2)" @@ -11988,7 +11993,7 @@ msgid "MPEG audio layer I/II/III decoder" msgstr "Decodificador de capa d'audio MPEG I/II/III" -#: modules/codec/mft.c:62 +#: modules/codec/mft.c:66 msgid "Media Foundation Transform decoder" msgstr "" @@ -12656,7 +12661,7 @@ msgid "S/PDIF pass-through decoder" msgstr "" -#: modules/codec/speex.c:59 modules/codec/speex.c:907 +#: modules/codec/speex.c:59 modules/codec/speex.c:910 #: modules/gui/macosx/VLCOpenWindowController.m:195 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:259 #: modules/gui/qt/ui/sprefs_video.h:325 modules/gui/qt/ui/video_effects.h:1282 @@ -12986,7 +12991,7 @@ #. #. This MUST be a valid iconv character set. If unsure, please refer #. the VideoLAN translators mailing list. -#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:98 +#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:99 msgctxt "GetACP" msgid "CP1252" msgstr "CP1252" @@ -14085,8 +14090,8 @@ #: modules/codec/x264.c:429 modules/gui/macosx/VLCMainMenu.m:290 #: modules/gui/macosx/VLCMainMenu.m:392 #: modules/gui/macosx/VLCSimplePrefsController.m:711 -#: modules/gui/qt/components/simple_preferences.cpp:703 -#: modules/misc/gnutls.c:778 modules/text_renderer/freetype/freetype.c:124 +#: modules/gui/qt/components/simple_preferences.cpp:714 +#: modules/misc/gnutls.c:775 modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:143 msgid "Normal" msgstr "Normal" @@ -14143,7 +14148,7 @@ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)" msgstr "" -#: modules/codec/x265.c:46 +#: modules/codec/x265.c:53 msgid "H.265/HEVC encoder (x265)" msgstr "" @@ -14222,14 +14227,14 @@ #: modules/gui/macosx/VLCMainWindow.m:587 #: modules/gui/macosx/VLCMainWindow.m:1030 #: modules/gui/macosx/VLCStatusBarIcon.m:378 modules/gui/ncurses.c:1026 -#: modules/gui/qt/dialogs/help.cpp:91 modules/gui/qt/main_interface.cpp:1267 -#: modules/gui/qt/main_interface.cpp:1271 -#: modules/gui/qt/main_interface.cpp:1310 -#: modules/gui/qt/main_interface.cpp:1312 -#: modules/gui/qt/main_interface.cpp:1420 -#: modules/gui/qt/main_interface.cpp:1437 -#: modules/gui/qt/main_interface.cpp:1445 -#: modules/gui/qt/main_interface.cpp:1468 modules/lua/libs/httpd.c:80 +#: modules/gui/qt/dialogs/help.cpp:100 modules/gui/qt/main_interface.cpp:1302 +#: modules/gui/qt/main_interface.cpp:1306 +#: modules/gui/qt/main_interface.cpp:1343 +#: modules/gui/qt/main_interface.cpp:1345 +#: modules/gui/qt/main_interface.cpp:1453 +#: modules/gui/qt/main_interface.cpp:1470 +#: modules/gui/qt/main_interface.cpp:1478 +#: modules/gui/qt/main_interface.cpp:1501 modules/lua/libs/httpd.c:80 #: modules/notify/osx_notifications.m:302 #: modules/video_output/wayland/shell.c:348 #: modules/video_output/wayland/xdg-shell.c:291 @@ -14286,7 +14291,7 @@ #: modules/control/globalhotkeys/win32.c:47 #: modules/control/globalhotkeys/xcb.c:50 -#: modules/gui/qt/components/preferences_widgets.cpp:1137 +#: modules/gui/qt/components/preferences_widgets.cpp:1141 msgid "Global Hotkeys" msgstr "Alcorces de teclau globals" @@ -14297,8 +14302,8 @@ #: modules/control/hotkeys.c:100 #: modules/gui/macosx/VLCSimplePrefsController.m:251 -#: modules/gui/qt/components/preferences_widgets.cpp:1136 -#: modules/gui/qt/components/simple_preferences.cpp:257 +#: modules/gui/qt/components/preferences_widgets.cpp:1140 +#: modules/gui/qt/components/simple_preferences.cpp:258 msgid "Hotkeys" msgstr "Alcorces de teclau" @@ -15007,7 +15012,7 @@ msgstr "" #: modules/demux/adaptive/adaptive.cpp:85 -#: modules/gui/qt/components/simple_preferences.cpp:702 +#: modules/gui/qt/components/simple_preferences.cpp:713 msgid "Low latency" msgstr "Baixa latencia" @@ -15059,11 +15064,11 @@ msgid "ASF/WMV demuxer" msgstr "Demuxor ASF/WMV" -#: modules/demux/asf/asf.c:277 modules/demux/asf/asf.c:834 +#: modules/demux/asf/asf.c:285 modules/demux/asf/asf.c:836 msgid "Could not demux ASF stream" msgstr "No se podió demuxar a emisión ASF" -#: modules/demux/asf/asf.c:278 +#: modules/demux/asf/asf.c:286 msgid "VLC failed to load the ASF header." msgstr "VLC no podió cargar o capitero ASF." @@ -15107,15 +15112,15 @@ msgid "Internal libavcodec format name" msgstr "" -#: modules/demux/avi/avi.c:55 +#: modules/demux/avi/avi.c:56 msgid "Force interleaved method" msgstr "Forzar metodo entrelazau" -#: modules/demux/avi/avi.c:57 +#: modules/demux/avi/avi.c:58 msgid "Force index creation" msgstr "Forzar creyación d'indiz" -#: modules/demux/avi/avi.c:59 +#: modules/demux/avi/avi.c:60 msgid "" "Recreate a index for the AVI file. Use this if your AVI file is damaged or " "incomplete (not seekable)." @@ -15123,27 +15128,27 @@ "Regenerar un indiz ta o fichero AVI. lo Use si o suyo fichero AVI ye danyau " "u incompleto (no buscable)." -#: modules/demux/avi/avi.c:67 +#: modules/demux/avi/avi.c:68 msgid "Ask for action" msgstr "Preguntar por acción" -#: modules/demux/avi/avi.c:68 +#: modules/demux/avi/avi.c:69 msgid "Always fix" msgstr "Siempre reparar" -#: modules/demux/avi/avi.c:69 +#: modules/demux/avi/avi.c:70 msgid "Never fix" msgstr "Nunca reparar" -#: modules/demux/avi/avi.c:70 +#: modules/demux/avi/avi.c:71 msgid "Fix when necessary" msgstr "" -#: modules/demux/avi/avi.c:74 +#: modules/demux/avi/avi.c:75 msgid "AVI demuxer" msgstr "Demuxor AVI" -#: modules/demux/avi/avi.c:902 modules/demux/mp4/mp4.c:4375 +#: modules/demux/avi/avi.c:910 modules/demux/mp4/mp4.c:4374 msgid "" "Because this file index is broken or missing, seeking will not work " "correctly.\n" @@ -15153,27 +15158,27 @@ "What do you want to do?" msgstr "" -#: modules/demux/avi/avi.c:910 +#: modules/demux/avi/avi.c:918 msgid "Do not play" msgstr "No reproducir" -#: modules/demux/avi/avi.c:911 +#: modules/demux/avi/avi.c:919 msgid "Build index then play" msgstr "Construir indiz dimpués reproducir" -#: modules/demux/avi/avi.c:912 +#: modules/demux/avi/avi.c:920 msgid "Play as is" msgstr "Reproducir como" -#: modules/demux/avi/avi.c:913 modules/demux/mp4/mp4.c:4386 +#: modules/demux/avi/avi.c:921 modules/demux/mp4/mp4.c:4385 msgid "Broken or missing Index" msgstr "" -#: modules/demux/avi/avi.c:2828 +#: modules/demux/avi/avi.c:2879 msgid "Broken or missing AVI Index" msgstr "" -#: modules/demux/avi/avi.c:2829 +#: modules/demux/avi/avi.c:2880 msgid "Fixing AVI Index..." msgstr "Reparar Index AVI..." @@ -15334,7 +15339,7 @@ "Precargar fichers matroska en a mesma carpeta ta buscar segmentos enlazaus " "(no ye bueno ta fichers rotos)." -#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:112 +#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:113 msgid "Seek based on percent not time" msgstr "Busca basada en porcentaje, no en tiempo" @@ -15588,27 +15593,27 @@ msgid "Clean" msgstr "" -#: modules/demux/mp4/mp4.c:50 +#: modules/demux/mp4/mp4.c:51 msgid "M4A audio only" msgstr "" -#: modules/demux/mp4/mp4.c:51 +#: modules/demux/mp4/mp4.c:52 msgid "Ignore non audio tracks from iTunes audio files" msgstr "" -#: modules/demux/mp4/mp4.c:56 +#: modules/demux/mp4/mp4.c:57 msgid "MP4 stream demuxer" msgstr "Demuxor MP4 d'emisión" -#: modules/demux/mp4/mp4.c:57 +#: modules/demux/mp4/mp4.c:58 msgid "MP4" msgstr "MP4" -#: modules/demux/mp4/mp4.c:4383 +#: modules/demux/mp4/mp4.c:4382 msgid "Do not seek" msgstr "" -#: modules/demux/mp4/mp4.c:4384 +#: modules/demux/mp4/mp4.c:4383 msgid "Build index" msgstr "" @@ -15674,21 +15679,21 @@ msgid "PS" msgstr "PS" -#: modules/demux/mpeg/ts.c:83 +#: modules/demux/mpeg/ts.c:84 msgid "Extra PMT" msgstr "PMT extra" -#: modules/demux/mpeg/ts.c:85 +#: modules/demux/mpeg/ts.c:86 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." msgstr "" "Permite a un usuario indicar un pmt extra (pmt_pid=pid:" "tipo_de_emisión[,...])." -#: modules/demux/mpeg/ts.c:87 +#: modules/demux/mpeg/ts.c:88 msgid "Set id of ES to PID" msgstr "Indica it de YE a PID" -#: modules/demux/mpeg/ts.c:88 +#: modules/demux/mpeg/ts.c:89 msgid "" "Set the internal ID of each elementary stream handled by VLC to the same " "value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do " @@ -15698,22 +15703,22 @@ "valor que o PID en a emisión TS, en cuenta d'1, 2, 3, etc. Util ta fer " "'#duplicate{..., select=\"ye=\"}'." -#: modules/demux/mpeg/ts.c:93 modules/mux/mpeg/ts.c:173 +#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:173 msgid "CSA Key" msgstr "Clau CSA" -#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:174 +#: modules/demux/mpeg/ts.c:95 modules/mux/mpeg/ts.c:174 msgid "" "CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)." msgstr "" "Clau de zifrau CSA. Ista debe estar una cadena de 16 caracters (8 bytes " "hexadecimals)." -#: modules/demux/mpeg/ts.c:97 modules/mux/mpeg/ts.c:177 +#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:177 msgid "Second CSA Key" msgstr "Segunda clau CSA" -#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:178 +#: modules/demux/mpeg/ts.c:99 modules/mux/mpeg/ts.c:178 msgid "" "The even CSA encryption key. This must be a 16 char string (8 hexadecimal " "bytes)." @@ -15721,21 +15726,21 @@ "Clau de zifrau CSA. Debe estar una cadena de 16 caracters (8 bytes " "hexadecimals)." -#: modules/demux/mpeg/ts.c:102 +#: modules/demux/mpeg/ts.c:103 msgid "Packet size in bytes to decrypt" msgstr "Grandaria d'o paquet en bytes a deszifrar" -#: modules/demux/mpeg/ts.c:103 +#: modules/demux/mpeg/ts.c:104 msgid "" "Specify the size of the TS packet to decrypt. The decryption routines " "subtract the TS-header from the value before decrypting." msgstr "" -#: modules/demux/mpeg/ts.c:107 +#: modules/demux/mpeg/ts.c:108 msgid "Separate sub-streams" msgstr "" -#: modules/demux/mpeg/ts.c:109 +#: modules/demux/mpeg/ts.c:110 msgid "" "Separate teletex/dvbs pages into independent ES. It can be useful to turn " "off this option when using stream output." @@ -15743,31 +15748,31 @@ "Deseparar pachinas teletexto/dvbs en YE independients. Puede s'util " "deshabilitar ista opción quan s'usa emisión de salida." -#: modules/demux/mpeg/ts.c:114 +#: modules/demux/mpeg/ts.c:115 msgid "" "Seek and position based on a percent byte position, not a PCR generated time " "position. If seeking doesn't work property, turn on this option." msgstr "" -#: modules/demux/mpeg/ts.c:125 +#: modules/demux/mpeg/ts.c:126 msgid "Trust in-stream PCR" msgstr "" -#: modules/demux/mpeg/ts.c:126 +#: modules/demux/mpeg/ts.c:127 msgid "Use the stream PCR as a reference." msgstr "" -#: modules/demux/mpeg/ts.c:133 modules/mux/mpeg/ts.c:100 +#: modules/demux/mpeg/ts.c:134 modules/mux/mpeg/ts.c:100 msgid "Digital TV Standard" msgstr "" -#: modules/demux/mpeg/ts.c:134 +#: modules/demux/mpeg/ts.c:135 msgid "" "Selects mode for digital TV standard. This feature affects EPG information " "and subtitles." msgstr "" -#: modules/demux/mpeg/ts.c:138 +#: modules/demux/mpeg/ts.c:139 msgid "MPEG Transport Stream demuxer" msgstr "Demuxor d'emisión de transporte MPEG" @@ -15992,7 +15997,7 @@ msgid "Total duration" msgstr "" -#: modules/demux/pva.c:43 +#: modules/demux/pva.c:44 msgid "PVA demuxer" msgstr "Demuxor AU" @@ -16128,23 +16133,23 @@ msgid "TTA demuxer" msgstr "Demuxor TTA" -#: modules/demux/ty.c:59 +#: modules/demux/ty.c:62 msgid "TY" msgstr "TY" -#: modules/demux/ty.c:60 +#: modules/demux/ty.c:63 msgid "TY Stream audio/video demux" msgstr "Demuxor d'audio/video emisión TY" -#: modules/demux/ty.c:770 +#: modules/demux/ty.c:784 msgid "Closed captions 2" msgstr "Subtítulos 2" -#: modules/demux/ty.c:771 +#: modules/demux/ty.c:785 msgid "Closed captions 3" msgstr "Subtítulos 3" -#: modules/demux/ty.c:772 +#: modules/demux/ty.c:786 msgid "Closed captions 4" msgstr "Subtítulos 4" @@ -16160,7 +16165,7 @@ msgid "Vobsub subtitles parser" msgstr "Analizador de subtítulos Vobsub" -#: modules/demux/voc.c:43 +#: modules/demux/voc.c:45 msgid "VOC demuxer" msgstr "Demuxor VOC" @@ -16172,7 +16177,7 @@ msgid "XA demuxer" msgstr "Demuxor XA" -#: modules/demux/xiph_metadata.c:588 +#: modules/demux/xiph_metadata.c:571 msgid "Unknown category" msgstr "Categoría desconoixida" @@ -16226,17 +16231,17 @@ msgstr "Sobre o reproductor multimedia VLC" #: modules/gui/macosx/VLCAboutWindowController.m:97 -#: modules/gui/qt/dialogs/help.cpp:125 +#: modules/gui/qt/dialogs/help.cpp:137 msgid "Credits" msgstr "" #: modules/gui/macosx/VLCAboutWindowController.m:99 -#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:119 +#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:129 msgid "License" msgstr "Licencia" #: modules/gui/macosx/VLCAboutWindowController.m:101 -#: modules/gui/qt/dialogs/help.cpp:122 +#: modules/gui/qt/dialogs/help.cpp:133 msgid "Authors" msgstr "Autors" @@ -16252,33 +16257,33 @@ "\">VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" +"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:105 #: modules/gui/macosx/VLCAddonsWindowController.m:357 -#: modules/gui/qt/dialogs/plugins.cpp:389 +#: modules/gui/qt/dialogs/plugins.cpp:388 #: modules/gui/qt/managers/addons_manager.cpp:88 msgid "Playlist parsers" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:107 #: modules/gui/macosx/VLCAddonsWindowController.m:359 -#: modules/gui/qt/dialogs/plugins.cpp:393 +#: modules/gui/qt/dialogs/plugins.cpp:392 #: modules/gui/qt/managers/addons_manager.cpp:90 msgid "Service Discovery" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:109 -#: modules/gui/qt/dialogs/plugins.cpp:397 +#: modules/gui/qt/dialogs/plugins.cpp:396 #: modules/gui/qt/managers/addons_manager.cpp:92 msgid "Interfaces" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:111 -#: modules/gui/qt/dialogs/plugins.cpp:400 +#: modules/gui/qt/dialogs/plugins.cpp:399 #: modules/gui/qt/managers/addons_manager.cpp:94 msgid "Art and meta fetchers" msgstr "" @@ -16286,7 +16291,7 @@ #: modules/gui/macosx/VLCAddonsWindowController.m:113 #: modules/gui/macosx/VLCAddonsWindowController.m:361 #: modules/gui/macosx/VLCMainMenu.m:343 modules/gui/macosx/VLCMainMenu.m:344 -#: modules/gui/qt/dialogs/plugins.cpp:403 +#: modules/gui/qt/dialogs/plugins.cpp:402 #: modules/gui/qt/managers/addons_manager.cpp:96 msgid "Extensions" msgstr "Extensions" @@ -16296,30 +16301,30 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:118 -#: modules/gui/qt/dialogs/plugins.cpp:431 +#: modules/gui/qt/dialogs/plugins.cpp:430 msgid "Find more addons online" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:128 -#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:86 +#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:85 msgid "Addons Manager" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:130 -#: modules/gui/qt/dialogs/plugins.cpp:1173 -#: modules/gui/qt/dialogs/plugins.cpp:1186 +#: modules/gui/qt/dialogs/plugins.cpp:1172 +#: modules/gui/qt/dialogs/plugins.cpp:1185 msgid "Installed" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:131 #: modules/gui/macosx/VLCBookmarksWindowController.m:87 -#: modules/gui/qt/dialogs/plugins.cpp:128 modules/mux/avi.c:54 +#: modules/gui/qt/dialogs/plugins.cpp:127 modules/mux/avi.c:54 msgid "Name" msgstr "Nombre" #: modules/gui/macosx/VLCAddonsWindowController.m:132 -#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1405 -#: modules/gui/qt/dialogs/plugins.cpp:1510 modules/mux/asf.c:58 +#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1404 +#: modules/gui/qt/dialogs/plugins.cpp:1509 modules/mux/asf.c:58 msgid "Author" msgstr "Autor" @@ -16328,7 +16333,7 @@ msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:355 -#: modules/gui/qt/dialogs/plugins.cpp:385 +#: modules/gui/qt/dialogs/plugins.cpp:384 #: modules/gui/qt/managers/addons_manager.cpp:86 #: modules/gui/skins2/src/skin_main.cpp:535 msgid "Skins" @@ -16345,7 +16350,7 @@ msgstr "Pase 2" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:219 -#: modules/gui/qt/components/extended_panels.cpp:1132 +#: modules/gui/qt/components/extended_panels.cpp:1157 #: modules/gui/qt/ui/equalizer.h:133 msgid "Preamp" msgstr "Preamp" @@ -16358,22 +16363,22 @@ #: modules/gui/macosx/VLCAudioEffectsWindowController.m:235 #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:49 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:210 -#: modules/gui/qt/dialogs/gototime.cpp:66 +#: modules/gui/qt/dialogs/gototime.cpp:65 msgid "Reset" msgstr "Restaurar" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:226 -#: modules/gui/qt/components/extended_panels.cpp:1296 +#: modules/gui/qt/components/extended_panels.cpp:1326 msgid "Attack" msgstr "Ataque" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:227 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "Release" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:228 -#: modules/gui/qt/components/extended_panels.cpp:1298 +#: modules/gui/qt/components/extended_panels.cpp:1328 msgid "Threshold" msgstr "Branquil" @@ -16527,7 +16532,7 @@ #: modules/gui/macosx/VLCOutput.m:60 modules/gui/macosx/VLCPlaylistInfo.m:337 #: modules/gui/macosx/VLCSimplePrefsController.m:295 #: modules/gui/macosx/VLCTimeSelectionPanelController.m:51 -#: modules/gui/qt/components/open_panels.cpp:1380 +#: modules/gui/qt/components/open_panels.cpp:1360 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "OK" msgstr "Acceptar" @@ -16554,8 +16559,8 @@ #: modules/gui/macosx/VLCBookmarksWindowController.m:213 msgid "" -"Input has changed, unable to save bookmark. Suspending playback with " -"\"Pause\" while editing bookmarks to ensure to keep the same input." +"Input has changed, unable to save bookmark. Suspending playback with \"Pause" +"\" while editing bookmarks to ensure to keep the same input." msgstr "" "A dentrada ha cambiau, incapaz d'alzar favorito. Suspendendo reproducción " "con «Pausa» mientres s'edita favoritos ta asegurar mantener a mesma dentrada." @@ -16646,10 +16651,10 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:381 #: modules/gui/macosx/prefs_widgets.m:1126 #: modules/gui/qt/components/preferences_widgets.cpp:264 -#: modules/gui/qt/components/simple_preferences.cpp:471 -#: modules/gui/qt/components/sout/sout_widgets.cpp:135 -#: modules/gui/qt/ui/open.h:279 modules/gui/qt/ui/open_disk.h:304 -#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:414 +#: modules/gui/qt/components/simple_preferences.cpp:472 +#: modules/gui/qt/components/sout/sout_widgets.cpp:136 +#: modules/gui/qt/ui/open.h:277 modules/gui/qt/ui/open_disk.h:304 +#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:415 #: modules/gui/qt/ui/sprefs_input.h:365 modules/gui/qt/ui/sprefs_video.h:329 msgid "Browse..." msgstr "Explorar..." @@ -16670,7 +16675,7 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:149 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:392 #: modules/gui/macosx/VLCOutput.m:65 modules/gui/macosx/VLCOutput.m:194 -#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:94 +#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:92 msgid "Stream" msgstr "Emitir" @@ -16745,10 +16750,10 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:186 #: modules/gui/macosx/VLCOpenWindowController.m:197 #: modules/gui/macosx/VLCOutput.m:68 -#: modules/gui/qt/components/sout/sout_widgets.cpp:241 -#: modules/gui/qt/components/sout/sout_widgets.cpp:328 -#: modules/gui/qt/components/sout/sout_widgets.cpp:370 -#: modules/gui/qt/components/sout/sout_widgets.cpp:425 +#: modules/gui/qt/components/sout/sout_widgets.cpp:242 +#: modules/gui/qt/components/sout/sout_widgets.cpp:329 +#: modules/gui/qt/components/sout/sout_widgets.cpp:371 +#: modules/gui/qt/components/sout/sout_widgets.cpp:426 msgid "Address" msgstr "Adreza" @@ -16760,11 +16765,11 @@ #: modules/gui/macosx/VLCOpenWindowController.m:185 #: modules/gui/macosx/VLCOpenWindowController.m:187 #: modules/gui/macosx/VLCOutput.m:69 -#: modules/gui/qt/components/sout/sout_widgets.cpp:187 -#: modules/gui/qt/components/sout/sout_widgets.cpp:242 -#: modules/gui/qt/components/sout/sout_widgets.cpp:283 -#: modules/gui/qt/components/sout/sout_widgets.cpp:329 -#: modules/gui/qt/components/sout/sout_widgets.cpp:426 modules/lua/vlc.c:67 +#: modules/gui/qt/components/sout/sout_widgets.cpp:188 +#: modules/gui/qt/components/sout/sout_widgets.cpp:243 +#: modules/gui/qt/components/sout/sout_widgets.cpp:284 +#: modules/gui/qt/components/sout/sout_widgets.cpp:330 +#: modules/gui/qt/components/sout/sout_widgets.cpp:427 modules/lua/vlc.c:67 #: modules/stream_out/rtp.c:114 #: share/lua/http/dialogs/stream_config_window.html:32 #: share/lua/http/dialogs/stream_window.html:91 @@ -16856,7 +16861,7 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:705 #: modules/gui/macosx/VLCSimplePrefsController.m:733 #: modules/gui/macosx/VLCSimplePrefsController.m:1266 -#: modules/gui/qt/components/simple_preferences.cpp:700 +#: modules/gui/qt/components/simple_preferences.cpp:711 msgid "Custom" msgstr "Personalizar" @@ -16895,7 +16900,7 @@ #: modules/gui/macosx/VLCFSPanelController.m:140 #: modules/gui/macosx/VLCMainWindowControlsBar.m:80 -#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:408 +#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:409 msgid "Volume" msgstr "Volumen" @@ -16929,7 +16934,7 @@ msgstr "" #: modules/gui/macosx/VLCLogWindowController.m:94 -#: modules/gui/qt/dialogs/messages.cpp:80 +#: modules/gui/qt/dialogs/messages.cpp:77 #: modules/gui/qt/ui/messages_panel.h:136 #: modules/gui/qt/ui/messages_panel.h:140 msgid "Messages" @@ -17294,8 +17299,8 @@ msgid "Bring All to Front" msgstr "Trayer tot a o frent" -#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:54 -#: modules/gui/qt/menus.cpp:951 modules/gui/qt/menus.cpp:1138 +#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:52 +#: modules/gui/qt/menus.cpp:956 modules/gui/qt/menus.cpp:1143 msgid "Help" msgstr "Aduya" @@ -17358,13 +17363,13 @@ #: modules/gui/macosx/VLCMainWindow.m:220 #: modules/gui/macosx/VLCMainWindow.m:226 -#: modules/gui/qt/components/playlist/selector.cpp:580 +#: modules/gui/qt/components/playlist/selector.cpp:593 msgid "Subscribe" msgstr "Suscribirse" #: modules/gui/macosx/VLCMainWindow.m:221 #: modules/gui/macosx/VLCMainWindow.m:232 -#: modules/gui/qt/components/playlist/selector.cpp:597 +#: modules/gui/qt/components/playlist/selector.cpp:610 msgid "Unsubscribe" msgstr "Cancelar conduta" @@ -17374,7 +17379,7 @@ msgstr "Suscribirse a un podcast" #: modules/gui/macosx/VLCMainWindow.m:225 -#: modules/gui/qt/components/playlist/selector.cpp:581 +#: modules/gui/qt/components/playlist/selector.cpp:594 msgid "Enter URL of the podcast to subscribe to:" msgstr "Introducir a URL d'o podcast a o que suscribirse:" @@ -17411,7 +17416,7 @@ msgstr "Amostrar/amagar lista de reproducción" #: modules/gui/macosx/VLCMainWindowControlsBar.m:71 -#: modules/gui/qt/dialogs/vlm.cpp:548 share/lua/http/index.html:259 +#: modules/gui/qt/dialogs/vlm.cpp:542 share/lua/http/index.html:259 msgid "Repeat" msgstr "Repetir" @@ -17497,7 +17502,7 @@ #: modules/gui/macosx/VLCOpenWindowController.m:152 #: modules/gui/macosx/VLCOpenWindowController.m:349 #: modules/gui/macosx/VLCSimplePrefsController.m:353 -#: modules/gui/qt/ui/sprefs_interface.h:545 +#: modules/gui/qt/ui/sprefs_interface.h:552 msgid "Choose..." msgstr "Seleccionar..." @@ -17739,10 +17744,9 @@ msgstr "" #: modules/gui/macosx/VLCPlaylist.m:231 -#: modules/gui/qt/components/playlist/standardpanel.cpp:273 -#, fuzzy +#: modules/gui/qt/components/playlist/standardpanel.cpp:274 msgid "Shuffle playlist" -msgstr "Alzar lista de reproducción" +msgstr "" #: modules/gui/macosx/VLCPlaylistInfo.m:54 #: modules/gui/qt/dialogs/mediainfo.cpp:54 @@ -17812,8 +17816,8 @@ msgid "VLC was unable to save the meta data." msgstr "VLC estió incapaz d'alzar os metadatos." -#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:194 -#: modules/gui/qt/ui/sprefs_interface.h:551 +#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:197 +#: modules/gui/qt/ui/sprefs_interface.h:558 msgid "Continue playback?" msgstr "" @@ -17857,27 +17861,27 @@ msgstr "Internet" #: modules/gui/macosx/VLCSimplePrefsController.m:241 -#: modules/gui/qt/components/simple_preferences.cpp:247 -#: modules/gui/qt/components/simple_preferences.cpp:727 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/components/simple_preferences.cpp:248 +#: modules/gui/qt/components/simple_preferences.cpp:738 +#: modules/gui/qt/dialogs/plugins.cpp:382 msgid "Interface Settings" msgstr "Preferencias d'interficie" #: modules/gui/macosx/VLCSimplePrefsController.m:243 -#: modules/gui/qt/components/simple_preferences.cpp:249 -#: modules/gui/qt/components/simple_preferences.cpp:446 +#: modules/gui/qt/components/simple_preferences.cpp:250 +#: modules/gui/qt/components/simple_preferences.cpp:447 msgid "Audio Settings" msgstr "Preferencias d'audio" #: modules/gui/macosx/VLCSimplePrefsController.m:245 -#: modules/gui/qt/components/simple_preferences.cpp:251 -#: modules/gui/qt/components/simple_preferences.cpp:379 +#: modules/gui/qt/components/simple_preferences.cpp:252 +#: modules/gui/qt/components/simple_preferences.cpp:380 msgid "Video Settings" msgstr "Preferencias de video" #: modules/gui/macosx/VLCSimplePrefsController.m:247 -#: modules/gui/qt/components/simple_preferences.cpp:253 -#: modules/gui/qt/components/simple_preferences.cpp:868 +#: modules/gui/qt/components/simple_preferences.cpp:254 +#: modules/gui/qt/components/simple_preferences.cpp:894 msgid "Subtitle & On Screen Display Settings" msgstr "" @@ -17906,12 +17910,12 @@ msgstr "Mantener rans d'audio entre sesions" #: modules/gui/macosx/VLCSimplePrefsController.m:289 -#: modules/gui/qt/ui/sprefs_audio.h:410 +#: modules/gui/qt/ui/sprefs_audio.h:411 msgid "Always reset audio start level to:" msgstr "Siempre restablir rans d'audio a l'inicio a2:" #: modules/gui/macosx/VLCSimplePrefsController.m:292 -#: modules/gui/qt/dialogs/vlm.cpp:492 +#: modules/gui/qt/dialogs/vlm.cpp:486 msgid "Change" msgstr "Cambiar" @@ -17924,7 +17928,7 @@ msgstr "Seleccionar una acción ta cambiar l'alcorce de teclau asociau:" #: modules/gui/macosx/VLCSimplePrefsController.m:298 -#: modules/gui/qt/components/preferences_widgets.cpp:1141 +#: modules/gui/qt/components/preferences_widgets.cpp:1145 msgid "Action" msgstr "Acción" @@ -17950,7 +17954,7 @@ msgstr "Ran de caché predeterminau" #: modules/gui/macosx/VLCSimplePrefsController.m:307 -#: modules/gui/qt/ui/open.h:263 +#: modules/gui/qt/ui/open.h:261 msgid "Caching" msgstr "Caché" @@ -18036,7 +18040,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:341 -#: modules/gui/qt/ui/sprefs_interface.h:553 +#: modules/gui/qt/ui/sprefs_interface.h:560 msgid "Privacy / Network Interaction" msgstr "Interacción de ret / Privacidat" @@ -18111,7 +18115,7 @@ msgstr "Amostrar video dentro d'a finestra prencipal" #: modules/gui/macosx/VLCSimplePrefsController.m:370 -#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:178 +#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:181 msgid "Pause the video playback when minimized" msgstr "Pausar a reproducción d'o video quan sía minimizau" @@ -18292,12 +18296,12 @@ msgstr "seg." #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:50 -#: modules/gui/qt/components/extended_panels.cpp:1412 modules/gui/qt/qt.cpp:213 +#: modules/gui/qt/components/extended_panels.cpp:1442 modules/gui/qt/qt.cpp:216 msgid "Audio/Video" msgstr "Audio/Video" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:51 -#: modules/gui/qt/components/extended_panels.cpp:1416 +#: modules/gui/qt/components/extended_panels.cpp:1446 msgid "Audio track synchronization:" msgstr "Sincronización de pista d'audio:" @@ -18306,12 +18310,12 @@ msgstr " Una valor positiva significa que l'audio va abanzau a o video" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:54 -#: modules/gui/qt/components/extended_panels.cpp:1424 +#: modules/gui/qt/components/extended_panels.cpp:1454 msgid "Subtitles/Video" msgstr "Subtítulos/Video" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:55 -#: modules/gui/qt/components/extended_panels.cpp:1428 +#: modules/gui/qt/components/extended_panels.cpp:1458 msgid "Subtitle track synchronization:" msgstr "" @@ -18320,31 +18324,31 @@ msgstr "Una valor positiva significa que os subtítulos van abanzaus a o video" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:58 -#: modules/gui/qt/components/extended_panels.cpp:1435 +#: modules/gui/qt/components/extended_panels.cpp:1465 msgid "Subtitle speed:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:60 -#: modules/gui/qt/components/extended_panels.cpp:1449 +#: modules/gui/qt/components/extended_panels.cpp:1479 msgid "Subtitle duration factor:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:68 -#: modules/gui/qt/components/extended_panels.cpp:1560 +#: modules/gui/qt/components/extended_panels.cpp:1590 msgid "" "Extend subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:72 -#: modules/gui/qt/components/extended_panels.cpp:1565 +#: modules/gui/qt/components/extended_panels.cpp:1595 msgid "" "Multiply subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:76 -#: modules/gui/qt/components/extended_panels.cpp:1570 +#: modules/gui/qt/components/extended_panels.cpp:1600 msgid "" "Recalculate subtitle duration according\n" "to their content and this value.\n" @@ -18751,17 +18755,17 @@ "De forma predeterminada, a interficie s'achusta a la grandaria nativa d'o " "video." -#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:180 +#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:183 msgid "" "With this option enabled, the playback will be automatically paused when " "minimizing the window." msgstr "" -#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:182 +#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:185 msgid "Allow automatic icon changes" msgstr "Permitir cambeo automatico d'icono" -#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:184 +#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:187 msgid "" "This option allows the interface to change its icon on various occasions." msgstr "" @@ -18819,21 +18823,21 @@ "open one of those, playback will continue." msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:206 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:209 msgid "Ask" msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/keystore/keychain.m:50 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/keystore/keychain.m:50 msgid "Always" msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/gui/qt/qt.cpp:213 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/gui/qt/qt.cpp:216 msgid "Never" msgstr "" -#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:186 +#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:189 msgid "Maximum Volume displayed" msgstr "" @@ -19179,27 +19183,27 @@ msgid "Find: %s" msgstr "" -#: modules/gui/qt/components/controller.cpp:343 +#: modules/gui/qt/components/controller.cpp:352 msgid "Shift+L" msgstr "Shift+L" -#: modules/gui/qt/components/controller.cpp:448 +#: modules/gui/qt/components/controller.cpp:457 msgid "Click to toggle between loop all, loop one and no loop" msgstr " Repetir una vegada u repetir indefinidament" -#: modules/gui/qt/components/controller.cpp:549 +#: modules/gui/qt/components/controller.cpp:558 msgid "Previous Chapter/Title" msgstr "Capitol anterior" -#: modules/gui/qt/components/controller.cpp:555 +#: modules/gui/qt/components/controller.cpp:564 msgid "Next Chapter/Title" msgstr "Capitol siguient" -#: modules/gui/qt/components/controller.cpp:604 +#: modules/gui/qt/components/controller.cpp:613 msgid "Teletext Activation" msgstr "Activación teletexto" -#: modules/gui/qt/components/controller.cpp:620 +#: modules/gui/qt/components/controller.cpp:629 msgid "Toggle Transparency" msgstr "" @@ -19318,7 +19322,7 @@ msgstr "Meyo siguient en lista de reproducción" #: modules/gui/qt/components/controller.hpp:126 -#: modules/gui/qt/components/open_panels.cpp:259 +#: modules/gui/qt/components/open_panels.cpp:241 msgid "Open subtitle file" msgstr "" @@ -19365,21 +19369,21 @@ msgid "No EPG Data Available" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:380 #: modules/gui/qt/components/extended_panels.cpp:393 +#: modules/gui/qt/components/extended_panels.cpp:406 msgid "Image Files" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:382 modules/spu/logo.c:49 +#: modules/gui/qt/components/extended_panels.cpp:395 modules/spu/logo.c:49 msgid "Logo filenames" msgstr "Nombres de fichero de logo" -#: modules/gui/qt/components/extended_panels.cpp:395 +#: modules/gui/qt/components/extended_panels.cpp:408 #: modules/video_filter/erase.c:55 msgid "Image mask" msgstr "Mascareta d'imachen" -#: modules/gui/qt/components/extended_panels.cpp:645 +#: modules/gui/qt/components/extended_panels.cpp:658 msgid "" "No v4l2 instance found.\n" "Please check that the device has been opened with VLC and is playing.\n" @@ -19391,133 +19395,133 @@ "\n" "Os controls amaneixerán automaticament aquí." -#: modules/gui/qt/components/extended_panels.cpp:1107 -#: modules/gui/qt/components/extended_panels.cpp:1108 -#: modules/gui/qt/components/extended_panels.cpp:1109 -#: modules/gui/qt/components/extended_panels.cpp:1110 -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1112 -#: modules/gui/qt/components/extended_panels.cpp:1113 -#: modules/gui/qt/components/extended_panels.cpp:1114 -#: modules/gui/qt/components/extended_panels.cpp:1115 -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1120 -#: modules/gui/qt/components/extended_panels.cpp:1121 -#: modules/gui/qt/components/extended_panels.cpp:1122 -#: modules/gui/qt/components/extended_panels.cpp:1123 -#: modules/gui/qt/components/extended_panels.cpp:1124 -#: modules/gui/qt/components/extended_panels.cpp:1125 -#: modules/gui/qt/components/extended_panels.cpp:1126 -#: modules/gui/qt/components/extended_panels.cpp:1127 -#: modules/gui/qt/components/extended_panels.cpp:1128 -#: modules/gui/qt/components/extended_panels.cpp:1129 #: modules/gui/qt/components/extended_panels.cpp:1132 -#: modules/gui/qt/components/extended_panels.cpp:1298 -#: modules/gui/qt/components/extended_panels.cpp:1300 -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1133 +#: modules/gui/qt/components/extended_panels.cpp:1134 +#: modules/gui/qt/components/extended_panels.cpp:1135 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1137 +#: modules/gui/qt/components/extended_panels.cpp:1138 +#: modules/gui/qt/components/extended_panels.cpp:1139 +#: modules/gui/qt/components/extended_panels.cpp:1140 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1145 +#: modules/gui/qt/components/extended_panels.cpp:1146 +#: modules/gui/qt/components/extended_panels.cpp:1147 +#: modules/gui/qt/components/extended_panels.cpp:1148 +#: modules/gui/qt/components/extended_panels.cpp:1149 +#: modules/gui/qt/components/extended_panels.cpp:1150 +#: modules/gui/qt/components/extended_panels.cpp:1151 +#: modules/gui/qt/components/extended_panels.cpp:1152 +#: modules/gui/qt/components/extended_panels.cpp:1153 +#: modules/gui/qt/components/extended_panels.cpp:1154 +#: modules/gui/qt/components/extended_panels.cpp:1157 +#: modules/gui/qt/components/extended_panels.cpp:1328 +#: modules/gui/qt/components/extended_panels.cpp:1330 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "dB" msgstr "dB" -#: modules/gui/qt/components/extended_panels.cpp:1108 +#: modules/gui/qt/components/extended_panels.cpp:1133 msgid "170 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1109 +#: modules/gui/qt/components/extended_panels.cpp:1134 msgid "310 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1110 +#: modules/gui/qt/components/extended_panels.cpp:1135 msgid "600 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1125 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1150 msgid "1 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1112 +#: modules/gui/qt/components/extended_panels.cpp:1137 msgid "3 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1113 +#: modules/gui/qt/components/extended_panels.cpp:1138 msgid "6 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1114 +#: modules/gui/qt/components/extended_panels.cpp:1139 msgid "12 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1115 +#: modules/gui/qt/components/extended_panels.cpp:1140 msgid "14 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1129 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1154 msgid "16 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1120 +#: modules/gui/qt/components/extended_panels.cpp:1145 msgid "31 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1121 +#: modules/gui/qt/components/extended_panels.cpp:1146 msgid "63 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1122 +#: modules/gui/qt/components/extended_panels.cpp:1147 msgid "125 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1123 +#: modules/gui/qt/components/extended_panels.cpp:1148 msgid "250 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1124 +#: modules/gui/qt/components/extended_panels.cpp:1149 msgid "500 Hz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1126 +#: modules/gui/qt/components/extended_panels.cpp:1151 msgid "2 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1127 +#: modules/gui/qt/components/extended_panels.cpp:1152 msgid "4 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1128 +#: modules/gui/qt/components/extended_panels.cpp:1153 msgid "8 KHz" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1296 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1326 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "ms" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1300 +#: modules/gui/qt/components/extended_panels.cpp:1330 msgid "" "Knee\n" "radius" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "" "Makeup\n" "gain" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1354 +#: modules/gui/qt/components/extended_panels.cpp:1384 msgid "Adjust pitch" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1388 +#: modules/gui/qt/components/extended_panels.cpp:1418 msgid "(Hastened)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1390 +#: modules/gui/qt/components/extended_panels.cpp:1420 msgid "(Delayed)" msgstr "(Retardau)" -#: modules/gui/qt/components/extended_panels.cpp:1477 +#: modules/gui/qt/components/extended_panels.cpp:1507 msgid "Force update of this dialog's values" msgstr "Forzar actualizar as valors d'iste dialogo" @@ -19614,7 +19618,7 @@ msgid "Overall" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:676 +#: modules/gui/qt/components/interface_widgets.cpp:683 msgid "" "Current playback speed: %1\n" "Click to adjust" @@ -19622,136 +19626,136 @@ "Velocidat de reproducción actual: %1\n" "Clic ta achustar" -#: modules/gui/qt/components/interface_widgets.cpp:749 +#: modules/gui/qt/components/interface_widgets.cpp:756 msgid "Revert to normal play speed" msgstr "Tornar a velocidat normal de reproducción" -#: modules/gui/qt/components/interface_widgets.cpp:856 +#: modules/gui/qt/components/interface_widgets.cpp:863 msgid "Download cover art" msgstr "Descargar arte de carátula" -#: modules/gui/qt/components/interface_widgets.cpp:860 +#: modules/gui/qt/components/interface_widgets.cpp:867 msgid "Add cover art from file" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:926 +#: modules/gui/qt/components/interface_widgets.cpp:933 msgid "Choose Cover Art" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:927 +#: modules/gui/qt/components/interface_widgets.cpp:934 msgid "Image Files (*.gif *.jpg *.jpeg *.png)" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:954 +#: modules/gui/qt/components/interface_widgets.cpp:961 #: modules/gui/qt/dialogs/toolbar.cpp:573 msgid "Elapsed time" msgstr "Tiempo transcorriu" -#: modules/gui/qt/components/interface_widgets.cpp:958 +#: modules/gui/qt/components/interface_widgets.cpp:965 #: modules/gui/qt/dialogs/toolbar.cpp:577 msgid "Total/Remaining time" msgstr "Total/Tiempo restante" -#: modules/gui/qt/components/interface_widgets.cpp:960 +#: modules/gui/qt/components/interface_widgets.cpp:967 msgid "Click to toggle between total and remaining time" msgstr "Clic ta intercambiar entre tiempo total y restante" -#: modules/gui/qt/components/interface_widgets.cpp:966 +#: modules/gui/qt/components/interface_widgets.cpp:973 msgid "Click to toggle between elapsed and remaining time" msgstr "Cambiar entre tiempo transcorriu y restante" -#: modules/gui/qt/components/interface_widgets.cpp:968 +#: modules/gui/qt/components/interface_widgets.cpp:975 msgid "Double click to jump to a chosen time position" msgstr "Dople clic ta ir a la posición de tiempo seleccionada" -#: modules/gui/qt/components/open_panels.cpp:58 +#: modules/gui/qt/components/open_panels.cpp:55 msgid "Select a device or a VIDEO_TS directory" msgstr "Seleccionar un dispositivo u a carpeta VIDEO_TS" -#: modules/gui/qt/components/open_panels.cpp:59 +#: modules/gui/qt/components/open_panels.cpp:56 msgid "Select a device or a VIDEO_TS folder" msgstr "Seleccionar un dispositivo u a carpeta VIDEO_TS" -#: modules/gui/qt/components/open_panels.cpp:145 -#: modules/gui/qt/components/open_panels.cpp:224 +#: modules/gui/qt/components/open_panels.cpp:127 +#: modules/gui/qt/components/open_panels.cpp:206 msgid "Select one or multiple files" msgstr "Seleccionar un u quantos fichers" -#: modules/gui/qt/components/open_panels.cpp:160 +#: modules/gui/qt/components/open_panels.cpp:142 msgid "File names:" msgstr "Nombres de fichero:" -#: modules/gui/qt/components/open_panels.cpp:162 -#: modules/gui/qt/ui/sprefs_interface.h:558 +#: modules/gui/qt/components/open_panels.cpp:144 +#: modules/gui/qt/ui/sprefs_interface.h:565 msgid "Filter:" msgstr "Filtro:" -#: modules/gui/qt/components/open_panels.cpp:367 +#: modules/gui/qt/components/open_panels.cpp:349 msgid "Eject the disc" msgstr "Fer fuera o disco" -#: modules/gui/qt/components/open_panels.cpp:534 +#: modules/gui/qt/components/open_panels.cpp:514 msgid "Entry" msgstr "Acceso" -#: modules/gui/qt/components/open_panels.cpp:893 +#: modules/gui/qt/components/open_panels.cpp:873 msgid "Channels:" msgstr "Canales:" -#: modules/gui/qt/components/open_panels.cpp:904 +#: modules/gui/qt/components/open_panels.cpp:884 msgid "Selected ports:" msgstr "Puertos seleccionaus:" -#: modules/gui/qt/components/open_panels.cpp:907 +#: modules/gui/qt/components/open_panels.cpp:887 msgid ".*" msgstr ".*" -#: modules/gui/qt/components/open_panels.cpp:914 +#: modules/gui/qt/components/open_panels.cpp:894 msgid "Use VLC pace" msgstr "Usar ritmo VLC" -#: modules/gui/qt/components/open_panels.cpp:934 +#: modules/gui/qt/components/open_panels.cpp:914 msgid "TV - digital" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:937 +#: modules/gui/qt/components/open_panels.cpp:917 msgid "Tuner card" msgstr "Tarcheta sintonizador" -#: modules/gui/qt/components/open_panels.cpp:938 +#: modules/gui/qt/components/open_panels.cpp:918 msgid "Delivery system" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:968 +#: modules/gui/qt/components/open_panels.cpp:948 msgid "Transponder/multiplex frequency" msgstr "Freqüencia de transpondedor/multiplex" -#: modules/gui/qt/components/open_panels.cpp:978 +#: modules/gui/qt/components/open_panels.cpp:958 msgid "Transponder symbol rate" msgstr "Taxa simbolo de transpondedor" -#: modules/gui/qt/components/open_panels.cpp:1011 +#: modules/gui/qt/components/open_panels.cpp:991 msgid "Bandwidth" msgstr "Amplo de banda" -#: modules/gui/qt/components/open_panels.cpp:1055 +#: modules/gui/qt/components/open_panels.cpp:1035 msgid "TV - analog" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1058 +#: modules/gui/qt/components/open_panels.cpp:1038 msgid "Device name" msgstr "Nombre de dispositivo" -#: modules/gui/qt/components/open_panels.cpp:1118 +#: modules/gui/qt/components/open_panels.cpp:1098 msgid "Your display will be opened and played in order to stream or save it." msgstr "A suya pantalla será ubierta y reproducida ta emitir-la u alzar-la." #. xgettext: frames per second -#: modules/gui/qt/components/open_panels.cpp:1132 +#: modules/gui/qt/components/open_panels.cpp:1112 msgid " f/s" msgstr " f/s" -#: modules/gui/qt/components/open_panels.cpp:1347 +#: modules/gui/qt/components/open_panels.cpp:1327 msgid "Advanced Options" msgstr " Opcions abanzadas" @@ -19783,11 +19787,11 @@ msgid "Internet" msgstr "Internet" -#: modules/gui/qt/components/playlist/selector.cpp:443 +#: modules/gui/qt/components/playlist/selector.cpp:456 msgid "Remove this podcast subscription" msgstr "Eliminar ista conduta de podcast" -#: modules/gui/qt/components/playlist/selector.cpp:594 +#: modules/gui/qt/components/playlist/selector.cpp:607 msgid "Do you really want to unsubscribe from %1?" msgstr "Deseya cancelar a conduta de %1?" @@ -19827,35 +19831,35 @@ msgid "Enter a new name for the folder:" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:254 +#: modules/gui/qt/components/playlist/standardpanel.cpp:255 msgid "Sort by" msgstr "Ordenar por" -#: modules/gui/qt/components/playlist/standardpanel.cpp:261 +#: modules/gui/qt/components/playlist/standardpanel.cpp:262 msgid "Ascending" msgstr "ascendentment" -#: modules/gui/qt/components/playlist/standardpanel.cpp:265 +#: modules/gui/qt/components/playlist/standardpanel.cpp:266 msgid "Descending" msgstr "descendentemente" -#: modules/gui/qt/components/playlist/standardpanel.cpp:278 +#: modules/gui/qt/components/playlist/standardpanel.cpp:279 msgid "Display size" msgstr "Grandaria de pantalla" -#: modules/gui/qt/components/playlist/standardpanel.cpp:279 +#: modules/gui/qt/components/playlist/standardpanel.cpp:280 msgid "Increase" msgstr "Incrementar" -#: modules/gui/qt/components/playlist/standardpanel.cpp:280 +#: modules/gui/qt/components/playlist/standardpanel.cpp:281 msgid "Decrease" msgstr "Decrementar" -#: modules/gui/qt/components/playlist/standardpanel.cpp:413 +#: modules/gui/qt/components/playlist/standardpanel.cpp:414 msgid "Playlist View Mode" msgstr "" -#: modules/gui/qt/components/playlist/standardpanel.cpp:592 +#: modules/gui/qt/components/playlist/standardpanel.cpp:593 msgid "" "Playlist is currently empty.\n" "Drop a file here or select a media source from the left." @@ -19881,91 +19885,91 @@ msgid "Select File" msgstr "Seleccionar fichero" -#: modules/gui/qt/components/preferences_widgets.cpp:1125 +#: modules/gui/qt/components/preferences_widgets.cpp:1129 msgid "" "Select or double click an action to change the associated hotkey. Use delete " "key to remove hotkeys." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1132 +#: modules/gui/qt/components/preferences_widgets.cpp:1136 msgid "in" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1134 +#: modules/gui/qt/components/preferences_widgets.cpp:1138 msgid "Any field" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1135 +#: modules/gui/qt/components/preferences_widgets.cpp:1139 msgid "Actions" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1142 +#: modules/gui/qt/components/preferences_widgets.cpp:1146 msgid "Hotkey" msgstr "Alcorce de teclau" -#: modules/gui/qt/components/preferences_widgets.cpp:1143 +#: modules/gui/qt/components/preferences_widgets.cpp:1147 msgid "Application level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1144 -#: modules/gui/qt/components/preferences_widgets.cpp:1401 +#: modules/gui/qt/components/preferences_widgets.cpp:1148 +#: modules/gui/qt/components/preferences_widgets.cpp:1405 msgid "Global" msgstr "Global" -#: modules/gui/qt/components/preferences_widgets.cpp:1145 +#: modules/gui/qt/components/preferences_widgets.cpp:1149 msgid "Desktop level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1225 -#: modules/gui/qt/components/preferences_widgets.cpp:1226 +#: modules/gui/qt/components/preferences_widgets.cpp:1229 +#: modules/gui/qt/components/preferences_widgets.cpp:1230 msgid "" "Double click to change.\n" "Delete key to remove." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1402 +#: modules/gui/qt/components/preferences_widgets.cpp:1406 msgid "Hotkey change" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1406 +#: modules/gui/qt/components/preferences_widgets.cpp:1410 msgid "Press the new key or combination for " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1415 +#: modules/gui/qt/components/preferences_widgets.cpp:1419 msgid "Assign" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1450 +#: modules/gui/qt/components/preferences_widgets.cpp:1454 msgid "Warning: this key or combination is already assigned to " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1462 +#: modules/gui/qt/components/preferences_widgets.cpp:1466 msgid "Warning: %1 is already an application menu shortcut" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1485 +#: modules/gui/qt/components/preferences_widgets.cpp:1489 msgid "Key or combination: " msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1494 +#: modules/gui/qt/components/preferences_widgets.cpp:1498 msgid "Key: " msgstr "Tecla: " -#: modules/gui/qt/components/simple_preferences.cpp:255 -#: modules/gui/qt/components/simple_preferences.cpp:628 +#: modules/gui/qt/components/simple_preferences.cpp:256 +#: modules/gui/qt/components/simple_preferences.cpp:636 msgid "Input & Codecs Settings" msgstr "Preferencias de dentrada y códecs" -#: modules/gui/qt/components/simple_preferences.cpp:257 -#: modules/gui/qt/components/simple_preferences.cpp:912 +#: modules/gui/qt/components/simple_preferences.cpp:258 +#: modules/gui/qt/components/simple_preferences.cpp:938 msgid "Configure Hotkeys" msgstr "Configurar alcorces de teclau" -#: modules/gui/qt/components/simple_preferences.cpp:454 +#: modules/gui/qt/components/simple_preferences.cpp:455 msgid "Device:" msgstr "Dispositivo:" -#: modules/gui/qt/components/simple_preferences.cpp:633 +#: modules/gui/qt/components/simple_preferences.cpp:641 msgid "" "If this property is blank, different values\n" "for DVD, VCD, and CDDA are set.\n" @@ -19977,58 +19981,58 @@ "Puede definir un solo u configurar-los \n" "individualment en preferencias abanzadas." -#: modules/gui/qt/components/simple_preferences.cpp:701 +#: modules/gui/qt/components/simple_preferences.cpp:712 msgid "Lowest latency" msgstr "A menor latencia" -#: modules/gui/qt/components/simple_preferences.cpp:704 +#: modules/gui/qt/components/simple_preferences.cpp:715 msgid "High latency" msgstr "Alta latencia" -#: modules/gui/qt/components/simple_preferences.cpp:705 +#: modules/gui/qt/components/simple_preferences.cpp:716 msgid "Higher latency" msgstr "A mayor latencia" -#: modules/gui/qt/components/simple_preferences.cpp:753 +#: modules/gui/qt/components/simple_preferences.cpp:764 msgid "This is VLC's skinnable interface. You can download other skins at" msgstr "" "Ista ye a interficie personalizable de VLC. Puede descargar atras piels dende" -#: modules/gui/qt/components/simple_preferences.cpp:755 +#: modules/gui/qt/components/simple_preferences.cpp:766 msgid "VLC skins website" msgstr "puesto web de piels VLC" -#: modules/gui/qt/components/simple_preferences.cpp:779 +#: modules/gui/qt/components/simple_preferences.cpp:794 msgid "System's default" msgstr "Predeterminau d'o sistema" -#: modules/gui/qt/components/simple_preferences.cpp:1317 +#: modules/gui/qt/components/simple_preferences.cpp:1344 msgid "File associations" msgstr "Asociacions de fichero" -#: modules/gui/qt/components/simple_preferences.cpp:1326 +#: modules/gui/qt/components/simple_preferences.cpp:1353 #: modules/gui/qt/dialogs_provider.hpp:42 msgid "Audio Files" msgstr "Fichers d'audio" -#: modules/gui/qt/components/simple_preferences.cpp:1327 +#: modules/gui/qt/components/simple_preferences.cpp:1354 #: modules/gui/qt/dialogs_provider.hpp:41 msgid "Video Files" msgstr "Fichers de video" -#: modules/gui/qt/components/simple_preferences.cpp:1328 +#: modules/gui/qt/components/simple_preferences.cpp:1355 #: modules/gui/qt/dialogs_provider.hpp:43 msgid "Playlist Files" msgstr "Listas de reproducción" -#: modules/gui/qt/components/simple_preferences.cpp:1393 +#: modules/gui/qt/components/simple_preferences.cpp:1420 msgid "&Apply" msgstr "&Aplicar" -#: modules/gui/qt/components/simple_preferences.cpp:1394 +#: modules/gui/qt/components/simple_preferences.cpp:1421 #: modules/gui/qt/dialogs/convert.cpp:137 -#: modules/gui/qt/dialogs/gototime.cpp:49 modules/gui/qt/dialogs/open.cpp:108 -#: modules/gui/qt/dialogs/openurl.cpp:60 +#: modules/gui/qt/dialogs/gototime.cpp:48 modules/gui/qt/dialogs/open.cpp:109 +#: modules/gui/qt/dialogs/openurl.cpp:59 #: modules/gui/qt/dialogs/podcast_configuration.cpp:37 #: modules/gui/qt/dialogs/preferences.cpp:97 #: modules/gui/qt/dialogs/toolbar.cpp:198 @@ -20072,89 +20076,89 @@ msgid "You must set a name for the profile." msgstr "Debe establir un nombre ta fichero ta o perfil." -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Directory" msgstr "Fichero/Carpeta" -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Folder" msgstr "Fichero/Carpeta" -#: modules/gui/qt/components/sout/sout_widgets.cpp:47 +#: modules/gui/qt/components/sout/sout_widgets.cpp:48 #: modules/gui/qt/ui/sout.h:199 msgid "Source" msgstr "Fuent" -#: modules/gui/qt/components/sout/sout_widgets.cpp:50 +#: modules/gui/qt/components/sout/sout_widgets.cpp:51 msgid "Source:" msgstr "Fuent:" -#: modules/gui/qt/components/sout/sout_widgets.cpp:59 +#: modules/gui/qt/components/sout/sout_widgets.cpp:60 msgid "Type:" msgstr "Tipo:" -#: modules/gui/qt/components/sout/sout_widgets.cpp:127 +#: modules/gui/qt/components/sout/sout_widgets.cpp:128 msgid "This module writes the transcoded stream to a file." msgstr "Iste modulo escribe a emisión transcodificada en un fichero." -#: modules/gui/qt/components/sout/sout_widgets.cpp:129 +#: modules/gui/qt/components/sout/sout_widgets.cpp:130 msgid "Filename" msgstr "Nombre de fichero" -#: modules/gui/qt/components/sout/sout_widgets.cpp:173 +#: modules/gui/qt/components/sout/sout_widgets.cpp:174 #: modules/gui/qt/dialogs/convert.cpp:161 msgid "Save file..." msgstr "Alzar fichero..." -#: modules/gui/qt/components/sout/sout_widgets.cpp:174 +#: modules/gui/qt/components/sout/sout_widgets.cpp:175 msgid "" "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" msgstr "" "Contenedors (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv)" -#: modules/gui/qt/components/sout/sout_widgets.cpp:184 +#: modules/gui/qt/components/sout/sout_widgets.cpp:185 msgid "This module outputs the transcoded stream to a network via HTTP." msgstr "" "Iste modulo ninvia a emisión transcodificada a un ret a traviés de HTTP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:186 -#: modules/gui/qt/components/sout/sout_widgets.cpp:282 +#: modules/gui/qt/components/sout/sout_widgets.cpp:187 +#: modules/gui/qt/components/sout/sout_widgets.cpp:283 msgid "Path" msgstr "Rota" -#: modules/gui/qt/components/sout/sout_widgets.cpp:238 +#: modules/gui/qt/components/sout/sout_widgets.cpp:239 msgid "" "This module outputs the transcoded stream to a network via the mms protocol." msgstr "" "Iste modulo ninvia a emisión transcodificada a un ret a traviés d'o " "protocolo mms." -#: modules/gui/qt/components/sout/sout_widgets.cpp:280 +#: modules/gui/qt/components/sout/sout_widgets.cpp:281 msgid "This module outputs the transcoded stream to a network via RTSP." msgstr "Iste modulo ninvia a emisión transcodificada a un ret via RTSP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:326 +#: modules/gui/qt/components/sout/sout_widgets.cpp:327 msgid "This module outputs the transcoded stream to a network via UDP." msgstr "Iste modulo ninvia a emisión transcodificada a un ret a traviés d'UDP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:368 +#: modules/gui/qt/components/sout/sout_widgets.cpp:369 msgid "This module outputs the transcoded stream to a network via RTP." msgstr "" "Iste modulo ninvia a emisión transcodificada a un ret a traviés de RTP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:375 +#: modules/gui/qt/components/sout/sout_widgets.cpp:376 msgid "Base port" msgstr "Puerto base" -#: modules/gui/qt/components/sout/sout_widgets.cpp:423 +#: modules/gui/qt/components/sout/sout_widgets.cpp:424 msgid "This module outputs the transcoded stream to an Icecast server." msgstr "Iste modulo ninvia a emisión transcodificada a un servidor Icecast." -#: modules/gui/qt/components/sout/sout_widgets.cpp:442 +#: modules/gui/qt/components/sout/sout_widgets.cpp:443 msgid "Mount Point" msgstr "Punto de montache" -#: modules/gui/qt/components/sout/sout_widgets.cpp:443 +#: modules/gui/qt/components/sout/sout_widgets.cpp:444 msgid "Login:pass" msgstr "Usuario:clau" @@ -20180,13 +20184,13 @@ #: modules/gui/qt/dialogs/bookmarks.cpp:62 modules/gui/qt/dialogs/epg.cpp:92 #: modules/gui/qt/dialogs/errors.cpp:49 modules/gui/qt/dialogs/extended.cpp:130 -#: modules/gui/qt/dialogs/help.cpp:66 modules/gui/qt/dialogs/help.cpp:212 +#: modules/gui/qt/dialogs/help.cpp:64 modules/gui/qt/dialogs/help.cpp:223 #: modules/gui/qt/dialogs/mediainfo.cpp:80 -#: modules/gui/qt/dialogs/messages.cpp:84 modules/gui/qt/dialogs/plugins.cpp:94 -#: modules/gui/qt/dialogs/plugins.cpp:1438 -#: modules/gui/qt/dialogs/plugins.cpp:1551 +#: modules/gui/qt/dialogs/messages.cpp:81 modules/gui/qt/dialogs/plugins.cpp:93 +#: modules/gui/qt/dialogs/plugins.cpp:1437 +#: modules/gui/qt/dialogs/plugins.cpp:1550 #: modules/gui/qt/dialogs/podcast_configuration.cpp:36 -#: modules/gui/qt/dialogs/vlm.cpp:136 +#: modules/gui/qt/dialogs/vlm.cpp:130 msgid "&Close" msgstr "&Zarrar" @@ -20206,7 +20210,7 @@ msgid "Destination" msgstr "Destín" -#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:413 +#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:414 msgid "Destination file:" msgstr "Fichero destino:" @@ -20246,16 +20250,16 @@ msgid "Containers" msgstr "" -#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:431 +#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:434 msgid "Program Guide" msgstr "Guía de programa" -#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:286 -#: modules/gui/qt/ui/about.h:287 +#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:283 +#: modules/gui/qt/ui/about.h:284 msgid "Update" msgstr "Actualizar" -#: modules/gui/qt/dialogs/epg.cpp:161 +#: modules/gui/qt/dialogs/epg.cpp:162 msgid " (%1+ rated)" msgstr "" @@ -20292,7 +20296,7 @@ msgid "&Save" msgstr "&Alzar" -#: modules/gui/qt/dialogs/external.cpp:216 +#: modules/gui/qt/dialogs/external.cpp:218 msgid "Store the Password" msgstr "" @@ -20323,60 +20327,60 @@ msgid "Regularly check for VLC updates" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:42 +#: modules/gui/qt/dialogs/gototime.cpp:41 msgid "Go to Time" msgstr "Ir a tiempo" -#: modules/gui/qt/dialogs/gototime.cpp:48 +#: modules/gui/qt/dialogs/gototime.cpp:47 msgid "&Go" msgstr "&Ir" -#: modules/gui/qt/dialogs/gototime.cpp:56 +#: modules/gui/qt/dialogs/gototime.cpp:55 msgid "Go to time" msgstr "Ir a tiempo" -#: modules/gui/qt/dialogs/help.cpp:86 modules/gui/qt/dialogs/plugins.cpp:1376 -#: modules/gui/qt/dialogs/plugins.cpp:1459 +#: modules/gui/qt/dialogs/help.cpp:84 modules/gui/qt/dialogs/plugins.cpp:1375 +#: modules/gui/qt/dialogs/plugins.cpp:1458 msgid "About" msgstr "Sobre" -#: modules/gui/qt/dialogs/help.cpp:94 +#: modules/gui/qt/dialogs/help.cpp:101 msgid "" "

VLC media player is a free and open source media player, encoder, and " "streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:214 +#: modules/gui/qt/dialogs/help.cpp:225 msgid "&Recheck version" msgstr "&Recomprobar versión" -#: modules/gui/qt/dialogs/help.cpp:217 +#: modules/gui/qt/dialogs/help.cpp:228 msgid "&Yes" msgstr "&Sí" -#: modules/gui/qt/dialogs/help.cpp:219 +#: modules/gui/qt/dialogs/help.cpp:230 msgid "&No" msgstr "&No" -#: modules/gui/qt/dialogs/help.cpp:222 modules/gui/qt/ui/update.h:144 +#: modules/gui/qt/dialogs/help.cpp:233 modules/gui/qt/ui/update.h:144 msgid "VLC media player updates" msgstr "Actualizacions d'o reproductor multimedia VLC" -#: modules/gui/qt/dialogs/help.cpp:294 +#: modules/gui/qt/dialogs/help.cpp:305 msgid "A new version of VLC (%1.%2.%3%4) is available." msgstr "Una nueva versión de VLC (%1.%2.%3%4) ye disponible." -#: modules/gui/qt/dialogs/help.cpp:319 +#: modules/gui/qt/dialogs/help.cpp:330 msgid "You have the latest version of VLC media player." msgstr "Tiene a zaguera versión d'o reproductor multimedia VLC." -#: modules/gui/qt/dialogs/help.cpp:326 +#: modules/gui/qt/dialogs/help.cpp:337 msgid "An error occurred while checking for updates..." msgstr "Ocurrió una error en buscar actualizacions..." @@ -20408,23 +20412,23 @@ msgid "Location:" msgstr "Puesto:" -#: modules/gui/qt/dialogs/messages.cpp:91 +#: modules/gui/qt/dialogs/messages.cpp:88 msgid "Saves all the displayed logs to a file" msgstr "Alza todas as trazas amostradas en un fichero" -#: modules/gui/qt/dialogs/messages.cpp:259 +#: modules/gui/qt/dialogs/messages.cpp:256 msgid "Save log file as..." msgstr "Alzar fichero de trazas como..." -#: modules/gui/qt/dialogs/messages.cpp:261 +#: modules/gui/qt/dialogs/messages.cpp:258 msgid "Texts/Logs (*.log *.txt);; All (*.*)" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:267 +#: modules/gui/qt/dialogs/messages.cpp:264 msgid "Application" msgstr "Aplicación" -#: modules/gui/qt/dialogs/messages.cpp:268 +#: modules/gui/qt/dialogs/messages.cpp:265 msgid "" "Cannot write to file %1:\n" "%2." @@ -20432,74 +20436,74 @@ "No se puede escribir fichero %1:\n" "%2." -#: modules/gui/qt/dialogs/messages.cpp:334 +#: modules/gui/qt/dialogs/messages.cpp:331 msgid "Update the tree" msgstr "Actualizar l'arbol" -#: modules/gui/qt/dialogs/messages.cpp:335 +#: modules/gui/qt/dialogs/messages.cpp:332 msgid "Clear the messages" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:78 modules/gui/qt/menus.cpp:935 -#: modules/gui/qt/menus.cpp:1132 +#: modules/gui/qt/dialogs/open.cpp:79 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:1137 msgid "Open Media" msgstr "Ubrir meyo" -#: modules/gui/qt/dialogs/open.cpp:90 +#: modules/gui/qt/dialogs/open.cpp:91 msgid "&File" msgstr "&Fichero" -#: modules/gui/qt/dialogs/open.cpp:92 +#: modules/gui/qt/dialogs/open.cpp:93 msgid "&Disc" msgstr "&Disco" -#: modules/gui/qt/dialogs/open.cpp:94 +#: modules/gui/qt/dialogs/open.cpp:95 msgid "&Network" msgstr "&Ret" -#: modules/gui/qt/dialogs/open.cpp:96 +#: modules/gui/qt/dialogs/open.cpp:97 msgid "Capture &Device" msgstr "Dispositivo de &captura" -#: modules/gui/qt/dialogs/open.cpp:111 +#: modules/gui/qt/dialogs/open.cpp:112 msgid "&Select" msgstr "&Seleccionar" -#: modules/gui/qt/dialogs/open.cpp:115 modules/gui/qt/dialogs/open.cpp:210 -#: modules/gui/qt/dialogs/openurl.cpp:57 +#: modules/gui/qt/dialogs/open.cpp:116 modules/gui/qt/dialogs/open.cpp:211 +#: modules/gui/qt/dialogs/openurl.cpp:56 msgid "&Enqueue" msgstr "&Encolar" -#: modules/gui/qt/dialogs/open.cpp:117 modules/gui/qt/dialogs/open.cpp:214 -#: modules/gui/qt/dialogs/openurl.cpp:54 modules/gui/qt/menus.cpp:824 +#: modules/gui/qt/dialogs/open.cpp:118 modules/gui/qt/dialogs/open.cpp:215 +#: modules/gui/qt/dialogs/openurl.cpp:53 modules/gui/qt/menus.cpp:829 msgid "&Play" msgstr "&Reproducir" -#: modules/gui/qt/dialogs/open.cpp:119 modules/gui/qt/dialogs/open.cpp:204 +#: modules/gui/qt/dialogs/open.cpp:120 modules/gui/qt/dialogs/open.cpp:205 msgid "&Stream" msgstr "Y&mitir" -#: modules/gui/qt/dialogs/open.cpp:121 +#: modules/gui/qt/dialogs/open.cpp:122 msgid "C&onvert" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:207 +#: modules/gui/qt/dialogs/open.cpp:208 msgid "C&onvert / Save" msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:47 +#: modules/gui/qt/dialogs/openurl.cpp:46 msgid "Open URL" msgstr "Ubrir URL" -#: modules/gui/qt/dialogs/openurl.cpp:64 +#: modules/gui/qt/dialogs/openurl.cpp:63 msgid "Enter URL here..." msgstr "Introduzca a URL aquí..." -#: modules/gui/qt/dialogs/openurl.cpp:67 +#: modules/gui/qt/dialogs/openurl.cpp:66 msgid "Please enter the URL or path to the media you want to play." msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:71 +#: modules/gui/qt/dialogs/openurl.cpp:70 msgid "" "If your clipboard contains a valid URL\n" "or the path to a file on your computer,\n" @@ -20509,105 +20513,105 @@ "u a rota a un fichero en a suya computadora,\n" "ye automaticament seleccionau." -#: modules/gui/qt/dialogs/plugins.cpp:80 +#: modules/gui/qt/dialogs/plugins.cpp:79 msgid "Plugins and extensions" msgstr "Complementos y extensions" -#: modules/gui/qt/dialogs/plugins.cpp:88 +#: modules/gui/qt/dialogs/plugins.cpp:87 msgid "Active Extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Capability" msgstr "Caracteristica" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Score" msgstr "Puntuación" -#: modules/gui/qt/dialogs/plugins.cpp:141 +#: modules/gui/qt/dialogs/plugins.cpp:140 msgid "&Search:" msgstr "&Buscar" -#: modules/gui/qt/dialogs/plugins.cpp:259 -#: modules/gui/qt/dialogs/plugins.cpp:1292 +#: modules/gui/qt/dialogs/plugins.cpp:258 +#: modules/gui/qt/dialogs/plugins.cpp:1291 msgid "More information..." msgstr "Mas información..." -#: modules/gui/qt/dialogs/plugins.cpp:267 +#: modules/gui/qt/dialogs/plugins.cpp:266 msgid "Reload extensions" msgstr "Recargar extensions" -#: modules/gui/qt/dialogs/plugins.cpp:386 +#: modules/gui/qt/dialogs/plugins.cpp:385 msgid "" "Skins customize player's appearance. You can activate them through " "preferences." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:390 +#: modules/gui/qt/dialogs/plugins.cpp:389 msgid "" "Playlist parsers add new capabilities to read internet streams or extract " "meta data." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:394 +#: modules/gui/qt/dialogs/plugins.cpp:393 msgid "" "Service discoveries adds new sources to your playlist such as web radios, " "video websites, ..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:401 +#: modules/gui/qt/dialogs/plugins.cpp:400 msgid "Retrieves extra info and art for playlist items" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:404 +#: modules/gui/qt/dialogs/plugins.cpp:403 msgid "" "Extensions brings various enhancements. Check descriptions for more details" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:425 +#: modules/gui/qt/dialogs/plugins.cpp:424 msgid "Only installed" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:531 +#: modules/gui/qt/dialogs/plugins.cpp:530 msgid "Retrieving addons..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:542 +#: modules/gui/qt/dialogs/plugins.cpp:541 msgid "No addons found" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:821 +#: modules/gui/qt/dialogs/plugins.cpp:820 msgid "This addon has been installed manually. VLC can't manage it by itself." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1204 +#: modules/gui/qt/dialogs/plugins.cpp:1203 msgid "Version %1" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1232 +#: modules/gui/qt/dialogs/plugins.cpp:1231 msgid "%1 downloads" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1301 +#: modules/gui/qt/dialogs/plugins.cpp:1300 msgid "&Uninstall" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1304 +#: modules/gui/qt/dialogs/plugins.cpp:1303 msgid "&Install" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:1399 -#: modules/gui/qt/dialogs/plugins.cpp:1502 +#: modules/gui/qt/dialogs/plugins.cpp:1398 +#: modules/gui/qt/dialogs/plugins.cpp:1501 msgid "Version" msgstr "Versión" -#: modules/gui/qt/dialogs/plugins.cpp:1419 -#: modules/gui/qt/dialogs/plugins.cpp:1529 +#: modules/gui/qt/dialogs/plugins.cpp:1418 +#: modules/gui/qt/dialogs/plugins.cpp:1528 msgid "Website" msgstr "Puesto web" -#: modules/gui/qt/dialogs/plugins.cpp:1541 modules/gui/qt/ui/sprefs_input.h:363 +#: modules/gui/qt/dialogs/plugins.cpp:1540 modules/gui/qt/ui/sprefs_input.h:363 msgid "Files" msgstr "Fichers" @@ -20667,11 +20671,11 @@ msgid "Are you sure you want to reset your VLC media player preferences?" msgstr "Deseya restaurar as preferencias d'o reproductor multimedia VLC?" -#: modules/gui/qt/dialogs/sout.cpp:45 modules/gui/qt/ui/sout.h:198 +#: modules/gui/qt/dialogs/sout.cpp:43 modules/gui/qt/ui/sout.h:198 msgid "Stream Output" msgstr "Salida d'emisión" -#: modules/gui/qt/dialogs/sout.cpp:51 +#: modules/gui/qt/dialogs/sout.cpp:49 msgid "" "This wizard will allow you to stream or convert your media for use locally, " "on your private network, or on the Internet.\n" @@ -20679,7 +20683,7 @@ "be and then press the \"Next\" button to continue.\n" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:58 +#: modules/gui/qt/dialogs/sout.cpp:56 msgid "" "Stream output string.\n" "This is automatically generated when you change the above settings,\n" @@ -20689,7 +20693,7 @@ "Se chenera automaticament en cambiar as opcions d'alto,\n" "pero puede modificar-la manualment." -#: modules/gui/qt/dialogs/sout.cpp:91 +#: modules/gui/qt/dialogs/sout.cpp:89 msgid "Back" msgstr "Dezaga" @@ -20821,67 +20825,67 @@ msgid "Speed selector" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:73 +#: modules/gui/qt/dialogs/vlm.cpp:67 msgid "Broadcast" msgstr "Retransmisión" -#: modules/gui/qt/dialogs/vlm.cpp:74 +#: modules/gui/qt/dialogs/vlm.cpp:68 msgid "Schedule" msgstr "Horario programado" -#: modules/gui/qt/dialogs/vlm.cpp:75 +#: modules/gui/qt/dialogs/vlm.cpp:69 msgid "Video On Demand ( VOD )" msgstr "Video baixo demanda (VOD)" -#: modules/gui/qt/dialogs/vlm.cpp:80 +#: modules/gui/qt/dialogs/vlm.cpp:74 msgid "Hours / Minutes / Seconds:" msgstr "Horas / Menutos / Segundos:" -#: modules/gui/qt/dialogs/vlm.cpp:82 +#: modules/gui/qt/dialogs/vlm.cpp:76 msgid "Day / Month / Year:" msgstr "Día / Mes / Anyo:" -#: modules/gui/qt/dialogs/vlm.cpp:84 +#: modules/gui/qt/dialogs/vlm.cpp:78 msgid "Repeat:" msgstr "Repetir:" -#: modules/gui/qt/dialogs/vlm.cpp:86 +#: modules/gui/qt/dialogs/vlm.cpp:80 msgid "Repeat delay:" msgstr "Repetir retardo:" -#: modules/gui/qt/dialogs/vlm.cpp:111 modules/gui/qt/ui/sprefs_interface.h:555 +#: modules/gui/qt/dialogs/vlm.cpp:105 modules/gui/qt/ui/sprefs_interface.h:562 msgid " days" msgstr " días" -#: modules/gui/qt/dialogs/vlm.cpp:130 +#: modules/gui/qt/dialogs/vlm.cpp:124 msgid "I&mport" msgstr "&Importar" -#: modules/gui/qt/dialogs/vlm.cpp:133 +#: modules/gui/qt/dialogs/vlm.cpp:127 msgid "E&xport" msgstr "&Exportar" -#: modules/gui/qt/dialogs/vlm.cpp:264 +#: modules/gui/qt/dialogs/vlm.cpp:258 msgid "Save VLM configuration as..." msgstr "Alzar configuración VLM como..." -#: modules/gui/qt/dialogs/vlm.cpp:266 modules/gui/qt/dialogs/vlm.cpp:335 +#: modules/gui/qt/dialogs/vlm.cpp:260 modules/gui/qt/dialogs/vlm.cpp:329 msgid "VLM conf (*.vlm);;All (*)" msgstr "Configuración VLM (*.vlm);;Tot (*.*)" -#: modules/gui/qt/dialogs/vlm.cpp:333 +#: modules/gui/qt/dialogs/vlm.cpp:327 msgid "Open VLM configuration..." msgstr "Ubrir configuración VLM..." -#: modules/gui/qt/dialogs/vlm.cpp:532 +#: modules/gui/qt/dialogs/vlm.cpp:526 msgid "Broadcast: " msgstr "Retransmisión: " -#: modules/gui/qt/dialogs/vlm.cpp:605 +#: modules/gui/qt/dialogs/vlm.cpp:599 msgid "Schedule: " msgstr "Horario programado: " -#: modules/gui/qt/dialogs/vlm.cpp:629 +#: modules/gui/qt/dialogs/vlm.cpp:623 msgid "VOD: " msgstr "VOD: " @@ -20939,339 +20943,339 @@ msgid "Deactivate" msgstr "" -#: modules/gui/qt/main_interface.cpp:373 +#: modules/gui/qt/main_interface.cpp:378 msgid "Do you want to restart the playback where left off?" msgstr "" -#: modules/gui/qt/main_interface.cpp:379 +#: modules/gui/qt/main_interface.cpp:384 msgid "&Continue" msgstr "" -#: modules/gui/qt/main_interface.cpp:1421 +#: modules/gui/qt/main_interface.cpp:1454 msgid "Control menu for the player" msgstr "Menú de control ta o reproductor" -#: modules/gui/qt/main_interface.cpp:1465 +#: modules/gui/qt/main_interface.cpp:1498 msgid "Paused" msgstr "Pausau" -#: modules/gui/qt/menus.cpp:331 +#: modules/gui/qt/menus.cpp:334 msgid "&Media" msgstr "&Meyo" -#: modules/gui/qt/menus.cpp:334 +#: modules/gui/qt/menus.cpp:337 msgid "P&layback" msgstr "&Reproducción" -#: modules/gui/qt/menus.cpp:335 modules/gui/qt/menus.cpp:1050 +#: modules/gui/qt/menus.cpp:338 modules/gui/qt/menus.cpp:1055 msgid "&Audio" msgstr "&Audio" -#: modules/gui/qt/menus.cpp:336 modules/gui/qt/menus.cpp:1057 +#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1062 msgid "&Video" msgstr "&Video" -#: modules/gui/qt/menus.cpp:337 modules/gui/qt/menus.cpp:1064 +#: modules/gui/qt/menus.cpp:340 modules/gui/qt/menus.cpp:1069 msgid "Subti&tle" msgstr "Subtí&tulo" -#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1080 +#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1085 msgid "Tool&s" msgstr "" -#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1087 +#: modules/gui/qt/menus.cpp:345 modules/gui/qt/menus.cpp:1092 msgid "V&iew" msgstr "V&er" -#: modules/gui/qt/menus.cpp:344 modules/gui/qt/menus.cpp:788 +#: modules/gui/qt/menus.cpp:347 modules/gui/qt/menus.cpp:793 msgid "&Help" msgstr "Ai&uda" -#: modules/gui/qt/menus.cpp:357 +#: modules/gui/qt/menus.cpp:360 msgid "Open &File..." msgstr "Ubrir &fichero..." -#: modules/gui/qt/menus.cpp:359 +#: modules/gui/qt/menus.cpp:362 msgid "&Open Multiple Files..." msgstr "" -#: modules/gui/qt/menus.cpp:363 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:366 modules/gui/qt/menus.cpp:945 msgid "Open &Disc..." msgstr "Ubrir &disco..." -#: modules/gui/qt/menus.cpp:365 +#: modules/gui/qt/menus.cpp:368 msgid "Open &Network Stream..." msgstr "Ubrir vulcau de &ret..." -#: modules/gui/qt/menus.cpp:367 modules/gui/qt/menus.cpp:944 +#: modules/gui/qt/menus.cpp:370 modules/gui/qt/menus.cpp:949 msgid "Open &Capture Device..." msgstr "Ubrir dispositivo de &captura..." -#: modules/gui/qt/menus.cpp:370 +#: modules/gui/qt/menus.cpp:373 msgid "Open &Location from clipboard" msgstr "Ubrir dende &portafuellas" -#: modules/gui/qt/menus.cpp:374 +#: modules/gui/qt/menus.cpp:377 msgid "Open &Recent Media" msgstr "Ubrir meyos &recients" -#: modules/gui/qt/menus.cpp:387 +#: modules/gui/qt/menus.cpp:390 msgid "Conve&rt / Save..." msgstr "Con&vertir..." -#: modules/gui/qt/menus.cpp:389 +#: modules/gui/qt/menus.cpp:392 msgid "&Stream..." msgstr "Y&mitir..." -#: modules/gui/qt/menus.cpp:394 +#: modules/gui/qt/menus.cpp:397 msgid "Quit at the end of playlist" msgstr "Salir a la fin d'a lista de reproducción" -#: modules/gui/qt/menus.cpp:401 +#: modules/gui/qt/menus.cpp:404 msgid "Close to systray" msgstr "Zarrar servilla d'o sistema" -#: modules/gui/qt/menus.cpp:405 modules/gui/qt/menus.cpp:1194 +#: modules/gui/qt/menus.cpp:408 modules/gui/qt/menus.cpp:1199 msgid "&Quit" msgstr "&Salir" -#: modules/gui/qt/menus.cpp:415 +#: modules/gui/qt/menus.cpp:418 msgid "&Effects and Filters" msgstr "Efectos y &filtros" -#: modules/gui/qt/menus.cpp:418 +#: modules/gui/qt/menus.cpp:421 msgid "&Track Synchronization" msgstr "&Sincronización de pista" -#: modules/gui/qt/menus.cpp:437 +#: modules/gui/qt/menus.cpp:440 msgid "Plu&gins and extensions" msgstr "Complementos y &extensions" -#: modules/gui/qt/menus.cpp:442 +#: modules/gui/qt/menus.cpp:445 msgid "Customi&ze Interface..." msgstr "&Personalizar interficie" -#: modules/gui/qt/menus.cpp:445 +#: modules/gui/qt/menus.cpp:448 msgid "&Preferences" msgstr "&Preferencias" -#: modules/gui/qt/menus.cpp:466 +#: modules/gui/qt/menus.cpp:469 msgid "&View" msgstr "&Veyer" -#: modules/gui/qt/menus.cpp:487 +#: modules/gui/qt/menus.cpp:490 msgid "Play&list" msgstr "&Lista de reproducción" -#: modules/gui/qt/menus.cpp:488 +#: modules/gui/qt/menus.cpp:491 msgid "Ctrl+L" msgstr "Ctrl+L" -#: modules/gui/qt/menus.cpp:491 +#: modules/gui/qt/menus.cpp:494 msgid "Docked Playlist" msgstr "Lista de reproducción ancorada" -#: modules/gui/qt/menus.cpp:501 +#: modules/gui/qt/menus.cpp:504 msgid "Always on &top" msgstr "" -#: modules/gui/qt/menus.cpp:509 +#: modules/gui/qt/menus.cpp:512 msgid "Mi&nimal Interface" msgstr " Interficie yo&nima" -#: modules/gui/qt/menus.cpp:510 +#: modules/gui/qt/menus.cpp:513 msgid "Ctrl+H" msgstr "Ctrl+H" -#: modules/gui/qt/menus.cpp:519 +#: modules/gui/qt/menus.cpp:522 msgid "&Fullscreen Interface" msgstr "Interficie a pantalla &completa" -#: modules/gui/qt/menus.cpp:527 +#: modules/gui/qt/menus.cpp:530 msgid "&Advanced Controls" msgstr "Controls &abanzaus" -#: modules/gui/qt/menus.cpp:534 +#: modules/gui/qt/menus.cpp:538 msgid "Status Bar" msgstr "Barra d'estau" -#: modules/gui/qt/menus.cpp:539 +#: modules/gui/qt/menus.cpp:544 msgid "Visualizations selector" msgstr "Selector de visualizacions" -#: modules/gui/qt/menus.cpp:597 +#: modules/gui/qt/menus.cpp:602 msgid "&Increase Volume" msgstr "" -#: modules/gui/qt/menus.cpp:600 +#: modules/gui/qt/menus.cpp:605 msgid "D&ecrease Volume" msgstr "" -#: modules/gui/qt/menus.cpp:603 +#: modules/gui/qt/menus.cpp:608 msgid "&Mute" msgstr "" -#: modules/gui/qt/menus.cpp:619 +#: modules/gui/qt/menus.cpp:624 msgid "Audio &Device" msgstr "&Dispositivo d'audio" -#: modules/gui/qt/menus.cpp:623 +#: modules/gui/qt/menus.cpp:628 msgid "Audio &Track" msgstr "&Pista d'audio" -#: modules/gui/qt/menus.cpp:625 +#: modules/gui/qt/menus.cpp:630 msgid "&Stereo Mode" msgstr "" -#: modules/gui/qt/menus.cpp:628 +#: modules/gui/qt/menus.cpp:633 msgid "&Visualizations" msgstr "&Visualizacions" -#: modules/gui/qt/menus.cpp:654 +#: modules/gui/qt/menus.cpp:659 msgid "Add &Subtitle File..." msgstr "" -#: modules/gui/qt/menus.cpp:656 +#: modules/gui/qt/menus.cpp:661 msgid "Sub &Track" msgstr "" -#: modules/gui/qt/menus.cpp:678 +#: modules/gui/qt/menus.cpp:683 msgid "Video &Track" msgstr "Pista de &video" -#: modules/gui/qt/menus.cpp:682 +#: modules/gui/qt/menus.cpp:687 msgid "&Fullscreen" msgstr "&Pantalla completa" -#: modules/gui/qt/menus.cpp:683 +#: modules/gui/qt/menus.cpp:688 msgid "Always Fit &Window" msgstr "Siempre achustau a la &finestra" -#: modules/gui/qt/menus.cpp:684 +#: modules/gui/qt/menus.cpp:689 msgid "Set as Wall&paper" msgstr "Establir como &fondo d'escritorio" -#: modules/gui/qt/menus.cpp:688 +#: modules/gui/qt/menus.cpp:693 msgid "&Zoom" msgstr "&Enamplar" -#: modules/gui/qt/menus.cpp:689 +#: modules/gui/qt/menus.cpp:694 msgid "&Aspect Ratio" msgstr "Proporció&n" -#: modules/gui/qt/menus.cpp:690 +#: modules/gui/qt/menus.cpp:695 msgid "&Crop" msgstr "&Retallar" -#: modules/gui/qt/menus.cpp:694 +#: modules/gui/qt/menus.cpp:699 msgid "&Deinterlace" msgstr "&Desentrelazar" -#: modules/gui/qt/menus.cpp:695 +#: modules/gui/qt/menus.cpp:700 msgid "&Deinterlace mode" msgstr "Modo &desentrelazado" -#: modules/gui/qt/menus.cpp:699 +#: modules/gui/qt/menus.cpp:704 msgid "Take &Snapshot" msgstr "Capturar &pantalla" -#: modules/gui/qt/menus.cpp:718 +#: modules/gui/qt/menus.cpp:723 msgid "T&itle" msgstr "&Titol" -#: modules/gui/qt/menus.cpp:719 +#: modules/gui/qt/menus.cpp:724 msgid "&Chapter" msgstr "&Capitol" -#: modules/gui/qt/menus.cpp:721 +#: modules/gui/qt/menus.cpp:726 msgid "&Program" msgstr "&Programa" -#: modules/gui/qt/menus.cpp:725 +#: modules/gui/qt/menus.cpp:730 msgid "&Manage" msgstr "Ad&ministrar" -#: modules/gui/qt/menus.cpp:791 +#: modules/gui/qt/menus.cpp:796 msgid "Check for &Updates..." msgstr "&Buscar actualizacions..." -#: modules/gui/qt/menus.cpp:838 +#: modules/gui/qt/menus.cpp:843 msgid "&Stop" msgstr "Detener" -#: modules/gui/qt/menus.cpp:846 +#: modules/gui/qt/menus.cpp:851 msgid "Pre&vious" msgstr "&Anterior" -#: modules/gui/qt/menus.cpp:852 +#: modules/gui/qt/menus.cpp:857 msgid "Ne&xt" msgstr "&Siguient" -#: modules/gui/qt/menus.cpp:870 +#: modules/gui/qt/menus.cpp:875 msgid "Sp&eed" msgstr "&Velocidat" -#: modules/gui/qt/menus.cpp:876 +#: modules/gui/qt/menus.cpp:881 msgid "&Faster" msgstr "Mas &rapido" -#: modules/gui/qt/menus.cpp:888 +#: modules/gui/qt/menus.cpp:893 msgid "N&ormal Speed" msgstr "Velocidat nor&malament" -#: modules/gui/qt/menus.cpp:898 +#: modules/gui/qt/menus.cpp:903 msgid "Slo&wer" msgstr "Mas &lento" -#: modules/gui/qt/menus.cpp:913 +#: modules/gui/qt/menus.cpp:918 msgid "&Jump Forward" msgstr "Blincar a2&debant" -#: modules/gui/qt/menus.cpp:920 +#: modules/gui/qt/menus.cpp:925 msgid "Jump Bac&kward" msgstr "Blincar at&rás" -#: modules/gui/qt/menus.cpp:927 +#: modules/gui/qt/menus.cpp:932 msgid "Ctrl+T" msgstr "Ctrl+T" -#: modules/gui/qt/menus.cpp:942 +#: modules/gui/qt/menus.cpp:947 msgid "Open &Network..." msgstr "Ubrir &ret..." -#: modules/gui/qt/menus.cpp:1036 +#: modules/gui/qt/menus.cpp:1041 msgid "Leave Fullscreen" msgstr "Abandonar pantalla completa" -#: modules/gui/qt/menus.cpp:1070 +#: modules/gui/qt/menus.cpp:1075 msgid "&Playback" msgstr "&Reproducción" -#: modules/gui/qt/menus.cpp:1175 +#: modules/gui/qt/menus.cpp:1180 msgid "&Hide VLC media player in taskbar" msgstr "" -#: modules/gui/qt/menus.cpp:1181 +#: modules/gui/qt/menus.cpp:1186 msgid "Sho&w VLC media player" msgstr "" -#: modules/gui/qt/menus.cpp:1192 +#: modules/gui/qt/menus.cpp:1197 msgid "&Open Media" msgstr "" -#: modules/gui/qt/menus.cpp:1622 +#: modules/gui/qt/menus.cpp:1627 msgid "&Clear" msgstr "&Borrar" -#: modules/gui/qt/menus.cpp:1630 +#: modules/gui/qt/menus.cpp:1635 msgid "&Renderer" msgstr "" -#: modules/gui/qt/menus.cpp:1634 +#: modules/gui/qt/menus.cpp:1639 msgid "" msgstr "" -#: modules/gui/qt/menus.cpp:1647 +#: modules/gui/qt/menus.cpp:1652 msgid "Scanning..." msgstr "" @@ -21363,10 +21367,18 @@ msgstr "Amuestra dialogos d'avisos y errors no importants" #: modules/gui/qt/qt.cpp:124 +msgid "Enable Dark Mode" +msgstr "" + +#: modules/gui/qt/qt.cpp:125 +msgid "Applies a dark theme to the style." +msgstr "" + +#: modules/gui/qt/qt.cpp:127 msgid "Activate the updates availability notification" msgstr "Activa a notificación de disponibilidat d'actualización" -#: modules/gui/qt/qt.cpp:125 +#: modules/gui/qt/qt.cpp:128 msgid "" "Activate the automatic notification of new versions of the software. It runs " "once every two weeks." @@ -21374,32 +21386,32 @@ "Activa a notificación automatica de nuevas versions d'o programa. S'executa " "una vegada cada dos semanas." -#: modules/gui/qt/qt.cpp:128 +#: modules/gui/qt/qt.cpp:131 msgid "Number of days between two update checks" msgstr "Numero de días entre dos buscas d'actualizacions" -#: modules/gui/qt/qt.cpp:130 +#: modules/gui/qt/qt.cpp:133 msgid "Ask for network policy at start" msgstr "Preguntar por a politica de ret en encetar" -#: modules/gui/qt/qt.cpp:132 +#: modules/gui/qt/qt.cpp:135 msgid "Save the recently played items in the menu" msgstr "Alzar os elementos reproducius en o menú" -#: modules/gui/qt/qt.cpp:134 +#: modules/gui/qt/qt.cpp:137 msgid "List of words separated by | to filter" msgstr "Lista de parolas separadas por | ta filtrar" -#: modules/gui/qt/qt.cpp:135 +#: modules/gui/qt/qt.cpp:138 msgid "" "Regular expression used to filter the recent items played in the player." msgstr "" -#: modules/gui/qt/qt.cpp:138 +#: modules/gui/qt/qt.cpp:141 msgid "Define the colors of the volume slider" msgstr "" -#: modules/gui/qt/qt.cpp:139 +#: modules/gui/qt/qt.cpp:142 msgid "" "Define the colors of the volume slider\n" "By specifying the 12 numbers separated by a ';'\n" @@ -21407,11 +21419,11 @@ "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255'" msgstr "" -#: modules/gui/qt/qt.cpp:144 +#: modules/gui/qt/qt.cpp:147 msgid "Selection of the starting mode and look" msgstr "" -#: modules/gui/qt/qt.cpp:145 +#: modules/gui/qt/qt.cpp:148 msgid "" "Start VLC with:\n" " - normal mode\n" @@ -21424,57 +21436,57 @@ "letras, carátulas...\n" "Vista minima: en modo minimo con controls limitaus." -#: modules/gui/qt/qt.cpp:151 +#: modules/gui/qt/qt.cpp:154 msgid "Show a controller in fullscreen mode" msgstr "Amuestra un controlador en modo pantalla completa" -#: modules/gui/qt/qt.cpp:152 +#: modules/gui/qt/qt.cpp:155 msgid "Embed the file browser in open dialog" msgstr "Embeber o navegador de fichers en o dialogo ubrir" -#: modules/gui/qt/qt.cpp:154 +#: modules/gui/qt/qt.cpp:157 msgid "Define which screen fullscreen goes" msgstr "Define que pantalla va a pantalla completa" -#: modules/gui/qt/qt.cpp:155 +#: modules/gui/qt/qt.cpp:158 msgid "Screennumber of fullscreen, instead of same screen where interface is." msgstr "" -#: modules/gui/qt/qt.cpp:158 +#: modules/gui/qt/qt.cpp:161 msgid "Load extensions on startup" msgstr "Cargar extensions en encetar" -#: modules/gui/qt/qt.cpp:159 +#: modules/gui/qt/qt.cpp:162 msgid "Automatically load the extensions module on startup." msgstr "" -#: modules/gui/qt/qt.cpp:162 +#: modules/gui/qt/qt.cpp:165 msgid "Start in minimal view (without menus)" msgstr "Encetar en vista minima (sin menús)" -#: modules/gui/qt/qt.cpp:164 +#: modules/gui/qt/qt.cpp:167 msgid "Display background cone or art" msgstr "Amostrar como de fondo u arte" -#: modules/gui/qt/qt.cpp:165 +#: modules/gui/qt/qt.cpp:168 msgid "" "Display background cone or current album art when not playing. Can be " "disabled to prevent burning screen." msgstr "" -#: modules/gui/qt/qt.cpp:168 +#: modules/gui/qt/qt.cpp:171 msgid "Expanding background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:169 +#: modules/gui/qt/qt.cpp:172 msgid "Background art fits window's size." msgstr "" -#: modules/gui/qt/qt.cpp:171 +#: modules/gui/qt/qt.cpp:174 msgid "Ignore keyboard volume buttons." msgstr "" -#: modules/gui/qt/qt.cpp:173 +#: modules/gui/qt/qt.cpp:176 msgid "" "With this option checked, the volume up, volume down and mute buttons on " "your keyboard will always change your system volume. With this option " @@ -21482,41 +21494,41 @@ "and change the system volume when VLC is not selected." msgstr "" -#: modules/gui/qt/qt.cpp:188 +#: modules/gui/qt/qt.cpp:191 msgid "When to raise the interface" msgstr "" -#: modules/gui/qt/qt.cpp:189 +#: modules/gui/qt/qt.cpp:192 msgid "" "This option allows the interface to be raised automatically when a video/" "audio playback starts, or never." msgstr "" -#: modules/gui/qt/qt.cpp:192 +#: modules/gui/qt/qt.cpp:195 msgid "Fullscreen controller mouse sensitivity" msgstr "" -#: modules/gui/qt/qt.cpp:200 +#: modules/gui/qt/qt.cpp:203 msgid "When minimized" msgstr "" -#: modules/gui/qt/qt.cpp:218 +#: modules/gui/qt/qt.cpp:221 msgid "Qt interface" msgstr "Interficie Qt" -#: modules/gui/qt/util/customwidgets.cpp:82 +#: modules/gui/qt/util/customwidgets.cpp:80 msgid "errors" msgstr "errors" -#: modules/gui/qt/util/customwidgets.cpp:83 +#: modules/gui/qt/util/customwidgets.cpp:81 msgid "warnings" msgstr "avisos" -#: modules/gui/qt/util/customwidgets.cpp:84 +#: modules/gui/qt/util/customwidgets.cpp:82 msgid "debug" msgstr "depurar" -#: modules/gui/qt/util/searchlineedit.cpp:49 +#: modules/gui/qt/util/searchlineedit.cpp:50 msgctxt "Tooltip|Clear" msgid "Clear" msgstr "" @@ -21619,72 +21631,76 @@ msgid "Open skin..." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:86 modules/hw/d3d9/d3d9_filters.c:68 +#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:68 #: modules/video_filter/adjust.c:61 msgid "Brightness threshold" msgstr "Branquil de brilo" -#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:69 +#: modules/hw/d3d11/d3d11_filters.c:88 modules/hw/d3d9/d3d9_filters.c:69 #: modules/video_filter/adjust.c:62 msgid "" "When this mode is enabled, pixels will be shown as black or white. The " "threshold value will be the brightness defined below." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:90 modules/hw/d3d9/d3d9_filters.c:72 +#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:72 #: modules/video_filter/adjust.c:65 msgid "Image contrast (0-2)" msgstr "Contraste d'imachen (0-2)" -#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:73 +#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:73 #: modules/video_filter/adjust.c:66 msgid "Set the image contrast, between 0 and 2. Defaults to 1." msgstr "Establir o contraste d'imachen, entre 0 y 2. Predeterminau a 1." -#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:74 +#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:74 msgid "Image hue (0-360)" msgstr "Color d'imachen (0-360)" -#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:75 +#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:75 msgid "Set the image hue, between 0 and 360. Defaults to 0." msgstr "Establir a color d'imachen, entre 0 y 360. Predeterminau a 0." -#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:76 +#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:76 #: modules/video_filter/adjust.c:69 msgid "Image saturation (0-3)" msgstr "Saturación d'imachen (0-3)" -#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:77 +#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:77 #: modules/video_filter/adjust.c:70 msgid "Set the image saturation, between 0 and 3. Defaults to 1." msgstr "Establir a saturación d'imachen, entre 0 y 3. Predeterminau a 1." -#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:78 +#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:78 #: modules/video_filter/adjust.c:71 msgid "Image brightness (0-2)" msgstr "Brilo d'imachen (0-2)" -#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:79 +#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:79 #: modules/video_filter/adjust.c:72 msgid "Set the image brightness, between 0 and 2. Defaults to 1." msgstr "Establir o brilo d'imachen, entre 0 y 2. Predeterminau a 1." -#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:80 +#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:80 #: modules/video_filter/adjust.c:73 msgid "Image gamma (0-10)" msgstr "Gamma d'imachen (0-10)" -#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:81 +#: modules/hw/d3d11/d3d11_filters.c:100 modules/hw/d3d9/d3d9_filters.c:81 #: modules/video_filter/adjust.c:74 msgid "Set the image gamma, between 0.01 and 10. Defaults to 1." msgstr "Establir a gamma d'imachen, entre 0.01 y 10. Predeterminau a 1." -#: modules/hw/d3d11/d3d11_filters.c:670 +#: modules/hw/d3d11/d3d11_filters.c:681 msgid "AMD VQ Enhancer" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:671 -msgid "amf_vqenhancer" +#: modules/hw/d3d11/d3d11_filters.c:687 +msgid "AMD Frame Rate Doubler" +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:690 +msgid "Show indicator" msgstr "" #: modules/hw/d3d9/d3d9_filters.c:454 @@ -22065,11 +22081,11 @@ msgid "System logger (syslog)" msgstr "" -#: modules/lua/extension.c:1194 +#: modules/lua/extension.c:1200 msgid "Extension not responding!" msgstr "" -#: modules/lua/extension.c:1195 +#: modules/lua/extension.c:1201 #, c-format msgid "" "Extension '%s' does not respond.\n" @@ -22097,8 +22113,8 @@ #: modules/lua/vlc.c:53 msgid "" -"Lua interface configuration string. Format is: '[\"\"] = {

For all the saving, converting, transcoding, encoding, muxing and " "streaming tasks, you should find useful information in the Streaming Documentation.

If you are unsure about terminology, please consult the knowledge base.

To understand the main keyboard shortcuts, read the shortcuts page.

Help

Before " -"asking any question, please refer yourself to the FAQ.

You might then get (and give) " -"help on the Forums, the mailing-lists or our IRC " -"channel (#videolan on irc.freenode.net).

Contribute to the " -"project

You can help the VideoLAN project giving some of your time to " -"help the community, to design skins, to translate the documentation, to test " -"and to code. You can also give funds and material to help us. And of course, " -"you can promote VLC media player.

" +"a>.

If you are unsure about terminology, please consult the knowledge base.

To " +"understand the main keyboard shortcuts, read the shortcuts page.

Help

Before asking " +"any question, please refer yourself to the FAQ.

You might then get (and give) help on the " +"Forums, the mailing-lists or our IRC channel " +"(#videolan on irc.freenode.net).

Contribute to the project

You can help the VideoLAN project giving some of your time to help the " +"community, to design skins, to translate the documentation, to test and to " +"code. You can also give funds and material to help us. And of course, you " +"can promote VLC media player.

" msgstr "" "

مرحبا بك في مساعدة مشغّل الوسائط " -"VLC

التوثيق

يمكنك العثور على توثيق VLC في موقع الويكي لِ‍ VideoLAN.

إن كنت حديث " -"العهد بِ‍ VLC، فرجاءً اقرأ

التوثيق

يمكنك العثور على توثيق VLC في موقع الويكي لِ‍ VideoLAN.

إن كنت حديث العهد " +"بِ‍ VLC، فرجاءً اقرأ
مقدّمة إلى مشغّل الوسائط VLC.

ستجد بعض " "المعلومات حول كيفية استخدام المشغّل في مستند
”طريقة تشغيل الملفات بمشغّل " @@ -625,8 +625,8 @@ "Documentation:Streaming_HowTo\">توثيق التدفقات كل ما تحتاج لمهام الحفظ، " "والتحويل، وتبديل الترميز، والترميز، والمزج والتدفق.

إن لم تكن متأكدا " "من المصطلحات فطالع قاعدة " -"المعرفة.

لفهم اختصارات لوحة المفاتيح الأساسية اقرأ صفحة الاختصارات.

المساعدة.

لفهم اختصارات لوحة المفاتيح الأساسية اقرأ صفحة الاختصارات.

المساعدة

رجاءً وقبل طرح أي سؤال طالع صفحة الأسئلة الشائعة.

بعدها يمكنك الحصول (وربما " "تقديم) المساعدة في المنتدى، أو $a: Artist
$b: Album
$c: Copyright
$t: Title
$g: " -"Genre
$n: Track num
$p: Now playing
$A: Date
$D: Duration
$Z: " -"\"Now playing\" (Fall back on Title - Artist)" +"This option allows you to set the title according to what's being played
" +"$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: Genre
$n: " +"Track num
$p: Now playing
$A: Date
$D: Duration
$Z: \"Now playing" +"\" (Fall back on Title - Artist)" msgstr "" "يسمح لك هذا الخيار بتعيين العنوان وفقا لما يتم تشغيلة
$a: الفنان
$b: " "الألبوم
$c: حقوق التأليف والنشر
$t: العنوان
$g: النوع
$n:رقم " -"المسار
$p: تشغيل الآن
$A: تاريخ
$D: مدة
$Z: \"التشغيل الآن\" " -"(تقع مرة أخرى على العنوان - الفنان)" +"المسار
$p: تشغيل الآن
$A: تاريخ
$D: مدة
$Z: \"التشغيل الآن" +"\" (تقع مرة أخرى على العنوان - الفنان)" #: src/libvlc-module.c:695 msgid "Disable all lua plugins" @@ -3618,7 +3617,7 @@ msgid "Tell VLC that it is being launched due to a file association in the OS" msgstr "أخبر VLC أنه يتم تشغيله بسبب ارتباط ملف في نظام التشغيل " -#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:547 +#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:554 msgid "Use only one instance when started from file manager" msgstr "استخدم سيرورة واحدة فقط عند البدء من مدير اللفات" @@ -3640,7 +3639,7 @@ "بأنه في حالات معينة (علل) يمكن أن يأخذ VLC كامل وقت المعالجة ويجعل النظام " "كله غير مستجيب ما يضطرك لإعادة إقلاع الجهاز." -#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:550 +#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:557 msgid "Enqueue items into playlist in one instance mode" msgstr "إدراج العناصر بقائمة الانتظار في قائمة التشغيل في وضع مثيل واحد" @@ -3670,35 +3669,37 @@ #: src/libvlc-module.c:1117 msgid "Automatically preparse items" -msgstr "" +msgstr "التحليل المسبق للإدخالات تلقائيًا" #: src/libvlc-module.c:1119 msgid "" "Automatically preparse items added to the playlist (to retrieve some " "metadata)." msgstr "" +"يقوم تلقائيًا بتحليل الإدخالات المضافة إلى قائمة التشغيل (لاسترداد بعض " +"البيانات التعريفية)." #: src/libvlc-module.c:1122 msgid "Preparsing timeout" -msgstr "" +msgstr "مهلة ما قبل التحليل" #: src/libvlc-module.c:1124 msgid "Maximum time allowed to preparse an item, in milliseconds" -msgstr "" +msgstr "الحد الأقصى للوقت المسموح به لإعداد عنصر، بالمللي ثانية" #: src/libvlc-module.c:1126 modules/gui/macosx/VLCSimplePrefsController.m:342 #: modules/gui/qt/dialogs/firstrun.cpp:95 -#: modules/gui/qt/ui/sprefs_interface.h:562 +#: modules/gui/qt/ui/sprefs_interface.h:569 msgid "Allow metadata network access" -msgstr "" +msgstr "السماح بالوصول إلى شبكة البيانات التعريفية" #: src/libvlc-module.c:1131 msgid "Collapse" -msgstr "" +msgstr "طي" #: src/libvlc-module.c:1131 msgid "Expand" -msgstr "" +msgstr "وسّع" #: src/libvlc-module.c:1133 msgid "Subdirectory behavior" @@ -3718,7 +3719,7 @@ #: src/libvlc-module.c:1140 msgid "Ignored extensions" -msgstr "" +msgstr "ملحقات تم تجاهلها" #: src/libvlc-module.c:1142 msgid "" @@ -3733,11 +3734,11 @@ #: src/libvlc-module.c:1147 msgid "Show hidden files" -msgstr "" +msgstr "أظهر الملفات المخفية" #: src/libvlc-module.c:1149 msgid "Ignore files starting with '.'" -msgstr "" +msgstr "تجاهل الملفات التي تبدأ بـ \".\"" #: src/libvlc-module.c:1151 msgid "Services discovery modules" @@ -3748,6 +3749,8 @@ "Specifies the services discovery modules to preload, separated by colons. " "Typical value is \"sap\"." msgstr "" +"يحدد وحدات اكتشاف الخدمات التي سيتم تحميلها مسبقًا، مفصولة بنقطتين. القيمة " +"النموذجية هي \"sap\"." #: src/libvlc-module.c:1156 msgid "Play files randomly forever" @@ -3815,13 +3818,13 @@ #: src/libvlc-module.c:1188 msgid "Pause on audio communication" -msgstr "" +msgstr "توقف مؤقتًا عن الاتصال الصوتي" #: src/libvlc-module.c:1190 msgid "" "If pending audio communication is detected, playback will be paused " "automatically." -msgstr "" +msgstr "إذا تم اكتشاف اتصال صوتي معلق، فسيتم إيقاف التشغيل مؤقتًا تلقائيًا." #: src/libvlc-module.c:1193 msgid "Use media library" @@ -3833,7 +3836,7 @@ "VLC." msgstr "تُحفظ مكتبة الوسائط ويُعاد تحميلها في كل مرة تبدأ فيها VLC." -#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:548 +#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:555 msgid "Display playlist tree" msgstr "اعرض شجرة قائمة التشغيل" @@ -3842,6 +3845,7 @@ "The playlist can use a tree to categorize some items, like the contents of a " "directory." msgstr "" +"يمكن لقائمة التشغيل استخدام شجرة لتصنيف بعض العناصر، مثل محتويات الدليل." #: src/libvlc-module.c:1209 msgid "These settings are the global VLC key bindings, known as \"hotkeys\"." @@ -3854,35 +3858,39 @@ #: src/libvlc-module.c:1214 msgid "Volume control" -msgstr "" +msgstr "التحكم في مستوى الصوت" #: src/libvlc-module.c:1215 msgid "Position control" -msgstr "" +msgstr "التحكم بالوضعية" #: src/libvlc-module.c:1215 msgid "Position control reversed" -msgstr "" +msgstr "تم عكس التحكم في الوضع" #: src/libvlc-module.c:1218 msgid "Mouse wheel vertical axis control" -msgstr "" +msgstr "التحكم بالمحور العمودي لعجلة الماوس" #: src/libvlc-module.c:1220 msgid "" "The mouse wheel vertical (up/down) axis can control volume, position or be " "ignored." msgstr "" +"يمكن للمحور الرأسي لعجلة الماوس (لأعلى/لأسفل) التحكم في مستوى الصوت أو " +"الموضع أو تجاهله." #: src/libvlc-module.c:1222 msgid "Mouse wheel horizontal axis control" -msgstr "" +msgstr "التحكم بالمحور الأفقي لعجلة الماوس" #: src/libvlc-module.c:1224 msgid "" "The mouse wheel horizontal (left/right) axis can control volume, position or " "be ignored." msgstr "" +"يمكن لمحور عجلة الماوس الأفقي (يسار/يمين) التحكم في مستوى الصوت أو الموضع أو " +"تجاهله." #: src/libvlc-module.c:1226 src/video_output/vout_intf.c:268 #: modules/gui/macosx/VLCControlsBarCommon.m:98 @@ -3956,11 +3964,11 @@ msgid "Select the hotkey to set the playback rate back to normal." msgstr "اختر مفتاح الاختصار لإرجاع معدّل التشغيل إلى طبيعته." -#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:884 +#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:889 msgid "Faster (fine)" msgstr "أسرع (قليلًا)" -#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:892 +#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:897 msgid "Slower (fine)" msgstr "أبطأ (قليلًا)" @@ -3971,7 +3979,7 @@ #: modules/gui/macosx/VLCMainMenu.m:396 modules/gui/macosx/VLCMainMenu.m:499 #: modules/gui/macosx/VLCMainMenu.m:507 #: modules/gui/qt/components/controller.hpp:112 -#: modules/gui/qt/dialogs/sout.cpp:93 modules/notify/notify.c:335 +#: modules/gui/qt/dialogs/sout.cpp:91 modules/notify/notify.c:335 #: modules/gui/qt/ui/streampanel.h:179 msgid "Next" msgstr "التالي" @@ -3998,7 +4006,7 @@ #: modules/gui/macosx/VLCMainMenu.m:498 modules/gui/macosx/VLCMainMenu.m:505 #: modules/gui/macosx/VLCMainWindowControlsBar.m:65 #: modules/gui/qt/components/controller.hpp:107 -#: modules/gui/qt/dialogs/vlm.cpp:544 modules/gui/qt/ui/streampanel.h:178 +#: modules/gui/qt/dialogs/vlm.cpp:538 modules/gui/qt/ui/streampanel.h:178 msgid "Stop" msgstr "أوقِف" @@ -4127,8 +4135,8 @@ #: src/libvlc-module.c:1293 modules/control/hotkeys.c:361 #: modules/gui/macosx/VLCStatusBarIcon.m:116 #: modules/gui/qt/components/controller.hpp:111 -#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:955 -#: modules/gui/qt/menus.cpp:1141 modules/gui/skins2/commands/cmd_quit.cpp:45 +#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:960 +#: modules/gui/qt/menus.cpp:1146 modules/gui/skins2/commands/cmd_quit.cpp:45 msgid "Quit" msgstr "أنهِ" @@ -4145,6 +4153,8 @@ "Select the key to move the selector up in DVD menus / Move viewpoint to up " "(pitch)." msgstr "" +"حدد المفتاح لتحريك المحدد لأعلى في قوائم DVD / حرك نقطة العرض لأعلى (درجة " +"الصوت)." #: src/libvlc-module.c:1297 msgid "Navigate down" @@ -4155,6 +4165,8 @@ "Select the key to move the selector down in DVD menus / Move viewpoint to " "down (pitch)." msgstr "" +"حدد المفتاح لتحريك المحدد لأسفل في قوائم DVD / حرك نقطة العرض لأسفل (درجة " +"الصوت)." #: src/libvlc-module.c:1299 msgid "Navigate left" @@ -4165,6 +4177,8 @@ "Select the key to move the selector left in DVD menus / Move viewpoint to " "left (yaw)." msgstr "" +"حدد المفتاح لتحريك المحدد إلى اليسار في قوائم DVD / نقل نقطة العرض إلى " +"اليسار (زاوية الإنعراج)." #: src/libvlc-module.c:1301 msgid "Navigate right" @@ -4175,6 +4189,8 @@ "Select the key to move the selector right in DVD menus / Move viewpoint to " "right (yaw)." msgstr "" +"حدد المفتاح لتحريك المحدد لليمين في قوائم DVD / حرك نقطة العرض إلى اليمين " +"(زاوية الإنعراج)." #: src/libvlc-module.c:1303 msgid "Activate" @@ -4190,7 +4206,7 @@ #: src/libvlc-module.c:1306 msgid "Select the key to take you to the DVD menu" -msgstr "" +msgstr "حدد المفتاح لينقلك إلى قائمة DVD" #: src/libvlc-module.c:1307 msgid "Select previous DVD title" @@ -4198,7 +4214,7 @@ #: src/libvlc-module.c:1308 msgid "Select the key to choose the previous title from the DVD" -msgstr "" +msgstr "حدد المفتاح لاختيار العنوان السابق من قرص DVD" #: src/libvlc-module.c:1309 msgid "Select next DVD title" @@ -4206,7 +4222,7 @@ #: src/libvlc-module.c:1310 msgid "Select the key to choose the next title from the DVD" -msgstr "" +msgstr "حدد المفتاح لاختيار العنوان التالي من قرص DVD" #: src/libvlc-module.c:1311 msgid "Select prev DVD chapter" @@ -4214,7 +4230,7 @@ #: src/libvlc-module.c:1312 msgid "Select the key to choose the previous chapter from the DVD" -msgstr "" +msgstr "حدد المفتاح لاختيار الفصل السابق من قرص DVD" #: src/libvlc-module.c:1313 msgid "Select next DVD chapter" @@ -4222,7 +4238,7 @@ #: src/libvlc-module.c:1314 msgid "Select the key to choose the next chapter from the DVD" -msgstr "" +msgstr "حدد المفتاح لاختيار الفصل التالي من قرص DVD" #: src/libvlc-module.c:1315 msgid "Volume up" @@ -4269,67 +4285,69 @@ #: src/libvlc-module.c:1325 msgid "Reset subtitles text scale" -msgstr "" +msgstr "إعادة ضبط مقياس نص الترجمة" #: src/libvlc-module.c:1326 msgid "Scale up subtitles text" -msgstr "" +msgstr "قم بتوسيع نطاق نص الترجمة" #: src/libvlc-module.c:1327 msgid "Scale down subtitles text" -msgstr "" +msgstr "تقليص نص الترجمة" #: src/libvlc-module.c:1328 msgid "Select the key to change subtitles text scaling" -msgstr "" +msgstr "حدد المفتاح لتغيير حجم نص الترجمة" #: src/libvlc-module.c:1329 msgid "Subtitle sync / bookmark audio timestamp" -msgstr "" +msgstr "مزامنة الترجمة / الطابع الزمني للصوت المرجعي" #: src/libvlc-module.c:1330 msgid "Select the key to bookmark audio timestamp when syncing subtitles." msgstr "" +"حدد المفتاح لوضع إشارة مرجعية على الطابع الزمني الصوتي عند مزامنة الترجمة." #: src/libvlc-module.c:1331 msgid "Subtitle sync / bookmark subtitle timestamp" -msgstr "" +msgstr "مزامنة الترجمة/الطابع الزمني للترجمة المرجعية" #: src/libvlc-module.c:1332 msgid "Select the key to bookmark subtitle timestamp when syncing subtitles." msgstr "" +"حدد المفتاح لوضع إشارة مرجعية على الطابع الزمني للترجمة عند مزامنة الترجمات." #: src/libvlc-module.c:1333 msgid "Subtitle sync / synchronize audio & subtitle timestamps" -msgstr "" +msgstr "مزامنة الترجمة / مزامنة الطوابع الزمنية للصوت والترجمة" #: src/libvlc-module.c:1334 msgid "Select the key to synchronize bookmarked audio & subtitle timestamps." -msgstr "" +msgstr "حدد المفتاح لمزامنة الطوابع الزمنية للصوت والترجمة المرجعية." #: src/libvlc-module.c:1335 msgid "Subtitle sync / reset audio & subtitle synchronization" -msgstr "" +msgstr "مزامنة الترجمة / إعادة ضبط مزامنة الصوت والترجمة" #: src/libvlc-module.c:1336 msgid "Select the key to reset synchronization of audio & subtitle timestamps." -msgstr "" +msgstr "حدد المفتاح لإعادة ضبط مزامنة الطوابع الزمنية للصوت والترجمة." #: src/libvlc-module.c:1337 msgid "Subtitle position up" -msgstr "" +msgstr "موضع الترجمة لأعلى" #: src/libvlc-module.c:1338 msgid "Select the key to move subtitles higher." -msgstr "" +msgstr "حدد المفتاح لنقل الترجمة إلى أعلى." #: src/libvlc-module.c:1339 msgid "Subtitle position down" -msgstr "" +msgstr "موضع الترجمة لأسفل" #: src/libvlc-module.c:1340 msgid "Select the key to move subtitles lower." -msgstr "" +msgstr "حدد المفتاح لتحريك الترجمة إلى الأسفل." #: src/libvlc-module.c:1341 msgid "Audio delay up" @@ -4436,7 +4454,7 @@ msgstr "اختر المفتاح الساخن الذي يضبط علامة قائمة التشغيل هذه." #: src/libvlc-module.c:1373 -#: modules/gui/qt/components/playlist/standardpanel.cpp:246 +#: modules/gui/qt/components/playlist/standardpanel.cpp:247 msgid "Clear the playlist" msgstr "امسح قائمة التشغيل" @@ -4498,11 +4516,11 @@ #: src/libvlc-module.c:1391 msgid "Cycle subtitle track in reverse order" -msgstr "" +msgstr "قم بتدوير مسار الترجمة بترتيب عكسي" #: src/libvlc-module.c:1392 msgid "Cycle through the available subtitle tracks in reverse order." -msgstr "" +msgstr "قم بالتنقل عبر مسارات الترجمة المتوفرة بترتيب عكسي." #: src/libvlc-module.c:1393 msgid "Cycle subtitle track" @@ -4514,27 +4532,27 @@ #: src/libvlc-module.c:1395 msgid "Toggle subtitles" -msgstr "" +msgstr "تبديل الترجمة" #: src/libvlc-module.c:1396 msgid "Toggle subtitle track visibility." -msgstr "" +msgstr "تبديل رؤية مسار الترجمة." #: src/libvlc-module.c:1397 msgid "Cycle next program Service ID" -msgstr "" +msgstr "دورة معرف خدمة البرنامج التالي" #: src/libvlc-module.c:1398 msgid "Cycle through the available next program Service IDs (SIDs)." -msgstr "" +msgstr "التنقل عبر معرفات خدمة البرنامج التالي المتوفرة (SIDs)." #: src/libvlc-module.c:1399 msgid "Cycle previous program Service ID" -msgstr "" +msgstr "دورة معرف خدمة البرنامج السابق" #: src/libvlc-module.c:1400 msgid "Cycle through the available previous program Service IDs (SIDs)." -msgstr "" +msgstr "التنقل عبر معرفات خدمة البرنامج السابقة المتوفرة (SIDs)." #: src/libvlc-module.c:1401 msgid "Cycle source aspect ratio" @@ -4554,27 +4572,27 @@ #: src/libvlc-module.c:1405 msgid "Toggle autoscaling" -msgstr "" +msgstr "تبديل القياس التلقائي" #: src/libvlc-module.c:1406 msgid "Activate or deactivate autoscaling." -msgstr "" +msgstr "تنشيط أو إلغاء تنشيط القياس التلقائي." #: src/libvlc-module.c:1407 msgid "Increase scale factor" -msgstr "" +msgstr "زيادة عامل الحجم" #: src/libvlc-module.c:1409 msgid "Decrease scale factor" -msgstr "" +msgstr "تقليل عامل الحجم" #: src/libvlc-module.c:1411 msgid "Toggle deinterlacing" -msgstr "" +msgstr "تبديل التشابك" #: src/libvlc-module.c:1412 msgid "Activate or deactivate deinterlacing." -msgstr "" +msgstr "تنشيط أو إلغاء تنشيط التشابك." #: src/libvlc-module.c:1413 msgid "Cycle deinterlace modes" @@ -4582,7 +4600,7 @@ #: src/libvlc-module.c:1414 msgid "Cycle through available deinterlace modes." -msgstr "" +msgstr "قم بالتنقل عبر أوضاع التشابك المتاحة." #: src/libvlc-module.c:1415 msgid "Show controller in fullscreen" @@ -4614,7 +4632,7 @@ #: src/libvlc-module.c:1423 modules/gui/macosx/VLCMainMenu.m:387 #: modules/gui/qt/components/controller.hpp:110 -#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:858 +#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:863 #: modules/stream_out/record.c:60 msgid "Record" msgstr "سجّل" @@ -4625,15 +4643,15 @@ #: src/libvlc-module.c:1426 msgid "Normal/Loop/Repeat" -msgstr "" +msgstr "عادي/حلقة/تكرار" #: src/libvlc-module.c:1427 msgid "Toggle Normal/Loop/Repeat playlist modes" -msgstr "" +msgstr "تبديل أوضاع قائمة التشغيل العادية/الدورانية/التكرارية" #: src/libvlc-module.c:1430 msgid "Toggle random playlist playback" -msgstr "" +msgstr "تبديل تشغيل قائمة التشغيل العشوائية" #: src/libvlc-module.c:1435 src/libvlc-module.c:1436 msgid "Un-Zoom" @@ -4657,7 +4675,7 @@ #: src/libvlc-module.c:1448 src/libvlc-module.c:1449 msgid "Crop one pixel from the bottom of the video" -msgstr "" +msgstr "قم بقص بكسل واحد من أسفل الفيديو" #: src/libvlc-module.c:1450 src/libvlc-module.c:1451 msgid "Uncrop one pixel from the bottom of the video" @@ -4673,35 +4691,35 @@ #: src/libvlc-module.c:1459 msgid "Shrink the viewpoint field of view (360°)" -msgstr "" +msgstr "تقليص مجال الرؤية (360 درجة)" #: src/libvlc-module.c:1460 msgid "Expand the viewpoint field of view (360°)" -msgstr "" +msgstr "قم بتوسيع مجال الرؤية (360 درجة)" #: src/libvlc-module.c:1461 msgid "Roll the viewpoint clockwise (360°)" -msgstr "" +msgstr "قم بتدوير نقطة الرؤية في اتجاه عقارب الساعة (360 درجة)" #: src/libvlc-module.c:1462 msgid "Roll the viewpoint anti-clockwise (360°)" -msgstr "" +msgstr "قم بتدوير نقطة الرؤية عكس اتجاه عقارب الساعة (360 درجة)" #: src/libvlc-module.c:1464 msgid "Toggle wallpaper mode in video output" -msgstr "" +msgstr "تبديل وضع الخلفية في إخراج الفيديو" #: src/libvlc-module.c:1466 msgid "Toggle wallpaper mode in video output." -msgstr "" +msgstr "تبديل وضع الخلفية في إخراج الفيديو." #: src/libvlc-module.c:1468 msgid "Cycle through audio devices" -msgstr "" +msgstr "التنقل بين الأجهزة الصوتية" #: src/libvlc-module.c:1469 msgid "Cycle through available audio devices" -msgstr "" +msgstr "التنقل بين أجهزة الصوت المتاحة" #: src/libvlc-module.c:1598 src/video_output/vout_intf.c:274 #: modules/gui/macosx/VLCMainMenu.m:434 modules/gui/macosx/VLCMainMenu.m:512 @@ -4774,7 +4792,7 @@ msgid "Special modules" msgstr "الوحدات الخاصة " -#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:90 +#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:89 msgid "Plugins" msgstr "الإضافات" @@ -4784,7 +4802,7 @@ #: src/libvlc-module.c:2061 msgid "Clock source" -msgstr "" +msgstr "مصدر الساعة" #: src/libvlc-module.c:2179 msgid "Hot keys" @@ -4825,10 +4843,12 @@ "print help on a specific module (can be combined with --advanced and --help-" "verbose). Prefix the module name with = for strict matches." msgstr "" +"تعليمات الطباعة على وحدة نمطية محددة (يمكن دمجها مع --advanced و --help-" +"verbose). ضع بادئة اسم الوحدة بـ = للمطابقات الصارمة." #: src/libvlc-module.c:2771 msgid "no configuration option will be loaded nor saved to config file" -msgstr "" +msgstr "لن يتم تحميل أي خيار تكوين أو حفظه في ملف التكوين" #: src/libvlc-module.c:2773 msgid "reset the current config to the default values" @@ -4848,7 +4868,7 @@ #: src/libvlc-module.c:2819 msgid "core program" -msgstr "" +msgstr "البرنامج الأساسي" #: src/misc/actions.c:52 msgid "Backspace" @@ -5041,7 +5061,7 @@ msgid "Media View" msgstr "عرض الوسائط" -#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:568 +#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:577 msgid "Menu" msgstr "القائمة" @@ -5074,8 +5094,8 @@ #: modules/gui/macosx/VLCFSPanelController.m:251 #: modules/gui/macosx/VLCMainMenu.m:1346 modules/gui/macosx/VLCMainMenu.m:1347 #: modules/gui/macosx/VLCMainMenu.m:1348 -#: modules/gui/qt/components/playlist/standardpanel.cpp:196 -#: modules/gui/qt/menus.cpp:832 +#: modules/gui/qt/components/playlist/standardpanel.cpp:197 +#: modules/gui/qt/menus.cpp:837 msgid "Pause" msgstr "ألبِث" @@ -5154,7 +5174,7 @@ #: src/misc/update.c:488 #, c-format msgid "% B" -msgstr "" +msgstr "% ب" #: src/misc/update.c:580 msgid "Saving file failed" @@ -5166,7 +5186,7 @@ msgstr "فشل فتح ”%s“ للقراءة." #: src/misc/update.c:596 src/misc/update.c:726 modules/access/dvb/scan.c:826 -#: modules/demux/avi/avi.c:2827 +#: modules/demux/avi/avi.c:2878 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:513 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:571 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:854 @@ -5191,10 +5211,10 @@ #: modules/gui/macosx/VLCVideoEffectsWindowController.m:791 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:860 #: modules/gui/macosx/prefs.m:189 -#: modules/gui/qt/components/open_panels.cpp:1381 -#: modules/gui/qt/components/preferences_widgets.cpp:1416 +#: modules/gui/qt/components/open_panels.cpp:1361 +#: modules/gui/qt/components/preferences_widgets.cpp:1420 #: modules/gui/qt/components/sout/profile_selector.cpp:452 -#: modules/gui/qt/dialogs/sout.cpp:92 +#: modules/gui/qt/dialogs/sout.cpp:90 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "Cancel" msgstr "ألغِ" @@ -5218,6 +5238,8 @@ "It was not possible to download a cryptographic signature for the downloaded " "file \"%s\". Thus, it was deleted." msgstr "" +"لم يكن من الممكن تنزيل توقيع التشفير للملف الذي تم تنزيله \"%s\". ولذا، تم " +"حذفه." #: src/misc/update.c:661 src/misc/update.c:673 msgid "Invalid signature" @@ -5229,6 +5251,8 @@ "The cryptographic signature for the downloaded file \"%s\" was invalid and " "could not be used to securely verify it. Thus, the file was deleted." msgstr "" +"كان التوقيع المشفر للملف الذي تم تنزيله \"%s\" غير صالح ولا يمكن استخدامه " +"للتحقق منه بشكل آمن. ولذا، تم حذف الملف." #: src/misc/update.c:686 msgid "File not verifiable" @@ -5240,6 +5264,8 @@ "It was not possible to securely verify the downloaded file \"%s\". Thus, it " "was deleted." msgstr "" +"لم يكن من الممكن التحقق بشكل آمن من الملف الذي تم تنزيله \"%s\". ولذا، تم " +"حذفه." #: src/misc/update.c:698 src/misc/update.c:710 msgid "File corrupted" @@ -5501,7 +5527,7 @@ #: src/text/iso-639_def.h:97 msgid "Interlingue" -msgstr "" +msgstr "الغربية" #: src/text/iso-639_def.h:98 msgid "Interlingua" @@ -5529,7 +5555,7 @@ #: src/text/iso-639_def.h:105 msgid "Greenlandic, Kalaallisut" -msgstr "" +msgstr "جرينلاند، كالاليسوت" #: src/text/iso-639_def.h:106 msgid "Kannada" @@ -5681,7 +5707,7 @@ #: src/text/iso-639_def.h:143 msgid "Occitan; Provençal" -msgstr "" +msgstr "الأوكيتانية. بروفنسال" #: src/text/iso-639_def.h:144 msgid "Oriya" @@ -5933,7 +5959,7 @@ #: src/video_output/vout_intf.c:169 msgid "Autoscale video" -msgstr "" +msgstr "مقياس تلقائي للفيديو" #: src/video_output/vout_intf.c:203 modules/gui/macosx/VLCMainMenu.m:439 #: modules/gui/macosx/VLCMainMenu.m:440 @@ -5955,6 +5981,8 @@ "Pass alsa:// to open the default ALSA capture device, or alsa://SOURCE to " "open a specific device named SOURCE." msgstr "" +"قم بتمرير alsa:// لفتح جهاز التقاط ALSA الافتراضي، أو alsa://SOURCE لفتح " +"جهاز محدد يسمى SOURCE." #: modules/access/alsa.c:49 msgid "192000 Hz" @@ -6014,7 +6042,7 @@ #: modules/access/alsa.c:57 msgid "ALSA audio capture" -msgstr "" +msgstr "ALSA التقاط الصوت" #: modules/access/attachment.c:44 msgid "Attachment" @@ -6022,44 +6050,48 @@ #: modules/access/attachment.c:45 msgid "Attachment input" -msgstr "" +msgstr "مدخلات المرفقات" #: modules/access/avaudiocapture.m:212 msgid "No Audio Input device found" -msgstr "" +msgstr "لم يتم العثور على جهاز إدخال الصوت" #: modules/access/avaudiocapture.m:213 msgid "" "Your Mac does not seem to be equipped with a suitable audio input device." "Please check your connectors and drivers." msgstr "" +"يبدو أن جهاز Mac الخاص بك غير مزود بجهاز إدخال صوتي مناسب. يرجى التحقق من " +"الموصلات وبرامج التشغيل لديك." #: modules/access/avaudiocapture.m:236 modules/access/avcapture.m:434 #: modules/access/disc_helper.h:56 msgid "Problem accessing a system resource" -msgstr "" +msgstr "مشكلة في الوصول إلى مورد النظام" #: modules/access/avaudiocapture.m:237 msgid "" "Please open \"System Preferences\" -> \"Security & Privacy\" and allow VLC " "to access your microphone." msgstr "" +"يرجى فتح \"تفضيلات النظام\" -> \"الأمان والخصوصية\" والسماح لـ VLC بالوصول " +"إلى الميكروفون الخاص بك." #: modules/access/avaudiocapture.m:341 msgid "AVFoundation Audio Capture" -msgstr "" +msgstr "AVFoundation التقاط الصوت" #: modules/access/avaudiocapture.m:342 msgid "AVFoundation audio capture module." -msgstr "" +msgstr "وحدة التقاط الصوت AVFoundation." #: modules/access/avcapture.m:66 msgid "AVFoundation Video Capture" -msgstr "" +msgstr "AVFoundation التقاط الفيديو" #: modules/access/avcapture.m:67 msgid "AVFoundation video capture module." -msgstr "" +msgstr "وحدة التقاط الفيديو AVFoundation." #: modules/access/avcapture.m:376 modules/access/avcapture.m:406 msgid "No video devices found" @@ -6070,26 +6102,32 @@ "Your Mac does not seem to be equipped with a suitable video input device. " "Please check your connectors and drivers." msgstr "" +"يبدو أن جهاز Mac الخاص بك غير مزود بجهاز إدخال فيديو مناسب. يرجى التحقق من " +"الموصلات وبرامج التشغيل الخاصة بك." #: modules/access/avcapture.m:407 msgid "" "Your Mac does not seem to be equipped with a suitable input device. Please " "check your connectors and drivers." msgstr "" +"يبدو أن جهاز Mac الخاص بك غير مزود بجهاز إدخال مناسب. يرجى التحقق من " +"الموصلات وبرامج التشغيل الخاصة بك." #: modules/access/avcapture.m:435 msgid "" "Please open \"System Preferences\" -> \"Security & Privacy\" and allow VLC " "to access your camera." msgstr "" +"يرجى فتح \"تفضيلات النظام\" -> \"الأمان والخصوصية\" والسماح لبرنامج VLC " +"بالوصول إلى الكاميرا الخاصة بك." #: modules/access/avio.h:33 msgid "AVIO" -msgstr "" +msgstr "AVIO" #: modules/access/avio.h:34 msgid "libavformat AVIO access" -msgstr "" +msgstr "الوصول الى libavformat AVIO" #: modules/access/avio.h:44 msgid "libavformat AVIO access output" @@ -6123,56 +6161,56 @@ msgid "Blu-ray Disc support (libbluray)" msgstr "دعم أسطوانات بلو-ري (libbluray)" -#: modules/access/bluray.c:849 +#: modules/access/bluray.c:847 msgid "Path doesn't appear to be a Blu-ray" msgstr "لا يبدو المسار مسار بلو-ري" -#: modules/access/bluray.c:864 +#: modules/access/bluray.c:862 msgid "" "This Blu-ray Disc needs a library for AACS decoding, and your system does " "not have it." msgstr "" "تحتاج أسطوانة بلو-ري هذه مكتبة لفكّ ترميز AACS، والنظام لديك لا يحتويها." -#: modules/access/bluray.c:870 +#: modules/access/bluray.c:868 msgid "Blu-ray Disc is corrupted." msgstr "أسطوانة بلو-ري تالفة." -#: modules/access/bluray.c:872 +#: modules/access/bluray.c:870 msgid "Missing AACS configuration file!" -msgstr "" +msgstr "ملف تكوين AACS مفقود!" -#: modules/access/bluray.c:874 +#: modules/access/bluray.c:872 msgid "No valid processing key found in AACS config file." -msgstr "" +msgstr "لم يتم العثور على مفتاح معالجة صالح في ملف تكوين AACS." -#: modules/access/bluray.c:876 +#: modules/access/bluray.c:874 msgid "No valid host certificate found in AACS config file." -msgstr "" +msgstr "لم يتم العثور على شهادة مضيف صالحة في ملف تكوين AACS." -#: modules/access/bluray.c:878 +#: modules/access/bluray.c:876 msgid "AACS Host certificate revoked." msgstr "أُلغيت شهادة المضيف AACS." -#: modules/access/bluray.c:880 +#: modules/access/bluray.c:878 msgid "AACS MMC failed." msgstr "فشل AACS MMC." -#: modules/access/bluray.c:890 +#: modules/access/bluray.c:888 msgid "" "This Blu-ray Disc needs a library for BD+ decoding, and your system does not " "have it." msgstr "تحتاج أسطوانة بلو-ري هذه مكتبة لفكّ ترميز BD+‎، والنظام لديك لا يحتويها." -#: modules/access/bluray.c:893 +#: modules/access/bluray.c:891 msgid "Your system BD+ decoding library does not work. Missing configuration?" -msgstr "" +msgstr "مكتبة فك تشفير BD+ الخاصة بنظامك لا تعمل. تكوين مفقود؟" -#: modules/access/bluray.c:926 +#: modules/access/bluray.c:924 msgid "Java required" msgstr "جاڤا مطلوب" -#: modules/access/bluray.c:927 +#: modules/access/bluray.c:925 #, c-format msgid "" "This Blu-ray disc requires Java for menus support.%s\n" @@ -6181,26 +6219,26 @@ "تتطلب أسطوانة بلو-ري هذه «جاڤا» لدعم القوائم.%s\n" "ستُشغّل الأسطوانة دون قوائم." -#: modules/access/bluray.c:928 +#: modules/access/bluray.c:926 msgid "Java was not found on your system." msgstr "لم يُعثر على «جاڤا» في النظام." -#: modules/access/bluray.c:951 +#: modules/access/bluray.c:949 msgid "Failed to start bluray playback. Please try without menu support." -msgstr "" +msgstr "فشل في بدء تشغيل بلوراي. يرجى المحاولة بدون دعم القائمة." -#: modules/access/bluray.c:992 modules/access/bluray.c:2825 -#: modules/access/bluray.c:2830 +#: modules/access/bluray.c:990 modules/access/bluray.c:2823 +#: modules/access/bluray.c:2828 msgid "Blu-ray error" msgstr "خطأ في بلو-ري" -#: modules/access/bluray.c:2115 +#: modules/access/bluray.c:2113 msgid "Top Menu" -msgstr "" +msgstr "القائمة العلوية" -#: modules/access/bluray.c:2118 +#: modules/access/bluray.c:2116 msgid "First Play" -msgstr "" +msgstr "التشغيل الأول" #: modules/access/cdda.c:716 #, c-format @@ -6225,9 +6263,8 @@ msgstr "" #: modules/access/cdda.c:1023 -#, fuzzy msgid "Address of the musicbrainz server to use." -msgstr "عنوان خادوم CDDB المطلوب استخدامه." +msgstr "" #: modules/access/cdda.c:1025 msgid "CDDB Server" @@ -6247,19 +6284,19 @@ #: modules/access/concat.c:303 msgid "Inputs list" -msgstr "" +msgstr "قائمة المدخلات" #: modules/access/concat.c:305 msgid "Comma-separated list of input URLs to concatenate." -msgstr "" +msgstr "قائمة مفصولة بفواصل لعناوين URL المدخلة للتسلسل." #: modules/access/concat.c:308 msgid "Concatenation" -msgstr "" +msgstr "سلسلة" #: modules/access/concat.c:309 msgid "Concatenated inputs" -msgstr "" +msgstr "المدخلات المتسلسلة" #: modules/access/dc1394.c:51 msgid "DC1394" @@ -6267,15 +6304,15 @@ #: modules/access/dc1394.c:52 msgid "IIDC Digital Camera (FireWire) input" -msgstr "" +msgstr "إدخال الكاميرا الرقمية IIDC (FireWire)." #: modules/access/dcp/dcp.cpp:43 msgid "KDM file" -msgstr "" +msgstr "ملف KDM" #: modules/access/dcp/dcp.cpp:44 msgid "Path to Key Delivery Message XML file" -msgstr "" +msgstr "المسار إلى ملف XML لرسالة تسليم المفتاح" #: modules/access/dcp/dcp.cpp:77 msgid "DCP" @@ -6283,37 +6320,43 @@ #: modules/access/dcp/dcp.cpp:79 msgid "Digital Cinema Package module" -msgstr "" +msgstr "وحدة حزمة السينما الرقمية" #: modules/access/decklink.cpp:49 msgid "Input card to use" -msgstr "" +msgstr "بطاقة الإدخال المراد استخدامها" #: modules/access/decklink.cpp:51 msgid "" "DeckLink capture card to use, if multiple exist. The cards are numbered from " "0." msgstr "" +"بطاقة التقاط DeckLink للاستخدام، في حالة وجود نسخ متعددة. يتم ترقيم البطاقات " +"من 0." #: modules/access/decklink.cpp:54 msgid "Desired input video mode. Leave empty for autodetection." -msgstr "" +msgstr "وضع إدخال الفيديو المطلوب. اتركه فارغًا للاكتشاف التلقائي." #: modules/access/decklink.cpp:56 msgid "" "Desired input video mode for DeckLink captures. This value should be a " "FOURCC code in textual form, e.g. \"ntsc\"." msgstr "" +"وضع إدخال الفيديو المطلوب لالتقاط DeckLink. يجب أن تكون هذه القيمة رمز " +"FOURCC على شكل نصي، على سبيل المثال. \"ntsc\"." #: modules/access/decklink.cpp:60 modules/video_output/decklink.cpp:100 msgid "Audio connection" -msgstr "" +msgstr "اتصال صوتي" #: modules/access/decklink.cpp:62 msgid "" "Audio connection to use for DeckLink captures. Valid choices: embedded, " "aesebu, analog. Leave blank for card default." msgstr "" +"اتصال صوتي لاستخدامه في التقاط DeckLink. الاختيارات الصالحة: مضمن، aesebu، " +"التناظرية. اتركه فارغًا للبطاقة الافتراضية." #: modules/access/decklink.cpp:66 modules/demux/rawaud.c:43 #: modules/video_output/decklink.cpp:105 @@ -6324,6 +6367,8 @@ msgid "" "Audio sampling rate (in hertz) for DeckLink captures. 0 disables audio input." msgstr "" +"معدل أخذ العينات الصوتية (بالهرتز) لالتقاط DeckLink. قيمة 0 لتعطيل إدخال " +"الصوت." #: modules/access/decklink.cpp:71 modules/access/dshow/dshow.cpp:197 #: modules/video_output/decklink.cpp:110 @@ -6335,16 +6380,20 @@ "Number of input audio channels for DeckLink captures. Must be 2, 8 or 16. 0 " "disables audio input." msgstr "" +"عدد قنوات الصوت المدخلة لالتقاط DeckLink. يجب أن يكون 2 أو 8 أو 16. 0 يعطل " +"إدخال الصوت." #: modules/access/decklink.cpp:76 modules/video_output/decklink.cpp:115 msgid "Video connection" -msgstr "" +msgstr "اتصال الفيديو" #: modules/access/decklink.cpp:78 msgid "" "Video connection to use for DeckLink captures. Valid choices: sdi, hdmi, " "opticalsdi, component, composite, svideo. Leave blank for card default." msgstr "" +"اتصال فيديو لاستخدامه في التقاط DeckLink. الخيارات الصالحة: sdi، hdmi، " +"Opticalsdi، Component، Composite، svideo. اتركه فارغًا للبطاقة الافتراضية." #: modules/access/decklink.cpp:87 modules/access/linsys/linsys_sdi.c:94 msgid "SDI" @@ -6368,7 +6417,7 @@ #: modules/access/decklink.cpp:87 msgid "S-Video" -msgstr "" +msgstr "S-Video" #: modules/access/decklink.cpp:94 msgid "Embedded" @@ -6388,19 +6437,19 @@ #: modules/access/decklink.cpp:102 msgid "DeckLink" -msgstr "" +msgstr "DeckLink" #: modules/access/decklink.cpp:103 msgid "Blackmagic DeckLink SDI input" -msgstr "" +msgstr "مدخل Blackmagic DeckLink SDI" #: modules/access/decklink.cpp:123 modules/video_output/decklink.cpp:119 msgid "10 bits" msgstr "10 بيتات" -#: modules/access/decklink.cpp:358 modules/demux/ty.c:769 +#: modules/access/decklink.cpp:358 modules/demux/ty.c:783 msgid "Closed captions 1" -msgstr "" +msgstr "التسميات التوضيحية المغلقة 1" #: modules/access/disc_helper.h:57 msgid "" @@ -6408,6 +6457,9 @@ "Preferences\" -> \"Security & Privacy\" and allow VLC to access your " "external media in \"Files and Folders\" section." msgstr "" +"من المحتمل أن نظام التشغيل macOS يمنع الوصول إلى القرص الخاص بك. يرجى فتح " +"\"تفضيلات النظام\" -> \"الأمان والخصوصية\" والسماح لـ VLC بالوصول إلى " +"الوسائط الخارجية الخاصة بك في قسم \"الملفات والمجلدات\"." #: modules/access/dshow/dshow.cpp:92 msgid "Cable" @@ -6434,7 +6486,7 @@ msgstr "DSS" #: modules/access/dshow/dshow.cpp:130 -#: modules/gui/qt/components/open_panels.cpp:838 +#: modules/gui/qt/components/open_panels.cpp:818 msgid "Video device name" msgstr "اسم جهاز الڤديو" @@ -6447,8 +6499,8 @@ "الجهاز المبدئي." #: modules/access/dshow/dshow.cpp:135 -#: modules/gui/qt/components/open_panels.cpp:846 -#: modules/gui/qt/components/open_panels.cpp:1067 +#: modules/gui/qt/components/open_panels.cpp:826 +#: modules/gui/qt/components/open_panels.cpp:1047 msgid "Audio device name" msgstr "اسم جهاز الصوت" @@ -6457,9 +6509,11 @@ "Name of the audio device that will be used by the DirectShow plugin. If you " "don't specify anything, the default device will be used." msgstr "" +"اسم جهاز الصوت الذي سيتم استخدامه بواسطة البرنامج الإضافي DirectShow. إذا لم " +"تحدد أي شيء، فسيتم استخدام الجهاز الافتراضي." #: modules/access/dshow/dshow.cpp:140 -#: modules/gui/qt/components/open_panels.cpp:813 +#: modules/gui/qt/components/open_panels.cpp:793 msgid "Video size" msgstr "حجم الڤديو" @@ -6469,18 +6523,23 @@ "don't specify anything the default size for your device will be used. You " "can specify a standard size (cif, d1, ...) or x." msgstr "" +"حجم الفيديو الذي سيتم عرضه بواسطة البرنامج المساعد DirectShow. إذا لم تحدد " +"أي شيء، فسيتم استخدام الحجم الافتراضي لجهازك. يمكنك تحديد حجم قياسي (cif، " +"d1، ...) أو x." #: modules/access/dshow/dshow.cpp:145 modules/access/v4l2/v4l2.c:196 msgid "Picture aspect-ratio n:m" -msgstr "" +msgstr "نسبة أبعاد الصورة n:m" #: modules/access/dshow/dshow.cpp:146 modules/access/v4l2/v4l2.c:197 msgid "Define input picture aspect-ratio to use. Default is 4:3" msgstr "" +"تحديد نسبة العرض إلى الارتفاع لصورة الإدخال المراد استخدامها. الافتراضي هو " +"4:3" #: modules/access/dshow/dshow.cpp:147 modules/access/v4l2/v4l2.c:53 msgid "Video input chroma format" -msgstr "" +msgstr "تنسيق كروما لإدخال الفيديو" #: modules/access/dshow/dshow.cpp:149 msgid "" @@ -6499,6 +6558,8 @@ "Force the DirectShow video input to use a specific frame rate (eg. 0 means " "default, 25, 29.97, 50, 59.94, etc.)" msgstr "" +"فرض إدخال فيديو DirectShow لاستخدام معدل إطارات محدد (على سبيل المثال، 0 " +"يعني الافتراضي، 25، 29.97، 50، 59.94، وما إلى ذلك)" #: modules/access/dshow/dshow.cpp:155 msgid "Device properties" @@ -6527,17 +6588,17 @@ #: modules/access/dshow/dshow.cpp:166 msgid "Tuner Frequency" -msgstr "" +msgstr "تردد الموالف" #: modules/access/dshow/dshow.cpp:167 msgid "This overrides the channel. Measured in Hz." -msgstr "" +msgstr "وهذا يتجاوز القناة. تقاس بالهرتز." #: modules/access/dshow/dshow.cpp:168 -#: modules/gui/qt/components/open_panels.cpp:866 -#: modules/gui/qt/components/open_panels.cpp:1087 +#: modules/gui/qt/components/open_panels.cpp:846 +#: modules/gui/qt/components/open_panels.cpp:1067 msgid "Video standard" -msgstr "" +msgstr "معيار الفيديو" #: modules/access/dshow/dshow.cpp:169 msgid "Tuner country code" @@ -6570,6 +6631,10 @@ "\"Device config\" area, and use those numbers here. -1 means that settings " "will not be changed." msgstr "" +"حدد مصدر إدخال الفيديو، مثل الفيديو المركب أو s-video أو الموالف. نظرًا لأن " +"هذه الإعدادات خاصة بالأجهزة، فيجب عليك العثور على إعدادات جيدة في منطقة " +"\"تكوين الجهاز\"، واستخدام هذه الأرقام هنا. -1 يعني أنه لن يتم تغيير " +"الإعدادات." #: modules/access/dshow/dshow.cpp:182 msgid "Audio input pin" @@ -6604,11 +6669,14 @@ "AM Tuner mode. Can be one of Default (0), TV (1), AM Radio (2), FM Radio (3) " "or DSS (4)." msgstr "" +"وضع موالف AM. يمكن أن يكون أحد الخيارات الافتراضية (0)، أو التلفزيون (1)، أو " +"راديو AM (2)، أو راديو FM (3)، أو DSS (4)." #: modules/access/dshow/dshow.cpp:199 msgid "" "Select audio input format with the given number of audio channels (if non 0)" msgstr "" +"حدد تنسيق إدخال الصوت مع العدد المحدد من القنوات الصوتية (إذا لم يكن 0)" #: modules/access/dshow/dshow.cpp:201 #: modules/stream_out/transcode/transcode.c:94 @@ -6618,15 +6686,15 @@ #: modules/access/dshow/dshow.cpp:203 msgid "Select audio input format with the given sample rate (if non 0)" -msgstr "" +msgstr "حدد تنسيق إدخال الصوت بمعدل العينة المحدد (إذا لم يكن 0)" #: modules/access/dshow/dshow.cpp:205 msgid "Audio bits per sample" -msgstr "" +msgstr "بتات الصوت لكل عينة" #: modules/access/dshow/dshow.cpp:207 msgid "Select audio input format with the given bits/sample (if non 0)" -msgstr "" +msgstr "حدد تنسيق إدخال الصوت مع البتات/العينات المحددة (إذا لم يكن 0)" #: modules/access/dshow/dshow.cpp:219 msgid "DirectShow" @@ -6648,11 +6716,12 @@ #: modules/access/dshow/dshow.cpp:591 msgid "VLC cannot open ANY capture device. Check the error log for details." msgstr "" +"لا يمكن لبرنامج VLC فتح أي جهاز التقاط. راجع سجل الأخطاء للحصول على التفاصيل." #: modules/access/dshow/dshow.cpp:1055 msgid "" "The device you selected cannot be used, because its type is not supported." -msgstr "" +msgstr "لا يمكن استخدام الجهاز الذي حددته، لأن نوعه غير مدعوم." #: modules/access/dshow/dshow.cpp:1126 #, c-format @@ -6661,29 +6730,31 @@ #: modules/access/dsm/access.c:72 modules/access/dsm/sd.c:138 msgid "Windows networks" -msgstr "" +msgstr "شبكات ويندوز" #: modules/access/dsm/access.c:74 msgid "libdsm's SMB (Windows network shares) input and browser" -msgstr "" +msgstr "إدخال ومتصفح SMB الخاص بـ libdsm (مشاركات شبكة Windows)." #: modules/access/dsm/access.c:78 msgid "libdsm SMB input" -msgstr "" +msgstr "إدخال libdsm SMB" #: modules/access/dsm/access.c:98 msgid "libdsm NETBIOS discovery module" -msgstr "" +msgstr "وحدة اكتشاف libdsm NETBIOS" #: modules/access/dtv/access.c:43 msgid "DVB adapter" -msgstr "" +msgstr "محول DVB" #: modules/access/dtv/access.c:45 msgid "" "If there is more than one digital broadcasting adapter, the adapter number " "must be selected. Numbering starts from zero." msgstr "" +"إذا كان هناك أكثر من محول بث رقمي، فيجب تحديد رقم المحول. الترقيم يبدأ من " +"الصفر" #: modules/access/dtv/access.c:48 msgid "DVB device" @@ -6694,16 +6765,20 @@ "If the adapter provides multiple independent tuner devices, the device " "number must be selected. Numbering starts from zero." msgstr "" +"إذا كان المحول يوفر أجهزة موالف مستقلة ومتعددة، فيجب تحديد رقم الجهاز. " +"الترقيم يبدأ من الصفر" #: modules/access/dtv/access.c:52 msgid "Do not demultiplex" -msgstr "" +msgstr "لاتقم بـ فك مزج الإشارات" #: modules/access/dtv/access.c:54 msgid "" "Only useful programs are normally demultiplexed from the transponder. This " "option will disable demultiplexing and receive all programs." msgstr "" +"عادةً ما يتم فك مزج إشارات البرامج المفيدة فقط من جهاز الإرسال والاستقبال. " +"سيؤدي هذا الخيار إلى تعطيل فك مزج الإشارات واستقبال كافة البرامج." #: modules/access/dtv/access.c:57 msgid "Network name" @@ -6711,7 +6786,7 @@ #: modules/access/dtv/access.c:58 msgid "Unique network name in the System Tuning Spaces" -msgstr "" +msgstr "اسم شبكة فريد في مساحات ضبط النظام" #: modules/access/dtv/access.c:60 msgid "Network name to create" @@ -6719,7 +6794,7 @@ #: modules/access/dtv/access.c:61 msgid "Create unique name in the System Tuning Spaces" -msgstr "" +msgstr "قم بإنشاء اسم فريد في مساحات ضبط النظام" #: modules/access/dtv/access.c:63 msgid "Frequency (Hz)" @@ -6730,22 +6805,24 @@ "TV channels are grouped by transponder (a.k.a. multiplex) on a given " "frequency. This is required to tune the receiver." msgstr "" +"يتم تجميع القنوات التلفزيونية بواسطة جهاز الإرسال والاستقبال (المعروف أيضًا " +"باسم تعدد الإرسال) على تردد معين. وهذا مطلوب لضبط المتلقي." -#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:987 +#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:967 msgid "Modulation / Constellation" -msgstr "" +msgstr "التحوير / الكوكبة" #: modules/access/dtv/access.c:69 msgid "Layer A modulation" -msgstr "" +msgstr "تحوير الطبقة \"أ\"" #: modules/access/dtv/access.c:70 msgid "Layer B modulation" -msgstr "" +msgstr "تحوير الطبقة \"ب\"" #: modules/access/dtv/access.c:71 msgid "Layer C modulation" -msgstr "" +msgstr "تحوير الطبقة \"ج\"" #: modules/access/dtv/access.c:73 msgid "" @@ -6753,62 +6830,67 @@ "(depending on the delivery system). If the demodulator cannot detect the " "constellation automatically, it needs to be configured manually." msgstr "" +"يمكن تعديل الإشارة الرقمية وفقًا لمجموعات مختلفة (حسب نظام التوصيل). إذا لم " +"يتمكن مزيل التشكيل من اكتشاف الكوكبة تلقائيًا، فيجب تكوينه يدويًا." #: modules/access/dtv/access.c:88 msgid "Symbol rate (bauds)" -msgstr "" +msgstr "معدل الرمز (باود)" #: modules/access/dtv/access.c:90 msgid "" "The symbol rate must be specified manually for some systems, notably DVB-C, " "DVB-S and DVB-S2." msgstr "" +"يجب تحديد معدل الرموز يدويًا لبعض الأنظمة، ولا سيما DVB-C وDVB-S وDVB-S2." #: modules/access/dtv/access.c:93 msgid "Spectrum inversion" -msgstr "" +msgstr "انعكاس الطيف" #: modules/access/dtv/access.c:95 msgid "" "If the demodulator cannot detect spectral inversion correctly, it needs to " "be configured manually." msgstr "" +"إذا لم يتمكن مزيل التشكيل من اكتشاف الانعكاس الطيفي بشكل صحيح، فيجب تكوينه " +"يدويًا." #: modules/access/dtv/access.c:101 msgid "FEC code rate" -msgstr "" +msgstr "معدل رمز FEC" #: modules/access/dtv/access.c:102 msgid "High-priority code rate" -msgstr "" +msgstr "معدل رمز الأولوية العالية" #: modules/access/dtv/access.c:103 msgid "Low-priority code rate" -msgstr "" +msgstr "معدل رمز الأولوية المنخفضة" #: modules/access/dtv/access.c:104 msgid "Layer A code rate" -msgstr "" +msgstr "معدل ترميز الطبقة \"أ\"" #: modules/access/dtv/access.c:105 msgid "Layer B code rate" -msgstr "" +msgstr "معدل ترميز الطبقة \"ب\"" #: modules/access/dtv/access.c:106 msgid "Layer C code rate" -msgstr "" +msgstr "معدل ترميز الطبقة \"ج\"" #: modules/access/dtv/access.c:108 msgid "The code rate for Forward Error Correction can be specified." -msgstr "" +msgstr "يمكن تحديد معدل التعليمات البرمجية لتصحيح الأخطاء إلى الأمام." #: modules/access/dtv/access.c:118 msgid "Transmission mode" -msgstr "طريقة الإرسال" +msgstr "وضع الإرسال" #: modules/access/dtv/access.c:126 msgid "Bandwidth (MHz)" -msgstr "" +msgstr "عرض النطاق الترددي (ميغاهرتز)" #: modules/access/dtv/access.c:131 msgid "10 MHz" @@ -6836,55 +6918,55 @@ #: modules/access/dtv/access.c:135 msgid "Guard interval" -msgstr "" +msgstr "فاصل الحراسة" #: modules/access/dtv/access.c:143 msgid "Hierarchy mode" -msgstr "" +msgstr "وضع التسلسل الهرمي" #: modules/access/dtv/access.c:151 msgid "DVB-T2 Physical Layer Pipe" -msgstr "" +msgstr "أنابيب الطبقة المادية DVB-T2" #: modules/access/dtv/access.c:153 msgid "Layer A segments count" -msgstr "" +msgstr "عدد شرائح الطبقة أ" #: modules/access/dtv/access.c:154 msgid "Layer B segments count" -msgstr "" +msgstr "عدد شرائح الطبقة ب" #: modules/access/dtv/access.c:155 msgid "Layer C segments count" -msgstr "" +msgstr "عدد شرائح الطبقة ج" #: modules/access/dtv/access.c:157 msgid "Layer A time interleaving" -msgstr "" +msgstr "طبقة تشذير الوقت \"أ\"" #: modules/access/dtv/access.c:158 msgid "Layer B time interleaving" -msgstr "" +msgstr "طبقة تشذير الوقت \"ب\"" #: modules/access/dtv/access.c:159 msgid "Layer C time interleaving" -msgstr "" +msgstr "طبقة تشذير الوقت \"ج\"" #: modules/access/dtv/access.c:161 msgid "Stream identifier" -msgstr "" +msgstr "معرف البث" #: modules/access/dtv/access.c:163 msgid "Pilot" -msgstr "" +msgstr "تجريبي" #: modules/access/dtv/access.c:165 msgid "Roll-off factor" -msgstr "" +msgstr "عامل التدحرج" #: modules/access/dtv/access.c:170 msgid "0.35 (same as DVB-S)" -msgstr "" +msgstr "0.35 (مثل DVB-S)" #: modules/access/dtv/access.c:170 msgid "0.20" @@ -6896,21 +6978,23 @@ #: modules/access/dtv/access.c:173 msgid "Transport stream ID" -msgstr "" +msgstr "معرف بث النقل" #: modules/access/dtv/access.c:175 msgid "Polarization (Voltage)" -msgstr "" +msgstr "الاستقطاب (الجهد)" #: modules/access/dtv/access.c:177 msgid "" "To select the polarization of the transponder, a different voltage is " "normally applied to the low noise block-downconverter (LNB)." msgstr "" +"لتحديد استقطاب جهاز الإرسال والاستقبال، يتم عادةً تطبيق جهد مختلف على محول " +"خفض الضوضاء المنخفض (LNB)." #: modules/access/dtv/access.c:180 msgid "Unspecified (0V)" -msgstr "" +msgstr "غير محدد (0 فولت)" #: modules/access/dtv/access.c:181 msgid "Vertical (13V)" @@ -6922,11 +7006,11 @@ #: modules/access/dtv/access.c:182 msgid "Circular Right Hand (13V)" -msgstr "" +msgstr "اليد اليمنى الدائرية (13 فولت)" #: modules/access/dtv/access.c:182 msgid "Circular Left Hand (18V)" -msgstr "" +msgstr "يد يسرى دائرية (18 فولت)" #: modules/access/dtv/access.c:184 msgid "High LNB voltage" @@ -6938,14 +7022,17 @@ "receiver are long, higher voltage may be required.\n" "Not all receivers support this." msgstr "" +"إذا كانت الكابلات بين محول خفض الضوضاء المنخفض للقمر الصناعي وجهاز الاستقبال " +"طويلة، فقد تكون هناك حاجة إلى جهد أعلى.\n" +"ليس كل أجهزة الاستقبال تدعم هذا." #: modules/access/dtv/access.c:190 msgid "Local oscillator low frequency (kHz)" -msgstr "" +msgstr "المذبذب المحلي ذو التردد المنخفض (كيلو هرتز)" #: modules/access/dtv/access.c:191 msgid "Local oscillator high frequency (kHz)" -msgstr "" +msgstr "مذبذب محلي عالي التردد (كيلو هرتز)" #: modules/access/dtv/access.c:193 msgid "" @@ -6953,10 +7040,12 @@ "the satellite transmission frequency. The intermediate frequency (IF) on the " "RF cable is the result." msgstr "" +"سوف يقوم المحول السفلي (LNB) بطرح تردد المذبذب المحلي من تردد إرسال القمر " +"الصناعي. والنتيجة هي التردد المتوسط (IF) على كابل التردد اللاسلكي." #: modules/access/dtv/access.c:196 msgid "Universal LNB switch frequency (kHz)" -msgstr "" +msgstr "تردد مفتاح LNB العالمي (كيلو هرتز)" #: modules/access/dtv/access.c:198 msgid "" @@ -6964,20 +7053,25 @@ "oscillator high frequency will be used as reference. Furthermore the " "automatic continuous 22kHz tone will be sent." msgstr "" +"إذا تجاوز تردد الإرسال عبر الأقمار الصناعية تردد التبديل، فسيتم استخدام " +"التردد العالي للمذبذب كمرجع. علاوة على ذلك، سيتم إرسال نغمة 22 كيلو هرتز " +"التلقائية المستمرة." #: modules/access/dtv/access.c:201 msgid "Continuous 22kHz tone" -msgstr "" +msgstr "نغمة مستمرة 22 كيلو هرتز" #: modules/access/dtv/access.c:203 msgid "" "A continuous tone at 22kHz can be sent on the cable. This normally selects " "the higher frequency band from a universal LNB." msgstr "" +"يمكن إرسال نغمة مستمرة عند 22 كيلو هرتز عبر الكابل. يؤدي هذا عادةً إلى تحديد " +"نطاق التردد الأعلى من LNB العالمي." #: modules/access/dtv/access.c:206 msgid "DiSEqC LNB number" -msgstr "" +msgstr "رقم DiSEqC LNB" #: modules/access/dtv/access.c:208 msgid "" @@ -6985,6 +7079,9 @@ "downconverters (LNB) through a DiSEqC 1.0 switch, the correct LNB can be " "selected (1 to 4). If there is no switch, this parameter should be 0." msgstr "" +"إذا كان جهاز استقبال القمر الصناعي متصلاً بمحولات خفض الضوضاء المنخفضة " +"المتعددة (LNB) من خلال مفتاح DiSEqC 1.0، فيمكن تحديد LNB الصحيح (من 1 إلى " +"4). إذا لم يكن هناك مفتاح، يجب أن تكون هذه المدخلة 0." #: modules/access/dtv/access.c:214 modules/access/v4l2/v4l2.c:136 #: modules/access/v4l2/v4l2.c:163 modules/access/v4l2/v4l2.c:201 @@ -6993,7 +7090,7 @@ #: modules/access/dtv/access.c:218 msgid "Uncommitted DiSEqC LNB number" -msgstr "" +msgstr "رقم DiSEqC LNB غير الملتزم به" #: modules/access/dtv/access.c:220 msgid "" @@ -7003,6 +7100,10 @@ "selected (1 to 4). If there is no uncommitted switch, this parameter should " "be 0." msgstr "" +"إذا كان جهاز استقبال القمر الصناعي متصلاً بعدة محولات خفض الضوضاء المنخفضة " +"(LNB) من خلال سلسلة مكونة من المفتاح غير الملتزم DiSEqC 1.1 والمفتاح الملتزم " +"DiSEqC 1.0، فيمكن تحديد LNB الصحيح غير الملتزم (من 1 إلى 4). إذا لم يكن هناك " +"مفتاح غير ملتزم به، فيجب أن تكون هذه المدخلة 0." #: modules/access/dtv/access.c:227 msgid "Network identifier" @@ -7010,47 +7111,49 @@ #: modules/access/dtv/access.c:228 msgid "Satellite azimuth" -msgstr "" +msgstr "سمت القمر الصناعي" #: modules/access/dtv/access.c:229 msgid "Satellite azimuth in tenths of degree" -msgstr "" +msgstr "سمت القمر الصناعي في أعشار الدرجة" #: modules/access/dtv/access.c:230 msgid "Satellite elevation" -msgstr "" +msgstr "ارتفاع القمر الصناعي" #: modules/access/dtv/access.c:231 msgid "Satellite elevation in tenths of degree" -msgstr "" +msgstr "ارتفاع القمر الصناعي في أعشار الدرجة" #: modules/access/dtv/access.c:232 msgid "Satellite longitude" -msgstr "" +msgstr "خط طول القمر الصناعي" #: modules/access/dtv/access.c:234 msgid "Satellite longitude in tenths of degree. West is negative." -msgstr "" +msgstr "خط طول القمر الصناعي بعشر الدرجة. الغرب سلبي." #: modules/access/dtv/access.c:236 msgid "Satellite range code" -msgstr "" +msgstr "رمز نطاق القمر الصناعي" #: modules/access/dtv/access.c:237 msgid "Satellite range code as defined by manufacturer e.g. DISEqC switch code" msgstr "" +"رمز نطاق القمر الصناعي كما هو محدد من قبل الشركة المصنعة، على سبيل المثال. " +"رمز التبديل DISEqC" #: modules/access/dtv/access.c:241 msgid "Major channel" -msgstr "" +msgstr "قناة رئيسية" #: modules/access/dtv/access.c:242 msgid "ATSC minor channel" -msgstr "" +msgstr "قناة ATSC الثانوية" #: modules/access/dtv/access.c:243 msgid "Physical channel" -msgstr "" +msgstr "القناة المادية" #: modules/access/dtv/access.c:249 msgid "DTV" @@ -7058,39 +7161,39 @@ #: modules/access/dtv/access.c:250 msgid "Digital Television and Radio" -msgstr "" +msgstr "التلفزيون الرقمي والراديو" #: modules/access/dtv/access.c:288 msgid "Terrestrial reception parameters" -msgstr "" +msgstr "معلمات الاستقبال الأرضي" #: modules/access/dtv/access.c:300 msgid "DVB-T reception parameters" -msgstr "" +msgstr "معلمات استقبال DVB-T" #: modules/access/dtv/access.c:316 msgid "ISDB-T reception parameters" -msgstr "" +msgstr "معلمات الاستقبال ISDB-T" #: modules/access/dtv/access.c:357 msgid "Cable and satellite reception parameters" -msgstr "" +msgstr "معلمات استقبال الكابلات والأقمار الصناعية" #: modules/access/dtv/access.c:369 msgid "DVB-S2 parameters" -msgstr "" +msgstr "معلّمات DVB-S2" #: modules/access/dtv/access.c:380 msgid "ISDB-S parameters" -msgstr "" +msgstr "معلّمات ISDB-S" #: modules/access/dtv/access.c:385 msgid "Satellite equipment control" -msgstr "" +msgstr "التحكم في معدات الأقمار الصناعية" #: modules/access/dtv/access.c:427 msgid "ATSC reception parameters" -msgstr "" +msgstr "معلّمات الاستقبال ATSC" #: modules/access/dtv/access.c:481 msgid "Digital broadcasting" @@ -7101,10 +7204,12 @@ "The selected digital tuner does not support the specified parameters.\n" "Please check the preferences." msgstr "" +"الموالف الرقمي المحدد لا يدعم المعلمات المحددة.\n" +"يرجى التحقق من التفضيلات." #: modules/access/dv.c:57 msgid "Digital Video (Firewire/ieee1394) input" -msgstr "" +msgstr "إدخال الفيديو الرقمي (Firewire/ieee1394)." #: modules/access/dv.c:58 msgid "DV" @@ -7112,41 +7217,43 @@ #: modules/access/dvb/access.c:66 msgid "Probe DVB card for capabilities" -msgstr "" +msgstr "دقق في بطاقة DVB لمعرفة القدرات" #: modules/access/dvb/access.c:67 msgid "" "Some DVB cards do not like to be probed for their capabilities, you can " "disable this feature if you experience some trouble." msgstr "" +"بعض بطاقات DVB لا تحب أن يتم فحص قدراتها، يمكنك تعطيل هذه الميزة إذا واجهت " +"بعض المشاكل." #: modules/access/dvb/access.c:70 msgid "Satellite scanning config" -msgstr "" +msgstr "تكوين المسح عبر الأقمار الصناعية" #: modules/access/dvb/access.c:71 msgid "Filename of config file in share/dvb/dvb-s." -msgstr "" +msgstr "اسم ملف التكوين في share/dvb/dvb-s." #: modules/access/dvb/access.c:73 msgid "Scan tuning list" -msgstr "" +msgstr "قائمة ضبط المسح" #: modules/access/dvb/access.c:74 msgid "Filename containing initial scan tuning data." -msgstr "" +msgstr "اسم الملف الذي يحتوي على بيانات ضبط المسح الأولي." #: modules/access/dvb/access.c:76 msgid "Use NIT for scanning services" -msgstr "" +msgstr "استخدم NIT لخدمات المسح الضوئي" #: modules/access/dvb/access.c:79 msgid "DVB" -msgstr "" +msgstr "DVB" #: modules/access/dvb/access.c:80 msgid "DVB input with v4l2 support" -msgstr "" +msgstr "مدخل DVB مع دعم v4l2" #: modules/access/dvb/scan.c:817 #, c-format @@ -7154,10 +7261,12 @@ "%.1f MHz (%d services)\n" "~%s remaining" msgstr "" +"%.1f ميغاهيرتز (%d الخدمات)\n" +"~%s باقي" #: modules/access/dvb/scan.c:827 msgid "Scanning DVB" -msgstr "" +msgstr "مسح DVB" #: modules/access/dvdnav.c:78 modules/access/dvdread.c:76 msgid "DVD angle" @@ -7200,6 +7309,8 @@ msgid "" "VLC cannot set the DVD's title. It possibly cannot decrypt the entire disc." msgstr "" +"لا يمكن لبرنامج VLC تعيين عنوان قرص DVD. ربما لا يستطيع فك تشفير القرص " +"بأكمله." #: modules/access/dvdread.c:84 msgid "DVD without menus" @@ -7207,16 +7318,16 @@ #: modules/access/dvdread.c:85 msgid "DVDRead Input (no menu support)" -msgstr "" +msgstr "إدخال DVDRead (لا يوجد دعم للقائمة)" #: modules/access/dvdread.c:237 #, c-format msgid "DVDRead could not open the disc \"%s\"." -msgstr "" +msgstr "تعذر على DVDRead فتح القرص \"%s\"." #: modules/access/dvdread.c:253 msgid "Cannot play a non-UDF mastered DVD." -msgstr "" +msgstr "لا يمكن تشغيل قرص DVD بصيغة غير UDF." #: modules/access/dvdread.c:512 #, c-format @@ -7236,8 +7347,8 @@ #: modules/audio_output/file.c:113 #: modules/gui/macosx/VLCOpenWindowController.m:140 #: modules/gui/macosx/VLCOutput.m:64 modules/gui/macosx/VLCOutput.m:175 -#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1429 -#: modules/gui/qt/dialogs/sout.cpp:69 modules/gui/qt/dialogs/sout.cpp:121 +#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1428 +#: modules/gui/qt/dialogs/sout.cpp:67 modules/gui/qt/dialogs/sout.cpp:119 #: share/lua/http/dialogs/create_stream.html:204 #: share/lua/http/dialogs/stream_config_window.html:36 #: share/lua/http/dialogs/stream_window.html:95 @@ -7251,11 +7362,11 @@ #: modules/access/fs.c:53 msgid "List special files" -msgstr "" +msgstr "قائمة الملفات الخاصة" #: modules/access/fs.c:54 msgid "Include devices and pipes when listing directories" -msgstr "" +msgstr "قم بتضمين الأجهزة والأنابيب عند إدراج الدلائل" #: modules/access/ftp.c:69 modules/access/live555.cpp:85 #: modules/access/rdp.c:65 modules/access/sftp.c:55 @@ -7263,7 +7374,7 @@ #: modules/access_output/http.c:52 #: modules/gui/macosx/VLCCoreDialogProvider.m:191 #: modules/gui/macosx/VLCSimplePrefsController.m:286 -#: modules/gui/qt/dialogs/external.cpp:203 modules/misc/audioscrobbler.c:114 +#: modules/gui/qt/dialogs/external.cpp:205 modules/misc/audioscrobbler.c:114 #: modules/stream_out/rtp.c:173 msgid "Username" msgstr "اسم المستخدم" @@ -7282,7 +7393,7 @@ #: modules/gui/macosx/VLCCoreDialogProvider.m:192 #: modules/gui/macosx/VLCSimplePrefsController.m:285 #: modules/gui/macosx/VLCSimplePrefsController.m:348 -#: modules/gui/qt/dialogs/external.cpp:208 modules/lua/vlc.c:54 +#: modules/gui/qt/dialogs/external.cpp:210 modules/lua/vlc.c:54 #: modules/lua/vlc.c:70 modules/misc/audioscrobbler.c:116 #: modules/stream_out/rtp.c:176 msgid "Password" @@ -7305,12 +7416,12 @@ #: modules/access/ftp.c:79 msgid "FTP authentication" -msgstr "" +msgstr "مصادقة بروتوكول نقل الملفات FTP" #: modules/access/ftp.c:80 #, c-format msgid "Please enter a valid login and password for the ftp connexion to %s" -msgstr "" +msgstr "الرجاء إدخال معلومات تسجيل دخول وكلمة مرور صالحة لاتصال ftp بـ %s" #: modules/access/ftp.c:85 msgid "FTP input" @@ -7360,15 +7471,15 @@ #: modules/access/http.c:304 modules/access/http/access.c:215 #, c-format msgid "Please enter a valid login name and a password for realm %s." -msgstr "" +msgstr "الرجاء إدخال اسم تسجيل دخول صالح وكلمة مرور لـ realm %s." #: modules/access/http/access.c:288 msgid "HTTPS input" -msgstr "" +msgstr "إدخال HTTPS" #: modules/access/http/access.c:289 msgid "HTTPS" -msgstr "" +msgstr "HTTPS" #: modules/access/http/access.c:296 msgid "Continuous stream" @@ -7376,27 +7487,27 @@ #: modules/access/http/access.c:297 msgid "Keep reading a resource that keeps being updated." -msgstr "" +msgstr "استمر في قراءة المورد الذي يتم تحديثه باستمرار." #: modules/access/http/access.c:299 msgid "Cookies forwarding" -msgstr "" +msgstr "إعادة توجيه ملفات تعريف الارتباط" #: modules/access/http/access.c:300 msgid "Forward cookies across HTTP redirections." -msgstr "" +msgstr "إعادة توجيه ملفات تعريف الارتباط عبر عمليات إعادة توجيه HTTP." #: modules/access/http/access.c:301 msgid "Referrer" -msgstr "" +msgstr "المُحيل" #: modules/access/http/access.c:302 msgid "Provide the referral URL, i.e. HTTP \"Referer\" (sic)." -msgstr "" +msgstr "قم بتوفير عنوان URL للإحالة، أي HTTP \"المُحيل\" (كذا)." #: modules/access/http/access.c:306 msgid "User agent" -msgstr "" +msgstr "وكيل المستخدم" #: modules/access/http/access.c:307 msgid "" @@ -7404,6 +7515,9 @@ "server, i.e. the HTTP \"User-Agent\". Name and version must be separated by " "a forward slash, e.g. \"FooBar/1.2.3\"." msgstr "" +"تجاوز اسم التطبيق وإصداره كما هو مقدم إلى خادم HTTP، أي \"وكيل مستخدم\" " +"HTTP. يجب أن يتم الفصل بين الاسم والإصدار بشرطة مائلة للأمام، على سبيل " +"المثال. \"فوبار/1.2.3\"." #: modules/access/idummy.c:41 modules/access_output/dummy.c:44 #: modules/audio_output/adummy.c:36 modules/codec/ddummy.c:46 @@ -7414,7 +7528,7 @@ #: modules/access/idummy.c:42 msgid "Dummy input" -msgstr "" +msgstr "المدخلات الوهمية" #: modules/access/imem.c:49 modules/gui/qt/components/playlist/sorting.h:59 #: modules/stream_out/bridge.c:41 modules/stream_out/mosaic_bridge.c:101 @@ -7423,7 +7537,7 @@ #: modules/access/imem.c:51 modules/demux/image.c:46 msgid "Set the ID of the elementary stream" -msgstr "" +msgstr "قم بتعيين معرف البث الأولي" #: modules/access/imem.c:53 modules/demux/image.c:48 msgid "Group" @@ -7431,7 +7545,7 @@ #: modules/access/imem.c:55 modules/demux/image.c:50 msgid "Set the group of the elementary stream" -msgstr "" +msgstr "قم بتعيين مجموعة البث الأولي" #: modules/access/imem.c:57 msgid "Category" @@ -7439,7 +7553,7 @@ #: modules/access/imem.c:59 msgid "Set the category of the elementary stream" -msgstr "" +msgstr "قم بتعيين فئة البث الأولي" #: modules/access/imem.c:64 modules/gui/macosx/VLCAddonsWindowController.m:363 #: modules/gui/qt/managers/addons_manager.cpp:98 @@ -7452,15 +7566,15 @@ #: modules/access/imem.c:69 msgid "Set the codec of the elementary stream" -msgstr "" +msgstr "قم بتعيين برنامج الترميز للتيار الأولي" #: modules/access/imem.c:73 msgid "Language of the elementary stream as described by ISO639" -msgstr "" +msgstr "لغة التدفق الأولي كما هو موضح في ISO639" #: modules/access/imem.c:77 msgid "Sample rate of an audio elementary stream" -msgstr "" +msgstr "معدل العينة للتيار الصوتي الأولي" #: modules/access/imem.c:79 modules/audio_output/amem.c:51 msgid "Channels count" @@ -7468,13 +7582,13 @@ #: modules/access/imem.c:81 msgid "Channels count of an audio elementary stream" -msgstr "" +msgstr "عدد القنوات للتيار الصوتي الأساسي" #: modules/access/imem.c:83 modules/access/v4l2/v4l2.c:65 #: modules/demux/rawvid.c:47 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:239 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167 -#: modules/gui/qt/components/extended_panels.cpp:1318 modules/spu/mosaic.c:94 +#: modules/gui/qt/components/extended_panels.cpp:1348 modules/spu/mosaic.c:94 #: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108 #: modules/gui/qt/ui/profiles.h:741 msgid "Width" @@ -7482,7 +7596,7 @@ #: modules/access/imem.c:84 msgid "Width of video or subtitle elementary streams" -msgstr "" +msgstr "عرض بثوث الفيديو أو الترجمة الأولية" #: modules/access/imem.c:86 modules/access/v4l2/v4l2.c:66 #: modules/demux/rawvid.c:51 @@ -7495,7 +7609,7 @@ #: modules/access/imem.c:87 msgid "Height of video or subtitle elementary streams" -msgstr "" +msgstr "ارتفاع بثوث الفيديو أو الترجمة الأولية" #: modules/access/imem.c:89 msgid "Display aspect ratio" @@ -7503,77 +7617,77 @@ #: modules/access/imem.c:91 msgid "Display aspect ratio of a video elementary stream" -msgstr "" +msgstr "عرض نسبة العرض إلى الارتفاع لبث الفيديو الأساسي" #: modules/access/imem.c:95 msgid "Frame rate of a video elementary stream" -msgstr "" +msgstr "معدل الإطارات لبث الفيديو الأساسي" #: modules/access/imem.c:97 msgid "Callback cookie string" -msgstr "" +msgstr "سلسلة ملفات تعريف الارتباط لرد الاتصال" #: modules/access/imem.c:99 msgid "Text identifier for the callback functions" -msgstr "" +msgstr "معرف النص لوظائف رد الاتصال" #: modules/access/imem.c:101 msgid "Callback data" -msgstr "" +msgstr "بيانات رد الاتصال" #: modules/access/imem.c:103 msgid "Data for the get and release functions" -msgstr "" +msgstr "البيانات الخاصة بوظائف الحصول والإصدار" #: modules/access/imem.c:105 msgid "Get function" -msgstr "" +msgstr "الحصول على وظيفة" #: modules/access/imem.c:107 msgid "Address of the get callback function" -msgstr "" +msgstr "عنوان وظيفة رد الاتصال" #: modules/access/imem.c:109 msgid "Release function" -msgstr "" +msgstr "وظيفة الإصدار" #: modules/access/imem.c:111 msgid "Address of the release callback function" -msgstr "" +msgstr "عنوان وظيفة رد الاتصال الإصدار" #: modules/access/imem.c:113 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:236 -#: modules/gui/qt/components/extended_panels.cpp:1317 +#: modules/gui/qt/components/extended_panels.cpp:1347 msgid "Size" msgstr "الحجم" #: modules/access/imem.c:115 msgid "Size of stream in bytes" -msgstr "" +msgstr "حجم البث بالبايت" #: modules/access/imem.c:118 modules/access/imem.c:119 msgid "Memory input" -msgstr "" +msgstr "إدخال الذاكرة" #: modules/access/imem-access.c:165 msgid "Memory stream" -msgstr "" +msgstr "تيار الذاكرة" #: modules/access/imem-access.c:166 msgid "In-memory stream input" -msgstr "" +msgstr "إدخال تيار في الذاكرة" #: modules/access/jack.c:59 msgid "Pace" -msgstr "" +msgstr "الوتيرة" #: modules/access/jack.c:61 msgid "Read the audio stream at VLC pace rather than Jack pace." -msgstr "" +msgstr "اقرأ البث الصوتي بسرعة VLC بدلاً من سرعة Jack." -#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:918 +#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:898 msgid "Auto connection" -msgstr "" +msgstr "اتصال تلقائي" #: modules/access/jack.c:64 msgid "Automatically connect VLC input ports to available output ports." @@ -7597,7 +7711,7 @@ msgid "" "Allows you to set the desired link of the board for the capture (starting at " "0)." -msgstr "" +msgstr "يسمح لك بتعيين الرابط المطلوب للوحة الالتقاط (بدءًا من 0)." #: modules/access/linsys/linsys_hdsdi.c:75 #: modules/access/linsys/linsys_sdi.c:71 @@ -7607,12 +7721,12 @@ #: modules/access/linsys/linsys_hdsdi.c:77 #: modules/access/linsys/linsys_sdi.c:73 msgid "Allows you to set the ES ID of the video." -msgstr "" +msgstr "يسمح لك بتعيين معرف ES للفيديو." #: modules/access/linsys/linsys_hdsdi.c:80 #: modules/access/linsys/linsys_sdi.c:76 msgid "Allows you to force the aspect ratio of the video." -msgstr "" +msgstr "يسمح لك بفرض نسبة العرض إلى الارتفاع للفيديو." #: modules/access/linsys/linsys_hdsdi.c:81 #: modules/access/linsys/linsys_sdi.c:77 @@ -7623,10 +7737,11 @@ #: modules/access/linsys/linsys_sdi.c:79 msgid "Allows you to set audio configuration (id=group,pair:id=group,pair...)." msgstr "" +"يسمح لك بضبط تكوين الصوت (المعرف=المجموعة،الزوج:المعرف=المجموعة،الزوج...)" #: modules/access/linsys/linsys_hdsdi.c:89 msgid "HD-SDI Input" -msgstr "" +msgstr "مدخل HD-SDI" #: modules/access/linsys/linsys_hdsdi.c:90 msgid "HD-SDI" @@ -7634,28 +7749,28 @@ #: modules/access/linsys/linsys_sdi.c:80 msgid "Teletext configuration" -msgstr "" +msgstr "تكوين النص التليفزيوني" #: modules/access/linsys/linsys_sdi.c:82 msgid "" "Allows you to set Teletext configuration (id=line1-lineN with both fields)." -msgstr "" +msgstr "يتيح لك ضبط تكوين قناة المعلومات (المعرف=line1-lineN مع كلا الحقلين)." #: modules/access/linsys/linsys_sdi.c:83 msgid "Teletext language" -msgstr "" +msgstr "لغة النص التلفزيوني" #: modules/access/linsys/linsys_sdi.c:85 msgid "Allows you to set Teletext language (page=lang/type,...)." -msgstr "" +msgstr "يتيح لك ضبط لغة نصوص المعلومات (page=lang/type,...)." #: modules/access/linsys/linsys_sdi.c:93 msgid "SDI Input" -msgstr "" +msgstr "مدخل SDI" #: modules/access/linsys/linsys_sdi.c:114 msgid "SDI Demux" -msgstr "" +msgstr "فك دمج إشارات SDI" #: modules/access/live555.cpp:75 msgid "Kasenna RTSP dialect" @@ -7667,16 +7782,20 @@ "parameter VLC will try this dialect, but then it cannot connect to normal " "RTSP servers." msgstr "" +"تستخدم خوادم Kasenna لهجة قديمة وغير قياسية لـ RTSP. باستخدام هذه المعلمة، " +"سيحاول VLC هذه اللهجة، ولكن بعد ذلك لا يمكنه الاتصال بخوادم RTSP العادية." #: modules/access/live555.cpp:80 msgid "WMServer RTSP dialect" -msgstr "" +msgstr "لهجة WMServer RTSP" #: modules/access/live555.cpp:81 msgid "" "WMServer uses a nonstandard dialect of RTSP. Selecting this parameter will " "tell VLC to assume some options contrary to RFC 2326 guidelines." msgstr "" +"يستخدم WMServer لهجة غير قياسية لـ RTSP. سيؤدي تحديد هذه المعلمة إلى إخبار " +"VLC بافتراض بعض الخيارات المخالفة لإرشادات RFC 2326." #: modules/access/live555.cpp:86 msgid "" @@ -7693,13 +7812,15 @@ #: modules/access/live555.cpp:91 msgid "RTSP frame buffer size" -msgstr "" +msgstr "حجم المخزن المؤقت لإطار RTSP" #: modules/access/live555.cpp:92 msgid "" "RTSP start frame buffer size of the video track, can be increased in case of " "broken pictures due to too small buffer." msgstr "" +"يمكن زيادة حجم المخزن المؤقت لإطار بدء تشغيل RTSP لمسار الفيديو في حالة وجود " +"صور مكسورة بسبب المخزن المؤقت الصغير جدًا." #: modules/access/live555.cpp:98 msgid "RTP/RTSP/SDP demuxer (using Live555)" @@ -7723,7 +7844,7 @@ #: modules/access/live555.cpp:119 modules/access/live555.cpp:120 msgid "Force multicast RTP via RTSP" -msgstr "" +msgstr "فرض البث المتعدد RTP عبر RTSP" #: modules/access/live555.cpp:123 modules/access/live555.cpp:124 msgid "Tunnel RTSP and RTP over HTTP" @@ -7737,21 +7858,21 @@ msgid "Port to use for tunneling the RTSP/RTP over HTTP." msgstr "HTTP انتهى RTSP/RTP منفذ استعماله لحفر نفق لـ " -#: modules/access/live555.cpp:673 +#: modules/access/live555.cpp:677 msgid "RTSP authentication" msgstr "توثيق RTSP" -#: modules/access/live555.cpp:674 +#: modules/access/live555.cpp:678 msgid "Please enter a valid login name and a password." msgstr ".يرجى إدخال إسم دخول وكلمة السرصالحين " -#: modules/access/live555.cpp:699 +#: modules/access/live555.cpp:703 msgid "RTSP connection failed" -msgstr "" +msgstr "فشل اتصال RTSP" -#: modules/access/live555.cpp:700 +#: modules/access/live555.cpp:704 msgid "Access to the stream is denied by the server configuration." -msgstr "" +msgstr "تم رفض الوصول إلى الدفق من خلال تكوين الخادم." #: modules/access/mms/mms.c:49 msgid "Force selection of all streams" @@ -7775,13 +7896,15 @@ #: modules/access/mms/mms.c:58 msgid "TCP/UDP timeout (ms)" -msgstr "" +msgstr "مهلة TCP/UDP (بالمللي ثانية)" #: modules/access/mms/mms.c:59 msgid "" "Amount of time (in ms) to wait before aborting network reception of data. " "Note that there will be 10 retries before completely giving up." msgstr "" +"مقدار الوقت (بالمللي ثانية) للانتظار قبل إيقاف استقبال البيانات على الشبكة. " +"لاحظ أنه ستكون هناك 10 محاولات قبل الاستسلام تمامًا." #: modules/access/mms/mms.c:63 msgid "Microsoft Media Server (MMS) input" @@ -7806,25 +7929,26 @@ #: modules/access/nfs.c:49 msgid "Set NFS uid/guid automatically" -msgstr "" +msgstr "قم بتعيين NFS uid/guid تلقائيًا" #: modules/access/nfs.c:50 msgid "" "If uid/gid are not specified in the url, VLC will automatically set a uid/" "gid." msgstr "" +"إذا لم يتم تحديد uid/gid في عنوان url، فسيقوم VLC تلقائيًا بتعيين uid/gid." #: modules/access/nfs.c:57 msgid "NFS" -msgstr "" +msgstr "NFS" #: modules/access/nfs.c:58 msgid "NFS input" -msgstr "" +msgstr "مدخلات NFS" #: modules/access/nfs.c:114 msgid "NFS operation failed" -msgstr "" +msgstr "فشلت عملية NFS" #: modules/access/oss.c:66 msgid "Capture the audio stream in stereo." @@ -7840,6 +7964,8 @@ "Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100, " "48000)" msgstr "" +"عينة من تدفق الصوت الملتقط، بالهرتز (على سبيل المثال: 11025، 22050، 44100، " +"48000)" #: modules/access/oss.c:76 msgid "OSS" @@ -7854,14 +7980,16 @@ "Pass pulse:// to open the default PulseAudio source, or pulse://SOURCE to " "open a specific source named SOURCE." msgstr "" +"قم بتمرير النبض: // لفتح مصدر PulseAudio الافتراضي، أو النبض: // SOURCE لفتح " +"مصدر محدد يسمى SOURCE." #: modules/access/pulse.c:42 msgid "PulseAudio" -msgstr "" +msgstr "PulseAudio" #: modules/access/pulse.c:43 msgid "PulseAudio input" -msgstr "" +msgstr "إدخال PulseAudio" #: modules/access/rdp.c:72 msgid "Encrypted connexion" @@ -7869,7 +7997,7 @@ #: modules/access/rdp.c:74 msgid "Acquisition rate (in fps)" -msgstr "" +msgstr "معدل الاكتساب (بالإطارات في الثانية)" #: modules/access/rdp.c:85 msgid "RDP" @@ -7877,99 +8005,107 @@ #: modules/access/rdp.c:89 msgid "RDP Remote Desktop" -msgstr "" +msgstr "الوصول عن بعد RDP" #: modules/access/rist.c:65 msgid "Range" -msgstr "" +msgstr "نطاق" #: modules/access/rist.c:65 msgid "Bitmask" -msgstr "" +msgstr "قناع نقطي" #: modules/access/rist.c:1127 modules/access_output/rist.c:849 msgid "RIST" -msgstr "" +msgstr "RIST" #: modules/access/rist.c:1128 msgid "RIST input" -msgstr "" +msgstr "إدخال RIST" #: modules/access/rist.c:1133 msgid "RIST maximum packet size (bytes)" -msgstr "" +msgstr "RIST الحد الأقصى لحجم الحزمة (بايت)" #: modules/access/rist.c:1135 msgid "RIST demux/decode maximum jitter (default is 5ms)" -msgstr "" +msgstr "RIST demux/decode الحد الأقصى من الارتعاش (الافتراضي هو 5 مللي ثانية)" #: modules/access/rist.c:1136 msgid "" "This controls the maximum jitter that will be passed to the demux/decode " "chain. The lower the value, the more CPU cycles the algorithm will consume" msgstr "" +"يتحكم هذا في الحد الأقصى من الارتعاش الذي سيتم تمريره إلى سلسلة فك دمج " +"الاشارات/فك الترميز. كلما انخفضت القيمة، زاد عدد دورات وحدة المعالجة " +"المركزية التي ستستهلكها الخوارزمية" #: modules/access/rist.c:1138 msgid "RIST latency (ms)" -msgstr "" +msgstr "زمن استجابة RIST (ملي ثانية)" #: modules/access/rist.c:1139 msgid "RIST nack retry interval (ms)" -msgstr "" +msgstr "الفاصل الزمني لإعادة محاولة RIST (بالمللي ثانية)" #: modules/access/rist.c:1141 msgid "RIST reorder buffer (ms)" -msgstr "" +msgstr "المخزن المؤقت لإعادة ترتيب RIST (ملي ثانية)" #: modules/access/rist.c:1143 msgid "RIST maximum retry count" -msgstr "" +msgstr "الحد الأقصى لعدد مرات إعادة المحاولة للـ RIST" #: modules/access/rist.c:1145 msgid "RIST nack type, 0 = range, 1 = bitmask. Default is range" -msgstr "" +msgstr "نوع RIST nack، حيث 0 = النطاق، 1 = قناع البت. الافتراضي هو النطاق" #: modules/access/rist.c:1147 msgid "Disable NACK output packets" -msgstr "" +msgstr "تعطيل حزم الإخراج NACK" #: modules/access/rist.c:1148 msgid "Use this to disable packet recovery" -msgstr "" +msgstr "استخدم هذا لتعطيل استرداد الحزمة" #: modules/access/rist.c:1149 msgid "Do not check for a valid rtcp message from the encoder" -msgstr "" +msgstr "لا تتحقق من وجود رسالة rtcp صالحة من برنامج التشفير" #: modules/access/rist.c:1150 msgid "" "Send nack messages even when we have not confirmed that the encoder is on " "our local network." msgstr "" +"أرسل رسائل nack حتى عندما لا نتأكد من وجود برنامج التشفير على شبكتنا المحلية." #: modules/access/rtp/rtp.c:44 msgid "RTCP (local) port" -msgstr "" +msgstr "منفذ RTCP (المحلي)." #: modules/access/rtp/rtp.c:46 msgid "" "RTCP packets will be received on this transport protocol port. If zero, " "multiplexed RTP/RTCP is used." msgstr "" +"سيتم استلام حزم RTCP على منفذ بروتوكول النقل هذا. إذا كان الصفر، يتم استخدام " +"RTP/RTCP متعدد الإرسال." #: modules/access/rtp/rtp.c:49 modules/stream_out/rtp.c:144 msgid "SRTP key (hexadecimal)" -msgstr "" +msgstr "مفتاح SRTP (سداسي عشري)" #: modules/access/rtp/rtp.c:51 msgid "" "RTP packets will be authenticated and deciphered with this Secure RTP master " "shared secret key. This must be a 32-character-long hexadecimal string." msgstr "" +"ستتم مصادقة حزم RTP وفك تشفيرها باستخدام المفتاح السري المشترك الرئيسي " +"Secure RTP. يجب أن يكون هذا سلسلة سداسية عشرية مكونة من 32 حرفًا." #: modules/access/rtp/rtp.c:55 modules/stream_out/rtp.c:150 msgid "SRTP salt (hexadecimal)" -msgstr "" +msgstr "رمز سولت SRTP (سداسي عشري)" #: modules/access/rtp/rtp.c:57 modules/stream_out/rtp.c:152 msgid "" @@ -7981,49 +8117,56 @@ #: modules/access/rtp/rtp.c:60 msgid "Maximum RTP sources" -msgstr "" +msgstr "الحد الأقصى لمصادر RTP" #: modules/access/rtp/rtp.c:62 msgid "How many distinct active RTP sources are allowed at a time." -msgstr "" +msgstr "ما عدد مصادر RTP النشطة المميزة المسموح بها في المرة الواحدة." #: modules/access/rtp/rtp.c:64 msgid "RTP source timeout (sec)" -msgstr "" +msgstr "مهلة مصدر RTP (ثانية)" #: modules/access/rtp/rtp.c:66 msgid "How long to wait for any packet before a source is expired." -msgstr "" +msgstr "كم من الوقت يجب انتظار أي حزمة قبل انتهاء صلاحية المصدر." #: modules/access/rtp/rtp.c:68 msgid "Maximum RTP sequence number dropout" -msgstr "" +msgstr "العدد الأقصى لانقطاع الحزم المتسلسلة لـ RTP" #: modules/access/rtp/rtp.c:70 msgid "" "RTP packets will be discarded if they are too much ahead (i.e. in the " "future) by this many packets from the last received packet." msgstr "" +"سيتم تجاهل حزم RTP إذا كانت متقدمة جدًا (أي في المستقبل) بهذا العدد من الحزم " +"من آخر حزمة تم استلامها." #: modules/access/rtp/rtp.c:73 msgid "Maximum RTP sequence number misordering" -msgstr "" +msgstr "العدد الأقصى لخطأ ترتيب الحزم المتسلسلة لـ RTP" #: modules/access/rtp/rtp.c:75 msgid "" "RTP packets will be discarded if they are too far behind (i.e. in the past) " "by this many packets from the last received packet." msgstr "" +"سيتم تجاهل حزم RTP إذا كانت متخلفة جدًا (أي في الماضي) عن طريق هذا العدد من " +"الحزم من آخر حزمة تم استلامها." #: modules/access/rtp/rtp.c:78 msgid "RTP payload format assumed for dynamic payloads" -msgstr "" +msgstr "تنسيق حمولة RTP المفترض للحمولات الديناميكية" #: modules/access/rtp/rtp.c:81 msgid "" "This payload format will be assumed for dynamic payload types (between 96 " "and 127) if it can't be determined otherwise with out-of-band mappings (SDP)" msgstr "" +"سيتم افتراض تنسيق الحمولة النافعة هذا لأنواع الحمولة النافعة الديناميكية " +"(بين 96 و127) إذا لم يكن من الممكن تحديده بطريقة أخرى باستخدام تعيينات خارج " +"النطاق (SDP)" #: modules/access/rtp/rtp.c:95 modules/stream_out/rtp.c:187 msgid "RTP" @@ -8031,11 +8174,11 @@ #: modules/access/rtp/rtp.c:96 msgid "Real-Time Protocol (RTP) input" -msgstr "" +msgstr "مُدْخَل بروتوكول الوقت الحقيقي (RTP)." #: modules/access/rtp/rtp.c:773 msgid "SDP required" -msgstr "" +msgstr "مطلوب SDP" #: modules/access/rtp/rtp.c:774 #, c-format @@ -8043,6 +8186,8 @@ "A description in SDP format is required to receive the RTP stream. Note that " "rtp:// URIs cannot work with dynamic RTP payload format (%)." msgstr "" +"مطلوب وصف بتنسيق SDP لتلقي تدفق حزم RTP. لاحظ أن عناوين URL لـ rtp:// لا " +"يمكنها العمل مع تنسيق حمولة RTP الديناميكي (%)." #: modules/access/rtsp/access.c:48 modules/access/rtsp/access.c:49 msgid "Real RTSP" @@ -8067,19 +8212,19 @@ #: modules/access/satip.c:60 modules/access/udp.c:59 msgid "Receive buffer" -msgstr "" +msgstr "تلقي المخزن المؤقت" #: modules/access/satip.c:61 modules/access/udp.c:60 msgid "UDP receive buffer size (bytes)" -msgstr "" +msgstr "حجم المخزن المؤقت لاستقبال UDP (بايت)" #: modules/access/satip.c:63 msgid "Request multicast stream" -msgstr "" +msgstr "طلب دفق البث المتعدد" #: modules/access/satip.c:64 msgid "Request server to send stream as multicast" -msgstr "" +msgstr "اطلب من الخادم إرسال الدفق كبث متعدد" #: modules/access/satip.c:66 modules/lua/vlc.c:62 #: share/lua/http/dialogs/stream_config_window.html:28 @@ -8089,10 +8234,10 @@ #: modules/access/satip.c:70 msgid "SAT>IP Receiver Plugin" -msgstr "" +msgstr "SAT> البرنامج المساعد لاستقبال IP" #: modules/access/screen/screen.c:45 -#: modules/gui/qt/components/open_panels.cpp:1124 +#: modules/gui/qt/components/open_panels.cpp:1104 msgid "Desired frame rate for the capture." msgstr ".معدل الإطارات للإلتقاط" @@ -8110,27 +8255,27 @@ #: modules/access/screen/screen.c:55 modules/access/screen/xcb.c:47 msgid "Region top row" -msgstr "" +msgstr "المنطقة في الصف العلوي" #: modules/access/screen/screen.c:57 modules/access/screen/xcb.c:49 msgid "Ordinate of the capture region in pixels." -msgstr "" +msgstr "ترتيب منطقة الالتقاط بالبكسل" #: modules/access/screen/screen.c:59 modules/access/screen/xcb.c:43 msgid "Region left column" -msgstr "" +msgstr "المنطقة في العمود الأيسر" #: modules/access/screen/screen.c:61 modules/access/screen/xcb.c:45 msgid "Abscissa of the capture region in pixels." -msgstr "" +msgstr "الإحداثي السيني لمنطقة الالتقاط بالبكسل." #: modules/access/screen/screen.c:63 modules/access/screen/xcb.c:51 msgid "Capture region width" -msgstr "" +msgstr "عرض منطقة الإلتقاط" #: modules/access/screen/screen.c:65 modules/access/screen/xcb.c:55 msgid "Capture region height" -msgstr "" +msgstr "إرتفاع منطقة الإلتقاط" #: modules/access/screen/screen.c:67 modules/access/screen/xcb.c:59 #: modules/gui/macosx/VLCOpenWindowController.m:214 @@ -8139,7 +8284,7 @@ #: modules/access/screen/screen.c:69 modules/access/screen/xcb.c:61 msgid "Follow the mouse when capturing a subscreen." -msgstr "" +msgstr "اتبع الماوس عند التقاط شاشة فرعية." #: modules/access/screen/screen.c:73 msgid "Mouse pointer image" @@ -8148,23 +8293,23 @@ #: modules/access/screen/screen.c:75 msgid "" "If specified, will use the image to draw the mouse pointer on the capture." -msgstr "" +msgstr "إذا تم تحديدها، سيتم استخدام الصورة لرسم مؤشر الماوس على الالتقاط." #: modules/access/screen/screen.c:80 msgid "Display ID" -msgstr "" +msgstr "معرف العرض" #: modules/access/screen/screen.c:82 msgid "Display ID. If not specified, main display ID is used." -msgstr "" +msgstr "معرف العرض إذا لم يتم تحديده، فسيتم استخدام معرف العرض الرئيسي." #: modules/access/screen/screen.c:83 msgid "Screen index" -msgstr "" +msgstr "فهرس الشاشة" #: modules/access/screen/screen.c:85 msgid "Index of screen (1, 2, 3, ...). Alternative to Display ID." -msgstr "" +msgstr "فهرس الشاشة (1، 2، 3، ...). بديل لمعرف العرض." #: modules/access/screen/screen.c:98 msgid "Screen Input" @@ -8349,9 +8494,8 @@ msgstr "" #: modules/access/srt.c:446 modules/access_output/srt.c:480 -#, fuzzy msgid " SRT Stream ID" -msgstr "تدفق %d" +msgstr "" #: modules/access/srt_common.c:26 msgid "16 bytes" @@ -8459,7 +8603,7 @@ msgid "Radio tuner device node." msgstr "" -#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1094 +#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1074 msgid "Frequency" msgstr "التردد" @@ -8638,7 +8782,7 @@ msgstr "٥٠ هرتز" #: modules/access/v4l2/v4l2.c:137 -#: modules/gui/qt/components/extended_panels.cpp:1107 +#: modules/gui/qt/components/extended_panels.cpp:1132 msgid "60 Hz" msgstr "٦٠ هرتز" @@ -8797,7 +8941,7 @@ #: modules/control/hotkeys.c:395 #: modules/gui/macosx/VLCAddonsWindowController.m:100 #: modules/gui/qt/dialogs/convert.cpp:164 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/dialogs/plugins.cpp:382 #: modules/gui/qt/dialogs/preferences.cpp:79 msgid "All" msgstr "الكل" @@ -9163,9 +9307,9 @@ #: modules/access_output/livehttp.c:98 msgid "" -"File is read when segment starts and is assumed to be in format: key-" -"uri\\nkey-file. File is read on the segment opening and values are used on " -"that segment." +"File is read when segment starts and is assumed to be in format: key-uri" +"\\nkey-file. File is read on the segment opening and values are used on that " +"segment." msgstr "" #: modules/access_output/livehttp.c:102 @@ -9226,7 +9370,7 @@ msgstr "" #: modules/access_output/rist.c:842 modules/access_output/shout.c:64 -#: modules/gui/qt/components/sout/sout_widgets.cpp:385 +#: modules/gui/qt/components/sout/sout_widgets.cpp:386 #: share/lua/http/dialogs/create_stream.html:139 msgid "Stream name" msgstr "اسم الدفق" @@ -9317,8 +9461,8 @@ "of streams) on the icecast/shoutcast website. Requires the bitrate " "information specified for shoutcast. Requires Ogg streaming for icecast." msgstr "" -".موقع icecast/shoutcast (جعل الخدمة متاحة للجمهور على 'الصفحات الصفراء' " -"(دليل قائمة الجداول\n" +".موقع icecast/shoutcast (جعل الخدمة متاحة للجمهور على 'الصفحات " +"الصفراء' (دليل قائمة الجداول\n" ". icecast لــOgg يتطلب الجري .shoutcast يتطلب معدل البت المعلومات المحددة ل" #: modules/access_output/shout.c:111 @@ -9611,7 +9755,7 @@ #: modules/audio_filter/chorus_flanger.c:80 #: modules/audio_filter/stereo_widen.c:57 -#: modules/gui/qt/components/extended_panels.cpp:1337 +#: modules/gui/qt/components/extended_panels.cpp:1367 msgid "Delay time" msgstr "" @@ -9639,7 +9783,7 @@ #: modules/audio_filter/chorus_flanger.c:89 #: modules/audio_filter/stereo_widen.c:60 -#: modules/gui/qt/components/extended_panels.cpp:1338 +#: modules/gui/qt/components/extended_panels.cpp:1368 msgid "Feedback gain" msgstr "" @@ -9665,7 +9809,7 @@ #: modules/audio_filter/compressor.c:155 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:225 -#: modules/gui/qt/components/extended_panels.cpp:1295 +#: modules/gui/qt/components/extended_panels.cpp:1325 msgid "RMS/peak" msgstr "" @@ -9699,7 +9843,7 @@ #: modules/audio_filter/compressor.c:167 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:229 -#: modules/gui/qt/components/extended_panels.cpp:1299 +#: modules/gui/qt/components/extended_panels.cpp:1329 msgid "Ratio" msgstr "النسبة" @@ -10120,19 +10264,19 @@ #: modules/audio_filter/spatializer/spatializer.cpp:61 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:241 -#: modules/gui/qt/components/extended_panels.cpp:1319 +#: modules/gui/qt/components/extended_panels.cpp:1349 msgid "Wet" msgstr "" #: modules/audio_filter/spatializer/spatializer.cpp:64 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:242 -#: modules/gui/qt/components/extended_panels.cpp:1320 +#: modules/gui/qt/components/extended_panels.cpp:1350 msgid "Dry" msgstr "" #: modules/audio_filter/spatializer/spatializer.cpp:67 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:243 -#: modules/gui/qt/components/extended_panels.cpp:1321 +#: modules/gui/qt/components/extended_panels.cpp:1351 msgid "Damp" msgstr "" @@ -10166,7 +10310,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:64 -#: modules/gui/qt/components/extended_panels.cpp:1339 +#: modules/gui/qt/components/extended_panels.cpp:1369 msgid "Crossfeed" msgstr "" @@ -10178,7 +10322,7 @@ msgstr "" #: modules/audio_filter/stereo_widen.c:68 -#: modules/gui/qt/components/extended_panels.cpp:1340 +#: modules/gui/qt/components/extended_panels.cpp:1370 msgid "Dry mix" msgstr "" @@ -10416,7 +10560,7 @@ msgid "K Audio Interface audio output" msgstr "" -#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:416 +#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:417 msgid "HDMI/SPDIF audio passthrough" msgstr "" @@ -10508,11 +10652,11 @@ ".(السمعيه طريقة الانتاج (الذي لا وأيده بعض بطاقات الصوت float32 الخيار يسمح " "لك تمكين او تعطيل عالية الجوده" -#: modules/codec/a52.c:70 +#: modules/codec/a52.c:72 msgid "A/52 dynamic range compression" msgstr "ضغط ديناميكي A/52" -#: modules/codec/a52.c:72 modules/codec/dca.c:63 +#: modules/codec/a52.c:74 modules/codec/dca.c:65 msgid "" "Dynamic range compression makes the loud sounds softer, and the soft sounds " "louder, so you can more easily listen to the stream in a noisy environment " @@ -10524,7 +10668,7 @@ "كنت تشل دينامكية مجموعة ضغط على الاسترجاع ستكون اكثر ملاءمة للسينما اوقاعة " "إستماع للمسرح . " -#: modules/codec/a52.c:80 +#: modules/codec/a52.c:82 msgid "ATSC A/52 (AC-3) audio decoder" msgstr "كاشف الرموز السمعي ATSC A/52 (AC-3)" @@ -11034,15 +11178,15 @@ "enabled libavcodec" msgstr "" -#: modules/codec/avcodec/d3d11va.c:63 +#: modules/codec/avcodec/d3d11va.c:67 msgid "Direct3D11 Video Acceleration" msgstr "" -#: modules/codec/avcodec/dxva2.c:51 +#: modules/codec/avcodec/dxva2.c:55 msgid "DirectX Video Acceleration (DXVA) 2.0" msgstr "" -#: modules/codec/avcodec/encoder.c:383 +#: modules/codec/avcodec/encoder.c:399 #, c-format msgid "" "It seems your Libav/FFmpeg (libavcodec) installation lacks the following " @@ -11054,32 +11198,32 @@ "Do not contact the VideoLAN project about this issue.\n" msgstr "" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "unknown" -msgstr "" +msgstr "غير معروف" -#: modules/codec/avcodec/encoder.c:905 +#: modules/codec/avcodec/encoder.c:926 msgid "video" msgstr "" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "audio" msgstr "سمعي" -#: modules/codec/avcodec/encoder.c:906 +#: modules/codec/avcodec/encoder.c:927 msgid "subpicture" msgstr "" -#: modules/codec/avcodec/encoder.c:919 +#: modules/codec/avcodec/encoder.c:940 #, c-format msgid "VLC could not open the %4.4s %s encoder." msgstr "" -#: modules/codec/avcodec/vaapi.c:354 +#: modules/codec/avcodec/vaapi.c:388 msgid "VA-API video decoder via DRM" msgstr "" -#: modules/codec/avcodec/vaapi.c:359 +#: modules/codec/avcodec/vaapi.c:393 msgid "VA-API video decoder" msgstr "" @@ -11176,15 +11320,23 @@ msgid "Max number of threads used for tile decoding, default 0=auto" msgstr "" -#: modules/codec/dav1d.c:60 +#: modules/codec/dav1d.c:56 +msgid "All Layers" +msgstr "" + +#: modules/codec/dav1d.c:57 +msgid "Whether or not to display all spatial layers, default false" +msgstr "" + +#: modules/codec/dav1d.c:62 msgid "Dav1d video decoder" msgstr "" -#: modules/codec/dca.c:61 +#: modules/codec/dca.c:63 msgid "DTS dynamic range compression" msgstr "ضغط ديناميكي DTS" -#: modules/codec/dca.c:73 +#: modules/codec/dca.c:75 msgid "DTS Coherent Acoustics audio decoder" msgstr "كاشف الرموز السمعي DTS Coherent Acoustics" @@ -11709,7 +11861,7 @@ "رجاءً انتظر بينما يُعاد بناء خبيئة الخطوط.\n" "يفترض أن ينتهي هذا خلال دقيقة واحدة." -#: modules/codec/libmpeg2.c:137 +#: modules/codec/libmpeg2.c:140 msgid "MPEG I/II video decoder (using libmpeg2)" msgstr "(libmpeg2 يستعمل ) MPEG I/II كاشف الرموز للفديو " @@ -11729,7 +11881,7 @@ msgid "MPEG audio layer I/II/III decoder" msgstr "III/II/I السمعي الطبقات MPEG كاشف الرموز " -#: modules/codec/mft.c:62 +#: modules/codec/mft.c:66 msgid "Media Foundation Transform decoder" msgstr "" @@ -12395,7 +12547,7 @@ msgid "S/PDIF pass-through decoder" msgstr "" -#: modules/codec/speex.c:59 modules/codec/speex.c:907 +#: modules/codec/speex.c:59 modules/codec/speex.c:910 #: modules/gui/macosx/VLCOpenWindowController.m:195 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:259 #: modules/gui/qt/ui/sprefs_video.h:325 modules/gui/qt/ui/video_effects.h:1282 @@ -12721,7 +12873,7 @@ #. #. This MUST be a valid iconv character set. If unsure, please refer #. the VideoLAN translators mailing list. -#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:98 +#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:99 msgctxt "GetACP" msgid "CP1252" msgstr "CP1256" @@ -13777,8 +13929,8 @@ #: modules/codec/x264.c:429 modules/gui/macosx/VLCMainMenu.m:290 #: modules/gui/macosx/VLCMainMenu.m:392 #: modules/gui/macosx/VLCSimplePrefsController.m:711 -#: modules/gui/qt/components/simple_preferences.cpp:703 -#: modules/misc/gnutls.c:778 modules/text_renderer/freetype/freetype.c:124 +#: modules/gui/qt/components/simple_preferences.cpp:714 +#: modules/misc/gnutls.c:775 modules/text_renderer/freetype/freetype.c:124 #: modules/text_renderer/freetype/freetype.c:143 msgid "Normal" msgstr "عادي" @@ -13835,7 +13987,7 @@ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)" msgstr "" -#: modules/codec/x265.c:46 +#: modules/codec/x265.c:53 msgid "H.265/HEVC encoder (x265)" msgstr "" @@ -13911,14 +14063,14 @@ #: modules/gui/macosx/VLCMainWindow.m:587 #: modules/gui/macosx/VLCMainWindow.m:1030 #: modules/gui/macosx/VLCStatusBarIcon.m:378 modules/gui/ncurses.c:1026 -#: modules/gui/qt/dialogs/help.cpp:91 modules/gui/qt/main_interface.cpp:1267 -#: modules/gui/qt/main_interface.cpp:1271 -#: modules/gui/qt/main_interface.cpp:1310 -#: modules/gui/qt/main_interface.cpp:1312 -#: modules/gui/qt/main_interface.cpp:1420 -#: modules/gui/qt/main_interface.cpp:1437 -#: modules/gui/qt/main_interface.cpp:1445 -#: modules/gui/qt/main_interface.cpp:1468 modules/lua/libs/httpd.c:80 +#: modules/gui/qt/dialogs/help.cpp:100 modules/gui/qt/main_interface.cpp:1302 +#: modules/gui/qt/main_interface.cpp:1306 +#: modules/gui/qt/main_interface.cpp:1343 +#: modules/gui/qt/main_interface.cpp:1345 +#: modules/gui/qt/main_interface.cpp:1453 +#: modules/gui/qt/main_interface.cpp:1470 +#: modules/gui/qt/main_interface.cpp:1478 +#: modules/gui/qt/main_interface.cpp:1501 modules/lua/libs/httpd.c:80 #: modules/notify/osx_notifications.m:302 #: modules/video_output/wayland/shell.c:348 #: modules/video_output/wayland/xdg-shell.c:291 @@ -13971,7 +14123,7 @@ #: modules/control/globalhotkeys/win32.c:47 #: modules/control/globalhotkeys/xcb.c:50 -#: modules/gui/qt/components/preferences_widgets.cpp:1137 +#: modules/gui/qt/components/preferences_widgets.cpp:1141 msgid "Global Hotkeys" msgstr "مفاتيح الاختصارات العمومية" @@ -13982,8 +14134,8 @@ #: modules/control/hotkeys.c:100 #: modules/gui/macosx/VLCSimplePrefsController.m:251 -#: modules/gui/qt/components/preferences_widgets.cpp:1136 -#: modules/gui/qt/components/simple_preferences.cpp:257 +#: modules/gui/qt/components/preferences_widgets.cpp:1140 +#: modules/gui/qt/components/simple_preferences.cpp:258 msgid "Hotkeys" msgstr "مفاتيح الاختصارات" @@ -14691,7 +14843,7 @@ msgstr "" #: modules/demux/adaptive/adaptive.cpp:85 -#: modules/gui/qt/components/simple_preferences.cpp:702 +#: modules/gui/qt/components/simple_preferences.cpp:713 msgid "Low latency" msgstr "" @@ -14743,11 +14895,11 @@ msgid "ASF/WMV demuxer" msgstr "فاكك مزج إشارات ASF/WMV" -#: modules/demux/asf/asf.c:277 modules/demux/asf/asf.c:834 +#: modules/demux/asf/asf.c:285 modules/demux/asf/asf.c:836 msgid "Could not demux ASF stream" msgstr "ASF لا تستطيع ديموكس الرافد" -#: modules/demux/asf/asf.c:278 +#: modules/demux/asf/asf.c:286 msgid "VLC failed to load the ASF header." msgstr "ASF ليس له حمل العنوان الرأسي لـ VLC " @@ -14791,15 +14943,15 @@ msgid "Internal libavcodec format name" msgstr "" -#: modules/demux/avi/avi.c:55 +#: modules/demux/avi/avi.c:56 msgid "Force interleaved method" msgstr "اسلوب القوة بين- الاجازه " -#: modules/demux/avi/avi.c:57 +#: modules/demux/avi/avi.c:58 msgid "Force index creation" msgstr "انشاء قوة الفهرس" -#: modules/demux/avi/avi.c:59 +#: modules/demux/avi/avi.c:60 msgid "" "Recreate a index for the AVI file. Use this if your AVI file is damaged or " "incomplete (not seekable)." @@ -14807,27 +14959,27 @@ " متضرر أو ناقص AVI استعمال هذا إذا كان الملف .AVIإعادة تكوين الفهرس من أجل " "الملف" -#: modules/demux/avi/avi.c:67 +#: modules/demux/avi/avi.c:68 msgid "Ask for action" msgstr "" -#: modules/demux/avi/avi.c:68 +#: modules/demux/avi/avi.c:69 msgid "Always fix" msgstr "أصلح دائمًا" -#: modules/demux/avi/avi.c:69 +#: modules/demux/avi/avi.c:70 msgid "Never fix" msgstr "لا تصلح أبدًا" -#: modules/demux/avi/avi.c:70 +#: modules/demux/avi/avi.c:71 msgid "Fix when necessary" msgstr "" -#: modules/demux/avi/avi.c:74 +#: modules/demux/avi/avi.c:75 msgid "AVI demuxer" msgstr "فاكك مزج إشارات AVI" -#: modules/demux/avi/avi.c:902 modules/demux/mp4/mp4.c:4375 +#: modules/demux/avi/avi.c:910 modules/demux/mp4/mp4.c:4374 msgid "" "Because this file index is broken or missing, seeking will not work " "correctly.\n" @@ -14841,27 +14993,27 @@ "قد يأخذ هذا وقتا طويلا إن كان الملف كبيرا.\n" "ما الذي تريد فعله؟" -#: modules/demux/avi/avi.c:910 +#: modules/demux/avi/avi.c:918 msgid "Do not play" msgstr "لا تشغّل الملف" -#: modules/demux/avi/avi.c:911 +#: modules/demux/avi/avi.c:919 msgid "Build index then play" msgstr "ابنِ الفهرس ثم شغّل الملف" -#: modules/demux/avi/avi.c:912 +#: modules/demux/avi/avi.c:920 msgid "Play as is" msgstr "شغّل الملف كما هو" -#: modules/demux/avi/avi.c:913 modules/demux/mp4/mp4.c:4386 +#: modules/demux/avi/avi.c:921 modules/demux/mp4/mp4.c:4385 msgid "Broken or missing Index" msgstr "الفهرس تالف أو ناقص" -#: modules/demux/avi/avi.c:2828 +#: modules/demux/avi/avi.c:2879 msgid "Broken or missing AVI Index" msgstr "فهرس AVI تالف أو ناقص" -#: modules/demux/avi/avi.c:2829 +#: modules/demux/avi/avi.c:2880 msgid "Fixing AVI Index..." msgstr "يُصلح فهرس AVI..." @@ -15020,7 +15172,7 @@ "good for broken files)." msgstr "" -#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:112 +#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:113 msgid "Seek based on percent not time" msgstr "قد طلب إلى قاعدة بالمئة ولا مرة" @@ -15270,27 +15422,27 @@ msgid "Clean" msgstr "" -#: modules/demux/mp4/mp4.c:50 +#: modules/demux/mp4/mp4.c:51 msgid "M4A audio only" msgstr "صوت M4A فقط" -#: modules/demux/mp4/mp4.c:51 +#: modules/demux/mp4/mp4.c:52 msgid "Ignore non audio tracks from iTunes audio files" msgstr "تجاهَل المسارات غير الصوتية من ملفات صوت «آي‌تيونز»" -#: modules/demux/mp4/mp4.c:56 +#: modules/demux/mp4/mp4.c:57 msgid "MP4 stream demuxer" msgstr "فاكك مزج إشارات دفق MP4" -#: modules/demux/mp4/mp4.c:57 +#: modules/demux/mp4/mp4.c:58 msgid "MP4" msgstr "MP4" -#: modules/demux/mp4/mp4.c:4383 +#: modules/demux/mp4/mp4.c:4382 msgid "Do not seek" msgstr "" -#: modules/demux/mp4/mp4.c:4384 +#: modules/demux/mp4/mp4.c:4383 msgid "Build index" msgstr "" @@ -15355,20 +15507,20 @@ msgid "PS" msgstr "PS" -#: modules/demux/mpeg/ts.c:83 +#: modules/demux/mpeg/ts.c:84 msgid "Extra PMT" msgstr "إضافي PMT" -#: modules/demux/mpeg/ts.c:85 +#: modules/demux/mpeg/ts.c:86 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." msgstr "" ".pmt (pmt_pid=pid:stream_type[,...]) يسمح للمستخدم بتحديد اضافي التحديث " -#: modules/demux/mpeg/ts.c:87 +#: modules/demux/mpeg/ts.c:88 msgid "Set id of ES to PID" msgstr "PID إلى ES من ID مجموعة " -#: modules/demux/mpeg/ts.c:88 +#: modules/demux/mpeg/ts.c:89 msgid "" "Set the internal ID of each elementary stream handled by VLC to the same " "value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do " @@ -15378,70 +15530,70 @@ "المفيد ان يفعل 'إختيار= \" TS في PID يتولاها الى نفس القيمه كما VLC " "الداخلية تحدد هوية كل تيار ابتدائي في " -#: modules/demux/mpeg/ts.c:93 modules/mux/mpeg/ts.c:173 +#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:173 msgid "CSA Key" msgstr "CSA المفتاح" -#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:174 +#: modules/demux/mpeg/ts.c:95 modules/mux/mpeg/ts.c:174 msgid "" "CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)." msgstr "Csa مفتاح التشفير . ويجب ان يكون هذا الخيط حرف16(8 سات عشري بايت)." -#: modules/demux/mpeg/ts.c:97 modules/mux/mpeg/ts.c:177 +#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:177 msgid "Second CSA Key" msgstr "" -#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:178 +#: modules/demux/mpeg/ts.c:99 modules/mux/mpeg/ts.c:178 msgid "" "The even CSA encryption key. This must be a 16 char string (8 hexadecimal " "bytes)." msgstr "" -#: modules/demux/mpeg/ts.c:102 +#: modules/demux/mpeg/ts.c:103 msgid "Packet size in bytes to decrypt" msgstr "عدد الرزم بالبتات لفكّ الشفرة" -#: modules/demux/mpeg/ts.c:103 +#: modules/demux/mpeg/ts.c:104 msgid "" "Specify the size of the TS packet to decrypt. The decryption routines " "subtract the TS-header from the value before decrypting." msgstr "" -#: modules/demux/mpeg/ts.c:107 +#: modules/demux/mpeg/ts.c:108 msgid "Separate sub-streams" msgstr "" -#: modules/demux/mpeg/ts.c:109 +#: modules/demux/mpeg/ts.c:110 msgid "" "Separate teletex/dvbs pages into independent ES. It can be useful to turn " "off this option when using stream output." msgstr "" -#: modules/demux/mpeg/ts.c:114 +#: modules/demux/mpeg/ts.c:115 msgid "" "Seek and position based on a percent byte position, not a PCR generated time " "position. If seeking doesn't work property, turn on this option." msgstr "" -#: modules/demux/mpeg/ts.c:125 +#: modules/demux/mpeg/ts.c:126 msgid "Trust in-stream PCR" msgstr "" -#: modules/demux/mpeg/ts.c:126 +#: modules/demux/mpeg/ts.c:127 msgid "Use the stream PCR as a reference." msgstr "" -#: modules/demux/mpeg/ts.c:133 modules/mux/mpeg/ts.c:100 +#: modules/demux/mpeg/ts.c:134 modules/mux/mpeg/ts.c:100 msgid "Digital TV Standard" msgstr "" -#: modules/demux/mpeg/ts.c:134 +#: modules/demux/mpeg/ts.c:135 msgid "" "Selects mode for digital TV standard. This feature affects EPG information " "and subtitles." msgstr "" -#: modules/demux/mpeg/ts.c:138 +#: modules/demux/mpeg/ts.c:139 msgid "MPEG Transport Stream demuxer" msgstr "demuxer MPEG جدول النقل " @@ -15662,7 +15814,7 @@ msgid "Total duration" msgstr "" -#: modules/demux/pva.c:43 +#: modules/demux/pva.c:44 msgid "PVA demuxer" msgstr "فاكك مزج إشارات PVA" @@ -15795,23 +15947,23 @@ msgid "TTA demuxer" msgstr "فاكك مزج إشارات TTA" -#: modules/demux/ty.c:59 +#: modules/demux/ty.c:62 msgid "TY" msgstr "TY" -#: modules/demux/ty.c:60 +#: modules/demux/ty.c:63 msgid "TY Stream audio/video demux" msgstr "TY دفق الصوت / الڤديو demuxer" -#: modules/demux/ty.c:770 +#: modules/demux/ty.c:784 msgid "Closed captions 2" msgstr "" -#: modules/demux/ty.c:771 +#: modules/demux/ty.c:785 msgid "Closed captions 3" msgstr "" -#: modules/demux/ty.c:772 +#: modules/demux/ty.c:786 msgid "Closed captions 4" msgstr "" @@ -15827,7 +15979,7 @@ msgid "Vobsub subtitles parser" msgstr "تعريب العناوين الفرعية" -#: modules/demux/voc.c:43 +#: modules/demux/voc.c:45 msgid "VOC demuxer" msgstr "فاكك مزج إشارات VOC" @@ -15839,7 +15991,7 @@ msgid "XA demuxer" msgstr "فاكك مزج إشارات XA" -#: modules/demux/xiph_metadata.c:588 +#: modules/demux/xiph_metadata.c:571 msgid "Unknown category" msgstr "تصنيف غير معروف!" @@ -15893,17 +16045,17 @@ msgstr "عن مشغّل الوسائط VLC" #: modules/gui/macosx/VLCAboutWindowController.m:97 -#: modules/gui/qt/dialogs/help.cpp:125 +#: modules/gui/qt/dialogs/help.cpp:137 msgid "Credits" msgstr "إشادات" #: modules/gui/macosx/VLCAboutWindowController.m:99 -#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:119 +#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:129 msgid "License" msgstr "الترخيص" #: modules/gui/macosx/VLCAboutWindowController.m:101 -#: modules/gui/qt/dialogs/help.cpp:122 +#: modules/gui/qt/dialogs/help.cpp:133 msgid "Authors" msgstr "المؤلفون" @@ -15919,33 +16071,33 @@ "\">VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" +"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:105 #: modules/gui/macosx/VLCAddonsWindowController.m:357 -#: modules/gui/qt/dialogs/plugins.cpp:389 +#: modules/gui/qt/dialogs/plugins.cpp:388 #: modules/gui/qt/managers/addons_manager.cpp:88 msgid "Playlist parsers" msgstr "محلّلات قوائم التشغيل" #: modules/gui/macosx/VLCAddonsWindowController.m:107 #: modules/gui/macosx/VLCAddonsWindowController.m:359 -#: modules/gui/qt/dialogs/plugins.cpp:393 +#: modules/gui/qt/dialogs/plugins.cpp:392 #: modules/gui/qt/managers/addons_manager.cpp:90 msgid "Service Discovery" msgstr "" #: modules/gui/macosx/VLCAddonsWindowController.m:109 -#: modules/gui/qt/dialogs/plugins.cpp:397 +#: modules/gui/qt/dialogs/plugins.cpp:396 #: modules/gui/qt/managers/addons_manager.cpp:92 msgid "Interfaces" msgstr "الواجهات" #: modules/gui/macosx/VLCAddonsWindowController.m:111 -#: modules/gui/qt/dialogs/plugins.cpp:400 +#: modules/gui/qt/dialogs/plugins.cpp:399 #: modules/gui/qt/managers/addons_manager.cpp:94 msgid "Art and meta fetchers" msgstr "" @@ -15953,7 +16105,7 @@ #: modules/gui/macosx/VLCAddonsWindowController.m:113 #: modules/gui/macosx/VLCAddonsWindowController.m:361 #: modules/gui/macosx/VLCMainMenu.m:343 modules/gui/macosx/VLCMainMenu.m:344 -#: modules/gui/qt/dialogs/plugins.cpp:403 +#: modules/gui/qt/dialogs/plugins.cpp:402 #: modules/gui/qt/managers/addons_manager.cpp:96 msgid "Extensions" msgstr "إضافات" @@ -15963,30 +16115,30 @@ msgstr "اعرض المثبّت فقط" #: modules/gui/macosx/VLCAddonsWindowController.m:118 -#: modules/gui/qt/dialogs/plugins.cpp:431 +#: modules/gui/qt/dialogs/plugins.cpp:430 msgid "Find more addons online" msgstr "جِد إضافات أخرى على الشابكة" #: modules/gui/macosx/VLCAddonsWindowController.m:128 -#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:86 +#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:85 msgid "Addons Manager" msgstr "مدير الإضافات" #: modules/gui/macosx/VLCAddonsWindowController.m:130 -#: modules/gui/qt/dialogs/plugins.cpp:1173 -#: modules/gui/qt/dialogs/plugins.cpp:1186 +#: modules/gui/qt/dialogs/plugins.cpp:1172 +#: modules/gui/qt/dialogs/plugins.cpp:1185 msgid "Installed" msgstr "المثبّت" #: modules/gui/macosx/VLCAddonsWindowController.m:131 #: modules/gui/macosx/VLCBookmarksWindowController.m:87 -#: modules/gui/qt/dialogs/plugins.cpp:128 modules/mux/avi.c:54 +#: modules/gui/qt/dialogs/plugins.cpp:127 modules/mux/avi.c:54 msgid "Name" msgstr "الاسم" #: modules/gui/macosx/VLCAddonsWindowController.m:132 -#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1405 -#: modules/gui/qt/dialogs/plugins.cpp:1510 modules/mux/asf.c:58 +#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1404 +#: modules/gui/qt/dialogs/plugins.cpp:1509 modules/mux/asf.c:58 msgid "Author" msgstr "المؤلف" @@ -15995,7 +16147,7 @@ msgstr "أزِل التثبيت" #: modules/gui/macosx/VLCAddonsWindowController.m:355 -#: modules/gui/qt/dialogs/plugins.cpp:385 +#: modules/gui/qt/dialogs/plugins.cpp:384 #: modules/gui/qt/managers/addons_manager.cpp:86 #: modules/gui/skins2/src/skin_main.cpp:535 msgid "Skins" @@ -16012,7 +16164,7 @@ msgstr "ممر 2 " #: modules/gui/macosx/VLCAudioEffectsWindowController.m:219 -#: modules/gui/qt/components/extended_panels.cpp:1132 +#: modules/gui/qt/components/extended_panels.cpp:1157 #: modules/gui/qt/ui/equalizer.h:133 msgid "Preamp" msgstr "Preamp" @@ -16025,22 +16177,22 @@ #: modules/gui/macosx/VLCAudioEffectsWindowController.m:235 #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:49 #: modules/gui/macosx/VLCVideoEffectsWindowController.m:210 -#: modules/gui/qt/dialogs/gototime.cpp:66 +#: modules/gui/qt/dialogs/gototime.cpp:65 msgid "Reset" msgstr "أعد الضبط" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:226 -#: modules/gui/qt/components/extended_panels.cpp:1296 +#: modules/gui/qt/components/extended_panels.cpp:1326 msgid "Attack" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:227 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "Release" msgstr "" #: modules/gui/macosx/VLCAudioEffectsWindowController.m:228 -#: modules/gui/qt/components/extended_panels.cpp:1298 +#: modules/gui/qt/components/extended_panels.cpp:1328 msgid "Threshold" msgstr "العتبة" @@ -16194,7 +16346,7 @@ #: modules/gui/macosx/VLCOutput.m:60 modules/gui/macosx/VLCPlaylistInfo.m:337 #: modules/gui/macosx/VLCSimplePrefsController.m:295 #: modules/gui/macosx/VLCTimeSelectionPanelController.m:51 -#: modules/gui/qt/components/open_panels.cpp:1380 +#: modules/gui/qt/components/open_panels.cpp:1360 #: modules/stream_out/chromecast/cast.cpp:1197 msgid "OK" msgstr "نعم" @@ -16221,8 +16373,8 @@ #: modules/gui/macosx/VLCBookmarksWindowController.m:213 msgid "" -"Input has changed, unable to save bookmark. Suspending playback with " -"\"Pause\" while editing bookmarks to ensure to keep the same input." +"Input has changed, unable to save bookmark. Suspending playback with \"Pause" +"\" while editing bookmarks to ensure to keep the same input." msgstr "" ".المدخلات قد تغيرت ، قادرة على انقاذ كتاب. تعليق يديو مع \"توقف \" بينما " "كتب لضمان تحرير الابقاء على نفس المدخلات" @@ -16313,10 +16465,10 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:381 #: modules/gui/macosx/prefs_widgets.m:1126 #: modules/gui/qt/components/preferences_widgets.cpp:264 -#: modules/gui/qt/components/simple_preferences.cpp:471 -#: modules/gui/qt/components/sout/sout_widgets.cpp:135 -#: modules/gui/qt/ui/open.h:279 modules/gui/qt/ui/open_disk.h:304 -#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:414 +#: modules/gui/qt/components/simple_preferences.cpp:472 +#: modules/gui/qt/components/sout/sout_widgets.cpp:136 +#: modules/gui/qt/ui/open.h:277 modules/gui/qt/ui/open_disk.h:304 +#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:415 #: modules/gui/qt/ui/sprefs_input.h:365 modules/gui/qt/ui/sprefs_video.h:329 msgid "Browse..." msgstr "تصفح..." @@ -16337,7 +16489,7 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:149 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:392 #: modules/gui/macosx/VLCOutput.m:65 modules/gui/macosx/VLCOutput.m:194 -#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:94 +#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:92 msgid "Stream" msgstr "التيار" @@ -16412,10 +16564,10 @@ #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:186 #: modules/gui/macosx/VLCOpenWindowController.m:197 #: modules/gui/macosx/VLCOutput.m:68 -#: modules/gui/qt/components/sout/sout_widgets.cpp:241 -#: modules/gui/qt/components/sout/sout_widgets.cpp:328 -#: modules/gui/qt/components/sout/sout_widgets.cpp:370 -#: modules/gui/qt/components/sout/sout_widgets.cpp:425 +#: modules/gui/qt/components/sout/sout_widgets.cpp:242 +#: modules/gui/qt/components/sout/sout_widgets.cpp:329 +#: modules/gui/qt/components/sout/sout_widgets.cpp:371 +#: modules/gui/qt/components/sout/sout_widgets.cpp:426 msgid "Address" msgstr "عنوان" @@ -16427,11 +16579,11 @@ #: modules/gui/macosx/VLCOpenWindowController.m:185 #: modules/gui/macosx/VLCOpenWindowController.m:187 #: modules/gui/macosx/VLCOutput.m:69 -#: modules/gui/qt/components/sout/sout_widgets.cpp:187 -#: modules/gui/qt/components/sout/sout_widgets.cpp:242 -#: modules/gui/qt/components/sout/sout_widgets.cpp:283 -#: modules/gui/qt/components/sout/sout_widgets.cpp:329 -#: modules/gui/qt/components/sout/sout_widgets.cpp:426 modules/lua/vlc.c:67 +#: modules/gui/qt/components/sout/sout_widgets.cpp:188 +#: modules/gui/qt/components/sout/sout_widgets.cpp:243 +#: modules/gui/qt/components/sout/sout_widgets.cpp:284 +#: modules/gui/qt/components/sout/sout_widgets.cpp:330 +#: modules/gui/qt/components/sout/sout_widgets.cpp:427 modules/lua/vlc.c:67 #: modules/stream_out/rtp.c:114 #: share/lua/http/dialogs/stream_config_window.html:32 #: share/lua/http/dialogs/stream_window.html:91 @@ -16523,7 +16675,7 @@ #: modules/gui/macosx/VLCSimplePrefsController.m:705 #: modules/gui/macosx/VLCSimplePrefsController.m:733 #: modules/gui/macosx/VLCSimplePrefsController.m:1266 -#: modules/gui/qt/components/simple_preferences.cpp:700 +#: modules/gui/qt/components/simple_preferences.cpp:711 msgid "Custom" msgstr "" @@ -16562,7 +16714,7 @@ #: modules/gui/macosx/VLCFSPanelController.m:140 #: modules/gui/macosx/VLCMainWindowControlsBar.m:80 -#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:408 +#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:409 msgid "Volume" msgstr "مستوى الصوت" @@ -16596,7 +16748,7 @@ msgstr "" #: modules/gui/macosx/VLCLogWindowController.m:94 -#: modules/gui/qt/dialogs/messages.cpp:80 +#: modules/gui/qt/dialogs/messages.cpp:77 #: modules/gui/qt/ui/messages_panel.h:136 #: modules/gui/qt/ui/messages_panel.h:140 msgid "Messages" @@ -16960,8 +17112,8 @@ msgid "Bring All to Front" msgstr "اجلب الكل إلى الأمام" -#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:54 -#: modules/gui/qt/menus.cpp:951 modules/gui/qt/menus.cpp:1138 +#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:52 +#: modules/gui/qt/menus.cpp:956 modules/gui/qt/menus.cpp:1143 msgid "Help" msgstr "مساعدة" @@ -17024,13 +17176,13 @@ #: modules/gui/macosx/VLCMainWindow.m:220 #: modules/gui/macosx/VLCMainWindow.m:226 -#: modules/gui/qt/components/playlist/selector.cpp:580 +#: modules/gui/qt/components/playlist/selector.cpp:593 msgid "Subscribe" msgstr "" #: modules/gui/macosx/VLCMainWindow.m:221 #: modules/gui/macosx/VLCMainWindow.m:232 -#: modules/gui/qt/components/playlist/selector.cpp:597 +#: modules/gui/qt/components/playlist/selector.cpp:610 msgid "Unsubscribe" msgstr "" @@ -17040,7 +17192,7 @@ msgstr "" #: modules/gui/macosx/VLCMainWindow.m:225 -#: modules/gui/qt/components/playlist/selector.cpp:581 +#: modules/gui/qt/components/playlist/selector.cpp:594 msgid "Enter URL of the podcast to subscribe to:" msgstr "" @@ -17077,7 +17229,7 @@ msgstr "اعرض/أخفِ قائمة التشغيل" #: modules/gui/macosx/VLCMainWindowControlsBar.m:71 -#: modules/gui/qt/dialogs/vlm.cpp:548 share/lua/http/index.html:259 +#: modules/gui/qt/dialogs/vlm.cpp:542 share/lua/http/index.html:259 msgid "Repeat" msgstr "" @@ -17163,7 +17315,7 @@ #: modules/gui/macosx/VLCOpenWindowController.m:152 #: modules/gui/macosx/VLCOpenWindowController.m:349 #: modules/gui/macosx/VLCSimplePrefsController.m:353 -#: modules/gui/qt/ui/sprefs_interface.h:545 +#: modules/gui/qt/ui/sprefs_interface.h:552 msgid "Choose..." msgstr "اختر..." @@ -17396,10 +17548,9 @@ msgstr "اطوِ الكل" #: modules/gui/macosx/VLCPlaylist.m:231 -#: modules/gui/qt/components/playlist/standardpanel.cpp:273 -#, fuzzy +#: modules/gui/qt/components/playlist/standardpanel.cpp:274 msgid "Shuffle playlist" -msgstr "احفظ قائمة التشغيل" +msgstr "" #: modules/gui/macosx/VLCPlaylistInfo.m:54 #: modules/gui/qt/dialogs/mediainfo.cpp:54 @@ -17469,8 +17620,8 @@ msgid "VLC was unable to save the meta data." msgstr "" -#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:194 -#: modules/gui/qt/ui/sprefs_interface.h:551 +#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:197 +#: modules/gui/qt/ui/sprefs_interface.h:558 msgid "Continue playback?" msgstr "أأتابع التشغيل؟" @@ -17514,27 +17665,27 @@ msgstr "الشابكة" #: modules/gui/macosx/VLCSimplePrefsController.m:241 -#: modules/gui/qt/components/simple_preferences.cpp:247 -#: modules/gui/qt/components/simple_preferences.cpp:727 -#: modules/gui/qt/dialogs/plugins.cpp:383 +#: modules/gui/qt/components/simple_preferences.cpp:248 +#: modules/gui/qt/components/simple_preferences.cpp:738 +#: modules/gui/qt/dialogs/plugins.cpp:382 msgid "Interface Settings" msgstr "إعدادات الواجهة" #: modules/gui/macosx/VLCSimplePrefsController.m:243 -#: modules/gui/qt/components/simple_preferences.cpp:249 -#: modules/gui/qt/components/simple_preferences.cpp:446 +#: modules/gui/qt/components/simple_preferences.cpp:250 +#: modules/gui/qt/components/simple_preferences.cpp:447 msgid "Audio Settings" msgstr "إعدادات الصو" #: modules/gui/macosx/VLCSimplePrefsController.m:245 -#: modules/gui/qt/components/simple_preferences.cpp:251 -#: modules/gui/qt/components/simple_preferences.cpp:379 +#: modules/gui/qt/components/simple_preferences.cpp:252 +#: modules/gui/qt/components/simple_preferences.cpp:380 msgid "Video Settings" msgstr "إعدادات الڤديو" #: modules/gui/macosx/VLCSimplePrefsController.m:247 -#: modules/gui/qt/components/simple_preferences.cpp:253 -#: modules/gui/qt/components/simple_preferences.cpp:868 +#: modules/gui/qt/components/simple_preferences.cpp:254 +#: modules/gui/qt/components/simple_preferences.cpp:894 msgid "Subtitle & On Screen Display Settings" msgstr "إعدادات الترجمة والعرض على الشاشة" @@ -17563,12 +17714,12 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:289 -#: modules/gui/qt/ui/sprefs_audio.h:410 +#: modules/gui/qt/ui/sprefs_audio.h:411 msgid "Always reset audio start level to:" msgstr "صفّر مستوى بدء الصوت دائما إلى:" #: modules/gui/macosx/VLCSimplePrefsController.m:292 -#: modules/gui/qt/dialogs/vlm.cpp:492 +#: modules/gui/qt/dialogs/vlm.cpp:486 msgid "Change" msgstr "غيّر" @@ -17581,7 +17732,7 @@ msgstr "اختر إجراءً لتُغيّر المفاتيح الساخنة المربوطة به:" #: modules/gui/macosx/VLCSimplePrefsController.m:298 -#: modules/gui/qt/components/preferences_widgets.cpp:1141 +#: modules/gui/qt/components/preferences_widgets.cpp:1145 msgid "Action" msgstr "الإجراء" @@ -17607,7 +17758,7 @@ msgstr "مستوى الاختزان المبدئي" #: modules/gui/macosx/VLCSimplePrefsController.m:307 -#: modules/gui/qt/ui/open.h:263 +#: modules/gui/qt/ui/open.h:261 msgid "Caching" msgstr "الذاكرة الوسيطة" @@ -17691,7 +17842,7 @@ msgstr "" #: modules/gui/macosx/VLCSimplePrefsController.m:341 -#: modules/gui/qt/ui/sprefs_interface.h:553 +#: modules/gui/qt/ui/sprefs_interface.h:560 msgid "Privacy / Network Interaction" msgstr "" @@ -17766,7 +17917,7 @@ msgstr "اعرض الڤديو في النافذة الرئيسية" #: modules/gui/macosx/VLCSimplePrefsController.m:370 -#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:178 +#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:181 msgid "Pause the video playback when minimized" msgstr "ألبِث تشغيل الڤديو عند التصغير" @@ -17952,12 +18103,12 @@ msgstr ".ثا" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:50 -#: modules/gui/qt/components/extended_panels.cpp:1412 modules/gui/qt/qt.cpp:213 +#: modules/gui/qt/components/extended_panels.cpp:1442 modules/gui/qt/qt.cpp:216 msgid "Audio/Video" msgstr "صوت/ڤديو" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:51 -#: modules/gui/qt/components/extended_panels.cpp:1416 +#: modules/gui/qt/components/extended_panels.cpp:1446 msgid "Audio track synchronization:" msgstr "" @@ -17966,12 +18117,12 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:54 -#: modules/gui/qt/components/extended_panels.cpp:1424 +#: modules/gui/qt/components/extended_panels.cpp:1454 msgid "Subtitles/Video" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:55 -#: modules/gui/qt/components/extended_panels.cpp:1428 +#: modules/gui/qt/components/extended_panels.cpp:1458 msgid "Subtitle track synchronization:" msgstr "" @@ -17980,31 +18131,31 @@ msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:58 -#: modules/gui/qt/components/extended_panels.cpp:1435 +#: modules/gui/qt/components/extended_panels.cpp:1465 msgid "Subtitle speed:" msgstr "سرعة الترجمة:" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:60 -#: modules/gui/qt/components/extended_panels.cpp:1449 +#: modules/gui/qt/components/extended_panels.cpp:1479 msgid "Subtitle duration factor:" msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:68 -#: modules/gui/qt/components/extended_panels.cpp:1560 +#: modules/gui/qt/components/extended_panels.cpp:1590 msgid "" "Extend subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:72 -#: modules/gui/qt/components/extended_panels.cpp:1565 +#: modules/gui/qt/components/extended_panels.cpp:1595 msgid "" "Multiply subtitle duration by this value.\n" "Set 0 to disable." msgstr "" #: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:76 -#: modules/gui/qt/components/extended_panels.cpp:1570 +#: modules/gui/qt/components/extended_panels.cpp:1600 msgid "" "Recalculate subtitle duration according\n" "to their content and this value.\n" @@ -18393,17 +18544,17 @@ " By default, interface resize to the native video size." msgstr "" -#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:180 +#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:183 msgid "" "With this option enabled, the playback will be automatically paused when " "minimizing the window." msgstr "" -#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:182 +#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:185 msgid "Allow automatic icon changes" msgstr "" -#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:184 +#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:187 msgid "" "This option allows the interface to change its icon on various occasions." msgstr "" @@ -18461,21 +18612,21 @@ "open one of those, playback will continue." msgstr "" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:206 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:209 msgid "Ask" msgstr "اسأل‎" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/keystore/keychain.m:50 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/keystore/keychain.m:50 msgid "Always" msgstr "دائما" -#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:200 -#: modules/gui/qt/qt.cpp:206 modules/gui/qt/qt.cpp:213 +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/gui/qt/qt.cpp:216 msgid "Never" msgstr "أبدا " -#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:186 +#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:189 msgid "Maximum Volume displayed" msgstr "" @@ -18820,27 +18971,27 @@ msgid "Find: %s" msgstr "" -#: modules/gui/qt/components/controller.cpp:343 +#: modules/gui/qt/components/controller.cpp:352 msgid "Shift+L" msgstr "" -#: modules/gui/qt/components/controller.cpp:448 +#: modules/gui/qt/components/controller.cpp:457 msgid "Click to toggle between loop all, loop one and no loop" msgstr "" -#: modules/gui/qt/components/controller.cpp:549 +#: modules/gui/qt/components/controller.cpp:558 msgid "Previous Chapter/Title" msgstr "" -#: modules/gui/qt/components/controller.cpp:555 +#: modules/gui/qt/components/controller.cpp:564 msgid "Next Chapter/Title" msgstr "الفصل/العنوان التالي" -#: modules/gui/qt/components/controller.cpp:604 +#: modules/gui/qt/components/controller.cpp:613 msgid "Teletext Activation" msgstr "" -#: modules/gui/qt/components/controller.cpp:620 +#: modules/gui/qt/components/controller.cpp:629 msgid "Toggle Transparency" msgstr "" @@ -18959,7 +19110,7 @@ msgstr "الوسيط التالي في قائمة التشغيل" #: modules/gui/qt/components/controller.hpp:126 -#: modules/gui/qt/components/open_panels.cpp:259 +#: modules/gui/qt/components/open_panels.cpp:241 msgid "Open subtitle file" msgstr "افتح ملف ترجمة" @@ -19006,21 +19157,21 @@ msgid "No EPG Data Available" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:380 #: modules/gui/qt/components/extended_panels.cpp:393 +#: modules/gui/qt/components/extended_panels.cpp:406 msgid "Image Files" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:382 modules/spu/logo.c:49 +#: modules/gui/qt/components/extended_panels.cpp:395 modules/spu/logo.c:49 msgid "Logo filenames" msgstr "شعار أسماءملف" -#: modules/gui/qt/components/extended_panels.cpp:395 +#: modules/gui/qt/components/extended_panels.cpp:408 #: modules/video_filter/erase.c:55 msgid "Image mask" msgstr "قناع الصورة" -#: modules/gui/qt/components/extended_panels.cpp:645 +#: modules/gui/qt/components/extended_panels.cpp:658 msgid "" "No v4l2 instance found.\n" "Please check that the device has been opened with VLC and is playing.\n" @@ -19028,133 +19179,133 @@ "Controls will automatically appear here." msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1107 -#: modules/gui/qt/components/extended_panels.cpp:1108 -#: modules/gui/qt/components/extended_panels.cpp:1109 -#: modules/gui/qt/components/extended_panels.cpp:1110 -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1112 -#: modules/gui/qt/components/extended_panels.cpp:1113 -#: modules/gui/qt/components/extended_panels.cpp:1114 -#: modules/gui/qt/components/extended_panels.cpp:1115 -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1120 -#: modules/gui/qt/components/extended_panels.cpp:1121 -#: modules/gui/qt/components/extended_panels.cpp:1122 -#: modules/gui/qt/components/extended_panels.cpp:1123 -#: modules/gui/qt/components/extended_panels.cpp:1124 -#: modules/gui/qt/components/extended_panels.cpp:1125 -#: modules/gui/qt/components/extended_panels.cpp:1126 -#: modules/gui/qt/components/extended_panels.cpp:1127 -#: modules/gui/qt/components/extended_panels.cpp:1128 -#: modules/gui/qt/components/extended_panels.cpp:1129 #: modules/gui/qt/components/extended_panels.cpp:1132 -#: modules/gui/qt/components/extended_panels.cpp:1298 -#: modules/gui/qt/components/extended_panels.cpp:1300 -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1133 +#: modules/gui/qt/components/extended_panels.cpp:1134 +#: modules/gui/qt/components/extended_panels.cpp:1135 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1137 +#: modules/gui/qt/components/extended_panels.cpp:1138 +#: modules/gui/qt/components/extended_panels.cpp:1139 +#: modules/gui/qt/components/extended_panels.cpp:1140 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1145 +#: modules/gui/qt/components/extended_panels.cpp:1146 +#: modules/gui/qt/components/extended_panels.cpp:1147 +#: modules/gui/qt/components/extended_panels.cpp:1148 +#: modules/gui/qt/components/extended_panels.cpp:1149 +#: modules/gui/qt/components/extended_panels.cpp:1150 +#: modules/gui/qt/components/extended_panels.cpp:1151 +#: modules/gui/qt/components/extended_panels.cpp:1152 +#: modules/gui/qt/components/extended_panels.cpp:1153 +#: modules/gui/qt/components/extended_panels.cpp:1154 +#: modules/gui/qt/components/extended_panels.cpp:1157 +#: modules/gui/qt/components/extended_panels.cpp:1328 +#: modules/gui/qt/components/extended_panels.cpp:1330 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "dB" msgstr "dB" -#: modules/gui/qt/components/extended_panels.cpp:1108 +#: modules/gui/qt/components/extended_panels.cpp:1133 msgid "170 Hz" msgstr "١٧٠ هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1109 +#: modules/gui/qt/components/extended_panels.cpp:1134 msgid "310 Hz" msgstr "٣١٠ هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1110 +#: modules/gui/qt/components/extended_panels.cpp:1135 msgid "600 Hz" msgstr "٦٠٠ هرت" -#: modules/gui/qt/components/extended_panels.cpp:1111 -#: modules/gui/qt/components/extended_panels.cpp:1125 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1150 msgid "1 KHz" msgstr "١ ك.هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1112 +#: modules/gui/qt/components/extended_panels.cpp:1137 msgid "3 KHz" msgstr "٣ ك.هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1113 +#: modules/gui/qt/components/extended_panels.cpp:1138 msgid "6 KHz" msgstr "٦ ك.هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1114 +#: modules/gui/qt/components/extended_panels.cpp:1139 msgid "12 KHz" msgstr "١٢ ك.هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1115 +#: modules/gui/qt/components/extended_panels.cpp:1140 msgid "14 KHz" msgstr "١٤ ك.هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1116 -#: modules/gui/qt/components/extended_panels.cpp:1129 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1154 msgid "16 KHz" msgstr "١٦ ك.هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1120 +#: modules/gui/qt/components/extended_panels.cpp:1145 msgid "31 Hz" msgstr "٣١ هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1121 +#: modules/gui/qt/components/extended_panels.cpp:1146 msgid "63 Hz" msgstr "٦٣ هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1122 +#: modules/gui/qt/components/extended_panels.cpp:1147 msgid "125 Hz" msgstr "١٢٥ هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1123 +#: modules/gui/qt/components/extended_panels.cpp:1148 msgid "250 Hz" msgstr "٢٥٠ هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1124 +#: modules/gui/qt/components/extended_panels.cpp:1149 msgid "500 Hz" msgstr "٥٠٠ هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1126 +#: modules/gui/qt/components/extended_panels.cpp:1151 msgid "2 KHz" msgstr "٢ ك.هرت" -#: modules/gui/qt/components/extended_panels.cpp:1127 +#: modules/gui/qt/components/extended_panels.cpp:1152 msgid "4 KHz" msgstr "٤ ك.هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1128 +#: modules/gui/qt/components/extended_panels.cpp:1153 msgid "8 KHz" msgstr "٨ ك.هرتز" -#: modules/gui/qt/components/extended_panels.cpp:1296 -#: modules/gui/qt/components/extended_panels.cpp:1297 +#: modules/gui/qt/components/extended_panels.cpp:1326 +#: modules/gui/qt/components/extended_panels.cpp:1327 msgid "ms" msgstr "م‌ث" -#: modules/gui/qt/components/extended_panels.cpp:1300 +#: modules/gui/qt/components/extended_panels.cpp:1330 msgid "" "Knee\n" "radius" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1301 +#: modules/gui/qt/components/extended_panels.cpp:1331 msgid "" "Makeup\n" "gain" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1354 +#: modules/gui/qt/components/extended_panels.cpp:1384 msgid "Adjust pitch" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1388 +#: modules/gui/qt/components/extended_panels.cpp:1418 msgid "(Hastened)" msgstr "" -#: modules/gui/qt/components/extended_panels.cpp:1390 +#: modules/gui/qt/components/extended_panels.cpp:1420 msgid "(Delayed)" -msgstr "" +msgstr "(تأخير)" -#: modules/gui/qt/components/extended_panels.cpp:1477 +#: modules/gui/qt/components/extended_panels.cpp:1507 msgid "Force update of this dialog's values" msgstr "" @@ -19249,142 +19400,142 @@ msgid "Overall" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:676 +#: modules/gui/qt/components/interface_widgets.cpp:683 msgid "" "Current playback speed: %1\n" "Click to adjust" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:749 +#: modules/gui/qt/components/interface_widgets.cpp:756 msgid "Revert to normal play speed" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:856 +#: modules/gui/qt/components/interface_widgets.cpp:863 msgid "Download cover art" msgstr "نزّل الغلاف الفني" -#: modules/gui/qt/components/interface_widgets.cpp:860 +#: modules/gui/qt/components/interface_widgets.cpp:867 msgid "Add cover art from file" msgstr "أضِف غلافا فنيا من ملف" -#: modules/gui/qt/components/interface_widgets.cpp:926 +#: modules/gui/qt/components/interface_widgets.cpp:933 msgid "Choose Cover Art" msgstr "اختر غلافا فنيا" -#: modules/gui/qt/components/interface_widgets.cpp:927 +#: modules/gui/qt/components/interface_widgets.cpp:934 msgid "Image Files (*.gif *.jpg *.jpeg *.png)" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:954 +#: modules/gui/qt/components/interface_widgets.cpp:961 #: modules/gui/qt/dialogs/toolbar.cpp:573 msgid "Elapsed time" msgstr "الوقت المنقضي" -#: modules/gui/qt/components/interface_widgets.cpp:958 +#: modules/gui/qt/components/interface_widgets.cpp:965 #: modules/gui/qt/dialogs/toolbar.cpp:577 msgid "Total/Remaining time" msgstr "الوقت الكلي/المتبقي" -#: modules/gui/qt/components/interface_widgets.cpp:960 +#: modules/gui/qt/components/interface_widgets.cpp:967 msgid "Click to toggle between total and remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:966 +#: modules/gui/qt/components/interface_widgets.cpp:973 msgid "Click to toggle between elapsed and remaining time" msgstr "" -#: modules/gui/qt/components/interface_widgets.cpp:968 +#: modules/gui/qt/components/interface_widgets.cpp:975 msgid "Double click to jump to a chosen time position" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:58 +#: modules/gui/qt/components/open_panels.cpp:55 msgid "Select a device or a VIDEO_TS directory" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:59 +#: modules/gui/qt/components/open_panels.cpp:56 msgid "Select a device or a VIDEO_TS folder" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:145 -#: modules/gui/qt/components/open_panels.cpp:224 +#: modules/gui/qt/components/open_panels.cpp:127 +#: modules/gui/qt/components/open_panels.cpp:206 msgid "Select one or multiple files" msgstr "اختر ملفًا أو أكثر" -#: modules/gui/qt/components/open_panels.cpp:160 +#: modules/gui/qt/components/open_panels.cpp:142 msgid "File names:" msgstr "أسماء الملف:" -#: modules/gui/qt/components/open_panels.cpp:162 -#: modules/gui/qt/ui/sprefs_interface.h:558 +#: modules/gui/qt/components/open_panels.cpp:144 +#: modules/gui/qt/ui/sprefs_interface.h:565 msgid "Filter:" msgstr "مُرشّح:" -#: modules/gui/qt/components/open_panels.cpp:367 +#: modules/gui/qt/components/open_panels.cpp:349 msgid "Eject the disc" msgstr "أخرج القرص" -#: modules/gui/qt/components/open_panels.cpp:534 +#: modules/gui/qt/components/open_panels.cpp:514 msgid "Entry" msgstr "مدخلة" -#: modules/gui/qt/components/open_panels.cpp:893 +#: modules/gui/qt/components/open_panels.cpp:873 msgid "Channels:" msgstr "القنوات:" -#: modules/gui/qt/components/open_panels.cpp:904 +#: modules/gui/qt/components/open_panels.cpp:884 msgid "Selected ports:" msgstr "المنافذة المُختارة:" -#: modules/gui/qt/components/open_panels.cpp:907 +#: modules/gui/qt/components/open_panels.cpp:887 msgid ".*" msgstr ".*" -#: modules/gui/qt/components/open_panels.cpp:914 +#: modules/gui/qt/components/open_panels.cpp:894 msgid "Use VLC pace" msgstr "استخدام سرعة VLC" -#: modules/gui/qt/components/open_panels.cpp:934 +#: modules/gui/qt/components/open_panels.cpp:914 msgid "TV - digital" msgstr "تلفاز - رقمي" -#: modules/gui/qt/components/open_panels.cpp:937 +#: modules/gui/qt/components/open_panels.cpp:917 msgid "Tuner card" msgstr "بطاقة المستقبل" -#: modules/gui/qt/components/open_panels.cpp:938 +#: modules/gui/qt/components/open_panels.cpp:918 msgid "Delivery system" msgstr "نظام التوصيل" -#: modules/gui/qt/components/open_panels.cpp:968 +#: modules/gui/qt/components/open_panels.cpp:948 msgid "Transponder/multiplex frequency" msgstr "تردد Transponder/multiplex " -#: modules/gui/qt/components/open_panels.cpp:978 +#: modules/gui/qt/components/open_panels.cpp:958 msgid "Transponder symbol rate" msgstr "" -#: modules/gui/qt/components/open_panels.cpp:1011 +#: modules/gui/qt/components/open_panels.cpp:991 msgid "Bandwidth" msgstr "عرض النطاق" -#: modules/gui/qt/components/open_panels.cpp:1055 +#: modules/gui/qt/components/open_panels.cpp:1035 msgid "TV - analog" msgstr "تلفاز - تناظرية" -#: modules/gui/qt/components/open_panels.cpp:1058 +#: modules/gui/qt/components/open_panels.cpp:1038 msgid "Device name" msgstr "إسم الجهاز" -#: modules/gui/qt/components/open_panels.cpp:1118 +#: modules/gui/qt/components/open_panels.cpp:1098 msgid "Your display will be opened and played in order to stream or save it." msgstr "سيتم فتح شاشتك وتشغيلها لدفقها أو حفظها." #. xgettext: frames per second -#: modules/gui/qt/components/open_panels.cpp:1132 +#: modules/gui/qt/components/open_panels.cpp:1112 msgid " f/s" msgstr "إطار/ث" -#: modules/gui/qt/components/open_panels.cpp:1347 +#: modules/gui/qt/components/open_panels.cpp:1327 msgid "Advanced Options" msgstr "خيارت متقدمة" @@ -19416,11 +19567,11 @@ msgid "Internet" msgstr "الشابكة" -#: modules/gui/qt/components/playlist/selector.cpp:443 +#: modules/gui/qt/components/playlist/selector.cpp:456 msgid "Remove this podcast subscription" msgstr "قم بإزالة اشتراك البودكاست هذا" -#: modules/gui/qt/components/playlist/selector.cpp:594 +#: modules/gui/qt/components/playlist/selector.cpp:607 msgid "Do you really want to unsubscribe from %1?" msgstr "" @@ -19460,35 +19611,35 @@ msgid "Enter a new name for the folder:" msgstr "أدخِل اسما جديدا للمجلد:" -#: modules/gui/qt/components/playlist/standardpanel.cpp:254 +#: modules/gui/qt/components/playlist/standardpanel.cpp:255 msgid "Sort by" msgstr "افرز بِ‍" -#: modules/gui/qt/components/playlist/standardpanel.cpp:261 +#: modules/gui/qt/components/playlist/standardpanel.cpp:262 msgid "Ascending" msgstr "تصاعديا" -#: modules/gui/qt/components/playlist/standardpanel.cpp:265 +#: modules/gui/qt/components/playlist/standardpanel.cpp:266 msgid "Descending" msgstr "تنازليا" -#: modules/gui/qt/components/playlist/standardpanel.cpp:278 +#: modules/gui/qt/components/playlist/standardpanel.cpp:279 msgid "Display size" msgstr "مقاس العرض" -#: modules/gui/qt/components/playlist/standardpanel.cpp:279 +#: modules/gui/qt/components/playlist/standardpanel.cpp:280 msgid "Increase" msgstr "زِد" -#: modules/gui/qt/components/playlist/standardpanel.cpp:280 +#: modules/gui/qt/components/playlist/standardpanel.cpp:281 msgid "Decrease" msgstr "أنقِص" -#: modules/gui/qt/components/playlist/standardpanel.cpp:413 +#: modules/gui/qt/components/playlist/standardpanel.cpp:414 msgid "Playlist View Mode" msgstr "وضع منظور قائمة التشغيل" -#: modules/gui/qt/components/playlist/standardpanel.cpp:592 +#: modules/gui/qt/components/playlist/standardpanel.cpp:593 msgid "" "Playlist is currently empty.\n" "Drop a file here or select a media source from the left." @@ -19516,7 +19667,7 @@ msgid "Select File" msgstr "اختر ملفا" -#: modules/gui/qt/components/preferences_widgets.cpp:1125 +#: modules/gui/qt/components/preferences_widgets.cpp:1129 msgid "" "Select or double click an action to change the associated hotkey. Use delete " "key to remove hotkeys." @@ -19524,85 +19675,85 @@ "حدّد إجراءً أو انقره مرتين لتغيير مفتاح الاختصار المرتبط به. استخدم مفتاح " "Delete لإزالة الاختصار." -#: modules/gui/qt/components/preferences_widgets.cpp:1132 +#: modules/gui/qt/components/preferences_widgets.cpp:1136 msgid "in" msgstr "في" -#: modules/gui/qt/components/preferences_widgets.cpp:1134 +#: modules/gui/qt/components/preferences_widgets.cpp:1138 msgid "Any field" msgstr "أي حقل" -#: modules/gui/qt/components/preferences_widgets.cpp:1135 +#: modules/gui/qt/components/preferences_widgets.cpp:1139 msgid "Actions" msgstr "الإجراءات" -#: modules/gui/qt/components/preferences_widgets.cpp:1142 +#: modules/gui/qt/components/preferences_widgets.cpp:1146 msgid "Hotkey" msgstr "مفتاح الاختصار" -#: modules/gui/qt/components/preferences_widgets.cpp:1143 +#: modules/gui/qt/components/preferences_widgets.cpp:1147 msgid "Application level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1144 -#: modules/gui/qt/components/preferences_widgets.cpp:1401 +#: modules/gui/qt/components/preferences_widgets.cpp:1148 +#: modules/gui/qt/components/preferences_widgets.cpp:1405 msgid "Global" msgstr "عمومي" -#: modules/gui/qt/components/preferences_widgets.cpp:1145 +#: modules/gui/qt/components/preferences_widgets.cpp:1149 msgid "Desktop level hotkey" msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1225 -#: modules/gui/qt/components/preferences_widgets.cpp:1226 +#: modules/gui/qt/components/preferences_widgets.cpp:1229 +#: modules/gui/qt/components/preferences_widgets.cpp:1230 msgid "" "Double click to change.\n" "Delete key to remove." msgstr "" -#: modules/gui/qt/components/preferences_widgets.cpp:1402 +#: modules/gui/qt/components/preferences_widgets.cpp:1406 msgid "Hotkey change" msgstr "تغيّر مفتاح الاختصار" -#: modules/gui/qt/components/preferences_widgets.cpp:1406 +#: modules/gui/qt/components/preferences_widgets.cpp:1410 msgid "Press the new key or combination for " msgstr "اضغط المفتاح الجديد أو تجميعة المفاتيح لِ‍ " -#: modules/gui/qt/components/preferences_widgets.cpp:1415 +#: modules/gui/qt/components/preferences_widgets.cpp:1419 msgid "Assign" msgstr "أسنِد" -#: modules/gui/qt/components/preferences_widgets.cpp:1450 +#: modules/gui/qt/components/preferences_widgets.cpp:1454 msgid "Warning: this key or combination is already assigned to " msgstr "تحذير: هذا المفتاح أو هذه التجميعة مُسندة بالفعل بِ‍ " -#: modules/gui/qt/components/preferences_widgets.cpp:1462 +#: modules/gui/qt/components/preferences_widgets.cpp:1466 msgid "Warning: %1 is already an application menu shortcut" msgstr "تحذير: %1 اختصار قائمة تطبيق بالفعل" -#: modules/gui/qt/components/preferences_widgets.cpp:1485 +#: modules/gui/qt/components/preferences_widgets.cpp:1489 msgid "Key or combination: " msgstr "المفتاح أو التجميعة: " -#: modules/gui/qt/components/preferences_widgets.cpp:1494 +#: modules/gui/qt/components/preferences_widgets.cpp:1498 msgid "Key: " msgstr "المفتاح: " -#: modules/gui/qt/components/simple_preferences.cpp:255 -#: modules/gui/qt/components/simple_preferences.cpp:628 +#: modules/gui/qt/components/simple_preferences.cpp:256 +#: modules/gui/qt/components/simple_preferences.cpp:636 msgid "Input & Codecs Settings" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:257 -#: modules/gui/qt/components/simple_preferences.cpp:912 +#: modules/gui/qt/components/simple_preferences.cpp:258 +#: modules/gui/qt/components/simple_preferences.cpp:938 msgid "Configure Hotkeys" msgstr "اضبط مفاتيح الاختصارات" -#: modules/gui/qt/components/simple_preferences.cpp:454 +#: modules/gui/qt/components/simple_preferences.cpp:455 msgid "Device:" msgstr "الجهاز:" -#: modules/gui/qt/components/simple_preferences.cpp:633 +#: modules/gui/qt/components/simple_preferences.cpp:641 msgid "" "If this property is blank, different values\n" "for DVD, VCD, and CDDA are set.\n" @@ -19610,57 +19761,57 @@ "individually in the advanced preferences." msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:701 +#: modules/gui/qt/components/simple_preferences.cpp:712 msgid "Lowest latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:704 +#: modules/gui/qt/components/simple_preferences.cpp:715 msgid "High latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:705 +#: modules/gui/qt/components/simple_preferences.cpp:716 msgid "Higher latency" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:753 +#: modules/gui/qt/components/simple_preferences.cpp:764 msgid "This is VLC's skinnable interface. You can download other skins at" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:755 +#: modules/gui/qt/components/simple_preferences.cpp:766 msgid "VLC skins website" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:779 +#: modules/gui/qt/components/simple_preferences.cpp:794 msgid "System's default" msgstr "مبدئيات النظام" -#: modules/gui/qt/components/simple_preferences.cpp:1317 +#: modules/gui/qt/components/simple_preferences.cpp:1344 msgid "File associations" msgstr "ارتباطات الملفات" -#: modules/gui/qt/components/simple_preferences.cpp:1326 +#: modules/gui/qt/components/simple_preferences.cpp:1353 #: modules/gui/qt/dialogs_provider.hpp:42 msgid "Audio Files" msgstr "ملفات الصوت" -#: modules/gui/qt/components/simple_preferences.cpp:1327 +#: modules/gui/qt/components/simple_preferences.cpp:1354 #: modules/gui/qt/dialogs_provider.hpp:41 msgid "Video Files" msgstr "ملفات الڤديو" -#: modules/gui/qt/components/simple_preferences.cpp:1328 +#: modules/gui/qt/components/simple_preferences.cpp:1355 #: modules/gui/qt/dialogs_provider.hpp:43 msgid "Playlist Files" msgstr "ملفات قوائم التشغيل" -#: modules/gui/qt/components/simple_preferences.cpp:1393 +#: modules/gui/qt/components/simple_preferences.cpp:1420 msgid "&Apply" msgstr "" -#: modules/gui/qt/components/simple_preferences.cpp:1394 +#: modules/gui/qt/components/simple_preferences.cpp:1421 #: modules/gui/qt/dialogs/convert.cpp:137 -#: modules/gui/qt/dialogs/gototime.cpp:49 modules/gui/qt/dialogs/open.cpp:108 -#: modules/gui/qt/dialogs/openurl.cpp:60 +#: modules/gui/qt/dialogs/gototime.cpp:48 modules/gui/qt/dialogs/open.cpp:109 +#: modules/gui/qt/dialogs/openurl.cpp:59 #: modules/gui/qt/dialogs/podcast_configuration.cpp:37 #: modules/gui/qt/dialogs/preferences.cpp:97 #: modules/gui/qt/dialogs/toolbar.cpp:198 @@ -19704,85 +19855,85 @@ msgid "You must set a name for the profile." msgstr "يجب عليك تحديد اسم لهذا الطور." -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Directory" msgstr "ملف/دليل" -#: modules/gui/qt/components/sout/sout_widgets.cpp:40 +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 msgid "File/Folder" msgstr "ملف/مجلد" -#: modules/gui/qt/components/sout/sout_widgets.cpp:47 +#: modules/gui/qt/components/sout/sout_widgets.cpp:48 #: modules/gui/qt/ui/sout.h:199 msgid "Source" msgstr "المصدر" -#: modules/gui/qt/components/sout/sout_widgets.cpp:50 +#: modules/gui/qt/components/sout/sout_widgets.cpp:51 msgid "Source:" msgstr "المصدر:" -#: modules/gui/qt/components/sout/sout_widgets.cpp:59 +#: modules/gui/qt/components/sout/sout_widgets.cpp:60 msgid "Type:" msgstr "النوع:" -#: modules/gui/qt/components/sout/sout_widgets.cpp:127 +#: modules/gui/qt/components/sout/sout_widgets.cpp:128 msgid "This module writes the transcoded stream to a file." msgstr "هذه الوحدة تكتب التيار المُحوَّل ترميزه نحو ملف." -#: modules/gui/qt/components/sout/sout_widgets.cpp:129 +#: modules/gui/qt/components/sout/sout_widgets.cpp:130 msgid "Filename" msgstr "إسم الملف" -#: modules/gui/qt/components/sout/sout_widgets.cpp:173 +#: modules/gui/qt/components/sout/sout_widgets.cpp:174 #: modules/gui/qt/dialogs/convert.cpp:161 msgid "Save file..." msgstr "...حفظ ملف" -#: modules/gui/qt/components/sout/sout_widgets.cpp:174 +#: modules/gui/qt/components/sout/sout_widgets.cpp:175 msgid "" "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" msgstr "" "‫الحاويات (‪*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm‬)‬" -#: modules/gui/qt/components/sout/sout_widgets.cpp:184 +#: modules/gui/qt/components/sout/sout_widgets.cpp:185 msgid "This module outputs the transcoded stream to a network via HTTP." msgstr "هذه الوحدة تخرج التيار المُحوَّل ترميزه نحو الشبكة عبر HTTP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:186 -#: modules/gui/qt/components/sout/sout_widgets.cpp:282 +#: modules/gui/qt/components/sout/sout_widgets.cpp:187 +#: modules/gui/qt/components/sout/sout_widgets.cpp:283 msgid "Path" msgstr "مسار" -#: modules/gui/qt/components/sout/sout_widgets.cpp:238 +#: modules/gui/qt/components/sout/sout_widgets.cpp:239 msgid "" "This module outputs the transcoded stream to a network via the mms protocol." msgstr "هذه الوحدة تخرج التيار المُحوَّل ترميزه نحو الشبكة عبر بروتوكول mms." -#: modules/gui/qt/components/sout/sout_widgets.cpp:280 +#: modules/gui/qt/components/sout/sout_widgets.cpp:281 msgid "This module outputs the transcoded stream to a network via RTSP." msgstr "هذه الوحدة تخرج التيار المُحوَّل ترميزه نحو الشبكة عبر RTSP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:326 +#: modules/gui/qt/components/sout/sout_widgets.cpp:327 msgid "This module outputs the transcoded stream to a network via UDP." msgstr "هذه الوحدة تخرج التيار المُحوَّل ترميزه نحو الشبكة عبر UDP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:368 +#: modules/gui/qt/components/sout/sout_widgets.cpp:369 msgid "This module outputs the transcoded stream to a network via RTP." msgstr "هذه الوحدة تخرج التيار المُحوَّل ترميزه نحو الشبكة عبر RTP." -#: modules/gui/qt/components/sout/sout_widgets.cpp:375 +#: modules/gui/qt/components/sout/sout_widgets.cpp:376 msgid "Base port" msgstr "" -#: modules/gui/qt/components/sout/sout_widgets.cpp:423 +#: modules/gui/qt/components/sout/sout_widgets.cpp:424 msgid "This module outputs the transcoded stream to an Icecast server." msgstr "هذه الوحدة تخرج التيار المُحوَّل ترميزه نحو الشبكة عبر خادم Icecast." -#: modules/gui/qt/components/sout/sout_widgets.cpp:442 +#: modules/gui/qt/components/sout/sout_widgets.cpp:443 msgid "Mount Point" msgstr "نقطة الضمّ" -#: modules/gui/qt/components/sout/sout_widgets.cpp:443 +#: modules/gui/qt/components/sout/sout_widgets.cpp:444 msgid "Login:pass" msgstr "" @@ -19808,13 +19959,13 @@ #: modules/gui/qt/dialogs/bookmarks.cpp:62 modules/gui/qt/dialogs/epg.cpp:92 #: modules/gui/qt/dialogs/errors.cpp:49 modules/gui/qt/dialogs/extended.cpp:130 -#: modules/gui/qt/dialogs/help.cpp:66 modules/gui/qt/dialogs/help.cpp:212 +#: modules/gui/qt/dialogs/help.cpp:64 modules/gui/qt/dialogs/help.cpp:223 #: modules/gui/qt/dialogs/mediainfo.cpp:80 -#: modules/gui/qt/dialogs/messages.cpp:84 modules/gui/qt/dialogs/plugins.cpp:94 -#: modules/gui/qt/dialogs/plugins.cpp:1438 -#: modules/gui/qt/dialogs/plugins.cpp:1551 +#: modules/gui/qt/dialogs/messages.cpp:81 modules/gui/qt/dialogs/plugins.cpp:93 +#: modules/gui/qt/dialogs/plugins.cpp:1437 +#: modules/gui/qt/dialogs/plugins.cpp:1550 #: modules/gui/qt/dialogs/podcast_configuration.cpp:36 -#: modules/gui/qt/dialogs/vlm.cpp:136 +#: modules/gui/qt/dialogs/vlm.cpp:130 msgid "&Close" msgstr "أغ&لق" @@ -19834,7 +19985,7 @@ msgid "Destination" msgstr "المقصد" -#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:413 +#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:414 msgid "Destination file:" msgstr "الملف المقصد:" @@ -19874,16 +20025,16 @@ msgid "Containers" msgstr "الحاويات" -#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:431 +#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:434 msgid "Program Guide" msgstr "دليل البرنامج" -#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:286 -#: modules/gui/qt/ui/about.h:287 +#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:283 +#: modules/gui/qt/ui/about.h:284 msgid "Update" msgstr "حَدِّث" -#: modules/gui/qt/dialogs/epg.cpp:161 +#: modules/gui/qt/dialogs/epg.cpp:162 msgid " (%1+ rated)" msgstr "" @@ -19920,7 +20071,7 @@ msgid "&Save" msgstr "ا&حفظ" -#: modules/gui/qt/dialogs/external.cpp:216 +#: modules/gui/qt/dialogs/external.cpp:218 msgid "Store the Password" msgstr "" @@ -19959,60 +20110,60 @@ msgid "Regularly check for VLC updates" msgstr "" -#: modules/gui/qt/dialogs/gototime.cpp:42 +#: modules/gui/qt/dialogs/gototime.cpp:41 msgid "Go to Time" msgstr "انتقل إلى" -#: modules/gui/qt/dialogs/gototime.cpp:48 +#: modules/gui/qt/dialogs/gototime.cpp:47 msgid "&Go" msgstr "ا&ذهب" -#: modules/gui/qt/dialogs/gototime.cpp:56 +#: modules/gui/qt/dialogs/gototime.cpp:55 msgid "Go to time" msgstr "انتقل إلى" -#: modules/gui/qt/dialogs/help.cpp:86 modules/gui/qt/dialogs/plugins.cpp:1376 -#: modules/gui/qt/dialogs/plugins.cpp:1459 +#: modules/gui/qt/dialogs/help.cpp:84 modules/gui/qt/dialogs/plugins.cpp:1375 +#: modules/gui/qt/dialogs/plugins.cpp:1458 msgid "About" msgstr "عن" -#: modules/gui/qt/dialogs/help.cpp:94 +#: modules/gui/qt/dialogs/help.cpp:101 msgid "" "

VLC media player is a free and open source media player, encoder, and " "streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " "essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:214 +#: modules/gui/qt/dialogs/help.cpp:225 msgid "&Recheck version" msgstr "" -#: modules/gui/qt/dialogs/help.cpp:217 +#: modules/gui/qt/dialogs/help.cpp:228 msgid "&Yes" msgstr "&نعم" -#: modules/gui/qt/dialogs/help.cpp:219 +#: modules/gui/qt/dialogs/help.cpp:230 msgid "&No" msgstr "&لا" -#: modules/gui/qt/dialogs/help.cpp:222 modules/gui/qt/ui/update.h:144 +#: modules/gui/qt/dialogs/help.cpp:233 modules/gui/qt/ui/update.h:144 msgid "VLC media player updates" msgstr "تحديثات مشغل الوسائط VLC" -#: modules/gui/qt/dialogs/help.cpp:294 +#: modules/gui/qt/dialogs/help.cpp:305 msgid "A new version of VLC (%1.%2.%3%4) is available." msgstr "يوجد إصدار متاح وحديث لـ VLC (%1.%2.%3%4)‎." -#: modules/gui/qt/dialogs/help.cpp:319 +#: modules/gui/qt/dialogs/help.cpp:330 msgid "You have the latest version of VLC media player." msgstr "لديك آخر نسخة من مشغل الوسائط VLC." -#: modules/gui/qt/dialogs/help.cpp:326 +#: modules/gui/qt/dialogs/help.cpp:337 msgid "An error occurred while checking for updates..." msgstr "حدث خطأ أثناء التحقق من التحديثات..." @@ -20044,23 +20195,23 @@ msgid "Location:" msgstr "الموقع:" -#: modules/gui/qt/dialogs/messages.cpp:91 +#: modules/gui/qt/dialogs/messages.cpp:88 msgid "Saves all the displayed logs to a file" msgstr "يحفظ كل السجلات المعروضة إلى ملف" -#: modules/gui/qt/dialogs/messages.cpp:259 +#: modules/gui/qt/dialogs/messages.cpp:256 msgid "Save log file as..." msgstr "احفظ ملف السجل كـ..." -#: modules/gui/qt/dialogs/messages.cpp:261 +#: modules/gui/qt/dialogs/messages.cpp:258 msgid "Texts/Logs (*.log *.txt);; All (*.*)" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:267 +#: modules/gui/qt/dialogs/messages.cpp:264 msgid "Application" msgstr "تطبيق" -#: modules/gui/qt/dialogs/messages.cpp:268 +#: modules/gui/qt/dialogs/messages.cpp:265 msgid "" "Cannot write to file %1:\n" "%2." @@ -20068,74 +20219,74 @@ "تعذّرت الكتابة إلى الملف %1:\n" "%2." -#: modules/gui/qt/dialogs/messages.cpp:334 +#: modules/gui/qt/dialogs/messages.cpp:331 msgid "Update the tree" msgstr "" -#: modules/gui/qt/dialogs/messages.cpp:335 +#: modules/gui/qt/dialogs/messages.cpp:332 msgid "Clear the messages" msgstr "امسح الرسائل" -#: modules/gui/qt/dialogs/open.cpp:78 modules/gui/qt/menus.cpp:935 -#: modules/gui/qt/menus.cpp:1132 +#: modules/gui/qt/dialogs/open.cpp:79 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:1137 msgid "Open Media" msgstr "افتح وسيطا" -#: modules/gui/qt/dialogs/open.cpp:90 +#: modules/gui/qt/dialogs/open.cpp:91 msgid "&File" msgstr "&ملف" -#: modules/gui/qt/dialogs/open.cpp:92 +#: modules/gui/qt/dialogs/open.cpp:93 msgid "&Disc" msgstr "أس&طوانة" -#: modules/gui/qt/dialogs/open.cpp:94 +#: modules/gui/qt/dialogs/open.cpp:95 msgid "&Network" msgstr "&شبكة" -#: modules/gui/qt/dialogs/open.cpp:96 +#: modules/gui/qt/dialogs/open.cpp:97 msgid "Capture &Device" msgstr "جهاز الت&قاط" -#: modules/gui/qt/dialogs/open.cpp:111 +#: modules/gui/qt/dialogs/open.cpp:112 msgid "&Select" msgstr "ا&ختر" -#: modules/gui/qt/dialogs/open.cpp:115 modules/gui/qt/dialogs/open.cpp:210 -#: modules/gui/qt/dialogs/openurl.cpp:57 +#: modules/gui/qt/dialogs/open.cpp:116 modules/gui/qt/dialogs/open.cpp:211 +#: modules/gui/qt/dialogs/openurl.cpp:56 msgid "&Enqueue" msgstr "" -#: modules/gui/qt/dialogs/open.cpp:117 modules/gui/qt/dialogs/open.cpp:214 -#: modules/gui/qt/dialogs/openurl.cpp:54 modules/gui/qt/menus.cpp:824 +#: modules/gui/qt/dialogs/open.cpp:118 modules/gui/qt/dialogs/open.cpp:215 +#: modules/gui/qt/dialogs/openurl.cpp:53 modules/gui/qt/menus.cpp:829 msgid "&Play" msgstr "&شغّل" -#: modules/gui/qt/dialogs/open.cpp:119 modules/gui/qt/dialogs/open.cpp:204 +#: modules/gui/qt/dialogs/open.cpp:120 modules/gui/qt/dialogs/open.cpp:205 msgid "&Stream" msgstr "&دفّق" -#: modules/gui/qt/dialogs/open.cpp:121 +#: modules/gui/qt/dialogs/open.cpp:122 msgid "C&onvert" msgstr "&حوّل" -#: modules/gui/qt/dialogs/open.cpp:207 +#: modules/gui/qt/dialogs/open.cpp:208 msgid "C&onvert / Save" msgstr "حوّ&ل/احفظ" -#: modules/gui/qt/dialogs/openurl.cpp:47 +#: modules/gui/qt/dialogs/openurl.cpp:46 msgid "Open URL" msgstr "فتح مسار" -#: modules/gui/qt/dialogs/openurl.cpp:64 +#: modules/gui/qt/dialogs/openurl.cpp:63 msgid "Enter URL here..." msgstr "أدخل المسار هنا..." -#: modules/gui/qt/dialogs/openurl.cpp:67 +#: modules/gui/qt/dialogs/openurl.cpp:66 msgid "Please enter the URL or path to the media you want to play." msgstr "" -#: modules/gui/qt/dialogs/openurl.cpp:71 +#: modules/gui/qt/dialogs/openurl.cpp:70 msgid "" "If your clipboard contains a valid URL\n" "or the path to a file on your computer,\n" @@ -20145,42 +20296,42 @@ "أو مسارًا إلى ملف على حاسوبك،\n" "فسوف يُحدّد تلقائيًا." -#: modules/gui/qt/dialogs/plugins.cpp:80 +#: modules/gui/qt/dialogs/plugins.cpp:79 msgid "Plugins and extensions" msgstr "الملحقات والامتدادات" -#: modules/gui/qt/dialogs/plugins.cpp:88 +#: modules/gui/qt/dialogs/plugins.cpp:87 msgid "Active Extensions" msgstr "الامتدادات النشطة" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Capability" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:128 +#: modules/gui/qt/dialogs/plugins.cpp:127 msgid "Score" msgstr "مدى" -#: modules/gui/qt/dialogs/plugins.cpp:141 +#: modules/gui/qt/dialogs/plugins.cpp:140 msgid "&Search:" msgstr "اب&حث عن:" -#: modules/gui/qt/dialogs/plugins.cpp:259 -#: modules/gui/qt/dialogs/plugins.cpp:1292 +#: modules/gui/qt/dialogs/plugins.cpp:258 +#: modules/gui/qt/dialogs/plugins.cpp:1291 msgid "More information..." msgstr "معلومات أكثر..." -#: modules/gui/qt/dialogs/plugins.cpp:267 +#: modules/gui/qt/dialogs/plugins.cpp:266 msgid "Reload extensions" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:386 +#: modules/gui/qt/dialogs/plugins.cpp:385 msgid "" "Skins customize player's appearance. You can activate them through " "preferences." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:390 +#: modules/gui/qt/dialogs/plugins.cpp:389 msgid "" "Playlist parsers add new capabilities to read internet streams or extract " "meta data." @@ -20188,64 +20339,64 @@ "محلّلات قوائم التشغيل تضيف إمكانات لقراءة الدفق من الشابكة أو استخراج " "البيانات الوصفية." -#: modules/gui/qt/dialogs/plugins.cpp:394 +#: modules/gui/qt/dialogs/plugins.cpp:393 msgid "" "Service discoveries adds new sources to your playlist such as web radios, " "video websites, ..." msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:401 +#: modules/gui/qt/dialogs/plugins.cpp:400 msgid "Retrieves extra info and art for playlist items" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:404 +#: modules/gui/qt/dialogs/plugins.cpp:403 msgid "" "Extensions brings various enhancements. Check descriptions for more details" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:425 +#: modules/gui/qt/dialogs/plugins.cpp:424 msgid "Only installed" msgstr "" -#: modules/gui/qt/dialogs/plugins.cpp:531 +#: modules/gui/qt/dialogs/plugins.cpp:530 msgid "Retrieving addons..." msgstr "يجلب الإضافات..." -#: modules/gui/qt/dialogs/plugins.cpp:542 +#: modules/gui/qt/dialogs/plugins.cpp:541 msgid "No addons found" msgstr "لم يُعثر على إضافات" -#: modules/gui/qt/dialogs/plugins.cpp:821 +#: modules/gui/qt/dialogs/plugins.cpp:820 msgid "This addon has been installed manually. VLC can't manage it by itself." msgstr "ثُبّتت هذه الإضافة يدويا. لا يمكن أن يديرها VLC بنفسه." -#: modules/gui/qt/dialogs/plugins.cpp:1204 +#: modules/gui/qt/dialogs/plugins.cpp:1203 msgid "Version %1" msgstr "إصدار %1" -#: modules/gui/qt/dialogs/plugins.cpp:1232 +#: modules/gui/qt/dialogs/plugins.cpp:1231 msgid "%1 downloads" msgstr "%1 تنزيل" -#: modules/gui/qt/dialogs/plugins.cpp:1301 +#: modules/gui/qt/dialogs/plugins.cpp:1300 msgid "&Uninstall" msgstr "أ&زِل" -#: modules/gui/qt/dialogs/plugins.cpp:1304 +#: modules/gui/qt/dialogs/plugins.cpp:1303 msgid "&Install" msgstr "&ثبّت" -#: modules/gui/qt/dialogs/plugins.cpp:1399 -#: modules/gui/qt/dialogs/plugins.cpp:1502 +#: modules/gui/qt/dialogs/plugins.cpp:1398 +#: modules/gui/qt/dialogs/plugins.cpp:1501 msgid "Version" msgstr "الإصدار" -#: modules/gui/qt/dialogs/plugins.cpp:1419 -#: modules/gui/qt/dialogs/plugins.cpp:1529 +#: modules/gui/qt/dialogs/plugins.cpp:1418 +#: modules/gui/qt/dialogs/plugins.cpp:1528 msgid "Website" msgstr "الموقع" -#: modules/gui/qt/dialogs/plugins.cpp:1541 modules/gui/qt/ui/sprefs_input.h:363 +#: modules/gui/qt/dialogs/plugins.cpp:1540 modules/gui/qt/ui/sprefs_input.h:363 msgid "Files" msgstr "ملفات " @@ -20305,11 +20456,11 @@ msgid "Are you sure you want to reset your VLC media player preferences?" msgstr "أمتأكد من تصفير تفضيلات مشغّل الوسائط VLC؟" -#: modules/gui/qt/dialogs/sout.cpp:45 modules/gui/qt/ui/sout.h:198 +#: modules/gui/qt/dialogs/sout.cpp:43 modules/gui/qt/ui/sout.h:198 msgid "Stream Output" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:51 +#: modules/gui/qt/dialogs/sout.cpp:49 msgid "" "This wizard will allow you to stream or convert your media for use locally, " "on your private network, or on the Internet.\n" @@ -20317,14 +20468,14 @@ "be and then press the \"Next\" button to continue.\n" msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:58 +#: modules/gui/qt/dialogs/sout.cpp:56 msgid "" "Stream output string.\n" "This is automatically generated when you change the above settings,\n" "but you can change it manually." msgstr "" -#: modules/gui/qt/dialogs/sout.cpp:91 +#: modules/gui/qt/dialogs/sout.cpp:89 msgid "Back" msgstr "السابق" @@ -20456,67 +20607,67 @@ msgid "Speed selector" msgstr "منتقي السرع" -#: modules/gui/qt/dialogs/vlm.cpp:73 +#: modules/gui/qt/dialogs/vlm.cpp:67 msgid "Broadcast" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:74 +#: modules/gui/qt/dialogs/vlm.cpp:68 msgid "Schedule" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:75 +#: modules/gui/qt/dialogs/vlm.cpp:69 msgid "Video On Demand ( VOD )" msgstr "" -#: modules/gui/qt/dialogs/vlm.cpp:80 +#: modules/gui/qt/dialogs/vlm.cpp:74 msgid "Hours / Minutes / Seconds:" msgstr "ساعة/دقيقة/ثانية:" -#: modules/gui/qt/dialogs/vlm.cpp:82 +#: modules/gui/qt/dialogs/vlm.cpp:76 msgid "Day / Month / Year:" msgstr "يوم/شهر/سنة:" -#: modules/gui/qt/dialogs/vlm.cpp:84 +#: modules/gui/qt/dialogs/vlm.cpp:78 msgid "Repeat:" msgstr "الإعادة:" -#: modules/gui/qt/dialogs/vlm.cpp:86 +#: modules/gui/qt/dialogs/vlm.cpp:80 msgid "Repeat delay:" msgstr "تأخير الإعادة:" -#: modules/gui/qt/dialogs/vlm.cpp:111 modules/gui/qt/ui/sprefs_interface.h:555 +#: modules/gui/qt/dialogs/vlm.cpp:105 modules/gui/qt/ui/sprefs_interface.h:562 msgid " days" msgstr " أيام" -#: modules/gui/qt/dialogs/vlm.cpp:130 +#: modules/gui/qt/dialogs/vlm.cpp:124 msgid "I&mport" msgstr "ا&ستورد" -#: modules/gui/qt/dialogs/vlm.cpp:133 +#: modules/gui/qt/dialogs/vlm.cpp:127 msgid "E&xport" msgstr "&صدّر" -#: modules/gui/qt/dialogs/vlm.cpp:264 +#: modules/gui/qt/dialogs/vlm.cpp:258 msgid "Save VLM configuration as..." msgstr "احفظ ضبط VLM كَ‍..." -#: modules/gui/qt/dialogs/vlm.cpp:266 modules/gui/qt/dialogs/vlm.cpp:335 +#: modules/gui/qt/dialogs/vlm.cpp:260 modules/gui/qt/dialogs/vlm.cpp:329 msgid "VLM conf (*.vlm);;All (*)" msgstr "ضبط VLM (*.vlm);;الكل (*)" -#: modules/gui/qt/dialogs/vlm.cpp:333 +#: modules/gui/qt/dialogs/vlm.cpp:327 msgid "Open VLM configuration..." msgstr "افتح ضبط VLM..." -#: modules/gui/qt/dialogs/vlm.cpp:532 +#: modules/gui/qt/dialogs/vlm.cpp:526 msgid "Broadcast: " msgstr "بث: " -#: modules/gui/qt/dialogs/vlm.cpp:605 +#: modules/gui/qt/dialogs/vlm.cpp:599 msgid "Schedule: " msgstr "جدول: " -#: modules/gui/qt/dialogs/vlm.cpp:629 +#: modules/gui/qt/dialogs/vlm.cpp:623 msgid "VOD: " msgstr "VOD: " @@ -20574,339 +20725,339 @@ msgid "Deactivate" msgstr "" -#: modules/gui/qt/main_interface.cpp:373 +#: modules/gui/qt/main_interface.cpp:378 msgid "Do you want to restart the playback where left off?" msgstr "أتريد إعادة بدء التشغيل من حيث تركته؟" -#: modules/gui/qt/main_interface.cpp:379 +#: modules/gui/qt/main_interface.cpp:384 msgid "&Continue" msgstr "&تابِع" -#: modules/gui/qt/main_interface.cpp:1421 +#: modules/gui/qt/main_interface.cpp:1454 msgid "Control menu for the player" msgstr "قائمة التحكم بالمشغل" -#: modules/gui/qt/main_interface.cpp:1465 +#: modules/gui/qt/main_interface.cpp:1498 msgid "Paused" msgstr "مُلبث" -#: modules/gui/qt/menus.cpp:331 +#: modules/gui/qt/menus.cpp:334 msgid "&Media" msgstr "و&سيط" -#: modules/gui/qt/menus.cpp:334 +#: modules/gui/qt/menus.cpp:337 msgid "P&layback" msgstr "تش&غيل" -#: modules/gui/qt/menus.cpp:335 modules/gui/qt/menus.cpp:1050 +#: modules/gui/qt/menus.cpp:338 modules/gui/qt/menus.cpp:1055 msgid "&Audio" msgstr "&صوت" -#: modules/gui/qt/menus.cpp:336 modules/gui/qt/menus.cpp:1057 +#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1062 msgid "&Video" msgstr "ڤد&يو" -#: modules/gui/qt/menus.cpp:337 modules/gui/qt/menus.cpp:1064 +#: modules/gui/qt/menus.cpp:340 modules/gui/qt/menus.cpp:1069 msgid "Subti&tle" msgstr "ترج&مة" -#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1080 +#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1085 msgid "Tool&s" msgstr "أ&دوات" -#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1087 +#: modules/gui/qt/menus.cpp:345 modules/gui/qt/menus.cpp:1092 msgid "V&iew" msgstr "من&ظور" -#: modules/gui/qt/menus.cpp:344 modules/gui/qt/menus.cpp:788 +#: modules/gui/qt/menus.cpp:347 modules/gui/qt/menus.cpp:793 msgid "&Help" msgstr "مسا&عدة" -#: modules/gui/qt/menus.cpp:357 +#: modules/gui/qt/menus.cpp:360 msgid "Open &File..." msgstr "افتح &ملفا..." -#: modules/gui/qt/menus.cpp:359 +#: modules/gui/qt/menus.cpp:362 msgid "&Open Multiple Files..." msgstr "ا&فتح عدة ملفات..." -#: modules/gui/qt/menus.cpp:363 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:366 modules/gui/qt/menus.cpp:945 msgid "Open &Disc..." msgstr "افتح اس&طوانة..." -#: modules/gui/qt/menus.cpp:365 +#: modules/gui/qt/menus.cpp:368 msgid "Open &Network Stream..." msgstr "افتح دفق &شبكة..." -#: modules/gui/qt/menus.cpp:367 modules/gui/qt/menus.cpp:944 +#: modules/gui/qt/menus.cpp:370 modules/gui/qt/menus.cpp:949 msgid "Open &Capture Device..." msgstr "افتح جهاز الت&قاط..." -#: modules/gui/qt/menus.cpp:370 +#: modules/gui/qt/menus.cpp:373 msgid "Open &Location from clipboard" msgstr "افتح م&كانا من الحافظة" -#: modules/gui/qt/menus.cpp:374 +#: modules/gui/qt/menus.cpp:377 msgid "Open &Recent Media" msgstr "افتح وسيطا حدي&ثا" -#: modules/gui/qt/menus.cpp:387 +#: modules/gui/qt/menus.cpp:390 msgid "Conve&rt / Save..." msgstr "&حوّل/احفظ..." -#: modules/gui/qt/menus.cpp:389 +#: modules/gui/qt/menus.cpp:392 msgid "&Stream..." msgstr "دفّ&ق..." -#: modules/gui/qt/menus.cpp:394 +#: modules/gui/qt/menus.cpp:397 msgid "Quit at the end of playlist" msgstr "أنهِ عند انتهاء قائمة التشغيل" -#: modules/gui/qt/menus.cpp:401 +#: modules/gui/qt/menus.cpp:404 msgid "Close to systray" msgstr "أغلِق إلى صينية النظام" -#: modules/gui/qt/menus.cpp:405 modules/gui/qt/menus.cpp:1194 +#: modules/gui/qt/menus.cpp:408 modules/gui/qt/menus.cpp:1199 msgid "&Quit" msgstr "أن&هِ" -#: modules/gui/qt/menus.cpp:415 +#: modules/gui/qt/menus.cpp:418 msgid "&Effects and Filters" msgstr "التأ&ثيرات والمرشّحات" -#: modules/gui/qt/menus.cpp:418 +#: modules/gui/qt/menus.cpp:421 msgid "&Track Synchronization" msgstr "مزامنة الم&قطوعة" -#: modules/gui/qt/menus.cpp:437 +#: modules/gui/qt/menus.cpp:440 msgid "Plu&gins and extensions" msgstr "المل&حقات والامتدادات" -#: modules/gui/qt/menus.cpp:442 +#: modules/gui/qt/menus.cpp:445 msgid "Customi&ze Interface..." msgstr "&خصّص الواجهة..." -#: modules/gui/qt/menus.cpp:445 +#: modules/gui/qt/menus.cpp:448 msgid "&Preferences" msgstr "التف&ضيلات" -#: modules/gui/qt/menus.cpp:466 +#: modules/gui/qt/menus.cpp:469 msgid "&View" msgstr "من&ظور" -#: modules/gui/qt/menus.cpp:487 +#: modules/gui/qt/menus.cpp:490 msgid "Play&list" msgstr "قائمة الت&شغيل" -#: modules/gui/qt/menus.cpp:488 +#: modules/gui/qt/menus.cpp:491 msgid "Ctrl+L" msgstr "Ctrl+L" -#: modules/gui/qt/menus.cpp:491 +#: modules/gui/qt/menus.cpp:494 msgid "Docked Playlist" msgstr "قائمة التشغيل مرصوفة" -#: modules/gui/qt/menus.cpp:501 +#: modules/gui/qt/menus.cpp:504 msgid "Always on &top" msgstr "بالأ&على دائما" -#: modules/gui/qt/menus.cpp:509 +#: modules/gui/qt/menus.cpp:512 msgid "Mi&nimal Interface" msgstr "واجهة مبسّ&طة" -#: modules/gui/qt/menus.cpp:510 +#: modules/gui/qt/menus.cpp:513 msgid "Ctrl+H" msgstr "Ctrl+H" -#: modules/gui/qt/menus.cpp:519 +#: modules/gui/qt/menus.cpp:522 msgid "&Fullscreen Interface" msgstr "واجهة بملء ال&شاشة" -#: modules/gui/qt/menus.cpp:527 +#: modules/gui/qt/menus.cpp:530 msgid "&Advanced Controls" msgstr "التحكمات المت&قدمة" -#: modules/gui/qt/menus.cpp:534 +#: modules/gui/qt/menus.cpp:538 msgid "Status Bar" msgstr "شريطة الحالة" -#: modules/gui/qt/menus.cpp:539 +#: modules/gui/qt/menus.cpp:544 msgid "Visualizations selector" msgstr "مُحدِّد المؤثرات البصرية" -#: modules/gui/qt/menus.cpp:597 +#: modules/gui/qt/menus.cpp:602 msgid "&Increase Volume" msgstr "ار&فع مستوى الصوت" -#: modules/gui/qt/menus.cpp:600 +#: modules/gui/qt/menus.cpp:605 msgid "D&ecrease Volume" msgstr "أن&قِص مستوى الصوت" -#: modules/gui/qt/menus.cpp:603 +#: modules/gui/qt/menus.cpp:608 msgid "&Mute" msgstr "ا&كتم" -#: modules/gui/qt/menus.cpp:619 +#: modules/gui/qt/menus.cpp:624 msgid "Audio &Device" msgstr "جهاز الصوت" -#: modules/gui/qt/menus.cpp:623 +#: modules/gui/qt/menus.cpp:628 msgid "Audio &Track" msgstr "م&سار الصوت" -#: modules/gui/qt/menus.cpp:625 +#: modules/gui/qt/menus.cpp:630 msgid "&Stereo Mode" msgstr "" -#: modules/gui/qt/menus.cpp:628 +#: modules/gui/qt/menus.cpp:633 msgid "&Visualizations" msgstr "ال&تصوير البصري" -#: modules/gui/qt/menus.cpp:654 +#: modules/gui/qt/menus.cpp:659 msgid "Add &Subtitle File..." msgstr "أضِف ملف &ترجمة..." -#: modules/gui/qt/menus.cpp:656 +#: modules/gui/qt/menus.cpp:661 msgid "Sub &Track" msgstr "م&سار الترجمة" -#: modules/gui/qt/menus.cpp:678 +#: modules/gui/qt/menus.cpp:683 msgid "Video &Track" msgstr "م&سار الڤديو" -#: modules/gui/qt/menus.cpp:682 +#: modules/gui/qt/menus.cpp:687 msgid "&Fullscreen" msgstr "ملء ال&شاشة" -#: modules/gui/qt/menus.cpp:683 +#: modules/gui/qt/menus.cpp:688 msgid "Always Fit &Window" msgstr "لائِم الناف&ذة دائما" -#: modules/gui/qt/menus.cpp:684 +#: modules/gui/qt/menus.cpp:689 msgid "Set as Wall&paper" msgstr "اضبط ك&خلفية" -#: modules/gui/qt/menus.cpp:688 +#: modules/gui/qt/menus.cpp:693 msgid "&Zoom" msgstr "الت&قريب" -#: modules/gui/qt/menus.cpp:689 +#: modules/gui/qt/menus.cpp:694 msgid "&Aspect Ratio" msgstr "ال&نسبة الباعية" -#: modules/gui/qt/menus.cpp:690 +#: modules/gui/qt/menus.cpp:695 msgid "&Crop" msgstr "الاقت&صاص" -#: modules/gui/qt/menus.cpp:694 +#: modules/gui/qt/menus.cpp:699 msgid "&Deinterlace" msgstr "إل&غاء التداخل" -#: modules/gui/qt/menus.cpp:695 +#: modules/gui/qt/menus.cpp:700 msgid "&Deinterlace mode" msgstr "و&ضع إلغاء التداخل" -#: modules/gui/qt/menus.cpp:699 +#: modules/gui/qt/menus.cpp:704 msgid "Take &Snapshot" msgstr "خُذ لق&طة" -#: modules/gui/qt/menus.cpp:718 +#: modules/gui/qt/menus.cpp:723 msgid "T&itle" msgstr "ال&عنوان" -#: modules/gui/qt/menus.cpp:719 +#: modules/gui/qt/menus.cpp:724 msgid "&Chapter" msgstr "الف&صل" -#: modules/gui/qt/menus.cpp:721 +#: modules/gui/qt/menus.cpp:726 msgid "&Program" msgstr "&برنامج" -#: modules/gui/qt/menus.cpp:725 +#: modules/gui/qt/menus.cpp:730 msgid "&Manage" msgstr "أ&دِر" -#: modules/gui/qt/menus.cpp:791 +#: modules/gui/qt/menus.cpp:796 msgid "Check for &Updates..." msgstr "التمس التحدي&ثات..." -#: modules/gui/qt/menus.cpp:838 +#: modules/gui/qt/menus.cpp:843 msgid "&Stop" msgstr "أو&قِف" -#: modules/gui/qt/menus.cpp:846 +#: modules/gui/qt/menus.cpp:851 msgid "Pre&vious" msgstr "ال&سابق" -#: modules/gui/qt/menus.cpp:852 +#: modules/gui/qt/menus.cpp:857 msgid "Ne&xt" msgstr "ال&تالي" -#: modules/gui/qt/menus.cpp:870 +#: modules/gui/qt/menus.cpp:875 msgid "Sp&eed" msgstr "" -#: modules/gui/qt/menus.cpp:876 +#: modules/gui/qt/menus.cpp:881 msgid "&Faster" msgstr "أس&رع" -#: modules/gui/qt/menus.cpp:888 +#: modules/gui/qt/menus.cpp:893 msgid "N&ormal Speed" msgstr "سرعة &عادية" -#: modules/gui/qt/menus.cpp:898 +#: modules/gui/qt/menus.cpp:903 msgid "Slo&wer" msgstr "أب&طأ" -#: modules/gui/qt/menus.cpp:913 +#: modules/gui/qt/menus.cpp:918 msgid "&Jump Forward" msgstr "اق&فز أمامًا" -#: modules/gui/qt/menus.cpp:920 +#: modules/gui/qt/menus.cpp:925 msgid "Jump Bac&kward" msgstr "اقفز &خلفًا" -#: modules/gui/qt/menus.cpp:927 +#: modules/gui/qt/menus.cpp:932 msgid "Ctrl+T" msgstr "" -#: modules/gui/qt/menus.cpp:942 +#: modules/gui/qt/menus.cpp:947 msgid "Open &Network..." msgstr "افتح &شبكة..." -#: modules/gui/qt/menus.cpp:1036 +#: modules/gui/qt/menus.cpp:1041 msgid "Leave Fullscreen" msgstr "غادر ملء الشاشة" -#: modules/gui/qt/menus.cpp:1070 +#: modules/gui/qt/menus.cpp:1075 msgid "&Playback" msgstr "تش&غيل" -#: modules/gui/qt/menus.cpp:1175 +#: modules/gui/qt/menus.cpp:1180 msgid "&Hide VLC media player in taskbar" msgstr "أ&خفِ مشغّل الوسائط VLC في شريط المهام" -#: modules/gui/qt/menus.cpp:1181 +#: modules/gui/qt/menus.cpp:1186 msgid "Sho&w VLC media player" msgstr "ا&عرض مشغّل الوسائط VLC" -#: modules/gui/qt/menus.cpp:1192 +#: modules/gui/qt/menus.cpp:1197 msgid "&Open Media" msgstr "ا&فتح وسيطا" -#: modules/gui/qt/menus.cpp:1622 +#: modules/gui/qt/menus.cpp:1627 msgid "&Clear" msgstr "ام&سح" -#: modules/gui/qt/menus.cpp:1630 +#: modules/gui/qt/menus.cpp:1635 msgid "&Renderer" msgstr "ال&مصيّر" -#: modules/gui/qt/menus.cpp:1634 +#: modules/gui/qt/menus.cpp:1639 msgid "" msgstr "<المحلي>" -#: modules/gui/qt/menus.cpp:1647 +#: modules/gui/qt/menus.cpp:1652 msgid "Scanning..." msgstr "" @@ -20986,41 +21137,49 @@ msgstr "" #: modules/gui/qt/qt.cpp:124 -msgid "Activate the updates availability notification" +msgid "Enable Dark Mode" msgstr "" #: modules/gui/qt/qt.cpp:125 +msgid "Applies a dark theme to the style." +msgstr "" + +#: modules/gui/qt/qt.cpp:127 +msgid "Activate the updates availability notification" +msgstr "" + +#: modules/gui/qt/qt.cpp:128 msgid "" "Activate the automatic notification of new versions of the software. It runs " "once every two weeks." msgstr "" -#: modules/gui/qt/qt.cpp:128 +#: modules/gui/qt/qt.cpp:131 msgid "Number of days between two update checks" msgstr "" -#: modules/gui/qt/qt.cpp:130 +#: modules/gui/qt/qt.cpp:133 msgid "Ask for network policy at start" msgstr "" -#: modules/gui/qt/qt.cpp:132 +#: modules/gui/qt/qt.cpp:135 msgid "Save the recently played items in the menu" msgstr "" -#: modules/gui/qt/qt.cpp:134 +#: modules/gui/qt/qt.cpp:137 msgid "List of words separated by | to filter" msgstr "" -#: modules/gui/qt/qt.cpp:135 +#: modules/gui/qt/qt.cpp:138 msgid "" "Regular expression used to filter the recent items played in the player." msgstr "" -#: modules/gui/qt/qt.cpp:138 +#: modules/gui/qt/qt.cpp:141 msgid "Define the colors of the volume slider" msgstr "" -#: modules/gui/qt/qt.cpp:139 +#: modules/gui/qt/qt.cpp:142 msgid "" "Define the colors of the volume slider\n" "By specifying the 12 numbers separated by a ';'\n" @@ -21028,11 +21187,11 @@ "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255'" msgstr "" -#: modules/gui/qt/qt.cpp:144 +#: modules/gui/qt/qt.cpp:147 msgid "Selection of the starting mode and look" msgstr "" -#: modules/gui/qt/qt.cpp:145 +#: modules/gui/qt/qt.cpp:148 msgid "" "Start VLC with:\n" " - normal mode\n" @@ -21040,57 +21199,57 @@ " - minimal mode with limited controls" msgstr "" -#: modules/gui/qt/qt.cpp:151 +#: modules/gui/qt/qt.cpp:154 msgid "Show a controller in fullscreen mode" msgstr "اعرض متحكّمًا في وضع ملء الشاشة" -#: modules/gui/qt/qt.cpp:152 +#: modules/gui/qt/qt.cpp:155 msgid "Embed the file browser in open dialog" msgstr "ضمّن متصفح الملفات في حوار الفتح" -#: modules/gui/qt/qt.cpp:154 +#: modules/gui/qt/qt.cpp:157 msgid "Define which screen fullscreen goes" msgstr "" -#: modules/gui/qt/qt.cpp:155 +#: modules/gui/qt/qt.cpp:158 msgid "Screennumber of fullscreen, instead of same screen where interface is." msgstr "" -#: modules/gui/qt/qt.cpp:158 +#: modules/gui/qt/qt.cpp:161 msgid "Load extensions on startup" msgstr "" -#: modules/gui/qt/qt.cpp:159 +#: modules/gui/qt/qt.cpp:162 msgid "Automatically load the extensions module on startup." msgstr "" -#: modules/gui/qt/qt.cpp:162 +#: modules/gui/qt/qt.cpp:165 msgid "Start in minimal view (without menus)" msgstr "ابدأ بالمنظور المبسّط (بلا قوائم)" -#: modules/gui/qt/qt.cpp:164 +#: modules/gui/qt/qt.cpp:167 msgid "Display background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:165 +#: modules/gui/qt/qt.cpp:168 msgid "" "Display background cone or current album art when not playing. Can be " "disabled to prevent burning screen." msgstr "" -#: modules/gui/qt/qt.cpp:168 +#: modules/gui/qt/qt.cpp:171 msgid "Expanding background cone or art" msgstr "" -#: modules/gui/qt/qt.cpp:169 +#: modules/gui/qt/qt.cpp:172 msgid "Background art fits window's size." msgstr "" -#: modules/gui/qt/qt.cpp:171 +#: modules/gui/qt/qt.cpp:174 msgid "Ignore keyboard volume buttons." msgstr "" -#: modules/gui/qt/qt.cpp:173 +#: modules/gui/qt/qt.cpp:176 msgid "" "With this option checked, the volume up, volume down and mute buttons on " "your keyboard will always change your system volume. With this option " @@ -21098,41 +21257,41 @@ "and change the system volume when VLC is not selected." msgstr "" -#: modules/gui/qt/qt.cpp:188 +#: modules/gui/qt/qt.cpp:191 msgid "When to raise the interface" msgstr "" -#: modules/gui/qt/qt.cpp:189 +#: modules/gui/qt/qt.cpp:192 msgid "" "This option allows the interface to be raised automatically when a video/" "audio playback starts, or never." msgstr "" -#: modules/gui/qt/qt.cpp:192 +#: modules/gui/qt/qt.cpp:195 msgid "Fullscreen controller mouse sensitivity" msgstr "حساسيّة الفأرة على متحكّم ملء الشاش" -#: modules/gui/qt/qt.cpp:200 +#: modules/gui/qt/qt.cpp:203 msgid "When minimized" msgstr "عند التصغير" -#: modules/gui/qt/qt.cpp:218 +#: modules/gui/qt/qt.cpp:221 msgid "Qt interface" msgstr "واجهة كيوت" -#: modules/gui/qt/util/customwidgets.cpp:82 +#: modules/gui/qt/util/customwidgets.cpp:80 msgid "errors" msgstr "الأخطاء" -#: modules/gui/qt/util/customwidgets.cpp:83 +#: modules/gui/qt/util/customwidgets.cpp:81 msgid "warnings" msgstr "التحذيرات" -#: modules/gui/qt/util/customwidgets.cpp:84 +#: modules/gui/qt/util/customwidgets.cpp:82 msgid "debug" msgstr "التنقيح" -#: modules/gui/qt/util/searchlineedit.cpp:49 +#: modules/gui/qt/util/searchlineedit.cpp:50 msgctxt "Tooltip|Clear" msgid "Clear" msgstr "امسح" @@ -21232,72 +21391,76 @@ msgid "Open skin..." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:86 modules/hw/d3d9/d3d9_filters.c:68 +#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:68 #: modules/video_filter/adjust.c:61 msgid "Brightness threshold" msgstr ".عتبة الوهج" -#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:69 +#: modules/hw/d3d11/d3d11_filters.c:88 modules/hw/d3d9/d3d9_filters.c:69 #: modules/video_filter/adjust.c:62 msgid "" "When this mode is enabled, pixels will be shown as black or white. The " "threshold value will be the brightness defined below." msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:90 modules/hw/d3d9/d3d9_filters.c:72 +#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:72 #: modules/video_filter/adjust.c:65 msgid "Image contrast (0-2)" msgstr "( تباين الصورة(0-2" -#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:73 +#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:73 #: modules/video_filter/adjust.c:66 msgid "Set the image contrast, between 0 and 2. Defaults to 1." msgstr ".مجموعة صورة مقارنة بين 0 و 2. التقصير الى 1" -#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:74 +#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:74 msgid "Image hue (0-360)" msgstr " (تدرج لون الصورة(0-360" -#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:75 +#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:75 msgid "Set the image hue, between 0 and 360. Defaults to 0." msgstr "مجموعة صورة الشكل ، بين 0 و 360. 0 الى التقصير. " -#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:76 +#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:76 #: modules/video_filter/adjust.c:69 msgid "Image saturation (0-3)" msgstr " (اشباع الصورة(0-3" -#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:77 +#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:77 #: modules/video_filter/adjust.c:70 msgid "Set the image saturation, between 0 and 3. Defaults to 1." msgstr ".مجموعة صورة الاشباع ، بين 0 و 3. التقصير الى 1" -#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:78 +#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:78 #: modules/video_filter/adjust.c:71 msgid "Image brightness (0-2)" msgstr "اضاءة الصورة(0-2)" -#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:79 +#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:79 #: modules/video_filter/adjust.c:72 msgid "Set the image brightness, between 0 and 2. Defaults to 1." msgstr "مجموعة صورة السطوح بين 0 و 2. التقصير الى 1. " -#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:80 +#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:80 #: modules/video_filter/adjust.c:73 msgid "Image gamma (0-10)" msgstr " (جاما الصورة(0-10" -#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:81 +#: modules/hw/d3d11/d3d11_filters.c:100 modules/hw/d3d9/d3d9_filters.c:81 #: modules/video_filter/adjust.c:74 msgid "Set the image gamma, between 0.01 and 10. Defaults to 1." msgstr ".مجموعة صورة غاما ، وبين 0.01 و 10. التقصير الى 1" -#: modules/hw/d3d11/d3d11_filters.c:670 +#: modules/hw/d3d11/d3d11_filters.c:681 msgid "AMD VQ Enhancer" msgstr "" -#: modules/hw/d3d11/d3d11_filters.c:671 -msgid "amf_vqenhancer" +#: modules/hw/d3d11/d3d11_filters.c:687 +msgid "AMD Frame Rate Doubler" +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:690 +msgid "Show indicator" msgstr "" #: modules/hw/d3d9/d3d9_filters.c:454 @@ -21678,11 +21841,11 @@ msgid "System logger (syslog)" msgstr "" -#: modules/lua/extension.c:1194 +#: modules/lua/extension.c:1200 msgid "Extension not responding!" msgstr "" -#: modules/lua/extension.c:1195 +#: modules/lua/extension.c:1201 #, c-format msgid "" "Extension '%s' does not respond.\n" @@ -21710,8 +21873,8 @@ #: modules/lua/vlc.c:53 msgid "" -"Lua interface configuration string. Format is: '[\"\"] = {

Welcome to VLC media player Help

Documentation

You can find VLC documentation on VideoLAN's wiki website.

If you are a " +"newcomer to VLC media player, please read the
Introduction to VLC media " +"player.

You will find some information on how to use the " +"player in the
\"How to play files with VLC media player\" document." +"

For all the saving, converting, transcoding, encoding, muxing and " +"streaming tasks, you should find useful information in the Streaming Documentation.

If you are unsure about terminology, please consult the knowledge base.

To " +"understand the main keyboard shortcuts, read the shortcuts page.

Help

Before asking " +"any question, please refer yourself to the FAQ.

You might then get (and give) help on the " +"Forums, the mailing-lists or our IRC channel " +"(#videolan on irc.freenode.net).

Contribute to the project

You can help the VideoLAN project giving some of your time to help the " +"community, to design skins, to translate the documentation, to test and to " +"code. You can also give funds and material to help us. And of course, you " +"can promote VLC media player.

" +msgstr "" +"

VLC মিডিয়া চলোৱাৰ সহায়টোলৈ স্বাগতম

ডকুমেন্টেশ্বন

আপুনি ভিডিঅ'LANৰ উইকি ৱেবছাইটত VLC ডকুমেন্টেশ্বন বিচাৰি পাব পাৰে.

যদি আপুনি VLC " +"মিডিয়া প্লেয়াৰটো নতুনকৈ ব্যৱহাৰ কৰিছে, তেন্তে অনুগ্ৰহ কৰি
VLC মিডিয়া প্লেয়াৰৰ পৰিচয়টো পঢ়ক.

প্লেয়াৰটো কেনেকৈ ব্যৱহাৰ কৰিব লাগে তাৰ বিষয়ে আপুনি
" +"\"VLC " +"মিডিয়া প্লেয়াৰৰ সৈতে ফাইলবোৰ কেনেকৈ চলায়\" ডকুমেন্টত কিছু তথ্য লাভ কৰিব." +"

সকলোবোৰ ছেভিং, ৰূপান্তৰ, ট্ৰেন্সকোডিং, এনকোডিং, মাক্সিং আৰু ষ্ট্ৰিমিং কাৰ্যৰ " +"বাবে আপুনি ষ্ট্ৰিমিম ডকুমেন্টেশ্বনত উপযোগী তথ্য বিচাৰি পাব.

যদি আপুনি ভাষাটোৰ " +"বিষয়ে অজ্ঞ, তেন্তে অনুগ্ৰহ কৰি জ্ঞানৰ ভেটি টো আলোচনা কৰক.

মুখ্য কীবোৰ্ডৰ চমুপথবোৰ বুজিবলৈ চমুপথবোৰ পৃষ্ঠাটো পঢ়ক.

Help

যিকোনো প্ৰশ্ন সোধাৰ আগতে, অনুগ্ৰহ কৰি নিজকে FAQ লৈ পৰামৰ্শ কৰক.

আপুনি তেতিয়া ফৰামবোৰ, মেইল কৰা তালিকাবোৰ বা আমাৰ IRC চেনেলত সহায় লাভ কৰিব (আৰু " +"দিব) (irc.freenode.net ত #videolan).

প্ৰকল্পটোত বৰঙণি দিয়ক

আপুনি সম্প্ৰদায়টোক সহায় কৰিবলৈ, স্কিনবোৰ আৰ্হি কৰিবলৈ, ডকুমেন্টেশ্বনবোৰ অনুবাদ " +"কৰিবলৈ, পৰীক্ষা কৰিবলৈ আৰু কোড কৰিবলৈ আপোনাৰ কিছু সময় খৰচ কৰাৰ দ্বাৰা আপুনি " +"ভিডিঅ'LAN প্ৰকল্পটোত সহায় কৰিব পাৰে. আমাক সহায় কৰিবলৈ আপুনি লগতে পুঁজি আৰু সামগ্ৰী " +"দিব পাৰে. আৰু নিশ্চয়, আপুনি VLC মিডিয়া প্লেয়াৰটো প্ৰচলন কৰিব পাৰে.

" + +#: src/audio_output/filters.c:267 +msgid "Audio filtering failed" +msgstr "অডিঅ' ফিল্টাৰিং ব্যৰ্থ হল" + +#: src/audio_output/filters.c:268 +#, c-format +msgid "The maximum number of filters (%u) was reached." +msgstr "ফিল্টাৰবোৰৰ (%u) সৰ্বাধিক সংখ্যটো পোৱা গৈছিল." + +#: src/audio_output/output.c:263 src/config/core.c:380 src/input/es_out.c:936 +#: src/libvlc-module.c:540 modules/demux/adaptive/adaptive.cpp:124 +#: modules/gui/macosx/VLCMainMenu.m:243 +#: modules/gui/macosx/VLCSidebarDataSource.m:211 +#: modules/video_filter/postproc.c:235 +msgid "Disable" +msgstr "অক্ষম কৰক" + +#: src/audio_output/output.c:266 modules/visualization/visual/visual.c:142 +msgid "Spectrometer" +msgstr "স্পেকট্ৰোমিটাৰ" + +#: src/audio_output/output.c:269 +msgid "Scope" +msgstr "সুবিধা" + +#: src/audio_output/output.c:272 +msgid "Spectrum" +msgstr "স্পেকট্ৰাম" + +#: src/audio_output/output.c:275 +msgid "VU meter" +msgstr "" + +#: src/audio_output/output.c:314 src/libvlc-module.c:201 +msgid "Audio filters" +msgstr "অডিঅ' ফিল্টাৰবোৰ" + +#: src/audio_output/output.c:327 +msgid "Replay gain" +msgstr "লাভ কৰাটো পুনৰ চলাওক" + +#: src/audio_output/output.c:345 modules/gui/macosx/VLCMainMenu.m:420 +#: modules/gui/macosx/VLCMainMenu.m:421 +msgid "Stereo audio mode" +msgstr "ষ্টেৰিঅ' অডিঅ' ধৰণ" + +#: src/audio_output/output.c:419 src/libvlc-module.c:198 +#: modules/access/v4l2/v4l2.c:267 modules/audio_output/alsa.c:76 +msgid "Mono" +msgstr "ম'ন'" + +#: src/audio_output/output.c:425 +msgid "Original" +msgstr "" + +#: src/audio_output/output.c:431 src/libvlc-module.c:197 +msgid "Dolby Surround" +msgstr "ডল্বি ছাৰাউণ্ড" + +#: src/audio_output/output.c:436 src/libvlc-module.c:196 +#: modules/access/alsa.c:38 modules/access/oss.c:64 +#: modules/access/v4l2/v4l2.c:268 modules/audio_output/alsa.c:76 +#: modules/codec/twolame.c:70 +msgid "Stereo" +msgstr "ষ্টেৰিঅ'" + +#: src/audio_output/output.c:445 src/input/es_out.c:3301 +#: src/libvlc-module.c:197 src/libvlc-module.c:295 src/libvlc-module.c:368 +#: src/misc/actions.c:81 modules/audio_filter/channel_mixer/mono.c:89 +#: modules/audio_filter/channel_mixer/remap.c:61 modules/codec/dvbsub.c:102 +#: modules/codec/subsdec.c:167 modules/codec/zvbi.c:83 +#: modules/control/gestures.c:85 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:218 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:291 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:313 +#: modules/spu/audiobargraph_v.c:65 modules/spu/logo.c:80 +#: modules/spu/marq.c:129 modules/spu/mosaic.c:170 modules/spu/rss.c:171 +#: modules/gui/qt/ui/video_effects.h:1267 +#: modules/gui/qt/ui/video_effects.h:1309 +#: modules/gui/qt/ui/video_effects.h:1319 +msgid "Left" +msgstr "বাওঁফাল" + +#: src/audio_output/output.c:448 src/libvlc-module.c:197 +#: src/libvlc-module.c:295 src/libvlc-module.c:368 src/misc/actions.c:109 +#: modules/audio_filter/channel_mixer/mono.c:89 +#: modules/audio_filter/channel_mixer/remap.c:61 modules/codec/dvbsub.c:102 +#: modules/codec/subsdec.c:167 modules/codec/zvbi.c:83 +#: modules/control/gestures.c:85 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:219 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:293 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:315 +#: modules/spu/audiobargraph_v.c:65 modules/spu/logo.c:80 +#: modules/spu/marq.c:129 modules/spu/mosaic.c:170 modules/spu/rss.c:171 +#: modules/gui/qt/ui/video_effects.h:1268 +msgid "Right" +msgstr "সোঁফালে" + +#: src/audio_output/output.c:452 src/libvlc-module.c:196 +msgid "Reverse stereo" +msgstr "ওলোটা ষ্টেৰিঅ'" + +#: src/audio_output/output.c:460 src/libvlc-module.c:198 +#: modules/audio_filter/equalizer_presets.h:55 +msgid "Headphones" +msgstr "হেডফোনবোৰ" + +#: src/config/core.c:370 modules/access/dtv/access.c:98 +#: modules/access/dtv/access.c:113 modules/access/dtv/access.c:122 +#: modules/access/dtv/access.c:130 modules/access/dtv/access.c:139 +#: modules/access/dtv/access.c:147 modules/access/dtv/access.c:169 +#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:971 +#: modules/gui/qt/components/simple_preferences.cpp:395 +msgid "Automatic" +msgstr "স্বয়ংক্ৰিয়" + +#: src/config/file.c:452 +msgid "boolean" +msgstr "ব্যুলীয়্যান" + +#: src/config/file.c:452 src/config/help.c:426 +msgid "integer" +msgstr "অখণ্ড" + +#: src/config/file.c:460 src/config/help.c:476 +msgid "float" +msgstr "ফ্লট" + +#: src/config/file.c:473 src/config/help.c:383 +msgid "string" +msgstr "ষ্ট্ৰিং" + +#: src/config/help.c:164 +msgid "To get exhaustive help, use '-H'." +msgstr "সম্পূৰ্ণ সহায় লাভ কৰিবলৈ, '-H' ব্যৱহাৰ কৰক." + +#: src/config/help.c:168 +#, c-format +msgid "" +"Usage: %s [options] [stream] ...\n" +"You can specify multiple streams on the commandline.\n" +"They will be enqueued in the playlist.\n" +"The first item specified will be played first.\n" +"\n" +"Options-styles:\n" +" --option A global option that is set for the duration of the program.\n" +" -option A single letter version of a global --option.\n" +" :option An option that only applies to the stream directly before it\n" +" and that overrides previous settings.\n" +"\n" +"Stream MRL syntax:\n" +" [[access][/demux]://]URL[#[title][:chapter][-[title][:chapter]]]\n" +" [:option=value ...]\n" +"\n" +" Many of the global --options can also be used as MRL specific :options.\n" +" Multiple :option=value pairs can be specified.\n" +"\n" +"URL syntax:\n" +" file:///path/file Plain media file\n" +" http://host[:port]/file HTTP URL\n" +" ftp://host[:port]/file FTP URL\n" +" mms://host[:port]/file MMS URL\n" +" screen:// Screen capture\n" +" dvd://[device] DVD device\n" +" vcd://[device] VCD device\n" +" cdda://[device] Audio CD device\n" +" udp://[[]@[][:]]\n" +" UDP stream sent by a streaming server\n" +" vlc://pause: Pause the playlist for a certain time\n" +" vlc://quit Special item to quit VLC\n" +"\n" +msgstr "" +"ব্যৱহাৰবিধি: %s [বিকল্পবোৰ] [ষ্ট্ৰিম] ...\n" +"নিৰ্দেশৰ শাৰীত আপুনি বিভিন্ন ষ্ট্ৰিম নিৰ্ধাৰণ কৰিব পাৰে.\n" +"সেইবোৰ প্লেলিষ্টত শাৰীত যোগ কৰা হব.\n" +"নিৰ্ধাৰিত প্ৰথম বস্তুটো প্ৰথমে চলোৱা হব.\n" +"\n" +"বিকল্পবোৰৰ-শৈলীবোৰ:\n" +" --বিকল্প কাৰ্যসূচীটোৰ সময়চোৱাৰ বাবে ছেট কৰা এটা সাৰ্বজনীন বিকল্প.\n" +" -বিকল্প সাৰ্বজনীন এটাৰ এটা অকলশৰীয়া আখৰৰ সংস্কৰণ --বিকল্প.\n" +" :বিকল্প এটা বিকল্প যিটো এইটোৰ আগতে ষ্ট্ৰিমটোলৈ কেৱল প্ৰত্যক্ষভাৱে প্ৰয়োগ কৰা হয়\n" +" আৰু সেইটোৱে পূৰ্বৰ ছেটিংবোৰ অভাৰৰাইড কৰে.\n" +"\n" +"ষ্ট্ৰিম MRL ছিন্টেক্স:\n" +" [[প্ৰৱেশ][/ডিমাক্স]://]URL[#[শিৰোনাম][:পাঠ][-[শিৰোনাম][:পাঠ]]]\n" +" [:বিকল্প=মান ...]\n" +"\n" +" বহুতো সাৰ্বজনীন --বিকল্পবোৰ MRL নিৰ্দিষ্ট হিচাপে ব্যৱহাৰ কৰিব পাৰি :বিকল্পবোৰ.\n" +" বিভিন্ন :বিকল্প=মান যোৰাবোৰ নিৰ্ধাৰিত কৰিব পাৰি.\n" +"\n" +"URL ছিন্টেক্স:\n" +" file:///path/file সাধাৰণ মিডিয়া ফাইল\n" +" http://host[:port]/file HTTP URL\n" +" ftp://host[:port]/file FTP URL\n" +" mms://host[:port]/file MMS URL\n" +" screen:// স্ক্ৰীন অধিগ্ৰহণ\n" +" dvd://[device] DVD ডিভাইচ\n" +" vcd://[device] VCD ডিভাইচ\n" +" cdda://[device] অডিঅ' CD ডিভাইচ\n" +" udp://[[]@[][:]]\n" +" এটা ষ্ট্ৰিমিং ছাৰ্ভাৰৰ দ্বাৰা পথোৱা UDP ষ্ট্ৰিম\n" +" vlc://pause: এটা নিৰ্দিষ্ট সময়ৰ বাবে প্লেলিষ্টখন ৰখাই থওক\n" +" vlc://quit VLC ত্যাগ কৰিবল বিশেষ বস্তু\n" +"\n" + +#: src/config/help.c:490 +msgid "(default enabled)" +msgstr "" + +#: src/config/help.c:491 +msgid "(default disabled)" +msgstr "" + +#: src/config/help.c:651 src/config/help.c:655 +msgid "Note:" +msgstr "টোকা:" + +#: src/config/help.c:651 +msgid "add --advanced to your command line to see advanced options." +msgstr "উন্নত বিকল্পবোৰ চাবলৈ আপোনাৰ নিৰ্দেশ শাৰীত --উন্নত যোগ কৰক." + +#: src/config/help.c:656 +#, c-format +msgid "%u module was not displayed because it only has advanced options.\n" +msgid_plural "" +"%u modules were not displayed because they only have advanced options.\n" +msgstr[0] "%u মডুলটো প্ৰদৰ্শন কৰা হোৱা নাছিল কাৰণ ইয়াৰ কেৱল উন্নত বিকল্পবোৰ আছে.\n" +msgstr[1] "%u মডুলবোৰ প্ৰদৰ্শন কৰা হোৱা নাছিল কাৰণ ইয়াৰ কেৱল উন্নত বিকল্পবোৰ আছে.\n" + +#: src/config/help.c:663 +msgid "" +"No matching module found. Use --list or --list-verbose to list available " +"modules." +msgstr "" +"কোনো মিলা মডুল বিচাৰি পোৱা নগল. উপলব্ধ মডুলবোৰ তালিকা কৰিবলৈ --তালিকা বা --" +"তালিকা-ভাৰ্বোজ ব্যৱহাৰ কৰক." + +#: src/config/help.c:721 +#, c-format +msgid "VLC version %s (%s)\n" +msgstr "VLC সংস্কৰণ %s (%s)\n" + +#: src/config/help.c:722 +#, c-format +msgid "Compiled by %s on %s (%s)\n" +msgstr "%s ৰ দ্বাৰা %s (%s) ত লগলগাওক\n" + +#: src/config/help.c:724 +#, c-format +msgid "Compiler: %s\n" +msgstr "লগলগাওতা: %s\n" + +#: src/config/help.c:753 +#, c-format +msgid "" +"\n" +"Dumped content to vlc-help.txt file.\n" +msgstr "" +"\n" +"vlc-help.txt ফাইলত বিষয়বস্তুবোৰ জমা কৰক.\n" + +#: src/config/help.c:768 +msgid "" +"\n" +"Press the RETURN key to continue...\n" +msgstr "" +"\n" +"অব্যাহত ৰাখিবলৈ উভোতা কীটো হেচক...\n" + +#: src/darwin/error.c:37 +msgid "Unknown error" +msgstr "অজ্ঞাত ভুল" + +#: src/input/control.c:204 +#, c-format +msgid "Bookmark %i" +msgstr "পৃষ্ঠাসংকেত %i" + +#: src/input/decoder.c:1895 +msgid "No description for this codec" +msgstr "এই কোডেকটোৰ বাবে কোনো ব্যাখ্যা নাই" + +#: src/input/decoder.c:1897 +msgid "Codec not supported" +msgstr "কোডেকটো সমৰ্থন নকৰে" + +#: src/input/decoder.c:1898 +#, c-format +msgid "VLC could not decode the format \"%4.4s\" (%s)" +msgstr "VLC য়ে \"%4.4s\" (%s) ফৰমেটটো ডিকোড কৰিব নোৱাৰিলে" + +#: src/input/decoder.c:1902 +msgid "Unidentified codec" +msgstr "অপৰিচিত কোডেক" + +#: src/input/decoder.c:1903 +msgid "VLC could not identify the audio or video codec" +msgstr "VLC য়ে অডিঅ' বা ভিডিঅ' কোডেক চিনাক্ত কৰিব নোৱাৰিলে" + +#: src/input/decoder.c:1914 +msgid "packetizer" +msgstr "পেকেটাইজাৰ" + +#: src/input/decoder.c:1914 +msgid "decoder" +msgstr "ডিকোডাৰ" + +#: src/input/decoder.c:1922 src/input/decoder.c:2205 +#: modules/codec/avcodec/encoder.c:394 modules/codec/avcodec/encoder.c:939 +#: modules/stream_out/es.c:349 modules/stream_out/es.c:362 +msgid "Streaming / Transcoding failed" +msgstr "ষ্ট্ৰিমিং / ট্ৰেন্সকোডিং ব্যৰ্থ হল" + +#: src/input/decoder.c:1923 +#, c-format +msgid "VLC could not open the %s module." +msgstr "VLC য়ে %s মুডলটো খুলিব নোৱাৰিল." + +#: src/input/decoder.c:2206 +msgid "VLC could not open the decoder module." +msgstr "VLC ডিকোডাৰ মডুলটো খুলিব নোৱাৰিলে." + +#: src/input/es_out.c:956 src/input/es_out.c:961 src/libvlc-module.c:239 +#: modules/gui/qt/components/open_panels.cpp:527 +msgid "Track" +msgstr "পথ" + +#: src/input/es_out.c:1179 +#, c-format +msgid "%s [%s %d]" +msgstr "%s [%s %d]" + +#: src/input/es_out.c:1180 src/input/es_out.c:1185 src/input/es_out.c:1200 +#: src/input/var.c:160 src/libvlc-module.c:564 +#: modules/gui/macosx/VLCMainMenu.m:407 modules/gui/macosx/VLCMainMenu.m:408 +msgid "Program" +msgstr "কাৰ্যসূচী" + +#: src/input/es_out.c:1210 +#, c-format +msgid "Stream %d" +msgstr "ষ্ট্ৰিম %d" + +#: src/input/es_out.c:1463 src/input/es_out.c:1465 +msgid "Scrambled" +msgstr "সানমিহলি কৰা হল" + +#: src/input/es_out.c:1463 modules/keystore/keychain.m:41 +#: modules/lua/extension.c:1199 +msgid "Yes" +msgstr "হয়" + +#: src/input/es_out.c:2159 +#, c-format +msgid "DTVCC Closed captions %u" +msgstr "" + +#: src/input/es_out.c:2161 +#, c-format +msgid "Closed captions %u" +msgstr "%u কেপশ্বনবোৰ বন্ধ কৰা হল" + +#: src/input/es_out.c:3136 +msgid "Original ID" +msgstr "প্ৰকৃত ID" + +#: src/input/es_out.c:3144 src/input/es_out.c:3147 modules/access/imem.c:67 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:162 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:173 +#: modules/gui/qt/ui/profiles.h:726 modules/gui/qt/ui/profiles.h:752 +#: modules/gui/qt/ui/profiles.h:761 +msgid "Codec" +msgstr "কোডেক" + +#: src/input/es_out.c:3151 src/input/meta.c:66 modules/access/imem.c:71 +#: modules/gui/macosx/VLCPlaylist.m:98 +#: modules/gui/macosx/VLCSimplePrefsController.m:325 +#: modules/stream_out/setid.c:49 modules/gui/qt/ui/sprefs_interface.h:533 +msgid "Language" +msgstr "ভাষা" + +#: src/input/es_out.c:3154 src/input/meta.c:61 +#: modules/gui/macosx/VLCBookmarksWindowController.m:80 +#: modules/gui/macosx/VLCPlaylist.m:96 modules/gui/qt/dialogs/bookmarks.cpp:75 +#: modules/gui/qt/dialogs/epg.cpp:55 +msgid "Description" +msgstr "বিৱৰণ" + +#: src/input/es_out.c:3160 src/input/es_out.c:3204 src/input/es_out.c:3394 +#: modules/gui/macosx/VLCAddonsWindowController.m:133 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:185 +#: modules/gui/macosx/VLCOutput.m:75 modules/gui/qt/dialogs/plugins.cpp:1494 +msgid "Type" +msgstr "প্ৰকাৰ" + +#: src/input/es_out.c:3163 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:175 +#: modules/gui/macosx/VLCOutput.m:98 modules/gui/qt/ui/profiles.h:754 +msgid "Channels" +msgstr "চেনেলবোৰ" + +#: src/input/es_out.c:3168 modules/access/alsa.c:39 modules/access/imem.c:75 +#: modules/audio_output/amem.c:47 modules/codec/fluidsynth.c:64 +msgid "Sample rate" +msgstr "নমুনাৰ হাৰ" + +#: src/input/es_out.c:3168 +#, c-format +msgid "%u Hz" +msgstr "%u Hz" + +#: src/input/es_out.c:3178 +msgid "Bits per sample" +msgstr "নমুনাই প্ৰতি বিটবোৰ" + +#: src/input/es_out.c:3183 modules/access_output/shout.c:92 +#: modules/demux/playlist/shoutcast.c:327 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:163 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:174 +#: modules/gui/qt/ui/profiles.h:727 modules/gui/qt/ui/profiles.h:753 +msgid "Bitrate" +msgstr "বিটৰ হাৰ" + +#: src/input/es_out.c:3183 +#, c-format +msgid "%u kb/s" +msgstr "%u kb/s" + +#: src/input/es_out.c:3195 +msgid "Track replay gain" +msgstr "পথৰ পুনৰ চলোৱাটো লাভ কৰক" + +#: src/input/es_out.c:3197 +msgid "Album replay gain" +msgstr "এলবামৰ পুনৰ চলোৱাটো লাভ কৰক" + +#: src/input/es_out.c:3198 +#, c-format +msgid "%.2f dB" +msgstr "%.2f dB" + +#: src/input/es_out.c:3208 +msgid "Video resolution" +msgstr "" + +#: src/input/es_out.c:3213 +msgid "Buffer dimensions" +msgstr "" + +#: src/input/es_out.c:3223 src/input/es_out.c:3226 modules/access/imem.c:93 +#: modules/access/rdp.c:73 modules/access/screen/screen.c:43 +#: modules/access/screen/xcb.c:39 modules/access/shm.c:42 +#: modules/access/timecode.c:34 modules/access/v4l2/v4l2.c:70 +#: modules/access/vdr.c:78 modules/access/vnc.c:60 modules/demux/image.c:66 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:164 +#: modules/video_filter/fps.c:42 +msgid "Frame rate" +msgstr "ফ্ৰেমৰ হাৰ" + +#: src/input/es_out.c:3234 +msgid "Decoded format" +msgstr "ফৰমেট ডিকোড কৰা হল" + +#: src/input/es_out.c:3239 +msgid "Top left" +msgstr "" + +#: src/input/es_out.c:3239 +msgid "Left top" +msgstr "" + +#: src/input/es_out.c:3240 +msgid "Right bottom" +msgstr "" + +#: src/input/es_out.c:3240 +msgid "Top right" +msgstr "" + +#: src/input/es_out.c:3241 +msgid "Bottom left" +msgstr "" + +#: src/input/es_out.c:3241 +msgid "Bottom right" +msgstr "" + +#: src/input/es_out.c:3242 +msgid "Left bottom" +msgstr "" + +#: src/input/es_out.c:3242 +msgid "Right top" +msgstr "" + +#: src/input/es_out.c:3244 +msgid "Orientation" +msgstr "" + +#: src/input/es_out.c:3250 src/input/es_out.c:3268 src/input/es_out.c:3286 +#: src/input/es_out.c:3300 src/playlist/tree.c:67 +#: modules/access/dtv/access.c:82 modules/access/v4l2/v4l2.c:242 +msgid "Undefined" +msgstr "বাখ্যা নকৰা" + +#: src/input/es_out.c:3252 +msgid "ITU-R BT.601 (525 lines, 60 Hz)" +msgstr "" + +#: src/input/es_out.c:3254 +msgid "ITU-R BT.601 (625 lines, 50 Hz)" +msgstr "" + +#: src/input/es_out.c:3262 +msgid "Color primaries" +msgstr "" + +#: src/input/es_out.c:3269 src/libvlc-module.c:362 +#: modules/video_filter/deinterlace/deinterlace.h:58 +msgid "Linear" +msgstr "সমান্তৰাল" + +#: src/input/es_out.c:3276 +msgid "Hybrid Log-Gamma" +msgstr "" + +#: src/input/es_out.c:3280 +msgid "Color transfer function" +msgstr "" + +#: src/input/es_out.c:3293 +msgid "Color space" +msgstr "" + +#: src/input/es_out.c:3293 +#, c-format +msgid "%s Range" +msgstr "" + +#: src/input/es_out.c:3295 +msgid "Full" +msgstr "" + +#: src/input/es_out.c:3302 src/libvlc-module.c:295 src/libvlc-module.c:368 +#: modules/audio_filter/channel_mixer/mono.c:91 +#: modules/audio_filter/channel_mixer/remap.c:61 modules/codec/dvbsub.c:102 +#: modules/codec/subsdec.c:167 modules/codec/zvbi.c:83 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:289 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:311 +#: modules/spu/audiobargraph_v.c:65 modules/spu/logo.c:80 +#: modules/spu/marq.c:129 modules/spu/mosaic.c:170 modules/spu/rss.c:171 +msgid "Center" +msgstr "কেন্দ্ৰত" + +#: src/input/es_out.c:3303 +msgid "Top Left" +msgstr "" + +#: src/input/es_out.c:3304 +msgid "Top Center" +msgstr "" + +#: src/input/es_out.c:3305 +msgid "Bottom Left" +msgstr "" + +#: src/input/es_out.c:3306 +msgid "Bottom Center" +msgstr "" + +#: src/input/es_out.c:3310 +msgid "Chroma location" +msgstr "" + +#: src/input/es_out.c:3319 +msgid "Rectangular" +msgstr "" + +#: src/input/es_out.c:3322 +msgid "Equirectangular" +msgstr "" + +#: src/input/es_out.c:3325 +msgid "Cubemap" +msgstr "" + +#: src/input/es_out.c:3331 +msgid "Projection" +msgstr "" + +#: src/input/es_out.c:3333 +msgctxt "ViewPoint" +msgid "Yaw" +msgstr "" + +#: src/input/es_out.c:3335 +msgctxt "ViewPoint" +msgid "Pitch" +msgstr "" + +#: src/input/es_out.c:3337 +msgctxt "ViewPoint" +msgid "Roll" +msgstr "" + +#: src/input/es_out.c:3340 +msgctxt "ViewPoint" +msgid "Field of view" +msgstr "" + +#: src/input/es_out.c:3345 +msgid "Max. luminance" +msgstr "" + +#: src/input/es_out.c:3350 +msgid "Min. luminance" +msgstr "" + +#: src/input/es_out.c:3358 +msgid "Primary R" +msgstr "" + +#: src/input/es_out.c:3365 +msgid "Primary G" +msgstr "" + +#: src/input/es_out.c:3372 +msgid "Primary B" +msgstr "" + +#: src/input/es_out.c:3379 +msgid "White point" +msgstr "" + +#: src/input/es_out.c:3394 modules/access/imem.c:64 +msgid "Subtitle" +msgstr "উপশিৰোনাম" + +#: src/input/input.c:1858 modules/control/hotkeys.c:1512 +#, c-format +msgid "Volume %ld%%" +msgstr "প্ৰসাৰ %ld%%" + +#: src/input/input.c:2763 +msgid "Your input can't be opened" +msgstr "আপোনাৰ ইনপুটটো খুলিব পৰা নগল" + +#: src/input/input.c:2764 +#, c-format +msgid "VLC is unable to open the MRL '%s'. Check the log for details." +msgstr "VLC য়ে MRL '%s' টো খুলিবলৈ অক্ষম. পূংখানুপূংখ বিৱৰণৰ বাবে ল'গটো পৰীক্ষা কৰক." + +#: src/input/meta.c:55 src/input/var.c:170 modules/gui/macosx/VLCMainMenu.m:409 +#: modules/gui/macosx/VLCMainMenu.m:410 +#: modules/gui/macosx/VLCOpenWindowController.m:178 +#: modules/gui/macosx/VLCOpenWindowController.m:180 +#: modules/gui/macosx/VLCPlaylist.m:91 modules/gui/macosx/VLCPlaylistInfo.m:59 +#: modules/gui/qt/components/open_panels.cpp:487 +#: modules/gui/qt/components/open_panels.cpp:501 +#: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56 +#: modules/gui/qt/ui/open_disk.h:306 +msgid "Title" +msgstr "শিৰোনাম" + +#: src/input/meta.c:56 modules/gui/macosx/VLCPlaylistInfo.m:60 +#: modules/mux/avi.c:49 +msgid "Artist" +msgstr "শিল্পী" + +#: src/input/meta.c:57 modules/demux/mp4/meta.c:87 +#: modules/gui/macosx/VLCPlaylist.m:94 modules/mux/avi.c:51 +msgid "Genre" +msgstr "শৈলী" + +#: src/input/meta.c:58 modules/mux/asf.c:60 modules/mux/avi.c:52 +msgid "Copyright" +msgstr "প্ৰতিলিপিস্বত্ব" + +#: src/input/meta.c:59 src/libvlc-module.c:239 +#: modules/gui/macosx/VLCPlaylist.m:95 +msgid "Album" +msgstr "এলবাম" + +#: src/input/meta.c:60 +msgid "Track number" +msgstr "পথ সংখ্যা" + +#: src/input/meta.c:62 modules/demux/mp4/meta.c:433 modules/mux/asf.c:64 +msgid "Rating" +msgstr "ক্ৰম কৰা" + +#: src/input/meta.c:63 modules/gui/macosx/VLCPlaylist.m:97 modules/mux/avi.c:50 +msgid "Date" +msgstr "তাৰিখ" + +#: src/input/meta.c:64 +msgid "Setting" +msgstr "ছেট কৰিছে" + +#: src/input/meta.c:65 modules/gui/macosx/VLCOpenWindowController.m:188 +#: modules/gui/qt/ui/podcast_configuration.h:100 +msgid "URL" +msgstr "URL" + +#: src/input/meta.c:67 src/input/meta.c:68 modules/notify/notify.c:314 +msgid "Now Playing" +msgstr "এতিয়া চলি আছে" + +#: src/input/meta.c:69 modules/demux/mp4/meta.c:96 +msgid "Publisher" +msgstr "প্ৰকাশক" + +#: src/input/meta.c:70 +msgid "Encoded by" +msgstr "...ৰ দ্বাৰা এনকোড কৰা হল" + +#: src/input/meta.c:71 +msgid "Artwork URL" +msgstr "চিত্ৰকৰ্ম URL" + +#: src/input/meta.c:72 +msgid "Track ID" +msgstr "পথ ID" + +#: src/input/meta.c:73 +msgid "Number of Tracks" +msgstr "পথবোৰৰ সংখ্যা" + +#: src/input/meta.c:74 +msgid "Director" +msgstr "পৰিচালক" + +#: src/input/meta.c:75 +msgid "Season" +msgstr "কাল" + +#: src/input/meta.c:76 +msgid "Episode" +msgstr "অধ্যায়" + +#: src/input/meta.c:77 +msgid "Show Name" +msgstr "নাম দেখুৱাওক" + +#: src/input/meta.c:78 +msgid "Actors" +msgstr "অভিনেতাবোৰ" + +#: src/input/meta.c:79 modules/demux/mp4/meta.c:101 +msgid "Album Artist" +msgstr "" + +#: src/input/meta.c:80 +msgid "Disc number" +msgstr "" + +#: src/input/var.c:152 +msgid "Bookmark" +msgstr "পৃষ্ঠাসংকেত" + +#: src/input/var.c:165 src/libvlc-module.c:570 +msgid "Programs" +msgstr "কাৰ্যসূচীবোৰ" + +#: src/input/var.c:175 modules/gui/macosx/VLCMainMenu.m:411 +#: modules/gui/macosx/VLCMainMenu.m:412 +#: modules/gui/macosx/VLCOpenWindowController.m:179 +#: modules/gui/macosx/VLCOpenWindowController.m:181 +#: modules/gui/qt/ui/open_disk.h:307 +msgid "Chapter" +msgstr "পাঠ" + +#: src/input/var.c:188 modules/gui/macosx/VLCMainMenu.m:435 +#: modules/gui/macosx/VLCMainMenu.m:436 +msgid "Video Track" +msgstr "ভিডিঅ' পথ" + +#: src/input/var.c:194 modules/gui/macosx/VLCMainMenu.m:418 +#: modules/gui/macosx/VLCMainMenu.m:419 +msgid "Audio Track" +msgstr "অডিঅ' পথ" + +#: src/input/var.c:200 +msgid "Subtitle Track" +msgstr "উপশিৰোনাম পথ" + +#: src/input/var.c:264 +msgid "Next title" +msgstr "পৰৱৰ্তী শিৰোনাম" + +#: src/input/var.c:271 +msgid "Previous title" +msgstr "আগৰ শিৰোনাম" + +#: src/input/var.c:278 +msgid "Menu title" +msgstr "" + +#: src/input/var.c:285 +msgid "Menu popup" +msgstr "" + +#: src/input/var.c:319 +#, c-format +msgid "Title %i%s" +msgstr "শিৰোনাম %i%s" + +#: src/input/var.c:344 src/input/var.c:401 +#, c-format +msgid "Chapter %i" +msgstr "পাঠ %i" + +#: src/input/var.c:380 modules/gui/qt/dialogs/toolbar.cpp:514 +msgid "Next chapter" +msgstr "পৰৱৰ্তী পাঠ" + +#: src/input/var.c:385 modules/gui/qt/dialogs/toolbar.cpp:504 +msgid "Previous chapter" +msgstr "আগৰ পাঠ" + +#: src/input/vlm.c:641 src/input/vlm.c:1020 +#, c-format +msgid "Media: %s" +msgstr "মিডিয়া: %s" + +#: src/interface/interface.c:82 modules/gui/macosx/VLCMainMenu.m:346 +#: modules/gui/macosx/VLCMainMenu.m:347 +msgid "Add Interface" +msgstr "ইন্টাৰফেছ যোগ কৰক" + +#: src/interface/interface.c:89 +msgid "Console" +msgstr "কনছোল" + +#: src/interface/interface.c:93 +msgid "Telnet" +msgstr "টেলনেট" + +#: src/interface/interface.c:96 +msgid "Web" +msgstr "ৱেব" + +#: src/interface/interface.c:99 +msgid "Mouse Gestures" +msgstr "মাউছৰ চলাচল" + +#: src/interface/interface.c:222 +msgid "" +"Running vlc with the default interface. Use 'cvlc' to use vlc without " +"interface." +msgstr "" +"ডিফল্ট ইন্টাৰফেছটোৰ সৈতে vlc টো চলাইছে. ইন্টাৰফেছ অবিহনে vlc ব্যৱহাৰ কৰিবলৈ " +"'cvlc' ব্যৱহাৰ কৰক." + +#. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... +#: src/libvlc.c:174 +msgid "C" +msgstr "as_IN" + +#: src/libvlc.h:166 src/libvlc-module.c:1432 src/libvlc-module.c:1433 +#: src/video_output/vout_intf.c:176 modules/gui/macosx/VLCMainMenu.m:475 +msgid "Zoom" +msgstr "জুম কৰক" + +#: src/libvlc.h:167 src/libvlc-module.c:1346 src/video_output/vout_intf.c:87 +msgid "1:4 Quarter" +msgstr "1:4 এক-চতুৰ্থাংশ" + +#: src/libvlc.h:168 src/libvlc-module.c:1347 src/video_output/vout_intf.c:88 +msgid "1:2 Half" +msgstr "1:2 আধা" + +#: src/libvlc.h:169 src/libvlc-module.c:1348 src/video_output/vout_intf.c:89 +msgid "1:1 Original" +msgstr "1:1 প্ৰকৃত" + +#: src/libvlc.h:170 src/libvlc-module.c:1349 src/video_output/vout_intf.c:90 +msgid "2:1 Double" +msgstr "2:1 দ্বিগুণ" + +#: src/libvlc-module.c:64 +msgid "" +"These options allow you to configure the interfaces used by VLC. You can " +"select the main interface, additional interface modules, and define various " +"related options." +msgstr "" +"এইবোৰ বিকল্পই আপোনাক VLC ৰ দ্বাৰা ব্যৱহাৰ কৰা ইন্টাৰফেছবোৰ ৰূপৰেখা কৰিবলৈ অনুমতি " +"দিয়ে. আপুনি মুখ্য মুখ্য ইন্টাৰফেছ, অতিৰিক্ত ইন্টাৰফেছ মডুলবোৰ নিৰ্বাচন কৰিব পাৰে আৰু " +"বিভিন্ন সম্পৰ্কীয় বিকল্পবোৰ বাখ্যা কৰিব পাৰে." + +#: src/libvlc-module.c:68 +msgid "Interface module" +msgstr "ইন্টাৰফেছ মডুল" + +#: src/libvlc-module.c:70 +msgid "" +"This is the main interface used by VLC. The default behavior is to " +"automatically select the best module available." +msgstr "" +"এইটো হল VLC য়ে ব্যৱহাৰ কৰা মুখ্য ইন্টাৰফেছ. উপলব্ধ শ্ৰেষ্ঠ মডুলটো স্বয়ংক্ৰিয়ভাৱে " +"নিৰ্বাচন কৰিবলৈ ডিফল্ট আচৰণটো." + +#: src/libvlc-module.c:74 modules/control/ntservice.c:60 +msgid "Extra interface modules" +msgstr "অতিৰিক্ত ইন্টাৰফেছ মডুলবোৰ" + +#: src/libvlc-module.c:76 +msgid "" +"You can select \"additional interfaces\" for VLC. They will be launched in " +"the background in addition to the default interface. Use a colon separated " +"list of interface modules. (common values are \"rc\" (remote control), \"http" +"\", \"gestures\" ...)" +msgstr "" +"VLC ৰ বাবে আপুনি \"additional interfaces\" নিৰ্বাচন কৰিব পাৰে. ডিফল্ট " +"ইন্টাৰফেছটোৰ লগতে সেইবোৰ পটভূমিত আৰম্ভ কৰা হব. ইন্টাৰফেছ মডুলবোৰৰ কলনৰ দ্বাৰা " +"পৃথকীকৰণ তালিকা এখন ব্যৱহাৰ কৰক. (সাধাৰণ মানবোৰ হল \"rc\" (দূৰৈৰ পৰা নিয়ন্ত্ৰণ), " +"\"http\", \"gestures\" ...)" + +#: src/libvlc-module.c:83 +msgid "You can select control interfaces for VLC." +msgstr "VLC ৰ বাবে আপুনি নিয়ন্ত্ৰণ ইন্টাৰফেছবোৰ নিৰ্বাচন কৰিব পাৰে." + +#: src/libvlc-module.c:85 +msgid "Verbosity (0,1,2)" +msgstr "ভাৰ্বোছিটি (0,1,2)" + +#: src/libvlc-module.c:87 +msgid "" +"This is the verbosity level (0=only errors and standard messages, " +"1=warnings, 2=debug)." +msgstr "" +"এইটো হল ভাৰ্বোছিটি স্তৰ (0=কেৱল ভুলবোৰ আৰু মানবিশিষ্ট বাৰ্তাবোৰ, 1=সতৰ্কীকৰণবোৰ, " +"2=ডিবাগ)." + +#: src/libvlc-module.c:90 +msgid "Default stream" +msgstr "ডিফল্ট ষ্ট্ৰিম" + +#: src/libvlc-module.c:92 +msgid "This stream will always be opened at VLC startup." +msgstr "VLC ৰ আৰম্ভণিত এই ষ্ট্ৰিমটো সদায় খোলা হব." + +#: src/libvlc-module.c:94 +msgid "Color messages" +msgstr "ৰঙীণ বাৰ্তাবোৰ" + +#: src/libvlc-module.c:96 +msgid "" +"This enables colorization of the messages sent to the console. Your terminal " +"needs Linux color support for this to work." +msgstr "" + +#: src/libvlc-module.c:99 +msgid "Show advanced options" +msgstr "উন্নত বিকল্পবোৰ দেখুৱাওক" + +#: src/libvlc-module.c:101 +msgid "" +"When this is enabled, the preferences and/or interfaces will show all " +"available options, including those that most users should never touch." +msgstr "" +"যেতিয়া এইটো সক্ষম কৰা হয়, পছন্দবোৰ আৰু/বা ইন্টাৰফেছবোৰে উপলব্ধ বিকল্পবোৰ দেখুৱাব, " +"অধিকাংশ ব্যৱহাৰকৰ্তাই কেতিয়াও স্পৰ্শ নকৰাবোৰকে ধৰি." + +#: src/libvlc-module.c:105 +msgid "Interface interaction" +msgstr "ইন্টাৰফেছৰ বিনিময়" + +#: src/libvlc-module.c:107 +msgid "" +"When this is enabled, the interface will show a dialog box each time some " +"user input is required." +msgstr "" +"যেতিয়া এইটো সক্ষম কৰা হয়, ইন্টাৰফেছটোৱে প্ৰতিবাৰতে কিছুমান ব্যৱহাৰকৰ্তাৰ ইনপুট দাবী " +"কৰা সংলাপ বাকচ এটা দেখুৱাব." + +#: src/libvlc-module.c:117 +msgid "" +"These options allow you to modify the behavior of the audio subsystem, and " +"to add audio filters which can be used for post processing or visual effects " +"(spectrum analyzer, etc.). Enable these filters here, and configure them in " +"the \"audio filters\" modules section." +msgstr "" +"এইবোৰ বিকল্পই আপোনাক অডিঅ' উপছিষ্টেমটোৰ আচৰণ সলনি কৰিবলৈ আৰু অডিঅ' ফিল্টাৰবোৰ " +"যোগ কৰিবলৈ অনুমতি দিয়ে যিটো পিছৰ প্ৰক্ৰিয়াৰ বা দৃশ্যৰ প্ৰভাৱবোৰৰ (স্পেকট্ৰামৰ " +"বিশ্লেষক, ইত্যাদি) বাবে ব্যৱহাৰ কৰিব পাৰি. এই ফিল্টাৰবোৰ ইয়াত সক্ষম কৰক, আৰু " +"\"audio filters\" মডুল খণ্ডত ৰূপৰেখা কৰক." + +#: src/libvlc-module.c:123 +msgid "Audio output module" +msgstr "অডিঅ' আউটপুট মডুল" + +#: src/libvlc-module.c:125 +msgid "" +"This is the audio output method used by VLC. The default behavior is to " +"automatically select the best method available." +msgstr "" +"এইটো হল VLC য়ে ব্যৱহাৰ কৰা অডিঅ' আউটপুট পদ্ধতি. ডিফল্ট আচৰণটো হল উপলব্ধ শ্ৰেষ্ঠ " +"পদ্ধতিটো স্বয়ংক্ৰিয়ভাৱে নিৰ্বাচন কৰিবলৈ." + +#: src/libvlc-module.c:129 +msgid "Media role" +msgstr "" + +#: src/libvlc-module.c:130 +msgid "Media (player) role for operating system policy." +msgstr "" + +#: src/libvlc-module.c:132 modules/gui/macosx/VLCSimplePrefsController.m:281 +#: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:408 +msgid "Enable audio" +msgstr "অডিঅ' সক্ষম" + +#: src/libvlc-module.c:134 +msgid "" +"You can completely disable the audio output. The audio decoding stage will " +"not take place, thus saving some processing power." +msgstr "" +"অডিঅ' আউটপুটটো আপুনি সম্পূৰ্ণভাৱে অক্ষম কৰিব পাৰে. অডিঅ' ডিকোডিং স্তৰটো সংগটিত নহব, " +"এইদৰে কিছুমান প্ৰক্ৰিয়া কৰা শক্তি ৰাহি হব." + +#: src/libvlc-module.c:142 +msgid "Music" +msgstr "" + +#: src/libvlc-module.c:142 +msgid "Communication" +msgstr "" + +#: src/libvlc-module.c:142 modules/meta_engine/ID3Genres.h:69 +msgid "Game" +msgstr "খেল" + +#: src/libvlc-module.c:143 +msgid "Notification" +msgstr "" + +#: src/libvlc-module.c:143 +msgid "Animation" +msgstr "" + +#: src/libvlc-module.c:143 +msgid "Production" +msgstr "" + +#: src/libvlc-module.c:144 +msgid "Accessibility" +msgstr "" + +#: src/libvlc-module.c:144 +msgid "Test" +msgstr "" + +#: src/libvlc-module.c:147 +msgid "Audio gain" +msgstr "অডিঅ' লাভ" + +#: src/libvlc-module.c:149 +msgid "This linear gain will be applied to outputted audio." +msgstr "আউটপুট কৰা অডিঅ'লৈ এই সমান্তৰাল লাভটো প্ৰয়োগ কৰা হব." + +#: src/libvlc-module.c:151 +msgid "Audio output volume step" +msgstr "অডিঅ' আউটপুট প্ৰসাৰৰ স্তৰ" + +#: src/libvlc-module.c:153 +msgid "The step size of the volume is adjustable using this option." +msgstr "এই বিকল্পটো ব্যৱহাৰ কৰি প্ৰসাৰৰ স্তৰ আকাৰটো মিলাব পাৰি." + +#: src/libvlc-module.c:156 +msgid "Remember the audio volume" +msgstr "অডিঅ' প্ৰসাৰ মনত পেলাওক" + +#: src/libvlc-module.c:158 +msgid "" +"The volume can be recorded and automatically restored next time VLC is used." +msgstr "" +"প্ৰসাৰটো ৰেকৰ্ড কৰিব পাৰি আৰু পৰৱৰ্তী সময়ত VLC টো ব্যৱহাৰ কৰোতে স্বয়ংক্ৰিয়ভাৱে পুনৰ " +"জমা কৰিব পাৰি." + +#: src/libvlc-module.c:161 +msgid "Audio desynchronization compensation" +msgstr "অডিঅ' ডিছিনক্ৰনাইজেশ্বন ক্ষতিপূৰণ" + +#: src/libvlc-module.c:163 +msgid "" +"This delays the audio output. The delay must be given in milliseconds. This " +"can be handy if you notice a lag between the video and the audio." +msgstr "" +"এইটোৱে অডিঅ' আউটপুটোত বিলম্ব কৰে. বিলম্বটো মিলিছেকেণ্ডত উল্লেখ কৰাটো অপৰিহাৰ্য. " +"এইটো উপযোগী হব পাৰে যদি আপুনি ভিডিঅ' আৰু অডিঅ'টোৰ মাজত অন্তৰাল এটা দেখা পায়." + +#: src/libvlc-module.c:168 +msgid "This selects which plugin to use for audio resampling." +msgstr "" +"অডিঅ' পুনৰ নমুনা কৰিবৰ বাবে কোনটো প্লাগইন ব্যৱহাৰ কৰা হব এইটোৱে নিৰ্বাচন কৰে." + +#: src/libvlc-module.c:171 +msgid "" +"Sets the audio output channels mode that will be used by default if your " +"hardware and the audio stream are compatible." +msgstr "" + +#: src/libvlc-module.c:174 +msgid "Force S/PDIF support" +msgstr "" + +#: src/libvlc-module.c:176 +msgid "" +"This option should be used when the audio output can't negotiate S/PDIF " +"support." +msgstr "" + +#: src/libvlc-module.c:178 +msgid "Force detection of Dolby Surround" +msgstr "ডল্বি ছাৰাউণ্ড জোৰকৈ চিনাক্তকৰণ" + +#: src/libvlc-module.c:180 +msgid "" +"Use this when you know your stream is (or is not) encoded with Dolby " +"Surround but fails to be detected as such. Even if the stream is not " +"actually encoded with Dolby Surround, turning on this option might enhance " +"your experience, especially when combined with the Headphone Channel Mixer." +msgstr "" +"এইটো ব্যৱহাৰ কৰক যেতিয়া আপোনাৰ ষ্ট্ৰিমটো ডল্বি ছাৰাউণ্ডৰ সৈতে এনকোড কৰা হৈছে (বা " +"নহয়) কিন্তু সেইটো হিচাপে চিনাক্ত কৰিবলৈ ব্যৰ্থ বুলি আপুনি জ্ঞাত. তাৰোপৰি ষ্ট্ৰিমটো " +"ডল্বি ছাৰাউণ্ডৰ সৈতে প্ৰকৃততে এনকোড কৰা নহয়, এই বিকল্পটো আৰম্ভ কৰাটোৱে আপোনাৰ " +"অভিজ্ঞতা বৃদ্ধি কৰিব পাৰে, বিশেষকৈ যেতিয়া হেডফোন চেনেল মিক্সাৰটোৰ সৈতে মিশ্ৰণ কৰে." + +#: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:957 +#: modules/audio_output/kai.c:106 modules/codec/subsdec.c:167 +#: modules/codec/x264.c:434 modules/demux/adaptive/adaptive.cpp:122 +#: modules/demux/mpeg/ts.c:132 modules/gui/macosx/VLCSimplePrefsController.m:54 +#: modules/gui/qt/components/simple_preferences.cpp:69 +#: modules/gui/qt/components/sout/profile_selector.cpp:590 +#: modules/text_renderer/freetype/freetype.c:124 +#: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62 +#: modules/video_output/win32/direct3d11.c:88 +#: modules/video_output/xcb/xvideo.c:824 modules/gui/qt/ui/profiles.h:742 +#: modules/gui/qt/ui/profiles.h:745 +msgid "Auto" +msgstr "স্বয়ংক্ৰিয়" + +#: src/libvlc-module.c:187 modules/access/dtv/access.c:99 +#: modules/access/v4l2/v4l2.c:201 modules/control/hotkeys.c:405 +msgid "On" +msgstr "আৰম্ভ" + +#: src/libvlc-module.c:187 modules/access/dtv/access.c:99 +#: modules/access/v4l2/v4l2.c:137 modules/access/v4l2/v4l2.c:201 +#: modules/control/hotkeys.c:383 modules/control/hotkeys.c:405 +#: modules/video_filter/deinterlace/algo_phosphor.h:55 +msgid "Off" +msgstr "বন্ধ" + +#: src/libvlc-module.c:189 +msgid "Stereo audio output mode" +msgstr "ষ্টেৰিঅ' অডিঅ' আউটপুট ধৰণ" + +#: src/libvlc-module.c:195 src/misc/actions.c:112 +#: modules/gui/qt/components/preferences_widgets.cpp:1421 +#: modules/gui/qt/util/customwidgets.cpp:328 +msgid "Unset" +msgstr "ছেট কৰা নাই" + +#: src/libvlc-module.c:203 +msgid "This adds audio post processing filters, to modify the sound rendering." +msgstr "" +"শব্দ অনুবাদটো সলনি কৰিবলৈ এইটোৱে অডিঅ' পূৰ্বৰ প্ৰক্ৰিয়া কৰা ফিল্টাৰবোৰ যোগ কৰে." + +#: src/libvlc-module.c:208 +msgid "This adds visualization modules (spectrum analyzer, etc.)." +msgstr "এইটোৱে দৃশ্যৰ মডুলবোৰ যোগ কৰে (স্পেকট্ৰাম বিশ্লেষক, ইত্যাদি.)." + +#: src/libvlc-module.c:212 +msgid "Replay gain mode" +msgstr "পুনৰ চলোৱা লাভৰ ধৰণ" + +#: src/libvlc-module.c:214 +msgid "Select the replay gain mode" +msgstr "পুনৰ চলোৱা লাভৰ ধৰণটো নিৰ্বাচন কৰক" + +#: src/libvlc-module.c:216 +msgid "Replay preamp" +msgstr "প্ৰিএমপ্লিফায়াৰ পুনৰ চলাওক" + +#: src/libvlc-module.c:218 +msgid "" +"This allows you to change the default target level (89 dB) for stream with " +"replay gain information" +msgstr "" +"এইটোৱে পুনৰ চলোৱা লাভৰ তথ্যৰ সৈতে ষ্ট্ৰিমৰ বাবে ডিফল্ট লক্ষ্য স্তৰ (89 dB) সলনি " +"কৰিবলৈ আপোনাক অনুমতি দিয়ে" + +#: src/libvlc-module.c:221 +msgid "Default replay gain" +msgstr "ডিফল্ট পুনৰ চলোৱা লাভ" + +#: src/libvlc-module.c:223 +msgid "This is the gain used for stream without replay gain information" +msgstr "পুনৰ চলোৱা লাভৰ তথ্য অবিহনে ষ্ট্ৰিমৰ বাবে ব্যৱহাৰ কৰা লাভটো" + +#: src/libvlc-module.c:225 +msgid "Peak protection" +msgstr "শীৰ্ষ নিৰাপত্তা" + +#: src/libvlc-module.c:227 +msgid "Protect against sound clipping" +msgstr "ধ্বনি ক্লিপিংৰ বিৰুদ্ধে সুৰক্ষা দিয়ক" + +#: src/libvlc-module.c:230 +msgid "Enable time stretching audio" +msgstr "সময় ষ্ট্ৰেছ কৰা অডিঅ' সক্ষম কৰক" + +#: src/libvlc-module.c:232 +msgid "" +"This allows playing audio at lower or higher speed without affecting the " +"audio pitch" +msgstr "" +"অডিঅ' পিট্চটোত প্ৰভাৱ নকৰাকৈ উচ্চ বা নিম্ন গতিত অডিঅ' চলাবলৈ এইটোৱে অনুমতি দিয়ে " + +#: src/libvlc-module.c:239 src/libvlc-module.c:1131 +#: modules/access/dshow/dshow.cpp:2083 modules/access/dtv/access.c:114 +#: modules/access/dtv/access.c:148 modules/access/v4l2/v4l2.c:163 +#: modules/codec/avcodec/avcodec.c:50 modules/codec/avcodec/avcodec.c:54 +#: modules/codec/kate.c:199 modules/codec/x264.c:429 modules/codec/x264.c:434 +#: modules/demux/mp4/meta.c:430 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:191 +#: modules/gui/macosx/VLCOpenWindowController.m:243 +#: modules/gui/macosx/VLCOpenWindowController.m:272 +#: modules/gui/macosx/VLCOpenWindowController.m:273 +#: modules/text_renderer/freetype/freetype.c:143 +#: modules/visualization/visual/window_presets.h:34 +#: share/lua/http/dialogs/create_stream.html:196 +msgid "None" +msgstr "নাই" + +#: src/libvlc-module.c:247 +msgid "" +"These options allow you to modify the behavior of the video output " +"subsystem. You can for example enable video filters (deinterlacing, image " +"adjusting, etc.). Enable these filters here and configure them in the " +"\"video filters\" modules section. You can also set many miscellaneous video " +"options." +msgstr "" +"এইবোৰ বিকল্পই আপোনাক ভিডিঅ' আউটপুট উপপ্ৰণালীৰ আচৰণটো সলনি কৰিবলৈ অনুমতি দিয়ে. " +"উদাহৰণস্বৰূপে আপুনি ভিডিঅ' ফিল্টাৰবোৰ সক্ষম কৰিব পাৰে (ডিইন্টাৰলেছিং, ছবি মিলোৱা, " +"ইত্যাদি). এই ফিল্টাৰবোৰ ইয়াত সক্ষম কৰক আৰু সেইবোৰক \"video filters\" মডুলবোৰৰ " +"খণ্ডত ৰূপৰেখা কৰক. আপুনি লগতে বহুতো বিভিন্ন ভিডিঅ' বিকল্পবোৰ ছেট কৰিব পাৰে." + +#: src/libvlc-module.c:253 +msgid "Video output module" +msgstr "ভিডিঅ' আউটপুট মডুল" + +#: src/libvlc-module.c:255 +msgid "" +"This is the the video output method used by VLC. The default behavior is to " +"automatically select the best method available." +msgstr "" +"এইটো হল VLC য়ে ব্যৱহাৰ কৰা ভিডিঅ' আউটপুট পদ্ধতি. উপলব্ধ শ্ৰেষ্ঠ পদ্ধতিটো " +"স্বয়ংক্ৰিয়ভাৱে নিৰ্বাচন কৰিবলৈ ডিফল্ট আচৰণটো." + +#: src/libvlc-module.c:258 modules/gui/macosx/VLCSimplePrefsController.m:367 +#: modules/stream_out/display.c:42 modules/gui/qt/ui/sprefs_video.h:311 +msgid "Enable video" +msgstr "ভিডিঅ' সক্ষম কৰক" + +#: src/libvlc-module.c:260 +msgid "" +"You can completely disable the video output. The video decoding stage will " +"not take place, thus saving some processing power." +msgstr "" +"ভিডিঅ' আউটপুটটো আপুনি সম্পূৰ্ণভাৱে অক্ষম কৰিব পাৰে. ভিডিঅ' ডিকোডিং স্তৰটো সংগটিত " +"নহব, এইদৰে কিছুমান প্ৰক্ৰিয়া শক্তি ছেভ হব." + +#: src/libvlc-module.c:263 modules/stream_out/mosaic_bridge.c:105 +#: modules/stream_out/transcode/transcode.c:67 +#: modules/visualization/glspectrum.c:55 modules/visualization/projectm.cpp:65 +#: modules/visualization/visual/visual.c:53 modules/visualization/vsxu.cpp:52 +msgid "Video width" +msgstr "ভিডিঅ'ৰ প্ৰস্থ" + +#: src/libvlc-module.c:265 +msgid "" +"You can enforce the video width. By default (-1) VLC will adapt to the video " +"characteristics." +msgstr "" +"আপুনি ভিডিঅ' প্ৰস্থটো আৰোপ কৰিব পাৰে. ডিফল্ট হিচাপে (-1) VLC য়ে ভিডিঅ' " +"বৈশিষ্ট্যবোৰলৈ এডাপ্ট কৰিব." + +#: src/libvlc-module.c:268 modules/stream_out/mosaic_bridge.c:108 +#: modules/stream_out/transcode/transcode.c:70 +#: modules/visualization/glspectrum.c:58 modules/visualization/projectm.cpp:68 +#: modules/visualization/visual/visual.c:57 modules/visualization/vsxu.cpp:55 +msgid "Video height" +msgstr "ভিডিঅ'ৰ উচ্চতা" + +#: src/libvlc-module.c:270 +msgid "" +"You can enforce the video height. By default (-1) VLC will adapt to the " +"video characteristics." +msgstr "" +"আপুনি ভিডিঅ' উচ্চতাটো আৰোপ কৰিব পাৰে. ডিফল্ট হিচাপে (-1) VLC য়ে ভিডিঅ' " +"বৈশিষ্ট্যবোৰলৈ এডাপ্ট কৰিব." + +#: src/libvlc-module.c:273 +msgid "Video X coordinate" +msgstr "ভিডিঅ' X স্থানাংক" + +#: src/libvlc-module.c:275 +msgid "" +"You can enforce the position of the top left corner of the video window (X " +"coordinate)." +msgstr "আপুনি ভিডিঅ' উইণ্ডোৰ ওপৰৰ বাওঁ চুকত স্থানটো আৰোপ কৰিব পাৰে (X স্থানাংক)." + +#: src/libvlc-module.c:278 +msgid "Video Y coordinate" +msgstr "ভিডিঅ' Y স্থানাংক" + +#: src/libvlc-module.c:280 +msgid "" +"You can enforce the position of the top left corner of the video window (Y " +"coordinate)." +msgstr "আপুনি ভিডিঅ' উইণ্ডোৰ ওপৰৰ বাওঁ চুকত স্থানটো আৰোপ কৰিব পাৰে (Y স্থানাংক)." + +#: src/libvlc-module.c:283 +msgid "Video title" +msgstr "ভিডিঅ' শিৰোনাম" + +#: src/libvlc-module.c:285 +msgid "" +"Custom title for the video window (in case the video is not embedded in the " +"interface)." +msgstr "" +"ভিডিঅ' উইণ্ডোৰ বাবে শিৰোনামৰ ব্যৱস্থা কৰক (ভিডিঅ' উইণ্ডোখন ইন্টাৰফেছত সংলগ্ন নকৰাৰ " +"ক্ষেত্ৰত)." + +#: src/libvlc-module.c:288 +msgid "Video alignment" +msgstr "ভিডিঅ' শাৰীকৰাটো" + +#: src/libvlc-module.c:290 +msgid "" +"Enforce the alignment of the video in its window. By default (0) it will be " +"centered (0=center, 1=left, 2=right, 4=top, 8=bottom, you can also use " +"combinations of these values, like 6=4+2 meaning top-right)." +msgstr "" +"ইয়াৰ উইণ্ডোৰ ভিতৰত ভিডিঅ'টোৰ শাৰীকৰাটো আৰোপ কৰক. ডিফল্ট হিচাপে (0) এইটো " +"কেন্দ্ৰীয় কৰা হব (0=কেন্দ্ৰ, 1=বাওঁফাল, 2=সোঁফাল, 4=ওপৰ, 8=তল, আপুনি লগতে এই " +"মানবোৰৰ মিশ্ৰণবোৰ ব্যৱহাৰ কৰিব পাৰে, 6=4+2 য়ে ওপৰৰ-সোঁফাল বুজোৱাৰ দৰে)." + +#: src/libvlc-module.c:295 src/libvlc-module.c:368 modules/codec/dvbsub.c:102 +#: modules/codec/zvbi.c:83 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:217 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:295 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:317 +#: modules/spu/audiobargraph_v.c:65 modules/spu/logo.c:80 +#: modules/spu/marq.c:129 modules/spu/mosaic.c:170 modules/spu/rss.c:171 +#: modules/gui/qt/ui/video_effects.h:1265 +#: modules/gui/qt/ui/video_effects.h:1307 +#: modules/gui/qt/ui/video_effects.h:1318 +msgid "Top" +msgstr "ওপৰলৈ" + +#: src/libvlc-module.c:295 src/libvlc-module.c:368 modules/codec/dvbsub.c:102 +#: modules/codec/zvbi.c:83 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:220 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:297 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:319 +#: modules/spu/audiobargraph_v.c:65 modules/spu/logo.c:80 +#: modules/spu/marq.c:129 modules/spu/mosaic.c:170 modules/spu/rss.c:171 +#: modules/gui/qt/ui/video_effects.h:1269 +msgid "Bottom" +msgstr "তললৈ" + +#: src/libvlc-module.c:296 src/libvlc-module.c:369 modules/codec/dvbsub.c:103 +#: modules/codec/zvbi.c:84 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:299 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:321 +#: modules/spu/audiobargraph_v.c:66 modules/spu/logo.c:81 +#: modules/spu/marq.c:130 modules/spu/mosaic.c:171 modules/spu/rss.c:172 +msgid "Top-Left" +msgstr "ওপৰ-বাওঁফাল" + +#: src/libvlc-module.c:296 src/libvlc-module.c:369 modules/codec/dvbsub.c:103 +#: modules/codec/zvbi.c:84 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:301 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:323 +#: modules/spu/audiobargraph_v.c:66 modules/spu/logo.c:81 +#: modules/spu/marq.c:130 modules/spu/mosaic.c:171 modules/spu/rss.c:172 +msgid "Top-Right" +msgstr "ওপৰ-সোঁফাল" + +#: src/libvlc-module.c:296 src/libvlc-module.c:369 modules/codec/dvbsub.c:103 +#: modules/codec/zvbi.c:84 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:303 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:325 +#: modules/spu/audiobargraph_v.c:66 modules/spu/logo.c:81 +#: modules/spu/marq.c:130 modules/spu/mosaic.c:171 modules/spu/rss.c:172 +msgid "Bottom-Left" +msgstr "তল-বাওঁফাল" + +#: src/libvlc-module.c:296 src/libvlc-module.c:369 modules/codec/dvbsub.c:103 +#: modules/codec/zvbi.c:84 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:305 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:327 +#: modules/spu/audiobargraph_v.c:66 modules/spu/logo.c:81 +#: modules/spu/marq.c:130 modules/spu/mosaic.c:171 modules/spu/rss.c:172 +msgid "Bottom-Right" +msgstr "তল-সোঁফাল" + +#: src/libvlc-module.c:298 +msgid "Zoom video" +msgstr "ভিডিঅ' জুম কৰক" + +#: src/libvlc-module.c:300 +msgid "You can zoom the video by the specified factor." +msgstr "নিৰ্ধাৰিত কাৰকটোৰ দ্বাৰা আপুনি ভিডিঅ'টো জুম কৰিব পাৰে." + +#: src/libvlc-module.c:302 +msgid "Grayscale video output" +msgstr "গ্ৰেস্কেল ভিডিঅ' আউটপুট" + +#: src/libvlc-module.c:304 +msgid "" +"Output video in grayscale. As the color information aren't decoded, this can " +"save some processing power." +msgstr "" +"গ্ৰেস্কেলত আউটপুট ভিডিঅ'. যিহেতু ৰংৰ তথ্যটো ডিকোড কৰা নহয়, এইটোৱে কিছুমান প্ৰক্ৰিয়া " +"কৰা শক্তি ছেভ কৰিব পাৰে." + +#: src/libvlc-module.c:307 +msgid "Embedded video" +msgstr "ভিডিঅ' সংলগ্ন কৰা হল" + +#: src/libvlc-module.c:309 +msgid "Embed the video output in the main interface." +msgstr "মুখ্য ইন্টাৰফেছত ভিডিঅ' আউটপুটটো সংলগ্ন কৰক." + +#: src/libvlc-module.c:311 +msgid "Fullscreen video output" +msgstr "সম্পূৰ্ণ দৃশ্যৰ ভিডিঅ' আউটপুট" + +#: src/libvlc-module.c:313 +msgid "Start video in fullscreen mode" +msgstr "সম্পূৰ্ণ দৃশ্যৰ ধৰণত ভিডিঅ' আৰম্ভ কৰক" + +#: src/libvlc-module.c:315 src/video_output/vout_intf.c:253 +msgid "Always on top" +msgstr "সদায় ওপৰত" + +#: src/libvlc-module.c:317 +msgid "Always place the video window on top of other windows." +msgstr "ভিডিঅ' উইণ্ডোখন সদায় আন উইণ্ডোবোৰৰ ওপৰত ৰাখক." + +#: src/libvlc-module.c:319 +msgid "Enable wallpaper mode" +msgstr "" + +#: src/libvlc-module.c:321 +msgid "" +"The wallpaper mode allows you to display the video as the desktop background." +msgstr "" +"ৱালপেপাৰৰ ধৰণটোৱে আপোনাক ডেস্কটপৰ পটভূমিৰ দৰে ভিডিঅ'টো প্ৰদৰ্শন কৰিবলৈ অনুমতি " +"দিয়ে." + +#: src/libvlc-module.c:324 +msgid "Show media title on video" +msgstr "ভিডিঅ'ত মিডিয়া শিৰোনাম দেখুৱাওক" + +#: src/libvlc-module.c:326 +msgid "Display the title of the video on top of the movie." +msgstr "চলচিত্ৰৰ ওপৰত ভিডিঅ'ৰ শিৰোনামটো প্ৰদৰ্শন কৰক." + +#: src/libvlc-module.c:328 +msgid "Show video title for x milliseconds" +msgstr "x মিলিছেকেণ্ডৰ বাবে ভিডিঅ' শিৰোনাম দেখুৱাওক" + +#: src/libvlc-module.c:330 +msgid "Show the video title for n milliseconds, default is 5000 ms (5 sec.)" +msgstr "" +"n মিলিছেকেণ্ডৰ বাবে ভিডিঅ' শিৰোনাম দেখুৱাওক, ডিফল্টটো হল 5000 ms (5 ছেকেণ্ড)" + +#: src/libvlc-module.c:332 +msgid "Position of video title" +msgstr "ভিডিঅ' শিৰোনামৰ স্থান" + +#: src/libvlc-module.c:334 +msgid "Place on video where to display the title (default bottom center)." +msgstr "ভিডিঅ'ত ঠাইটো যত শিৰোনামটো প্ৰদৰ্শন কৰা হব (ডিফল্ট তলৰ কেন্দ্ৰত)." + +#: src/libvlc-module.c:336 +msgid "Hide cursor and fullscreen controller after x milliseconds" +msgstr "x মিলিছেকেণ্ডৰ পিছত কাৰ্ছোৰ আৰু সম্পূৰ্ণ দৃশ্য নিয়ন্ত্ৰক লুকুৱাওক." + +#: src/libvlc-module.c:339 +msgid "Hide mouse cursor and fullscreen controller after n milliseconds." +msgstr "n মিলিছেকেণ্ডৰ পিছত মাউছ কাৰ্ছোৰ আৰু সম্পূৰ্ণ দৃশ্য নিয়ন্ত্ৰক লুকুৱাওক." + +#: src/libvlc-module.c:342 src/libvlc-module.c:344 +#: src/video_output/interlacing.c:112 modules/gui/macosx/VLCMainMenu.m:443 +#: modules/gui/macosx/VLCMainMenu.m:444 +#: modules/gui/macosx/VLCSimplePrefsController.m:386 +#: modules/gui/qt/dialogs/convert.cpp:123 modules/hw/vdpau/chroma.c:896 +#: modules/video_filter/deinterlace/deinterlace.c:300 +#: share/lua/http/dialogs/create_stream.html:346 +msgid "Deinterlace" +msgstr "ডিইন্টাৰলেচ" + +#: src/libvlc-module.c:352 src/video_output/interlacing.c:128 +#: modules/gui/macosx/VLCMainMenu.m:445 modules/gui/macosx/VLCMainMenu.m:446 +#: modules/gui/macosx/VLCSimplePrefsController.m:387 +#: modules/video_filter/deinterlace/deinterlace.c:256 +msgid "Deinterlace mode" +msgstr "ডিইন্টাৰলেচ ধৰণ" + +#: src/libvlc-module.c:354 +msgid "Deinterlace method to use for video processing." +msgstr "ভিডিঅ' প্ৰক্ৰিয়াৰ বাবে ব্যৱহাৰ কৰিবলৈ ডিইন্টাৰলেছ পদ্ধতি." + +#: src/libvlc-module.c:361 modules/video_filter/deinterlace/deinterlace.h:58 +msgid "Discard" +msgstr "বাতিল কৰক" + +#: src/libvlc-module.c:361 modules/video_filter/deinterlace/algo_phosphor.h:47 +#: modules/video_filter/deinterlace/deinterlace.h:58 +msgid "Blend" +msgstr "ব্লেণ্ড" + +#: src/libvlc-module.c:361 modules/video_filter/deinterlace/deinterlace.h:58 +msgid "Mean" +msgstr "মধ্যক" + +#: src/libvlc-module.c:361 modules/hw/vdpau/chroma.c:883 +#: modules/video_filter/deinterlace/deinterlace.h:58 +msgid "Bob" +msgstr "ব'ব" + +#: src/libvlc-module.c:362 modules/video_filter/deinterlace/deinterlace.h:59 +msgid "Phosphor" +msgstr "ফছফোৰ" + +#: src/libvlc-module.c:363 modules/video_filter/deinterlace/deinterlace.h:59 +msgid "Film NTSC (IVTC)" +msgstr "ফিল্ম NTSC (IVTC)" + +#: src/libvlc-module.c:371 +msgid "Disable screensaver" +msgstr "স্ক্ৰীনছেভাৰ অক্ষম কৰক" + +#: src/libvlc-module.c:372 +msgid "Disable the screensaver during video playback." +msgstr "ভিডিঅ' প্লেবেকৰ সময়ত স্ক্ৰীনছেভাৰটো অক্ষম কৰক." + +#: src/libvlc-module.c:374 modules/gui/macosx/VLCSimplePrefsController.m:372 +#: modules/gui/qt/ui/sprefs_video.h:314 +msgid "Window decorations" +msgstr "উইণ্ডোৰ সজ্জাবোৰ" + +#: src/libvlc-module.c:376 +msgid "" +"VLC can avoid creating window caption, frames, etc... around the video, " +"giving a \"minimal\" window." +msgstr "" +"VLC য়ে উইণ্ডো কেপশ্বন, ফ্ৰেমবোৰ, ইত্যাদি তৈয়াৰ কৰাটো আওকাণ কৰিব পাৰে... ভিডিঅ'ৰ " +"চাৰিওফালে, \"minimal\" উইণ্ডো এখন দি." + +#: src/libvlc-module.c:379 +msgid "Video splitter module" +msgstr "ভিডিঅ' স্প্লিটাৰ মডুল" + +#: src/libvlc-module.c:381 +msgid "This adds video splitters like clone or wall" +msgstr "এইটোৱে ক্লন বা ৱালৰ দৰে ভিডিঅ' স্প্লিটাৰবোৰ যোগ কৰে" + +#: src/libvlc-module.c:383 +msgid "Video filter module" +msgstr "ভিডিঅ' ফিল্টাৰ মডুল" + +#: src/libvlc-module.c:385 +msgid "" +"This adds post-processing filters to enhance the picture quality, for " +"instance deinterlacing, or distort the video." +msgstr "" +"এইটোৱে ছবিৰ মানদণ্ডটো বৃদ্ধি কৰিবলৈ পিছত প্ৰক্ৰিয়া কৰা ফিল্টাৰবোৰ যোগ কৰে, " +"উদাহৰণস্বৰূপে ভিডিঅ'টো বৰ্গীকৰণ বা ইন্টাৰলেচিং নকৰা." + +#: src/libvlc-module.c:389 +msgid "Video snapshot directory (or filename)" +msgstr "ভিডিঅ' স্নেপশ্বট নিৰ্দেশকা (বা ফাইলৰ নাম)" + +#: src/libvlc-module.c:391 +msgid "Directory where the video snapshots will be stored." +msgstr "নিৰ্দেশিকা যত ভিডিঅ' স্নেপশ্বটবোৰ জমা কৰা হব." + +#: src/libvlc-module.c:393 src/libvlc-module.c:395 +msgid "Video snapshot file prefix" +msgstr "ভিডিঅ' স্নেপশ্বট ফাইল উপসৰ্গ" + +#: src/libvlc-module.c:397 +msgid "Video snapshot format" +msgstr "ভিডিঅ' স্নেপশ্বট ফাইল ফৰমেট" + +#: src/libvlc-module.c:399 +msgid "Image format which will be used to store the video snapshots" +msgstr "ছবিৰ ফৰমেট যিটো ভিডিঅ' স্নেপশ্বটবোৰ জমা কৰিবলৈ ব্যৱহাৰ কৰা হব" + +#: src/libvlc-module.c:401 +msgid "Display video snapshot preview" +msgstr "ভিডিঅ' স্নেপশ্বট প্ৰস্থ পূৰ্বদৃশ্য প্ৰদৰ্শন কৰক" + +#: src/libvlc-module.c:403 +msgid "Display the snapshot preview in the screen's top-left corner." +msgstr "স্ক্ৰীনৰ ওপৰৰ-বাওঁফালৰ চুকটোত স্নেপশ্বটৰ পূৰ্বদৃশ্যটো প্ৰদৰ্শন কৰক." + +#: src/libvlc-module.c:405 +msgid "Use sequential numbers instead of timestamps" +msgstr "টাইমষ্টেম্পবোৰৰ পৰিৱৰ্তে ক্ৰমিক সংখ্যাবোৰ ব্যৱহাৰ কৰক" + +#: src/libvlc-module.c:407 +msgid "Use sequential numbers instead of timestamps for snapshot numbering" +msgstr "স্নেপশ্বট সংখ্যাৰ বাবে টাইমষ্টেম্পবোৰৰ পৰিৱৰ্তে ক্ৰমিক সংখ্যাবোৰ ব্যৱহাৰ কৰক" + +#: src/libvlc-module.c:409 +msgid "Video snapshot width" +msgstr "ভিডিঅ' স্নেপশ্বট প্ৰস্থ" + +#: src/libvlc-module.c:411 +msgid "" +"You can enforce the width of the video snapshot. By default it will keep the " +"original width (-1). Using 0 will scale the width to keep the aspect ratio." +msgstr "" +"আপুনি ভিডিঅ' স্নেপশ্বটটোৰ প্ৰস্থটো আৰোপ কৰিব পাৰে. ডিফল্ট হিচাপে এইটোৱে প্ৰকৃত " +"প্ৰস্থটো ধৰি ৰাখিব (-1). 0 ব্যৱহাৰ কৰাটোৱে দৃষ্টিকোণ অনুপাতটো ৰাখিবলৈ প্ৰস্থটো জুখিব." + +#: src/libvlc-module.c:415 +msgid "Video snapshot height" +msgstr "ভিডিঅ' স্নেপশ্বট উচ্চতা" + +#: src/libvlc-module.c:417 +msgid "" +"You can enforce the height of the video snapshot. By default it will keep " +"the original height (-1). Using 0 will scale the height to keep the aspect " +"ratio." +msgstr "" +"আপুনি ভিডিঅ' স্নেপশ্বটটোৰ উচ্চতাটো আৰোপ কৰিব পাৰে. ডিফল্ট হিচাপে এইটোৱে প্ৰকৃত " +"উচ্চতাটো ধৰি ৰাখিব (-1). 0 ব্যৱহাৰ কৰাটোৱে দৃষ্টিকোণ অনুপাতটো ৰাখিবলৈ উচ্চতাটো " +"জুখিব." + +#: src/libvlc-module.c:421 +msgid "Video cropping" +msgstr "ভিডিঅ' ক্ৰোপ কৰিছে" + +#: src/libvlc-module.c:423 +msgid "" +"This forces the cropping of the source video. Accepted formats are x:y (4:3, " +"16:9, etc.) expressing the global image aspect." +msgstr "" +"এইটোৱে উত্স ভিডিঅ'টোৰ ক্ৰোপ কৰাটো জোৰ কৰে. গ্ৰহণ কৰা ফৰমেটবোৰ হল x:y (4:3, " +"16:9, ইত্যাদি) সাৰ্বজনীন ছবিৰ দৃষ্টিকোণটো প্ৰকাশ কৰি." + +#: src/libvlc-module.c:427 +msgid "Source aspect ratio" +msgstr "উত্স দৃষ্টিকোণ অনুপাত" + +#: src/libvlc-module.c:429 +msgid "" +"This forces the source aspect ratio. For instance, some DVDs claim to be " +"16:9 while they are actually 4:3. This can also be used as a hint for VLC " +"when a movie does not have aspect ratio information. Accepted formats are x:" +"y (4:3, 16:9, etc.) expressing the global image aspect, or a float value " +"(1.25, 1.3333, etc.) expressing pixel squareness." +msgstr "" +"এইটোৱে উত্সৰ দৃষ্টিকোণ অনুপাতটো জোৰ কৰে. উদাহৰণস্বৰূপে, কিছুমান DVD য়ে 16:9 বুলি " +"দাবী কৰে যদিও সেইবোৰ প্ৰকৃততে 4:3. এইটো লগতে VLC ৰ বাবে এটা ইংগিতৰ দৰে ব্যৱহাৰ " +"কৰিব পাৰি যেতিয়া চলচিত্ৰ এখনৰ দৃষ্টিকোণ অনুপাতৰ তথ্য নাথাকে. গ্ৰহণ কৰা ফৰমেটবোৰ হল " +"x:y (4:3, 16:9, ইত্যাদি) সাৰ্বজনীন ছবিৰ দৃষ্টিকোণটো প্ৰকাশ কৰি, বা এটা ফ্লট মান " +"(1.25, 1.3333, ইত্যাদি) পিক্সেল স্কয়াৰনেছ প্ৰকাশ কৰি." + +#: src/libvlc-module.c:436 +msgid "Video Auto Scaling" +msgstr "ভিডিঅ' স্বয়ংক্ৰিয় জোখা" + +#: src/libvlc-module.c:438 +msgid "Let the video scale to fit a given window or fullscreen." +msgstr "দিয়া উইণ্ডো বা সম্পূৰ্ণদৃশ্য এখনত খাপ খুৱাবলৈ ভিডিঅ' জোখক." + +#: src/libvlc-module.c:440 +msgid "Video scaling factor" +msgstr "ভিডিঅ' জোখা কাৰক" + +#: src/libvlc-module.c:442 +msgid "" +"Scaling factor used when Auto Scaling is disabled.\n" +"Default value is 1.0 (original video size)." +msgstr "" +"যেতিয়া স্বয়ংক্ৰিয়ভাৱে জোখাটো অক্ষম হয় তেতিয়া জোখাৰ কাৰক ব্যৱহাৰ কৰা হয়.\n" +"ডিফল্ট মানটো হল 1.0 (প্ৰকৃত ভিডিঅ' আকাৰ)." + +#: src/libvlc-module.c:445 +msgid "Custom crop ratios list" +msgstr "ক্ৰোপ অনুপাতবোৰৰ তালিকা ব্যৱস্থা কৰক" + +#: src/libvlc-module.c:447 +msgid "" +"Comma separated list of crop ratios which will be added in the interface's " +"crop ratios list." +msgstr "" +"ক্ৰোপ অনুপাতবোৰৰ ক'মাৰ দ্বাৰা পৃথকীকৃত তালিকা যিটো ইন্টাৰফেছৰ ক্ৰোপ অনুপাতবোৰৰ " +"তালিকাত যোগ কৰা হব." + +#: src/libvlc-module.c:450 +msgid "Custom aspect ratios list" +msgstr "দৃষ্টিকোণ অনুপাতবোৰৰ তালিকা ব্যৱস্থা কৰক" + +#: src/libvlc-module.c:452 +msgid "" +"Comma separated list of aspect ratios which will be added in the interface's " +"aspect ratio list." +msgstr "" +"দৃষ্টিকোণ অনুপাতবোৰৰ ক'মাৰ দ্বাৰা পৃথকীকৃত তালিকা যিটো ইন্টাৰফেছৰ দৃষ্টিকোণ অনুপাত " +"তালিকাত যোগ কৰা হব." + +#: src/libvlc-module.c:455 +msgid "Fix HDTV height" +msgstr "HDTV উচ্চতা নিৰ্দিষ্ট কৰক" + +#: src/libvlc-module.c:457 +msgid "" +"This allows proper handling of HDTV-1080 video format even if broken encoder " +"incorrectly sets height to 1088 lines. You should only disable this option " +"if your video has a non-standard format requiring all 1088 lines." +msgstr "" +"এইটোৱে HDTV-1080 ভিডিঅ' ফৰমেটৰ উপযুক্ত পৰিচালনাৰ অনুমতি দিয়ে যদিও নষ্ট হোৱা " +"এনকোডাৰে অশুদ্ধকৈ 1088 শাৰীৰ উচ্চতালৈ ছেট কৰে. আপুনি কেৱল এই বিকল্পটো অক্ষম কৰিব " +"পাৰিব যদি আপোনাৰ ভিডিঅ'টোৰ 1088 শাৰীবোৰ দাবী কৰা অমানবিশিষ্ট ফৰমেট এটা আছে." + +#: src/libvlc-module.c:462 +msgid "Monitor pixel aspect ratio" +msgstr "মনিটৰ পিক্সেল দৃষ্টিকোণ অনুপাত" + +#: src/libvlc-module.c:464 +msgid "" +"This forces the monitor aspect ratio. Most monitors have square pixels " +"(1:1). If you have a 16:9 screen, you might need to change this to 4:3 in " +"order to keep proportions." +msgstr "" +"এইটোৱে মনিটৰ দৃষ্টিকোণ অনুপাতটো জোৰ কৰে. অধিকাংশ মনিটৰৰ বৰ্গাকৃতিৰ পিক্সেলবোৰ আছে " +"(1:1). যদি আপোনাৰ এখন 16:9 স্ক্ৰীন আছে, তেন্তে আপুনি সমানুপাতবোৰ ৰাখিবলৈ এইখন 4:3 " +"লৈ সলনি কৰিবলগীয়া হব পাৰে." + +#: src/libvlc-module.c:468 modules/gui/macosx/VLCSimplePrefsController.m:315 +msgid "Skip frames" +msgstr "ফ্ৰেমবোৰ এৰি যাওক" + +#: src/libvlc-module.c:470 +msgid "" +"Enables framedropping on MPEG2 stream. Framedropping occurs when your " +"computer is not powerful enough" +msgstr "" +"MPEG2 ষ্ট্ৰিমত ফ্ৰেমড্ৰপিং সক্ষম কৰে. আপোনাৰ কম্পিউটাৰটো অধিক শক্তিশালী নহলে " +"ফ্ৰেমড্ৰপিংৰ উদ্ভৱ হয়" + +#: src/libvlc-module.c:473 +msgid "Drop late frames" +msgstr "পলমকৈ অহা ফ্ৰেমবোৰ ড্ৰপ কৰক" + +#: src/libvlc-module.c:475 +msgid "" +"This drops frames that are late (arrive to the video output after their " +"intended display date)." +msgstr "" +"এইটোৱে পলমকৈ অহা ফ্ৰেমবোৰ ড্ৰপ কৰে (সিহঁতৰ উদ্দেশ্যপ্ৰণোদিত প্ৰদৰ্শন তাৰিখৰ পিছত " +"ভিডিঅ' আউটপুটটোলৈ যাওক)." + +#: src/libvlc-module.c:478 +msgid "Quiet synchro" +msgstr "শান্ত ছিনক্ৰনাইজেশ্বন" + +#: src/libvlc-module.c:480 +msgid "" +"This avoids flooding the message log with debug output from the video output " +"synchronization mechanism." +msgstr "" +"এইটোৱে ভিডিঅ' আউটপুট ছিনক্ৰনাইজেশ্বন কাৰিকৰীটোৰ পৰা ডিবাগ আউটপুটৰ সৈতে বাৰ্তা " +"ল'গটো ফ্লাডকৰাটো আওকাণ কৰে." + +#: src/libvlc-module.c:483 +msgid "Key press events" +msgstr "কী প্ৰেছ কৰা ঘটনাবোৰ" + +#: src/libvlc-module.c:485 +msgid "This enables VLC hotkeys from the (non-embedded) video window." +msgstr "এইটোৱে (সংলগ্ন নকৰা) ভিডিঅ' উইণ্ডোটোৰ পৰা VLC হটকীবোৰ সক্ষম কৰে." + +#: src/libvlc-module.c:487 modules/spu/remoteosd.c:91 +msgid "Mouse events" +msgstr "মাউছ ঘটনাবোৰ" + +#: src/libvlc-module.c:489 +msgid "This enables handling of mouse clicks on the video." +msgstr "এইটোৱে ভিডিঅ'বোৰত মাউছ ক্লিকবোৰ পৰিচালনা কৰাটো সক্ষম কৰে." + +#: src/libvlc-module.c:497 +msgid "" +"These options allow you to modify the behavior of the input subsystem, such " +"as the DVD or VCD device, the network interface settings or the subtitle " +"channel." +msgstr "" +"এইবোৰ বিকল্পই DVD বা VCD ডিভাইচ, নেটৱৰ্ক ইন্টাৰফেছ ছেটিংবোৰ বা উপশিৰোনাম চেনেলৰ " +"দৰে ইনপুট ছিষ্টেমটোৰ আচৰণটো সলনি কৰিবলৈ আপোনাক অনুমতি দিয়ে." + +#: src/libvlc-module.c:501 +msgid "File caching (ms)" +msgstr "ফাইল কেশ্বিং (ms)" + +#: src/libvlc-module.c:503 +msgid "Caching value for local files, in milliseconds." +msgstr "মিলিছেকেণ্ডত স্থানীয় ফাইলবোৰৰ বাবে মান কেশ্ব কৰিছে." + +#: src/libvlc-module.c:505 +msgid "Live capture caching (ms)" +msgstr "পোনপটীয়া অধিগ্ৰহণৰ কেশ্বিং (ms)" + +#: src/libvlc-module.c:507 +msgid "Caching value for cameras and microphones, in milliseconds." +msgstr "মিলিছেকেণ্ডত কেমেৰাবোৰ আৰু মাইক্ৰফোনবোৰৰ বাবে মান কেশ্ব কৰিছে." + +#: src/libvlc-module.c:509 +msgid "Disc caching (ms)" +msgstr "ডিস্ক কেশ্বিং (ms)" + +#: src/libvlc-module.c:511 +msgid "Caching value for optical media, in milliseconds." +msgstr "মিলিছেকেণ্ডত অপ্টিকেল মিডিয়াৰ বাবে মান কেশ্ব কৰিছে." + +#: src/libvlc-module.c:513 +msgid "Network caching (ms)" +msgstr "নেটৱৰ্ক কেশ্বিং (ms)" + +#: src/libvlc-module.c:515 +msgid "Caching value for network resources, in milliseconds." +msgstr "মিলিছেকেণ্ডত নেটৱৰ্ক সম্পদবোৰৰ বাবে মান কেশ্ব কৰিছে." + +#: src/libvlc-module.c:517 +msgid "Clock reference average counter" +msgstr "ঘড়ী প্ৰসংগৰ গড় গণনাকাৰী" + +#: src/libvlc-module.c:519 +msgid "" +"When using the PVR input (or a very irregular source), you should set this " +"to 10000." +msgstr "" +"PVR ইনপুটটো ব্যৱহাৰ কৰে (বা এটা বৰ অনিয়মিত উত্স), আপুনি এইটো 10000 লৈ ছেট কৰা " +"উচিত." + +#: src/libvlc-module.c:522 +msgid "Clock synchronisation" +msgstr "ঘড়ীৰ ছিনক্ৰনাইজেশ্বন" + +#: src/libvlc-module.c:524 +msgid "" +"It is possible to disable the input clock synchronisation for real-time " +"sources. Use this if you experience jerky playback of network streams." +msgstr "" +"ৰিয়েল-টাইম উত্সবোৰৰ বাবে ইনপুট ঘড়ী ছিনক্ৰনাইজেশ্বনটো অক্ষম কৰাটো সম্ভৱ. এইটো " +"ব্যৱহাৰ কৰক যদি আপুনি নেটৱৰ্ক ষ্ট্ৰিমবোৰৰ জাৰ্কী প্লেবেক অনুভৱ কৰে." + +#: src/libvlc-module.c:528 +msgid "Clock jitter" +msgstr "ঘড়ী জিটাৰ" + +#: src/libvlc-module.c:530 +msgid "" +"This defines the maximum input delay jitter that the synchronization " +"algorithms should try to compensate (in milliseconds)." +msgstr "" +"এইটোৱে সৰ্বাধিক ইনপুট বিলম্ব জিটাৰটো বাখ্যা কৰে যিটো ছিনক্ৰনাইজেশ্বন এলগোৰিথমবোৰে " +"ক্ষতিপূৰণ দিবলৈ চেষ্টা কৰা উচিত (মিলিছেকেণ্ডত)." + +#: src/libvlc-module.c:533 +msgid "Network synchronisation" +msgstr "নেটৱৰ্ক ছিক্ৰনাইজেশ্বন" + +#: src/libvlc-module.c:534 +msgid "" +"This allows you to remotely synchronise clocks for server and client. The " +"detailed settings are available in Advanced / Network Sync." +msgstr "" +"এইটোৱে ছাৰ্ভাৰ আৰু গ্ৰাহকবোৰৰ বাবে আপোনাক ঘড়ীবোৰ দূৰৱৰ্তীভাৱে ছিনক্ৰনাইজ কৰিবলৈ " +"অনুমতি দিয়ে. পূংখানুপূংখ ছেটিংবোৰ উন্নত / নেটৱৰ্ক ছিনক্ৰনাইজেশ্বনত উপলব্ধ." + +#: src/libvlc-module.c:540 src/video_output/vout_intf.c:98 +#: src/video_output/vout_intf.c:116 modules/access/dshow/dshow.cpp:92 +#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119 +#: modules/access/dshow/dshow.cpp:2081 modules/audio_output/alsa.c:767 +#: modules/audio_output/directsound.c:1048 modules/audio_output/mmdevice.c:1316 +#: modules/audio_output/mmdevice.c:1445 modules/audio_output/winstore.c:594 +#: modules/codec/avcodec/avcodec.c:50 modules/demux/adaptive/adaptive.cpp:106 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:79 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:322 +#: modules/gui/macosx/VLCMainMenu.m:602 +#: modules/gui/macosx/VLCSimplePrefsController.m:669 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:54 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:388 +#: modules/gui/macosx/prefs_widgets.m:1219 +#: modules/gui/macosx/prefs_widgets.m:1276 +#: modules/gui/qt/components/preferences_widgets.cpp:546 +#: modules/logger/file.c:203 modules/spu/marq.c:61 modules/spu/rss.c:69 +#: modules/spu/rss.c:182 modules/video_output/win32/directdraw.c:1492 +msgid "Default" +msgstr "ডিফল্ট কৰক" + +#: src/libvlc-module.c:540 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:215 +#: modules/gui/macosx/VLCSidebarDataSource.m:209 +#: modules/gui/qt/components/extended_panels.cpp:962 +#: modules/gui/qt/ui/equalizer.h:130 modules/gui/qt/ui/vlm.h:286 +msgid "Enable" +msgstr "সক্ষম কৰক" + +#: src/libvlc-module.c:542 +msgid "MTU of the network interface" +msgstr "নেটৱৰ্ক ইন্টাৰফেছৰ MTU" + +#: src/libvlc-module.c:544 +msgid "" +"This is the maximum application-layer packet size that can be transmitted " +"over the network (in bytes)." +msgstr "" +"এইটো হল সৰ্বাধিক আবেদন-স্তৰৰ পেকেট আকাৰ যিটো নেটৱৰ্কটোত প্ৰেৰণ কৰিব পাৰি (বাইটত)." + +#: src/libvlc-module.c:549 modules/stream_out/rtp.c:124 +msgid "Hop limit (TTL)" +msgstr "হপৰ সীমা (TTL)" + +#: src/libvlc-module.c:551 modules/stream_out/rtp.c:126 +msgid "" +"This is the hop limit (also known as \"Time-To-Live\" or TTL) of the " +"multicast packets sent by the stream output (-1 = use operating system built-" +"in default)." +msgstr "" +"এইটো হল ষ্ট্ৰিম (-1 = ডিফল্ট হিচাপে তৈয়াৰী অপাৰেটিং ছিষ্টেম ব্যৱহাৰ কৰক) আউটপুটটোৰ " +"দ্বাৰা পথোৱা মাল্টিকাষ্ট পেকেটবোৰৰ হপৰ সীমা (লগতে \"Time-To-Live\" বা TTL " +"হিচাপে জনাজাত)." + +#: src/libvlc-module.c:555 +msgid "Multicast output interface" +msgstr "মাল্টিকাষ্ট আউটপুট ইন্টাৰফেছ" + +#: src/libvlc-module.c:557 +msgid "Default multicast interface. This overrides the routing table." +msgstr "ডিফল্ট মাল্টিকাষ্ট ইন্টাৰফেছ. এইটোৱে ৰাউটিং তালিকাটো অভাৰৰাইড কৰে." + +#: src/libvlc-module.c:559 +msgid "DiffServ Code Point" +msgstr "ভাগ কৰা ছাৰ্ভাৰবোৰৰ কোড বিন্দু" + +#: src/libvlc-module.c:560 +msgid "" +"Differentiated Services Code Point for outgoing UDP streams (or IPv4 Type Of " +"Service, or IPv6 Traffic Class). This is used for network Quality of Service." +msgstr "" +"বাহিৰলৈ যোৱা UDP ষ্ট্ৰিমবোৰৰ বাবে ভাগ কৰা ছাৰ্ভাৰবোৰৰ কোড বিন্দু (বা সেৱাৰ IPv4 " +"প্ৰকাৰ, বা IPv6 ট্ৰেফিক শ্ৰেণী). এইটো সেৱাৰ নেটৱৰ্ক মানদণ্ডৰ বাবে ব্যৱহাৰ কৰা হয়." + +#: src/libvlc-module.c:566 +msgid "" +"Choose the program to select by giving its Service ID. Only use this option " +"if you want to read a multi-program stream (like DVB streams for example)." +msgstr "" +"ইয়াৰ সেৱা ID টো প্ৰদানৰ দ্বাৰা নিৰ্বাচন কৰিবলৈ কাৰ্যসূচীটো পছন্দ কৰক. কেৱল এই " +"বিকল্পটো ব্যৱহাৰ কৰক যদি আপুনি বিভিন্ন-কাৰ্যসূচীৰ ষ্ট্ৰিম এটা পঢ়িব বিচাৰে " +"(উদাহৰণস্বৰূপে DVB ষ্ট্ৰিমবোৰ)." + +#: src/libvlc-module.c:572 +msgid "" +"Choose the programs to select by giving a comma-separated list of Service " +"IDs (SIDs). Only use this option if you want to read a multi-program stream " +"(like DVB streams for example)." +msgstr "" +"সেৱা IDবোৰৰ (SIDবোৰ) ক'মা-পৃথকীকৃত তালিকা এখন প্ৰদানৰ দ্বাৰা নিৰ্বাচন কৰিবলৈ " +"কাৰ্যসূচীটো পছন্দ কৰক. কেৱল এই বিকল্পটো ব্যৱহাৰ কৰক যদি আপুনি বিভিন্ন-কাৰ্যসূচীৰ " +"ষ্ট্ৰিম এটা পঢ়িব বিচাৰে (উদাহৰণস্বৰূপে DVB ষ্ট্ৰিমবোৰ)." + +#: src/libvlc-module.c:578 modules/gui/qt/ui/open_disk.h:309 +msgid "Audio track" +msgstr "অডিঅ' পথ" + +#: src/libvlc-module.c:580 +msgid "Stream number of the audio track to use (from 0 to n)." +msgstr "ব্যৱহাৰ কৰিবলৈ অডিঅ' পথৰ ষ্ট্ৰিম সংখ্যা (0 ৰ পৰা n লৈ)." + +#: src/libvlc-module.c:583 modules/gui/qt/ui/open_disk.h:310 +msgid "Subtitle track" +msgstr "উপশিৰোনাম পথ" + +#: src/libvlc-module.c:585 +msgid "Stream number of the subtitle track to use (from 0 to n)." +msgstr "ব্যৱহাৰ কৰিবলৈ উপশিৰোনাম পথৰ ষ্ট্ৰিম সংখ্যা (0 ৰ পৰা n লৈ)." + +#: src/libvlc-module.c:588 modules/stream_out/transcode/transcode.c:97 +msgid "Audio language" +msgstr "অডিঅ' ভাষা" + +#: src/libvlc-module.c:590 +msgid "" +"Language of the audio track you want to use (comma separated, two or three " +"letter country code, you may use 'none' to avoid a fallback to another " +"language)." +msgstr "" +"আপুনি ব্যৱহাৰ কৰিবলৈ বিচৰা অডিঅ' পথটোৰ ভাষা (কমা পৃথকীকৃত, দুটা বা তিনিটা আখৰৰ " +"দেশীয় কোড, অন্য এটাত ভাষাত পৰাটো আওকাণ কৰিবলৈ আপুনি 'নাই' ব্যৱহাৰ কৰিব পাৰে)." + +#: src/libvlc-module.c:593 +msgid "Subtitle language" +msgstr "উপশিৰোনামৰ ভাষা" + +#: src/libvlc-module.c:595 +msgid "" +"Language of the subtitle track you want to use (comma separated, two or " +"three letters country code, you may use 'any' as a fallback)." +msgstr "" +"আপুনি ব্যৱহাৰ কৰিবলৈ বিচৰা উপশিৰোনাম পথটোৰ ভাষা (কমা পৃথকীকৃত, দুটা বা তিনিটা " +"আখৰৰ দেশীয় কোড, পিছলৈ পৰাটোৰ দৰে আপুনি 'যিকোনো' ব্যৱহাৰ কৰিব পাৰে)." + +#: src/libvlc-module.c:598 +msgid "Menu language" +msgstr "তালিকাৰ ভাষা" + +#: src/libvlc-module.c:600 +msgid "" +"Language of the menus you want to use with DVD/BluRay (comma separated, two " +"or three letters country code, you may use 'any' as a fallback)." +msgstr "" +"আপুনি DVD/ব্লুৰে ৰ সৈতে ব্যৱহাৰ কৰিব বিচৰা তালিকাবোৰৰ ভাষা (কমা পৃথকীকৃত, দুটা বা " +"তিনিটা আখৰৰ দেশীয় কোড, পিছলৈ পৰাটোৰ দৰে আপুনি 'যিকোনো' ব্যৱহাৰ কৰিব পাৰে)." + +#: src/libvlc-module.c:604 +msgid "Audio track ID" +msgstr "অডিঅ' পথ ID" + +#: src/libvlc-module.c:606 +msgid "Stream ID of the audio track to use." +msgstr "ব্যৱহাৰ কৰিবলৈ অডিঅ' পথটোৰ ষ্ট্ৰিম ID." + +#: src/libvlc-module.c:608 +msgid "Subtitle track ID" +msgstr "উপশিৰোনাম পথ ID" + +#: src/libvlc-module.c:610 +msgid "Stream ID of the subtitle track to use." +msgstr "ব্যৱহাৰ কৰিবলৈ উপশিৰোনাম পথটোৰ ষ্ট্ৰিম ID." + +#: src/libvlc-module.c:612 +msgid "Preferred Closed Captions decoder" +msgstr "" + +#: src/libvlc-module.c:616 +msgid "Preferred video resolution" +msgstr "পছন্দ কৰা ভিডিঅ' বিশ্লেষণ" + +#: src/libvlc-module.c:618 +msgid "" +"When several video formats are available, select one whose resolution is " +"closest to (but not higher than) this setting, in number of lines. Use this " +"option if you don't have enough CPU power or network bandwidth to play " +"higher resolutions." +msgstr "" +"যেতিয়া বিভিন্ন ভিডিঅ' ফৰমেটবোৰ উপলব্ধ, তেতিয়া এটা নিৰ্বাচন কৰক যাৰ বিশ্লেষণটো এই " +"ছেটিংটোৰ আটাইতকৈ ওচৰত (কিন্তু তাতকৈ ডাঙৰ নহয়) থাকে, শাৰীবোৰৰ সংখ্যাত. এই " +"বিকল্পটো ব্যৱহাৰ কৰক যদি উচ্চ বিশ্লেষণবোৰ চলাবলৈ আপোনাৰ যথেষ্ট CPU শক্তি বা নেটৱৰ্ক " +"বেণ্ডউইড নাই." + +#: src/libvlc-module.c:624 +msgid "Best available" +msgstr "শ্ৰেষ্ঠ উপলব্ধ" + +#: src/libvlc-module.c:624 +msgid "Full HD (1080p)" +msgstr "সম্পূৰ্ণ HD (1080p)" + +#: src/libvlc-module.c:624 +msgid "HD (720p)" +msgstr "HD (720p)" + +#: src/libvlc-module.c:625 +msgid "Standard Definition (576 or 480 lines)" +msgstr "মানবিশিষ্ট স্পষ্টতা (576 বা 480 শাৰী)" + +#: src/libvlc-module.c:626 +msgid "Low Definition (360 lines)" +msgstr "নিম্ন স্পষ্টতা (360 শাৰী)" + +#: src/libvlc-module.c:627 +msgid "Very Low Definition (240 lines)" +msgstr "অতি নিম্ন স্পষ্টতা (240 শাৰী)" + +#: src/libvlc-module.c:630 +msgid "Input repetitions" +msgstr "ইনপুট পুনৰাবৃত্তিবোৰ" + +#: src/libvlc-module.c:632 +msgid "Number of time the same input will be repeated" +msgstr "বহুবাৰ একেটা ইনপুট পুনৰাবৃত্তি কৰা হব" + +#: src/libvlc-module.c:634 modules/gui/macosx/VLCOpenWindowController.m:159 +msgid "Start time" +msgstr "আৰম্ভৰ সময়" + +#: src/libvlc-module.c:636 +msgid "The stream will start at this position (in seconds)." +msgstr "এই স্থানটোত ষ্ট্ৰিমটো আৰম্ভ হব (ছেকেণ্ডত)." + +#: src/libvlc-module.c:638 modules/gui/macosx/VLCOpenWindowController.m:161 +msgid "Stop time" +msgstr "বন্ধৰ সময়" + +#: src/libvlc-module.c:640 +msgid "The stream will stop at this position (in seconds)." +msgstr "এই স্থানটোত ষ্ট্ৰিমটো বন্ধ হব (ছেকেণ্ডত)." + +#: src/libvlc-module.c:642 +msgid "Run time" +msgstr "চলা সময়" + +#: src/libvlc-module.c:644 +msgid "The stream will run this duration (in seconds)." +msgstr "এই সময়চোৱাত ষ্ট্ৰিমটো চলিব (ছেকেণ্ডত)." + +#: src/libvlc-module.c:646 modules/gui/qt/ui/sprefs_input.h:360 +msgid "Fast seek" +msgstr "খৰতকীয়াকৈ বিচৰা" + +#: src/libvlc-module.c:648 +msgid "Favor speed over precision while seeking" +msgstr "বিচৰোতে সুস্পষ্টতাটোৰ ওপৰত গতিটো সমৰ্থন কৰে" + +#: src/libvlc-module.c:650 +msgid "Playback speed" +msgstr "প্লেবেকৰ গতি" + +#: src/libvlc-module.c:652 +msgid "This defines the playback speed (nominal speed is 1.0)." +msgstr "এইটোৱে প্লেবেক গতিটো বাখ্যা কৰে (মনোনীত গতিটো হল 1.0)." + +#: src/libvlc-module.c:654 +msgid "Input list" +msgstr "ইনপুট তালিকা" + +#: src/libvlc-module.c:656 +msgid "" +"You can give a comma-separated list of inputs that will be concatenated " +"together after the normal one." +msgstr "" +"আপুনি ইনপুটবোৰৰ ক'মাৰ দ্বৰা পৃথকীকৃত তালিকা এখন দিব পাৰে যিখন স্বাভাৱিক এটাৰ পিছত " +"সংযোগ কৰা হব." + +#: src/libvlc-module.c:659 +msgid "Input slave (experimental)" +msgstr "শ্লেভ ইনপুট কৰক (পৰীক্ষামূলক)" + +#: src/libvlc-module.c:661 +msgid "" +"This allows you to play from several inputs at the same time. This feature " +"is experimental, not all formats are supported. Use a '#' separated list of " +"inputs." +msgstr "" +"এইটোৱে আপোনাক একে সময়তে বিভিন্ন ইনপুটবোৰৰ পৰা চলাবলৈ অনুমতি দিয়ে. এই বৈশিষ্ট্যটো " +"পৰীক্ষামূলক, সকলোবোৰ ফৰমেট সমৰ্থন নকৰে. ইনপুটবোৰৰ '#' ৰ দ্বাৰা পৃথকীকৃত তালিকা এখন " +"ব্যৱহাৰ কৰক." + +#: src/libvlc-module.c:665 +msgid "Bookmarks list for a stream" +msgstr "ষ্ট্ৰিম এটাৰ বাব পৃষ্ঠাসংকেতবোৰৰ তালিকা" + +#: src/libvlc-module.c:667 +msgid "" +"You can manually give a list of bookmarks for a stream in the form " +"\"{name=bookmark-name,time=optional-time-offset,bytes=optional-byte-offset}," +"{...}\"" +msgstr "" +"ষ্ট্ৰিম এটাৰ বাবে \"{name=bookmark-name,time=optional-time-offset," +"bytes=optional-byte-offset},{...}\" ৰ ৰূপত আপুনি মেনুৱেলী পৃষ্ঠাসংকেতবোৰৰ তালিকা " +"এখন দিব পাৰে" + +#: src/libvlc-module.c:671 +msgid "Record directory" +msgstr "" + +#: src/libvlc-module.c:673 +msgid "Directory where the records will be stored" +msgstr "" + +#: src/libvlc-module.c:675 +msgid "Prefer native stream recording" +msgstr "স্থানীয় ষ্ট্ৰিম ৰেকৰ্ডিং পছন্দ কৰক" + +#: src/libvlc-module.c:677 +msgid "" +"When possible, the input stream will be recorded instead of using the stream " +"output module" +msgstr "" +"যেতিয়া সম্ভৱ, ষ্ট্ৰিম আউটপুট মডুলটো ব্যৱহাৰ কৰাৰ পৰিৱৰ্তে ইনপুট ষ্ট্ৰিমটো ৰেকৰ্ড কৰা হব" + +#: src/libvlc-module.c:680 +msgid "Timeshift directory" +msgstr "টাইমছিফ্ট নিৰ্দেশিকা" + +#: src/libvlc-module.c:682 +msgid "Directory used to store the timeshift temporary files." +msgstr "টাইমছিফ্ট সাময়িক ফাইলবোৰ জমা কৰিবলৈ ব্যৱহাৰ কৰা নিৰ্দেশিকা." + +#: src/libvlc-module.c:684 +msgid "Timeshift granularity" +msgstr "টাইমছিফ্ট গ্ৰেনুলাৰিটি" + +#: src/libvlc-module.c:686 +msgid "" +"This is the maximum size in bytes of the temporary files that will be used " +"to store the timeshifted streams." +msgstr "" +"এইটো হল সাময়িক ফাইলবোৰৰ বাইটত সৰ্বাধিক আকাৰটো যিটো টাইমছিফ্ট কৰা ষ্ট্ৰিমবোৰ জমা " +"কৰিবলৈ ব্যৱহাৰ কৰা হব." + +#: src/libvlc-module.c:689 +msgid "Change title according to current media" +msgstr "চলিত মিডিয়া মতে শিৰোনামটো সলনি কৰক" + +#: src/libvlc-module.c:690 +msgid "" +"This option allows you to set the title according to what's being played
" +"$a: Artist
$b: Album
$c: Copyright
$t: Title
$g: Genre
$n: " +"Track num
$p: Now playing
$A: Date
$D: Duration
$Z: \"Now playing" +"\" (Fall back on Title - Artist)" +msgstr "" +"এই বিকল্পটোৱে আপোনাক কি চলোৱা হব সেইমতে শিৰোনাম ছেট কৰিবলৈ অনুমতি দিয়ে
$a: " +"শিল্পী
$b: এলবাম
$c: প্ৰতিলিপিস্বত্ত্ব
$t: শিৰোনাম
$g: গেন্ৰে
$n: " +"পথ সংখ্যা
$p: এতিয়া চলি থকাটো
$A: তাৰিখ
$D: সময়সীমা
$Z: \"Now " +"playing\" (শিৰোনামলৈ উভতি আহক - শিল্পী)" + +#: src/libvlc-module.c:695 +msgid "Disable all lua plugins" +msgstr "" + +#: src/libvlc-module.c:699 +msgid "" +"These options allow you to modify the behavior of the subpictures subsystem. " +"You can for example enable subpictures sources (logo, etc.). Enable these " +"filters here and configure them in the \"subsources filters\" modules " +"section. You can also set many miscellaneous subpictures options." +msgstr "" +"এইবোৰ বিকল্পই আপোনাক উপছবিবোৰৰ উপপ্ৰণালীটোৰ আচৰণ সলনি কৰিবলৈ অনুমতি দিয়ে. " +"উদাহৰণস্বৰূপে আপুনি উপছবিবোৰৰ উত্সবোৰ সক্ষম কৰিব পাৰে (ল'গ', ইত্যাদি). ইয়াত এই " +"ফিল্টাৰবোৰ সক্ষম কৰক আৰু \"subsources filters\" মডুলবোৰৰ খণ্ডত সেইবোৰ ৰূপৰেখা কৰক. " +"আপুনি লগতে বহুতো বিভিন্ন উপছবিবোৰৰ বিকল্প ছেট কৰিব পাৰে." + +#: src/libvlc-module.c:705 modules/gui/qt/ui/sprefs_subtitles.h:304 +msgid "Force subtitle position" +msgstr "উপশিৰোনামৰ স্থানটো জোৰ কৰক" + +#: src/libvlc-module.c:707 +msgid "" +"You can use this option to place the subtitles under the movie, instead of " +"over the movie. Try several positions." +msgstr "" +"উপশিৰোনামবোৰ চলচিত্ৰৰ ওপৰত ৰখাৰ পৰিৱৰ্তে চলচিত্ৰৰ তলত ৰাখিবলৈ আপুনি এই বিকল্পটো " +"ব্যৱহাৰ কৰিব পাৰে. বিভিন্ন স্থানবোৰ চেষ্টা কৰক." + +#: src/libvlc-module.c:710 +msgid "Subtitles text scaling factor" +msgstr "" + +#: src/libvlc-module.c:711 +msgid "Changes the subtitles size where possible" +msgstr "" + +#: src/libvlc-module.c:713 +msgid "Enable sub-pictures" +msgstr "উপ-ছবিবোৰ সক্ষম কৰক" + +#: src/libvlc-module.c:715 +msgid "You can completely disable the sub-picture processing." +msgstr "উপ-ছবি প্ৰক্ৰিয়া কৰাটো আপুনি সম্পূৰ্ণভাৱে অক্ষম কৰিব পাৰে." + +#: src/libvlc-module.c:717 src/libvlc-module.c:1674 src/text/iso-639_def.h:146 +#: modules/gui/macosx/VLCSimplePrefsController.m:359 +#: modules/gui/qt/ui/sprefs_subtitles.h:289 +msgid "On Screen Display" +msgstr "স্ক্ৰীনত প্ৰদৰ্শন" + +#: src/libvlc-module.c:719 +msgid "" +"VLC can display messages on the video. This is called OSD (On Screen " +"Display)." +msgstr "" +"VLC য়ে ভিডিঅ'টোত বাৰ্তাবোৰ প্ৰদৰ্শন কৰিব পাৰে. ইয়াক OSD বুলি কোৱা হয় (স্ক্ৰীনত " +"প্ৰদৰ্শন)." + +#: src/libvlc-module.c:722 +msgid "Text rendering module" +msgstr "টেক্সট অনুবাদ কৰা মডুল" + +#: src/libvlc-module.c:724 +msgid "" +"VLC normally uses Freetype for rendering, but this allows you to use svg for " +"instance." +msgstr "" +"VLC য়ে অনুবাদৰ বাবে সাধাৰণতে মুক্ত প্ৰকাৰটো ব্যৱহাৰ কৰে, কিন্তু এইটোৱে আপোনাক " +"উদাহৰণৰ বাবে svg ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:726 +msgid "Subpictures source module" +msgstr "উপছবিবোৰৰ উত্স মডুল" + +#: src/libvlc-module.c:728 +msgid "" +"This adds so-called \"subpicture sources\". These filters overlay some " +"images or text over the video (like a logo, arbitrary text, ...)." +msgstr "" +"এইটোৱে \"subpicture sources\" হিচাপে কোৱাবোৰ যোগ কৰে. এই ফিল্টাৰবোৰে " +"ভিডিঅ'টোৰ ওপৰত কিছুমান ছবি বা টেক্সট অভাৰলে কৰে (এটা ল'গ', স্বতন্ত্ৰ টেক্সট, ...ৰ " +"দৰে)." + +#: src/libvlc-module.c:731 +msgid "Subpictures filter module" +msgstr "উপছবিবোৰৰ ফিল্টাৰ মডুল" + +#: src/libvlc-module.c:733 +msgid "" +"This adds so-called \"subpicture filters\". These filter subpictures created " +"by subtitle decoders or other subpictures sources." +msgstr "" +"এইটোৱে \"subpicture filters\" হিচাপে কোৱাবোৰ যোগ কৰে. এই ফিল্টাৰ উপছবিবোৰ " +"উপশিৰোনাম ডিকোডাৰ বা অন্য উপছবিবোৰৰ উত্সৰ দ্বাৰা তৈয়াৰ কৰা হয়." + +#: src/libvlc-module.c:736 +msgid "Autodetect subtitle files" +msgstr "স্বয়ংক্ৰিয়ভাৱে চিনাক্ত কৰা উপশিৰোনাম ফাইলবোৰ" + +#: src/libvlc-module.c:738 +msgid "" +"Automatically detect a subtitle file, if no subtitle filename is specified " +"(based on the filename of the movie)." +msgstr "" +"স্বয়ংক্ৰিয়ভাৱে উপশিৰোনাম ফাইল এটা চিনাক্ত কৰে, যদি কোনো উপশিৰোনাম ফাইল নাম " +"নিৰ্ধাৰণ কৰা নহয় (চলচিত্ৰৰ ফাইল নামটোৰ ওপৰত ভিত্তি কৰি)." + +#: src/libvlc-module.c:741 +msgid "Subtitle autodetection fuzziness" +msgstr "উপশিৰোনামৰ স্বয়ংক্ৰিয়ভাৱে চিনাক্ত কৰা অস্পষ্টতা" + +#: src/libvlc-module.c:743 +msgid "" +"This determines how fuzzy subtitle and movie filename matching will be. " +"Options are:\n" +"0 = no subtitles autodetected\n" +"1 = any subtitle file\n" +"2 = any subtitle file containing the movie name\n" +"3 = subtitle file matching the movie name with additional chars\n" +"4 = subtitle file matching the movie name exactly" +msgstr "" +"এইটোৱে অস্পষ্ট উপশিৰোনাম আৰু চলচিত্ৰ মিলোৱাটো কেনেকৈ মিলোৱা হব নিৰ্ধাৰণ কৰে. " +"বিকল্পবোৰ হল:\n" +"0 = কোনো উপশিৰোনাম স্বয়ংক্ৰিয়ভাৱে চিনাক্ত কৰা হোৱা নাই\n" +"1 = যিকোনো উপশিৰোনাম ফাইল\n" +"2 = চলচিত্ৰৰ নাম ধাৰণ কৰা যিকোনো উপশিৰোনাম ফাইল\n" +"3 = অতিৰিক্ত আখৰবোৰৰ সৈতে চলচিত্ৰৰ নামটো মিলোৱা উপশিৰোনাম ফাইল\n" +"4 = চলচিত্ৰৰ নামটো সঠিকভাৱে মিলোৱা উপশিৰোনাম ফাইল" + +#: src/libvlc-module.c:751 +msgid "Subtitle autodetection paths" +msgstr "উপশিৰোনামৰ স্বয়ংক্ৰিয়ভাৱে চিনাক্ত কৰা পাথবোৰ" + +#: src/libvlc-module.c:753 +msgid "" +"Look for a subtitle file in those paths too, if your subtitle file was not " +"found in the current directory." +msgstr "" +"উপশিৰোনাম ফাইল এটাৰ বাবে এই পাথবোৰতও বিচাৰক, যদি চলিত নিৰ্দেশিকাটোত আপোনাৰ " +"উপশিৰোনাম ফাইলটো বিচাৰি পোৱা নাছিল." + +#: src/libvlc-module.c:756 +msgid "Use subtitle file" +msgstr "উপশিৰোনাম ফাইল ব্যৱহাৰ কৰক" + +#: src/libvlc-module.c:758 +msgid "" +"Load this subtitle file. To be used when autodetect cannot detect your " +"subtitle file." +msgstr "" +"এই উপশিৰোনাম ফাইলটো লোড কৰক. ব্যৱহাৰ কৰা হব যেতিয়া স্বয়ংক্ৰিয়ভাৱে চিনাক্ত " +"কৰাটোৱে আপোনাৰ উপশিৰোনাম ফাইলটো চিনাক্ত নকৰে." + +#: src/libvlc-module.c:762 +msgid "DVD device" +msgstr "DVD ডিভাইচ" + +#: src/libvlc-module.c:763 +msgid "VCD device" +msgstr "VCD ডিভাইচ" + +#: src/libvlc-module.c:764 modules/access/cdda.c:984 +msgid "Audio CD device" +msgstr "অডিঅ' CD ডিভাইচ" + +#: src/libvlc-module.c:768 +msgid "" +"This is the default DVD drive (or file) to use. Don't forget the colon after " +"the drive letter (e.g. D:)" +msgstr "" +"এইটো হল ব্যৱহাৰ কৰিবলৈ ডিফল্ট DVD ড্ৰাইভ (বা ফাইল). ড্ৰাইভ আখৰটোৰ পিছত কলনটো " +"দিবলৈ নাপাহৰিব (উদাহৰণ, D:)" + +#: src/libvlc-module.c:771 +msgid "" +"This is the default VCD drive (or file) to use. Don't forget the colon after " +"the drive letter (e.g. D:)" +msgstr "" +"এইটো হল ব্যৱহাৰ কৰিবলৈ ডিফল্ট VCD ড্ৰাইভ (বা ফাইল). ড্ৰাইভ আখৰটোৰ পিছত কলনটো " +"দিবলৈ নাপাহৰিব (উদাহৰণ, D:)" + +#: src/libvlc-module.c:774 modules/access/cdda.c:987 +msgid "" +"This is the default Audio CD drive (or file) to use. Don't forget the colon " +"after the drive letter (e.g. D:)" +msgstr "" +"এইটো হল ব্যৱহাৰ কৰিবলৈ ডিফল্ট অডিঅ' CD ড্ৰাইভ (বা ফাইল). ড্ৰাইভ আখৰটোৰ পিছত " +"কলনটো দিবলৈ নাপাহৰিব (উদাহৰণ, D:)" + +#: src/libvlc-module.c:781 +msgid "This is the default DVD device to use." +msgstr "এইটো হল ব্যৱহাৰ কৰিবলৈ ডিফল্ট DVD ডিভাইচ." + +#: src/libvlc-module.c:783 +msgid "This is the default VCD device to use." +msgstr "এইটো হল ব্যৱহাৰ কৰিবলৈ ডিফল্ট VCD ডিভাইচ." + +#: src/libvlc-module.c:785 modules/access/cdda.c:992 +msgid "This is the default Audio CD device to use." +msgstr "ব্যৱহাৰ কৰিবলৈ এইটো হল ডিফল্ট অডিঅ' CD ডিভাইচ." + +#: src/libvlc-module.c:799 +msgid "TCP connection timeout" +msgstr "TCP সংযোগ উকলি গল" + +#: src/libvlc-module.c:801 +msgid "Default TCP connection timeout (in milliseconds)." +msgstr "" + +#: src/libvlc-module.c:803 +msgid "HTTP server address" +msgstr "HTTP ছাৰ্ভাৰৰ ঠিকনা" + +#: src/libvlc-module.c:805 +msgid "" +"By default, the server will listen on any local IP address. Specify an IP " +"address (e.g. ::1 or 127.0.0.1) or a host name (e.g. localhost) to restrict " +"them to a specific network interface." +msgstr "" +"ডিফল্ট হিচাপে ছাৰ্ভাৰটোৱে যিকোনো স্থানীয় IP ঠিকনাত মনোযোগ দিব. এটা বিশেষ নেটৱৰ্ক " +"ইন্টাফেছলৈ সেইবোৰ সীমিত কৰিবলৈ এটা IP ঠিকনা (উদাহৰণ ::1 বা 127.0.0.1) বা এটা " +"হষ্ট নাম (উদাহৰণ, স্থানীয় হষ্ট) নিৰ্দিষ্ট কৰক." + +#: src/libvlc-module.c:809 +msgid "RTSP server address" +msgstr "RTSP ছাৰ্ভাৰৰ ঠিকনা" + +#: src/libvlc-module.c:811 +msgid "" +"This defines the address the RTSP server will listen on, along with the base " +"path of the RTSP VOD media. Syntax is address/path. By default, the server " +"will listen on any local IP address. Specify an IP address (e.g. ::1 or " +"127.0.0.1) or a host name (e.g. localhost) to restrict them to a specific " +"network interface." +msgstr "" +"এইটোৱে RTSP VOD মিডিয়াৰ শ্ৰেষ্ঠ পাথটোৰ সৈতে RTSP ছাৰ্ভাৰটোৱে মনোযোগ দিয়া " +"ঠিকনাটো বাখ্যা কৰে. ছিনটেক্সটো হল ঠিকনা/পাথ. ডিফল্ট হিচাপে, ছাৰ্ভাৰটোৱে যিকোনো " +"স্থানীয় IP ঠিকনাত মনোযোগ দিব. সেইবোৰক এটা বিশেষ নেটৱৰ্ক ইন্টাৰফেছত সীমিত কৰিবলৈ " +"এটা IP ঠিকনা (উদাহৰণ, ::1 বা 127.0.0.1) বা এটা হষ্ট নাম (উদাহৰণ, স্থানীয় হষ্ট) " +"নিৰ্ধাৰণ কৰক." + +#: src/libvlc-module.c:817 +msgid "HTTP server port" +msgstr "HTTP ছাৰ্ভাৰৰ পোৰ্ট" + +#: src/libvlc-module.c:819 +msgid "" +"The HTTP server will listen on this TCP port. The standard HTTP port number " +"is 80. However allocation of port numbers below 1025 is usually restricted " +"by the operating system." +msgstr "" +"HTTP ছাৰ্ভাৰে এই TCP পোৰ্টটোত মনোযোগ দিব. মানবিশিষ্ট HTTP পোৰ্ট সংখ্যাটো হল 80. " +"সেইদৰে 1025 ৰ তলৰ পোৰ্ট সংখ্যাবোৰৰ স্থান নিৰ্ধাৰণ কৰাটো সাধাৰণতে অপাৰেটিং " +"ছিষ্টেমে সীমিত কৰে." + +#: src/libvlc-module.c:824 +msgid "HTTPS server port" +msgstr "HTTPS ছাৰ্ভাৰৰ পোৰ্ট" + +#: src/libvlc-module.c:826 +msgid "" +"The HTTPS server will listen on this TCP port. The standard HTTPS port " +"number is 443. However allocation of port numbers below 1025 is usually " +"restricted by the operating system." +msgstr "" +"HTTP ছাৰ্ভাৰে এই TCP পোৰ্টটোত মনোযোগ দিব. মানবিশিষ্ট HTTPS পোৰ্ট সংখ্যাটো হল 443. " +"সেইদৰে 1025 ৰ তলৰ পোৰ্ট সংখ্যাবোৰৰ স্থান নিৰ্ধাৰণ কৰাটো সাধাৰণতে অপাৰেটিং " +"ছিষ্টেমে সীমিত কৰে." + +#: src/libvlc-module.c:831 +msgid "RTSP server port" +msgstr "RTSP ছাৰ্ভাৰৰ পোৰ্ট" + +#: src/libvlc-module.c:833 +msgid "" +"The RTSP server will listen on this TCP port. The standard RTSP port number " +"is 554. However allocation of port numbers below 1025 is usually restricted " +"by the operating system." +msgstr "" +"RTSP ছাৰ্ভাৰে এই TCP পোৰ্টটোত মনোযোগ দিব. মানবিশিষ্ট RTSP পোৰ্ট সংখ্যাটো হল 554. " +"সেইদৰে 1025 ৰ তলৰ পোৰ্ট সংখ্যাবোৰৰ স্থান নিৰ্ধাৰণ কৰাটো সাধাৰণতে অপাৰেটিং " +"ছিষ্টেমে সীমিত কৰে." + +#: src/libvlc-module.c:838 +msgid "HTTP/TLS server certificate" +msgstr "HTTP/TLS ছাৰ্ভাৰৰ প্ৰমাণপত্ৰ" + +#: src/libvlc-module.c:840 +msgid "" +"This X.509 certicate file (PEM format) is used for server-side TLS. On OS X, " +"the string is used as a label to search the certificate in the keychain." +msgstr "" +"ছাৰ্ভাৰ-কাষ TLS ৰ বাবে এই X.509 প্ৰমাণপত্ৰ ফাইলটো (PEM ফৰমেট) ব্যৱহাৰ কৰা হয়. OS " +"X ত, কী শৃংখলটোত প্ৰমাণপত্ৰখন সন্ধান কৰিবলৈ ষ্ট্ৰিংটো এখন লেবেল হিচাপে ব্যৱহাৰ কৰা " +"হয়." + +#: src/libvlc-module.c:843 +msgid "HTTP/TLS server private key" +msgstr "HTTP/TLS ছাৰ্ভাৰৰ ব্যক্তিগত কী" + +#: src/libvlc-module.c:845 +msgid "This private key file (PEM format) is used for server-side TLS." +msgstr "ছাৰ্ভাৰ-কাষ TLS ৰ বাবে এই ব্যক্তিগত কী ফাইলটো (PEM ফৰমেট) ব্যৱহাৰ কৰা হয়." + +#: src/libvlc-module.c:847 +msgid "HTTP proxy" +msgstr "HTTP প্ৰক্সি" + +#: src/libvlc-module.c:849 +msgid "" +"HTTP proxy to be used It must be of the form http://[user@]myproxy.mydomain:" +"myport/ ; if empty, the http_proxy environment variable will be tried." +msgstr "" +"ব্যৱহাৰ কৰিবলগীয়া HTTP প্ৰক্সি. এইটো http://[user@]myproxy.mydomain:myport/ " +"ধৰণৰ হোৱাটো অপৰিহাৰ্য; যদি খালী, তেন্তে http_প্ৰক্সি পৰিৱেশ চলকটো চেষ্টা কৰা হব." + +#: src/libvlc-module.c:853 +msgid "HTTP proxy password" +msgstr "HTTP প্ৰক্সি পাছৱৰ্ড" + +#: src/libvlc-module.c:855 +msgid "If your HTTP proxy requires a password, set it here." +msgstr "যদি আপোনাৰ HTTP প্ৰক্সিয়ে পাছৱৰ্ড এটা দাবী কৰে, তেন্তে এইটোক ইয়াত ছেট কৰক." + +#: src/libvlc-module.c:857 +msgid "SOCKS server" +msgstr "SOCKS ছাৰ্ভাৰ" + +#: src/libvlc-module.c:859 +msgid "" +"SOCKS proxy server to use. This must be of the form address:port. It will be " +"used for all TCP connections" +msgstr "" +"ব্যৱহাৰ কৰিবলৈ SOCKS প্ৰক্সি ছাৰ্ভাৰ. এইটো ঠিকনা:পোৰ্টৰ ৰূপত হোৱাটো অপৰিহাৰ্য. এইটো " +"সকলো TCP সংযোগৰ বাবে ব্যৱহাৰ কৰা হব" + +#: src/libvlc-module.c:862 +msgid "SOCKS user name" +msgstr "SOCKS ব্যৱহাকৰ্তাৰ নাম" + +#: src/libvlc-module.c:864 +msgid "User name to be used for connection to the SOCKS proxy." +msgstr "SOCKS প্ৰক্সিটোলৈ সংযোগ কৰিবৰ বাবে ব্যৱহাৰ কৰিবলগীয়া ব্যৱহাৰকৰ্তাৰ নাম." + +#: src/libvlc-module.c:866 +msgid "SOCKS password" +msgstr "SOCKS পাছৱৰ্ড" + +#: src/libvlc-module.c:868 +msgid "Password to be used for connection to the SOCKS proxy." +msgstr "SOCKS প্ৰক্সিটোলৈ সংযোগ কৰিবৰ বাবে ব্যৱহাৰ কৰিবলগীয়া পাছৱৰ্ড." + +#: src/libvlc-module.c:870 +msgid "Title metadata" +msgstr "শিৰোনাম মেটাডাটা" + +#: src/libvlc-module.c:872 +msgid "Allows you to specify a \"title\" metadata for an input." +msgstr "" +"ইনপুট এটাৰ বাবে আপোনাক \"title\" মেটাডাটা এটা নিৰ্দিষ্ট কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:874 +msgid "Author metadata" +msgstr "লেখকৰ মেটাডাটা" + +#: src/libvlc-module.c:876 +msgid "Allows you to specify an \"author\" metadata for an input." +msgstr "" +"ইনপুট এটাৰ বাবে আপোনাক \"author\" মেটাডাটা এটা নিৰ্দিষ্ট কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:878 +msgid "Artist metadata" +msgstr "শিল্পীৰ মেটাডাটা" + +#: src/libvlc-module.c:880 +msgid "Allows you to specify an \"artist\" metadata for an input." +msgstr "" +"ইনপুট এটাৰ বাবে আপোনাক \"artist\" মেটাডাটা এটা নিৰ্দিষ্ট কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:882 +msgid "Genre metadata" +msgstr "গেন্ৰে মেটাডাটা" + +#: src/libvlc-module.c:884 +msgid "Allows you to specify a \"genre\" metadata for an input." +msgstr "" +"ইনপুট এটাৰ বাবে আপোনাক \"genre\" মেটাডাটা এটা নিৰ্দিষ্ট কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:886 +msgid "Copyright metadata" +msgstr "প্ৰতিলিপিস্বত্ব মেটাডাটা" + +#: src/libvlc-module.c:888 +msgid "Allows you to specify a \"copyright\" metadata for an input." +msgstr "" +"ইনপুট এটাৰ বাবে আপোনাক \"copyright\" মেটাডাটা এটা নিৰ্দিষ্ট কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:890 +msgid "Description metadata" +msgstr "বিৱৰণৰ মেটাডাটা" + +#: src/libvlc-module.c:892 +msgid "Allows you to specify a \"description\" metadata for an input." +msgstr "" +"ইনপুট এটাৰ বাবে আপোনাক \"description\" মেটাডাটা এটা নিৰ্দিষ্ট কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:894 +msgid "Date metadata" +msgstr "তাৰিখ মেটাডাটা" + +#: src/libvlc-module.c:896 +msgid "Allows you to specify a \"date\" metadata for an input." +msgstr "ইনপুট এটাৰ বাবে আপোনাক \"date\" মেটাডাটা এটা নিৰ্দিষ্ট কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:898 +msgid "URL metadata" +msgstr "URL মেটাডাটা" + +#: src/libvlc-module.c:900 +msgid "Allows you to specify a \"url\" metadata for an input." +msgstr "ইনপুট এটাৰ বাবে আপোনাক \"url\" মেটাডাটা এটা নিৰ্দিষ্ট কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:904 +msgid "" +"This option can be used to alter the way VLC selects its codecs " +"(decompression methods). Only advanced users should alter this option as it " +"can break playback of all your streams." +msgstr "" +"VLC য়ে ইয়াৰ কোডেকবোৰ নিৰ্বাচন কৰা পথটো সলনি কৰিবলৈ এই বিকল্পটো ব্যৱহাৰ কৰিব " +"পাৰি (অসংনমন পদ্ধতি). কেৱল উন্নত ব্যৱহাৰকৰ্তাবোৰে এই বিকল্পটো সলনি কৰিব পাৰে " +"যিহেতু এইটোৱে আপোনাৰ সকলোবোৰ ষ্ট্ৰিমৰ প্লেবেক ভাঙি পেলাব পাৰে." + +#: src/libvlc-module.c:908 +msgid "Preferred decoders list" +msgstr "পছন্দ কৰা ডিকোডাৰৰ তালিকা" + +#: src/libvlc-module.c:910 +msgid "" +"List of codecs that VLC will use in priority. For instance, 'dummy,a52' will " +"try the dummy and a52 codecs before trying the other ones. Only advanced " +"users should alter this option as it can break playback of all your streams." +msgstr "" +"অগ্ৰাধিকাৰত VLC য়ে ব্যৱহাৰ কৰিবলগীয়া কোডেকবোৰৰ তালিকা. উদাহৰণস্বৰূপে, 'ডামি,a52' " +"য়ে অন্য এটা চেষ্টা কৰাৰ আগতে ডামি আৰু a52 কোডেকবোৰ চেষ্টা কৰিব. কেৱল উন্নত " +"ব্যৱহাৰকৰ্তাবোৰে এই বিকল্পটো সলনি কৰিব পাৰে যিহেতু এইটোৱে আপোনাৰ সকলোবোৰ ষ্ট্ৰিমৰ " +"প্লেবেক ভাঙি পেলাব পাৰে." + +#: src/libvlc-module.c:915 +msgid "Preferred encoders list" +msgstr "পছন্দ কৰা এনকোডাৰবোৰৰ তালিকা" + +#: src/libvlc-module.c:917 +msgid "" +"This allows you to select a list of encoders that VLC will use in priority." +msgstr "" +"এইটোৱে আপোনাক এনকোডাৰবোৰৰ তালিকা এখন নিৰ্বাচন কৰিবলৈ অনুমতি দিয়ে যিখন VLC য়ে " +"অগ্ৰাধিকাৰৰ ভিত্তিত ব্যৱহাৰ কৰিব." + +#: src/libvlc-module.c:926 +msgid "" +"These options allow you to set default global options for the stream output " +"subsystem." +msgstr "" +"এই বিকল্পবোৰে আপোনাক ষ্ট্ৰিম আউটপুট উপছিষ্টেমটোৰ বাবে ডিফল্ট সাৰ্বজনীন বিকল্পবোৰ ছেট " +"কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:929 +msgid "Default stream output chain" +msgstr "ডিফল্ট ষ্ট্ৰিম আউটপুট শৃংখল" + +#: src/libvlc-module.c:931 +msgid "" +"You can enter here a default stream output chain. Refer to the documentation " +"to learn how to build such chains. Warning: this chain will be enabled for " +"all streams." +msgstr "" +"আপুনি ইয়াত এটা ডিফল্ট ষ্ট্ৰিম আউটপুট শৃংখল ভৰাৱ পাৰে. তেনেকুৱা শৃংখলবোৰ কেনেকৈ তৈয়াৰ " +"কৰে জানিবলৈ ডকুমেন্টেশ্বনটোলৈ পৰামৰ্শ কৰক. সতৰ্কীকৰণ: এই শৃংখলটো সকলোবোৰ ষ্ট্ৰিমৰ " +"বাবে সক্ষম কৰা হব." + +#: src/libvlc-module.c:935 +msgid "Enable streaming of all ES" +msgstr "সকলোবোৰ ES ৰ ষ্ট্ৰিমিংটো সক্ষম কৰক" + +#: src/libvlc-module.c:937 +msgid "Stream all elementary streams (video, audio and subtitles)" +msgstr "সকলোবোৰ প্ৰাথমিক ষ্ট্ৰিম ষ্ট্ৰিম কৰক (ভিডিঅ', অডিঅ' আৰু উপশিৰোনামবোৰ)" + +#: src/libvlc-module.c:939 +msgid "Display while streaming" +msgstr "ষ্ট্ৰিম কৰি থাকোতে প্ৰদৰ্শন কৰক" + +#: src/libvlc-module.c:941 +msgid "Play locally the stream while streaming it." +msgstr "ষ্ট্ৰিমটো স্থানীয়ভাৱে চলাওক যেতিয়া এইটো ষ্ট্ৰিম কৰি থাকে." + +#: src/libvlc-module.c:943 +msgid "Enable video stream output" +msgstr "ভিডিঅ' ষ্ট্ৰিম আউটপুট সক্ষম কৰক" + +#: src/libvlc-module.c:945 +msgid "" +"Choose whether the video stream should be redirected to the stream output " +"facility when this last one is enabled." +msgstr "" +"যেতিয়া এই অন্তিম সক্ষম কৰে তেতিয়া ভিডিঅ' ষ্ট্ৰিমটো ষ্ট্ৰিম আউটপুট সুবিধাটোলৈ পুনৰ " +"নিৰ্দেশ কৰা হব নে নাই পছন্দ কৰক." + +#: src/libvlc-module.c:948 +msgid "Enable audio stream output" +msgstr "অডিঅ' ষ্ট্ৰিম আউটপুট সক্ষম কৰক" + +#: src/libvlc-module.c:950 +msgid "" +"Choose whether the audio stream should be redirected to the stream output " +"facility when this last one is enabled." +msgstr "" +"যেতিয়া এই অন্তিম সক্ষম কৰে তেতিয়া অডিঅ' ষ্ট্ৰিমটো ষ্ট্ৰিম আউটপুট সুবিধাটোলৈ পুনৰ " +"নিৰ্দেশ কৰা হব নে নাই পছন্দ কৰক." + +#: src/libvlc-module.c:953 +msgid "Enable SPU stream output" +msgstr "SPU ষ্ট্ৰিম আউটপুট সক্ষম কৰক" + +#: src/libvlc-module.c:955 +msgid "" +"Choose whether the SPU streams should be redirected to the stream output " +"facility when this last one is enabled." +msgstr "" +"যেতিয়া এই অন্তিম সক্ষম কৰে তেতিয়া SPU ষ্ট্ৰিমবোৰ ষ্ট্ৰিম আউটপুট সুবিধাটোলৈ পুনৰ " +"নিৰ্দেশ কৰা হব নে নাই পছন্দ কৰক." + +#: src/libvlc-module.c:958 +msgid "Keep stream output open" +msgstr "ষ্ট্ৰিম আউটপুটটো খুলি ৰাখক" + +#: src/libvlc-module.c:960 +msgid "" +"This allows you to keep an unique stream output instance across multiple " +"playlist item (automatically insert the gather stream output if not " +"specified)" +msgstr "" +"এইটোৱে আপোনাক বিভিন্ন প্লেলিষ্ট বস্তুৰ চাৰিওফালে এটা অদ্বিতীয় ষ্ট্ৰিম আউটপুট উদাহৰণ " +"ৰাখিবলৈ অনুমতি দিয়ে (যদি নিৰ্ধাৰণ নকৰে স্বয়ংক্ৰিয়ভাৱে যুগুত কৰা ষ্ট্ৰিম আউটপুটটো " +"ভৰাওক)" + +#: src/libvlc-module.c:964 +msgid "Stream output muxer caching (ms)" +msgstr "ষ্ট্ৰিম আউটপুট মাক্সাৰ কেশ্বিং (ms)" + +#: src/libvlc-module.c:966 +msgid "" +"This allow you to configure the initial caching amount for stream output " +"muxer. This value should be set in milliseconds." +msgstr "" +"এইটোৱে আপোনাক ষ্ট্ৰিম আউটপুট মাক্সাৰ বাবে প্ৰাৰম্ভিক কেশ্বিং পৰিমাণটো ৰূপৰেখা কৰিবলৈ " +"অনুমতি দিয়ে. এই মানটো মিলিছেকেণ্ডত ছেট কৰা হব." + +#: src/libvlc-module.c:969 +msgid "Preferred packetizer list" +msgstr "পছন্দ কৰা পেকেটাইজাৰ তালিকা" + +#: src/libvlc-module.c:971 +msgid "" +"This allows you to select the order in which VLC will choose its packetizers." +msgstr "" +"এইটোৱে আপোনাক ক্ৰম এটা নিৰ্বাচন কৰিবলৈ অনুমতি দিয়ে যত VLC য়ে ইয়াৰ পেকেটাইজাৰবোৰ " +"পছন্দ কৰিব." + +#: src/libvlc-module.c:974 +msgid "Mux module" +msgstr "মাক্স মডুল" + +#: src/libvlc-module.c:976 +msgid "This is a legacy entry to let you configure mux modules" +msgstr "আপোনাক মাক্স মডুলবোৰ ৰূপৰেখা কৰিব দিবৰ বাবে এইটো হল এটা বৈধ প্ৰৱিষ্টি" + +#: src/libvlc-module.c:978 +msgid "Access output module" +msgstr "আউটপুট মডুলত প্ৰৱেশ কৰক" + +#: src/libvlc-module.c:980 +msgid "This is a legacy entry to let you configure access output modules" +msgstr "" +"আপোনাক প্ৰৱেশ আউটপুট মডুলবোৰ ৰূপৰেখা কৰিব দিবৰ বাবে এইটো হল এটা বৈধ প্ৰৱিষ্টি" + +#: src/libvlc-module.c:983 +msgid "" +"If this option is enabled, the flow on the SAP multicast address will be " +"controlled. This is needed if you want to make announcements on the MBone." +msgstr "" +"যদি এই বিকল্পটো সক্ষম কৰে, তেন্তে SAP মাল্টিকাষ্ট ঠিকনাত থকা প্ৰবাহটো নিয়ন্ত্ৰণ কৰা " +"হব. এইটো প্ৰয়োজনীয় যদি আপুনি MBone টোত ঘোষণা এটা কৰিব বিচাৰে." + +#: src/libvlc-module.c:987 +msgid "SAP announcement interval" +msgstr "SAP ঘোষণাৰ অন্তৰাল" + +#: src/libvlc-module.c:989 +msgid "" +"When the SAP flow control is disabled, this lets you set the fixed interval " +"between SAP announcements." +msgstr "" +"যেতিয়া SAP প্ৰবাহ নিয়ন্ত্ৰণটো অক্ষম কৰা হয়, এইটোৱে আপোনাক SAP ঘোষণাবোৰৰ মাজত " +"নিৰ্দিষ্ট অন্তৰাল এটা ছেট কৰিব দিয়ে." + +#: src/libvlc-module.c:998 +msgid "" +"These options allow you to select default modules. Leave these alone unless " +"you really know what you are doing." +msgstr "" +"এইবোৰ বিকল্পই আপোনাক ডিফল্ট মডুলবোৰ নিৰ্বাচন কৰিবলৈ অনুমতি দিয়ে. আপুনি কি কৰি আছে " +"জ্ঞাত নোহোৱালৈকে এইবোৰক অকলশৰীয়াকৈ এৰক." + +#: src/libvlc-module.c:1001 +msgid "Access module" +msgstr "মডুলত প্ৰৱেশ কৰক" + +#: src/libvlc-module.c:1003 +msgid "" +"This allows you to force an access module. You can use it if the correct " +"access is not automatically detected. You should not set this as a global " +"option unless you really know what you are doing." +msgstr "" +"এইটোৱে আপোনাক প্ৰৱেশ মডুল এটা জোৰ কৰিবলৈ অনুমতি দিয়ে. আপুনি এইটো ব্যৱহাৰ কৰিব " +"পাৰে যদি শুদ্ধ প্ৰৱেশটো স্বয়ংক্ৰিয়ভাৱে চিনাক্ত নকৰে. আপুনি কি কৰি আছে প্ৰকৃততে আপুনি " +"জ্ঞাত নোহোৱালৈকে আপুনি এইটো সাৰ্বজনীন বিকল্প এটাৰ দৰে ছেট কৰিব নোৱাৰে." + +#: src/libvlc-module.c:1007 +msgid "Stream filter module" +msgstr "ষ্ট্ৰিম ফিল্টাৰ মডুল " + +#: src/libvlc-module.c:1009 +msgid "Stream filters are used to modify the stream that is being read." +msgstr "" + +#: src/libvlc-module.c:1011 +msgid "Demux filter module" +msgstr "" + +#: src/libvlc-module.c:1013 +msgid "Demux filters are used to modify/control the stream that is being read." +msgstr "" + +#: src/libvlc-module.c:1015 +msgid "Demux module" +msgstr "ডিমাক্স মডুল" + +#: src/libvlc-module.c:1017 +msgid "" +"Demultiplexers are used to separate the \"elementary\" streams (like audio " +"and video streams). You can use it if the correct demuxer is not " +"automatically detected. You should not set this as a global option unless " +"you really know what you are doing." +msgstr "" +"\"elementary\" ষ্ট্ৰিমবোৰ পৃথক কৰিবলৈ ডিমাল্টিপ্লেক্সাৰবোৰ ব্যৱহাৰ কৰা হয় (অডিঅ' আৰু " +"ভিডিঅ' ষ্ট্ৰিমবোৰৰ দৰে). আপুনি এইটো ব্যৱহাৰ কৰিব পাৰে যদিহে শুদ্ধ ডিমাক্সাৰটো " +"স্বয়ংক্ৰিয়ভাৱে চিনাক্ত নকৰে. আপুনি কি কৰি আছে প্ৰকৃততে আপুনি জ্ঞাত নোহোৱালৈকে আপুনি " +"এইটো সাৰ্বজনীন বিকল্প এটাৰ দৰে ছেট কৰিব নোৱাৰে." + +#: src/libvlc-module.c:1022 +msgid "VoD server module" +msgstr "VoD ছাৰ্ভাৰ মডুল" + +#: src/libvlc-module.c:1024 +msgid "" +"You can select which VoD server module you want to use. Set this to " +"'vod_rtsp' to switch back to the old, legacy module." +msgstr "" + +#: src/libvlc-module.c:1027 +msgid "Allow real-time priority" +msgstr "প্ৰকৃত-সময় অগ্ৰাধিকাৰৰ অনুমতি দিয়ক" + +#: src/libvlc-module.c:1029 +msgid "" +"Running VLC in real-time priority will allow for much more precise " +"scheduling and yield better, especially when streaming content. It can " +"however lock up your whole machine, or make it very very slow. You should " +"only activate this if you know what you're doing." +msgstr "" +"প্ৰকৃত-সময় অগ্ৰাধিকাৰত VLC চলোৱাটোৱে অধিক সঠিক সময়সূচী আৰু তাতোকৈ অধিক ভালৰ বাবে " +"অনুমতি দিব, বিশেষকৈ যেতিয়া উপাদান ষ্ট্ৰিমিং কৰে. এইটোৱে সেইদৰে আপোনাৰ সমগ্ৰ " +"যন্ত্ৰটো লক কৰিব পাৰে, বা এইটো অতি মন্থৰ কৰি তুলিব পাৰে. আপুনি এইটো কেৱল তেতিয়াহে " +"সক্ৰিয় কৰিব পাৰিব যদি আপুনি কি কৰি আছে তাৰ বিষয়ে আপুনি জ্ঞাত হয়." + +#: src/libvlc-module.c:1035 +msgid "Adjust VLC priority" +msgstr "VLC অগ্ৰাধিকাৰটো মিলাওক" + +#: src/libvlc-module.c:1037 +msgid "" +"This option adds an offset (positive or negative) to VLC default priorities. " +"You can use it to tune VLC priority against other programs, or against other " +"VLC instances." +msgstr "" +"এই বিকল্পটোৱে VLC ৰ ডিফল্ট অগ্ৰাধিকাৰবোৰলৈ অফচেট এটা (ধনাত্মক বা ঋণাত্মক) যোগ " +"কৰে. আপুনি অন্য কাৰ্যসূচী বা অন্য VLC উদাহৰণবোৰৰ বিৰুদ্ধে VLC অগ্ৰাধিকাৰ টিউন কৰিবলৈ " +"এইটো ব্যৱহাৰ কৰিব পাৰে." + +#: src/libvlc-module.c:1042 +msgid "" +"This option is useful if you want to lower the latency when reading a stream" +msgstr "এই বিকল্পটো উপযোগী যদি ষ্ট্ৰিম এটা পঢ়োতে আপুনি বিলম্বটো হ্ৰাস কৰিব বিচাৰে" + +#: src/libvlc-module.c:1045 +msgid "VLM configuration file" +msgstr "VLM ৰূপৰেখাকৰণ ফাইল" + +#: src/libvlc-module.c:1047 +msgid "Read a VLM configuration file as soon as VLM is started." +msgstr "VLM আৰম্ভ কৰাৰ লগে লগে VLM ৰূপৰেখাকৰণ ফাইল এটা পঢ়ক." + +#: src/libvlc-module.c:1049 +msgid "Use a plugins cache" +msgstr "প্লাগইনবোৰৰ কেশ্ব এটা ব্যৱহাৰ কৰক" + +#: src/libvlc-module.c:1051 +msgid "Use a plugins cache which will greatly improve the startup time of VLC." +msgstr "প্লাগইনবোৰৰ কেশ্ব এটা ব্যৱহাৰ কৰক যিয়ে VLC ৰ আৰম্ভণিৰ সময়টো উন্নত কৰিব." + +#: src/libvlc-module.c:1053 +msgid "Scan for new plugins" +msgstr "" + +#: src/libvlc-module.c:1055 +msgid "" +"Scan plugin directories for new plugins at startup. This increases the " +"startup time of VLC." +msgstr "" + +#: src/libvlc-module.c:1058 +msgid "Preferred keystore list" +msgstr "" + +#: src/libvlc-module.c:1060 +msgid "List of keystores that VLC will use in priority." +msgstr "" + +#: src/libvlc-module.c:1062 +msgid "Locally collect statistics" +msgstr "স্থানীয়ভাৱে সংগ্ৰহ কৰা পৰিসংখ্যাবোৰ " + +#: src/libvlc-module.c:1064 +msgid "Collect miscellaneous local statistics about the playing media." +msgstr "চলিত মিডিয়াটোৰ বিষয়ে বিভিন্ন স্থানীয় পৰিসংখ্যাবোৰ যুগুত কৰক." + +#: src/libvlc-module.c:1066 +msgid "Run as daemon process" +msgstr "ডেমন প্ৰক্ৰিয়া এটা হিচাপে চলাওক" + +#: src/libvlc-module.c:1068 +msgid "Runs VLC as a background daemon process." +msgstr "এটা পটভূমিৰ ডেমন প্ৰক্ৰিয়া দৰে VLC টো চলাওক." + +#: src/libvlc-module.c:1070 +msgid "Write process id to file" +msgstr "ফাইললৈ প্ৰক্ৰিয়া id টো লিখক" + +#: src/libvlc-module.c:1072 +msgid "Writes process id into specified file." +msgstr "নিৰ্ধাৰিত ফাইলত প্ৰক্ৰিয়া id টো লিখক." + +#: src/libvlc-module.c:1074 +msgid "Allow only one running instance" +msgstr "কেৱল এটা চলিত উদাহৰণৰ অনুমতি দিয়ে" + +#: src/libvlc-module.c:1076 +msgid "" +"Allowing only one running instance of VLC can sometimes be useful, for " +"example if you associated VLC with some media types and you don't want a new " +"instance of VLC to be opened each time you open a file in your file manager. " +"This option will allow you to play the file with the already running " +"instance or enqueue it." +msgstr "" +"VLC ৰ কেৱল এটা চলিত উদাহৰণৰ অনুমতি দিয়াটো কেতিয়াবা উপযোগী হব পাৰে, " +"উদাহৰণস্বৰূপে যদি আপুনি VLC টোক কিছুমান মিডিয়া প্ৰকাৰৰ সৈতে জড়িত কৰে আৰু যদি আপুনি " +"আপোনাৰ ফাইল পৰিচালকত ফাইল এটা খোলোতে প্ৰতিবাৰতে VLC ৰ নতুন উদাহৰণ এটা " +"নিবিচাৰে. এই বিকল্পটোৱে আপোনাক ইতিমধ্যে চলি থকা উদাহৰণ বা এইটো শাৰী কৰাৰ সৈতে " +"ফাইল এটা চলাবলৈ অনুমতি দিব." + +#: src/libvlc-module.c:1082 +msgid "VLC is started from file association" +msgstr "ফাইল সংস্থাৰ পৰা VLC আৰম্ভ কৰা হৈছে" + +#: src/libvlc-module.c:1084 +msgid "Tell VLC that it is being launched due to a file association in the OS" +msgstr "VLC ক জনাওক যে OS ত ফাইল সংস্থা এটাৰ বাবে ইয়াক আৰম্ভ কৰা হৈছে" + +#: src/libvlc-module.c:1087 modules/gui/qt/ui/sprefs_interface.h:554 +msgid "Use only one instance when started from file manager" +msgstr "কেৱল এটা উদাহৰণ ব্যৱহাৰ কৰক যেতিয়া ফাইল পৰিচালকৰ পৰা আৰম্ভ কৰে" + +#: src/libvlc-module.c:1089 +msgid "Increase the priority of the process" +msgstr "প্ৰক্ৰিয়াটোৰ অগ্ৰাধিকাৰটো বৃদ্ধি কৰক" + +#: src/libvlc-module.c:1091 +msgid "" +"Increasing the priority of the process will very likely improve your playing " +"experience as it allows VLC not to be disturbed by other applications that " +"could otherwise take too much processor time. However be advised that in " +"certain circumstances (bugs) VLC could take all the processor time and " +"render the whole system unresponsive which might require a reboot of your " +"machine." +msgstr "" +"প্ৰক্ৰিয়াটোৰ অগ্ৰাধিকাৰ বৃদ্ধি কৰাটোৱে হয়তো সম্ভৱত আপোনাৰ চলোৱাৰ অভিজ্ঞতাটো উন্নত " +"কৰিব যিহেতু এইটোৱে VLC ক আন কাৰ্য্যবোৰৰ দ্বাৰা বিতৰণ কৰাৰ অনুমতি নিদিয়ে, সেইটোৱে " +"অন্যথা বহুত বেছি প্ৰক্ৰিয়াৰকৰ্তাৰ সময় নষ্ট কৰিব. সেইদৰে উপদেশ দিয়া হয় যে নিৰ্দিষ্ট " +"পৰিস্থিতিবোৰত (বাগবোৰ) VLC য়ে সকলোবোৰ প্ৰক্ৰিয়াকৰ্তাৰ সময় লব পাৰে আৰু সমগ্ৰ " +"সঁহাৰিবিহীন ছিষ্টেমটো অনুবাদ কৰে যিটোৱে আপোনাৰ মেচিনটোৰ ৰিবুট এটা দাবী কৰিব পাৰে." + +#: src/libvlc-module.c:1099 modules/gui/qt/ui/sprefs_interface.h:557 +msgid "Enqueue items into playlist in one instance mode" +msgstr "প্লেলিষ্টত এটা উদাহৰণৰ ধৰণত বস্তুবোৰ শাৰী কৰক" + +#: src/libvlc-module.c:1101 +msgid "" +"When using the one instance only option, enqueue items to playlist and keep " +"playing current item." +msgstr "" +"যেতিয়া এটা উদাহৰণ একমাত্ৰ বিকল্পটো ব্যৱহাৰ কৰে, বস্তুবোৰ প্লেলিষ্টত শাৰী কৰক আৰু " +"চলিত বস্তুটো চলি থাকিবলৈ দিয়ক." + +#: src/libvlc-module.c:1104 +msgid "Expose media player via D-Bus" +msgstr "" + +#: src/libvlc-module.c:1105 +msgid "Allow other applications to control VLC using the D-Bus MPRIS protocol." +msgstr "" + +#: src/libvlc-module.c:1114 +msgid "" +"These options define the behavior of the playlist. Some of them can be " +"overridden in the playlist dialog box." +msgstr "" +"এই বিকল্পবোৰে প্লেলিষ্টৰ আচৰণটো বাখ্যা কৰে. সেইবোৰৰ কিছুমান প্লেলিষ্টৰ সংলাপ " +"বাকচটোত অভাৰৰাইড কৰা হব." + +#: src/libvlc-module.c:1117 +msgid "Automatically preparse items" +msgstr "" + +#: src/libvlc-module.c:1119 +msgid "" +"Automatically preparse items added to the playlist (to retrieve some " +"metadata)." +msgstr "" + +#: src/libvlc-module.c:1122 +msgid "Preparsing timeout" +msgstr "" + +#: src/libvlc-module.c:1124 +msgid "Maximum time allowed to preparse an item, in milliseconds" +msgstr "" + +#: src/libvlc-module.c:1126 modules/gui/macosx/VLCSimplePrefsController.m:342 +#: modules/gui/qt/dialogs/firstrun.cpp:95 +#: modules/gui/qt/ui/sprefs_interface.h:569 +msgid "Allow metadata network access" +msgstr "মেটাডাটা নেটৱৰ্ক প্ৰৱেশৰ অনুমতি দিয়ক" + +#: src/libvlc-module.c:1131 +msgid "Collapse" +msgstr "খহিছে" + +#: src/libvlc-module.c:1131 +msgid "Expand" +msgstr "প্ৰসাৰ কৰক" + +#: src/libvlc-module.c:1133 +msgid "Subdirectory behavior" +msgstr "উপনিৰ্দেশিকাৰ আচৰণ" + +#: src/libvlc-module.c:1135 +msgid "" +"Select whether subdirectories must be expanded.\n" +"none: subdirectories do not appear in the playlist.\n" +"collapse: subdirectories appear but are expanded on first play.\n" +"expand: all subdirectories are expanded.\n" +msgstr "" +"উপনিৰ্দেশিকাবোৰ প্ৰসাৰ কৰে নে নাই নিৰ্বাচন কৰক.\n" +"নাই: উপনিৰ্দেশিকাবোৰ প্লেলিষ্টত দৃষ্টিগোচৰ নহয়.\n" +"খহি পৰা: উপনিৰ্দেশিকাবোৰ দৃষ্টিগোচৰ হয় কিন্তু প্ৰথমবাৰ চলাওতে প্ৰসাৰ কৰা হয়.\n" +"প্ৰসাৰ কৰক: সকলোবোৰ উপনিৰ্দেশিকা প্ৰসাৰ কৰা হয়.\n" + +#: src/libvlc-module.c:1140 +msgid "Ignored extensions" +msgstr "সম্প্ৰসাৰণবোৰ অৱজ্ঞা কৰা হল" + +#: src/libvlc-module.c:1142 +msgid "" +"Files with these extensions will not be added to playlist when opening a " +"directory.\n" +"This is useful if you add directories that contain playlist files for " +"instance. Use a comma-separated list of extensions." +msgstr "" +"এই সম্প্ৰসাৰণবোৰৰ সৈতে ফাইলবোৰ প্লেলিষ্টলৈ যোগ কৰা নহব যেতিয়া নিৰ্দেশিকা এটা " +"খোলে.\n" +"এইটো উপযোগী যদি আপুনি নিৰ্দেশিকাবোৰ যোগ কৰে যিয়ে উদাহৰণৰ বাবে প্লেলিষ্ট ফাইলবোৰ " +"ধাৰণ কৰে. সম্প্ৰসাৰণবোৰৰ বাবে ক'মা-পৃথকীকৃত তালিকা এখন ব্যৱহাৰ কৰক." + +#: src/libvlc-module.c:1147 +msgid "Show hidden files" +msgstr "" + +#: src/libvlc-module.c:1149 +msgid "Ignore files starting with '.'" +msgstr "" + +#: src/libvlc-module.c:1151 +msgid "Services discovery modules" +msgstr "সেৱাবোৰ আৱিষ্কাৰ মডুলবোৰ" + +#: src/libvlc-module.c:1153 +msgid "" +"Specifies the services discovery modules to preload, separated by colons. " +"Typical value is \"sap\"." +msgstr "" +"আগতীয়াকৈ লোড কৰিবলৈ, কলনবোৰৰ দ্বাৰা পৃথক কৰিবলৈ সেৱাবোৰ আৱিষ্কাৰ মডুলবোৰ নিৰ্ধাৰণ " +"কৰে. সাধাৰণ মানটো হল \"sap\"." + +#: src/libvlc-module.c:1156 +msgid "Play files randomly forever" +msgstr "চিৰদিন ফাইলবোৰ বিশৃংখলভাৱে চলাওক" + +#: src/libvlc-module.c:1158 +msgid "VLC will randomly play files in the playlist until interrupted." +msgstr "হস্তক্ষেপ নকৰালৈকে প্লেলিষ্টটোত VLC য়ে ফাইলবোৰ বিশৃংখলভাৱে চলাব." + +#: src/libvlc-module.c:1160 +msgid "Repeat all" +msgstr "সকলোবোৰ পুনৰাবৃত্তি কৰক" + +#: src/libvlc-module.c:1162 +msgid "VLC will keep playing the playlist indefinitely." +msgstr "VLC য়ে চলিত প্লেলিষ্ট বস্তুটো চিৰদিনৰ বাবে চলিত কৰি ৰাখিব." + +#: src/libvlc-module.c:1164 +msgid "Repeat current item" +msgstr "চলিত বস্তুটো পুনৰাবৃত্তি কৰক" + +#: src/libvlc-module.c:1166 +msgid "VLC will keep playing the current playlist item." +msgstr "VLC য়ে চলিত প্লেলিষ্ট বস্তুটো চলিত কৰি ৰাখিব." + +#: src/libvlc-module.c:1168 +msgid "Play and stop" +msgstr "চলাওক আৰু বন্ধ কৰক" + +#: src/libvlc-module.c:1170 +msgid "Stop the playlist after each played playlist item." +msgstr "প্লেলিষ্ট বস্তুৰ প্ৰত্যেকটো চলাৰ পিছত প্লেলিষ্টখন বন্ধ কৰক." + +#: src/libvlc-module.c:1172 +msgid "Play and exit" +msgstr "চলাওক আৰু প্ৰস্থান কৰক" + +#: src/libvlc-module.c:1174 +msgid "Exit if there are no more items in the playlist." +msgstr "প্ৰস্থান কৰক যদি প্লেলিষ্ট আৰু কোনো বস্তু নাই." + +#: src/libvlc-module.c:1176 +msgid "Play and pause" +msgstr "চলাওক আৰু বিৰতি দিয়ক" + +#: src/libvlc-module.c:1178 +msgid "Pause each item in the playlist on the last frame." +msgstr "অন্তিম ফ্ৰেমটোত প্লেলিষ্টটোত থকা প্ৰতিটো বস্তুক বিৰতি দিয়ক." + +#: src/libvlc-module.c:1180 +msgid "Start paused" +msgstr "" + +#: src/libvlc-module.c:1182 +msgid "Pause each item in the playlist on the first frame." +msgstr "" + +#: src/libvlc-module.c:1184 +msgid "Auto start" +msgstr "স্বয়ংক্ৰিয়ভাৱে আৰম্ভ কৰক" + +#: src/libvlc-module.c:1185 +msgid "Automatically start playing the playlist content once it's loaded." +msgstr "" +"এইটো এবাৰ লোড হোৱাৰ পিছত প্লেলিষ্টৰ উপাদানবোৰ স্বয়ংক্ৰিয়ভাৱে চলিবলৈ আৰম্ভ কৰে." + +#: src/libvlc-module.c:1188 +msgid "Pause on audio communication" +msgstr "অডিঅ' যোগাযোগত বিৰতি দিয়ক" + +#: src/libvlc-module.c:1190 +msgid "" +"If pending audio communication is detected, playback will be paused " +"automatically." +msgstr "" +"যদি বাকী থকা অডিঅ' যোগাযোগটো চিনাক্ত কৰে, তেন্তে প্লেবেকটোক স্বয়ক্ৰিয়ংভাৱে বিৰতি " +"দিয়া হব." + +#: src/libvlc-module.c:1193 +msgid "Use media library" +msgstr "মিডিয়া লাইব্ৰেৰী ব্যৱহাৰ কৰক" + +#: src/libvlc-module.c:1195 +msgid "" +"The media library is automatically saved and reloaded each time you start " +"VLC." +msgstr "" +"আপুনি প্ৰতিবাৰ VLC টো আৰম্ভ কৰিলে মিডিয়া লাইব্ৰেৰীটো স্বয়ংক্ৰিয়ভাৱে ছেভ কৰা আৰু পুনৰ " +"লোড কৰা হয়." + +#: src/libvlc-module.c:1198 modules/gui/qt/ui/sprefs_interface.h:555 +msgid "Display playlist tree" +msgstr "প্লেলিষ্টৰ বিন্যাস প্ৰদৰ্শন কৰক" + +#: src/libvlc-module.c:1200 +msgid "" +"The playlist can use a tree to categorize some items, like the contents of a " +"directory." +msgstr "" +"নিৰ্দেশিকা এটাৰ উপাদানবোৰৰ দৰে কিছুমান বস্তু শ্ৰেণীবিভাগ কৰিবলৈ প্লেলিষ্টখনে বিন্যাস " +"এটা ব্যৱহাৰ কৰিব পাৰে." + +#: src/libvlc-module.c:1209 +msgid "These settings are the global VLC key bindings, known as \"hotkeys\"." +msgstr "এই ছেটিংবোৰ হল সাৰ্বজনীন VLC কী বাইণ্ডিংবোৰ, \"hotkeys\" হিচাপে জনাজায়." + +#: src/libvlc-module.c:1214 modules/gui/macosx/VLCMain+OldPrefs.m:120 +msgid "Ignore" +msgstr "অৱজ্ঞা কৰক" + +#: src/libvlc-module.c:1214 +msgid "Volume control" +msgstr "" + +#: src/libvlc-module.c:1215 +msgid "Position control" +msgstr "" + +#: src/libvlc-module.c:1215 +msgid "Position control reversed" +msgstr "" + +#: src/libvlc-module.c:1218 +msgid "Mouse wheel vertical axis control" +msgstr "" + +#: src/libvlc-module.c:1220 +msgid "" +"The mouse wheel vertical (up/down) axis can control volume, position or be " +"ignored." +msgstr "" + +#: src/libvlc-module.c:1222 +msgid "Mouse wheel horizontal axis control" +msgstr "" + +#: src/libvlc-module.c:1224 +msgid "" +"The mouse wheel horizontal (left/right) axis can control volume, position or " +"be ignored." +msgstr "" + +#: src/libvlc-module.c:1226 src/video_output/vout_intf.c:268 +#: modules/gui/macosx/VLCControlsBarCommon.m:98 +#: modules/gui/macosx/VLCMainMenu.m:432 modules/gui/macosx/VLCMainMenu.m:511 +#: modules/gui/qt/components/controller.hpp:108 +#: modules/gui/qt/ui/sprefs_video.h:315 +msgid "Fullscreen" +msgstr "সম্পূৰ্ণ দৃশ্য" + +#: src/libvlc-module.c:1227 +msgid "Select the hotkey to use to swap fullscreen state." +msgstr "সম্পূৰ্ণ দৃশ্য অৱস্থা শ্বুৱাপ কৰিবৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1228 +msgid "Exit fullscreen" +msgstr "সম্পূৰ্ণ দৃশ্য বন্ধ কৰক" + +#: src/libvlc-module.c:1229 +msgid "Select the hotkey to use to exit fullscreen state." +msgstr "সম্পূৰ্ণ দৃশ্য অৱস্থা বন্ধ কৰিবৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1230 modules/gui/macosx/VLCFSPanelController.m:122 +msgid "Play/Pause" +msgstr "চলাওক/বিৰতি দিয়ক" + +#: src/libvlc-module.c:1231 +msgid "Select the hotkey to use to swap paused state." +msgstr "বিৰতি অৱস্থাটো শ্বুৱাপ কৰিবৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1232 +msgid "Pause only" +msgstr "কেৱল বিৰতি দিয়ক" + +#: src/libvlc-module.c:1233 +msgid "Select the hotkey to use to pause." +msgstr "বিৰতি দিবৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1234 +msgid "Play only" +msgstr "কেৱল চলাওক" + +#: src/libvlc-module.c:1235 +msgid "Select the hotkey to use to play." +msgstr "চলাবৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1236 modules/gui/macosx/VLCMainMenu.m:393 +#: modules/gui/qt/components/controller.hpp:108 +#: modules/gui/qt/components/controller.hpp:118 +msgid "Faster" +msgstr "খৰতকীয়া" + +#: src/libvlc-module.c:1237 src/libvlc-module.c:1243 +msgid "Select the hotkey to use for fast forward playback." +msgstr "খৰতীয়াকৈ আগলৈ প্লেবেক কৰিবৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1238 modules/gui/macosx/VLCMainMenu.m:391 +#: modules/gui/qt/components/controller.hpp:108 +#: modules/gui/qt/components/controller.hpp:118 +msgid "Slower" +msgstr "মন্থৰ" + +#: src/libvlc-module.c:1239 src/libvlc-module.c:1245 +msgid "Select the hotkey to use for slow motion playback." +msgstr "মন্থৰ গতিত প্লেবেকৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1240 +msgid "Normal rate" +msgstr "স্বাভাৱিক হাৰ" + +#: src/libvlc-module.c:1241 +msgid "Select the hotkey to set the playback rate back to normal." +msgstr "প্লেবেকৰ হাৰ স্বাভাৱিক অৱস্থালৈ ঘূৰাই নিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1242 modules/gui/qt/menus.cpp:889 +msgid "Faster (fine)" +msgstr "খৰতকীয়া (উত্তম)" + +#: src/libvlc-module.c:1244 modules/gui/qt/menus.cpp:897 +msgid "Slower (fine)" +msgstr "মন্থৰ (উত্তম)" + +#: src/libvlc-module.c:1246 modules/control/hotkeys.c:410 +#: modules/gui/macosx/VLCControlsBarCommon.m:196 +#: modules/gui/macosx/VLCFSPanelController.m:125 +#: modules/gui/macosx/VLCHelpWindowController.m:48 +#: modules/gui/macosx/VLCMainMenu.m:396 modules/gui/macosx/VLCMainMenu.m:499 +#: modules/gui/macosx/VLCMainMenu.m:507 +#: modules/gui/qt/components/controller.hpp:112 +#: modules/gui/qt/dialogs/sout.cpp:91 modules/notify/notify.c:335 +#: modules/gui/qt/ui/streampanel.h:179 +msgid "Next" +msgstr "পৰৱৰ্তী" + +#: src/libvlc-module.c:1247 +msgid "Select the hotkey to use to skip to the next item in the playlist." +msgstr "প্লেলিষ্টটোত পৰৱৰ্তী বস্তুটোলৈ যোৱাৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1248 modules/control/hotkeys.c:414 +#: modules/gui/macosx/VLCControlsBarCommon.m:193 +#: modules/gui/macosx/VLCFSPanelController.m:128 +#: modules/gui/macosx/VLCHelpWindowController.m:49 +#: modules/gui/macosx/VLCMainMenu.m:395 modules/gui/macosx/VLCMainMenu.m:500 +#: modules/gui/macosx/VLCMainMenu.m:506 +#: modules/gui/qt/components/controller.hpp:112 modules/notify/notify.c:333 +msgid "Previous" +msgstr "আগৰ" + +#: src/libvlc-module.c:1249 +msgid "Select the hotkey to use to skip to the previous item in the playlist." +msgstr "প্লেলিষ্টটোত আগৰ বস্তুটোলৈ যোৱাৰ বাবে ব্যৱহাৰ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1250 modules/gui/macosx/VLCMainMenu.m:386 +#: modules/gui/macosx/VLCMainMenu.m:498 modules/gui/macosx/VLCMainMenu.m:505 +#: modules/gui/macosx/VLCMainWindowControlsBar.m:65 +#: modules/gui/qt/components/controller.hpp:107 +#: modules/gui/qt/dialogs/vlm.cpp:538 modules/gui/qt/ui/streampanel.h:178 +msgid "Stop" +msgstr "বন্ধ কৰক" + +#: src/libvlc-module.c:1251 +msgid "Select the hotkey to stop playback." +msgstr "প্লেবেক বন্ধ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1252 modules/gui/macosx/VLCControlsBarCommon.m:92 +#: modules/gui/macosx/VLCFSPanelController.m:143 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:287 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:309 +#: modules/spu/marq.c:151 modules/spu/rss.c:198 +#: modules/gui/qt/ui/sprefs_subtitles.h:292 +#: modules/gui/qt/ui/video_effects.h:1315 +msgid "Position" +msgstr "স্থান" + +#: src/libvlc-module.c:1253 +msgid "Select the hotkey to display the position." +msgstr "স্থানটো প্ৰদৰ্শন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1255 +msgid "Very short backwards jump" +msgstr "বৰ চুটিকৈ পিছলৈ জপিওৱা" + +#: src/libvlc-module.c:1257 +msgid "Select the hotkey to make a very short backwards jump." +msgstr "বৰ চুটিকৈ পিছলৈ জপিওৱা এটা সম্পন্ন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1258 +msgid "Short backwards jump" +msgstr "চুটিকৈ পিছলৈ জপিওৱা" + +#: src/libvlc-module.c:1260 +msgid "Select the hotkey to make a short backwards jump." +msgstr "চুটিকৈ পিছলৈ জপিওৱা এটা সম্পন্ন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1261 +msgid "Medium backwards jump" +msgstr "মধ্যমভাৱে পিছলৈ জপিওৱা" + +#: src/libvlc-module.c:1263 +msgid "Select the hotkey to make a medium backwards jump." +msgstr "মধ্যমভাৱে পিছলৈ জপিওৱা এটা সম্পন্ন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1264 +msgid "Long backwards jump" +msgstr "দীঘলকৈ পিছলৈ জপিওৱা" + +#: src/libvlc-module.c:1266 +msgid "Select the hotkey to make a long backwards jump." +msgstr "দীঘলকৈ পিছলৈ জপিওৱা এটা সম্পন্ন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1268 +msgid "Very short forward jump" +msgstr "বৰ চুটিকৈ আগলৈ জপিওৱা" + +#: src/libvlc-module.c:1270 +msgid "Select the hotkey to make a very short forward jump." +msgstr "বৰ চুটিকৈ আগলৈ জপিওৱা এটা সম্পন্ন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1271 +msgid "Short forward jump" +msgstr "চুটিকৈ আগলৈ জপিওৱা" + +#: src/libvlc-module.c:1273 +msgid "Select the hotkey to make a short forward jump." +msgstr "চুটিকৈ আগলৈ জপিওৱা এটা সম্পন্ন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1274 +msgid "Medium forward jump" +msgstr "মধ্যমভাৱে আগলৈ জপিওৱা" + +#: src/libvlc-module.c:1276 +msgid "Select the hotkey to make a medium forward jump." +msgstr "মধ্যমভাৱে আগলৈ জপিওৱা এটা সম্পন্ন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1277 +msgid "Long forward jump" +msgstr "দীঘলকৈ আগলৈ জপিওৱা" + +#: src/libvlc-module.c:1279 +msgid "Select the hotkey to make a long forward jump." +msgstr "দীঘলকৈ আগলৈ জপিওৱা এটা সম্পন্ন কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1280 modules/control/hotkeys.c:599 +msgid "Next frame" +msgstr "পৰৱৰ্তী ফ্ৰেম" + +#: src/libvlc-module.c:1282 +msgid "Select the hotkey to got to the next video frame." +msgstr "পৰৱৰ্তী ভিডিঅ' ফ্ৰেমটোলৈ যাবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1284 +msgid "Very short jump length" +msgstr "বৰ চুটিকৈ জপিওৱাৰ দৈৰ্ঘ্য" + +#: src/libvlc-module.c:1285 +msgid "Very short jump length, in seconds." +msgstr "বৰ চুটিকৈ জপিওৱাৰ দৈৰ্ঘ্য, ছেকণ্ডত." + +#: src/libvlc-module.c:1286 +msgid "Short jump length" +msgstr "চুটিকৈ জপিওৱাৰ দৈৰ্ঘ্য" + +#: src/libvlc-module.c:1287 +msgid "Short jump length, in seconds." +msgstr "চুটিকৈ জপিওৱাৰ দৈৰ্ঘ্য, ছেকণ্ডত." + +#: src/libvlc-module.c:1288 +msgid "Medium jump length" +msgstr "মধ্যমভাৱে জপিওৱাৰ দৈৰ্ঘ্য" + +#: src/libvlc-module.c:1289 +msgid "Medium jump length, in seconds." +msgstr "মধ্যমভাৱে জপিওৱাৰ দৈৰ্ঘ্য, ছেকণ্ডত." + +#: src/libvlc-module.c:1290 +msgid "Long jump length" +msgstr "দীঘলকৈ জপিওৱাৰ দৈৰ্ঘ্য" + +#: src/libvlc-module.c:1291 +msgid "Long jump length, in seconds." +msgstr "দীঘলকৈ জপিওৱাৰ দৈৰ্ঘ্য, ছেকণ্ডত." + +#: src/libvlc-module.c:1293 modules/control/hotkeys.c:361 +#: modules/gui/macosx/VLCStatusBarIcon.m:116 +#: modules/gui/qt/components/controller.hpp:111 +#: modules/gui/qt/components/controller.hpp:123 modules/gui/qt/menus.cpp:960 +#: modules/gui/qt/menus.cpp:1146 modules/gui/skins2/commands/cmd_quit.cpp:45 +msgid "Quit" +msgstr "ত্যাগ কৰক" + +#: src/libvlc-module.c:1294 +msgid "Select the hotkey to quit the application." +msgstr "আবেদন ত্যাগ কৰিবলৈ হটকীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1295 +msgid "Navigate up" +msgstr "ওপৰলৈ নেভিগেট কৰক" + +#: src/libvlc-module.c:1296 +msgid "" +"Select the key to move the selector up in DVD menus / Move viewpoint to up " +"(pitch)." +msgstr "" + +#: src/libvlc-module.c:1297 +msgid "Navigate down" +msgstr "তললৈ নেভিগেট কৰক" + +#: src/libvlc-module.c:1298 +msgid "" +"Select the key to move the selector down in DVD menus / Move viewpoint to " +"down (pitch)." +msgstr "" + +#: src/libvlc-module.c:1299 +msgid "Navigate left" +msgstr "বাওঁফালে নেভিগেট কৰক" + +#: src/libvlc-module.c:1300 +msgid "" +"Select the key to move the selector left in DVD menus / Move viewpoint to " +"left (yaw)." +msgstr "" + +#: src/libvlc-module.c:1301 +msgid "Navigate right" +msgstr "সোঁফালে নেভিগেট কৰক" + +#: src/libvlc-module.c:1302 +msgid "" +"Select the key to move the selector right in DVD menus / Move viewpoint to " +"right (yaw)." +msgstr "" + +#: src/libvlc-module.c:1303 +msgid "Activate" +msgstr "সক্ৰিয় কৰক" + +#: src/libvlc-module.c:1304 +msgid "Select the key to activate selected item in DVD menus." +msgstr "DVD তালিকাবোৰত নিৰ্বাচিত বস্তুটো সক্ৰিয় কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1305 modules/gui/qt/dialogs/toolbar.cpp:509 +msgid "Go to the DVD menu" +msgstr "DVD তালিকাটোলৈ যাওক" + +#: src/libvlc-module.c:1306 +msgid "Select the key to take you to the DVD menu" +msgstr "আপোনাক DVD তালিকাটোলৈ নিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1307 +msgid "Select previous DVD title" +msgstr "আগৰ DVD শিৰোনাম নিৰ্বাচন কৰক" + +#: src/libvlc-module.c:1308 +msgid "Select the key to choose the previous title from the DVD" +msgstr "DVD ৰ পৰা আগৰ শিৰোনামটো পছন্দ কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1309 +msgid "Select next DVD title" +msgstr "পৰৱৰ্তী DVD শিৰোনাম নিৰ্বাচন কৰক" + +#: src/libvlc-module.c:1310 +msgid "Select the key to choose the next title from the DVD" +msgstr "DVD ৰ পৰা পৰৱৰ্তী শিৰোনামটো পছন্দ কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1311 +msgid "Select prev DVD chapter" +msgstr "আগৰ DVD পাঠ নিৰ্বাচন কৰক" + +#: src/libvlc-module.c:1312 +msgid "Select the key to choose the previous chapter from the DVD" +msgstr "DVD ৰ পৰা আগৰ পাঠটো পছন্দ কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1313 +msgid "Select next DVD chapter" +msgstr "পৰৱৰ্তী DVD পাঠ নিৰ্বাচন কৰক" + +#: src/libvlc-module.c:1314 +msgid "Select the key to choose the next chapter from the DVD" +msgstr "DVD ৰ পৰা পৰৱৰ্তী পাঠটো পছন্দ কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1315 +msgid "Volume up" +msgstr "প্ৰসাৰ বঢ়াওক" + +#: src/libvlc-module.c:1316 +msgid "Select the key to increase audio volume." +msgstr "অডিঅ’ প্ৰসাৰ বৃদ্ধি কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1317 +msgid "Volume down" +msgstr "প্ৰসাৰ কমাওক" + +#: src/libvlc-module.c:1318 +msgid "Select the key to decrease audio volume." +msgstr "অডিঅ’ প্ৰসাৰ হ্ৰাস কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1319 modules/access/v4l2/v4l2.c:181 +#: modules/gui/macosx/VLCMainMenu.m:417 modules/gui/macosx/VLCMainMenu.m:501 +#: modules/gui/macosx/VLCMainMenu.m:510 +#: modules/gui/macosx/VLCMainWindowControlsBar.m:82 +msgid "Mute" +msgstr "নিস্তব্দ কৰক" + +#: src/libvlc-module.c:1320 +msgid "Select the key to mute audio." +msgstr "অডিঅ’ নিস্তব্দ কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1321 +msgid "Subtitle delay up" +msgstr "উপশিৰোনামৰ বিলম্ব ওপৰলৈ" + +#: src/libvlc-module.c:1322 +msgid "Select the key to increase the subtitle delay." +msgstr "উপশিৰোনামৰ বিলম্বটো বঢ়াবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1323 +msgid "Subtitle delay down" +msgstr "উপশিৰোনামৰ বিলম্ব তললৈ" + +#: src/libvlc-module.c:1324 +msgid "Select the key to decrease the subtitle delay." +msgstr "উপশিৰোনামৰ বিলম্বটো হ্ৰাস কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1325 +msgid "Reset subtitles text scale" +msgstr "" + +#: src/libvlc-module.c:1326 +msgid "Scale up subtitles text" +msgstr "" + +#: src/libvlc-module.c:1327 +msgid "Scale down subtitles text" +msgstr "" + +#: src/libvlc-module.c:1328 +msgid "Select the key to change subtitles text scaling" +msgstr "" + +#: src/libvlc-module.c:1329 +msgid "Subtitle sync / bookmark audio timestamp" +msgstr "উপশিৰোনাম ছিনক্ৰনাইজেশ্বন / পৃষ্ঠাসংকেত অডিঅ' টাইমষ্টেম্প" + +#: src/libvlc-module.c:1330 +msgid "Select the key to bookmark audio timestamp when syncing subtitles." +msgstr "" +"পৃষ্ঠাসংকেত অডিঅ' টাইমষ্টেম্পলৈ কীটো নিৰ্বাচন কৰক যেতিয়া উপশিৰোনামবোৰ ছিনক্ৰনাইজ " +"কৰে." + +#: src/libvlc-module.c:1331 +msgid "Subtitle sync / bookmark subtitle timestamp" +msgstr "উপশিৰোনাম ছিনক্ৰনাইজেশ্বন / পৃষ্ঠাসংকেত উপশিৰোনাম টাইমষ্টেম্প" + +#: src/libvlc-module.c:1332 +msgid "Select the key to bookmark subtitle timestamp when syncing subtitles." +msgstr "" +"পৃষ্ঠাসংকেত উপশিৰোনাম টাইমষ্টেম্পলৈ কীটো নিৰ্বাচন কৰক যেতিয়া উপশিৰোনামবোৰ " +"ছিনক্ৰনাইজ কৰে." + +#: src/libvlc-module.c:1333 +msgid "Subtitle sync / synchronize audio & subtitle timestamps" +msgstr "উপশিৰোনাম ছিনক্ৰনাইজেশ্বন / ছিনক্ৰনাইজ অডিঅ' & উপশিৰোনাম টাইমষ্টেম্পবোৰ" + +#: src/libvlc-module.c:1334 +msgid "Select the key to synchronize bookmarked audio & subtitle timestamps." +msgstr "ছিনক্ৰনাইজ পৃষ্ঠাসংকেত অডিঅ' & উপশিৰোনাম টাইমষ্টেম্পবোৰল কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1335 +msgid "Subtitle sync / reset audio & subtitle synchronization" +msgstr "উপশিৰোনাম ছিনক্ৰনাইজেশ্বন / পুনৰ ছেট অডিঅ' & উপশিৰোনাম ছিনক্ৰনাইজেশ্বন" + +#: src/libvlc-module.c:1336 +msgid "Select the key to reset synchronization of audio & subtitle timestamps." +msgstr "" +"অডিঅ' & উপশিৰোনাম টাইমষ্টেম্পবোৰৰ ছিনক্ৰনাইজেশ্বন পুনৰ ছেট কৰিবলৈ কীটো নিৰ্বাচন " +"কৰক." + +#: src/libvlc-module.c:1337 +msgid "Subtitle position up" +msgstr "উপশিৰোনামৰ স্থান ওপৰলৈ" + +#: src/libvlc-module.c:1338 +msgid "Select the key to move subtitles higher." +msgstr "উপশিৰোনামবোৰ অধিক উচ্চলৈ নিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1339 +msgid "Subtitle position down" +msgstr "উপশিৰোনামৰ স্থান তললৈ" + +#: src/libvlc-module.c:1340 +msgid "Select the key to move subtitles lower." +msgstr "উপশিৰোনামবোৰ অধিক তললৈ নিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1341 +msgid "Audio delay up" +msgstr "অডিঅ' বিলম্ব ওপৰলৈ" + +#: src/libvlc-module.c:1342 +msgid "Select the key to increase the audio delay." +msgstr "অডিঅ' বিলম্বটো বঢ়াবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1343 +msgid "Audio delay down" +msgstr "অডিঅ' বিলম্ব তললৈ" + +#: src/libvlc-module.c:1344 +msgid "Select the key to decrease the audio delay." +msgstr "অডিঅ' বিলম্বটো হ্ৰাস কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1351 +msgid "Play playlist bookmark 1" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 1" + +#: src/libvlc-module.c:1352 +msgid "Play playlist bookmark 2" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 2" + +#: src/libvlc-module.c:1353 +msgid "Play playlist bookmark 3" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 3" + +#: src/libvlc-module.c:1354 +msgid "Play playlist bookmark 4" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 4" + +#: src/libvlc-module.c:1355 +msgid "Play playlist bookmark 5" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 5" + +#: src/libvlc-module.c:1356 +msgid "Play playlist bookmark 6" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 6" + +#: src/libvlc-module.c:1357 +msgid "Play playlist bookmark 7" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 7" + +#: src/libvlc-module.c:1358 +msgid "Play playlist bookmark 8" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 8" + +#: src/libvlc-module.c:1359 +msgid "Play playlist bookmark 9" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 9" + +#: src/libvlc-module.c:1360 +msgid "Play playlist bookmark 10" +msgstr "চলিত প্লেলিষ্টৰ পৃষ্ঠাসংকেত 10" + +#: src/libvlc-module.c:1361 +msgid "Select the key to play this bookmark." +msgstr "এই পৃষ্ঠাসংকেতটো চলাবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1362 +msgid "Set playlist bookmark 1" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 1 ছেট কৰক" + +#: src/libvlc-module.c:1363 +msgid "Set playlist bookmark 2" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 2 ছেট কৰক" + +#: src/libvlc-module.c:1364 +msgid "Set playlist bookmark 3" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 3 ছেট কৰক" + +#: src/libvlc-module.c:1365 +msgid "Set playlist bookmark 4" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 4 ছেট কৰক" + +#: src/libvlc-module.c:1366 +msgid "Set playlist bookmark 5" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 5 ছেট কৰক" + +#: src/libvlc-module.c:1367 +msgid "Set playlist bookmark 6" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 6 ছেট কৰক" + +#: src/libvlc-module.c:1368 +msgid "Set playlist bookmark 7" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 7 ছেট কৰক" + +#: src/libvlc-module.c:1369 +msgid "Set playlist bookmark 8" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 8 ছেট কৰক" + +#: src/libvlc-module.c:1370 +msgid "Set playlist bookmark 9" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 9 ছেট কৰক" + +#: src/libvlc-module.c:1371 +msgid "Set playlist bookmark 10" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 10 ছেট কৰক" + +#: src/libvlc-module.c:1372 +msgid "Select the key to set this playlist bookmark." +msgstr "এই প্লেলিষ্ট পৃষ্ঠাসংকেতটো ছেট কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1373 +#: modules/gui/qt/components/playlist/standardpanel.cpp:247 +msgid "Clear the playlist" +msgstr "প্লেলিষ্টখন খালী কৰক" + +#: src/libvlc-module.c:1374 +msgid "Select the key to clear the current playlist." +msgstr "চলিত প্লেলিষ্টখন খলী কৰিবলৈ কীটো নিৰ্বাচন কৰক." + +#: src/libvlc-module.c:1376 +msgid "Playlist bookmark 1" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 1" + +#: src/libvlc-module.c:1377 +msgid "Playlist bookmark 2" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 2" + +#: src/libvlc-module.c:1378 +msgid "Playlist bookmark 3" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 3" + +#: src/libvlc-module.c:1379 +msgid "Playlist bookmark 4" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 4" + +#: src/libvlc-module.c:1380 +msgid "Playlist bookmark 5" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 5" + +#: src/libvlc-module.c:1381 +msgid "Playlist bookmark 6" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 6" + +#: src/libvlc-module.c:1382 +msgid "Playlist bookmark 7" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 7" + +#: src/libvlc-module.c:1383 +msgid "Playlist bookmark 8" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 8" + +#: src/libvlc-module.c:1384 +msgid "Playlist bookmark 9" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 9" + +#: src/libvlc-module.c:1385 +msgid "Playlist bookmark 10" +msgstr "প্লেলিষ্টৰ পৃষ্ঠাসংকেত 10" + +#: src/libvlc-module.c:1387 +msgid "This allows you to define playlist bookmarks." +msgstr "এইটোৱে আপোনাক প্লেলিষ্টৰ পৃষ্ঠাসংকেত বাখ্যা কৰিবলৈ অনুমতি দিয়ে." + +#: src/libvlc-module.c:1389 +msgid "Cycle audio track" +msgstr "অডিঅ' পথ চক্ৰ কৰক" + +#: src/libvlc-module.c:1390 +msgid "Cycle through the available audio tracks(languages)." +msgstr "উপলব্ধ অডিঅ' পথবোৰৰ(ভাষাবোৰ) মাজেৰে চক্ৰ কৰক." + +#: src/libvlc-module.c:1391 +msgid "Cycle subtitle track in reverse order" +msgstr "" + +#: src/libvlc-module.c:1392 +msgid "Cycle through the available subtitle tracks in reverse order." +msgstr "" + +#: src/libvlc-module.c:1393 +msgid "Cycle subtitle track" +msgstr "উপশিৰোনাম পথ চক্ৰ কৰক" + +#: src/libvlc-module.c:1394 +msgid "Cycle through the available subtitle tracks." +msgstr "উপলব্ধ উপশিৰোনাম পথবোৰৰ মাজেৰে চক্ৰ কৰক." + +#: src/libvlc-module.c:1395 +msgid "Toggle subtitles" +msgstr "" + +#: src/libvlc-module.c:1396 +msgid "Toggle subtitle track visibility." +msgstr "" + +#: src/libvlc-module.c:1397 +msgid "Cycle next program Service ID" +msgstr "পৰৱৰ্তী কাৰ্যসূচী সেৱা ID চক্ৰ কৰক" + +#: src/libvlc-module.c:1398 +msgid "Cycle through the available next program Service IDs (SIDs)." +msgstr "উপলব্ধ পৰৱৰ্তী সেৱা IDবোৰৰ (SIDবোৰ) মাজেৰে চক্ৰ কৰক." + +#: src/libvlc-module.c:1399 +msgid "Cycle previous program Service ID" +msgstr "আগৰ কাৰ্যসূচী সেৱা ID চক্ৰ কৰক" + +#: src/libvlc-module.c:1400 +msgid "Cycle through the available previous program Service IDs (SIDs)." +msgstr "উপলব্ধ আগৰ সেৱা IDবোৰৰ (SIDবোৰ) মাজেৰে চক্ৰ কৰক." + +#: src/libvlc-module.c:1401 +msgid "Cycle source aspect ratio" +msgstr "উত্স দৃষ্টিকোণ অনুপাত চক্ৰ কৰক" + +#: src/libvlc-module.c:1402 +msgid "Cycle through a predefined list of source aspect ratios." +msgstr "উত্স দৃষ্টিকোণ অনুপাতবোৰৰ পূৰ্বনিৰ্ধাৰিত তালিকা এখনৰ মাজেৰে চক্ৰ কৰক." + +#: src/libvlc-module.c:1403 +msgid "Cycle video crop" +msgstr "ভিডিঅ' ক্ৰোপ চক্ৰ কৰক" + +#: src/libvlc-module.c:1404 +msgid "Cycle through a predefined list of crop formats." +msgstr "ক্ৰোপ ফৰমেটবোৰৰ পূৰ্বনিৰ্ধাৰিত তালিকা এখনৰ মাজেৰে চক্ৰ কৰক." + +#: src/libvlc-module.c:1405 +msgid "Toggle autoscaling" +msgstr "স্বয়ংক্ৰিয়ভাৱে জোখাটো টগুল কৰক" + +#: src/libvlc-module.c:1406 +msgid "Activate or deactivate autoscaling." +msgstr "স্বয়ংক্ৰিয়ভাৱে জোখাটো সক্ৰিয় বা নিষ্ক্ৰিয় কৰক." + +#: src/libvlc-module.c:1407 +msgid "Increase scale factor" +msgstr "জোখৰ কাৰক বৃদ্ধি কৰক" + +#: src/libvlc-module.c:1409 +msgid "Decrease scale factor" +msgstr "জোখৰ কাৰক হ্ৰাস কৰক" + +#: src/libvlc-module.c:1411 +msgid "Toggle deinterlacing" +msgstr "ডিইন্টাৰলেচিং টগুল কৰক" + +#: src/libvlc-module.c:1412 +msgid "Activate or deactivate deinterlacing." +msgstr "ডিইন্টাৰলেচিং সক্ৰিয় বা নিষ্ক্ৰিয় কৰক." + +#: src/libvlc-module.c:1413 +msgid "Cycle deinterlace modes" +msgstr "চক্ৰ ডিইন্টাৰলেচ ধৰণবোৰ" + +#: src/libvlc-module.c:1414 +msgid "Cycle through available deinterlace modes." +msgstr "উপলব্ধ ডিইন্টাৰলেচ ধৰণবোৰৰ মাজেৰে চক্ৰ কৰক." + +#: src/libvlc-module.c:1415 +msgid "Show controller in fullscreen" +msgstr "সম্পূৰ্ণ দৃশ্যত নিয়ন্ত্ৰণকৰ্তা দেখুৱাওক" + +#: src/libvlc-module.c:1416 +msgid "Boss key" +msgstr "বছ কী" + +#: src/libvlc-module.c:1417 +msgid "Hide the interface and pause playback." +msgstr "ইন্টাৰফেছটো লুকাওক আৰু প্লেবেকটোক বিৰতি দিয়ক." + +#: src/libvlc-module.c:1418 +msgid "Context menu" +msgstr "প্ৰসংগ মেনু" + +#: src/libvlc-module.c:1419 +msgid "Show the contextual popup menu." +msgstr "প্ৰাসংগিক প'পআপ তালিকাটো দেখুৱাওক." + +#: src/libvlc-module.c:1420 +msgid "Take video snapshot" +msgstr "ভিডিঅ' স্নেপশ্বট লওক" + +#: src/libvlc-module.c:1421 +msgid "Takes a video snapshot and writes it to disk." +msgstr "ভিডিঅ' স্নেপশ্বট এটা লয় আৰু ডিস্কত লিখে." + +#: src/libvlc-module.c:1423 modules/gui/macosx/VLCMainMenu.m:387 +#: modules/gui/qt/components/controller.hpp:110 +#: modules/gui/qt/components/controller.hpp:121 modules/gui/qt/menus.cpp:863 +#: modules/stream_out/record.c:60 +msgid "Record" +msgstr "ৰেকৰ্ড কৰক" + +#: src/libvlc-module.c:1424 +msgid "Record access filter start/stop." +msgstr "প্ৰৱেশ ফিল্টাৰ আৰম্ভ/বন্ধ ৰেকৰ্ড কৰক." + +#: src/libvlc-module.c:1426 +msgid "Normal/Loop/Repeat" +msgstr "স্বাভাৱিক/লুপ/পুনৰাবৃত্তি" + +#: src/libvlc-module.c:1427 +msgid "Toggle Normal/Loop/Repeat playlist modes" +msgstr "স্বাভাৱিক/লুপ/পুনৰাবৃত্তি কৰা প্লেলিষ্ট ধৰণবোৰ টগুল কৰক" + +#: src/libvlc-module.c:1430 +msgid "Toggle random playlist playback" +msgstr "বিশৃংখল প্লেলিষ্ট প্লেবেকটো টগুল কৰক" + +#: src/libvlc-module.c:1435 src/libvlc-module.c:1436 +msgid "Un-Zoom" +msgstr "জুম নকৰিব" + +#: src/libvlc-module.c:1438 src/libvlc-module.c:1439 +msgid "Crop one pixel from the top of the video" +msgstr "ভিডিঅ'টোৰ ওপৰ পৰা পিক্সেল এটা ক্ৰোপ কৰক" + +#: src/libvlc-module.c:1440 src/libvlc-module.c:1441 +msgid "Uncrop one pixel from the top of the video" +msgstr "ভিডিঅ'টোৰ ওপৰ পৰা পিক্সেল এটা আনক্ৰোপ কৰক" + +#: src/libvlc-module.c:1443 src/libvlc-module.c:1444 +msgid "Crop one pixel from the left of the video" +msgstr "ভিডিঅ'টোৰ বাওঁফালৰ পৰা পিক্সেল এটা ক্ৰোপ কৰক" + +#: src/libvlc-module.c:1445 src/libvlc-module.c:1446 +msgid "Uncrop one pixel from the left of the video" +msgstr "ভিডিঅ'টোৰ বাওঁফালৰ পৰা পিক্সেল এটা আনক্ৰোপ কৰক" + +#: src/libvlc-module.c:1448 src/libvlc-module.c:1449 +msgid "Crop one pixel from the bottom of the video" +msgstr "ভিডিঅ'টোৰ তলৰ পৰা পিক্সেল এটা ক্ৰোপ কৰক" + +#: src/libvlc-module.c:1450 src/libvlc-module.c:1451 +msgid "Uncrop one pixel from the bottom of the video" +msgstr "ভিডিঅ'টোৰ তলৰ পৰা পিক্সেল এটা আনক্ৰোপ কৰক" + +#: src/libvlc-module.c:1453 src/libvlc-module.c:1454 +msgid "Crop one pixel from the right of the video" +msgstr "ভিডিঅ'টোৰ সোঁফালৰ পৰা পিক্সেল এটা ক্ৰোপ কৰক" + +#: src/libvlc-module.c:1455 src/libvlc-module.c:1456 +msgid "Uncrop one pixel from the right of the video" +msgstr "ভিডিঅ'টোৰ সোঁফালৰ পৰা পিক্সেল এটা আনক্ৰোপ কৰক" + +#: src/libvlc-module.c:1459 +msgid "Shrink the viewpoint field of view (360°)" +msgstr "" + +#: src/libvlc-module.c:1460 +msgid "Expand the viewpoint field of view (360°)" +msgstr "" + +#: src/libvlc-module.c:1461 +msgid "Roll the viewpoint clockwise (360°)" +msgstr "" + +#: src/libvlc-module.c:1462 +msgid "Roll the viewpoint anti-clockwise (360°)" +msgstr "" + +#: src/libvlc-module.c:1464 +msgid "Toggle wallpaper mode in video output" +msgstr "ভিডিঅ' আউটপুটত ৱালপেপাৰ ধৰণটো টগুল কৰক" + +#: src/libvlc-module.c:1466 +msgid "Toggle wallpaper mode in video output." +msgstr "ভিডিঅ' আউটপুটত ৱালপেপাৰ ধৰণটো টগুল কৰক." + +#: src/libvlc-module.c:1468 +msgid "Cycle through audio devices" +msgstr "অডিঅ' ডিভাইচবোৰৰ মাজেৰে চক্ৰ কৰক" + +#: src/libvlc-module.c:1469 +msgid "Cycle through available audio devices" +msgstr "উপলব্ধ অডিঅ' ডিভাইচবোৰৰ মাজেৰে চক্ৰ কৰক" + +#: src/libvlc-module.c:1598 src/video_output/vout_intf.c:274 +#: modules/gui/macosx/VLCMainMenu.m:434 modules/gui/macosx/VLCMainMenu.m:512 +#: modules/gui/qt/components/controller.hpp:109 +msgid "Snapshot" +msgstr "স্নেপশ্বট" + +#: src/libvlc-module.c:1615 +msgid "Window properties" +msgstr "উইণ্ডো সম্পত্তিবোৰ" + +#: src/libvlc-module.c:1675 +msgid "Subpictures" +msgstr "উপছবিবোৰ" + +#: src/libvlc-module.c:1683 modules/codec/subsdec.c:182 +#: modules/demux/subtitle.c:71 modules/demux/xiph_metadata.h:49 +#: modules/demux/xiph_metadata.h:62 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:158 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:178 +#: modules/gui/macosx/VLCMainMenu.m:450 +#: share/lua/http/dialogs/create_stream.html:153 +#: modules/gui/qt/ui/profiles.h:716 modules/gui/qt/ui/profiles.h:760 +#: modules/gui/qt/ui/profiles.h:763 +msgid "Subtitles" +msgstr "উপশিৰোনামবোৰ" + +#: src/libvlc-module.c:1703 modules/stream_out/transcode/transcode.c:116 +msgid "Overlays" +msgstr "অভাৰলেবোৰ" + +#: src/libvlc-module.c:1713 +msgid "Track settings" +msgstr "পথ ছেটিংবোৰ" + +#: src/libvlc-module.c:1753 modules/gui/macosx/VLCSimplePrefsController.m:330 +msgid "Playback control" +msgstr "প্লেবেক নিয়ন্ত্ৰণ" + +#: src/libvlc-module.c:1782 +msgid "Default devices" +msgstr "ডিফল্ট ডিভাইচবোৰ" + +#: src/libvlc-module.c:1789 +msgid "Network settings" +msgstr "নেটৱৰ্ক ছেটিংবোৰ" + +#: src/libvlc-module.c:1827 +msgid "Socks proxy" +msgstr "শ্বকছ প্ৰক্সি" + +#: src/libvlc-module.c:1836 modules/demux/xiph_metadata.h:55 +msgid "Metadata" +msgstr "মেটাডাটা" + +#: src/libvlc-module.c:1937 +msgid "Decoders" +msgstr "ডিকোডাৰবোৰ" + +#: src/libvlc-module.c:1944 modules/access/avio.h:40 +#: modules/access/v4l2/v4l2.c:59 modules/gui/macosx/VLCPlaylistInfo.m:80 +msgid "Input" +msgstr "ইনপুট" + +#: src/libvlc-module.c:1980 +msgid "VLM" +msgstr "VLM" + +#: src/libvlc-module.c:2026 +msgid "Special modules" +msgstr "বিশেষ মডুলবোৰ" + +#: src/libvlc-module.c:2031 modules/gui/qt/dialogs/plugins.cpp:89 +msgid "Plugins" +msgstr "প্লাগইনবোৰ" + +#: src/libvlc-module.c:2043 +msgid "Performance options" +msgstr "কাৰ্যদক্ষতাৰ বিকল্পবোৰ" + +#: src/libvlc-module.c:2061 +msgid "Clock source" +msgstr "ঘড়ী উত্স" + +#: src/libvlc-module.c:2179 +msgid "Hot keys" +msgstr "হট কীবোৰ" + +#: src/libvlc-module.c:2668 +msgid "Jump sizes" +msgstr "জপিওৱাৰ আকাৰবোৰ" + +#: src/libvlc-module.c:2753 +msgid "print help for VLC (can be combined with --advanced and --help-verbose)" +msgstr "" +"VLC ৰ বাবে সহায় ছপা কৰক ( --উন্নত আৰু --সহায়-ভাৰ্বোছৰ সৈতে মিশ্ৰণ কৰিব পাৰি)" + +#: src/libvlc-module.c:2756 +msgid "Exhaustive help for VLC and its modules" +msgstr "VLC আৰু ইয়াৰ মডুলবোৰৰ বাবে সম্পূৰ্ণ সহায়" + +#: src/libvlc-module.c:2758 +msgid "" +"print help for VLC and all its modules (can be combined with --advanced and " +"--help-verbose)" +msgstr "" +"VLC আৰু ইয়াৰ সকলোবোৰ মডুলৰ বাবে সহায় ছপা কৰক (--উন্নত আৰু --সহায়-ভাৰ্বোছৰ সৈতে " +"মিশ্ৰণ কৰিব পাৰি)" + +#: src/libvlc-module.c:2761 +msgid "ask for extra verbosity when displaying help" +msgstr "যেতিয়া সহায়টো প্ৰদৰ্শন কৰে অতিৰিক্ত ভাৰ্বোছিটিৰ বাবে সোধক" + +#: src/libvlc-module.c:2763 +msgid "print a list of available modules" +msgstr "উপলব্ধ মডুলবোৰৰ তালিকা এখন ছপা কৰক" + +#: src/libvlc-module.c:2765 +msgid "print a list of available modules with extra detail" +msgstr "অতিৰিক্ত বিৱৰণৰ সৈতে উপলব্ধ মডুলবোৰৰ তালিকা এখন ছপা কৰক" + +#: src/libvlc-module.c:2767 +msgid "" +"print help on a specific module (can be combined with --advanced and --help-" +"verbose). Prefix the module name with = for strict matches." +msgstr "" +"এটা বিশেষ মডুলত সহায়টো ছপা কৰক (--উন্নত আৰু --সহায়-ভাৰ্বোজৰ সৈতে মিশ্ৰণ কৰিব " +"পাৰি). কোঠৰ মিলবোৰৰ বাবে = ৰ সৈতে মডুল নামটো উপসৰ্গ কৰক." + +#: src/libvlc-module.c:2771 +msgid "no configuration option will be loaded nor saved to config file" +msgstr "ফাইল ৰূপৰেখা কৰিবলৈ কোনো ৰূপৰেখাকৰণ বিকল্প লোড বা ছেভ কৰা নহব" + +#: src/libvlc-module.c:2773 +msgid "reset the current config to the default values" +msgstr "মানবোৰ ডিফল্ট কৰিবলৈ চলিত ৰূপৰেখাটো পুনৰ ছেট কৰক" + +#: src/libvlc-module.c:2775 +msgid "use alternate config file" +msgstr "বেলেগ ৰূপৰেখা ফাইল ব্যৱহাৰ কৰক" + +#: src/libvlc-module.c:2777 +msgid "resets the current plugins cache" +msgstr "চলিত প্লাগইন কেশ্ববোৰ পুনৰ ছেট কৰে" + +#: src/libvlc-module.c:2779 +msgid "print version information" +msgstr "ছপা সংস্কৰণৰ তথ্য" + +#: src/libvlc-module.c:2819 +msgid "core program" +msgstr "মুখ্য কাৰ্যসূচী" + +#: src/misc/actions.c:52 +msgid "Backspace" +msgstr "পিছলৈ যাওক" + +#: src/misc/actions.c:53 +msgid "Brightness Down" +msgstr "উজ্জ্বলতা কমাওক" + +#: src/misc/actions.c:54 +msgid "Brightness Up" +msgstr "উজ্জ্বলতা বঢ়াওক" + +#: src/misc/actions.c:55 +msgid "Browser Back" +msgstr "ব্ৰাউজাৰৰ পিছলৈ" + +#: src/misc/actions.c:56 +msgid "Browser Favorites" +msgstr "ব্ৰাউজাৰৰ প্ৰিয়বোৰ" + +#: src/misc/actions.c:57 +msgid "Browser Forward" +msgstr "ব্ৰাউজাৰৰ আগলৈ" + +#: src/misc/actions.c:58 +msgid "Browser Home" +msgstr "ব্ৰাউজাৰৰ মুখ্য" + +#: src/misc/actions.c:59 +msgid "Browser Refresh" +msgstr "ব্ৰাউজাৰৰ পুনৰসজীৱ" + +#: src/misc/actions.c:60 +msgid "Browser Search" +msgstr "ব্ৰাউজাৰৰ সন্ধান" + +#: src/misc/actions.c:61 +msgid "Browser Stop" +msgstr "ব্ৰাউজাৰ বন্ধ" + +#: src/misc/actions.c:62 modules/gui/macosx/VLCMainMenu.m:370 +#: modules/gui/macosx/VLCPlaylist.m:224 modules/gui/qt/dialogs/bookmarks.cpp:50 +#: modules/gui/qt/ui/podcast_configuration.h:102 +#: modules/gui/qt/ui/streampanel.h:170 +msgid "Delete" +msgstr "ডিলিট কৰক" + +#: src/misc/actions.c:63 +msgid "Down" +msgstr "তললৈ" + +#: src/misc/actions.c:64 modules/control/oldrc.c:72 +msgid "End" +msgstr "সমাপ্ত" + +#: src/misc/actions.c:65 +msgid "Enter" +msgstr "প্ৰৱেশ কৰক" + +#: src/misc/actions.c:66 +msgid "Esc" +msgstr "আওকাণ কৰক" + +#: src/misc/actions.c:67 +msgid "F1" +msgstr "F1" + +#: src/misc/actions.c:68 +msgid "F10" +msgstr "F10" + +#: src/misc/actions.c:69 +msgid "F11" +msgstr "F11" + +#: src/misc/actions.c:70 +msgid "F12" +msgstr "F12" + +#: src/misc/actions.c:71 +msgid "F2" +msgstr "F2" + +#: src/misc/actions.c:72 +msgid "F3" +msgstr "F3" + +#: src/misc/actions.c:73 +msgid "F4" +msgstr "F4" + +#: src/misc/actions.c:74 +msgid "F5" +msgstr "F5" + +#: src/misc/actions.c:75 +msgid "F6" +msgstr "F6" + +#: src/misc/actions.c:76 +msgid "F7" +msgstr "F7" + +#: src/misc/actions.c:77 +msgid "F8" +msgstr "F8" + +#: src/misc/actions.c:78 +msgid "F9" +msgstr "F9" + +#: src/misc/actions.c:79 +msgid "Home" +msgstr "মুখ্য" + +#: src/misc/actions.c:80 +msgid "Insert" +msgstr "ভৰাওক" + +#: src/misc/actions.c:82 +msgid "Media Angle" +msgstr "মিডিয়া কোণ" + +#: src/misc/actions.c:83 +msgid "Media Audio Track" +msgstr "মিডিয়া অডিঅ' পথ" + +#: src/misc/actions.c:84 +msgid "Media Forward" +msgstr "মিডিয়া আগলৈ" + +#: src/misc/actions.c:85 +msgid "Media Menu" +msgstr "মিডিয়া তালিকা" + +#: src/misc/actions.c:86 +msgid "Media Next Frame" +msgstr "মিডিয়াৰ পৰৱৰ্তী ফ্ৰেম" + +#: src/misc/actions.c:87 +msgid "Media Next Track" +msgstr "মিডিয়া পৰৱৰ্তী পথ" + +#: src/misc/actions.c:88 +msgid "Media Play Pause" +msgstr "মি়ডিয়া চলোৱাটোত বিৰতি দিয়া" + +#: src/misc/actions.c:89 +msgid "Media Prev Frame" +msgstr "মি়ডিয়াৰ আগৰ ফ্ৰেম" + +#: src/misc/actions.c:90 +msgid "Media Prev Track" +msgstr "মিডিয়াৰ আগৰ পথ" + +#: src/misc/actions.c:91 +msgid "Media Record" +msgstr "মিডিয়া ৰেকৰ্ড" + +#: src/misc/actions.c:92 +msgid "Media Repeat" +msgstr "মিডিয়াৰ পুনৰাবৃত্তি" + +#: src/misc/actions.c:93 +msgid "Media Rewind" +msgstr "মিডিয়া পুনৰলাভ" + +#: src/misc/actions.c:94 +msgid "Media Select" +msgstr "মিডিয়া নিৰ্বাচন" + +#: src/misc/actions.c:95 +msgid "Media Shuffle" +msgstr "মিডিয়াৰ সানমিহলি" + +#: src/misc/actions.c:96 +msgid "Media Stop" +msgstr "মিডিয়া বন্ধ" + +#: src/misc/actions.c:97 +msgid "Media Subtitle" +msgstr "মিডিয়া উপশিৰোনাম" + +#: src/misc/actions.c:98 +msgid "Media Time" +msgstr "মিডিয়া সময়" + +#: src/misc/actions.c:99 +msgid "Media View" +msgstr "মিডিয়া দৃশ্য" + +#: src/misc/actions.c:100 modules/gui/qt/components/controller.cpp:577 +msgid "Menu" +msgstr "তালিকা" + +#: src/misc/actions.c:101 +msgid "Mouse Wheel Down" +msgstr "মাউছৰ চকা তললৈ" + +#: src/misc/actions.c:102 +msgid "Mouse Wheel Left" +msgstr "মাউছৰ চকা বাওঁফালে" + +#: src/misc/actions.c:103 +msgid "Mouse Wheel Right" +msgstr "মাউছৰ চকা সোঁফালে" + +#: src/misc/actions.c:104 +msgid "Mouse Wheel Up" +msgstr "মাউছৰ চকা ওপৰলৈ" + +#: src/misc/actions.c:105 +msgid "Page Down" +msgstr "পৃষ্ঠাৰ তললৈ যাওক" + +#: src/misc/actions.c:106 +msgid "Page Up" +msgstr "পৃষ্ঠাৰ ওপৰলৈ যাওক" + +#: src/misc/actions.c:107 modules/control/oldrc.c:71 +#: modules/gui/macosx/VLCControlsBarCommon.m:423 +#: modules/gui/macosx/VLCFSPanelController.m:251 +#: modules/gui/macosx/VLCMainMenu.m:1346 modules/gui/macosx/VLCMainMenu.m:1347 +#: modules/gui/macosx/VLCMainMenu.m:1348 +#: modules/gui/qt/components/playlist/standardpanel.cpp:197 +#: modules/gui/qt/menus.cpp:837 +msgid "Pause" +msgstr "বিৰতি দিয়ক" + +#: src/misc/actions.c:108 +msgid "Print" +msgstr "ছপা কৰক" + +#: src/misc/actions.c:110 modules/meta_engine/ID3Genres.h:77 +msgid "Space" +msgstr "ঠাই এৰক" + +#: src/misc/actions.c:111 +msgid "Tab" +msgstr "টেব" + +#: src/misc/actions.c:113 +msgid "Up" +msgstr "ওপৰলৈ" + +#: src/misc/actions.c:114 modules/gui/macosx/VLCMainMenu.m:509 +msgid "Volume Down" +msgstr "প্ৰসাৰ কমাওক" + +#: src/misc/actions.c:115 +msgid "Volume Mute" +msgstr "প্ৰসাৰটো নিস্তব্দ কৰক" + +#: src/misc/actions.c:116 modules/gui/macosx/VLCMainMenu.m:508 +msgid "Volume Up" +msgstr "প্ৰসাৰ বঢ়াওক" + +#: src/misc/actions.c:117 +msgid "Zoom In" +msgstr "ভিতৰলৈ জুম কৰক" + +#: src/misc/actions.c:118 +msgid "Zoom Out" +msgstr "বাহিৰলৈ জুম কৰক" + +#: src/misc/actions.c:246 +msgid "Ctrl+" +msgstr "কন্ট্ৰোল+" + +#: src/misc/actions.c:247 +msgid "Alt+" +msgstr "অল্ট+" + +#: src/misc/actions.c:248 +msgid "Shift+" +msgstr "ছিফ্ট+" + +#: src/misc/actions.c:249 +msgid "Meta+" +msgstr "মেটা+" + +#: src/misc/actions.c:250 +msgid "Command+" +msgstr "নিৰ্দেশ+" + +#: src/misc/update.c:482 +#, c-format +msgid "%.1f GiB" +msgstr "%.1f GiB" + +#: src/misc/update.c:484 +#, c-format +msgid "%.1f MiB" +msgstr "%.1f MiB" + +#: src/misc/update.c:486 modules/gui/macosx/VLCPlaylistInfo.m:138 +#: modules/gui/macosx/VLCPlaylistInfo.m:140 +#, c-format +msgid "%.1f KiB" +msgstr "%.1f KiB" + +#: src/misc/update.c:488 +#, c-format +msgid "% B" +msgstr "" + +#: src/misc/update.c:580 +msgid "Saving file failed" +msgstr "ফাইল ছেভ কৰা ব্যৰ্থ হল" + +#: src/misc/update.c:581 +#, c-format +msgid "Failed to open \"%s\" for writing" +msgstr "লিখিবৰ বাবে \"%s\" খুলিবলৈ ব্যৰ্থ হল" + +#: src/misc/update.c:596 src/misc/update.c:726 modules/access/dvb/scan.c:826 +#: modules/demux/avi/avi.c:2878 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:513 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:571 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:854 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:900 +#: modules/gui/macosx/VLCBookmarksWindowController.m:86 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:153 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:182 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:339 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:488 +#: modules/gui/macosx/VLCCoreDialogProvider.m:193 +#: modules/gui/macosx/VLCCoreDialogProvider.m:197 +#: modules/gui/macosx/VLCCoreDialogProvider.m:293 +#: modules/gui/macosx/VLCMainWindow.m:227 +#: modules/gui/macosx/VLCMainWindow.m:233 +#: modules/gui/macosx/VLCOpenWindowController.m:134 +#: modules/gui/macosx/VLCOpenWindowController.m:192 +#: modules/gui/macosx/VLCSimplePrefsController.m:294 +#: modules/gui/macosx/VLCSimplePrefsController.m:321 +#: modules/gui/macosx/VLCSimplePrefsController.m:392 +#: modules/gui/macosx/VLCSimplePrefsController.m:835 +#: modules/gui/macosx/VLCTimeSelectionPanelController.m:50 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:791 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:860 +#: modules/gui/macosx/prefs.m:189 +#: modules/gui/qt/components/open_panels.cpp:1361 +#: modules/gui/qt/components/preferences_widgets.cpp:1420 +#: modules/gui/qt/components/sout/profile_selector.cpp:452 +#: modules/gui/qt/dialogs/sout.cpp:90 +#: modules/stream_out/chromecast/cast.cpp:1197 +msgid "Cancel" +msgstr "বাতিল কৰক" + +#: src/misc/update.c:598 +#, c-format +msgid "" +"%s\n" +"Downloading... %s/%s %.1f%% done" +msgstr "" +"%s\n" +"ডাউনলোড কৰিছে... %s/%s %.1f%% সম্পন্ন কৰা হল" + +#: src/misc/update.c:649 +msgid "File could not be verified" +msgstr "ফাইল প্ৰমাণিত কৰিব পৰা নগল" + +#: src/misc/update.c:650 +#, c-format +msgid "" +"It was not possible to download a cryptographic signature for the downloaded " +"file \"%s\". Thus, it was deleted." +msgstr "" +"ডাউনলোড কৰা \"%s\" ফাইলটোৰ বাবে ক্ৰিপ্টোগ্ৰাফিক স্বাক্ষৰ এটা ডাউনলোড কৰাটো সম্ভৱ " +"নাছিল. সেয়ে, এইটো ডিলিট কৰা হৈছে." + +#: src/misc/update.c:661 src/misc/update.c:673 +msgid "Invalid signature" +msgstr "অবৈধ স্বাক্ষৰ" + +#: src/misc/update.c:662 src/misc/update.c:674 +#, c-format +msgid "" +"The cryptographic signature for the downloaded file \"%s\" was invalid and " +"could not be used to securely verify it. Thus, the file was deleted." +msgstr "" +"ডাউনলোড কৰা \"%s\" ফাইলটোৰ বাবে ক্ৰিপ্টোগ্ৰাফিক স্বাক্ষটো অবৈধ আছিল আৰু এইটো " +"সুৰক্ষিতভাৱে প্ৰমাণিত কৰিবলৈ ব্যৱহাৰ কৰিব পৰা নগল. সেয়ে, ফাইলটো ডিলিট কৰা হৈছিল." + +#: src/misc/update.c:686 +msgid "File not verifiable" +msgstr "ফাইল প্ৰমাণিত কৰিব নোৱাৰি" + +#: src/misc/update.c:687 +#, c-format +msgid "" +"It was not possible to securely verify the downloaded file \"%s\". Thus, it " +"was deleted." +msgstr "" +"ডাউনলোড কৰা \"%s\" ফাইলটো সুৰক্ষিতভাৱে প্ৰমাণিত কৰাটো সম্ভৱ নহয়. সেয়ে, এইটো " +"ডিলিট কৰা হৈছিল." + +#: src/misc/update.c:698 src/misc/update.c:710 +msgid "File corrupted" +msgstr "ফাইল নষ্ট হৈছে" + +#: src/misc/update.c:699 src/misc/update.c:711 +#, c-format +msgid "Downloaded file \"%s\" was corrupted. Thus, it was deleted." +msgstr "ডাউনলোড কৰা \"%s\" ফাইলটো নষ্ট আছিল. সেয়ে, ইয়াক ডিলিট কৰা হৈছিল." + +#: src/misc/update.c:723 +msgid "" +"The new version was successfully downloaded. Do you want to close VLC and " +"install it now?" +msgstr "" + +#: src/misc/update.c:726 modules/gui/macosx/VLCAddonsWindowController.m:200 +msgid "Install" +msgstr "ইনষ্টল কৰক" + +#: src/misc/update.c:727 +msgid "Update VLC media player" +msgstr "VLC মিডিয়া প্লেয়াৰ আপডেট কৰক" + +#: src/playlist/engine.c:247 src/playlist/loadsave.c:159 lib/media_list.c:237 +#: modules/gui/macosx/VLCMainWindow.m:796 +#: modules/gui/macosx/VLCSidebarDataSource.m:70 +#: modules/gui/qt/components/playlist/selector.cpp:236 +msgid "Media Library" +msgstr "মিডিয়া লাইব্ৰেৰী" + +#: src/text/iso-639_def.h:40 +msgid "Afar" +msgstr "আফ্ৰা" + +#: src/text/iso-639_def.h:41 +msgid "Abkhazian" +msgstr "আবখাজিয়াৰ" + +#: src/text/iso-639_def.h:42 +msgid "Afrikaans" +msgstr "আফ্ৰিকানবোৰ" + +#: src/text/iso-639_def.h:43 +msgid "Albanian" +msgstr "আলবানিয়াৰ" + +#: src/text/iso-639_def.h:44 +msgid "Amharic" +msgstr "আমহাৰি" + +#: src/text/iso-639_def.h:45 +msgid "Arabic" +msgstr "আৰৱী" + +#: src/text/iso-639_def.h:46 +msgid "Armenian" +msgstr "আৰ্মেনিয়াৰ" + +#: src/text/iso-639_def.h:47 +msgid "Assamese" +msgstr "অসমীয়া" + +#: src/text/iso-639_def.h:48 +msgid "Avestan" +msgstr "এভেষ্টান" + +#: src/text/iso-639_def.h:49 +msgid "Aymara" +msgstr "আয়েমাৰা" + +#: src/text/iso-639_def.h:50 +msgid "Azerbaijani" +msgstr "আজাৰবাইজানী" + +#: src/text/iso-639_def.h:51 +msgid "Bashkir" +msgstr "বাস্কিৰ" + +#: src/text/iso-639_def.h:52 +msgid "Basque" +msgstr "বাছকিউ" + +#: src/text/iso-639_def.h:53 +msgid "Belarusian" +msgstr "বেলাৰুছৰ" + +#: src/text/iso-639_def.h:54 +msgid "Bengali" +msgstr "বঙালী" + +#: src/text/iso-639_def.h:55 +msgid "Bihari" +msgstr "বিহাৰী" + +#: src/text/iso-639_def.h:56 +msgid "Bislama" +msgstr "বিছলামা" + +#: src/text/iso-639_def.h:57 +msgid "Bosnian" +msgstr "বছনিয়াৰ" + +#: src/text/iso-639_def.h:58 +msgid "Breton" +msgstr "ব্ৰেটন" + +#: src/text/iso-639_def.h:59 +msgid "Bulgarian" +msgstr "বুলগেৰিয়াৰ" + +#: src/text/iso-639_def.h:60 +msgid "Burmese" +msgstr "বাৰ্মাৰ" + +#: src/text/iso-639_def.h:61 +msgid "Catalan" +msgstr "কেটালান" + +#: src/text/iso-639_def.h:62 +msgid "Chamorro" +msgstr "ছামোৰো" + +#: src/text/iso-639_def.h:63 +msgid "Chechen" +msgstr "শ্বেকচেন" + +#: src/text/iso-639_def.h:64 +msgid "Chinese" +msgstr "চীনৰ" + +#: src/text/iso-639_def.h:65 +msgid "Church Slavic" +msgstr "চাৰ্চ শ্লেভিক" + +#: src/text/iso-639_def.h:66 +msgid "Chuvash" +msgstr "শ্বুভাছ" + +#: src/text/iso-639_def.h:67 +msgid "Cornish" +msgstr "কোৰ্নিচ্ছ" + +#: src/text/iso-639_def.h:68 +msgid "Corsican" +msgstr "কোৰ্ছিকান" + +#: src/text/iso-639_def.h:69 +msgid "Czech" +msgstr "শ্বেক" + +#: src/text/iso-639_def.h:70 +msgid "Danish" +msgstr "ডেনিছ" + +#: src/text/iso-639_def.h:71 +msgid "Dutch" +msgstr "ডাচ্ছ" + +#: src/text/iso-639_def.h:72 +msgid "Dzongkha" +msgstr "ডিজোংখা" + +#: src/text/iso-639_def.h:73 +msgid "English" +msgstr "ইংৰাজী" + +#: src/text/iso-639_def.h:74 +msgid "Esperanto" +msgstr "এছপিৰেন্টো" + +#: src/text/iso-639_def.h:75 +msgid "Estonian" +msgstr "এষ্টোনিয়াৰ" + +#: src/text/iso-639_def.h:76 +msgid "Faroese" +msgstr "ফাৰোইজ" + +#: src/text/iso-639_def.h:77 +msgid "Fijian" +msgstr "ফিজিৰ" + +#: src/text/iso-639_def.h:78 +msgid "Finnish" +msgstr "ফিনিছ" + +#: src/text/iso-639_def.h:79 +msgid "French" +msgstr "ফ্ৰেন্স" + +#: src/text/iso-639_def.h:80 +msgid "Frisian" +msgstr "ফ্ৰিছিয়াৰ" + +#: src/text/iso-639_def.h:81 +msgid "Georgian" +msgstr "জৰ্জিয়াৰ" + +#: src/text/iso-639_def.h:82 +msgid "German" +msgstr "জাৰ্মান" + +#: src/text/iso-639_def.h:83 +msgid "Gaelic (Scots)" +msgstr "গায়েলিক (স্কটছ)" + +#: src/text/iso-639_def.h:84 +msgid "Irish" +msgstr "আইৰিছ" + +#: src/text/iso-639_def.h:85 +msgid "Gallegan" +msgstr "গালিয়ান" + +#: src/text/iso-639_def.h:86 +msgid "Manx" +msgstr "মেন্ক্স" + +#: src/text/iso-639_def.h:87 +msgid "Greek, Modern" +msgstr "গ্ৰীক, আধুনিক" + +#: src/text/iso-639_def.h:88 +msgid "Guarani" +msgstr "গুৱাৰানী" + +#: src/text/iso-639_def.h:89 +msgid "Gujarati" +msgstr "গুজৰাটী" + +#: src/text/iso-639_def.h:90 src/text/iso-639_def.h:102 +msgid "Hebrew" +msgstr "হিব্ৰিউ" + +#: src/text/iso-639_def.h:91 +msgid "Herero" +msgstr "হেৰেৰো" + +#: src/text/iso-639_def.h:92 +msgid "Hindi" +msgstr "হিন্দী" + +#: src/text/iso-639_def.h:93 +msgid "Hiri Motu" +msgstr "হিৰি মোটু" + +#: src/text/iso-639_def.h:94 +msgid "Hungarian" +msgstr "হাংগেৰিৰ" + +#: src/text/iso-639_def.h:95 +msgid "Icelandic" +msgstr "আইছলেণ্ডিক" + +#: src/text/iso-639_def.h:96 +msgid "Inuktitut" +msgstr "ইনুকটিটুট" + +#: src/text/iso-639_def.h:97 +msgid "Interlingue" +msgstr "ইন্টাৰলিংগুই" + +#: src/text/iso-639_def.h:98 +msgid "Interlingua" +msgstr "ইন্টাৰলিংগুৱা" + +#: src/text/iso-639_def.h:99 +msgid "Indonesian" +msgstr "ইণ্ডোনেছিয়াৰ" + +#: src/text/iso-639_def.h:100 +msgid "Inupiaq" +msgstr "ইনুপিয়াক" + +#: src/text/iso-639_def.h:101 +msgid "Italian" +msgstr "ইটালীৰ" + +#: src/text/iso-639_def.h:103 +msgid "Javanese" +msgstr "জাভাৰ" + +#: src/text/iso-639_def.h:104 +msgid "Japanese" +msgstr "জাপানৰ" + +#: src/text/iso-639_def.h:105 +msgid "Greenlandic, Kalaallisut" +msgstr "গ্ৰীণলেণ্ডিক, কালাল্লিচুট" + +#: src/text/iso-639_def.h:106 +msgid "Kannada" +msgstr "কানাডা" + +#: src/text/iso-639_def.h:107 +msgid "Kashmiri" +msgstr "কাশ্মিৰী" + +#: src/text/iso-639_def.h:108 +msgid "Kazakh" +msgstr "কাজাখ" + +#: src/text/iso-639_def.h:109 +msgid "Khmer" +msgstr "খমেৰ" + +#: src/text/iso-639_def.h:110 +msgid "Kikuyu" +msgstr "কিকুইউ" + +#: src/text/iso-639_def.h:111 +msgid "Kinyarwanda" +msgstr "কিনিআৰৱাণ্ডা" + +#: src/text/iso-639_def.h:112 +msgid "Kirghiz" +msgstr "কিৰ্ঘিজ" + +#: src/text/iso-639_def.h:113 +msgid "Komi" +msgstr "কোমি" + +#: src/text/iso-639_def.h:114 +msgid "Korean" +msgstr "কোৰিয়াৰ" + +#: src/text/iso-639_def.h:115 +msgid "Kuanyama" +msgstr "কুৱানিআমা" + +#: src/text/iso-639_def.h:116 +msgid "Kurdish" +msgstr "কুৰ্ডিছ" + +#: src/text/iso-639_def.h:117 +msgid "Lao" +msgstr "লাঅ'" + +#: src/text/iso-639_def.h:118 modules/meta_engine/ID3Genres.h:119 +msgid "Latin" +msgstr "লেটিন" + +#: src/text/iso-639_def.h:119 +msgid "Latvian" +msgstr "লাটভিয়াৰ" + +#: src/text/iso-639_def.h:120 +msgid "Lingala" +msgstr "লিংগালা" + +#: src/text/iso-639_def.h:121 +msgid "Lithuanian" +msgstr "লিথুৱানিয়াৰ" + +#: src/text/iso-639_def.h:122 +msgid "Letzeburgesch" +msgstr "লেটজিবাৰ্গেস্ক" + +#: src/text/iso-639_def.h:123 +msgid "Macedonian" +msgstr "মেচিডোনিয়াৰ" + +#: src/text/iso-639_def.h:124 +msgid "Marshall" +msgstr "মাৰ্শ্বাল" + +#: src/text/iso-639_def.h:125 +msgid "Malayalam" +msgstr "মালায়ালম" + +#: src/text/iso-639_def.h:126 +msgid "Maori" +msgstr "মাওৰি" + +#: src/text/iso-639_def.h:127 +msgid "Marathi" +msgstr "মাৰাঠী" + +#: src/text/iso-639_def.h:128 +msgid "Malay" +msgstr "মালায়" + +#: src/text/iso-639_def.h:129 +msgid "Malagasy" +msgstr "মালাগেছি" + +#: src/text/iso-639_def.h:130 +msgid "Maltese" +msgstr "মাল্টেছী" + +#: src/text/iso-639_def.h:131 +msgid "Moldavian" +msgstr "মোল্ডাভিয়াৰ" + +#: src/text/iso-639_def.h:132 +msgid "Mongolian" +msgstr "মংগোলিয়াৰ" + +#: src/text/iso-639_def.h:133 +msgid "Nauru" +msgstr "নাউৰু" + +#: src/text/iso-639_def.h:134 +msgid "Navajo" +msgstr "নাভাজো" + +#: src/text/iso-639_def.h:135 +msgid "Ndebele, South" +msgstr "নডেবেলি, দক্ষিণ" + +#: src/text/iso-639_def.h:136 +msgid "Ndebele, North" +msgstr "নডেবেলি, উত্তৰ" + +#: src/text/iso-639_def.h:137 +msgid "Ndonga" +msgstr "নডোংগা" + +#: src/text/iso-639_def.h:138 +msgid "Nepali" +msgstr "নেপালী" + +#: src/text/iso-639_def.h:139 +msgid "Norwegian" +msgstr "নৰৱেৰ" + +#: src/text/iso-639_def.h:140 +msgid "Norwegian Nynorsk" +msgstr "নৰৱেৰ নাইনোৰ্স্ক" + +#: src/text/iso-639_def.h:141 +msgid "Norwegian Bokmaal" +msgstr "নৰৱেৰ বকমাল" + +#: src/text/iso-639_def.h:142 +msgid "Chichewa; Nyanja" +msgstr "চিচেৱা; নিয়ানজা" + +#: src/text/iso-639_def.h:143 +msgid "Occitan; Provençal" +msgstr "অচিটান; প্ৰোভেনাল" + +#: src/text/iso-639_def.h:144 +msgid "Oriya" +msgstr "উড়িয়া" + +#: src/text/iso-639_def.h:145 +msgid "Oromo" +msgstr "অৰোমো" + +#: src/text/iso-639_def.h:147 +msgid "Ossetian; Ossetic" +msgstr "অচেটিয়ান; অচেটিক" + +#: src/text/iso-639_def.h:148 +msgid "Panjabi" +msgstr "পাঞ্জাৱী" + +#: src/text/iso-639_def.h:149 +msgid "Persian" +msgstr "পাৰ্চীৰ" + +#: src/text/iso-639_def.h:150 +msgid "Pali" +msgstr "পালি" + +#: src/text/iso-639_def.h:151 +msgid "Polish" +msgstr "পোলিচ" + +#: src/text/iso-639_def.h:152 +msgid "Portuguese" +msgstr "পৰ্তুগালৰ" + +#: src/text/iso-639_def.h:153 +msgid "Pushto" +msgstr "পুষ্টো" + +#: src/text/iso-639_def.h:154 +msgid "Quechua" +msgstr "কিউচুআ" + +#: src/text/iso-639_def.h:155 +msgid "Original audio" +msgstr "প্ৰকৃত অডিঅ'" + +#: src/text/iso-639_def.h:156 +msgid "Raeto-Romance" +msgstr "ৰায়েটো-ৰোমাঞ্চ" + +#: src/text/iso-639_def.h:157 +msgid "Romanian" +msgstr "ৰোমানিয়াৰ" + +#: src/text/iso-639_def.h:158 +msgid "Rundi" +msgstr "ৰুণ্ডী" + +#: src/text/iso-639_def.h:159 +msgid "Russian" +msgstr "ৰাছিয়াৰ" + +#: src/text/iso-639_def.h:160 +msgid "Sango" +msgstr "সাংগো" + +#: src/text/iso-639_def.h:161 +msgid "Sanskrit" +msgstr "সংস্কৃত" + +#: src/text/iso-639_def.h:162 +msgid "Serbian" +msgstr "চাৰ্বিয়াৰ" + +#: src/text/iso-639_def.h:163 +msgid "Croatian" +msgstr "ক্ৰোৱেচিয়াৰ" + +#: src/text/iso-639_def.h:164 +msgid "Sinhalese" +msgstr "সিংহলৰ" + +#: src/text/iso-639_def.h:165 +msgid "Slovak" +msgstr "শ্লোভাক" + +#: src/text/iso-639_def.h:166 +msgid "Slovenian" +msgstr "শ্লোভেনিয়াৰ" + +#: src/text/iso-639_def.h:167 +msgid "Northern Sami" +msgstr "নৰ্ডান ছামি" + +#: src/text/iso-639_def.h:168 +msgid "Samoan" +msgstr "ছামোআন" + +#: src/text/iso-639_def.h:169 +msgid "Shona" +msgstr "ছোনা" + +#: src/text/iso-639_def.h:170 +msgid "Sindhi" +msgstr "সিন্ধি" + +#: src/text/iso-639_def.h:171 +msgid "Somali" +msgstr "ছোমালি" + +#: src/text/iso-639_def.h:172 +msgid "Sotho, Southern" +msgstr "চোথো, ছাউথাৰ্ণ" + +#: src/text/iso-639_def.h:173 +msgid "Spanish" +msgstr "স্পেনিছ" + +#: src/text/iso-639_def.h:174 +msgid "Sardinian" +msgstr "ছৰ্দিনিয়াৰ" + +#: src/text/iso-639_def.h:175 +msgid "Swati" +msgstr "স্বাটী" + +#: src/text/iso-639_def.h:176 +msgid "Sundanese" +msgstr "ছুডানৰ" + +#: src/text/iso-639_def.h:177 +msgid "Swahili" +msgstr "স্বাহিলি" + +#: src/text/iso-639_def.h:178 +msgid "Swedish" +msgstr "ছুইডেনৰ" + +#: src/text/iso-639_def.h:179 +msgid "Tahitian" +msgstr "তাহিতিয়াৰ" + +#: src/text/iso-639_def.h:180 +msgid "Tamil" +msgstr "তামিল" + +#: src/text/iso-639_def.h:181 +msgid "Tatar" +msgstr "তাতাৰ" + +#: src/text/iso-639_def.h:182 +msgid "Telugu" +msgstr "তেলেগু" + +#: src/text/iso-639_def.h:183 +msgid "Tajik" +msgstr "তাজিক" + +#: src/text/iso-639_def.h:184 +msgid "Tagalog" +msgstr "টাগালোগ" + +#: src/text/iso-639_def.h:185 +msgid "Thai" +msgstr "থাই" + +#: src/text/iso-639_def.h:186 +msgid "Tibetan" +msgstr "তিব্বতৰ" + +#: src/text/iso-639_def.h:187 +msgid "Tigrinya" +msgstr "তিগ্ৰিনিয়া" + +#: src/text/iso-639_def.h:188 +msgid "Tonga (Tonga Islands)" +msgstr "টংগা (টোংগা দ্বীপবোৰ)" + +#: src/text/iso-639_def.h:189 +msgid "Tswana" +msgstr "টছৱানা" + +#: src/text/iso-639_def.h:190 +msgid "Tsonga" +msgstr "টছোনংগা" + +#: src/text/iso-639_def.h:191 +msgid "Turkish" +msgstr "তুৰ্কিছ" + +#: src/text/iso-639_def.h:192 +msgid "Turkmen" +msgstr "তুৰ্কমেন" + +#: src/text/iso-639_def.h:193 +msgid "Twi" +msgstr "টৱি" + +#: src/text/iso-639_def.h:194 +msgid "Uighur" +msgstr "উইঘুৰ" + +#: src/text/iso-639_def.h:195 +msgid "Ukrainian" +msgstr "ইউক্ৰেইনৰ" + +#: src/text/iso-639_def.h:196 +msgid "Urdu" +msgstr "উৰ্দু" + +#: src/text/iso-639_def.h:197 +msgid "Uzbek" +msgstr "উজবেক" + +#: src/text/iso-639_def.h:198 +msgid "Vietnamese" +msgstr "ভিয়েটনামৰ" + +#: src/text/iso-639_def.h:199 +msgid "Volapuk" +msgstr "ভোলাপুক" + +#: src/text/iso-639_def.h:200 +msgid "Welsh" +msgstr "ৱেলছ" + +#: src/text/iso-639_def.h:201 +msgid "Wolof" +msgstr "ৱোলোফ" + +#: src/text/iso-639_def.h:202 +msgid "Xhosa" +msgstr "এক্সহোছা" + +#: src/text/iso-639_def.h:203 +msgid "Yiddish" +msgstr "ইদ্দিছ" + +#: src/text/iso-639_def.h:204 +msgid "Yoruba" +msgstr "ইয়োৰুবা" + +#: src/text/iso-639_def.h:205 +msgid "Zhuang" +msgstr "জেডহুংগা" + +#: src/text/iso-639_def.h:206 +msgid "Zulu" +msgstr "জুলু" + +#: src/video_output/vout_intf.c:169 +msgid "Autoscale video" +msgstr "স্বয়ংক্ৰিয়ভাৱে জোখা ভিডিঅ'" + +#: src/video_output/vout_intf.c:203 modules/gui/macosx/VLCMainMenu.m:439 +#: modules/gui/macosx/VLCMainMenu.m:440 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:193 +#: modules/video_filter/croppadd.c:87 modules/gui/qt/ui/video_effects.h:1275 +msgid "Crop" +msgstr "ক্ৰোপ" + +#: src/video_output/vout_intf.c:230 modules/access/decklink.cpp:97 +#: modules/access/linsys/linsys_hdsdi.c:78 +#: modules/access/linsys/linsys_sdi.c:74 modules/demux/rawvid.c:58 +#: modules/gui/macosx/VLCMainMenu.m:437 modules/gui/macosx/VLCMainMenu.m:438 +#: modules/gui/macosx/VLCMainMenu.m:1458 +msgid "Aspect ratio" +msgstr "দৃষ্টিভংগীৰ অনুপাত" + +#: modules/access/alsa.c:36 +msgid "" +"Pass alsa:// to open the default ALSA capture device, or alsa://SOURCE to " +"open a specific device named SOURCE." +msgstr "" +"পাছ আলছা:// ডিফল্ট ALSA অধিগ্ৰহণ ডিভাইচটো খুলিবলৈ, বা আলছা://SOURCE নিৰ্ধাৰিত " +"এটা বিশেষ ডিভাইচ খুলিবলৈ SOURCE." + +#: modules/access/alsa.c:49 +msgid "192000 Hz" +msgstr "192000 Hz" + +#: modules/access/alsa.c:49 +msgid "176400 Hz" +msgstr "176400 Hz" + +#: modules/access/alsa.c:50 +msgid "96000 Hz" +msgstr "96000 Hz" + +#: modules/access/alsa.c:50 +msgid "88200 Hz" +msgstr "88200 Hz" + +#: modules/access/alsa.c:50 +msgid "48000 Hz" +msgstr "48000 Hz" + +#: modules/access/alsa.c:50 +msgid "44100 Hz" +msgstr "44100 Hz" + +#: modules/access/alsa.c:51 +msgid "32000 Hz" +msgstr "32000 Hz" + +#: modules/access/alsa.c:51 +msgid "22050 Hz" +msgstr "22050 Hz" + +#: modules/access/alsa.c:51 +msgid "24000 Hz" +msgstr "24000 Hz" + +#: modules/access/alsa.c:51 +msgid "16000 Hz" +msgstr "16000 Hz" + +#: modules/access/alsa.c:52 +msgid "11025 Hz" +msgstr "11025 Hz" + +#: modules/access/alsa.c:52 +msgid "8000 Hz" +msgstr "8000 Hz" + +#: modules/access/alsa.c:52 +msgid "4000 Hz" +msgstr "4000 Hz" + +#: modules/access/alsa.c:56 +msgid "ALSA" +msgstr "ALSA" + +#: modules/access/alsa.c:57 +msgid "ALSA audio capture" +msgstr "ALSA অডিঅ' অধিগ্ৰহণ" + +#: modules/access/attachment.c:44 +msgid "Attachment" +msgstr "সংলগ্নকৰণ" + +#: modules/access/attachment.c:45 +msgid "Attachment input" +msgstr "সংলগ্নকৰণ ইনপুট" + +#: modules/access/avaudiocapture.m:212 +msgid "No Audio Input device found" +msgstr "" + +#: modules/access/avaudiocapture.m:213 +msgid "" +"Your Mac does not seem to be equipped with a suitable audio input device." +"Please check your connectors and drivers." +msgstr "" + +#: modules/access/avaudiocapture.m:236 modules/access/avcapture.m:434 +#: modules/access/disc_helper.h:56 +msgid "Problem accessing a system resource" +msgstr "" + +#: modules/access/avaudiocapture.m:237 +msgid "" +"Please open \"System Preferences\" -> \"Security & Privacy\" and allow VLC " +"to access your microphone." +msgstr "" + +#: modules/access/avaudiocapture.m:341 +msgid "AVFoundation Audio Capture" +msgstr "" + +#: modules/access/avaudiocapture.m:342 +msgid "AVFoundation audio capture module." +msgstr "" + +#: modules/access/avcapture.m:66 +msgid "AVFoundation Video Capture" +msgstr "" + +#: modules/access/avcapture.m:67 +msgid "AVFoundation video capture module." +msgstr "" + +#: modules/access/avcapture.m:376 modules/access/avcapture.m:406 +msgid "No video devices found" +msgstr "" + +#: modules/access/avcapture.m:377 +msgid "" +"Your Mac does not seem to be equipped with a suitable video input device. " +"Please check your connectors and drivers." +msgstr "" + +#: modules/access/avcapture.m:407 +msgid "" +"Your Mac does not seem to be equipped with a suitable input device. Please " +"check your connectors and drivers." +msgstr "" +"উপযুক্ত ইনপুট ডিভাইচ এটাৰ সৈতে সুসজ্জিত হিচাপে আপোনাৰ মেকটো দেখা পোৱা নাযায়. " +"অনুগ্ৰহ কৰি আপোনাৰ সংযোগকৰ্তা আৰু ড্ৰাইভাৰবোৰ পৰীক্ষা কৰক." + +#: modules/access/avcapture.m:435 +msgid "" +"Please open \"System Preferences\" -> \"Security & Privacy\" and allow VLC " +"to access your camera." +msgstr "" + +#: modules/access/avio.h:33 +msgid "AVIO" +msgstr "AVIO" + +#: modules/access/avio.h:34 +msgid "libavformat AVIO access" +msgstr "libavফৰমেট AVIO প্ৰৱেশ" + +#: modules/access/avio.h:44 +msgid "libavformat AVIO access output" +msgstr "libavফৰমেট AVIO প্ৰৱেশ আউটপুট" + +#: modules/access/bluray.c:72 +msgid "Blu-ray menus" +msgstr "ব্লু-ৰে তালিকাবোৰ" + +#: modules/access/bluray.c:73 +msgid "Use Blu-ray menus. If disabled, the movie will start directly" +msgstr "" +"ব্লু-ৰে তালিকাবোৰ ব্যৱহাৰ কৰক. যদি অক্ষম কৰে, তেন্তে চলচিত্ৰ প্ৰত্যক্ষভাৱে আৰম্ভ হব" + +#: modules/access/bluray.c:75 +msgid "Region code" +msgstr "অঞ্চলৰ কোড" + +#: modules/access/bluray.c:76 +msgid "" +"Blu-Ray player region code. Some discs can be played only with a correct " +"region code." +msgstr "" +"ব্লু-ৰে প্লেয়াৰৰ অঞ্চলৰ কোড. কিছুমান ডিস্ক কেৱল এটা শুদ্ধ অঞ্চলৰ কোড এটাৰ সৈতে চলাব " +"পাৰি." + +#: modules/access/bluray.c:103 modules/services_discovery/udev.c:603 +#: modules/gui/qt/ui/open_disk.h:296 +msgid "Blu-ray" +msgstr "ব্লু-ৰে " + +#: modules/access/bluray.c:104 +msgid "Blu-ray Disc support (libbluray)" +msgstr "ব্লু-ৰে ডিস্ক সমৰ্থন (লাইব্ৰেৰী ব্লু-ৰে)" + +#: modules/access/bluray.c:847 +msgid "Path doesn't appear to be a Blu-ray" +msgstr "এটা ব্লু-ৰে হিচাপে পথটো দৃষ্টিগোচৰ নহয়" + +#: modules/access/bluray.c:862 +msgid "" +"This Blu-ray Disc needs a library for AACS decoding, and your system does " +"not have it." +msgstr "" +"AACS ডিকোডিংৰ বাবে এই ব্লু-ৰে ডিস্কটোৱে লাইব্ৰেৰী এটা দাবী কৰে, আৰু আপোনাৰ " +"ছিষ্টেমৰ এইটো নাই." + +#: modules/access/bluray.c:868 +msgid "Blu-ray Disc is corrupted." +msgstr "ব্লু-ৰে ডিস্ক নষ্ট হৈছে." + +#: modules/access/bluray.c:870 +msgid "Missing AACS configuration file!" +msgstr "AACS ৰূপৰেখা ফাইল হেৰাইছে!" + +#: modules/access/bluray.c:872 +msgid "No valid processing key found in AACS config file." +msgstr "AACS ৰূপৰেখা ফাইলত কোনো বৈধ প্ৰক্ৰিয়া কৰা কী বিচাৰি পোৱা নগল." + +#: modules/access/bluray.c:874 +msgid "No valid host certificate found in AACS config file." +msgstr "AACS ৰূপৰেখা ফাইলত কোনো বৈধ হষ্ট প্ৰমাণপত্ৰ বিচাৰি পোৱা নগল." + +#: modules/access/bluray.c:876 +msgid "AACS Host certificate revoked." +msgstr "AACS হষ্ট প্ৰমাণপত্ৰ বাতিল কৰা হল." + +#: modules/access/bluray.c:878 +msgid "AACS MMC failed." +msgstr "AACS MMC ব্যৰ্থ হল." + +#: modules/access/bluray.c:888 +msgid "" +"This Blu-ray Disc needs a library for BD+ decoding, and your system does not " +"have it." +msgstr "" +"BD+ ডিকোডিংৰ বাবে এই ব্ল-ৰে ডিস্কটোৱে লাইব্ৰেৰী এটা বিচাৰে, আৰু আপোনাৰ ছিষ্টেমৰ " +"এইটো নাই." + +#: modules/access/bluray.c:891 +msgid "Your system BD+ decoding library does not work. Missing configuration?" +msgstr "আপোনাৰ ছিষ্টেম BD+ ডিকোডিং লাইব্ৰেৰীটোৱে কাৰ্য নকৰে. ৰূপৰেখা হেৰাইছে নেকি?" + +#: modules/access/bluray.c:924 +msgid "Java required" +msgstr "" + +#: modules/access/bluray.c:925 +#, c-format +msgid "" +"This Blu-ray disc requires Java for menus support.%s\n" +"The disc will be played without menus." +msgstr "" + +#: modules/access/bluray.c:926 +msgid "Java was not found on your system." +msgstr "" + +#: modules/access/bluray.c:949 +msgid "Failed to start bluray playback. Please try without menu support." +msgstr "" +"ব্লু-ৰে প্লেবেক আৰম্ভ কৰিবলৈ ব্যৰ্থ হল. অনুগ্ৰহ কৰি তালিকা সমৰ্থন অবিহনে চেষ্টাক কৰক." + +#: modules/access/bluray.c:990 modules/access/bluray.c:2823 +#: modules/access/bluray.c:2828 +msgid "Blu-ray error" +msgstr "ব্লু-ৰে ভুল" + +#: modules/access/bluray.c:2113 +msgid "Top Menu" +msgstr "ওপৰৰ মেনু" + +#: modules/access/bluray.c:2116 +msgid "First Play" +msgstr "প্ৰথমে চলোৱা" + +#: modules/access/cdda.c:716 +#, c-format +msgid "Audio CD - Track %02i" +msgstr "অডিঅ' CD - পথ %02i" + +#: modules/access/cdda.c:1003 modules/gui/macosx/VLCOpenWindowController.m:169 +#: modules/gui/qt/ui/open_disk.h:297 +msgid "Audio CD" +msgstr "অডিঅ' CD" + +#: modules/access/cdda.c:1004 +msgid "Audio CD input" +msgstr "অডিঅ' CD ইনপুট" + +#: modules/access/cdda.c:1013 +msgid "[cdda:][device][@[track]]" +msgstr "[cdda:][ডিভাইছ][@[পথ]]" + +#: modules/access/cdda.c:1022 +msgid "Musicbrainz Server" +msgstr "" + +#: modules/access/cdda.c:1023 +msgid "Address of the musicbrainz server to use." +msgstr "" + +#: modules/access/cdda.c:1025 +msgid "CDDB Server" +msgstr "CDDB ছাৰ্ভাৰ" + +#: modules/access/cdda.c:1026 +msgid "Address of the CDDB server to use." +msgstr "ব্যৱহাৰ কৰিবলৈ CDDB ছাৰ্ভাৰটোৰ ঠিকনা." + +#: modules/access/cdda.c:1027 +msgid "CDDB port" +msgstr "CDDB পোৰ্ট" + +#: modules/access/cdda.c:1028 +msgid "CDDB Server port to use." +msgstr "ব্যৱহাৰ কৰিবলৈ CDDB ছাৰ্ভাৰ পোৰ্ট." + +#: modules/access/concat.c:303 +msgid "Inputs list" +msgstr "" + +#: modules/access/concat.c:305 +msgid "Comma-separated list of input URLs to concatenate." +msgstr "" + +#: modules/access/concat.c:308 +msgid "Concatenation" +msgstr "" + +#: modules/access/concat.c:309 +msgid "Concatenated inputs" +msgstr "" + +#: modules/access/dc1394.c:51 +msgid "DC1394" +msgstr "DC1394" + +#: modules/access/dc1394.c:52 +msgid "IIDC Digital Camera (FireWire) input" +msgstr "IIDC ডিজিটেল কেমেৰা (ফায়াৰ ৱেৰ) ইনপুট" + +#: modules/access/dcp/dcp.cpp:43 +msgid "KDM file" +msgstr "" + +#: modules/access/dcp/dcp.cpp:44 +msgid "Path to Key Delivery Message XML file" +msgstr "" + +#: modules/access/dcp/dcp.cpp:77 +msgid "DCP" +msgstr "DCP" + +#: modules/access/dcp/dcp.cpp:79 +msgid "Digital Cinema Package module" +msgstr "ডিজিটেল চিনেমা পেকেজ মডুল" + +#: modules/access/decklink.cpp:49 +msgid "Input card to use" +msgstr "ব্যৱহাৰ কৰিবলৈ ইনপুট কাৰ্ড" + +#: modules/access/decklink.cpp:51 +msgid "" +"DeckLink capture card to use, if multiple exist. The cards are numbered from " +"0." +msgstr "" +"ব্যৱহাৰ কৰিবলৈ ডেকসংযোগ অধিগ্ৰহণ কাৰ্ড, যদি বিভিন্ন বৰ্তি থাকে. কাৰ্ডবোৰ 0 ৰ পৰা " +"সংখ্যা কৰা হয়." + +#: modules/access/decklink.cpp:54 +msgid "Desired input video mode. Leave empty for autodetection." +msgstr "বিচৰা ইনপুট ভিডিঅ'ৰ ধৰণ. স্বয়ংক্ৰিয়ভাৱে চিনাক্তকৰণৰ বাবে খালী এৰক." + +#: modules/access/decklink.cpp:56 +msgid "" +"Desired input video mode for DeckLink captures. This value should be a " +"FOURCC code in textual form, e.g. \"ntsc\"." +msgstr "" +"ডেকসংযোগ অধিগ্ৰহণবোৰৰ বাবে বিচৰা ইনপুট ভিডিঅ' ধৰণ. টেক্সটৰ ধৰণত এই মানটো FOURCC " +"কোড এটা হোৱা উচিত, উদাহৰণস্বৰূপে \"ntsc\"." + +#: modules/access/decklink.cpp:60 modules/video_output/decklink.cpp:100 +msgid "Audio connection" +msgstr "অডিঅ' সংযোগ" + +#: modules/access/decklink.cpp:62 +msgid "" +"Audio connection to use for DeckLink captures. Valid choices: embedded, " +"aesebu, analog. Leave blank for card default." +msgstr "" +"ডেকসংযোগ অধিগ্ৰহণবোৰৰ বাবে ব্যৱহাৰ কৰিবলৈ অডিঅ' সংযোগ. বৈধ পছন্দবোৰ: সংলগ্ন কৰা, " +"aesebu, এনালগ. কাৰ্ড ডিফল্টৰ বাবে খালী এৰক." + +#: modules/access/decklink.cpp:66 modules/demux/rawaud.c:43 +#: modules/video_output/decklink.cpp:105 +msgid "Audio samplerate (Hz)" +msgstr "অডিঅ' নমুনাৰ হাৰ (Hz)" + +#: modules/access/decklink.cpp:68 +msgid "" +"Audio sampling rate (in hertz) for DeckLink captures. 0 disables audio input." +msgstr "" +"ডেকসংযোগ অধিগ্ৰহণবোৰৰ বাবে অডিঅ' নমুনা কৰাৰ হাৰ (হাৰ্টজত). 0 য়ে অডিঅ' ইনপুট অক্ষম " +"কৰে." + +#: modules/access/decklink.cpp:71 modules/access/dshow/dshow.cpp:197 +#: modules/video_output/decklink.cpp:110 +msgid "Number of audio channels" +msgstr "অডিঅ' চেনেলবোৰৰ সংখ্যা" + +#: modules/access/decklink.cpp:73 +msgid "" +"Number of input audio channels for DeckLink captures. Must be 2, 8 or 16. 0 " +"disables audio input." +msgstr "" +"ডেকসংযোগ অধিগ্ৰহণবোৰৰ বাবে ইনপুট অডিঅ' চেনেলবোৰৰ সংখ্যা. 2, 8 বা 16 হোৱাটো " +"অপৰিহাৰ্য. 0 য়ে অডিঅ' ইনপুট অক্ষম কৰে." + +#: modules/access/decklink.cpp:76 modules/video_output/decklink.cpp:115 +msgid "Video connection" +msgstr "ভিডিঅ' সংযোগ" + +#: modules/access/decklink.cpp:78 +msgid "" +"Video connection to use for DeckLink captures. Valid choices: sdi, hdmi, " +"opticalsdi, component, composite, svideo. Leave blank for card default." +msgstr "" +"ডেকসংযোগ অধিগ্ৰহণবোৰৰ বাবে ব্যৱহাৰ কৰিবলৈ ভিডিঅ' সংযোগ. বৈধ পছন্দবোৰ: sdi, " +"hdmi, অপ্টিকেলsdi, উপাদান, যৌথ, sভিডিঅ'. কাৰ্ডৰ ডিফল্টৰ বাবে খালী এৰক." + +#: modules/access/decklink.cpp:87 modules/access/linsys/linsys_sdi.c:94 +msgid "SDI" +msgstr "SDI" + +#: modules/access/decklink.cpp:87 +msgid "HDMI" +msgstr "HDMI" + +#: modules/access/decklink.cpp:87 +msgid "Optical SDI" +msgstr "অপ্টিকেল SDI" + +#: modules/access/decklink.cpp:87 +msgid "Component" +msgstr "উপাদান" + +#: modules/access/decklink.cpp:87 +msgid "Composite" +msgstr "মিশ্ৰিত" + +#: modules/access/decklink.cpp:87 +msgid "S-Video" +msgstr "" + +#: modules/access/decklink.cpp:94 +msgid "Embedded" +msgstr "সংলগ্ন কৰা হল" + +#: modules/access/decklink.cpp:94 +msgid "AES/EBU" +msgstr "AES/EBU" + +#: modules/access/decklink.cpp:94 +msgid "Analog" +msgstr "এনালগ" + +#: modules/access/decklink.cpp:99 modules/demux/rawvid.c:60 +msgid "Aspect ratio (4:3, 16:9). Default assumes square pixels." +msgstr "দৃষ্টিকোণ অনুপাত (4:3, 16:9). ডিফল্টে বৰ্গ পিক্সেলবোৰ অনুমান কৰে." + +#: modules/access/decklink.cpp:102 +msgid "DeckLink" +msgstr "ডেকসংযোগ" + +#: modules/access/decklink.cpp:103 +msgid "Blackmagic DeckLink SDI input" +msgstr "ব্লেকমেজিক ডেকসংযোগ SDI ইনপুট" + +#: modules/access/decklink.cpp:123 modules/video_output/decklink.cpp:119 +msgid "10 bits" +msgstr "10 বিট" + +#: modules/access/decklink.cpp:358 modules/demux/ty.c:783 +msgid "Closed captions 1" +msgstr "কেপশ্বনবোৰ 1 বন্ধ কৰা হল" + +#: modules/access/disc_helper.h:57 +msgid "" +"Potentially, macOS blocks access to your disc. Please open \"System " +"Preferences\" -> \"Security & Privacy\" and allow VLC to access your " +"external media in \"Files and Folders\" section." +msgstr "" + +#: modules/access/dshow/dshow.cpp:92 +msgid "Cable" +msgstr "তাৰ" + +#: modules/access/dshow/dshow.cpp:92 +msgid "Antenna" +msgstr "এন্টেনা" + +#: modules/access/dshow/dshow.cpp:100 +msgid "TV" +msgstr "TV" + +#: modules/access/dshow/dshow.cpp:101 +msgid "FM radio" +msgstr "FM ৰেডিঅ'" + +#: modules/access/dshow/dshow.cpp:102 +msgid "AM radio" +msgstr "AM ৰেডিঅ'" + +#: modules/access/dshow/dshow.cpp:103 +msgid "DSS" +msgstr "DSS" + +#: modules/access/dshow/dshow.cpp:130 +#: modules/gui/qt/components/open_panels.cpp:818 +msgid "Video device name" +msgstr "ভিডিঅ' ডিভাইচৰ নাম" + +#: modules/access/dshow/dshow.cpp:132 +msgid "" +"Name of the video device that will be used by the DirectShow plugin. If you " +"don't specify anything, the default device will be used." +msgstr "" +"প্ৰত্যক্ষভাৱে দেখুওৱা প্লাগইনটোৰ দ্বাৰা ব্যৱহাৰ কৰা ভিডঅ' ডিভাইচটোৰ নাম. যদি আপুনি " +"একো নিৰ্ধাৰণ নকৰে, তেন্তে ডিফল্ট ডিভাইচটো ব্যৱহাৰ কৰা হব." + +#: modules/access/dshow/dshow.cpp:135 +#: modules/gui/qt/components/open_panels.cpp:826 +#: modules/gui/qt/components/open_panels.cpp:1047 +msgid "Audio device name" +msgstr "অডিঅ' ডিভাইচৰ নাম" + +#: modules/access/dshow/dshow.cpp:137 +msgid "" +"Name of the audio device that will be used by the DirectShow plugin. If you " +"don't specify anything, the default device will be used." +msgstr "" + +#: modules/access/dshow/dshow.cpp:140 +#: modules/gui/qt/components/open_panels.cpp:793 +msgid "Video size" +msgstr "ভিডিঅ'ৰ আকাৰ" + +#: modules/access/dshow/dshow.cpp:142 +msgid "" +"Size of the video that will be displayed by the DirectShow plugin. If you " +"don't specify anything the default size for your device will be used. You " +"can specify a standard size (cif, d1, ...) or x." +msgstr "" +"প্ৰত্যক্ষভাৱে দেখুওৱা প্লাগইনটোৰ দ্বাৰা প্ৰদৰ্শন কৰিবলগীয়া ভিডিঅ'টোৰ আকাৰ. যদি আপুনি " +"একো নিৰ্ধাৰণ নকৰে, তেন্তে আপোনাৰ ডিভাইচৰ ডিফল্ট আকাৰটো ব্যৱহাৰ কৰা হব. আপুনি " +"মানবিশিষ্ট আকাৰ এটা নিৰ্দিষ্ট কৰিব পাৰে (cif, d1, ...) বা x. " + +#: modules/access/dshow/dshow.cpp:145 modules/access/v4l2/v4l2.c:196 +msgid "Picture aspect-ratio n:m" +msgstr "ছবি দৃষ্টিকোণ-অনুপাত n:m" + +#: modules/access/dshow/dshow.cpp:146 modules/access/v4l2/v4l2.c:197 +msgid "Define input picture aspect-ratio to use. Default is 4:3" +msgstr "ব্যৱহাৰ কৰিবলৈ ইনপুট ছবি দৃষ্টিকোণ-অনুপাত বাখ্যা কৰক. ডিফল্টটো হল 4:3" + +#: modules/access/dshow/dshow.cpp:147 modules/access/v4l2/v4l2.c:53 +msgid "Video input chroma format" +msgstr "ভিডিঅ' ইনপুট ক্ৰোমা ফৰমেট" + +#: modules/access/dshow/dshow.cpp:149 +msgid "" +"Force the DirectShow video input to use a specific chroma format (eg. I420 " +"(default), RV24, etc.)" +msgstr "" +"এটা বিশেষ ক্ৰোমা ফৰমেট ব্যৱহাৰ কৰিবলৈ প্ৰত্যক্ষভাৱে দেখুওৱা ভিডিঅ' ইনপুটটো জোৰ কৰক " +"(উদাহৰণ I420 (ডিফল্ট), RV24, ইত্যাদি.)" + +#: modules/access/dshow/dshow.cpp:151 +msgid "Video input frame rate" +msgstr "ভিডিঅ' ইনপুট ফ্ৰেমৰ হাৰ" + +#: modules/access/dshow/dshow.cpp:153 +msgid "" +"Force the DirectShow video input to use a specific frame rate (eg. 0 means " +"default, 25, 29.97, 50, 59.94, etc.)" +msgstr "" +"এটা বিশেষ ফ্ৰেমৰ হাৰ ব্যৱহাৰ কৰিবলৈ প্ৰত্যক্ষভাৱে দেখুওৱা ভিডিঅ' ইনপুটটো জোৰ কৰক " +"(উদাহৰণ 0 মানে ডিফল্ট, 25, 29.97, 50, 59.94, ইত্যাদি.)" + +#: modules/access/dshow/dshow.cpp:155 +msgid "Device properties" +msgstr "ডিভাইচৰ বৈশিষ্ট্যবোৰ" + +#: modules/access/dshow/dshow.cpp:157 +msgid "" +"Show the properties dialog of the selected device before starting the stream." +msgstr "ষ্ট্ৰিমটো আৰম্ভ কৰাৰ আগতে নিৰ্বাচিত সংলাপটোৰ বৈশিষ্ট্যবোৰৰ সংলাপটো দেখুৱাওক." + +#: modules/access/dshow/dshow.cpp:159 +msgid "Tuner properties" +msgstr "টিউনাৰৰ বৈশিষ্ট্যবোৰ" + +#: modules/access/dshow/dshow.cpp:161 +msgid "Show the tuner properties [channel selection] page." +msgstr "টিউনাৰ সম্পত্তিবোৰৰ [চেনেল নিৰ্বাচন] পৃষ্ঠা দেখুৱাওক." + +#: modules/access/dshow/dshow.cpp:162 +msgid "Tuner TV Channel" +msgstr "টিউনাৰ TV চেনেল" + +#: modules/access/dshow/dshow.cpp:164 +msgid "Set the TV channel the tuner will set to (0 means default)." +msgstr "TV চেনেলটো ছেট কৰক, টিউনাৰটো ...লৈ ছেট কৰা হব (0 মানে ডিফল্ট)." + +#: modules/access/dshow/dshow.cpp:166 +msgid "Tuner Frequency" +msgstr "টিউনাৰ কম্পনাংক" + +#: modules/access/dshow/dshow.cpp:167 +msgid "This overrides the channel. Measured in Hz." +msgstr "এইটোৱে চেনেলটো অভাৰৰাইড কৰে. Hz ত জোখা হয়." + +#: modules/access/dshow/dshow.cpp:168 +#: modules/gui/qt/components/open_panels.cpp:846 +#: modules/gui/qt/components/open_panels.cpp:1067 +msgid "Video standard" +msgstr "ভিডিঅ'ৰ মানদণ্ড" + +#: modules/access/dshow/dshow.cpp:169 +msgid "Tuner country code" +msgstr "টিউনাৰৰ দেশীয় কোড" + +#: modules/access/dshow/dshow.cpp:171 +msgid "" +"Set the tuner country code that establishes the current channel-to-frequency " +"mapping (0 means default)." +msgstr "" +"টিউনাৰ দেশীয় কোডটো ছেট কৰক যিয়ে চলিত চেনেল-লৈ-কম্পনাংকটো মেপ কৰাটো প্ৰতিষ্ঠা " +"কৰে (0 মানে ডিফল্ট)." + +#: modules/access/dshow/dshow.cpp:173 +msgid "Tuner input type" +msgstr "টিউনাৰৰ ইনপুট প্ৰকাৰ" + +#: modules/access/dshow/dshow.cpp:175 +msgid "Select the tuner input type (Cable/Antenna)." +msgstr "টিউনাৰ ইনপুট প্ৰকাৰটো নিৰ্বাচন কৰক (কেবল/এন্টেনা)." + +#: modules/access/dshow/dshow.cpp:176 +msgid "Video input pin" +msgstr "ভিডিঅ' ইনপুট পিন" + +#: modules/access/dshow/dshow.cpp:178 +msgid "" +"Select the video input source, such as composite, s-video, or tuner. Since " +"these settings are hardware-specific, you should find good settings in the " +"\"Device config\" area, and use those numbers here. -1 means that settings " +"will not be changed." +msgstr "" +"মিশ্ৰিত, s-ভিডিঅ', বা টিউনাৰৰ দৰে ভিডিঅ' ইনপুটটো নিৰ্বাচন কৰক. যিহেতু এই " +"ছেটিংবোৰ হাৰ্ডৱেৰ-নিৰ্দিষ্ট, আপুনি ভাল ছেটিংবোৰ \"Device config\" অঞ্চলত বিচাৰি " +"পোৱা উচিত, আৰু সেই সংখ্যাবোৰ ইয়াত ব্যৱহাৰ কৰক. -1 য়ে বুজায় যে ছেটিংবোৰ সলনি কৰা " +"নহব." + +#: modules/access/dshow/dshow.cpp:182 +msgid "Audio input pin" +msgstr "অডিঅ' ইনপুট পিন" + +#: modules/access/dshow/dshow.cpp:184 +msgid "Select the audio input source. See the \"video input\" option." +msgstr "অডিঅ' ইনপুট উত্সটো নিৰ্বাচন কৰক. \"video input\" বিকল্পটো চাওক." + +#: modules/access/dshow/dshow.cpp:185 +msgid "Video output pin" +msgstr "ভিডিঅ' ইনপুট পিন" + +#: modules/access/dshow/dshow.cpp:187 +msgid "Select the video output type. See the \"video input\" option." +msgstr "ভিডিঅ' আউটপুট উত্সটো নিৰ্বাচন কৰক. \"video input\" বিকল্পটো চাওক." + +#: modules/access/dshow/dshow.cpp:188 +msgid "Audio output pin" +msgstr "অডিঅ' আউটপুট পিন" + +#: modules/access/dshow/dshow.cpp:190 +msgid "Select the audio output type. See the \"video input\" option." +msgstr "অডিঅ' আউটপুট উত্সটো নিৰ্বাচন কৰক. \"video input\" বিকল্পটো চাওক." + +#: modules/access/dshow/dshow.cpp:192 +msgid "AM Tuner mode" +msgstr "AM টিউনাৰ ধৰণ" + +#: modules/access/dshow/dshow.cpp:194 +msgid "" +"AM Tuner mode. Can be one of Default (0), TV (1), AM Radio (2), FM Radio (3) " +"or DSS (4)." +msgstr "" + +#: modules/access/dshow/dshow.cpp:199 +msgid "" +"Select audio input format with the given number of audio channels (if non 0)" +msgstr "" +"উল্লেখিত সংখ্যক অডিঅ' চেনেলবোৰৰ সৈতে অডিঅ' ইনপুট ফৰমেট নিৰ্বাচন কৰক (যদি 0 নহয়)" + +#: modules/access/dshow/dshow.cpp:201 +#: modules/stream_out/transcode/transcode.c:94 +#: share/lua/http/dialogs/create_stream.html:281 +msgid "Audio sample rate" +msgstr "অডিঅ' নমুনাৰ হাৰ" + +#: modules/access/dshow/dshow.cpp:203 +msgid "Select audio input format with the given sample rate (if non 0)" +msgstr "উল্লেখিত নমুনাৰ হাৰটোৰ সৈতে অডিঅ' ইনপুট ফৰমেট নিৰ্বাচন কৰক (যদি 0 নহয়)" + +#: modules/access/dshow/dshow.cpp:205 +msgid "Audio bits per sample" +msgstr "নমুনাই প্ৰতি অডিঅ' বিট " + +#: modules/access/dshow/dshow.cpp:207 +msgid "Select audio input format with the given bits/sample (if non 0)" +msgstr "উল্লেখিত বিট/নমুনাৰ সৈতে অডিঅ' ইনপুট ফৰমেট নিৰ্বাচন কৰক (যদি 0 নহয়)" + +#: modules/access/dshow/dshow.cpp:219 +msgid "DirectShow" +msgstr "প্ৰত্যক্ষভাৱে দেখুৱাওক" + +#: modules/access/dshow/dshow.cpp:220 modules/access/dshow/dshow.cpp:298 +msgid "DirectShow input" +msgstr "প্ৰত্যক্ষভাৱে দেখুওৱা ইনপুট" + +#: modules/access/dshow/dshow.cpp:516 modules/access/dshow/dshow.cpp:590 +#: modules/access/dshow/dshow.cpp:1054 modules/access/dshow/dshow.cpp:1125 +msgid "Capture failed" +msgstr "অধিগ্ৰহণ ব্যৰ্থ হল" + +#: modules/access/dshow/dshow.cpp:517 +msgid "No video or audio device selected." +msgstr "কোনো ভিডিঅ' বা অডিঅ' ডিভাইচ নিৰ্বাচিত কৰা নহল." + +#: modules/access/dshow/dshow.cpp:591 +msgid "VLC cannot open ANY capture device. Check the error log for details." +msgstr "" +"VLC য়ে কোনো অধিগ্ৰহণৰ ডিভাইচ খুলিব নোৱাৰে. পূংখানুপূংখ বিৱৰণৰ বাবে ভুল ল'গটো " +"পৰীক্ষা কৰক." + +#: modules/access/dshow/dshow.cpp:1055 +msgid "" +"The device you selected cannot be used, because its type is not supported." +msgstr "" +"আপুনি নিৰ্বাচন কৰা ডিভাইচটো ব্যৱহাৰ নকৰিব পাৰে, কাৰণ ইয়াৰ প্ৰকাৰটো সমৰ্থন নকৰে." + +#: modules/access/dshow/dshow.cpp:1126 +#, c-format +msgid "The capture device \"%s\" does not support the required parameters." +msgstr "\"%s\" অধিগ্ৰহণ ডিভাইচটোৱে দাবী কৰা পেৰামিটাৰবোৰ সমৰ্থন নকৰে." + +#: modules/access/dsm/access.c:72 modules/access/dsm/sd.c:138 +msgid "Windows networks" +msgstr "" + +#: modules/access/dsm/access.c:74 +msgid "libdsm's SMB (Windows network shares) input and browser" +msgstr "" + +#: modules/access/dsm/access.c:78 +msgid "libdsm SMB input" +msgstr "" + +#: modules/access/dsm/access.c:98 +msgid "libdsm NETBIOS discovery module" +msgstr "" + +#: modules/access/dtv/access.c:43 +msgid "DVB adapter" +msgstr "DVB এডাপ্টাৰ" + +#: modules/access/dtv/access.c:45 +msgid "" +"If there is more than one digital broadcasting adapter, the adapter number " +"must be selected. Numbering starts from zero." +msgstr "" +"যদি এটাতকৈ অধিক ডিজিটেল প্ৰচাৰৰ এডাপ্টাৰ আছে, তেন্তে এডাপ্টাৰ সংখ্যাটো নিৰ্বাচিত " +"কৰাটো অপৰিহাৰ্য. সংখ্যাটো শূন্যৰ পৰা আৰম্ভ হয়." + +#: modules/access/dtv/access.c:48 +msgid "DVB device" +msgstr "DVB ডিভাইচ" + +#: modules/access/dtv/access.c:50 +msgid "" +"If the adapter provides multiple independent tuner devices, the device " +"number must be selected. Numbering starts from zero." +msgstr "" +"যদি এডাপ্টাৰটোৱে বিভিন্ন স্বতন্ত্ৰ টিউনাৰ ডিভাইচবোৰ আগবঢ়ায়, তেন্তে ডিভাইচ সংখ্যাটো " +"নিৰ্বাচিত কৰাটো অপৰিহাৰ্য. সংখ্যাটো শূন্যৰ পৰা আৰম্ভ হয়." + +#: modules/access/dtv/access.c:52 +msgid "Do not demultiplex" +msgstr "ডিমাল্টিপ্লেক্স নকৰিব" + +#: modules/access/dtv/access.c:54 +msgid "" +"Only useful programs are normally demultiplexed from the transponder. This " +"option will disable demultiplexing and receive all programs." +msgstr "" +"ট্ৰেন্সপোণ্ডাৰটোৰ পৰা কেৱল উপযোগী কাৰ্যসূচীবোৰ সাধাৰণতে ডিমাল্টিপ্লেক্স কৰা হয়. এই " +"বিকল্পটোৱে ডিমাল্টিপ্লেক্স অক্ষম কৰিব আৰু সকলো কাৰ্যসূচী গ্ৰহণ কৰিব." + +#: modules/access/dtv/access.c:57 +msgid "Network name" +msgstr "নেটৱৰ্কৰ নাম" + +#: modules/access/dtv/access.c:58 +msgid "Unique network name in the System Tuning Spaces" +msgstr "ছিষ্টেম টিউনিং ঠাইবোৰত অদ্বিতীয় নেটৱৰ্ক নাম" + +#: modules/access/dtv/access.c:60 +msgid "Network name to create" +msgstr "তৈয়াৰ কৰিবলৈ নেটৱৰ্ক নাম" + +#: modules/access/dtv/access.c:61 +msgid "Create unique name in the System Tuning Spaces" +msgstr "ছিষ্টেম টিউনিং ঠাইবোৰত অদ্বিতীয় নাম তৈয়াৰ কৰক" + +#: modules/access/dtv/access.c:63 +msgid "Frequency (Hz)" +msgstr "কম্পনাংক (Hz)" + +#: modules/access/dtv/access.c:65 +msgid "" +"TV channels are grouped by transponder (a.k.a. multiplex) on a given " +"frequency. This is required to tune the receiver." +msgstr "" +"এটা উল্লেখিত কম্পনাংকত ট্ৰেন্সপোণ্ডাৰৰ (a.k.a. মাল্টিপ্লেক্স) দ্বৰা TV চেনেলবোৰ গোট " +"কৰা হয়. গ্ৰাহকটো টিউন কৰিবলৈ এইটো দাবী কৰে." + +#: modules/access/dtv/access.c:68 modules/gui/qt/components/open_panels.cpp:967 +msgid "Modulation / Constellation" +msgstr "মডুলেশ্বন / কনষ্টিলেশ্বন" + +#: modules/access/dtv/access.c:69 +msgid "Layer A modulation" +msgstr "স্তৰ A মডুলেশ্বন" + +#: modules/access/dtv/access.c:70 +msgid "Layer B modulation" +msgstr "স্তৰ B মডুলেশ্বন" + +#: modules/access/dtv/access.c:71 +msgid "Layer C modulation" +msgstr "স্তৰ C মডুলেশ্বন" + +#: modules/access/dtv/access.c:73 +msgid "" +"The digital signal can be modulated according with different constellations " +"(depending on the delivery system). If the demodulator cannot detect the " +"constellation automatically, it needs to be configured manually." +msgstr "" +"বিভিন্ন কনষ্টিলেশ্বন মতে ডিজিটেল সংকেতটো মডুলেট কৰিব পাৰি (প্ৰদানৰ ছিষ্টেমটোৰ ওপৰত " +"নিৰ্ভৰ কৰি). যদি ডিমডুলেটৰটোৱে কনষ্টিলেশ্বনটো স্বয়ংক্ৰিয়ভাৱে চিনাক্ত নকৰে, তেন্তে " +"এইটো মেনুৱেলী ৰূপৰেখা কৰাটো প্ৰয়োজন." + +#: modules/access/dtv/access.c:88 +msgid "Symbol rate (bauds)" +msgstr "প্ৰতীকৰ হাৰ (বাউডছ)" + +#: modules/access/dtv/access.c:90 +msgid "" +"The symbol rate must be specified manually for some systems, notably DVB-C, " +"DVB-S and DVB-S2." +msgstr "" +"কিছুমান ছিষ্টেমৰ বাবে প্ৰতীকৰ হাৰটো মেনুৱলী নিৰ্ধাৰণ কৰাটো অপৰিহাৰ্য, DVB-C, DVB-S " +"আৰু DVB-S2 টো উপযোগী." + +#: modules/access/dtv/access.c:93 +msgid "Spectrum inversion" +msgstr "স্পেকট্ৰাম ওলোটা কৰাটো" + +#: modules/access/dtv/access.c:95 +msgid "" +"If the demodulator cannot detect spectral inversion correctly, it needs to " +"be configured manually." +msgstr "" +"যদি ডিমটুলেটৰটোৱে বৰ্ণালী ওলোটাটো শুদ্ধভাৱে চিনাক্ত নকৰে, তেন্তে এইটো মেনুৱেলী " +"ৰূপৰেখা কৰাৰ প্ৰয়োজন হব." + +#: modules/access/dtv/access.c:101 +msgid "FEC code rate" +msgstr "FEC কোডৰ হাৰ" + +#: modules/access/dtv/access.c:102 +msgid "High-priority code rate" +msgstr "উচ্চ-অগ্ৰাধিকাৰ কোডৰ হাৰ" + +#: modules/access/dtv/access.c:103 +msgid "Low-priority code rate" +msgstr "নিম্ন-অগ্ৰাধিকাৰ কোডৰ হাৰ" + +#: modules/access/dtv/access.c:104 +msgid "Layer A code rate" +msgstr "স্তৰ A কোড হাৰ" + +#: modules/access/dtv/access.c:105 +msgid "Layer B code rate" +msgstr "স্তৰ B কোড হাৰ" + +#: modules/access/dtv/access.c:106 +msgid "Layer C code rate" +msgstr "স্তৰ C কোড হাৰ" + +#: modules/access/dtv/access.c:108 +msgid "The code rate for Forward Error Correction can be specified." +msgstr "আগলৈ পথোৱা ভুল শুদ্ধকৰণৰ বাবে কোড হাৰটো নিৰ্ধাৰিত কৰিব পাৰি." + +#: modules/access/dtv/access.c:118 +msgid "Transmission mode" +msgstr "সৰবৰাহৰ ধৰণ" + +#: modules/access/dtv/access.c:126 +msgid "Bandwidth (MHz)" +msgstr "বেণ্ডউইড (MHz)" + +#: modules/access/dtv/access.c:131 +msgid "10 MHz" +msgstr "10 MHz" + +#: modules/access/dtv/access.c:131 +msgid "8 MHz" +msgstr "8 MHz" + +#: modules/access/dtv/access.c:131 +msgid "7 MHz" +msgstr "7 MHz" + +#: modules/access/dtv/access.c:131 +msgid "6 MHz" +msgstr "6 MHz" + +#: modules/access/dtv/access.c:132 +msgid "5 MHz" +msgstr "5 MHz" + +#: modules/access/dtv/access.c:132 +msgid "1.712 MHz" +msgstr "1.712 MHz" + +#: modules/access/dtv/access.c:135 +msgid "Guard interval" +msgstr "গাৰ্ড অন্তৰাল" + +#: modules/access/dtv/access.c:143 +msgid "Hierarchy mode" +msgstr "বিন্যাসৰ ধৰণ" + +#: modules/access/dtv/access.c:151 +msgid "DVB-T2 Physical Layer Pipe" +msgstr "DVB-T2 দৈহিক স্তৰ পাইপ" + +#: modules/access/dtv/access.c:153 +msgid "Layer A segments count" +msgstr "স্তৰ A খণ্ডবোৰ গণনা" + +#: modules/access/dtv/access.c:154 +msgid "Layer B segments count" +msgstr "স্তৰ B খণ্ডবোৰ গণনা" + +#: modules/access/dtv/access.c:155 +msgid "Layer C segments count" +msgstr "স্তৰ C খণ্ডবোৰ গণনা" + +#: modules/access/dtv/access.c:157 +msgid "Layer A time interleaving" +msgstr "স্তৰ A সময় অন্তৰাল" + +#: modules/access/dtv/access.c:158 +msgid "Layer B time interleaving" +msgstr "স্তৰ B সময় অন্তৰাল" + +#: modules/access/dtv/access.c:159 +msgid "Layer C time interleaving" +msgstr "স্তৰ C সময় অন্তৰাল" + +#: modules/access/dtv/access.c:161 +msgid "Stream identifier" +msgstr "" + +#: modules/access/dtv/access.c:163 +msgid "Pilot" +msgstr "পাইলট" + +#: modules/access/dtv/access.c:165 +msgid "Roll-off factor" +msgstr "ৰোল-অফ কাৰক" + +#: modules/access/dtv/access.c:170 +msgid "0.35 (same as DVB-S)" +msgstr "0.35 (DVB-S ৰ দৰে একে)" + +#: modules/access/dtv/access.c:170 +msgid "0.20" +msgstr "0.20" + +#: modules/access/dtv/access.c:170 +msgid "0.25" +msgstr "0.25" + +#: modules/access/dtv/access.c:173 +msgid "Transport stream ID" +msgstr "পৰিবহন ষ্ট্ৰিম ID" + +#: modules/access/dtv/access.c:175 +msgid "Polarization (Voltage)" +msgstr "পোলাৰাইজেশ্বন (ভল্টেজ)" + +#: modules/access/dtv/access.c:177 +msgid "" +"To select the polarization of the transponder, a different voltage is " +"normally applied to the low noise block-downconverter (LNB)." +msgstr "" +"ট্ৰেন্সপোণ্ডাৰটোৰ পোলাৰাইজেশ্বনটো নিৰ্বাচন কৰিবলৈ, নিম্ন শব্দ ব্লক-ডাউন ৰূপান্তৰকটোলৈ " +"এটা বেলেগ ভল্টেজ সাধাৰণতে প্ৰয়োগ কৰা হয় (LNB)." + +#: modules/access/dtv/access.c:180 +msgid "Unspecified (0V)" +msgstr "অনিৰ্ধাৰিত (0V)" + +#: modules/access/dtv/access.c:181 +msgid "Vertical (13V)" +msgstr "উলম্ব (13V)" + +#: modules/access/dtv/access.c:181 +msgid "Horizontal (18V)" +msgstr "সমান্তৰাল (18V)" + +#: modules/access/dtv/access.c:182 +msgid "Circular Right Hand (13V)" +msgstr "চক্ৰাকাৰ সোঁহাত (13V)" + +#: modules/access/dtv/access.c:182 +msgid "Circular Left Hand (18V)" +msgstr "চক্ৰাকাৰ বাওঁহাত (18V)" + +#: modules/access/dtv/access.c:184 +msgid "High LNB voltage" +msgstr "উচ্চ LNB ভল্টেজ" + +#: modules/access/dtv/access.c:186 +msgid "" +"If the cables between the satellilte low noise block-downconverter and the " +"receiver are long, higher voltage may be required.\n" +"Not all receivers support this." +msgstr "" +"যদি কৃত্ৰিম উপগ্ৰহটোৰ মাজত থকা তাঁৰবোৰ নিম্ন শব্দৰ ব্লক-ডাউন ৰূপান্তৰক হয় আৰু গ্ৰাহকটো " +"দীঘল হয়, উচ্চ ভল্টেজৰ প্ৰয়োজন হব পাৰে.\n" +"সকলোবোৰ গ্ৰাহকে এইটো সমৰ্থন নকৰে." + +#: modules/access/dtv/access.c:190 +msgid "Local oscillator low frequency (kHz)" +msgstr "স্থানীয় অচ্ছিলেটৰ নিম্ন কম্পনাংক (kHz)" + +#: modules/access/dtv/access.c:191 +msgid "Local oscillator high frequency (kHz)" +msgstr "স্থানীয় অচ্ছিলেটৰ উচ্চ কম্পনাংক (kHz)" + +#: modules/access/dtv/access.c:193 +msgid "" +"The downconverter (LNB) will subtract the local oscillator frequency from " +"the satellite transmission frequency. The intermediate frequency (IF) on the " +"RF cable is the result." +msgstr "" + +#: modules/access/dtv/access.c:196 +msgid "Universal LNB switch frequency (kHz)" +msgstr "সাধাৰণ LNB শ্বুইটছ কম্পনাংক (kHz)" + +#: modules/access/dtv/access.c:198 +msgid "" +"If the satellite transmission frequency exceeds the switch frequency, the " +"oscillator high frequency will be used as reference. Furthermore the " +"automatic continuous 22kHz tone will be sent." +msgstr "" +"যদি উপগ্ৰহ সৰবৰাহ কম্পনাংকটোৱে শ্বুইটছ কম্পনাংকটো অতিক্ৰম কৰে, তেন্তে অচ্ছিলেটৰ উচ্চ " +"কম্পনাংকটো সাৰাংশ হিচাপে ব্যৱহাৰ কৰা হব. তাৰোপৰি স্বয়ংক্ৰিয় ধাৰাবাহিক 22kHz স্বৰ " +"প্ৰেৰণ কৰা হব." + +#: modules/access/dtv/access.c:201 +msgid "Continuous 22kHz tone" +msgstr "ধাৰবাহিক 22kHz স্বৰ" + +#: modules/access/dtv/access.c:203 +msgid "" +"A continuous tone at 22kHz can be sent on the cable. This normally selects " +"the higher frequency band from a universal LNB." +msgstr "" +"তাঁৰডালত 22kHz ৰ এটা ধাৰাবাহিক স্বৰ এটা পথাব পাৰি. এইটোৱে সাধাৰণতে সাধাৰণ LNB " +"এটাৰ পৰা উচ্চ কম্পনাংকৰ বেণ্ডটো নিৰ্বাচন কৰে." + +#: modules/access/dtv/access.c:206 +msgid "DiSEqC LNB number" +msgstr "DiSEqC LNB সংখ্যা" + +#: modules/access/dtv/access.c:208 +msgid "" +"If the satellite receiver is connected to multiple low noise block-" +"downconverters (LNB) through a DiSEqC 1.0 switch, the correct LNB can be " +"selected (1 to 4). If there is no switch, this parameter should be 0." +msgstr "" +"DiSEqC 1.0 শ্বুইটছ এটা জৰিয়তে যদি উপগ্ৰহ গ্ৰাহকটো বিভিন্ন নিম্ন শব্দৰ ব্লক-ডাউন " +"ৰূপান্তৰকবোৰলৈ সংযোগ কৰে, শুদ্ধ LNB টো নিৰ্বাচিত কৰিব পাৰি (1 ৰ পৰা 4 লৈ). যদি " +"কোনো শ্বুইটছ নাথাকে, তেন্তে এই পেৰামিটাৰটো 0 হোৱা উচিত." + +#: modules/access/dtv/access.c:214 modules/access/v4l2/v4l2.c:136 +#: modules/access/v4l2/v4l2.c:163 modules/access/v4l2/v4l2.c:201 +msgid "Unspecified" +msgstr "অনিৰ্ধাৰিত" + +#: modules/access/dtv/access.c:218 +msgid "Uncommitted DiSEqC LNB number" +msgstr "সম্পন্ন নকৰা DiSEqC LNB সংখ্যা" + +#: modules/access/dtv/access.c:220 +msgid "" +"If the satellite receiver is connected to multiple low noise block-" +"downconverters (LNB) through a cascade formed from DiSEqC 1.1 uncommitted " +"switch and DiSEqC 1.0 committed switch, the correct uncommitted LNB can be " +"selected (1 to 4). If there is no uncommitted switch, this parameter should " +"be 0." +msgstr "" +"DiSEqC 1.1 সম্পন্ন নকৰা শ্বুইটছ আৰু DiSEqC 1.0 সম্পন্ন কৰা শ্বুইটছৰ পৰা এটা কেছকেড " +"ধৰণৰ জৰিয়তে যদি উপগ্ৰহৰ গ্ৰাহকটো বিভিন্ন নিম্ন শব্দৰ ব্লক-ডাউন ৰূপান্তৰকবোৰলৈ (LNB) " +"সংযোগ কৰে, শুদ্ধ সম্পন্ন নকৰা LNB টো নিৰ্বাচন কৰিব পাৰি (1 ৰ পৰা 4 লৈ). যদি কোনো " +"সম্পন্ন নকৰা শ্বুইটছ নাই, এই পেৰামিটাৰটো 0 হোৱা উচিত." + +#: modules/access/dtv/access.c:227 +msgid "Network identifier" +msgstr "নেটৱৰ্ক চিনাক্তকৰ্তা" + +#: modules/access/dtv/access.c:228 +msgid "Satellite azimuth" +msgstr "উপগ্ৰহ এজিমুথ" + +#: modules/access/dtv/access.c:229 +msgid "Satellite azimuth in tenths of degree" +msgstr "ডিগ্ৰীৰ দশমত উপগ্ৰহ এজিমুথ" + +#: modules/access/dtv/access.c:230 +msgid "Satellite elevation" +msgstr "উপগ্ৰহ ইলেভেশ্বন" + +#: modules/access/dtv/access.c:231 +msgid "Satellite elevation in tenths of degree" +msgstr "ডিগ্ৰীৰ দশমত উপগ্ৰহ ইলেভেশ্বন" + +#: modules/access/dtv/access.c:232 +msgid "Satellite longitude" +msgstr "উপগ্ৰহৰ দ্ৰাঘিমাংশ" + +#: modules/access/dtv/access.c:234 +msgid "Satellite longitude in tenths of degree. West is negative." +msgstr "ডিগ্ৰীৰ দশমত উপগ্ৰহৰ দ্ৰাঘিমাংশ. পশ্চিমটো ঋণাত্মক." + +#: modules/access/dtv/access.c:236 +msgid "Satellite range code" +msgstr "উপগ্ৰহৰ পৰিসৰ কোড" + +#: modules/access/dtv/access.c:237 +msgid "Satellite range code as defined by manufacturer e.g. DISEqC switch code" +msgstr "" +"নিৰ্মাতাৰ দ্বাৰা বাখ্যা কৰাৰ দৰে উপগ্ৰহৰ পৰিসৰ কোড, উদাহৰণস্বৰূপে DISEqC শ্বুইটছ কোড" + +#: modules/access/dtv/access.c:241 +msgid "Major channel" +msgstr "মুখ্য চেনেল" + +#: modules/access/dtv/access.c:242 +msgid "ATSC minor channel" +msgstr "ATSC গৌণ চেনেল" + +#: modules/access/dtv/access.c:243 +msgid "Physical channel" +msgstr "দৈহিক চেনেল" + +#: modules/access/dtv/access.c:249 +msgid "DTV" +msgstr "DTV" + +#: modules/access/dtv/access.c:250 +msgid "Digital Television and Radio" +msgstr "ডিজিটেল টেলিভিশ্বন আৰু ৰেডিঅ'" + +#: modules/access/dtv/access.c:288 +msgid "Terrestrial reception parameters" +msgstr "টেৰেষ্ট্ৰিয়েল গ্ৰহণৰ পেৰামিটাৰবোৰ" + +#: modules/access/dtv/access.c:300 +msgid "DVB-T reception parameters" +msgstr "DVB-T গ্ৰহণৰ পেৰামিটাৰবোৰ" + +#: modules/access/dtv/access.c:316 +msgid "ISDB-T reception parameters" +msgstr "ISDB-T গ্ৰহণৰ পেৰামিটাৰবোৰ" + +#: modules/access/dtv/access.c:357 +msgid "Cable and satellite reception parameters" +msgstr "তাঁৰ আৰু উপগ্ৰহৰ গ্ৰহণৰ পেৰামিটাৰবোৰ" + +#: modules/access/dtv/access.c:369 +msgid "DVB-S2 parameters" +msgstr "DVB-S2 পেৰামিটাৰবোৰ" + +#: modules/access/dtv/access.c:380 +msgid "ISDB-S parameters" +msgstr "ISDB-S পেৰামিটাৰবোৰ" + +#: modules/access/dtv/access.c:385 +msgid "Satellite equipment control" +msgstr "উপগ্ৰহৰ সৰঞ্জাম নিয়ন্ত্ৰণ" + +#: modules/access/dtv/access.c:427 +msgid "ATSC reception parameters" +msgstr "ATSC গ্ৰহণৰ পেৰামিটাৰবোৰ" + +#: modules/access/dtv/access.c:481 +msgid "Digital broadcasting" +msgstr "ডিজিটেল প্ৰচাৰ" + +#: modules/access/dtv/access.c:482 +msgid "" +"The selected digital tuner does not support the specified parameters.\n" +"Please check the preferences." +msgstr "" +"নিৰ্বাচিত ডিজিটেল টিউনাৰটোৱে নিৰ্ধাৰিত পেৰামিটাৰবোৰ পছন্দ নকৰে.\n" +"অনুগ্ৰহ কৰি পছন্দবোৰ পৰীক্ষা কৰক." + +#: modules/access/dv.c:57 +msgid "Digital Video (Firewire/ieee1394) input" +msgstr "ডিজিটেল ভিডিঅ' (ফায়াৰৱেৰ/ieee1394) ইনপুট" + +#: modules/access/dv.c:58 +msgid "DV" +msgstr "DV" + +#: modules/access/dvb/access.c:66 +msgid "Probe DVB card for capabilities" +msgstr "" + +#: modules/access/dvb/access.c:67 +msgid "" +"Some DVB cards do not like to be probed for their capabilities, you can " +"disable this feature if you experience some trouble." +msgstr "" + +#: modules/access/dvb/access.c:70 +msgid "Satellite scanning config" +msgstr "" + +#: modules/access/dvb/access.c:71 +msgid "Filename of config file in share/dvb/dvb-s." +msgstr "" + +#: modules/access/dvb/access.c:73 +msgid "Scan tuning list" +msgstr "" + +#: modules/access/dvb/access.c:74 +msgid "Filename containing initial scan tuning data." +msgstr "" + +#: modules/access/dvb/access.c:76 +msgid "Use NIT for scanning services" +msgstr "" + +#: modules/access/dvb/access.c:79 +msgid "DVB" +msgstr "" + +#: modules/access/dvb/access.c:80 +msgid "DVB input with v4l2 support" +msgstr "" + +#: modules/access/dvb/scan.c:817 +#, c-format +msgid "" +"%.1f MHz (%d services)\n" +"~%s remaining" +msgstr "" + +#: modules/access/dvb/scan.c:827 +msgid "Scanning DVB" +msgstr "" + +#: modules/access/dvdnav.c:78 modules/access/dvdread.c:76 +msgid "DVD angle" +msgstr "DVD কোণ" + +#: modules/access/dvdnav.c:80 modules/access/dvdread.c:78 +msgid "Default DVD angle." +msgstr "ডিফল্ট DVD কোণ." + +#: modules/access/dvdnav.c:82 +msgid "Start directly in menu" +msgstr "প্ৰত্যক্ষভাৱে মেনুত আৰম্ভ কৰক" + +#: modules/access/dvdnav.c:84 +msgid "" +"Start the DVD directly in the main menu. This will try to skip all the " +"useless warning introductions." +msgstr "" +"মুখ্য মেনুটোত DVD প্ৰত্যক্ষভাৱে আৰম্ভ কৰক. এইটোৱে সকলোবোৰ ব্যৱহাৰ অযোগ্য সতৰ্কীকৰণ " +"পৰিচয়বোৰ আওকাণ কৰিবলৈ চেষ্টা কৰিব." + +#: modules/access/dvdnav.c:98 +msgid "DVD with menus" +msgstr "মেনুবোৰৰ সৈতে DVD" + +#: modules/access/dvdnav.c:99 +msgid "DVDnav Input" +msgstr "DVDnav ইনপুট" + +#: modules/access/dvdnav.c:111 +msgid "DVDnav demuxer" +msgstr "" + +#: modules/access/dvdnav.c:289 modules/access/dvdread.c:236 +#: modules/access/dvdread.c:252 modules/access/dvdread.c:511 +#: modules/access/dvdread.c:576 +msgid "Playback failure" +msgstr "প্লেবেক ব্যৰ্থতা" + +#: modules/access/dvdnav.c:290 +msgid "" +"VLC cannot set the DVD's title. It possibly cannot decrypt the entire disc." +msgstr "" +"VLC য়ে DVD ৰ শিৰোনামবোৰ ছেট কৰিব নোৱাৰে. এইটোৱে সম্ভৱত সমগ্ৰ ডিস্কটো ডিক্ৰিপ্ট " +"কৰিব নোৱাৰে." + +#: modules/access/dvdread.c:84 +msgid "DVD without menus" +msgstr "তালিকাবোৰ অবিহনে DVD" + +#: modules/access/dvdread.c:85 +msgid "DVDRead Input (no menu support)" +msgstr "DVDRead ইনপুট (কোনো তালিকা সমৰ্থন নকৰে)" + +#: modules/access/dvdread.c:237 +#, c-format +msgid "DVDRead could not open the disc \"%s\"." +msgstr "DVDRead য়ে \"%s\" ডিস্কটো খুলিব নোৱাৰিলে." + +#: modules/access/dvdread.c:253 +msgid "Cannot play a non-UDF mastered DVD." +msgstr "" + +#: modules/access/dvdread.c:512 +#, c-format +msgid "DVDRead could not read block %d." +msgstr "DVDRead য়ে %d খণ্ডটো পঢ়িব নোৱাৰিলে." + +#: modules/access/dvdread.c:577 +#, c-format +msgid "DVDRead could not read %d/%d blocks at 0x%02x." +msgstr "DVDপঢ়াটোৱে পঢ়িব নোৱাৰিলে %d/%d খণ্ডবোৰ 0x%02x ত." + +#: modules/access/fs.c:34 +msgid "File input" +msgstr "ফাইল ইনপুট" + +#: modules/access/fs.c:35 modules/access_output/file.c:388 +#: modules/audio_output/file.c:113 +#: modules/gui/macosx/VLCOpenWindowController.m:140 +#: modules/gui/macosx/VLCOutput.m:64 modules/gui/macosx/VLCOutput.m:175 +#: modules/gui/macosx/VLCOutput.m:301 modules/gui/qt/dialogs/plugins.cpp:1428 +#: modules/gui/qt/dialogs/sout.cpp:67 modules/gui/qt/dialogs/sout.cpp:119 +#: share/lua/http/dialogs/create_stream.html:204 +#: share/lua/http/dialogs/stream_config_window.html:36 +#: share/lua/http/dialogs/stream_window.html:95 +msgid "File" +msgstr "ফাইল" + +#: modules/access/fs.c:44 modules/demux/directory.c:93 +#: modules/gui/qt/ui/sprefs_video.h:328 +msgid "Directory" +msgstr "নিৰ্দেশিকা" + +#: modules/access/fs.c:53 +msgid "List special files" +msgstr "" + +#: modules/access/fs.c:54 +msgid "Include devices and pipes when listing directories" +msgstr "" + +#: modules/access/ftp.c:69 modules/access/live555.cpp:85 +#: modules/access/rdp.c:65 modules/access/sftp.c:55 +#: modules/access/smb_common.h:21 modules/access/vnc.c:47 +#: modules/access_output/http.c:52 +#: modules/gui/macosx/VLCCoreDialogProvider.m:191 +#: modules/gui/macosx/VLCSimplePrefsController.m:286 +#: modules/gui/qt/dialogs/external.cpp:205 modules/misc/audioscrobbler.c:114 +#: modules/stream_out/rtp.c:173 +msgid "Username" +msgstr "ব্যৱহাৰকৰ্তাৰ নাম" + +#: modules/access/ftp.c:70 modules/access/rdp.c:66 modules/access/sftp.c:56 +#: modules/access/smb_common.h:22 +msgid "" +"Username that will be used for the connection, if no username is set in the " +"URL." +msgstr "" + +#: modules/access/ftp.c:72 modules/access/live555.cpp:88 +#: modules/access/rdp.c:68 modules/access/sftp.c:58 +#: modules/access/smb_common.h:24 modules/access/vnc.c:48 +#: modules/access_output/http.c:55 +#: modules/gui/macosx/VLCCoreDialogProvider.m:192 +#: modules/gui/macosx/VLCSimplePrefsController.m:285 +#: modules/gui/macosx/VLCSimplePrefsController.m:348 +#: modules/gui/qt/dialogs/external.cpp:210 modules/lua/vlc.c:54 +#: modules/lua/vlc.c:70 modules/misc/audioscrobbler.c:116 +#: modules/stream_out/rtp.c:176 +msgid "Password" +msgstr "পাছৱৰ্ড" + +#: modules/access/ftp.c:73 modules/access/rdp.c:69 modules/access/sftp.c:59 +#: modules/access/smb_common.h:25 +msgid "" +"Password that will be used for the connection, if no username or password " +"are set in URL." +msgstr "" + +#: modules/access/ftp.c:75 +msgid "FTP account" +msgstr "FTP একাউন্ট" + +#: modules/access/ftp.c:76 +msgid "Account that will be used for the connection." +msgstr "সংযোগৰ বাবে ব্যৱহাৰ কৰিবলগীয়া একাউন্টটো" + +#: modules/access/ftp.c:79 +msgid "FTP authentication" +msgstr "" + +#: modules/access/ftp.c:80 +#, c-format +msgid "Please enter a valid login and password for the ftp connexion to %s" +msgstr "" + +#: modules/access/ftp.c:85 +msgid "FTP input" +msgstr "FTP ইনপুট" + +#: modules/access/ftp.c:99 +msgid "FTP upload output" +msgstr "FTP আপলোড আউটপুট" + +#: modules/access/ftp.c:370 modules/access/ftp.c:386 modules/access/ftp.c:538 +msgid "Network interaction failed" +msgstr "নেটৱৰ্ক বিনিময় ব্যৰ্থ হল" + +#: modules/access/ftp.c:371 +msgid "VLC could not connect with the given server." +msgstr "নিৰ্ধাৰিত ছাৰ্ভাৰটোৰ সৈতে VLC য়ে সংযোগ স্থাপন কৰিব নোৱাৰিলে." + +#: modules/access/ftp.c:387 +msgid "VLC's connection to the given server was rejected." +msgstr "নিৰ্ধাৰিত ছাৰ্ভাৰটোৰ সৈতে VLC ৰ সংযোগটো অগ্ৰাহ্য কৰা হৈছিল." + +#: modules/access/ftp.c:539 +msgid "Your account was rejected." +msgstr "আপোনাৰ একাউন্টটো অগ্ৰাহ্য কৰা হৈছিল." + +#: modules/access/http.c:59 +msgid "Auto re-connect" +msgstr "স্বয়ংক্ৰিয়ভাৱে পুনৰ-সংযোগ" + +#: modules/access/http.c:61 +msgid "" +"Automatically try to reconnect to the stream in case of a sudden disconnect." +msgstr "" +"আকষ্মিক সংযোগবিহীন এটাৰ ক্ষেত্ৰত ষ্ট্ৰিমটোলৈ স্বয়ংক্ৰিয়ভাৱে পুনৰ সংযোগ কৰিবলৈ চেষ্টা " +"কৰক." + +#: modules/access/http.c:65 +msgid "HTTP input" +msgstr "HTTP ইনপুট" + +#: modules/access/http.c:67 +msgid "HTTP(S)" +msgstr "HTTP(S)" + +#: modules/access/http.c:303 modules/access/http/access.c:214 +msgid "HTTP authentication" +msgstr "HTTP বৈধতা" + +#: modules/access/http.c:304 modules/access/http/access.c:215 +#, c-format +msgid "Please enter a valid login name and a password for realm %s." +msgstr "অনুগ্ৰহ কৰি প্ৰকৃতm %s ৰ বাবে এটা বৈধ লগইন নাম আৰু পাছৱৰ্ড ভৰাওক." + +#: modules/access/http/access.c:288 +msgid "HTTPS input" +msgstr "" + +#: modules/access/http/access.c:289 +msgid "HTTPS" +msgstr "" + +#: modules/access/http/access.c:296 +msgid "Continuous stream" +msgstr "ধাৰাবাহিক ষ্ট্ৰিম" + +#: modules/access/http/access.c:297 +msgid "Keep reading a resource that keeps being updated." +msgstr "" + +#: modules/access/http/access.c:299 +msgid "Cookies forwarding" +msgstr "" + +#: modules/access/http/access.c:300 +msgid "Forward cookies across HTTP redirections." +msgstr "" + +#: modules/access/http/access.c:301 +msgid "Referrer" +msgstr "" + +#: modules/access/http/access.c:302 +msgid "Provide the referral URL, i.e. HTTP \"Referer\" (sic)." +msgstr "" + +#: modules/access/http/access.c:306 +msgid "User agent" +msgstr "" + +#: modules/access/http/access.c:307 +msgid "" +"Override the name and version of the application as provided to the HTTP " +"server, i.e. the HTTP \"User-Agent\". Name and version must be separated by " +"a forward slash, e.g. \"FooBar/1.2.3\"." +msgstr "" + +#: modules/access/idummy.c:41 modules/access_output/dummy.c:44 +#: modules/audio_output/adummy.c:36 modules/codec/ddummy.c:46 +#: modules/codec/edummy.c:39 modules/control/dummy.c:49 +#: modules/text_renderer/tdummy.c:35 modules/video_output/vdummy.c:47 +msgid "Dummy" +msgstr "ডামি" + +#: modules/access/idummy.c:42 +msgid "Dummy input" +msgstr "ডামি ইনপুট" + +#: modules/access/imem.c:49 modules/gui/qt/components/playlist/sorting.h:59 +#: modules/stream_out/bridge.c:41 modules/stream_out/mosaic_bridge.c:101 +msgid "ID" +msgstr "ID" + +#: modules/access/imem.c:51 modules/demux/image.c:46 +msgid "Set the ID of the elementary stream" +msgstr "প্ৰাথমিক ষ্ট্ৰিমটোৰ ID টো ছেট কৰক" + +#: modules/access/imem.c:53 modules/demux/image.c:48 +msgid "Group" +msgstr "গোট" + +#: modules/access/imem.c:55 modules/demux/image.c:50 +msgid "Set the group of the elementary stream" +msgstr "প্ৰাথমিক ষ্ট্ৰিমটোৰ গোটটো ছেট কৰক" + +#: modules/access/imem.c:57 +msgid "Category" +msgstr "শ্ৰেণী" + +#: modules/access/imem.c:59 +msgid "Set the category of the elementary stream" +msgstr "প্ৰাথমিক ষ্ট্ৰিমটোৰ শ্ৰেণীটো ছেট কৰক" + +#: modules/access/imem.c:64 modules/gui/macosx/VLCAddonsWindowController.m:363 +#: modules/gui/qt/managers/addons_manager.cpp:98 +msgid "Unknown" +msgstr "অজ্ঞাত" + +#: modules/access/imem.c:64 +msgid "Data" +msgstr "ডাটা" + +#: modules/access/imem.c:69 +msgid "Set the codec of the elementary stream" +msgstr "প্ৰাথমিক ষ্ট্ৰিমটোৰ কোডেকটো ছেট কৰক" + +#: modules/access/imem.c:73 +msgid "Language of the elementary stream as described by ISO639" +msgstr "ISO639 ৰ দ্বাৰা বাখ্যা কৰাৰ দৰে প্ৰাথমিক ষ্ট্ৰিমটোৰ ভাষা" + +#: modules/access/imem.c:77 +msgid "Sample rate of an audio elementary stream" +msgstr "অডিঅ' প্ৰাথমিক ষ্ট্ৰিম এটাৰ নমুনাৰ হাৰ" + +#: modules/access/imem.c:79 modules/audio_output/amem.c:51 +msgid "Channels count" +msgstr "চেনেলবোৰৰ গণনা" + +#: modules/access/imem.c:81 +msgid "Channels count of an audio elementary stream" +msgstr "অডিঅ' প্ৰাথমিক ষ্ট্ৰিম এটাৰ চেনেলবোৰৰ গণনা" + +#: modules/access/imem.c:83 modules/access/v4l2/v4l2.c:65 +#: modules/demux/rawvid.c:47 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:239 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167 +#: modules/gui/qt/components/extended_panels.cpp:1348 modules/spu/mosaic.c:94 +#: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108 +#: modules/gui/qt/ui/profiles.h:741 +msgid "Width" +msgstr "প্ৰস্থ" + +#: modules/access/imem.c:84 +msgid "Width of video or subtitle elementary streams" +msgstr "ভিডিঅ' বা উপশিৰোনাম প্ৰাথমিক ষ্ট্ৰিমবোৰৰ প্ৰস্থ" + +#: modules/access/imem.c:86 modules/access/v4l2/v4l2.c:66 +#: modules/demux/rawvid.c:51 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:168 +#: modules/spu/mosaic.c:92 modules/video_output/vmem.c:45 +#: share/lua/http/dialogs/mosaic_window.html:126 +#: modules/gui/qt/ui/profiles.h:744 +msgid "Height" +msgstr "উচ্চতা" + +#: modules/access/imem.c:87 +msgid "Height of video or subtitle elementary streams" +msgstr "ভিডিঅ' বা উপশিৰোনাম প্ৰাথমিক ষ্ট্ৰিমবোৰৰ উচ্চতা" + +#: modules/access/imem.c:89 +msgid "Display aspect ratio" +msgstr "দৃষ্টিকোণৰ অনুপাত প্ৰদৰ্শন কৰক" + +#: modules/access/imem.c:91 +msgid "Display aspect ratio of a video elementary stream" +msgstr "ভিডিঅ' প্ৰাথমিক ষ্ট্ৰিম এটাৰ দৃষ্টিকোণ অনুপাতটো প্ৰদৰ্শন কৰক" + +#: modules/access/imem.c:95 +msgid "Frame rate of a video elementary stream" +msgstr "ভিডিঅ' প্ৰাথমিক ষ্ট্ৰিম এটাৰ ফ্ৰেমৰ হাৰ" + +#: modules/access/imem.c:97 +msgid "Callback cookie string" +msgstr "কলবেক কুকী ষ্ট্ৰিং" + +#: modules/access/imem.c:99 +msgid "Text identifier for the callback functions" +msgstr "কলবেক কাৰ্যবোৰৰ বাবে টেক্সট চিনাক্তকৰ্তা" + +#: modules/access/imem.c:101 +msgid "Callback data" +msgstr "কলবেক ডাটা" + +#: modules/access/imem.c:103 +msgid "Data for the get and release functions" +msgstr "কাৰ্যবোৰ লাভ কৰা আৰু এৰি দিয়াৰ বাবে ডাটা" + +#: modules/access/imem.c:105 +msgid "Get function" +msgstr "কাৰ্য লাভ কৰক" + +#: modules/access/imem.c:107 +msgid "Address of the get callback function" +msgstr "লাভ কৰা কলবেক কাৰ্যটোৰ ঠিকনা" + +#: modules/access/imem.c:109 +msgid "Release function" +msgstr "কাৰ্য এৰি দিয়ক" + +#: modules/access/imem.c:111 +msgid "Address of the release callback function" +msgstr "এৰি দিয়া কলবেক কাৰ্যটোৰ ঠিকনা" + +#: modules/access/imem.c:113 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:236 +#: modules/gui/qt/components/extended_panels.cpp:1347 +msgid "Size" +msgstr "আকাৰ" + +#: modules/access/imem.c:115 +msgid "Size of stream in bytes" +msgstr "বাইটত ষ্ট্ৰিমৰ আকাৰ" + +#: modules/access/imem.c:118 modules/access/imem.c:119 +msgid "Memory input" +msgstr "স্মৃতি ইনপুট" + +#: modules/access/imem-access.c:165 +msgid "Memory stream" +msgstr "" + +#: modules/access/imem-access.c:166 +msgid "In-memory stream input" +msgstr "" + +#: modules/access/jack.c:59 +msgid "Pace" +msgstr "গতি" + +#: modules/access/jack.c:61 +msgid "Read the audio stream at VLC pace rather than Jack pace." +msgstr "জেক পেছৰ পৰিৱৰ্তে VLC পেছত অডিঅ' ষ্ট্ৰিমটো পঢ়ক." + +#: modules/access/jack.c:62 modules/gui/qt/components/open_panels.cpp:898 +msgid "Auto connection" +msgstr "স্বয়ংক্ৰিয় সংযোগ" + +#: modules/access/jack.c:64 +msgid "Automatically connect VLC input ports to available output ports." +msgstr "উপলব্ধ আউটপুট পোৰ্টবোৰলৈ স্বয়ংক্ৰিয়ভাৱে VLC ইনপুট পোৰ্টবোৰ সংযোগ কৰক." + +#: modules/access/jack.c:67 +msgid "JACK audio input" +msgstr "JACK অডিঅ’ ইনপুট" + +#: modules/access/jack.c:69 +msgid "JACK Input" +msgstr "JACK ইনপুট" + +#: modules/access/linsys/linsys_hdsdi.c:72 +#: modules/access/linsys/linsys_sdi.c:68 +msgid "Link #" +msgstr "সংযোগ #" + +#: modules/access/linsys/linsys_hdsdi.c:74 +#: modules/access/linsys/linsys_sdi.c:70 +msgid "" +"Allows you to set the desired link of the board for the capture (starting at " +"0)." +msgstr "" +"অধিগ্ৰহণটোৰ বাবে আপোনাক বোৰ্ডৰ বিচৰা সংযোগটো ছেট কৰিবলৈ অনুমতি দিয়ে (0 আৰম্ভ " +"কৰিছে)." + +#: modules/access/linsys/linsys_hdsdi.c:75 +#: modules/access/linsys/linsys_sdi.c:71 +msgid "Video ID" +msgstr "ভিডিঅ' ID" + +#: modules/access/linsys/linsys_hdsdi.c:77 +#: modules/access/linsys/linsys_sdi.c:73 +msgid "Allows you to set the ES ID of the video." +msgstr "ভিডিঅ'টোৰ ES ID ছেট কৰিবলৈ আপোনাক অনুমতি দিয়ে." + +#: modules/access/linsys/linsys_hdsdi.c:80 +#: modules/access/linsys/linsys_sdi.c:76 +msgid "Allows you to force the aspect ratio of the video." +msgstr "ভিডিঅ'টোৰ দৃষ্টিকোণ অনুপাতটো জোৰ কৰিবলৈ আপোনাক অনুমতি দিয়ে." + +#: modules/access/linsys/linsys_hdsdi.c:81 +#: modules/access/linsys/linsys_sdi.c:77 +msgid "Audio configuration" +msgstr "অডিঅ' ৰূপৰেখা" + +#: modules/access/linsys/linsys_hdsdi.c:83 +#: modules/access/linsys/linsys_sdi.c:79 +msgid "Allows you to set audio configuration (id=group,pair:id=group,pair...)." +msgstr "" +"আপোনাক অডিঅ' ৰূপৰেখা ছেট কৰিবলৈ অনুমতি দিয়ে (id=গোট,যোৰা:id=গোট,যোৰা...)." + +#: modules/access/linsys/linsys_hdsdi.c:89 +msgid "HD-SDI Input" +msgstr "HD-SDI ইনপুট" + +#: modules/access/linsys/linsys_hdsdi.c:90 +msgid "HD-SDI" +msgstr "HD-SDI" + +#: modules/access/linsys/linsys_sdi.c:80 +msgid "Teletext configuration" +msgstr "টেলিটেক্সট ৰূপৰেখা" + +#: modules/access/linsys/linsys_sdi.c:82 +msgid "" +"Allows you to set Teletext configuration (id=line1-lineN with both fields)." +msgstr "" +"টেলিটেক্সট ৰূপৰেখা ছেট কৰিবলৈ আপোনাক অনুমতি দিয়ে (id=শাৰী1-শাৰীN উভয় ক্ষেত্ৰৰ " +"সৈতে)." + +#: modules/access/linsys/linsys_sdi.c:83 +msgid "Teletext language" +msgstr "টেলিটেক্সট ভাষা" + +#: modules/access/linsys/linsys_sdi.c:85 +msgid "Allows you to set Teletext language (page=lang/type,...)." +msgstr "টেলিটেক্সট ভাষা ছেট কৰিবলৈ আপোনাক অনুমতি দিয়ে (পৃষ্ঠা=ভাষা/প্ৰকাৰ,...)." + +#: modules/access/linsys/linsys_sdi.c:93 +msgid "SDI Input" +msgstr "SDI ইনপুট" + +#: modules/access/linsys/linsys_sdi.c:114 +msgid "SDI Demux" +msgstr "SDI ডিমাক্স" + +#: modules/access/live555.cpp:75 +msgid "Kasenna RTSP dialect" +msgstr "কাছেন্না RTSP ডাইলেক্ট" + +#: modules/access/live555.cpp:76 +msgid "" +"Kasenna servers use an old and nonstandard dialect of RTSP. With this " +"parameter VLC will try this dialect, but then it cannot connect to normal " +"RTSP servers." +msgstr "" +"কাছেন্না ছাৰ্ভাৰবোৰে RTSPৰ এটা পুৰণি আৰু অমানবিশিষ্ট ডাইলেক্ট ব্যৱহাৰ কৰে. এই " +"পেৰামিটাৰটোৰ সৈতে VLC য়ে এই ডাইলেক্টটো চেষ্টা কৰিব, কিন্তু তেতিয়া এইটো স্বাভাৱিক " +"RTSP ছাৰ্ভাৰবোৰলৈ সংযোগ কৰিব নোৱাৰি." + +#: modules/access/live555.cpp:80 +msgid "WMServer RTSP dialect" +msgstr "WMছাৰ্ভাৰ RTSP ডাইলেক্ট" + +#: modules/access/live555.cpp:81 +msgid "" +"WMServer uses a nonstandard dialect of RTSP. Selecting this parameter will " +"tell VLC to assume some options contrary to RFC 2326 guidelines." +msgstr "" +"WMছাৰ্ভাৰে RTSP ৰ অমানবিশিষ্ট ডাইলেক্ট এটা ব্যৱহাৰ কৰে. এই পেৰামিটাৰটো নিৰ্বাচন " +"কৰাটোৱে VLC ক RFC 2326 নিৰ্দেশনাবোৰৰ বিপৰীতে কিছুমান বিকল্প অনুমান কৰিবলৈ কব." + +#: modules/access/live555.cpp:86 +msgid "" +"Sets the username for the connection, if no username or password are set in " +"the url." +msgstr "" +"সংযোগটোৰ বাবে ব্যৱহাৰকৰ্তাৰ নামটো ছেট কৰে, যদি url টোত কোনো ব্যৱহাৰকৰ্তাৰ নাম বা " +"পাছৱৰ্ড নাথাকে." + +#: modules/access/live555.cpp:89 +msgid "" +"Sets the password for the connection, if no username or password are set in " +"the url." +msgstr "" +"সংযোগটোৰ বাবে পাছৱৰ্ডটো ছেট কৰে, যদি url টোত কোনো ব্যৱহাৰকৰ্তাৰ নাম বা পাছৱৰ্ড " +"নাথাকে." + +#: modules/access/live555.cpp:91 +msgid "RTSP frame buffer size" +msgstr "RTSP ফ্ৰেম বাফাৰ আকাৰ" + +#: modules/access/live555.cpp:92 +msgid "" +"RTSP start frame buffer size of the video track, can be increased in case of " +"broken pictures due to too small buffer." +msgstr "" +"RTSP য়ে ভিডিঅ' পথটোৰ ফ্ৰেম বাফাৰ আকাৰ আৰম্ভ কৰে, অতিশয় সৰু বাফাৰৰ বাবে ছবিবোৰ " +"ভাঙি যোৱাৰ ক্ষেত্ৰত বৃদ্ধি কৰিব পাৰি." + +#: modules/access/live555.cpp:98 +msgid "RTP/RTSP/SDP demuxer (using Live555)" +msgstr "RTP/RTSP/SDP ডিমাক্সাৰ (পোনপটীয়া555 ব্যৱহাৰ কৰি)" + +#: modules/access/live555.cpp:107 +msgid "RTSP/RTP access and demux" +msgstr "RTSP/RTP প্ৰৱেশ আৰু ডিমাক্স" + +#: modules/access/live555.cpp:112 modules/access/live555.cpp:113 +msgid "Use RTP over RTSP (TCP)" +msgstr "RTSP (TCP) ৰ ওপৰত RTP ব্যৱহাৰ কৰক" + +#: modules/access/live555.cpp:116 +msgid "Client port" +msgstr "গ্ৰাহক পোৰ্ট" + +#: modules/access/live555.cpp:117 +msgid "Port to use for the RTP source of the session" +msgstr "অধিৱেশনৰ RTP উত্সটোৰ বাবে ব্যৱহাৰ কৰিবললৈ পোৰ্ট" + +#: modules/access/live555.cpp:119 modules/access/live555.cpp:120 +msgid "Force multicast RTP via RTSP" +msgstr "RTSP ৰ যোগেদি RTP জোৰকৈ মাল্টিকাষ্ট কৰক" + +#: modules/access/live555.cpp:123 modules/access/live555.cpp:124 +msgid "Tunnel RTSP and RTP over HTTP" +msgstr "HTTP ৰ ওপৰত টানেল RTSP আৰু RTP" + +#: modules/access/live555.cpp:127 +msgid "HTTP tunnel port" +msgstr "HTTP টানেল পোৰ্ট" + +#: modules/access/live555.cpp:128 +msgid "Port to use for tunneling the RTSP/RTP over HTTP." +msgstr "HTTP ৰ ওপৰত RTSP/RTP টো টানেলিং কৰাৰ বাবে ব্যৱহাৰ কৰিবলৈ পোৰ্ট." + +#: modules/access/live555.cpp:677 +msgid "RTSP authentication" +msgstr "RTSP বৈধতা" + +#: modules/access/live555.cpp:678 +msgid "Please enter a valid login name and a password." +msgstr "অনুগ্ৰহ কৰি এটা বৈধ লগইন নাম আৰু এটা পাছৱৰ্ড ভৰাওক." + +#: modules/access/live555.cpp:703 +msgid "RTSP connection failed" +msgstr "RTSP সংযোগ ব্যৰ্থ হল" + +#: modules/access/live555.cpp:704 +msgid "Access to the stream is denied by the server configuration." +msgstr "ছাৰ্ভাৰৰ ৰূপৰেখাটোৰ দ্বাৰা ষ্ট্ৰিমটোলৈ প্ৰৱেশটো অস্বীকাৰ কৰা হৈছে." + +#: modules/access/mms/mms.c:49 +msgid "Force selection of all streams" +msgstr "সকলোবোৰ ষ্ট্ৰিমৰ নিৰ্বাচনটো জোৰ কৰক" + +#: modules/access/mms/mms.c:51 +msgid "" +"MMS streams can contain several elementary streams, with different bitrates. " +"You can choose to select all of them." +msgstr "" +"MMS ষ্ট্ৰিমবোৰে অসংখ্য প্ৰাথমিক ষ্ট্ৰিম ধাৰণ কৰিব পাৰে, বিভিন্ন বাইট হাৰবোৰৰ সৈতে. " +"সেইবোৰৰ সকলো নিৰ্বাচন কৰিবলৈ আপুনি পছন্দ কৰিব পাৰে." + +#: modules/access/mms/mms.c:54 +msgid "Maximum bitrate" +msgstr "সৰ্বাধিক বাইটৰ হাৰ" + +#: modules/access/mms/mms.c:56 +msgid "Select the stream with the maximum bitrate under that limit." +msgstr "সেই সীমাটোৰ অধীনত সৰ্বাধিক বাইট হাৰটোৰ সৈতে ষ্ট্ৰিমটো নিৰ্বাচন কৰক." + +#: modules/access/mms/mms.c:58 +msgid "TCP/UDP timeout (ms)" +msgstr "TCP/UDP সময় উকলি গল (ms)" + +#: modules/access/mms/mms.c:59 +msgid "" +"Amount of time (in ms) to wait before aborting network reception of data. " +"Note that there will be 10 retries before completely giving up." +msgstr "" +"ডাটাৰ নেটৱৰ্ক গ্ৰহণ লাভৰ আগতে অপেক্ষা কৰিবলগীয়া সময়ৰ পৰিমাণ (in ms). মন কৰিব যে " +"সম্পূৰ্ণৰূপে এৰি দিয়াৰ আগতে তাত 10 টা অৱসৰ থাকিব." + +#: modules/access/mms/mms.c:63 +msgid "Microsoft Media Server (MMS) input" +msgstr "মাইক্ৰ'ছফ্ট মিডিয়া ছৰ্ভাৰ (MMS) ইনপুট" + +#: modules/access/mtp.c:57 +msgid "MTP input" +msgstr "MTP ইনপুট" + +#: modules/access/mtp.c:58 +msgid "MTP" +msgstr "MTP" + +#: modules/access/mtp.c:167 modules/access/vdr.c:379 modules/access/vdr.c:545 +msgid "File reading failed" +msgstr "ফাইল পঢ়াটো ব্যৰ্থ হল" + +#: modules/access/mtp.c:168 +#, c-format +msgid "VLC could not read the file: %s" +msgstr "VLC য়ে ফাইলটো পঢ়িব নোৱাৰিলে: %s" + +#: modules/access/nfs.c:49 +msgid "Set NFS uid/guid automatically" +msgstr "" + +#: modules/access/nfs.c:50 +msgid "" +"If uid/gid are not specified in the url, VLC will automatically set a uid/" +"gid." +msgstr "" + +#: modules/access/nfs.c:57 +msgid "NFS" +msgstr "" + +#: modules/access/nfs.c:58 +msgid "NFS input" +msgstr "" + +#: modules/access/nfs.c:114 +msgid "NFS operation failed" +msgstr "" + +#: modules/access/oss.c:66 +msgid "Capture the audio stream in stereo." +msgstr "ষ্টেৰিঅ'ত অডিঅ' ষ্ট্ৰিমটো অধিগ্ৰহণ কৰক." + +#: modules/access/oss.c:67 modules/access_output/shout.c:95 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:176 +msgid "Samplerate" +msgstr "নমুনাৰ হাৰ" + +#: modules/access/oss.c:69 +msgid "" +"Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100, " +"48000)" +msgstr "" +"Hz ত অধিগ্ৰহণ কৰা অডিঅ' ষ্ট্ৰিমটোৰ নমুনাৰ হাৰ (উদাহৰণ: 11025, 22050, 44100, " +"48000)" + +#: modules/access/oss.c:76 +msgid "OSS" +msgstr "OSS" + +#: modules/access/oss.c:77 +msgid "OSS input" +msgstr "OSS ইনপুট" + +#: modules/access/pulse.c:35 +msgid "" +"Pass pulse:// to open the default PulseAudio source, or pulse://SOURCE to " +"open a specific source named SOURCE." +msgstr "" +"পাছ পাল্চ:// ডিফল্ট পাল্চ অডিঅ' উত্স খুলিবলৈ, বা পাল্চ://SOURCE নিৰ্ধাৰিত এটা উত্স " +"ডিভাইচ খুলিবলৈ SOURCE." + +#: modules/access/pulse.c:42 +msgid "PulseAudio" +msgstr "পাল্চ অডিঅ'" + +#: modules/access/pulse.c:43 +msgid "PulseAudio input" +msgstr "পাল্চ অডিঅ' ইনপুট" + +#: modules/access/rdp.c:72 +msgid "Encrypted connexion" +msgstr "এনক্ৰিপ্ট কৰা সংযোগ" + +#: modules/access/rdp.c:74 +msgid "Acquisition rate (in fps)" +msgstr "একুইজিশ্বন হাৰ (fps ত)" + +#: modules/access/rdp.c:85 +msgid "RDP" +msgstr "RDP" + +#: modules/access/rdp.c:89 +msgid "RDP Remote Desktop" +msgstr "RDP দূৰৈৰ ডেক্সটপ" + +#: modules/access/rist.c:65 +msgid "Range" +msgstr "" + +#: modules/access/rist.c:65 +msgid "Bitmask" +msgstr "" + +#: modules/access/rist.c:1127 modules/access_output/rist.c:849 +msgid "RIST" +msgstr "" + +#: modules/access/rist.c:1128 +msgid "RIST input" +msgstr "" + +#: modules/access/rist.c:1133 +msgid "RIST maximum packet size (bytes)" +msgstr "" + +#: modules/access/rist.c:1135 +msgid "RIST demux/decode maximum jitter (default is 5ms)" +msgstr "" + +#: modules/access/rist.c:1136 +msgid "" +"This controls the maximum jitter that will be passed to the demux/decode " +"chain. The lower the value, the more CPU cycles the algorithm will consume" +msgstr "" + +#: modules/access/rist.c:1138 +msgid "RIST latency (ms)" +msgstr "" + +#: modules/access/rist.c:1139 +msgid "RIST nack retry interval (ms)" +msgstr "" + +#: modules/access/rist.c:1141 +msgid "RIST reorder buffer (ms)" +msgstr "" + +#: modules/access/rist.c:1143 +msgid "RIST maximum retry count" +msgstr "" + +#: modules/access/rist.c:1145 +msgid "RIST nack type, 0 = range, 1 = bitmask. Default is range" +msgstr "" + +#: modules/access/rist.c:1147 +msgid "Disable NACK output packets" +msgstr "" + +#: modules/access/rist.c:1148 +msgid "Use this to disable packet recovery" +msgstr "" + +#: modules/access/rist.c:1149 +msgid "Do not check for a valid rtcp message from the encoder" +msgstr "" + +#: modules/access/rist.c:1150 +msgid "" +"Send nack messages even when we have not confirmed that the encoder is on " +"our local network." +msgstr "" + +#: modules/access/rtp/rtp.c:44 +msgid "RTCP (local) port" +msgstr "RTCP (স্থানীয়) পোৰ্ট" + +#: modules/access/rtp/rtp.c:46 +msgid "" +"RTCP packets will be received on this transport protocol port. If zero, " +"multiplexed RTP/RTCP is used." +msgstr "" +"এই পৰিবহন প্ৰটকল পোৰ্টটোত RTCP পেকেটবোৰ গ্ৰহণ কৰা হব. যদি শূন্য হয়, মাল্টিপ্লেক্সড " +"RTP/RTCP ব্যৱহাৰ কৰা হয়." + +#: modules/access/rtp/rtp.c:49 modules/stream_out/rtp.c:144 +msgid "SRTP key (hexadecimal)" +msgstr "SRTP কী (হেক্সাডেচিমেল)" + +#: modules/access/rtp/rtp.c:51 +msgid "" +"RTP packets will be authenticated and deciphered with this Secure RTP master " +"shared secret key. This must be a 32-character-long hexadecimal string." +msgstr "" +"এই সুৰক্ষিত মুখ্য বিনিময় কৰা গোপন কীটোৰ সৈতে RTPRTP পেকেটবোৰ বৈধ আৰু ডিচিফাৰ্ড কৰা " +"হব. এইটো এটা 32-আখৰ-দৈৰ্ঘৰ হেক্সাডেচিমেল ষ্ট্ৰিং হোৱাটো অপৰিহাৰ্য." + +#: modules/access/rtp/rtp.c:55 modules/stream_out/rtp.c:150 +msgid "SRTP salt (hexadecimal)" +msgstr "SRTP ছল্ট (হেক্সাডেচিমেল)" + +#: modules/access/rtp/rtp.c:57 modules/stream_out/rtp.c:152 +msgid "" +"Secure RTP requires a (non-secret) master salt value. This must be a 28-" +"character-long hexadecimal string." +msgstr "" +"সুৰক্ষিত RTP য়ে (গোপনীয় নহয়) মুখ্য ছল্ট মান এটা দাবী কৰে. এইটো এটা 28-আখৰ-দৈৰ্ঘৰ " +"হেক্সাডেচিমেল ষ্ট্ৰিং হোৱাটো অপৰিহাৰ্য." + +#: modules/access/rtp/rtp.c:60 +msgid "Maximum RTP sources" +msgstr "সৰ্বাধিক RTP উত্সবোৰ" + +#: modules/access/rtp/rtp.c:62 +msgid "How many distinct active RTP sources are allowed at a time." +msgstr "একেটা সময়ত কিমান স্পষ্ট সক্ৰিয় RTP উত্সবোৰ অনুমতি দিয়া হব." + +#: modules/access/rtp/rtp.c:64 +msgid "RTP source timeout (sec)" +msgstr "RTP উত্সৰ সময় উকলি গল(ছেকেণ্ড)" + +#: modules/access/rtp/rtp.c:66 +msgid "How long to wait for any packet before a source is expired." +msgstr "" +"উত্স এটাৰ ম্যাদ উকলি যোৱাৰ আগতে যিকোনো পেকেটৰ বাবে কিমান দেৰি অপেক্ষা কৰিব লাগে." + +#: modules/access/rtp/rtp.c:68 +msgid "Maximum RTP sequence number dropout" +msgstr "সৰ্বাধিক RTP ক্ৰম সংখ্যা ড্ৰপআউট" + +#: modules/access/rtp/rtp.c:70 +msgid "" +"RTP packets will be discarded if they are too much ahead (i.e. in the " +"future) by this many packets from the last received packet." +msgstr "" +"অন্তিমবাৰ লাভ কৰা পেকেটটোৰ পৰা এই বহুত পেকেটবোৰৰ দ্বাৰা RTP পেকেটবোৰ বাতিল কৰা " +"হব যদি সেইবোৰ বহুত বেছি আগত থাকে (যেনে, ভৱিষ্যতত)." + +#: modules/access/rtp/rtp.c:73 +msgid "Maximum RTP sequence number misordering" +msgstr "সৰ্বাধিক RTP ক্ৰম সংখ্যা ভুলকৈ সজোৱা হৈছে" + +#: modules/access/rtp/rtp.c:75 +msgid "" +"RTP packets will be discarded if they are too far behind (i.e. in the past) " +"by this many packets from the last received packet." +msgstr "" +"অন্তিমবাৰ লাভ কৰা পেকেটটোৰ পৰা এই বহুত পেকেটবোৰৰ দ্বাৰা RTP পেকেটবোৰ বাতিল কৰা " +"হব যদি সেইবোৰ বহুত বেছি পিছত থাকে (যেনে, অতীতত)." + +#: modules/access/rtp/rtp.c:78 +msgid "RTP payload format assumed for dynamic payloads" +msgstr "ডাইনেমিক পেলোডবোৰৰ বাবে RTP পেলোড ফৰমেট ধাৰণা কৰা হল" + +#: modules/access/rtp/rtp.c:81 +msgid "" +"This payload format will be assumed for dynamic payload types (between 96 " +"and 127) if it can't be determined otherwise with out-of-band mappings (SDP)" +msgstr "" +"ডাইনেমিক পেলোড প্ৰকাৰবোৰৰ বাবে এই পেলোড ফৰমেটটো ধাৰণা কৰা হব (96 আৰু 127 ৰ " +"মাজত) যদি এইটো নিৰ্ধাৰণ কৰিব নোৱাৰি অন্যথা মেপিংবোৰৰ আউট-অফ-বেণ্ডৰ সৈতে (SDP)" + +#: modules/access/rtp/rtp.c:95 modules/stream_out/rtp.c:187 +msgid "RTP" +msgstr "RTP" + +#: modules/access/rtp/rtp.c:96 +msgid "Real-Time Protocol (RTP) input" +msgstr "প্ৰকৃত-সময়ৰ প্ৰটকল (RTP) ইনপুট" + +#: modules/access/rtp/rtp.c:773 +msgid "SDP required" +msgstr "SDP দাবী কৰে" + +#: modules/access/rtp/rtp.c:774 +#, c-format +msgid "" +"A description in SDP format is required to receive the RTP stream. Note that " +"rtp:// URIs cannot work with dynamic RTP payload format (%)." +msgstr "" +"RTP ষ্ট্ৰিমটো গ্ৰহণ কৰিবলৈ SDP ফৰমেটত বিৱৰণ এটা দাবী কৰে. মনকৰিব যে rtp:// " +"ডাইনেমিক RTP পেলোড ফৰমেটৰ সৈতে URIবোৰে কাৰ্য নকৰে (%)." + +#: modules/access/rtsp/access.c:48 modules/access/rtsp/access.c:49 +msgid "Real RTSP" +msgstr "প্ৰকৃত RTSP" + +#: modules/access/rtsp/access.c:87 +msgid "Connection failed" +msgstr "সংযোগ ব্যৰ্থ হল" + +#: modules/access/rtsp/access.c:88 +#, c-format +msgid "VLC could not connect to \"%s:%d\"." +msgstr "VLC য়ে \"%s:%d\" লৈ সংযোগ স্থাপন কৰিব নোৱাৰিলে." + +#: modules/access/rtsp/access.c:225 +msgid "Session failed" +msgstr "অধিৱেশন ব্যৰ্থ হল" + +#: modules/access/rtsp/access.c:226 +msgid "The requested RTSP session could not be established." +msgstr "দাবী কৰা RTSP অধিৱেশটো স্থাপন কৰিব পৰা নগল." + +#: modules/access/satip.c:60 modules/access/udp.c:59 +msgid "Receive buffer" +msgstr "বাফাৰ গ্ৰহণ কৰক" + +#: modules/access/satip.c:61 modules/access/udp.c:60 +msgid "UDP receive buffer size (bytes)" +msgstr "UDP গ্ৰহণ কৰা বাফাৰৰ আকাৰ (বাইট)" + +#: modules/access/satip.c:63 +msgid "Request multicast stream" +msgstr "" + +#: modules/access/satip.c:64 +msgid "Request server to send stream as multicast" +msgstr "" + +#: modules/access/satip.c:66 modules/lua/vlc.c:62 +#: share/lua/http/dialogs/stream_config_window.html:28 +#: share/lua/http/dialogs/stream_window.html:87 +msgid "Host" +msgstr "হষ্ট" + +#: modules/access/satip.c:70 +msgid "SAT>IP Receiver Plugin" +msgstr "" + +#: modules/access/screen/screen.c:45 +#: modules/gui/qt/components/open_panels.cpp:1104 +msgid "Desired frame rate for the capture." +msgstr "অধিগ্ৰহণটোৰ বাবে বিচৰা ফ্ৰেম হাৰ." + +#: modules/access/screen/screen.c:48 +msgid "Capture fragment size" +msgstr "উপাংশৰ আকাৰ অধিগ্ৰহণ কৰক" + +#: modules/access/screen/screen.c:50 +msgid "" +"Optimize the capture by fragmenting the screen in chunks of predefined " +"height (16 might be a good value, and 0 means disabled)." +msgstr "" +"পূৰ্বনিৰ্ধাৰিত উচ্চতাৰ গোটবোৰত স্ক্ৰীনটো উপাংশ কৰি অধিগ্ৰহণটো যিমান দূৰ সম্ভৱ কৰক (16 " +"টো এটা ভাল মান হব পাৰে, আৰু 0 মানে হল অক্ষম)." + +#: modules/access/screen/screen.c:55 modules/access/screen/xcb.c:47 +msgid "Region top row" +msgstr "অঞ্চলটোৰ ওপৰৰ শাৰী" + +#: modules/access/screen/screen.c:57 modules/access/screen/xcb.c:49 +msgid "Ordinate of the capture region in pixels." +msgstr "পিক্সেলত অধিগ্ৰহণ কৰা অঞ্চলৰ উলম্ব দূৰত্ব." + +#: modules/access/screen/screen.c:59 modules/access/screen/xcb.c:43 +msgid "Region left column" +msgstr "অঞ্চলৰ বাওঁফালৰ স্তম্ভ" + +#: modules/access/screen/screen.c:61 modules/access/screen/xcb.c:45 +msgid "Abscissa of the capture region in pixels." +msgstr "পিক্সেলত অধিগ্ৰহণ কৰা অঞ্চলটোৰ সমান্তৰাল দূৰত্ব." + +#: modules/access/screen/screen.c:63 modules/access/screen/xcb.c:51 +msgid "Capture region width" +msgstr "অঞ্চলটোৰ প্ৰস্থ অধিগ্ৰহণ কৰক " + +#: modules/access/screen/screen.c:65 modules/access/screen/xcb.c:55 +msgid "Capture region height" +msgstr "অধিগ্ৰহণ কৰা অঞ্চলটোৰ উচ্চতা" + +#: modules/access/screen/screen.c:67 modules/access/screen/xcb.c:59 +#: modules/gui/macosx/VLCOpenWindowController.m:214 +msgid "Follow the mouse" +msgstr "মাউছটো অনুসৰণ কৰক" + +#: modules/access/screen/screen.c:69 modules/access/screen/xcb.c:61 +msgid "Follow the mouse when capturing a subscreen." +msgstr "যেতিয়া উপস্ক্ৰীন এটা ধৰি ৰাখে মাউছটো অনুসৰণ কৰক." + +#: modules/access/screen/screen.c:73 +msgid "Mouse pointer image" +msgstr "মাউছ নিৰ্দেশকৰ্তা ছবি" + +#: modules/access/screen/screen.c:75 +msgid "" +"If specified, will use the image to draw the mouse pointer on the capture." +msgstr "" +"যদি নিৰ্ধাৰণ কৰে, তেন্তে অধিগ্ৰহণটোত মাউছ নিৰ্দেশকটো আনিবলৈ ছবিটো ব্যৱহাৰ কৰিব." + +#: modules/access/screen/screen.c:80 +msgid "Display ID" +msgstr "ID প্ৰদৰ্শন কৰক" + +#: modules/access/screen/screen.c:82 +msgid "Display ID. If not specified, main display ID is used." +msgstr "" + +#: modules/access/screen/screen.c:83 +msgid "Screen index" +msgstr "স্ক্ৰীনৰ সূচী" + +#: modules/access/screen/screen.c:85 +msgid "Index of screen (1, 2, 3, ...). Alternative to Display ID." +msgstr "স্ক্ৰীনৰ সূচী (1, 2, 3, ...). ID প্ৰদৰ্শন কৰিবলৈ বিকল্প." + +#: modules/access/screen/screen.c:98 +msgid "Screen Input" +msgstr "স্ক্ৰীন ইনপুট" + +#: modules/access/screen/screen.c:99 modules/access/screen/xcb.c:70 +#: modules/gui/macosx/VLCMainMenu.m:610 +#: modules/gui/macosx/VLCOpenWindowController.m:207 +#: modules/gui/macosx/VLCOpenWindowController.m:209 +#: modules/gui/macosx/VLCOpenWindowController.m:489 +#: modules/gui/macosx/VLCOpenWindowController.m:1118 +#: modules/gui/macosx/VLCSimplePrefsController.m:674 +msgid "Screen" +msgstr "স্ক্ৰীন" + +#: modules/access/screen/xcb.c:41 modules/access/shm.c:44 +#: modules/access/vnc.c:61 +msgid "How many times the screen content should be refreshed per second." +msgstr "প্ৰতি ছেকেণ্ডত স্ক্ৰীনৰ উপাদানটো কিমানবাৰ পুনৰসজীৱ কৰা উচিত." + +#: modules/access/screen/xcb.c:53 +msgid "Pixel width of the capture region, or 0 for full width" +msgstr "অধিগ্ৰহণ কৰা অঞ্চলৰ পিক্সেল প্ৰস্থ, বা সম্পূৰ্ণ প্ৰস্থৰ বাবে 0" + +#: modules/access/screen/xcb.c:57 +msgid "Pixel height of the capture region, or 0 for full height" +msgstr "অধিগ্ৰহণ কৰা অঞ্চলৰ পিক্সেল উচ্চতা, বা সম্পূৰ্ণ প্ৰস্থৰ বাবে 0" + +#: modules/access/screen/xcb.c:71 +msgid "Screen capture (with X11/XCB)" +msgstr "স্ক্ৰীন অধিগ্ৰহণ (X11/XCB ৰ সৈতে)" + +#: modules/access/sdp.c:32 modules/stream_out/rtp.c:79 +msgid "SDP" +msgstr "SDP" + +#: modules/access/sdp.c:33 +msgid "Session Description Protocol" +msgstr "অধিৱেশন বিৱৰণৰ প্ৰটকল" + +#: modules/access/sftp.c:53 +msgid "SFTP port" +msgstr "SFTP পোৰ্ট" + +#: modules/access/sftp.c:54 +msgid "SFTP port number to use on the server" +msgstr "ছাৰ্ভাৰটোত ব্যৱহাৰ কৰিবলৈ SFTP পোৰ্ট সংখ্যা" + +#: modules/access/sftp.c:64 +msgid "SFTP input" +msgstr "SFTP ইনপুট" + +#: modules/access/sftp.c:411 +msgid "SFTP authentication" +msgstr "SFTP বৈধতা" + +#: modules/access/sftp.c:412 +#, c-format +msgid "Please enter a valid login and password for the sftp connexion to %s" +msgstr "%s লৈ sftp সংযোগৰ বাবে অনুগ্ৰহ কৰি এটা বৈধ লগইন আৰু পাছৱৰ্ড ভৰাওক" + +#: modules/access/shm.c:46 modules/access/vnc.c:58 +msgid "Frame buffer depth" +msgstr "ফ্ৰেম বাফাৰৰ গভীৰতা" + +#: modules/access/shm.c:48 +msgid "Pixel depth of the frame buffer, or zero for XWD file" +msgstr "ফ্ৰেম বাফাৰটোৰ পিক্সেল গভীৰতা, বা XWD ফাইলৰ বাবে শূন্য" + +#: modules/access/shm.c:50 +msgid "Frame buffer width" +msgstr "ফ্ৰেম বাফাৰ প্ৰস্থ" + +#: modules/access/shm.c:52 +msgid "Pixel width of the frame buffer (ignored for XWD file)" +msgstr "ফ্ৰেম বাফাৰটোৰ পিক্সেল প্ৰস্থ (XWD ফাইলৰ বাবে অৱজ্ঞা কৰা হল)" + +#: modules/access/shm.c:54 +msgid "Frame buffer height" +msgstr "ফ্ৰেম বাফাৰ উচ্চতা" + +#: modules/access/shm.c:56 +msgid "Pixel height of the frame buffer (ignored for XWD file)" +msgstr "ফ্ৰেম বাফাৰটোৰ পিক্সেল উচ্চতা (XWD ফাইলৰ বাবে অৱজ্ঞা কৰা হল)" + +#: modules/access/shm.c:58 +msgid "Frame buffer segment ID" +msgstr "ফ্ৰেম বাফাৰ খণ্ড ID" + +#: modules/access/shm.c:60 +msgid "" +"System V shared memory segment ID of the frame buffer (this is ignored if --" +"shm-file is specified)." +msgstr "" +"ছিষ্টেম V য়ে ফ্ৰেম বাফাৰটোৰ স্মৃতি খণ্ড ID বিনিময় কৰে (এইটো অৱজ্ঞা কৰে যদি --shm-" +"ফাইল নিৰ্ধাৰণ কৰা হয়)." + +#: modules/access/shm.c:63 +msgid "Frame buffer file" +msgstr "ফ্ৰেম বাফাৰ ফাইল" + +#: modules/access/shm.c:65 +msgid "Path of the memory mapped file of the frame buffer" +msgstr "ফ্ৰেম বাফাৰটোৰ স্মৃতি মেপ কৰা ফাইলটোৰ পাথ" + +#: modules/access/shm.c:75 +msgid "XWD file (autodetect)" +msgstr "XWD ফাইল (স্বয়ংক্ৰিয়ভাৱে চিনাক্ত কৰা হল)" + +#: modules/access/shm.c:76 modules/access/vnc.c:69 +msgid "8 bits" +msgstr "8 বিট" + +#: modules/access/shm.c:76 +msgid "15 bits" +msgstr "15 বিট" + +#: modules/access/shm.c:76 modules/access/vnc.c:69 +msgid "16 bits" +msgstr "16 বিট" + +#: modules/access/shm.c:76 modules/access/vnc.c:69 +msgid "24 bits" +msgstr "24 বিট" + +#: modules/access/shm.c:76 modules/access/vnc.c:69 +msgid "32 bits" +msgstr "32 বিট" + +#: modules/access/shm.c:83 +msgid "Framebuffer input" +msgstr "ফ্ৰেম বাফাৰ ইনপুট" + +#: modules/access/shm.c:84 +msgid "Shared memory framebuffer" +msgstr "স্মৃতি ফ্ৰেম বাফাৰ বিনিময় কৰা হল" + +#: modules/access/smb.c:65 +msgid "Samba (Windows network shares) input" +msgstr "ছাম্বা (উইণ্ডোজ নেটৱৰ্ক বিনিময়বোৰ) ইনপুট" + +#: modules/access/smb.c:68 +msgid "SMB input" +msgstr "SMB ইনপুট" + +#: modules/access/smb_common.h:27 +msgid "SMB domain" +msgstr "SMB ক্ষেত্ৰ" + +#: modules/access/smb_common.h:28 +msgid "Domain/Workgroup that will be used for the connection." +msgstr "সংযোগটোৰ বাবে ব্যৱহাৰ কৰিবলগীয়া ক্ষেত্ৰ/কাৰ্যগোট." + +#: modules/access/smb_common.h:34 +msgid "SMB authentication required" +msgstr "" + +#: modules/access/smb_common.h:35 +#, c-format +msgid "" +"The computer (%s) you are trying to connect to requires authentication.\n" +"Please provide a username (ideally a domain name using the format DOMAIN;" +"username) and a password." +msgstr "" + +#: modules/access/srt.c:428 modules/access_output/srt.c:457 +msgid "SRT" +msgstr "" + +#: modules/access/srt.c:429 +msgid "SRT input" +msgstr "" + +#: modules/access/srt.c:435 modules/access_output/srt.c:464 +msgid "Return poll wait after timeout milliseconds (-1 = infinite)" +msgstr "" + +#: modules/access/srt.c:438 modules/access_output/srt.c:466 +msgid "SRT latency (ms)" +msgstr "" + +#: modules/access/srt.c:440 modules/access_output/srt.c:468 +msgid "Password for stream encryption" +msgstr "" + +#: modules/access/srt.c:446 modules/access_output/srt.c:480 +msgid " SRT Stream ID" +msgstr "" + +#: modules/access/srt_common.c:26 +msgid "16 bytes" +msgstr "" + +#: modules/access/srt_common.c:27 +msgid "24 bytes" +msgstr "" + +#: modules/access/srt_common.c:27 +msgid "32 bytes" +msgstr "" + +#: modules/access/tcp.c:116 +msgid "TCP" +msgstr "TCP" + +#: modules/access/tcp.c:117 +msgid "TCP input" +msgstr "TCP ইনপুট" + +#: modules/access/timecode.c:42 +msgid "Time code" +msgstr "সময় কোড" + +#: modules/access/timecode.c:43 +msgid "Time code subpicture elementary stream generator" +msgstr "সময় কোড উপছবি প্ৰাথমিক ষ্ট্ৰিম উত্পাদক" + +#: modules/access/udp.c:61 +msgid "UDP Source timeout (sec)" +msgstr "" + +#: modules/access/udp.c:64 +msgid "UDP" +msgstr "UDP" + +#: modules/access/udp.c:65 +msgid "UDP input" +msgstr "UDP ইনপুট" + +#: modules/access/v4l2/controls.c:770 +msgid "Reset defaults" +msgstr "ডিফল্টবোৰ পুনৰ ছেট কৰক" + +#: modules/access/v4l2/v4l2.c:44 +msgid "Video capture device" +msgstr "ভিডিঅ’ অধিগ্ৰহণৰ ডিভাইচ" + +#: modules/access/v4l2/v4l2.c:45 +msgid "Video capture device node." +msgstr "ভিডিঅ’ অধিগ্ৰহণৰ ডিভাইচ নোড." + +#: modules/access/v4l2/v4l2.c:46 +msgid "VBI capture device" +msgstr "VBI অধিগ্ৰহণৰ ডিভাইচ" + +#: modules/access/v4l2/v4l2.c:48 +msgid "The device node where VBI data can be read (for closed captions)." +msgstr "" + +#: modules/access/v4l2/v4l2.c:50 modules/stream_out/standard.c:92 +msgid "Standard" +msgstr "মানবিশিষ্ট" + +#: modules/access/v4l2/v4l2.c:52 +msgid "Video standard (Default, SECAM, PAL, or NTSC)." +msgstr "ভিডিঅ’ মানবিশিষ্ট (ডিফল্ট, SECAM, PAL, বা NTSC)." + +#: modules/access/v4l2/v4l2.c:55 +msgid "" +"Force the Video4Linux2 video device to use a specific chroma format (eg. " +"I420 or I422 for raw images, MJPG for M-JPEG compressed input). Complete " +"list: GREY, I240, RV16, RV15, RV24, RV32, YUY2, YUYV, UYVY, I41N, I422, " +"I420, I411, I410, MJPG" +msgstr "" + +#: modules/access/v4l2/v4l2.c:61 +msgid "Input of the card to use (see debug)." +msgstr "ব্যৱহাৰ কৰিবলৈ কাৰ্ডৰ ইনপুটটো (ডিবাগ চাওক)." + +#: modules/access/v4l2/v4l2.c:62 +msgid "Audio input" +msgstr "অডিঅ’ ইনপুট" + +#: modules/access/v4l2/v4l2.c:64 +msgid "Audio input of the card to use (see debug)." +msgstr "ব্যৱহাৰ কৰিবলৈ কাৰ্ডখনৰ অডিঅ’ ইনপুট (সংলাপ চাওক)." + +#: modules/access/v4l2/v4l2.c:68 +msgid "" +"The specified pixel resolution is forced (if both width and height are " +"strictly positive)." +msgstr "" +"নিৰ্ধাৰিত পিক্সেল বিশ্লেষণটো জোৰ কৰা হৈছে (যদি প্ৰস্থ আৰু উচ্চতা দুয়োটা কঠোৰভাৱে " +"ধনাত্মক)." + +#: modules/access/v4l2/v4l2.c:71 +msgid "Maximum frame rate to use (0 = no limits)." +msgstr "ব্যৱহাৰ কৰিবলৈ সৰ্বাধিক ফ্ৰেমৰ হাৰ (0 = কোনো সীমা নাই)." + +#: modules/access/v4l2/v4l2.c:73 +msgid "Radio device" +msgstr "ৰেডিঅ’ ডিভাইচ" + +#: modules/access/v4l2/v4l2.c:74 +msgid "Radio tuner device node." +msgstr "ৰেডিঅ’ টিউনাৰ ডিভাইচ নোড." + +#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1074 +msgid "Frequency" +msgstr "কম্পনাংক" + +#: modules/access/v4l2/v4l2.c:77 +msgid "Tuner frequency in Hz or kHz (see debug output)." +msgstr "" + +#: modules/access/v4l2/v4l2.c:78 +msgid "Audio mode" +msgstr "অডিঅ’ ধৰণ" + +#: modules/access/v4l2/v4l2.c:80 +msgid "Tuner audio mono/stereo and track selection." +msgstr "টিউনাৰ অডিঅ' ম'ন'/ষ্টেৰিঅ' আৰু পথ নিৰ্বাচন." + +#: modules/access/v4l2/v4l2.c:82 +msgid "Reset controls" +msgstr "নিয়ন্ত্ৰণবোৰ পুনৰ ছেট কৰক" + +#: modules/access/v4l2/v4l2.c:83 +msgid "Reset controls to defaults." +msgstr "ডিফল্টবোৰলৈ নিয়ন্ত্ৰণবোৰ পুনৰ ছেট কৰক." + +#: modules/access/v4l2/v4l2.c:84 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:206 +#: modules/gui/qt/ui/video_effects.h:1253 +msgid "Brightness" +msgstr "উজ্জলতাবোৰ" + +#: modules/access/v4l2/v4l2.c:85 +msgid "Picture brightness or black level." +msgstr "ছবিৰ উজ্জ্বলতা বা কলাৰ স্তৰ." + +#: modules/access/v4l2/v4l2.c:86 +msgid "Automatic brightness" +msgstr "স্বয়ংক্ৰিয় উজ্জ্বলতাবোৰ" + +#: modules/access/v4l2/v4l2.c:88 +msgid "Automatically adjust the picture brightness." +msgstr "ছবিৰ উজ্জ্বলতাবোৰ স্বয়ংক্ৰিয়ভাৱে মিলাওক." + +#: modules/access/v4l2/v4l2.c:89 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:205 +#: modules/gui/qt/ui/video_effects.h:1255 +msgid "Contrast" +msgstr "প্ৰভেদ" + +#: modules/access/v4l2/v4l2.c:90 +msgid "Picture contrast or luma gain." +msgstr "ছবিৰ প্ৰভেদ বা লুমা লাভ." + +#: modules/access/v4l2/v4l2.c:91 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:208 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:254 +#: modules/gui/qt/ui/video_effects.h:1256 +#: modules/gui/qt/ui/video_effects.h:1288 +msgid "Saturation" +msgstr "চেচুৰেশ্বন" + +#: modules/access/v4l2/v4l2.c:92 +msgid "Picture saturation or chroma gain." +msgstr "ছবি চেচুৰেশ্বন বা ক্ৰোমা লাভ." + +#: modules/access/v4l2/v4l2.c:93 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:204 +#: modules/gui/qt/ui/video_effects.h:1252 +msgid "Hue" +msgstr "হিউ" + +#: modules/access/v4l2/v4l2.c:94 +msgid "Hue or color balance." +msgstr "হিউ বা ৰংৰ সমতা." + +#: modules/access/v4l2/v4l2.c:95 +msgid "Automatic hue" +msgstr "স্বয়ংক্ৰিয় হিউ" + +#: modules/access/v4l2/v4l2.c:97 +msgid "Automatically adjust the picture hue." +msgstr "ছবিৰ হিউটো স্বয়ক্ৰিয়ভাৱে মিলাওক." + +#: modules/access/v4l2/v4l2.c:98 +msgid "White balance temperature (K)" +msgstr "বগা সমতাৰ উষ্ঞতা (K)" + +#: modules/access/v4l2/v4l2.c:100 +msgid "" +"White balance temperature as a color temperation in Kelvin (2800 is minimum " +"incandescence, 6500 is maximum daylight)." +msgstr "" +"ৰংৰ উষ্ঞতা হিচাপে কেলভিনত বগা সমতাৰ উষ্ঞতা (2800 হল নূন্যতম বিকিৰণ, 6500 হল " +"সৰ্বাধিক দিনৰ পোহৰ)." + +#: modules/access/v4l2/v4l2.c:102 +msgid "Automatic white balance" +msgstr "স্বয়ংক্ৰিয় বগা সমতা" + +#: modules/access/v4l2/v4l2.c:104 +msgid "Automatically adjust the picture white balance." +msgstr "ছবিৰ বগা সমতাটো স্বয়ক্ৰিয়ভাৱে মিলাওক." + +#: modules/access/v4l2/v4l2.c:105 +msgid "Red balance" +msgstr "ৰঙা সমতা" + +#: modules/access/v4l2/v4l2.c:107 +msgid "Red chroma balance." +msgstr "ৰঙা ক্ৰোমা সমতা." + +#: modules/access/v4l2/v4l2.c:108 +msgid "Blue balance" +msgstr "নীলা সমতা" + +#: modules/access/v4l2/v4l2.c:110 +msgid "Blue chroma balance." +msgstr "নীলা ক্ৰোমা সমতা." + +#: modules/access/v4l2/v4l2.c:111 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:209 +#: modules/gui/qt/ui/video_effects.h:1257 +msgid "Gamma" +msgstr "গামা" + +#: modules/access/v4l2/v4l2.c:113 +msgid "Gamma adjust." +msgstr "গামা মিলোৱা." + +#: modules/access/v4l2/v4l2.c:114 +msgid "Automatic gain" +msgstr "স্বয়ংক্ৰিয় গেইন" + +#: modules/access/v4l2/v4l2.c:116 +msgid "Automatically set the video gain." +msgstr "ভিডিঅ' গেইনটো স্বয়ংক্ৰিয়ভাৱে ছেট কৰক." + +#: modules/access/v4l2/v4l2.c:117 modules/audio_filter/gain.c:62 +msgid "Gain" +msgstr "গেইন" + +#: modules/access/v4l2/v4l2.c:119 +msgid "Picture gain." +msgstr "ছবি গেইন." + +#: modules/access/v4l2/v4l2.c:120 +msgid "Sharpness" +msgstr "তীক্ষ্নতা" + +#: modules/access/v4l2/v4l2.c:121 +msgid "Sharpness filter adjust." +msgstr "তীক্ষ্নতা ফিল্টাৰ মিলাওক." + +#: modules/access/v4l2/v4l2.c:122 +msgid "Chroma gain" +msgstr "ক্ৰোমা লাভ" + +#: modules/access/v4l2/v4l2.c:123 +msgid "Chroma gain control." +msgstr "ক্ৰোমা লাভ নিয়ন্ত্ৰণ." + +#: modules/access/v4l2/v4l2.c:124 +msgid "Automatic chroma gain" +msgstr "স্বয়ংক্ৰিয় ক্ৰোমা লাভ" + +#: modules/access/v4l2/v4l2.c:126 +msgid "Automatically control the chroma gain." +msgstr "স্বয়ংক্ৰিয়ভাৱে ক্ৰোমা লাভটো নিয়ন্ত্ৰণ কৰক." + +#: modules/access/v4l2/v4l2.c:127 +msgid "Power line frequency" +msgstr "শক্তি শাৰীৰ কম্পনাংক" + +#: modules/access/v4l2/v4l2.c:129 +msgid "Power line frequency anti-flicker filter." +msgstr "শক্তি শাৰী কম্পনাংক ফ্লিকাৰ বিৰোধী ফিল্টাৰ." + +#: modules/access/v4l2/v4l2.c:137 +msgid "50 Hz" +msgstr "50 Hz" + +#: modules/access/v4l2/v4l2.c:137 +#: modules/gui/qt/components/extended_panels.cpp:1132 +msgid "60 Hz" +msgstr "60 Hz" + +#: modules/access/v4l2/v4l2.c:139 +msgid "Backlight compensation" +msgstr "পিছফালৰ পোহৰৰ ক্ষতিপূৰণ" + +#: modules/access/v4l2/v4l2.c:141 +msgid "Band-stop filter" +msgstr "বেণ্ড-বন্ধ ফিল্টাৰ" + +#: modules/access/v4l2/v4l2.c:143 +msgid "Cut a light band induced by fluorescent lighting (unit undocumented)." +msgstr "" +"ফ্লুৰেচেন্ট পোহৰৰ দ্বাৰা আৰোপ কৰা পোহৰ বেণ্ড এটা কাটক (নথি নকৰাবোৰ একগোট কৰক)." + +#: modules/access/v4l2/v4l2.c:144 +msgid "Horizontal flip" +msgstr "সমান্তৰাল ফ্লিপ" + +#: modules/access/v4l2/v4l2.c:146 +msgid "Flip the picture horizontally." +msgstr "ছবিটো সমান্তৰালভাৱে ফ্লিপ কৰক." + +#: modules/access/v4l2/v4l2.c:147 +msgid "Vertical flip" +msgstr "উলম্ব ফ্লিপ" + +#: modules/access/v4l2/v4l2.c:149 +msgid "Flip the picture vertically." +msgstr "ছবিটো উলম্বভাৱে ফ্লিপ কৰক." + +#: modules/access/v4l2/v4l2.c:150 +msgid "Rotate (degrees)" +msgstr "ঘূৰাওক (ডিগ্ৰীবোৰ)" + +#: modules/access/v4l2/v4l2.c:151 +msgid "Picture rotation angle (in degrees)." +msgstr "ছবি আৱৰ্তনৰ কোণ (ডিগ্ৰীত)." + +#: modules/access/v4l2/v4l2.c:152 +msgid "Color killer" +msgstr "ৰং কিলাৰ" + +#: modules/access/v4l2/v4l2.c:154 +msgid "" +"Enable the color killer, i.e. switch to black & white picture whenever the " +"signal is weak." +msgstr "" +"ৰং কিলাৰটো সক্ষম কৰক, যেনে, কলা & বগা ছবিলৈ শ্বুইট্চ কৰক যেতিয়া সংকেতটো দুৰ্বল হয়." + +#: modules/access/v4l2/v4l2.c:156 +msgid "Color effect" +msgstr "ৰংৰ প্ৰভাৱ" + +#: modules/access/v4l2/v4l2.c:157 +msgid "Select a color effect." +msgstr "ৰংৰ প্ৰভাৱ এটা নিৰ্বাচন কৰক." + +#: modules/access/v4l2/v4l2.c:164 +msgid "Black & white" +msgstr "কলা & বগা" + +#: modules/access/v4l2/v4l2.c:164 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:256 +#: modules/video_filter/sepia.c:66 modules/gui/qt/ui/video_effects.h:1290 +msgid "Sepia" +msgstr "ছেপিয়া" + +#: modules/access/v4l2/v4l2.c:164 +msgid "Negative" +msgstr "ঋণাত্মক" + +#: modules/access/v4l2/v4l2.c:165 +msgid "Emboss" +msgstr "ইমবছ" + +#: modules/access/v4l2/v4l2.c:165 +msgid "Sketch" +msgstr "স্কেটচ্ছ কৰক" + +#: modules/access/v4l2/v4l2.c:165 +msgid "Sky blue" +msgstr "আকাশী নীলা" + +#: modules/access/v4l2/v4l2.c:166 +msgid "Grass green" +msgstr "ঘাঁহৰ সেউজীয়া" + +#: modules/access/v4l2/v4l2.c:166 +msgid "Skin whiten" +msgstr "স্কিন বগা কৰা" + +#: modules/access/v4l2/v4l2.c:166 +msgid "Vivid" +msgstr "ভিভিড" + +#: modules/access/v4l2/v4l2.c:169 modules/audio_output/auhal.c:43 +#: modules/audio_output/directsound.c:69 modules/audio_output/mmdevice.c:1489 +#: modules/audio_output/waveout.c:145 +msgid "Audio volume" +msgstr "অডিঅ' প্ৰসাৰ" + +#: modules/access/v4l2/v4l2.c:171 +msgid "Volume of the audio input." +msgstr "অডিঅ' ইনপুটটোৰ প্ৰসাৰ" + +#: modules/access/v4l2/v4l2.c:172 +msgid "Audio balance" +msgstr "অডিঅ' সমতা" + +#: modules/access/v4l2/v4l2.c:174 +msgid "Balance of the audio input." +msgstr "অডিঅ' ইনপুটটোৰ সমতা." + +#: modules/access/v4l2/v4l2.c:175 +msgid "Bass level" +msgstr "বেছ স্তৰ" + +#: modules/access/v4l2/v4l2.c:177 +msgid "Bass adjustment of the audio input." +msgstr "অডিঅ' ইনপুটটোৰ বেছ মিলোৱা." + +#: modules/access/v4l2/v4l2.c:178 +msgid "Treble level" +msgstr "ত্ৰিবল স্তৰ" + +#: modules/access/v4l2/v4l2.c:180 +msgid "Treble adjustment of the audio input." +msgstr "অডিঅ' ইনপুটটোৰ ত্ৰিবল মিলোৱা." + +#: modules/access/v4l2/v4l2.c:183 +msgid "Mute the audio." +msgstr "অডিঅ'টো নিস্তব্দ কৰক." + +#: modules/access/v4l2/v4l2.c:184 +msgid "Loudness mode" +msgstr "প্ৰাৱল্যৰ ধৰণ" + +#: modules/access/v4l2/v4l2.c:186 +msgid "Loudness mode a.k.a. bass boost." +msgstr "প্ৰাৱল্যৰ ধৰণ a.k.a. বেছ বুষ্ট." + +#: modules/access/v4l2/v4l2.c:188 +msgid "v4l2 driver controls" +msgstr "v4l2 ড্ৰাইভাৰ নিয়ন্ত্ৰণবোৰ" + +#: modules/access/v4l2/v4l2.c:190 +msgid "" +"Set the v4l2 driver controls to the values specified using a comma separated " +"list optionally encapsulated by curly braces (e.g.: {video_bitrate=6000000," +"audio_crc=0,stream_type=3} ). To list available controls, increase verbosity " +"(-vv) or use the v4l2-ctl application." +msgstr "" + +#: modules/access/v4l2/v4l2.c:242 modules/codec/avcodec/avcodec.c:50 +#: modules/codec/avcodec/avcodec.c:54 modules/codec/x264.c:429 +#: modules/control/hotkeys.c:395 +#: modules/gui/macosx/VLCAddonsWindowController.m:100 +#: modules/gui/qt/dialogs/convert.cpp:164 +#: modules/gui/qt/dialogs/plugins.cpp:382 +#: modules/gui/qt/dialogs/preferences.cpp:79 +msgid "All" +msgstr "সকলো" + +#: modules/access/v4l2/v4l2.c:246 +msgid "Multichannel television sound (MTS)" +msgstr "মাল্টিচেনেল টেলিভিশ্বন শব্দ (MTS)" + +#: modules/access/v4l2/v4l2.c:247 +msgid "525 lines / 60 Hz" +msgstr "525 শাৰী / 60 Hz" + +#: modules/access/v4l2/v4l2.c:247 +msgid "625 lines / 50 Hz" +msgstr "625 শাৰী / 50 Hz" + +#: modules/access/v4l2/v4l2.c:255 +msgid "PAL N Argentina" +msgstr "PAL N আৰ্জেন্টিনা" + +#: modules/access/v4l2/v4l2.c:256 +msgid "NTSC M Japan" +msgstr "NTSC M জাপান" + +#: modules/access/v4l2/v4l2.c:256 +msgid "NTSC M South Korea" +msgstr "NTSC M দক্ষিণ কোৰিয়া" + +#: modules/access/v4l2/v4l2.c:269 +msgid "Primary language" +msgstr "প্ৰাথমিক ভাষা" + +#: modules/access/v4l2/v4l2.c:270 +msgid "Secondary language or program" +msgstr "গৌণ ভাষা বা কাৰ্যসূচী" + +#: modules/access/v4l2/v4l2.c:271 modules/codec/twolame.c:70 +msgid "Dual mono" +msgstr "দুটা ম'ন'" + +#: modules/access/v4l2/v4l2.c:275 +msgid "V4L" +msgstr "V4L" + +#: modules/access/v4l2/v4l2.c:276 +msgid "Video4Linux input" +msgstr "ভিডিঅ’4লিনাক্স ইনপুট" + +#: modules/access/v4l2/v4l2.c:280 +msgid "Video input" +msgstr "ভিডিঅ’ ইনপুট" + +#: modules/access/v4l2/v4l2.c:317 +msgid "Tuner" +msgstr "টিউনাৰ" + +#: modules/access/v4l2/v4l2.c:332 +msgid "Controls" +msgstr "নিয়ন্ত্ৰণবোৰ" + +#: modules/access/v4l2/v4l2.c:333 +msgid "Video capture controls (if supported by the device)" +msgstr "ভিডিঅ’ অধিগ্ৰহণ নিয়ন্ত্ৰণবোৰ (যদি ডিভাইচটোৱে সমৰ্থন কৰে)" + +#: modules/access/v4l2/v4l2.c:424 +msgid "Video4Linux compressed A/V input" +msgstr "ভিডিঅ’4লিনাক্স সংনমন A/V ইনপুট" + +#: modules/access/v4l2/v4l2.c:431 +msgid "Video4Linux radio tuner" +msgstr "ভিডিঅ’4লিনাক্স ৰেডিঅ’ টিউনাৰ" + +#: modules/access/vcd/vcd.c:47 +msgid "VCD" +msgstr "VCD" + +#: modules/access/vcd/vcd.c:48 +msgid "VCD input" +msgstr "VCD ইনপুট" + +#: modules/access/vcd/vcd.c:54 +msgid "[vcd:][device][#[title][,[chapter]]]" +msgstr "[vcd:][ডিভাইচ][#[শিৰোনাম][,[পাঠ]]]" + +#: modules/access/vdr.c:72 +msgid "Support for VDR recordings (http://www.tvdr.de/)." +msgstr "VDR ৰেকৰ্ডিংবোৰৰ বাবে সমৰ্থন (http://www.tvdr.de/)." + +#: modules/access/vdr.c:74 +msgid "Chapter offset in ms" +msgstr "ms ত পাঠৰ অফচেট" + +#: modules/access/vdr.c:76 +msgid "Move all chapters. This value should be set in milliseconds." +msgstr "সকলোবোৰ পাঠ আতঁৰ কৰক. এই মানটো মিলিছেকেণ্ডত ছেট কৰা হব." + +#: modules/access/vdr.c:80 +msgid "Default frame rate for chapter import." +msgstr "পাঠ আমদানিৰ বাবে ডিফল্ট ফ্ৰেম হাৰ." + +#: modules/access/vdr.c:84 +msgid "VDR" +msgstr "VDR" + +#: modules/access/vdr.c:87 +msgid "VDR recordings" +msgstr "VDR ৰেকৰ্ডিংবোৰ" + +#: modules/access/vdr.c:380 +#, c-format +msgid "VLC could not read the file (%s)." +msgstr "VLC য়ে (%s) ফাইলটো পঢ়িব নোৱাৰিলে." + +#: modules/access/vdr.c:545 +#, c-format +msgid "VLC could not open the file \"%s\" (%s)." +msgstr "VLC য়ে \"%s\" (%s) ফাইলটো খুলিব নোৱাৰিলে." + +#: modules/access/vdr.c:820 +msgid "VDR Cut Marks" +msgstr "VDR কাট কৰা নম্বৰবোৰ" + +#: modules/access/vdr.c:886 +msgid "Start" +msgstr "আৰম্ভ কৰক" + +#: modules/access/vnc.c:49 +msgid "X.509 Certificate Authority" +msgstr "X.509 প্ৰমাণপত্ৰৰ কৰ্তৃপক্ষ" + +#: modules/access/vnc.c:50 +msgid "Certificate of the Authority to verify server's against" +msgstr "ছৰ্ভাৰৰ বিৰুদ্ধে প্ৰমাণিত কৰিবলৈ কৰ্তৃপক্ষৰ প্ৰমাণপত্ৰ" + +#: modules/access/vnc.c:51 +msgid "X.509 Certificate Revocation List" +msgstr "X.509 প্ৰমাণপত্ৰ বাতিলৰ তালিকা" + +#: modules/access/vnc.c:52 +msgid "List of revoked servers certificates" +msgstr "বাতিল কৰা ছাৰ্ভাৰবোৰৰ প্ৰমাণপত্ৰবোৰৰ তালিকা" + +#: modules/access/vnc.c:53 +msgid "X.509 Client certificate" +msgstr "X.509 গ্ৰাহক প্ৰমাণপত্ৰ" + +#: modules/access/vnc.c:54 +msgid "Certificate for client authentication" +msgstr "" + +#: modules/access/vnc.c:55 +msgid "X.509 Client private key" +msgstr "X.509 গ্ৰাহক ব্যক্তিগত কী" + +#: modules/access/vnc.c:56 +msgid "Private key for authentication by certificate" +msgstr "" + +#: modules/access/vnc.c:59 +msgid "RGB chroma (RV32, RV24, RV16, RGB2)" +msgstr "RGB ক্ৰোমা (RV32, RV24, RV16, RGB2)" + +#: modules/access/vnc.c:62 +msgid "Compression level" +msgstr "সংনমনৰ স্তৰ" + +#: modules/access/vnc.c:63 +msgid "Transfer compression level from 0 (none) to 9 (max)" +msgstr "সংনমনৰ স্তৰ 0 (নাই) পৰা 9 (সৰ্বাধিক) লৈ সলনি কৰক" + +#: modules/access/vnc.c:64 +msgid "Image quality" +msgstr "ছবিৰ মানদণ্ড" + +#: modules/access/vnc.c:65 +msgid "Image quality 1 to 9 (max)" +msgstr "ছবিৰ মানদণ্ড 1 ৰ পৰা 9 লৈ (সৰ্বাধিক)" + +#: modules/access/vnc.c:79 +msgid "VNC" +msgstr "VNC" + +#: modules/access/vnc.c:83 +msgid "VNC client access" +msgstr "VNC গ্ৰাহক প্ৰৱেশ" + +#: modules/access/wasapi.c:485 +msgid "Loopback mode" +msgstr "" + +#: modules/access/wasapi.c:486 +msgid "Record an audio rendering endpoint." +msgstr "" + +#: modules/access/wasapi.c:489 +msgid "WASAPI" +msgstr "" + +#: modules/access/wasapi.c:490 +msgid "Windows Audio Session API input" +msgstr "" + +#: modules/access_output/dummy.c:43 modules/stream_out/dummy.c:50 +msgid "Dummy stream output" +msgstr "ডামি ষ্ট্ৰিম আউপুট" + +#: modules/access_output/file.c:314 +msgid "Keep existing file" +msgstr "বৰ্তি থকা ফাইল ধৰি ৰাখক" + +#: modules/access_output/file.c:315 +msgid "Overwrite" +msgstr "অভাৰৰাইট কৰক" + +#: modules/access_output/file.c:316 +msgid "" +"The output file already exists. If recording continues, the file will be " +"overridden and its content will be lost." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/access_output/file.c:374 +msgid "Overwrite existing file" +msgstr "বৰ্তি থকা ফাইল অভাৰৰাইট কৰক" + +#: modules/access_output/file.c:376 +msgid "If the file already exists, it will be overwritten." +msgstr "যদি ফাইলটো ইতিমধ্যে বৰ্তি আছে, এইটো অভাৰৰাইট কৰা হব." + +#: modules/access_output/file.c:377 +msgid "Append to file" +msgstr "ফাইল সংলগ্ন কৰক" + +#: modules/access_output/file.c:378 +msgid "Append to file if it exists instead of replacing it." +msgstr "ফাইলত সংলগ্ন কৰক যদি সলনি কৰাৰ পৰিৱৰ্তে এইটো বৰ্তি থাকে." + +#: modules/access_output/file.c:380 +msgid "Format time and date" +msgstr "সময় আৰু তাৰিখ ফৰমেট কৰক" + +#: modules/access_output/file.c:381 +msgid "Perform ISO C time and date formatting on the file path" +msgstr "ISO C সময়টো সম্পাদন কৰক আৰু ফাইল পাথটোত তাৰিখ ফৰমেট কৰিছে" + +#: modules/access_output/file.c:383 +msgid "Synchronous writing" +msgstr "ছিনক্ৰনাইজ কৰি লিখা" + +#: modules/access_output/file.c:384 +msgid "Open the file with synchronous writing." +msgstr "ছিনক্ৰনাইজ কৰি লিখাৰ সৈতে ফাইলটো খোলকয়" + +#: modules/access_output/file.c:387 +msgid "File stream output" +msgstr "ফাইল ষ্ট্ৰিম আউটপুট" + +#: modules/access_output/http.c:53 modules/stream_out/rtp.c:174 +msgid "Username that will be requested to access the stream." +msgstr "" + +#: modules/access_output/http.c:56 modules/stream_out/rtp.c:177 +msgid "Password that will be requested to access the stream." +msgstr "ষ্ট্ৰিমটোত প্ৰৱেশ কৰিবলৈ দাবী কৰিবলগীয়া পাছৱৰ্ড." + +#: modules/access_output/http.c:58 modules/demux/playlist/qtl.c:242 +#: modules/demux/playlist/shoutcast.c:326 +msgid "Mime" +msgstr "মাইম" + +#: modules/access_output/http.c:59 +msgid "MIME returned by the server (autodetected if not specified)." +msgstr "" +"ছৰ্ভাৰটোৰ দ্বাৰ উভোতাই পথোৱা MIME (যদি নিৰ্ধাৰণ নকৰে স্বয়ংক্ৰিয়ভাৱে চিনাক্ত কৰিব)." + +#: modules/access_output/http.c:61 +msgid "Metacube" +msgstr "মেটাকিউব" + +#: modules/access_output/http.c:62 +msgid "" +"Use the Metacube protocol. Needed for streaming to the Cubemap reflector." +msgstr "" +"মেটাকিউব প্ৰটকল ব্যৱহাৰ কৰক. কিউবমেপ প্ৰতিফলকলৈ কিউবমেপ কৰাৰ বাবে প্ৰয়োজনীয়." + +#: modules/access_output/http.c:67 +msgid "HTTP stream output" +msgstr "HTTP ষ্ট্ৰিম আউটপুট" + +#: modules/access_output/livehttp.c:67 +msgid "Segment length" +msgstr "খণ্ডৰ দৈৰ্ঘ্য" + +#: modules/access_output/livehttp.c:68 +msgid "Length of TS stream segments" +msgstr "TS ষ্ট্ৰিম খণ্ডবোৰৰ দৈৰ্ঘ্য" + +#: modules/access_output/livehttp.c:70 +msgid "Split segments anywhere" +msgstr "খণ্ডবোৰ যিকোনো স্থানত স্প্লিট কৰক" + +#: modules/access_output/livehttp.c:71 +msgid "" +"Don't require a keyframe before splitting a segment. Needed for audio only." +msgstr "" +"খণ্ড এটা স্প্লিট কৰাৰ আগতে কী ফ্ৰেম এটা দাবী নকৰে. কেৱল অডিঅ'ৰ বাবে প্ৰয়োজনীয়." + +#: modules/access_output/livehttp.c:74 +msgid "Number of segments" +msgstr "খণ্ডবোৰৰ সংখ্যা" + +#: modules/access_output/livehttp.c:75 +msgid "Number of segments to include in index" +msgstr "সূচীত অন্তৰ্ভুক্ত কৰিবলৈ খণ্ডবোৰৰ সংখ্যা" + +#: modules/access_output/livehttp.c:77 +msgid "Allow cache" +msgstr "কেশ্বৰ অনুমতি দিয়ক" + +#: modules/access_output/livehttp.c:78 +msgid "Add EXT-X-ALLOW-CACHE:NO directive in playlist-file if this is disabled" +msgstr "" +"যদি এইটো অক্ষম কৰে তেন্তে প্লেলিষ্ট-ফাইলত EXT-X-ALLOW-CACHE:NO নিৰ্দেশনাটো যোগ কৰক" + +#: modules/access_output/livehttp.c:80 +msgid "Index file" +msgstr "সূচী ফাইল" + +#: modules/access_output/livehttp.c:81 +msgid "Path to the index file to create" +msgstr "তৈয়াৰ কৰিবলৈ সূচী ফাইলটোল পাথ" + +#: modules/access_output/livehttp.c:83 +msgid "Full URL to put in index file" +msgstr "সূচী ফাইলত ৰাখিবলৈ সম্পূৰ্ণ URL" + +#: modules/access_output/livehttp.c:84 +msgid "Full URL to put in index file. Use #'s to represent segment number" +msgstr "সূচী ফাইলত ৰাখিবলৈ সম্পূৰ্ণ URL. খণ্ড সংখ্যাটো প্ৰদৰ্শন কৰিবলৈ #'s ব্যৱহাৰ কৰক" + +#: modules/access_output/livehttp.c:87 +msgid "Delete segments" +msgstr "খণ্ডবোৰ ডিলিট কৰক" + +#: modules/access_output/livehttp.c:88 +msgid "Delete segments when they are no longer needed" +msgstr "খণ্ডবোৰ ডিলিট কৰক যেতিয়া সেইবোৰ বেছি সময়ৰ বাবে প্ৰয়োজন নহয়" + +#: modules/access_output/livehttp.c:90 +msgid "Use muxers rate control mechanism" +msgstr "মাক্ৰাৰবোৰৰ হাৰ নিয়ন্ত্ৰণ কাৰিকৰী ব্যৱহাৰ কৰক" + +#: modules/access_output/livehttp.c:92 +msgid "AES key URI to place in playlist" +msgstr "প্লেলিষ্টত থবলৈ AES কী URI" + +#: modules/access_output/livehttp.c:94 +msgid "AES key file" +msgstr "AES কী ফাইল" + +#: modules/access_output/livehttp.c:95 +msgid "File containing the 16 bytes encryption key" +msgstr "16 বাইট এনক্ৰিপশ্বন কী ধাৰণ কৰা ফাইল" + +#: modules/access_output/livehttp.c:97 +msgid "File where vlc reads key-uri and keyfile-location" +msgstr "ফাইলটো যত vlc য়ে কী-uri আৰু কীফাইল-স্থান পঢ়ে" + +#: modules/access_output/livehttp.c:98 +msgid "" +"File is read when segment starts and is assumed to be in format: key-uri" +"\\nkey-file. File is read on the segment opening and values are used on that " +"segment." +msgstr "" + +#: modules/access_output/livehttp.c:102 +msgid "Use randomized IV for encryption" +msgstr "এনক্ৰিপশ্বনৰ বাবে বিশৃংখলকৃত IV ব্যৱহাৰ কৰক" + +#: modules/access_output/livehttp.c:103 +msgid "Generate IV instead using segment-number as IV" +msgstr "IV হিচাপে খণ্ড-সংখ্যা ব্যৱহাৰ কৰাৰ পৰিৱৰ্তে IV তৈয়াৰ কৰক" + +#: modules/access_output/livehttp.c:105 +msgid "Number of first segment" +msgstr "প্ৰথম খণ্ডৰ সংখ্যাটো" + +#: modules/access_output/livehttp.c:106 +msgid "The number of the first segment generated" +msgstr "প্ৰথম খণ্ড উত্পন্ন কৰাটোৰ সংখ্যাটো" + +#: modules/access_output/livehttp.c:109 +msgid "HTTP Live streaming output" +msgstr "HTTP পোনপটীয়া ষ্ট্ৰিমিং আউটপুট" + +#: modules/access_output/livehttp.c:110 +msgid "LiveHTTP" +msgstr "পোনপটীয়াHTTP" + +#: modules/access_output/rist.c:824 +msgid "RIST data output caching size (ms)" +msgstr "" + +#: modules/access_output/rist.c:826 +msgid "" +"Having this cache will guarantee that the packets going out are delivered at " +"a spacing determined by the chain timestamps thus ensuring a near jitter " +"free output. Be aware that this setting will also add to the overall latency " +"of the stream." +msgstr "" + +#: modules/access_output/rist.c:831 +msgid "RIST retry-buffer queue size (ms)" +msgstr "" + +#: modules/access_output/rist.c:833 +msgid "" +"This must match the buffer size (latency) configured on the server side. If " +"you are not sure, leave the default of 0 which will set it the maximum value " +"and will use about 100MB of RAM" +msgstr "" + +#: modules/access_output/rist.c:837 +msgid "SSRC used in RTP output (default is random, i.e. 0)" +msgstr "" + +#: modules/access_output/rist.c:839 +msgid "" +"Use this setting to specify a known SSRC for the RTP header. This is only " +"useful if your receiver acts on it. When using VLC as receiver, it is not." +msgstr "" + +#: modules/access_output/rist.c:842 modules/access_output/shout.c:64 +#: modules/gui/qt/components/sout/sout_widgets.cpp:386 +#: share/lua/http/dialogs/create_stream.html:139 +msgid "Stream name" +msgstr "ষ্ট্ৰিম নাম" + +#: modules/access_output/rist.c:844 +msgid "" +"This Stream name will be sent to the receiver using the rist RTCP channel" +msgstr "" + +#: modules/access_output/rist.c:850 +msgid "RIST stream output" +msgstr "" + +#: modules/access_output/rist.c:855 +msgid "RIST target packet size (bytes)" +msgstr "" + +#: modules/access_output/shout.c:65 +msgid "Name to give to this stream/channel on the shoutcast/icecast server." +msgstr "ছাউটকাষ্ট/আইছকাষ্ট ছাৰ্ভাৰটোত এই ষ্ট্ৰিম/চেনেলটোলৈ দিবলৈ নাম." + +#: modules/access_output/shout.c:68 +msgid "Stream description" +msgstr "ষ্ট্ৰিম বিৱৰণ" + +#: modules/access_output/shout.c:69 +msgid "Description of the stream content or information about your channel." +msgstr "আপোনাৰ চেনেলৰ বিষয়ে ষ্ট্ৰিম উপাদান বা তথ্যৰ বিৱৰণ." + +#: modules/access_output/shout.c:72 +msgid "Stream MP3" +msgstr "ষ্ট্ৰিম MP3" + +#: modules/access_output/shout.c:73 +msgid "" +"You normally have to feed the shoutcast module with Ogg streams. It is also " +"possible to stream MP3 instead, so you can forward MP3 streams to the " +"shoutcast/icecast server." +msgstr "" +"Ogg ষ্ট্ৰিমবোৰৰ সৈতে আপুনি সাধাৰণতে ছাউটকাষ্ট মডুলটো ফীড কৰিব লাগে. এইটো লগতে " +"ষ্ট্ৰিম MP3 লৈও সম্ভৱ, সেয়ে আপুনি ছাউটকাষ্ট/আইছকাষ্ট ছাৰ্ভাৰটোলৈ MP3 ষ্ট্ৰিমবোৰ পথাব " +"পাৰে." + +#: modules/access_output/shout.c:82 +msgid "Genre description" +msgstr "গেন্ৰে বিৱৰণ" + +#: modules/access_output/shout.c:83 +msgid "Genre of the content." +msgstr "" + +#: modules/access_output/shout.c:85 +msgid "URL description" +msgstr "" + +#: modules/access_output/shout.c:86 +msgid "URL with information about the stream or your channel." +msgstr "" + +#: modules/access_output/shout.c:93 +msgid "Bitrate information of the transcoded stream." +msgstr "" + +#: modules/access_output/shout.c:96 +msgid "Samplerate information of the transcoded stream." +msgstr "" + +#: modules/access_output/shout.c:98 +msgid "Number of channels" +msgstr "চেনেলবোৰৰ সংখ্যা" + +#: modules/access_output/shout.c:99 +msgid "Number of channels information of the transcoded stream." +msgstr "" + +#: modules/access_output/shout.c:101 +msgid "Ogg Vorbis Quality" +msgstr "Ogg ভৰ্বিছ মানদণ্ড" + +#: modules/access_output/shout.c:102 +msgid "Ogg Vorbis Quality information of the transcoded stream." +msgstr "" + +#: modules/access_output/shout.c:104 +msgid "Stream public" +msgstr "ষ্ট্ৰিম ৰাজহুৱা" + +#: modules/access_output/shout.c:105 +msgid "" +"Make the server publicly available on the 'Yellow Pages' (directory listing " +"of streams) on the icecast/shoutcast website. Requires the bitrate " +"information specified for shoutcast. Requires Ogg streaming for icecast." +msgstr "" +"আইছকাষ্ট/ছাউটকাষ্ট ৱেবছাইটটোত 'হালধীয়া পৃষ্ঠাবোৰত' (ষ্ট্ৰিমবোৰৰ নিৰ্দেশিকা তালিকা) " +"ছাৰ্ভাৰটো ৰাজহুৱাভাৱে উপলব্ধ কৰি তোলক. ছাউটকাষ্টৰ বাবে নিৰ্ধাৰিত বাইট হাৰৰ তথ্য " +"দাবী কৰে. আইছকাষ্টৰ বাবে Ogg ষ্ট্ৰিমিং দাবী কৰে." + +#: modules/access_output/shout.c:111 +msgid "IceCAST output" +msgstr "আইছকাষ্ট আউটপুট" + +#: modules/access_output/srt.c:458 +msgid "SRT stream output" +msgstr "" + +#: modules/access_output/srt.c:471 +msgid "SRT maximum payload size (bytes)" +msgstr "" + +#: modules/access_output/srt.c:475 +msgid "SRT maximum bandwidth ceiling (bytes)" +msgstr "" + +#: modules/access_output/udp.c:62 modules/stream_out/rtp.c:135 +msgid "Caching value (ms)" +msgstr "কেশ্ব কৰা মান (ms)" + +#: modules/access_output/udp.c:64 +msgid "" +"Default caching value for outbound UDP streams. This value should be set in " +"milliseconds." +msgstr "" +"আউটবাউণ্ড UDP ষ্ট্ৰিমবোৰৰ বাবে ডিফল্ট কেশ্বিং মান. এই মানটো মিলিছেকেণ্ডত ছেট কৰা " +"হব." + +#: modules/access_output/udp.c:67 +msgid "Group packets" +msgstr "গোট পকেটবোৰ" + +#: modules/access_output/udp.c:68 +msgid "" +"Packets can be sent one by one at the right time or by groups. You can " +"choose the number of packets that will be sent at a time. It helps reducing " +"the scheduling load on heavily-loaded systems." +msgstr "" +"পেকেটবোৰ সঠিক সময়ত এটাৰ পিছত এটাকৈ সঠিক সময়ত পথাব পাৰি বা গোটবোৰৰ দ্বাৰা. " +"আপুনি পেকেটবোৰৰ সংখ্যাটো নিৰ্বাচন কৰিব পাৰে যিটো এটা সময়ত পথোৱা হব. এইটোৱে " +"গধুৰভাৱে-লোড কৰা ছিষ্টেমবোৰত নিৰ্ধাৰিত লোডটো হ্ৰাস কৰাত সহায় কৰে." + +#: modules/access_output/udp.c:75 +msgid "UDP stream output" +msgstr "UDP ষ্ট্ৰিম আউটপুট" + +#: modules/arm_neon/chroma_yuv.c:35 +msgid "ARM NEON video chroma conversions" +msgstr "ARM NEON ভিডিঅ' ক্ৰোমা ৰূপান্তৰণবোৰ" + +#: modules/arm_neon/volume.c:38 +msgid "ARM NEON audio volume" +msgstr "ARM NEON অডিঅ' প্ৰসাৰ" + +#: modules/arm_neon/yuv_rgb.c:36 +msgid "ARM NEON video chroma YUV->RGBA" +msgstr "ARM NEON ভিডিঅ' ক্ৰোমা YUV->RGBA" + +#: modules/audio_filter/audiobargraph_a.c:39 +msgid "Defines if BarGraph information should be sent" +msgstr "বাখ্যা কৰে যদি বাৰ গ্ৰাফ তথ্য পথায়" + +#: modules/audio_filter/audiobargraph_a.c:40 +msgid "" +"Defines if BarGraph information should be sent. 1 if the information should " +"be sent, 0 otherwise (default 1)." +msgstr "বাখ্যা কৰে যদি বাৰ গ্ৰাফ তথ্য পথায়. 1 যদি তথ্যটো পথায়, অন্যথা 0 (ডিফল্ট 1)." + +#: modules/audio_filter/audiobargraph_a.c:42 +msgid "Sends the barGraph information every n audio packets" +msgstr "প্ৰতিটো n অডিঅ পেকেটত বাৰ গ্ৰাফ তথ্য পথায়" + +#: modules/audio_filter/audiobargraph_a.c:43 +msgid "" +"Defines how often the barGraph information should be sent. Sends the " +"barGraph information every n audio packets (default 4)." +msgstr "" +"বাৰ গ্ৰাফ তথ্য কেনেকৈ পথায় বাখ্যা কৰে. প্ৰতিটো n অডিঅ পেকেটত বাৰ গ্ৰাফ তথ্য পথায় " +"(ডিফল্ট 4)." + +#: modules/audio_filter/audiobargraph_a.c:45 +msgid "Defines if silence alarm information should be sent" +msgstr "বাখ্যা কৰে যদি নিশব্দ সংকেত তথ্য পথায়" + +#: modules/audio_filter/audiobargraph_a.c:46 +msgid "" +"Defines if silence alarm information should be sent. 1 if the information " +"should be sent, 0 otherwise (default 1)." +msgstr "" +"বাখ্যা কৰে যদি নিশব্দ সংকেত তথ্য পথায়. 1 যদি তথ্যটো পথায়, অন্যথা 0 (ডিফল্ট 1)." + +#: modules/audio_filter/audiobargraph_a.c:48 +msgid "Time window to use in ms" +msgstr "ms ত ব্যৱহাৰ কৰিবলৈ সময় উইণ্ডো" + +#: modules/audio_filter/audiobargraph_a.c:49 +msgid "" +"Time Window during when the audio level is measured in ms for silence " +"detection. If the audio level is under the threshold during this time, an " +"alarm is sent (default 5000)." +msgstr "" +"নিশব্দ চিনাক্তকৰণৰ বাবে যেতিয়া অডিঅ' স্তৰটো ms ত জোখা হয় তেতিয়া সময় উইণ্ডো. যদি " +"এই সময়টোত অডিঅ' স্তৰটো থ্ৰেছহল্ডৰ অধীনত থাকে, তেন্তে সংকেত এটা পথায় (ডিফল্ট 5000)." + +#: modules/audio_filter/audiobargraph_a.c:52 +msgid "Minimum Audio level to raise the alarm" +msgstr "সংকেতটো দিবলৈ নূন্যতম অডিঅ' স্তৰ" + +#: modules/audio_filter/audiobargraph_a.c:53 +msgid "" +"Threshold to be attained to raise an alarm. If the audio level is under the " +"threshold during this time, an alarm is sent (default 0.1)." +msgstr "" +"সংকেত এটা দিয়া লাভ কৰিবলৈ থ্ৰেছহল্ড. যদি এই সময়টোত অডিঅ' স্তৰটো থ্ৰেছহল্ডৰ অধীনত " +"থাকে, তেন্তে সংকেত এটা পথায় (ডিফল্ট 0.1)." + +#: modules/audio_filter/audiobargraph_a.c:56 +msgid "Time between two alarm messages in ms" +msgstr "ms ত দুটা সংকেত বাৰ্তাৰ মাজৰ সময়" + +#: modules/audio_filter/audiobargraph_a.c:57 +msgid "" +"Time between two alarm messages in ms. This value is used to avoid alarm " +"saturation (default 2000)." +msgstr "" +"ms ত দুটা সংকেত বাৰ্তাৰ মাজৰ সময়. সংকেত চেচুৰেশ্বনটো আওকাণ কৰিবলৈ এই মানটো " +"ব্যৱহাৰ কৰা হয় (ডিফল্ট 2000)." + +#: modules/audio_filter/audiobargraph_a.c:70 +msgid "Audio part of the BarGraph function" +msgstr "বাৰ গ্ৰাফ কাৰ্যটোৰ অডিঅ' অংশটো" + +#: modules/audio_filter/audiobargraph_a.c:71 +msgid "Audiobar Graph" +msgstr "অডিঅ'বাৰ গ্ৰাফ" + +#: modules/audio_filter/channel_mixer/dolby.c:50 +msgid "Simple decoder for Dolby Surround encoded streams" +msgstr "ডল্বি ছাৰাউণ্ড এনকোড কৰা ষ্ট্ৰিমবোৰৰ বাবে সাধাৰণ ডিকোডাৰ" + +#: modules/audio_filter/channel_mixer/dolby.c:51 +msgid "Dolby Surround decoder" +msgstr "ডল্বি ছাৰাউণ্ড ডিকোডাৰ" + +#: modules/audio_filter/channel_mixer/headphone.c:53 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:247 +msgid "" +"This effect gives you the feeling that you are standing in a room with a " +"complete 7.1 speaker set when using only a headphone, providing a more " +"realistic sound experience. It should also be more comfortable and less " +"tiring when listening to music for long periods of time.\n" +"It works with any source format from mono to 7.1." +msgstr "" +"এই প্ৰভাৱটোৱে আপোনাক এটা অনুভৱ আনি দিয়ে যে আপুনি এটা সম্পূৰ্ণ 7.1 স্পিকাৰ ছেটৰ সৈতে " +"কোঠা এটাত থিয় দি আছে যেতিয়া কেৱল এটা হেডফোন ব্যৱহাৰ কৰে, এটা অধিক বাস্তৱিক " +"ধ্বনিৰ অভিজ্ঞতা আগবঢ়ায়. এইটো লগতে অধিক আৰামদায়ক আৰু কম ভাগৰুৱা হোৱা উচিত যেতিয়া " +"দৈৰ্ঘ্য সময়সীমাৰ বাবে সংগীত শুনে.\n" +"এইটোৱে যিকোনো উত্স ফৰমেটৰ সৈতে ম'ন' ৰ পৰা 7.1 লৈ কাৰ্য কৰে." + +#: modules/audio_filter/channel_mixer/headphone.c:60 +msgid "Characteristic dimension" +msgstr "বৈশিষ্ট্যৰ পৰিধি" + +#: modules/audio_filter/channel_mixer/headphone.c:62 +msgid "Distance between front left speaker and listener in meters." +msgstr "মিটাৰত সন্মুখৰ বাওঁফালৰ স্পিকাৰ আৰু শুনোতাৰ দূৰত্ব." + +#: modules/audio_filter/channel_mixer/headphone.c:64 +msgid "Compensate delay" +msgstr "বিলম্বৰ ক্ষতিপূৰণ" + +#: modules/audio_filter/channel_mixer/headphone.c:66 +msgid "" +"The delay which is introduced by the physical algorithm may sometimes be " +"disturbing for the synchronization between lips-movement and speech. In " +"case, turn this on to compensate." +msgstr "" +"বিলম্বটো দৈহিক এলগোৰিথমটোৰ দ্বাৰা পৰিচয় কৰোৱা হয়, হয়তো কেতিয়াবা ওঠবোৰৰ চলাচল " +"আৰু ভাষণৰ মাজৰ ছিনক্ৰনাইজেশ্বনটোৰ বাবে বাধাগ্ৰস্ত হব পাৰে. তেনেকুৱা ক্ষেত্ৰত এইটো " +"ক্ষতিপূৰণলৈ পথাওক." + +#: modules/audio_filter/channel_mixer/headphone.c:70 +msgid "No decoding of Dolby Surround" +msgstr "ডল্বি ছাৰাউণ্ডৰ কোনো ডিকোডিং নাই" + +#: modules/audio_filter/channel_mixer/headphone.c:72 +msgid "" +"Dolby Surround encoded streams won't be decoded before being processed by " +"this filter. Enabling this setting is not recommended." +msgstr "" +"এই ফিল্টাৰটোৰ দ্বাৰা প্ৰক্ৰিয়া কৰাৰ আগতে ডল্বি ছাৰাউণ্ড এনকোড কৰা ষ্ট্ৰিমবোৰ ডিকোড " +"কৰিব নোৱাৰি. এই ছেটিংটো সক্ষম কৰাটো পৰামৰ্শ নকৰে." + +#: modules/audio_filter/channel_mixer/headphone.c:76 +msgid "Headphone virtual spatialization effect" +msgstr "হেডফোন বাস্তৱিক স্পাশ্বিয়েলাইজেশ্বন প্ৰভাৱ" + +#: modules/audio_filter/channel_mixer/headphone.c:77 +msgid "Headphone effect" +msgstr "হেডফোনৰ প্ৰভাৱ" + +#: modules/audio_filter/channel_mixer/mono.c:78 +msgid "Use downmix algorithm" +msgstr "ডাউনমিক্স এলগোৰিথম ব্যৱহাৰ কৰক" + +#: modules/audio_filter/channel_mixer/mono.c:79 +msgid "" +"This option selects a stereo to mono downmix algorithm that is used in the " +"headphone channel mixer. It gives the effect of standing in a room full of " +"speakers." +msgstr "" +"এই বিকল্পটোৱে হেডফোন চেনেল মিক্সাৰত ব্যৱহাৰ কৰা ম'ন' ডাউন মিক্স এলগোৰিথমলৈ " +"ষ্টেৰিঅ’ এটা নিৰ্বাচন কৰে. এইটোৱে স্পিকাৰেৰে পূৰ্ণ কোঠা এটাত থিয় দি থকাৰ প্ৰভাৱটো " +"দিয়ে." + +#: modules/audio_filter/channel_mixer/mono.c:83 +msgid "Select channel to keep" +msgstr "ৰাখিবলৈ চেনেল নিৰ্বাচন কৰক" + +#: modules/audio_filter/channel_mixer/mono.c:84 +msgid "This option silences all other channels except the selected channel." +msgstr "এই বিকল্পটোৱে নিৰ্বাচিত চেনেলটোৰ বাদে আন সকলোবোৰ চেনেল নিশব্দ কৰে." + +#: modules/audio_filter/channel_mixer/mono.c:90 +#: modules/audio_filter/channel_mixer/remap.c:62 +msgid "Rear left" +msgstr "পিছৰ বাওঁফাল" + +#: modules/audio_filter/channel_mixer/mono.c:90 +#: modules/audio_filter/channel_mixer/remap.c:62 +msgid "Rear right" +msgstr "পিছৰ সোঁফাল" + +#: modules/audio_filter/channel_mixer/mono.c:91 +#: modules/audio_filter/channel_mixer/remap.c:63 +msgid "Low-frequency effects" +msgstr "নিম্ন-কম্পনাংকৰ প্ৰভাৱবোৰ" + +#: modules/audio_filter/channel_mixer/mono.c:92 +#: modules/audio_filter/channel_mixer/remap.c:63 +msgid "Side left" +msgstr "কাষৰ বাওঁফাল" + +#: modules/audio_filter/channel_mixer/mono.c:92 +#: modules/audio_filter/channel_mixer/remap.c:63 +msgid "Side right" +msgstr "কাষৰ সোঁফাল" + +#: modules/audio_filter/channel_mixer/mono.c:92 +#: modules/audio_filter/channel_mixer/remap.c:62 +msgid "Rear center" +msgstr "পিছৰ কেন্দ্ৰ" + +#: modules/audio_filter/channel_mixer/mono.c:99 +msgid "Stereo to mono downmixer" +msgstr "ম’ন’ ডাউনমিক্সাৰলৈ ষ্টেৰিঅ’" + +#: modules/audio_filter/channel_mixer/remap.c:74 +msgid "Audio channel remapper" +msgstr "অডিঅ' চেনেল পুনৰ মেপকৰ্তা" + +#: modules/audio_filter/channel_mixer/simple.c:43 +msgid "Audio filter for simple channel mixing" +msgstr "সাধাৰণ চেনেল মিক্সিংৰ বাবে অডিঅ' ফিল্টাৰ" + +#: modules/audio_filter/channel_mixer/spatialaudio.cpp:50 +msgid "HRTF file for the binauralization" +msgstr "" + +#: modules/audio_filter/channel_mixer/spatialaudio.cpp:51 +msgid "Custom HRTF (Head-related transfer function) file in the SOFA format." +msgstr "" + +#: modules/audio_filter/channel_mixer/spatialaudio.cpp:54 +msgid "Headphones mode (binaural)" +msgstr "" + +#: modules/audio_filter/channel_mixer/spatialaudio.cpp:55 +msgid "If the output is stereo, render ambisonics with the binaural decoder." +msgstr "" + +#: modules/audio_filter/channel_mixer/spatialaudio.cpp:65 +msgid "Ambisonics renderer and binauralizer" +msgstr "" + +#: modules/audio_filter/channel_mixer/spatialaudio.cpp:77 +msgid "Binauralizer" +msgstr "" + +#: modules/audio_filter/channel_mixer/trivial.c:42 +msgid "Audio filter for trivial channel mixing" +msgstr "ট্ৰিভাইয়েল চেনেল মিক্সিংৰ বাবে অডিঅ' ফিল্টাৰ" + +#: modules/audio_filter/chorus_flanger.c:74 +msgid "Sound Delay" +msgstr "শব্দ বিলম্ব" + +#: modules/audio_filter/chorus_flanger.c:75 +#: modules/gui/macosx/VLCOpenWindowController.m:355 modules/spu/mosaic.c:154 +#: modules/stream_out/bridge.c:51 modules/stream_out/delay.c:54 +msgid "Delay" +msgstr "বিলম্ব" + +#: modules/audio_filter/chorus_flanger.c:76 +msgid "Add a delay effect to the sound" +msgstr "শব্দটোলৈ বিলম্বৰ প্ৰভাৱ এটা যোগ কৰক" + +#: modules/audio_filter/chorus_flanger.c:80 +#: modules/audio_filter/stereo_widen.c:57 +#: modules/gui/qt/components/extended_panels.cpp:1367 +msgid "Delay time" +msgstr "বিলম্ব সময়" + +#: modules/audio_filter/chorus_flanger.c:81 +msgid "Time in milliseconds of the average delay. Note average" +msgstr "মিলিছেকেণ্ডত গড় বিলম্বটোৰ সময়. টোকা গড়" + +#: modules/audio_filter/chorus_flanger.c:82 +msgid "Sweep Depth" +msgstr "শ্বুইপ গভীৰতা" + +#: modules/audio_filter/chorus_flanger.c:83 +msgid "" +"Time in milliseconds of the maximum sweep depth. Thus, the sweep range will " +"be delay-time +/- sweep-depth." +msgstr "" +"মিলিছেকেণ্ডত সৰ্বাধিক শ্বুইপ গভীৰতাটোৰ সময়. সেয়ে, শ্বুইপৰ পৰিসৰটো হব বিলম্ব-সময় +/- " +"শ্বুইপ-গভীৰতা." + +#: modules/audio_filter/chorus_flanger.c:85 +msgid "Sweep Rate" +msgstr "শ্বুইপ হাৰ" + +#: modules/audio_filter/chorus_flanger.c:86 +msgid "Rate of change of sweep depth in milliseconds shift per second of play" +msgstr "চলোৱাৰ প্ৰতি ছেকেণ্ডৰ মিলিছেকেণ্ড ছিফ্টত শ্বুইপ গভীৰতাৰ সলনিৰ হাৰ" + +#: modules/audio_filter/chorus_flanger.c:89 +#: modules/audio_filter/stereo_widen.c:60 +#: modules/gui/qt/components/extended_panels.cpp:1368 +msgid "Feedback gain" +msgstr "মন্তব্য লাভ" + +#: modules/audio_filter/chorus_flanger.c:89 +msgid "Gain on Feedback loop" +msgstr "মন্তব্যৰ লুপত লাভ" + +#: modules/audio_filter/chorus_flanger.c:91 +msgid "Wet mix" +msgstr "তিতা মিশ্ৰণ" + +#: modules/audio_filter/chorus_flanger.c:91 +msgid "Level of delayed signal" +msgstr "বিলম্ব সংকেতৰ স্তৰ" + +#: modules/audio_filter/chorus_flanger.c:93 +msgid "Dry Mix" +msgstr "শুকান মিশ্ৰণ" + +#: modules/audio_filter/chorus_flanger.c:93 +msgid "Level of input signal" +msgstr "ইনপুট সংকেতৰ স্তৰ " + +#: modules/audio_filter/compressor.c:155 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:225 +#: modules/gui/qt/components/extended_panels.cpp:1325 +msgid "RMS/peak" +msgstr "RMS/শীৰ্ষ" + +#: modules/audio_filter/compressor.c:156 +msgid "Set the RMS/peak." +msgstr "" + +#: modules/audio_filter/compressor.c:158 +msgid "Attack time" +msgstr "আক্ৰমণৰ সময়" + +#: modules/audio_filter/compressor.c:159 +msgid "Set the attack time in milliseconds." +msgstr "" + +#: modules/audio_filter/compressor.c:161 +msgid "Release time" +msgstr "এৰি দিয়াৰ সময়" + +#: modules/audio_filter/compressor.c:162 +msgid "Set the release time in milliseconds." +msgstr "" + +#: modules/audio_filter/compressor.c:164 +msgid "Threshold level" +msgstr "দুৱাৰডলিৰ স্তৰ" + +#: modules/audio_filter/compressor.c:165 +msgid "Set the threshold level in dB." +msgstr "" + +#: modules/audio_filter/compressor.c:167 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:229 +#: modules/gui/qt/components/extended_panels.cpp:1329 +msgid "Ratio" +msgstr "অনুপাত" + +#: modules/audio_filter/compressor.c:168 +msgid "Set the ratio (n:1)." +msgstr "" + +#: modules/audio_filter/compressor.c:170 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:230 +msgid "Knee radius" +msgstr "বক্ৰ ব্যাসাৰ্ধ" + +#: modules/audio_filter/compressor.c:171 +msgid "Set the knee radius in dB." +msgstr "" + +#: modules/audio_filter/compressor.c:173 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:231 +msgid "Makeup gain" +msgstr "মেকআপ লাভ" + +#: modules/audio_filter/compressor.c:174 +msgid "Set the makeup gain in dB (0 ... 24)." +msgstr "dB ত মেকআপ লাভটো ছেট কৰক (0 ... 24)." + +#: modules/audio_filter/compressor.c:177 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:272 +#: modules/gui/qt/dialogs/extended.cpp:71 +msgid "Compressor" +msgstr "সংনমনকৰ্তা" + +#: modules/audio_filter/compressor.c:178 +msgid "Dynamic range compressor" +msgstr "ডাইনেমিক পৰিসৰ সংনমনকৰ্তা" + +#: modules/audio_filter/converter/format.c:49 +msgid "Audio filter for PCM format conversion" +msgstr "PCM ফৰমেট কথোপকথনৰ বাবে অডিঅ’ ফিল্টাৰ" + +#: modules/audio_filter/converter/tospdif.c:49 +msgid "Audio filter for A/52/DTS->S/PDIF encapsulation" +msgstr "" + +#: modules/audio_filter/equalizer.c:58 +msgid "Equalizer preset" +msgstr "সমতাকৰ্তাটোৰ আগতীয়া ছেট" + +#: modules/audio_filter/equalizer.c:59 +msgid "Preset to use for the equalizer." +msgstr "সমতাকৰ্তাটোৰ বাবে ব্যৱহাৰ কৰিবলৈ আগতীয়া ছেট." + +#: modules/audio_filter/equalizer.c:61 +msgid "Bands gain" +msgstr "বেণ্ডবোৰ লাভ" + +#: modules/audio_filter/equalizer.c:63 +msgid "" +"Don't use presets, but manually specified bands. You need to provide 10 " +"values between -20dB and 20dB, separated by spaces, e.g. \"0 2 4 2 0 -2 -4 " +"-2 0 2\"." +msgstr "" +"আগতীয়া ছেটবোৰ ব্যৱহাৰ নকৰিব, কিন্তু মেনুৱেলী নিৰ্ধাৰণ কৰা বেণ্ডবোৰ কৰক. আপুনি -20dB " +"আৰু 20dBY মাজত 10 টা মান আগবঢ়োৱাটো আৱশ্যক, ক’মাৰ দ্বাৰা পৃথকীকৃত, উদাহৰণ \"0 2 4 " +"2 0 -2 -4 -2 0 2\"." + +#: modules/audio_filter/equalizer.c:67 +msgid "Use VLC frequency bands" +msgstr "VLC কম্পনাংক বেণ্ডবোৰ ব্যৱহাৰ কৰক" + +#: modules/audio_filter/equalizer.c:69 +msgid "" +"Use the VLC frequency bands. Otherwise, use the ISO Standard frequency bands." +msgstr "" +"VLC কম্পনাংক বেণ্ডবোৰ ব্যৱহাৰ কৰক. অন্যথা, ISO মানবিশিষ্ট কম্পনাংক বেণ্ডবোৰ ব্যৱহাৰ " +"কৰক." + +#: modules/audio_filter/equalizer.c:72 +msgid "Two pass" +msgstr "দুটা পাছ" + +#: modules/audio_filter/equalizer.c:73 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:217 +msgid "Filter the audio twice. This provides a more intense effect." +msgstr "অডিঅ'টো দুবাৰ ফিল্টাৰ কৰক. এইটোৱে এটা অধিক ডাঙৰ প্ৰভাৱ দিয়ে." + +#: modules/audio_filter/equalizer.c:76 +msgid "Global gain" +msgstr "সাৰ্বজনীন লাভ" + +#: modules/audio_filter/equalizer.c:77 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:220 +msgid "Set the global gain in dB (-20 ... 20)." +msgstr "dB ত সাৰ্বজনীন লাভটো ছেট কৰক (-20 ... 20)." + +#: modules/audio_filter/equalizer.c:80 +msgid "Equalizer with 10 bands" +msgstr "10 টা বেণ্ডৰ সৈতে সমতাকৰ্তাটো" + +#: modules/audio_filter/equalizer.c:81 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:271 +#: modules/gui/qt/dialogs/extended.cpp:67 share/lua/http/index.html:237 +msgid "Equalizer" +msgstr "সমতাকৰ্তা" + +#: modules/audio_filter/equalizer_presets.h:54 +msgid "Flat" +msgstr "ফ্লেট" + +#: modules/audio_filter/equalizer_presets.h:54 +#: modules/meta_engine/ID3Genres.h:65 +msgid "Classical" +msgstr "শাস্ত্ৰীয়" + +#: modules/audio_filter/equalizer_presets.h:54 +#: modules/meta_engine/ID3Genres.h:145 +msgid "Club" +msgstr "ক্লাব" + +#: modules/audio_filter/equalizer_presets.h:54 +#: modules/meta_engine/ID3Genres.h:36 +msgid "Dance" +msgstr "নৃত্য" + +#: modules/audio_filter/equalizer_presets.h:54 +msgid "Full bass" +msgstr "সম্পূৰ্ণ বেছ" + +#: modules/audio_filter/equalizer_presets.h:55 +msgid "Full bass and treble" +msgstr "সম্পূৰ্ণ বেছ আৰু ট্ৰিবল" + +#: modules/audio_filter/equalizer_presets.h:55 +msgid "Full treble" +msgstr "সম্পূৰ্ণ ট্ৰিবল" + +#: modules/audio_filter/equalizer_presets.h:56 +msgid "Large Hall" +msgstr "ডাঙৰ প্ৰেক্ষাগৃহ" + +#: modules/audio_filter/equalizer_presets.h:56 +msgid "Live" +msgstr "পোনপোটীয়া" + +#: modules/audio_filter/equalizer_presets.h:56 +msgid "Party" +msgstr "পাৰ্টি" + +#: modules/audio_filter/equalizer_presets.h:56 +#: modules/meta_engine/ID3Genres.h:46 +msgid "Pop" +msgstr "প'প" + +#: modules/audio_filter/equalizer_presets.h:56 +#: modules/meta_engine/ID3Genres.h:49 +msgid "Reggae" +msgstr "ৰেগে" + +#: modules/audio_filter/equalizer_presets.h:57 +#: modules/meta_engine/ID3Genres.h:50 +msgid "Rock" +msgstr "ৰ'ক" + +#: modules/audio_filter/equalizer_presets.h:57 +#: modules/meta_engine/ID3Genres.h:54 +msgid "Ska" +msgstr "স্কা" + +#: modules/audio_filter/equalizer_presets.h:57 +msgid "Soft" +msgstr "কোমল" + +#: modules/audio_filter/equalizer_presets.h:57 +msgid "Soft rock" +msgstr "কোমল ৰ’ক" + +#: modules/audio_filter/equalizer_presets.h:57 +#: modules/meta_engine/ID3Genres.h:51 +msgid "Techno" +msgstr "প্ৰযুক্তি" + +#: modules/audio_filter/gain.c:58 +msgid "Gain multiplier" +msgstr "পূৰণকৰ্তা লাভ কৰক" + +#: modules/audio_filter/gain.c:59 +msgid "Increase or decrease the gain (default 1.0)" +msgstr "লাভটো বৃদ্ধি বা হ্ৰাস কৰক (ডিফল্ট 1.0)" + +#: modules/audio_filter/gain.c:63 +msgid "Gain control filter" +msgstr "নিয়ন্ত্ৰণ ফিল্টাৰ লাভ কৰক" + +#: modules/audio_filter/karaoke.c:33 modules/demux/xiph_metadata.h:51 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:260 +msgid "Karaoke" +msgstr "কেৰিঅকি" + +#: modules/audio_filter/karaoke.c:34 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:261 +msgid "Simple Karaoke filter" +msgstr "সাধাৰণ কেৰিঅকি ফিল্টাৰ" + +#: modules/audio_filter/normvol.c:65 +msgid "Number of audio buffers" +msgstr "অডিঅ’ বাফাৰবোৰৰ সংখ্যা" + +#: modules/audio_filter/normvol.c:66 +msgid "" +"This is the number of audio buffers on which the power measurement is made. " +"A higher number of buffers will increase the response time of the filter to " +"a spike but will make it less sensitive to short variations." +msgstr "" +"এইটো হল অডিঅ’ বাফাৰবোৰৰ সংখ্যা যত শক্তিৰ জোখটো তৈয়াৰ কৰা হয়. বাফাৰবোৰৰ এটা উচ্চ " +"সংখ্যাই স্পাইক এটালৈ ফিল্টাৰটোৰ সঁহাৰিৰ সময়টো বৃদ্ধি কৰিব কিন্তু এইটোক চুটি " +"তাৰতম্যবোৰলৈ কম সংবেদনশীল কৰি তুলিব." + +#: modules/audio_filter/normvol.c:71 +msgid "Maximal volume level" +msgstr "সৰ্বাধিক প্ৰসাৰৰ স্তৰ" + +#: modules/audio_filter/normvol.c:72 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:255 +msgid "" +"If the average power over the last N buffers is higher than this value, the " +"volume will be normalized. This value is a positive floating point number. A " +"value between 0.5 and 10 seems sensible." +msgstr "" +"যদি অন্তিম N বাফাৰবোৰৰ ওপৰত গড় শক্তিটো এই মানটোতকৈ উচ্চ হয়, তেন্তে প্ৰসাৰটো " +"স্বাভাৱিক কৰা হব. এই মানটটো হল এটা ধনাত্মক ফ্লটিং পইন্ট সংখ্যা. 0.5 আৰু 10 ৰ মাজৰ " +"মান এটা উত্তম হিচাপে দেখা যায়." + +#: modules/audio_filter/normvol.c:78 modules/audio_filter/normvol.c:79 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:254 +msgid "Volume normalizer" +msgstr "প্ৰসাৰ স্বাভাৱিককৰ্তা" + +#: modules/audio_filter/param_eq.c:52 modules/audio_filter/param_eq.c:53 +msgid "Parametric Equalizer" +msgstr "পেৰামেট্ৰিক সমতাকৰ্তা" + +#: modules/audio_filter/param_eq.c:58 +msgid "Low freq (Hz)" +msgstr "নিম্ন কম্পনাংক (Hz)" + +#: modules/audio_filter/param_eq.c:60 +msgid "Low freq gain (dB)" +msgstr "নিম্ন কম্পনাংক লাভ (dB)" + +#: modules/audio_filter/param_eq.c:61 +msgid "High freq (Hz)" +msgstr "উচ্চ কম্পনাংক (Hz)" + +#: modules/audio_filter/param_eq.c:63 +msgid "High freq gain (dB)" +msgstr "উচ্চ কম্পনাংক লাভ (dB)" + +#: modules/audio_filter/param_eq.c:64 +msgid "Freq 1 (Hz)" +msgstr "কম্পনাংক 1 (Hz)" + +#: modules/audio_filter/param_eq.c:66 +msgid "Freq 1 gain (dB)" +msgstr "কম্পনাংক 1 লাভ (dB)" + +#: modules/audio_filter/param_eq.c:68 +msgid "Freq 1 Q" +msgstr "কম্পনাংক 1 Q" + +#: modules/audio_filter/param_eq.c:69 +msgid "Freq 2 (Hz)" +msgstr "কম্পনাংক 2 (Hz)" + +#: modules/audio_filter/param_eq.c:71 +msgid "Freq 2 gain (dB)" +msgstr "কম্পনাংক 2 লাভ (dB)" + +#: modules/audio_filter/param_eq.c:73 +msgid "Freq 2 Q" +msgstr "কম্পনাংক 2 Q" + +#: modules/audio_filter/param_eq.c:74 +msgid "Freq 3 (Hz)" +msgstr "কম্পনাংক 3 (Hz)" + +#: modules/audio_filter/param_eq.c:76 +msgid "Freq 3 gain (dB)" +msgstr "কম্পনাংক 3 লাভ (dB)" + +#: modules/audio_filter/param_eq.c:78 +msgid "Freq 3 Q" +msgstr "কম্পনাংক 3 Q" + +#: modules/audio_filter/resampler/bandlimited.c:89 +msgid "Audio filter for band-limited interpolation resampling" +msgstr "বেণ্ড-সীমিত ইন্টাৰপলেশ্বন পুনৰ নমুনাৰ বাবে অডিঅ’ ফিল্টাৰ" + +#: modules/audio_filter/resampler/soxr.c:40 +#: modules/audio_filter/resampler/speex.c:34 +msgid "Resampling quality" +msgstr "মানদণ্ড পুনৰ নমুনা কৰিছে" + +#: modules/audio_filter/resampler/soxr.c:41 +#: modules/audio_filter/resampler/speex.c:35 +msgid "Resampling quality, from worst to best" +msgstr "" + +#: modules/audio_filter/resampler/soxr.c:67 +msgid "SoX Resampler" +msgstr "" + +#: modules/audio_filter/resampler/speex.c:42 +#: modules/audio_filter/resampler/speex.c:43 +msgid "Speex resampler" +msgstr "স্পীক্স পুনৰ নমুনাকৰ্তা" + +#: modules/audio_filter/resampler/src.c:40 +msgid "Sample rate converter type" +msgstr "নমুনাৰ হাৰ ৰূপান্তৰকৰ্তাৰ প্ৰকাৰ" + +#: modules/audio_filter/resampler/src.c:42 +msgid "" +"Different resampling algorithms are supported. The best one is slower, while " +"the fast one exhibits low quality." +msgstr "" +"বেলেগ বেলগ পুনৰ নমুনা কৰা এলগোৰিথমবোৰ সমৰ্থন কৰে. শ্ৰেষ্ঠটো হল মন্থৰ, সেইদৰে " +"খৰতকীয়া এটাই নিম্ন মানদণ্ডটো প্ৰদৰ্শন কৰে." + +#: modules/audio_filter/resampler/src.c:49 +msgid "Sinc function (best quality)" +msgstr "ছিন্ক কাৰ্য (শ্ৰেষ্ঠ মানদণ্ড)" + +#: modules/audio_filter/resampler/src.c:49 +msgid "Sinc function (medium quality)" +msgstr "ছিন্ক কাৰ্য (মধ্যম মানদণ্ড)" + +#: modules/audio_filter/resampler/src.c:50 +msgid "Sinc function (fast)" +msgstr "ছিন্ক কাৰ্য (খৰতকীয়া)" + +#: modules/audio_filter/resampler/src.c:50 +msgid "Zero Order Hold (fastest)" +msgstr "শূন্য নিৰ্দেশ ধৰি ৰখা (আটাইতকৈ খৰতকীয়া)" + +#: modules/audio_filter/resampler/src.c:50 +msgid "Linear (fastest)" +msgstr "সমান্তৰাল (আটাইতকৈ খৰতকীয়া)" + +#: modules/audio_filter/resampler/src.c:58 +msgid "SRC resampler" +msgstr "SRC পুনৰ নমুনাকৰ্তা" + +#: modules/audio_filter/resampler/src.c:59 +msgid "Secret Rabbit Code (libsamplerate) resampler" +msgstr "গোপন ৰেবিট কোড (libনমুনাৰ হাৰ) নমুনাকৰ্তা" + +#: modules/audio_filter/resampler/ugly.c:49 +msgid "Nearest-neighbor audio resampler" +msgstr "আটাইতকৈ ওচৰৰ বন্ধুত্বপূৰ্ণ অডিঅ’ পুনৰ নমুনাকৰ্তা" + +#: modules/audio_filter/scaletempo.c:52 +msgid "Pitch Shifter" +msgstr "" + +#: modules/audio_filter/scaletempo.c:53 +msgid "Audio pitch changer" +msgstr "" + +#: modules/audio_filter/scaletempo.c:55 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:263 +msgid "Audio tempo scaler synched with rate" +msgstr "অডিঅ’ টেম্পো জোখাটো হাৰৰ সৈতে ছিনক্ৰনাইজ কৰা হল " + +#: modules/audio_filter/scaletempo.c:56 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:262 +msgid "Scaletempo" +msgstr "টেম্পো জোখক" + +#: modules/audio_filter/scaletempo.c:67 +msgid "Stride Length" +msgstr "খোজৰ দৈৰ্ঘ্য" + +#: modules/audio_filter/scaletempo.c:67 +msgid "Length in milliseconds to output each stride" +msgstr "প্ৰতিটো খোজৰ আউটপুটলৈ মিলিছেকেণ্ডত খোজৰ দৈৰ্ঘ" + +#: modules/audio_filter/scaletempo.c:69 +msgid "Overlap Length" +msgstr "দৈৰ্ঘ্য অভাৰলেপ কৰক" + +#: modules/audio_filter/scaletempo.c:69 +msgid "Percentage of stride to overlap" +msgstr "অভাৰলেপ কৰিবলৈ খোজৰ শতাংশ" + +#: modules/audio_filter/scaletempo.c:71 +msgid "Search Length" +msgstr "সন্ধানৰ দৈৰ্ঘ্য" + +#: modules/audio_filter/scaletempo.c:71 +msgid "Length in milliseconds to search for best overlap position" +msgstr "শ্ৰেষ্ঠ অভাৰলেপ স্থানটোৰ বাবে সন্ধান কৰিবলৈ মিলিছেকেণ্ডত দৈৰ্ঘ্য" + +#: modules/audio_filter/scaletempo.c:74 +msgid "Pitch Shift" +msgstr "" + +#: modules/audio_filter/scaletempo.c:74 +msgid "Pitch shift in semitones." +msgstr "" + +#: modules/audio_filter/spatializer/spatializer.cpp:54 +msgid "Room size" +msgstr "কোঠাৰ আকাৰ" + +#: modules/audio_filter/spatializer/spatializer.cpp:55 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:237 +msgid "Defines the virtual surface of the room emulated by the filter." +msgstr "ফিল্টাৰটোৰ দ্বাৰা এমুলেট কৰা কোঠাটোৰ বাস্তৱিক পৃষ্ঠটো বাখ্যা কৰে." + +#: modules/audio_filter/spatializer/spatializer.cpp:58 +msgid "Room width" +msgstr "কোঠাৰ প্ৰস্থ" + +#: modules/audio_filter/spatializer/spatializer.cpp:59 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:240 +msgid "Width of the virtual room" +msgstr "বাস্তৱিক কোঠাটোৰ প্ৰস্থ" + +#: modules/audio_filter/spatializer/spatializer.cpp:61 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:241 +#: modules/gui/qt/components/extended_panels.cpp:1349 +msgid "Wet" +msgstr "তিতা" + +#: modules/audio_filter/spatializer/spatializer.cpp:64 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:242 +#: modules/gui/qt/components/extended_panels.cpp:1350 +msgid "Dry" +msgstr "শুকান" + +#: modules/audio_filter/spatializer/spatializer.cpp:67 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:243 +#: modules/gui/qt/components/extended_panels.cpp:1351 +msgid "Damp" +msgstr "সেমেকা" + +#: modules/audio_filter/spatializer/spatializer.cpp:71 +msgid "Audio Spatializer" +msgstr "অডিঅ’ স্পাশ্বিয়েলাইজাৰ" + +#: modules/audio_filter/spatializer/spatializer.cpp:72 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:273 +#: modules/gui/qt/dialogs/extended.cpp:75 +msgid "Spatializer" +msgstr "স্পাশ্বিয়েলাইজাৰ" + +#: modules/audio_filter/stereo_widen.c:53 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:265 +msgid "" +"This filter enhances the stereo effect by suppressing mono (signal common to " +"both channels) and by delaying the signal of left into right and vice versa, " +"thereby widening the stereo effect." +msgstr "" +"ম’ন’ দমাই ৰখা (উভয় চেনেলৰ সাধাৰণ সংকতে) আৰু বাওঁফালৰ পৰা সোঁফালৰ সংকেতটোত বিলম্ব " +"কৰা আৰু ওলোটাটোৰ দ্বাৰা এই ফিল্টাৰটোৱে ষ্টেৰিঅ’টো বৃদ্ধি কৰে, এইদৰে ষ্টেৰিঅ’ " +"প্ৰভাৱটো প্ৰসাৰিত কৰে." + +#: modules/audio_filter/stereo_widen.c:58 +msgid "Time in ms of the delay of left signal into right and vice versa." +msgstr "সোঁফালত বাওঁফালৰ সংকেতৰ বিলম্বটোৰ আৰু বিপৰীতটোৰ ms ত সময়." + +#: modules/audio_filter/stereo_widen.c:61 +msgid "" +"Amount of gain in delayed left signal into right and vice versa. Gives a " +"delay effect of left signal in right output and vice versa which gives " +"widening effect." +msgstr "" +"সোঁফালত বাওঁফালৰ সংকেতৰ বিলম্বটোৰ আৰু বিপৰীতটোত লাভৰ পৰিমাণ. সোঁফালৰ আউটপুটত " +"বাওঁফালৰ সংকেতৰ বিলম্বৰ প্ৰভাৱ আৰু বিপৰীতটো দিয়ে যিয়ে প্ৰসাৰিত প্ৰভাৱ দিয়ে." + +#: modules/audio_filter/stereo_widen.c:64 +#: modules/gui/qt/components/extended_panels.cpp:1369 +msgid "Crossfeed" +msgstr "ক্ৰছফীড" + +#: modules/audio_filter/stereo_widen.c:65 +msgid "" +"Cross feed of left into right with inverted phase. This helps in suppressing " +"the mono. If the value is 1 it will cancel all the signal common to both " +"channels." +msgstr "" +"ওলোটা কৰা পৰ্য্যায়ৰ সৈতে বাওঁফালৰ পৰা সোঁফালত ক্ৰোছ ফীড. এইটোৱে ম’ন’টো দমাই ৰখাত " +"সহায় কৰে. যদি মানটো 1 হয় তেন্তে এইটোৱে উভয় চেনেললৈ সাধাৰণ সকলোবোৰ সংকেত বাতিল " +"কৰিব." + +#: modules/audio_filter/stereo_widen.c:68 +#: modules/gui/qt/components/extended_panels.cpp:1370 +msgid "Dry mix" +msgstr "শুকান মিহলি" + +#: modules/audio_filter/stereo_widen.c:69 +msgid "Level of input signal of original channel." +msgstr "প্ৰকৃত চেনেলৰ ইনপুট সংকেতৰ স্তৰ." + +#: modules/audio_filter/stereo_widen.c:77 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:264 +msgid "Stereo Enhancer" +msgstr "ষ্টেৰিঅ’ বৃদ্ধি কৰ্তা" + +#: modules/audio_filter/stereo_widen.c:78 +msgid "Simple stereo widening effect" +msgstr "সাধাৰণ ষ্টেৰিঅ’ প্ৰসাৰিত প্ৰভাৱ" + +#: modules/audio_mixer/float.c:49 +msgid "Single precision audio volume" +msgstr "একমাত্ৰ সুস্পষ্টতা অডিঅ’ প্ৰসাৰ" + +#: modules/audio_mixer/integer.c:38 +msgid "Integer audio volume" +msgstr "অখণ্ড অডিঅ’ প্ৰসাৰ" + +#: modules/audio_output/adummy.c:37 +msgid "Dummy audio output" +msgstr "ডামি অডিঅ’ আউটপুট" + +#: modules/audio_output/alsa.c:64 modules/audio_output/oss.c:69 +msgid "Audio output device" +msgstr "অডিঅ’ আউটপুট ডিভাইচ" + +#: modules/audio_output/alsa.c:65 +msgid "Audio output device (using ALSA syntax)." +msgstr "অডিঅ’ আউটপুট ডিভাইচ (ALSA ছিনটেক্স ব্যৱহাৰ কৰি)." + +#: modules/audio_output/alsa.c:67 modules/audio_output/waveout.c:140 +msgid "Audio output channels" +msgstr "অডিঅ’ আউটপুট চেনেলবোৰ" + +#: modules/audio_output/alsa.c:68 modules/audio_output/waveout.c:141 +msgid "" +"Channels available for audio output. If the input has more channels than the " +"output, it will be down-mixed. This parameter is ignored when digital pass-" +"through is active." +msgstr "" +"অডিঅ' আউটপুটৰ বাবে উপলব্ধ চেনেলবোৰ. যদি আউটপুটটোতকৈ ইনপুটটোৰ অধিক চেনেল থাকে, " +"এইটো ডাউন-মিক্স কৰা হব. পেৰামিটাৰটো অৱজ্ঞা কৰা হয় যেতিয়া ডিজিটেল পাছ-থ্ৰ সক্ৰিয় " +"হয়." + +#: modules/audio_output/alsa.c:76 +msgid "Surround 4.0" +msgstr "ছাৰাউণ্ড 4.0" + +#: modules/audio_output/alsa.c:76 +msgid "Surround 4.1" +msgstr "ছাৰাউণ্ড 4.1" + +#: modules/audio_output/alsa.c:77 +msgid "Surround 5.0" +msgstr "ছাৰাউণ্ড 5.0" + +#: modules/audio_output/alsa.c:77 +msgid "Surround 5.1" +msgstr "ছাৰাউণ্ড 5.1" + +#: modules/audio_output/alsa.c:77 +msgid "Surround 7.1" +msgstr "ছাৰাউণ্ড 7.1" + +#: modules/audio_output/alsa.c:82 +msgid "ALSA audio output" +msgstr "ALSA অডিঅ’ আউটপুট" + +#: modules/audio_output/alsa.c:393 modules/audio_output/auhal.c:1177 +msgid "Audio output failed" +msgstr "অডিঅ’ আউটপুট ব্যৰ্থ হল" + +#: modules/audio_output/alsa.c:394 +#, c-format +msgid "" +"The audio device \"%s\" could not be used:\n" +"%s." +msgstr "" +"\"%s\" অডিঅ’ ডিভাইচটো ব্যৱহাৰ কৰিব নোৱাৰি:\n" +"%s." + +#: modules/audio_output/amem.c:36 +msgid "Audio memory" +msgstr "অডিঅ’ স্মৃতি" + +#: modules/audio_output/amem.c:37 +msgid "Audio memory output" +msgstr "অডিঅ’ স্মৃতি আউটপুট" + +#: modules/audio_output/amem.c:44 +msgid "Sample format" +msgstr "নমুনা ফৰমেট" + +#: modules/audio_output/auhal.c:46 +msgid "Last audio device" +msgstr "অন্তিম অডিঅ’ ডিভাইচ" + +#: modules/audio_output/auhal.c:54 +msgid "HAL AudioUnit output" +msgstr "HAL অডিঅ’ ইউনিট আউটপুট" + +#: modules/audio_output/auhal.c:464 +msgid "System Sound Output Device" +msgstr "ছিষ্টেম ছাউণ্ড আউটপুট ডিভাইচ" + +#: modules/audio_output/auhal.c:535 +#, c-format +msgid "%s (Encoded Output)" +msgstr "%s (এনকোড কৰা আউটপুট)" + +#: modules/audio_output/auhal.c:1033 +msgid "Audio device is not configured" +msgstr "অডিঅ’ ডিভাইচ ৰূপৰেখা কৰা নাই" + +#: modules/audio_output/auhal.c:1034 +msgid "" +"You should configure your speaker layout with \"Audio Midi Setup\" in /" +"Applications/Utilities. VLC will output Stereo only." +msgstr "" +"আপুনি \"Audio Midi Setup\" ৰ সৈতে /আবেদনবোৰ/উপযোগিতাবোৰত আপোনাৰ স্পিকাৰ খচৰা " +"ৰূপৰেখা কৰিব পাৰে. VLC য়ে কেৱল ষ্টেৰিঅ' আউটপুট কৰিব." + +#: modules/audio_output/auhal.c:1178 +msgid "" +"The selected audio output device is exclusively in use by another program." +msgstr "" +"নিৰ্বাচিত অডিঅ' আউটপুট ডিভাইচটো অন্য কাৰ্যসূচীৰ দ্বাৰ বিশেষভাৱে ব্যৱহাৰ কৰা হয়." + +#: modules/audio_output/directsound.c:62 modules/audio_output/mmdevice.c:1486 +msgid "Output device" +msgstr "আউটপুট ডিভাইচ" + +#: modules/audio_output/directsound.c:63 modules/audio_output/mmdevice.c:1487 +msgid "Select your audio output device" +msgstr "আপোনাৰ অডিঅ’ আউটপুট ডিভাইচ নিৰ্বাচন কৰক" + +#: modules/audio_output/directsound.c:65 +msgid "Speaker configuration" +msgstr "স্পীকাৰৰ ৰূপৰেখা" + +#: modules/audio_output/directsound.c:66 +msgid "" +"Select speaker configuration you want to use. This option doesn't upmix! So " +"NO e.g. Stereo -> 5.1 conversion." +msgstr "" +"আপুনি ব্যৱহাৰ কৰিবলৈ বিচৰা স্পিকাৰ ৰূপৰেখা নিৰ্বাচন কৰক. এই বিকল্পটোৱে আপমিক্স " +"নকৰে! সেয়ে নহয় উদাহৰণস্বৰূপে ষ্টেৰিঅ' -> 5.1 ৰূপান্তৰণ." + +#: modules/audio_output/directsound.c:70 modules/audio_output/mmdevice.c:1490 +msgid "Audio volume in hundredths of decibels (dB)." +msgstr "ডেচিবেলৰ এশত অডিঅ’ প্ৰসাৰ (dB)." + +#: modules/audio_output/directsound.c:73 +msgid "DirectX audio output" +msgstr "প্ৰত্যক্ষ X অডিঅ’ আউটপুট" + +#: modules/audio_output/file.c:83 +msgid "Output format" +msgstr "আউটপুট ফৰমেট" + +#: modules/audio_output/file.c:85 +msgid "Number of output channels" +msgstr "আউটপুট চেনেলবোৰৰ সংখ্যা" + +#: modules/audio_output/file.c:86 +msgid "" +"By default (0), all the channels of the incoming will be saved but you can " +"restrict the number of channels here." +msgstr "" +"ডিফল্ট হিচাপে (0), ভিতৰলৈ অহাটোৰ সকলোবোৰ চেনেল ছেভ কৰা হব কিন্তু আপুনি ইয়াত " +"চেনেলবোৰৰ সংখ্যাটো সীমাবদ্ধ কৰিব পাৰে." + +#: modules/audio_output/file.c:89 +msgid "Add WAVE header" +msgstr "WAVE হেডাৰ যোগ কৰক" + +#: modules/audio_output/file.c:90 +msgid "Instead of writing a raw file, you can add a WAV header to the file." +msgstr "এটা ৰ’ ফাইল লিখাৰ পৰিৱৰ্তে, আপুনি ফাইলটোলৈ WAV হেডাৰ এটা যোগ কৰিব পাৰে." + +#: modules/audio_output/file.c:108 modules/stream_out/stats.c:40 +#: share/lua/http/dialogs/create_stream.html:382 +msgid "Output file" +msgstr "আউটপুট ফাইল" + +#: modules/audio_output/file.c:109 +msgid "File to which the audio samples will be written to (\"-\" for stdout)." +msgstr "" + +#: modules/audio_output/file.c:112 +msgid "File audio output" +msgstr "ফাইল অডিঅ’ আউটপুট " + +#: modules/audio_output/jack.c:83 +msgid "Automatically connect to writable clients" +msgstr "লিখিব পৰা গ্ৰাহকবোৰলৈ স্বয়ংক্ৰিয়ভাৱে সংযোগ স্থাপন কৰক" + +#: modules/audio_output/jack.c:85 +msgid "" +"If enabled, this option will automatically connect sound output to the first " +"writable JACK clients found." +msgstr "" +"যদি সক্ষম কৰে, তেন্তে এই বিকল্পটোৱে স্বয়ংক্ৰিয়ভাৱে প্ৰথমে বিচাৰি পোৱা লিখিব পৰা " +"JACK গ্ৰাহকবোৰলৈ ধ্বনি আউটপুটটো সংযোগ কৰিব." + +#: modules/audio_output/jack.c:89 +msgid "Connect to clients matching" +msgstr "গ্ৰাহকবোৰ মিলোৱালৈ সংযোগ কৰক" + +#: modules/audio_output/jack.c:91 +msgid "" +"If automatic connection is enabled, only JACK clients whose names match this " +"regular expression will be considered for connection." +msgstr "" +"যদি স্বয়ংক্ৰিয় সংযোগটো সক্ষম কৰে, তেন্তে কেৱল এই নিয়মিত প্ৰকাশভংগীটোৰ সৈতে মিলা " +"JACK গ্ৰাহকবোৰ যাৰ নামবোৰ সংযোগটোৰ বাবে বিবেচনা কৰা হব." + +#: modules/audio_output/jack.c:94 +msgid "JACK client name" +msgstr "" + +#: modules/audio_output/jack.c:101 +msgid "JACK audio output" +msgstr "JACK অডিঅ’ আউটপুট" + +#: modules/audio_output/kai.c:93 +msgid "Device" +msgstr "ডিভাইচ" + +#: modules/audio_output/kai.c:95 +msgid "Select a proper audio device to be used by KAI." +msgstr "KAI ৰ দ্বাৰা ব্যৱহাৰ কৰিবলগীয়া প্ৰকৃত অডিঅ’ ডিভাইচ এটা নিৰ্বাচন কৰক." + +#: modules/audio_output/kai.c:98 +msgid "Open audio in exclusive mode." +msgstr "বিশেষ ধৰণত অডিঅ' খোলক." + +#: modules/audio_output/kai.c:100 +msgid "" +"Enable this option if you want your audio not to be interrupted by the other " +"audio." +msgstr "" +"এই বিকল্পটো সক্ষম কৰে যদি আপুনি আপোনাৰ অডিঅ'টো অন্য অডিঅ' দ্বাৰা বাধাগ্ৰস্ত হোৱাটো " +"নিবিচাৰে." + +#: modules/audio_output/kai.c:110 +msgid "K Audio Interface audio output" +msgstr "K অডিঅ’ ইন্টাৰফেছ অডিঅ’ আউটপুট" + +#: modules/audio_output/mmdevice.c:1472 modules/gui/qt/ui/sprefs_audio.h:417 +msgid "HDMI/SPDIF audio passthrough" +msgstr "" + +#: modules/audio_output/mmdevice.c:1474 +msgid "" +"Change this value if you have issue with HD codecs when using a HDMI " +"receiver." +msgstr "" + +#: modules/audio_output/mmdevice.c:1481 +msgid "Disabled" +msgstr "" + +#: modules/audio_output/mmdevice.c:1482 +msgid "Enabled (AC3/DTS only)" +msgstr "" + +#: modules/audio_output/mmdevice.c:1483 +msgid "Enabled" +msgstr "" + +#: modules/audio_output/mmdevice.c:1494 +msgid "Windows Multimedia Device output" +msgstr "" + +#: modules/audio_output/mmdevice.c:1500 +msgid "Output back-end" +msgstr "" + +#: modules/audio_output/mmdevice.c:1500 +msgid "Audio output back-end interface." +msgstr "" + +#: modules/audio_output/oss.c:70 +msgid "OSS device node path." +msgstr "OSS ডিভাইচ নোড পাথ." + +#: modules/audio_output/oss.c:74 +msgid "Open Sound System audio output" +msgstr "মুক্ত ধ্বনি ছিষ্টেম অডিঅ’ আউটপুট" + +#: modules/audio_output/pulse.c:43 +msgid "Pulseaudio audio output" +msgstr "পাল্চ অডিঅ’ আউটপুট" + +#: modules/audio_output/sndio.c:39 +msgid "OpenBSD sndio audio output" +msgstr "মুক্তBSD স্নডিঅ’ অডিঅ’ আউটপুট" + +#: modules/audio_output/volume.h:30 +msgid "Software gain" +msgstr "ছফটৱেৰ লাভ" + +#: modules/audio_output/volume.h:31 +msgid "This linear gain will be applied in software." +msgstr "ছফটৱেৰত সমান্তৰাল লাভটো প্ৰয়োগ কৰা হব." + +#: modules/audio_output/wasapi.c:652 +msgid "Windows Audio Session API output" +msgstr "উইণ্ডোজ অডিঅ’ অধিৱেশন API আউটপুট" + +#: modules/audio_output/waveout.c:135 +msgid "Select Audio Device" +msgstr "অডিঅ’ ডিভাইচ নিৰ্বাচন কৰক" + +#: modules/audio_output/waveout.c:136 +msgid "" +"Select special Audio device, or let windows decide (default), change needs " +"VLC restart to apply." +msgstr "" +"বিশেষ অডিঅ' ডিভাইচ নিৰ্বাচন কৰক, বা উইণ্ডোজক সিদ্ধান্ত লবলৈ দিয়ক (ডিফল্ট), " +"সলনিটোৱে প্ৰয়োগ কৰিবলৈ VLC পুনৰ আৰম্ভ কৰাটো দাবী কৰে." + +#: modules/audio_output/waveout.c:149 +msgid "WaveOut audio output" +msgstr "ৱেভআউট অডিঅ’ আউটপুট" + +#: modules/audio_output/waveout.c:710 +msgid "Microsoft Soundmapper" +msgstr "মাইক্ৰ’ছফ্ট ধ্বনি মেপকৰ্তা" + +#: modules/audio_output/windows_audio_common.h:122 +msgid "Use float32 output" +msgstr "ফ্লট32 আউটপুট ব্যৱহাৰ কৰক" + +#: modules/audio_output/windows_audio_common.h:124 +msgid "" +"The option allows you to enable or disable the high-quality float32 audio " +"output mode (which is not well supported by some soundcards)." +msgstr "" +"বিকল্পটোৱে আপোনাক উচ্চ-মানদণ্ডৰ ফ্লট32 অডিঅ' আউটপুট ধৰণটো সক্ষম বা অক্ষম কৰিবলৈ " +"অনুমতি দিয়ে (যিটো কিছুমান ধ্বনি কাৰ্ডে ভালকৈ সমৰ্থন নকৰে)." + +#: modules/codec/a52.c:72 +msgid "A/52 dynamic range compression" +msgstr "A/52 ডাইনেমিক পৰিসৰ সংনমনকৰ্তা" + +#: modules/codec/a52.c:74 modules/codec/dca.c:65 +msgid "" +"Dynamic range compression makes the loud sounds softer, and the soft sounds " +"louder, so you can more easily listen to the stream in a noisy environment " +"without disturbing anyone. If you disable the dynamic range compression the " +"playback will be more adapted to a movie theater or a listening room." +msgstr "" +"ডাইনেমিক পৰিসৰ সংনমনটোৱে ডাঙৰ ধ্বনিবোৰ কোমল কৰে আৰু কোমল ধ্বনিবোৰ ডাঙৰ কৰে, " +"সেয়ে আপুনি হুলস্থলীয়া পৰিৱেশ এটাত কাকো অসুবিধা নিদিয়াকৈ ষ্ট্ৰিমটো শুনিব পাৰে. যদি " +"আপুনি ডাইনেমিক পৰিসৰ সংনমনটো অক্ষম কৰে তেন্তে চলচিত্ৰৰ প্ৰেক্ষাগৃহ বা শ্ৰোতা কোঠা " +"এটাত প্লেবেকটো অধিক এডাপ্ট কৰা হব." + +#: modules/codec/a52.c:82 +msgid "ATSC A/52 (AC-3) audio decoder" +msgstr "ATSC A/52 (AC-3) অডিঅ' ডিকোডাৰ" + +#: modules/codec/adpcm.c:48 +msgid "ADPCM audio decoder" +msgstr "ADPCM অডিঅ’ ডিকোডাৰ" + +#: modules/codec/aes3.c:47 +msgid "AES3/SMPTE 302M audio decoder" +msgstr "AES3/SMPTE 302M অডিঅ’ ডিকোডাৰ" + +#: modules/codec/aes3.c:52 +msgid "AES3/SMPTE 302M audio packetizer" +msgstr "AES3/SMPTE 302M অডিঅ’ পেকেটাইজাৰ" + +#: modules/codec/aom.c:52 +msgid "AOM video decoder" +msgstr "" + +#: modules/codec/araw.c:51 +msgid "Raw/Log Audio decoder" +msgstr "ৰ’/ল’গ অডিঅ’ ডিকোডাৰ" + +#: modules/codec/araw.c:60 +msgid "Raw audio encoder" +msgstr "ৰ’ অডিঅ’ ডিকোডাৰ" + +#: modules/codec/audiotoolbox_midi.c:47 modules/codec/fluidsynth.c:47 +msgid "SoundFont file" +msgstr "" + +#: modules/codec/audiotoolbox_midi.c:49 modules/codec/fluidsynth.c:49 +msgid "SoundFont file to use for software synthesis." +msgstr "" + +#: modules/codec/audiotoolbox_midi.c:57 +msgid "AudioToolbox MIDI synthesizer" +msgstr "" + +#: modules/codec/audiotoolbox_midi.c:59 +msgid "AUMIDI" +msgstr "" + +#: modules/codec/arib/aribsub.c:46 +msgid "Ignore ruby (furigana)" +msgstr "" + +#: modules/codec/arib/aribsub.c:47 +msgid "Ignore ruby (furigana) in the subtitle." +msgstr "" + +#: modules/codec/arib/aribsub.c:48 +msgid "Use Core Text renderer" +msgstr "" + +#: modules/codec/arib/aribsub.c:49 +msgid "Use Core Text renderer in the subtitle." +msgstr "" + +#: modules/codec/arib/aribsub.c:53 +msgid "ARIB subtitles decoder" +msgstr "" + +#: modules/codec/arib/aribsub.c:54 modules/demux/mpeg/ts_psi.c:1089 +#: modules/demux/mpeg/ts_psi.c:1096 +msgid "ARIB subtitles" +msgstr "" + +#: modules/codec/avcodec/avcodec.c:50 modules/codec/avcodec/avcodec.c:54 +msgid "Non-ref" +msgstr "প্ৰসংগ নকৰা" + +#: modules/codec/avcodec/avcodec.c:50 modules/codec/avcodec/avcodec.c:54 +msgid "Bidir" +msgstr "দুটা নিৰ্দেশিকা" + +#: modules/codec/avcodec/avcodec.c:50 modules/codec/avcodec/avcodec.c:54 +msgid "Non-key" +msgstr "কী নহয়" + +#: modules/codec/avcodec/avcodec.c:59 +msgid "rd" +msgstr "rd" + +#: modules/codec/avcodec/avcodec.c:59 +msgid "bits" +msgstr "বিটবোৰ" + +#: modules/codec/avcodec/avcodec.c:59 +msgid "simple" +msgstr "সাধাৰণ" + +#: modules/codec/avcodec/avcodec.c:71 +msgid "" +"Various audio and video decoders/encoders delivered by the FFmpeg library. " +"This includes (MS)MPEG4, DivX, SV1,H261, H263, H264, WMV, WMA, AAC, AMR, DV, " +"MJPEG and other codecs" +msgstr "" +"FFmpeg লাইব্ৰেৰীটোৰ দ্বাৰা প্ৰদান কৰা বিভিন্ন অডিঅ' আৰু ভিডিঅ' ডিকোডাৰবোৰ/" +"এনকোডাৰবোৰ. এইটোৱে (MS)MPEG4, DivX, SV1,H261, H263, H264, WMV, WMA, AAC, " +"AMR, DV, MJPEG আৰু অন্য কোডেকবোৰ অন্তৰ্ভুক্ত কৰে" + +#: modules/codec/avcodec/avcodec.c:80 +msgid "FFmpeg audio/video decoder" +msgstr "FFmpeg অডিঅ'/ভিডিঅ' ডিকোডাৰ" + +#: modules/codec/avcodec/avcodec.c:82 modules/codec/gstreamer/gstdecode.c:96 +#: modules/codec/omxil/mediacodec.c:185 modules/codec/omxil/omxil.c:148 +msgid "Decoding" +msgstr "ডিকোড কৰিছে" + +#: modules/codec/avcodec/avcodec.c:152 modules/codec/jpeg.c:119 +#: modules/codec/omxil/omxil.c:171 modules/codec/png.c:99 +#: modules/codec/schroedinger.c:370 +msgid "Encoding" +msgstr "এনকোড কৰিছে" + +#: modules/codec/avcodec/avcodec.c:153 +msgid "FFmpeg audio/video encoder" +msgstr "FFmpeg অডিঅ'/ভিডিঅ' এনকোডাৰ" + +#: modules/codec/avcodec/avcodec.h:57 +msgid "Direct rendering" +msgstr "প্ৰত্যক্ষ অনুবাদ" + +#: modules/codec/avcodec/avcodec.h:60 +msgid "Show corrupted frames" +msgstr "" + +#: modules/codec/avcodec/avcodec.h:61 +msgid "Prefer visual artifacts instead of missing frames" +msgstr "" + +#: modules/codec/avcodec/avcodec.h:63 +msgid "Error resilience" +msgstr "ভুল পুনৰ উদ্ধাৰ" + +#: modules/codec/avcodec/avcodec.h:65 +msgid "" +"libavcodec can do error resilience.\n" +"However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) this " +"can produce a lot of errors.\n" +"Valid values range from 0 to 4 (0 disables all errors resilience)." +msgstr "" +"libavকোডেকয়ে ভুল পুনৰউদ্ধাৰ কৰিব পাৰে.\n" +"সেইদৰে, এটা বাজি এনকোডাৰ সৈতে (M$ ৰ পৰা ISO MPEG-4 এনকোডাৰটোৰ পৰা) এইটোৱে " +"বহুতো ভুল তৈয়াৰ কৰিব পাৰে.\n" +"বৈধ মানবোৰে 0 ৰ পৰা 4 লৈকে পৰিসৰ দিয়ে (0 ই সকলোবোৰ ভুল পুনৰ উদ্ধাৰ অক্ষম কৰে)." + +#: modules/codec/avcodec/avcodec.h:70 +msgid "Workaround bugs" +msgstr "চাৰিওফালে কাৰ্য কৰা বাগবোৰ" + +#: modules/codec/avcodec/avcodec.h:72 +msgid "" +"Try to fix some bugs:\n" +"1 autodetect\n" +"2 old msmpeg4\n" +"4 xvid interlaced\n" +"8 ump4 \n" +"16 no padding\n" +"32 ac vlc\n" +"64 Qpel chroma.\n" +"This must be the sum of the values. For example, to fix \"ac vlc\" and " +"\"ump4\", enter 40." +msgstr "" +"কিছুমান বাগ নিৰ্দিষ্ট কৰিবলৈ চেষ্টা কৰক:\n" +"1 স্বয়ংক্ৰিয়ভাৱে চিনাক্ত\n" +"2 পুৰণি msmpeg4\n" +"4 xvid ইন্টাৰলেচ কৰা\n" +"8 ump4 \n" +"16 কোনো পেডিং নাই\n" +"32 ac vlc\n" +"64 Qpel ক্ৰোমা.\n" +"এইটো মানবোৰৰ যোগফল হোৱাটো অপৰিহাৰ্য. উদাহৰণস্বৰূপে, \"ac vlc\" আৰু \"ump4\" " +"নিৰ্দিষ্ট কৰিবলৈ, 40 ভৰাওক." + +#: modules/codec/avcodec/avcodec.h:83 modules/codec/avcodec/avcodec.h:178 +#: modules/demux/rawdv.c:42 +msgid "Hurry up" +msgstr "খৰখেদা কৰক" + +#: modules/codec/avcodec/avcodec.h:85 +msgid "" +"The decoder can partially decode or skip frame(s) when there is not enough " +"time. It's useful with low CPU power but it can produce distorted pictures." +msgstr "" +"ডিকোডাৰটোৱে ফ্ৰেম(বোৰ) আংশিকভাৱে ডিকোড বা এৰি যাব পাৰে যেতিয়া তাত যথেষ্ট সময় " +"নাথাকে. নিম্ন CPU শক্তিৰ সৈতে এইটো উপযোগী কিন্তু এইটোৱে বিকৃত ছবি তৈয়াৰ কৰিব পাৰে." + +#: modules/codec/avcodec/avcodec.h:89 +msgid "Allow speed tricks" +msgstr "গতিশীল কৌশলবোৰৰ অনুমতি দিয়ক" + +#: modules/codec/avcodec/avcodec.h:91 +msgid "" +"Allow non specification compliant speedup tricks. Faster but error-prone." +msgstr "" +"নিৰ্দিষ্টকৈ বাখ্যা নকৰা অভিযোগ গতিশীল কৌশলবোৰ অনুমতি দিয়ক. খৰতকীয়া কিন্তু ভুলৰ " +"সম্ভাৱনা থকা." + +#: modules/codec/avcodec/avcodec.h:93 +msgid "Skip frame (default=0)" +msgstr "ফ্ৰেম এৰি যাওক (ডিফল্ট=0)" + +#: modules/codec/avcodec/avcodec.h:95 +msgid "" +"Force skipping of frames to speed up decoding (-1=None, 0=Default, 1=B-" +"frames, 2=P-frames, 3=B+P frames, 4=all frames)." +msgstr "" +"ডিকোডিং গতিশীল কৰিবলৈ ফ্ৰেমবোৰ জোৰকৈ এৰি যাওক (-1=নাই, 0=ডিফল্ট, 1=B-ফ্ৰেমবোৰ, " +"2=P-ফ্ৰেমবোৰ, 3=B+P ফ্ৰেমবোৰ, 4=সকলোবোৰ ফ্ৰেম)." + +#: modules/codec/avcodec/avcodec.h:98 +msgid "Skip idct (default=0)" +msgstr "idct এৰি যাওক (ডিফল্ট=0)" + +#: modules/codec/avcodec/avcodec.h:100 +msgid "" +"Force skipping of idct to speed up decoding for frame types (-1=None, " +"0=Default, 1=B-frames, 2=P-frames, 3=B+P frames, 4=all frames)." +msgstr "" +"ফ্ৰেম প্ৰকাৰবোৰৰ বাবে ডিকোডিং গতিশীল কৰিবলৈ idct জোৰকৈ এৰিযোৱাটো (-1=নাই, " +"0=ডিফল্ট, 1=B-ফ্ৰেমবোৰ, 2=P-ফ্ৰেমবোৰ, 3=B+P ফ্ৰেমবোৰ, 4=সকলোবোৰ ফ্ৰেম)." + +#: modules/codec/avcodec/avcodec.h:103 +msgid "Debug mask" +msgstr "ডিবাগ মাক্স" + +#: modules/codec/avcodec/avcodec.h:104 +msgid "Set FFmpeg debug mask" +msgstr "FFmpeg ডিবাগ মাক্স ছেট কৰক" + +#: modules/codec/avcodec/avcodec.h:106 +msgid "Codec name" +msgstr "কোডেক নাম" + +#: modules/codec/avcodec/avcodec.h:107 +msgid "Internal libavcodec codec name" +msgstr "আভ্যন্তৰীণ libavকোডেক কোডেক নাম" + +#: modules/codec/avcodec/avcodec.h:109 +#: modules/gui/macosx/VLCSimplePrefsController.m:313 +msgid "Skip the loop filter for H.264 decoding" +msgstr "H.264 ডিকোডিংৰ বাবে লুপ ফিল্টাৰটো এৰি যাওক" + +#: modules/codec/avcodec/avcodec.h:110 +msgid "" +"Skipping the loop filter (aka deblocking) usually has a detrimental effect " +"on quality. However it provides a big speedup for high definition streams." +msgstr "" +"লুপ ফিল্টাৰটো এৰি যোৱাটোৰ (aka deblocking) সাধাৰণতে মানদণ্ডৰ ওপৰত এটা " +"ডিট্ৰিমেন্টেল প্ৰভাৱ থাকে. সেইদৰে এইটোৱে উচ্চ পৰিধিৰ ষ্ট্ৰিমবোৰৰ বাবে ডাঙৰ গতি " +"প্ৰদান কৰে." + +#: modules/codec/avcodec/avcodec.h:114 +#: modules/gui/macosx/VLCSimplePrefsController.m:311 +msgid "Hardware decoding" +msgstr "হাৰ্ডৱেৰ ডিকোডিং" + +#: modules/codec/avcodec/avcodec.h:115 +msgid "This allows hardware decoding when available." +msgstr "এইটোৱে হাৰ্ডৱেৰ ডিকোডিংৰ অনুমতি দিয়ে যেতিয়া উপলব্ধ হয়." + +#: modules/codec/avcodec/avcodec.h:117 +msgid "Threads" +msgstr "থ্ৰেডবোৰ" + +#: modules/codec/avcodec/avcodec.h:118 +msgid "Number of threads used for decoding, 0 meaning auto" +msgstr "ডিকোডিংৰ বাবে ব্যৱহাৰ কৰা থ্ৰেডবোৰৰ সংখ্যা, 0 মানে স্বয়ংক্ৰিয়" + +#: modules/codec/avcodec/avcodec.h:125 +msgid "Ratio of key frames" +msgstr "মুখ্য ফ্ৰেমবোৰৰ অনুপাত" + +#: modules/codec/avcodec/avcodec.h:126 +msgid "Number of frames that will be coded for one key frame." +msgstr "ফ্ৰেমবোৰৰ সংখ্যা যিটো এটা কী ফ্ৰেমৰ বাবে কোড কৰা হব." + +#: modules/codec/avcodec/avcodec.h:129 +msgid "Ratio of B frames" +msgstr "B ফ্ৰেমবোৰৰ অনুপাত" + +#: modules/codec/avcodec/avcodec.h:130 +msgid "Number of B frames that will be coded between two reference frames." +msgstr "B ফ্ৰেমবোৰৰ সংখ্যা যিটো দুটা প্ৰসংগ কৰা ফ্ৰেমবোৰৰ মাডত কোড কৰা হব." + +#: modules/codec/avcodec/avcodec.h:133 +msgid "Video bitrate tolerance" +msgstr "ভিডিঅ' বিট হাৰ বহন ক্ষমতা" + +#: modules/codec/avcodec/avcodec.h:134 +msgid "Video bitrate tolerance in kbit/s." +msgstr "kbit/s ত ভিডিঅ' বিট হাৰ বহন." + +#: modules/codec/avcodec/avcodec.h:136 +msgid "Interlaced encoding" +msgstr "ইন্টাৰলেচ এনকোডিং" + +#: modules/codec/avcodec/avcodec.h:137 +msgid "Enable dedicated algorithms for interlaced frames." +msgstr "ইন্টাৰলেচ কৰা ফ্ৰেমবোৰৰ বাবে উত্সৰ্গিত এলগোৰিথমবোৰ সক্ষম কৰক." + +#: modules/codec/avcodec/avcodec.h:140 +msgid "Interlaced motion estimation" +msgstr "প্ৰস্তাৱৰ পৰিকল্পনা ইন্টাৰলেচ কৰা হল" + +#: modules/codec/avcodec/avcodec.h:141 +msgid "Enable interlaced motion estimation algorithms. This requires more CPU." +msgstr "" +"ইন্টাৰলেচ কৰা প্ৰস্তাৱৰ পৰিকল্পনা এলগোৰিথমবোৰ সক্ষম কৰক. এইটোৱে অধিক CPU দাবী কৰে." + +#: modules/codec/avcodec/avcodec.h:144 +msgid "Pre-motion estimation" +msgstr "পূৰ্ব-প্ৰস্তাৱৰ পৰিকল্পনা" + +#: modules/codec/avcodec/avcodec.h:145 +msgid "Enable the pre-motion estimation algorithm." +msgstr "পূৰ্ব-প্ৰস্তাৱৰ পৰিকল্পনাৰ এলগোৰিথমটো সক্ষম কৰক." + +#: modules/codec/avcodec/avcodec.h:148 +msgid "Rate control buffer size" +msgstr "হাৰ নিয়ন্ত্ৰণ বাফাৰ আকাৰ" + +#: modules/codec/avcodec/avcodec.h:149 +msgid "" +"Rate control buffer size (in kbytes). A bigger buffer will allow for better " +"rate control, but will cause a delay in the stream." +msgstr "" +"হাৰ নিয়ন্ত্ৰণ বাফাৰৰ আকাৰ (kbytes ত). এটা অধিক ডাঙৰ বাফাৰে অধিক ভাল হাৰ " +"নিয়ন্ত্ৰণৰ অনুমতি দিব, কিন্তু ষ্ট্ৰিমটোত বিলম্ব এটা ঘটাব." + +#: modules/codec/avcodec/avcodec.h:153 +msgid "Rate control buffer aggressiveness" +msgstr "হাৰ নিয়ন্ত্ৰণ বাফাৰৰ আক্ৰমণকতা" + +#: modules/codec/avcodec/avcodec.h:154 +msgid "Rate control buffer aggressiveness." +msgstr "হাৰ নিয়ন্ত্ৰণ বাফাৰৰ আক্ৰমণকতা." + +#: modules/codec/avcodec/avcodec.h:157 +msgid "I quantization factor" +msgstr "I পৰিণামী কাৰক" + +#: modules/codec/avcodec/avcodec.h:159 +msgid "" +"Quantization factor of I frames, compared with P frames (for instance 1.0 => " +"same qscale for I and P frames)." +msgstr "" +"I ফ্ৰেমবোৰৰ পৰিণামী কাৰক, P ফ্ৰেমবোৰৰ সৈতে তুলনা কৰা (উদাহৰণস্বৰূপে 1.0 => I আৰু P " +"ফ্ৰেমবোৰৰ বাবে একে qজোখ)." + +#: modules/codec/avcodec/avcodec.h:162 modules/codec/x264.c:363 +#: modules/demux/mod.c:79 +msgid "Noise reduction" +msgstr "হুলস্থূল হ্ৰাসকৰণ" + +#: modules/codec/avcodec/avcodec.h:163 +msgid "" +"Enable a simple noise reduction algorithm to lower the encoding length and " +"bitrate, at the expense of lower quality frames." +msgstr "" +"এনকোডিংৰ দৈৰ্ঘ্য আৰু বাইট হাৰ নিম্ন কৰিবলৈ এটা সাধাৰণ হুলস্থূল হ্ৰাসৰ এলগোৰিথম সক্ষম " +"কৰক, নিম্ন মানদণ্ডৰ ফ্ৰেমবোৰৰ খৰচত." + +#: modules/codec/avcodec/avcodec.h:167 +msgid "MPEG4 quantization matrix" +msgstr "MPEG4 পৰিণামী মেট্ৰিক্স" + +#: modules/codec/avcodec/avcodec.h:168 +msgid "" +"Use the MPEG4 quantization matrix for MPEG2 encoding. This generally yields " +"a better looking picture, while still retaining the compatibility with " +"standard MPEG2 decoders." +msgstr "" +"MPEG2 এনকোডিংৰ বাবে MPEG4 পৰিণামী মেট্ৰিক্সটো ব্যৱহাৰ কৰক. এইটোৱে সাধাৰণতে এটা " +"ভাল ছবি দিয়ে, সেইদৰে এতিয়াও মানবিশিষ্ট MPEG2 ডিকোডাৰবোৰৰ সৈতে খাপখোৱাটো ধৰি " +"ৰাখিছে." + +#: modules/codec/avcodec/avcodec.h:173 modules/codec/jpeg.c:51 +msgid "Quality level" +msgstr "মানদণ্ডৰ স্তৰ" + +#: modules/codec/avcodec/avcodec.h:174 +msgid "" +"Quality level for the encoding of motions vectors (this can slow down the " +"encoding very much)." +msgstr "" +"প্ৰস্তাৱ ভেক্টৰবোৰৰ এনকোডিংটোৰ বাবে মানদণ্ডৰ স্তৰ (এইটোৱে অধিক এনকোডিং কৰাটো মন্থৰ " +"কৰিব পাৰে)." + +#: modules/codec/avcodec/avcodec.h:179 +msgid "" +"The encoder can make on-the-fly quality tradeoffs if your CPU can't keep up " +"with the encoding rate. It will disable trellis quantization, then the rate " +"distortion of motion vectors (hq), and raise the noise reduction threshold " +"to ease the encoder's task." +msgstr "" +"যদি আপোনাৰ CPU টোৱে এনকোডিংৰ হাৰটোৰ সৈতে আগবাঢ়িব নোৱাৰে তেন্তে এনকোডাৰটোৱে অন-" +"দা-ফ্লাই মানদণ্ডৰ ট্ৰেডঅফছ তৈয়াৰ কৰিব পাৰে. এইটোৱে ট্ৰেলিছ পৰিণামীকৰণ অক্ষম কৰিব, " +"তেতিয়া এনকোডাৰৰ কাৰ্য সহজ কৰিবলৈ প্ৰস্তাৱ ভেক্টৰবোৰৰ (hq) হাৰ বিঘ্নিত হোৱাটো, আৰু " +"হুলস্থূল হ্ৰাস কৰা থ্ৰেছহল্ডটো বৃদ্ধি কৰা হয়." + +#: modules/codec/avcodec/avcodec.h:185 +msgid "Minimum video quantizer scale" +msgstr "নূন্যতম ভিডিঅ’ পৰিণামীকৰ্তা জোখ" + +#: modules/codec/avcodec/avcodec.h:186 +msgid "Minimum video quantizer scale." +msgstr "নূন্যতম ভিডিঅ’ পৰিণামীকৰ্তা জোখ." + +#: modules/codec/avcodec/avcodec.h:189 +msgid "Maximum video quantizer scale" +msgstr "সৰ্বাধিক ভিডিঅ’ পৰিণামীকৰ্তা জোখ" + +#: modules/codec/avcodec/avcodec.h:190 +msgid "Maximum video quantizer scale." +msgstr "সৰ্বাধিক ভিডিঅ’ পৰিণামীকৰ্তা জোখ." + +#: modules/codec/avcodec/avcodec.h:193 +msgid "Trellis quantization" +msgstr "ট্ৰেলিছ পৰিণামীকৰণ" + +#: modules/codec/avcodec/avcodec.h:194 +msgid "Enable trellis quantization (rate distortion for block coefficients)." +msgstr "ট্ৰেলিছ পৰিণামীকৰণ সক্ষম কৰক (ব্লক গুণাংকবোৰৰ বাবে হাৰ বিঘ্নিতকৰণ)." + +#: modules/codec/avcodec/avcodec.h:197 +msgid "Fixed quantizer scale" +msgstr "নিৰ্দিষ্ট কৰা পৰিণামীকৰ্তা জোখ" + +#: modules/codec/avcodec/avcodec.h:198 +msgid "" +"A fixed video quantizer scale for VBR encoding (accepted values: 0.01 to " +"255.0)." +msgstr "" +"VBR এনকোডিংৰ বাবে এটা নিৰ্দিষ্ট ভিডিঅ' পৰিণামীকৰ্তা (গ্ৰহণ কৰা মানবোৰ: 0.01 ৰ " +"পৰা 255.0 লৈ)." + +#: modules/codec/avcodec/avcodec.h:201 +msgid "Strict standard compliance" +msgstr "কোঠৰ মানবিশিষ্ট অনুপালন" + +#: modules/codec/avcodec/avcodec.h:202 +msgid "" +"Force a strict standard compliance when encoding (accepted values: -2 to 2)." +msgstr "" +"কোঠৰ মানবিশিষ্ট অনুপালন এটা জোৰ কৰক যেতিয়া এনকোডিং কৰে (গ্ৰহণ কৰা মানবোৰ: -2 to " +"2)." + +#: modules/codec/avcodec/avcodec.h:205 +msgid "Luminance masking" +msgstr "লুমিনেঞ্চ মাস্কিং" + +#: modules/codec/avcodec/avcodec.h:206 +msgid "Raise the quantizer for very bright macroblocks (default: 0.0)." +msgstr "বৰ উজ্জ্বল মেক্ৰোব্লকবোৰৰ বাবে পৰিণামীকৰ্তা বঢ়াওক (ডিফল্ট: 0.0)." + +#: modules/codec/avcodec/avcodec.h:209 +msgid "Darkness masking" +msgstr "আন্ধাৰ কৰা মাস্কিং" + +#: modules/codec/avcodec/avcodec.h:210 +msgid "Raise the quantizer for very dark macroblocks (default: 0.0)." +msgstr "বৰ আন্ধাৰ মেক্ৰোব্লকবোৰৰ বাবে পৰিণামীকৰ্তা বঢ়াওক (ডিফল্ট: 0.0)." + +#: modules/codec/avcodec/avcodec.h:213 +msgid "Motion masking" +msgstr "প্ৰস্তাৱ মাস্কিং" + +#: modules/codec/avcodec/avcodec.h:214 +msgid "" +"Raise the quantizer for macroblocks with a high temporal complexity " +"(default: 0.0)." +msgstr "" +"মেক্ৰোব্লকবোৰৰ বাবে এটা উচ্চ সাময়িক জটিলতাৰ সৈতে পৰিণামীকৰ্তাটো বঢ়াওক (ডিফল্ট: " +"0.0)." + +#: modules/codec/avcodec/avcodec.h:217 +msgid "Border masking" +msgstr "সীমা মাক্স কৰিছে" + +#: modules/codec/avcodec/avcodec.h:218 +msgid "" +"Raise the quantizer for macroblocks at the border of the frame (default: " +"0.0)." +msgstr "ফ্ৰেমটোৰ সীমাত মেক্ৰোব্লকবোৰৰ বাবে পৰিণামীকৰ্তাটো বঢ়াওক (ডিফল্ট: 0.0)." + +#: modules/codec/avcodec/avcodec.h:221 +msgid "Luminance elimination" +msgstr "লুমিনেঞ্চ এৰি দিয়াটো" + +#: modules/codec/avcodec/avcodec.h:222 +msgid "" +"Eliminates luminance blocks when the PSNR isn't much changed (default: 0.0). " +"The H264 specification recommends -4." +msgstr "" +"লুমিনেঞ্চ খণ্ডবোৰ এৰি দিয়ে যেতিয়া PSNR টো অধিক সলনি কৰা নহয় (ডিফল্ট: 0.0). H264 " +"বাখ্যাটোৱে -4 পৰামৰ্শ কৰে." + +#: modules/codec/avcodec/avcodec.h:226 +msgid "Chrominance elimination" +msgstr "ক্ৰোমিনেঞ্চ এৰি দিয়া" + +#: modules/codec/avcodec/avcodec.h:227 +msgid "" +"Eliminates chrominance blocks when the PSNR isn't much changed (default: " +"0.0). The H264 specification recommends 7." +msgstr "" +"ক্ৰোমিনেঞ্চ খণ্ডবোৰ এৰি দিয়ে যেতিয়া PSNR টো অধিক সলনি কৰা নহয় (ডিফল্ট: 0.0). " +"H264 বাখ্যাটোৱে 7 পৰামৰ্শ কৰে." + +#: modules/codec/avcodec/avcodec.h:231 +msgid "Specify AAC audio profile to use" +msgstr "ব্যৱহাৰ কৰিবলৈ AAC অডিঅ’ প্ৰফাইল নিৰ্ধাৰণ কৰক" + +#: modules/codec/avcodec/avcodec.h:232 +msgid "" +"Specify the AAC audio profile to use for encoding the audio bitstream. It " +"takes the following options: main, low, ssr (not supported),ltp, hev1, hev2 " +"(default: low). hev1 and hev2 are currently supported only with libfdk-aac " +"enabled libavcodec" +msgstr "" +"অডিঅ’ বিটষ্ট্ৰিমটো এনকোডিং কৰিবৰ বাবে ব্যৱহাৰ কৰিবলৈ AAC অডিঅ’ প্ৰফাইলটো নিৰ্ধাৰণ " +"কৰক. এইটোৱে নিম্নোক্ত বিকল্পবোৰ গ্ৰহণ কৰে: মুখ্য, নিম্ন, ssr (সমৰ্থন নকৰে),ltp, " +"hev1, hev2 (default: low). কেৱল libavcodec সক্ষম কৰা libfdk-aac ৰ সৈতে hev1 " +"আৰু hev2 টো বৰ্তমান সমৰ্থন কৰা হৈছে" + +#: modules/codec/avcodec/d3d11va.c:67 +msgid "Direct3D11 Video Acceleration" +msgstr "" + +#: modules/codec/avcodec/dxva2.c:55 +msgid "DirectX Video Acceleration (DXVA) 2.0" +msgstr "প্ৰত্যক্ষX ভিডিঅ’ দ্ৰুতি (DXVA) 2.0" + +#: modules/codec/avcodec/encoder.c:399 +#, c-format +msgid "" +"It seems your Libav/FFmpeg (libavcodec) installation lacks the following " +"encoder:\n" +"%s.\n" +"If you don't know how to fix this, ask for support from your distribution.\n" +"\n" +"This is not an error inside VLC media player.\n" +"Do not contact the VideoLAN project about this issue.\n" +msgstr "" +"এইটোৱে আপোনাৰ Libav/FFmpeg (libavcodec) ইনষ্টলেশ্বন ত্ৰুটিবোৰ নিম্নোক্ত " +"এনকোডাৰবোৰত দেখুৱায়:\n" +"%s.\n" +"যদি আপুনি কেনেকৈ নিৰ্দিষ্ট কৰিব লাগে নাজানে, তেন্তে আপোনাৰ বিতৰণৰ পৰা সমৰ্থনৰ " +"বাবে সোধক.\n" +"\n" +"এইটো VLC মিডিয়া প্লেয়াৰ ভিতৰত থকা ভুল এটা নহয়.\n" +"এই বিতৰ্কটোৰ বিষয়ে VideoLAN প্ৰকল্পটোৰ সৈতে যোগাযোগ নকৰিব.\n" + +#: modules/codec/avcodec/encoder.c:926 +msgid "unknown" +msgstr "অজ্ঞাত" + +#: modules/codec/avcodec/encoder.c:926 +msgid "video" +msgstr "ভিডিঅ’" + +#: modules/codec/avcodec/encoder.c:927 +msgid "audio" +msgstr "অডিঅ’" + +#: modules/codec/avcodec/encoder.c:927 +msgid "subpicture" +msgstr "উপছবি" + +#: modules/codec/avcodec/encoder.c:940 +#, c-format +msgid "VLC could not open the %4.4s %s encoder." +msgstr "VLC য়ে %4.4s %s এনকোডাৰ খুলিব নোৱাৰিলে." + +#: modules/codec/avcodec/vaapi.c:388 +msgid "VA-API video decoder via DRM" +msgstr "DRM ৰ যোগেদি VA-API ভিডিঅ’ ডিকোডাৰ " + +#: modules/codec/avcodec/vaapi.c:393 +msgid "VA-API video decoder" +msgstr "" + +#: modules/codec/bpg.c:49 +msgid "BPG image decoder" +msgstr "" + +#: modules/codec/cc.c:51 modules/codec/zvbi.c:65 +#: modules/gui/macosx/VLCSimplePrefsController.m:361 modules/spu/marq.c:108 +#: modules/spu/rss.c:144 modules/gui/qt/ui/video_effects.h:1312 +msgid "Opacity" +msgstr "অস্বচ্ছতা" + +#: modules/codec/cc.c:52 modules/codec/zvbi.c:66 +msgid "Setting to true makes the text to be boxed and maybe easier to read." +msgstr "" + +#: modules/codec/cc.c:56 +msgid "CC 608/708" +msgstr "CC 608/708" + +#: modules/codec/cc.c:57 +msgid "Closed Captions decoder" +msgstr "কেপশ্বনবোৰ ডিকোডাৰ বন্ধ কৰা হল" + +#: modules/codec/cdg.c:88 +msgid "CDG video decoder" +msgstr "CDG ভিডিঅ’ ডিকোডাৰ" + +#: modules/codec/crystalhd.c:90 +msgid "Crystal HD hardware video decoder" +msgstr "ক্ৰিষ্টেল HD হাৰ্ডৱেৰ ভিডিঅ’ ডিকোডাৰ" + +#: modules/codec/cvdsub.c:50 +msgid "CVD subtitle decoder" +msgstr "CVD উপশিৰোনাম ডিকোডাৰ" + +#: modules/codec/cvdsub.c:55 +msgid "Chaoji VCD subtitle packetizer" +msgstr "চাওজী VCD উপশিৰোনাম পেকেটাইজাৰ" + +#: modules/codec/daala.c:109 modules/codec/speex.c:63 +#: modules/codec/theora.c:105 modules/codec/twolame.c:54 +#: modules/codec/vorbis.c:173 +msgid "Encoding quality" +msgstr "এনকোডিংৰ মানদণ্ড" + +#: modules/codec/daala.c:111 +msgid "Enforce a quality between 0 (lossless) and 511 (worst)." +msgstr "" + +#: modules/codec/daala.c:112 +msgid "Keyframe interval" +msgstr "" + +#: modules/codec/daala.c:114 +msgid "Enforce a keyframe interval between 1 and 1000." +msgstr "" + +#: modules/codec/daala.c:120 +msgid "Daala video decoder" +msgstr "" + +#: modules/codec/daala.c:125 +msgid "Daala video packetizer" +msgstr "" + +#: modules/codec/daala.c:132 +msgid "Daala video encoder" +msgstr "" + +#: modules/codec/daala.c:143 modules/codec/schroedinger.c:54 +msgid "Chroma format" +msgstr "ক্ৰোমা ফৰমেট" + +#: modules/codec/daala.c:144 modules/codec/schroedinger.c:55 +msgid "" +"Picking chroma format will force a conversion of the video into that format" +msgstr "ক্ৰোমা ফৰমেট লোৱাটোৱে ভিডিঅ'টোৰ ৰূপান্তৰণ এটা সেই ফৰমেটটোলৈ জোৰ কৰিব" + +#: modules/codec/dav1d.c:52 +msgid "Frames Threads" +msgstr "" + +#: modules/codec/dav1d.c:53 +msgid "Max number of threads used for frame decoding, default 0=auto" +msgstr "" + +#: modules/codec/dav1d.c:54 +msgid "Tiles Threads" +msgstr "" + +#: modules/codec/dav1d.c:55 +msgid "Max number of threads used for tile decoding, default 0=auto" +msgstr "" + +#: modules/codec/dav1d.c:56 +msgid "All Layers" +msgstr "" + +#: modules/codec/dav1d.c:57 +msgid "Whether or not to display all spatial layers, default false" +msgstr "" + +#: modules/codec/dav1d.c:62 +msgid "Dav1d video decoder" +msgstr "" + +#: modules/codec/dca.c:63 +msgid "DTS dynamic range compression" +msgstr "DTS ডাইনেমিক পৰিসৰ সংনমনকৰ্তা" + +#: modules/codec/dca.c:75 +msgid "DTS Coherent Acoustics audio decoder" +msgstr "DTS কোহেৰেন্ট একাউষ্টিকছৰ বাবে অডিঅ’ ডিকোডাৰ" + +#: modules/codec/ddummy.c:36 +msgid "Save raw codec data" +msgstr "ৰ' কোডেক ডাটা ছেভ কৰক" + +#: modules/codec/ddummy.c:38 +msgid "" +"Save the raw codec data if you have selected/forced the dummy decoder in the " +"main options." +msgstr "" +"ৰ' কোডেক ডাটা ছেভ কৰক যদি মুখ্য বিকল্পবোৰত আপোনাৰ নিৰ্বাচিত/জোৰ কৰা ডামি ডিকোডাৰ " +"আছে." + +#: modules/codec/ddummy.c:47 +msgid "Dummy decoder" +msgstr "ডামি ডিকোডাৰ" + +#: modules/codec/ddummy.c:64 modules/codec/ddummy.c:65 +msgid "Dump decoder" +msgstr "ডাম্প ডিকোডাৰ" + +#: modules/codec/dmo/dmo.c:91 +msgid "DirectMedia Object decoder" +msgstr "প্ৰত্যক্ষ মিডিয়া বস্তু ডিকোডাৰ" + +#: modules/codec/dmo/dmo.c:105 +msgid "DirectMedia Object encoder" +msgstr "প্ৰত্যক্ষ মিডিয়া বস্তু এনকোডাৰ" + +#: modules/codec/dvbsub.c:83 +msgid "Decoding X coordinate" +msgstr "X স্থানাংক ডিকোড কৰিছে" + +#: modules/codec/dvbsub.c:84 +msgid "X coordinate of the rendered subtitle" +msgstr "অনুবাদ কৰা উপশিৰোনামটোৰ X স্থানাংক" + +#: modules/codec/dvbsub.c:86 +msgid "Decoding Y coordinate" +msgstr "Y স্থানাংক ডিকোড কৰিছে" + +#: modules/codec/dvbsub.c:87 +msgid "Y coordinate of the rendered subtitle" +msgstr "অনুবাদ কৰা উপশিৰোনামটোৰ Y স্থানাংক" + +#: modules/codec/dvbsub.c:89 +msgid "Subpicture position" +msgstr "উপছবিৰ স্থান" + +#: modules/codec/dvbsub.c:91 +msgid "" +"You can enforce the subpicture position on the video (0=center, 1=left, " +"2=right, 4=top, 8=bottom, you can also use combinations of these values, e." +"g. 6=top-right)." +msgstr "" +"আপুনি ভিডিঅ'টোত উপছবি স্থানটো জোৰ কৰিব পাৰে (0=কেন্দ্ৰ, 1=বাওঁফাল, 2=সোঁফাল, " +"4=ওপৰ, 8=তল, আপুনি লগতে এই মানবোৰৰ মিশ্ৰণবোৰ ব্যৱহাৰ কৰিব পাৰে, উদাহৰণস্বৰূপে " +"6=ওপৰ-সোঁফাল)." + +#: modules/codec/dvbsub.c:95 +msgid "Encoding X coordinate" +msgstr "X স্থানাংক এনকোড কৰিছে" + +#: modules/codec/dvbsub.c:96 +msgid "X coordinate of the encoded subtitle" +msgstr "এনকোড কৰা উপশিৰোনামটোৰ X স্থানাংক" + +#: modules/codec/dvbsub.c:97 +msgid "Encoding Y coordinate" +msgstr "Y স্থানাংক এনকোড কৰিছে" + +#: modules/codec/dvbsub.c:98 +msgid "Y coordinate of the encoded subtitle" +msgstr "এনকোড কৰা উপশিৰোনামটোৰ Y স্থানাংক" + +#: modules/codec/dvbsub.c:121 +msgid "DVB subtitles decoder" +msgstr "DVB উপশিৰোনামবোৰৰ ডিকোডাৰ" + +#: modules/codec/dvbsub.c:122 modules/demux/mpeg/ts_psi.c:772 +#: modules/demux/mpeg/ts_psi.c:821 +msgid "DVB subtitles" +msgstr "DVB উপশিৰোনামবোৰৰ" + +#: modules/codec/dvbsub.c:136 +msgid "DVB subtitles encoder" +msgstr "DVB উপশিৰোনামবোৰৰ এনকোডাৰ" + +#: modules/codec/edummy.c:40 +msgid "Dummy encoder" +msgstr "ডামি এনকোডাৰ" + +#: modules/codec/faad.c:54 +msgid "AAC audio decoder (using libfaad2)" +msgstr "AAC অডিঅ’ ডিকোডাৰ (libfaad2 ব্যৱহাৰ কৰি)" + +#: modules/codec/faad.c:448 +msgid "AAC extension" +msgstr "AAC সম্প্ৰসাৰণ" + +#: modules/codec/fdkaac.c:67 +msgid "Encoder Profile" +msgstr "এনকোডাৰ প্ৰফাইল" + +#: modules/codec/fdkaac.c:68 +msgid "Encoder Algorithm to use." +msgstr "" + +#: modules/codec/fdkaac.c:70 +msgid "Enable spectral band replication" +msgstr "স্পেকট্ৰেল বেণ্ডৰ প্ৰতিকৃতিকৰণ সক্ষম কৰক" + +#: modules/codec/fdkaac.c:71 +msgid "This is an optional feature only for the AAC-ELD profile." +msgstr "" + +#: modules/codec/fdkaac.c:73 +msgid "VBR Quality" +msgstr "VBR মানদণ্ড" + +#: modules/codec/fdkaac.c:74 +msgid "" +"Quality of the VBR Encoding (0=cbr, 1-5 constant vbr quality, 5 is the best)." +msgstr "" + +#: modules/codec/fdkaac.c:76 +msgid "Enable afterburner library" +msgstr "আফ্টাৰবাৰ্ণাৰ লাইব্ৰেৰী সক্ষম কৰক" + +#: modules/codec/fdkaac.c:77 +msgid "" +"This library will produce higher quality audio at the expense of additional " +"CPU usage (default is enabled)." +msgstr "" + +#: modules/codec/fdkaac.c:79 +msgid "Signaling mode of the extension AOT" +msgstr "সম্প্ৰসাৰিত AOT ৰ সংকেত দিয়াৰ ধৰণ" + +#: modules/codec/fdkaac.c:80 +msgid "" +"1 is explicit for SBR and implicit for PS (default), 2 is explicit " +"hierarchical." +msgstr "" + +#: modules/codec/fdkaac.c:97 +msgid "AAC-LC" +msgstr "AAC-LC" + +#: modules/codec/fdkaac.c:97 +msgid "HE-AAC" +msgstr "HE-AAC" + +#: modules/codec/fdkaac.c:97 +msgid "HE-AAC-v2" +msgstr "HE-AAC-v2" + +#: modules/codec/fdkaac.c:97 +msgid "AAC-LD" +msgstr "AAC-LD" + +#: modules/codec/fdkaac.c:97 +msgid "AAC-ELD" +msgstr "AAC-ELD" + +#: modules/codec/fdkaac.c:100 +msgid "FDKAAC" +msgstr "FDKAAC" + +#: modules/codec/fdkaac.c:101 +msgid "FDK-AAC Audio encoder" +msgstr "FDK-AAC অডিঅ’ এনকোডাৰ" + +#: modules/codec/flac.c:164 +msgid "Flac audio decoder" +msgstr "ফ্লেক অডিঅ' ডিকোডাৰ" + +#: modules/codec/flac.c:171 +msgid "Flac audio encoder" +msgstr "ফ্লেক অডিঅ' এনকোডাৰ" + +#: modules/codec/fluidsynth.c:51 modules/meta_engine/ID3Genres.h:130 +msgid "Chorus" +msgstr "কোৰাছ" + +#: modules/codec/fluidsynth.c:53 +msgid "Synthesis gain" +msgstr "ছিন্থেছিছ" + +#: modules/codec/fluidsynth.c:54 +msgid "" +"This gain is applied to synthesis output. High values may cause saturation " +"when many notes are played at a time." +msgstr "" +"এই লাভটো আউটপুট ছিন্থেছিছ কৰিবলৈ প্ৰয়োগ কৰা হয়. উচ্চ মানবোৰে চেচুৰেশ্বন ঘটাব পাৰে " +"যেতিয়া বহুতো নোট একেটা সময়ত চলোৱা হয়. " + +#: modules/codec/fluidsynth.c:57 +msgid "Polyphony" +msgstr "পলিফোনি" + +#: modules/codec/fluidsynth.c:59 +msgid "" +"The polyphony defines how many voices can be played at a time. Larger values " +"require more processing power." +msgstr "" +"পলিফোনিটোৱে একেটা সময়ত কিমানটা কন্ঠ চলাব পাৰি বাখ্যা কৰে. ডাঙৰ মানবোৰে অধিক " +"প্ৰক্ৰিয়া কৰা শক্তি দাবী কৰে." + +#: modules/codec/fluidsynth.c:62 modules/demux/mod.c:82 +msgid "Reverb" +msgstr "ৰিভাৰ্ব" + +#: modules/codec/fluidsynth.c:70 +msgid "FluidSynth MIDI synthesizer" +msgstr "ফ্লুইড ছিন্থেছিছ MIDI ছিন্থেছাইজাৰ" + +#: modules/codec/fluidsynth.c:72 +msgid "FluidSynth" +msgstr "ফ্লুইড ছিন্থেছিছ " + +#: modules/codec/fluidsynth.c:153 +msgid "MIDI synthesis not set up" +msgstr "MIDI ছিন্থেছিছ ছেট আপ কৰা নাই" + +#: modules/codec/fluidsynth.c:154 +msgid "" +"A sound font file (.SF2) is required for MIDI synthesis.\n" +"Please install a sound font and configure it from the VLC preferences " +"(Input / Codecs > Audio codecs > FluidSynth).\n" +msgstr "" +"MIDI ছিন্থেছিছৰ বাবে এটা প্ৰভাৱী ফন্ট ফাইল দাবী কৰে (.SF2).\n" +"অনুগ্ৰহ কৰি প্ৰভাৱী ফন্ট এটা ইনষ্টল কৰক আৰু VLC পছন্দবোৰৰ পৰা এইটো ৰূপৰেখা কৰক " +"(ইনপুট / কোডেকবোৰ > অডিঅ' কোডেকবোৰ> ফ্লুইড ছিন্থেছিছ).\n" + +#: modules/codec/g711.c:46 +msgid "G.711 decoder" +msgstr "G.711 ডিকোডাৰ" + +#: modules/codec/g711.c:54 +msgid "G.711 encoder" +msgstr "G.711 এনকোডাৰ" + +#: modules/codec/gstreamer/gstdecode.c:76 +msgid "Uses GStreamer framework's plugins to decode the media codecs" +msgstr "মিডিয়া কোডেকবোৰ ডিকোড কৰিবলৈ Gষ্ট্ৰিমাৰ ফ্ৰেমৱৰ্কবোৰৰ প্লাগইনবোৰ" + +#: modules/codec/gstreamer/gstdecode.c:79 +msgid "Use DecodeBin" +msgstr "ডিকোড বিন ব্যৱহাৰ কৰক" + +#: modules/codec/gstreamer/gstdecode.c:81 +msgid "" +"DecodeBin is a container element, that can add and manage multiple elements. " +"Apart from adding the decoders, decodebin also adds elementary stream " +"parsers which can provide more info such as codec profile, level and other " +"attributes, in the form of GstCaps (Stream Capabilities) to decoder." +msgstr "" +"ডিকোডবিন হল এটা ধাৰক উপাদান, যিয়ে বিভিন্ন উপাদান যোগ আৰু পৰিচালনা কৰিব পাৰে. " +"ডিকোডাৰবোৰ যোগ কৰাৰ উপৰিও, ডিকোডবিনে লগতে প্ৰাথমিক ষ্ট্ৰিম ভাগকৰ্তাবোৰ যোগ কৰে " +"যিয়ে কোডেক প্ৰফাইল, স্তৰ আৰু অন্য বৈশিষ্ট্যবোৰৰ দৰে অধিক তথ্য আগবঢ়ায়, ডিকোডাৰলৈ " +"GstCaps (ষ্ট্ৰিম দক্ষতাবোৰ) ৰ ৰূপত." + +#: modules/codec/gstreamer/gstdecode.c:93 +msgid "GStreamer Based Decoder" +msgstr "Gষ্ট্ৰিমাৰ আধাৰিত ডিকোডাৰ" + +#: modules/codec/jpeg.c:52 +msgid "" +"Quality level for encoding (this can enlarge or reduce output image size)." +msgstr "" +"এনকোডিংৰ বাবে মানদণ্ডৰ স্তৰ (এইটোৱে আউটপুট ছবিৰ আকাৰ বৃদ্ধি বা হ্ৰাস কৰিব পাৰে)." + +#: modules/codec/jpeg.c:111 +msgid "JPEG image decoder" +msgstr "JPEG ছবি ডিকোডাৰ" + +#: modules/codec/jpeg.c:120 +msgid "JPEG image encoder" +msgstr "JPEG ছবি এনকোডাৰ" + +#: modules/codec/kate.c:191 modules/codec/subsusf.c:44 +msgid "Formatted Subtitles" +msgstr "উপশিৰোনামবোৰ ফৰমেট কৰা হল" + +#: modules/codec/kate.c:192 +msgid "" +"Kate streams allow for text formatting. VLC partly implements this, but you " +"can choose to disable all formatting. Note that this has no effect is " +"rendering via Tiger is enabled." +msgstr "" + +#: modules/codec/kate.c:199 +msgid "Shadow" +msgstr "ছায়া" + +#: modules/codec/kate.c:199 +msgid "Outline" +msgstr "আউটলাইন" + +#: modules/codec/kate.c:207 modules/spu/marq.c:61 modules/spu/rss.c:69 +#: modules/text_renderer/freetype/freetype.c:135 +msgid "Black" +msgstr "কলা" + +#: modules/codec/kate.c:207 modules/spu/marq.c:61 modules/spu/rss.c:70 +#: modules/text_renderer/freetype/freetype.c:135 +msgid "Gray" +msgstr "গ্ৰে" + +#: modules/codec/kate.c:207 modules/spu/marq.c:62 modules/spu/rss.c:70 +#: modules/text_renderer/freetype/freetype.c:135 +msgid "Silver" +msgstr "ৰূপালী" + +#: modules/codec/kate.c:207 modules/spu/marq.c:62 modules/spu/rss.c:70 +#: modules/text_renderer/freetype/freetype.c:135 +#: modules/video_filter/ball.c:120 +msgid "White" +msgstr "বগা" + +#: modules/codec/kate.c:207 modules/spu/marq.c:62 modules/spu/rss.c:70 +#: modules/text_renderer/freetype/freetype.c:135 +msgid "Maroon" +msgstr "মেৰুণ" + +#: modules/codec/kate.c:208 modules/gui/macosx/VLCMainMenu.m:468 +#: modules/gui/macosx/VLCMainMenu.m:1103 modules/spu/marq.c:62 +#: modules/spu/rss.c:70 modules/text_renderer/freetype/freetype.c:136 +#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:65 +msgid "Red" +msgstr "ৰঙা" + +#: modules/codec/kate.c:208 modules/spu/marq.c:63 modules/spu/rss.c:71 +#: modules/text_renderer/freetype/freetype.c:136 +#: modules/video_filter/colorthres.c:65 +msgid "Fuchsia" +msgstr "ফুছিয়া" + +#: modules/codec/kate.c:208 modules/gui/macosx/VLCMainMenu.m:470 +#: modules/gui/macosx/VLCMainMenu.m:1107 modules/spu/marq.c:63 +#: modules/spu/rss.c:71 modules/text_renderer/freetype/freetype.c:136 +#: modules/video_filter/colorthres.c:65 +msgid "Yellow" +msgstr "হালধীয়া" + +#: modules/codec/kate.c:208 modules/spu/marq.c:63 modules/spu/rss.c:71 +#: modules/text_renderer/freetype/freetype.c:136 +msgid "Olive" +msgstr "অলিভ" + +#: modules/codec/kate.c:208 modules/gui/macosx/VLCMainMenu.m:469 +#: modules/gui/macosx/VLCMainMenu.m:1105 modules/spu/marq.c:63 +#: modules/spu/rss.c:71 modules/text_renderer/freetype/freetype.c:136 +#: modules/video_filter/ball.c:119 +msgid "Green" +msgstr "সেউজীয়া" + +#: modules/codec/kate.c:208 modules/spu/marq.c:64 modules/spu/rss.c:72 +#: modules/text_renderer/freetype/freetype.c:136 +msgid "Teal" +msgstr "তিল" + +#: modules/codec/kate.c:209 modules/spu/marq.c:64 modules/spu/rss.c:72 +#: modules/text_renderer/freetype/freetype.c:137 +#: modules/video_filter/colorthres.c:65 +msgid "Lime" +msgstr "লাইম" + +#: modules/codec/kate.c:209 modules/spu/marq.c:64 modules/spu/rss.c:72 +#: modules/text_renderer/freetype/freetype.c:137 +msgid "Purple" +msgstr "পাৰ্পল" + +#: modules/codec/kate.c:209 modules/spu/marq.c:64 modules/spu/rss.c:72 +#: modules/text_renderer/freetype/freetype.c:137 +msgid "Navy" +msgstr "নেভি" + +#: modules/codec/kate.c:209 modules/gui/macosx/VLCMainMenu.m:471 +#: modules/gui/macosx/VLCMainMenu.m:1109 modules/spu/marq.c:64 +#: modules/spu/rss.c:72 modules/text_renderer/freetype/freetype.c:137 +#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:65 +msgid "Blue" +msgstr "নীলা" + +#: modules/codec/kate.c:209 modules/spu/marq.c:65 modules/spu/rss.c:73 +#: modules/text_renderer/freetype/freetype.c:137 +#: modules/video_filter/colorthres.c:65 +msgid "Aqua" +msgstr "একুৱা" + +#: modules/codec/kate.c:211 +msgid "Use Tiger for rendering" +msgstr "অনুবাদৰ বাবে টাইগাৰ ব্যৱহাৰ কৰক" + +#: modules/codec/kate.c:212 +msgid "" +"Kate streams can be rendered using the Tiger library. Disabling this will " +"only render static text and bitmap based streams." +msgstr "" +"টাইগাৰ লাইব্ৰেৰী ব্যৱহাৰ কৰি কী ষ্ট্ৰিমাবোৰ অনুবাদ কৰিব পাৰি. এইটো অক্ষম কৰাটোৱে " +"কেৱল অচল টেক্সট আৰু বিটমেপ আধাৰ ষ্ট্ৰিমবোৰ অনুবাদ কৰিব." + +#: modules/codec/kate.c:216 +msgid "Rendering quality" +msgstr "অনুবাদৰ মানদণ্ড" + +#: modules/codec/kate.c:217 +msgid "" +"Select rendering quality, at the expense of speed. 0 is fastest, 1 is " +"highest quality." +msgstr "" +"গতি খৰচ কৰি অনুবাদৰ মানদণ্ডটো নিৰ্বাচন কৰক. 0 হল আটাইতকৈ খৰতকীয়া, 1 হল আটাইতকৈ " +"উচ্চ মানদণ্ডৰ." + +#: modules/codec/kate.c:221 +msgid "Default font effect" +msgstr "ডিফল্ট ফন্ট প্ৰভাৱ" + +#: modules/codec/kate.c:222 +msgid "" +"Add a font effect to text to improve readability against different " +"backgrounds." +msgstr "" +"বিভিন্ন পটভূমিবোৰৰ বিৰুদ্ধে পঢ়াৰ দক্ষতাটো বৃদ্ধি কৰিবলৈ টেক্সটলৈ ফন্ট প্ৰভাৱ এটা যোগ " +"কৰক." + +#: modules/codec/kate.c:226 +msgid "Default font effect strength" +msgstr "ডিফল্ট ফন্ট প্ৰভাৱ শক্তি" + +#: modules/codec/kate.c:227 +msgid "How pronounced to make the chosen font effect (effect dependent)." +msgstr "" +"পছন্দ কৰা ফন্ট প্ৰভাৱটো তৈয়াৰ কৰিবলৈ কেনেকৈ উচ্চাৰণ কৰিছিল (প্ৰভাৱ নিৰ্ভৰশীল)." + +#: modules/codec/kate.c:231 +msgid "Default font description" +msgstr "ডিফল্ট ফন্ট বিৱৰণ" + +#: modules/codec/kate.c:232 +msgid "" +"Which font description to use if the Kate stream does not specify particular " +"font parameters (name, size, etc) to use. A blank name will let Tiger choose " +"font parameters where appropriate." +msgstr "" +"কোনটো ফন্ট বিৱৰণ ব্যৱহাৰ কৰিব যদি কীট ষ্ট্ৰিমটোৱে ব্যৱহাৰ কৰিবলৈ বিশেষ ফন্ট " +"পেৰামিটাৰবোৰ নিৰ্ধাৰণ নকৰে (নাম, আকাৰ, ইত্যাদি). এটা খালী নামে টাইগাৰক প্ৰয়োজন " +"অনুসৰি ফন্ট পেৰামিটাৰবোৰ পছন্দ কৰিবলৈ দিব." + +#: modules/codec/kate.c:237 +msgid "Default font color" +msgstr "ডিফল্ট ফন্ট ৰং" + +#: modules/codec/kate.c:238 +msgid "" +"Default font color to use if the Kate stream does not specify a particular " +"font color to use." +msgstr "" +"ব্যৱহাৰ কৰিবলৈ ডিফল্ট ফন্ট ৰংটো যদিহে কীট ষ্ট্ৰিমটোৱে ব্যৱহাৰ কৰিবলৈ বিশেষ ফন্ট ৰং " +"এটা নিৰ্ধাৰণ নকৰে." + +#: modules/codec/kate.c:242 +msgid "Default font alpha" +msgstr "ডিফল্ট ফন্ট আলফা" + +#: modules/codec/kate.c:243 +msgid "" +"Transparency of the default font color if the Kate stream does not specify a " +"particular font color to use." +msgstr "" +"ডিফল্ট ফন্ট ৰংটোৰ স্বচ্ছতা যদিহে কীট ষ্ট্ৰিমটোৱে ব্যৱহাৰ কৰিবলৈ বিশেষ ফন্ট ৰং এটা " +"নিৰ্ধাৰণ নকৰে." + +#: modules/codec/kate.c:247 +msgid "Default background color" +msgstr "ডিফল্ট পটভূমিৰ ৰং" + +#: modules/codec/kate.c:248 +msgid "" +"Default background color if the Kate stream does not specify a background " +"color to use." +msgstr "" +"ডিফল্ট পটভূমিৰ ৰংটো যদিহে কীট ষ্ট্ৰিমটোৱে ব্যৱহাৰ কৰিবলৈ বিশেষ পটভূমিৰ ৰং এটা " +"নিৰ্ধাৰণ নকৰে." + +#: modules/codec/kate.c:252 +msgid "Default background alpha" +msgstr "ডিফল্ট পটভূমি আলফা" + +#: modules/codec/kate.c:253 +msgid "" +"Transparency of the default background color if the Kate stream does not " +"specify a particular background color to use." +msgstr "" +"ডিফল্ট পটভূমিৰ ৰংটোৰ স্বচ্ছতা যদিহে কীট ষ্ট্ৰিমটোৱে ব্যৱহাৰ কৰিবলৈ বিশেষ পটভূমিৰ ৰং " +"এটা নিৰ্ধাৰণ নকৰে." + +#: modules/codec/kate.c:259 +msgid "" +"Kate is a codec for text and image based overlays.\n" +"The Tiger rendering library is needed to render complex Kate streams, but " +"VLC can still render static text and image based subtitles if it is not " +"available.\n" +"Note that changing settings below will not take effect until a new stream is " +"played. This will hopefully be fixed soon." +msgstr "" +"টেক্স আৰু ছবি আধাৰিত অভাৰলেবোৰৰ বাবে কীট হল এটা কোডেক.\n" +"জটিল কীট ষ্ট্ৰিমবোৰ অনুবাদ কৰিবলৈ টাইগাৰ অনুবাদ কৰা লাইব্ৰেৰী এটা প্ৰয়োজন হয়, কিন্তু " +"VLC য়ে এতিয়াও অচল টেক্স আৰু ছবি আধাৰিত উপশিৰোনামবোৰ অনুবাদ কৰিব পাৰে যদি এইটো " +"উপলব্ধ নাথাকে.\n" +"মন কৰিব যে এটা নতুন ষ্ট্ৰিম নচলোৱালৈকে ছেটিংবোৰ সলনি কৰাটো কাৰ্যকৰী নহব. এইটো " +"আশানুৰূপভাৱে সোনকালে নিৰ্দিষ্ট কৰা হব." + +#: modules/codec/kate.c:268 +msgid "Kate" +msgstr "কীট" + +#: modules/codec/kate.c:269 +msgid "Kate overlay decoder" +msgstr "কীট অভাৰলে ডিকোডাৰ" + +#: modules/codec/kate.c:288 +msgid "Tiger rendering defaults" +msgstr "টাইগাৰ অনুবাদ কৰা ডিফল্টবোৰ" + +#: modules/codec/kate.c:323 +msgid "Kate text subtitles packetizer" +msgstr "কীট টেক্সট উপশিৰোনামবোৰৰ পেকেটাইজাৰ" + +#: modules/codec/libass.c:60 +msgid "Additional fonts directory" +msgstr "" + +#: modules/codec/libass.c:63 +msgid "Subtitles (advanced)" +msgstr "উপশিৰোনামবোৰ (উন্নত)" + +#: modules/codec/libass.c:64 +msgid "Subtitle renderers using libass" +msgstr "ব্যৱহাৰ কৰি উপশিৰোনাম অনুবাদবোৰ" + +#: modules/codec/libass.c:261 +#: modules/text_renderer/freetype/fonts/fontconfig.c:78 +msgid "Building font cache" +msgstr "ফন্ট কেশ্ব তৈয়াৰ কৰক" + +#: modules/codec/libass.c:262 +msgid "" +"Please wait while your font cache is rebuilt.\n" +"This should take less than a minute." +msgstr "" +"অনুগ্ৰহ কৰি অপেক্ষা কৰক যেতিয়া আপোনাৰ ফন্ট কেশ্বটো পুনৰ তৈয়াৰ কৰে.\n" +"এইটোৱে এক মিনিটতকৈ কম সময় লব." + +#: modules/codec/libmpeg2.c:140 +msgid "MPEG I/II video decoder (using libmpeg2)" +msgstr "MPEG I/II ভিডিঅ' ডিকোডাৰ (libmpeg2 ব্যৱহাৰ কৰি)" + +#: modules/codec/lpcm.c:60 +msgid "Linear PCM audio decoder" +msgstr "সমান্তৰাল PCM অডিঅ' ডিকোডাৰ" + +#: modules/codec/lpcm.c:65 +msgid "Linear PCM audio packetizer" +msgstr "সমান্তৰাল PCM অডিঅ' পেকেটাইজাৰ" + +#: modules/codec/lpcm.c:71 +msgid "Linear PCM audio encoder" +msgstr "সমান্তৰাল PCM অডিঅ' এনকোডাৰ" + +#: modules/codec/mad.c:78 +msgid "MPEG audio layer I/II/III decoder" +msgstr "MPEG অডিঅ' স্তৰ I/II/III ডিকোডাৰ" + +#: modules/codec/mft.c:66 +msgid "Media Foundation Transform decoder" +msgstr "মিডিয়া ফাউণ্ডেশ্বন ৰূপান্তৰ ডিকোডাৰ" + +#: modules/codec/mpg123.c:67 +msgid "MPEG audio decoder using mpg123" +msgstr "" + +#: modules/codec/oggspots.c:86 +msgid "OggSpots video decoder" +msgstr "" + +#: modules/codec/oggspots.c:92 +msgid "OggSpots video packetizer" +msgstr "" + +#: modules/codec/omxil/omxil.c:139 +msgid "OMX direct rendering" +msgstr "" + +#: modules/codec/omxil/omxil.c:141 +msgid "Enable OMX direct rendering." +msgstr "" + +#: modules/codec/omxil/omxil.c:145 +msgid "Audio/Video decoder (using OpenMAX IL)" +msgstr "অডিঅ'/ভিডিঅ' ডিকোডাৰ (মুক্তMAX IL ব্যৱহাৰ কৰি)" + +#: modules/codec/omxil/omxil.c:172 +msgid "Video encoder (using OpenMAX IL)" +msgstr "ভিডিঅ' এনকোডাৰ (মুক্তMAX IL ব্যৱহাৰ কৰি)" + +#: modules/codec/omxil/vout.c:49 +msgid "OpenMAX IL video output" +msgstr "মুক্তMAX IL ভিডিঅ' আউটপুট" + +#: modules/codec/opus.c:65 +msgid "Opus audio decoder" +msgstr "অপাছ অডিঅ' ডিকোডাৰ" + +#: modules/codec/opus.c:67 modules/codec/opus.c:74 +msgid "Opus" +msgstr "অপাছ" + +#: modules/codec/opus.c:72 +msgid "Opus audio encoder" +msgstr "অপাছ অডিঅ' এনকোডাৰ" + +#: modules/codec/png.c:91 +msgid "PNG video decoder" +msgstr "PNG ভিডিঅ' ডিকোডাৰ" + +#: modules/codec/png.c:100 +msgid "PNG video encoder" +msgstr "PNG ভিডিঅ' এনকোডাৰ" + +#: modules/codec/qsv.c:56 +msgid "Enable software mode" +msgstr "ছফটৱেৰ ধৰণ সক্ষম কৰক" + +#: modules/codec/qsv.c:57 +msgid "" +"Allow the use of the Intel Media SDK software implementation of the codecs " +"if no QuickSync Video hardware acceleration is present on the system." +msgstr "" +"কোডেকবোৰৰ ইনটেল মিডিয়া SDK ছফ্টৱেৰ কাৰ্যটোৰ ব্যৱহাৰটো অনুমতি দিয়ে যদি ছিষ্টেমটোত " +"কোনো ক্ষিপ্ৰ ছিক্ৰনাইজেশ্বন ভিডিঅ' হাৰ্ডৱেৰ দ্ৰুতি নাথাকে." + +#: modules/codec/qsv.c:61 +msgid "Codec Profile" +msgstr "কোডেক প্ৰফাইল" + +#: modules/codec/qsv.c:63 +msgid "" +"Specify the codec profile explicitly. If you don't, the codec will determine " +"the correct profile from other sources, such as resolution and bitrate. E.g. " +"'high'" +msgstr "" +"কোডেক প্ৰফাইল স্পষ্টতাটো নিৰ্ধাৰণ কৰক. যদি আপুনি নোৱাৰে, তেন্তে কোডেকটোৱে অন্য উত্সৰ " +"পৰা শুদ্ধ প্ৰফাইলটো নিৰ্ধাৰণ কৰিব, বিশ্লেষণ আৰু বিট হাৰৰ দৰে. উদাহৰণস্বৰূপে 'উচ্চ'" + +#: modules/codec/qsv.c:67 +msgid "Codec Level" +msgstr "কোডেক স্তৰ" + +#: modules/codec/qsv.c:69 +msgid "" +"Specify the codec level explicitly. If you don't, the codec will determine " +"the correct profile from other sources, such as resolution and bitrate. E.g. " +"'4.2' for mpeg4-part10 or 'low' for mpeg2" +msgstr "" +"কোডেক স্তৰ স্পষ্টতাটো নিৰ্ধাৰণ কৰক. যদি আপুনি নোৱাৰে, তেন্তে কোডেকটোৱে অন্য উত্সৰ " +"পৰা শুদ্ধ প্ৰফাইলটো নিৰ্ধাৰণ কৰিব, বিশ্লেষণ আৰু বিট হাৰৰ দৰে. উদাহৰণস্বৰূপে mpeg4-" +"part10 ৰ বাবে '4.2' বা mpeg2 ৰ বাবে 'নিম্ন'" + +#: modules/codec/qsv.c:73 +msgid "Group of Picture size" +msgstr "ছবি আকৰৰ গোট" + +#: modules/codec/qsv.c:75 +msgid "" +"Number of pictures within the current GOP (Group of Pictures); if " +"GopPicSize=0, then the GOP size is unspecified. If GopPicSize=1, only I-" +"frames are used." +msgstr "" +"চলিত GOP (Group of Pictures) টোৰ ভিতৰত ছবিবোৰৰ সংখ্যা; যদি GopPicSize=0, " +"তেন্তে GOP আকাৰটো নিৰ্ধাৰণ কৰা নহয়. যদি GopPicSize=1, কেৱল I-ফ্ৰেমবোৰ ব্যৱহাৰ " +"কৰা হয়." + +#: modules/codec/qsv.c:79 +msgid "Group of Picture Reference Distance" +msgstr "ছবি প্ৰসংগ দূৰত্বৰ গোট" + +#: modules/codec/qsv.c:81 +msgid "" +"Distance between I- or P- key frames; if it is zero, the GOP structure is " +"unspecified. Note: If GopRefDist = 1, there are no B-frames used." +msgstr "" + +#: modules/codec/qsv.c:85 +msgid "Target Usage" +msgstr "লক্ষ্য প্ৰচলন" + +#: modules/codec/qsv.c:86 +msgid "" +"The target usage allow to choose between different trade-offs between " +"quality and speed. Allowed values are: 'speed', 'balanced' and 'quality'." +msgstr "" + +#: modules/codec/qsv.c:90 +msgid "IDR interval" +msgstr "IDR অন্তৰাল" + +#: modules/codec/qsv.c:92 +msgid "" +"For H.264, IdrInterval specifies IDR-frame interval in terms of I-frames; if " +"IdrInterval=0, then every I-frame is an IDR-frame. If IdrInterval=1, then " +"every other I-frame is an IDR-frame, etc. For MPEG2, IdrInterval defines " +"sequence header interval in terms of I-frames. If IdrInterval=N, SDK inserts " +"the sequence header before every Nth I-frame. If IdrInterval=0 (default), " +"SDK inserts the sequence header once at the beginning of the stream." +msgstr "" + +#: modules/codec/qsv.c:100 +msgid "Rate Control Method" +msgstr "হাৰ নিয়ন্ত্ৰণ পদ্ধতি" + +#: modules/codec/qsv.c:102 +msgid "" +"The rate control method to use when encoding. Can be one of 'cbr', 'vbr', " +"'qp', 'avbr'. 'qp' mode isn't supported for mpeg2." +msgstr "" + +#: modules/codec/qsv.c:105 +msgid "Quantization parameter" +msgstr "কুৱান্টাইজেশ্বন পেৰামিটাৰ" + +#: modules/codec/qsv.c:106 +msgid "" +"Quantization parameter for all types of frames. This parameters sets qpi, " +"qpp and qpb. It has less precedence than the forementionned parameters. Used " +"only if rc_method is 'qp'." +msgstr "" + +#: modules/codec/qsv.c:110 +msgid "Quantization parameter for I-frames" +msgstr "I-ফ্ৰেমবোৰৰ বাবে কুৱান্টাইজেশ্বন পেৰামিটাৰ" + +#: modules/codec/qsv.c:111 +msgid "" +"Quantization parameter for I-frames. This parameter overrides any qp set " +"globally. Used only if rc_method is 'qp'." +msgstr "" +"I-ফ্ৰেমবোৰৰ বাবে কুৱান্টাইজেশ্বন পেৰামিটাৰ. এই পেৰামিটাৰটোৱে সাৰ্বজনীনভাৱে যিকোনো " +"qp ছেট অভাৰৰাইড কৰে. কেৱল ব্যৱহাৰ কৰা হয় যদিহে rc_method টো 'qp' হয়." + +#: modules/codec/qsv.c:114 +msgid "Quantization parameter for P-frames" +msgstr "P-ফ্ৰেমবোৰৰ বাবে কুৱান্টাইজেশ্বন পেৰামিটাৰ" + +#: modules/codec/qsv.c:115 +msgid "" +"Quantization parameter for P-frames. This parameter overrides any qp set " +"globally. Used only if rc_method is 'qp'." +msgstr "" +"P-ফ্ৰেমবোৰৰ বাবে কুৱান্টাইজেশ্বন পেৰামিটাৰ. এই পেৰামিটাৰটোৱে সাৰ্বজনীনভাৱে যিকোনো " +"qp ছেট অভাৰৰাইড কৰে. কেৱল ব্যৱহাৰ কৰা হয় যদিহে rc_method টো 'qp' হয়." + +#: modules/codec/qsv.c:118 +msgid "Quantization parameter for B-frames" +msgstr "B-ফ্ৰেমবোৰৰ বাবে কুৱান্টাইজেশ্বন পেৰামিটাৰ" + +#: modules/codec/qsv.c:119 +msgid "" +"Quantization parameter for B-frames. This parameter overrides any qp set " +"globally. Used only if rc_method is 'qp'." +msgstr "" +"B-ফ্ৰেমবোৰৰ বাবে কুৱান্টাইজেশ্বন পেৰামিটাৰ. এই পেৰামিটাৰটোৱে সাৰ্বজনীনভাৱে যিকোনো " +"qp ছেট অভাৰৰাইড কৰে. কেৱল ব্যৱহাৰ কৰা হয় যদিহে rc_method টো 'qp' হয়." + +#: modules/codec/qsv.c:122 +msgid "Maximum Bitrate" +msgstr "সৰ্বাধিক বিটৰ হাৰ" + +#: modules/codec/qsv.c:123 +msgid "" +"Defines the maximum bitrate in kbps (1000 bits/s) for VBR rate control " +"method. If not set, this parameter is computed from other sources such as " +"bitrate, profile, level, etc." +msgstr "" + +#: modules/codec/qsv.c:127 +msgid "Accuracy of RateControl" +msgstr "হাৰ নিয়ন্ত্ৰণৰ সঠিকতা" + +#: modules/codec/qsv.c:128 +msgid "" +"Tolerance in percentage of the 'avbr' (Average Variable BitRate) method. (e." +"g. 10 with a bitrate of 800 kbps means the encoder tries not to go above " +"880 kbps and under 730 kbps. The targeted accuracy is only reached after a " +"certained convergence period. See the convergence parameter" +msgstr "" + +#: modules/codec/qsv.c:134 +msgid "Convergence time of 'avbr' RateControl" +msgstr "'avbr' হাৰ নিয়ন্ত্ৰণৰ অভিসৰণৰ সময়" + +#: modules/codec/qsv.c:135 +msgid "" +"Number of 100 frames before the 'avbr' rate control method reaches the " +"requested bitrate with the requested accuracy. See the accuracy parameter." +msgstr "" + +#: modules/codec/qsv.c:139 +msgid "Number of slices per frame" +msgstr "প্ৰত্যেক ফ্ৰেমত শ্লাইছবোৰৰ সংখ্যা" + +#: modules/codec/qsv.c:140 +msgid "" +"Number of slices in each video frame; each slice contains one or more macro-" +"block rows. If numslice is not set, the encoder may choose any slice " +"partitioning allowed by the codec standard." +msgstr "" +"প্ৰতিটো ভিডিঅ' ফ্ৰেমত শ্লাইছবোৰৰ সংখ্যা; প্ৰতিটো শ্লাইছে এটা বা ততোধিক মেক্ৰো-ব্লক " +"শাৰী ধাৰণ কৰে. যদি নামশ্লাইছটো ছেট নকৰে, তেন্তে এনকোডাৰটোৱে কোডেক মানবিশিষ্টটোৰ " +"দ্বাৰা অনুমোদিত যিকোনো শ্লাইছ ভাগ কৰাটো পছন্দ কৰিব পাৰে." + +#: modules/codec/qsv.c:145 modules/codec/qsv.c:146 modules/codec/x264.c:137 +msgid "Number of reference frames" +msgstr "প্ৰসংগ ফ্ৰেমবোৰৰ সংখ্যা" + +#: modules/codec/qsv.c:148 +msgid "Number of parallel operations" +msgstr "সমান্তৰাল কাৰ্যবোৰৰ সংখ্যা" + +#: modules/codec/qsv.c:149 +msgid "" +"Defines the number of parallel encoding operations before we synchronise the " +"result. Higher numbers may result on better throughput depending on " +"hardware. MPEG2 needs at least 1 here." +msgstr "" + +#: modules/codec/qsv.c:193 +msgid "Intel QuickSync Video encoder for MPEG4-Part10/MPEG2 (aka H.264/H.262)" +msgstr "" +"MPEG4-Part10/MPEG2 (aka H.264/H.262) ৰ বাবে ইনটেল ক্ষিপ্ৰ ছিনক্ৰনাইজেশ্বন ভিডিঅ' " +"এনকোডাৰ" + +#: modules/codec/rawvideo.c:64 +msgid "Pseudo raw video decoder" +msgstr "ছিউডো ৰ' ভিডিঅ' ডিকোডাৰ" + +#: modules/codec/rawvideo.c:71 +msgid "Pseudo raw video packetizer" +msgstr "ছিউডো ৰ' ভিডিঅ' পেকেটাইজাৰ" + +#: modules/codec/rtpvideo.c:45 +msgid "Raw video encoder for RTP" +msgstr "" + +#: modules/codec/schroedinger.c:60 +msgid "4:2:0" +msgstr "4:2:0" + +#: modules/codec/schroedinger.c:60 +msgid "4:2:2" +msgstr "4:2:2" + +#: modules/codec/schroedinger.c:60 +msgid "4:4:4" +msgstr "4:4:4" + +#: modules/codec/schroedinger.c:63 +msgid "Rate control method" +msgstr "হাৰ নিয়ন্ত্ৰণ পদ্ধতি" + +#: modules/codec/schroedinger.c:64 +msgid "Method used to encode the video sequence" +msgstr "ভিডিঅ' ক্ৰমটো এনকোড কৰিবলৈ ব্যৱহাৰ কৰা পদ্ধতি" + +#: modules/codec/schroedinger.c:77 +msgid "Constant noise threshold mode" +msgstr "স্থিৰ হুলস্থূল থ্ৰেছহল্ডৰ ধৰণ" + +#: modules/codec/schroedinger.c:78 +msgid "Constant bitrate mode (CBR)" +msgstr "স্থিৰ বিট হাৰৰ ধৰণ (CBR)" + +#: modules/codec/schroedinger.c:79 +msgid "Low Delay mode" +msgstr "নিম্ন বিলম্বৰ ধৰণ" + +#: modules/codec/schroedinger.c:80 +msgid "Lossless mode" +msgstr "দোষৰোহিত ধৰণ" + +#: modules/codec/schroedinger.c:81 +msgid "Constant lambda mode" +msgstr "স্থিৰ লেম্ব্দাৰ ধৰণ" + +#: modules/codec/schroedinger.c:82 +msgid "Constant error mode" +msgstr "স্থিৰ ভুলৰ ধৰণ" + +#: modules/codec/schroedinger.c:83 +msgid "Constant quality mode" +msgstr "স্থিৰ মানদণ্ডৰ ধৰণ" + +#: modules/codec/schroedinger.c:87 +msgid "GOP structure" +msgstr "GOP গাঁথনি" + +#: modules/codec/schroedinger.c:88 +msgid "GOP structure used to encode the video sequence" +msgstr "ভিডিঅ' ক্ৰমটো এনকোড কৰিবলৈ ব্যৱহাৰ কৰা GOP গাঁথনি" + +#: modules/codec/schroedinger.c:100 +msgid "" +"No fixed gop structure. A picture can be intra or inter and refer to " +"previous or future pictures." +msgstr "" +"কোনো নিৰ্দিষ্ট কৰা gop গাঁথনি নাই. ছবি এটা অন্ত: বা আন্ত: আৰু আগলৈ পৰামৰ্শ কৰা বা " +"ভৱিষ্যতৰ ছবিবোৰ হব পাৰে." + +#: modules/codec/schroedinger.c:101 +msgid "I-frame only sequence" +msgstr "I-ফ্ৰেম কেৱল কম্পনাংক" + +#: modules/codec/schroedinger.c:102 modules/codec/schroedinger.c:103 +msgid "Inter pictures refere to previous pictures only" +msgstr "কেৱল আগৰ ছবিবোৰলৈ আন্ত: ছবিবোৰৰ প্ৰসংগ" + +#: modules/codec/schroedinger.c:104 modules/codec/schroedinger.c:105 +msgid "Inter pictures can refer to previous or future pictures" +msgstr "আন্ত: ছবিবোৰে আগৰ বা ভৱিষ্যতৰ ছবিবোৰলৈ প্ৰসংগ কৰিব পাৰে" + +#: modules/codec/schroedinger.c:109 +msgid "Constant quality factor" +msgstr "স্থিৰ মানদণ্ডৰ কাৰক" + +#: modules/codec/schroedinger.c:110 +msgid "Quality factor to use in constant quality mode" +msgstr "স্থিৰ মানদণ্ডৰ ধৰণত ব্যৱহাৰ কৰিবলৈ মানদণ্ডবিশিষ্ট কাৰক" + +#: modules/codec/schroedinger.c:113 +msgid "Noise Threshold" +msgstr "হুলস্থূলৰ থ্ৰেছহল্ড" + +#: modules/codec/schroedinger.c:114 +msgid "Noise threshold to use in constant noise threshold mode" +msgstr "সুস্থিৰ হুলস্থূল থ্ৰেছহল্ড ধৰণত ব্যৱহাৰ কৰিবলৈ হুলস্থূল থ্ৰেছহল্ড" + +#: modules/codec/schroedinger.c:117 +msgid "CBR bitrate (kbps)" +msgstr "CBR বিট হাৰ (kbps)" + +#: modules/codec/schroedinger.c:118 +msgid "Target bitrate in kbps when encoding in constant bitrate mode" +msgstr "kbps ত লক্ষ্য কৰা বিট হাৰ যেতিয়া সুস্থিৰ বিট হাৰ ধৰণত এনকোড কৰে" + +#: modules/codec/schroedinger.c:121 +msgid "Maximum bitrate (kbps)" +msgstr "সৰ্বাধিক বিট হাৰ (kbps)" + +#: modules/codec/schroedinger.c:122 +msgid "Maximum bitrate in kbps when encoding in constant bitrate mode" +msgstr "kbps ত সৰ্বাধিক বিট হাৰ যেতিয়া স্থিৰ বিট হাৰ ধৰণত এনকোড কৰে" + +#: modules/codec/schroedinger.c:125 +msgid "Minimum bitrate (kbps)" +msgstr "নূন্যতম বিট হাৰ (kbps)" + +#: modules/codec/schroedinger.c:126 +msgid "Minimum bitrate in kbps when encoding in constant bitrate mode" +msgstr "kbps ত নূন্যতম বিট হাৰ যেতিয়া স্থিৰ বিট হাৰ ধৰণত এনকোড কৰে" + +#: modules/codec/schroedinger.c:129 +msgid "GOP length" +msgstr "GOP দৈৰ্ঘ" + +#: modules/codec/schroedinger.c:130 +msgid "" +"Number of pictures between successive sequence headers i.e. length of the " +"group of pictures" +msgstr "ধাৰাবাহিক ক্ৰম হেডাৰবোৰৰ মাজত ছবিবোৰৰ সংখ্যা যেনে, ছবিবোৰৰ গোটটোৰ দৈৰ্ঘ্য" + +#: modules/codec/schroedinger.c:134 +msgid "Prefilter" +msgstr "পূৰ্বৰ ফিল্টাৰ" + +#: modules/codec/schroedinger.c:135 +msgid "Enable adaptive prefiltering" +msgstr "এডাপ্টিভ পূৰ্বৰ ফিল্টাৰিংটো সক্ষম কৰক" + +#: modules/codec/schroedinger.c:147 +msgid "No pre-filtering" +msgstr "কোনো পূৰ্বে ফিল্টাৰ কৰা নাই" + +#: modules/codec/schroedinger.c:148 +msgid "Centre Weighted Median" +msgstr "কেন্দ্ৰত ওজন কৰা মধ্যমান" + +#: modules/codec/schroedinger.c:149 +msgid "Gaussian Low Pass Filter" +msgstr "গাউছিয়ান নিম্ন পাছ ফিল্টাৰ" + +#: modules/codec/schroedinger.c:150 +msgid "Add Noise" +msgstr "হুলস্থূল যোগ কৰক" + +#: modules/codec/schroedinger.c:151 +msgid "Gaussian Adaptive Low Pass Filter" +msgstr "গাউছিয়ান এডাপ্টিভ নিম্ন পাছ ফিল্টাৰ" + +#: modules/codec/schroedinger.c:152 +msgid "Low Pass Filter" +msgstr "নিম্ন পাছ ফিল্টাৰ" + +#: modules/codec/schroedinger.c:156 +msgid "Amount of prefiltering" +msgstr "পূৰ্বৰ ফিল্টাৰিংৰ পৰিমাণ" + +#: modules/codec/schroedinger.c:157 +msgid "Higher value implies more prefiltering" +msgstr "উচ্চ মানটোৱে অধিক পূৰ্বৰ ফিল্টাৰিং সূচায়" + +#: modules/codec/schroedinger.c:160 +msgid "Picture coding mode" +msgstr "ছবি কোড কৰা ধৰণ" + +#: modules/codec/schroedinger.c:161 +msgid "" +"Field coding is where interlaced fields are coded separately as opposed to a " +"pseudo-progressive frame" +msgstr "" +"ক্ষেত্ৰ কোডিং হল যত ইন্টাৰলেচ কৰা ক্ষেত্ৰবোৰ পৃথকভাৱে কোড কৰা হয়, ছিউডো-প্ৰগ্ৰেছিভ " +"ফ্ৰেম এটালৈ বিৰোধ কৰাৰ দৰে" + +#: modules/codec/schroedinger.c:166 +msgid "auto - let encoder decide based upon input (Best)" +msgstr "স্বয়ংক্ৰিয় - ইনপুটৰ ওপৰত ভিত্তি কৰি এনকোডাৰক সিদ্ধান্ত লব দিয়ক (শ্ৰেষ্ঠ)" + +#: modules/codec/schroedinger.c:167 +msgid "force coding frame as single picture" +msgstr "অকলশৰীয়া ছবিৰ দৰে ফ্ৰেম জোৰকৈ কোড কৰক" + +#: modules/codec/schroedinger.c:168 +msgid "force coding frame as separate interlaced fields" +msgstr "পৃথক ইন্টাৰলেচ ক্ষেত্ৰবোৰৰ দৰে ফ্ৰেম জোৰকৈ কোড কৰক" + +#: modules/codec/schroedinger.c:173 +msgid "Size of motion compensation blocks" +msgstr "প্ৰস্তাৱ ক্ষতিপূৰণৰ ব্লকবোৰৰ আকাৰ" + +#: modules/codec/schroedinger.c:182 modules/codec/schroedinger.c:199 +#: modules/codec/schroedinger.c:297 modules/codec/schroedinger.c:338 +msgid "automatic - let encoder decide based upon input (Best)" +msgstr "স্বয়ংক্ৰিয় - ইনপুটৰ ওপৰত ভিত্তি কৰি এনকোডাৰক সিদ্ধান্ত লব দিয়ক (শ্ৰেষ্ঠ)" + +#: modules/codec/schroedinger.c:183 +msgid "small - use small motion compensation blocks" +msgstr "সৰু - সৰু প্ৰস্তাৱ ক্ষতিপূৰণৰ ব্লকবোৰ ব্যৱহাৰ কৰক" + +#: modules/codec/schroedinger.c:184 +msgid "medium - use medium motion compensation blocks" +msgstr "মধ্যম - মধ্যম প্ৰস্তাৱ ক্ষতিপূৰণৰ ব্লকবোৰ ব্যৱহাৰ কৰক" + +#: modules/codec/schroedinger.c:185 +msgid "large - use large motion compensation blocks" +msgstr "ডাঙৰ - ডাঙৰ প্ৰস্তৱ ক্ষতিপূৰণৰ ব্লকবোৰ ব্যৱহাৰ কৰক" + +#: modules/codec/schroedinger.c:190 +msgid "Overlap of motion compensation blocks" +msgstr "প্ৰস্তাৱ ক্ষতিপূৰণৰ ব্লকবোৰ অভাৰলেপ কৰক" + +#: modules/codec/schroedinger.c:200 +msgid "none - Motion compensation blocks do not overlap" +msgstr "নাই - প্ৰস্তাৱ ক্ষতিপূৰণৰ ব্লকবোৰে অভাৰলেপ নকৰে" + +#: modules/codec/schroedinger.c:201 +msgid "partial - Motion compensation blocks only partially overlap" +msgstr "আংশিক - প্ৰস্তাৱ ক্ষতিপূৰণৰ খণ্ড কেৱল আংশিক অভাৰলেপ" + +#: modules/codec/schroedinger.c:202 +msgid "full - Motion compensation blocks fully overlap" +msgstr "সম্পূৰ্ণ - প্ৰস্তাৱ ক্ষতিপূৰণৰ ব্লকবোৰে সম্পূৰ্ণভাৱে অভাৰলেপ কৰে" + +#: modules/codec/schroedinger.c:207 +msgid "Motion Vector precision" +msgstr "প্ৰস্তাৱ ভেক্টৰ স্পষ্টতা" + +#: modules/codec/schroedinger.c:208 +msgid "Motion Vector precision in pels" +msgstr "পেলবোৰত প্ৰস্তাৱ ভেক্টৰ সুস্পষ্টতা" + +#: modules/codec/schroedinger.c:214 +msgid "Three component motion estimation" +msgstr "তিনিটা উপাংশ প্ৰস্তাৱ পৰিকল্পনা" + +#: modules/codec/schroedinger.c:215 +msgid "Use chroma as part of the motion estimation process" +msgstr "প্ৰস্তাৱ পৰিকল্পনা কৰা প্ৰক্ৰিয়াটোৰ অংশ হিচাপে ক্ৰোমা ব্যৱহাৰ কৰক" + +#: modules/codec/schroedinger.c:218 +msgid "Intra picture DWT filter" +msgstr "অন্ত: ছবি DWT ফিল্টাৰ" + +#: modules/codec/schroedinger.c:221 +msgid "Inter picture DWT filter" +msgstr "আন্ত: ছবি DWT ফিল্টাৰ" + +#: modules/codec/schroedinger.c:244 +msgid "Number of DWT iterations" +msgstr "DWT পুনৰাবৃত্তিবোৰৰ সংখ্যা" + +#: modules/codec/schroedinger.c:245 +msgid "Also known as DWT levels" +msgstr "DWT স্তৰবোৰ হিচাপেও জনাজায়" + +#: modules/codec/schroedinger.c:250 +msgid "Enable multiple quantizers" +msgstr "বিভিন্ন পৰিণামীকৰ্তাবোৰ সক্ষম কৰক" + +#: modules/codec/schroedinger.c:251 +msgid "Enable multiple quantizers per subband (one per codeblock)" +msgstr "প্ৰতিটো উপবেণ্ডৰ বিভিন্ন পৰিণামীকৰ্তাবোৰ সক্ষম কৰক (প্ৰতিটো কোড খণ্ডত এটা)" + +#: modules/codec/schroedinger.c:255 +msgid "Disable arithmetic coding" +msgstr "সাংখ্যিক কোডিং অক্ষম কৰক" + +#: modules/codec/schroedinger.c:256 +msgid "Use variable length codes instead, useful for very high bitrates" +msgstr "চলক দৈৰ্ঘ্যৰ কোডবোৰ ব্যৱহাৰ কৰক, বৰ উচ্চ বিট হাৰবোৰৰ বাবে উপযোগী" + +#: modules/codec/schroedinger.c:261 +msgid "perceptual weighting method" +msgstr "বোধাত্মক ওজন কৰা পদ্ধতি" + +#: modules/codec/schroedinger.c:272 +msgid "perceptual distance" +msgstr "বোধাত্মক দূৰত্ব" + +#: modules/codec/schroedinger.c:273 +msgid "perceptual distance to calculate perceptual weight" +msgstr "বোধাত্মক ওজন গণনা কৰিবলৈ বোধাত্মক দূৰত্ব" + +#: modules/codec/schroedinger.c:277 +msgid "Horizontal slices per frame" +msgstr "প্ৰতিটো ফ্ৰেমত সমান্তৰাল শ্লাইছবোৰ" + +#: modules/codec/schroedinger.c:278 +msgid "Number of horizontal slices per frame in low delay mode" +msgstr "কম বিলম্বৰ ধৰণত প্ৰতিটো ফ্ৰেমত সমান্তৰাল শ্লাইছবোৰৰ সংখ্যা" + +#: modules/codec/schroedinger.c:282 +msgid "Vertical slices per frame" +msgstr "প্ৰত্যেক ফ্ৰমত উলম্ব শ্লাইছবোৰ" + +#: modules/codec/schroedinger.c:283 +msgid "Number of vertical slices per frame in low delay mode" +msgstr "কম বিলম্বৰ ধৰণত প্ৰতিটো ফ্ৰেমত উলম্ব শ্লাইছবোৰৰ সংখ্যা" + +#: modules/codec/schroedinger.c:287 +msgid "Size of code blocks in each subband" +msgstr "প্ৰতিটো উপবেণ্ডত কোড ব্লকবোৰৰ আকাৰ" + +#: modules/codec/schroedinger.c:298 +msgid "small - use small code blocks" +msgstr "সৰু - সৰু কোড ব্লকবোৰ ব্যৱহাৰ কৰক" + +#: modules/codec/schroedinger.c:299 +msgid "medium - use medium sized code blocks" +msgstr "মধ্যম - মধ্যম আকাৰৰ কোড ব্লকবোৰ ব্যৱহাৰ কৰক" + +#: modules/codec/schroedinger.c:300 +msgid "large - use large code blocks" +msgstr "ডাঙৰ - ডাঙৰ কোড ব্লকবোৰ ব্যৱহাৰ কৰক" + +#: modules/codec/schroedinger.c:301 +msgid "full - One code block per subband" +msgstr "সম্পূৰ্ণ - প্ৰতিটো উপবেণ্ডত এটা কোড ব্লক" + +#: modules/codec/schroedinger.c:306 +msgid "Enable hierarchical Motion Estimation" +msgstr "বৰ্গীকৃত প্ৰস্তাৱ পৰিকল্পনাটো সক্ষম কৰক" + +#: modules/codec/schroedinger.c:310 +msgid "Number of levels of downsampling" +msgstr "তললৈ নমুনা কৰাৰ স্তৰবোৰৰ সংখ্যা" + +#: modules/codec/schroedinger.c:311 +msgid "Number of levels of downsampling in hierarchical motion estimation mode" +msgstr "বৰ্গীকৃত প্ৰস্তাৱ পৰিকল্পনাৰ ধৰণত তললৈ নমুনা কৰাৰ স্তৰবোৰৰ সংখ্যা" + +#: modules/codec/schroedinger.c:315 +msgid "Enable Global Motion Estimation" +msgstr "সাৰ্বজনীন প্ৰস্তাৱ পৰিকল্পনাটো সক্ষম কৰক" + +#: modules/codec/schroedinger.c:319 +msgid "Enable Phase Correlation Estimation" +msgstr "পৰ্য্যায় সহসম্বন্ধৰ পৰিকল্পনা সক্ষম কৰক" + +#: modules/codec/schroedinger.c:323 +msgid "Enable Scene Change Detection" +msgstr "দৃশ্য সলনি চিনাক্তকৰণ সক্ষম কৰক" + +#: modules/codec/schroedinger.c:327 +msgid "Force Profile" +msgstr "প্ৰফাইল জোৰ কৰক" + +#: modules/codec/schroedinger.c:339 +msgid "VC2 Low Delay Profile" +msgstr "VC2 নিম্ন বিলম্ব প্ৰফাইল" + +#: modules/codec/schroedinger.c:340 +msgid "VC2 Simple Profile" +msgstr "VC2 সাধাৰণ প্ৰফাইল" + +#: modules/codec/schroedinger.c:341 +msgid "VC2 Main Profile" +msgstr "VC2 মুখ্য প্ৰফাইল" + +#: modules/codec/schroedinger.c:342 +msgid "Main Profile" +msgstr "মুখ্য প্ৰফাইল" + +#: modules/codec/schroedinger.c:363 +msgid "Dirac video decoder using libschroedinger" +msgstr "libschroedinger ব্যৱহাৰ কৰি প্ৰত্যক্ষ Dirac ভিডিঅ' ডিকোডাৰ" + +#: modules/codec/schroedinger.c:371 +msgid "Dirac video encoder using libschroedinger" +msgstr "libschroedinger ব্যৱহাৰ কৰি প্ৰত্যক্ষ Dirac ভিডিঅ' এনকোডাৰ" + +#: modules/codec/scte18.c:41 +msgid "SCTE-18 decoder" +msgstr "" + +#: modules/codec/scte18.c:42 +msgid "SCTE-18" +msgstr "" + +#: modules/codec/scte18.h:24 +msgid "Emergency Alert Messaging for Cable" +msgstr "" + +#: modules/codec/scte27.c:42 +msgid "SCTE-27 decoder" +msgstr "" + +#: modules/codec/scte27.c:43 +msgid "SCTE-27" +msgstr "" + +#: modules/codec/sdl_image.c:60 +msgid "SDL Image decoder" +msgstr "SDL ছবি ডিকোডাৰ" + +#: modules/codec/sdl_image.c:61 +msgid "SDL_image video decoder" +msgstr "SDL_ছবি ভিডিঅ' ডিকোডাৰ" + +#: modules/codec/shine.c:64 +msgid "MP3 fixed point audio encoder" +msgstr "MP3 নিৰ্দিষ্ট কৰা পইন্ট অডিঅ' এনকোডাৰ" + +#: modules/codec/spdif.c:36 +msgid "S/PDIF pass-through decoder" +msgstr "" + +#: modules/codec/speex.c:59 modules/codec/speex.c:910 +#: modules/gui/macosx/VLCOpenWindowController.m:195 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:259 +#: modules/gui/qt/ui/sprefs_video.h:325 modules/gui/qt/ui/video_effects.h:1282 +msgid "Mode" +msgstr "ধৰণ" + +#: modules/codec/speex.c:61 +msgid "Enforce the mode of the encoder." +msgstr "এনকোডাৰৰ ধৰণটো আৰোপ কৰক." + +#: modules/codec/speex.c:65 +msgid "Enforce a quality between 0 (low) and 10 (high)." +msgstr "0 (নিম্ন) আৰু 10 (উচ্চ) ৰ মাজত মানদণ্ড এটা আৰোপ কৰক." + +#: modules/codec/speex.c:67 +msgid "Encoding complexity" +msgstr "এনকোডিংৰ জটিলতা" + +#: modules/codec/speex.c:69 +msgid "Enforce the complexity of the encoder." +msgstr "এনকোডাৰৰ জটিলতাটো আৰোপ কৰক." + +#: modules/codec/speex.c:71 +msgid "Maximal bitrate" +msgstr "সৰ্বাধিক বিটৰ হাৰ" + +#: modules/codec/speex.c:73 +msgid "Enforce the maximal VBR bitrate" +msgstr "সৰ্বাধিক VBR বিটৰ হাৰটো আৰোপ কৰক" + +#: modules/codec/speex.c:75 modules/codec/vorbis.c:183 +msgid "CBR encoding" +msgstr "CBR এনকোডিং" + +#: modules/codec/speex.c:77 +msgid "" +"Enforce a constant bitrate encoding (CBR) instead of default variable " +"bitrate encoding (VBR)." +msgstr "" +"ডিফল্ট চলক বিট হাৰ এনকোডিংৰ (VBR) ৰ পৰিবৰ্তি এটা সুস্থিৰ বিট হাৰ এনকোডিং (CBR) " +"জোৰ কৰক." + +#: modules/codec/speex.c:80 +msgid "Voice activity detection" +msgstr "কন্ঠৰ কাৰ্যকলাপ চিনাক্তকৰণ" + +#: modules/codec/speex.c:82 +msgid "" +"Enable voice activity detection (VAD). It is automatically activated in VBR " +"mode." +msgstr "" +"কন্ঠৰ কাৰ্যকলাপ চিনাক্তকৰণটো (VAD) সক্ষম কৰক . VBR ধৰণত এইটো স্বয়ংক্ৰিয়ভাৱে সক্ৰিয় " +"কৰা হয়." + +#: modules/codec/speex.c:85 +msgid "Discontinuous Transmission" +msgstr "ধাৰাবাহিকতাহীন সৰবৰাহ" + +#: modules/codec/speex.c:87 +msgid "Enable discontinuous transmission (DTX)." +msgstr "ধাৰাবাহিকতাহীন সৰবৰাহ সক্ষম কৰক (DTX)." + +#: modules/codec/speex.c:91 +msgid "Narrow-band (8kHz)" +msgstr "সংকুচিত-বেণ্ড (8kHz)" + +#: modules/codec/speex.c:91 +msgid "Wide-band (16kHz)" +msgstr "ৱাইড-বেণ্ড (16kHz)" + +#: modules/codec/speex.c:91 +msgid "Ultra-wideband (32kHz)" +msgstr "আল্ট্ৰা-ৱাইডবেণ্ড (32kHz)" + +#: modules/codec/speex.c:98 +msgid "Speex audio decoder" +msgstr "স্পীক্স অডিঅ’ ডিকোডাৰ" + +#: modules/codec/speex.c:100 +msgid "Speex" +msgstr "স্পীক্স" + +#: modules/codec/speex.c:104 +msgid "Speex audio packetizer" +msgstr "স্পীক্স অডিঅ’ পেকেটাইজাৰ" + +#: modules/codec/speex.c:110 +msgid "Speex audio encoder" +msgstr "স্পীক্স অডিঅ’ এনকোডাৰ" + +#: modules/codec/spudec/spudec.c:45 +msgid "Disable DVD subtitle transparency" +msgstr "DVD উপশিৰোনাম স্বচ্ছতাটো অক্ষম কৰক" + +#: modules/codec/spudec/spudec.c:46 +msgid "Removes all transparency effects used in DVD subtitles." +msgstr "DVD উপশিৰোনামবোৰত ব্যৱহাৰ কৰা সকলোবোৰ স্বচ্ছতা প্ৰভাৱ আতঁৰ কৰক." + +#: modules/codec/spudec/spudec.c:50 +msgid "DVD subtitles decoder" +msgstr "DVD উপশিৰোনামবোৰৰ ডিকোডাৰ" + +#: modules/codec/spudec/spudec.c:51 +msgid "DVD subtitles" +msgstr "DVD উপশিৰোনামবোৰ" + +#: modules/codec/spudec/spudec.c:60 +msgid "DVD subtitles packetizer" +msgstr "DVD উপশিৰোনামবোৰ পেকেটাইজাৰ" + +#: modules/codec/stl.c:47 +msgid "EBU STL subtitles decoder" +msgstr "EBU STL উপশিৰোনামবোৰৰ ডিকোডাৰ" + +#. xgettext: +#. The character encoding name in parenthesis corresponds to that used for +#. the GetACP translation. "Windows-1252" applies to Western European +#. languages using the Latin alphabet. +#: modules/codec/subsdec.c:100 +msgid "Default (Windows-1252)" +msgstr "ডিফল্ট (উইণ্ডোজ-1252)" + +#: modules/codec/subsdec.c:101 +msgid "System codeset" +msgstr "ছিষ্টেম কোড ছেট" + +#: modules/codec/subsdec.c:102 +msgid "Universal (UTF-8)" +msgstr "সাধাৰণ (UTF-8)" + +#: modules/codec/subsdec.c:103 +msgid "Universal (UTF-16)" +msgstr "সাধাৰণ (UTF-16)" + +#: modules/codec/subsdec.c:104 +msgid "Universal (big endian UTF-16)" +msgstr "সাধাৰণ (ডাঙৰ এণ্ডিয়ান UTF-16)" + +#: modules/codec/subsdec.c:105 +msgid "Universal (little endian UTF-16)" +msgstr "সাধাৰণ (সৰু এণ্ডিয়ান UTF-16)" + +#: modules/codec/subsdec.c:106 +msgid "Universal, Chinese (GB18030)" +msgstr "সাধাৰণ, চীনৰ (GB18030)" + +#: modules/codec/subsdec.c:110 +msgid "Western European (Latin-9)" +msgstr "পশ্চিম ইউৰোপৰ (লেটিন-9)" + +#: modules/codec/subsdec.c:111 +msgid "Western European (Windows-1252)" +msgstr "পশ্চিম ইউৰোপৰ (উইণ্ডোজ-1252)" + +#: modules/codec/subsdec.c:112 +msgid "Western European (IBM 00850)" +msgstr "পশ্চিম ইউৰোপৰ (IBM 00850)" + +#: modules/codec/subsdec.c:114 +msgid "Eastern European (Latin-2)" +msgstr "পূব ইউৰোপৰ (লেটিন-2)" + +#: modules/codec/subsdec.c:115 +msgid "Eastern European (Windows-1250)" +msgstr "পূব ইউৰোপৰ (উইণ্ডোজ-1250)" + +#: modules/codec/subsdec.c:117 +msgid "Esperanto (Latin-3)" +msgstr "এছপাৰেন্ট (লেটিন-3)" + +#: modules/codec/subsdec.c:119 +msgid "Nordic (Latin-6)" +msgstr "নৰ্ডিক (লেটিন-6)" + +#: modules/codec/subsdec.c:121 +msgid "Cyrillic (Windows-1251)" +msgstr "চিৰিলিক (উইণ্ডোজ-1251)" + +#: modules/codec/subsdec.c:122 +msgid "Russian (KOI8-R)" +msgstr "ৰাছিয়াৰ (KOI8-R)" + +#: modules/codec/subsdec.c:123 +msgid "Ukrainian (KOI8-U)" +msgstr "ইউক্ৰেনৰ (KOI8-U)" + +#: modules/codec/subsdec.c:125 +msgid "Arabic (ISO 8859-6)" +msgstr "আৰৱী (ISO 8859-6)" + +#: modules/codec/subsdec.c:126 +msgid "Arabic (Windows-1256)" +msgstr "আৰৱী (উইণ্ডোজ-1256)" + +#: modules/codec/subsdec.c:128 +msgid "Greek (ISO 8859-7)" +msgstr "গ্ৰীক (ISO 8859-7)" + +#: modules/codec/subsdec.c:129 +msgid "Greek (Windows-1253)" +msgstr "গ্ৰীক (Windows-1253)" + +#: modules/codec/subsdec.c:131 +msgid "Hebrew (ISO 8859-8)" +msgstr "হিব্ৰিউ (ISO 8859-8)" + +#: modules/codec/subsdec.c:132 +msgid "Hebrew (Windows-1255)" +msgstr "হিব্ৰিউ (উইণ্ডোজ-1255)" + +#: modules/codec/subsdec.c:134 +msgid "Turkish (ISO 8859-9)" +msgstr "তুৰ্কীৰ (ISO 8859-9)" + +#: modules/codec/subsdec.c:135 +msgid "Turkish (Windows-1254)" +msgstr "তুৰ্কীৰ (Windows-1254)" + +#: modules/codec/subsdec.c:138 +msgid "Thai (TIS 620-2533/ISO 8859-11)" +msgstr "থাই (TIS 620-2533/ISO 8859-11)" + +#: modules/codec/subsdec.c:139 +msgid "Thai (Windows-874)" +msgstr "থাই (উইণ্ডোজ-874)" + +#: modules/codec/subsdec.c:141 +msgid "Baltic (Latin-7)" +msgstr "বেল্টি (লেটিন-7)" + +#: modules/codec/subsdec.c:142 +msgid "Baltic (Windows-1257)" +msgstr "বেল্টিক (উইণ্ডোজ-1257)" + +#: modules/codec/subsdec.c:145 +msgid "Celtic (Latin-8)" +msgstr "চেল্টিক (লেটিন-8)" + +#: modules/codec/subsdec.c:148 +msgid "South-Eastern European (Latin-10)" +msgstr "দক্ষিণ-পূব ইউৰোপৰ (লেটিন-10)" + +#: modules/codec/subsdec.c:150 +msgid "Simplified Chinese (ISO-2022-CN-EXT)" +msgstr "সৰলীকৃত চীনৰ (ISO-2022-CN-EXT)" + +#: modules/codec/subsdec.c:151 +msgid "Simplified Chinese Unix (EUC-CN)" +msgstr "সৰলীকৃত চীনৰ ইনিক্স (EUC-CN)" + +#: modules/codec/subsdec.c:152 +msgid "Japanese (7-bits JIS/ISO-2022-JP-2)" +msgstr "জাপানৰ (7-বিট JIS/ISO-2022-JP-2)" + +#: modules/codec/subsdec.c:153 +msgid "Japanese Unix (EUC-JP)" +msgstr "জাপানৰ ইউনিক্স (EUC-JP)" + +#: modules/codec/subsdec.c:154 +msgid "Japanese (Shift JIS)" +msgstr "জাপানৰ (ছিফ্ট JIS)" + +#: modules/codec/subsdec.c:155 +msgid "Korean (EUC-KR/CP949)" +msgstr "কোৰিয়াৰ (EUC-KR/CP949)" + +#: modules/codec/subsdec.c:156 +msgid "Korean (ISO-2022-KR)" +msgstr "কোৰিয়াৰ (ISO-2022-KR)" + +#: modules/codec/subsdec.c:157 +msgid "Traditional Chinese (Big5)" +msgstr "পৰম্পৰাগত চীনৰ (ডাঙৰ5)" + +#: modules/codec/subsdec.c:158 +msgid "Traditional Chinese Unix (EUC-TW)" +msgstr "পৰম্পৰাগত চীনৰ ইউনিক্স (EUC-TW)" + +#: modules/codec/subsdec.c:159 +msgid "Hong-Kong Supplementary (HKSCS)" +msgstr "হং-কং অতিৰিক্ত (HKSCS)" + +#: modules/codec/subsdec.c:161 +msgid "Vietnamese (VISCII)" +msgstr "ভিয়েটনামৰ (VISCII)" + +#: modules/codec/subsdec.c:162 +msgid "Vietnamese (Windows-1258)" +msgstr "ভিয়েটনামৰ (উইণ্ডোজ-1258)" + +#: modules/codec/subsdec.c:170 +msgid "Subtitle text encoding" +msgstr "উপশিৰোনাম টেক্স এনকোডিং" + +#: modules/codec/subsdec.c:171 +msgid "Set the encoding used in text subtitles" +msgstr "টেক্সটৰ উপশিৰোনামবোৰ ব্যৱহাৰ কৰা এনকোডিংটো ছেট কৰক" + +#: modules/codec/subsdec.c:172 modules/codec/ttml/ttml.c:36 +msgid "Subtitle justification" +msgstr "উপশিৰোনাম বিচাৰ" + +#: modules/codec/subsdec.c:173 modules/codec/ttml/ttml.c:37 +msgid "Set the justification of subtitles" +msgstr "উপশিৰোনামৰ বিচাৰটো ছেট কৰক" + +#: modules/codec/subsdec.c:174 +msgid "UTF-8 subtitle autodetection" +msgstr "UTF-8 উপশিৰোনাম স্বয়ংক্ৰিয়ভাৱে চিনাক্তকৰণ" + +#: modules/codec/subsdec.c:175 +msgid "" +"This enables automatic detection of UTF-8 encoding within subtitle files." +msgstr "" +"এইটোৱে উপশিৰোনাম ফাইলবোৰৰ ভিতৰত UTF-8 এনকোডিংৰ স্বয়ংক্ৰিয় চিনাক্তকৰণ সক্ষম কৰে." + +#: modules/codec/subsdec.c:183 +msgid "Text subtitle decoder" +msgstr "টেক্সট উপশিৰোনাম ডিকোডাৰ" + +#. xgettext: +#. The Windows ANSI code page most commonly used for this language. +#. VLC uses this as a guess of the subtitle files character set +#. (if UTF-8 and UTF-16 autodetection fails). +#. Western European languages normally use "CP1252", which is a +#. Microsoft-variant of ISO 8859-1. That suits the Latin alphabet. +#. Other scripts use other code pages. +#. +#. This MUST be a valid iconv character set. If unsure, please refer +#. the VideoLAN translators mailing list. +#: modules/codec/subsdec.c:292 modules/demux/avi/avi.c:99 +msgctxt "GetACP" +msgid "CP1252" +msgstr "CP1252" + +#: modules/codec/subsusf.c:45 +msgid "" +"Some subtitle formats allow for text formatting. VLC partly implements this, " +"but you can choose to disable all formatting." +msgstr "" +"টেক্সট ফৰমেটিংৰ বাবে কিছুমান উপশিৰোনাম ফৰমেটৰ অনুমতি দিয়া হয়. VLC আংশিকভাৱে " +"এইটো কাৰ্যকৰী কৰে, কিন্তু সকলোবোৰ ফৰমেটিং অক্ষম কৰিবলৈ আপুনি পছন্দ কৰিব পাৰে." + +#: modules/codec/subsusf.c:50 +msgid "USFSubs" +msgstr "USFউপশিৰোনামবোৰ" + +#: modules/codec/subsusf.c:51 +msgid "USF subtitles decoder" +msgstr "USF উপশিৰোনামবোৰৰ ডিকোডাৰ" + +#: modules/codec/substx3g.c:41 +msgid "tx3g subtitles decoder" +msgstr "tx3g উপশিৰোনামবোৰৰ ডিকোডাৰ" + +#: modules/codec/substx3g.c:42 +msgid "tx3g subtitles" +msgstr "tx3g উপশিৰোনামবোৰ" + +#: modules/codec/svcdsub.c:47 +msgid "Philips OGT (SVCD subtitle) decoder" +msgstr "ফিলিপছ OGT (SVCD উপশিৰোনাম) ডিকোডাৰ" + +#: modules/codec/svcdsub.c:48 +msgid "SVCD subtitles" +msgstr "SVCD উপশিৰোনামবোৰ" + +#: modules/codec/svcdsub.c:57 +msgid "Philips OGT (SVCD subtitle) packetizer" +msgstr "ফিলিপছ OGT (SVCD উপশিৰোনাম) পেকেটাইজাৰ" + +#: modules/codec/svg.c:50 modules/video_filter/scene.c:62 +msgid "Image width" +msgstr "ছবিৰ প্ৰস্থ" + +#: modules/codec/svg.c:51 +msgid "Specify the width to decode the image too" +msgstr "" + +#: modules/codec/svg.c:52 modules/video_filter/scene.c:67 +msgid "Image height" +msgstr "ছবিৰ উচ্চতা" + +#: modules/codec/svg.c:53 +msgid "Specify the height to decode the image too" +msgstr "" + +#: modules/codec/svg.c:54 +msgid "Scale factor" +msgstr "জোখৰ কাৰক" + +#: modules/codec/svg.c:55 +msgid "Scale factor to apply to image" +msgstr "" + +#: modules/codec/svg.c:63 +msgid "SVG video decoder" +msgstr "" + +#: modules/codec/t140.c:36 +msgid "T.140 text encoder" +msgstr "T.140 টেক্সট এনকোডাৰ" + +#: modules/codec/telx.c:54 +msgid "Override page" +msgstr "পৃষ্ঠা অভাৰৰাইড কৰক" + +#: modules/codec/telx.c:55 +msgid "" +"Override the indicated page, try this if your subtitles don't appear (-1 = " +"autodetect from TS, 0 = autodetect from teletext, >0 = actual page number, " +"usually 888 or 889)." +msgstr "" +"সূচিত পৃষ্ঠাটো অভাৰৰাইড কৰক, এইটো চেষ্টা কৰক যদি আপোনাৰ উপশিৰোনামবোৰ দৃষ্টি গোচৰ " +"নহয় (-1 = TS ৰ পৰা স্বয়ংক্ৰিয়ভাৱে চিনাক্ত কৰক, 0 = টেলিটেক্সৰ পৰা স্বয়ংক্ৰিয়ভাৱে " +"চিনাক্ত কৰক, >0 = প্ৰকৃত পৃষ্ঠা আকাৰ, সচৰাচৰ 888 বা 889)." + +#: modules/codec/telx.c:60 +msgid "Ignore subtitle flag" +msgstr "উপশিৰোনাম ফ্লেগ অৱজ্ঞা কৰক" + +#: modules/codec/telx.c:61 +msgid "Ignore the subtitle flag, try this if your subtitles don't appear." +msgstr "" +"উপশিৰোনাম ফ্লেগ অৱজ্ঞা কৰক, এইটো চেষ্টা কৰক যদি আপোনাৰ উপশিৰোনামবোৰ দৃষ্টিগোচৰ " +"নহয়." + +#: modules/codec/telx.c:64 +msgid "Workaround for France" +msgstr "ফ্ৰান্সৰ বাবে চাৰিওফাল কাৰ্য কৰা" + +#: modules/codec/telx.c:65 +msgid "" +"Some French channels do not flag their subtitling pages correctly due to a " +"historical interpretation mistake. Try using this wrong interpretation if " +"your subtitles don't appear." +msgstr "" +"কিছুমান ফ্ৰেন্স চেনেলে ঐতিহাসিক অনুবাদৰ ভুল এটালৈ সিহঁতৰ উপশিৰোনাম পৃষ্ঠাবোৰ শুদ্ধকৈ " +"ফ্লেগ নকৰে. এই অশুদ্ধ অনুবাদটো ব্যৱহাৰ কৰি চেষ্টা কৰক যদি আপোনাৰ উপশিৰোনামবোৰ " +"দৃষ্টিগোচৰ নহয়." + +#: modules/codec/telx.c:71 +msgid "Teletext subtitles decoder" +msgstr "টেলিটেক্স উপশিৰোনামবোৰৰ ডিকোডাৰ" + +#: modules/codec/textst.c:49 +msgid "HDMV TextST subtitles decoder" +msgstr "" + +#: modules/codec/theora.c:107 modules/codec/vorbis.c:175 +msgid "" +"Enforce a quality between 1 (low) and 10 (high), instead of specifying a " +"particular bitrate. This will produce a VBR stream." +msgstr "" +"1 (নিম্ন) আৰু 10 (উচ্চ)ৰ মাজত মানদণ্ড এটা জোৰ কৰক, নিৰ্দিষ্ট বিট হাৰ এটা নিৰ্ধাৰণ " +"কৰাৰ পৰিৱৰ্তে. এইটোৱে এটা VBR ষ্ট্ৰিম তৈয়াৰ কৰিব." + +#: modules/codec/theora.c:110 modules/video_filter/postproc.c:69 +msgid "Post processing quality" +msgstr "পিছত প্ৰক্ৰিয়া কৰাৰ মানদণ্ড" + +#: modules/codec/theora.c:116 +msgid "Theora video decoder" +msgstr "থিওৰা ভিডিঅ' ডিকোডাৰ" + +#: modules/codec/theora.c:124 +msgid "Theora video packetizer" +msgstr "থিওৰা ভিডিঅ' পেকেটাইজাৰ" + +#: modules/codec/theora.c:131 +msgid "Theora video encoder" +msgstr "থিওৰা ভিডিঅ' এনকোডাৰ" + +#: modules/codec/ttml/ttml.c:45 +msgid "TTML decoder" +msgstr "" + +#: modules/codec/ttml/ttml.c:46 +msgid "TTML subtitles decoder" +msgstr "" + +#: modules/codec/ttml/ttml.c:53 +msgid "TTML" +msgstr "" + +#: modules/codec/ttml/ttml.c:54 +msgid "TTML demuxer" +msgstr "" + +#: modules/codec/twolame.c:56 +msgid "" +"Force a specific encoding quality between 0.0 (high) and 50.0 (low), instead " +"of specifying a particular bitrate. This will produce a VBR stream." +msgstr "" +"0.0 (high) আৰু 50.0 (low) ৰ মাজৰ এটা বিশেষ এনকোড কৰা মানদণ্ড জোৰ কৰক, এটা " +"নিৰ্দিষ্ট বিট হাৰ নিৰ্ধাৰিত কৰাৰ পৰিৱৰ্তে. এইটোৱে VBR ষ্ট্ৰিম এটা তৈয়াৰ কৰিব." + +#: modules/codec/twolame.c:59 +msgid "Stereo mode" +msgstr "ষ্টেৰিঅ' ধৰণ" + +#: modules/codec/twolame.c:60 +msgid "Handling mode for stereo streams" +msgstr "ষ্টেৰিঅ' ষ্ট্ৰিমবোৰৰ বাবে পৰিচালনাৰ ধৰণ" + +#: modules/codec/twolame.c:61 +msgid "VBR mode" +msgstr "VBR ধৰণ" + +#: modules/codec/twolame.c:63 +msgid "Use Variable BitRate. Default is to use Constant BitRate (CBR)." +msgstr "চলক বিট হাৰ ব্যৱহাৰ কৰক. সুস্থিৰ বিট হাৰ ব্যৱহাৰ কৰিবলৈ ডিফল্ট (CBR)." + +#: modules/codec/twolame.c:64 +msgid "Psycho-acoustic model" +msgstr "ছাইকো-একোউষ্টিক আৰ্হি" + +#: modules/codec/twolame.c:66 +msgid "Integer from -1 (no model) to 4." +msgstr "-1 ৰ পৰা (কোনো আৰ্হি নাই) 4 লৈ অখণ্ড সংখ্যা." + +#: modules/codec/twolame.c:70 +msgid "Joint stereo" +msgstr "যুগ্ম ষ্টেৰিঅ'" + +#: modules/codec/twolame.c:75 +msgid "Libtwolame audio encoder" +msgstr "Libtwolame অডিঅ' এনকোডাৰ" + +#: modules/codec/uleaddvaudio.c:41 +msgid "Ulead DV audio decoder" +msgstr "ইউলীড DV অডিঅ' ডিকোডাৰ" + +#: modules/codec/videotoolbox.m:82 +msgid "Use Hardware decoders only" +msgstr "" + +#: modules/codec/videotoolbox.m:90 +msgid "VideoToolbox video decoder" +msgstr "" + +#: modules/codec/vorbis.c:177 +msgid "Maximum encoding bitrate" +msgstr "সৰ্বাধিক এনকোডিং বিট হাৰ" + +#: modules/codec/vorbis.c:179 +msgid "Maximum bitrate in kbps. This is useful for streaming applications." +msgstr "kbps ত সৰ্বাধিক বিট হাৰ. এইটো ষ্ট্ৰিম কৰা আবেদনবোৰৰ বাবে উপযোগী." + +#: modules/codec/vorbis.c:180 +msgid "Minimum encoding bitrate" +msgstr "নূন্যতম এনকোডিং বিট হাৰ" + +#: modules/codec/vorbis.c:182 +msgid "" +"Minimum bitrate in kbps. This is useful for encoding for a fixed-size " +"channel." +msgstr "" +"kbps ত নূন্যতম বিট হাৰ. নিৰ্দিষ্ট আকাৰ চেনেল এটাৰ বাবে এনকোডিংৰ বাবে এইটো উপযোগী." + +#: modules/codec/vorbis.c:185 +msgid "Force a constant bitrate encoding (CBR)." +msgstr "সুস্থিৰ বিট হাৰ এনকোডিং এটা জোৰ কৰক (CBR)." + +#: modules/codec/vorbis.c:189 +msgid "Vorbis audio decoder" +msgstr "ভৰ্বিছ অডিঅ' ডিকোডাৰ" + +#: modules/codec/vorbis.c:200 +msgid "Vorbis audio packetizer" +msgstr "ভৰ্বিছ অডিঅ' পেকেটাইজাৰ" + +#: modules/codec/vorbis.c:207 +msgid "Vorbis audio encoder" +msgstr "ভৰ্বিছ অডিঅ' এনকোডাৰ" + +#: modules/codec/vpx.c:53 +msgid "Quality mode" +msgstr "" + +#: modules/codec/vpx.c:54 +msgid "" +"Quality setting which will determine max encoding time\n" +" - 0: Good quality\n" +" - 1: Realtime\n" +" - 2: Best quality" +msgstr "" + +#: modules/codec/vpx.c:66 +msgid "WebM video decoder" +msgstr "ৱেবM ভিডিঅ' ডিকোডাৰ" + +#: modules/codec/vpx.c:75 +msgid "WebM video encoder" +msgstr "" + +#: modules/codec/webvtt/webvtt.c:40 +msgid "WEBVTT decoder" +msgstr "" + +#: modules/codec/webvtt/webvtt.c:41 +msgid "WEBVTT subtitles decoder" +msgstr "" + +#: modules/codec/webvtt/webvtt.c:47 modules/codec/webvtt/webvtt.c:55 +msgid "WEBVTT subtitles parser" +msgstr "" + +#: modules/codec/wmafixed/wma.c:83 +msgid "WMA v1/v2 fixed point audio decoder" +msgstr "WMA v1/v2 নিৰ্দিষ্ট পইন্ট অডিঅ' ডিকোডাৰ" + +#: modules/codec/x264.c:71 +msgid "Maximum GOP size" +msgstr "সৰ্বাধিক GOP আকাৰ" + +#: modules/codec/x264.c:72 +msgid "" +"Sets maximum interval between IDR-frames. Larger values save bits, thus " +"improving quality for a given bitrate at the cost of seeking precision. Use " +"-1 for infinite." +msgstr "" + +#: modules/codec/x264.c:76 +msgid "Minimum GOP size" +msgstr "নূন্যতম GOP আকাৰ" + +#: modules/codec/x264.c:77 +msgid "" +"Sets minimum interval between IDR-frames. In H.264, I-frames do not " +"necessarily bound a closed GOP because it is allowable for a P-frame to be " +"predicted from more frames than just the one frame before it (also see " +"reference frame option). Therefore, I-frames are not necessarily seekable. " +"IDR-frames restrict subsequent P-frames from referring to any frame prior to " +"the IDR-frame. \n" +"If scenecuts appear within this interval, they are still encoded as I-" +"frames, but do not start a new GOP." +msgstr "" +"IDR-ফ্ৰেমবোৰৰ মাজত নূন্যতম অন্তৰাল ছেট কৰে. H.264 ত, I-ফ্ৰেমবোৰৰ এটা বন্ধ GOP ৰ " +"প্ৰতি দায়বদ্ধ নহয় কাৰণ এইটো অধিক ফ্ৰেমৰ পৰা প্ৰত্যাশা কৰিবলৈ P-ফ্ৰেম এটালৈ অনুমতি " +"যোগ্য, মাত্ৰ ইয়াৰ আগত কেৱল এটা ফ্ৰেম (লগতে প্ৰসংগ কৰা ফ্ৰেম বিকল্প চাওক). সেইবাবে, " +"I-ফ্ৰেমবোৰ প্ৰয়োজনীয়ভাৱে বিচৰা নহয়. IDR-ফ্ৰেমবোৰে IDR-ফ্ৰেমটোলৈ যিকোনো ফ্ৰেম " +"প্ৰসংগ কৰা পৰা সমসাময়িক P-ফ্ৰেমবোৰ সীমিত কৰে. \n" +"যদি এই অন্তৰালটোৰ ভিতৰত দৃশ্য কটাটো দৃষ্টিগোচৰ হয়, সিহঁতক এতিয়াও I-ফ্ৰেমবোৰৰ দৰে " +"এনকোড কৰা হয়, কিন্তু এটা নতুন GOP আৰম্ভ নকৰে." + +#: modules/codec/x264.c:86 +msgid "Use recovery points to close GOPs" +msgstr "GOPবোৰ বন্ধ কৰিবলৈ উদ্ধাৰ বিন্দুবোৰ ব্যৱহাৰ কৰক" + +#: modules/codec/x264.c:87 +msgid "use open GOP, for bluray compatibility use also bluray-compat option" +msgstr "মুক্ত GOP ব্যৱহাৰ কৰক, ব্লাৰে খাপখোৱাটোৰ বাবে, লগতে ব্লাৰে-কম্পেট বিকল্পও" + +#: modules/codec/x264.c:89 +msgid "Enable compatibility hacks for Blu-ray support" +msgstr "ব্লা-ৰে সমৰ্থনৰ বাবে খাপখোৱাটো সমৰ্থনটো সক্ষম কৰক" + +#: modules/codec/x264.c:90 +msgid "" +"Enable hacks for Blu-ray support, this doesn't enforce every aspect of Blu-" +"ray compatibility\n" +"e.g. resolution, framerate, level" +msgstr "" +"ব্লা-ৰে সমৰ্থনৰ বাবে খাপখোৱাটো সমৰ্থনটো সক্ষম কৰক, এইটোৱে ব্লা-ৰে খাপখোৱাটোৰ " +"প্ৰত্যেকটো দৃষ্টিকোণ জোৰ নকৰে\n" +"উদাহৰণস্বৰূপে বিশ্লেষণ, ফ্ৰেম হাৰ, স্তৰ" + +#: modules/codec/x264.c:93 +msgid "Extra I-frames aggressivity" +msgstr "অতিৰিক্ত I-ফ্ৰেমবোৰৰ আক্ৰমণাত্মকতা" + +#: modules/codec/x264.c:94 +msgid "" +"Scene-cut detection. Controls how aggressively to insert extra I-frames. " +"With small values of scenecut, the codec often has to force an I-frame when " +"it would exceed keyint. Good values of scenecut may find a better location " +"for the I-frame. Large values use more I-frames than necessary, thus wasting " +"bits. -1 disables scene-cut detection, so I-frames are inserted only every " +"other keyint frames, which probably leads to ugly encoding artifacts. Range " +"1 to 100." +msgstr "" +"দৃশ্য-কাটটো চিনাক্তকৰণ. অতিৰিক্ত I-ফ্ৰেমবোৰ কেনকৈ ভৰাব নিয়ন্ত্ৰণ কৰক. দৃশ্য কটাৰ সৰু " +"মানবোৰৰ সৈতে, কোডটোৱে প্ৰায়ে I-ফ্ৰেম এটা জোৰ কৰিব লাগে যেতিয়া এইটোৱে মুখ্য " +"অখণ্ডটো অতিক্ৰম কৰিব. দৃশ্য কটাটোৰ ভাল মানবোৰে I-ফ্ৰেমটোৰ বাবে এটা ভাল স্থান " +"বিচাৰি পাব পাৰে. বৃহত মানবোৰে প্ৰয়োজনতকৈ অধিক I-ফ্ৰেম ব্যৱহাৰ কৰে, এইদৰে বিটবোৰ " +"অপব্যয় কৰে. -1 য়ে দৃশ্য-কাট চিনাক্তকৰণটো অক্ষম কৰে, সেয়ে I-ফ্ৰেমবোৰ কেৱল প্ৰত্যেক " +"মুখ্য অখণ্ডবোৰত ভৰোৱা হয়, যিয়ে সম্ভৱত বেয়াকৈ এনকোড কৰা আৰ্টিফেক্টবোৰ তৈয়াৰ কৰে. " +"পৰিসৰ 1 ৰ পৰা 100 লৈ." + +#: modules/codec/x264.c:105 +msgid "B-frames between I and P" +msgstr "I আৰু P ৰ মাজৰ B-ফ্ৰেমবোৰ" + +#: modules/codec/x264.c:106 +msgid "Number of consecutive B-frames between I and P-frames. Range 1 to 16." +msgstr "I আৰু P-ফ্ৰেমবোৰৰ মাজত ধাৰাবাহিক B-ফ্ৰেমবোৰৰ সংখ্যা. পৰিসৰ 1 ৰ পৰা 16 লৈ." + +#: modules/codec/x264.c:109 +msgid "Adaptive B-frame decision" +msgstr "এডাপ্টিভ B-ফ্ৰেম সিদ্ধান্ত" + +#: modules/codec/x264.c:110 +msgid "" +"Force the specified number of consecutive B-frames to be used, except " +"possibly before an I-frame. Range 0 to 2." +msgstr "" + +#: modules/codec/x264.c:114 +msgid "Influence (bias) B-frames usage" +msgstr "B-ফ্ৰেমবোৰৰ উপযোগীতা প্ৰভাৱিত কৰক (বাইয়াছ) " + +#: modules/codec/x264.c:115 +msgid "" +"Bias the choice to use B-frames. Positive values cause more B-frames, " +"negative values cause less B-frames." +msgstr "" +"B-ফ্ৰেমবোৰৰ ব্যৱহাৰটোলৈ পছন্দটো বাইয়াছ কৰক. ধনাত্মক মানবোৰে অধিক B-ফ্ৰেম সংগটিত " +"কৰিব পাৰে, ঋণাত্মক মানবোৰে কম B-ফ্ৰেম সংগটিত কৰে." + +#: modules/codec/x264.c:119 +msgid "Keep some B-frames as references" +msgstr "প্ৰসংগৰ দৰে কিছুমান B-ফ্ৰেম ৰাখক" + +#: modules/codec/x264.c:120 +msgid "" +"Allows B-frames to be used as references for predicting other frames. Keeps " +"the middle of 2+ consecutive B-frames as a reference, and reorders frame " +"appropriately.\n" +" - none: Disabled\n" +" - strict: Strictly hierarchical pyramid\n" +" - normal: Non-strict (not Blu-ray compatible)\n" +msgstr "" +"অন্য ফ্ৰেমবোৰ আশা কৰাৰ বাবে প্ৰসংগ দৰে B-ফ্ৰেমবোৰ ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়ে. " +"প্ৰসংগ এটা হিচাপে 2+ ধাৰাবাহিক B-ফ্ৰেমৰ মাজৰটো ধৰি ৰাখক, আৰু ফ্ৰেমটো সঠিকভাৱে " +"পুনৰ নিৰ্দেশ কৰক.\n" +" - নাই: অক্ষম কৰা হল\n" +" - কোঠৰ: কোঠৰভাৱে কৰা বৰ্গীকৃত পিৰামিড\n" +" - স্বাভাৱিক: কোঠৰহীন (ব্লা-ৰে খাপখোৱা নহয়)\n" + +#: modules/codec/x264.c:128 +msgid "Use fullrange instead of TV colorrange" +msgstr "TV ৰংৰ পৰিসৰটোৰ পৰিৱৰ্তে সম্পূৰ্ণ পৰিসৰ ব্যৱহাৰ কৰক" + +#: modules/codec/x264.c:129 +msgid "" +"TV-range is usually used colorrange, defining this to true will enable " +"libx264 to use full colorrange on encoding" +msgstr "" +"TV-পৰিসৰটোৱে সাধাৰণতে ৰংৰ পৰিসৰ ব্যৱহাৰ কৰে, সচালৈ এইটো বাখ্যা কৰাটোৱে " +"এনকোডিংত সম্পূৰ্ণ ৰংৰ পৰিসৰ ব্যৱহাৰ কৰিবলৈ libx264 টো সক্ষম কৰিব" + +#: modules/codec/x264.c:132 +msgid "CABAC" +msgstr "CABAC" + +#: modules/codec/x264.c:133 +msgid "" +"CABAC (Context-Adaptive Binary Arithmetic Coding). Slightly slows down " +"encoding and decoding, but should save 10 to 15% bitrate." +msgstr "" +"CABAC (প্ৰসংগ-এডাপ্টিভ বাইনেৰী সংখ্যা কোডিং). এনকোডিং আৰু ডিকোডিং সামান্যভাৱে " +"মন্থৰ হয়, 15% বিট হাৰলৈ 10 ছেভ কৰিব." + +#: modules/codec/x264.c:138 +msgid "" +"Number of previous frames used as predictors. This is effective in Anime, " +"but seems to make little difference in live-action source material. Some " +"decoders are unable to deal with large frameref values. Range 1 to 16." +msgstr "" +"প্ৰত্যাশাকৰ্তাবোৰ হিচাপে ব্যৱহাৰ কৰা আগৰ ফ্ৰেমবোৰৰ সংখ্যা. এইটো এনিমেশ্বনত কাৰ্যকৰী, " +"জীৱন্ত-কাৰ্য উত্স বস্তুনিষ্ঠত সামান্য পাৰ্থক্য তৈয়াৰ কৰে. বৃহত ফ্ৰেম প্ৰসংগ কৰা মানবোৰৰ " +"সৈতে লেনদেন কৰিবলৈ কিছুমান ডিকোডাৰ অক্ষম. পৰিসৰ 1 ৰ পৰা 16 লৈ." + +#: modules/codec/x264.c:143 +msgid "Skip loop filter" +msgstr "লুপ ফিল্টাৰ এৰি যাওক" + +#: modules/codec/x264.c:144 +msgid "Deactivate the deblocking loop filter (decreases quality)." +msgstr "ডিব্লক কৰা ফিল্টাৰ লুপটো নিষ্ক্ৰিয় কৰক (মানদণ্ড হ্ৰাস কৰক)." + +#: modules/codec/x264.c:146 +msgid "Loop filter AlphaC0 and Beta parameters alpha:beta" +msgstr "লুপ ফিল্টাৰ আলফাC0 আৰু বিটা পেৰামিটাৰ আলফা:বিটা" + +#: modules/codec/x264.c:147 +msgid "" +"Loop filter AlphaC0 and Beta parameters. Range -6 to 6 for both alpha and " +"beta parameters. -6 means light filter, 6 means strong." +msgstr "" +"লুপ ফিল্টাৰ আলফাC0 আৰু বিটা পেৰামিটাৰবোৰ. আলফা আৰু বিটা দুয়োটা পেৰামিটাৰৰ বাবে " +"পৰিসৰ -6 ৰ পৰা 6 লৈ. -6 মানে হল পাতল ফিল্টাৰ, 6 মানে হল শক্তিশালী ফিল্টাৰ." + +#: modules/codec/x264.c:151 +msgid "H.264 level" +msgstr "H.264 স্তৰ" + +#: modules/codec/x264.c:152 +msgid "" +"Specify H.264 level (as defined by Annex A of the standard). Levels are not " +"enforced; it's up to the user to select a level compatible with the rest of " +"the encoding options. Range 1 to 5.1 (10 to 51 is also allowed). Set to 0 " +"for letting x264 set level." +msgstr "" +"H.264 স্তৰ নিৰ্ধাৰণ কৰক (মানবিশিষ্টৰ অনুবন্ধ A ৰ দ্বাৰা বাখ্যা কৰা দৰে). স্তৰবোৰ জোৰ " +"কৰা নহয়; বাকী থকা এনকোডিং বিকল্পটোৰ সৈতে স্তৰ খাপখোৱা এটা নিৰ্বাচন কৰিবলৈ এইটো " +"ব্যৱহাৰকৰ্তাৰ ওপৰ নিৰ্ভৰ কৰে. পৰিসৰ 1 ৰ পৰা 5.1 লৈ (10 ৰ পৰা 51 লৈও অনুমোদন কৰা " +"হয়). x264 ছেট স্তৰলৈ ছেট কৰিব দিবৰ বাবে 0 লৈ ছেট কৰক." + +#: modules/codec/x264.c:157 +msgid "H.264 profile" +msgstr "H.264 প্ৰফাইল" + +#: modules/codec/x264.c:158 +msgid "Specify H.264 profile which limits are enforced over other settings" +msgstr "H.264 প্ৰফাইলটো নিৰ্ধাৰণ কৰক যাৰ সীমাবোৰ অন্য ছেটিংবোৰৰ ওপৰত জোৰ কৰা হয়" + +#: modules/codec/x264.c:164 +msgid "Interlaced mode" +msgstr "ইন্টাৰলেচ কৰা ধৰণ" + +#: modules/codec/x264.c:165 +msgid "Pure-interlaced mode." +msgstr "বিশুদ্ধ-ইন্টাৰলেচ কৰা ধৰণ." + +#: modules/codec/x264.c:167 +msgid "Frame packing" +msgstr "ফ্ৰেম পেকিং কৰিছে" + +#: modules/codec/x264.c:168 +msgid "" +"For stereoscopic videos define frame arrangement:\n" +" 0: checkerboard - pixels are alternatively from L and R\n" +" 1: column alternation - L and R are interlaced by column\n" +" 2: row alternation - L and R are interlaced by row\n" +" 3: side by side - L is on the left, R on the right\n" +" 4: top bottom - L is on top, R on bottom\n" +" 5: frame alternation - one view per frame" +msgstr "" +"ষ্টেৰিঅ'স্কোপিক ভিডিঅ'বোৰৰ বাবে ফ্ৰেম ব্যৱস্থাটো বাখ্যা কৰক:\n" +" 0: পৰীক্ষাৰ বোৰ্ড - পিক্সেলবোৰ বৈকল্পিকভাৱে L আৰু R ৰ পৰা\n" +" 1: স্তম্ভ বিকল্পকৰণ - L আৰু R ক স্তম্ভৰ দ্বাৰা ইন্টাৰলেচ কৰা হয়\n" +" 2: শাৰী বিকল্পকৰণ - L আৰু R ক শাৰীৰ দ্বাৰা ইন্টাৰলেচ কৰা হয়\n" +" 3: কাষে কাষে - L টো বাওঁফালে, R টো সোঁফালে\n" +" 4: ওপৰ তল - L টো ওপৰত, R টো তলত\n" +" 5: ফ্ৰেম বিকল্পকৰণ - প্ৰত্যেক ফ্ৰেমত এটা দৃশ্য" + +#: modules/codec/x264.c:176 +msgid "Use Periodic Intra Refresh" +msgstr "সাময়িক অন্ত: পুনৰসজীৱ ব্যৱহাৰ কৰক" + +#: modules/codec/x264.c:177 +msgid "Use Periodic Intra Refresh instead of IDR frames" +msgstr "IDR ফ্ৰেমবোৰৰ পৰিৱৰ্তে সাময়িক অন্ত: পুনৰসজীৱ ব্যৱহাৰ কৰক" + +#: modules/codec/x264.c:179 +msgid "Use mb-tree ratecontrol" +msgstr "mb-বিন্যাস হাৰ নিয়ন্ত্ৰণ ব্যৱহাৰ কৰক" + +#: modules/codec/x264.c:180 +msgid "You can disable use of Macroblock-tree on ratecontrol" +msgstr "হাৰ নিয়ন্ত্ৰণত আপুনি মেক্ৰোব্লক-বিন্যাসৰ ব্যৱহাৰ অক্ষম কৰিব পাৰে" + +#: modules/codec/x264.c:182 +msgid "Force number of slices per frame" +msgstr "প্ৰত্যেক ফ্ৰেমত শ্লাইছবোৰৰ সংখ্যা জোৰ কৰক" + +#: modules/codec/x264.c:183 +msgid "Force rectangular slices and is overridden by other slicing options" +msgstr "" +"আয়তাকাৰ শ্লাইছবোৰ জোৰ কৰক আৰু অন্য শ্লাইছ বিকল্পবোৰৰ দ্বাৰা অভাৰৰাইড কৰা হৈছে" + +#: modules/codec/x264.c:185 +msgid "Limit the size of each slice in bytes" +msgstr "বাইটত প্ৰতিটো শ্লাইছৰ আকাৰ সীমিত কৰক" + +#: modules/codec/x264.c:186 +msgid "Sets a maximum slice size in bytes, Includes NAL overhead in size" +msgstr "বাইটত শ্লাইছৰ সৰ্বাধিক আকাৰটো ছেট কৰে, আকাৰত NAL অভাৰহেড অন্তৰ্ভুক্ত কৰে" + +#: modules/codec/x264.c:188 +msgid "Limit the size of each slice in macroblocks" +msgstr "মেক্ৰোব্লকবোৰত প্ৰতিটো শ্লাইছৰ আকাৰটো সীমিত কৰক" + +#: modules/codec/x264.c:189 +msgid "Sets a maximum number of macroblocks per slice" +msgstr "শ্লাইচে প্ৰতি সৰ্বাধিক এটা সৰ্বাধিক সংখ্যক মেক্ৰোব্লক ছেট কৰে" + +#: modules/codec/x264.c:192 +msgid "Set QP" +msgstr "QP ছেট কৰক" + +#: modules/codec/x264.c:193 +msgid "" +"This selects the quantizer to use. Lower values result in better fidelity, " +"but higher bitrates. 26 is a good default value. Range 0 (lossless) to 51." +msgstr "" +"এইটোৱে ব্যৱহাৰ কৰিবলৈ পৰিণামীকৰ্তাটো নিৰ্বাচন কৰে. নিম্ন মানবোৰে অধিক বিশ্বাসযোগ্য " +"ফলাফল দিয়ে, কিন্তু বিটৰ হাৰটো উচ্চ হয়. 26 হল এটা ভাল ডিফল্ট মান. পৰিসৰটো 0 ৰ পৰা " +"(নেহৰুওৱাকৈ) 51 লৈ." + +#: modules/codec/x264.c:197 +msgid "Quality-based VBR" +msgstr "মানদণ্ড-আধাৰিত VBR" + +#: modules/codec/x264.c:198 +msgid "1-pass Quality-based VBR. Range 0 to 51." +msgstr "1-পাছ মানদণ্ড-আধাৰিত VBR. পৰিসৰ 0 ৰ পৰা 51." + +#: modules/codec/x264.c:200 +msgid "Min QP" +msgstr "নূন্যতম QP" + +#: modules/codec/x264.c:201 +msgid "Minimum quantizer parameter. 15 to 35 seems to be a useful range." +msgstr "নূন্যতম পৰিণামীকৰ্তা পেৰামিটাৰ. 15 ৰ পৰা 35 লৈ এটা উপযোগী পৰিসৰ হব পাৰে." + +#: modules/codec/x264.c:204 +msgid "Max QP" +msgstr "সৰ্বাধিক QP" + +#: modules/codec/x264.c:205 +msgid "Maximum quantizer parameter." +msgstr "সৰ্বাধিক পৰিণামীকৰ্তা পেৰামিটাৰ." + +#: modules/codec/x264.c:207 +msgid "Max QP step" +msgstr "সৰ্বাধিক QP স্তৰ" + +#: modules/codec/x264.c:208 +msgid "Max QP step between frames." +msgstr "ফ্ৰেমবোৰৰ মাজৰ সৰ্বাধিক QP স্তৰ." + +#: modules/codec/x264.c:210 +msgid "Average bitrate tolerance" +msgstr "গড় বিট হাৰ বহন ক্ষমতা" + +#: modules/codec/x264.c:211 +msgid "Allowed variance in average bitrate (in kbits/s)." +msgstr "গড়ৰ বিটহাৰত চলক অনুমোদন কৰে (kbits/s ত)." + +#: modules/codec/x264.c:214 +msgid "Max local bitrate" +msgstr "সৰ্বাধিক স্থানীয় বিট হাৰ" + +#: modules/codec/x264.c:215 +msgid "Sets a maximum local bitrate (in kbits/s)." +msgstr "এটা সৰ্বাধি স্থানীয় বিট হাৰ ছেট কৰে (kbits/s ত)." + +#: modules/codec/x264.c:217 +msgid "VBV buffer" +msgstr "VBV বাফাৰ" + +#: modules/codec/x264.c:218 +msgid "Averaging period for the maximum local bitrate (in kbits)." +msgstr "সৰ্বাধিক স্থানীয় বিট হাৰটোৰ বাবে সময়সীমা গড় কৰিছে (kbits/s ত)." + +#: modules/codec/x264.c:221 +msgid "Initial VBV buffer occupancy" +msgstr "প্ৰাৰম্ভিক VBV বাফাৰ দখল" + +#: modules/codec/x264.c:222 +msgid "" +"Sets the initial buffer occupancy as a fraction of the buffer size. Range " +"0.0 to 1.0." +msgstr "" +"বাফাৰ আকাৰটোৰ অংশ এটাৰ দৰে প্ৰাৰম্ভিক বাফাৰটো ছেট কৰে. পৰিসৰ 0.0 ৰ পৰা 1.0 লৈ." + +#: modules/codec/x264.c:225 +msgid "How AQ distributes bits" +msgstr "AQ য়ে কেনেকৈ বিটবোৰ বিতৰণ কৰে" + +#: modules/codec/x264.c:226 +msgid "" +"Defines bitdistribution mode for AQ, default 1\n" +" - 0: Disabled\n" +" - 1: Current x264 default mode\n" +" - 2: uses log(var)^2 instead of log(var) and attempts to adapt strength per " +"frame" +msgstr "" +"AQৰ বাবে হাৰ বিতৰণৰ ধৰণটো বাখ্যা কৰে, ডিফল্ট 1\n" +" - 0: অক্ষম কৰা হল\n" +" - 1: চলিত x264 ডিফল্ট ধৰণ\n" +" - 2: log(var) ৰ পৰিবৰ্তে log(var)^2 ব্যৱহাৰ কৰে আৰু প্ৰত্যেক ফ্ৰেমত শক্তি এডাপ্ট " +"কৰিবলৈ চেষ্টা কৰে" + +#: modules/codec/x264.c:231 +msgid "Strength of AQ" +msgstr "AQ ৰ শক্তি" + +#: modules/codec/x264.c:232 +msgid "" +"Strength to reduce blocking and blurring in flat\n" +"and textured areas, default 1.0 recommended to be between 0..2\n" +" - 0.5: weak AQ\n" +" - 1.5: strong AQ" +msgstr "" +"ফ্লেট আৰু টেক্সছাৰ অঞ্চলবোৰত ব্লক আৰু ব্লাৰিং হ্ৰাস কৰিবলৈ শক্তি,\n" +"ডিফল্ট 1.0 য়ে 0..2 ৰ মাজত পৰামৰ্শ কৰিব\n" +" - 0.5: দুৰ্বল AQ\n" +" - 1.5: শক্তিশালী AQ" + +#: modules/codec/x264.c:238 +msgid "QP factor between I and P" +msgstr "I আৰু P ৰ মাজৰ QP কাৰক" + +#: modules/codec/x264.c:239 +msgid "QP factor between I and P. Range 1.0 to 2.0." +msgstr "I আৰু P ৰ মাজৰ QP কাৰক. পৰিসৰটো 1.0 ৰ পৰা 2.0 লৈ." + +#: modules/codec/x264.c:242 +msgid "QP factor between P and B" +msgstr "P আৰু B ৰ মাজৰ QP কাৰক" + +#: modules/codec/x264.c:243 +msgid "QP factor between P and B. Range 1.0 to 2.0." +msgstr "P আৰু B ৰ মাজৰ QP কাৰক. পৰিসৰটো 1.0 ৰ পৰা 2.0 লৈ." + +#: modules/codec/x264.c:245 +msgid "QP difference between chroma and luma" +msgstr "ক্ৰোমা আৰু লুমাৰ মাজৰ QP পাৰ্থক্য" + +#: modules/codec/x264.c:246 +msgid "QP difference between chroma and luma." +msgstr "ক্ৰোমা আৰু লুমাৰ মাজৰ QP পাৰ্থক্য." + +#: modules/codec/x264.c:248 +msgid "Multipass ratecontrol" +msgstr "মাল্টিপাছ হাৰ নিয়ন্ত্ৰণ" + +#: modules/codec/x264.c:249 +msgid "" +"Multipass ratecontrol:\n" +" - 1: First pass, creates stats file\n" +" - 2: Last pass, does not overwrite stats file\n" +" - 3: Nth pass, overwrites stats file\n" +msgstr "" +"মাল্টিপাছ হাৰ নিয়ন্ত্ৰণ:\n" +" - 1: প্ৰথম পাছ, পৰিসংখ্যা ফাইল তৈয়াৰ কৰে\n" +" - 2: অন্তিম পাছ, পৰিসংখ্যা ফাইল অভাৰৰাইট নকৰে\n" +" - 3: Nতম পাছ, পৰিসংখ্যা ফাইল অভাৰৰাইট কৰে\n" + +#: modules/codec/x264.c:254 +msgid "QP curve compression" +msgstr "QP বক্ৰ সংনমন" + +#: modules/codec/x264.c:255 +msgid "QP curve compression. Range 0.0 (CBR) to 1.0 (QCP)." +msgstr "QP বক্ৰ সংনমন. পৰিসৰ 0.0 (CBR) ৰ পৰা 1.0 (QCP) লৈ." + +#: modules/codec/x264.c:257 modules/codec/x264.c:261 +msgid "Reduce fluctuations in QP" +msgstr "QP ত তাৰতম্য হ্ৰাস কৰে" + +#: modules/codec/x264.c:258 +msgid "" +"This reduces the fluctuations in QP before curve compression. Temporally " +"blurs complexity." +msgstr "" +"বক্ৰ সংনমনৰ আগতে এইটোৱে QP ত তাৰতম্যবোৰ হ্ৰাস কৰে. সাময়িকভাৱে ব্লাৰবোৰৰ জটিলতা." + +#: modules/codec/x264.c:262 +msgid "" +"This reduces the fluctuations in QP after curve compression. Temporally " +"blurs quants." +msgstr "" +"বক্ৰ সংনমনৰ পিছত এইটোৱে QP ত তাৰতম্যবোৰ হ্ৰাস কৰে. সাময়িকভাৱে ব্লাৰবোৰৰ জটিলতা." + +#: modules/codec/x264.c:267 +msgid "Partitions to consider" +msgstr "বিবেচনা কৰিবলৈ ভাগবোৰ" + +#: modules/codec/x264.c:268 +msgid "" +"Partitions to consider in analyse mode:\n" +" - none : \n" +" - fast : i4x4\n" +" - normal: i4x4,p8x8,(i8x8)\n" +" - slow : i4x4,p8x8,(i8x8),b8x8\n" +" - all : i4x4,p8x8,(i8x8),b8x8,p4x4\n" +"(p4x4 requires p8x8. i8x8 requires 8x8dct)." +msgstr "" + +#: modules/codec/x264.c:276 +msgid "Direct MV prediction mode" +msgstr "প্ৰত্যক্ষ MV প্ৰত্যাশাৰ ধৰণ" + +#: modules/codec/x264.c:279 +msgid "Direct prediction size" +msgstr "প্ৰত্যক্ষ প্ৰত্যাশাৰ আকাৰ" + +#: modules/codec/x264.c:280 +msgid "" +"Direct prediction size:\n" +" - 0: 4x4\n" +" - 1: 8x8\n" +" - -1: smallest possible according to level\n" +msgstr "" + +#: modules/codec/x264.c:285 +msgid "Weighted prediction for B-frames" +msgstr "B-ফ্ৰেমবোৰৰ বাবে ওজন কৰা প্ৰত্যাশা" + +#: modules/codec/x264.c:286 +msgid "Weighted prediction for B-frames." +msgstr "B-ফ্ৰেমবোৰৰ বাবে ওজন কৰা প্ৰত্যাশা." + +#: modules/codec/x264.c:288 +msgid "Weighted prediction for P-frames" +msgstr "P-ফ্ৰেমবোৰৰ বাবে ওজন কৰা প্ৰত্যাশা." + +#: modules/codec/x264.c:289 +msgid "" +"Weighted prediction for P-frames:\n" +" - 0: Disabled\n" +" - 1: Blind offset\n" +" - 2: Smart analysis\n" +msgstr "" + +#: modules/codec/x264.c:294 +msgid "Integer pixel motion estimation method" +msgstr "অখণ্ড পিক্সেল প্ৰস্তাৱ পৰিকল্পনাৰ পদ্ধতি" + +#: modules/codec/x264.c:295 +msgid "" +"Selects the motion estimation algorithm:\n" +" - dia: diamond search, radius 1 (fast)\n" +" - hex: hexagonal search, radius 2\n" +" - umh: uneven multi-hexagon search (better but slower)\n" +" - esa: exhaustive search (extremely slow, primarily for testing)\n" +" - tesa: hadamard exhaustive search (extremely slow, primarily for testing)\n" +msgstr "" + +#: modules/codec/x264.c:302 +msgid "Maximum motion vector search range" +msgstr "সৰ্বাধিক প্ৰস্তাৱ ভেক্টৰ সন্ধানৰ পৰিসৰ" + +#: modules/codec/x264.c:303 +msgid "" +"Maximum distance to search for motion estimation, measured from predicted " +"position(s). Default of 16 is good for most footage, high motion sequences " +"may benefit from settings between 24 and 32. Range 0 to 64." +msgstr "" +"প্ৰস্তাৱ পৰিকল্পনাৰ বাবে সন্ধান কৰিবলৈ সৰ্বাধিক দূৰত্ব, প্ৰত্যাশিত স্থান(বোৰ) ৰ পৰা " +"জোখা হয়. অধিকাংশ দৃশ্যৰ বাবে 16 ৰ ডিফল্টটো হল ভাল, উচ্চ প্ৰস্তাৱৰ ক্ৰমবোৰ 24 আৰু 32 " +"ৰ মাজৰ ছেটিংবোৰৰ পৰা উপযোগী হব পাৰে. পৰিসৰ 0 ৰ পৰা 64 লৈ." + +#: modules/codec/x264.c:308 +msgid "Maximum motion vector length" +msgstr "সৰ্বাধিক প্ৰস্তাৱ ভেক্টৰ সন্ধানৰ দৈৰ্ঘ্য" + +#: modules/codec/x264.c:309 +msgid "" +"Maximum motion vector length in pixels. -1 is automatic, based on level." +msgstr "" +"পিক্সেলবোৰত সৰ্বাধিক প্ৰস্তাৱ ভেক্টৰৰ দৈৰ্ঘ্য. -1 টো হল স্বয়ংক্ৰিয়, স্তৰটোৰ ওপৰত ভিত্তি " +"কৰি." + +#: modules/codec/x264.c:312 +msgid "Minimum buffer space between threads" +msgstr "থ্ৰেডবোৰৰ মাজত নূন্যতম বাফাৰ ঠাই" + +#: modules/codec/x264.c:313 +msgid "" +"Minimum buffer space between threads. -1 is automatic, based on number of " +"threads." +msgstr "" +"থ্ৰেডবোৰৰ মাজৰ নূন্যতম বাফাৰ ঠাই. -1 টো হল স্বয়ংক্ৰিয়, থ্ৰেডবোৰৰ ওপৰত ভিত্তি কৰি." + +#: modules/codec/x264.c:316 +msgid "Strength of psychovisual optimization, default is \"1.0:0.0\"" +msgstr "ছাইকোভিজুৱেল অপ্টিমাইজেশ্বনৰ শক্তি, ডিফল্ট হল \"1.0:0.0\"" + +#: modules/codec/x264.c:317 +msgid "" +"First parameter controls if RD is on (subme>=6) or off.\n" +"Second parameter controls if Trellis is used on psychovisual optimization, " +"default off" +msgstr "" +"প্ৰথম পেৰামিটাৰটোৱে নিয়ন্ত্ৰণ কৰে যদি RD টো চলি থাকে (subme>=6) বা অফ.\n" +"দ্বিতীয় পেৰামিটাৰটোৱে নিয়ন্ত্ৰণ কৰে যদি ট্ৰেলিছটো ছাইকো দৃশ্য অপ্টিমাইজেশ্বনত ব্যৱহাৰ " +"কৰা হয়, ডিফল্ট বন্ধ" + +#: modules/codec/x264.c:321 +msgid "Subpixel motion estimation and partition decision quality" +msgstr "উপপিক্সেল প্ৰস্তাৱ পৰিকল্পনা আৰু ভাগ কৰা সিদ্ধান্তৰ মানদণ্ড" + +#: modules/codec/x264.c:323 +msgid "" +"This parameter controls quality versus speed tradeoffs involved in the " +"motion estimation decision process (lower = quicker and higher = better " +"quality). Range 1 to 9." +msgstr "" +"এই পেৰামিটাৰটোৱে প্ৰস্তাৱ পৰিকল্পনাৰ সিদ্ধান্তৰ প্ৰক্ৰিয়াটোত জড়িত মানদণ্ডৰ বিপৰীতে " +"গতিৰ ট্ৰেঅফবোৰ নিয়ন্ত্ৰণ কৰে (নিম্ন = ক্ষিপ্ৰ আৰু উচ্চ = ভাল মানদণ্ড). পৰিসৰ 1 ৰ পৰা " +"9 লৈ." + +#: modules/codec/x264.c:327 +msgid "RD based mode decision for B-frames. This requires subme 6 (or higher)." +msgstr "" +"B-ফ্ৰেমবোৰৰ বাবে RD আধাৰিত ধৰণৰ সিদ্ধান্ত. এইটোৱে subme 6 দাবী কৰে (বা অধিক)." + +#: modules/codec/x264.c:330 +msgid "Decide references on a per partition basis" +msgstr "প্ৰতিটো ভাগৰ ভিত্তিত প্ৰসংগবোৰ সিদ্ধান্ত কৰক" + +#: modules/codec/x264.c:331 +msgid "" +"Allows each 8x8 or 16x8 partition to independently select a reference frame, " +"as opposed to only one ref per macroblock." +msgstr "" +"স্বাধীনভাৱে প্ৰসংগ ফ্ৰেম এটা নিৰ্বাচন কৰিবলৈ প্ৰতিটো 8x8 বা 16x8 ৰ অনুমতি দিয়ে, " +"প্ৰতিটো মেক্ৰোব্লকত কেৱল এটা প্ৰসংগলৈ বিৰোধ কৰাৰ দৰে." + +#: modules/codec/x264.c:335 +msgid "Chroma in motion estimation" +msgstr "প্ৰস্তাৱ পৰিকল্পনাত ক্ৰোমা" + +#: modules/codec/x264.c:336 +msgid "Chroma ME for subpel and mode decision in P-frames." +msgstr "P-ফ্ৰেমবোৰত উপপেল আৰু ধৰণৰ সিদ্ধান্তৰ বাবে ক্ৰোমা ME." + +#: modules/codec/x264.c:339 +msgid "Joint bidirectional motion refinement." +msgstr "উভয়দিশৰ প্ৰস্তাৱ শোধনটো লগ লগাোক." + +#: modules/codec/x264.c:341 +msgid "Adaptive spatial transform size" +msgstr "এডাপ্টিভ স্পাশ্বিয়েল সলনিৰ আকাৰ" + +#: modules/codec/x264.c:343 +msgid "SATD-based decision for 8x8 transform in inter-MBs." +msgstr "আন্ত-MBবোৰত 8x8 ৰূপান্তৰণৰ বাবে SATD-আধাৰিত সিদ্ধান্ত." + +#: modules/codec/x264.c:345 +msgid "Trellis RD quantization" +msgstr "ট্ৰেলিছ RD পৰিণামীকৰণ" + +#: modules/codec/x264.c:346 +msgid "" +"Trellis RD quantization:\n" +" - 0: disabled\n" +" - 1: enabled only on the final encode of a MB\n" +" - 2: enabled on all mode decisions\n" +"This requires CABAC." +msgstr "" + +#: modules/codec/x264.c:352 +msgid "Early SKIP detection on P-frames" +msgstr "P-ফ্ৰেমবোৰত আগতীয়া SKIP চিনাক্তৰণ" + +#: modules/codec/x264.c:353 +msgid "Early SKIP detection on P-frames." +msgstr "P-ফ্ৰেমবোৰত আগতীয়া SKIP চিনাক্তৰণ." + +#: modules/codec/x264.c:355 +msgid "Coefficient thresholding on P-frames" +msgstr "P-ফ্ৰেমবোৰত গুণাংক থ্ৰেছহল্ডিং" + +#: modules/codec/x264.c:356 +msgid "" +"Coefficient thresholding on P-frames. Eliminate dct blocks containing only a " +"small single coefficient." +msgstr "" + +#: modules/codec/x264.c:359 +msgid "Use Psy-optimizations" +msgstr "ছাইকো-অপ্টিমাইজেশ্বন ব্যৱহাৰ কৰক" + +#: modules/codec/x264.c:360 +msgid "Use all visual optimizations that can worsen both PSNR and SSIM" +msgstr "" +"সকলোবোৰ দৃশ্যমান অপ্টিমাইজেশ্বন ব্যৱহাৰ কৰক যিয়ে PSNR আৰু SSIM দুয়োটা নষ্ট কৰিব পাৰে" + +#: modules/codec/x264.c:364 +msgid "" +"Dct-domain noise reduction. Adaptive pseudo-deadzone. 10 to 1000 seems to be " +"a useful range." +msgstr "" +"Dct-ক্ষেত্ৰ হুলস্থূল হ্ৰাস. এডাপ্টিভ ছিউডো-ডেথজন. 10 ৰ পৰা 1000 লৈ এটা উপযোগী পৰিসৰ " +"হিচাপে ধৰিব পাৰি." + +#: modules/codec/x264.c:367 +msgid "Inter luma quantization deadzone" +msgstr "আন্ত: লুমা পৰিণামীকৰণ ডেথজন" + +#: modules/codec/x264.c:368 +msgid "Set the size of the inter luma quantization deadzone. Range 0 to 32." +msgstr "আন্ত: লুমা পৰিণামীকৰণ ডেথজনটোৰ আকাৰটো ছেট কৰক. পৰিসৰ 0 ৰ পৰা 32." + +#: modules/codec/x264.c:371 +msgid "Intra luma quantization deadzone" +msgstr "অন্ত: লুমা পৰিণামীকৰণ ডেথজনটোৰ " + +#: modules/codec/x264.c:372 +msgid "Set the size of the intra luma quantization deadzone. Range 0 to 32." +msgstr "অন্ত: লুমা পৰিণামীকৰণ ডেথজনটোৰ আকাৰটো ছেট কৰক. পৰিসৰ 0 ৰ পৰা 32." + +#: modules/codec/x264.c:377 +msgid "Non-deterministic optimizations when threaded" +msgstr "নিৰ্ধাৰণাত্মকহীন অপ্টিমাইজেশ্বন যেতিয়া থ্ৰেড কৰে" + +#: modules/codec/x264.c:378 +msgid "Slightly improve quality of SMP, at the cost of repeatability." +msgstr "SMP ৰ মানদণ্ড সামান্যভাৱে বৃদ্ধি কৰক, পুনৰাবৃত্তিৰ দক্ষতাৰ মূল্যটোৰ বিনিময়ত." + +#: modules/codec/x264.c:381 +msgid "CPU optimizations" +msgstr "CPU অপ্টিমাইজেশ্বনবোৰ" + +#: modules/codec/x264.c:382 +msgid "Use assembler CPU optimizations." +msgstr "এছেম্বলকৰ্তা CPU অপ্টিমাইজেশ্বনবোৰ ব্যৱহাৰ কৰক." + +#: modules/codec/x264.c:384 +msgid "Filename for 2 pass stats file" +msgstr "2 পাছ পৰিসংখ্যা ফাইলৰ বাবে ফাইল নাম" + +#: modules/codec/x264.c:385 +msgid "Filename for 2 pass stats file for multi-pass encoding." +msgstr "মাল্টি-পাছ এনকোডিংৰ বাবে 2 পাছ পৰিসংখ্যা ফাইলৰ বাবে ফাইল নাম." + +#: modules/codec/x264.c:387 +msgid "PSNR computation" +msgstr "PSNR গণনা" + +#: modules/codec/x264.c:388 +msgid "" +"Compute and print PSNR stats. This has no effect on the actual encoding " +"quality." +msgstr "" +"PSNR ষ্টেটছ গণনা আৰু ছপা কৰক. প্ৰকৃত এনকোডিং মানদণ্ডটোত এইটোৰ কোনো প্ৰভাৱ নাই." + +#: modules/codec/x264.c:391 +msgid "SSIM computation" +msgstr "SSIM গণনা" + +#: modules/codec/x264.c:392 +msgid "" +"Compute and print SSIM stats. This has no effect on the actual encoding " +"quality." +msgstr "" +"SSIM ষ্টেটছ গণনা আৰু ছপা কৰক. প্ৰকৃত এনকোডিং মানদণ্ডটোত এইটোৰ কোনো প্ৰভাৱ নাই." + +#: modules/codec/x264.c:395 +msgid "Quiet mode" +msgstr "শান্তৰ ধৰণ" + +#: modules/codec/x264.c:397 modules/gui/macosx/VLCPlaylistInfo.m:65 +#: modules/gui/qt/ui/streampanel.h:168 +msgid "Statistics" +msgstr "পৰিসংখ্যাবোৰ" + +#: modules/codec/x264.c:398 +msgid "Print stats for each frame." +msgstr "প্ৰতিটো ফ্ৰেমৰ বাবে পৰিসংখ্যা ছপা কৰক" + +#: modules/codec/x264.c:400 +msgid "SPS and PPS id numbers" +msgstr "SPS আৰু PPS id সংখ্যাবোৰ" + +#: modules/codec/x264.c:401 +msgid "" +"Set SPS and PPS id numbers to allow concatenating streams with different " +"settings." +msgstr "" +"বিভিন্ন ছেটিংবোৰৰ সৈতে ষ্ট্ৰিম সংলগ্ন কৰাটো অনুমতি দিবলৈ SPS আৰু PPS id সংখ্যাবোৰ " +"ছেট কৰক." + +#: modules/codec/x264.c:404 +msgid "Access unit delimiters" +msgstr "ইউনিট অপৰিসীমকৰ্তাবোৰত প্ৰৱেশ কৰক" + +#: modules/codec/x264.c:405 +msgid "Generate access unit delimiter NAL units." +msgstr "প্ৰৱেশ ইউনিট অপৰিসীমকৰ্তা NAL ইউনিটবোৰ তৈয়াৰ কৰক." + +#: modules/codec/x264.c:407 +msgid "Framecount to use on frametype lookahead" +msgstr "আগলৈ চোৱা ফ্ৰেম প্ৰকাৰত ব্যৱহাৰ কৰিবলৈ ফ্ৰেম গণনা " + +#: modules/codec/x264.c:408 +msgid "" +"Framecount to use on frametype lookahead. Currently default can cause sync-" +"issues on unmuxable output, like rtsp-output without ts-mux" +msgstr "" +"সন্মুখলৈ চোৱা ফ্ৰেম প্ৰকাৰত ব্যৱহাৰ কৰিবলৈ ফ্ৰেম গণনা. বৰ্তমানে ডিফল্টটোৱে ts-mux " +"অবিহনে rtsp-আউটপুটৰ দৰে মাক্স কৰিব নোৱাৰা আউটপুটত ছিনক্ৰনাইজ-বিতৰ্কবোৰ কৰিব পাৰে" + +#: modules/codec/x264.c:411 +msgid "HRD-timing information" +msgstr "HRD-সময় মিলোৱা তথ্য" + +#: modules/codec/x264.c:412 +msgid "Default tune setting used" +msgstr "ডিফল্ট টিউন ছেটিং ব্যৱহাৰ কৰা হৈছে" + +#: modules/codec/x264.c:413 +msgid "Default preset setting used" +msgstr "ডিফল্ট পূৰ্বে ছেট কৰা ছেটিং ব্যৱহাৰ কৰা হৈছে" + +#: modules/codec/x264.c:415 +msgid "x264 advanced options" +msgstr "" + +#: modules/codec/x264.c:416 +msgid "x264 advanced options, in the form {opt=val,op2=val2}." +msgstr "" + +#: modules/codec/x264.c:421 +msgid "dia" +msgstr "dia" + +#: modules/codec/x264.c:421 +msgid "hex" +msgstr "hex" + +#: modules/codec/x264.c:421 +msgid "umh" +msgstr "umh" + +#: modules/codec/x264.c:421 +msgid "esa" +msgstr "esa" + +#: modules/codec/x264.c:421 +msgid "tesa" +msgstr "tesa" + +#: modules/codec/x264.c:429 +msgid "Fast" +msgstr "খৰতকীয়া" + +#: modules/codec/x264.c:429 modules/gui/macosx/VLCMainMenu.m:290 +#: modules/gui/macosx/VLCMainMenu.m:392 +#: modules/gui/macosx/VLCSimplePrefsController.m:711 +#: modules/gui/qt/components/simple_preferences.cpp:714 +#: modules/misc/gnutls.c:775 modules/text_renderer/freetype/freetype.c:124 +#: modules/text_renderer/freetype/freetype.c:143 +msgid "Normal" +msgstr "স্বাভাৱিক" + +#: modules/codec/x264.c:429 +msgid "Slow" +msgstr "মন্থৰ" + +#: modules/codec/x264.c:434 +msgid "Spatial" +msgstr "স্পাশ্বিয়েল" + +#: modules/codec/x264.c:434 modules/hw/vdpau/chroma.c:883 +msgid "Temporal" +msgstr "সাময়িক" + +#: modules/codec/x264.c:439 +msgid "checkerboard" +msgstr "পৰীক্ষাকৰ্তা বোৰ্ড" + +#: modules/codec/x264.c:439 +msgid "column alternation" +msgstr "স্তম্ভ সলনিকৰণ" + +#: modules/codec/x264.c:439 +msgid "row alternation" +msgstr "শাৰী সলনিকৰণ" + +#: modules/codec/x264.c:439 +msgid "side by side" +msgstr "কাষে কাষে" + +#: modules/codec/x264.c:439 +msgid "top bottom" +msgstr "ওপৰ তল" + +#: modules/codec/x264.c:439 +msgid "frame alternation" +msgstr "ফ্ৰেম সলনিকৰণ" + +#: modules/codec/x264.c:439 +msgid "2D" +msgstr "" + +#: modules/codec/x264.c:443 +msgid "H.264/MPEG-4 Part 10/AVC encoder (x264 10-bit)" +msgstr "H.264/MPEG-4 অংশ 10/AVC এনকোডাৰ (x264 10-বিট)" + +#: modules/codec/x264.c:447 +msgid "H.262/MPEG-2 encoder (x262)" +msgstr "H.262/MPEG-2 এনকোডাৰ (x262)" + +#: modules/codec/x264.c:451 +msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)" +msgstr "H.264/MPEG-4 অংশ 10/AVC এনকোডাৰ (x264)" + +#: modules/codec/x265.c:53 +msgid "H.265/HEVC encoder (x265)" +msgstr "H.265/HEVC এনকোডাৰ (x265)" + +#: modules/codec/xwd.c:36 +msgid "XWD image decoder" +msgstr "XWD ছবি ডিকোডাৰ" + +#: modules/codec/zvbi.c:61 +msgid "Teletext page" +msgstr "টেলিটেক্সট পৃষ্ঠা" + +#: modules/codec/zvbi.c:62 +msgid "Open the indicated Teletext page. Default page is index 100." +msgstr "" + +#: modules/codec/zvbi.c:69 +msgid "Teletext alignment" +msgstr "টেলিটেক্সট শাৰী কৰক" + +#: modules/codec/zvbi.c:71 +msgid "" +"You can enforce the teletext position on the video (0=center, 1=left, " +"2=right, 4=top, 8=bottom, you can also use combinations of these values, eg. " +"6 = top-right)." +msgstr "" +"আপুনি ভিডিঅ'টোত টেলিটেক্স স্থানটো জোৰ কৰিব পাৰে (0=কেন্দ্ৰ, 1=বাওঁফাল, 2=সোঁফাল, " +"4=ওপৰ, 8=তল, আপুনি লগতে এই মানবোৰৰ মিশ্ৰণবোৰ ব্যৱহাৰ কৰিব পাৰে, উদাহৰণস্বৰূপে 6 = " +"ওপৰ-সোঁফাল)." + +#: modules/codec/zvbi.c:75 +msgid "Teletext text subtitles" +msgstr "টেলিটেক্স টেক্স উপশিৰোনামবোৰ" + +#: modules/codec/zvbi.c:76 +msgid "Output teletext subtitles as text instead of as RGBA." +msgstr "" + +#: modules/codec/zvbi.c:79 +msgid "Presentation Level" +msgstr "" + +#: modules/codec/zvbi.c:88 modules/gui/qt/ui/streampanel.h:167 +msgid "1" +msgstr "1" + +#: modules/codec/zvbi.c:88 +msgid "1.5" +msgstr "" + +#: modules/codec/zvbi.c:88 +msgid "2.5" +msgstr "" + +#: modules/codec/zvbi.c:88 +msgid "3.5" +msgstr "" + +#: modules/codec/zvbi.c:95 +msgid "VBI and Teletext decoder" +msgstr "VBI আৰু টেলিটেক্সট ডিকোডাৰ" + +#: modules/codec/zvbi.c:96 +msgid "VBI & Teletext" +msgstr "VBI & টেলিটেক্স" + +#: modules/control/dbus/dbus.c:141 +msgid "DBus" +msgstr "Dবাছ" + +#: modules/control/dbus/dbus.c:143 +msgid "D-Bus control interface" +msgstr "D-বাছ নিয়ন্ত্ৰণ ইন্টাৰফেছ" + +#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/VLCMainWindow.m:190 +#: modules/gui/macosx/VLCMainWindow.m:581 +#: modules/gui/macosx/VLCMainWindow.m:587 +#: modules/gui/macosx/VLCMainWindow.m:1030 +#: modules/gui/macosx/VLCStatusBarIcon.m:378 modules/gui/ncurses.c:1026 +#: modules/gui/qt/dialogs/help.cpp:100 modules/gui/qt/main_interface.cpp:1302 +#: modules/gui/qt/main_interface.cpp:1306 +#: modules/gui/qt/main_interface.cpp:1343 +#: modules/gui/qt/main_interface.cpp:1345 +#: modules/gui/qt/main_interface.cpp:1453 +#: modules/gui/qt/main_interface.cpp:1470 +#: modules/gui/qt/main_interface.cpp:1478 +#: modules/gui/qt/main_interface.cpp:1501 modules/lua/libs/httpd.c:80 +#: modules/notify/osx_notifications.m:302 +#: modules/video_output/wayland/shell.c:348 +#: modules/video_output/wayland/xdg-shell.c:291 +#: modules/video_output/xcb/window.c:464 +msgid "VLC media player" +msgstr "VLC মিডিয়া প্লেয়াৰ" + +#: modules/control/dummy.c:38 modules/control/oldrc.c:175 +msgid "Do not open a DOS command box interface" +msgstr "DOS নিৰ্দেশ বাকচ ইন্টাৰফেছ এট নুখুলিব" + +#: modules/control/dummy.c:40 +msgid "" +"By default the dummy interface plugin will start a DOS command box. Enabling " +"the quiet mode will not bring this command box but can also be pretty " +"annoying when you want to stop VLC and no video window is open." +msgstr "" +"ডিফল্ট হিচাপে ডামি ইন্টাৰফেছ প্লাগইনটোৱে DOS নিৰ্দেশ বাকচ এটা আৰম্ভ কৰিব. শান্ত " +"ধৰণটো সক্ষম কৰাটোৱে এই নিৰ্দেশ বাকচটো কঢ়িয়াই নানিব কিন্তু কিছুপৰিমাণে বিৰক্ত কৰিব " +"পাৰে যেতিয়া আপুনি VLC টো বন্ধ কৰিব বিচাৰে আৰু কোনো ভিডিঅ' উইণ্ডো নুখুলে." + +#: modules/control/dummy.c:50 +msgid "Dummy interface" +msgstr "ডামি ইন্টাৰফেছ" + +#: modules/control/gestures.c:73 +msgid "Motion threshold (10-100)" +msgstr "প্ৰস্তাৱ থ্ৰেছহল্ড (10-100)" + +#: modules/control/gestures.c:75 +msgid "Amount of movement required for a mouse gesture to be recorded." +msgstr "ৰেকৰ্ড কৰিবলৈ মাউছ চলাচল এটাৰ বাবে প্ৰয়োজনীয় গতিবিধৰ পৰিমাণ." + +#: modules/control/gestures.c:77 +msgid "Trigger button" +msgstr "ট্ৰিগাৰ বাটন" + +#: modules/control/gestures.c:79 +msgid "Trigger button for mouse gestures." +msgstr "মাউছৰ ভাব-ভংগীৰ বাবে ট্ৰিগাৰ বাটন" + +#: modules/control/gestures.c:85 +msgid "Middle" +msgstr "মাজত" + +#: modules/control/gestures.c:88 +msgid "Gestures" +msgstr "ভাব-ভংগীবোৰ" + +#: modules/control/gestures.c:96 +msgid "Mouse gestures control interface" +msgstr "মাউছ ভাব-ভংগীবোৰ নিয়ন্ত্ৰণৰ ইন্টাৰফেছ" + +#: modules/control/globalhotkeys/win32.c:47 +#: modules/control/globalhotkeys/xcb.c:50 +#: modules/gui/qt/components/preferences_widgets.cpp:1141 +msgid "Global Hotkeys" +msgstr "সাৰ্বজনীন হটকীবোৰ" + +#: modules/control/globalhotkeys/win32.c:50 +#: modules/control/globalhotkeys/xcb.c:53 +msgid "Global Hotkeys interface" +msgstr "সাৰ্বজনীন হটকীবোৰৰ ইন্টাৰফেছ" + +#: modules/control/hotkeys.c:100 +#: modules/gui/macosx/VLCSimplePrefsController.m:251 +#: modules/gui/qt/components/preferences_widgets.cpp:1140 +#: modules/gui/qt/components/simple_preferences.cpp:258 +msgid "Hotkeys" +msgstr "হটকীবোৰ" + +#: modules/control/hotkeys.c:101 +msgid "Hotkeys management interface" +msgstr "হটকীবোৰ পৰিচালনাৰ ইন্টাৰফেছ" + +#: modules/control/hotkeys.c:390 +msgid "One" +msgstr "এক" + +#: modules/control/hotkeys.c:397 +#, c-format +msgid "Loop: %s" +msgstr "লুপ: %s" + +#: modules/control/hotkeys.c:404 +#, c-format +msgid "Random: %s" +msgstr "বিশৃংখল: %s" + +#: modules/control/hotkeys.c:530 +#, c-format +msgid "Audio Device: %s" +msgstr "অডিঅ' ডিভাইচ: %s" + +#: modules/control/hotkeys.c:591 +msgid "Recording" +msgstr "ৰেকৰ্ডিং" + +#: modules/control/hotkeys.c:591 +msgid "Recording done" +msgstr "ৰেকৰ্ডিং সম্পন্ন কৰা হল" + +#: modules/control/hotkeys.c:606 +msgid "Sub sync: bookmarked audio time" +msgstr "উপ ছিনক্ৰনাইজেশ্বন: পৃষ্ঠাসংকেত কৰা অডিঅ' সময়" + +#: modules/control/hotkeys.c:621 modules/control/hotkeys.c:690 +msgid "No active subtitle" +msgstr "কোনো সক্ৰিয় উপশিৰোনাম নাই" + +#: modules/control/hotkeys.c:627 +msgid "Sub sync: bookmarked subtitle time" +msgstr "উপ ছিনক্ৰনাইজেশ্বন: পৃষ্ঠাসংকেত কৰা উপশিৰোনামৰ সময়" + +#: modules/control/hotkeys.c:647 +msgid "Sub sync: set bookmarks first!" +msgstr "উপ ছিনক্ৰনাইজেশ্বন: প্ৰথমে পৃষ্ঠাসংকেতবোৰ ছেট কৰক!" + +#: modules/control/hotkeys.c:656 +#, c-format +msgid "Sub sync: corrected %i ms (total delay = %i ms)" +msgstr "উপ ছিনক্ৰনাইজেশ্বন: শুদ্ধ কৰা হল %i ms (মুঠ বিলম্ব = %i ms)" + +#: modules/control/hotkeys.c:669 +msgid "Sub sync: delay reset" +msgstr "উপ ছিনক্ৰনাইজেশ্বন: পুনৰ ছেট কৰাত বিলম্ব কৰক" + +#: modules/control/hotkeys.c:698 +#, c-format +msgid "Subtitle delay %i ms" +msgstr "উপশিৰোনাম বিলম্ব %i ms" + +#: modules/control/hotkeys.c:715 +#, c-format +msgid "Audio delay %i ms" +msgstr "অডিঅ' বিলম্ব %i ms" + +#: modules/control/hotkeys.c:751 +#, c-format +msgid "Audio track: %s" +msgstr "অডিঅ' পথ: %s" + +#: modules/control/hotkeys.c:771 modules/control/hotkeys.c:797 +#: modules/control/hotkeys.c:811 modules/control/hotkeys.c:847 +#, c-format +msgid "Subtitle track: %s" +msgstr "উপশিৰোনাম পথ: %s" + +#: modules/control/hotkeys.c:772 modules/control/hotkeys.c:812 +#: modules/control/hotkeys.c:866 +msgid "N/A" +msgstr "N/A" + +#: modules/control/hotkeys.c:865 modules/control/hotkeys.c:897 +#, c-format +msgid "Program Service ID: %s" +msgstr "কাৰ্যসূচী সেৱা ID: %s" + +#: modules/control/hotkeys.c:1040 +#, c-format +msgid "Aspect ratio: %s" +msgstr "দৃষ্টিকোণৰ অনুপাত: %s" + +#: modules/control/hotkeys.c:1070 +#, c-format +msgid "Crop: %s" +msgstr "ক্ৰোপ: %s" + +#: modules/control/hotkeys.c:1144 +msgid "Zooming reset" +msgstr "জুম কৰা পুনৰ ছেট কৰক" + +#: modules/control/hotkeys.c:1151 +msgid "Scaled to screen" +msgstr "স্ক্ৰীনলৈ জোখা হল" + +#: modules/control/hotkeys.c:1153 +msgid "Original Size" +msgstr "প্ৰকৃত আকাৰ" + +#: modules/control/hotkeys.c:1222 +#, c-format +msgid "Zoom mode: %s" +msgstr "জুমৰ ধৰণ: %s" + +#: modules/control/hotkeys.c:1237 modules/control/hotkeys.c:1294 +msgid "Deinterlace off" +msgstr "ডিইন্টাৰলেচ বন্ধ কৰক" + +#: modules/control/hotkeys.c:1256 modules/control/hotkeys.c:1289 +msgid "Deinterlace on" +msgstr "ডিইন্টাৰলেচ আৰম্ভ কৰক" + +#: modules/control/hotkeys.c:1319 +msgid "Subtitle position: no active subtitle" +msgstr "উপশিৰোনামৰ স্থান: কোনো সক্ৰিয় উপশিৰোনাম নাই" + +#: modules/control/hotkeys.c:1331 +#, c-format +msgid "Subtitle position %d px" +msgstr "উপশিৰোনামৰ স্থান %d px" + +#: modules/control/hotkeys.c:1356 +#, c-format +msgid "Subtitle text scale %d%%" +msgstr "" + +#: modules/control/hotkeys.c:1517 +#, c-format +msgid "Speed: %.2fx" +msgstr "গতি: %.2fx" + +#: modules/control/intromsg.h:34 +msgid "" +"\n" +"Warning: if you cannot access the GUI anymore, open a command-line window, " +"go to the directory where you installed VLC and run \"vlc -I qt\"\n" +msgstr "" +"\n" +"সৰ্তকীকৰণ: যদি আপুনি GUI ত কোনোপধ্যে প্ৰৱেশ কৰিব নোৱাৰে, তেন্তে নিৰ্দেশ-শাৰীৰ " +"উইণ্ডো এখন খোলক, নিৰ্দেশিকটোলৈ যাওক যত আপুনি VLC ইনষ্টল কৰিছে আৰু \"vlc -I qt\" " +"চলাওক\n" + +#: modules/control/lirc.c:47 +msgid "Change the lirc configuration file" +msgstr "lirc ৰূপৰেখাকৰণ ফাইলটো সলনি কৰক" + +#: modules/control/lirc.c:49 +msgid "" +"Tell lirc to read this configuration file. By default it searches in the " +"users home directory." +msgstr "" +"এই ৰূপৰেখা কৰা ফাইলটো পঢ়িবলৈ lirc ক কওক. ডিফল্ট হিচাপে এইটোৱে ব্যৱহাৰকৰ্তাৰ মুখ্য " +"নিৰ্দেশিকাটো সন্ধান কৰে." + +#: modules/control/lirc.c:59 +msgid "Infrared" +msgstr "ইফ্ৰাৰেড" + +#: modules/control/lirc.c:62 +msgid "Infrared remote control interface" +msgstr "ইফ্ৰাৰেড ৰিমোট নিয়ন্ত্ৰণ ইন্টাৰফেছ" + +#: modules/control/motion.c:67 +msgid "motion" +msgstr "প্ৰস্তাৱ" + +#: modules/control/motion.c:70 +msgid "motion control interface" +msgstr "প্ৰস্তাৱ নিয়ন্ত্ৰণ ইন্টাৰফেছ" + +#: modules/control/motion.c:71 modules/video_filter/rotate.c:62 +msgid "" +"Use HDAPS, AMS, APPLESMC or UNIMOTION motion sensors to rotate the video" +msgstr "" +"ভিডিঅ'টো ঘূৰাবলৈ HDAPS, AMS, APPLESMC বা UNIMOTION প্ৰস্তাৱ সংবেদক ব্যৱহাৰ কৰক" + +#: modules/control/netsync.c:56 +msgid "Network master clock" +msgstr "নেটৱৰ্কৰ মুখ্য ঘড়ী" + +#: modules/control/netsync.c:57 +msgid "" +"When set, this VLC instance will act as the master clock for synchronization " +"for clients listening" +msgstr "" +"যেতিয়া ছেট কৰে, এই VLC টোৱে গ্ৰাহকবোৰৰ বাবে ছিন্ক্ৰনাইজেশ্বনৰ বাবে মুখ্য ঘড়ীটোৰ " +"দৰে কাৰ্য কৰিব" + +#: modules/control/netsync.c:61 +msgid "Master server IP address" +msgstr "" + +#: modules/control/netsync.c:62 +msgid "" +"The IP address of the network master clock to use for clock synchronization." +msgstr "ঘড়ীৰ ছিনক্ৰনাইজেশ্বনৰ বাবে ব্যৱহাৰ কৰিবলৈ মুখ্য ঘড়ী নেটৱৰ্কটোৰ IP ঠিকনা." + +#: modules/control/netsync.c:65 +msgid "UDP timeout (in ms)" +msgstr "UDP ৰ সময় উকলি গল (ms ত)" + +#: modules/control/netsync.c:66 +msgid "Length of time (in ms) until aborting data reception." +msgstr "ডাটা গ্ৰহণ এৰি নিদিয়ালৈকে সময়ৰ দৈৰ্ঘ্য (ms ত)." + +#: modules/control/netsync.c:70 +msgid "Network Sync" +msgstr "নেটৱৰ্ক ছিনক্ৰনাইজেশ্বন" + +#: modules/control/netsync.c:71 +msgid "Network synchronization" +msgstr "নেটৱৰ্ক ছিনক্ৰনাইজেশ্বন" + +#: modules/control/ntservice.c:46 +msgid "Install Windows Service" +msgstr "উইণ্ডোজ সেৱা ইনষ্টল কৰক" + +#: modules/control/ntservice.c:48 +msgid "Install the Service and exit." +msgstr "সেৱাটো ইনষ্টল কৰক আৰু প্ৰস্থান কৰক." + +#: modules/control/ntservice.c:49 +msgid "Uninstall Windows Service" +msgstr "উইণ্ডোজ সেৱাৰ ইনষ্টলটো নাইকিয়া কৰক" + +#: modules/control/ntservice.c:51 +msgid "Uninstall the Service and exit." +msgstr "সেৱাটোৰ ইনষ্টল নাইকিয়া কৰক আৰু প্ৰস্থান কৰক." + +#: modules/control/ntservice.c:52 +msgid "Display name of the Service" +msgstr "সেৱাটোৰ নাম প্ৰদৰ্শন কৰক" + +#: modules/control/ntservice.c:54 +msgid "Change the display name of the Service." +msgstr "সেৱাটোৰ প্ৰদৰ্শন কৰা নামটো সলনি কৰক." + +#: modules/control/ntservice.c:55 +msgid "Configuration options" +msgstr "ৰূপৰেখাকৰণৰ বিকল্পবোৰ" + +#: modules/control/ntservice.c:57 +msgid "" +"Configuration options that will be used by the Service (eg. --foo=bar --no-" +"foobar). It should be specified at install time so the Service is properly " +"configured." +msgstr "" +"সেৱাটোৰ দ্বাৰা ব্যৱহাৰ কৰিবলগীয়া ৰূপৰেখাৰ বিকল্পবোৰ (উদাহৰণস্বৰূপে --foo=bar --no-" +"foobar). ইনষ্টল কৰাৰ সময়ত এইটো নিৰ্ধাৰণ কৰা উচিত যাতে সেৱাটো সঠিকভাৱে ৰূপৰেখা " +"কৰিব পাৰে." + +#: modules/control/ntservice.c:62 +msgid "" +"Additional interfaces spawned by the Service. It should be specified at " +"install time so the Service is properly configured. Use a comma separated " +"list of interface modules. (common values are: logger, sap, rc, http)" +msgstr "" +"সেৱাটোৰ দ্বৰা স্পাৱন কৰা অতিৰিক্ত ইন্টাৰফেছবোৰ. ইনষ্টল কৰাৰ সময়ত এইটো নিৰ্ধাৰণ কৰা " +"উচিত যাতে সেৱাটো সঠিকভাৱে ৰূপৰেখা কৰা হয়. ইন্টাৰফেছ মডুলবোৰৰ ক'মাৰ দ্বাৰা পৃথক " +"কৰা তালিকা এখন ব্যৱহাৰ কৰক. (সাধাৰণ মানবোৰ হল: logger, sap, rc, http)" + +#: modules/control/ntservice.c:68 +msgid "NT Service" +msgstr "NT সেৱা" + +#: modules/control/ntservice.c:69 +msgid "Windows Service interface" +msgstr "উইণ্ডোজ সেৱা ইন্টাৰফেছ" + +#: modules/control/oldrc.c:68 +msgid "Initializing" +msgstr "সাজু কৰিছে" + +#: modules/control/oldrc.c:69 +msgid "Opening" +msgstr "খুলিছে" + +#: modules/control/oldrc.c:73 modules/logger/file.c:203 +msgid "Error" +msgstr "ভুল" + +#: modules/control/oldrc.c:159 +msgid "Show stream position" +msgstr "ষ্ট্ৰিমৰ স্থান দেখুৱাওক" + +#: modules/control/oldrc.c:160 +msgid "" +"Show the current position in seconds within the stream from time to time." +msgstr "সময়ে সময়ে ষ্ট্ৰিমটোৰ ভিতৰত চলিত স্থানটো ছেকেণ্ডত দেখুৱাওক." + +#: modules/control/oldrc.c:163 +msgid "Fake TTY" +msgstr "ভুৱা TTY" + +#: modules/control/oldrc.c:164 +msgid "Force the rc module to use stdin as if it was a TTY." +msgstr "stdin ব্যৱহাৰ কৰিবলৈ rc ধৰণটো জোৰ কৰক যিহেতু এইটো এটা TTY আছিল." + +#: modules/control/oldrc.c:166 +msgid "UNIX socket command input" +msgstr "UNIX ছকেট নিৰ্দেশ ইনপুট" + +#: modules/control/oldrc.c:167 +msgid "Accept commands over a Unix socket rather than stdin." +msgstr "stdin ৰ পৰিৱৰ্তে ইউনিক্স ছকেট এটাৰ ওপৰত নিৰ্দেশবোৰ গ্ৰহণ কৰক." + +#: modules/control/oldrc.c:170 modules/lua/vlc.c:73 +msgid "TCP command input" +msgstr "TCP নিৰ্দেশ ইনপুট" + +#: modules/control/oldrc.c:171 modules/lua/vlc.c:74 +msgid "" +"Accept commands over a socket rather than stdin. You can set the address and " +"port the interface will bind to." +msgstr "" +"stdin ৰ পৰিৱৰ্তে ছকেট এটাৰ ওপৰত নিৰ্দেশ এটা গ্ৰহণ কৰক. আপুনি ঠিকনাটো ছেট কৰিব " +"পাৰে আৰু ইন্টাৰফেছটো ...লৈ বাইণ্ড কৰিব পাৰে." + +#: modules/control/oldrc.c:177 +msgid "" +"By default the rc interface plugin will start a DOS command box. Enabling " +"the quiet mode will not bring this command box but can also be pretty " +"annoying when you want to stop VLC and no video window is open." +msgstr "" +"ডিফল্ট হিচাপে rc ইন্টাৰফেছ প্লাগইনটোৱে এটা DOS নিৰ্দেশ বাকচ আৰম্ভ কৰিব. শান্ত " +"ধৰণটো সক্ষম কৰাটোৱে এই নিৰ্দেশ বাকচটো কঢ়িয়াই নানিব কিন্তু আপুনি VLC বন্ধ কৰিব " +"বিচাৰিলে এইটো সন্তোষজনক হব পাৰে আৰু কোনো ভিডিঅ' উইণ্ডো খোলা নাথাকে." + +#: modules/control/oldrc.c:187 +msgid "RC" +msgstr "RC" + +#: modules/control/oldrc.c:190 +msgid "Remote control interface" +msgstr "দূৰৈৰ পৰা নিয়ন্ত্ৰণৰ ইন্টাৰফেছ" + +#: modules/control/oldrc.c:370 +msgid "Remote control interface initialized. Type `help' for help." +msgstr "দূৰৈৰ পৰা নিয়ন্ত্ৰণৰ ইন্টাৰফেছ সাজু কৰা হল. সহায়ৰ বাবে `সহায়' টাইপ কৰক." + +#: modules/control/oldrc.c:769 +#, c-format +msgid "Unknown command `%s'. Type `help' for help." +msgstr "`%s' অজ্ঞাত নিৰ্দেশ. সহায়ৰ বাবে `সহায়' টাইপ কৰক." + +#: modules/control/oldrc.c:787 +msgid "+----[ Remote control commands ]" +msgstr "+----[ দূৰৈৰ পৰা নিয়ন্ত্ৰণৰ নিৰ্দেশবোৰ ]" + +#: modules/control/oldrc.c:789 +msgid "| add XYZ . . . . . . . . . . . . add XYZ to playlist" +msgstr "| XYZ যোগ কৰক . . . . . . . . . . . . প্লেলিষ্টলৈ XYZ যোগ কৰক" + +#: modules/control/oldrc.c:790 +msgid "| enqueue XYZ . . . . . . . . . queue XYZ to playlist" +msgstr "| শাৰীত যোগ কৰক XYZ . . . . . . . . . XYZ ক প্লেলিষ্টলৈ শাৰী কৰক" + +#: modules/control/oldrc.c:791 +msgid "| playlist . . . . . show items currently in playlist" +msgstr "| প্লেলিষ্ট . . . . . বস্তুবোৰ বৰ্তমানে প্লেলিষ্টত দেখুৱাওক" + +#: modules/control/oldrc.c:792 +msgid "| play . . . . . . . . . . . . . . . . . . play stream" +msgstr "| চলাওক . . . . . . . . . . . . . . . . . . ষ্ট্ৰিম চলাওক" + +#: modules/control/oldrc.c:793 +msgid "| stop . . . . . . . . . . . . . . . . . . stop stream" +msgstr "| বন্ধ কৰক . . . . . . . . . . . . . . . . . . ষ্ট্ৰিম বন্ধ কৰক" + +#: modules/control/oldrc.c:794 +msgid "| next . . . . . . . . . . . . . . next playlist item" +msgstr "| পৰৱৰ্তী . . . . . . . . . . . . . . পৰৱৰ্তী প্লেলিষ্ট বস্তু" + +#: modules/control/oldrc.c:795 +msgid "| prev . . . . . . . . . . . . previous playlist item" +msgstr "| আগৰ . . . . . . . . . . . . আগৰ প্লেলিষ্ট বস্তু" + +#: modules/control/oldrc.c:796 +msgid "| goto . . . . . . . . . . . . . . goto item at index" +msgstr "| যাওক . . . . . . . . . . . . . . সূচীত থকা বস্তুলৈ যাওক" + +#: modules/control/oldrc.c:797 +msgid "| repeat [on|off] . . . . toggle playlist item repeat" +msgstr "| পুনৰাবৃত্তি [আৰম্ভ|বন্ধ] . . . . প্লেলিষ্ট বস্তুৰ পুনৰাবৃত্তি টগুল কৰক" + +#: modules/control/oldrc.c:798 +msgid "| loop [on|off] . . . . . . . . . toggle playlist loop" +msgstr "| লুপ [আৰম্ভ|বন্ধ] . . . . . . . . . প্লেলিষ্ট লুপ টগুল কৰক" + +#: modules/control/oldrc.c:799 +msgid "| random [on|off] . . . . . . . toggle random jumping" +msgstr "| বিশৃংখল [আৰম্ভ|বন্ধ] . . . . . . . বিশৃংখলভাৱে জাম্প কৰাটো টগুল কৰক" + +#: modules/control/oldrc.c:800 +msgid "| clear . . . . . . . . . . . . . . clear the playlist" +msgstr "| খালী কৰক . . . . . . . . . . . . . . প্লেলিষ্ট খালী কৰক" + +#: modules/control/oldrc.c:801 +msgid "| status . . . . . . . . . . . current playlist status" +msgstr "| স্থতি . . . . . . . . . . . চলিত প্লেলিষ্টৰ স্থিতি" + +#: modules/control/oldrc.c:802 +msgid "| title [X] . . . . . . set/get title in current item" +msgstr "| শিৰোনাম [X] . . . . . . চলিত বস্তুত শিৰোনাম ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:803 +msgid "| title_n . . . . . . . . next title in current item" +msgstr "| শিৰোনাম_n . . . . . . . . চলিত বস্তুত পৰৱৰ্তী শিৰোনাম" + +#: modules/control/oldrc.c:804 +msgid "| title_p . . . . . . previous title in current item" +msgstr "| শিৰোনাম_p . . . . . . চলিত বস্তুত আগৰ শিৰোনাম" + +#: modules/control/oldrc.c:805 +msgid "| chapter [X] . . . . set/get chapter in current item" +msgstr "| পাঠ [X] . . . . চলিত বস্তুত পাঠটো ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:806 +msgid "| chapter_n . . . . . . next chapter in current item" +msgstr "| পাঠ_n . . . . . . চলিত বস্তুত পৰৱৰ্তী পাঠ" + +#: modules/control/oldrc.c:807 +msgid "| chapter_p . . . . previous chapter in current item" +msgstr "| পাঠ_p . . . . চলিত বস্তুত আগৰ পাঠ" + +#: modules/control/oldrc.c:809 +msgid "| seek X . . . seek in seconds, for instance `seek 12'" +msgstr "| X বিচাৰক . . . ছেকেণ্ডবোৰত বিচাৰক, উদাহৰণস্বৰূপে `12 বিচাৰক'" + +#: modules/control/oldrc.c:810 +msgid "| pause . . . . . . . . . . . . . . . . toggle pause" +msgstr "| বিৰতি দিয়ক . . . . . . . . . . . . . . . . বিৰতি দিয়াটো টগুলক কৰক" + +#: modules/control/oldrc.c:811 +msgid "| fastforward . . . . . . . . . set to maximum rate" +msgstr "| খৰতকীয়াকৈ আগলৈ যাওক . . . . . . . . . সৰ্বাধিক হাৰলৈ ছেট কৰক" + +#: modules/control/oldrc.c:812 +msgid "| rewind . . . . . . . . . . . . set to minimum rate" +msgstr "| উলটি যাওক . . . . . . . . . . . . নূন্যতম হাৰলৈ ছেট কৰক" + +#: modules/control/oldrc.c:813 +msgid "| faster . . . . . . . . . . faster playing of stream" +msgstr "| খৰতকীয়া . . . . . . . . . . ষ্ট্ৰিমৰ খৰতকীয়াকৈ চলোৱাটো" + +#: modules/control/oldrc.c:814 +msgid "| slower . . . . . . . . . . slower playing of stream" +msgstr "| মন্থৰ . . . . . . . . . . ষ্ট্ৰিমৰ মন্থৰকৈ চলোৱা" + +#: modules/control/oldrc.c:815 +msgid "| normal . . . . . . . . . . normal playing of stream" +msgstr "| স্বাভাৱিক . . . . . . . . . . ষ্ট্ৰিমৰ স্বাভাৱিক ভাৱে চলোৱা" + +#: modules/control/oldrc.c:816 +msgid "| frame. . . . . . . . . . play frame by frame" +msgstr "| ফ্ৰেম. . . . . . . . . . ফ্ৰেমৰ পিছত ফ্ৰেম চলাওক" + +#: modules/control/oldrc.c:817 +msgid "| f [on|off] . . . . . . . . . . . . toggle fullscreen" +msgstr "| f [on|off] . . . . . . . . . . . . সম্পূৰ্ণ দৃশ্য টগুল কৰক" + +#: modules/control/oldrc.c:818 +msgid "| info . . . . . information about the current stream" +msgstr "| তথ্যা . . . . . চলিত ষ্ট্ৰিমটোৰ বিষয়ে তথ্য" + +#: modules/control/oldrc.c:819 +msgid "| stats . . . . . . . . show statistical information" +msgstr "| পৰিসংখ্যা . . . . . . . . পৰিসাংখ্যিক তথ্য দেখুৱাওক" + +#: modules/control/oldrc.c:820 +msgid "| get_time . . seconds elapsed since stream's beginning" +msgstr "| পোৱা_সময় . . ষ্ট্ৰিমৰ আৰম্ভণিৰ পৰা নষ্ট হোৱা ছেকেণ্ডবোৰ" + +#: modules/control/oldrc.c:821 +msgid "| is_playing . . . . 1 if a stream plays, 0 otherwise" +msgstr "| চলি আছে . . . . 1 যদি এটা ষ্ট্ৰিম চলে, অন্যথা 0" + +#: modules/control/oldrc.c:822 +msgid "| get_title . . . . . the title of the current stream" +msgstr "| পোৱা_শিৰোনাম . . . . . চলিত ষ্ট্ৰিমটোৰ শিৰোনাম" + +#: modules/control/oldrc.c:823 +msgid "| get_length . . . . the length of the current stream" +msgstr "| পোৱা_দৈৰ্ঘ্য . . . . চলিত ষ্ট্ৰিমটোৰ দৈৰ্ঘ্যটো" + +#: modules/control/oldrc.c:825 +msgid "| volume [X] . . . . . . . . . . set/get audio volume" +msgstr "| প্ৰসাৰ [X] . . . . . . . . . . অডিঅ' প্ৰসাৰ ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:826 +msgid "| volup [X] . . . . . . . raise audio volume X steps" +msgstr "| প্ৰসাৰ বঢ়াওক [X] . . . . . . . প্ৰসাৰটো X স্তৰলৈ বঢ়াওক" + +#: modules/control/oldrc.c:827 +msgid "| voldown [X] . . . . . . lower audio volume X steps" +msgstr "| প্ৰসাৰ কমাওক [X] . . . . . . প্ৰসাৰটো X স্তৰলৈ কমাওক" + +#: modules/control/oldrc.c:828 +msgid "| adev [device] . . . . . . . . set/get audio device" +msgstr "| অডিঅ' [ডিভাইচ] . . . . . . . . অডিঅ' ডিভাইচ ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:829 +msgid "| achan [X]. . . . . . . . . . set/get audio channels" +msgstr "| অডিঅ' চেনেল [X]. . . . . . . . . . অডিঅ' চেনেলবোৰ ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:830 +msgid "| atrack [X] . . . . . . . . . . . set/get audio track" +msgstr "| অডিঅ' পথ [X] . . . . . . . . . . . অডিঅ' পথ ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:831 +msgid "| vtrack [X] . . . . . . . . . . . set/get video track" +msgstr "| ভিডিঅ' পথ [X] . . . . . . . . . . . ভিডিঅ' পথ ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:832 +msgid "| vratio [X] . . . . . . . set/get video aspect ratio" +msgstr "| ভিডিঅ' অনুপাত [X] . . . . . . . ভিডিঅ' অনুপাত ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:833 +msgid "| vcrop [X] . . . . . . . . . . . set/get video crop" +msgstr "| ভিডিঅ' ক্ৰোপ [X] . . . . . . . . . . . ভিডিঅ' ক্ৰোপ ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:834 +msgid "| vzoom [X] . . . . . . . . . . . set/get video zoom" +msgstr "| ভিডিঅ' জুম [X] . . . . . . . . . . . ভিডিঅ' জুম ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:835 +msgid "| snapshot . . . . . . . . . . . . take video snapshot" +msgstr "| স্নেপশ্বট . . . . . . . . . . . . ভিডিঅ' স্নেপশ্বট লওক" + +#: modules/control/oldrc.c:836 +msgid "| strack [X] . . . . . . . . . set/get subtitle track" +msgstr "| উপশিৰোনাম পথ [X] . . . . . . . . . উপশিৰোনাম পথ ছেট/লাভ কৰক" + +#: modules/control/oldrc.c:837 +msgid "| key [hotkey name] . . . . . . simulate hotkey press" +msgstr "| কী [হটকীৰ নাম] . . . . . . হটকী পাছ ছিমুলেট কৰক" + +#: modules/control/oldrc.c:839 +msgid "| help . . . . . . . . . . . . . . . this help message" +msgstr "| সহায় . . . . . . . . . . . . . . . এইটো সহায় বাৰ্তা" + +#: modules/control/oldrc.c:840 +msgid "| logout . . . . . . . exit (if in socket connection)" +msgstr "| ল'গআউট . . . . . . . প্ৰস্থান কৰক (যদি ছকেট সংযোগ থাকে)" + +#: modules/control/oldrc.c:841 +msgid "| quit . . . . . . . . . . . . . . . . . . . quit vlc" +msgstr "| ত্যাগ . . . . . . . . . . . . . . . . . . . vlc ত্যাগ কৰক" + +#: modules/control/oldrc.c:843 +msgid "+----[ end of help ]" +msgstr "+----[ সহায়ৰ শেষত ]" + +#: modules/control/oldrc.c:970 +msgid "Press pause to continue." +msgstr "অব্যাহত থাকিবলৈ বিৰতিত প্ৰেছ কৰক." + +#: modules/control/oldrc.c:1194 modules/control/oldrc.c:1443 +#: modules/control/oldrc.c:1487 +msgid "Type 'pause' to continue." +msgstr "অব্যাহত থাকিবলৈ 'বিৰতি' টাইপ কৰক." + +#: modules/control/oldrc.c:1283 +msgid "Error: `goto' needs an argument greater than zero." +msgstr "ভুল: `...লৈ যাওক' য়ে শূন্যতকৈ ডাঙৰ যুক্তি এটা বিচাৰে." + +#: modules/control/oldrc.c:1293 +#, c-format +msgid "Playlist has only %u element" +msgid_plural "Playlist has only %u elements" +msgstr[0] "প্লেলিষ্টৰ কেৱল %u টা উপাদন আছে" +msgstr[1] "প্লেলিষ্টৰ কেৱল %u উপাদনবোৰ আছে" + +#: modules/control/oldrc.c:1739 modules/gui/ncurses.c:808 +msgid "+-[Incoming]" +msgstr "+-[ভিতৰলৈ অহা]" + +#: modules/control/oldrc.c:1740 modules/gui/ncurses.c:810 +#, c-format +msgid "| input bytes read : %8.0f KiB" +msgstr "| ইনপুট বাইটবোৰ পঢ়া : %8.0f KiB" + +#: modules/control/oldrc.c:1742 modules/gui/ncurses.c:812 +#, c-format +msgid "| input bitrate : %6.0f kb/s" +msgstr "| ইনপুট বিট হাৰ : %6.0f kb/s" + +#: modules/control/oldrc.c:1744 modules/gui/ncurses.c:814 +#, c-format +msgid "| demux bytes read : %8.0f KiB" +msgstr "| ডিমাক্স বাইটবোৰ পঢ়া : %8.0f KiB" + +#: modules/control/oldrc.c:1746 modules/gui/ncurses.c:816 +#, c-format +msgid "| demux bitrate : %6.0f kb/s" +msgstr "| ডিমাক্স বিটহাৰ : %6.0f kb/s" + +#: modules/control/oldrc.c:1748 +#, c-format +msgid "| demux corrupted : %5" +msgstr "| ডিমাক্স নষ্ট হোৱা : %5" + +#: modules/control/oldrc.c:1750 +#, c-format +msgid "| discontinuities : %5" +msgstr "| ধাৰাবাহিকতাহীনবোৰ : %5" + +#: modules/control/oldrc.c:1754 modules/gui/ncurses.c:822 +msgid "+-[Video Decoding]" +msgstr "+-[ভিডিঅ' ডিকোডিং]" + +#: modules/control/oldrc.c:1755 modules/gui/ncurses.c:824 +#, c-format +msgid "| video decoded : %5" +msgstr "| ডিকোড কৰা ভিডিঅ' : %5" + +#: modules/control/oldrc.c:1757 modules/gui/ncurses.c:826 +#, c-format +msgid "| frames displayed : %5" +msgstr "| প্ৰদৰ্শন কৰা ফ্ৰেমবোৰ : %5" + +#: modules/control/oldrc.c:1759 modules/gui/ncurses.c:828 +#, c-format +msgid "| frames lost : %5" +msgstr "| হেৰোৱা ফ্ৰেমবোৰ : %5" + +#: modules/control/oldrc.c:1763 modules/gui/ncurses.c:834 +msgid "+-[Audio Decoding]" +msgstr "+-[অডিঅ' ডিকোডিং]" + +#: modules/control/oldrc.c:1764 modules/gui/ncurses.c:836 +#, c-format +msgid "| audio decoded : %5" +msgstr "| অডিঅ' ডিকোড কৰা হল : %5" + +#: modules/control/oldrc.c:1766 modules/gui/ncurses.c:838 +#, c-format +msgid "| buffers played : %5" +msgstr "| চলোৱা বাফাৰবোৰ : %5" + +#: modules/control/oldrc.c:1768 modules/gui/ncurses.c:840 +#, c-format +msgid "| buffers lost : %5" +msgstr "| হেৰোৱা বাফাৰবোৰ : %5" + +#: modules/control/win_msg.c:192 +msgid "WinMsg" +msgstr "" + +#: modules/control/win_msg.c:193 +msgid "Windows messages interface" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:69 +msgid "Maximum device width" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:70 +msgid "Maximum device height" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:72 +msgid "Fixed Bandwidth in KiB/s" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:73 +msgid "Preferred bandwidth for non adaptive streams" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:75 +msgid "Live Playback delay (ms)" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:76 +msgid "Tradeoff between stability and real time" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:78 +msgid "Max buffering (ms)" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:80 +msgid "Adaptive Logic" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:82 +msgid "Use regular HTTP modules" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:83 +msgid "Connect using HTTP access instead of custom HTTP code" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:85 +#: modules/gui/qt/components/simple_preferences.cpp:713 +msgid "Low latency" +msgstr "নিম্ন বিলম্ব" + +#: modules/demux/adaptive/adaptive.cpp:86 +msgid "Overrides low latency parameters" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:107 +msgid "Predictive" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:108 +msgid "Near Optimal" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:109 +msgid "Bandwidth Adaptive" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:110 +msgid "Fixed Bandwidth" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:111 +msgid "Lowest Bandwidth/Quality" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:112 +msgid "Highest Bandwidth/Quality" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:123 +msgid "Force" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:127 +msgid "Adaptive" +msgstr "" + +#: modules/demux/adaptive/adaptive.cpp:128 +msgid "Unified adaptive streaming for DASH/HLS" +msgstr "" + +#: modules/demux/aiff.c:50 +msgid "AIFF demuxer" +msgstr "AIFF ডিমাক্সাৰ" + +#: modules/demux/asf/asf.c:62 +msgid "ASF/WMV demuxer" +msgstr "ASF/WMV ডিমাক্সাৰ" + +#: modules/demux/asf/asf.c:285 modules/demux/asf/asf.c:836 +msgid "Could not demux ASF stream" +msgstr "ASF ষ্ট্ৰিম ডিমাক্স কৰিব নোৱাৰিলে" + +#: modules/demux/asf/asf.c:286 +msgid "VLC failed to load the ASF header." +msgstr "VLC য়ে ASF হেডাৰ লোড কৰিবলৈ ব্যৰ্থ হল." + +#: modules/demux/au.c:51 +msgid "AU demuxer" +msgstr "AU ডিমাক্সাৰ" + +#: modules/demux/avformat/avformat.c:41 +msgid "Avformat demuxer" +msgstr "Avফৰমেট ডিমাক্সাৰ" + +#: modules/demux/avformat/avformat.c:42 +msgid "Avformat" +msgstr "Avফৰমেট" + +#: modules/demux/avformat/avformat.c:45 +msgid "Demuxer" +msgstr "ডিমাক্সাৰ" + +#: modules/demux/avformat/avformat.c:54 +msgid "Avformat muxer" +msgstr "Avফৰমেট মাক্সাৰ" + +#: modules/demux/avformat/avformat.c:56 modules/stream_out/rtp.c:87 +msgid "Muxer" +msgstr "মাক্সাৰ" + +#: modules/demux/avformat/avformat.h:35 +msgid "Avformat mux" +msgstr "Avফৰমেট মাক্স" + +#: modules/demux/avformat/avformat.h:36 +msgid "Force use of a specific avformat muxer." +msgstr "এটা বিশেষ avফৰমেট মাক্সাৰৰ জোৰকৈ ব্যৱহাৰটো." + +#: modules/demux/avformat/avformat.h:37 +msgid "Format name" +msgstr "ফৰমেট নাম" + +#: modules/demux/avformat/avformat.h:38 +msgid "Internal libavcodec format name" +msgstr "আভ্যন্তৰীণ libavকোডেক ফৰমেট নাম" + +#: modules/demux/avi/avi.c:56 +msgid "Force interleaved method" +msgstr "জোৰকৈ অন্তৰালৰ কৰা পদ্ধতি" + +#: modules/demux/avi/avi.c:58 +msgid "Force index creation" +msgstr "জোৰকৈ সূচী তৈয়াৰ কৰা" + +#: modules/demux/avi/avi.c:60 +msgid "" +"Recreate a index for the AVI file. Use this if your AVI file is damaged or " +"incomplete (not seekable)." +msgstr "" +"AVI ফাইলটোৰ বাবে সূচী এটা তৈয়াৰ কৰক. এইটো ব্যৱহাৰ কৰক যদি আপোনাৰ AVI নষ্ট হৈছে " +"বা অসম্পূৰ্ণ (বিচাৰিব পৰা নহয়)." + +#: modules/demux/avi/avi.c:68 +msgid "Ask for action" +msgstr "কাৰ্য এটাৰ বাবে সোধক" + +#: modules/demux/avi/avi.c:69 +msgid "Always fix" +msgstr "সদায় নিৰ্দিষ্ট কৰক" + +#: modules/demux/avi/avi.c:70 +msgid "Never fix" +msgstr "কেতিয়াও নিৰ্দিষ্ট নকৰিব" + +#: modules/demux/avi/avi.c:71 +msgid "Fix when necessary" +msgstr "যেতিয়া প্ৰয়োজন হয় নিৰ্দিষ্ট কৰক" + +#: modules/demux/avi/avi.c:75 +msgid "AVI demuxer" +msgstr "AVI ডিমাক্সাৰ" + +#: modules/demux/avi/avi.c:910 modules/demux/mp4/mp4.c:4374 +msgid "" +"Because this file index is broken or missing, seeking will not work " +"correctly.\n" +"VLC won't repair your file but can temporary fix this problem by building an " +"index in memory.\n" +"This step might take a long time on a large file.\n" +"What do you want to do?" +msgstr "" + +#: modules/demux/avi/avi.c:918 +msgid "Do not play" +msgstr "নচলাব" + +#: modules/demux/avi/avi.c:919 +msgid "Build index then play" +msgstr "সূচী তৈয়াৰ কৰক তাৰ পিছত চলাওক" + +#: modules/demux/avi/avi.c:920 +msgid "Play as is" +msgstr "থকাৰ দৰে চলাওক" + +#: modules/demux/avi/avi.c:921 modules/demux/mp4/mp4.c:4385 +msgid "Broken or missing Index" +msgstr "" + +#: modules/demux/avi/avi.c:2879 +msgid "Broken or missing AVI Index" +msgstr "ভাঙি যোৱা বা হেৰোৱা AVI সূচী" + +#: modules/demux/avi/avi.c:2880 +msgid "Fixing AVI Index..." +msgstr "AVI সূচী নিৰ্দিষ্ট কৰিছে..." + +#: modules/demux/caf.c:53 +msgid "CAF demuxer" +msgstr "CAF ডিমাক্সাৰ" + +#: modules/demux/cdg.c:43 +msgid "CDG demuxer" +msgstr "CDG ডিমাক্সাৰ" + +#: modules/demux/demuxdump.c:32 +msgid "Dump module" +msgstr "মডুল জমা কৰক" + +#: modules/demux/demuxdump.c:33 +msgid "Dump filename" +msgstr "ফাইলনাম জমা কৰক" + +#: modules/demux/demuxdump.c:35 +msgid "Name of the file to which the raw stream will be dumped." +msgstr "ফাইলটোৰ নাম যলৈ ৰ' ষ্ট্ৰিমটো জমা কৰা হব." + +#: modules/demux/demuxdump.c:36 +msgid "Append to existing file" +msgstr "বৰ্তি থকা ফাললৈ সংযোগ কৰক" + +#: modules/demux/demuxdump.c:38 +msgid "If the file already exists, it will not be overwritten." +msgstr "যদি ফাইলটো ইতিমধ্যে বৰ্তি আছে, তেন্তে এইটো অভাৰৰাইট কৰা নহব." + +#: modules/demux/demuxdump.c:47 +msgid "File dumper" +msgstr "ফাইল জমাকৰ্তা" + +#: modules/demux/dirac.c:41 +msgid "Value to adjust dts by" +msgstr "...ৰ দ্বাৰা dts মিলাবলৈ মান " + +#: modules/demux/dirac.c:54 +msgid "Dirac video demuxer" +msgstr "Dirac ভিডিঅ' ডিমাক্সাৰ" + +#: modules/demux/directory.c:94 +msgid "Directory import" +msgstr "" + +#: modules/demux/filter/noseek.c:79 +msgid "Seek prevention demux filter" +msgstr "" + +#: modules/demux/flac.c:52 +msgid "FLAC demuxer" +msgstr "FLAC ডিমাক্সাৰ" + +#: modules/demux/image.c:44 +msgid "ES ID" +msgstr "ES ID" + +#: modules/demux/image.c:52 +msgid "Decode" +msgstr "ডিকোড কৰক" + +#: modules/demux/image.c:54 +msgid "Decode at the demuxer stage" +msgstr "ডিমাক্সাৰ অৱস্থাটোত ডিকোড কৰক" + +#: modules/demux/image.c:56 +msgid "Forced chroma" +msgstr "ক্ৰোমা জোৰ কৰা হল" + +#: modules/demux/image.c:58 +msgid "" +"If non empty and image-decode is true, the image will be converted to the " +"specified chroma." +msgstr "" +"যদি খালী নাথাকে আৰু ছবি-ডিকোটো সঁচা হয়, তেন্তে ছবিটো নিৰ্ধাৰিত ক্ৰোমাটোলৈ " +"ৰূপান্তৰিত কৰা হব." + +#: modules/demux/image.c:61 +msgid "Duration in seconds" +msgstr "ছেকেণ্ডত সময়সীমা" + +#: modules/demux/image.c:63 +msgid "" +"Duration in seconds before simulating an end of file. A negative value means " +"an unlimited play time." +msgstr "" +"ফাইলৰ শেষ এটা সক্ৰিয় কৰাৰ আগতে ছেকেণ্ডত সময়সীমা. এটা ঋণাত্মক মান মানে এটা অসীম " +"চলোৱাৰ সময়." + +#: modules/demux/image.c:68 +msgid "Frame rate of the elementary stream produced." +msgstr "প্ৰাথমিক ষ্ট্ৰিম তৈয়াৰীটোৰ ফ্ৰেমৰ হাৰ." + +#: modules/demux/image.c:70 +msgid "Real-time" +msgstr "প্ৰকৃত-সময়" + +#: modules/demux/image.c:72 +msgid "" +"Use real-time mode suitable for being used as a master input and real-time " +"input slaves." +msgstr "" +"এটা মুখ্য ইনপুট আৰু প্ৰকৃত-সময় ইনপুট শ্লেভৰ দৰে ব্যৱহাৰ কৰাৰ বাবে উপযোগী প্ৰকৃত-সময়ৰ " +"ধৰণ ব্যৱহাৰ কৰক." + +#: modules/demux/image.c:76 +msgid "Image demuxer" +msgstr "ছবি ডিমাক্সাৰ" + +#: modules/demux/image.c:77 +msgid "Image" +msgstr "ছবি" + +#: modules/demux/mjpeg.c:46 modules/demux/mpeg/es.c:53 +#: modules/demux/mpeg/h26x.c:46 modules/demux/rawvid.c:43 +#: modules/demux/subtitle.c:77 modules/demux/vc1.c:43 +#: modules/gui/macosx/VLCOpenWindowController.m:208 +msgid "Frames per Second" +msgstr "প্ৰতিছেকেণ্ডত ফ্ৰেমবোৰ" + +#: modules/demux/mjpeg.c:47 +msgid "" +"This is the desired frame rate when playing MJPEG from a file. Use 0 (this " +"is the default value) for a live stream (from a camera)." +msgstr "" +"এইটো হল বিচৰা ফ্ৰেম হাৰ যেতিয়া ফাইল এটাৰ পৰা MJPEG চলায়. জীৱন্ত ষ্ট্ৰিম (কেমেৰা " +"এটাৰ পৰা) এটাৰ বাবে 0 (এইটো হল ডিফল্ট মান) ব্যৱহাৰ কৰক." + +#: modules/demux/mjpeg.c:53 +msgid "M-JPEG camera demuxer" +msgstr "M-JPEG কেমেৰা ডিমাক্সাৰ" + +#: modules/demux/mkv/mkv.cpp:54 +msgid "Matroska stream demuxer" +msgstr "মেট্ৰোস্কা ষ্ট্ৰিম ডিমাক্সাৰ" + +#: modules/demux/mkv/mkv.cpp:61 +msgid "Respect ordered chapters" +msgstr "ক্ৰম কৰা পাঠবোৰ মানি চলক" + +#: modules/demux/mkv/mkv.cpp:62 +msgid "Play chapters in the order specified in the segment." +msgstr "খণ্ডটোত নিৰ্ধাৰিত ক্ৰম অনুযায়ী পাঠবোৰ চলাওক." + +#: modules/demux/mkv/mkv.cpp:65 +msgid "Chapter codecs" +msgstr "পাঠ কোডেকবোৰ" + +#: modules/demux/mkv/mkv.cpp:66 +msgid "Use chapter codecs found in the segment." +msgstr "খণ্ডটোত বিচাৰি পোৱা পাঠ কোডেকবোৰ ব্যৱহাৰ কৰক." + +#: modules/demux/mkv/mkv.cpp:69 modules/gui/qt/ui/sprefs_input.h:367 +msgid "Preload MKV files in the same directory" +msgstr "একেটা নিৰ্দেশিকাত MKV ফাইলবোৰ পুনৰ লোড কৰক" + +#: modules/demux/mkv/mkv.cpp:70 +msgid "" +"Preload matroska files in the same directory to find linked segments (not " +"good for broken files)." +msgstr "" +"সংযোগ কৰা খণ্ডবোৰ বিচাৰি উলিয়াবলৈ একেটা নিৰ্দেশিকাত মেট্ৰোস্কা ফাইলবোৰ পুনৰ লোড " +"কৰক (ভঙা ফাইলবোৰ বাবে ভাল নহয়)." + +#: modules/demux/mkv/mkv.cpp:73 modules/demux/mpeg/ts.c:113 +msgid "Seek based on percent not time" +msgstr "শতাংশত আধাৰ বিচাৰক সময়ত নহয়" + +#: modules/demux/mkv/mkv.cpp:74 +msgid "Seek based on percent not time." +msgstr "শতাংশত আধাৰ বিচাৰক সময়ত নহয়." + +#: modules/demux/mkv/mkv.cpp:77 +msgid "Dummy Elements" +msgstr "ডামি উপাদানবোৰ" + +#: modules/demux/mkv/mkv.cpp:78 +msgid "Read and discard unknown EBML elements (not good for broken files)." +msgstr "অজ্ঞাত EBML উপাদানবোৰ পঢ়ক আৰু এৰি দিয়ক (ভঙা ফাইলবোৰৰ বাবে ভাল নহয়)." + +#: modules/demux/mkv/mkv.cpp:81 +msgid "Preload clusters" +msgstr "" + +#: modules/demux/mkv/mkv.cpp:82 +msgid "" +"Find all cluster positions by jumping cluster-to-cluster before playback" +msgstr "" + +#: modules/demux/mod.c:55 +msgid "Enable noise reduction algorithm." +msgstr "হুলস্থূল হ্ৰাস কৰা এলগোৰিথম সক্ষম কৰক." + +#: modules/demux/mod.c:56 +msgid "Enable reverberation" +msgstr "ৰিভাৰ্বেশ্বন সক্ষম কৰক" + +#: modules/demux/mod.c:57 +msgid "Reverberation level (from 0 to 100, default value is 0)." +msgstr "ৰিভাৰ্বেশ্বনৰ স্তৰ (0 ৰ পৰা 100 লৈ, ডিফল্ট মানটো হল 0)." + +#: modules/demux/mod.c:59 +msgid "Reverberation delay, in ms. Usual values are from 40 to 200ms." +msgstr "" + +#: modules/demux/mod.c:61 +msgid "Enable megabass mode" +msgstr "মেগাবেছ ধৰণটো সক্ষম কৰক" + +#: modules/demux/mod.c:62 +msgid "Megabass mode level (from 0 to 100, default value is 0)." +msgstr "মেগাবেছ ধৰণৰ স্তৰ (0 ৰ পৰা 100 লৈ, ডিফল্ট মানটো হল 0)." + +#: modules/demux/mod.c:64 +msgid "" +"Megabass mode cutoff frequency, in Hz. This is the maximum frequency for " +"which the megabass effect applies. Valid values are from 10 to 100 Hz." +msgstr "" +"মেগাবেছ ধৰণ কাটঅফ কম্পনাংক, Hz ত. এইটো হল সৰ্বাধিক কম্পনাংক যাৰ বাবে মেগাবেছ " +"প্ৰভাৱ প্ৰয়োগ কৰা হয়. বৈধ মানবোৰ হল 10 ৰ পৰা100 Hz." + +#: modules/demux/mod.c:67 +msgid "Surround effect level (from 0 to 100, default value is 0)." +msgstr "ছাৰাউণ্ড প্ৰভাৱৰ স্তৰ (0 ৰ পৰা 100 লৈ, ডিফল্ট মানটো হল 0)." + +#: modules/demux/mod.c:69 +msgid "Surround delay, in ms. Usual values are from 5 to 40 ms." +msgstr "ছাৰাউণ্ড বিলম্ব, ms ত. সাধাৰণ মানবোৰ হল 5 ৰ পৰা 40 ms." + +#: modules/demux/mod.c:74 +msgid "MOD demuxer (libmodplug)" +msgstr "MOD ডিমাক্ৰাৰ (libmodplug)" + +#: modules/demux/mod.c:85 +msgid "Reverberation level" +msgstr "ৰিভাৰ্বেশ্বন স্তৰ" + +#: modules/demux/mod.c:87 +msgid "Reverberation delay" +msgstr "ৰিভাৰ্বেশ্বন বিলম্ব" + +#: modules/demux/mod.c:89 +msgid "Mega bass" +msgstr "মেগা বেছ" + +#: modules/demux/mod.c:92 +msgid "Mega bass level" +msgstr "মেগা বেছ স্তৰ" + +#: modules/demux/mod.c:94 +msgid "Mega bass cutoff" +msgstr "মেগা বেছ কাটঅফ" + +#: modules/demux/mod.c:96 +msgid "Surround" +msgstr "ছাৰাউণ্ড" + +#: modules/demux/mod.c:99 +msgid "Surround level" +msgstr "ছাৰাউণ্ডৰ স্তৰ" + +#: modules/demux/mod.c:101 +msgid "Surround delay (ms)" +msgstr "ছাৰাউণ্ডৰ বিলম্ব (ms)" + +#: modules/demux/mp4/meta.c:68 +msgid "Writer" +msgstr "লেখক" + +#: modules/demux/mp4/meta.c:69 +msgid "Composer" +msgstr "কম্পোজাৰ" + +#: modules/demux/mp4/meta.c:70 +msgid "Producer" +msgstr "প্ৰযোজক" + +#: modules/demux/mp4/meta.c:71 modules/demux/mp4/meta.c:137 +#: modules/gui/qt/components/controller.hpp:112 +#: modules/gui/qt/components/controller.hpp:124 +msgid "Information" +msgstr "তথ্য" + +#: modules/demux/mp4/meta.c:72 +msgid "Disclaimer" +msgstr "মন্তব্য" + +#: modules/demux/mp4/meta.c:73 +msgid "Requirements" +msgstr "প্ৰয়োজনীয়তাবোৰ" + +#: modules/demux/mp4/meta.c:74 +msgid "Original Format" +msgstr "প্ৰকৃত ফৰমেট" + +#: modules/demux/mp4/meta.c:75 +msgid "Display Source As" +msgstr "উত্সৰ দৰে প্ৰদৰ্শন কৰক" + +#: modules/demux/mp4/meta.c:76 +msgid "Host Computer" +msgstr "হষ্ট কম্পুটাৰ" + +#: modules/demux/mp4/meta.c:77 +msgid "Performers" +msgstr "কৰ্যকৰ্তাবোৰ" + +#: modules/demux/mp4/meta.c:78 +msgid "Original Performer" +msgstr "প্ৰকৃত কাৰ্যকৰ্তা" + +#: modules/demux/mp4/meta.c:79 +msgid "Providers Source Content" +msgstr "উত্সৰ উপাদানবোৰ আগবঢ়াওক" + +#: modules/demux/mp4/meta.c:80 modules/logger/file.c:203 +msgid "Warning" +msgstr "সতৰ্কীকৰণ" + +#: modules/demux/mp4/meta.c:81 +msgid "Software" +msgstr "ছফটৱেৰ" + +#: modules/demux/mp4/meta.c:82 modules/demux/xiph_metadata.h:57 +#: modules/demux/xiph_metadata.h:64 +msgid "Lyrics" +msgstr "সংগীত" + +#: modules/demux/mp4/meta.c:83 +msgid "Record Company" +msgstr "ৰেকৰ্ড কোম্পানী" + +#: modules/demux/mp4/meta.c:84 +msgid "Model" +msgstr "আৰ্হি" + +#: modules/demux/mp4/meta.c:85 +msgid "Product" +msgstr "" + +#: modules/demux/mp4/meta.c:86 +msgid "Grouping" +msgstr "গোট কৰা" + +#: modules/demux/mp4/meta.c:88 +msgid "Sub-Title" +msgstr "উপশিৰোনাম" + +#: modules/demux/mp4/meta.c:89 +msgid "Arranger" +msgstr "ব্যৱস্থাকৰ্তা" + +#: modules/demux/mp4/meta.c:90 +msgid "Art Director" +msgstr "চিত্ৰ নিৰ্দেশক" + +#: modules/demux/mp4/meta.c:91 +msgid "Copyright Acknowledgement" +msgstr "প্ৰতিলিপিস্বত্বৰ স্বীকাৰোক্তি" + +#: modules/demux/mp4/meta.c:92 +msgid "Conductor" +msgstr "পৰিচালনাকৰ্তা" + +#: modules/demux/mp4/meta.c:93 +msgid "Song Description" +msgstr "গানৰ বিৱৰণ" + +#: modules/demux/mp4/meta.c:94 +msgid "Liner Notes" +msgstr "লিনাৰ টোকাবোৰ" + +#: modules/demux/mp4/meta.c:95 +msgid "Phonogram Rights" +msgstr "ফোনোগ্ৰাম অধিকাৰবোৰ" + +#: modules/demux/mp4/meta.c:97 +msgid "Sound Engineer" +msgstr "ধ্বনি অভিযন্তা" + +#: modules/demux/mp4/meta.c:98 +msgid "Soloist" +msgstr "ছ'ল'ইষ্ট" + +#: modules/demux/mp4/meta.c:99 +msgid "Thanks" +msgstr "ধন্যবাদ" + +#: modules/demux/mp4/meta.c:100 +msgid "Executive Producer" +msgstr "সক্ৰিয় প্ৰযোজক" + +#: modules/demux/mp4/meta.c:102 +msgid "Encoding Params" +msgstr "" + +#: modules/demux/mp4/meta.c:103 modules/demux/mp4/meta.c:139 +msgid "Vendor" +msgstr "" + +#: modules/demux/mp4/meta.c:104 +msgid "Catalog Number" +msgstr "" + +#: modules/demux/mp4/meta.c:138 modules/mux/avi.c:57 +msgid "Keywords" +msgstr "মুখ্য শব্দবোৰ" + +#: modules/demux/mp4/meta.c:423 +msgid "Explicit" +msgstr "" + +#: modules/demux/mp4/meta.c:426 +msgid "Clean" +msgstr "" + +#: modules/demux/mp4/mp4.c:51 +msgid "M4A audio only" +msgstr "" + +#: modules/demux/mp4/mp4.c:52 +msgid "Ignore non audio tracks from iTunes audio files" +msgstr "" + +#: modules/demux/mp4/mp4.c:57 +msgid "MP4 stream demuxer" +msgstr "MP4 ষ্ট্ৰিম ডিমাক্সাৰ" + +#: modules/demux/mp4/mp4.c:58 +msgid "MP4" +msgstr "MP4" + +#: modules/demux/mp4/mp4.c:4382 +msgid "Do not seek" +msgstr "" + +#: modules/demux/mp4/mp4.c:4383 +msgid "Build index" +msgstr "" + +#: modules/demux/mpc.c:63 +msgid "MusePack demuxer" +msgstr "মাউছপেক ডিমাক্সাৰ" + +#: modules/demux/mpeg/es.c:54 +msgid "" +"This is the frame rate used as a fallback when playing MPEG video elementary " +"streams." +msgstr "" +"এইটো হল এৰি যোৱা এটাৰ দৰে ব্যৱহাৰ কৰা ফ্ৰেম ৰেট যেতিয়া MPEG ভিডিঅ'ৰ প্ৰাথমিক " +"ষ্ট্ৰিমবোৰ চলায়." + +#: modules/demux/mpeg/es.c:60 +msgid "MPEG-I/II/4 / A52 / DTS / MLP audio" +msgstr "MPEG-I/II/4 / A52 / DTS / MLP অডিঅ'" + +#: modules/demux/mpeg/es.c:61 +msgid "Audio ES" +msgstr "অডিঅ' ES" + +#: modules/demux/mpeg/es.c:73 +msgid "MPEG-4 video" +msgstr "MPEG-4 ভিডিঅ'" + +#: modules/demux/mpeg/h26x.c:47 +msgid "Desired frame rate for the stream." +msgstr "ষ্ট্ৰিমটোৰ বাবে বিচৰা ফ্ৰেম হাৰ." + +#: modules/demux/mpeg/h26x.c:53 modules/demux/mpeg/h26x.c:55 +msgid "H264 video demuxer" +msgstr "H264 ভিডিঅ' ডিমাক্সাৰ" + +#: modules/demux/mpeg/h26x.c:64 modules/demux/mpeg/h26x.c:66 +msgid "HEVC/H.265 video demuxer" +msgstr "HEVC/H.265 ভিডিঅ' ডিমাক্সাৰ" + +#: modules/demux/mpeg/mpgv.c:46 +msgid "MPEG-I/II video demuxer" +msgstr "MPEG-I/II ভিডিঅ' ডিমাক্সাৰ" + +#: modules/demux/mpeg/ps.c:44 +msgid "Trust MPEG timestamps" +msgstr "বিশ্বাসী MPEG সময় ষ্টেম্পবোৰ" + +#: modules/demux/mpeg/ps.c:45 +msgid "" +"Normally we use the timestamps of the MPEG files to calculate position and " +"duration. However sometimes this might not be usable. Disable this option to " +"calculate from the bitrate instead." +msgstr "" +"স্থান আৰু সময়সীমা গণনা কৰিবলৈ সাধাৰণতে আমি MPEG ফাইলবোৰৰ সময়ষ্টেম্পবোৰ ব্যৱহাৰ " +"কৰো. কেতিয়াবা এইবোৰ ব্যৱহাৰৰ উপযোগী নহব পাৰে. বিট হাৰটোৰ পৰা গণনা কৰিবলৈ এই " +"বিকল্পটো অক্ষম কৰক." + +#: modules/demux/mpeg/ps.c:62 modules/demux/mpeg/ps.c:75 +msgid "MPEG-PS demuxer" +msgstr "MPEG-PS ডিমাক্সাৰ" + +#: modules/demux/mpeg/ps.c:63 +msgid "PS" +msgstr "PS" + +#: modules/demux/mpeg/ts.c:84 +msgid "Extra PMT" +msgstr "অতিৰিক্ত PMT" + +#: modules/demux/mpeg/ts.c:86 +msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." +msgstr "" +"অতিৰিক্ত pmt এটা নিৰ্দিষ্ট কৰিবলৈ ব্যৱহাৰকৰ্তা এজনক অনুমতি দিয়ে (pmt_pid=pid:" +"stream_type[,...])." + +#: modules/demux/mpeg/ts.c:88 +msgid "Set id of ES to PID" +msgstr "PID লৈ ES ৰ id ছেট কৰক" + +#: modules/demux/mpeg/ts.c:89 +msgid "" +"Set the internal ID of each elementary stream handled by VLC to the same " +"value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do " +"'#duplicate{..., select=\"es=\"}'." +msgstr "" +"প্ৰতিটো VLC প্ৰাথমিক ষ্ট্ৰিম {..., select=\"es=\"}'. 1, 2, 3, প্ৰাথমিক " +"ষ্ট্ৰিম PID" + +#: modules/demux/mpeg/ts.c:94 modules/mux/mpeg/ts.c:173 +msgid "CSA Key" +msgstr "CSA কী" + +#: modules/demux/mpeg/ts.c:95 modules/mux/mpeg/ts.c:174 +msgid "" +"CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)." +msgstr "" +"CSA এনক্ৰিপশ্বন কী. এইটো এটা 16 টা আখৰৰ ষ্ট্ৰিং হোৱাটো অপৰিহাৰ্য (8 হেক্সাডেচিমেল " +"বাইট)." + +#: modules/demux/mpeg/ts.c:98 modules/mux/mpeg/ts.c:177 +msgid "Second CSA Key" +msgstr "দ্বিতীয় CSA কী" + +#: modules/demux/mpeg/ts.c:99 modules/mux/mpeg/ts.c:178 +msgid "" +"The even CSA encryption key. This must be a 16 char string (8 hexadecimal " +"bytes)." +msgstr "" +"যুগ্ম CSA এনক্ৰিপশ্বন কী. এইটো এটা 16 টা আখৰৰ ষ্ট্ৰিং হোৱাটো অপৰিহাৰ্য (8 " +"হেক্সাডেচিমেল বাইট)." + +#: modules/demux/mpeg/ts.c:103 +msgid "Packet size in bytes to decrypt" +msgstr "ডিক্ৰিপ্ট কৰিবলৈ বাইটবোৰত পেকেট আকাৰ" + +#: modules/demux/mpeg/ts.c:104 +msgid "" +"Specify the size of the TS packet to decrypt. The decryption routines " +"subtract the TS-header from the value before decrypting." +msgstr "" + +#: modules/demux/mpeg/ts.c:108 +msgid "Separate sub-streams" +msgstr "উপ-ষ্ট্ৰিমবোৰ পৃথক কৰক" + +#: modules/demux/mpeg/ts.c:110 +msgid "" +"Separate teletex/dvbs pages into independent ES. It can be useful to turn " +"off this option when using stream output." +msgstr "অডিঅ' ষ্ট্ৰিমটো প্ৰক্ৰিয়া কৰিবলৈ অডিঅ' ফিল্টাৰবোৰ ব্যৱহাৰ কৰা হয়." + +#: modules/demux/mpeg/ts.c:115 +msgid "" +"Seek and position based on a percent byte position, not a PCR generated time " +"position. If seeking doesn't work property, turn on this option." +msgstr "অডিঅ' ষ্ট্ৰিমটো প্ৰক্ৰিয়া কৰিবলৈ অডিঅ' ফিল্টাৰবোৰ ব্যৱহাৰ কৰা হয়." + +#: modules/demux/mpeg/ts.c:126 +msgid "Trust in-stream PCR" +msgstr "ইন-ষ্ট্ৰিম PCR বিশ্বাস কৰক" + +#: modules/demux/mpeg/ts.c:127 +msgid "Use the stream PCR as a reference." +msgstr "প্ৰসংগ এটাৰ দৰে ষ্ট্ৰিম PCRটো ব্যৱহাৰ কৰক." + +#: modules/demux/mpeg/ts.c:134 modules/mux/mpeg/ts.c:100 +msgid "Digital TV Standard" +msgstr "" + +#: modules/demux/mpeg/ts.c:135 +msgid "" +"Selects mode for digital TV standard. This feature affects EPG information " +"and subtitles." +msgstr "" + +#: modules/demux/mpeg/ts.c:139 +msgid "MPEG Transport Stream demuxer" +msgstr "MPEG পৰিবহন ষ্ট্ৰিম ডিমাক্সাৰ" + +#: modules/demux/mpeg/ts_psi.c:422 +msgid "Main audio" +msgstr "" + +#: modules/demux/mpeg/ts_psi.c:423 +msgid "Audio description for the visually impaired" +msgstr "" + +#: modules/demux/mpeg/ts_psi.c:424 +msgid "Clean audio for the hearing impaired" +msgstr "" + +#: modules/demux/mpeg/ts_psi.c:425 +msgid "Spoken subtitles for the visually impaired" +msgstr "" + +#: modules/demux/mpeg/ts_psi.c:607 modules/gui/macosx/VLCMainMenu.m:465 +#: modules/gui/qt/dialogs/toolbar.cpp:541 +msgid "Teletext" +msgstr "টেলিটেক্সট" + +#: modules/demux/mpeg/ts_psi.c:608 +msgid "Teletext subtitles" +msgstr "টেলিটেক্সট উপশিৰোনামবোৰ" + +#: modules/demux/mpeg/ts_psi.c:609 +msgid "Teletext: additional information" +msgstr "টেলিটেক্সট: অতিৰিক্ত তথ্য" + +#: modules/demux/mpeg/ts_psi.c:610 +msgid "Teletext: program schedule" +msgstr "টেলিটেক্সট: কাৰ্যসূচীৰ সময়সূচী" + +#: modules/demux/mpeg/ts_psi.c:611 +msgid "Teletext subtitles: hearing impaired" +msgstr "টেলিটেক্সট উপশিৰোনাম: কাণেৰে কম শুনা" + +#: modules/demux/mpeg/ts_psi.c:828 +msgid "DVB subtitles: hearing impaired" +msgstr "DVB উপশিৰোনামবোৰ: শুনাত বিসংগতি" + +#: modules/demux/mpeg/ts_psi.c:1337 +msgid "clean effects" +msgstr "স্পষ্ট প্ৰভাৱবোৰ" + +#: modules/demux/mpeg/ts_psi.c:1338 +msgid "hearing impaired" +msgstr "শুনাত বিসংগতি" + +#: modules/demux/mpeg/ts_psi.c:1339 +msgid "visual impaired commentary" +msgstr "দেখাত বিসংগতি ভাষ্য" + +#: modules/demux/nsc.c:47 +msgid "Windows Media NSC metademux" +msgstr "উইণ্ডোজ মিডিয়া NSC মেটাডিমাক্স" + +#: modules/demux/nsv.c:49 +msgid "NullSoft demuxer" +msgstr "নালছফ্ট ডিমাক্সাৰ" + +#: modules/demux/nuv.c:50 +msgid "Nuv demuxer" +msgstr "Nuv ডিমাক্সাৰ" + +#: modules/demux/ogg.c:57 +msgid "OGG demuxer" +msgstr "OGG ডিমাক্সাৰ" + +#: modules/demux/playlist/playlist.c:46 +msgid "Show shoutcast adult content" +msgstr "ছাউটকাষ্ট প্ৰাপ্তবয়ষ্ক বস্তুবোৰ দেখুৱাওক" + +#: modules/demux/playlist/playlist.c:47 +msgid "Show NC17 rated video streams when using shoutcast video playlists." +msgstr "" +"NC17 ক্ৰম কৰা ভিডিঅ' ষ্ট্ৰিমবোৰ দেখুৱাওক যেতিয়া ছাউটকাষ্ট ভিডিঅ' প্লেলিষ্টবোৰ " +"ব্যৱহাৰ কৰে." + +#: modules/demux/playlist/playlist.c:50 +msgid "Skip ads" +msgstr "এডছবোৰ এৰি যাওক" + +#: modules/demux/playlist/playlist.c:51 +msgid "" +"Use playlist options usually used to prevent ads skipping to detect ads and " +"prevent adding them to the playlist." +msgstr "" +"প্লেলিষ্ট বিকল্প ব্যৱহাৰ কৰাটোৱে সধাৰণতে এডছ চিনাক্ত কৰিবলৈ এডছ এৰি যোৱাবোৰ বাধা " +"দিবলৈ আৰু সেইবোৰক প্লেলিষ্টত যোগ কৰা বাধা দিবলৈ ব্যৱহাৰ কৰা হয়." + +#: modules/demux/playlist/playlist.c:67 +msgid "M3U playlist import" +msgstr "M3U প্লেলিষ্ট আমদানি কৰক" + +#: modules/demux/playlist/playlist.c:72 +msgid "RAM playlist import" +msgstr "RAM প্লেলিষ্ট আমদানি কৰক" + +#: modules/demux/playlist/playlist.c:76 +msgid "PLS playlist import" +msgstr "PLS প্লেলিষ্ট আমদানি কৰক" + +#: modules/demux/playlist/playlist.c:80 +msgid "B4S playlist import" +msgstr "B4S প্লেলিষ্ট আমদানি কৰক" + +#: modules/demux/playlist/playlist.c:85 +msgid "DVB playlist import" +msgstr "DVB প্লেলিষ্ট আমদানি কৰক" + +#: modules/demux/playlist/playlist.c:90 +msgid "Podcast parser" +msgstr "পডকাষ্ট ভাগকৰ্তা" + +#: modules/demux/playlist/playlist.c:95 +msgid "XSPF playlist import" +msgstr "XSPF প্লেলিষ্ট ৰপ্তানি কৰক" + +#: modules/demux/playlist/playlist.c:99 +msgid "New winamp 5.2 shoutcast import" +msgstr "নতুন উইনেম্প 5.2 ছাউটকাষ্ট আমদানি" + +#: modules/demux/playlist/playlist.c:106 +msgid "ASX playlist import" +msgstr "ASX প্লেলিষ্ট ৰপ্তানি কৰক" + +#: modules/demux/playlist/playlist.c:110 +msgid "Kasenna MediaBase parser" +msgstr "কাছেন্না মিডিয়া আধাৰ ভাগকৰ্তা" + +#: modules/demux/playlist/playlist.c:115 +msgid "QuickTime Media Link importer" +msgstr "কুইকটাইম মিডিয়া সংযোগ আমদানিকৰ্তা" + +#: modules/demux/playlist/playlist.c:120 +msgid "Dummy IFO demux" +msgstr "ডামি IFO ডিমাক্স" + +#: modules/demux/playlist/playlist.c:124 +msgid "iTunes Music Library importer" +msgstr "iটিউনবোৰৰ সংগীত লাইব্ৰেৰী আমদানিকৰ্তা" + +#: modules/demux/playlist/playlist.c:129 +msgid "WPL playlist import" +msgstr "WPL প্লেলিষ্ট আমদানি কৰক" + +#: modules/demux/playlist/podcast.c:230 modules/demux/playlist/podcast.c:242 +#: modules/demux/playlist/podcast.c:305 modules/demux/playlist/podcast.c:328 +msgid "Podcast Info" +msgstr "পডকাষ্ট তথ্য" + +#: modules/demux/playlist/podcast.c:232 +msgid "Podcast Link" +msgstr "পডকাষ্ট সংযোগ" + +#: modules/demux/playlist/podcast.c:233 +msgid "Podcast Copyright" +msgstr "পডকাষ্ট প্ৰতিলিপিস্বত্ব" + +#: modules/demux/playlist/podcast.c:234 +msgid "Podcast Category" +msgstr "পডকাষ্ট শ্ৰেণী" + +#: modules/demux/playlist/podcast.c:235 modules/demux/playlist/podcast.c:312 +msgid "Podcast Keywords" +msgstr "পডকাষ্ট মুখ্য শব্দবোৰ" + +#: modules/demux/playlist/podcast.c:236 modules/demux/playlist/podcast.c:313 +msgid "Podcast Subtitle" +msgstr "পডকাষ্ট উপশিৰোনাম" + +#: modules/demux/playlist/podcast.c:242 modules/demux/playlist/podcast.c:314 +msgid "Podcast Summary" +msgstr "পডকাষ্ট সাৰাংশ" + +#: modules/demux/playlist/podcast.c:308 +msgid "Podcast Publication Date" +msgstr "পডকাষ্ট প্ৰকাশনৰ তাৰিখ" + +#: modules/demux/playlist/podcast.c:309 +msgid "Podcast Author" +msgstr "পডকাষ্ট লেখক" + +#: modules/demux/playlist/podcast.c:310 +msgid "Podcast Subcategory" +msgstr "পডকাষ্ট উপশ্ৰেণী" + +#: modules/demux/playlist/podcast.c:311 +msgid "Podcast Duration" +msgstr "পডকাষ্ট সময়সীমা" + +#: modules/demux/playlist/podcast.c:315 +msgid "Podcast Type" +msgstr "পডকাষ্ট প্ৰকাৰ" + +#: modules/demux/playlist/podcast.c:329 +msgid "Podcast Size" +msgstr "পডকাষ্ট আকাৰ" + +#: modules/demux/playlist/podcast.c:330 +#, c-format +msgid "%s bytes" +msgstr "%s বাইট" + +#: modules/demux/playlist/shoutcast.c:324 +msgid "Shoutcast" +msgstr "ছাউটকাষ্ট" + +#: modules/demux/playlist/shoutcast.c:328 +msgid "Listeners" +msgstr "শুনোতাবোৰ" + +#: modules/demux/playlist/shoutcast.c:329 +msgid "Load" +msgstr "লোড কৰক" + +#: modules/demux/playlist/wpl.c:99 +msgid "Total duration" +msgstr "" + +#: modules/demux/pva.c:44 +msgid "PVA demuxer" +msgstr "PVA ডিমাক্সাৰ" + +#: modules/demux/rawaud.c:44 +msgid "Audio sample rate in Hertz. Default is 48000 Hz." +msgstr "হাৰ্টজত অডিঅ' নমুনাৰ হাৰ. ডিফল্ট হল 48000 Hz." + +#: modules/demux/rawaud.c:46 modules/stream_out/transcode/transcode.c:100 +#: share/lua/http/dialogs/create_stream.html:316 +msgid "Audio channels" +msgstr "অডিঅ’ চেনেলবোৰ" + +#: modules/demux/rawaud.c:47 +msgid "Audio channels in input stream. Numeric value >0. Default is 2." +msgstr "অডিঅ' চেনেলবোৰৰ ইনপুট ষ্ট্ৰিম. সাংখ্যিক মান >0. ডিফল্ট হল 2." + +#: modules/demux/rawaud.c:49 +msgid "FOURCC code of raw input format" +msgstr "ৰ' ইনপুট ফৰমেটৰ FOURCC কোড" + +#: modules/demux/rawaud.c:51 +msgid "FOURCC code of the raw input format. This is a four character string." +msgstr "ৰ' ইনপুট ফৰমেটটোৰ FOURCC কোড. এইটো হল এটা চাৰিটা আখৰৰ ষ্ট্ৰিং." + +#: modules/demux/rawaud.c:53 +msgid "Forces the audio language" +msgstr "অডিঅ' ভাষাটো জোৰ কৰক" + +#: modules/demux/rawaud.c:54 +msgid "" +"Forces the audio language for the output mux. Three letter ISO639 code. " +"Default is 'eng'." +msgstr "" + +#: modules/demux/rawaud.c:64 +msgid "Raw audio demuxer" +msgstr "ৰ' অডিঅ' ডিমাক্সাৰ" + +#: modules/demux/rawdv.c:43 +msgid "" +"The demuxer will advance timestamps if the input can't keep up with the rate." +msgstr "ডিমাক্সাৰটোৱে সময়ষ্টেম্পবোৰ উন্নত কৰিব যদি ইনপুটটোৱে হাৰটো ধৰি নাথাকে." + +#: modules/demux/rawdv.c:51 +msgid "DV (Digital Video) demuxer" +msgstr "DV (ডিজিটেল ভিডিঅ') ডিমাক্সাৰ" + +#: modules/demux/rawvid.c:44 +msgid "" +"This is the desired frame rate when playing raw video streams. In the form " +"30000/1001 or 29.97" +msgstr "" +"এইটো হল আশা কৰা ফ্ৰেম হাৰটো যেতিয়া ৰ' ভিডিঅ' ষ্ট্ৰিমবোৰ চলায়. 30000/1001 বা " +"29.97 ৰ ৰূপত" + +#: modules/demux/rawvid.c:48 +msgid "This specifies the width in pixels of the raw video stream." +msgstr "এইটোৱে ৰ' ভিডিঅ' ষ্ট্ৰিমটোৰ প্ৰস্থটো পিক্সেলবোৰত নিৰ্ধাৰণ কৰে. " + +#: modules/demux/rawvid.c:52 +msgid "This specifies the height in pixels of the raw video stream." +msgstr "এইটোৱে ৰ' ভিডিঅ' ষ্ট্ৰিমটোৰ উচ্চতাটো পিক্সেলবোৰত নিৰ্ধাৰণ কৰে. " + +#: modules/demux/rawvid.c:55 +msgid "Force chroma (Use carefully)" +msgstr "ক্ৰোমা জোৰ কৰক (সতৰ্কতাৰে ব্যৱহাৰ কৰক)" + +#: modules/demux/rawvid.c:56 +msgid "Force chroma. This is a four character string." +msgstr "ক্ৰোমা জোৰ কৰক. এইটো হল এটা চাৰিটা আখৰৰ ষ্ট্ৰিং." + +#: modules/demux/rawvid.c:64 +msgid "Raw video demuxer" +msgstr "ৰ' ভিডিঅ' ডিমাক্সাৰ" + +#: modules/demux/real.c:71 +msgid "Real demuxer" +msgstr "প্ৰকৃত ডিমাক্সাৰ" + +#: modules/demux/sid.cpp:53 +msgid "C64 sid demuxer" +msgstr "C64 sid ডিমাক্সাৰ" + +#: modules/demux/smf.c:725 +msgid "SMF demuxer" +msgstr "SMF ডিমাক্সাৰ" + +#: modules/demux/stl.c:43 +msgid "EBU STL subtitles parser" +msgstr "EBU STL উপশিৰোনামবোৰ ভাগকৰ্তা" + +#: modules/demux/subtitle.c:53 +msgid "Apply a delay to all subtitles (in 1/10s, eg 100 means 10s)." +msgstr "" +"সকলোবোৰ উপশিৰোনামল বিলম্ব এটা প্ৰয়োগ কৰক (1/10s ত, উদাহৰণস্বৰুপে 100 মানে 10s)." + +#: modules/demux/subtitle.c:55 +msgid "" +"Override the normal frames per second settings. This will only work with " +"MicroDVD and SubRIP (SRT) subtitles." +msgstr "" +"প্ৰতি ছেকেণ্ডৰ ছেটিংবোৰৰ সাভাৱিক ফ্ৰেমবোৰ অভাৰ ৰাইড কৰক. এইটোৱে কেৱল মাইক্ৰোDVD " +"আৰু উপRIP (SRT) উপশিৰোনামবোৰৰ সৈতে কাৰ্য কৰিব." + +#: modules/demux/subtitle.c:58 +msgid "" +"Force the subtitles format. Selecting \"auto\" means autodetection and " +"should always work." +msgstr "" + +#: modules/demux/subtitle.c:60 +msgid "Override the default track description." +msgstr "ডিফল্ট পথ বিৱৰণটো অভাৰৰাইড কৰক." + +#: modules/demux/subtitle.c:72 +msgid "Text subtitle parser" +msgstr "টেক্সট উপশিৰোনাম ভাগকৰ্তা" + +#: modules/demux/subtitle.c:80 modules/spu/subsdelay.c:275 +msgid "Subtitle delay" +msgstr "উপশিৰোনাম বিলম্ব" + +#: modules/demux/subtitle.c:82 +msgid "Subtitle format" +msgstr "উপশিৰোনাম ফৰমেট" + +#: modules/demux/subtitle.c:85 +msgid "Subtitle description" +msgstr "উপশিৰোনাম বিৱৰণ" + +#: modules/demux/tta.c:46 +msgid "TTA demuxer" +msgstr "TTA ডিমাক্সাৰ" + +#: modules/demux/ty.c:62 +msgid "TY" +msgstr "TY" + +#: modules/demux/ty.c:63 +msgid "TY Stream audio/video demux" +msgstr "TY ষ্ট্ৰিম অডিঅ'/ভিডিঅ' ডিমাক্স" + +#: modules/demux/ty.c:784 +msgid "Closed captions 2" +msgstr "কেপশ্বনবোৰ 2 বন্ধ কৰা হল" + +#: modules/demux/ty.c:785 +msgid "Closed captions 3" +msgstr "কেপশ্বনবোৰ 3 বন্ধ কৰা হল" + +#: modules/demux/ty.c:786 +msgid "Closed captions 4" +msgstr "কেপশ্বনবোৰ 4 বন্ধ কৰা হল" + +#: modules/demux/vc1.c:44 +msgid "Desired frame rate for the VC-1 stream." +msgstr "VC-1 ষ্ট্ৰিমটোৰ বাবে বিচৰা ফ্ৰেম হাৰ." + +#: modules/demux/vc1.c:50 +msgid "VC1 video demuxer" +msgstr "VC1 ভিডিঅ' ডিমাক্সাৰ" + +#: modules/demux/vobsub.c:51 +msgid "Vobsub subtitles parser" +msgstr "Vobউপ উপশিৰোনাম ভাগকৰ্তা" + +#: modules/demux/voc.c:45 +msgid "VOC demuxer" +msgstr "VOC ডিমাক্সাৰ" + +#: modules/demux/wav.c:52 +msgid "WAV demuxer" +msgstr "WAV ডিমাক্সাৰ" + +#: modules/demux/xa.c:44 +msgid "XA demuxer" +msgstr "XA ডিমাক্সাৰ" + +#: modules/demux/xiph_metadata.c:571 +msgid "Unknown category" +msgstr "অজ্ঞাত শ্ৰেণী" + +#: modules/demux/xiph_metadata.h:48 +msgid "Closed captions" +msgstr "কেপশ্বনবোৰ বন্ধ কৰা হল" + +#: modules/demux/xiph_metadata.h:50 +msgid "Textual audio descriptions" +msgstr "টেক্সট সম্পৰ্কীয় অডিঅ' বিৱৰণ" + +#: modules/demux/xiph_metadata.h:52 +msgid "Ticker text" +msgstr "টিকাৰ টেক্সট" + +#: modules/demux/xiph_metadata.h:53 +msgid "Active regions" +msgstr "সক্ৰিয় অঞ্চলবোৰ" + +#: modules/demux/xiph_metadata.h:54 +msgid "Semantic annotations" +msgstr "ছেমেন্টিক টোকাবোৰ" + +#: modules/demux/xiph_metadata.h:56 +msgid "Transcript" +msgstr "প্ৰতিলিপ কৰক" + +#: modules/demux/xiph_metadata.h:58 +msgid "Linguistic markup" +msgstr "ভাষিক মূল্য" + +#: modules/demux/xiph_metadata.h:59 +msgid "Cue points" +msgstr "সূত্ৰ বিন্দু" + +#: modules/demux/xiph_metadata.h:63 modules/demux/xiph_metadata.h:67 +msgid "Subtitles (images)" +msgstr "উপশিৰোনামবোৰ (ছবিবোৰ)" + +#: modules/demux/xiph_metadata.h:68 +msgid "Slides (text)" +msgstr "শ্লাইডবোৰ (টেক্সট)" + +#: modules/demux/xiph_metadata.h:69 +msgid "Slides (images)" +msgstr "শ্লাইডবোৰ (ছবিবোৰ)" + +#: modules/gui/macosx/VLCAboutWindowController.m:94 +#: modules/gui/macosx/VLCMainMenu.m:339 +msgid "About VLC media player" +msgstr "VLC মিডিয়া প্লেয়াৰৰ বিষয়ে" + +#: modules/gui/macosx/VLCAboutWindowController.m:97 +#: modules/gui/qt/dialogs/help.cpp:137 +msgid "Credits" +msgstr "ক্ৰেডিটবোৰ" + +#: modules/gui/macosx/VLCAboutWindowController.m:99 +#: modules/gui/macosx/VLCMainMenu.m:490 modules/gui/qt/dialogs/help.cpp:129 +msgid "License" +msgstr "অনুজ্ঞাপত্ৰ" + +#: modules/gui/macosx/VLCAboutWindowController.m:101 +#: modules/gui/qt/dialogs/help.cpp:133 +msgid "Authors" +msgstr "লেখকবোৰ" + +#: modules/gui/macosx/VLCAboutWindowController.m:103 +msgid "" +"VLC media player and VideoLAN are trademarks of the VideoLAN Association." +msgstr "VLC মিডিয়া প্লেয়াৰ আৰু ভিডিঅ'LAN হল ভিডিঅ'LAN সংস্থাটোৰ ট্ৰেডমাৰ্ক." + +#: modules/gui/macosx/VLCAboutWindowController.m:128 +msgid "" +"

VLC media player is a free and open source media player, encoder, and " +"streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " +"essentially every popular platform, and can read almost all files, CDs, " +"DVDs, network streams, capture cards and other media formats!

Help and join us!" +msgstr "" + +#: modules/gui/macosx/VLCAddonsWindowController.m:105 +#: modules/gui/macosx/VLCAddonsWindowController.m:357 +#: modules/gui/qt/dialogs/plugins.cpp:388 +#: modules/gui/qt/managers/addons_manager.cpp:88 +msgid "Playlist parsers" +msgstr "প্লেলিষ্ট ভাগকৰ্তাবোৰ" + +#: modules/gui/macosx/VLCAddonsWindowController.m:107 +#: modules/gui/macosx/VLCAddonsWindowController.m:359 +#: modules/gui/qt/dialogs/plugins.cpp:392 +#: modules/gui/qt/managers/addons_manager.cpp:90 +msgid "Service Discovery" +msgstr "সেৱা আৱিষ্কাৰ" + +#: modules/gui/macosx/VLCAddonsWindowController.m:109 +#: modules/gui/qt/dialogs/plugins.cpp:396 +#: modules/gui/qt/managers/addons_manager.cpp:92 +msgid "Interfaces" +msgstr "" + +#: modules/gui/macosx/VLCAddonsWindowController.m:111 +#: modules/gui/qt/dialogs/plugins.cpp:399 +#: modules/gui/qt/managers/addons_manager.cpp:94 +msgid "Art and meta fetchers" +msgstr "" + +#: modules/gui/macosx/VLCAddonsWindowController.m:113 +#: modules/gui/macosx/VLCAddonsWindowController.m:361 +#: modules/gui/macosx/VLCMainMenu.m:343 modules/gui/macosx/VLCMainMenu.m:344 +#: modules/gui/qt/dialogs/plugins.cpp:402 +#: modules/gui/qt/managers/addons_manager.cpp:96 +msgid "Extensions" +msgstr "সম্প্ৰসাৰণবোৰ" + +#: modules/gui/macosx/VLCAddonsWindowController.m:116 +msgid "Show Installed Only" +msgstr "কেৱল ইনষ্টল কৰাটো দেখুৱাওক" + +#: modules/gui/macosx/VLCAddonsWindowController.m:118 +#: modules/gui/qt/dialogs/plugins.cpp:430 +msgid "Find more addons online" +msgstr "অনলাইনত অধিক এডঅন বিচাৰি উলিয়াওক" + +#: modules/gui/macosx/VLCAddonsWindowController.m:128 +#: modules/gui/macosx/VLCMainMenu.m:345 modules/gui/qt/dialogs/plugins.cpp:85 +msgid "Addons Manager" +msgstr "এডঅন পৰিচালক" + +#: modules/gui/macosx/VLCAddonsWindowController.m:130 +#: modules/gui/qt/dialogs/plugins.cpp:1172 +#: modules/gui/qt/dialogs/plugins.cpp:1185 +msgid "Installed" +msgstr "ইনষ্টল কৰা হল" + +#: modules/gui/macosx/VLCAddonsWindowController.m:131 +#: modules/gui/macosx/VLCBookmarksWindowController.m:87 +#: modules/gui/qt/dialogs/plugins.cpp:127 modules/mux/avi.c:54 +msgid "Name" +msgstr "নাম" + +#: modules/gui/macosx/VLCAddonsWindowController.m:132 +#: modules/gui/macosx/VLCPlaylist.m:92 modules/gui/qt/dialogs/plugins.cpp:1404 +#: modules/gui/qt/dialogs/plugins.cpp:1509 modules/mux/asf.c:58 +msgid "Author" +msgstr "লেখক" + +#: modules/gui/macosx/VLCAddonsWindowController.m:197 +msgid "Uninstall" +msgstr "ইনষ্টল নকৰিব" + +#: modules/gui/macosx/VLCAddonsWindowController.m:355 +#: modules/gui/qt/dialogs/plugins.cpp:384 +#: modules/gui/qt/managers/addons_manager.cpp:86 +#: modules/gui/skins2/src/skin_main.cpp:535 +msgid "Skins" +msgstr "স্কিনবোৰ" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:211 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:199 +msgid "Apply profile at next launch" +msgstr "" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:216 +#: modules/gui/qt/ui/equalizer.h:131 +msgid "2 Pass" +msgstr "2 পাছ" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:219 +#: modules/gui/qt/components/extended_panels.cpp:1157 +#: modules/gui/qt/ui/equalizer.h:133 +msgid "Preamp" +msgstr "পূৰ্ববিস্তাৰ" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:223 +msgid "Enable dynamic range compressor" +msgstr "পৰিধিৰ পৰিসৰ সংনমন সক্ষম কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:224 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:235 +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:49 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:210 +#: modules/gui/qt/dialogs/gototime.cpp:65 +msgid "Reset" +msgstr "পুনৰ ছেট কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:226 +#: modules/gui/qt/components/extended_panels.cpp:1326 +msgid "Attack" +msgstr "আক্ৰমণ কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:227 +#: modules/gui/qt/components/extended_panels.cpp:1327 +msgid "Release" +msgstr "এৰি দিয়ক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:228 +#: modules/gui/qt/components/extended_panels.cpp:1328 +msgid "Threshold" +msgstr "থ্ৰেছহল্ড" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:234 +msgid "Enable Spatializer" +msgstr "স্পাশ্বিয়েলাইজাৰ সক্ষম কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:246 +msgid "Headphone virtualization" +msgstr "হেডফোন বাস্তৱিককৰণ" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:253 +msgid "Volume normalization" +msgstr "প্ৰসাৰ স্বাভাৱিককৰণ" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:259 +msgid "Maximum level" +msgstr "সৰ্বাধিক স্তৰ" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:274 +msgid "Filter" +msgstr "ফিল্টাৰ কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:276 +#: modules/gui/macosx/VLCMainWindowControlsBar.m:88 +#: modules/gui/macosx/VLCSimplePrefsController.m:280 +#: modules/gui/qt/dialogs/extended.cpp:96 +msgid "Audio Effects" +msgstr "অডিঅ' প্ৰভাৱবোৰ" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:327 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:393 +msgid "Duplicate current profile..." +msgstr "চলিত প্ৰফাইলটো নকল কৰক..." + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:332 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:1062 +msgid "Organize Profiles..." +msgstr "প্ৰফাইলবোৰ সজাওক..." + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:511 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:789 +msgid "Duplicate current profile for a new profile" +msgstr "এটা নতুন প্ৰফাইলৰ বাবে চলিত প্ৰফাইলটো নকল কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:512 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:487 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:790 +msgid "Enter a name for the new profile:" +msgstr "নতুন প্ৰফাইলটোৰ বাবে নাম এটা ভৰাওক:" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:514 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:855 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:377 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:489 +#: modules/gui/macosx/VLCMainMenu.m:1164 modules/gui/macosx/VLCOutput.m:414 +#: modules/gui/macosx/VLCSimplePrefsController.m:320 +#: modules/gui/macosx/VLCSimplePrefsController.m:394 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:792 +#: modules/gui/macosx/prefs.m:188 +#: modules/gui/qt/components/sout/profile_selector.cpp:449 +#: modules/gui/qt/ui/vlm.h:298 +msgid "Save" +msgstr "ছেভ কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:534 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:813 +msgid "Please enter a unique name for the new profile." +msgstr "অনুগ্ৰহ কৰি নতুন প্ৰফাইলটোৰ বাবে অদ্বিতীয় নাম এটা ভৰাওক." + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:535 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:814 +msgid "Multiple profiles with the same name are not allowed." +msgstr "একে নামৰ বিভিন্ন প্ৰফাইলবোৰক অনুমতি দিয়া নহয়." + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:568 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:897 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:857 +msgid "Remove a preset" +msgstr "পূৰ্বে ছেট কৰা এটা আতঁৰ কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:569 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:898 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:858 +msgid "Select the preset you would like to remove:" +msgstr "আপুনি আতঁৰ কৰিবলৈ বিচৰা পূৰ্বে ছেট কৰাটো নিৰ্বাচন কৰক:" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:570 +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:899 +#: modules/gui/macosx/VLCBookmarksWindowController.m:78 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:338 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:859 +#: modules/gui/qt/ui/open_file.h:153 +msgid "Remove" +msgstr "আতঁৰ কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:647 +msgid "Add new Preset..." +msgstr "নতুন পূৰ্বছেট যোগ কৰক..." + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:652 +msgid "Organize Presets..." +msgstr "পূৰ্বছেটবোৰ সজাওক..." + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:852 +msgid "Save current selection as new preset" +msgstr "নতুন পূৰ্ব ছেটৰ দৰে চলিত নিৰ্বাচনটো ছেভ কৰক" + +#: modules/gui/macosx/VLCAudioEffectsWindowController.m:853 +msgid "Enter a name for the new preset:" +msgstr "নতুন পূৰ্বছেটটোৰ বাবে নাম এটা ভৰাওক:" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:74 +msgid "Bookmarks" +msgstr "পৃষ্ঠাসংকেতবোৰ" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:75 +#: modules/gui/qt/ui/podcast_configuration.h:101 modules/gui/qt/ui/sout.h:206 +#: modules/gui/qt/ui/vlm.h:296 +msgid "Add" +msgstr "যোগ কৰক" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:76 +#: modules/gui/macosx/VLCSimplePrefsController.m:296 +#: modules/gui/qt/dialogs/bookmarks.cpp:53 modules/gui/qt/ui/vlm.h:297 +msgid "Clear" +msgstr "খালী কৰক" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:77 +#: modules/gui/macosx/VLCMainMenu.m:366 +msgid "Edit" +msgstr "সম্পাদনা কৰক" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:82 +#: modules/gui/macosx/VLCBookmarksWindowController.m:88 +#: modules/gui/qt/dialogs/bookmarks.cpp:77 +#: modules/gui/qt/dialogs/toolbar.cpp:493 +msgid "Time" +msgstr "সময়" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:85 +#: modules/gui/macosx/VLCBookmarksWindowController.m:209 +#: modules/gui/macosx/VLCBookmarksWindowController.m:213 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:270 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:545 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:552 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:559 +#: modules/gui/macosx/VLCCoreDialogProvider.m:194 +#: modules/gui/macosx/VLCCoreDialogProvider.m:236 +#: modules/gui/macosx/VLCOpenWindowController.m:365 +#: modules/gui/macosx/VLCOutput.m:60 modules/gui/macosx/VLCPlaylistInfo.m:337 +#: modules/gui/macosx/VLCSimplePrefsController.m:295 +#: modules/gui/macosx/VLCTimeSelectionPanelController.m:51 +#: modules/gui/qt/components/open_panels.cpp:1360 +#: modules/stream_out/chromecast/cast.cpp:1197 +msgid "OK" +msgstr "OK" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:128 +#: modules/gui/macosx/VLCMainMenu.m:1154 +msgid "Untitled" +msgstr "শিৰোনামবিহীন" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:209 +msgid "No input" +msgstr "কোনো ইনপুট নাই" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:209 +msgid "" +"No input found. A stream must be playing or paused for bookmarks to work." +msgstr "" +"কোনো ইনপুট বিচাৰি পোৱা নগল. পৃষ্ঠাসংকেতবোৰে কাৰ্য কৰিবৰ বাবে ষ্ট্ৰিম এটা চলোৱা বা " +"বিৰতি দিয়াটো অপৰিহাৰ্য." + +#: modules/gui/macosx/VLCBookmarksWindowController.m:213 +msgid "Input has changed" +msgstr "ইনপুট সলনি কৰা হৈছে" + +#: modules/gui/macosx/VLCBookmarksWindowController.m:213 +msgid "" +"Input has changed, unable to save bookmark. Suspending playback with \"Pause" +"\" while editing bookmarks to ensure to keep the same input." +msgstr "" +"বিভিন্ন কম্পিউটাৰলৈ এই ষ্ট্ৰিমটো ব্যৱহাৰ কৰক. এই উপাদানটো হল আপোনাৰ ষ্ট্ৰিমটোৱে যাব " +"পৰা সৰ্বাধিক সংখ্যক ৰাস্তা. যদি এইটো মানে কি আপুনি নাযানে." + +#: modules/gui/macosx/VLCControlsBarCommon.m:84 +#: modules/gui/macosx/VLCControlsBarCommon.m:182 +#: modules/gui/macosx/VLCFSPanelController.m:134 +msgid "Backward" +msgstr "পিছলৈ" + +#: modules/gui/macosx/VLCControlsBarCommon.m:85 +#: modules/gui/macosx/VLCControlsBarCommon.m:183 +#: modules/gui/macosx/VLCFSPanelController.m:135 +msgid "Seek backward" +msgstr "" + +#: modules/gui/macosx/VLCControlsBarCommon.m:88 +#: modules/gui/macosx/VLCControlsBarCommon.m:185 +#: modules/gui/macosx/VLCFSPanelController.m:131 +msgid "Forward" +msgstr "আগলৈ" + +#: modules/gui/macosx/VLCControlsBarCommon.m:89 +#: modules/gui/macosx/VLCControlsBarCommon.m:186 +#: modules/gui/macosx/VLCFSPanelController.m:132 +msgid "Seek forward" +msgstr "" + +#: modules/gui/macosx/VLCControlsBarCommon.m:93 +msgid "Playback position" +msgstr "" + +#: modules/gui/macosx/VLCControlsBarCommon.m:113 +msgid "Playback time" +msgstr "" + +#: modules/gui/macosx/VLCControlsBarCommon.m:194 +#: modules/gui/macosx/VLCStatusBarIcon.m:100 +msgid "Go to previous item" +msgstr "" + +#: modules/gui/macosx/VLCControlsBarCommon.m:197 +#: modules/gui/macosx/VLCFSPanelController.m:126 +#: modules/gui/macosx/VLCStatusBarIcon.m:106 +msgid "Go to next item" +msgstr "" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:136 +msgid "Convert & Stream" +msgstr "ষ্ট্ৰিম ৰূপান্তৰ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:137 +msgid "Go!" +msgstr "যাওক!" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:138 +#: modules/gui/macosx/VLCMainWindow.m:199 +msgid "Drop media here" +msgstr "ইয়াত মিডিয়া ড্ৰপ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:139 +#: modules/gui/macosx/VLCMainWindow.m:215 +msgid "Open media..." +msgstr "মিডিয়া খোলক..." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:140 +msgid "Choose Profile" +msgstr "প্ৰফাইল পছন্দ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:141 +msgid "Customize..." +msgstr "ব্যৱস্থা কৰা..." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:142 +msgid "Choose Destination" +msgstr "গন্তব্যস্থান পছন্দ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:143 +msgid "Choose an output location" +msgstr "আউপুট স্থান এটা পছন্দ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:145 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:197 +#: modules/gui/macosx/VLCOpenWindowController.m:147 +#: modules/gui/macosx/VLCOpenWindowController.m:352 +#: modules/gui/macosx/VLCOutput.m:67 +#: modules/gui/macosx/VLCSimplePrefsController.m:303 +#: modules/gui/macosx/VLCSimplePrefsController.m:381 +#: modules/gui/macosx/prefs_widgets.m:1126 +#: modules/gui/qt/components/preferences_widgets.cpp:264 +#: modules/gui/qt/components/simple_preferences.cpp:472 +#: modules/gui/qt/components/sout/sout_widgets.cpp:136 +#: modules/gui/qt/ui/open.h:277 modules/gui/qt/ui/open_disk.h:304 +#: modules/gui/qt/ui/open_file.h:146 modules/gui/qt/ui/sprefs_audio.h:415 +#: modules/gui/qt/ui/sprefs_input.h:365 modules/gui/qt/ui/sprefs_video.h:329 +msgid "Browse..." +msgstr "ব্ৰাউজ কৰক..." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:146 +msgid "Setup Streaming..." +msgstr "ষ্ট্ৰিমিং ছেটআপ কৰক..." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:147 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:404 +msgid "Select Streaming Method" +msgstr "" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:148 +msgid "Save as File" +msgstr "ফাইলৰ দৰে ছেভ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:149 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:392 +#: modules/gui/macosx/VLCOutput.m:65 modules/gui/macosx/VLCOutput.m:194 +#: modules/gui/macosx/VLCOutput.m:313 modules/gui/qt/dialogs/sout.cpp:92 +msgid "Stream" +msgstr "ষ্ট্ৰিম" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:152 +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:181 +msgid "Apply" +msgstr "প্ৰয়োগ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:154 +msgid "Save as new Profile..." +msgstr "নতুন প্ৰফাইলৰ দৰে ছেভ কৰক..." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:155 +#: modules/gui/qt/ui/profiles.h:723 +msgid "Encapsulation" +msgstr "এনকেপশ্বুলেশ্বন" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:156 +#: share/lua/http/dialogs/create_stream.html:160 +#: modules/gui/qt/ui/profiles.h:749 +msgid "Video codec" +msgstr "ভিডিঅ' কোডেক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:157 +#: share/lua/http/dialogs/create_stream.html:178 +#: modules/gui/qt/ui/profiles.h:759 +msgid "Audio codec" +msgstr "অডিঅ' কোডেক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:161 +#: modules/gui/qt/ui/profiles.h:725 +msgid "Keep original video track" +msgstr "প্ৰকৃত ভিডিঅ' পথটো ৰাখক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:165 +#: modules/gui/qt/ui/profiles.h:747 +msgid "Resolution" +msgstr "বিশ্লেষণ" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:166 +#: modules/gui/qt/ui/profiles.h:738 +msgid "" +"You just need to fill one of the three following parameters, VLC will " +"autodetect the other using the original aspect ratio" +msgstr "" +"বিভিন্ন কম্পিউটাৰলৈ এই ষ্ট্ৰিমটো ব্যৱহাৰ কৰক. এই উপাদানটো হল আপোনাৰ ষ্ট্ৰিমটোৱে যাব " +"পৰা সৰ্বাধিক সংখ্যক ৰাস্তা. যদি এইটো মানে কি আপুনি নাযানে." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:169 +#: modules/gui/macosx/VLCOutput.m:88 modules/gui/qt/ui/profiles.h:739 +msgid "Scale" +msgstr "জোখক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:172 +#: modules/gui/qt/ui/profiles.h:751 +msgid "Keep original audio track" +msgstr "প্ৰকৃত ভিডিঅ' পথটো ৰাখক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:179 +#: modules/gui/qt/ui/profiles.h:762 +msgid "Overlay subtitles on the video" +msgstr "ভিডিঅ'টোত উপশিৰোনামবোৰ অভাৰলে কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:183 +msgid "Stream Destination" +msgstr "ষ্ট্ৰিম গন্তব্যস্থান" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:184 +msgid "Stream Announcement" +msgstr "ষ্ট্ৰিম ঘোষণা" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:186 +#: modules/gui/macosx/VLCOpenWindowController.m:197 +#: modules/gui/macosx/VLCOutput.m:68 +#: modules/gui/qt/components/sout/sout_widgets.cpp:242 +#: modules/gui/qt/components/sout/sout_widgets.cpp:329 +#: modules/gui/qt/components/sout/sout_widgets.cpp:371 +#: modules/gui/qt/components/sout/sout_widgets.cpp:426 +msgid "Address" +msgstr "ঠিকনা" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:187 +msgid "TTL" +msgstr "TTL" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:189 +#: modules/gui/macosx/VLCOpenWindowController.m:185 +#: modules/gui/macosx/VLCOpenWindowController.m:187 +#: modules/gui/macosx/VLCOutput.m:69 +#: modules/gui/qt/components/sout/sout_widgets.cpp:188 +#: modules/gui/qt/components/sout/sout_widgets.cpp:243 +#: modules/gui/qt/components/sout/sout_widgets.cpp:284 +#: modules/gui/qt/components/sout/sout_widgets.cpp:330 +#: modules/gui/qt/components/sout/sout_widgets.cpp:427 modules/lua/vlc.c:67 +#: modules/stream_out/rtp.c:114 +#: share/lua/http/dialogs/stream_config_window.html:32 +#: share/lua/http/dialogs/stream_window.html:91 +msgid "Port" +msgstr "পোৰ্ট" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:190 +#: modules/gui/macosx/VLCOutput.m:103 +msgid "SAP Announcement" +msgstr "SAP ঘোষণা" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:192 +#: modules/gui/macosx/VLCOutput.m:105 modules/gui/macosx/VLCOutput.m:506 +msgid "HTTP Announcement" +msgstr "HTTP ঘোষণা" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:193 +#: modules/gui/macosx/VLCOutput.m:104 modules/gui/macosx/VLCOutput.m:502 +msgid "RTSP Announcement" +msgstr "RTSP ঘোষণা" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:194 +#: modules/gui/macosx/VLCOutput.m:106 modules/gui/macosx/VLCOutput.m:510 +msgid "Export SDP as file" +msgstr "ফাইল হিচাপে SDP ৰপ্তানি কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:198 +#: modules/gui/macosx/VLCOutput.m:108 +msgid "Channel Name" +msgstr "চেনেলৰ নাম" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:199 +#: modules/gui/macosx/VLCOutput.m:109 +msgid "SDP URL" +msgstr "SDP URL" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:270 +msgid "Invalid container format for HTTP streaming" +msgstr "HTTP ষ্ট্ৰিম কৰাৰ বাবে অবৈধ ধাৰকৰ ফৰমেট" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:272 +msgid "" +"Media encapsulated as %@ cannot be streamed through the HTTP protocol for " +"technical reasons." +msgstr "" +"কাৰিকৰী কাৰণবোৰৰ বাবে HTTP প্ৰটকলটোৰ জৰিয়তে %@ ৰ দ্বাৰা এনকেপশ্বুলেট কৰা " +"মিডিয়াটো ষ্ট্ৰিম কৰিব নোৱাৰি." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:336 +msgid "Remove a profile" +msgstr "প্ৰফাইল এটা আতঁৰ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:337 +msgid "Select the profile you would like to remove:" +msgstr "আপুনি আতঁৰ কৰিবলৈ বিচৰা ফাইলটো নিৰ্বাচন কৰক:" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:486 +msgid "Save as new profile" +msgstr "নতুন প্ৰফাইলৰ দৰে ছেভ কৰক" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:535 +msgid "%@ stream to %@:%@" +msgstr "%@:%@ লৈ %@ ষ্ট্ৰিম" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:544 +msgid "No Address given" +msgstr "কোনো ঠিকনা দিয়া নাই" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:546 +msgid "In order to stream, a valid destination address is required." +msgstr "ষ্ট্ৰিমৰ বাবে এটা বৈধ গন্তব্যস্থানৰ ঠিকনা প্ৰয়োজন." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:551 +msgid "No Channel Name given" +msgstr "কোনো চেনেল নাম দিয়া নাই" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:553 +msgid "" +"SAP stream announcement is enabled. However, no channel name is provided." +msgstr "SAP ষ্ট্ৰিম ঘোষণাটো সক্ষম কৰা হৈছে. সেইদৰে কোনো চেনেলৰ নাম দিয়া নাই." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:558 +msgid "No SDP URL given" +msgstr "কোনো SDP URL দিয়া নাই" + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:560 +msgid "A SDP export is requested, but no URL is provided." +msgstr "এটা SDP ৰপ্তানি দাবী কৰা হৈছে, কিন্তু কোনো URL দিয়া নাই." + +#: modules/gui/macosx/VLCConvertAndSaveWindowController.m:1060 +#: modules/gui/macosx/VLCSimplePrefsController.m:705 +#: modules/gui/macosx/VLCSimplePrefsController.m:733 +#: modules/gui/macosx/VLCSimplePrefsController.m:1266 +#: modules/gui/qt/components/simple_preferences.cpp:711 +msgid "Custom" +msgstr "ব্যৱস্থা কৰক" + +#: modules/gui/macosx/VLCCoreDialogProvider.m:195 +msgid "Remember" +msgstr "" + +#: modules/gui/macosx/VLCCoreInteraction.m:485 +msgid "Random On" +msgstr "বিশৃংখল আৰম্ভ" + +#: modules/gui/macosx/VLCCoreInteraction.m:555 +msgid "Repeat Off" +msgstr "পুনৰাবৃত্তি বন্ধ" + +#: modules/gui/macosx/VLCErrorWindowController.m:55 +msgid "Errors and Warnings" +msgstr "ভুল আৰু সতৰ্কীকৰণবোৰ" + +#: modules/gui/macosx/VLCErrorWindowController.m:56 +msgid "Clean up" +msgstr "খালী কৰক" + +#: modules/gui/macosx/VLCFSPanelController.m:123 +msgid "Play/Pause the current media" +msgstr "" + +#: modules/gui/macosx/VLCFSPanelController.m:129 +msgid "Go to the previous item" +msgstr "" + +#: modules/gui/macosx/VLCFSPanelController.m:137 +#: modules/gui/macosx/VLCFSPanelController.m:138 +msgid "Leave fullscreen" +msgstr "" + +#: modules/gui/macosx/VLCFSPanelController.m:140 +#: modules/gui/macosx/VLCMainWindowControlsBar.m:80 +#: modules/gui/qt/dialogs/toolbar.cpp:477 modules/gui/qt/ui/sprefs_audio.h:409 +msgid "Volume" +msgstr "প্ৰসাৰ" + +#: modules/gui/macosx/VLCFSPanelController.m:141 +msgid "Adjust the volume" +msgstr "" + +#: modules/gui/macosx/VLCFSPanelController.m:144 +msgid "Adjust the current playback position" +msgstr "" + +#: modules/gui/macosx/VLCFSPanelController.m:325 +#: modules/gui/macosx/VLCMainWindowControlsBar.m:78 +#: modules/gui/macosx/VLCMainWindowControlsBar.m:503 +#, c-format +msgid "Volume: %i %%" +msgstr "" + +#: modules/gui/macosx/VLCHelpWindowController.m:47 +msgid "VLC media player Help" +msgstr "" + +#: modules/gui/macosx/VLCHelpWindowController.m:50 +#: modules/gui/macosx/VLCMainMenu.m:467 modules/gui/macosx/VLCMainMenu.m:1101 +msgid "Index" +msgstr "সূচী" + +#: modules/gui/macosx/VLCInputManager.m:478 +#: modules/gui/macosx/VLCInputManager.m:505 +msgid "VLC media playback" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:94 +#: modules/gui/qt/dialogs/messages.cpp:77 +#: modules/gui/qt/ui/messages_panel.h:136 +#: modules/gui/qt/ui/messages_panel.h:140 +msgid "Messages" +msgstr "বাৰ্তাবোৰ" + +#: modules/gui/macosx/VLCLogWindowController.m:104 +msgid "Save log" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:105 +msgid "Save the debug log to a file" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:107 +msgid "Refresh log" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:108 +msgid "Refresh the log output" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:110 +msgid "Clear log" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:111 +msgid "Clear the log output" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:113 +msgid "Toggle details" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:114 +msgid "Show/hide details about a log message" +msgstr "" + +#: modules/gui/macosx/VLCLogWindowController.m:198 +#, c-format +msgid "VLC Debug Log (%s).txt" +msgstr "" + +#: modules/gui/macosx/VLCMain+OldPrefs.m:118 +msgid "Remove old preferences?" +msgstr "পুৰণি পছন্দবোৰ আতঁৰ কৰে নে?" + +#: modules/gui/macosx/VLCMain+OldPrefs.m:119 +msgid "We just found an older version of VLC's preferences files." +msgstr "VLC ৰ পছন্দবোৰৰ ফাইলবোৰৰ আমি মাত্ৰ পুৰণি সংস্কৰণ এটা বিচাৰি পাইছো." + +#: modules/gui/macosx/VLCMain+OldPrefs.m:120 +msgid "Move To Trash and Relaunch VLC" +msgstr "ট্ৰেছলৈ যাওক আৰু VLC পুনৰ আৰম্ভ কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:249 +#, c-format +msgid "Level %i" +msgstr "স্তৰ %i" + +#: modules/gui/macosx/VLCMainMenu.m:288 +#: modules/text_renderer/freetype/freetype.c:124 +msgid "Smaller" +msgstr "অধিক সৰু" + +#: modules/gui/macosx/VLCMainMenu.m:289 +#: modules/text_renderer/freetype/freetype.c:124 +msgid "Small" +msgstr "সৰু" + +#: modules/gui/macosx/VLCMainMenu.m:291 +#: modules/text_renderer/freetype/freetype.c:124 +msgid "Large" +msgstr "ডাঙৰ" + +#: modules/gui/macosx/VLCMainMenu.m:292 +#: modules/text_renderer/freetype/freetype.c:124 +msgid "Larger" +msgstr "অধিক ডাঙৰ" + +#: modules/gui/macosx/VLCMainMenu.m:341 +msgid "Check for Update..." +msgstr "আপডেটৰ বাবে পৰীক্ষা কৰক..." + +#: modules/gui/macosx/VLCMainMenu.m:342 +msgid "Preferences..." +msgstr "পছন্দবোৰ..." + +#: modules/gui/macosx/VLCMainMenu.m:348 +msgid "Services" +msgstr "সেৱাবোৰ" + +#: modules/gui/macosx/VLCMainMenu.m:349 +msgid "Hide VLC" +msgstr "VLC লুকুৱাওক" + +#: modules/gui/macosx/VLCMainMenu.m:350 +msgid "Hide Others" +msgstr "অন্যবোৰ লুকুৱাওক" + +#: modules/gui/macosx/VLCMainMenu.m:351 +#: modules/gui/macosx/VLCSimplePrefsController.m:391 +msgid "Show All" +msgstr "সকলোবোৰ দেখুৱাওক" + +#: modules/gui/macosx/VLCMainMenu.m:352 +msgid "Quit VLC" +msgstr "VLC ত্যাগ কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:354 +msgid "1:File" +msgstr "1:ফাইল" + +#: modules/gui/macosx/VLCMainMenu.m:355 +msgid "Advanced Open File..." +msgstr "আগতীয়াকৈ খোলা ফাইল..." + +#: modules/gui/macosx/VLCMainMenu.m:356 +msgid "Open File..." +msgstr "ফাইল খোলক..." + +#: modules/gui/macosx/VLCMainMenu.m:357 +msgid "Open Disc..." +msgstr "ডিস্ক খোলক..." + +#: modules/gui/macosx/VLCMainMenu.m:358 +msgid "Open Network..." +msgstr "নেটৱৰ্ক খোলক..." + +#: modules/gui/macosx/VLCMainMenu.m:359 +msgid "Open Capture Device..." +msgstr "অধিগ্ৰহণ কৰা ডিভাইচ খোলক..." + +#: modules/gui/macosx/VLCMainMenu.m:360 +msgid "Open Recent" +msgstr "এইমাত্ৰ খোলা" + +#: modules/gui/macosx/VLCMainMenu.m:361 +msgid "Close Window" +msgstr "উইণ্ডো বন্ধ কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:362 +msgid "Convert / Stream..." +msgstr "ৰূপান্তৰ / ষ্ট্ৰিম কৰক..." + +#: modules/gui/macosx/VLCMainMenu.m:363 +msgid "Save Playlist..." +msgstr "প্লেলিষ্ট ছেভ কৰক..." + +#: modules/gui/macosx/VLCMainMenu.m:364 modules/gui/macosx/VLCPlaylist.m:229 +msgid "Reveal in Finder" +msgstr "বিচাৰি উলিওৱাটোত প্ৰকাশ কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:367 +msgid "Cut" +msgstr "কাট কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:368 +msgid "Copy" +msgstr "প্ৰতিলিপি কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:369 +msgid "Paste" +msgstr "আঠা লগাওক" + +#: modules/gui/macosx/VLCMainMenu.m:371 modules/gui/macosx/VLCPlaylist.m:227 +msgid "Select All" +msgstr "সকলোবোৰ নিৰ্বাচন কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:372 +msgid "Find" +msgstr "" + +#: modules/gui/macosx/VLCMainMenu.m:374 +msgid "View" +msgstr "চাওক" + +#: modules/gui/macosx/VLCMainMenu.m:375 modules/gui/macosx/macosx.m:116 +msgid "Show Previous & Next Buttons" +msgstr "আগৰ & পৰৱৰ্তী বাটনবোৰ দেখুৱাওক" + +#: modules/gui/macosx/VLCMainMenu.m:377 modules/gui/macosx/macosx.m:119 +msgid "Show Shuffle & Repeat Buttons" +msgstr "ওলোট-পালট & পুনৰাবৃত্তিৰ বাটনবোৰ দেখুৱাওক" + +#: modules/gui/macosx/VLCMainMenu.m:379 modules/gui/macosx/macosx.m:122 +msgid "Show Audio Effects Button" +msgstr "অডিঅ' প্ৰভাৱবোৰৰ বাটন দেখুৱাওক" + +#: modules/gui/macosx/VLCMainMenu.m:381 +msgid "Show Sidebar" +msgstr "কাষৰ বাৰটো দেখুৱাওক" + +#: modules/gui/macosx/VLCMainMenu.m:382 +msgid "Playlist Table Columns" +msgstr "প্লেলিষ্ট তালিকাৰ স্তম্ভবোৰ" + +#: modules/gui/macosx/VLCMainMenu.m:384 +msgid "Playback" +msgstr "প্লেবেক" + +#: modules/gui/macosx/VLCMainMenu.m:390 +msgid "Playback Speed" +msgstr "প্লেবেক গতি" + +#: modules/gui/macosx/VLCMainMenu.m:394 +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:48 +msgid "Track Synchronization" +msgstr "পথ ছিনক্ৰনাইজেশ্বন" + +#: modules/gui/macosx/VLCMainMenu.m:400 +#: modules/gui/qt/components/controller.hpp:110 +msgid "A→B Loop" +msgstr "A→B লুপ" + +#: modules/gui/macosx/VLCMainMenu.m:401 +msgid "Quit after Playback" +msgstr "প্লেবেকৰ পিছত ত্যাগ কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:402 +msgid "Step Forward" +msgstr "আগলৈ খোজ দিয়ক" + +#: modules/gui/macosx/VLCMainMenu.m:403 +msgid "Step Backward" +msgstr "পিছলৈ যাওক" + +#: modules/gui/macosx/VLCMainMenu.m:404 +#: modules/gui/macosx/VLCTimeSelectionPanelController.m:53 +msgid "Jump to Time" +msgstr "সময়টোলৈ জপিয়াওক" + +#: modules/gui/macosx/VLCMainMenu.m:405 +msgid "Renderer" +msgstr "" + +#: modules/gui/macosx/VLCMainMenu.m:406 +msgid "No renderer" +msgstr "" + +#: modules/gui/macosx/VLCMainMenu.m:415 +msgid "Increase Volume" +msgstr "প্ৰসাৰ বঢ়াওক" + +#: modules/gui/macosx/VLCMainMenu.m:416 +msgid "Decrease Volume" +msgstr "প্ৰসাৰ হ্ৰাস কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:422 modules/gui/macosx/VLCMainMenu.m:423 +msgid "Audio Device" +msgstr "অডিঅ' ডিভাইচ" + +#: modules/gui/macosx/VLCMainMenu.m:428 +msgid "Half Size" +msgstr "অৰ্ধ আকাৰ" + +#: modules/gui/macosx/VLCMainMenu.m:429 +msgid "Normal Size" +msgstr "স্বাভাৱিক আকাৰ" + +#: modules/gui/macosx/VLCMainMenu.m:430 +msgid "Double Size" +msgstr "দ্বিগুণ আকাৰ" + +#: modules/gui/macosx/VLCMainMenu.m:431 +msgid "Fit to Screen" +msgstr "স্ক্ৰীনত খাপ খুৱাওক" + +#: modules/gui/macosx/VLCMainMenu.m:433 +#: modules/gui/macosx/VLCSimplePrefsController.m:371 +msgid "Float on Top" +msgstr "ওপৰলৈ ফ্লট কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:441 modules/gui/macosx/VLCMainMenu.m:442 +#: modules/gui/macosx/VLCSimplePrefsController.m:378 +#: modules/gui/qt/ui/sprefs_video.h:316 +msgid "Fullscreen Video Device" +msgstr "সম্পূৰ্ণ দৃশ্যৰ ভিডিঅ' ডিভাইচ" + +#: modules/gui/macosx/VLCMainMenu.m:447 modules/gui/macosx/VLCMainMenu.m:448 +#: modules/video_filter/postproc.c:201 +msgid "Post processing" +msgstr "পূৰ্বে প্ৰক্ৰিয়া কৰা" + +#: modules/gui/macosx/VLCMainMenu.m:451 +msgid "Add Subtitle File..." +msgstr "ওলোট-পালট কৰা ফাইল যোগ কৰক..." + +#: modules/gui/macosx/VLCMainMenu.m:452 modules/gui/macosx/VLCMainMenu.m:453 +msgid "Subtitles Track" +msgstr "উপশিৰোনামবোৰৰ পথ" + +#: modules/gui/macosx/VLCMainMenu.m:454 +msgid "Text Size" +msgstr "টেক্সটৰ আকাৰ" + +#: modules/gui/macosx/VLCMainMenu.m:455 +msgid "Text Color" +msgstr "টেক্সটৰ ৰং" + +#: modules/gui/macosx/VLCMainMenu.m:456 +msgid "Outline Thickness" +msgstr "আউটলাইনৰ ডাঠ" + +#: modules/gui/macosx/VLCMainMenu.m:462 modules/gui/macosx/VLCMainMenu.m:463 +msgid "Background Opacity" +msgstr "পটভূমিৰ স্বচ্ছতা" + +#: modules/gui/macosx/VLCMainMenu.m:464 +msgid "Background Color" +msgstr "পটভূমিৰ ৰং" + +#: modules/gui/macosx/VLCMainMenu.m:466 +msgid "Transparent" +msgstr "স্বচ্ছ" + +#: modules/gui/macosx/VLCMainMenu.m:473 +msgid "Window" +msgstr "উইণ্ডো" + +#: modules/gui/macosx/VLCMainMenu.m:474 +msgid "Minimize" +msgstr "সৰু কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:476 +msgid "Player..." +msgstr "প্লেয়াৰ..." + +#: modules/gui/macosx/VLCMainMenu.m:477 +msgid "Main Window..." +msgstr "মুখ্য উইণ্ডো..." + +#: modules/gui/macosx/VLCMainMenu.m:478 +msgid "Audio Effects..." +msgstr "অডিঅ' প্ৰভাৱবোৰ..." + +#: modules/gui/macosx/VLCMainMenu.m:479 +msgid "Video Effects..." +msgstr "ভিডিঅ' প্ৰভাৱবোৰ..." + +#: modules/gui/macosx/VLCMainMenu.m:480 +msgid "Bookmarks..." +msgstr "পৃষ্ঠাসংকেতবোৰ..." + +#: modules/gui/macosx/VLCMainMenu.m:481 +msgid "Playlist..." +msgstr "প্লেলিষ্ট..." + +#: modules/gui/macosx/VLCMainMenu.m:482 modules/gui/macosx/VLCPlaylist.m:228 +msgid "Media Information..." +msgstr "মিডিয়া তথ্য..." + +#: modules/gui/macosx/VLCMainMenu.m:483 +msgid "Messages..." +msgstr "বাৰ্তা..." + +#: modules/gui/macosx/VLCMainMenu.m:484 +msgid "Errors and Warnings..." +msgstr "ভুল আৰু সতৰ্কীকৰণবোৰ..." + +#: modules/gui/macosx/VLCMainMenu.m:486 +msgid "Bring All to Front" +msgstr "সকলোবোৰ সন্মুখলৈ আনক" + +#: modules/gui/macosx/VLCMainMenu.m:488 modules/gui/qt/dialogs/help.cpp:52 +#: modules/gui/qt/menus.cpp:956 modules/gui/qt/menus.cpp:1143 +msgid "Help" +msgstr "সহায় কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:489 +msgid "VLC media player Help..." +msgstr "VLC মিডিয়া প্লেয়াৰ সহায়..." + +#: modules/gui/macosx/VLCMainMenu.m:491 +msgid "Online Documentation..." +msgstr "অনলাইন ডকুমেন্টেশ্বন..." + +#: modules/gui/macosx/VLCMainMenu.m:492 +msgid "VideoLAN Website..." +msgstr "ভিডিঅ'LAN ৱেবছাইট..." + +#: modules/gui/macosx/VLCMainMenu.m:493 +msgid "Make a donation..." +msgstr "বৰঙণি এটা দিয়ক..." + +#: modules/gui/macosx/VLCMainMenu.m:494 +msgid "Online Forum..." +msgstr "অনলাইন ফৰাম..." + +#: modules/gui/macosx/VLCMainMenu.m:1158 +msgid "File Format:" +msgstr "ফাইল ফৰমেট:" + +#: modules/gui/macosx/VLCMainMenu.m:1159 +msgid "Extended M3U" +msgstr "সম্প্ৰসাৰিত M3U" + +#: modules/gui/macosx/VLCMainMenu.m:1160 +msgid "XML Shareable Playlist Format (XSPF)" +msgstr "XML সন্ধানযোগ্য প্লেলিষ্ট ফৰমেট (XSPF)" + +#: modules/gui/macosx/VLCMainMenu.m:1161 +#: modules/gui/qt/dialogs_provider.cpp:659 +msgid "HTML playlist" +msgstr "HTML প্লেলিষ্ট" + +#: modules/gui/macosx/VLCMainMenu.m:1163 +msgid "Save Playlist" +msgstr "প্লেলিষ্ট ছেভ কৰক" + +#: modules/gui/macosx/VLCMainMenu.m:1460 modules/gui/macosx/macosx.m:111 +msgid "Lock Aspect Ratio" +msgstr "দৃষ্টিকোণৰ অনুপাত ল'ক কৰক" + +#: modules/gui/macosx/VLCMainWindow.m:193 +msgid "Search in Playlist" +msgstr "প্লেলিষ্টত সন্ধান কৰক" + +#: modules/gui/macosx/VLCMainWindow.m:195 +msgid "Search the playlist. Results will be selected in the table." +msgstr "" + +#: modules/gui/macosx/VLCMainWindow.m:216 +msgid "Open a dialog to select the media to play" +msgstr "" + +#: modules/gui/macosx/VLCMainWindow.m:220 +#: modules/gui/macosx/VLCMainWindow.m:226 +#: modules/gui/qt/components/playlist/selector.cpp:593 +msgid "Subscribe" +msgstr "ছাবস্ক্ৰাইব কৰক" + +#: modules/gui/macosx/VLCMainWindow.m:221 +#: modules/gui/macosx/VLCMainWindow.m:232 +#: modules/gui/qt/components/playlist/selector.cpp:610 +msgid "Unsubscribe" +msgstr "ছাবস্ক্ৰাইব নকৰিব" + +#: modules/gui/macosx/VLCMainWindow.m:224 +#: modules/gui/qt/components/playlist/selector.cpp:279 +msgid "Subscribe to a podcast" +msgstr "পডকাষ্টলৈ ছাবস্ক্ৰাইব কৰক" + +#: modules/gui/macosx/VLCMainWindow.m:225 +#: modules/gui/qt/components/playlist/selector.cpp:594 +msgid "Enter URL of the podcast to subscribe to:" +msgstr "ছাবস্ক্ৰাইব কৰিবলৈ পডকাষ্টটোৰ URL ভৰাওক: ...লৈ" + +#: modules/gui/macosx/VLCMainWindow.m:230 +msgid "Unsubscribe from a podcast" +msgstr "পডকাষ্ট এটাৰ পৰা ছাবস্ক্ৰাইব কৰক" + +#: modules/gui/macosx/VLCMainWindow.m:231 +msgid "Select the podcast you would like to unsubscribe from:" +msgstr "আপুনি ছাবস্ক্ৰাইপ কৰিব নিবিচৰা পডকাষ্টটো নিৰ্বাচন কৰক:" + +#: modules/gui/macosx/VLCMainWindow.m:257 +msgid "Check for album art and metadata?" +msgstr "এলবামৰ চিত্ৰ আৰু মেটাডাটাৰ বাবে পৰীক্ষা কৰে নে?" + +#: modules/gui/macosx/VLCMainWindow.m:257 +msgid "Enable Metadata Retrieval" +msgstr "মেটাডাটাৰ উদ্ধাৰটো সক্ষম কৰক" + +#: modules/gui/macosx/VLCMainWindow.m:257 +msgid "No, Thanks" +msgstr "নালাগে, ধন্যবাদ" + +#: modules/gui/macosx/VLCMainWindow.m:257 +msgid "" +"VLC can check online for album art and metadata to enrich your playback " +"experience, e.g. by providing track information when playing Audio CDs. To " +"provide this functionality, VLC will send information about your contents to " +"trusted services in an anonymized form." +msgstr "" +"ষ্ট্ৰিম ফিল্টাৰবোৰ হল বিশেষ মডুল যিয়ে VLC ৰ ইনপুটৰ ফালে উন্নত কাৰ্যবোৰৰ 30 অনুমতি " +"দিয়ে. সতৰ্কতাৰে ব্যৱহাৰ কৰক. এইটো হল ব্যৱহাৰ কৰিবলৈ ডিফল্ট অডিঅ' CD চলায়. ড্ৰাইভ " +"আখৰটোৰ পিছত কলনটো VLC দিবলৈ নাপাহৰিব." + +#: modules/gui/macosx/VLCMainWindowControlsBar.m:68 +msgid "Show/Hide Playlist" +msgstr "প্লেলিষ্ট দেখুৱাওক/লুকুৱাওক" + +#: modules/gui/macosx/VLCMainWindowControlsBar.m:71 +#: modules/gui/qt/dialogs/vlm.cpp:542 share/lua/http/index.html:259 +msgid "Repeat" +msgstr "পুনৰাবৃত্তি কৰক" + +#: modules/gui/macosx/VLCMainWindowControlsBar.m:72 +msgid "Change repeat mode. Modes: repeat one, repeat all and no repeat." +msgstr "" + +#: modules/gui/macosx/VLCMainWindowControlsBar.m:75 +#: share/lua/http/index.html:257 +msgid "Shuffle" +msgstr "ওলোট-পালট কৰক" + +#: modules/gui/macosx/VLCMainWindowControlsBar.m:85 +msgid "Full Volume" +msgstr "সম্পূৰ্ণ প্ৰসাৰ" + +#: modules/gui/macosx/VLCMainWindowControlsBar.m:89 +msgid "Open Audio Effects window" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:130 +msgid "Open Source" +msgstr "মুক্ত উত্স" + +#: modules/gui/macosx/VLCOpenWindowController.m:131 +msgid "Media Resource Locator (MRL)" +msgstr "মিডিয়া গৱেষণা নিৰূপক (MRL)" + +#: modules/gui/macosx/VLCOpenWindowController.m:133 +#: modules/gui/macosx/VLCOpenWindowController.m:193 +#: modules/gui/macosx/VLCOpenWindowController.m:584 +#: modules/gui/macosx/VLCOpenWindowController.m:670 +#: modules/gui/macosx/VLCOpenWindowController.m:902 +#: modules/gui/macosx/VLCOpenWindowController.m:1286 +#: modules/gui/qt/components/controller.hpp:107 +msgid "Open" +msgstr "খোলক" + +#: modules/gui/macosx/VLCOpenWindowController.m:136 +msgid "Stream output:" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:137 +msgid "Settings..." +msgstr "ছেটিংবোৰ..." + +#: modules/gui/macosx/VLCOpenWindowController.m:139 +msgid "Choose media input type" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:141 +msgid "Disc" +msgstr "ডিস্ক" + +#: modules/gui/macosx/VLCOpenWindowController.m:142 +#: modules/gui/macosx/VLCSimplePrefsController.m:310 +#: modules/gui/qt/ui/sprefs_input.h:368 +msgid "Network" +msgstr "নেটৱৰ্ক" + +#: modules/gui/macosx/VLCOpenWindowController.m:143 +msgid "Capture" +msgstr "অধিগ্ৰহণ কৰক" + +#: modules/gui/macosx/VLCOpenWindowController.m:145 +#: modules/gui/macosx/VLCOpenWindowController.m:346 +msgid "Choose a file" +msgstr "ফাইল এটা পছন্দ কৰক" + +#: modules/gui/macosx/VLCOpenWindowController.m:148 +#: modules/gui/macosx/VLCOpenWindowController.m:351 +msgid "Select a file for playback" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:149 +msgid "Treat as a pipe rather than as a file" +msgstr "ফাইল এটাৰ পৰিৱৰ্তে পাইপ এটাৰ দৰে শুশ্ৰুষা কৰক" + +#: modules/gui/macosx/VLCOpenWindowController.m:151 +msgid "Play another media synchronously" +msgstr "সমসাময়িকভাৱে অন্য এট মিডিয়া চলাওক" + +#: modules/gui/macosx/VLCOpenWindowController.m:152 +#: modules/gui/macosx/VLCOpenWindowController.m:349 +#: modules/gui/macosx/VLCSimplePrefsController.m:353 +#: modules/gui/qt/ui/sprefs_interface.h:552 +msgid "Choose..." +msgstr "পছন্দ কৰক..." + +#: modules/gui/macosx/VLCOpenWindowController.m:153 +msgid "Select another file to play in sync with the previously selected file" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:158 +msgid "Custom playback" +msgstr "প্লেবেকৰ ব্যৱস্থা কৰক" + +#: modules/gui/macosx/VLCOpenWindowController.m:166 +msgid "Open VIDEO_TS / BDMV folder" +msgstr "VIDEO_TS / BDMV ফোল্ডাৰ খোলক" + +#: modules/gui/macosx/VLCOpenWindowController.m:167 +msgid "Insert Disc" +msgstr "ডিস্ক ভৰাওক" + +#: modules/gui/macosx/VLCOpenWindowController.m:173 +msgid "Disable DVD menus" +msgstr "DVD তালিকাবোৰ অক্ষম কৰক" + +#: modules/gui/macosx/VLCOpenWindowController.m:176 +msgid "Enable DVD menus" +msgstr "DVD তালিকাবোৰ সক্ষম কৰক" + +#: modules/gui/macosx/VLCOpenWindowController.m:186 +#: modules/stream_out/chromecast/cast.cpp:226 +msgid "IP Address" +msgstr "IP ঠিকনা" + +#: modules/gui/macosx/VLCOpenWindowController.m:189 +msgid "" +"To Open a usual network stream (HTTP, RTSP, RTMP, MMS, FTP, etc.), just " +"enter the URL in the field above. If you want to open a RTP or UDP stream, " +"press the button below." +msgstr "" +"সাধাৰণ নেটৱৰ্ক ষ্ট্ৰিম এটা খুলিবলৈ (HTTP, RTSP, RTMP, MMS, FTP, etc.), মাত্ৰ URL " +"টো ভৰাওক ওপৰৰ ক্ষেত্ৰখনত. যদি আপুনি RTP বা UDP ষ্ট্ৰিম এটা খুলিব বিচাৰে, তেন্তে তলৰ " +"বাটনটোত ক্লিক কৰক." + +#: modules/gui/macosx/VLCOpenWindowController.m:190 +msgid "" +"If you want to open a multicast stream, enter the respective IP address " +"given by the stream provider. In unicast mode, VLC will use your machine's " +"IP automatically.\n" +"\n" +"To open a stream using a different protocol, just press Cancel to close this " +"sheet." +msgstr "" +"যেতিয়া এই ধৰণটো সক্ষম কৰে, IP ঠিকনা পিক্সেলবোৰ কলা বা বগাৰ দৰে দেখুওৱা হব. " +"থ্ৰেছহল্ড মানবোৰ VLC তলত দিয়াৰ দৰে IP স্বয়ংক্ৰিয়ভাৱে হব লাগে.\n" +"\n" +"ব্যৱহাৰ কৰিবলৈ ডেকসংযোগ অধিগ্ৰহণ কাৰ্ড, যদি বিভিন্ন বৰ্তি থাকে. কাৰ্ডবোৰ পৰা সংখ্যা " +"কৰা হয়" + +#: modules/gui/macosx/VLCOpenWindowController.m:191 +msgid "" +"Enter a stream URL here. To open RTP or UDP streams, use the respective " +"button below." +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:194 +msgid "Open RTP/UDP Stream" +msgstr "RTP/UDP ষ্ট্ৰিম খোলক" + +#: modules/gui/macosx/VLCOpenWindowController.m:196 +#: share/lua/http/dialogs/stream_config_window.html:24 +#: share/lua/http/dialogs/stream_window.html:83 +msgid "Protocol" +msgstr "প্ৰটকল" + +#: modules/gui/macosx/VLCOpenWindowController.m:199 +#: modules/gui/macosx/VLCOpenWindowController.m:1017 +#: modules/gui/macosx/VLCOpenWindowController.m:1077 +msgid "Unicast" +msgstr "ইউনিকাষ্ট" + +#: modules/gui/macosx/VLCOpenWindowController.m:200 +#: modules/gui/macosx/VLCOpenWindowController.m:1030 +#: modules/gui/macosx/VLCOpenWindowController.m:1090 +msgid "Multicast" +msgstr "মাল্টিকাষ্ট" + +#: modules/gui/macosx/VLCOpenWindowController.m:206 +#: modules/gui/macosx/VLCOpenWindowController.m:507 +#: modules/gui/macosx/VLCOpenWindowController.m:1168 +msgid "Input Devices" +msgstr "ইনপুট ডিভাইচবোৰ" + +#: modules/gui/macosx/VLCOpenWindowController.m:210 +msgid "Subscreen left" +msgstr "উপস্ক্ৰীন বাওঁফালে" + +#: modules/gui/macosx/VLCOpenWindowController.m:211 +msgid "Subscreen top" +msgstr "উপস্ক্ৰীন সোঁফালে" + +#: modules/gui/macosx/VLCOpenWindowController.m:212 +msgid "Subscreen Width" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:213 +msgid "Subscreen Height" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:215 +msgid "Capture Audio" +msgstr "অডিঅ' অধিগ্ৰহণ কৰক" + +#: modules/gui/macosx/VLCOpenWindowController.m:345 +msgid "Add Subtitle File:" +msgstr "উপশিৰোনাম ফাইল যোগ কৰক:" + +#: modules/gui/macosx/VLCOpenWindowController.m:350 +msgid "Setup subtitle playback details" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:353 +msgid "Select a subtitle file" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:354 +msgid "Override parameters" +msgstr "পেৰামিটাৰবোৰ অভাৰৰাইড কৰক" + +#: modules/gui/macosx/VLCOpenWindowController.m:357 +msgid "FPS" +msgstr "FPS" + +#: modules/gui/macosx/VLCOpenWindowController.m:359 +msgid "Subtitle encoding" +msgstr "উপশিৰোনাম এনকোডিং" + +#: modules/gui/macosx/VLCOpenWindowController.m:361 +#: modules/gui/macosx/VLCSimplePrefsController.m:355 +#: modules/gui/qt/ui/sprefs_subtitles.h:299 +msgid "Font size" +msgstr "ফন্টৰ আকাৰ" + +#: modules/gui/macosx/VLCOpenWindowController.m:363 +msgid "Subtitle alignment" +msgstr "উপশিৰোনামৰ শাৰীকৰণ" + +#: modules/gui/macosx/VLCOpenWindowController.m:366 +msgid "Dismiss the subtitle setup dialog" +msgstr "" + +#: modules/gui/macosx/VLCOpenWindowController.m:367 +msgid "Font Properties" +msgstr "ফন্ট বৈশিষ্ট্যবোৰ" + +#: modules/gui/macosx/VLCOpenWindowController.m:368 +msgid "Subtitle File" +msgstr "উপশিৰোনাম ফাইল" + +#: modules/gui/macosx/VLCOpenWindowController.m:370 +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:52 +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:56 +msgid "s" +msgstr "s" + +#: modules/gui/macosx/VLCOpenWindowController.m:371 +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:59 +msgid "fps" +msgstr "fps" + +#: modules/gui/macosx/VLCOpenWindowController.m:583 +#: modules/gui/macosx/VLCOpenWindowController.m:669 +#: modules/gui/macosx/VLCOpenWindowController.m:1285 +#: modules/gui/qt/ui/open_file.h:141 +msgid "Open File" +msgstr "ফাইল খোলক" + +#: modules/gui/macosx/VLCOpenWindowController.m:768 +#, c-format +msgid "%i tracks" +msgstr "%i পথবোৰ" + +#: modules/gui/macosx/VLCOutput.m:61 +msgid "Streaming and Transcoding Options" +msgstr "ষ্ট্ৰিম কৰা আৰু ট্ৰেন্সকোড কৰা বিকল্পবোৰ" + +#: modules/gui/macosx/VLCOutput.m:63 +msgid "Display the stream locally" +msgstr "ষ্ট্ৰিমটো স্থানীয়ভাৱে প্ৰদৰ্শন কৰক" + +#: modules/gui/macosx/VLCOutput.m:66 modules/gui/qt/dialogs/convert.cpp:107 +msgid "Dump raw input" +msgstr "ৰ' ইনপুট জমা কৰক" + +#: modules/gui/macosx/VLCOutput.m:77 +msgid "Encapsulation Method" +msgstr "এনকেপশ্বুলেশ্বন পদ্ধতি" + +#: modules/gui/macosx/VLCOutput.m:81 +msgid "Transcoding options" +msgstr "ট্ৰেন্সকোড কৰা বিকল্পবোৰ" + +#: modules/gui/macosx/VLCOutput.m:85 modules/gui/macosx/VLCOutput.m:95 +msgid "Bitrate (kb/s)" +msgstr "বিট হাৰ (kb/s)" + +#: modules/gui/macosx/VLCOutput.m:102 +msgid "Stream Announcing" +msgstr "ষ্ট্ৰিম ঘোষণা" + +#: modules/gui/macosx/VLCOutput.m:413 +#: modules/gui/qt/components/preferences_widgets.cpp:302 +msgid "Save File" +msgstr "ফাইল ছেভ কৰক" + +#: modules/gui/macosx/VLCPlaylist.m:90 +msgid "Track Number" +msgstr "পথ সংখ্যা" + +#: modules/gui/macosx/VLCPlaylist.m:93 +#: modules/gui/qt/components/playlist/sorting.h:61 +msgid "Duration" +msgstr "সময়সীমা" + +#: modules/gui/macosx/VLCPlaylist.m:99 +#: modules/gui/qt/components/playlist/sorting.h:67 +msgid "URI" +msgstr "URI" + +#: modules/gui/macosx/VLCPlaylist.m:100 +msgid "File Size" +msgstr "ফাইলৰ আকাৰ" + +#: modules/gui/macosx/VLCPlaylist.m:225 +msgid "Expand All" +msgstr "" + +#: modules/gui/macosx/VLCPlaylist.m:226 +msgid "Collapse All" +msgstr "" + +#: modules/gui/macosx/VLCPlaylist.m:231 +#: modules/gui/qt/components/playlist/standardpanel.cpp:274 +msgid "Shuffle playlist" +msgstr "" + +#: modules/gui/macosx/VLCPlaylistInfo.m:54 +#: modules/gui/qt/dialogs/mediainfo.cpp:54 +msgid "Media Information" +msgstr "মিডিয়া তথ্য" + +#: modules/gui/macosx/VLCPlaylistInfo.m:58 +msgid "Location" +msgstr "স্থান" + +#: modules/gui/macosx/VLCPlaylistInfo.m:61 +msgid "Save Metadata" +msgstr "মেটাডাটা ছেভ কৰক" + +#: modules/gui/macosx/VLCPlaylistInfo.m:63 +#: modules/visualization/visual/visual.c:122 +msgid "General" +msgstr "সাধাৰণ" + +#: modules/gui/macosx/VLCPlaylistInfo.m:64 +msgid "Codec Details" +msgstr "কোডেকৰ পূংখানুপূংখ বিৱৰণ" + +#: modules/gui/macosx/VLCPlaylistInfo.m:81 +msgid "Read at media" +msgstr "মিডিয়াত পঢ়ক" + +#: modules/gui/macosx/VLCPlaylistInfo.m:82 +#: modules/gui/qt/components/info_panels.cpp:578 +msgid "Input bitrate" +msgstr "বিট হাৰ ইনপুট কৰক" + +#: modules/gui/macosx/VLCPlaylistInfo.m:83 +msgid "Demuxed" +msgstr "ডিমাক্স কৰা হল" + +#: modules/gui/macosx/VLCPlaylistInfo.m:84 +msgid "Stream bitrate" +msgstr "ষ্ট্ৰিম বিট হাৰ" + +#: modules/gui/macosx/VLCPlaylistInfo.m:87 +#: modules/gui/macosx/VLCPlaylistInfo.m:92 +msgid "Decoded blocks" +msgstr "ব্লকবোৰ ডিকোড কৰা হল" + +#: modules/gui/macosx/VLCPlaylistInfo.m:88 +msgid "Displayed frames" +msgstr "ফ্ৰেমবোৰ প্ৰদৰ্শন কৰা হল" + +#: modules/gui/macosx/VLCPlaylistInfo.m:89 +msgid "Lost frames" +msgstr "ফ্ৰেমবোৰ হেৰালে" + +#: modules/gui/macosx/VLCPlaylistInfo.m:93 +msgid "Played buffers" +msgstr "বাফাৰবোৰ চলোৱা হল" + +#: modules/gui/macosx/VLCPlaylistInfo.m:94 +msgid "Lost buffers" +msgstr "বাফাৰবোৰ হেৰালে" + +#: modules/gui/macosx/VLCPlaylistInfo.m:335 +msgid "Error while saving meta" +msgstr "মেটা ছেভ কৰোতে ভুল ওলাইছে" + +#: modules/gui/macosx/VLCPlaylistInfo.m:336 +msgid "VLC was unable to save the meta data." +msgstr "মেটা ডাটা ছেভ কৰিবলৈ VLC অক্ষম হৈছিল." + +#: modules/gui/macosx/VLCResumeDialogController.m:48 modules/gui/qt/qt.cpp:197 +#: modules/gui/qt/ui/sprefs_interface.h:558 +msgid "Continue playback?" +msgstr "প্লেবেক অব্যাহত ৰাখে নে?" + +#: modules/gui/macosx/VLCResumeDialogController.m:49 +#: modules/gui/macosx/VLCSimplePrefsController.m:836 +#: modules/gui/qt/dialogs/firstrun.cpp:106 +msgid "Continue" +msgstr "অব্যাহত ৰাখক" + +#: modules/gui/macosx/VLCResumeDialogController.m:51 +msgid "Always continue media playback" +msgstr "" + +#: modules/gui/macosx/VLCResumeDialogController.m:62 +#: modules/gui/macosx/VLCResumeDialogController.m:94 +msgid "Restart playback" +msgstr "প্লেবেক পুনৰ আৰম্ভ কৰক" + +#: modules/gui/macosx/VLCResumeDialogController.m:69 +msgid "Playback of \"%@\" will continue at %@" +msgstr "\"%@\" ৰ প্লেবেকটো %@ ত অব্যাহত থাকিব" + +#: modules/gui/macosx/VLCSidebarDataSource.m:67 +msgid "LIBRARY" +msgstr "লাইব্ৰেৰী" + +#: modules/gui/macosx/VLCSidebarDataSource.m:72 +msgid "MY COMPUTER" +msgstr "মোৰ কম্পিউটাৰ" + +#: modules/gui/macosx/VLCSidebarDataSource.m:73 +msgid "DEVICES" +msgstr "ডিভাইচবোৰ" + +#: modules/gui/macosx/VLCSidebarDataSource.m:74 +msgid "LOCAL NETWORK" +msgstr "স্থানীয় নেটৱৰ্ক" + +#: modules/gui/macosx/VLCSidebarDataSource.m:75 +msgid "INTERNET" +msgstr "ইন্টাৰনেট" + +#: modules/gui/macosx/VLCSimplePrefsController.m:241 +#: modules/gui/qt/components/simple_preferences.cpp:248 +#: modules/gui/qt/components/simple_preferences.cpp:738 +#: modules/gui/qt/dialogs/plugins.cpp:382 +msgid "Interface Settings" +msgstr "ইন্টাৰফেছ ছেটিংবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:243 +#: modules/gui/qt/components/simple_preferences.cpp:250 +#: modules/gui/qt/components/simple_preferences.cpp:447 +msgid "Audio Settings" +msgstr "অডিঅ' ছেটিংবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:245 +#: modules/gui/qt/components/simple_preferences.cpp:252 +#: modules/gui/qt/components/simple_preferences.cpp:380 +msgid "Video Settings" +msgstr "ভিডিঅ' ছেটিংবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:247 +#: modules/gui/qt/components/simple_preferences.cpp:254 +#: modules/gui/qt/components/simple_preferences.cpp:894 +msgid "Subtitle & On Screen Display Settings" +msgstr "উপশিৰোনাম & স্ক্ৰীনত প্ৰদৰ্শন কৰা ছেটিংবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:249 +msgid "Input & Codec Settings" +msgstr "ইনপুট & কোডেক ছেটিংবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:282 +msgid "General Audio" +msgstr "সাধাৰণ অডিঅ'" + +#: modules/gui/macosx/VLCSimplePrefsController.m:283 +msgid "Preferred Audio language" +msgstr "অডিঅ' ভাষা পছন্দ কৰা হল" + +#: modules/gui/macosx/VLCSimplePrefsController.m:284 +msgid "Enable Last.fm submissions" +msgstr "Last.fm জমা দিয়াবোৰ সক্ষম কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:287 +msgid "Visualization" +msgstr "দৃশ্য" + +#: modules/gui/macosx/VLCSimplePrefsController.m:288 +msgid "Keep audio level between sessions" +msgstr "অধিবেশনবোৰৰ মাজত অডিঅ' স্তৰ ৰাখক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:289 +#: modules/gui/qt/ui/sprefs_audio.h:411 +msgid "Always reset audio start level to:" +msgstr "অডিঅ' আৰম্ভৰ স্তৰ সদায় পুনৰ ছেট কৰক: ...লৈ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:292 +#: modules/gui/qt/dialogs/vlm.cpp:486 +msgid "Change" +msgstr "সলনি কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:293 +msgid "Change Hotkey" +msgstr "হটকী সলনি কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:297 +msgid "Select an action to change the associated hotkey:" +msgstr "জড়িত হটকীটো সলনি কৰিবলৈ কাৰ্য এটা নিৰ্বাচন কৰক:" + +#: modules/gui/macosx/VLCSimplePrefsController.m:298 +#: modules/gui/qt/components/preferences_widgets.cpp:1145 +msgid "Action" +msgstr "কাৰ্য" + +#: modules/gui/macosx/VLCSimplePrefsController.m:299 +msgid "Shortcut" +msgstr "চমুপথ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:302 +#: modules/gui/qt/ui/sprefs_input.h:364 +msgid "Record directory or filename" +msgstr "নিৰ্দেশিকা বা ফাইল নাম ৰেকৰ্ড কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:304 +msgid "Directory or filename where the records will be stored" +msgstr "নিৰ্দেশিকা বা ফাইলনাম যত ৰেকৰ্ডবোৰ জমা কৰা হব" + +#: modules/gui/macosx/VLCSimplePrefsController.m:305 +msgid "Repair AVI Files" +msgstr "AVI ফাইলবোৰ মেৰামতি কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:306 +msgid "Default Caching Level" +msgstr "ডিফল্ট কেশ্বিং স্তৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:307 +#: modules/gui/qt/ui/open.h:261 +msgid "Caching" +msgstr "কেশ্ব কৰিছে" + +#: modules/gui/macosx/VLCSimplePrefsController.m:308 +msgid "" +"Use the complete preferences to configure custom caching values for each " +"access module." +msgstr "বিকল্পই আপোনাক দ্বাৰা ব্যৱহাৰ কৰা ইন্টাৰফেছবোৰ ৰূপৰেখা কৰিবলৈ অনুমতি দিয়ে." + +#: modules/gui/macosx/VLCSimplePrefsController.m:309 +msgid "Codecs / Muxers" +msgstr "কোডেকবোৰ / মাক্সাৰবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:312 +msgid "Post-Processing Quality" +msgstr "পিছত প্ৰক্ৰিয়া কৰাৰ মানদণ্ড" + +#: modules/gui/macosx/VLCSimplePrefsController.m:314 +msgid "Edit default application settings for network protocols" +msgstr "নেটৱৰ্ক প্ৰটকলবোৰৰ বাবে ডিফল্ট আবেদন ছেটিংবোৰ সম্পাদনা কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:318 +msgid "Open network streams using the following protocols" +msgstr "নিম্নোক্ত প্ৰটকলবোৰ ব্যৱহাৰ কৰি নেটৱৰ্ক ষ্ট্ৰিমবোৰ খোলক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:319 +msgid "Note that these are system-wide settings." +msgstr "মন কৰিব যে সেইবোৰ হল ছিষ্টেম-ৱাইড ছেটিং." + +#: modules/gui/macosx/VLCSimplePrefsController.m:324 +msgid "General settings" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:326 +msgid "Interface style" +msgstr "ইন্টাৰফেছৰ শৈলী" + +#: modules/gui/macosx/VLCSimplePrefsController.m:327 +msgid "Dark" +msgstr "আন্ধাৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:328 +msgid "Bright" +msgstr "উজ্জ্বল" + +#: modules/gui/macosx/VLCSimplePrefsController.m:331 +msgid "Continue playback" +msgstr "প্লেবেক অব্যাহত ৰাখক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:332 +#: modules/gui/macosx/macosx.m:76 +msgid "Control playback with the Apple Remote" +msgstr "এপল ৰিমোটটোৰ সৈতে প্লেবেক নিয়ন্ত্ৰণ কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:333 +#: modules/gui/macosx/macosx.m:88 +msgid "Control playback with media keys" +msgstr "মিডিয়া কীবোৰৰ সৈতে প্লেবেক নিয়ন্ত্ৰণ কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:334 +#: modules/gui/macosx/macosx.m:79 +msgid "Control system volume with the Apple Remote" +msgstr "এপল ৰিমোটটোৰ সৈতে ছিষ্টেম প্ৰসাৰ নিয়ন্ত্ৰণ কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:335 +#: modules/gui/macosx/macosx.m:82 +msgid "Display VLC status menu icon" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:337 +msgid "Playback behaviour" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:338 +msgid "Enable notifications on playlist item change" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:339 +#: modules/gui/macosx/macosx.m:125 +msgid "Control external music players" +msgstr "বাহ্যিক সংগীত প্লেয়াৰবোৰ নিয়ন্ত্ৰণ কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:341 +#: modules/gui/qt/ui/sprefs_interface.h:560 +msgid "Privacy / Network Interaction" +msgstr "ব্যক্তিগত / নেটৱৰ্ক বিনিময়" + +#: modules/gui/macosx/VLCSimplePrefsController.m:343 +msgid "Automatically check for updates" +msgstr "আপডেটবোৰৰ বাবে স্বয়ংক্ৰিয়ভাৱে পৰীক্ষা কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:346 +msgid "HTTP web interface" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:347 +msgid "Enable HTTP web interface" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:351 +msgid "Default Encoding" +msgstr "ডিফল্ট এনকোডিং" + +#: modules/gui/macosx/VLCSimplePrefsController.m:352 +msgid "Display Settings" +msgstr "ছেটিংবোৰ প্ৰদৰ্শন কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:354 +#: modules/gui/qt/ui/sprefs_subtitles.h:300 +msgid "Font color" +msgstr "ফন্ট ৰং" + +#: modules/gui/macosx/VLCSimplePrefsController.m:356 modules/spu/marq.c:157 +#: modules/spu/rss.c:204 modules/text_renderer/freetype/freetype.c:80 +#: modules/gui/qt/ui/sprefs_subtitles.h:298 +msgid "Font" +msgstr "ফন্ট" + +#: modules/gui/macosx/VLCSimplePrefsController.m:357 +msgid "Subtitle languages" +msgstr "উপশিৰোনাম ভাষাবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:358 +#: modules/gui/qt/ui/sprefs_subtitles.h:295 +msgid "Preferred subtitle language" +msgstr "পছন্দ কৰা উপশিৰোনাম ভাষা" + +#: modules/gui/macosx/VLCSimplePrefsController.m:360 +msgid "Enable OSD" +msgstr "OSD সক্ষম কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:362 +#: modules/text_renderer/freetype/freetype.c:104 +msgid "Force bold" +msgstr "বল্ড জোৰ কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:363 +#: modules/text_renderer/freetype/freetype.c:110 +#: modules/gui/qt/ui/sprefs_subtitles.h:302 +msgid "Outline color" +msgstr "আউটলাইন ৰং" + +#: modules/gui/macosx/VLCSimplePrefsController.m:364 +#: modules/text_renderer/freetype/freetype.c:111 +#: modules/gui/qt/ui/sprefs_subtitles.h:301 +msgid "Outline thickness" +msgstr "আউটলাইনৰ ডাঠ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:368 +#: modules/stream_out/display.c:53 modules/gui/qt/ui/sprefs_video.h:312 +msgid "Display" +msgstr "প্ৰদৰ্শন কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:369 +msgid "Show video within the main window" +msgstr "মুখ্য উইণ্ডোখনৰ ভিতৰত ভিডিঅ' দেখুৱাওক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:370 +#: modules/gui/macosx/macosx.m:104 modules/gui/qt/qt.cpp:181 +msgid "Pause the video playback when minimized" +msgstr "ভিডিঅ' প্লেবেকটোক বিৰতি দিয়ক যেতিয়া সৰু কৰে" + +#: modules/gui/macosx/VLCSimplePrefsController.m:374 +msgid "Fullscreen settings" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:375 +msgid "Start in fullscreen" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:376 +msgid "Black screens in Fullscreen mode" +msgstr "সম্পূৰ্ণ দৃশ্যৰ ধৰণত কলা স্ক্ৰীনবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:377 +#: modules/gui/macosx/macosx.m:95 +msgid "Use the native fullscreen mode" +msgstr "স্থানীয় সম্পূৰ্ণস্ক্ৰীনৰ ধৰণটো ব্যৱহাৰ কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:380 +#: modules/gui/qt/ui/sprefs_video.h:327 +msgid "Video snapshots" +msgstr "ভিডিঅ' স্নেপশ্বটবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:382 +#: modules/meta_engine/folder.c:70 +msgid "Folder" +msgstr "ফোল্ডাৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:383 +#: modules/gui/qt/ui/sprefs_video.h:333 +msgid "Format" +msgstr "ফৰমেট" + +#: modules/gui/macosx/VLCSimplePrefsController.m:384 +#: modules/gui/qt/ui/sprefs_video.h:330 +msgid "Prefix" +msgstr "উপসৰ্গ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:385 +#: modules/gui/qt/ui/sprefs_video.h:332 +msgid "Sequential numbering" +msgstr "ক্ৰমিকভাৱে সংখ্যা দিয়াটো" + +#: modules/gui/macosx/VLCSimplePrefsController.m:393 +#: modules/gui/macosx/prefs.m:190 +msgid "Reset All" +msgstr "সকলোবোৰ পুনৰ ছেট কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:395 +#: modules/gui/macosx/prefs.m:187 modules/gui/qt/dialogs/preferences.cpp:56 +msgid "Preferences" +msgstr "পছন্দবোৰ" + +#: modules/gui/macosx/VLCSimplePrefsController.m:568 +msgid "" +"Media files cannot be resumed because keeping recent media items is disabled." +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:588 +msgid "Last check on: %@" +msgstr "অন্তিম বাৰ পৰীক্ষা কৰক: %@" + +#: modules/gui/macosx/VLCSimplePrefsController.m:590 +msgid "No check was performed yet." +msgstr "এতিয়ালৈকে কোনো পৰীক্ষা সম্পন্ন কৰা হোৱা নাছিল." + +#: modules/gui/macosx/VLCSimplePrefsController.m:707 +msgid "Lowest Latency" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:709 +msgid "Low Latency" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:713 +msgid "Higher Latency" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:715 +msgid "Highest Latency" +msgstr "" + +#: modules/gui/macosx/VLCSimplePrefsController.m:835 +#: modules/gui/qt/dialogs/preferences.cpp:336 +msgid "Reset Preferences" +msgstr "পছন্দবোৰ পুনৰ ছেট কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:838 +msgid "" +"This will reset VLC media player's preferences.\n" +"\n" +"Note that VLC will restart during the process, so your current playlist will " +"be emptied and eventual playback, streaming or transcoding activities will " +"stop immediately.\n" +"\n" +"The Media Library will not be affected.\n" +"\n" +"Are you sure you want to continue?" +msgstr "" +"এইটোৱে VLC মিডিয়া প্লেয়াৰৰ পছন্দবোৰ প্ৰভাৱিত নকৰিব.\n" +"\n" +"মন কৰিব যে আপুনি কোনোপধ্যে প্ৰৱেশ কৰিব নোৱাৰে, তেন্তে নিৰ্দেশ-শাৰীৰ উইণ্ডো এখন " +"খোলক, নিৰ্দেশিকটোলৈ যাওক যত আপুনি VLC ইনষ্টল কৰিছে.\n" +".\n" +"\n" +"মিডিয়া লাইব্ৰেৰীটো ক্ষতিগ্ৰস্ত নহব.\n" +"\n" +"আপুনি অব্যাহত ৰাখিবলৈ নিশ্চিতনে?" + +#: modules/gui/macosx/VLCSimplePrefsController.m:1108 +msgid "" +"This setting cannot be changed because the native fullscreen mode is enabled." +msgstr "এই ছেটিংটো সলনি কৰিব নোৱাৰি কাৰণ স্থায়ী সম্পূৰ্ণদৃশ্যৰ ধৰণটো সক্ষম কৰা হৈছে." + +#: modules/gui/macosx/VLCSimplePrefsController.m:1177 +msgid "Choose the folder to save your video snapshots to." +msgstr "...লৈ আপোনাৰ ভিডিঅ' স্নেপশ্বটবোৰ ছেভ কৰিবলৈ ফোল্ডাৰটো নিৰ্বাচন কৰক." + +#: modules/gui/macosx/VLCSimplePrefsController.m:1179 +#: modules/gui/macosx/VLCSimplePrefsController.m:1278 +msgid "Choose" +msgstr "পছন্দ কৰক" + +#: modules/gui/macosx/VLCSimplePrefsController.m:1276 +msgid "Choose the directory or filename where the records will be stored." +msgstr "নিৰ্দেশিকা বা ফাইল নাম পছন্দ কৰক যত ৰেকৰ্ডবোৰ জমা কৰা হব." + +#: modules/gui/macosx/VLCSimplePrefsController.m:1389 +msgid "" +"Press new keys for\n" +"\"%@\"" +msgstr "" +"...ৰ বাবে নতুন কীবোৰ হেচক\n" +"\"%@\" " + +#: modules/gui/macosx/VLCSimplePrefsController.m:1462 +msgid "Invalid combination" +msgstr "অবৈধ যুটী" + +#: modules/gui/macosx/VLCSimplePrefsController.m:1463 +msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts." +msgstr "দুখজনকভাৱে, এই কীবোৰক হটকী চমুপথবোৰৰ দৰে নিৰ্ধাৰণ কৰিব নোৱাৰি." + +#: modules/gui/macosx/VLCSimplePrefsController.m:1473 +#: modules/gui/macosx/VLCSimplePrefsController.m:1477 +msgid "This combination is already taken by \"%@\"." +msgstr "এই যুটীটো ইতিমধ্যে \"%@\" ৰ দ্বাৰ লোৱা হৈছে." + +#: modules/gui/macosx/VLCStatusBarIcon.m:103 +msgid "Toggle Play/Pause" +msgstr "" + +#: modules/gui/macosx/VLCStatusBarIcon.m:109 +msgid "Toggle random order playback" +msgstr "" + +#: modules/gui/macosx/VLCStatusBarIcon.m:114 +msgid "Show Main Window" +msgstr "" + +#: modules/gui/macosx/VLCStatusBarIcon.m:115 +#: modules/gui/macosx/VLCStatusBarIcon.m:406 +msgid "Path/URL Action" +msgstr "" + +#: modules/gui/macosx/VLCStatusBarIcon.m:379 +msgid "Nothing playing" +msgstr "" + +#: modules/gui/macosx/VLCStatusBarIcon.m:413 +msgid "Select File In Finder" +msgstr "" + +#: modules/gui/macosx/VLCStatusBarIcon.m:415 +msgid "Copy URL to clipboard" +msgstr "" + +#: modules/gui/macosx/VLCStringUtility.m:242 +msgid "Not Set" +msgstr "ছেট কৰা নাই" + +#: modules/gui/macosx/VLCTimeSelectionPanelController.m:52 +msgid "sec." +msgstr "ছেকেণ্ড." + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:50 +#: modules/gui/qt/components/extended_panels.cpp:1442 modules/gui/qt/qt.cpp:216 +msgid "Audio/Video" +msgstr "অডিঅ'/ভিডিঅ'" + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:51 +#: modules/gui/qt/components/extended_panels.cpp:1446 +msgid "Audio track synchronization:" +msgstr "অডিঅ' পথ ছিনক্ৰনাইজেশ্বন:" + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:53 +msgid "A positive value means that the audio is ahead of the video" +msgstr "এটা ধনাত্মক মান মানে হল যে অডিঅ'টো ভিডিঅ'টোৰ আগত" + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:54 +#: modules/gui/qt/components/extended_panels.cpp:1454 +msgid "Subtitles/Video" +msgstr "উপশিৰোনামবোৰ/ভিডিঅ'" + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:55 +#: modules/gui/qt/components/extended_panels.cpp:1458 +msgid "Subtitle track synchronization:" +msgstr "উপশিৰোনাম পথ ছিনক্ৰনাইজেশ্বন:" + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:57 +msgid "A positive value means that the subtitles are ahead of the video" +msgstr "এটা ধনাত্মক মান মানে হল যে উপশিৰোনামবোৰ ভিডিঅ'টোৰ আগত" + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:58 +#: modules/gui/qt/components/extended_panels.cpp:1465 +msgid "Subtitle speed:" +msgstr "উপশিৰোনামৰ গতি:" + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:60 +#: modules/gui/qt/components/extended_panels.cpp:1479 +msgid "Subtitle duration factor:" +msgstr "উপশিৰোনাম সময়সীমাৰ কাৰক:" + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:68 +#: modules/gui/qt/components/extended_panels.cpp:1590 +msgid "" +"Extend subtitle duration by this value.\n" +"Set 0 to disable." +msgstr "" +"এই মানটোৰ দ্বাৰা উপশিৰোনাম সময়সীমাটো প্ৰসাৰ কৰক.\n" +"অক্ষম কৰিবলৈ 0 ছেট কৰক." + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:72 +#: modules/gui/qt/components/extended_panels.cpp:1595 +msgid "" +"Multiply subtitle duration by this value.\n" +"Set 0 to disable." +msgstr "" +"এই মানটোৰ দ্বাৰা বিভিন্ন উপশিৰোনাম সময়সীমা.\n" +"অক্ষম কৰিবলৈ 0 ছেট কৰক." + +#: modules/gui/macosx/VLCTrackSynchronizationWindowController.m:76 +#: modules/gui/qt/components/extended_panels.cpp:1600 +msgid "" +"Recalculate subtitle duration according\n" +"to their content and this value.\n" +"Set 0 to disable." +msgstr "" +"উপশিৰোনামৰ সময়সীমামতে পুনৰ গণনা\n" +"সিহঁতৰ বস্তু আৰু এই মানটো.\n" +"অক্ষম কৰিবলৈ 0 লৈ ছেট কৰক." + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:188 +#: modules/gui/qt/dialogs/extended.cpp:108 +msgid "Video Effects" +msgstr "ভিডিঅ' প্ৰভাৱবোৰ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:192 +msgid "Basic" +msgstr "প্ৰাথমিক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:194 +#: modules/gui/qt/ui/video_effects.h:1303 +msgid "Geometry" +msgstr "জ্যামিতি" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:195 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:252 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:270 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:273 +#: modules/spu/marq.c:115 modules/spu/rss.c:152 +#: modules/video_filter/colorthres.c:55 modules/gui/qt/ui/video_effects.h:1277 +#: modules/gui/qt/ui/video_effects.h:1283 +#: modules/gui/qt/ui/video_effects.h:1286 +msgid "Color" +msgstr "ৰং" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:203 +msgid "Image Adjust" +msgstr "ছবি মিলাওক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:207 +#: modules/gui/qt/ui/video_effects.h:1254 +msgid "Brightness Threshold" +msgstr "উজ্জ্বলতাৰ থ্ৰেছহল্ড" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:211 +#: modules/video_filter/sharpen.c:69 modules/gui/qt/ui/video_effects.h:1258 +msgid "Sharpen" +msgstr "তীক্ষ্ন" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:212 +#: modules/gui/qt/ui/video_effects.h:1259 +#: modules/gui/qt/ui/video_effects.h:1332 +msgid "Sigma" +msgstr "ছিগমা" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:213 +#: modules/gui/qt/ui/video_effects.h:1260 +msgid "Banding removal" +msgstr "বেণ্ডডিং আতঁৰ কৰা" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:214 +#: modules/video_filter/gradfun.c:50 modules/gui/qt/ui/video_effects.h:1261 +msgid "Radius" +msgstr "ব্যাসাৰ্ধ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:215 +#: modules/gui/qt/ui/video_effects.h:1262 +msgid "Film Grain" +msgstr "ফ্লিম গ্ৰেইন" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:216 +#: modules/video_filter/grain.c:53 modules/gui/qt/ui/video_effects.h:1263 +msgid "Variance" +msgstr "ভিন্নতা" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:221 +#: modules/gui/qt/ui/video_effects.h:1271 +msgid "Synchronize top and bottom" +msgstr "ওপৰ আৰু তললৈ ছিনক্ৰনাইজ কৰক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:222 +#: modules/gui/qt/ui/video_effects.h:1272 +msgid "Synchronize left and right" +msgstr "বাওঁফাল আৰু সোঁফাললৈ ছিনক্ৰনাইজ কৰক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:224 +#: modules/gui/qt/ui/video_effects.h:1297 +msgid "Transform" +msgstr "ৰূপান্তৰ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:226 +#: modules/video_filter/transform.c:52 +msgid "Rotate by 90 degrees" +msgstr "90 ডিগ্ৰীত ঘূৰাওক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:229 +#: modules/video_filter/transform.c:53 +msgid "Rotate by 180 degrees" +msgstr "180 ডিগ্ৰীত ঘূৰাওক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:232 +#: modules/video_filter/transform.c:53 +msgid "Rotate by 270 degrees" +msgstr "270 ডিগ্ৰীত ঘূৰাওক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:235 +#: modules/video_filter/transform.c:54 +msgid "Flip horizontally" +msgstr "সমান্তৰালভাৱে ফ্লিপ কৰক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:238 +#: modules/video_filter/transform.c:54 +msgid "Flip vertically" +msgstr "উলম্বভাৱে ফ্লিপ কৰক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:241 +msgid "Magnification/Zoom" +msgstr "বিবৰ্ধন/জুম" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:242 +#: modules/gui/qt/ui/video_effects.h:1300 +msgid "Puzzle game" +msgstr "সমস্যাৰ খেল" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:243 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:248 +#: share/lua/http/dialogs/mosaic_window.html:96 +#: modules/gui/qt/ui/video_effects.h:1295 +#: modules/gui/qt/ui/video_effects.h:1301 +msgid "Rows" +msgstr "শাৰীবোৰ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:244 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:249 +#: share/lua/http/dialogs/mosaic_window.html:114 +#: modules/gui/qt/ui/video_effects.h:1296 +#: modules/gui/qt/ui/video_effects.h:1302 +msgid "Columns" +msgstr "স্তম্ভবোৰ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:245 +#: modules/video_splitter/clone.c:57 modules/gui/qt/ui/video_effects.h:1342 +msgid "Clone" +msgstr "ক্লন কৰক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:246 +#: modules/video_splitter/clone.c:39 modules/gui/qt/ui/video_effects.h:1343 +msgid "Number of clones" +msgstr "ক্লনবোৰৰ সংখ্যা" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:247 +#: modules/gui/qt/ui/video_effects.h:1294 +msgid "Wall" +msgstr "ৱাল" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:251 +#: modules/video_filter/colorthres.c:71 modules/gui/qt/ui/video_effects.h:1285 +msgid "Color threshold" +msgstr "ৰংৰ থ্ৰেছহল্ড" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:255 +#: modules/gui/qt/ui/video_effects.h:1289 +msgid "Similarity" +msgstr "ঐক্যতা" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:257 +#: modules/gui/qt/ui/video_effects.h:1291 +msgid "Intensity" +msgstr "প্ৰৱল্য" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:258 +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:261 +#: modules/video_filter/gradient.c:76 modules/video_filter/gradient.c:82 +#: modules/gui/qt/ui/video_effects.h:1281 +msgid "Gradient" +msgstr "গ্ৰেডিয়েন্ট" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:264 +#: modules/video_filter/gradient.c:76 +msgid "Edge" +msgstr "কাষ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:267 +#: modules/video_filter/gradient.c:76 +msgid "Hough" +msgstr "হঘ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:271 +#: modules/gui/qt/ui/video_effects.h:1284 +msgid "Cartoon" +msgstr "কাৰ্টুন" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:272 +#: modules/gui/qt/ui/video_effects.h:1276 +msgid "Color extraction" +msgstr "ৰং নিষ্কৰ্ষকৰণ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:275 +msgid "Invert colors" +msgstr "ওলোটা ৰংবোৰ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:276 +#: modules/video_filter/posterize.c:69 modules/gui/qt/ui/video_effects.h:1280 +msgid "Posterize" +msgstr "পোষ্টাৰাইজ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:277 +#: modules/video_filter/posterize.c:61 +msgid "Posterize level" +msgstr "পোষ্টাৰাইজ স্তৰ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:278 +#: modules/video_filter/motionblur.c:60 modules/gui/qt/ui/video_effects.h:1333 +msgid "Motion blur" +msgstr "প্ৰস্তাৱ ব্লাৰ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:279 +#: modules/gui/qt/ui/video_effects.h:1334 +msgid "Factor" +msgstr "কাৰক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:280 +#: modules/video_filter/motiondetect.c:49 +msgid "Motion Detect" +msgstr "গতি চিনাক্ত" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:281 +#: modules/gui/qt/ui/video_effects.h:1329 +msgid "Water effect" +msgstr "পানীৰ প্ৰভাৱ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:283 +#: modules/meta_engine/ID3Genres.h:100 modules/video_filter/psychedelic.c:55 +#: modules/gui/qt/ui/video_effects.h:1327 +msgid "Psychedelic" +msgstr "ছাইকেডেলিক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:284 +#: modules/video_filter/anaglyph.c:72 +msgid "Anaglyph" +msgstr "এনালগীফ" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:285 +#: modules/gui/qt/ui/video_effects.h:1314 +msgid "Add text" +msgstr "টেক্সট যোগ কৰক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:286 +#: modules/logger/file.c:193 modules/spu/marq.c:88 +#: modules/gui/qt/ui/video_effects.h:1316 +msgid "Text" +msgstr "টেক্সট" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:307 +#: modules/gui/qt/ui/video_effects.h:1304 +msgid "Add logo" +msgstr "ল'গ' যোগ কৰক" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:308 +#: modules/gui/qt/ui/video_effects.h:1305 +msgid "Logo" +msgstr "ল'গ'" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:329 +#: modules/spu/mosaic.c:87 modules/stream_out/mosaic_bridge.c:124 +msgid "Transparency" +msgstr "স্বচ্ছতা" + +#: modules/gui/macosx/VLCVideoEffectsWindowController.m:398 +msgid "Organize profiles..." +msgstr "প্ৰফাইলবোৰ সজাওক..." + +#: modules/gui/macosx/macosx.m:51 +msgid "Video device" +msgstr "ভিডিঅ' ডিভাইচ" + +#: modules/gui/macosx/macosx.m:52 +msgid "" +"Number of the screen to use by default to display videos in 'fullscreen'. " +"The screen number correspondance can be found in the video device selection " +"menu." +msgstr "" +"বিভিন্ন কম্পিউটাৰলৈ এই ষ্ট্ৰিমটো ব্যৱহাৰ কৰক. এই উপাদানটো হল আপোনাৰ ষ্ট্ৰিমটোৱে যাব " +"পৰা সৰ্বাধিক সংখ্যক ৰাস্তা. যদি এইটো মানে কি আপুনি নাযানে." + +#: modules/gui/macosx/macosx.m:56 +msgid "Opaqueness" +msgstr "অপাৰদৰ্শিতা" + +#: modules/gui/macosx/macosx.m:57 +msgid "" +"Set the transparency of the video output. 1 is non-transparent (default) 0 " +"is fully transparent." +msgstr "" +"বিভিন্ন কম্পিউটাৰলৈ এই ষ্ট্ৰিমটো ব্যৱহাৰ কৰক. এই উপাদানটো হল আপোনাৰ ষ্ট্ৰিমটোৱে যাব " +"পৰা সৰ্বাধিক সংখ্যক ৰাস্তা. যদি এইটো মানে কি আপুনি নাযানে." + +#: modules/gui/macosx/macosx.m:60 +msgid "Black screens in fullscreen" +msgstr "সম্পূৰ্ণ দৃশ্যত কলা স্ক্ৰীনবোৰ" + +#: modules/gui/macosx/macosx.m:61 +msgid "In fullscreen mode, keep screen where there is no video displayed black" +msgstr "সম্পূৰ্ণস্ক্ৰীনৰ ধৰণত, স্ক্ৰীনখন ৰাখক যত কোনো ভিডিঅ' কলাকৈ প্ৰদৰ্শন কৰা নহয় " + +#: modules/gui/macosx/macosx.m:64 +msgid "Show Fullscreen controller" +msgstr "সম্পূৰ্ণ দৃশ্য নিয়ন্ত্ৰণকৰ্তা দেখুৱাওক" + +#: modules/gui/macosx/macosx.m:65 +msgid "Shows a lucent controller when moving the mouse in fullscreen mode." +msgstr "" +"বিভিন্ন কম্পিউটাৰলৈ এই ষ্ট্ৰিমটো ব্যৱহাৰ কৰক. এই উপাদানটো হল আপোনাৰ ষ্ট্ৰিমটোৱে যাব " +"পৰা সৰ্বাধিক সংখ্যক ৰাস্তা. যদি এইটো মানে কি আপুনি নাযানে." + +#: modules/gui/macosx/macosx.m:68 +msgid "Auto-playback of new items" +msgstr "নতুন বস্তুবোৰৰ স্বয়ংক্ৰিয়-প্লেবেক" + +#: modules/gui/macosx/macosx.m:69 +msgid "Start playback of new items immediately once they were added." +msgstr "এবাৰ সেইবোৰ যোগ কৰাৰ পিছত নতুন বস্তুবোৰৰ প্লেবেক ক্ষিপ্ৰভাৱে আৰম্ভ কৰক." + +#: modules/gui/macosx/macosx.m:72 +msgid "Keep Recent Items" +msgstr "শেহতীয়া বস্তুবোৰ ৰাখক" + +#: modules/gui/macosx/macosx.m:73 +msgid "" +"By default, VLC keeps a list of the last 10 items. This feature can be " +"disabled here." +msgstr "" +"ডিফল্ট হিচাপে, VLC য়ে অন্তিম 10 টা বস্তুৰ তালিকা এখন ৰাখি থয়. এই বৈশিষ্ট্যটো ইয়াত " +"অক্ষম কৰিব পাৰি." + +#: modules/gui/macosx/macosx.m:77 +msgid "By default, VLC can be remotely controlled with the Apple Remote." +msgstr "ডিফল্ট হিচাপে, VLC য়ে এপল ৰিমোটটোৰ সৈতে ৰিমোটভাৱ নিয়ন্ত্ৰণ কৰিব পাৰে." + +#: modules/gui/macosx/macosx.m:80 +msgid "" +"By default, VLC will control its own volume with the Apple Remote. However, " +"you can choose to control the global system volume instead." +msgstr "" +"ডিফল্ট হিচাপে, VLC য়ে এপল ৰিমোটটোৰ সৈতে ইয়াৰ নিজা প্ৰসাৰ নিয়ন্ত্ৰণ কৰিব. সেইদৰে " +"আপুনি সাৰ্বজনীন ছিষ্টেম প্ৰসাৰটো নিয়ন্ত্ৰণ কৰিবলৈ পছন্দ কৰিব পাৰে." + +#: modules/gui/macosx/macosx.m:83 +msgid "" +"By default, VLC will show the statusbar icon menu. However, you can choose " +"to disable it (restart required)." +msgstr "" + +#: modules/gui/macosx/macosx.m:85 +msgid "Control playlist items with the Apple Remote" +msgstr "এপল ৰিমোটটোৰ সৈতে প্লেলিষ্ট বস্তুবোৰ নিয়ন্ত্ৰণ কৰক" + +#: modules/gui/macosx/macosx.m:86 +msgid "" +"By default, VLC will allow you to switch to the next or previous item with " +"the Apple Remote. You can disable this behavior with this option." +msgstr "" +"ডিফল্ট হিচাপে, VLC য়ে এপল ৰিমোটটোৰ সৈতে পৰৱৰ্তী বা আগৰ বস্তুটোলৈ সলনি কৰিবলৈ " +"আপোনাক অনুমতি দব. আপুনি এই আচৰণটো ইয়াত অক্ষম কৰিব পাৰে." + +#: modules/gui/macosx/macosx.m:89 +msgid "" +"By default, VLC can be controlled using the media keys on modern Apple " +"keyboards." +msgstr "" +"ডিফল্ট হিচাপে, VLC য়ে এপল কীবোৰ্ডবোৰত মিডিয়া কীবোৰ ব্যৱহাৰ কৰি নিয়ন্ত্ৰণ কৰিব " +"পাৰে." + +#: modules/gui/macosx/macosx.m:92 +msgid "Run VLC with dark interface style" +msgstr "আন্ধাৰ ইন্টাৰফেছ শৈলীৰ সৈতে VLC চলাওক" + +#: modules/gui/macosx/macosx.m:93 +msgid "" +"If this option is enabled, VLC will use the dark interface style. Otherwise, " +"the grey interface style is used." +msgstr "" +"যদি এই বিকল্পটো সক্ষম কৰা হয়, VLC য়ে আন্ধাৰ ইন্টাৰফেছ শৈলীটো ব্যৱহাৰ কৰিব. অন্যথা, " +"গ্ৰে ইন্টাৰফেছ শৈলীটো ব্যৱহাৰ কৰা হব." + +#: modules/gui/macosx/macosx.m:96 +msgid "" +"By default, VLC uses the fullscreen mode known from previous Mac OS X " +"releases. It can also use the native fullscreen mode on Mac OS X 10.7 and " +"later." +msgstr "" +"ডিফল্ট হিচাপে, VLC য়ে আগৰ মেক OS X মুক্তিবোৰৰ পৰা জ্ঞাত ধৰণৰ সম্পূৰ্ণস্ক্ৰীনটো ব্যৱহাৰ " +"কৰে. এইটোৱে মেক OS X 10.7 ত স্থানীয় সম্পূৰ্ণদৃশ্যৰ ধৰণটো ব্যৱহাৰ কৰিব পাৰে আৰু পিছত." + +#: modules/gui/macosx/macosx.m:98 modules/gui/qt/qt.cpp:95 +msgid "Resize interface to the native video size" +msgstr "স্থানীয় ভিডিঅ' আকাৰটোলৈ ইন্টাৰফেছ পুনৰ আকাৰ কৰক" + +#: modules/gui/macosx/macosx.m:99 modules/gui/qt/qt.cpp:96 +msgid "" +"You have two choices:\n" +" - The interface will resize to the native video size\n" +" - The video will fit to the interface size\n" +" By default, interface resize to the native video size." +msgstr "" +"বিভিন্ন কম্পিউটাৰলৈ এই ষ্ট্ৰিমটো ব্যৱহাৰ কৰক. এই উপাদানটো হল আপোনাৰ ষ্ট্ৰিমটোৱে যাব " +"পৰা সৰ্বাধিক সংখ্যক ৰাস্তা. যদি এইটো মানে কি আপুনি নাযানে." + +#: modules/gui/macosx/macosx.m:105 modules/gui/qt/qt.cpp:183 +msgid "" +"With this option enabled, the playback will be automatically paused when " +"minimizing the window." +msgstr "" +"বিভিন্ন কম্পিউটাৰলৈ এই ষ্ট্ৰিমটো ব্যৱহাৰ কৰক. এই উপাদানটো হল আপোনাৰ ষ্ট্ৰিমটোৱে যাব " +"পৰা সৰ্বাধিক সংখ্যক ৰাস্তা. যদি এইটো মানে কি আপুনি নাযানে." + +#: modules/gui/macosx/macosx.m:108 modules/gui/qt/qt.cpp:185 +msgid "Allow automatic icon changes" +msgstr "স্বয়ংক্ৰিয় আইকন সলনিবোৰৰ অনুমতি দিয়ক" + +#: modules/gui/macosx/macosx.m:109 modules/gui/qt/qt.cpp:187 +msgid "" +"This option allows the interface to change its icon on various occasions." +msgstr "" +"বিভিন্ন কম্পিউটাৰলৈ এই ষ্ট্ৰিমটো ব্যৱহাৰ কৰক. এই উপাদানটো হল আপোনাৰ ষ্ট্ৰিমটোৱে যাব " +"পৰা সৰ্বাধিক সংখ্যক ৰাস্তা. যদি এইটো মানে কি আপুনি নাযানে." + +#: modules/gui/macosx/macosx.m:113 +msgid "Dim keyboard backlight during fullscreen playback" +msgstr "" + +#: modules/gui/macosx/macosx.m:114 +msgid "" +"Turn off the MacBook keyboard backlight while a video is playing in " +"fullscreen. Automatic brightness adjustment should be disabled in System " +"Preferences." +msgstr "" + +#: modules/gui/macosx/macosx.m:117 +msgid "Shows the previous and next buttons in the main window." +msgstr "মুখ্য উইণ্ডোত পূৰ্বৰ আৰু পৰৱৰ্তী বাটনবোৰ দেখুৱাওক." + +#: modules/gui/macosx/macosx.m:120 +msgid "Shows the shuffle and repeat buttons in the main window." +msgstr "মুখ্য উইণ্ডোত ওলোট-পালট আৰু পুনৰাবৃত্তিৰ বাটনবোৰ দেখুৱাওক." + +#: modules/gui/macosx/macosx.m:123 +msgid "Shows the audio effects button in the main window." +msgstr "মুখ্য উইণ্ডোত অডিঅ’ প্ৰভাৱ বাটনটো দেখুৱাওক." + +#: modules/gui/macosx/macosx.m:126 +msgid "VLC will pause and resume supported music players on playback." +msgstr "VLC য়ে প্লেবেকত সমৰ্থিত সংগীত প্লেয়াৰবোৰ বিৰতি দিব আৰু পুনৰ আৰম্ভ কৰিব." + +#: modules/gui/macosx/macosx.m:128 +msgid "Use large text for list views" +msgstr "তালিকাৰ দৃশ্যবোৰৰ বাবে ডাঙৰ টেক্সট ব্যৱহাৰ কৰক" + +#: modules/gui/macosx/macosx.m:133 +msgid "Do nothing" +msgstr "একো নকৰিব" + +#: modules/gui/macosx/macosx.m:133 +msgid "Pause iTunes / Spotify" +msgstr "iটিউনছ / স্পটিফাই বিৰতি দিয়ক" + +#: modules/gui/macosx/macosx.m:133 +msgid "Pause and resume iTunes / Spotify" +msgstr "iটিউনছ / স্পটিফাই বিৰতি দিয়ক আৰু পুনৰ আৰম্ভ কৰক" + +#: modules/gui/macosx/macosx.m:136 +msgid "Continue playback where you left off" +msgstr "আপুনি যত এৰি গৈছিল তাৰ পৰা প্লেবেক অব্যাহত ৰাখক" + +#: modules/gui/macosx/macosx.m:137 +msgid "" +"VLC will store playback positions of the last 30 items you played. If you re-" +"open one of those, playback will continue." +msgstr "" +"ষ্ট্ৰিম ফিল্টাৰবোৰ হল বিশেষ মডুল যিয়ে VLC ৰ ইনপুটৰ ফালে উন্নত কাৰ্যবোৰৰ 30 অনুমতি " +"দিয়ে. সতৰ্কতাৰে ব্যৱহাৰ কৰক." + +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:209 +msgid "Ask" +msgstr "সোধক" + +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/keystore/keychain.m:50 +msgid "Always" +msgstr "সদায়" + +#: modules/gui/macosx/macosx.m:142 modules/gui/qt/qt.cpp:203 +#: modules/gui/qt/qt.cpp:209 modules/gui/qt/qt.cpp:216 +msgid "Never" +msgstr "কেতিয়াও নহয়" + +#: modules/gui/macosx/macosx.m:145 modules/gui/qt/qt.cpp:189 +msgid "Maximum Volume displayed" +msgstr "সৰ্বাধিক প্ৰসাৰ প্ৰদৰ্শন" + +#: modules/gui/macosx/macosx.m:149 +msgid "Mac OS X interface" +msgstr "মেক OS X ইন্টাৰফেছ" + +#: modules/gui/macosx/macosx.m:156 +msgid "Appearance" +msgstr "দৃষ্টিগোচৰ" + +#: modules/gui/macosx/macosx.m:167 +msgid "Behavior" +msgstr "আচৰণ" + +#: modules/gui/macosx/macosx.m:180 +msgid "Apple Remote and media keys" +msgstr "এপল দূৰৈৰ আৰু মিডিয়া কীবোৰ" + +#: modules/gui/macosx/macosx.m:196 +msgid "Video output" +msgstr "ভিডিঅ’ আউটপুট" + +#: modules/gui/macosx/misc.m:301 +msgid "B" +msgstr "B" + +#: modules/gui/macosx/misc.m:308 +msgid "KB" +msgstr "KB" + +#: modules/gui/macosx/misc.m:315 +msgid "MB" +msgstr "MB" + +#: modules/gui/macosx/misc.m:323 +msgid "GB" +msgstr "GB" + +#: modules/gui/macosx/misc.m:328 +msgid "TB" +msgstr "TB" + +#: modules/gui/macosx/prefs.m:191 +msgid "Show Basic" +msgstr "প্ৰাথমিকটো দেখুৱাওক" + +#: modules/gui/macosx/prefs_widgets.m:1151 +msgid "Select a directory" +msgstr "নিৰ্দেশিকা এটা নিৰ্বাচন কৰক" + +#: modules/gui/macosx/prefs_widgets.m:1151 +msgid "Select a file" +msgstr "ফাইল এটা নিৰ্বাচন কৰক" + +#: modules/gui/macosx/prefs_widgets.m:1152 +msgid "Select" +msgstr "নিৰ্বাচন কৰক" + +#: modules/gui/minimal_macosx/macosx.c:57 +msgid "Minimal Mac OS X interface" +msgstr "নূন্যতম মেক OS X ইন্টাৰফেছ" + +#: modules/gui/ncurses.c:71 +msgid "Filebrowser starting point" +msgstr "ফাইলব্ৰাউজাৰ আৰম্ভণিৰ বিন্দু" + +#: modules/gui/ncurses.c:73 +msgid "" +"This option allows you to specify the directory the ncurses filebrowser will " +"show you initially." +msgstr "" +"ব্যৱহাৰ কৰা ভিডিঅ' আউটপুট পদ্ধতি. উপলব্ধ শ্ৰেষ্ঠ পদ্ধতিটো স্বয়ংক্ৰিয়ভাৱে নিৰ্বাচন " +"কৰিবলৈ ডিফল্ট আচৰণটো." + +#: modules/gui/ncurses.c:78 +msgid "Ncurses interface" +msgstr "এনকাৰ্ছেছ ইন্টাৰফেছ" + +#: modules/gui/ncurses.c:771 +#, c-format +msgid " [%s]" +msgstr " [%s]" + +#: modules/gui/ncurses.c:775 +#, c-format +msgid " %s: %s" +msgstr " %s: %s" + +#: modules/gui/ncurses.c:859 +msgid "[Display]" +msgstr "[প্ৰদৰ্শন কৰক]" + +#: modules/gui/ncurses.c:861 +msgid " h,H Show/Hide help box" +msgstr " h,H সহায়ৰ বাকচ দেখুৱাওক/লকুৱাওক" + +#: modules/gui/ncurses.c:862 +msgid " i Show/Hide info box" +msgstr " i তথ্যৰ বাকচ দেখুৱাওক/লকুৱাওক" + +#: modules/gui/ncurses.c:863 +msgid " M Show/Hide metadata box" +msgstr " M মেটাডাটা বাকচ দেখুৱাওক/লকুৱাওক" + +#: modules/gui/ncurses.c:864 +msgid " L Show/Hide messages box" +msgstr " L বাৰ্তাৰ বাকচ দেখুৱাওক/লকুৱাওক" + +#: modules/gui/ncurses.c:865 +msgid " P Show/Hide playlist box" +msgstr " P প্লেলিষ্টৰ বাকচ দেখুৱাওক/লকুৱাওক" + +#: modules/gui/ncurses.c:866 +msgid " B Show/Hide filebrowser" +msgstr " B ফাইল ব্ৰাউজাৰ দেখুৱাওক/লকুৱাওক" + +#: modules/gui/ncurses.c:867 +msgid " x Show/Hide objects box" +msgstr " x বস্তুবোৰৰ বাকচ দেখুৱাওক/লকুৱাওক" + +#: modules/gui/ncurses.c:868 +msgid " S Show/Hide statistics box" +msgstr " S পৰিসংখ্যাৰ বাকচ দেখুৱাওক/লকুৱাওক" + +#: modules/gui/ncurses.c:869 +msgid " Esc Close Add/Search entry" +msgstr " Esc যোগ/সন্ধানৰ প্ৰৱিষ্টি বন্ধ কৰক" + +#: modules/gui/ncurses.c:870 +msgid " Ctrl-l Refresh the screen" +msgstr " Ctrl-l স্ক্ৰীনখন পুনৰ সজীৱ কৰক" + +#: modules/gui/ncurses.c:874 +msgid "[Global]" +msgstr "[সাৰ্বজনীন]" + +#: modules/gui/ncurses.c:876 +msgid " q, Q, Esc Quit" +msgstr " q, Q, Esc ত্যাগ কৰক" + +#: modules/gui/ncurses.c:877 +msgid " s Stop" +msgstr " s বন্ধ কৰক" + +#: modules/gui/ncurses.c:878 +msgid " Pause/Play" +msgstr " বিৰতি দিয়ক/চলাওক" + +#: modules/gui/ncurses.c:879 +msgid " f Toggle Fullscreen" +msgstr " f সম্পূৰ্ণ দৃশ্য টগুল কৰক" + +#: modules/gui/ncurses.c:880 +msgid " c Cycle through audio tracks" +msgstr " c অডিঅ' পথবোৰৰ মাজেৰে ঘূৰাওক" + +#: modules/gui/ncurses.c:881 +msgid " v Cycle through subtitles tracks" +msgstr " v উপশিৰোনামবোৰৰ পথবোৰৰ মাজেৰে ঘূৰাওক" + +#: modules/gui/ncurses.c:882 +msgid " b Cycle through video tracks" +msgstr " b ভিডিঅ' পথবোৰৰ মাজেৰে ঘূৰাওক" + +#: modules/gui/ncurses.c:883 +msgid " n, p Next/Previous playlist item" +msgstr " n, p পৰৱৰ্তী/আগৰ প্লেলিষ্টৰ বস্তু" + +#: modules/gui/ncurses.c:884 +msgid " [, ] Next/Previous title" +msgstr " [, ] পৰৱৰ্তী/আগৰ শিৰোনাম" + +#: modules/gui/ncurses.c:885 +msgid " <, > Next/Previous chapter" +msgstr " <, > পৰৱৰ্তী/আগৰ পাঠ" + +#. xgettext: You can use ← and → characters +#: modules/gui/ncurses.c:887 +#, c-format +msgid " , Seek -/+ 1%%" +msgstr " , বিচাৰক -/+ 1%%" + +#: modules/gui/ncurses.c:888 +msgid " a, z Volume Up/Down" +msgstr " a, z প্ৰসাৰ বঢ়োৱা/কমোৱা" + +#: modules/gui/ncurses.c:889 +msgid " m Mute" +msgstr " m নিস্তব্দ কৰক" + +#. xgettext: You can use ↑ and ↓ characters +#: modules/gui/ncurses.c:891 +msgid " , Navigate through the box line by line" +msgstr " , শাৰীৰ দ্বাৰা বাকচ শাৰীটোৰ মাজেৰে নেভিগেট কৰক" + +#. xgettext: You can use ⇞ and ⇟ characters +#: modules/gui/ncurses.c:893 +msgid " , Navigate through the box page by page" +msgstr " , পৃষ্ঠাৰ দ্বাৰা বাকচ পৃষ্ঠাৰ মাজেৰে নেভিগেট কৰক" + +#. xgettext: You can use ↖ and ↘ characters +#: modules/gui/ncurses.c:895 +msgid " , Navigate to start/end of box" +msgstr " , বাকচৰ আৰম্ভণি/শেষলৈ নেভিগেট কৰক" + +#: modules/gui/ncurses.c:899 +msgid "[Playlist]" +msgstr "[প্লেলিষ্ট]" + +#: modules/gui/ncurses.c:901 +msgid " r Toggle Random playing" +msgstr " r বিশৃংখলভাৱে চলোৱাটো টগুল কৰক" + +#: modules/gui/ncurses.c:902 +msgid " l Toggle Loop Playlist" +msgstr " l লুপ প্লেলিষ্ট টগুল কৰক" + +#: modules/gui/ncurses.c:903 +msgid " R Toggle Repeat item" +msgstr " R পুনৰাবৃত্তি কৰা বস্তু টগুল কৰক" + +#: modules/gui/ncurses.c:904 +msgid " o Order Playlist by title" +msgstr " o শিৰোনামৰ দ্বাৰা প্লেলিষ্টৰ ক্ৰম কৰক" + +#: modules/gui/ncurses.c:905 +msgid " O Reverse order Playlist by title" +msgstr " O শিৰোনামৰ দ্বাৰা ক্ৰম কৰা প্লেলিষ্টখন ওলোটা কৰক" + +#: modules/gui/ncurses.c:906 +msgid " g Go to the current playing item" +msgstr " g বৰ্তমানে চলি বস্তুটোলৈ যাওক" + +#: modules/gui/ncurses.c:907 +msgid " / Look for an item" +msgstr " / বস্তু এটা বিচাৰক" + +#: modules/gui/ncurses.c:908 +msgid " ; Look for the next item" +msgstr " ; পৰৱৰ্তী বস্তুটো বিচাৰক" + +#: modules/gui/ncurses.c:909 +msgid " A Add an entry" +msgstr " A প্ৰৱিষ্টি এটা যোগ কৰক" + +#. xgettext: You can use ⌫ character to translate +#: modules/gui/ncurses.c:911 +msgid " D, , Delete an entry" +msgstr " D, , প্ৰৱিষ্টি এটা ডিলিট কৰক" + +#: modules/gui/ncurses.c:912 +msgid " e Eject (if stopped)" +msgstr " e উলিয়াওক (যদি বন্ধ কৰিছে)" + +#: modules/gui/ncurses.c:916 +msgid "[Filebrowser]" +msgstr "[ফাইল ব্ৰাউজাৰ]" + +#: modules/gui/ncurses.c:918 +msgid " Add the selected file to the playlist" +msgstr " প্লেলিষ্টলৈ নিৰ্বাচিত ফাইলটো যোগ কৰক" + +#: modules/gui/ncurses.c:919 +msgid " Add the selected directory to the playlist" +msgstr " প্লেলিষ্টলৈ নিৰ্বাচিত নিৰ্দেশিকাটো যোগ কৰক" + +#: modules/gui/ncurses.c:920 +msgid " . Show/Hide hidden files" +msgstr " . লুকুওৱা ফাইলবোৰ দেখুৱাওক/লুকুৱাওক" + +#: modules/gui/ncurses.c:924 +msgid "[Player]" +msgstr "[প্লেয়াৰ]" + +#. xgettext: You can use ↑ and ↓ characters +#: modules/gui/ncurses.c:927 +#, c-format +msgid " , Seek +/-5%%" +msgstr " , বিচাৰক +/-5%%" + +#: modules/gui/ncurses.c:1046 +msgid "[Repeat]" +msgstr "" + +#: modules/gui/ncurses.c:1047 +msgid "[Random]" +msgstr "" + +#: modules/gui/ncurses.c:1048 +msgid "[Loop]" +msgstr "[লুপ]" + +#: modules/gui/ncurses.c:1057 +#, c-format +msgid " Source : %s" +msgstr " উত্স : %s" + +#: modules/gui/ncurses.c:1090 +#, c-format +msgid " Position : %s/%s" +msgstr " স্থান : %s/%s" + +#: modules/gui/ncurses.c:1095 +msgid " Volume : Mute" +msgstr " প্ৰসাৰ : নিস্তব্দ" + +#: modules/gui/ncurses.c:1096 +#, c-format +msgid " Volume : %3ld%%" +msgstr " প্ৰসাৰ : %3ld%%" + +#: modules/gui/ncurses.c:1096 +msgid " Volume : ----" +msgstr " প্ৰসাৰ : ----" + +#: modules/gui/ncurses.c:1102 +#, c-format +msgid " Title : %/%d" +msgstr " শিৰোনাম : %/%d" + +#: modules/gui/ncurses.c:1108 +#, c-format +msgid " Chapter : %/%d" +msgstr " পাঠ : %/%d" + +#: modules/gui/ncurses.c:1113 +msgid " Source: " +msgstr "" + +#: modules/gui/ncurses.c:1115 +msgid " [ h for help ]" +msgstr " [ সহায়ৰ বাবে h ]" + +#: modules/gui/ncurses.c:1136 +#, c-format +msgid "Open: %s" +msgstr "খোলক: %s" + +#: modules/gui/ncurses.c:1138 +#, c-format +msgid "Find: %s" +msgstr "বিচাৰি উলিয়াওক: %s" + +#: modules/gui/qt/components/controller.cpp:352 +msgid "Shift+L" +msgstr "ছিফ্ট+L" + +#: modules/gui/qt/components/controller.cpp:457 +msgid "Click to toggle between loop all, loop one and no loop" +msgstr "সকলোবোৰ লুপ কৰা, এটা লুপ কৰা আৰু লুপ নথকাৰ মাজত টগুল কৰিবলৈ ক্লিক কৰক" + +#: modules/gui/qt/components/controller.cpp:558 +msgid "Previous Chapter/Title" +msgstr "আগৰ পাঠ/শিৰোনাম" + +#: modules/gui/qt/components/controller.cpp:564 +msgid "Next Chapter/Title" +msgstr "পৰৱৰ্তী পাঠ/শিৰোনাম" + +#: modules/gui/qt/components/controller.cpp:613 +msgid "Teletext Activation" +msgstr "টেলিটেক্স সক্ৰিয়কৰণ" + +#: modules/gui/qt/components/controller.cpp:629 +msgid "Toggle Transparency" +msgstr "" + +#: modules/gui/qt/components/controller.hpp:43 +msgid "" +"Play\n" +"If the playlist is empty, open a medium" +msgstr "" +"চলাওক\n" +"যদি প্লেলিষ্টটো খালী হয়, মাধ্যম এটা খোলক" + +#: modules/gui/qt/components/controller.hpp:108 +msgid "Previous / Backward" +msgstr "আগৰ / পিছলৈ" + +#: modules/gui/qt/components/controller.hpp:108 +msgid "Next / Forward" +msgstr "পৰৱৰ্তী / আগলৈ" + +#: modules/gui/qt/components/controller.hpp:109 +msgid "De-Fullscreen" +msgstr "De-সম্পূৰ্ণ দৃশ্য" + +#: modules/gui/qt/components/controller.hpp:109 +msgid "Extended panel" +msgstr "সম্প্ৰাৰিত পেনেল" + +#: modules/gui/qt/components/controller.hpp:110 +msgid "Frame By Frame" +msgstr "ফ্ৰেমৰ পিছত ফ্ৰেম" + +#: modules/gui/qt/components/controller.hpp:110 +msgid "Trickplay Reverse" +msgstr "ট্ৰিকপ্লেৰ বিপৰীত" + +#: modules/gui/qt/components/controller.hpp:111 +#: modules/gui/qt/components/controller.hpp:123 +msgid "Step backward" +msgstr "পিছলৈ প্ৰস্থান কৰক" + +#: modules/gui/qt/components/controller.hpp:111 +#: modules/gui/qt/components/controller.hpp:123 +msgid "Step forward" +msgstr "আগলৈ প্ৰস্থান কৰক" + +#: modules/gui/qt/components/controller.hpp:112 +msgid "Loop / Repeat" +msgstr "লুপ / পুনৰাবৃত্তি" + +#: modules/gui/qt/components/controller.hpp:113 +msgid "Open subtitles" +msgstr "উপশিৰোনামবোৰ খোলক" + +#: modules/gui/qt/components/controller.hpp:113 +msgid "Dock fullscreen controller" +msgstr "সম্পূৰ্ণদৃশ্য নিয়ন্ত্ৰক ডক কৰক" + +#: modules/gui/qt/components/controller.hpp:116 +msgid "Stop playback" +msgstr "প্লেবেক বন্ধ কৰক" + +#: modules/gui/qt/components/controller.hpp:116 +msgid "Open a medium" +msgstr "মাধ্যম এটা খোলক" + +#: modules/gui/qt/components/controller.hpp:117 +msgid "Previous media in the playlist, skip backward when held" +msgstr "প্লেলিষ্টটোত আগৰ মিডিয়া, পিছলৈ যাওক যেতিয়া ধৰি ৰাখে" + +#: modules/gui/qt/components/controller.hpp:118 +msgid "Next media in the playlist, skip forward when held" +msgstr "প্লেলিষ্টটোত পৰৱৰ্তী মিডিয়া, আগলৈ যাওক যেতিয়া ধৰি ৰাখে" + +#: modules/gui/qt/components/controller.hpp:119 +msgid "Toggle the video in fullscreen" +msgstr "সম্পূৰ্ণদৃশ্যত ভিডিঅ'টো টগুল কৰক" + +#: modules/gui/qt/components/controller.hpp:119 +msgid "Toggle the video out fullscreen" +msgstr "সম্পূৰ্ণদৃশ্যৰ বাহিৰত ভিডিঅ'টো টগুল কৰক" + +#: modules/gui/qt/components/controller.hpp:120 +msgid "Show extended settings" +msgstr "প্ৰসাৰিত ছেটিংবোৰ দেখুৱাওক" + +#: modules/gui/qt/components/controller.hpp:120 +msgid "Toggle playlist" +msgstr "প্লেলিষ্ট টগুল কৰক" + +#: modules/gui/qt/components/controller.hpp:121 +msgid "Take a snapshot" +msgstr "স্নেপশ্বট এটা লওক" + +#: modules/gui/qt/components/controller.hpp:122 +msgid "Loop from point A to point B continuously." +msgstr "বিন্দু A ৰ পৰা বিন্দু B লৈ ধাৰাবাহিকভাৱে লুপ কৰক." + +#: modules/gui/qt/components/controller.hpp:122 +msgid "Frame by frame" +msgstr "ফ্ৰেমৰ পিছত ফ্ৰেম" + +#: modules/gui/qt/components/controller.hpp:123 +msgid "Reverse" +msgstr "ওলোটা কৰক" + +#: modules/gui/qt/components/controller.hpp:124 +msgid "Change the loop and repeat modes" +msgstr "লুপ আৰু পুনৰাবৃত্তিৰ ধৰণবোৰ সলনি কৰক" + +#: modules/gui/qt/components/controller.hpp:125 +msgid "Previous media in the playlist" +msgstr "প্লেলিষ্টটোত আগৰ মিডিয়া" + +#: modules/gui/qt/components/controller.hpp:125 +msgid "Next media in the playlist" +msgstr "প্লেলিষ্টটোত পৰৱৰ্তী মিডিয়া" + +#: modules/gui/qt/components/controller.hpp:126 +#: modules/gui/qt/components/open_panels.cpp:241 +msgid "Open subtitle file" +msgstr "উপশিৰোনাম ফাইল খোলক" + +#: modules/gui/qt/components/controller.hpp:127 +msgid "Dock/undock fullscreen controller to/from bottom of screen" +msgstr "স্ক্ৰীনৰ তল লৈ/পৰা সম্পূৰ্ণদৃশ্য নিয়ন্ত্ৰকটো ডক/আনডক কৰক " + +#: modules/gui/qt/components/controller_widget.cpp:136 +msgctxt "Tooltip|Unmute" +msgid "Unmute" +msgstr "নিস্তব্দহীন কৰক" + +#: modules/gui/qt/components/controller_widget.cpp:148 +msgctxt "Tooltip|Mute" +msgid "Mute" +msgstr "নিস্তব্দ কৰক" + +#: modules/gui/qt/components/controller_widget.cpp:234 +msgid "Pause the playback" +msgstr "প্লেবেকটোত বিৰতি দিয়ক" + +#: modules/gui/qt/components/controller_widget.cpp:243 +msgid "" +"Loop from point A to point B continuously\n" +"Click to set point A" +msgstr "" +"A বিন্দুৰ পৰা B বিন্দুলৈ ধাৰাবাহিকভাৱে লুপ কৰক\n" +"A বিন্দু ছেট কৰিবলৈ ক্লিক কৰক" + +#: modules/gui/qt/components/controller_widget.cpp:249 +msgid "Click to set point B" +msgstr "B বিন্দু ছেট কৰিবলৈ ক্লিক কৰক" + +#: modules/gui/qt/components/controller_widget.cpp:254 +msgid "Stop the A to B loop" +msgstr "A ৰ পৰা B লৈ লুপটো বন্ধ কৰক" + +#: modules/gui/qt/components/controller_widget.cpp:275 +#: modules/video_output/decklink.cpp:80 +msgid "Aspect Ratio" +msgstr "দৃষ্টিকোণৰ অনুপাত" + +#: modules/gui/qt/components/epg/EPGWidget.cpp:65 +msgid "No EPG Data Available" +msgstr "" + +#: modules/gui/qt/components/extended_panels.cpp:393 +#: modules/gui/qt/components/extended_panels.cpp:406 +msgid "Image Files" +msgstr "" + +#: modules/gui/qt/components/extended_panels.cpp:395 modules/spu/logo.c:49 +msgid "Logo filenames" +msgstr "প্ৰতীক ফাইল নামবোৰ" + +#: modules/gui/qt/components/extended_panels.cpp:408 +#: modules/video_filter/erase.c:55 +msgid "Image mask" +msgstr "ছবি মাক্স" + +#: modules/gui/qt/components/extended_panels.cpp:658 +msgid "" +"No v4l2 instance found.\n" +"Please check that the device has been opened with VLC and is playing.\n" +"\n" +"Controls will automatically appear here." +msgstr "" +"নহয় v4l2 বিচাৰি পোৱা গল.\n" +"হব পাৰে যদি আপুনি ভিডিঅ' আৰু অডিঅ'টোৰ মাজত VLC অন্তৰাল এটা দেখা পায়.\n" +"\n" +"নিয়ন্ত্ৰণবোৰে স্বয়ংক্ৰিয়ভাৱে ইয়াত দৃষ্টিগোচৰ হব." + +#: modules/gui/qt/components/extended_panels.cpp:1132 +#: modules/gui/qt/components/extended_panels.cpp:1133 +#: modules/gui/qt/components/extended_panels.cpp:1134 +#: modules/gui/qt/components/extended_panels.cpp:1135 +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1137 +#: modules/gui/qt/components/extended_panels.cpp:1138 +#: modules/gui/qt/components/extended_panels.cpp:1139 +#: modules/gui/qt/components/extended_panels.cpp:1140 +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1145 +#: modules/gui/qt/components/extended_panels.cpp:1146 +#: modules/gui/qt/components/extended_panels.cpp:1147 +#: modules/gui/qt/components/extended_panels.cpp:1148 +#: modules/gui/qt/components/extended_panels.cpp:1149 +#: modules/gui/qt/components/extended_panels.cpp:1150 +#: modules/gui/qt/components/extended_panels.cpp:1151 +#: modules/gui/qt/components/extended_panels.cpp:1152 +#: modules/gui/qt/components/extended_panels.cpp:1153 +#: modules/gui/qt/components/extended_panels.cpp:1154 +#: modules/gui/qt/components/extended_panels.cpp:1157 +#: modules/gui/qt/components/extended_panels.cpp:1328 +#: modules/gui/qt/components/extended_panels.cpp:1330 +#: modules/gui/qt/components/extended_panels.cpp:1331 +msgid "dB" +msgstr "dB" + +#: modules/gui/qt/components/extended_panels.cpp:1133 +msgid "170 Hz" +msgstr "170 Hz" + +#: modules/gui/qt/components/extended_panels.cpp:1134 +msgid "310 Hz" +msgstr "310 Hz" + +#: modules/gui/qt/components/extended_panels.cpp:1135 +msgid "600 Hz" +msgstr "600 Hz" + +#: modules/gui/qt/components/extended_panels.cpp:1136 +#: modules/gui/qt/components/extended_panels.cpp:1150 +msgid "1 KHz" +msgstr "1 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1137 +msgid "3 KHz" +msgstr "3 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1138 +msgid "6 KHz" +msgstr "6 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1139 +msgid "12 KHz" +msgstr "12 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1140 +msgid "14 KHz" +msgstr "14 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1141 +#: modules/gui/qt/components/extended_panels.cpp:1154 +msgid "16 KHz" +msgstr "16 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1145 +msgid "31 Hz" +msgstr "31 Hz" + +#: modules/gui/qt/components/extended_panels.cpp:1146 +msgid "63 Hz" +msgstr "63 Hz" + +#: modules/gui/qt/components/extended_panels.cpp:1147 +msgid "125 Hz" +msgstr "125 Hz" + +#: modules/gui/qt/components/extended_panels.cpp:1148 +msgid "250 Hz" +msgstr "250 Hz" + +#: modules/gui/qt/components/extended_panels.cpp:1149 +msgid "500 Hz" +msgstr "500 Hz" + +#: modules/gui/qt/components/extended_panels.cpp:1151 +msgid "2 KHz" +msgstr "2 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1152 +msgid "4 KHz" +msgstr "4 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1153 +msgid "8 KHz" +msgstr "8 KHz" + +#: modules/gui/qt/components/extended_panels.cpp:1326 +#: modules/gui/qt/components/extended_panels.cpp:1327 +msgid "ms" +msgstr "ms" + +#: modules/gui/qt/components/extended_panels.cpp:1330 +msgid "" +"Knee\n" +"radius" +msgstr "" +"বক্ৰ\n" +"ব্যাসাৰ্ধ" + +#: modules/gui/qt/components/extended_panels.cpp:1331 +msgid "" +"Makeup\n" +"gain" +msgstr "" +"তৈয়াৰ\n" +"লাভ" + +#: modules/gui/qt/components/extended_panels.cpp:1384 +msgid "Adjust pitch" +msgstr "" + +#: modules/gui/qt/components/extended_panels.cpp:1418 +msgid "(Hastened)" +msgstr "(সোনকালে কৰা হল)" + +#: modules/gui/qt/components/extended_panels.cpp:1420 +msgid "(Delayed)" +msgstr "(বিলম্ব কৰা হল)" + +#: modules/gui/qt/components/extended_panels.cpp:1507 +msgid "Force update of this dialog's values" +msgstr "এই সংলাপৰ মানবোৰৰ আপডেটটো জোৰ কৰক" + +#: modules/gui/qt/components/info_panels.cpp:132 +msgid "&Fingerprint" +msgstr "&ফিংগাৰপ্ৰিন্ট" + +#: modules/gui/qt/components/info_panels.cpp:133 +msgid "Find meta data using audio fingerprinting" +msgstr "অডিঅ' ফিংগাৰপ্ৰিন্ট ব্যৱহাৰ কৰি মেটা ডাটা বিচাৰি উলিয়াওক" + +#: modules/gui/qt/components/info_panels.cpp:154 +msgid "Comments" +msgstr "মন্তব্যবোৰ" + +#: modules/gui/qt/components/info_panels.cpp:376 +msgid "Extra metadata and other information are shown in this panel.\n" +msgstr "এই পেনেলটোত অতিৰিক্ত মেটাডাটা আৰু অন্য তথ্য দেখুওৱা হৈছে.\n" + +#: modules/gui/qt/components/info_panels.cpp:473 +msgid "" +"Information about what your media or stream is made of.\n" +"Muxer, Audio and Video Codecs, Subtitles are shown." +msgstr "" +"আপোনাৰ মিডিয়া বা ষ্ট্ৰিম কিহেৰে তৈয়াৰী তাৰ বিষয়ে তথ্য.\n" +"মাক্সাৰ, অডিঅ' আৰু ভিডিঅ' কোডেকছ, উপশিৰোনামবোৰ দেখুওৱা হল." + +#: modules/gui/qt/components/info_panels.cpp:548 +msgid "Current media / stream statistics" +msgstr "চলিত মিডিয়া / ষ্ট্ৰিমৰ পৰিসংখ্যাবোৰ" + +#: modules/gui/qt/components/info_panels.cpp:574 +msgid "Input/Read" +msgstr "ইনপুট/পঢ়ক" + +#: modules/gui/qt/components/info_panels.cpp:576 +msgid "Media data size" +msgstr "মিডিয়া ডাটাৰ আকাৰ" + +#: modules/gui/qt/components/info_panels.cpp:582 +msgid "Demuxed data size" +msgstr "ডিমাক্স কৰা ডাটাৰ আকাৰ" + +#: modules/gui/qt/components/info_panels.cpp:583 +msgid "Content bitrate" +msgstr "বিষয়বস্তুৰ বিটৰ হাৰ" + +#: modules/gui/qt/components/info_panels.cpp:585 +msgid "Discarded (corrupted)" +msgstr "বাতিল কৰা হল (নষ্ট হৈছে)" + +#: modules/gui/qt/components/info_panels.cpp:587 +msgid "Dropped (discontinued)" +msgstr "ড্ৰপ কৰা হল (অব্যাহত বাতিল হল)" + +#: modules/gui/qt/components/info_panels.cpp:590 +#: modules/gui/qt/components/info_panels.cpp:597 +msgid "Decoded" +msgstr "ডিকোড কৰা হল" + +#: modules/gui/qt/components/info_panels.cpp:591 +#: modules/gui/qt/components/info_panels.cpp:598 +msgid "blocks" +msgstr "খণ্ডবোৰ" + +#: modules/gui/qt/components/info_panels.cpp:592 +msgid "Displayed" +msgstr "প্ৰদৰ্শন কৰা হল" + +#: modules/gui/qt/components/info_panels.cpp:593 +#: modules/gui/qt/components/info_panels.cpp:595 +msgid "frames" +msgstr "ফ্ৰেমবোৰ" + +#: modules/gui/qt/components/info_panels.cpp:594 +#: modules/gui/qt/components/info_panels.cpp:601 +msgid "Lost" +msgstr "হেৰালে" + +#: modules/gui/qt/components/info_panels.cpp:599 +msgid "Played" +msgstr "চলোৱা হল" + +#: modules/gui/qt/components/info_panels.cpp:600 +#: modules/gui/qt/components/info_panels.cpp:601 +msgid "buffers" +msgstr "বাফাৰবোৰ" + +#: modules/gui/qt/components/info_panels.cpp:622 +msgid "Last 60 seconds" +msgstr "অন্তিম 60 ছেকেণ্ড" + +#: modules/gui/qt/components/info_panels.cpp:623 +msgid "Overall" +msgstr "সমগ্ৰ" + +#: modules/gui/qt/components/interface_widgets.cpp:683 +msgid "" +"Current playback speed: %1\n" +"Click to adjust" +msgstr "" +"চলিত প্লেবেকৰ গতি: %1\n" +"মিলাবলৈ ক্লিক কৰক" + +#: modules/gui/qt/components/interface_widgets.cpp:756 +msgid "Revert to normal play speed" +msgstr "স্বাভাৱিকভাৱে চলা গতিটোলৈ উভতি আহক" + +#: modules/gui/qt/components/interface_widgets.cpp:863 +msgid "Download cover art" +msgstr "প্ৰচ্ছেদ চিত্ৰ ডাউনলোড কৰক" + +#: modules/gui/qt/components/interface_widgets.cpp:867 +msgid "Add cover art from file" +msgstr "ফাইলৰ পৰা প্ৰচ্ছেদ চিত্ৰ যোগ কৰক" + +#: modules/gui/qt/components/interface_widgets.cpp:933 +msgid "Choose Cover Art" +msgstr "প্ৰচ্ছেদ চিত্ৰ পছন্দ কৰক" + +#: modules/gui/qt/components/interface_widgets.cpp:934 +msgid "Image Files (*.gif *.jpg *.jpeg *.png)" +msgstr "ছবি ফাইলবোৰ (*.gif *.jpg *.jpeg *.png)" + +#: modules/gui/qt/components/interface_widgets.cpp:961 +#: modules/gui/qt/dialogs/toolbar.cpp:573 +msgid "Elapsed time" +msgstr "অতিবাহিত সময়" + +#: modules/gui/qt/components/interface_widgets.cpp:965 +#: modules/gui/qt/dialogs/toolbar.cpp:577 +msgid "Total/Remaining time" +msgstr "মুঠ/বাকীথকা সময়" + +#: modules/gui/qt/components/interface_widgets.cpp:967 +msgid "Click to toggle between total and remaining time" +msgstr "মুঠ আৰু বাকী থকা সময়ৰ মাজৰ টগুলত ক্লিক কৰক" + +#: modules/gui/qt/components/interface_widgets.cpp:973 +msgid "Click to toggle between elapsed and remaining time" +msgstr "অতিবাহিত আৰু বাকী থকা সময়ৰ মাজৰ টগুলত ক্লিক কৰক" + +#: modules/gui/qt/components/interface_widgets.cpp:975 +msgid "Double click to jump to a chosen time position" +msgstr "নিৰ্বাচিত সময়ৰ স্থান এটালৈ যাবলৈ দ্বিগুণ ক্লিক কৰক" + +#: modules/gui/qt/components/open_panels.cpp:55 +msgid "Select a device or a VIDEO_TS directory" +msgstr "ডিভাইচ এটা বা VIDEO_TS নিৰ্দেশিকা এটা নিৰ্বাচন কৰক" + +#: modules/gui/qt/components/open_panels.cpp:56 +msgid "Select a device or a VIDEO_TS folder" +msgstr "ডিভাইচ এটা বা VIDEO_TS ফল্ডাৰ এটা নিৰ্বাচন কৰক" + +#: modules/gui/qt/components/open_panels.cpp:127 +#: modules/gui/qt/components/open_panels.cpp:206 +msgid "Select one or multiple files" +msgstr "এটা বা বিভিন্ন ফাইল নিৰ্বাচন কৰক" + +#: modules/gui/qt/components/open_panels.cpp:142 +msgid "File names:" +msgstr "ফাইল নামবোৰ:" + +#: modules/gui/qt/components/open_panels.cpp:144 +#: modules/gui/qt/ui/sprefs_interface.h:565 +msgid "Filter:" +msgstr "ফিল্টাৰ:" + +#: modules/gui/qt/components/open_panels.cpp:349 +msgid "Eject the disc" +msgstr "ডিস্কখন উলিয়াওক" + +#: modules/gui/qt/components/open_panels.cpp:514 +msgid "Entry" +msgstr "প্ৰৱিষ্টি" + +#: modules/gui/qt/components/open_panels.cpp:873 +msgid "Channels:" +msgstr "চেনেলবোৰ:" + +#: modules/gui/qt/components/open_panels.cpp:884 +msgid "Selected ports:" +msgstr "পোৰ্টবোৰ নিৰ্বাচন কৰক:" + +#: modules/gui/qt/components/open_panels.cpp:887 +msgid ".*" +msgstr ".*" + +#: modules/gui/qt/components/open_panels.cpp:894 +msgid "Use VLC pace" +msgstr "VLC ৰ গতি ব্যৱহাৰ কৰক" + +#: modules/gui/qt/components/open_panels.cpp:914 +msgid "TV - digital" +msgstr "TV - ডিজিটেল" + +#: modules/gui/qt/components/open_panels.cpp:917 +msgid "Tuner card" +msgstr "টিউনাৰ কাৰ্ড" + +#: modules/gui/qt/components/open_panels.cpp:918 +msgid "Delivery system" +msgstr "পথোৱাৰ প্ৰণালী" + +#: modules/gui/qt/components/open_panels.cpp:948 +msgid "Transponder/multiplex frequency" +msgstr "ট্ৰেন্সপোণ্ডাৰ/মাল্টিপ্লেক্স কম্পনাংক" + +#: modules/gui/qt/components/open_panels.cpp:958 +msgid "Transponder symbol rate" +msgstr "ট্ৰেন্সপোণ্ডাৰ প্ৰতীকৰ হাৰ" + +#: modules/gui/qt/components/open_panels.cpp:991 +msgid "Bandwidth" +msgstr "বেণ্ডৰ প্ৰস্থ" + +#: modules/gui/qt/components/open_panels.cpp:1035 +msgid "TV - analog" +msgstr "TV - এনালগ" + +#: modules/gui/qt/components/open_panels.cpp:1038 +msgid "Device name" +msgstr "ডিভাইচৰ নাম" + +#: modules/gui/qt/components/open_panels.cpp:1098 +msgid "Your display will be opened and played in order to stream or save it." +msgstr "আপোনাৰ প্ৰদৰ্শনটো খোলা হব আৰু এইটো ষ্ট্ৰিম বা ছেভ কৰিবলৈ চলোৱা হব." + +#. xgettext: frames per second +#: modules/gui/qt/components/open_panels.cpp:1112 +msgid " f/s" +msgstr " f/s" + +#: modules/gui/qt/components/open_panels.cpp:1327 +msgid "Advanced Options" +msgstr "উন্নত বিকল্পবোৰ" + +#: modules/gui/qt/components/playlist/playlist.cpp:74 +msgid "Double click to get media information" +msgstr "মিডিয়া তথ্য পাবলৈ দ্বিগুণ ক্লিক কৰক" + +#: modules/gui/qt/components/playlist/playlist.cpp:113 +msgid "Change playlistview" +msgstr "প্লেলিষ্টৰ দৃশ্য সলনি কৰক" + +#: modules/gui/qt/components/playlist/playlist.cpp:123 +msgid "Search the playlist" +msgstr "প্লেলিষ্টৰ সন্ধান কৰক" + +#: modules/gui/qt/components/playlist/selector.cpp:243 +msgid "My Computer" +msgstr "মোৰ কম্পিউটাৰ" + +#: modules/gui/qt/components/playlist/selector.cpp:244 +msgid "Devices" +msgstr "ডিভাইচবোৰ" + +#: modules/gui/qt/components/playlist/selector.cpp:245 +msgid "Local Network" +msgstr "স্থানীয় নেটৱৰ্ক" + +#: modules/gui/qt/components/playlist/selector.cpp:246 +msgid "Internet" +msgstr "ইন্টাৰনেট" + +#: modules/gui/qt/components/playlist/selector.cpp:456 +msgid "Remove this podcast subscription" +msgstr "এই পডকাষ্ট ছাবক্ৰিপশ্বনবোৰ আতঁৰ কৰক" + +#: modules/gui/qt/components/playlist/selector.cpp:607 +msgid "Do you really want to unsubscribe from %1?" +msgstr "আপুনি প্ৰকৃততে %1 ৰ পৰা আনছাবক্ৰাইব কৰিব বিচাৰে নেকি?" + +#: modules/gui/qt/components/playlist/sorting.h:69 +msgid "Cover" +msgstr "প্ৰচ্চেদ" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:50 +msgid "Create Directory" +msgstr "নিৰ্দেশিকা তৈয়াৰ কৰক" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:50 +msgid "Create Folder" +msgstr "ফোল্ডাৰ তৈয়াৰ কৰক" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:52 +msgid "Enter name for new directory:" +msgstr "নতুন নিৰ্দেশিকাৰ বাবে নাম ভৰাওক:" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:53 +msgid "Enter name for new folder:" +msgstr "নতুন ফোল্ডাৰৰ বাবে নাম ভৰাওক:" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:56 +msgid "Rename Directory" +msgstr "নিৰ্দেশিকাৰ পুনৰ নামাংকন কৰক" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:56 +msgid "Rename Folder" +msgstr "ফোল্ডাৰৰ পুনৰ নামাংকন কৰক" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:58 +msgid "Enter a new name for the directory:" +msgstr "নিৰ্দেশিকাটোৰ বাবে নতুন নাম এটা ভৰাওক:" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:59 +msgid "Enter a new name for the folder:" +msgstr "ফোল্ডাৰটোৰ বাবে নতুন নাম এটা ভৰাওক:" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:255 +msgid "Sort by" +msgstr "...ৰ দ্বাৰা বৰ্গীকৰণ কৰক" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:262 +msgid "Ascending" +msgstr "উৰ্ধক্ৰম" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:266 +msgid "Descending" +msgstr "অধোক্ৰম" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:279 +msgid "Display size" +msgstr "আকাৰ প্ৰদৰ্শন কৰক" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:280 +msgid "Increase" +msgstr "বৃদ্ধি" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:281 +msgid "Decrease" +msgstr "হ্ৰাস" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:414 +msgid "Playlist View Mode" +msgstr "প্লেলিষ্ট দৃশ্যৰ ধৰণ" + +#: modules/gui/qt/components/playlist/standardpanel.cpp:593 +msgid "" +"Playlist is currently empty.\n" +"Drop a file here or select a media source from the left." +msgstr "" +"প্লেলিষ্ট বৰ্তমান খালী.\n" +"ইয়াত ফাইল এটা ড্ৰপ কৰক বা বাওঁফালৰ পৰা মিডিয়া উত্স এটা নিৰ্বাচন কৰক." + +#: modules/gui/qt/components/playlist/standardpanel.hpp:143 +msgid "Icons" +msgstr "আইকনবোৰ" + +#: modules/gui/qt/components/playlist/standardpanel.hpp:144 +msgid "Detailed List" +msgstr "পূংখানুপূংখ বিৱৰণৰ তালিকা" + +#: modules/gui/qt/components/playlist/standardpanel.hpp:145 +msgid "List" +msgstr "তালিকা" + +#: modules/gui/qt/components/playlist/standardpanel.hpp:146 +msgid "PictureFlow" +msgstr "ছবিৰ প্ৰবাহ" + +#: modules/gui/qt/components/preferences_widgets.cpp:305 +msgid "Select File" +msgstr "ফাইল নিৰ্বাচন কৰক" + +#: modules/gui/qt/components/preferences_widgets.cpp:1129 +msgid "" +"Select or double click an action to change the associated hotkey. Use delete " +"key to remove hotkeys." +msgstr "" + +#: modules/gui/qt/components/preferences_widgets.cpp:1136 +msgid "in" +msgstr "ভিতৰত" + +#: modules/gui/qt/components/preferences_widgets.cpp:1138 +msgid "Any field" +msgstr "যিকোনো ক্ষেত্ৰ" + +#: modules/gui/qt/components/preferences_widgets.cpp:1139 +msgid "Actions" +msgstr "কাৰ্যবোৰ" + +#: modules/gui/qt/components/preferences_widgets.cpp:1146 +msgid "Hotkey" +msgstr "হটকী" + +#: modules/gui/qt/components/preferences_widgets.cpp:1147 +msgid "Application level hotkey" +msgstr "আবেদন স্তৰৰ হটকী" + +#: modules/gui/qt/components/preferences_widgets.cpp:1148 +#: modules/gui/qt/components/preferences_widgets.cpp:1405 +msgid "Global" +msgstr "সাৰ্বজনীন" + +#: modules/gui/qt/components/preferences_widgets.cpp:1149 +msgid "Desktop level hotkey" +msgstr "ডেস্কটপ স্তৰৰ হটকী" + +#: modules/gui/qt/components/preferences_widgets.cpp:1229 +#: modules/gui/qt/components/preferences_widgets.cpp:1230 +msgid "" +"Double click to change.\n" +"Delete key to remove." +msgstr "" +"সলনি কৰিবলৈ দ্বিগুণ ক্লিক কৰক.\n" +"আতঁৰ কৰিবলৈ কী ডিলিট কৰক." + +#: modules/gui/qt/components/preferences_widgets.cpp:1406 +msgid "Hotkey change" +msgstr "হটকী সলনি" + +#: modules/gui/qt/components/preferences_widgets.cpp:1410 +msgid "Press the new key or combination for " +msgstr "নতুন কীটোত হেচক বা ... বাবে মিশ্ৰণ কৰক" + +#: modules/gui/qt/components/preferences_widgets.cpp:1419 +msgid "Assign" +msgstr "নিৰ্ধাৰণ কৰক" + +#: modules/gui/qt/components/preferences_widgets.cpp:1454 +msgid "Warning: this key or combination is already assigned to " +msgstr "সতৰ্কীকৰণ: এই কী বা মিশ্ৰণটো ইতিমধ্যে ...লৈ নিৰ্ধাৰণ কৰা হৈছে " + +#: modules/gui/qt/components/preferences_widgets.cpp:1466 +msgid "Warning: %1 is already an application menu shortcut" +msgstr "সতৰ্কীকৰণ: %1 হল ইতিমধ্যে এটা আবেদন তালিকাৰ চমুপথ" + +#: modules/gui/qt/components/preferences_widgets.cpp:1489 +msgid "Key or combination: " +msgstr "কী বা মিশ্ৰণ: " + +#: modules/gui/qt/components/preferences_widgets.cpp:1498 +msgid "Key: " +msgstr "কী: " + +#: modules/gui/qt/components/simple_preferences.cpp:256 +#: modules/gui/qt/components/simple_preferences.cpp:636 +msgid "Input & Codecs Settings" +msgstr "ইনপুট & কোডেকছ ছেটিংবোৰ " + +#: modules/gui/qt/components/simple_preferences.cpp:258 +#: modules/gui/qt/components/simple_preferences.cpp:938 +msgid "Configure Hotkeys" +msgstr "হটকীবোৰ ৰূপৰেখা কৰক" + +#: modules/gui/qt/components/simple_preferences.cpp:455 +msgid "Device:" +msgstr "ডিভাইচ:" + +#: modules/gui/qt/components/simple_preferences.cpp:641 +msgid "" +"If this property is blank, different values\n" +"for DVD, VCD, and CDDA are set.\n" +"You can define a unique one or configure them \n" +"individually in the advanced preferences." +msgstr "" +"যদি এই বৈশিষ্ট্যটো খালী, বিভিন্ন মানবোৰ\n" +"DVD, VCD, আৰু CDDA ছেট কৰা হয়.\n" +"আপুনি এটা অদ্বিতীয় বাখ্যা কৰিব পাৰে বা সেইবোৰক\n" +"ব্যক্তিগতভাৱে উন্নত পছন্দবোৰত ৰূপৰেখা কৰিব পাৰে." + +#: modules/gui/qt/components/simple_preferences.cpp:712 +msgid "Lowest latency" +msgstr "আটাইতকৈ নিম্ন বিলম্ব" + +#: modules/gui/qt/components/simple_preferences.cpp:715 +msgid "High latency" +msgstr "উচ্চ বিলম্ব" + +#: modules/gui/qt/components/simple_preferences.cpp:716 +msgid "Higher latency" +msgstr "অধিক উচ্চ বিলম্ব" + +#: modules/gui/qt/components/simple_preferences.cpp:764 +msgid "This is VLC's skinnable interface. You can download other skins at" +msgstr "" +"এইটো হল VLC ৰ স্কিন কৰিব পৰা ইন্টাৰফেছ. ...ত আপুনি অন্য স্কিনবোৰ ডাউনলোড কৰিব পাৰে" + +#: modules/gui/qt/components/simple_preferences.cpp:766 +msgid "VLC skins website" +msgstr "VLC স্কিনবোৰৰ ৱেবছাইট" + +#: modules/gui/qt/components/simple_preferences.cpp:794 +msgid "System's default" +msgstr "ছিষ্টেমৰ ডিফল্ট" + +#: modules/gui/qt/components/simple_preferences.cpp:1344 +msgid "File associations" +msgstr "ফাইল সংস্থাবোৰ" + +#: modules/gui/qt/components/simple_preferences.cpp:1353 +#: modules/gui/qt/dialogs_provider.hpp:42 +msgid "Audio Files" +msgstr "অডিঅ' ফাইলবোৰ" + +#: modules/gui/qt/components/simple_preferences.cpp:1354 +#: modules/gui/qt/dialogs_provider.hpp:41 +msgid "Video Files" +msgstr "ভিডিঅ' ফাইলবোৰ" + +#: modules/gui/qt/components/simple_preferences.cpp:1355 +#: modules/gui/qt/dialogs_provider.hpp:43 +msgid "Playlist Files" +msgstr "প্লেলিষ্ট ফাইলবোৰ" + +#: modules/gui/qt/components/simple_preferences.cpp:1420 +msgid "&Apply" +msgstr "প্ৰয়োগ কৰক" + +#: modules/gui/qt/components/simple_preferences.cpp:1421 +#: modules/gui/qt/dialogs/convert.cpp:137 +#: modules/gui/qt/dialogs/gototime.cpp:48 modules/gui/qt/dialogs/open.cpp:109 +#: modules/gui/qt/dialogs/openurl.cpp:59 +#: modules/gui/qt/dialogs/podcast_configuration.cpp:37 +#: modules/gui/qt/dialogs/preferences.cpp:97 +#: modules/gui/qt/dialogs/toolbar.cpp:198 +msgid "&Cancel" +msgstr "বাতিল কৰক" + +#: modules/gui/qt/components/sout/profile_selector.cpp:53 +msgid "Profile" +msgstr "প্ৰফাইল" + +#: modules/gui/qt/components/sout/profile_selector.cpp:61 +msgid "Edit selected profile" +msgstr "নিৰ্বাচিত প্ৰফালইবোৰ সম্পাদনা কৰক" + +#: modules/gui/qt/components/sout/profile_selector.cpp:66 +msgid "Delete selected profile" +msgstr "নিৰ্বাচিত প্ৰফালইবোৰ ডিলিট কৰক" + +#: modules/gui/qt/components/sout/profile_selector.cpp:71 +msgid "Create a new profile" +msgstr "এটা নতুন প্ৰফাইল তৈয়াৰ কৰক" + +#: modules/gui/qt/components/sout/profile_selector.cpp:449 +#: modules/gui/qt/dialogs/bookmarks.cpp:47 +msgid "Create" +msgstr "তৈয়াৰ কৰক" + +#: modules/gui/qt/components/sout/profile_selector.cpp:635 +msgid "This muxer is not provided directly by VLC: It could be missing." +msgstr "VLC ৰ দ্বাৰা মাক্সাৰটো প্ৰত্যক্ষভাৱে আগবঢ়োৱা নহয়: এইটো হেৰাব পাৰে." + +#: modules/gui/qt/components/sout/profile_selector.cpp:642 +msgid "This muxer is missing. Using this profile will fail" +msgstr "এই মাক্সাৰটো হেৰাইছে. এই প্ৰফাইলটো ব্যৱহাৰ কৰাটো ব্যৰ্থ হব" + +#: modules/gui/qt/components/sout/profile_selector.cpp:787 +msgid " Profile Name Missing" +msgstr "প্ৰফাইল নাম হেৰাইছে" + +#: modules/gui/qt/components/sout/profile_selector.cpp:788 +msgid "You must set a name for the profile." +msgstr "প্ৰফাইলটোৰ বাবে আপুনি নাম এটা ছেট কৰাটো অপৰিহাৰ্য্য." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 +msgid "File/Directory" +msgstr "ফাইল/নিৰ্দেশিকা" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:41 +msgid "File/Folder" +msgstr "ফাইল/ফোল্ডাৰ" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:48 +#: modules/gui/qt/ui/sout.h:199 +msgid "Source" +msgstr "উত্স" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:51 +msgid "Source:" +msgstr "উত্স:" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:60 +msgid "Type:" +msgstr "প্ৰকাৰ:" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:128 +msgid "This module writes the transcoded stream to a file." +msgstr "এই মডুলটোৱে ফাইল এটালৈ ট্ৰেনছকোড কৰা ষ্ট্ৰিম এটা লিখে." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:130 +msgid "Filename" +msgstr "ফাইল নাম" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:174 +#: modules/gui/qt/dialogs/convert.cpp:161 +msgid "Save file..." +msgstr "ফাইল ছেভ কৰক..." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:175 +msgid "" +"Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" +msgstr "" +"ধাৰকবোৰ (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:185 +msgid "This module outputs the transcoded stream to a network via HTTP." +msgstr "এই মডুলটোৱে ট্ৰেনছকোড কৰা ষ্ট্ৰিমটো নেটৱৰ্ক এটালৈ HTTP যোগেদি আউটপুট কৰে." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:187 +#: modules/gui/qt/components/sout/sout_widgets.cpp:283 +msgid "Path" +msgstr "পাথ" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:239 +msgid "" +"This module outputs the transcoded stream to a network via the mms protocol." +msgstr "" +"এই মডুলটোৱে ট্ৰেনছকোড কৰা ষ্ট্ৰিমটো নেটৱৰ্ক এটালৈ mms প্ৰটকলটোৰ যোগেদি আউটপুট কৰে." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:281 +msgid "This module outputs the transcoded stream to a network via RTSP." +msgstr "এই মডুলটোৱে ট্ৰেনছকোড কৰা ষ্ট্ৰিমটো নেটৱৰ্ক এটালৈ RTSP ৰ যোগেদি আউটপুট কৰে." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:327 +msgid "This module outputs the transcoded stream to a network via UDP." +msgstr "এই মডুলটোৱে ট্ৰেনছকোড কৰা ষ্ট্ৰিমটো নেটৱৰ্ক এটালৈ UDP ৰ যোগেদি আউটপুট কৰে." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:369 +msgid "This module outputs the transcoded stream to a network via RTP." +msgstr "এই মডুলটোৱে ট্ৰেনছকোড কৰা ষ্ট্ৰিমটো নেটৱৰ্ক এটালৈ RTP ৰ যোগেদি আউটপুট কৰে." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:376 +msgid "Base port" +msgstr "আধাৰ পোৰ্ট" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:424 +msgid "This module outputs the transcoded stream to an Icecast server." +msgstr "আইছকাষ্ট ছাৰ্ভাৰ এটালৈ এই মডুলটোৱে ট্ৰেন্সকোড কৰা ষ্ট্ৰিমটো আউটপুট কৰে." + +#: modules/gui/qt/components/sout/sout_widgets.cpp:443 +msgid "Mount Point" +msgstr "শীৰ্ষ বিন্দু" + +#: modules/gui/qt/components/sout/sout_widgets.cpp:444 +msgid "Login:pass" +msgstr "লগইন:পাছ" + +#: modules/gui/qt/dialogs/bookmarks.cpp:41 +msgid "Edit Bookmarks" +msgstr "পৃষ্ঠাসংকেতবোৰ সম্পাদনা কৰক" + +#: modules/gui/qt/dialogs/bookmarks.cpp:48 +msgid "Create a new bookmark" +msgstr "নতুন পৃষ্ঠাসংকেত এটা তৈয়াৰ কৰক" + +#: modules/gui/qt/dialogs/bookmarks.cpp:51 +msgid "Delete the selected item" +msgstr "নিৰ্বাচিত বস্তুটো ডিলিট কৰক" + +#: modules/gui/qt/dialogs/bookmarks.cpp:54 +msgid "Delete all the bookmarks" +msgstr "সকলোবোৰ পৃষ্ঠাসংকেত ডিলিট কৰক" + +#: modules/gui/qt/dialogs/bookmarks.cpp:57 modules/video_filter/extract.c:68 +msgid "Extract" +msgstr "নিষ্কৰ্ষ কৰক" + +#: modules/gui/qt/dialogs/bookmarks.cpp:62 modules/gui/qt/dialogs/epg.cpp:92 +#: modules/gui/qt/dialogs/errors.cpp:49 modules/gui/qt/dialogs/extended.cpp:130 +#: modules/gui/qt/dialogs/help.cpp:64 modules/gui/qt/dialogs/help.cpp:223 +#: modules/gui/qt/dialogs/mediainfo.cpp:80 +#: modules/gui/qt/dialogs/messages.cpp:81 modules/gui/qt/dialogs/plugins.cpp:93 +#: modules/gui/qt/dialogs/plugins.cpp:1437 +#: modules/gui/qt/dialogs/plugins.cpp:1550 +#: modules/gui/qt/dialogs/podcast_configuration.cpp:36 +#: modules/gui/qt/dialogs/vlm.cpp:130 +msgid "&Close" +msgstr "বন্ধ কৰক" + +#: modules/gui/qt/dialogs/bookmarks.cpp:76 +msgid "Bytes" +msgstr "বাইটবোৰ" + +#: modules/gui/qt/dialogs/convert.cpp:48 modules/gui/qt/dialogs/convert.cpp:106 +msgid "Convert" +msgstr "ৰূপান্তৰ কৰক" + +#: modules/gui/qt/dialogs/convert.cpp:61 +msgid "Multiple files selected." +msgstr "" + +#: modules/gui/qt/dialogs/convert.cpp:68 modules/stream_out/rtp.c:76 +msgid "Destination" +msgstr "গন্তব্যস্থান" + +#: modules/gui/qt/dialogs/convert.cpp:71 modules/gui/qt/ui/sprefs_audio.h:414 +msgid "Destination file:" +msgstr "গন্তব্যস্থানৰ ফাইল:" + +#: modules/gui/qt/dialogs/convert.cpp:82 +msgid "Browse" +msgstr "ব্ৰাউজ কৰক" + +#: modules/gui/qt/dialogs/convert.cpp:90 +msgid "Multiple Files Selected." +msgstr "" + +#: modules/gui/qt/dialogs/convert.cpp:92 +msgid "Files will be placed in the same directory with the same name." +msgstr "" + +#: modules/gui/qt/dialogs/convert.cpp:95 +msgid "Append '-converted' to filename" +msgstr "" + +#: modules/gui/qt/dialogs/convert.cpp:103 +msgid "Settings" +msgstr "ছেটিংবোৰ" + +#: modules/gui/qt/dialogs/convert.cpp:118 +msgid "Display the output" +msgstr "আউটপুটটো প্ৰদৰ্শন কৰক" + +#: modules/gui/qt/dialogs/convert.cpp:119 +msgid "This display the resulting media, but can slow things down." +msgstr "এইটোৱে লাভ কৰা মিডিয়াটো প্ৰদৰ্শন কৰে, কিন্তু বস্তুবোৰ মন্থৰ কৰিব পাৰে." + +#: modules/gui/qt/dialogs/convert.cpp:136 +msgid "&Start" +msgstr "আৰম্ভ কৰক" + +#: modules/gui/qt/dialogs/convert.cpp:163 +msgid "Containers" +msgstr "ধাৰকবোৰ" + +#: modules/gui/qt/dialogs/epg.cpp:49 modules/gui/qt/menus.cpp:434 +msgid "Program Guide" +msgstr "কাৰ্যসূচীৰ পথপ্ৰদৰ্শক" + +#: modules/gui/qt/dialogs/epg.cpp:87 modules/gui/qt/ui/about.h:283 +#: modules/gui/qt/ui/about.h:284 +msgid "Update" +msgstr "আপডেট কৰক" + +#: modules/gui/qt/dialogs/epg.cpp:162 +msgid " (%1+ rated)" +msgstr "" + +#: modules/gui/qt/dialogs/errors.cpp:40 +msgid "Errors" +msgstr "ভুলবোৰ" + +#: modules/gui/qt/dialogs/errors.cpp:47 +msgid "Cl&ear" +msgstr "সম্পন্ন কৰৰক" + +#: modules/gui/qt/dialogs/errors.cpp:54 +msgid "Hide future errors" +msgstr "ভৱিষ্যতৰ ভুলবোৰ লুকুৱাওক" + +#: modules/gui/qt/dialogs/extended.cpp:51 +msgid "Adjustments and Effects" +msgstr "মিলোৱা আৰু প্ৰভাৱ বোৰ" + +#: modules/gui/qt/dialogs/extended.cpp:80 +msgid "Stereo Widener" +msgstr "" + +#: modules/gui/qt/dialogs/extended.cpp:111 +msgid "Synchronization" +msgstr "ছিনক্ৰনাইজেশ্বন" + +#: modules/gui/qt/dialogs/extended.cpp:116 +msgid "v4l2 controls" +msgstr "v4l2 নিয়ন্ত্ৰণবোৰ" + +#: modules/gui/qt/dialogs/extended.cpp:125 +#: modules/gui/qt/dialogs/preferences.cpp:95 +msgid "&Save" +msgstr "ছেভ কৰক" + +#: modules/gui/qt/dialogs/external.cpp:218 +msgid "Store the Password" +msgstr "" + +#: modules/gui/qt/dialogs/firstrun.cpp:58 +#: modules/gui/qt/dialogs/firstrun.cpp:66 +msgid "Privacy and Network Access Policy" +msgstr "গোপনীয়তা আৰু নেটৱৰ্ক প্ৰৱেশ নীতি" + +#: modules/gui/qt/dialogs/firstrun.cpp:69 +msgid "" +"

In order to protect your privacy, VLC media player does not " +"collect personal data or transmit them, not even in anonymized form, to " +"anyone.

\n" +"

Nevertheless, VLC is able to automatically retrieve information " +"about the media in your playlist from third party Internet-based services. " +"This includes cover art, track names, artist names and other meta-data.

\n" +"

Consequently, this may entail identifying some of your media files to " +"third party entities. Therefore the VLC developers require your " +"express consent for the media player to access the Internet automatically.\n" +msgstr "" +"VLC মিডিয়া চলোৱাৰ সহায়টোলৈ স্বাগতম

ডকুমেন্টেশ্বন

আপুনি ভিডিঅ'LANৰ " +"উইকি ৱেবছাইটত VLC ডকুমেন্টেশ্বন বিচাৰি " +"পাব পাৰে.\n" +"

যদি আপুনি VLC মিডিয়া প্লেয়াৰটো নতুনকৈ ব্যৱহাৰ কৰিছে, তেন্তে অনুগ্ৰহ কৰি, " +"VLC মিডিয়া প্লেয়াৰৰ পৰিচয়টো পঢ়ক.

প্লেয়াৰটো কেনেকৈ ব্যৱহাৰ " +"কৰিব লাগে তাৰ বিষয়ে আপুনি\n" +"
\"VLC " +"মিডিয়া প্লেয়াৰৰ সৈতে ফাইলবোৰ কেনেকৈ চলায়\" ডকুমেন্টত কিছু তথ্য লাভ কৰিব." +"

সকলোবোৰ ছেভিং, ৰূপান্তৰ, ট্ৰেন্সকোডিং, এনকোডিং, মাক্সিং আৰু ষ্ট্ৰিমিং কাৰ্যৰ " +"বাবে আপুনি.

\n" + +#: modules/gui/qt/dialogs/firstrun.cpp:88 +msgid "Network Access Policy" +msgstr "নেটৱৰ্ক প্ৰৱেশ পলিচী" + +#: modules/gui/qt/dialogs/firstrun.cpp:100 +msgid "Regularly check for VLC updates" +msgstr "VLC আপডেটবোৰৰ বাবে নিয়মিতভাৱে পৰীক্ষা কৰক" + +#: modules/gui/qt/dialogs/gototime.cpp:41 +msgid "Go to Time" +msgstr "সময়লৈ যাওক" + +#: modules/gui/qt/dialogs/gototime.cpp:47 +msgid "&Go" +msgstr "যাওক" + +#: modules/gui/qt/dialogs/gototime.cpp:55 +msgid "Go to time" +msgstr "সময়লৈ যাওক" + +#: modules/gui/qt/dialogs/help.cpp:84 modules/gui/qt/dialogs/plugins.cpp:1375 +#: modules/gui/qt/dialogs/plugins.cpp:1458 +msgid "About" +msgstr "বিষয়ে" + +#: modules/gui/qt/dialogs/help.cpp:101 +msgid "" +"

VLC media player is a free and open source media player, encoder, and " +"streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " +"essentially every popular platform, and can read almost all files, CDs, " +"DVDs, network streams, capture cards and other media formats!

Help and join us!" +msgstr "" + +#: modules/gui/qt/dialogs/help.cpp:225 +msgid "&Recheck version" +msgstr "সংস্কৰণটো পুনৰ পৰীক্ষা কৰক" + +#: modules/gui/qt/dialogs/help.cpp:228 +msgid "&Yes" +msgstr "হয়" + +#: modules/gui/qt/dialogs/help.cpp:230 +msgid "&No" +msgstr "নহয়" + +#: modules/gui/qt/dialogs/help.cpp:233 modules/gui/qt/ui/update.h:144 +msgid "VLC media player updates" +msgstr "VLC মিডিয়া প্লেয়াৰ আপডেটবোৰ" + +#: modules/gui/qt/dialogs/help.cpp:305 +msgid "A new version of VLC (%1.%2.%3%4) is available." +msgstr "VLC (%1.%2.%3%4) ৰ নতুন সংস্কৰণ এটা উপলব্ধ." + +#: modules/gui/qt/dialogs/help.cpp:330 +msgid "You have the latest version of VLC media player." +msgstr "আপোনাৰ তাত VLC মিডিয়া প্লেয়াৰৰ শেহতীয়া সংস্কৰণ এটা আছে." + +#: modules/gui/qt/dialogs/help.cpp:337 +msgid "An error occurred while checking for updates..." +msgstr "আপডেটবোৰৰ বাবে পৰীক্ষা কৰোতে ভুল এটাৰ উদ্ভৱ হৈছিল..." + +#: modules/gui/qt/dialogs/mediainfo.cpp:52 +msgid "Current Media Information" +msgstr "চলিত মিডিয়া তথ্য" + +#: modules/gui/qt/dialogs/mediainfo.cpp:64 +msgid "&General" +msgstr "সাধাৰণ" + +#: modules/gui/qt/dialogs/mediainfo.cpp:66 +msgid "&Metadata" +msgstr "মেটাডাটা" + +#: modules/gui/qt/dialogs/mediainfo.cpp:68 +msgid "Co&dec" +msgstr "কোডেক" + +#: modules/gui/qt/dialogs/mediainfo.cpp:72 +msgid "S&tatistics" +msgstr "পৰিসংখ্যাবোৰ" + +#: modules/gui/qt/dialogs/mediainfo.cpp:78 +msgid "&Save Metadata" +msgstr "মেটাডাটা ছেভ কৰক" + +#: modules/gui/qt/dialogs/mediainfo.cpp:83 +msgid "Location:" +msgstr "স্থান:" + +#: modules/gui/qt/dialogs/messages.cpp:88 +msgid "Saves all the displayed logs to a file" +msgstr "ফাইল এটাত সকলোবোৰ প্ৰদৰ্শিত ল'গ ছেভ কৰে" + +#: modules/gui/qt/dialogs/messages.cpp:256 +msgid "Save log file as..." +msgstr "...ৰ দৰে ল'গ ফাইল ছেভ কৰক" + +#: modules/gui/qt/dialogs/messages.cpp:258 +msgid "Texts/Logs (*.log *.txt);; All (*.*)" +msgstr "" + +#: modules/gui/qt/dialogs/messages.cpp:264 +msgid "Application" +msgstr "আবেদন" + +#: modules/gui/qt/dialogs/messages.cpp:265 +msgid "" +"Cannot write to file %1:\n" +"%2." +msgstr "" +"%1 ফাইললৈ লিখিব নোৱাৰি:\n" +"%2." + +#: modules/gui/qt/dialogs/messages.cpp:331 +msgid "Update the tree" +msgstr "বিন্যাসটো আপডেট কৰক" + +#: modules/gui/qt/dialogs/messages.cpp:332 +msgid "Clear the messages" +msgstr "বাৰ্তাবোৰ খালী কৰক" + +#: modules/gui/qt/dialogs/open.cpp:79 modules/gui/qt/menus.cpp:940 +#: modules/gui/qt/menus.cpp:1137 +msgid "Open Media" +msgstr "মিডিয়া খোলক" + +#: modules/gui/qt/dialogs/open.cpp:91 +msgid "&File" +msgstr "ফাইল" + +#: modules/gui/qt/dialogs/open.cpp:93 +msgid "&Disc" +msgstr "ডিস্ক" + +#: modules/gui/qt/dialogs/open.cpp:95 +msgid "&Network" +msgstr "নেটৱৰ্ক" + +#: modules/gui/qt/dialogs/open.cpp:97 +msgid "Capture &Device" +msgstr "অধিগ্ৰহণ &ডিভাইচ" + +#: modules/gui/qt/dialogs/open.cpp:112 +msgid "&Select" +msgstr "নিৰ্বাচন কৰক" + +#: modules/gui/qt/dialogs/open.cpp:116 modules/gui/qt/dialogs/open.cpp:211 +#: modules/gui/qt/dialogs/openurl.cpp:56 +msgid "&Enqueue" +msgstr "শাৰী কৰক" + +#: modules/gui/qt/dialogs/open.cpp:118 modules/gui/qt/dialogs/open.cpp:215 +#: modules/gui/qt/dialogs/openurl.cpp:53 modules/gui/qt/menus.cpp:829 +msgid "&Play" +msgstr "চলাওক" + +#: modules/gui/qt/dialogs/open.cpp:120 modules/gui/qt/dialogs/open.cpp:205 +msgid "&Stream" +msgstr "ষ্ট্ৰিম" + +#: modules/gui/qt/dialogs/open.cpp:122 +msgid "C&onvert" +msgstr "ৰূপান্তৰ কৰক" + +#: modules/gui/qt/dialogs/open.cpp:208 +msgid "C&onvert / Save" +msgstr "ৰূপান্তৰ / ছেভ কৰক" + +#: modules/gui/qt/dialogs/openurl.cpp:46 +msgid "Open URL" +msgstr "URL খোলক" + +#: modules/gui/qt/dialogs/openurl.cpp:63 +msgid "Enter URL here..." +msgstr "ইয়াত URL ভৰাওক..." + +#: modules/gui/qt/dialogs/openurl.cpp:66 +msgid "Please enter the URL or path to the media you want to play." +msgstr "অনুগ্ৰহ কৰি আপুনি চলাবলৈ বিচৰা মিডিয়ালৈ URL বা পাথটো ভৰাওক." + +#: modules/gui/qt/dialogs/openurl.cpp:70 +msgid "" +"If your clipboard contains a valid URL\n" +"or the path to a file on your computer,\n" +"it will be automatically selected." +msgstr "" +"প্লেলিষ্টটোত পৰৱৰ্তী বস্তুটোলৈ যোৱাৰ বাবে ব্যৱহাৰ URL\n" +"বা কৰিবলৈ হটকীটো নিৰ্বাচন কৰক,\n" +"এইটো স্বয়ংক্ৰিয়ভাৱে নিৰ্বাচন কৰা হব." + +#: modules/gui/qt/dialogs/plugins.cpp:79 +msgid "Plugins and extensions" +msgstr "প্লাগইন আৰু সম্প্ৰসাৰণবোৰ" + +#: modules/gui/qt/dialogs/plugins.cpp:87 +msgid "Active Extensions" +msgstr "সক্ৰিয় সম্প্ৰসাৰণবোৰ" + +#: modules/gui/qt/dialogs/plugins.cpp:127 +msgid "Capability" +msgstr "দক্ষতা" + +#: modules/gui/qt/dialogs/plugins.cpp:127 +msgid "Score" +msgstr "স্কোৰ" + +#: modules/gui/qt/dialogs/plugins.cpp:140 +msgid "&Search:" +msgstr "সন্ধান কৰক:" + +#: modules/gui/qt/dialogs/plugins.cpp:258 +#: modules/gui/qt/dialogs/plugins.cpp:1291 +msgid "More information..." +msgstr "অধিক তথ্য..." + +#: modules/gui/qt/dialogs/plugins.cpp:266 +msgid "Reload extensions" +msgstr "সম্প্ৰসাৰণবোৰ পুনৰ লোড কৰক" + +#: modules/gui/qt/dialogs/plugins.cpp:385 +msgid "" +"Skins customize player's appearance. You can activate them through " +"preferences." +msgstr "" +"প্লেয়াৰৰ অঞ্চলৰ কোড. কিছুমান ডিস্ক কেৱল এটা শুদ্ধ অঞ্চলৰ কোড এটাৰ সৈতে চলাব পাৰি" + +#: modules/gui/qt/dialogs/plugins.cpp:389 +msgid "" +"Playlist parsers add new capabilities to read internet streams or extract " +"meta data." +msgstr "" +"প্লিলিষ্ট দক্ষতাবোৰৰ ভাগকৰ্তা ডিস্ক কেৱল এটা শুদ্ধ অঞ্চলৰ কোড এটাৰ সৈতে চলাব পাৰি." + +#: modules/gui/qt/dialogs/plugins.cpp:393 +msgid "" +"Service discoveries adds new sources to your playlist such as web radios, " +"video websites, ..." +msgstr "" +"এইটোৱে আপোনাক বিভিন্ন প্লেলিষ্ট বস্তুৰ চাৰিওফালে এটা ৱেব অনুপাত, ভিডিঅ' " +"ৱেবছাইটবোৰৰ দৰে,..." + +#: modules/gui/qt/dialogs/plugins.cpp:400 +msgid "Retrieves extra info and art for playlist items" +msgstr "" + +#: modules/gui/qt/dialogs/plugins.cpp:403 +msgid "" +"Extensions brings various enhancements. Check descriptions for more details" +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/qt/dialogs/plugins.cpp:424 +msgid "Only installed" +msgstr "কেৱল ইনষ্টল কৰা হল" + +#: modules/gui/qt/dialogs/plugins.cpp:530 +msgid "Retrieving addons..." +msgstr "এডঅনবোৰ উদ্ধাৰ কৰিছে..." + +#: modules/gui/qt/dialogs/plugins.cpp:541 +msgid "No addons found" +msgstr "কোনো এডঅন বিচাৰি পোৱা নগল" + +#: modules/gui/qt/dialogs/plugins.cpp:820 +msgid "This addon has been installed manually. VLC can't manage it by itself." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/qt/dialogs/plugins.cpp:1203 +msgid "Version %1" +msgstr "সংস্কৰণ %1" + +#: modules/gui/qt/dialogs/plugins.cpp:1231 +msgid "%1 downloads" +msgstr "%1 ডাউনলোডবোৰ" + +#: modules/gui/qt/dialogs/plugins.cpp:1300 +msgid "&Uninstall" +msgstr "ইনষ্টল নাইকিয়া কৰক" + +#: modules/gui/qt/dialogs/plugins.cpp:1303 +msgid "&Install" +msgstr "ইনষ্টল কৰক" + +#: modules/gui/qt/dialogs/plugins.cpp:1398 +#: modules/gui/qt/dialogs/plugins.cpp:1501 +msgid "Version" +msgstr "সংস্কৰণ" + +#: modules/gui/qt/dialogs/plugins.cpp:1418 +#: modules/gui/qt/dialogs/plugins.cpp:1528 +msgid "Website" +msgstr "ৱেবছাইট" + +#: modules/gui/qt/dialogs/plugins.cpp:1540 modules/gui/qt/ui/sprefs_input.h:363 +msgid "Files" +msgstr "ফাইলবোৰ" + +#: modules/gui/qt/dialogs/podcast_configuration.cpp:35 +msgid "Deletes the selected item" +msgstr "নিৰ্বাচিত বস্তুটো ডিলিট কৰে" + +#: modules/gui/qt/dialogs/preferences.cpp:72 +msgid "Show settings" +msgstr "ছেটিংবোৰ দেখুৱাওক" + +#: modules/gui/qt/dialogs/preferences.cpp:76 +msgid "Simple" +msgstr "সাধাৰণ" + +#: modules/gui/qt/dialogs/preferences.cpp:77 +msgid "Switch to simple preferences view" +msgstr "সাধাৰণ পছন্দবোৰৰ দৃশ্যলৈ সলনি কৰক" + +#: modules/gui/qt/dialogs/preferences.cpp:80 +msgid "Switch to full preferences view" +msgstr "সম্পূৰ্ণ পছন্দবোৰৰ দৃশ্যলৈ সলনি কৰক" + +#: modules/gui/qt/dialogs/preferences.cpp:96 +msgid "Save and close the dialog" +msgstr "সংলাপটো ছেভ আৰু বন্ধ কৰক" + +#: modules/gui/qt/dialogs/preferences.cpp:98 +msgid "&Reset Preferences" +msgstr "পছন্দবোৰ পুনৰ ছেট কৰক" + +#: modules/gui/qt/dialogs/preferences.cpp:167 +msgid "Only show current" +msgstr "কেৱল চলিতটো দেখুৱাওক" + +#: modules/gui/qt/dialogs/preferences.cpp:169 +msgid "Only show modules related to current playback" +msgstr "কেৱল চলিত প্লেবেকৰ সৈতে সম্পৰ্কীয় মডুলবোৰ দেখুৱাওক" + +#: modules/gui/qt/dialogs/preferences.cpp:206 +msgid "Advanced Preferences" +msgstr "উন্নত পছন্দবোৰ" + +#: modules/gui/qt/dialogs/preferences.cpp:227 +msgid "Simple Preferences" +msgstr "সাধাৰণ পছন্দবোৰ" + +#: modules/gui/qt/dialogs/preferences.cpp:311 +msgid "Cannot save Configuration" +msgstr "ৰূপৰেখাটো ছেভ কৰিব নোৱাৰি" + +#: modules/gui/qt/dialogs/preferences.cpp:312 +msgid "Preferences file could not be saved" +msgstr "পছন্দ কৰা ফাইলবোৰ ছেভ কৰিব পৰা নগল" + +#: modules/gui/qt/dialogs/preferences.cpp:337 +msgid "Are you sure you want to reset your VLC media player preferences?" +msgstr "" +"আপোনাৰ VLC মিডিয়া প্লেয়াৰ পছন্দবোৰ পুনৰ ছেট কৰিব বিচাৰে বুলি আপুনি নিশ্চিত নে?" + +#: modules/gui/qt/dialogs/sout.cpp:43 modules/gui/qt/ui/sout.h:198 +msgid "Stream Output" +msgstr "ষ্ট্ৰিম আউটপুট" + +#: modules/gui/qt/dialogs/sout.cpp:49 +msgid "" +"This wizard will allow you to stream or convert your media for use locally, " +"on your private network, or on the Internet.\n" +"You should start by checking that source matches what you want your input to " +"be and then press the \"Next\" button to continue.\n" +msgstr "" +"উইজাৰ্ডটোৱে আপোনাক ষ্ট্ৰিম বা ৰূপান্তৰ. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো " +"অভাৰৰাইড কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব.\n" +"সাধাৰণ ৰাজহুৱা অনুজ্ঞাপত্ৰৰ নিয়মবোৰৰ অধীনত আপুনি এইটো পুনৰ বিতৰণ কৰিব পাৰে \"Next" +"\" বাটন অব্যাহত ৰাখিবলৈ.\n" + +#: modules/gui/qt/dialogs/sout.cpp:56 +msgid "" +"Stream output string.\n" +"This is automatically generated when you change the above settings,\n" +"but you can change it manually." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/qt/dialogs/sout.cpp:89 +msgid "Back" +msgstr "পিছলৈ" + +#: modules/gui/qt/dialogs/toolbar.cpp:64 +msgid "Toolbars Editor" +msgstr "টুলবাৰবোৰ সম্পাদক" + +#: modules/gui/qt/dialogs/toolbar.cpp:71 +msgid "Toolbar Elements" +msgstr "টুলবাৰ উপাদানবোৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:76 +msgid "Flat Button" +msgstr "ফ্লেট বাটন" + +#: modules/gui/qt/dialogs/toolbar.cpp:77 +msgid "Next widget style" +msgstr "পৰৱৰ্তী উইজেট শৈলী" + +#: modules/gui/qt/dialogs/toolbar.cpp:78 +msgid "Big Button" +msgstr "ডাঙৰ বাটন" + +#: modules/gui/qt/dialogs/toolbar.cpp:80 +msgid "Native Slider" +msgstr "স্থানীয় শ্লাইডাৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:94 +msgid "Main Toolbar" +msgstr "মুখ্য টুলবাৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:97 +msgid "Above the Video" +msgstr "ভিডিঅ'টোৰ ওপৰত" + +#: modules/gui/qt/dialogs/toolbar.cpp:100 +msgid "Toolbar position:" +msgstr "টুলবাৰৰ স্থান:" + +#: modules/gui/qt/dialogs/toolbar.cpp:106 +msgid "Line 1:" +msgstr "শাৰী 1:" + +#: modules/gui/qt/dialogs/toolbar.cpp:111 +msgid "Line 2:" +msgstr "শাৰী 2:" + +#: modules/gui/qt/dialogs/toolbar.cpp:120 +msgid "Time Toolbar" +msgstr "সময় টুলবাৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:129 +msgid "Advanced Widget" +msgstr "উন্নত উজেট" + +#: modules/gui/qt/dialogs/toolbar.cpp:138 +msgid "Fullscreen Controller" +msgstr "সম্পূৰ্ণ দৃশ্য নিয়ন্ত্ৰণক" + +#: modules/gui/qt/dialogs/toolbar.cpp:147 +msgid "New profile" +msgstr "নতুন প্ৰফাইল" + +#: modules/gui/qt/dialogs/toolbar.cpp:150 +msgid "Delete the current profile" +msgstr "চলিত প্ৰফাইলটো ডিলিট কৰক" + +#: modules/gui/qt/dialogs/toolbar.cpp:152 +msgid "Select profile:" +msgstr "প্ৰফাইল নিৰ্বাচন কৰক:" + +#: modules/gui/qt/dialogs/toolbar.cpp:187 +msgid "Preview" +msgstr "পূৰ্বদৃশ্য" + +#: modules/gui/qt/dialogs/toolbar.cpp:196 +msgid "Cl&ose" +msgstr "বন্ধ কৰক" + +#: modules/gui/qt/dialogs/toolbar.cpp:226 +msgid "Profile Name" +msgstr "প্ৰফাইল নাম" + +#: modules/gui/qt/dialogs/toolbar.cpp:227 +msgid "Please enter the new profile name." +msgstr "অনুগ্ৰহ কৰি নতুন প্ৰফাইল নামটো ভৰাওক." + +#: modules/gui/qt/dialogs/toolbar.cpp:423 +msgid "Spacer" +msgstr "গতি প্ৰদানকৰ্তা" + +#: modules/gui/qt/dialogs/toolbar.cpp:430 +msgid "Expanding Spacer" +msgstr "গতি প্ৰদানকৰ্তা প্ৰসাৰ কৰিছে" + +#: modules/gui/qt/dialogs/toolbar.cpp:462 +msgid "Splitter" +msgstr "স্প্লিটাৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:469 +msgid "Time Slider" +msgstr "সময় শ্লাইডাৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:482 +msgid "Small Volume" +msgstr "সৰু প্ৰসাৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:519 +msgid "DVD menus" +msgstr "DVD তালিকাবোৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:533 +msgid "Teletext transparency" +msgstr "টেলিটেক্সট স্বচ্ছতা" + +#: modules/gui/qt/dialogs/toolbar.cpp:548 +msgid "Advanced Buttons" +msgstr "উন্নত বাটনবোৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:561 +msgid "Playback Buttons" +msgstr "প্লেবেক বাটনবোৰ" + +#: modules/gui/qt/dialogs/toolbar.cpp:565 +msgid "Aspect ratio selector" +msgstr "দৃষ্টিকোণ অনুপাত নিৰ্বাচক" + +#: modules/gui/qt/dialogs/toolbar.cpp:569 +msgid "Speed selector" +msgstr "গতি নিৰ্বাচক" + +#: modules/gui/qt/dialogs/vlm.cpp:67 +msgid "Broadcast" +msgstr "প্ৰচাৰণ" + +#: modules/gui/qt/dialogs/vlm.cpp:68 +msgid "Schedule" +msgstr "সময়সূচী" + +#: modules/gui/qt/dialogs/vlm.cpp:69 +msgid "Video On Demand ( VOD )" +msgstr "দাবী কৰা ভিডিঅ' ( VOD )" + +#: modules/gui/qt/dialogs/vlm.cpp:74 +msgid "Hours / Minutes / Seconds:" +msgstr "ঘন্টা / মিনিট / ছেকেণ্ড:" + +#: modules/gui/qt/dialogs/vlm.cpp:76 +msgid "Day / Month / Year:" +msgstr "দিন / মাহ / বছৰ:" + +#: modules/gui/qt/dialogs/vlm.cpp:78 +msgid "Repeat:" +msgstr "পুনৰাবৃত্তি কৰক:" + +#: modules/gui/qt/dialogs/vlm.cpp:80 +msgid "Repeat delay:" +msgstr "বিলম্বৰ পুনৰাবৃত্তি কৰক:" + +#: modules/gui/qt/dialogs/vlm.cpp:105 modules/gui/qt/ui/sprefs_interface.h:562 +msgid " days" +msgstr "দিনবোৰ" + +#: modules/gui/qt/dialogs/vlm.cpp:124 +msgid "I&mport" +msgstr "আমদানি কৰক" + +#: modules/gui/qt/dialogs/vlm.cpp:127 +msgid "E&xport" +msgstr "ৰপ্তানিক কৰক" + +#: modules/gui/qt/dialogs/vlm.cpp:258 +msgid "Save VLM configuration as..." +msgstr "...ৰ দৰে VLM ৰূপৰেখা ছেভ কৰক" + +#: modules/gui/qt/dialogs/vlm.cpp:260 modules/gui/qt/dialogs/vlm.cpp:329 +msgid "VLM conf (*.vlm);;All (*)" +msgstr "VLM ৰূপৰেখা (*.vlm);;সকলো (*)" + +#: modules/gui/qt/dialogs/vlm.cpp:327 +msgid "Open VLM configuration..." +msgstr "VLM ৰূপৰেখা খোলক..." + +#: modules/gui/qt/dialogs/vlm.cpp:526 +msgid "Broadcast: " +msgstr "প্ৰচাৰণ:" + +#: modules/gui/qt/dialogs/vlm.cpp:599 +msgid "Schedule: " +msgstr "সময়সূচী: " + +#: modules/gui/qt/dialogs/vlm.cpp:623 +msgid "VOD: " +msgstr "VOD: " + +#: modules/gui/qt/dialogs_provider.cpp:67 +msgid "Open Directory" +msgstr "নিৰ্দেশিকা খোলক" + +#: modules/gui/qt/dialogs_provider.cpp:68 +msgid "Open Folder" +msgstr "ফোল্ডাৰ খোলক" + +#: modules/gui/qt/dialogs_provider.cpp:633 +msgid "Open playlist..." +msgstr "প্লেলিষ্ট খোলক..." + +#: modules/gui/qt/dialogs_provider.cpp:656 +msgid "XSPF playlist" +msgstr "XSPF প্লেলিষ্ট" + +#: modules/gui/qt/dialogs_provider.cpp:657 +msgid "M3U playlist" +msgstr "M3U প্লেলিষ্ট" + +#: modules/gui/qt/dialogs_provider.cpp:658 +msgid "M3U8 playlist" +msgstr "M3U8 প্লেলিষ্ট" + +#: modules/gui/qt/dialogs_provider.cpp:676 +msgid "Save playlist as..." +msgstr "...ৰ দৰে প্লেলিষ্ট ছেভ কৰক" + +#: modules/gui/qt/dialogs_provider.cpp:824 +msgid "Open subtitles..." +msgstr "উপশিৰোনামবোৰ খোলক..." + +#: modules/gui/qt/dialogs_provider.hpp:40 +msgid "Media Files" +msgstr "মিডিয়া ফাইলবোৰ" + +#: modules/gui/qt/dialogs_provider.hpp:44 +msgid "Subtitle Files" +msgstr "উপশিৰোনাম ফাইলবোৰ" + +#: modules/gui/qt/dialogs_provider.hpp:45 +msgid "All Files" +msgstr "সকলোবোৰ ফাইল" + +#: modules/gui/qt/extensions_manager.cpp:181 +#: modules/gui/qt/extensions_manager.cpp:191 +#: modules/gui/qt/util/qmenuview.cpp:70 +msgid "Empty" +msgstr "" + +#: modules/gui/qt/extensions_manager.cpp:197 +msgid "Deactivate" +msgstr "" + +#: modules/gui/qt/main_interface.cpp:378 +msgid "Do you want to restart the playback where left off?" +msgstr "আপুনি যত এৰি গৈছিল তাৰ পৰা প্লেবেকটো পুনৰ আৰম্ভ কৰিব বিচাৰে নেকি?" + +#: modules/gui/qt/main_interface.cpp:384 +msgid "&Continue" +msgstr "" + +#: modules/gui/qt/main_interface.cpp:1454 +msgid "Control menu for the player" +msgstr "প্লেয়াৰটোৰ বাবে নিয়ন্ত্ৰণৰ তালিকা" + +#: modules/gui/qt/main_interface.cpp:1498 +msgid "Paused" +msgstr "বিৰতি দিয়া হল" + +#: modules/gui/qt/menus.cpp:334 +msgid "&Media" +msgstr "মিডিয়া" + +#: modules/gui/qt/menus.cpp:337 +msgid "P&layback" +msgstr "প্লেবেক" + +#: modules/gui/qt/menus.cpp:338 modules/gui/qt/menus.cpp:1055 +msgid "&Audio" +msgstr "অডিঅ'" + +#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1062 +msgid "&Video" +msgstr "ভিডিঅ'" + +#: modules/gui/qt/menus.cpp:340 modules/gui/qt/menus.cpp:1069 +msgid "Subti&tle" +msgstr "উপশিৰোনাম" + +#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1085 +msgid "Tool&s" +msgstr "" + +#: modules/gui/qt/menus.cpp:345 modules/gui/qt/menus.cpp:1092 +msgid "V&iew" +msgstr "দৃশ্য" + +#: modules/gui/qt/menus.cpp:347 modules/gui/qt/menus.cpp:793 +msgid "&Help" +msgstr "সহায়" + +#: modules/gui/qt/menus.cpp:360 +msgid "Open &File..." +msgstr "ফাইল খোলক..." + +#: modules/gui/qt/menus.cpp:362 +msgid "&Open Multiple Files..." +msgstr "বিভিন্ন ফাইলবোৰ খোলক..." + +#: modules/gui/qt/menus.cpp:366 modules/gui/qt/menus.cpp:945 +msgid "Open &Disc..." +msgstr "ডিস্ক খোলক..." + +#: modules/gui/qt/menus.cpp:368 +msgid "Open &Network Stream..." +msgstr "নেটৱৰ্ক ষ্ট্ৰিম খোলক..." + +#: modules/gui/qt/menus.cpp:370 modules/gui/qt/menus.cpp:949 +msgid "Open &Capture Device..." +msgstr "ডিভাইচ খোলক &অধিগ্ৰহণ কৰক..." + +#: modules/gui/qt/menus.cpp:373 +msgid "Open &Location from clipboard" +msgstr "ক্লিপবোৰ্ডৰ পৰা খোলক &স্থান নিৰ্ণয় কৰক..." + +#: modules/gui/qt/menus.cpp:377 +msgid "Open &Recent Media" +msgstr "শেহতীয়া মিডিয়াটো খোলক" + +#: modules/gui/qt/menus.cpp:390 +msgid "Conve&rt / Save..." +msgstr "ৰূপান্তৰ / ছেভ কৰক..." + +#: modules/gui/qt/menus.cpp:392 +msgid "&Stream..." +msgstr "&ষ্ট্ৰিম..." + +#: modules/gui/qt/menus.cpp:397 +msgid "Quit at the end of playlist" +msgstr "প্লেলিষ্টৰ শেষত ত্যাগ কৰক" + +#: modules/gui/qt/menus.cpp:404 +msgid "Close to systray" +msgstr "ছিষ্ট্ৰে কৰিবলৈ বন্ধ কৰক" + +#: modules/gui/qt/menus.cpp:408 modules/gui/qt/menus.cpp:1199 +msgid "&Quit" +msgstr "ত্যাগ কৰক" + +#: modules/gui/qt/menus.cpp:418 +msgid "&Effects and Filters" +msgstr "প্ৰভাৱবোৰ আৰু ফিল্টাৰবোৰ" + +#: modules/gui/qt/menus.cpp:421 +msgid "&Track Synchronization" +msgstr "পথ ছিনক্ৰনাইজেশ্বন" + +#: modules/gui/qt/menus.cpp:440 +msgid "Plu&gins and extensions" +msgstr "প্লাগইনবোৰ আৰু সম্প্ৰসাৰণবোৰ" + +#: modules/gui/qt/menus.cpp:445 +msgid "Customi&ze Interface..." +msgstr "ইন্টাৰফেছৰ ব্যৱস্থা কৰক..." + +#: modules/gui/qt/menus.cpp:448 +msgid "&Preferences" +msgstr "পছন্দবোৰ" + +#: modules/gui/qt/menus.cpp:469 +msgid "&View" +msgstr "&দৃশ্য" + +#: modules/gui/qt/menus.cpp:490 +msgid "Play&list" +msgstr "প্লেলিষ্ট" + +#: modules/gui/qt/menus.cpp:491 +msgid "Ctrl+L" +msgstr "কোন্ট্ৰল+L" + +#: modules/gui/qt/menus.cpp:494 +msgid "Docked Playlist" +msgstr "প্লেলিষ্ট ডক কৰক" + +#: modules/gui/qt/menus.cpp:504 +msgid "Always on &top" +msgstr "" + +#: modules/gui/qt/menus.cpp:512 +msgid "Mi&nimal Interface" +msgstr "নূন্যতম ইন্টাৰফেছ" + +#: modules/gui/qt/menus.cpp:513 +msgid "Ctrl+H" +msgstr "কোন্ট্ৰল+H" + +#: modules/gui/qt/menus.cpp:522 +msgid "&Fullscreen Interface" +msgstr "সম্পূৰ্ণ দৃশ্যৰ ইন্টাৰফেছ" + +#: modules/gui/qt/menus.cpp:530 +msgid "&Advanced Controls" +msgstr "উন্নত নিয়ন্ত্ৰণবোৰ" + +#: modules/gui/qt/menus.cpp:538 +msgid "Status Bar" +msgstr "স্থিতি বাৰ" + +#: modules/gui/qt/menus.cpp:544 +msgid "Visualizations selector" +msgstr "দৃশ্যবোৰৰ নিৰ্বাচক" + +#: modules/gui/qt/menus.cpp:602 +msgid "&Increase Volume" +msgstr "প্ৰসাৰ বঢ়াওক" + +#: modules/gui/qt/menus.cpp:605 +msgid "D&ecrease Volume" +msgstr "" + +#: modules/gui/qt/menus.cpp:608 +msgid "&Mute" +msgstr "নিস্তব্দ কৰক" + +#: modules/gui/qt/menus.cpp:624 +msgid "Audio &Device" +msgstr "অডিঅ' ডিভাইচ" + +#: modules/gui/qt/menus.cpp:628 +msgid "Audio &Track" +msgstr "অডিঅ' পথ" + +#: modules/gui/qt/menus.cpp:630 +msgid "&Stereo Mode" +msgstr "ষ্টেৰিঅ'ৰ ধৰণ" + +#: modules/gui/qt/menus.cpp:633 +msgid "&Visualizations" +msgstr "দৃশ্যবোৰ" + +#: modules/gui/qt/menus.cpp:659 +msgid "Add &Subtitle File..." +msgstr "উপশিৰোনাম ফাইল যোগ কৰক..." + +#: modules/gui/qt/menus.cpp:661 +msgid "Sub &Track" +msgstr "উপ পথ" + +#: modules/gui/qt/menus.cpp:683 +msgid "Video &Track" +msgstr "ভিডিঅ' পথ" + +#: modules/gui/qt/menus.cpp:687 +msgid "&Fullscreen" +msgstr "সম্পূৰ্ণ দৃশ্য" + +#: modules/gui/qt/menus.cpp:688 +msgid "Always Fit &Window" +msgstr "সদায় উইণ্ডো খাপ খুৱাওক" + +#: modules/gui/qt/menus.cpp:689 +msgid "Set as Wall&paper" +msgstr "ৱালপেপাৰ হিচাপে ছেট কৰক" + +#: modules/gui/qt/menus.cpp:693 +msgid "&Zoom" +msgstr "জুম কৰক" + +#: modules/gui/qt/menus.cpp:694 +msgid "&Aspect Ratio" +msgstr "&দৃষ্টিকোণৰ অনুপাত" + +#: modules/gui/qt/menus.cpp:695 +msgid "&Crop" +msgstr "ক্ৰোপ" + +#: modules/gui/qt/menus.cpp:699 +msgid "&Deinterlace" +msgstr "ডিইন্টাৰলেচ" + +#: modules/gui/qt/menus.cpp:700 +msgid "&Deinterlace mode" +msgstr "ডিইন্টাৰলেচৰ ধৰণ" + +#: modules/gui/qt/menus.cpp:704 +msgid "Take &Snapshot" +msgstr "স্নেপশ্বট লওক" + +#: modules/gui/qt/menus.cpp:723 +msgid "T&itle" +msgstr "শিৰোনাম" + +#: modules/gui/qt/menus.cpp:724 +msgid "&Chapter" +msgstr "পাঠ" + +#: modules/gui/qt/menus.cpp:726 +msgid "&Program" +msgstr "কাৰ্যসূচী" + +#: modules/gui/qt/menus.cpp:730 +msgid "&Manage" +msgstr "পৰিচালনা কৰক" + +#: modules/gui/qt/menus.cpp:796 +msgid "Check for &Updates..." +msgstr "আপডেটবোৰৰ বাবে পৰীক্ষা কৰক..." + +#: modules/gui/qt/menus.cpp:843 +msgid "&Stop" +msgstr "বন্ধ কৰক" + +#: modules/gui/qt/menus.cpp:851 +msgid "Pre&vious" +msgstr "আগৰ" + +#: modules/gui/qt/menus.cpp:857 +msgid "Ne&xt" +msgstr "পৰৱৰ্তী" + +#: modules/gui/qt/menus.cpp:875 +msgid "Sp&eed" +msgstr "গতি" + +#: modules/gui/qt/menus.cpp:881 +msgid "&Faster" +msgstr "খৰতকীয়া" + +#: modules/gui/qt/menus.cpp:893 +msgid "N&ormal Speed" +msgstr "স্বাভাৱিক গতি" + +#: modules/gui/qt/menus.cpp:903 +msgid "Slo&wer" +msgstr "মন্থৰ" + +#: modules/gui/qt/menus.cpp:918 +msgid "&Jump Forward" +msgstr "আগলৈ জপিয়াওক" + +#: modules/gui/qt/menus.cpp:925 +msgid "Jump Bac&kward" +msgstr "পিছলৈ জপিয়াওক" + +#: modules/gui/qt/menus.cpp:932 +msgid "Ctrl+T" +msgstr "কোন্ট্ৰল+T" + +#: modules/gui/qt/menus.cpp:947 +msgid "Open &Network..." +msgstr "নেটৱৰ্ক খোলক..." + +#: modules/gui/qt/menus.cpp:1041 +msgid "Leave Fullscreen" +msgstr "সম্পূৰ্ণ স্ক্ৰীন ত্যাগ কৰক" + +#: modules/gui/qt/menus.cpp:1075 +msgid "&Playback" +msgstr "প্লেবেক" + +#: modules/gui/qt/menus.cpp:1180 +msgid "&Hide VLC media player in taskbar" +msgstr "টাস্কবাৰত VLC মিডিয়া প্লেয়াৰ লুকুৱাওক" + +#: modules/gui/qt/menus.cpp:1186 +msgid "Sho&w VLC media player" +msgstr "VLC মিডিয়া প্লেয়াৰ দেখুৱাওক" + +#: modules/gui/qt/menus.cpp:1197 +msgid "&Open Media" +msgstr "মিডিয়া খোলক" + +#: modules/gui/qt/menus.cpp:1627 +msgid "&Clear" +msgstr "খালী কৰক" + +#: modules/gui/qt/menus.cpp:1635 +msgid "&Renderer" +msgstr "" + +#: modules/gui/qt/menus.cpp:1639 +msgid "" +msgstr "" + +#: modules/gui/qt/menus.cpp:1652 +msgid "Scanning..." +msgstr "" + +#: modules/gui/qt/qt.cpp:81 +msgid "Show advanced preferences over simple ones" +msgstr "সাধাৰণ এটাৰ ওপৰত উন্নত পছন্দবোৰ দেখুৱাওক" + +#: modules/gui/qt/qt.cpp:82 +msgid "" +"Show advanced preferences and not simple preferences when opening the " +"preferences dialog." +msgstr "" +"উন্নত পছন্দবোৰ দেখুৱাওক আৰু সাধাৰণ পছন্দবোৰ নেদেখুৱাব যেতিয়া পছন্দবোৰৰ সংলাপটো খোলে." + +#: modules/gui/qt/qt.cpp:86 modules/gui/skins2/src/skin_main.cpp:499 +msgid "Systray icon" +msgstr "ছিষ্ট্ৰে আইকন" + +#: modules/gui/qt/qt.cpp:87 +msgid "" +"Show an icon in the systray allowing you to control VLC media player for " +"basic actions." +msgstr "" +"প্ৰাথমিক কাৰ্যবোৰৰ বাবে VLC মিডিয়া প্লেয়াৰ নিয়ন্ত্ৰণ কৰিবলৈ আপোনাক অনুমতি দিয়া " +"ছিছষ্ট্ৰেটোত আইকন এটা দেখুৱাওক." + +#: modules/gui/qt/qt.cpp:91 +msgid "Start VLC with only a systray icon" +msgstr "কেৱল এটা ছিষ্ট্ৰে আইকনৰ সৈতে VLC আৰম্ভ কৰক" + +#: modules/gui/qt/qt.cpp:92 +msgid "VLC will start with just an icon in your taskbar." +msgstr "" + +#: modules/gui/qt/qt.cpp:101 +msgid "Show playing item name in window title" +msgstr "উইণ্ডো শিৰোনামত চলোৱা বস্তু দেখুৱাওক" + +#: modules/gui/qt/qt.cpp:102 +msgid "Show the name of the song or video in the controller window title." +msgstr "নিয়ন্ত্ৰক উইণ্ডো শিৰোনামটোত গান বা ভিডিঅ'টোৰ নামটো দেখুৱাওক." + +#: modules/gui/qt/qt.cpp:105 +msgid "Show notification popup on track change" +msgstr "পথ সলনিত জাননীৰ প'পআপ দেখুৱাওক" + +#: modules/gui/qt/qt.cpp:107 +msgid "" +"Show a notification popup with the artist and track name when the current " +"playlist item changes, when VLC is minimized or hidden." +msgstr "" +"প্ৰাথমিক কাৰ্যবোৰৰ বাবে VLC মিডিয়া প্লেয়াৰ নিয়ন্ত্ৰণ কৰিবলৈ আপোনাক অনুমতি দিয়া " +"ছিছষ্ট্ৰেটোত আইকন এটা দেখুৱাওক." + +#: modules/gui/qt/qt.cpp:110 +msgid "Windows opacity between 0.1 and 1" +msgstr "0.1 আৰু 1 মাজত উইণ্ডোবোৰৰ অস্বচ্ছতা" + +#: modules/gui/qt/qt.cpp:111 +msgid "" +"Sets the windows opacity between 0.1 and 1 for main interface, playlist and " +"extended panel. This option only works with Windows and X11 with composite " +"extensions." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/qt/qt.cpp:116 +msgid "Fullscreen controller opacity between 0.1 and 1" +msgstr "0.1 আৰু 1 ৰ মাজত সম্পূৰ্ণদৃশ্য নিয়ন্ত্ৰকৰ অস্বচ্ছতা" + +#: modules/gui/qt/qt.cpp:117 +msgid "" +"Sets the fullscreen controller opacity between 0.1 and 1 for main interface, " +"playlist and extended panel. This option only works with Windows and X11 " +"with composite extensions." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/qt/qt.cpp:122 +msgid "Show unimportant error and warnings dialogs" +msgstr "অপ্ৰয়োজনীয় ভুল আৰু সতৰ্কীকৰণবোৰৰ সংলাপবোৰ দেখুৱাওক" + +#: modules/gui/qt/qt.cpp:124 +msgid "Enable Dark Mode" +msgstr "" + +#: modules/gui/qt/qt.cpp:125 +msgid "Applies a dark theme to the style." +msgstr "" + +#: modules/gui/qt/qt.cpp:127 +msgid "Activate the updates availability notification" +msgstr "আপডেটবোৰৰ উপলব্ধ জাননীটো সক্ৰিয় কৰক" + +#: modules/gui/qt/qt.cpp:128 +msgid "" +"Activate the automatic notification of new versions of the software. It runs " +"once every two weeks." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/qt/qt.cpp:131 +msgid "Number of days between two update checks" +msgstr "দুটা আপডেট পৰীক্ষাৰ মাজৰ দিনবোৰৰ সংখ্যা" + +#: modules/gui/qt/qt.cpp:133 +msgid "Ask for network policy at start" +msgstr "আৰম্ভ কৰিবলৈ নেটৱৰ্ক নীতিৰ বাবে সোধক" + +#: modules/gui/qt/qt.cpp:135 +msgid "Save the recently played items in the menu" +msgstr "অলপতে চলোৱা বস্তুটো তালিকাত ছেভ কৰক" + +#: modules/gui/qt/qt.cpp:137 +msgid "List of words separated by | to filter" +msgstr "ফিল্টাৰ কৰিবলৈ | ৰ দ্বাৰা পৃথক কৰা শব্দবোৰৰ তালিকা" + +#: modules/gui/qt/qt.cpp:138 +msgid "" +"Regular expression used to filter the recent items played in the player." +msgstr "" + +#: modules/gui/qt/qt.cpp:141 +msgid "Define the colors of the volume slider" +msgstr "" + +#: modules/gui/qt/qt.cpp:142 +msgid "" +"Define the colors of the volume slider\n" +"By specifying the 12 numbers separated by a ';'\n" +"Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n" +"An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255'" +msgstr "" + +#: modules/gui/qt/qt.cpp:147 +msgid "Selection of the starting mode and look" +msgstr "" + +#: modules/gui/qt/qt.cpp:148 +msgid "" +"Start VLC with:\n" +" - normal mode\n" +" - a zone always present to show information as lyrics, album arts...\n" +" - minimal mode with limited controls" +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/qt/qt.cpp:154 +msgid "Show a controller in fullscreen mode" +msgstr "সম্পূৰ্ণদৃশ্য ধৰণত নিয়ন্ত্ৰক এটা দেখুৱাওক" + +#: modules/gui/qt/qt.cpp:155 +msgid "Embed the file browser in open dialog" +msgstr "খোলা সংলাপটোত ফাইল ব্ৰাউজাৰটো সংলগ্ন কৰক" + +#: modules/gui/qt/qt.cpp:157 +msgid "Define which screen fullscreen goes" +msgstr "কোনখন স্ক্ৰীনৰ সম্পূৰ্ণদৃশ্য যায় বাখ্যা কৰক" + +#: modules/gui/qt/qt.cpp:158 +msgid "Screennumber of fullscreen, instead of same screen where interface is." +msgstr "" + +#: modules/gui/qt/qt.cpp:161 +msgid "Load extensions on startup" +msgstr "আৰম্ভণিত সম্প্ৰসাৰণবোৰ লোড কৰক" + +#: modules/gui/qt/qt.cpp:162 +msgid "Automatically load the extensions module on startup." +msgstr "" + +#: modules/gui/qt/qt.cpp:165 +msgid "Start in minimal view (without menus)" +msgstr "নূন্যতম দৃশ্যত আৰম্ভ কৰক (তালিকাবোৰ অবিহনে)" + +#: modules/gui/qt/qt.cpp:167 +msgid "Display background cone or art" +msgstr "পটভূমিৰ কোণ বা চিত্ৰ প্ৰদৰ্শন কৰক" + +#: modules/gui/qt/qt.cpp:168 +msgid "" +"Display background cone or current album art when not playing. Can be " +"disabled to prevent burning screen." +msgstr "" +"পটভূমিৰ কোণ বা চলিত এলবামৰ চিত্ৰ প্ৰদৰ্শন কৰক যেতিয়া নচলায়. স্ক্ৰীন বাৰ্ণ হোৱাটো " +"বাধা দিবলৈ অক্ষম কৰিব পাৰি." + +#: modules/gui/qt/qt.cpp:171 +msgid "Expanding background cone or art" +msgstr "" + +#: modules/gui/qt/qt.cpp:172 +msgid "Background art fits window's size." +msgstr "" + +#: modules/gui/qt/qt.cpp:174 +msgid "Ignore keyboard volume buttons." +msgstr "কীবোৰ্ড প্ৰসাৰ বাটনবোৰ অৱজ্ঞা কৰক." + +#: modules/gui/qt/qt.cpp:176 +msgid "" +"With this option checked, the volume up, volume down and mute buttons on " +"your keyboard will always change your system volume. With this option " +"unchecked, the volume buttons will change VLC's volume when VLC is selected " +"and change the system volume when VLC is not selected." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/qt/qt.cpp:191 +msgid "When to raise the interface" +msgstr "" + +#: modules/gui/qt/qt.cpp:192 +msgid "" +"This option allows the interface to be raised automatically when a video/" +"audio playback starts, or never." +msgstr "" + +#: modules/gui/qt/qt.cpp:195 +msgid "Fullscreen controller mouse sensitivity" +msgstr "সম্পূৰ্ণদৃশ্য নিয়ন্ত্ৰক মাউছ সংবেদশীলতা" + +#: modules/gui/qt/qt.cpp:203 +msgid "When minimized" +msgstr "যেতিয়া সৰু কৰে" + +#: modules/gui/qt/qt.cpp:221 +msgid "Qt interface" +msgstr "Qt ইন্টাৰফেছ" + +#: modules/gui/qt/util/customwidgets.cpp:80 +msgid "errors" +msgstr "ভুলবোৰ" + +#: modules/gui/qt/util/customwidgets.cpp:81 +msgid "warnings" +msgstr "সতৰ্কীকৰণবোৰ" + +#: modules/gui/qt/util/customwidgets.cpp:82 +msgid "debug" +msgstr "ডিবাগ কৰক" + +#: modules/gui/qt/util/searchlineedit.cpp:50 +msgctxt "Tooltip|Clear" +msgid "Clear" +msgstr "" + +#: modules/gui/skins2/src/dialogs.cpp:212 +msgid "Open a skin file" +msgstr "স্কিন ফাইল এটা খোলক" + +#: modules/gui/skins2/src/dialogs.cpp:213 +msgid "Skin files |*.vlt;*.wsz;*.xml" +msgstr "স্কিন ফাইলবোৰ |*.vlt;*.wsz;*.xml" + +#: modules/gui/skins2/src/dialogs.cpp:221 +msgid "Playlist Files |" +msgstr "" + +#: modules/gui/skins2/src/dialogs.cpp:221 +msgid "|All Files |*" +msgstr "" + +#: modules/gui/skins2/src/dialogs.cpp:222 +msgid "Open playlist" +msgstr "প্লেলিষ্ট খোলক" + +#: modules/gui/skins2/src/dialogs.cpp:230 +msgid "Save playlist" +msgstr "প্লেলিষ্ট ছেভ কৰক" + +#: modules/gui/skins2/src/dialogs.cpp:230 +msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html" +msgstr "" + +#: modules/gui/skins2/src/skin_main.cpp:494 +msgid "Skin to use" +msgstr "ব্যৱহাৰ কৰিবলৈ স্কিন" + +#: modules/gui/skins2/src/skin_main.cpp:495 +msgid "Path to the skin to use." +msgstr "ব্যৱহাৰ কৰিবলৈ স্কিনলৈ পথ." + +#: modules/gui/skins2/src/skin_main.cpp:496 +msgid "Config of last used skin" +msgstr "অন্তিমবাৰ ব্যৱহাৰ কৰা স্কিনৰ ৰূপৰেখা" + +#: modules/gui/skins2/src/skin_main.cpp:497 +msgid "" +"Windows configuration of the last skin used. This option is updated " +"automatically, do not touch it." +msgstr "" +"অন্তিমবাৰ ব্যৱহাৰ কৰা স্কিনৰ উইণ্ডোজ ৰূপৰেখা. এই বিকল্পটো স্বয়ংক্ৰিয়ভাৱে আপডেট কৰা " +"হয়, এইটো স্পৰ্শ নকৰিব." + +#: modules/gui/skins2/src/skin_main.cpp:500 +msgid "Show a systray icon for VLC" +msgstr "VLC ৰ বাবে ছিষ্ট্ৰে আইকন এটা দেখুৱাওক" + +#: modules/gui/skins2/src/skin_main.cpp:501 +#: modules/gui/skins2/src/skin_main.cpp:502 +msgid "Show VLC on the taskbar" +msgstr "টাস্কবাৰটোত VLC দেখুৱাওক" + +#: modules/gui/skins2/src/skin_main.cpp:503 +msgid "Enable transparency effects" +msgstr "স্বচ্ছতাৰ প্ৰভৱবোৰ সক্ষম কৰক" + +#: modules/gui/skins2/src/skin_main.cpp:504 +msgid "" +"You can disable all transparency effects if you want. This is mainly useful " +"when moving windows does not behave correctly." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/skins2/src/skin_main.cpp:507 +#: modules/gui/skins2/src/skin_main.cpp:508 +msgid "Use a skinned playlist" +msgstr "স্কিন কৰা প্লেলিষ্ট এখন ব্যৱহাৰ কৰক" + +#: modules/gui/skins2/src/skin_main.cpp:509 +msgid "Display video in a skinned window if any" +msgstr "এখন স্কিন কৰা উইণ্ডোত ভিডিঅ' প্ৰদৰ্শন কৰক যদি আছে" + +#: modules/gui/skins2/src/skin_main.cpp:511 +msgid "" +"When set to 'no', this parameter is intended to give old skins a chance to " +"play back video even though no video tag is implemented" +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/gui/skins2/src/skin_main.cpp:536 +msgid "Skinnable Interface" +msgstr "স্কিন কৰিব পৰা ইন্টাৰফেছ" + +#: modules/gui/skins2/src/theme_repository.cpp:58 +msgid "Select skin" +msgstr "স্কিন নিৰ্বাচন কৰক" + +#: modules/gui/skins2/src/theme_repository.cpp:116 +msgid "Open skin..." +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:68 +#: modules/video_filter/adjust.c:61 +msgid "Brightness threshold" +msgstr "উজ্জ্বলতাৰ থ্ৰেছহল্ড" + +#: modules/hw/d3d11/d3d11_filters.c:88 modules/hw/d3d9/d3d9_filters.c:69 +#: modules/video_filter/adjust.c:62 +msgid "" +"When this mode is enabled, pixels will be shown as black or white. The " +"threshold value will be the brightness defined below." +msgstr "" +"যেতিয়া এই ধৰণটো সক্ষম কৰে, পিক্সেলবোৰ কলা বা বগাৰ দৰে দেখুওৱা হব. থ্ৰেছহল্ড " +"মানবোৰ তলত দিয়াৰ দৰে উজ্জ্বল হব লাগে." + +#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:72 +#: modules/video_filter/adjust.c:65 +msgid "Image contrast (0-2)" +msgstr "ছবিৰ প্ৰভেদ (0-2)" + +#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:73 +#: modules/video_filter/adjust.c:66 +msgid "Set the image contrast, between 0 and 2. Defaults to 1." +msgstr "0 আৰু 2 ৰ মাজত ছবিৰ প্ৰভেদটো ছেট কৰক. ডিফল্টবোৰ 1 লৈ." + +#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:74 +msgid "Image hue (0-360)" +msgstr "ছবিৰ হিউ (0-360)" + +#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:75 +msgid "Set the image hue, between 0 and 360. Defaults to 0." +msgstr "ছবিৰ হিউ ছেট কৰক, 0 আৰু 360 ৰ মাজত. 0 লৈ ডিফল্টবোৰ." + +#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:76 +#: modules/video_filter/adjust.c:69 +msgid "Image saturation (0-3)" +msgstr "ছবি চেচুৰেশ্বন (0-3)" + +#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:77 +#: modules/video_filter/adjust.c:70 +msgid "Set the image saturation, between 0 and 3. Defaults to 1." +msgstr "0 আৰু 3 ৰ মাজত ছবি চেচুৰেশ্বনটো ছেট কৰক. 1 লৈ ডিফল্ট কৰে." + +#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:78 +#: modules/video_filter/adjust.c:71 +msgid "Image brightness (0-2)" +msgstr "ছবিৰ উজ্জ্বলতা (0-2)" + +#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:79 +#: modules/video_filter/adjust.c:72 +msgid "Set the image brightness, between 0 and 2. Defaults to 1." +msgstr "0 আৰু 2 ৰ মাজত ছবিৰ উজ্জ্বলতাবোৰ ছেট কৰক. ডিফল্টবোৰ 1 লৈ." + +#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:80 +#: modules/video_filter/adjust.c:73 +msgid "Image gamma (0-10)" +msgstr "ছবি গামা (0-10)" + +#: modules/hw/d3d11/d3d11_filters.c:100 modules/hw/d3d9/d3d9_filters.c:81 +#: modules/video_filter/adjust.c:74 +msgid "Set the image gamma, between 0.01 and 10. Defaults to 1." +msgstr "0.01 আৰু 10 ৰ মাজত ছবিৰ গামা ছেট কৰক. ডিফল্টবোৰ 1 লৈ." + +#: modules/hw/d3d11/d3d11_filters.c:681 +msgid "AMD VQ Enhancer" +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:687 +msgid "AMD Frame Rate Doubler" +msgstr "" + +#: modules/hw/d3d11/d3d11_filters.c:690 +msgid "Show indicator" +msgstr "" + +#: modules/hw/d3d9/d3d9_filters.c:454 +msgid "Direct3D9 adjust filter" +msgstr "" + +#: modules/hw/mmal/codec.c:51 +msgid "Decode frames directly into RPI VideoCore instead of host memory." +msgstr "Decode frames directly into RPI VideoCore instead of host memory." + +#: modules/hw/mmal/codec.c:52 +msgid "" +"Decode frames directly into RPI VideoCore instead of host memory. This " +"option must only be used with the MMAL video output plugin." +msgstr "" +"হষ্ট স্মৃতিৰ পৰিৱৰ্তে RPI ভিডিঅ' মুখ্যলৈ ফ্ৰেমবোৰ প্ৰত্যক্ষভাৱে ডিকোড কৰক. এই বিকল্পটো " +"কেৱল MMAL ভিডিঅ' আউটপুট প্লাগইনটোৰ সৈতে ব্যৱহাৰ কৰাটো অপৰিহাৰ্য." + +#: modules/hw/mmal/codec.c:58 +msgid "MMAL decoder" +msgstr "MMAL ডিকোডাৰ" + +#: modules/hw/mmal/codec.c:59 +msgid "MMAL-based decoder plugin for Raspberry Pi" +msgstr "ৰাস্পবেৰী Pi ৰ বাবে MMAL-আধাৰিত ডিকোডাৰ" + +#: modules/hw/mmal/deinterlace.c:45 +msgid "Use QPUs for advanced HD deinterlacing." +msgstr "" + +#: modules/hw/mmal/deinterlace.c:46 +msgid "" +"Make use of the QPUs to allow higher quality deinterlacing of HD content." +msgstr "" + +#: modules/hw/mmal/deinterlace.c:52 +msgid "MMAL deinterlace" +msgstr "" + +#: modules/hw/mmal/deinterlace.c:53 +msgid "MMAL-based deinterlace filter plugin" +msgstr "" + +#: modules/hw/mmal/vout.c:50 +msgid "VideoCore layer where the video is displayed." +msgstr "ভিডিঅ' মুখ্য স্তৰটো যত ভিডিঅ'টো প্ৰদৰ্শন কৰা হয়." + +#: modules/hw/mmal/vout.c:51 +msgid "" +"VideoCore layer where the video is displayed. Subpictures are displayed " +"directly above and a black background directly below." +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/hw/mmal/vout.c:54 +msgid "Blank screen below video." +msgstr "" + +#: modules/hw/mmal/vout.c:55 +msgid "Render blank screen below video. Increases VideoCore load." +msgstr "" + +#: modules/hw/mmal/vout.c:59 modules/hw/mmal/vout.c:60 +msgid "Adjust HDMI refresh rate to the video." +msgstr "ভিডিঅ'টোলৈ HDMI পুনৰ সজীৱৰ হাৰ মিলাওক." + +#: modules/hw/mmal/vout.c:63 +msgid "Force interlaced video mode." +msgstr "" + +#: modules/hw/mmal/vout.c:64 +msgid "" +"Force the HDMI output into an interlaced video mode for interlaced video " +"content." +msgstr "" + +#: modules/hw/mmal/vout.c:75 +msgid "MMAL vout" +msgstr "MMAL vআউট" + +#: modules/hw/mmal/vout.c:76 +msgid "MMAL-based vout plugin for Raspberry Pi" +msgstr "ৰেছবেৰী Pi ৰ বাবে MMAL-আধাৰিত vআউট প্লাগইন" + +#: modules/hw/vaapi/filters.c:1185 +msgid "VAAPI filters" +msgstr "" + +#: modules/hw/vaapi/filters.c:1186 +msgid "Video Accelerated API filters" +msgstr "" + +#: modules/hw/vdpau/adjust.c:187 +msgid "VDPAU adjust video filter" +msgstr "VDPAU মিলোৱা ভিডিঅ' ফিল্টাৰ" + +#: modules/hw/vdpau/avcodec.c:222 +msgid "VDPAU video decoder" +msgstr "VDPAU ভিডিঅ' ডিকোডাৰ" + +#: modules/hw/vdpau/chroma.c:883 +msgid "Temporal-spatial" +msgstr "সাময়িক-স্পাশ্বিয়েল" + +#: modules/hw/vdpau/chroma.c:887 modules/hw/vdpau/display.c:45 +msgid "VDPAU" +msgstr "VDPAU" + +#: modules/hw/vdpau/chroma.c:888 +msgid "VDPAU surface conversions" +msgstr "VDPAU পৃষ্ঠ ৰূপান্তৰণবোৰ" + +#: modules/hw/vdpau/chroma.c:896 +msgid "Deinterlacing algorithm" +msgstr "ডিইন্টাৰলেচ কৰা এলগোৰিথম" + +#: modules/hw/vdpau/chroma.c:899 +msgid "Inverse telecine" +msgstr "ওলোটা টেলিছাই" + +#: modules/hw/vdpau/chroma.c:901 +msgid "Deinterlace chroma skip" +msgstr "ক্ৰোমা এৰি যোৱাটো ডিইন্টাৰলেচ কৰক" + +#: modules/hw/vdpau/chroma.c:902 +msgid "Whether temporal deinterlacing applies to luma only" +msgstr "কেৱল লুমালৈ সাময়িক ডিইন্টাৰলেচিং প্ৰয়োগ কৰে নে" + +#: modules/hw/vdpau/chroma.c:904 +msgid "Noise reduction level" +msgstr "হুলস্থূল হ্ৰাসৰ স্তৰ" + +#: modules/hw/vdpau/chroma.c:906 +msgid "Scaling quality" +msgstr "জোখাৰ মানদণ্ড" + +#: modules/hw/vdpau/chroma.c:906 +msgid "High quality scaling level" +msgstr "উচ্চ মানদণ্ডৰ জোখাৰ স্তৰ" + +#: modules/hw/vdpau/deinterlace.c:134 +msgid "VDPAU deinterlacing filter" +msgstr "VDPAU ডিইন্টাৰলেচিং ফিল্টাৰ" + +#: modules/hw/vdpau/display.c:46 +msgid "VDPAU output" +msgstr "VDPAU আউটপুট" + +#: modules/hw/vdpau/sharpen.c:143 +msgid "VDPAU sharpen video filter" +msgstr "VDPAU তীক্ষ্ন ভিডিঅ' ফিল্টাৰ" + +#: modules/keystore/file.c:54 +msgid "File keystore (plaintext)" +msgstr "" + +#: modules/keystore/file.c:55 +msgid "Secrets are stored on a file without any encryption" +msgstr "" + +#: modules/keystore/file.c:65 +msgid "Crypt keystore" +msgstr "" + +#: modules/keystore/file.c:66 +msgid "Secrets are stored encrypted on a file" +msgstr "" + +#: modules/keystore/keychain.m:41 +msgid "No" +msgstr "" + +#: modules/keystore/keychain.m:41 +msgid "Any" +msgstr "" + +#: modules/keystore/keychain.m:47 +msgid "System default" +msgstr "" + +#: modules/keystore/keychain.m:48 +msgid "After first unlock" +msgstr "" + +#: modules/keystore/keychain.m:49 +msgid "After first unlock, on this device only" +msgstr "" + +#: modules/keystore/keychain.m:51 +msgid "When passcode set, on this device only" +msgstr "" + +#: modules/keystore/keychain.m:52 +msgid "Always, on this device only" +msgstr "" + +#: modules/keystore/keychain.m:53 +msgid "When unlocked" +msgstr "" + +#: modules/keystore/keychain.m:54 +msgid "When unlocked, on this device only" +msgstr "" + +#: modules/keystore/keychain.m:57 +msgid "Synchronize stored items" +msgstr "" + +#: modules/keystore/keychain.m:58 +msgid "" +"Synchronizes stored items via iCloud Keychain if enabled in the user domain." +msgstr "" + +#: modules/keystore/keychain.m:60 +msgid "Accessibility type for all future passwords saved to the Keychain" +msgstr "" + +#: modules/keystore/keychain.m:62 +msgid "Keychain access group" +msgstr "" + +#: modules/keystore/keychain.m:63 +msgid "Keychain access group as defined by the app entitlements." +msgstr "" + +#: modules/keystore/keychain.m:109 +msgid "Keychain keystore" +msgstr "" + +#: modules/keystore/keychain.m:110 +msgid "Keystore for iOS, Mac OS X and tvOS" +msgstr "" + +#: modules/keystore/kwallet.c:48 +msgid "KWallet keystore" +msgstr "" + +#: modules/keystore/kwallet.c:49 +msgid "Secrets are stored via KWallet" +msgstr "" + +#: modules/keystore/memory.c:41 +msgid "Memory keystore" +msgstr "" + +#: modules/keystore/memory.c:42 +msgid "Secrets are stored in memory" +msgstr "" + +#: modules/keystore/secret.c:39 +msgid "libsecret keystore" +msgstr "" + +#: modules/keystore/secret.c:40 +msgid "Secrets are stored via libsecret" +msgstr "" + +#: modules/logger/android.c:85 +msgid "Android log" +msgstr "" + +#: modules/logger/android.c:86 +msgid "Android log using logcat" +msgstr "" + +#: modules/logger/console.c:147 +msgid "Be quiet" +msgstr "শান্ত হওক" + +#: modules/logger/console.c:148 +msgid "Turn off all messages on the console." +msgstr "" + +#: modules/logger/console.c:151 +msgid "Console log" +msgstr "" + +#: modules/logger/console.c:152 +msgid "Console logger" +msgstr "" + +#: modules/logger/file.c:193 +msgid "HTML" +msgstr "" + +#: modules/logger/file.c:203 +msgid "Info" +msgstr "" + +#: modules/logger/file.c:203 +msgid "Debug" +msgstr "" + +#: modules/logger/file.c:205 +msgid "Log to file" +msgstr "ফাইললৈ ল'গ কৰক" + +#: modules/logger/file.c:206 +msgid "Log all VLC messages to a text file." +msgstr "টেক্সট ফাইল এটালৈ সকলোবোৰ VLC বাৰ্তা ল'গ কৰক." + +#: modules/logger/file.c:208 +msgid "Log filename" +msgstr "ফাইল নাম ল'গ কৰক" + +#: modules/logger/file.c:209 +msgid "Specify the log filename." +msgstr "ল'গ ফাইলনামটো নিৰ্ধাৰণ কৰক." + +#: modules/logger/file.c:211 +msgid "Log format" +msgstr "ল'গ ফৰমেট" + +#: modules/logger/file.c:212 +msgid "Specify the logging format." +msgstr "লগিং ফৰমেটটো নিৰ্দিষ্ট কৰক." + +#: modules/logger/file.c:214 +msgid "Verbosity" +msgstr "ভাৰ্বোছিটি" + +#: modules/logger/file.c:215 +msgid "" +"Select the logging verbosity or default to use the same verbosity given by --" +"verbose." +msgstr "" + +#: modules/logger/file.c:219 +msgid "Logger" +msgstr "" + +#: modules/logger/file.c:220 +msgid "File logger" +msgstr "" + +#: modules/logger/journal.c:77 +msgid "Journal" +msgstr "" + +#: modules/logger/journal.c:78 +msgid "SystemD journal logger" +msgstr "" + +#: modules/logger/syslog.c:138 +msgid "System log (syslog)" +msgstr "" + +#: modules/logger/syslog.c:139 +msgid "Emit log messages through the POSIX system log." +msgstr "" + +#: modules/logger/syslog.c:141 +msgid "Debug messages" +msgstr "" + +#: modules/logger/syslog.c:142 +msgid "Include debug messages in system log." +msgstr "" + +#: modules/logger/syslog.c:144 +msgid "Identity" +msgstr "" + +#: modules/logger/syslog.c:145 +msgid "Process identity in system log." +msgstr "" + +#: modules/logger/syslog.c:147 +msgid "Facility" +msgstr "" + +#: modules/logger/syslog.c:148 +msgid "System logging facility." +msgstr "" + +#: modules/logger/syslog.c:151 +msgid "syslog" +msgstr "" + +#: modules/logger/syslog.c:152 +msgid "System logger (syslog)" +msgstr "" + +#: modules/lua/extension.c:1200 +msgid "Extension not responding!" +msgstr "" + +#: modules/lua/extension.c:1201 +#, c-format +msgid "" +"Extension '%s' does not respond.\n" +"Do you want to kill it now? " +msgstr "" + +#: modules/lua/libs/httpd.c:75 +msgid "" +"

Password for Web interface has not been set.

Please use --http-" +"password, or set a password in

Preferences > All > Main " +"interfaces > Lua > Lua HTTP > Password.

" +msgstr "" +"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " +"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." + +#: modules/lua/vlc.c:49 +msgid "Lua interface" +msgstr "লুৱা ইন্টাৰফেছ" + +#: modules/lua/vlc.c:50 +msgid "Lua interface module to load" +msgstr "লোড কৰিবলৈ লুৱা ইন্টাৰফেছ মডুল" + +#: modules/lua/vlc.c:52 +msgid "Lua interface configuration" +msgstr "লুৱা ইন্টাৰফেছ ৰূপৰেখাকৰণ" + +#: modules/lua/vlc.c:53 +msgid "" +"Lua interface configuration string. Format is: '[\"" +"\"] = {

ডকুমেন্টেশ্বন

আপুনি ভিডিঅ'LANৰ " -"উইকি ৱেবছাইটত VLC ডকুমেন্টেশ্বন বিচাৰি " -"পাব পাৰে.\n" -"

যদি আপুনি VLC মিডিয়া প্লেয়াৰটো নতুনকৈ ব্যৱহাৰ কৰিছে, তেন্তে অনুগ্ৰহ কৰি, " -"VLC মিডিয়া প্লেয়াৰৰ পৰিচয়টো পঢ়ক.

প্লেয়াৰটো কেনেকৈ ব্যৱহাৰ " -"কৰিব লাগে তাৰ বিষয়ে আপুনি\n" -"
\"VLC " -"মিডিয়া প্লেয়াৰৰ সৈতে ফাইলবোৰ কেনেকৈ চলায়\" ডকুমেন্টত কিছু তথ্য লাভ কৰিব." -"

সকলোবোৰ ছেভিং, ৰূপান্তৰ, ট্ৰেন্সকোডিং, এনকোডিং, মাক্সিং আৰু ষ্ট্ৰিমিং কাৰ্যৰ " -"বাবে আপুনি.

\n" - -#: modules/gui/qt/dialogs/firstrun.cpp:88 -msgid "Network Access Policy" -msgstr "নেটৱৰ্ক প্ৰৱেশ পলিচী" - -#: modules/gui/qt/dialogs/firstrun.cpp:100 -msgid "Regularly check for VLC updates" -msgstr "VLC আপডেটবোৰৰ বাবে নিয়মিতভাৱে পৰীক্ষা কৰক" - -#: modules/gui/qt/dialogs/gototime.cpp:42 -msgid "Go to Time" -msgstr "সময়লৈ যাওক" - -#: modules/gui/qt/dialogs/gototime.cpp:48 -msgid "&Go" -msgstr "যাওক" - -#: modules/gui/qt/dialogs/gototime.cpp:56 -msgid "Go to time" -msgstr "সময়লৈ যাওক" - -#: modules/gui/qt/dialogs/help.cpp:86 modules/gui/qt/dialogs/plugins.cpp:1376 -#: modules/gui/qt/dialogs/plugins.cpp:1459 -msgid "About" -msgstr "বিষয়ে" - -#: modules/gui/qt/dialogs/help.cpp:94 -msgid "" -"

VLC media player is a free and open source media player, encoder, and " -"streamer made by the volunteers of the VideoLAN community.

VLC uses its internal codecs, works on " -"essentially every popular platform, and can read almost all files, CDs, " -"DVDs, network streams, capture cards and other media formats!

Help and join us!" -msgstr "" - -#: modules/gui/qt/dialogs/help.cpp:214 -msgid "&Recheck version" -msgstr "সংস্কৰণটো পুনৰ পৰীক্ষা কৰক" - -#: modules/gui/qt/dialogs/help.cpp:217 -msgid "&Yes" -msgstr "হয়" - -#: modules/gui/qt/dialogs/help.cpp:219 -msgid "&No" -msgstr "নহয়" - -#: modules/gui/qt/dialogs/help.cpp:222 modules/gui/qt/ui/update.h:144 -msgid "VLC media player updates" -msgstr "VLC মিডিয়া প্লেয়াৰ আপডেটবোৰ" - -#: modules/gui/qt/dialogs/help.cpp:294 -msgid "A new version of VLC (%1.%2.%3%4) is available." -msgstr "VLC (%1.%2.%3%4) ৰ নতুন সংস্কৰণ এটা উপলব্ধ." - -#: modules/gui/qt/dialogs/help.cpp:319 -msgid "You have the latest version of VLC media player." -msgstr "আপোনাৰ তাত VLC মিডিয়া প্লেয়াৰৰ শেহতীয়া সংস্কৰণ এটা আছে." - -#: modules/gui/qt/dialogs/help.cpp:326 -msgid "An error occurred while checking for updates..." -msgstr "আপডেটবোৰৰ বাবে পৰীক্ষা কৰোতে ভুল এটাৰ উদ্ভৱ হৈছিল..." - -#: modules/gui/qt/dialogs/mediainfo.cpp:52 -msgid "Current Media Information" -msgstr "চলিত মিডিয়া তথ্য" - -#: modules/gui/qt/dialogs/mediainfo.cpp:64 -msgid "&General" -msgstr "সাধাৰণ" - -#: modules/gui/qt/dialogs/mediainfo.cpp:66 -msgid "&Metadata" -msgstr "মেটাডাটা" - -#: modules/gui/qt/dialogs/mediainfo.cpp:68 -msgid "Co&dec" -msgstr "কোডেক" - -#: modules/gui/qt/dialogs/mediainfo.cpp:72 -msgid "S&tatistics" -msgstr "পৰিসংখ্যাবোৰ" - -#: modules/gui/qt/dialogs/mediainfo.cpp:78 -msgid "&Save Metadata" -msgstr "মেটাডাটা ছেভ কৰক" - -#: modules/gui/qt/dialogs/mediainfo.cpp:83 -msgid "Location:" -msgstr "স্থান:" - -#: modules/gui/qt/dialogs/messages.cpp:91 -msgid "Saves all the displayed logs to a file" -msgstr "ফাইল এটাত সকলোবোৰ প্ৰদৰ্শিত ল'গ ছেভ কৰে" - -#: modules/gui/qt/dialogs/messages.cpp:259 -msgid "Save log file as..." -msgstr "...ৰ দৰে ল'গ ফাইল ছেভ কৰক" - -#: modules/gui/qt/dialogs/messages.cpp:261 -msgid "Texts/Logs (*.log *.txt);; All (*.*)" -msgstr "" - -#: modules/gui/qt/dialogs/messages.cpp:267 -msgid "Application" -msgstr "আবেদন" - -#: modules/gui/qt/dialogs/messages.cpp:268 -msgid "" -"Cannot write to file %1:\n" -"%2." -msgstr "" -"%1 ফাইললৈ লিখিব নোৱাৰি:\n" -"%2." - -#: modules/gui/qt/dialogs/messages.cpp:334 -msgid "Update the tree" -msgstr "বিন্যাসটো আপডেট কৰক" - -#: modules/gui/qt/dialogs/messages.cpp:335 -msgid "Clear the messages" -msgstr "বাৰ্তাবোৰ খালী কৰক" - -#: modules/gui/qt/dialogs/open.cpp:78 modules/gui/qt/menus.cpp:935 -#: modules/gui/qt/menus.cpp:1132 -msgid "Open Media" -msgstr "মিডিয়া খোলক" - -#: modules/gui/qt/dialogs/open.cpp:90 -msgid "&File" -msgstr "ফাইল" - -#: modules/gui/qt/dialogs/open.cpp:92 -msgid "&Disc" -msgstr "ডিস্ক" - -#: modules/gui/qt/dialogs/open.cpp:94 -msgid "&Network" -msgstr "নেটৱৰ্ক" - -#: modules/gui/qt/dialogs/open.cpp:96 -msgid "Capture &Device" -msgstr "অধিগ্ৰহণ &ডিভাইচ" - -#: modules/gui/qt/dialogs/open.cpp:111 -msgid "&Select" -msgstr "নিৰ্বাচন কৰক" - -#: modules/gui/qt/dialogs/open.cpp:115 modules/gui/qt/dialogs/open.cpp:210 -#: modules/gui/qt/dialogs/openurl.cpp:57 -msgid "&Enqueue" -msgstr "শাৰী কৰক" - -#: modules/gui/qt/dialogs/open.cpp:117 modules/gui/qt/dialogs/open.cpp:214 -#: modules/gui/qt/dialogs/openurl.cpp:54 modules/gui/qt/menus.cpp:824 -msgid "&Play" -msgstr "চলাওক" - -#: modules/gui/qt/dialogs/open.cpp:119 modules/gui/qt/dialogs/open.cpp:204 -msgid "&Stream" -msgstr "ষ্ট্ৰিম" - -#: modules/gui/qt/dialogs/open.cpp:121 -msgid "C&onvert" -msgstr "ৰূপান্তৰ কৰক" - -#: modules/gui/qt/dialogs/open.cpp:207 -msgid "C&onvert / Save" -msgstr "ৰূপান্তৰ / ছেভ কৰক" - -#: modules/gui/qt/dialogs/openurl.cpp:47 -msgid "Open URL" -msgstr "URL খোলক" - -#: modules/gui/qt/dialogs/openurl.cpp:64 -msgid "Enter URL here..." -msgstr "ইয়াত URL ভৰাওক..." - -#: modules/gui/qt/dialogs/openurl.cpp:67 -msgid "Please enter the URL or path to the media you want to play." -msgstr "অনুগ্ৰহ কৰি আপুনি চলাবলৈ বিচৰা মিডিয়ালৈ URL বা পাথটো ভৰাওক." - -#: modules/gui/qt/dialogs/openurl.cpp:71 -msgid "" -"If your clipboard contains a valid URL\n" -"or the path to a file on your computer,\n" -"it will be automatically selected." -msgstr "" -"প্লেলিষ্টটোত পৰৱৰ্তী বস্তুটোলৈ যোৱাৰ বাবে ব্যৱহাৰ URL\n" -"বা কৰিবলৈ হটকীটো নিৰ্বাচন কৰক,\n" -"এইটো স্বয়ংক্ৰিয়ভাৱে নিৰ্বাচন কৰা হব." - -#: modules/gui/qt/dialogs/plugins.cpp:80 -msgid "Plugins and extensions" -msgstr "প্লাগইন আৰু সম্প্ৰসাৰণবোৰ" - -#: modules/gui/qt/dialogs/plugins.cpp:88 -msgid "Active Extensions" -msgstr "সক্ৰিয় সম্প্ৰসাৰণবোৰ" - -#: modules/gui/qt/dialogs/plugins.cpp:128 -msgid "Capability" -msgstr "দক্ষতা" - -#: modules/gui/qt/dialogs/plugins.cpp:128 -msgid "Score" -msgstr "স্কোৰ" - -#: modules/gui/qt/dialogs/plugins.cpp:141 -msgid "&Search:" -msgstr "সন্ধান কৰক:" - -#: modules/gui/qt/dialogs/plugins.cpp:259 -#: modules/gui/qt/dialogs/plugins.cpp:1292 -msgid "More information..." -msgstr "অধিক তথ্য..." - -#: modules/gui/qt/dialogs/plugins.cpp:267 -msgid "Reload extensions" -msgstr "সম্প্ৰসাৰণবোৰ পুনৰ লোড কৰক" - -#: modules/gui/qt/dialogs/plugins.cpp:386 -msgid "" -"Skins customize player's appearance. You can activate them through " -"preferences." -msgstr "" -"প্লেয়াৰৰ অঞ্চলৰ কোড. কিছুমান ডিস্ক কেৱল এটা শুদ্ধ অঞ্চলৰ কোড এটাৰ সৈতে চলাব পাৰি" - -#: modules/gui/qt/dialogs/plugins.cpp:390 -msgid "" -"Playlist parsers add new capabilities to read internet streams or extract " -"meta data." -msgstr "" -"প্লিলিষ্ট দক্ষতাবোৰৰ ভাগকৰ্তা ডিস্ক কেৱল এটা শুদ্ধ অঞ্চলৰ কোড এটাৰ সৈতে চলাব পাৰি." - -#: modules/gui/qt/dialogs/plugins.cpp:394 -msgid "" -"Service discoveries adds new sources to your playlist such as web radios, " -"video websites, ..." -msgstr "" -"এইটোৱে আপোনাক বিভিন্ন প্লেলিষ্ট বস্তুৰ চাৰিওফালে এটা ৱেব অনুপাত, ভিডিঅ' " -"ৱেবছাইটবোৰৰ দৰে,..." - -#: modules/gui/qt/dialogs/plugins.cpp:401 -msgid "Retrieves extra info and art for playlist items" -msgstr "" - -#: modules/gui/qt/dialogs/plugins.cpp:404 -msgid "" -"Extensions brings various enhancements. Check descriptions for more details" -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/qt/dialogs/plugins.cpp:425 -msgid "Only installed" -msgstr "কেৱল ইনষ্টল কৰা হল" - -#: modules/gui/qt/dialogs/plugins.cpp:531 -msgid "Retrieving addons..." -msgstr "এডঅনবোৰ উদ্ধাৰ কৰিছে..." - -#: modules/gui/qt/dialogs/plugins.cpp:542 -msgid "No addons found" -msgstr "কোনো এডঅন বিচাৰি পোৱা নগল" - -#: modules/gui/qt/dialogs/plugins.cpp:821 -msgid "This addon has been installed manually. VLC can't manage it by itself." -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/qt/dialogs/plugins.cpp:1204 -msgid "Version %1" -msgstr "সংস্কৰণ %1" - -#: modules/gui/qt/dialogs/plugins.cpp:1232 -msgid "%1 downloads" -msgstr "%1 ডাউনলোডবোৰ" - -#: modules/gui/qt/dialogs/plugins.cpp:1301 -msgid "&Uninstall" -msgstr "ইনষ্টল নাইকিয়া কৰক" - -#: modules/gui/qt/dialogs/plugins.cpp:1304 -msgid "&Install" -msgstr "ইনষ্টল কৰক" - -#: modules/gui/qt/dialogs/plugins.cpp:1399 -#: modules/gui/qt/dialogs/plugins.cpp:1502 -msgid "Version" -msgstr "সংস্কৰণ" - -#: modules/gui/qt/dialogs/plugins.cpp:1419 -#: modules/gui/qt/dialogs/plugins.cpp:1529 -msgid "Website" -msgstr "ৱেবছাইট" - -#: modules/gui/qt/dialogs/plugins.cpp:1541 modules/gui/qt/ui/sprefs_input.h:363 -msgid "Files" -msgstr "ফাইলবোৰ" - -#: modules/gui/qt/dialogs/podcast_configuration.cpp:35 -msgid "Deletes the selected item" -msgstr "নিৰ্বাচিত বস্তুটো ডিলিট কৰে" - -#: modules/gui/qt/dialogs/preferences.cpp:72 -msgid "Show settings" -msgstr "ছেটিংবোৰ দেখুৱাওক" - -#: modules/gui/qt/dialogs/preferences.cpp:76 -msgid "Simple" -msgstr "সাধাৰণ" - -#: modules/gui/qt/dialogs/preferences.cpp:77 -msgid "Switch to simple preferences view" -msgstr "সাধাৰণ পছন্দবোৰৰ দৃশ্যলৈ সলনি কৰক" - -#: modules/gui/qt/dialogs/preferences.cpp:80 -msgid "Switch to full preferences view" -msgstr "সম্পূৰ্ণ পছন্দবোৰৰ দৃশ্যলৈ সলনি কৰক" - -#: modules/gui/qt/dialogs/preferences.cpp:96 -msgid "Save and close the dialog" -msgstr "সংলাপটো ছেভ আৰু বন্ধ কৰক" - -#: modules/gui/qt/dialogs/preferences.cpp:98 -msgid "&Reset Preferences" -msgstr "পছন্দবোৰ পুনৰ ছেট কৰক" - -#: modules/gui/qt/dialogs/preferences.cpp:167 -msgid "Only show current" -msgstr "কেৱল চলিতটো দেখুৱাওক" - -#: modules/gui/qt/dialogs/preferences.cpp:169 -msgid "Only show modules related to current playback" -msgstr "কেৱল চলিত প্লেবেকৰ সৈতে সম্পৰ্কীয় মডুলবোৰ দেখুৱাওক" - -#: modules/gui/qt/dialogs/preferences.cpp:206 -msgid "Advanced Preferences" -msgstr "উন্নত পছন্দবোৰ" - -#: modules/gui/qt/dialogs/preferences.cpp:227 -msgid "Simple Preferences" -msgstr "সাধাৰণ পছন্দবোৰ" - -#: modules/gui/qt/dialogs/preferences.cpp:311 -msgid "Cannot save Configuration" -msgstr "ৰূপৰেখাটো ছেভ কৰিব নোৱাৰি" - -#: modules/gui/qt/dialogs/preferences.cpp:312 -msgid "Preferences file could not be saved" -msgstr "পছন্দ কৰা ফাইলবোৰ ছেভ কৰিব পৰা নগল" - -#: modules/gui/qt/dialogs/preferences.cpp:337 -msgid "Are you sure you want to reset your VLC media player preferences?" -msgstr "" -"আপোনাৰ VLC মিডিয়া প্লেয়াৰ পছন্দবোৰ পুনৰ ছেট কৰিব বিচাৰে বুলি আপুনি নিশ্চিত নে?" - -#: modules/gui/qt/dialogs/sout.cpp:45 modules/gui/qt/ui/sout.h:198 -msgid "Stream Output" -msgstr "ষ্ট্ৰিম আউটপুট" - -#: modules/gui/qt/dialogs/sout.cpp:51 -msgid "" -"This wizard will allow you to stream or convert your media for use locally, " -"on your private network, or on the Internet.\n" -"You should start by checking that source matches what you want your input to " -"be and then press the \"Next\" button to continue.\n" -msgstr "" -"উইজাৰ্ডটোৱে আপোনাক ষ্ট্ৰিম বা ৰূপান্তৰ. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো " -"অভাৰৰাইড কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব.\n" -"সাধাৰণ ৰাজহুৱা অনুজ্ঞাপত্ৰৰ নিয়মবোৰৰ অধীনত আপুনি এইটো পুনৰ বিতৰণ কৰিব পাৰে " -"\"Next\" বাটন অব্যাহত ৰাখিবলৈ.\n" - -#: modules/gui/qt/dialogs/sout.cpp:58 -msgid "" -"Stream output string.\n" -"This is automatically generated when you change the above settings,\n" -"but you can change it manually." -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/qt/dialogs/sout.cpp:91 -msgid "Back" -msgstr "পিছলৈ" - -#: modules/gui/qt/dialogs/toolbar.cpp:64 -msgid "Toolbars Editor" -msgstr "টুলবাৰবোৰ সম্পাদক" - -#: modules/gui/qt/dialogs/toolbar.cpp:71 -msgid "Toolbar Elements" -msgstr "টুলবাৰ উপাদানবোৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:76 -msgid "Flat Button" -msgstr "ফ্লেট বাটন" - -#: modules/gui/qt/dialogs/toolbar.cpp:77 -msgid "Next widget style" -msgstr "পৰৱৰ্তী উইজেট শৈলী" - -#: modules/gui/qt/dialogs/toolbar.cpp:78 -msgid "Big Button" -msgstr "ডাঙৰ বাটন" - -#: modules/gui/qt/dialogs/toolbar.cpp:80 -msgid "Native Slider" -msgstr "স্থানীয় শ্লাইডাৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:94 -msgid "Main Toolbar" -msgstr "মুখ্য টুলবাৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:97 -msgid "Above the Video" -msgstr "ভিডিঅ'টোৰ ওপৰত" - -#: modules/gui/qt/dialogs/toolbar.cpp:100 -msgid "Toolbar position:" -msgstr "টুলবাৰৰ স্থান:" - -#: modules/gui/qt/dialogs/toolbar.cpp:106 -msgid "Line 1:" -msgstr "শাৰী 1:" - -#: modules/gui/qt/dialogs/toolbar.cpp:111 -msgid "Line 2:" -msgstr "শাৰী 2:" - -#: modules/gui/qt/dialogs/toolbar.cpp:120 -msgid "Time Toolbar" -msgstr "সময় টুলবাৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:129 -msgid "Advanced Widget" -msgstr "উন্নত উজেট" - -#: modules/gui/qt/dialogs/toolbar.cpp:138 -msgid "Fullscreen Controller" -msgstr "সম্পূৰ্ণ দৃশ্য নিয়ন্ত্ৰণক" - -#: modules/gui/qt/dialogs/toolbar.cpp:147 -msgid "New profile" -msgstr "নতুন প্ৰফাইল" - -#: modules/gui/qt/dialogs/toolbar.cpp:150 -msgid "Delete the current profile" -msgstr "চলিত প্ৰফাইলটো ডিলিট কৰক" - -#: modules/gui/qt/dialogs/toolbar.cpp:152 -msgid "Select profile:" -msgstr "প্ৰফাইল নিৰ্বাচন কৰক:" - -#: modules/gui/qt/dialogs/toolbar.cpp:187 -msgid "Preview" -msgstr "পূৰ্বদৃশ্য" - -#: modules/gui/qt/dialogs/toolbar.cpp:196 -msgid "Cl&ose" -msgstr "বন্ধ কৰক" - -#: modules/gui/qt/dialogs/toolbar.cpp:226 -msgid "Profile Name" -msgstr "প্ৰফাইল নাম" - -#: modules/gui/qt/dialogs/toolbar.cpp:227 -msgid "Please enter the new profile name." -msgstr "অনুগ্ৰহ কৰি নতুন প্ৰফাইল নামটো ভৰাওক." - -#: modules/gui/qt/dialogs/toolbar.cpp:423 -msgid "Spacer" -msgstr "গতি প্ৰদানকৰ্তা" - -#: modules/gui/qt/dialogs/toolbar.cpp:430 -msgid "Expanding Spacer" -msgstr "গতি প্ৰদানকৰ্তা প্ৰসাৰ কৰিছে" - -#: modules/gui/qt/dialogs/toolbar.cpp:462 -msgid "Splitter" -msgstr "স্প্লিটাৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:469 -msgid "Time Slider" -msgstr "সময় শ্লাইডাৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:482 -msgid "Small Volume" -msgstr "সৰু প্ৰসাৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:519 -msgid "DVD menus" -msgstr "DVD তালিকাবোৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:533 -msgid "Teletext transparency" -msgstr "টেলিটেক্সট স্বচ্ছতা" - -#: modules/gui/qt/dialogs/toolbar.cpp:548 -msgid "Advanced Buttons" -msgstr "উন্নত বাটনবোৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:561 -msgid "Playback Buttons" -msgstr "প্লেবেক বাটনবোৰ" - -#: modules/gui/qt/dialogs/toolbar.cpp:565 -msgid "Aspect ratio selector" -msgstr "দৃষ্টিকোণ অনুপাত নিৰ্বাচক" - -#: modules/gui/qt/dialogs/toolbar.cpp:569 -msgid "Speed selector" -msgstr "গতি নিৰ্বাচক" - -#: modules/gui/qt/dialogs/vlm.cpp:73 -msgid "Broadcast" -msgstr "প্ৰচাৰণ" - -#: modules/gui/qt/dialogs/vlm.cpp:74 -msgid "Schedule" -msgstr "সময়সূচী" - -#: modules/gui/qt/dialogs/vlm.cpp:75 -msgid "Video On Demand ( VOD )" -msgstr "দাবী কৰা ভিডিঅ' ( VOD )" - -#: modules/gui/qt/dialogs/vlm.cpp:80 -msgid "Hours / Minutes / Seconds:" -msgstr "ঘন্টা / মিনিট / ছেকেণ্ড:" - -#: modules/gui/qt/dialogs/vlm.cpp:82 -msgid "Day / Month / Year:" -msgstr "দিন / মাহ / বছৰ:" - -#: modules/gui/qt/dialogs/vlm.cpp:84 -msgid "Repeat:" -msgstr "পুনৰাবৃত্তি কৰক:" - -#: modules/gui/qt/dialogs/vlm.cpp:86 -msgid "Repeat delay:" -msgstr "বিলম্বৰ পুনৰাবৃত্তি কৰক:" - -#: modules/gui/qt/dialogs/vlm.cpp:111 modules/gui/qt/ui/sprefs_interface.h:555 -msgid " days" -msgstr "দিনবোৰ" - -#: modules/gui/qt/dialogs/vlm.cpp:130 -msgid "I&mport" -msgstr "আমদানি কৰক" - -#: modules/gui/qt/dialogs/vlm.cpp:133 -msgid "E&xport" -msgstr "ৰপ্তানিক কৰক" - -#: modules/gui/qt/dialogs/vlm.cpp:264 -msgid "Save VLM configuration as..." -msgstr "...ৰ দৰে VLM ৰূপৰেখা ছেভ কৰক" - -#: modules/gui/qt/dialogs/vlm.cpp:266 modules/gui/qt/dialogs/vlm.cpp:335 -msgid "VLM conf (*.vlm);;All (*)" -msgstr "VLM ৰূপৰেখা (*.vlm);;সকলো (*)" - -#: modules/gui/qt/dialogs/vlm.cpp:333 -msgid "Open VLM configuration..." -msgstr "VLM ৰূপৰেখা খোলক..." - -#: modules/gui/qt/dialogs/vlm.cpp:532 -msgid "Broadcast: " -msgstr "প্ৰচাৰণ:" - -#: modules/gui/qt/dialogs/vlm.cpp:605 -msgid "Schedule: " -msgstr "সময়সূচী: " - -#: modules/gui/qt/dialogs/vlm.cpp:629 -msgid "VOD: " -msgstr "VOD: " - -#: modules/gui/qt/dialogs_provider.cpp:67 -msgid "Open Directory" -msgstr "নিৰ্দেশিকা খোলক" - -#: modules/gui/qt/dialogs_provider.cpp:68 -msgid "Open Folder" -msgstr "ফোল্ডাৰ খোলক" - -#: modules/gui/qt/dialogs_provider.cpp:633 -msgid "Open playlist..." -msgstr "প্লেলিষ্ট খোলক..." - -#: modules/gui/qt/dialogs_provider.cpp:656 -msgid "XSPF playlist" -msgstr "XSPF প্লেলিষ্ট" - -#: modules/gui/qt/dialogs_provider.cpp:657 -msgid "M3U playlist" -msgstr "M3U প্লেলিষ্ট" - -#: modules/gui/qt/dialogs_provider.cpp:658 -msgid "M3U8 playlist" -msgstr "M3U8 প্লেলিষ্ট" - -#: modules/gui/qt/dialogs_provider.cpp:676 -msgid "Save playlist as..." -msgstr "...ৰ দৰে প্লেলিষ্ট ছেভ কৰক" - -#: modules/gui/qt/dialogs_provider.cpp:824 -msgid "Open subtitles..." -msgstr "উপশিৰোনামবোৰ খোলক..." - -#: modules/gui/qt/dialogs_provider.hpp:40 -msgid "Media Files" -msgstr "মিডিয়া ফাইলবোৰ" - -#: modules/gui/qt/dialogs_provider.hpp:44 -msgid "Subtitle Files" -msgstr "উপশিৰোনাম ফাইলবোৰ" - -#: modules/gui/qt/dialogs_provider.hpp:45 -msgid "All Files" -msgstr "সকলোবোৰ ফাইল" - -#: modules/gui/qt/extensions_manager.cpp:181 -#: modules/gui/qt/extensions_manager.cpp:191 -#: modules/gui/qt/util/qmenuview.cpp:70 -msgid "Empty" -msgstr "" - -#: modules/gui/qt/extensions_manager.cpp:197 -msgid "Deactivate" -msgstr "" - -#: modules/gui/qt/main_interface.cpp:373 -msgid "Do you want to restart the playback where left off?" -msgstr "আপুনি যত এৰি গৈছিল তাৰ পৰা প্লেবেকটো পুনৰ আৰম্ভ কৰিব বিচাৰে নেকি?" - -#: modules/gui/qt/main_interface.cpp:379 -msgid "&Continue" -msgstr "" - -#: modules/gui/qt/main_interface.cpp:1421 -msgid "Control menu for the player" -msgstr "প্লেয়াৰটোৰ বাবে নিয়ন্ত্ৰণৰ তালিকা" - -#: modules/gui/qt/main_interface.cpp:1465 -msgid "Paused" -msgstr "বিৰতি দিয়া হল" - -#: modules/gui/qt/menus.cpp:331 -msgid "&Media" -msgstr "মিডিয়া" - -#: modules/gui/qt/menus.cpp:334 -msgid "P&layback" -msgstr "প্লেবেক" - -#: modules/gui/qt/menus.cpp:335 modules/gui/qt/menus.cpp:1050 -msgid "&Audio" -msgstr "অডিঅ'" - -#: modules/gui/qt/menus.cpp:336 modules/gui/qt/menus.cpp:1057 -msgid "&Video" -msgstr "ভিডিঅ'" - -#: modules/gui/qt/menus.cpp:337 modules/gui/qt/menus.cpp:1064 -msgid "Subti&tle" -msgstr "উপশিৰোনাম" - -#: modules/gui/qt/menus.cpp:339 modules/gui/qt/menus.cpp:1080 -msgid "Tool&s" -msgstr "" - -#: modules/gui/qt/menus.cpp:342 modules/gui/qt/menus.cpp:1087 -msgid "V&iew" -msgstr "দৃশ্য" - -#: modules/gui/qt/menus.cpp:344 modules/gui/qt/menus.cpp:788 -msgid "&Help" -msgstr "সহায়" - -#: modules/gui/qt/menus.cpp:357 -msgid "Open &File..." -msgstr "ফাইল খোলক..." - -#: modules/gui/qt/menus.cpp:359 -msgid "&Open Multiple Files..." -msgstr "বিভিন্ন ফাইলবোৰ খোলক..." - -#: modules/gui/qt/menus.cpp:363 modules/gui/qt/menus.cpp:940 -msgid "Open &Disc..." -msgstr "ডিস্ক খোলক..." - -#: modules/gui/qt/menus.cpp:365 -msgid "Open &Network Stream..." -msgstr "নেটৱৰ্ক ষ্ট্ৰিম খোলক..." - -#: modules/gui/qt/menus.cpp:367 modules/gui/qt/menus.cpp:944 -msgid "Open &Capture Device..." -msgstr "ডিভাইচ খোলক &অধিগ্ৰহণ কৰক..." - -#: modules/gui/qt/menus.cpp:370 -msgid "Open &Location from clipboard" -msgstr "ক্লিপবোৰ্ডৰ পৰা খোলক &স্থান নিৰ্ণয় কৰক..." - -#: modules/gui/qt/menus.cpp:374 -msgid "Open &Recent Media" -msgstr "শেহতীয়া মিডিয়াটো খোলক" - -#: modules/gui/qt/menus.cpp:387 -msgid "Conve&rt / Save..." -msgstr "ৰূপান্তৰ / ছেভ কৰক..." - -#: modules/gui/qt/menus.cpp:389 -msgid "&Stream..." -msgstr "&ষ্ট্ৰিম..." - -#: modules/gui/qt/menus.cpp:394 -msgid "Quit at the end of playlist" -msgstr "প্লেলিষ্টৰ শেষত ত্যাগ কৰক" - -#: modules/gui/qt/menus.cpp:401 -msgid "Close to systray" -msgstr "ছিষ্ট্ৰে কৰিবলৈ বন্ধ কৰক" - -#: modules/gui/qt/menus.cpp:405 modules/gui/qt/menus.cpp:1194 -msgid "&Quit" -msgstr "ত্যাগ কৰক" - -#: modules/gui/qt/menus.cpp:415 -msgid "&Effects and Filters" -msgstr "প্ৰভাৱবোৰ আৰু ফিল্টাৰবোৰ" - -#: modules/gui/qt/menus.cpp:418 -msgid "&Track Synchronization" -msgstr "পথ ছিনক্ৰনাইজেশ্বন" - -#: modules/gui/qt/menus.cpp:437 -msgid "Plu&gins and extensions" -msgstr "প্লাগইনবোৰ আৰু সম্প্ৰসাৰণবোৰ" - -#: modules/gui/qt/menus.cpp:442 -msgid "Customi&ze Interface..." -msgstr "ইন্টাৰফেছৰ ব্যৱস্থা কৰক..." - -#: modules/gui/qt/menus.cpp:445 -msgid "&Preferences" -msgstr "পছন্দবোৰ" - -#: modules/gui/qt/menus.cpp:466 -msgid "&View" -msgstr "&দৃশ্য" - -#: modules/gui/qt/menus.cpp:487 -msgid "Play&list" -msgstr "প্লেলিষ্ট" - -#: modules/gui/qt/menus.cpp:488 -msgid "Ctrl+L" -msgstr "কোন্ট্ৰল+L" - -#: modules/gui/qt/menus.cpp:491 -msgid "Docked Playlist" -msgstr "প্লেলিষ্ট ডক কৰক" - -#: modules/gui/qt/menus.cpp:501 -msgid "Always on &top" -msgstr "" - -#: modules/gui/qt/menus.cpp:509 -msgid "Mi&nimal Interface" -msgstr "নূন্যতম ইন্টাৰফেছ" - -#: modules/gui/qt/menus.cpp:510 -msgid "Ctrl+H" -msgstr "কোন্ট্ৰল+H" - -#: modules/gui/qt/menus.cpp:519 -msgid "&Fullscreen Interface" -msgstr "সম্পূৰ্ণ দৃশ্যৰ ইন্টাৰফেছ" - -#: modules/gui/qt/menus.cpp:527 -msgid "&Advanced Controls" -msgstr "উন্নত নিয়ন্ত্ৰণবোৰ" - -#: modules/gui/qt/menus.cpp:534 -msgid "Status Bar" -msgstr "স্থিতি বাৰ" - -#: modules/gui/qt/menus.cpp:539 -msgid "Visualizations selector" -msgstr "দৃশ্যবোৰৰ নিৰ্বাচক" - -#: modules/gui/qt/menus.cpp:597 -msgid "&Increase Volume" -msgstr "প্ৰসাৰ বঢ়াওক" - -#: modules/gui/qt/menus.cpp:600 -msgid "D&ecrease Volume" -msgstr "" - -#: modules/gui/qt/menus.cpp:603 -msgid "&Mute" -msgstr "নিস্তব্দ কৰক" - -#: modules/gui/qt/menus.cpp:619 -msgid "Audio &Device" -msgstr "অডিঅ' ডিভাইচ" - -#: modules/gui/qt/menus.cpp:623 -msgid "Audio &Track" -msgstr "অডিঅ' পথ" - -#: modules/gui/qt/menus.cpp:625 -msgid "&Stereo Mode" -msgstr "ষ্টেৰিঅ'ৰ ধৰণ" - -#: modules/gui/qt/menus.cpp:628 -msgid "&Visualizations" -msgstr "দৃশ্যবোৰ" - -#: modules/gui/qt/menus.cpp:654 -msgid "Add &Subtitle File..." -msgstr "উপশিৰোনাম ফাইল যোগ কৰক..." - -#: modules/gui/qt/menus.cpp:656 -msgid "Sub &Track" -msgstr "উপ পথ" - -#: modules/gui/qt/menus.cpp:678 -msgid "Video &Track" -msgstr "ভিডিঅ' পথ" - -#: modules/gui/qt/menus.cpp:682 -msgid "&Fullscreen" -msgstr "সম্পূৰ্ণ দৃশ্য" - -#: modules/gui/qt/menus.cpp:683 -msgid "Always Fit &Window" -msgstr "সদায় উইণ্ডো খাপ খুৱাওক" - -#: modules/gui/qt/menus.cpp:684 -msgid "Set as Wall&paper" -msgstr "ৱালপেপাৰ হিচাপে ছেট কৰক" - -#: modules/gui/qt/menus.cpp:688 -msgid "&Zoom" -msgstr "জুম কৰক" - -#: modules/gui/qt/menus.cpp:689 -msgid "&Aspect Ratio" -msgstr "&দৃষ্টিকোণৰ অনুপাত" - -#: modules/gui/qt/menus.cpp:690 -msgid "&Crop" -msgstr "ক্ৰোপ" - -#: modules/gui/qt/menus.cpp:694 -msgid "&Deinterlace" -msgstr "ডিইন্টাৰলেচ" - -#: modules/gui/qt/menus.cpp:695 -msgid "&Deinterlace mode" -msgstr "ডিইন্টাৰলেচৰ ধৰণ" - -#: modules/gui/qt/menus.cpp:699 -msgid "Take &Snapshot" -msgstr "স্নেপশ্বট লওক" - -#: modules/gui/qt/menus.cpp:718 -msgid "T&itle" -msgstr "শিৰোনাম" - -#: modules/gui/qt/menus.cpp:719 -msgid "&Chapter" -msgstr "পাঠ" - -#: modules/gui/qt/menus.cpp:721 -msgid "&Program" -msgstr "কাৰ্যসূচী" - -#: modules/gui/qt/menus.cpp:725 -msgid "&Manage" -msgstr "পৰিচালনা কৰক" - -#: modules/gui/qt/menus.cpp:791 -msgid "Check for &Updates..." -msgstr "আপডেটবোৰৰ বাবে পৰীক্ষা কৰক..." - -#: modules/gui/qt/menus.cpp:838 -msgid "&Stop" -msgstr "বন্ধ কৰক" - -#: modules/gui/qt/menus.cpp:846 -msgid "Pre&vious" -msgstr "আগৰ" - -#: modules/gui/qt/menus.cpp:852 -msgid "Ne&xt" -msgstr "পৰৱৰ্তী" - -#: modules/gui/qt/menus.cpp:870 -msgid "Sp&eed" -msgstr "গতি" - -#: modules/gui/qt/menus.cpp:876 -msgid "&Faster" -msgstr "খৰতকীয়া" - -#: modules/gui/qt/menus.cpp:888 -msgid "N&ormal Speed" -msgstr "স্বাভাৱিক গতি" - -#: modules/gui/qt/menus.cpp:898 -msgid "Slo&wer" -msgstr "মন্থৰ" - -#: modules/gui/qt/menus.cpp:913 -msgid "&Jump Forward" -msgstr "আগলৈ জপিয়াওক" - -#: modules/gui/qt/menus.cpp:920 -msgid "Jump Bac&kward" -msgstr "পিছলৈ জপিয়াওক" - -#: modules/gui/qt/menus.cpp:927 -msgid "Ctrl+T" -msgstr "কোন্ট্ৰল+T" - -#: modules/gui/qt/menus.cpp:942 -msgid "Open &Network..." -msgstr "নেটৱৰ্ক খোলক..." - -#: modules/gui/qt/menus.cpp:1036 -msgid "Leave Fullscreen" -msgstr "সম্পূৰ্ণ স্ক্ৰীন ত্যাগ কৰক" - -#: modules/gui/qt/menus.cpp:1070 -msgid "&Playback" -msgstr "প্লেবেক" - -#: modules/gui/qt/menus.cpp:1175 -msgid "&Hide VLC media player in taskbar" -msgstr "টাস্কবাৰত VLC মিডিয়া প্লেয়াৰ লুকুৱাওক" - -#: modules/gui/qt/menus.cpp:1181 -msgid "Sho&w VLC media player" -msgstr "VLC মিডিয়া প্লেয়াৰ দেখুৱাওক" - -#: modules/gui/qt/menus.cpp:1192 -msgid "&Open Media" -msgstr "মিডিয়া খোলক" - -#: modules/gui/qt/menus.cpp:1622 -msgid "&Clear" -msgstr "খালী কৰক" - -#: modules/gui/qt/menus.cpp:1630 -msgid "&Renderer" -msgstr "" - -#: modules/gui/qt/menus.cpp:1634 -msgid "" -msgstr "" - -#: modules/gui/qt/menus.cpp:1647 -msgid "Scanning..." -msgstr "" - -#: modules/gui/qt/qt.cpp:81 -msgid "Show advanced preferences over simple ones" -msgstr "সাধাৰণ এটাৰ ওপৰত উন্নত পছন্দবোৰ দেখুৱাওক" - -#: modules/gui/qt/qt.cpp:82 -msgid "" -"Show advanced preferences and not simple preferences when opening the " -"preferences dialog." -msgstr "" -"উন্নত পছন্দবোৰ দেখুৱাওক আৰু সাধাৰণ পছন্দবোৰ নেদেখুৱাব যেতিয়া পছন্দবোৰৰ সংলাপটো খোলে." - -#: modules/gui/qt/qt.cpp:86 modules/gui/skins2/src/skin_main.cpp:499 -msgid "Systray icon" -msgstr "ছিষ্ট্ৰে আইকন" - -#: modules/gui/qt/qt.cpp:87 -msgid "" -"Show an icon in the systray allowing you to control VLC media player for " -"basic actions." -msgstr "" -"প্ৰাথমিক কাৰ্যবোৰৰ বাবে VLC মিডিয়া প্লেয়াৰ নিয়ন্ত্ৰণ কৰিবলৈ আপোনাক অনুমতি দিয়া " -"ছিছষ্ট্ৰেটোত আইকন এটা দেখুৱাওক." - -#: modules/gui/qt/qt.cpp:91 -msgid "Start VLC with only a systray icon" -msgstr "কেৱল এটা ছিষ্ট্ৰে আইকনৰ সৈতে VLC আৰম্ভ কৰক" - -#: modules/gui/qt/qt.cpp:92 -msgid "VLC will start with just an icon in your taskbar." -msgstr "" - -#: modules/gui/qt/qt.cpp:101 -msgid "Show playing item name in window title" -msgstr "উইণ্ডো শিৰোনামত চলোৱা বস্তু দেখুৱাওক" - -#: modules/gui/qt/qt.cpp:102 -msgid "Show the name of the song or video in the controller window title." -msgstr "নিয়ন্ত্ৰক উইণ্ডো শিৰোনামটোত গান বা ভিডিঅ'টোৰ নামটো দেখুৱাওক." - -#: modules/gui/qt/qt.cpp:105 -msgid "Show notification popup on track change" -msgstr "পথ সলনিত জাননীৰ প'পআপ দেখুৱাওক" - -#: modules/gui/qt/qt.cpp:107 -msgid "" -"Show a notification popup with the artist and track name when the current " -"playlist item changes, when VLC is minimized or hidden." -msgstr "" -"প্ৰাথমিক কাৰ্যবোৰৰ বাবে VLC মিডিয়া প্লেয়াৰ নিয়ন্ত্ৰণ কৰিবলৈ আপোনাক অনুমতি দিয়া " -"ছিছষ্ট্ৰেটোত আইকন এটা দেখুৱাওক." - -#: modules/gui/qt/qt.cpp:110 -msgid "Windows opacity between 0.1 and 1" -msgstr "0.1 আৰু 1 মাজত উইণ্ডোবোৰৰ অস্বচ্ছতা" - -#: modules/gui/qt/qt.cpp:111 -msgid "" -"Sets the windows opacity between 0.1 and 1 for main interface, playlist and " -"extended panel. This option only works with Windows and X11 with composite " -"extensions." -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/qt/qt.cpp:116 -msgid "Fullscreen controller opacity between 0.1 and 1" -msgstr "0.1 আৰু 1 ৰ মাজত সম্পূৰ্ণদৃশ্য নিয়ন্ত্ৰকৰ অস্বচ্ছতা" - -#: modules/gui/qt/qt.cpp:117 -msgid "" -"Sets the fullscreen controller opacity between 0.1 and 1 for main interface, " -"playlist and extended panel. This option only works with Windows and X11 " -"with composite extensions." -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/qt/qt.cpp:122 -msgid "Show unimportant error and warnings dialogs" -msgstr "অপ্ৰয়োজনীয় ভুল আৰু সতৰ্কীকৰণবোৰৰ সংলাপবোৰ দেখুৱাওক" - -#: modules/gui/qt/qt.cpp:124 -msgid "Activate the updates availability notification" -msgstr "আপডেটবোৰৰ উপলব্ধ জাননীটো সক্ৰিয় কৰক" - -#: modules/gui/qt/qt.cpp:125 -msgid "" -"Activate the automatic notification of new versions of the software. It runs " -"once every two weeks." -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/qt/qt.cpp:128 -msgid "Number of days between two update checks" -msgstr "দুটা আপডেট পৰীক্ষাৰ মাজৰ দিনবোৰৰ সংখ্যা" - -#: modules/gui/qt/qt.cpp:130 -msgid "Ask for network policy at start" -msgstr "আৰম্ভ কৰিবলৈ নেটৱৰ্ক নীতিৰ বাবে সোধক" - -#: modules/gui/qt/qt.cpp:132 -msgid "Save the recently played items in the menu" -msgstr "অলপতে চলোৱা বস্তুটো তালিকাত ছেভ কৰক" - -#: modules/gui/qt/qt.cpp:134 -msgid "List of words separated by | to filter" -msgstr "ফিল্টাৰ কৰিবলৈ | ৰ দ্বাৰা পৃথক কৰা শব্দবোৰৰ তালিকা" - -#: modules/gui/qt/qt.cpp:135 -msgid "" -"Regular expression used to filter the recent items played in the player." -msgstr "" - -#: modules/gui/qt/qt.cpp:138 -msgid "Define the colors of the volume slider" -msgstr "" - -#: modules/gui/qt/qt.cpp:139 -msgid "" -"Define the colors of the volume slider\n" -"By specifying the 12 numbers separated by a ';'\n" -"Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n" -"An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255'" -msgstr "" - -#: modules/gui/qt/qt.cpp:144 -msgid "Selection of the starting mode and look" -msgstr "" - -#: modules/gui/qt/qt.cpp:145 -msgid "" -"Start VLC with:\n" -" - normal mode\n" -" - a zone always present to show information as lyrics, album arts...\n" -" - minimal mode with limited controls" -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/qt/qt.cpp:151 -msgid "Show a controller in fullscreen mode" -msgstr "সম্পূৰ্ণদৃশ্য ধৰণত নিয়ন্ত্ৰক এটা দেখুৱাওক" - -#: modules/gui/qt/qt.cpp:152 -msgid "Embed the file browser in open dialog" -msgstr "খোলা সংলাপটোত ফাইল ব্ৰাউজাৰটো সংলগ্ন কৰক" - -#: modules/gui/qt/qt.cpp:154 -msgid "Define which screen fullscreen goes" -msgstr "কোনখন স্ক্ৰীনৰ সম্পূৰ্ণদৃশ্য যায় বাখ্যা কৰক" - -#: modules/gui/qt/qt.cpp:155 -msgid "Screennumber of fullscreen, instead of same screen where interface is." -msgstr "" - -#: modules/gui/qt/qt.cpp:158 -msgid "Load extensions on startup" -msgstr "আৰম্ভণিত সম্প্ৰসাৰণবোৰ লোড কৰক" - -#: modules/gui/qt/qt.cpp:159 -msgid "Automatically load the extensions module on startup." -msgstr "" - -#: modules/gui/qt/qt.cpp:162 -msgid "Start in minimal view (without menus)" -msgstr "নূন্যতম দৃশ্যত আৰম্ভ কৰক (তালিকাবোৰ অবিহনে)" - -#: modules/gui/qt/qt.cpp:164 -msgid "Display background cone or art" -msgstr "পটভূমিৰ কোণ বা চিত্ৰ প্ৰদৰ্শন কৰক" - -#: modules/gui/qt/qt.cpp:165 -msgid "" -"Display background cone or current album art when not playing. Can be " -"disabled to prevent burning screen." -msgstr "" -"পটভূমিৰ কোণ বা চলিত এলবামৰ চিত্ৰ প্ৰদৰ্শন কৰক যেতিয়া নচলায়. স্ক্ৰীন বাৰ্ণ হোৱাটো " -"বাধা দিবলৈ অক্ষম কৰিব পাৰি." - -#: modules/gui/qt/qt.cpp:168 -msgid "Expanding background cone or art" -msgstr "" - -#: modules/gui/qt/qt.cpp:169 -msgid "Background art fits window's size." -msgstr "" - -#: modules/gui/qt/qt.cpp:171 -msgid "Ignore keyboard volume buttons." -msgstr "কীবোৰ্ড প্ৰসাৰ বাটনবোৰ অৱজ্ঞা কৰক." - -#: modules/gui/qt/qt.cpp:173 -msgid "" -"With this option checked, the volume up, volume down and mute buttons on " -"your keyboard will always change your system volume. With this option " -"unchecked, the volume buttons will change VLC's volume when VLC is selected " -"and change the system volume when VLC is not selected." -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/qt/qt.cpp:188 -msgid "When to raise the interface" -msgstr "" - -#: modules/gui/qt/qt.cpp:189 -msgid "" -"This option allows the interface to be raised automatically when a video/" -"audio playback starts, or never." -msgstr "" - -#: modules/gui/qt/qt.cpp:192 -msgid "Fullscreen controller mouse sensitivity" -msgstr "সম্পূৰ্ণদৃশ্য নিয়ন্ত্ৰক মাউছ সংবেদশীলতা" - -#: modules/gui/qt/qt.cpp:200 -msgid "When minimized" -msgstr "যেতিয়া সৰু কৰে" - -#: modules/gui/qt/qt.cpp:218 -msgid "Qt interface" -msgstr "Qt ইন্টাৰফেছ" - -#: modules/gui/qt/util/customwidgets.cpp:82 -msgid "errors" -msgstr "ভুলবোৰ" - -#: modules/gui/qt/util/customwidgets.cpp:83 -msgid "warnings" -msgstr "সতৰ্কীকৰণবোৰ" - -#: modules/gui/qt/util/customwidgets.cpp:84 -msgid "debug" -msgstr "ডিবাগ কৰক" - -#: modules/gui/qt/util/searchlineedit.cpp:49 -msgctxt "Tooltip|Clear" -msgid "Clear" -msgstr "" - -#: modules/gui/skins2/src/dialogs.cpp:212 -msgid "Open a skin file" -msgstr "স্কিন ফাইল এটা খোলক" - -#: modules/gui/skins2/src/dialogs.cpp:213 -msgid "Skin files |*.vlt;*.wsz;*.xml" -msgstr "স্কিন ফাইলবোৰ |*.vlt;*.wsz;*.xml" - -#: modules/gui/skins2/src/dialogs.cpp:221 -msgid "Playlist Files |" -msgstr "" - -#: modules/gui/skins2/src/dialogs.cpp:221 -msgid "|All Files |*" -msgstr "" - -#: modules/gui/skins2/src/dialogs.cpp:222 -msgid "Open playlist" -msgstr "প্লেলিষ্ট খোলক" - -#: modules/gui/skins2/src/dialogs.cpp:230 -msgid "Save playlist" -msgstr "প্লেলিষ্ট ছেভ কৰক" - -#: modules/gui/skins2/src/dialogs.cpp:230 -msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html" -msgstr "" - -#: modules/gui/skins2/src/skin_main.cpp:494 -msgid "Skin to use" -msgstr "ব্যৱহাৰ কৰিবলৈ স্কিন" - -#: modules/gui/skins2/src/skin_main.cpp:495 -msgid "Path to the skin to use." -msgstr "ব্যৱহাৰ কৰিবলৈ স্কিনলৈ পথ." - -#: modules/gui/skins2/src/skin_main.cpp:496 -msgid "Config of last used skin" -msgstr "অন্তিমবাৰ ব্যৱহাৰ কৰা স্কিনৰ ৰূপৰেখা" - -#: modules/gui/skins2/src/skin_main.cpp:497 -msgid "" -"Windows configuration of the last skin used. This option is updated " -"automatically, do not touch it." -msgstr "" -"অন্তিমবাৰ ব্যৱহাৰ কৰা স্কিনৰ উইণ্ডোজ ৰূপৰেখা. এই বিকল্পটো স্বয়ংক্ৰিয়ভাৱে আপডেট কৰা " -"হয়, এইটো স্পৰ্শ নকৰিব." - -#: modules/gui/skins2/src/skin_main.cpp:500 -msgid "Show a systray icon for VLC" -msgstr "VLC ৰ বাবে ছিষ্ট্ৰে আইকন এটা দেখুৱাওক" - -#: modules/gui/skins2/src/skin_main.cpp:501 -#: modules/gui/skins2/src/skin_main.cpp:502 -msgid "Show VLC on the taskbar" -msgstr "টাস্কবাৰটোত VLC দেখুৱাওক" - -#: modules/gui/skins2/src/skin_main.cpp:503 -msgid "Enable transparency effects" -msgstr "স্বচ্ছতাৰ প্ৰভৱবোৰ সক্ষম কৰক" - -#: modules/gui/skins2/src/skin_main.cpp:504 -msgid "" -"You can disable all transparency effects if you want. This is mainly useful " -"when moving windows does not behave correctly." -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/skins2/src/skin_main.cpp:507 -#: modules/gui/skins2/src/skin_main.cpp:508 -msgid "Use a skinned playlist" -msgstr "স্কিন কৰা প্লেলিষ্ট এখন ব্যৱহাৰ কৰক" - -#: modules/gui/skins2/src/skin_main.cpp:509 -msgid "Display video in a skinned window if any" -msgstr "এখন স্কিন কৰা উইণ্ডোত ভিডিঅ' প্ৰদৰ্শন কৰক যদি আছে" - -#: modules/gui/skins2/src/skin_main.cpp:511 -msgid "" -"When set to 'no', this parameter is intended to give old skins a chance to " -"play back video even though no video tag is implemented" -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/gui/skins2/src/skin_main.cpp:536 -msgid "Skinnable Interface" -msgstr "স্কিন কৰিব পৰা ইন্টাৰফেছ" - -#: modules/gui/skins2/src/theme_repository.cpp:58 -msgid "Select skin" -msgstr "স্কিন নিৰ্বাচন কৰক" - -#: modules/gui/skins2/src/theme_repository.cpp:116 -msgid "Open skin..." -msgstr "" - -#: modules/hw/d3d11/d3d11_filters.c:86 modules/hw/d3d9/d3d9_filters.c:68 -#: modules/video_filter/adjust.c:61 -msgid "Brightness threshold" -msgstr "উজ্জ্বলতাৰ থ্ৰেছহল্ড" - -#: modules/hw/d3d11/d3d11_filters.c:87 modules/hw/d3d9/d3d9_filters.c:69 -#: modules/video_filter/adjust.c:62 -msgid "" -"When this mode is enabled, pixels will be shown as black or white. The " -"threshold value will be the brightness defined below." -msgstr "" -"যেতিয়া এই ধৰণটো সক্ষম কৰে, পিক্সেলবোৰ কলা বা বগাৰ দৰে দেখুওৱা হব. থ্ৰেছহল্ড " -"মানবোৰ তলত দিয়াৰ দৰে উজ্জ্বল হব লাগে." - -#: modules/hw/d3d11/d3d11_filters.c:90 modules/hw/d3d9/d3d9_filters.c:72 -#: modules/video_filter/adjust.c:65 -msgid "Image contrast (0-2)" -msgstr "ছবিৰ প্ৰভেদ (0-2)" - -#: modules/hw/d3d11/d3d11_filters.c:91 modules/hw/d3d9/d3d9_filters.c:73 -#: modules/video_filter/adjust.c:66 -msgid "Set the image contrast, between 0 and 2. Defaults to 1." -msgstr "0 আৰু 2 ৰ মাজত ছবিৰ প্ৰভেদটো ছেট কৰক. ডিফল্টবোৰ 1 লৈ." - -#: modules/hw/d3d11/d3d11_filters.c:92 modules/hw/d3d9/d3d9_filters.c:74 -msgid "Image hue (0-360)" -msgstr "ছবিৰ হিউ (0-360)" - -#: modules/hw/d3d11/d3d11_filters.c:93 modules/hw/d3d9/d3d9_filters.c:75 -msgid "Set the image hue, between 0 and 360. Defaults to 0." -msgstr "ছবিৰ হিউ ছেট কৰক, 0 আৰু 360 ৰ মাজত. 0 লৈ ডিফল্টবোৰ." - -#: modules/hw/d3d11/d3d11_filters.c:94 modules/hw/d3d9/d3d9_filters.c:76 -#: modules/video_filter/adjust.c:69 -msgid "Image saturation (0-3)" -msgstr "ছবি চেচুৰেশ্বন (0-3)" - -#: modules/hw/d3d11/d3d11_filters.c:95 modules/hw/d3d9/d3d9_filters.c:77 -#: modules/video_filter/adjust.c:70 -msgid "Set the image saturation, between 0 and 3. Defaults to 1." -msgstr "0 আৰু 3 ৰ মাজত ছবি চেচুৰেশ্বনটো ছেট কৰক. 1 লৈ ডিফল্ট কৰে." - -#: modules/hw/d3d11/d3d11_filters.c:96 modules/hw/d3d9/d3d9_filters.c:78 -#: modules/video_filter/adjust.c:71 -msgid "Image brightness (0-2)" -msgstr "ছবিৰ উজ্জ্বলতা (0-2)" - -#: modules/hw/d3d11/d3d11_filters.c:97 modules/hw/d3d9/d3d9_filters.c:79 -#: modules/video_filter/adjust.c:72 -msgid "Set the image brightness, between 0 and 2. Defaults to 1." -msgstr "0 আৰু 2 ৰ মাজত ছবিৰ উজ্জ্বলতাবোৰ ছেট কৰক. ডিফল্টবোৰ 1 লৈ." - -#: modules/hw/d3d11/d3d11_filters.c:98 modules/hw/d3d9/d3d9_filters.c:80 -#: modules/video_filter/adjust.c:73 -msgid "Image gamma (0-10)" -msgstr "ছবি গামা (0-10)" - -#: modules/hw/d3d11/d3d11_filters.c:99 modules/hw/d3d9/d3d9_filters.c:81 -#: modules/video_filter/adjust.c:74 -msgid "Set the image gamma, between 0.01 and 10. Defaults to 1." -msgstr "0.01 আৰু 10 ৰ মাজত ছবিৰ গামা ছেট কৰক. ডিফল্টবোৰ 1 লৈ." - -#: modules/hw/d3d11/d3d11_filters.c:670 -#, fuzzy -msgid "AMD VQ Enhancer" -msgstr "ষ্টেৰিঅ’ বৃদ্ধি কৰ্তা" - -#: modules/hw/d3d11/d3d11_filters.c:671 -msgid "amf_vqenhancer" -msgstr "" - -#: modules/hw/d3d9/d3d9_filters.c:454 -msgid "Direct3D9 adjust filter" -msgstr "" - -#: modules/hw/mmal/codec.c:51 -msgid "Decode frames directly into RPI VideoCore instead of host memory." -msgstr "Decode frames directly into RPI VideoCore instead of host memory." - -#: modules/hw/mmal/codec.c:52 -msgid "" -"Decode frames directly into RPI VideoCore instead of host memory. This " -"option must only be used with the MMAL video output plugin." -msgstr "" -"হষ্ট স্মৃতিৰ পৰিৱৰ্তে RPI ভিডিঅ' মুখ্যলৈ ফ্ৰেমবোৰ প্ৰত্যক্ষভাৱে ডিকোড কৰক. এই বিকল্পটো " -"কেৱল MMAL ভিডিঅ' আউটপুট প্লাগইনটোৰ সৈতে ব্যৱহাৰ কৰাটো অপৰিহাৰ্য." - -#: modules/hw/mmal/codec.c:58 -msgid "MMAL decoder" -msgstr "MMAL ডিকোডাৰ" - -#: modules/hw/mmal/codec.c:59 -msgid "MMAL-based decoder plugin for Raspberry Pi" -msgstr "ৰাস্পবেৰী Pi ৰ বাবে MMAL-আধাৰিত ডিকোডাৰ" - -#: modules/hw/mmal/deinterlace.c:45 -msgid "Use QPUs for advanced HD deinterlacing." -msgstr "" - -#: modules/hw/mmal/deinterlace.c:46 -msgid "" -"Make use of the QPUs to allow higher quality deinterlacing of HD content." -msgstr "" - -#: modules/hw/mmal/deinterlace.c:52 -msgid "MMAL deinterlace" -msgstr "" - -#: modules/hw/mmal/deinterlace.c:53 -msgid "MMAL-based deinterlace filter plugin" -msgstr "" - -#: modules/hw/mmal/vout.c:50 -msgid "VideoCore layer where the video is displayed." -msgstr "ভিডিঅ' মুখ্য স্তৰটো যত ভিডিঅ'টো প্ৰদৰ্শন কৰা হয়." - -#: modules/hw/mmal/vout.c:51 -msgid "" -"VideoCore layer where the video is displayed. Subpictures are displayed " -"directly above and a black background directly below." -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/hw/mmal/vout.c:54 -msgid "Blank screen below video." -msgstr "" - -#: modules/hw/mmal/vout.c:55 -msgid "Render blank screen below video. Increases VideoCore load." -msgstr "" - -#: modules/hw/mmal/vout.c:59 modules/hw/mmal/vout.c:60 -msgid "Adjust HDMI refresh rate to the video." -msgstr "ভিডিঅ'টোলৈ HDMI পুনৰ সজীৱৰ হাৰ মিলাওক." - -#: modules/hw/mmal/vout.c:63 -msgid "Force interlaced video mode." -msgstr "" - -#: modules/hw/mmal/vout.c:64 -msgid "" -"Force the HDMI output into an interlaced video mode for interlaced video " -"content." -msgstr "" - -#: modules/hw/mmal/vout.c:75 -msgid "MMAL vout" -msgstr "MMAL vআউট" - -#: modules/hw/mmal/vout.c:76 -msgid "MMAL-based vout plugin for Raspberry Pi" -msgstr "ৰেছবেৰী Pi ৰ বাবে MMAL-আধাৰিত vআউট প্লাগইন" - -#: modules/hw/vaapi/filters.c:1185 -msgid "VAAPI filters" -msgstr "" - -#: modules/hw/vaapi/filters.c:1186 -msgid "Video Accelerated API filters" -msgstr "" - -#: modules/hw/vdpau/adjust.c:187 -msgid "VDPAU adjust video filter" -msgstr "VDPAU মিলোৱা ভিডিঅ' ফিল্টাৰ" - -#: modules/hw/vdpau/avcodec.c:222 -msgid "VDPAU video decoder" -msgstr "VDPAU ভিডিঅ' ডিকোডাৰ" - -#: modules/hw/vdpau/chroma.c:883 -msgid "Temporal-spatial" -msgstr "সাময়িক-স্পাশ্বিয়েল" - -#: modules/hw/vdpau/chroma.c:887 modules/hw/vdpau/display.c:45 -msgid "VDPAU" -msgstr "VDPAU" - -#: modules/hw/vdpau/chroma.c:888 -msgid "VDPAU surface conversions" -msgstr "VDPAU পৃষ্ঠ ৰূপান্তৰণবোৰ" - -#: modules/hw/vdpau/chroma.c:896 -msgid "Deinterlacing algorithm" -msgstr "ডিইন্টাৰলেচ কৰা এলগোৰিথম" - -#: modules/hw/vdpau/chroma.c:899 -msgid "Inverse telecine" -msgstr "ওলোটা টেলিছাই" - -#: modules/hw/vdpau/chroma.c:901 -msgid "Deinterlace chroma skip" -msgstr "ক্ৰোমা এৰি যোৱাটো ডিইন্টাৰলেচ কৰক" - -#: modules/hw/vdpau/chroma.c:902 -msgid "Whether temporal deinterlacing applies to luma only" -msgstr "কেৱল লুমালৈ সাময়িক ডিইন্টাৰলেচিং প্ৰয়োগ কৰে নে" - -#: modules/hw/vdpau/chroma.c:904 -msgid "Noise reduction level" -msgstr "হুলস্থূল হ্ৰাসৰ স্তৰ" - -#: modules/hw/vdpau/chroma.c:906 -msgid "Scaling quality" -msgstr "জোখাৰ মানদণ্ড" - -#: modules/hw/vdpau/chroma.c:906 -msgid "High quality scaling level" -msgstr "উচ্চ মানদণ্ডৰ জোখাৰ স্তৰ" - -#: modules/hw/vdpau/deinterlace.c:134 -msgid "VDPAU deinterlacing filter" -msgstr "VDPAU ডিইন্টাৰলেচিং ফিল্টাৰ" - -#: modules/hw/vdpau/display.c:46 -msgid "VDPAU output" -msgstr "VDPAU আউটপুট" - -#: modules/hw/vdpau/sharpen.c:143 -msgid "VDPAU sharpen video filter" -msgstr "VDPAU তীক্ষ্ন ভিডিঅ' ফিল্টাৰ" - -#: modules/keystore/file.c:54 -msgid "File keystore (plaintext)" -msgstr "" - -#: modules/keystore/file.c:55 -msgid "Secrets are stored on a file without any encryption" -msgstr "" - -#: modules/keystore/file.c:65 -msgid "Crypt keystore" -msgstr "" - -#: modules/keystore/file.c:66 -msgid "Secrets are stored encrypted on a file" -msgstr "" - -#: modules/keystore/keychain.m:41 -msgid "No" -msgstr "" - -#: modules/keystore/keychain.m:41 -msgid "Any" -msgstr "" - -#: modules/keystore/keychain.m:47 -msgid "System default" -msgstr "" - -#: modules/keystore/keychain.m:48 -msgid "After first unlock" -msgstr "" - -#: modules/keystore/keychain.m:49 -msgid "After first unlock, on this device only" -msgstr "" - -#: modules/keystore/keychain.m:51 -msgid "When passcode set, on this device only" -msgstr "" - -#: modules/keystore/keychain.m:52 -msgid "Always, on this device only" -msgstr "" - -#: modules/keystore/keychain.m:53 -msgid "When unlocked" -msgstr "" - -#: modules/keystore/keychain.m:54 -msgid "When unlocked, on this device only" -msgstr "" - -#: modules/keystore/keychain.m:57 -msgid "Synchronize stored items" -msgstr "" - -#: modules/keystore/keychain.m:58 -msgid "" -"Synchronizes stored items via iCloud Keychain if enabled in the user domain." -msgstr "" - -#: modules/keystore/keychain.m:60 -msgid "Accessibility type for all future passwords saved to the Keychain" -msgstr "" - -#: modules/keystore/keychain.m:62 -msgid "Keychain access group" -msgstr "" - -#: modules/keystore/keychain.m:63 -msgid "Keychain access group as defined by the app entitlements." -msgstr "" - -#: modules/keystore/keychain.m:109 -msgid "Keychain keystore" -msgstr "" - -#: modules/keystore/keychain.m:110 -msgid "Keystore for iOS, Mac OS X and tvOS" -msgstr "" - -#: modules/keystore/kwallet.c:48 -msgid "KWallet keystore" -msgstr "" - -#: modules/keystore/kwallet.c:49 -msgid "Secrets are stored via KWallet" -msgstr "" - -#: modules/keystore/memory.c:41 -msgid "Memory keystore" -msgstr "" - -#: modules/keystore/memory.c:42 -msgid "Secrets are stored in memory" -msgstr "" - -#: modules/keystore/secret.c:39 -msgid "libsecret keystore" -msgstr "" - -#: modules/keystore/secret.c:40 -msgid "Secrets are stored via libsecret" -msgstr "" - -#: modules/logger/android.c:85 -msgid "Android log" -msgstr "" - -#: modules/logger/android.c:86 -msgid "Android log using logcat" -msgstr "" - -#: modules/logger/console.c:147 -msgid "Be quiet" -msgstr "শান্ত হওক" - -#: modules/logger/console.c:148 -msgid "Turn off all messages on the console." -msgstr "" - -#: modules/logger/console.c:151 -msgid "Console log" -msgstr "" - -#: modules/logger/console.c:152 -msgid "Console logger" -msgstr "" - -#: modules/logger/file.c:193 -msgid "HTML" -msgstr "" - -#: modules/logger/file.c:203 -msgid "Info" -msgstr "" - -#: modules/logger/file.c:203 -msgid "Debug" -msgstr "" - -#: modules/logger/file.c:205 -msgid "Log to file" -msgstr "ফাইললৈ ল'গ কৰক" - -#: modules/logger/file.c:206 -msgid "Log all VLC messages to a text file." -msgstr "টেক্সট ফাইল এটালৈ সকলোবোৰ VLC বাৰ্তা ল'গ কৰক." - -#: modules/logger/file.c:208 -msgid "Log filename" -msgstr "ফাইল নাম ল'গ কৰক" - -#: modules/logger/file.c:209 -msgid "Specify the log filename." -msgstr "ল'গ ফাইলনামটো নিৰ্ধাৰণ কৰক." - -#: modules/logger/file.c:211 -msgid "Log format" -msgstr "ল'গ ফৰমেট" - -#: modules/logger/file.c:212 -msgid "Specify the logging format." -msgstr "লগিং ফৰমেটটো নিৰ্দিষ্ট কৰক." - -#: modules/logger/file.c:214 -msgid "Verbosity" -msgstr "ভাৰ্বোছিটি" - -#: modules/logger/file.c:215 -msgid "" -"Select the logging verbosity or default to use the same verbosity given by --" -"verbose." -msgstr "" - -#: modules/logger/file.c:219 -msgid "Logger" -msgstr "" - -#: modules/logger/file.c:220 -msgid "File logger" -msgstr "" - -#: modules/logger/journal.c:77 -msgid "Journal" -msgstr "" - -#: modules/logger/journal.c:78 -msgid "SystemD journal logger" -msgstr "" - -#: modules/logger/syslog.c:138 -msgid "System log (syslog)" -msgstr "" - -#: modules/logger/syslog.c:139 -msgid "Emit log messages through the POSIX system log." -msgstr "" - -#: modules/logger/syslog.c:141 -msgid "Debug messages" -msgstr "" - -#: modules/logger/syslog.c:142 -msgid "Include debug messages in system log." -msgstr "" - -#: modules/logger/syslog.c:144 -msgid "Identity" -msgstr "" - -#: modules/logger/syslog.c:145 -msgid "Process identity in system log." -msgstr "" - -#: modules/logger/syslog.c:147 -msgid "Facility" -msgstr "" - -#: modules/logger/syslog.c:148 -msgid "System logging facility." -msgstr "" - -#: modules/logger/syslog.c:151 -msgid "syslog" -msgstr "" - -#: modules/logger/syslog.c:152 -msgid "System logger (syslog)" -msgstr "" - -#: modules/lua/extension.c:1194 -msgid "Extension not responding!" -msgstr "" - -#: modules/lua/extension.c:1195 -#, c-format -msgid "" -"Extension '%s' does not respond.\n" -"Do you want to kill it now? " -msgstr "" - -#: modules/lua/libs/httpd.c:75 -msgid "" -"

Password for Web interface has not been set.

Please use --http-" -"password, or set a password in

Preferences > All > Main " -"interfaces > Lua > Lua HTTP > Password.

" -msgstr "" -"আউটপুট ফাইলটো ইতিমধ্যে বৰ্তি আছে. যদি ৰেকৰ্ডি অব্যাহত থাকে, তেন্তে ফাইলটো অভাৰৰাইড " -"কৰা হব আৰু ইয়াৰ উপাদনবোৰ হেৰাব." - -#: modules/lua/vlc.c:49 -msgid "Lua interface" -msgstr "লুৱা ইন্টাৰফেছ" - -#: modules/lua/vlc.c:50 -msgid "Lua interface module to load" -msgstr "লোড কৰিবলৈ লুৱা ইন্টাৰফেছ মডুল" - -#: modules/lua/vlc.c:52 -msgid "Lua interface configuration" -msgstr "লুৱা ইন্টাৰফেছ ৰূপৰেখাকৰণ" - -#: modules/lua/vlc.c:53 -msgid "" -"Lua interface configuration string. Format is: '[\"\"] = {