handbrake: Update to 1.3.1

Changelog:
HandBrake 1.3.1
All platforms
General

    Fixed potential crash when opening a DVD source

Video

    Fixed rotation/flip not working properly in some cases
    Fixed an issue with QSV failures when using --start-at
    Updated presets using x265 to set aq-mode 1, the default prior to HandBrake 1.3.0
    Improved AMD VCE rate control by always explicitly setting the rate control method
    Added a workaround to fix x265 not parsing the H.265 Level setting where localized
    Added an upstream patch to fix x265 limit-tu bug in loading co-located CU's TU depth
    Added an upstream patch to fix x265 2-pass encoding failure
    Added an upstream patch to fix x265 VBV macroblocking at end of final GOP

Audio

    Fixed importing older presets where "und" was used to select any language track
        Since HandBrake 1.3.0, "any" selects any language track and "und" selects undefined language tracks only
    Fixed secondary audio tracks on Blu-ray sources not being detected in some cases

Subtitles

    Fixed importing older presets where "und" was used to select any language track
        Since HandBrake 1.3.0, "any" selects any language track and "und" selects undefined language tracks only

Build system

    Fixed cpp and lib flags causing build failures on some Linux systems

Third-party libraries

    Updated libraries
        FFmpeg 4.2.2 (decoding and filters)

Linux

    Fixed UI translations not working in some cases
    Fixed display of chapter start times
    Fixed small memory leak in audio list

Mac

    Fixed importing external ASS/SSA subtitles
    Fixed statistics not updating after queue completion
    Updated documentation link to the most recent documentation version

Windows

    Fixed missing UI translations for some languages
        Español (Spanish)
        Français (French)
        한국어 (Korean)
        русский (Russian)
        Türkçe (Turkish)
    Fixed official presets not updating after installing a new release
    Fixed preference for automatically naming file extension MP4/M4V not working
    Fixed an issue preventing the use of relative paths for automatic naming
    Fixed audio and subtitles selection behavior not saving when set via the Save New Preset dialog
    Fixed closed captions not being added automatically per selection behavior
    Fixed iPod 5G support option displaying when an incompatible encoder is selected
    Fixed queue updating slowly or not updating in some cases
    Fixed a few UI issues and a crash with the new dark theme.
    Fixed window not restoring properly after minimizing to system tray
    Fixed frame rate mode not updating on video codec change, preventing QSV zero-copy mode



HandBrake 1.3.0
All platforms
General

    HandBrake is now translated into many more languages
    Redesigned queue UI
    Removed Windows Mobile presets
        See the list of compatible replacements on GitHub
    Improved log output by silencing many lines at standard log level
    Improved quality of Gmail presets slightly
    Added Playstation 2160p60 4K Surround preset (supports PS4 Pro)
    Added Discord and Discord Nitro presets

Video

    Updated Intel Quick Sync Video to use Direct3D 11 API
    Updated minimum title scan duration to only apply to disc-based sources like Blu-ray and DVD
    Improved detection of MPEG-1 video in program streams
    Improved interface to FFmpeg avfilter and color handling
    Improved Nvidia NVENC constant quality encoding slightly by not setting qmin and qmax
    Replaced pp7 Deblock filter with FFmpeg Deblock filter
    Added support for reading Ultra HD Blu-ray discs (without copy protection)
    Added support for reading AV1 via libdav1d
    Added encoding to WebM container format
    Added Chroma Smooth filter (CLI only)
    Added zero-copy path for Intel QSV encoding removed in a previous release
    Added support for Intel QSV low power encoding (lowpower=1)
    Added support for AMD VCE encoding on Linux via Vulkan
    Added ability to select x265 encoder level and Fast Decode tune

Audio

    Updated audio resampling code to use FFmpeg swresample instead of libsamplerate
    Added source audio bit rate to tracks list
    Added ability to select unknown language tracks
    Added automatic track name pass through

Subtitles

    Added ability to import external SSA/ASS subtitles
    Added ability to select unknown language tracks
    Added automatic track name pass through

Command line interface

    Added additional unit aliases to --start-at and --stop-at, notably seconds and frames

