pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mpv: Remove, used to update multimedia/mpv



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Jan 1 16:50:41 2024 +0100
Changeset:	cd923d0ef3d36e781512e935d2496415008083f3

Modified Files:
	Makefile
Removed Files:
	mpv/COMMIT_MSG
	mpv/DESCR
	mpv/Makefile
	mpv/PLIST
	mpv/buildlink3.mk
	mpv/distinfo
	mpv/options.mk
	mpv/patches/patch-audio_out_ao__alsa.c
	mpv/patches/patch-etc_mpv.conf
	mpv/patches/patch-meson.build
	mpv/patches/patch-osdep_threads-posix.h
	mpv/patches/patch-stream_stream__libarchive.c
	mpv/patches/patch-video_out_drm__common.c

Log Message:
mpv: Remove, used to update multimedia/mpv

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd923d0ef3d36e781512e935d2496415008083f3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                      |   1 -
 mpv/COMMIT_MSG                                | 195 -----------------------
 mpv/DESCR                                     |   3 -
 mpv/Makefile                                  |  91 -----------
 mpv/PLIST                                     |  26 ----
 mpv/buildlink3.mk                             |  14 --
 mpv/distinfo                                  |  11 --
 mpv/options.mk                                | 215 --------------------------
 mpv/patches/patch-audio_out_ao__alsa.c        |  18 ---
 mpv/patches/patch-etc_mpv.conf                |  29 ----
 mpv/patches/patch-meson.build                 |  62 --------
 mpv/patches/patch-osdep_threads-posix.h       |  15 --
 mpv/patches/patch-stream_stream__libarchive.c |  17 --
 mpv/patches/patch-video_out_drm__common.c     |  16 --
 14 files changed, 713 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index f9a071cd47..039cfdbb8c 100644
--- a/Makefile
+++ b/Makefile
@@ -2289,7 +2289,6 @@ SUBDIR+=	mppdec
 SUBDIR+=	mppp
 SUBDIR+=	mpq-tools
 SUBDIR+=	mps-youtube
-SUBDIR+=	mpv
 SUBDIR+=	mpv-git
 SUBDIR+=	mrust
 SUBDIR+=	mrust-cargo