Build system

    HandBrake now builds with libnuma on Linux
    Fixed Python bytestrings causing newlines to be ignored in build output
    Fixed Xcode ignoring make jobs parameter and utilizing all CPU cores (macOS only)
    Updated configure to enable most hardware encoders by default where appropriate by platform
    Updated all scripts for compatibility with Python 3
    Updated mac-toolchain-build script with newer tool versions many improvements
    Updated mingw-w64-build script with mingw-w64 6.0.0, GCC 9.2, and many improvements
    Improved compatibility with GCC 9 and recent Clang releases
    Improved compatibility with recent Xcode releases (macOS only)
    Improved host/build semantics
    Improved namespace isolation
    Improved handling of all options passed to configure
    Improved configure help output
    Improved detection of missing executable dependencies during configure
    Added support for building on NetBSD
    Added --harden configure parameter to enable buffer overflow protections
    Added --sandbox configure parameter to enable sandbox build target on macOS
    Added --enable-gtk4 configure parameter to build with GTK 4 instead of GTK 3
    Added summary of build options to configure output
    Miscellaneous bug fixes and improvements

Third-party libraries

    Removed libraries
        libsamplerate (audio resampling)
    Updated libraries
        AMF 1.4.9 (AMD VCE encoding)
        bzip2 1.0.8 (general)
        FDK AAC 2.0.1 (AAC audio encoding, must compile from source)
        FFmpeg 4.2.1 (decoding and filters)
        FreeType 2.10.1 (subtitles)
        Fribidi 1.0.7 (subtitles)
        HarfBuzz 2.6.4 (subtitles)
        Jansson 2.12 (JSON architecture)
        libbluray 1.1.2 (Blu-ray decoding)
        libdav1d 0.5.1 (AV1 decoding)
        libdvdnav 6.0.1 (DVD decoding)
        libdvdread 6.0.2 (DVD decoding)
        libiconv 1.16 (character encoding support)
        libmfx (Intel QSV support)
        libogg 1.3.4 (Xiph codecs support)
        libopus 1.3.1 (Opus audio encoding)
        libvorbis 1.3.6 (Vorbis audio encoding)
        libvpx 1.8.1 (VP8/VP9 video encoding)
        libxml2 2.9.9 (general)
        nv-codec-headers 9.0.18.1 (Nvidia NVENC encoding)
        x265 3.2.1 (H.265/HEVC video encoding)

Linux

    Fixed slider control not showing complete values
    Updated translations (levels of completeness vary):
        Czech
        Chinese
        French
        German
        Italian
        Japanese
        Korean
        Norwegian
        Russian
        Spanish
        Thai
    Added translations (levels of completeness vary):
        Afrikaans
        Basque
        Croatian
        Dutch
        Polish
        Portuguese
        Romanian
        Slovak
        Swedish
        Turkish
        Ukrainian
    Added Intel QSV support to Flatpak (requires additional plugin installation)
    Added ability to double-click to edit audio track settings
    Added options to open encode log and log directory to actions menu on queue window
    Miscellaneous bug fixes and improvements

Mac

    HandBrake now requires OS X 10.11 El Capitan or later
    HandBrake is now sandboxed and uses the macOS hardened runtime
    Updated priority for low-priority threads on macOS to avoid potential stalls in future macOS
    Updated translations:
        German
    Added translations:
        French
        Italian
        Russian
    Added preference to disable preview image on summary tab
    Miscellaneous bcently used to fallback to parent directory
    Improved preferences layout
    Improved auto naming collision behavior and file overwriting
    Added preference to test selected notification sound
    Added preference to perform when done action immmediace safety measures
        Encoding jobs automatically pause when battery level is low, system sleep is allowed, and jobs resume when power is restored
        Encoding jobs automatically pause when disk space drops to critical levels
    Added translatioovements

10 files changed, 91 insertions, 177 deletions

diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index e75ff78a7eb..147c9e11f2f 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2020/01/26 17:31:46 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2020/02/12 13:54:56 ryoon Exp $
 #
 
-DISTNAME=	HandBrake-1.2.2-source
+DISTNAME=	HandBrake-1.3.1-source
 PKGNAME=	${DISTNAME:tl:S/-source//}
-PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://download.handbrake.fr/releases/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,12 +15,12 @@ LICENSE=	gnu-gpl-v2
 DIST_SUBDIR=	handbrake
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-CDISTFILES=	ffmpeg-4.1.tar.bz2 \
-		libbluray-1.0.2.tar.bz2 \
-		libdvdnav-6.0.0.tar.bz2 \
-		libdvdread-6.0.0.tar.bz2 \
-		libvpx-1.7.0.tar.gz \
-		x265_2.9.tar.gz
+CDISTFILES=	ffmpeg-4.2.2.tar.bz2 \
+		libbluray-1.1.2.tar.bz2 \
+		libdvdnav-6.0.1.tar.bz2 \
+		libdvdread-6.0.2.tar.bz2 \
+		x265_3.2.1.tar.gz \
+		dav1d-0.5.1.tar.bz2
 DISTFILES+=	${CDISTFILES}
 
 .for f in ${CDISTFILES}
@@ -42,6 +41,10 @@ USE_TOOLS+=	autoconf automake aclocal autoreconf m4
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 
+TOOL_DEPENDS+=	gettext-tools-[0-9]*:../../devel/gettext-tools
+_TOOLS_USE_PKGSRC.msgfmt=	yes
+USE_BUILTIN.gettext=		no
+
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
@@ -82,8 +85,11 @@ post-extract:
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/libass/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../multimedia/x264-devel/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/multimedia/handbrake/PLIST b/multimedia/handbrake/PLIST
index 9edee4d8453..d1220a1fff4 100644
--- a/multimedia/handbrake/PLIST
+++ b/multimedia/handbrake/PLIST
@@ -1,21 +1,31 @@
-@comment $NetBSD: PLIST,v 1.3 2019/03/01 23:51:48 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/02/12 13:54:56 ryoon Exp $
 bin/HandBrakeCLI
 bin/ghb
 share/applications/fr.handbrake.ghb.desktop
 share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg
 share/icons/hicolor/scalable/apps/hb-icon.svg
+share/locale/af/LC_MESSAGES/ghb.mo
 share/locale/cs/LC_MESSAGES/ghb.mo
 share/locale/da/LC_MESSAGES/ghb.mo
 share/locale/de/LC_MESSAGES/ghb.mo
 share/locale/es/LC_MESSAGES/ghb.mo
+share/locale/eu/LC_MESSAGES/ghb.mo
 share/locale/fr/LC_MESSAGES/ghb.mo
-share/locale/it_IT/LC_MESSAGES/ghb.mo
-share/locale/ja_JP/LC_MESSAGES/ghb.mo
+share/locale/hr/LC_MESSAGES/ghb.mo
+share/locale/it/LC_MESSAGES/ghb.mo
+share/locale/ja/LC_MESSAGES/ghb.mo
 share/locale/ko/LC_MESSAGES/ghb.mo
+share/locale/nl/LC_MESSAGES/ghb.mo
 share/locale/no/LC_MESSAGES/ghb.mo
+share/locale/pl/LC_MESSAGES/ghb.mo
+share/locale/pt/LC_MESSAGES/ghb.mo
 share/locale/pt_BR/LC_MESSAGES/ghb.mo
-share/locale/ro_RO/LC_MESSAGES/ghb.mo
+share/locale/ro/LC_MESSAGES/ghb.mo
 share/locale/ru/LC_MESSAGES/ghb.mo
+share/locale/sk/LC_MESSAGES/ghb.mo
+share/locale/sv/LC_MESSAGES/ghb.mo
 share/locale/th/LC_MESSAGES/ghb.mo
+share/locale/tr/LC_MESSAGES/ghb.mo
+share/locale/uk_UA/LC_MESSAGES/ghb.mo
 share/locale/zh_CN/LC_MESSAGES/ghb.mo
 share/metainfo/fr.handbrake.ghb.appdata.xml
diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo
index 4d9168428d5..6cc5fd67286 100644
--- a/multimedia/handbrake/distinfo
+++ b/multimedia/handbrake/distinfo
@@ -1,40 +1,32 @@
-$NetBSD: distinfo,v 1.7 2019/03/01 23:51:48 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2020/02/12 13:54:56 ryoon Exp $
 
-SHA1 (handbrake/HandBrake-1.2.2-source.tar.bz2) = 100e2b6a240b5743b4e31a2bee32986f791b516b
-RMD160 (handbrake/HandBrake-1.2.2-source.tar.bz2) = 82a72774f993feb3628eff7f164e308a17e6251b
-SHA512 (handbrake/HandBrake-1.2.2-source.tar.bz2) = 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
-Size (handbrake/HandBrake-1.2.2-source.tar.bz2) = 18010777 bytes
-SHA1 (handbrake/ffmpeg-4.1.tar.bz2) = dbbecc574c0a57687271165a618353d4ddbd8cfa
-RMD160 (handbrake/ffmpeg-4.1.tar.bz2) = 0baa9ea7abc780a3093bffadd0291676ea5c7f7b
-SHA512 (handbrake/ffmpeg-4.1.tar.bz2) = ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417
-Size (handbrake/ffmpeg-4.1.tar.bz2) = 10687291 bytes
-SHA1 (handbrake/libbluray-1.0.2.tar.bz2) = 025ef1c0a25b42f4a13a9fb2df09fc9cef1a821b
-RMD160 (handbrake/libbluray-1.0.2.tar.bz2) = 37ac4f42277f7feb79ee9b99c5d4870b1e4bfddf
-SHA512 (handbrake/libbluray-1.0.2.tar.bz2) = e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b
-Size (handbrake/libbluray-1.0.2.tar.bz2) = 733058 bytes
-SHA1 (handbrake/libdvdnav-6.0.0.tar.bz2) = 09be41ff1b4e83465eb27528ba6c8325e8f054b0
-RMD160 (handbrake/libdvdnav-6.0.0.tar.bz2) = 0b972d4bb872135f8b6c206163373ee9b4454ea7
-SHA512 (handbrake/libdvdnav-6.0.0.tar.bz2) = 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
-Size (handbrake/libdvdnav-6.0.0.tar.bz2) = 369605 bytes
-SHA1 (handbrake/libdvdread-6.0.0.tar.bz2) = 5a01d1e6196a6ceff363455951e3682b231a3b78
-RMD160 (handbrake/libdvdread-6.0.0.tar.bz2) = 0560ca14836495f8028e504827e23c135590183b
-SHA512 (handbrake/libdvdread-6.0.0.tar.bz2) = b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
-Size (handbrake/libdvdread-6.0.0.tar.bz2) = 394627 bytes
-SHA1 (handbrake/libvpx-1.7.0.tar.gz) = fb3d4b80596d1e3b1a7f53757d63e7d2b3eeb7c9
-RMD160 (handbrake/libvpx-1.7.0.tar.gz) = 3af78fbfad1c3a2398054c6cf6df626216b67160
-SHA512 (handbrake/libvpx-1.7.0.tar.gz) = 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
-Size (handbrake/libvpx-1.7.0.tar.gz) = 2679797 bytes
-SHA1 (handbrake/nv-codec-headers-8.1.24.2.tar.gz) = d500263b2fd92a32ac383ac87762648ecf8d325b
-RMD160 (handbrake/nv-codec-headers-8.1.24.2.tar.gz) = 50efbad1155bfebfb2fe340ed6dd88ddfb5b8aac
-SHA512 (handbrake/nv-codec-headers-8.1.24.2.tar.gz) = daa45ae8bcc11eb6b8d671c2d720d5c3edce9e4ef68f913ed25a8c4d1a4b165e0576b03eff9ce2fe355156ab5a5d8d74573158ef190feec5cfb5ac0838e0caa7
-Size (handbrake/nv-codec-headers-8.1.24.2.tar.gz) = 53627 bytes
-SHA1 (handbrake/x265_2.9.tar.gz) = 3c005b4ab409c6f996b36ad88d780ff85fbc9abf
-RMD160 (handbrake/x265_2.9.tar.gz) = ea6772ec426c141eb1756cdf6bb2def3d6319f47
-SHA512 (handbrake/x265_2.9.tar.gz) = 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
-Size (handbrake/x265_2.9.tar.gz) = 1385848 bytes
-SHA1 (patch-contrib_libbluray_P02-netbsd-configure.patch) = 00faf70aa66f15936a833aa22f9e656265143d69
-SHA1 (patch-libhb_fifo.c) = 4644cd76e40dd9969136516a532bad86ab0d1df1
-SHA1 (patch-libhb_module.defs) = 237c0e86ac2ced0c8266c88403506bcf0e8d6bde
-SHA1 (patch-make_configure.py) = eed0c1f7ce970d0bd57883612f130e30f323f816
-SHA1 (patch-make_include_main.defs) = a605c6d45d3b7d9f5f55873a5a7f3a483d49d65d
-SHA1 (patch-make_variant_netbsd.defs) = aa8e1c8dc51b7c426426e671970253a1ad05c98f
+SHA1 (handbrake/HandBrake-1.3.1-source.tar.bz2) = 213da9cebb19215d6e7ea49ac390ecc9cb6c749f
+RMD160 (handbrake/HandBrake-1.3.1-source.tar.bz2) = 2e586c8dae9d4a8b7c2fcb036fcdbff62f5c26d6
+SHA512 (handbrake/HandBrake-1.3.1-source.tar.bz2) = b713c70155feff765fb21e201e1c1599c970bf56581584281d883e57046409731cb663c11ee8ea2c141ba75852746be81d6db813f2d481b72429e53c89d584d2
+Size (handbrake/HandBrake-1.3.1-source.tar.bz2) = 16815767 bytes
+SHA1 (handbrake/dav1d-0.5.1.tar.bz2) = 03f6b1ceeb543caf783c6bb2c17e9790802277c8
+RMD160 (handbrake/dav1d-0.5.1.tar.bz2) = 2193f5f242573b1cc52afb7b6b1558aae019211e
+SHA512 (handbrake/dav1d-0.5.1.tar.bz2) = 2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b
+Size (handbrake/dav1d-0.5.1.tar.bz2) = 548584 bytes
+SHA1 (handbrake/ffmpeg-4.2.2.tar.bz2) = 77c9724bde4c6e3ef21ab954c0572ac45e61c3e5
+RMD160 (handbrake/ffmpeg-4.2.2.tar.bz2) = 170a0ab4f45f54e1473d906a01dac81ef113c3b8
+SHA512 (handbrake/ffmpeg-4.2.2.tar.bz2) = 6920bf2efb6ed665ea84c31ff3b28a0e9dc0ba3e0c8dfe4ceee4d8b8172328334490a28dbac93b0f9839d0c90ea588cb79141d88bdd3bf4bbf43fd22deb6a5e6
+Size (handbrake/ffmpeg-4.2.2.tar.bz2) = 10953320 bytes
+SHA1 (handbrake/libbluray-1.1.2.tar.bz2) = 3885c0d0bd0f04a3a372ceec3a01a44a7624f272
+RMD160 (handbrake/libbluray-1.1.2.tar.bz2) = bbfea1093f9fc5ea089cf5860e55e020b916a4b0
+SHA512 (handbrake/libbluray-1.1.2.tar.bz2) = 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7
+Size (handbrake/libbluray-1.1.2.tar.bz2) = 745779 bytes
+SHA1 (handbrake/libdvdnav-6.0.1.tar.bz2) = 258b82156e13803f2b0dbaec74e15475b4341d2f
+RMD160 (handbrake/libdvdnav-6.0.1.tar.bz2) = b546e77983eee3b0c842aa98f77c131d96132714
+SHA512 (handbrake/libdvdnav-6.0.1.tar.bz2) = 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
+Size (handbrake/libdvdnav-6.0.1.tar.bz2) = 378491 bytes
+SHA1 (handbrake/libdvdread-6.0.2.tar.bz2) = a3d4b85cbe52b11cff7587ed010fa38ce512fd95
+RMD160 (handbrake/libdvdread-6.0.2.tar.bz2) = 811f3199acabd487edce8741060e6499b53deb68
+SHA512 (handbrake/libdvdread-6.0.2.tar.bz2) = e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
+Size (handbrake/libdvdread-6.0.2.tar.bz2) = 405298 bytes
+SHA1 (handbrake/x265_3.2.1.tar.gz) = 0bd4889ff3ad596372ce2338f2d896947a2eec53
+RMD160 (handbrake/x265_3.2.1.tar.gz) = 7386c00a49a2fc143cd3c8cea657872235a8ba77
+SHA512 (handbrake/x265_3.2.1.tar.gz) = 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568
+Size (handbrake/x265_3.2.1.tar.gz) = 1426255 bytes
+SHA1 (patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch) = c3ecbaa85bfc23021fd8474774a710f1e9068a18
+SHA1 (patch-libhb_fifo.c) = 46c5ec1f2c665da297830c326e703160e3e911d2
diff --git a/multimedia/handbrake/patches/patch-contrib_libbluray_P02-netbsd-configure.patch b/multimedia/handbrake/patches/patch-contrib_libbluray_P02-netbsd-configure.patch
deleted file mode 100644
index d799b861b8f..00000000000
--- a/multimedia/handbrake/patches/patch-contrib_libbluray_P02-netbsd-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-contrib_libbluray_P02-netbsd-configure.patch,v 1.1 2019/03/01 23:51:48 ryoon Exp $
-
-* Fix internal libbluray build on NetBSD. See file name of this patch.
-
---- contrib/libbluray/P02-netbsd-configure.patch.orig	2019-03-01 15:01:26.529238549 +0000
-+++ contrib/libbluray/P02-netbsd-configure.patch
-@@ -0,0 +1,13 @@
-+--- libbluray-1.0.2/configure.orig	2017-12-04 00:27:38.000000000 +0900
-++++ libbluray-1.0.2/configure	2018-04-09 20:47:19.504645000 +0900
-+@@ -14,6 +14,10 @@
-+ ## M4sh Initialization. ##
-+ ## -------------------- ##
-+
-++if test `uname` = 'NetBSD' ; then
-++  ln -s linux/jni_md.h jni/jni_md.h
-++fi
-++
-+ # Be more Bourne compatible
-+ DUALCASE=1; export DUALCASE # for MKS sh
-+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
diff --git a/multimedia/handbrake/patches/patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch b/multimedia/handbrake/patches/patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch
new file mode 100644
index 00000000000..7019a7b8479
--- /dev/null
+++ b/multimedia/handbrake/patches/patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch
@@ -0,0 +1,27 @@
+$NetBSD: patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch,v 1.1 2020/02/12 13:54:56 ryoon Exp $
+
+* Fix segafult on recent NetBSD-current.
+
+--- contrib/libbluray/P04-netbsd-pthread_equal-check.patch.orig	2020-02-11 08:09:40.072157575 +0000
++++ contrib/libbluray/P04-netbsd-pthread_equal-check.patch
+@@ -0,0 +1,20 @@
++--- libbluray/src/util/mutex.c.orig	2019-06-07 18:00:28.000000000 +0000
+++++ libbluray/src/util/mutex.c
++@@ -89,7 +89,7 @@ static int _mutex_init(MUTEX_IMPL *p)
++ 
++ static int _mutex_lock(MUTEX_IMPL *p)
++ {
++-    if (pthread_equal(p->owner, pthread_self())) {
+++    if (p->owner == pthread_self()) {
++         /* recursive lock */
++         p->lock_count++;
++         return 0;
++@@ -108,7 +108,7 @@ static int _mutex_lock(MUTEX_IMPL *p)
++ 
++ static int _mutex_unlock(MUTEX_IMPL *p)
++ {
++-    if (!pthread_equal(p->owner, pthread_self())) {
+++    if (!(p->owner == pthread_self())) {
++         BD_DEBUG(DBG_BLURAY|DBG_CRIT, "bd_mutex_unlock(): not owner !\n");
++         return -1;
++     }
diff --git a/multimedia/handbrake/patches/patch-libhb_fifo.c b/multimedia/handbrake/patches/patch-libhb_fifo.c
index 487280de4d6..8812d8e9f3e 100644
--- a/multimedia/handbrake/patches/patch-libhb_fifo.c
+++ b/multimedia/handbrake/patches/patch-libhb_fifo.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-libhb_fifo.c,v 1.1 2019/03/01 23:51:48 ryoon Exp $
+$NetBSD: patch-libhb_fifo.c,v 1.2 2020/02/12 13:54:56 ryoon Exp $
 
-* NetBSD has no memalign
+* On NetBSD malloc() is defined in stdlib.h.
 
---- libhb/fifo.c.orig	2019-02-22 16:23:51.000000000 +0000
+--- libhb/fifo.c.orig	2020-01-04 16:28:06.000000000 +0000
 +++ libhb/fifo.c
-@@ -13,7 +13,7 @@
+@@ -16,7 +16,7 @@
  #endif
  
  #ifndef SYS_DARWIN
@@ -13,30 +13,3 @@ $NetBSD: patch-libhb_fifo.c,v 1.1 2019/03/01 23:51:48 ryoon Exp $
  #include <stdlib.h>
  #else
  #include <malloc.h>
-@@ -395,7 +395,7 @@ hb_buffer_t * hb_buffer_init_internal( i
- 
-     if (size)
-     {
--#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW )
-+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW ) || defined(__NetBSD__)
-         b->data  = malloc( b->alloc );
- #elif defined( SYS_CYGWIN )
-         /* FIXME */
-@@ -821,7 +821,7 @@ hb_image_t * hb_image_init(int pix_fmt, 
-     {
-         return NULL;
-     }
--#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW )
-+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW ) || defined(__NetBSD__)
-     image->data  = malloc(size);
- #elif defined( SYS_CYGWIN )
-     /* FIXME */
-@@ -862,7 +862,7 @@ hb_image_t * hb_buffer_to_image(hb_buffe
- {
-     hb_image_t *image = calloc(1, sizeof(hb_image_t));
- 
--#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW )
-+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW ) || defined(__NetBSD__)
-     image->data  = malloc( buf->size );
- #elif defined( SYS_CYGWIN )
-     /* FIXME */
diff --git a/multimedia/handbrake/patches/patch-libhb_module.defs b/multimedia/handbrake/patches/patch-libhb_module.defs
deleted file mode 100644
index 37fac2e2c00..00000000000
--- a/multimedia/handbrake/patches/patch-libhb_module.defs
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-libhb_module.defs,v 1.1 2019/03/01 23:51:48 ryoon Exp $
-
-* Use includes from pkgsrc
-
---- libhb/module.defs.orig	2019-02-22 16:23:51.000000000 +0000
-+++ libhb/module.defs
-@@ -51,6 +51,9 @@ LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB
- ifeq ($(BUILD.system),freebsd)
-     LIBHB.GCC.I += $(LOCALBASE)/include
-     LIBHB.GCC.I += $(LOCALBASE)/include/libxml2
-+else ifeq ($(BUILD.system),netbsd)
-+    LIBHB.GCC.I += $(LOCALBASE)/include
-+    LIBHB.GCC.I += $(LOCALBASE)/include/libxml2
- else ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
-     LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
- else
diff --git a/multimedia/handbrake/patches/patch-make_configure.py b/multimedia/handbrake/patches/patch-make_configure.py
deleted file mode 100644
index afce4be58c3..00000000000
--- a/multimedia/handbrake/patches/patch-make_configure.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-make_configure.py,v 1.1 2019/03/01 23:51:48 ryoon Exp $
-
-* Disable nvenc on NetBSD
-
---- make/configure.py.orig	2019-02-22 16:23:51.000000000 +0000
-+++ make/configure.py
-@@ -1327,7 +1327,7 @@ def createCLI():
-     grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' )
- 
-     h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h )
-+    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' ) or host.match( '*-*-netbsd*')), action='store_true', help=h )
- 
- 
-     cli.add_option_group( grp )
diff --git a/multimedia/handbrake/patches/patch-make_include_main.defs b/multimedia/handbrake/patches/patch-make_include_main.defs
deleted file mode 100644
index 4e4722b59e7..00000000000
--- a/multimedia/handbrake/patches/patch-make_include_main.defs
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-make_include_main.defs,v 1.1 2019/03/01 23:51:48 ryoon Exp $
-
-* Build GUI on NetBSD
-
---- make/include/main.defs.orig	2019-02-22 16:23:51.000000000 +0000
-+++ make/include/main.defs
-@@ -135,6 +135,11 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.syste
-     MODULES += gtk
- endif
- 
-+ifeq (1-netbsd,$(FEATURE.gtk)-$(BUILD.system))
-+    ## build gtk when gtk+netbsd
-+    MODULES += gtk
-+endif
-+
- ###############################################################################
- 
- MODULES += pkg
diff --git a/multimedia/handbrake/patches/patch-make_variant_netbsd.defs b/multimedia/handbrake/patches/patch-make_variant_netbsd.defs
deleted file mode 100644
index 8a6fa92d8ba..00000000000
--- a/multimedia/handbrake/patches/patch-make_variant_netbsd.defs
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-make_variant_netbsd.defs,v 1.1 2019/03/01 23:51:48 ryoon Exp $
-
-* Basic definitions for NetBSD
-
---- make/variant/netbsd.defs.orig	2019-03-01 13:37:26.511529480 +0000
-+++ make/variant/netbsd.defs
-@@ -0,0 +1,18 @@
-+# LOCALBASE is where NetBSD packages are installed. default is '/usr/pkg'.
-+LOCALBASE  ?= /usr/pkg
-+
-+TARGET.dylib.ext = .so
-+
-+GCC.D       = LIBICONV_PLUG
-+
-+GCC.args.dylib = -shared
-+GCC.args.pic   = 1
-+
-+GCC.args.g.none = -g0
-+GCC.args.g.min  = -g1
-+GCC.args.g.std  = -g2
-+GCC.args.g.max  = -g3
-+
-+GCC.MAJOR_VERSION = $(shell $(GCC.gcc) -dumpversion | cut -f 1 -d .)
-+GCC.LDFLAGS = 
-+LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(GCC.LDFLAGS), )