diff --git a/mpv/COMMIT_MSG b/mpv/COMMIT_MSG
deleted file mode 100644
index 324f57f491..0000000000
--- a/mpv/COMMIT_MSG
+++ /dev/null
@@ -1,195 +0,0 @@
-mpv: Update to 0.37.0
-
-pkgsrc changes:
-- Remove bits that were applied upstream in patch-osdep_threads-posix.h
-- Adjust patch-osdep_threads.c logic to patch-osdep_threads-posix.h
-- Add dependency to libplacebo (thanks to <wiz> for help in packaging!)
-
-Changes:
-0.37.0
-======
-This release requires FFmpeg 4.4 or newer and libplacebo 6.338.0 or
-newer.
-
-This is the first release to unconditionally require libplacebo, but
-note that the new improved renderer (vo_gpu_next) is not yet the
-default.
-
-Features
---------
-New
-~~~
-- ao_oss: add SPDIF passthrough support
-- hwtransfer: implement support for HW->HW format conversions
-- stream/dvbin: add support for delivery system ISDB-T
-- audio/chmap: support up to 64 channels (including 22.2 layout)
-- libmpv: add mpv_time_ns()
-- vo_gpu, vo_gpu_next: add Vulkan support for macOS
-- meson: make libplacebo a required dependency
-- hwdec: support videotoolbox hwdec with libplacebo
-
-Changed
-~~~~~~~
-- msg: print warning and error messages to stderr
-- options: restore old default subtitle selection behavior
-- input.conf: swap wheel up/down with wheel left/right
-
-Removed
-~~~~~~~
-- waf: remove waf as a build system
-- osc.lua: remove toggle for forced only subpictures (appeared as [F])
-- mac: remove runtime checks and compatibility for macOS older than 10.15
-- cocoa: remove deprecated OpenGL cocoa backend
-
-Options and Commands
---------------------
-Added
-~~~~~
-- vo_gpu_next: add --hdr-peak-percentile
-- player: add --term-remaining-playtime option
-- x11: add --x11-wid-title option
-- vo_gpu_next: add --libplacebo-opts
-- player: add --subs-match-os-language option (replaces 'auto' option)
-- vo: add --video-crop
-- win32: add --window-corners, --window-affinity, --title-bar, --backdrop-type
-- sub: add --sub-stretch-durations option
-
-Changed
-~~~~~~~
-- builtin.conf: add --hdr-peak-percentile=99.995 to gpu-hq profile
-- player: add 'always' option to --subs-fallback-forced
-- demux_playlist: default to --directory-mode=lazy
-- builtin.conf: add --allow-delayed-peak-detect=no to gpu-hq profile
-- vo_gpu, vo_gpu_next: support --icc-3dlut-size=auto
-- demux: prepend some cache options with --demuxer-
-- builtin.conf: modernize internal profiles for higher quality rendering by default,
-  rename 'gpu-hq' profile to 'high-quality', add 'fast' profile
-- vo_gpu, vo_gpu_next: default to dscale=hermite
-- builtin.conf: remove deprecated 'opengl-hq' profile
-- options: remove a bunch of old option fallbacks/deprecated ones
-- vo_gpu: allow --deband-iterations to be 0
-- stream_cdda: deprecate --cdda-toc-bias and always check for offsets
-- options: disable --allow-delayed-peak-detect by default
-- options: adjust default of --watch-later-options
-
-Deprecated
-~~~~~~~~~~
-- command: deprecate shared-script-properties
-- demux_cue: deprecate --demuxer-cue-codepage for --metadata-codepage
-
-Removed
-~~~~~~~
-- player: remove special 'auto' option from alang/slang/vlang (previous default)
-- vo_gpu: remove --tone-mapping-mode
-- vo_gpu: remove --scale-wblur, --scale-cutoff etc.
-- vo_gpu: remove --scaler-lut-size
-- m_option: drop support for -del for list options
-
-Fixes and Minor Enhancements
-----------------------------
-- build: remove unneeded libdl requirement for vaapi
-- zimg: fix abort on subsampled input with odd heights
-- video_writer: fix gamma for YUV screenshots
-- player/video: fix possible crash when changing lavfi-complex
-- ad_spdif: fix segfault due to early deallocation
-- ao_pipewire: fix race conditon with setting the media role
-- draw_bmp: fix overflowing coordinates in mark_rcs
-- ao_sndio: use sio_flush() to improve controls responsiveness
-- vo_vdpau: fix hwdec for this vo
-- vo_gpu, vo_gpu_next: fix setting an empty dscale
-- vd_lavc: repeatedly attempt to fallback if hwdec fails in reinit
-- options: fix relative time parsing on negative input
-- win32: signal DPI changes correctly
-- mp_image: properly infer color levels for some pixfmts
-- vo_gpu_next: add ability to use named hook params
-- vo_gpu_next: take into account PAR when taking screenshots
-- ao_audiotrack: support more channel layouts
-- osc.lua: support speed-independent time-remaining display
-- sub: fix switching tracks while paused
-- audio: fix clipping with gapless audio enabled
-- player/video: avoid spamming logs with EOF
-- player/command: detect aspect ratio name and show it in stats.lua
-- wayland: keyboard input fixes
-- demux_playlist: remove len restriction on headerless m3u
-- win32: fix display resolution calculation on mulitple monitors
-- vo_gpu_next: multiple adjustments and fixes to interpolation
-- loadfile: avoid infinite playlist loading loops
-- context_drm_egl: don't free EGL properties if they are null
-- x11: require xrandr 1.4, remove xinerama support
-- drm_common: skip cards that don't have connected outputs
-- win32_common: fixes minimized window being focused on launch
-- ao/jack: set device_buffer to JACK buffer size
-- meson: rename all features with underscores
-- input: add new keys: Back, Tools, ZoomIn, ZoomOut
-- win32: don't ignore --screen and --fs-screen
-- input: add missing keypad key defines and Windows multimedia keys
-- player: use audio pts corresponding to playing audio on EOF
-- command: add sub-ass-extradata property
-- vo_dmabuf_wayland: unmap osd surface when not needed
-- player: always write redirect entries for resuming playback
-- stats.lua: reorganize how video params are displayed
-- stats.lua: display HDR metadata
-- osc.lua: add scrolling to the seekbar
-- demux_lavf: prefer track durations over container durations to determine total
-- vo: vulkan: allow picking devices by UUID
-- video: allow overriding container crop if it is present
-- vo_gpu, vo_gpu_next, screenshot: support applying crop for screenshots
-- sd_lavc: account for floating point inaccuracy, fix sub PTS
-- stream: accept dav:// and davs:// urls
-- filter_kernels: refine some constants
-- filter_kernels: add ewa_lanczos4sharpest
-- osc.lua: add scrolling to audio/sub buttons
-- demux_mkv: support cropping and rotation
-- vo_dmabuf_wayland: support 90 degree rotations
-- filter_kernels: add hermite filter
-- vo: avoid unnecessary redraws when the OSD shows
-- scripting: support DLL cplugins
-- af_scaletempo2: various bug fixes
-- sdl_gamepad: fix button detection on modern controllers
-- vo_dmabuf_wayland: support osd rendering when there's no video
-- demux_playlist: add --directory-mode=auto
-- vo_gpu_next: use proper color for subtitles
-- win32: add an option to change window affinity and control title bar state
-- win32: reduce top border thickness to imitate DWM invisible borders
-- wayland: remove gnome-specific idle-inhibit warning
-- win32: pass window handle to the window-id property
-- osc.lua: fix calculation for slider's min-max average
-- recorder: fix a couple of memory leaks
-- af_scaletempo2: raise max playback rate to 8.0
-- osc.lua: move the idle logo behind other overlays
-- hwdec_drmprime: add nv16 support
-- various: change internal timing code to work in nanoseconds instead of microseconds
-- vo: increase display refresh rate estimation limit from 99 Hz to 400 Hz
-- external_files: base cover-art-whitelist on cover-art-auto-exts
-- path: don't override cache and state paths with --config-dir
-- codec_tags: map some more image mimetypes
-- af/vf-command: add ability to target a specific lavfi filter
-- win32: prevent white window flash on startup
-- demux_playlist: use --metacode-codepage when parsing playlist files
-- video: revert racey change that led to stutter and deadlocking
-- console.lua: various improvements
-- command: add playlist-next-playlist and playlist-prev-playlist
-- ytdl_hook.lua: set metadata with single tracks
-- defaults.lua: add a disabled parameter to timer constructors
-- terminal-unix: race condition fixes
-- af_scaletempo2: better defaults
-- hwtransfer: handle hwcontexts that don't implement frame constraints
-- stream_cdda: remove fallback for ancient libcdio versions
-- osdep: drop support for C11 without atomics
-- dvbin: do a big cleanup on code style and functions
-- ytdl_hook.lua: parse the separate cookies field
-- sub: update subtitles if current track is an image
-- javascript: use --js-memory-report option instead of MPV_LEAK_REPORT
-- ao_coreaudio: signal buffer underruns
-- ytdl_hook.lua: support thumbnails
-- demux: make hysteresis-secs respect cache-secs
-- mp_image: pass rotation correctly to/from AVFrame correctly
-- various: add new internal mp_thread abstraction and use it
-- drm: use present_sync mechanism for presentation feedback
-- vo_gpu: apply ICC profile and dithering only to window screenshots
-- audio: introduce ao_read_data_nonblocking() and use it in relevant backends
-- wayland: obey initial size hints set by the compositor
-- command: export storage aspect ratio (sar) properties
-- vo: delay vsync samples by at least 10 refreshes to improve convergence time
-- vo_sdl: fix broken mouse wheel multiplier
-- vo_gpu_next: simplify cache code and don't re-save when unmodified
diff --git a/mpv/DESCR b/mpv/DESCR
deleted file mode 100644
index 2e6447c68d..0000000000
--- a/mpv/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-mpv is a movie player based on MPlayer and mplayer2. It supports
-a wide variety of video file formats, audio and video codecs, and
-subtitle types.
diff --git a/mpv/Makefile b/mpv/Makefile
deleted file mode 100644
index e013bb0ff5..0000000000
--- a/mpv/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# $NetBSD: Makefile,v 1.162 2023/11/12 13:23:01 wiz Exp $
-
-DISTNAME=	mpv-0.37.0
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_GITHUB:=mpv-player/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-MAINTAINER=	leot%NetBSD.org@localhost
-HOMEPAGE=	https://mpv.io/
-COMMENT=	Video player based on MPlayer and mplayer2
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
-
-# needs sem_timedwait(3)
-NOT_FOR_PLATFORM=	NetBSD-[1-6].*-*
-
-# Requires support for c11 atomics.
-USE_CC_FEATURES+=	c11
-
-# Needed for rst2man
-TOOL_DEPENDS+=	${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
-
-MESON_ARGS+=	-Ddvdnav=enabled
-MESON_ARGS+=	-Dlibmpv=true
-
-# Support Wayland via SDL2, wayland support in mpv is too fast-moving.
-MESON_ARGS+=	-Dwayland=disabled
-
-USE_TOOLS+=	perl pkg-config
-
-MAKE_DIRS=		${PKG_SYSCONFDIR}/mpv
-INSTALLATION_DIRS=	share/examples/mpv
-CONF_FILES+=		share/examples/mpv/encoding-profiles.conf \
-			${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf
-CONF_FILES+=		share/examples/mpv/mpv.conf \
-			${PKG_SYSCONFDIR}/mpv/mpv.conf
-
-PKGCONFIG_OVERRIDE+=	libmpv/mpv.pc.in
-
-SUBST_CLASSES+=		python
-SUBST_SED.python+=	-e "s,python3,python${PYVERSSUFFIX},"
-SUBST_SED.python+=	-e "s,'rst2man','rst2man-${PYVERSSUFFIX}',"
-SUBST_FILES.python+=	meson.build
-SUBST_STAGE.python=	pre-configure
-SUBST_MESSAGE.python=	Fix python and rst2man command names.
-
-BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-version-script rm:-Wl,mpv.def
-
-CFLAGS.SunOS+=		-D__EXTENSIONS__
-LDFLAGS.SunOS+=		-lsocket
-
-.include "../../mk/bsd.prefs.mk"
-
-#
-# At some point this should be consolidated into mk/platform/Darwin.mk, it is
-# here temporarily while any issues are ironed out and it can be made generic
-# for Swift handling.
-#
-# On newer macOS releases there are a couple of swift compat static libraries
-# that need to be added to the search path.
-#
-.if ${OPSYS} == "Darwin"
-XCODE_DIR!=			xcode-select -p 2>/dev/null || ${TRUE}
-.  if exists(${XCODE_DIR}/usr/lib/swift/macosx)
-BUILDLINK_PASSTHRU_DIRS+=	${XCODE_DIR}/usr/lib/swift/macosx
-.  elif exists(${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx)
-BUILDLINK_PASSTHRU_DIRS+=	${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx
-.  endif
-.endif
-
-post-install:
-	${MV} ${DESTDIR}${PREFIX}/share/doc/mpv/mpv.conf \
-	    ${DESTDIR}${PREFIX}/share/examples/mpv/mpv.conf
-
-.include "options.mk"
-
-.include "../../devel/meson/build.mk"
-
-.include "../../archivers/libarchive/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/lcms2/buildlink3.mk"
-.include "../../lang/python/tool.mk"
-.include "../../multimedia/libass/buildlink3.mk"
-.include "../../multimedia/libdvdnav/buildlink3.mk"
-.include "../../multimedia/ffmpeg6/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../wip/libplacebo/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/atomic64.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mpv/PLIST b/mpv/PLIST
deleted file mode 100644
index c5a890e93d..0000000000
--- a/mpv/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2023/08/15 19:17:10 leot Exp $
-bin/mpv
-include/mpv/client.h
-include/mpv/render.h
-include/mpv/render_gl.h
-include/mpv/stream_cb.h
-lib/libmpv.so
-lib/libmpv.so.2
-lib/libmpv.so.2.2.0
-lib/pkgconfig/mpv.pc
-man/man1/mpv.1
-share/applications/mpv.desktop
-share/bash-completion/completions/mpv
-share/doc/mpv/input.conf
-share/doc/mpv/mplayer-input.conf
-share/doc/mpv/restore-old-bindings.conf
-share/examples/mpv/encoding-profiles.conf
-share/examples/mpv/mpv.conf
-share/icons/hicolor/128x128/apps/mpv.png
-share/icons/hicolor/16x16/apps/mpv.png
-share/icons/hicolor/32x32/apps/mpv.png
-share/icons/hicolor/64x64/apps/mpv.png
-share/icons/hicolor/scalable/apps/mpv.svg
-share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
-share/metainfo/mpv.metainfo.xml
-share/zsh/site-functions/_mpv
diff --git a/mpv/buildlink3.mk b/mpv/buildlink3.mk
deleted file mode 100644
index 450633a5c0..0000000000
--- a/mpv/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2023/08/14 05:24:56 wiz Exp $
-
-BUILDLINK_TREE+=	mpv
-
-.if !defined(MPV_BUILDLINK3_MK)
-MPV_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.mpv+=	mpv>=0.32.0nb13
-BUILDLINK_ABI_DEPENDS.mpv?=	mpv>=0.35.1nb6
-BUILDLINK_PKGSRCDIR.mpv?=	../../multimedia/mpv
-
-.endif	# MPV_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-mpv
diff --git a/mpv/distinfo b/mpv/distinfo
deleted file mode 100644
index 16a00d90d4..0000000000
--- a/mpv/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.80 2023/08/15 19:17:10 leot Exp $
-
-BLAKE2s (mpv-0.37.0.tar.gz) = 0406db57ea2b31c309f653af7ed61373ae2db6c63e8189a184bac159b7e52753
-SHA512 (mpv-0.37.0.tar.gz) = a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
-Size (mpv-0.37.0.tar.gz) = 3384190 bytes
-SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
-SHA1 (patch-etc_mpv.conf) = 9e41b2f4bf59c3bfc5ad84af05538661981ed111
-SHA1 (patch-meson.build) = 2ffcbb18391372b694af44d711c16d3d44f871c8
-SHA1 (patch-osdep_threads-posix.h) = 67900f0f14762a7ec7e2ee5fdcf57c32cbfe6b49
-SHA1 (patch-stream_stream__libarchive.c) = 2025f994b7f82cc868608ab7e8df0ae89b549922
-SHA1 (patch-video_out_drm__common.c) = 70eb8884f63e9456c0ffe592289cfd81e208955b
diff --git a/mpv/options.mk b/mpv/options.mk
deleted file mode 100644
index 897634b799..0000000000
--- a/mpv/options.mk
+++ /dev/null
@@ -1,215 +0,0 @@
-# $NetBSD: options.mk,v 1.35 2023/10/20 04:58:09 mrg Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.mpv
-
-
-PKG_OPTIONS_OPTIONAL_GROUPS=	gl
-PKG_OPTIONS_GROUP.gl=		opengl rpi
-
-# audio outputs
-PKG_SUPPORTED_OPTIONS+=		alsa jack openal pulseaudio
-# video outputs
-PKG_SUPPORTED_OPTIONS+=		caca libdrm sixel x11
-# audio/video outputs
-PKG_SUPPORTED_OPTIONS+=		sdl2
-# misc
-PKG_SUPPORTED_OPTIONS+=		bluray lua javascript
-
-PKG_SUGGESTED_OPTIONS=		bluray lua javascript sdl2 sixel
-PKG_SUGGESTED_OPTIONS.Linux+=	alsa pulseaudio
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${OPSYS} != "Darwin"
-PKG_SUGGESTED_OPTIONS+=		opengl x11
-.endif
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=		libdrm
-.endif
-
-.include "../../multimedia/libva/available.mk"
-
-.if ${VAAPI_AVAILABLE} == "yes"
-PKG_SUPPORTED_OPTIONS+=		vaapi
-PKG_SUGGESTED_OPTIONS+=		vaapi
-.endif
-
-.include "../../multimedia/libvdpau/available.mk"
-
-.if ${VDPAU_AVAILABLE} == "yes"
-PKG_SUPPORTED_OPTIONS+=		vdpau
-PKG_SUGGESTED_OPTIONS+=		vdpau
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-###
-### alsa support (audio output)
-###
-.if !empty(PKG_OPTIONS:Malsa)
-MESON_ARGS+=	-Dalsa=enabled
-.include "../../audio/alsa-lib/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dalsa=disabled
-.endif
-
-###
-### libbluray support
-###
-.if !empty(PKG_OPTIONS:Mbluray)
-MESON_ARGS+=	-Dlibbluray=enabled
-.include "../../multimedia/libbluray/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dlibbluray=disabled
-.endif
-
-###
-### caca support (video output)
-###
-.if !empty(PKG_OPTIONS:Mcaca)
-MESON_ARGS+=	-Dcaca=enabled
-.include "../../graphics/libcaca/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dcaca=disabled
-.endif
-
-###
-### lua support
-###
-.if !empty(PKG_OPTIONS:Mlua)
-MESON_ARGS+=	-Dlua=enabled
-LUA_VERSIONS_ACCEPTED=	52 51
-.include "../../lang/lua/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dlua=disabled
-.endif
-
-###
-### JACK support (audio output)
-###
-.if !empty(PKG_OPTIONS:Mjack)
-MESON_ARGS+=	-Djack=enabled
-.include "../../audio/jack/buildlink3.mk"
-.else
-MESON_ARGS+=	-Djack=disabled
-.endif
-
-
-###
-### OpenAL support (audio output)
-###
-.if !empty(PKG_OPTIONS:Mopenal)
-MESON_ARGS+=	-Dopenal=enabled
-.include "../../audio/openal-soft/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dopenal=disabled
-.endif
-
-###
-### PulseAudio support (audio output)
-###
-.if !empty(PKG_OPTIONS:Mpulseaudio)
-MESON_ARGS+=	-Dpulse=enabled
-.include "../../audio/pulseaudio/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dpulse=disabled
-.endif
-
-###
-### SDL2 support (audio and video output)
-###
-.if !empty(PKG_OPTIONS:Msdl2)
-MESON_ARGS+=	-Dsdl2-audio=enabled
-MESON_ARGS+=	-Dsdl2=enabled
-.include "../../devel/SDL2/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dsdl2-audio=disabled
-MESON_ARGS+=	-Dsdl2=disabled
-.endif
-
-###
-### VAAPI support (video output)
-###
-.if !empty(PKG_OPTIONS:Mvaapi)
-MESON_ARGS+=	-Dvaapi=enabled
-.include "../../multimedia/libva/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dvaapi=disabled
-.endif
-
-###
-### VDPAU support (video output)
-###
-.if !empty(PKG_OPTIONS:Mvdpau)
-MESON_ARGS+=	-Dvdpau=enabled
-.include "../../multimedia/libvdpau/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dvdpau=disabled
-.endif
-
-###
-### libdrm support (video output)
-###
-.if !empty(PKG_OPTIONS:Mlibdrm)
-MESON_ARGS+=	-Ddrm=enabled
-.include "../../x11/libdrm/buildlink3.mk"
-.else
-MESON_ARGS+=	-Ddrm=disabled
-.endif
-
-###
-### OpenGL support (video output)
-###
-.if !empty(PKG_OPTIONS:Mopengl)
-.include "../../graphics/MesaLib/features.mk"
-.  if ${MESALIB_SUPPORTS_EGL:tl} == "no"
-MESON_ARGS+=	-Degl-x11=disabled
-.  endif
-.include "../../graphics/MesaLib/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mrpi)
-TOOL_DEPENDS+=		raspberrypi-userland>=20170109:../../misc/raspberrypi-userland
-CFLAGS+=		"-L${PREFIX}/lib"
-SUBST_CLASSES+=		vc
-SUBST_STAGE.vc=		pre-configure
-SUBST_MESSAGE.vc=	Fixing path to VideoCore libraries.
-SUBST_FILES.vc+=	meson.build
-SUBST_SED.vc+=		-e 's;opt/vc;${PREFIX};g'
-.endif
-
-###
-### X11 support (video output)
-###
-.if !empty(PKG_OPTIONS:Mx11)
-MESON_ARGS+=	-Dx11=enabled
-MESON_ARGS+=	-Dxv=enabled
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXpresent/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dx11=disabled
-MESON_ARGS+=	-Dxv=disabled
-.endif
-
-###
-### Sixel support (video output)
-###
-.if !empty(PKG_OPTIONS:Msixel)
-MESON_ARGS+=	-Dsixel=enabled
-.include "../../graphics/libsixel/buildlink3.mk"
-.else
-MESON_ARGS+=	-Dsixel=disabled
-.endif
-
-###
-### JavaScript support
-###
-.if !empty(PKG_OPTIONS:Mjavascript)
-MESON_ARGS+=	-Djavascript=enabled
-.include "../../lang/mujs/buildlink3.mk"
-.else
-MESON_ARGS+=	-Djavascript=disabled
-.endif
diff --git a/mpv/patches/patch-audio_out_ao__alsa.c b/mpv/patches/patch-audio_out_ao__alsa.c
deleted file mode 100644
index 6a67e50515..0000000000
--- a/mpv/patches/patch-audio_out_ao__alsa.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-audio_out_ao__alsa.c,v 1.1 2019/06/01 01:15:54 tsutsui Exp $
-
-- pull a compat definition of ESTRPIPE for non-Linux OSes
-  from alsa-lib-1.1.4.1/include/type_compat.h
-
---- audio/out/ao_alsa.c.orig	2018-10-02 19:03:41.000000000 +0000
-+++ audio/out/ao_alsa.c
-@@ -49,6 +49,10 @@
- #define HAVE_CHMAP_API 0
- #endif
- 
-+#ifndef ESTRPIPE
-+#define ESTRPIPE EPIPE
-+#endif
-+
- #include "ao.h"
- #include "internal.h"
- #include "audio/format.h"
diff --git a/mpv/patches/patch-etc_mpv.conf b/mpv/patches/patch-etc_mpv.conf
deleted file mode 100644
index e5bd944aa0..0000000000
--- a/mpv/patches/patch-etc_mpv.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-etc_mpv.conf,v 1.1 2022/05/03 07:04:27 nia Exp $
-
-Optimize for stereo audio output devices on NetBSD.
-
---- etc/mpv.conf.orig	2022-01-03 19:45:08.000000000 +0000
-+++ etc/mpv.conf
-@@ -71,19 +71,9 @@
- # audio settings #
- ##################
- 
--# Specify default audio device. You can list devices with: --audio-device=help
--# The option takes the device string (the stuff between the '...').
--#audio-device=alsa/default
--
--# Do not filter audio to keep pitch when changing playback speed.
--#audio-pitch-correction=no
--
--# Output 5.1 audio natively, and upmix/downmix audio with a different format.
--#audio-channels=5.1
--# Disable any automatic remix, _if_ the audio output accepts the audio format.
--# of the currently played file. See caveats mentioned in the manpage.
--# (The default is "auto-safe", see manpage.)
--#audio-channels=auto
-+# NetBSD's audio stack will decline to set a surround mode if the device
-+# does not support it.  By default, play surround files in stereo for safety.
-+audio-channels=stereo
- 
- ##################
- # other settings #
diff --git a/mpv/patches/patch-meson.build b/mpv/patches/patch-meson.build
deleted file mode 100644
index 854631e8fb..0000000000
--- a/mpv/patches/patch-meson.build
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-meson.build,v 1.1 2023/08/15 19:17:10 leot Exp $
-
-- Instruct about NetBSD pthread_setname_np(3).
-  Maybe pthread_setname_np(3) should be checked in order to distinguish
-  based on the argument supported instead of special-casing based on the
-  platform... workaround that for the moment in the simplest way.
-- Enable support for DRM on NetBSD.
-- Install configuration files to examples, per pkgsrc conventions.
-
---- meson.build.orig	2023-11-21 18:47:46.000000000 +0000
-+++ meson.build
-@@ -297,6 +297,7 @@ if cc.get_id() == 'clang'
- endif
- 
- darwin = host_machine.system() == 'darwin'
-+netbsd = host_machine.system() == 'netbsd'
- win32 = host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
- posix = not win32
- 
-@@ -515,17 +516,22 @@ features += {'vt.h': cc.has_header_symbo
- 
- features += {'consio.h': not features['vt.h'] and cc.has_header_symbol('sys/consio.h', 'VT_GETMODE')}
- 
-+features += {'wsdisplay_usl_io.h': not features['vt.h'] and not features['consio.h'] and cc.has_header_symbol('dev/wscons/wsdisplay_usl_io.h', 'VT_GETMODE')}
-+
- # macOS's pthread_setname_np is a special snowflake and differs from literally every other platform.
- features += {'osx-thread-name': darwin}
- 
-+# NetBSD pthread_setname_np differs from macOS and Linux
-+features += {'netbsd-thread-name': netbsd}
-+
- features += {'glibc-thread-name': false}
--if not features['osx-thread-name']
-+if not features['osx-thread-name'] and not features['netbsd-thread-name']
-     features += {'glibc-thread-name': posix and cc.has_function('pthread_setname_np', args: '-D_GNU_SOURCE',
-                                                                 dependencies: pthreads, prefix: '#include <pthread.h>')}
- endif
- 
- features += {'bsd-thread-name': false}
--if not features['osx-thread-name'] and not features['glibc-thread-name']
-+if not features['osx-thread-name'] and not features['glibc-thread-name'] and not features['netbsd-thread-name']
-     features += {'bsd-thread-name': posix and cc.has_function('pthread_set_name_np', dependencies: pthreads,
-                                                               prefix: '#include <pthread.h>\n#include <pthread_np.h>')}
- endif
-@@ -900,7 +906,7 @@ if features['direct3d']
- endif
- 
- drm = dependency('libdrm', version: '>= 2.4.105', required: get_option('drm'))
--features += {'drm': drm.found() and (features['vt.h'] or features['consio.h'])}
-+features += {'drm': drm.found() and (features['vt.h'] or features['consio.h'] or features['wsdisplay_usl_io.h'])}
- if features['drm']
-     dependencies += drm
-     sources += files('video/drmprime.c',
-@@ -1734,7 +1740,7 @@ if get_option('cplayer')
- 
-     install_data('etc/mpv.desktop', install_dir: join_paths(datadir, 'applications'))
-     install_data('etc/mpv.metainfo.xml', install_dir: join_paths(datadir, 'metainfo'))
--    install_data('etc/encoding-profiles.conf', install_dir: join_paths(confdir, 'mpv'))
-+    install_data('etc/encoding-profiles.conf', install_dir: join_paths(datadir, 'examples/mpv'))
- 
-     foreach size: ['16x16', '32x32', '64x64', '128x128']
-         icon_dir = join_paths(datadir, 'icons', 'hicolor', size, 'apps')
diff --git a/mpv/patches/patch-osdep_threads-posix.h b/mpv/patches/patch-osdep_threads-posix.h
deleted file mode 100644
index 28b36c4bb6..0000000000
--- a/mpv/patches/patch-osdep_threads-posix.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Add support for NetBSD.
-
---- osdep/threads-posix.h.orig	2023-12-31 11:13:03.078250654 +0000
-+++ osdep/threads-posix.h
-@@ -232,6 +232,8 @@ static inline void mp_thread_set_name(co
-     pthread_set_name_np(pthread_self(), name);
- #elif HAVE_OSX_THREAD_NAME
-     pthread_setname_np(name);
-+#elif HAVE_NETBSD_THREAD_NAME
-+    pthread_setname_np(pthread_self(), "%s", name);
- #endif
- }
- 
diff --git a/mpv/patches/patch-stream_stream__libarchive.c b/mpv/patches/patch-stream_stream__libarchive.c
deleted file mode 100644
index e5ca14f35e..0000000000
--- a/mpv/patches/patch-stream_stream__libarchive.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-stream_stream__libarchive.c,v 1.1 2022/05/17 13:12:13 ryoon Exp $
-
-* NetBSD does not implement uselocale().
-
---- stream/stream_libarchive.c.orig	2022-01-03 19:45:08.000000000 +0000
-+++ stream/stream_libarchive.c
-@@ -29,6 +29,10 @@
- #define MP_ARCHIVE_FLAG_MAYBE_RAR       (MP_ARCHIVE_FLAG_PRIV << 1)
- #define MP_ARCHIVE_FLAG_MAYBE_VOLUMES   (MP_ARCHIVE_FLAG_PRIV << 2)
- 
-+#if defined(__NetBSD__)
-+#define uselocale(locale) NULL
-+#endif
-+
- struct mp_archive_volume {
-     struct mp_archive *mpa;
-     int index; // volume number (starting with 0, mp_archive.primary_src)
diff --git a/mpv/patches/patch-video_out_drm__common.c b/mpv/patches/patch-video_out_drm__common.c
deleted file mode 100644
index 02d150a067..0000000000
--- a/mpv/patches/patch-video_out_drm__common.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-video_out_drm__common.c,v 1.4 2020/12/19 11:27:51 leot Exp $
-
-Enable support for DRM on NetBSD.
-
---- video/out/drm_common.c.orig	2020-11-22 17:46:28.000000000 +0000
-+++ video/out/drm_common.c
-@@ -30,6 +30,9 @@
- 
- #if HAVE_CONSIO_H
- #include <sys/consio.h>
-+#elif HAVE_WSDISPLAY_USL_IO_H
-+#include <sys/types.h>
-+#include <dev/wscons/wsdisplay_usl_io.h>
- #else
- #include <sys/vt.h>
- #endif


Home | Main Index | Thread Index | Old Index