summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild159
-rw-r--r--media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch35
-rw-r--r--media-video/amdgpu-pro-amf/Manifest3
-rw-r--r--media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1376756-r1.ebuild58
-rw-r--r--media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1384496-r1.ebuild58
-rw-r--r--media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1395274.ebuild57
-rw-r--r--media-video/amdgpu-pro-amf/metadata.xml12
-rw-r--r--media-video/atomicparsley-wez/Manifest1
-rw-r--r--media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild37
-rw-r--r--media-video/atomicparsley-wez/metadata.xml11
-rw-r--r--media-video/atomicparsley/Manifest1
-rw-r--r--media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild32
-rw-r--r--media-video/avidemux/Manifest2
-rw-r--r--media-video/avidemux/avidemux-2.7.6-r1.ebuild136
-rw-r--r--media-video/avidemux/metadata.xml3
-rw-r--r--media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild4
-rw-r--r--media-video/bino/Manifest1
-rw-r--r--media-video/bino/bino-1.6.8.ebuild65
-rw-r--r--media-video/ccextractor/ccextractor-0.88.ebuild4
-rw-r--r--media-video/celluloid/celluloid-0.21.ebuild4
-rw-r--r--media-video/cheese/Manifest2
-rw-r--r--media-video/cheese/cheese-3.38.0.ebuild96
-rw-r--r--media-video/cheese/cheese-41.1.ebuild (renamed from media-video/cheese/cheese-3.38.0-r1.ebuild)13
-rw-r--r--media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch88
-rw-r--r--media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch177
-rw-r--r--media-video/clive/Manifest1
-rw-r--r--media-video/clive/clive-2.3.0.1.ebuild59
-rw-r--r--media-video/clive/metadata.xml18
-rw-r--r--media-video/devedeng/Manifest1
-rw-r--r--media-video/devedeng/devedeng-4.16.0-r2.ebuild (renamed from media-video/devedeng/devedeng-4.16.0-r1.ebuild)9
-rw-r--r--media-video/devedeng/devedeng-4.17.0.ebuild47
-rw-r--r--media-video/droidcam/Manifest3
-rw-r--r--media-video/droidcam/droidcam-1.8.1-r2.ebuild (renamed from media-video/droidcam/droidcam-1.8.0-r1.ebuild)7
-rw-r--r--media-video/droidcam/droidcam-1.8.2.ebuild (renamed from media-video/droidcam/droidcam-1.8.0.ebuild)27
-rw-r--r--media-video/droidcam/files/droidcam-makefile-fixes.patch23
-rw-r--r--media-video/dvdrip/dvdrip-0.98.11-r5.ebuild (renamed from media-video/dvdrip/dvdrip-0.98.11-r4.ebuild)40
-rw-r--r--media-video/dvdrip/files/dvdrip-0.98.11-r5-fix_parallel_make.patch (renamed from media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch)8
-rw-r--r--media-video/dvdstyler/Manifest1
-rw-r--r--media-video/dvdstyler/dvdstyler-3.2.1.ebuild70
-rw-r--r--media-video/dvdstyler/files/ffmpeg5.patch89
-rw-r--r--media-video/dvdstyler/files/wx30.patch14
-rw-r--r--media-video/ffdiaporama/Manifest1
-rw-r--r--media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild59
-rw-r--r--media-video/ffmpeg-chromium/Manifest2
-rw-r--r--media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild (renamed from media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild)13
-rw-r--r--media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild2
-rw-r--r--media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch27
-rw-r--r--media-video/ffmpeg/Manifest6
-rw-r--r--media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild20
-rw-r--r--media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild19
-rw-r--r--media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild (renamed from media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild)53
-rw-r--r--media-video/ffmpeg/ffmpeg-4.4.2.ebuild (renamed from media-video/ffmpeg/ffmpeg-4.4-r1.ebuild)75
-rw-r--r--media-video/ffmpeg/ffmpeg-5.0.1.ebuild (renamed from media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild)116
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild67
-rw-r--r--media-video/ffmpeg/files/amf-env-vulkan-override1
-rw-r--r--media-video/ffmpeg/files/ffmpeg-4.3.1-srt-1.4.2-build.patch52
-rw-r--r--media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch59
-rw-r--r--media-video/ffmpeg/files/vmaf-models-default-path.patch13
-rw-r--r--media-video/ffmpeg/metadata.xml3
-rw-r--r--media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild4
-rw-r--r--media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild61
-rw-r--r--media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild4
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-1.patch22
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-10.patch22
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-2.patch28
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-3.patch26
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-4.patch32
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-5.patch37
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-6.patch23
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-7.patch27
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-8.patch54
-rw-r--r--media-video/ffmpegthumbnailer/files/ffmpeg5-9.patch62
-rw-r--r--media-video/flvstreamer/flvstreamer-2.1c.ebuild4
-rw-r--r--media-video/gaupol/Manifest2
-rw-r--r--media-video/gaupol/gaupol-1.10.1.ebuild4
-rw-r--r--media-video/gaupol/gaupol-1.11-r1.ebuild (renamed from media-video/gaupol/gaupol-1.9.ebuild)13
-rw-r--r--media-video/google2srt/Manifest2
-rw-r--r--media-video/google2srt/files/build.xml85
-rw-r--r--media-video/google2srt/google2srt-0.5.6-r1.ebuild64
-rw-r--r--media-video/google2srt/metadata.xml20
-rw-r--r--media-video/gpac/Manifest1
-rw-r--r--media-video/gpac/files/gpac-2.0.0-configure.patch113
-rw-r--r--media-video/gpac/gpac-2.0.0.ebuild154
-rw-r--r--media-video/gpac/gpac-9999.ebuild6
-rw-r--r--media-video/guvcview/Manifest1
-rw-r--r--media-video/guvcview/files/ffmpeg5.patch47
-rw-r--r--media-video/guvcview/guvcview-2.0.7.ebuild78
-rw-r--r--media-video/gxine/Manifest1
-rw-r--r--media-video/gxine/files/gxine-0.5.909-fno-common.patch22
-rw-r--r--media-video/gxine/gxine-0.5.909-r1.ebuild71
-rw-r--r--media-video/gxine/metadata.xml10
-rw-r--r--media-video/handbrake/Manifest2
-rw-r--r--media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch28
-rw-r--r--media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch84
-rw-r--r--media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch40
-rw-r--r--media-video/handbrake/handbrake-1.3.3-r3.ebuild165
-rw-r--r--media-video/handbrake/handbrake-1.4.2-r2.ebuild (renamed from media-video/handbrake/handbrake-1.4.2-r1.ebuild)10
-rw-r--r--media-video/handbrake/handbrake-1.5.1.ebuild (renamed from media-video/handbrake/handbrake-1.3.3-r2.ebuild)97
-rw-r--r--media-video/handbrake/handbrake-9999.ebuild8
-rw-r--r--media-video/handbrake/metadata.xml1
-rw-r--r--media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild34
-rw-r--r--media-video/jellyfin-media-player/metadata.xml6
-rw-r--r--media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild2
-rw-r--r--media-video/jellyfin-web-jmp-bin/metadata.xml6
-rw-r--r--media-video/jubler/jubler-5.1.ebuild4
-rw-r--r--media-video/libva-utils/Manifest8
-rw-r--r--media-video/libva-utils/libva-utils-2.10.0.ebuild61
-rw-r--r--media-video/libva-utils/libva-utils-2.11.1.ebuild96
-rw-r--r--media-video/libva-utils/libva-utils-2.12.0.ebuild97
-rw-r--r--media-video/libva-utils/libva-utils-2.13.0.ebuild2
-rw-r--r--media-video/libva-utils/libva-utils-2.14.0.ebuild96
-rw-r--r--media-video/libva-utils/libva-utils-2.4.0.ebuild62
-rw-r--r--media-video/libva-utils/libva-utils-2.8.0-r1.ebuild74
-rw-r--r--media-video/libva-utils/libva-utils-2.8.0-r2.ebuild61
-rw-r--r--media-video/libva-utils/libva-utils-2.8.0.ebuild63
-rw-r--r--media-video/libva-utils/libva-utils-2.9.1-r1.ebuild61
-rw-r--r--media-video/libva-utils/libva-utils-2.9.1.ebuild62
-rw-r--r--media-video/libva-utils/libva-utils-9999.ebuild79
-rw-r--r--media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch4
-rw-r--r--media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch11
-rw-r--r--media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild (renamed from media-video/lxdvdrip/lxdvdrip-1.77.ebuild)32
-rw-r--r--media-video/makemkv/Manifest6
-rw-r--r--media-video/makemkv/makemkv-1.16.4.ebuild126
-rw-r--r--media-video/makemkv/makemkv-1.16.7.ebuild (renamed from media-video/makemkv/makemkv-1.16.5.ebuild)0
-rw-r--r--media-video/mediainfo/Manifest2
-rw-r--r--media-video/mediainfo/mediainfo-21.09.ebuild86
-rw-r--r--media-video/mediainfo/mediainfo-22.03.ebuild86
-rw-r--r--media-video/mjpegtools/Manifest1
-rw-r--r--media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild112
-rw-r--r--media-video/mjpegtools/mjpegtools-2.2.1.ebuild6
-rw-r--r--media-video/mkvtoolnix/Manifest2
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch76
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild4
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild125
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild131
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-9999.ebuild53
-rw-r--r--media-video/motiontrack/motiontrack-0.1.3-r2.ebuild4
-rw-r--r--media-video/movit/Manifest2
-rw-r--r--media-video/movit/files/movit-1.6.3-gcc12.patch12
-rw-r--r--media-video/movit/movit-1.6.2.ebuild48
-rw-r--r--media-video/movit/movit-1.6.3-r1.ebuild (renamed from media-video/movit/movit-1.6.3.ebuild)13
-rw-r--r--media-video/mplayer-sh/Manifest2
-rw-r--r--media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff84
-rw-r--r--media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff84
-rw-r--r--media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild42
-rw-r--r--media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild42
-rw-r--r--media-video/mplayer/Manifest1
-rw-r--r--media-video/mplayer/files/mplayer-1.4-riscv-support.patch14
-rw-r--r--media-video/mplayer/mplayer-1.4-r1.ebuild16
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild5
-rw-r--r--media-video/mpv/Manifest1
-rw-r--r--media-video/mpv/metadata.xml1
-rw-r--r--media-video/mpv/mpv-0.33.1-r3.ebuild (renamed from media-video/mpv/mpv-0.33.1-r2.ebuild)22
-rw-r--r--media-video/mpv/mpv-0.34.0-r1.ebuild (renamed from media-video/mpv/mpv-0.34.0.ebuild)22
-rw-r--r--media-video/mpv/mpv-0.34.1-r1.ebuild358
-rw-r--r--media-video/mpv/mpv-9999.ebuild24
-rw-r--r--media-video/obs-studio/Manifest9
-rw-r--r--media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch18
-rw-r--r--media-video/obs-studio/metadata.xml7
-rw-r--r--media-video/obs-studio/obs-studio-27.2.3-r1.ebuild (renamed from media-video/obs-studio/obs-studio-27.1.3-r1.ebuild)28
-rw-r--r--media-video/obs-studio/obs-studio-27.2.4.ebuild (renamed from media-video/obs-studio/obs-studio-27.0.1-r1.ebuild)48
-rw-r--r--media-video/obs-studio/obs-studio-9999.ebuild98
-rw-r--r--media-video/openshot/openshot-2.6.1.ebuild14
-rw-r--r--media-video/pipewire/Manifest5
-rw-r--r--media-video/pipewire/files/99-pipewire-default-hook.conf17
-rw-r--r--media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch19
-rw-r--r--media-video/pipewire/files/pipewire-0.3.38-find-readline.patch36
-rw-r--r--media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch18
-rw-r--r--media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch70
-rw-r--r--media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch20
-rw-r--r--media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch39
-rw-r--r--media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch70
-rw-r--r--media-video/pipewire/metadata.xml8
-rw-r--r--media-video/pipewire/pipewire-0.3.49-r1.ebuild (renamed from media-video/pipewire/pipewire-0.3.40-r1.ebuild)91
-rw-r--r--media-video/pipewire/pipewire-0.3.50-r3.ebuild (renamed from media-video/pipewire/pipewire-0.3.38.ebuild)178
-rw-r--r--media-video/pipewire/pipewire-0.3.51-r1.ebuild363
-rw-r--r--media-video/pipewire/pipewire-9999.ebuild89
-rw-r--r--media-video/pitivi/files/pitivi-0.999-gst-0.18.patch39
-rw-r--r--media-video/pitivi/pitivi-0.999-r5.ebuild (renamed from media-video/pitivi/pitivi-0.999-r4.ebuild)23
-rw-r--r--media-video/popcorntime-bin/Manifest2
-rw-r--r--media-video/popcorntime-bin/metadata.xml12
-rw-r--r--media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild53
-rw-r--r--media-video/projectx/projectx-0.91.0.10-r3.ebuild4
-rw-r--r--media-video/qmplay2/Manifest5
-rw-r--r--media-video/qmplay2/qmplay2-20.07.04.ebuild149
-rw-r--r--media-video/qmplay2/qmplay2-21.12.24.ebuild (renamed from media-video/qmplay2/qmplay2-21.06.07-r2.ebuild)43
-rw-r--r--media-video/qmplay2/qmplay2-22.03.19.ebuild (renamed from media-video/qmplay2/qmplay2-21.03.09.ebuild)56
-rw-r--r--media-video/qmplay2/qmplay2-9999.ebuild51
-rw-r--r--media-video/rage/Manifest1
-rw-r--r--media-video/rage/metadata.xml (renamed from media-video/mplayer-sh/metadata.xml)8
-rw-r--r--media-video/rage/rage-0.4.0-r1.ebuild26
-rw-r--r--media-video/rav1e/Manifest104
-rw-r--r--media-video/rav1e/rav1e-0.4.1-r1.ebuild4
-rw-r--r--media-video/rav1e/rav1e-0.5.1.ebuild244
-rw-r--r--media-video/rav1e/rav1e-9999.ebuild28
-rw-r--r--media-video/rtmpdump/Manifest1
-rw-r--r--media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch23
-rw-r--r--media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch46
-rw-r--r--media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild93
-rw-r--r--media-video/rtmpdump/rtmpdump-9999.ebuild11
-rw-r--r--media-video/shotcut/Manifest2
-rw-r--r--media-video/shotcut/shotcut-21.10.31.ebuild4
-rw-r--r--media-video/shotcut/shotcut-21.12.24.ebuild (renamed from media-video/shotcut/shotcut-21.09.20.ebuild)2
-rw-r--r--media-video/shotcut/shotcut-9999.ebuild4
-rw-r--r--media-video/simplescreenrecorder/Manifest2
-rw-r--r--media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.2-cmake.patch28
-rw-r--r--media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild (renamed from media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild)28
-rw-r--r--media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild23
-rw-r--r--media-video/smplayer/Manifest1
-rw-r--r--media-video/smplayer/smplayer-22.2.0.ebuild139
-rw-r--r--media-video/sonic-snap/sonic-snap-1.7-r1.ebuild4
-rw-r--r--media-video/subliminal/subliminal-2.1.0-r1.ebuild4
-rw-r--r--media-video/subliminal/subliminal-9999.ebuild4
-rw-r--r--media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch122
-rw-r--r--media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild7
-rw-r--r--media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild58
-rw-r--r--media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild4
-rw-r--r--media-video/totem/Manifest2
-rw-r--r--media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch41
-rw-r--r--media-video/totem/totem-3.38.2.ebuild5
-rw-r--r--media-video/totem/totem-42.0-r1.ebuild (renamed from media-video/totem/totem-3.38.1.ebuild)18
-rw-r--r--media-video/transcode/transcode-1.1.7-r6.ebuild4
-rw-r--r--media-video/unifi-video/unifi-video-3.10.13-r2.ebuild86
-rw-r--r--media-video/unifi-video/unifi-video-3.10.13-r3.ebuild86
-rw-r--r--media-video/unifi-video/unifi-video-3.10.13-r5.ebuild (renamed from media-video/unifi-video/unifi-video-3.10.13-r4.ebuild)7
-rw-r--r--media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild4
-rw-r--r--media-video/v4l2loopback/v4l2loopback-9999.ebuild4
-rw-r--r--media-video/vidify/files/vidify-2.2.6-python310.patch16
-rw-r--r--media-video/vidify/files/vidify-2.2.6-yt-dlp.patch122
-rw-r--r--media-video/vidify/vidify-2.2.6-r2.ebuild (renamed from media-video/vidify/vidify-2.2.6.ebuild)12
-rw-r--r--media-video/vlc/Manifest1
-rw-r--r--media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch78
-rw-r--r--media-video/vlc/vlc-3.0.16-r8.ebuild (renamed from media-video/vlc/vlc-3.0.16-r7.ebuild)9
-rw-r--r--media-video/vlc/vlc-3.0.17.3-r1.ebuild511
-rw-r--r--media-video/vlc/vlc-3.0.17.3-r2.ebuild512
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild27
-rw-r--r--media-video/vlc/vlc-9999.ebuild35
-rw-r--r--media-video/webcamoid/Manifest2
-rw-r--r--media-video/webcamoid/webcamoid-8.8.0.ebuild (renamed from media-video/webcamoid/webcamoid-8.7.1.ebuild)15
-rw-r--r--media-video/wireplumber/Manifest3
-rw-r--r--media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch129
-rw-r--r--media-video/wireplumber/files/wireplumber-0.4.5-alsa-handle-the-release-requested-signal.patch33
-rw-r--r--media-video/wireplumber/files/wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch27
-rw-r--r--media-video/wireplumber/files/wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch47
-rw-r--r--media-video/wireplumber/files/wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch34
-rw-r--r--media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch87
-rw-r--r--media-video/wireplumber/files/wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch33
-rw-r--r--media-video/wireplumber/metadata.xml5
-rw-r--r--media-video/wireplumber/wireplumber-0.4.10-r1.ebuild122
-rw-r--r--media-video/wireplumber/wireplumber-0.4.10.ebuild (renamed from media-video/wireplumber/wireplumber-0.4.5.ebuild)45
-rw-r--r--media-video/wireplumber/wireplumber-0.4.9-r1.ebuild121
-rw-r--r--media-video/wireplumber/wireplumber-0.4.9.ebuild (renamed from media-video/wireplumber/wireplumber-0.4.5-r1.ebuild)50
-rw-r--r--media-video/wireplumber/wireplumber-9999.ebuild45
-rw-r--r--media-video/x264-encoder/Manifest1
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild5
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild74
-rw-r--r--media-video/x264-encoder/x264-encoder-9999.ebuild13
-rw-r--r--media-video/xine-ui/Manifest1
-rw-r--r--media-video/xine-ui/xine-ui-0.99.13.ebuild100
-rw-r--r--media-video/yle-dl/Manifest2
-rw-r--r--media-video/yle-dl/yle-dl-20220425.ebuild (renamed from media-video/yle-dl/yle-dl-20210917.ebuild)6
261 files changed, 7430 insertions, 3990 deletions
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild
new file mode 100644
index 00000000000..0ac1ff04d08
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+LUA_REQ_USE="lua52compat"
+
+WX_GTK_VER=3.0
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
+COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234"
+
+inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
+SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+RESTRICT="!test? ( test )"
+
+# aegisub bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is practically dead since 2010.
+# Thus unbundling luabins isn't worth the effort.
+RDEPEND="${LUA_DEPS}
+ x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
+ dev-libs/boost:=[icu,nls,threads(+)]
+ dev-libs/icu:=
+ media-libs/ffmpegsource:=
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libass:=[fontconfig]
+ sys-libs/zlib
+ virtual/libiconv
+ virtual/opengl
+ alsa? ( media-libs/alsa-lib )
+ fftw? ( >=sci-libs/fftw-3.3:= )
+ openal? ( media-libs/openal )
+ portaudio? ( =media-libs/portaudio-19* )
+ pulseaudio? ( media-sound/pulseaudio )
+ spell? ( app-text/hunspell:= )
+ uchardet? ( app-i18n/uchardet )
+"
+DEPEND="${RDEPEND}"
+# luarocks is only used as a command-line tool so there is no need to enforce
+# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version
+# bounds in order to make sure we use a version migrated to Lua eclasses.
+BDEPEND="dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ ${RDEPEND}
+ >=dev-cpp/gtest-1.8.1
+ >=dev-lua/luarocks-3.4.0-r100
+ $(lua_gen_cond_dep '
+ dev-lua/busted[${LUA_USEDEP}]
+ ')
+ )
+"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ || ( alsa openal oss portaudio pulseaudio )"
+
+PATCHES=(
+ "${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch"
+ "${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
+ "${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
+ "${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
+ "${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
+ "${FILESDIR}/${PV}/${P}-fix-boost170-build.patch"
+ "${FILESDIR}/${PV}/${P}-fix-makefile-for-make4.3.patch"
+ "${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.patch"
+ "${FILESDIR}/${PV}/${P}-avoid-conveying-positional-parameters-to-source-builtin.patch"
+ "${FILESDIR}/${PV}/${P}-luaL_Reg-not-luaL_reg.patch"
+)
+
+aegisub_check_compiler() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+ die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
+ fi
+}
+
+pkg_pretend() {
+ aegisub_check_compiler
+}
+
+pkg_setup() {
+ aegisub_check_compiler
+ lua-single_pkg_setup
+}
+
+src_prepare() {
+ default_src_prepare
+
+ # Remove tests that require unavailable uuid Lua module.
+ rm automation/tests/modules/lfs.moon || die
+
+ remove_locale() {
+ rm "po/${1}.po" || die
+ }
+
+ plocale_find_changes 'po' '' '.po'
+ plocale_for_each_disabled_locale remove_locale
+
+ # See http://devel.aegisub.org/ticket/1914
+ config_rpath_update "${S}"/config.rpath
+
+ eautoreconf
+
+ cat <<- EOF > build/git_version.h || die
+ #define BUILD_GIT_VERSION_NUMBER 8897
+ #define BUILD_GIT_VERSION_STRING "${PV}"
+ #define TAGGED_RELEASE 0
+ EOF
+}
+
+src_configure() {
+ # Prevent access violations from OpenAL detection. See Gentoo bug 508184.
+ use openal && export agi_cv_with_openal="yes"
+
+ setup-wxwidgets
+ local myeconfargs=(
+ --disable-update-checker
+ --with-ffms2
+ --with-system-luajit
+ $(use_enable debug)
+ $(use_with alsa)
+ $(use_with fftw fftw3)
+ $(use_with openal)
+ $(use_with oss)
+ $(use_with portaudio)
+ $(use_with pulseaudio libpulse)
+ $(use_with spell hunspell)
+ $(use_with uchardet)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake WITH_SYSTEM_GTEST=$(usex test)
+}
+
+src_test() {
+ emake test-automation
+ emake test-libaegisub
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch
new file mode 100644
index 00000000000..1704630ea53
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch
@@ -0,0 +1,35 @@
+diff --git a/libaegisub/lua/modules/lpeg.c b/libaegisub/lua/modules/lpeg.c
+index 8d67335ab..5261c2061 100644
+--- a/libaegisub/lua/modules/lpeg.c
++++ b/libaegisub/lua/modules/lpeg.c
+@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
+ }
+
+
+-static struct luaL_reg pattreg[] = {
++static struct luaL_Reg pattreg[] = {
+ {"match", matchl},
+ {"print", printpat_l},
+ {"locale", locale_l},
+@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
+ };
+
+
+-static struct luaL_reg metapattreg[] = {
++static struct luaL_Reg metapattreg[] = {
+ {"__add", union_l},
+ {"__pow", star_l},
+ {"__sub", diff_l},
+diff --git a/vendor/luabins/src/luabins.c b/vendor/luabins/src/luabins.c
+index 60668213f..35b177629 100644
+--- a/vendor/luabins/src/luabins.c
++++ b/vendor/luabins/src/luabins.c
+@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
+ }
+
+ /* luabins Lua module API */
+-static const struct luaL_reg R[] =
++static const struct luaL_Reg R[] =
+ {
+ { "save", l_save },
+ { "load", l_load },
diff --git a/media-video/amdgpu-pro-amf/Manifest b/media-video/amdgpu-pro-amf/Manifest
new file mode 100644
index 00000000000..b8f924f0c3e
--- /dev/null
+++ b/media-video/amdgpu-pro-amf/Manifest
@@ -0,0 +1,3 @@
+DIST amdgpu-pro-amf-1.4.24.1376756.deb 1302168 BLAKE2B 706528317c317e0319e80decc8a9a59a0c55fed8c4c43c701ba93a2a503fbf5f2ee9fb44cfeb5bd582b013ebb8961514cb5b9faead8f24fdfe2b205f7d2dc656 SHA512 77740014e6bc2c91e822261e4fa247ac0e49747d6ff8af0c3b3046ec993c7c99621b55639ef18582021389a329e52ccc59edb85eb29d9e6a81da6986a487ec3e
+DIST amdgpu-pro-amf-1.4.24.1384496.deb 1304672 BLAKE2B a21e7d2cf9dc4fe139f87d5c61b4ac715e677fb23aa2cc3eb4a62e20776431d26e234d092d9b28ecad22de2f5acda1f21df394f3a51152c9fd36cdfddab78af2 SHA512 4620dda918196e67f99c8a1df8e3e487769bd3ad94881a3769e46a85a12648f50ba8520476c9eec9e982261354ff92f56803fd8731fa7a7e458670011426ce31
+DIST amdgpu-pro-amf-1.4.24.1395274.deb 1304984 BLAKE2B e1b51c6e9dfafcb677314ac881983372cc1d1f09b0112bbe842da06672da8f48e5bd5db358c8067fa23e8a5b4d110b2ea6d998c06357ed32e29accac8ba86c38 SHA512 e809ccf0b93fa8dc44320166ff549e10e1edc6556bb4bf48112de0f20c7e5dda761029aacfa0fd00def30cc647131eb55cf94f01414222c7891d2dad279d33f1
diff --git a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1376756-r1.ebuild b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1376756-r1.ebuild
new file mode 100644
index 00000000000..28e503e1d76
--- /dev/null
+++ b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1376756-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV_HIGH=$(ver_cut 1)
+MY_PV_MIDDLE=$(ver_cut 2)
+MY_PV_LOW=$(ver_cut 3)
+MY_PV_REV=$(ver_cut 4)
+
+MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="amf-amdgpu-pro"
+
+PRO_VULKAN_PKG_VER="21.50.1"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${PRO_VULKAN_PKG_VER}/ubuntu/pool/proprietary/a/${MY_PN}"
+
+DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}.deb"
+
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ media-libs/amdgpu-pro-vulkan
+ media-libs/libglvnd
+ x11-libs/libdrm
+ x11-libs/libX11
+"
+
+QA_PREBUILT="
+ usr/lib64/libamfrt64.so*
+"
+
+src_unpack() {
+ mkdir "${S}/${PN}-amd64" || die
+ cd "${S}/${PN}-amd64" || die
+ unpack_deb "${DISTDIR}/${P}.deb"
+}
+
+src_install() {
+ insinto "/usr/$(get_libdir)"
+
+ # AMF
+ doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so.${MY_PV}"
+ dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so"
+ dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so.1"
+}
diff --git a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1384496-r1.ebuild b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1384496-r1.ebuild
new file mode 100644
index 00000000000..d90e8996c76
--- /dev/null
+++ b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1384496-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV_HIGH=$(ver_cut 1)
+MY_PV_MIDDLE=$(ver_cut 2)
+MY_PV_LOW=$(ver_cut 3)
+MY_PV_REV=$(ver_cut 4)
+
+MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="amf-amdgpu-pro"
+
+PRO_VULKAN_PKG_VER="21.50.2"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${PRO_VULKAN_PKG_VER}/ubuntu/pool/proprietary/a/${MY_PN}"
+
+DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}.deb"
+
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ media-libs/amdgpu-pro-vulkan
+ media-libs/libglvnd
+ x11-libs/libdrm
+ x11-libs/libX11
+"
+
+QA_PREBUILT="
+ usr/lib64/libamfrt64.so*
+"
+
+src_unpack() {
+ mkdir "${S}/${PN}-amd64" || die
+ cd "${S}/${PN}-amd64" || die
+ unpack_deb "${DISTDIR}/${P}.deb"
+}
+
+src_install() {
+ insinto "/usr/$(get_libdir)"
+
+ # AMF
+ doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so.${MY_PV}"
+ dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so"
+ dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so.1"
+}
diff --git a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1395274.ebuild b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1395274.ebuild
new file mode 100644
index 00000000000..9e20d80730c
--- /dev/null
+++ b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1395274.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV_HIGH=$(ver_cut 1)
+MY_PV_MIDDLE=$(ver_cut 2)
+MY_PV_LOW=$(ver_cut 3)
+MY_PV_REV=$(ver_cut 4)
+
+MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="amf-amdgpu-pro"
+
+PRO_VULKAN_PKG_VER="22.10"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${PRO_VULKAN_PKG_VER}/ubuntu/pool/proprietary/a/${MY_PN}"
+
+DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}.deb"
+
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ media-libs/amdgpu-pro-vulkan
+ media-libs/libglvnd
+ x11-libs/libdrm
+ x11-libs/libX11
+"
+
+QA_PREBUILT="
+ usr/lib64/libamfrt64.so*
+"
+
+src_unpack() {
+ mkdir "${S}/${PN}-amd64" || die
+ cd "${S}/${PN}-amd64" || die
+ unpack_deb "${DISTDIR}/${P}.deb"
+}
+
+src_install() {
+ insinto "/usr/$(get_libdir)"
+
+ # AMF
+ doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so.${MY_PV}"
+ dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so.1"
+}
diff --git a/media-video/amdgpu-pro-amf/metadata.xml b/media-video/amdgpu-pro-amf/metadata.xml
new file mode 100644
index 00000000000..6d07c8aa625
--- /dev/null
+++ b/media-video/amdgpu-pro-amf/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <name>Adel Kara Slimane</name>
+ <email>adel.ks@zegrapher.com</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/media-video/atomicparsley-wez/Manifest b/media-video/atomicparsley-wez/Manifest
deleted file mode 100644
index 8f9d4d6c270..00000000000
--- a/media-video/atomicparsley-wez/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST atomicparsley-wez-0.9.6.tar.bz2 178956 BLAKE2B e7c9bc2f3b923194fef173b72b98e4654745e0811457a1e8cb29150ab265447c2bfa71b645869661f6fd92bb30a58f25ae3aa29b20255aa09ee63f3ab738b8c5 SHA512 1f094fd4d43f652319abd2eee70529d9a57e7843b4b725815b9939ad90cf56e3f061ffd9104507a7d74cabbdd9b7cb24ca12d30c88a89832629da3091bbcf1b6
diff --git a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
deleted file mode 100644
index 348e5e72d02..00000000000
--- a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_PN=${PN/-wez}
-
-DESCRIPTION="command line program for reading, parsing and setting iTunes-style metadata in MPEG4 files"
-HOMEPAGE="https://github.com/wez/atomicparsley"
-SRC_URI="https://bitbucket.org/wez/${MY_PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="sys-libs/zlib
- !media-video/atomicparsley"
-DEPEND="${RDEPEND}"
-
-DOCS=(Changes.txt CREDITS)
-
-src_unpack() {
- unpack ${A} || die
- mv *-${MY_PN}-* "${S}" || die
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- econf
-}
diff --git a/media-video/atomicparsley-wez/metadata.xml b/media-video/atomicparsley-wez/metadata.xml
deleted file mode 100644
index 77ffb793205..00000000000
--- a/media-video/atomicparsley-wez/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">wez/atomicparsley</remote-id>
- <remote-id type="bitbucket">wez/atomicparsley</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest
index 928a889fce2..d7149321a8b 100644
--- a/media-video/atomicparsley/Manifest
+++ b/media-video/atomicparsley/Manifest
@@ -1 +1,2 @@
DIST AtomicParsley-source-0.9.0.zip 172616 BLAKE2B 6e2fa904cde622524ec51e3d084d89dd86c04db9942a27fae67b0d12db0542705d28e723c26db94d234f26c7249c6b8d4fd01a2bce891d2310a3a912667e1d84 SHA512 a4733893bb0d8bf824ee46d7da7f8c2ab9338ae56ea89810db1ac40282554e7e095b3e88631786b248a66aba878f166b9ac403769c66ef3ad45ac8ff7d411982
+DIST atomicparsley-0.9.6_p20210715_p151551.tar.gz 230214 BLAKE2B 986058a8e80b84f30df03f5dfc6e2019ef6949469d8554a5a06ecc75716463b3047820265fd22556f9087a64498e07e994fa2162660f440086eab276be496a9d SHA512 9f58fe7426c9728f8e5624250ff57d7707a4b040365135fa5149909d84c536ecbddaa3820dae85ca8a4c31fc8009685bf56875f1d4ff6f5c854f05a30da6974a
diff --git a/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild b/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild
new file mode 100644
index 00000000000..c7c7cea6bd6
--- /dev/null
+++ b/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# The fork at https://github.com/wez/atomicparsley uses unusual versioning, so
+# we sadly need to hardcode the hash and update it per-release.
+MY_COMMIT_HASH="e7ad03a"
+MY_PV="$(ver_cut 5).$(ver_cut 7).${MY_COMMIT_HASH}"
+inherit cmake flag-o-matic
+
+DESCRIPTION="Command line program for manipulating iTunes-style metadata in MPEG4 files"
+HOMEPAGE="https://github.com/wez/atomicparsley http://atomicparsley.sourceforge.net"
+SRC_URI="https://github.com/wez/atomicparsley/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+src_configure() {
+ # APar_sha1.cpp:116:47 and 117:43: warning: dereferencing type-punned
+ # pointer will break strict-aliasing rules
+ append-flags -fno-strict-aliasing
+
+ cmake_src_configure
+}
+
+src_test() {
+ ln -s "${BUILD_DIR}"/AtomicParsley || die
+ tests/test.sh || die
+}
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 48945364b67..0201016418c 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,4 +1,2 @@
-DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
-DIST avidemux-i18n-2.7.6.tar.gz 2268693 BLAKE2B dedf6d015e6bbd58f432e05e72c4d8d175ce4f5567331b5e51e7a14d2a8180e92211efc172a4d7001a2947f46c2e910a485d42970b99df05c1ba12002974cfbf SHA512 26ada29c4b7c23739ddcc4ca1dc9819bbc64fa2b6472fd7ff5706905dbd9b382e7a7d69ba78f72afa6f3db55cf3c5373a5e2d244f1cf189aeb187984dd1f4187
DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
diff --git a/media-video/avidemux/avidemux-2.7.6-r1.ebuild b/media-video/avidemux/avidemux-2.7.6-r1.ebuild
deleted file mode 100644
index b1fce24ef0a..00000000000
--- a/media-video/avidemux/avidemux-2.7.6-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
-
-BDEPEND="dev-lang/yasm
- qt5? ( dev-qt/linguist-tools:5 )"
-DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
- opengl? ( virtual/opengl:0 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- vaapi? ( x11-libs/libva:0= )
-"
-RDEPEND="${DEPEND}
- nls? ( virtual/libintl:0 )
- !<media-video/avidemux-${PV}
-"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-src_unpack() {
- default
- mv -f -T avidemux2_i18n-${PV} "${S}"/avidemux/qt4/i18n >/dev/null || die
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-2.7.4-qt-5.15.patch
-
- processes="buildCli:avidemux/cli"
- use qt5 && processes+=" buildQt4:avidemux/qt4"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
- done
-
- if use qt5; then
- # Fix icon name -> avidemux-2.7
- sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
- die "Icon name fix failed."
-
- # The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5
- sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/${PN}.desktop || \
- die "Desktop file fix failed."
-
- # QA warnings: missing trailing ';' and 'Application' is deprecated.
- sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \
- die "Desktop file fix failed."
-
- # Now rename the desktop file to not collide with 2.6.
- mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
- fi
-
- # Remove "Build Option" dialog because it doesn't reflect
- # what the GUI can or has been built with. (Bug #463628)
- sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
- die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- # The build relies on an avidemux-core header that uses 'nullptr'
- # which is from >=C++11. Let's use the GCC-6 default C++ dialect.
- append-cxxflags -std=c++14
-
- local mycmakeargs=(
- -DGETTEXT="$(usex nls)"
- -DSDL="$(usex sdl)"
- -DLibVA="$(usex vaapi)"
- -DOPENGL="$(usex opengl)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use qt5 && mycmakeargs+=(
- -DENABLE_QT5="$(usex qt5)"
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_compile
- done
-}
-
-src_test() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_test
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_install
- done
-
- if use qt5; then
- cd "${S}" || die "Can't enter source folder"
- newicon ${PN}_icon.png ${PN}-${SLOT}.png
- domenu ${PN}-${SLOT}.desktop
- fi
-}
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 10fd32351be..3d2492c5401 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -5,9 +5,6 @@
<email>media-video@gentoo.org</email>
<name>Gentoo Video project</name>
</maintainer>
- <use>
- <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
- </use>
<upstream>
<remote-id type="sourceforge">avidemux</remote-id>
</upstream>
diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
index bb1a0715a86..2511f6ebe25 100644
--- a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
+++ b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
IUSE=""
BDEPEND="
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 8a9626ab08b..b16b13a4d7a 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1 +1,2 @@
DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
+DIST bino-1.6.8.tar.xz 836712 BLAKE2B 801d6f1ffbf1a7fbaabcdbb2c4bd649662d3b14b08189431a418702177f5de28a8961763c83962fd72cbf6f762fad34ed0b616efc68a723f65b6c72823618897 SHA512 d8cf5be356add4ed3fb36673038b5ffd92d0dc840798cc616fa4b11fec221c7f114347dfc7cdb7a3a24c5599b56301cddc99f84d3862d8e874612960281319cc
diff --git a/media-video/bino/bino-1.6.8.ebuild b/media-video/bino/bino-1.6.8.ebuild
new file mode 100644
index 00000000000..0cdd8ab1a37
--- /dev/null
+++ b/media-video/bino/bino-1.6.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Stereoscopic and multi-display media player"
+HOMEPAGE="https://bino3d.org/"
+SRC_URI="https://bino3d.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc lirc video_cards_nvidia"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ >=media-libs/glew-1.6.0:0=
+ >=media-libs/libass-0.9.9
+ >=media-libs/openal-1.15.1
+ virtual/libintl
+ >=media-video/ffmpeg-0.7:0=
+ lirc? ( app-misc/lirc )
+ video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+ virtual/pkgconfig"
+
+src_configure() {
+ if use video_cards_nvidia; then
+ append-cppflags "-I${ESYSROOT}/usr/include/NVCtrl"
+ append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/opengl/nvidia/lib -L${ESYSROOT}/usr/$(get_libdir)"
+ append-libs "Xext"
+ fi
+
+ if use lirc; then
+ append-cppflags "-I${ESYSROOT}/usr/include/lirc"
+ append-libs "lirc_client"
+ fi
+
+ # Fix a compilation error because of a multiple definitions error in glew
+ append-ldflags "-zmuldefs"
+
+ export MOC="$(qt5_get_bindir)"/moc
+ export RCC="$(qt5_get_bindir)"/rcc
+
+ econf \
+ $(use_with video_cards_nvidia xnvctrl) \
+ $(use_with lirc) \
+ $(use_enable debug) \
+ --without-equalizer \
+ --with-qt-version=5
+}
+
+src_install() {
+ default
+
+ if ! use doc; then
+ rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+ fi
+}
diff --git a/media-video/ccextractor/ccextractor-0.88.ebuild b/media-video/ccextractor/ccextractor-0.88.ebuild
index 72d1707c169..3a4800596f1 100644
--- a/media-video/ccextractor/ccextractor-0.88.ebuild
+++ b/media-video/ccextractor/ccextractor-0.88.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake flag-o-matic
+inherit cmake
DESCRIPTION="Extract closed captioning subtitles from video to SRT"
HOMEPAGE="https://www.ccextractor.org/"
diff --git a/media-video/celluloid/celluloid-0.21.ebuild b/media-video/celluloid/celluloid-0.21.ebuild
index 6a771a6e23f..6427cae1f4e 100644
--- a/media-video/celluloid/celluloid-0.21.ebuild
+++ b/media-video/celluloid/celluloid-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/celluloid-player/celluloid/releases/download/v${PV}/
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
RDEPEND=">=dev-libs/glib-2.44
>=x11-libs/gtk+-3.22.23:3
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 777126265c8..fda8b5ce554 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1 +1 @@
-DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
+DIST cheese-41.1.tar.xz 1092912 BLAKE2B 9bbfbc59868f39b344b1102f819ca647d82e9dee327f1d2a2e6b30fcfd2c59dd5f79236355d7148e01a4b07d80d630406708d2a152535b5732cfb52690f9f402 SHA512 2c0922dda97f4ce701add45977b405eff9ddbc24eb286e9e05a9f9bfbd7998e8e77ef2a8f1bbce9f8349ff522ee3cb6d6566fa5df80d782e6d844bff69a30074
diff --git a/media-video/cheese/cheese-3.38.0.ebuild b/media-video/cheese/cheese-3.38.0.ebuild
deleted file mode 100644
index 1044f8b7f62..00000000000
--- a/media-video/cheese/cheese-3.38.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MAX_API_VERSION="0.50"
-
-inherit gnome.org gnome2-utils meson vala virtualx xdg
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # subslot = libcheese soname version
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="gtk-doc +introspection test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- >=media-libs/clutter-1.13.2:1.0[introspection?]
- media-libs/clutter-gst:3.0
- >=media-libs/clutter-gtk-0.91.8:1.0
- x11-libs/gdk-pixbuf:2[jpeg,introspection?]
- >=dev-libs/glib-2.39.90:2
- >=gnome-base/gnome-desktop-2.91.6:3=
- >=media-libs/gstreamer-1.4:1.0[introspection?]
- >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis]
- >=media-libs/gst-plugins-bad-1.4:1.0
- >=x11-libs/gtk+-3.13.4:3
- >=media-libs/libcanberra-0.26[gtk3]
- x11-libs/libX11
- sys-apps/dbus
- media-video/gnome-video-effects
- introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-
- media-libs/cogl:1.0=[introspection?]
-
-"
-RDEPEND="${DEPEND}
- >=media-libs/gst-plugins-good-1.4:1.0
-
- >=media-plugins/gst-plugins-jpeg-1.4:1.0
- >=media-plugins/gst-plugins-v4l2-1.4:1.0
- >=media-plugins/gst-plugins-vpx-1.4:1.0
-"
-
-BDEPEND="
- gtk-doc? ( dev-util/gtk-doc )
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.3
- dev-util/itstool
- dev-libs/appstream-glib
- dev-libs/libxml2:2
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- x11-base/xorg-proto
- test? ( x11-libs/libXtst )
- $(vala_depend)
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-buildfix.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc gtk_doc)
- $(meson_use introspection)
- $(meson_use test tests)
- -Dman=true
- )
-
- meson_src_configure
-
- # Hack: version.xml is not generated if gtk-doc is not enabled
- echo ${PV} > docs/reference/version.xml
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/media-video/cheese/cheese-3.38.0-r1.ebuild b/media-video/cheese/cheese-41.1.ebuild
index f721a44d310..77211bff172 100644
--- a/media-video/cheese/cheese-3.38.0-r1.ebuild
+++ b/media-video/cheese/cheese-41.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
LICENSE="GPL-2+"
SLOT="0/8" # subslot = libcheese soname version
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="gtk-doc +introspection test"
RESTRICT="!test? ( test )"
@@ -38,7 +38,10 @@ RDEPEND="${DEPEND}
>=media-libs/gst-plugins-good-1.4:1.0
>=media-plugins/gst-plugins-jpeg-1.4:1.0
- >=media-plugins/gst-plugins-v4l2-1.4:1.0
+ || (
+ >=media-plugins/gst-plugins-v4l2-1.4:1.0
+ media-video/pipewire[gstreamer,v4l]
+ )
>=media-plugins/gst-plugins-vpx-1.4:1.0
"
@@ -58,9 +61,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${P}-buildfix.patch
- "${FILESDIR}"/${P}-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
- "${FILESDIR}"/${P}-vala-genericarray.patch
+ "${FILESDIR}"/${PN}-3.38.0-buildfix.patch
)
src_prepare() {
diff --git a/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch b/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
deleted file mode 100644
index 5a27eb6e784..00000000000
--- a/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From e7046d564a6f76c1af8f5640ac9c569e07284ec0 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 18 Sep 2020 12:06:45 +0200
-Subject: [PATCH] Fix infinite loop if thumbnailer is not available
-
-The code in cheese_thumb_view_idle_append_item() in
-src/thumbview/cheese-thumb-view.c didn't pop the list of items to
-thumbnail if thumbnailing failed.
-
- #0 0x00007f4a60e55314 in open64 () at /lib64/libc.so.6
- #1 0x00007f4a60de6386 in _IO_file_open () at /lib64/libc.so.6
- #2 0x00007f4a60de655a in __GI__IO_file_fopen () at /lib64/libc.so.6
- #3 0x00007f4a60dd9aad in __fopen_internal () at /lib64/libc.so.6
- #4 0x00007f4a6157a43f in gdk_pixbuf_new_from_file () at /lib64/libgdk_pixbuf-2.0.so.0
- #5 0x00007f4a61e84b3a in gnome_desktop_thumbnail_factory_lookup () at /lib64/libgnome-desktop-3.so.19
- #6 0x000055cef476046f in cheese_thumb_view_idle_append_item ()
- #7 0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
- #8 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
- #9 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
- #10 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
- #11 0x00007f4a6146a7ca in g_application_run () at /lib64/libgio-2.0.so.0
- #12 0x000055cef4758547 in _vala_main ()
- #13 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
- #14 0x000055cef47554be in _start ()
-
- #0 0x00007f4a60ec562d in __strlen_avx2 () at /lib64/libc.so.6
- #1 0x00007f4a61275de8 in g_str_has_suffix () at /lib64/libglib-2.0.so.0
- #2 0x00007f4a618c0072 in icon_name_is_symbolic () at /lib64/libgtk-3.so.0
- #3 0x00007f4a618c00b1 in theme_dir_get_icon_suffix () at /lib64/libgtk-3.so.0
- #4 0x00007f4a618c32ed in theme_lookup_icon () at /lib64/libgtk-3.so.0
- #5 0x00007f4a618c3adf in real_choose_icon () at /lib64/libgtk-3.so.0
- #6 0x00007f4a618c4762 in gtk_icon_theme_lookup_icon_for_scale () at /lib64/libgtk-3.so.0
- #7 0x00007f4a618c5105 in gtk_icon_theme_load_icon_for_scale () at /lib64/libgtk-3.so.0
- #8 0x000055cef47605c9 in cheese_thumb_view_idle_append_item ()
- #9 0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
- #10 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
- #11 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
- #12 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
- #13 0x00007f4a6146a7d8 in g_application_run () at /lib64/libgio-2.0.so.0
- #14 0x000055cef4758547 in _vala_main ()
- #15 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
- #16 0x000055cef47554be in _start ()
-
-Closes: #81
----
- src/thumbview/cheese-thumb-view.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
-index 1d2d88f5..232fd4b6 100644
---- a/src/thumbview/cheese-thumb-view.c
-+++ b/src/thumbview/cheese-thumb-view.c
-@@ -92,7 +92,7 @@ GtkWidget * cheese_thumb_view_new (void);
- static gboolean
- cheese_thumb_view_idle_append_item (gpointer data)
- {
-- CheeseThumbViewIdleData *item = g_queue_peek_head (data);
-+ CheeseThumbViewIdleData *item = g_queue_pop_head (data);
- CheeseThumbView *thumb_view;
- CheeseThumbViewPrivate *priv;
-
-@@ -119,6 +119,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
- if (!info)
- {
- g_warning ("Invalid filename\n");
-+ g_slice_free (CheeseThumbViewIdleData, item);
- return TRUE;
- }
- g_file_info_get_modification_time (info, &mtime);
-@@ -167,6 +168,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
- if (error)
- {
- g_warning ("%s", error->message);
-+ g_slice_free (CheeseThumbViewIdleData, item);
- return TRUE;
- }
- }
-@@ -183,7 +185,6 @@ cheese_thumb_view_idle_append_item (gpointer data)
- g_object_unref (pixbuf);
- g_object_unref (file);
- g_slice_free (CheeseThumbViewIdleData, item);
-- g_queue_pop_head (data);
-
- return TRUE;
- }
---
-2.28.0
-
diff --git a/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch b/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch
deleted file mode 100644
index dcbd1c1b2c5..00000000000
--- a/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 7cf6268e54620bbbe5e6e61800c50fb0cb4bea57 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
-Date: Fri, 16 Oct 2020 19:56:26 +0200
-Subject: [PATCH] Change GLib.PtrArray into GLib.GenericArray
-
-This is the vala-friendly way of handling GPtrArray.
-Fix several memory leaks on the go and unnecessary reference increase.
----
- src/cheese-preferences.vala | 26 ++++++++++++--------------
- src/cheese-window.vala | 22 +++++++++++-----------
- src/vapi/cheese-common.vapi | 2 +-
- 3 files changed, 24 insertions(+), 26 deletions(-)
-
-diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
-index f56af7e0..80a92431 100644
---- a/src/cheese-preferences.vala
-+++ b/src/cheese-preferences.vala
-@@ -100,7 +100,7 @@ public PreferencesDialog (Cheese.Camera camera)
- */
- private void initialize_camera_devices ()
- {
-- unowned GLib.PtrArray devices = camera.get_camera_devices ();
-+ GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
- camera_model = new Gtk.ListStore (2, typeof (string), typeof (Cheese.CameraDevice));
-
- source_combo.model = camera_model;
-@@ -357,13 +357,13 @@ public PreferencesDialog (Cheese.Camera camera)
- */
- private void on_camera_update_num_camera_devices ()
- {
-- unowned GLib.PtrArray devices = camera.get_camera_devices ();
-- Cheese.CameraDevice dev;
-+ GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
-+ unowned Cheese.CameraDevice dev;
-
- // Add (if) / Remove (else) a camera device.
-- if (devices.len > camera_model.iter_n_children (null))
-+ if (devices.length > camera_model.iter_n_children (null))
- {
-- dev = (Cheese.CameraDevice) devices.index (devices.len - 1);
-+ dev = devices.get (devices.length - 1);
- add_camera_device(dev);
- }
- else
-@@ -382,12 +382,11 @@ public PreferencesDialog (Cheese.Camera camera)
- bool device_removed = false;
- devices.foreach ((device) =>
- {
-- var old_device = (Cheese.CameraDevice) device;
- Cheese.CameraDevice new_device;
- camera_model.get (iter, 1, out new_device, -1);
-
- // Found the device that was removed.
-- if (old_device != new_device)
-+ if (device != new_device)
- {
- remove_camera_device (iter, new_device, active_device);
- device_removed = true;
-@@ -418,17 +417,16 @@ public PreferencesDialog (Cheese.Camera camera)
- *
- * @param device a Cheese.CameraDevice to add to the device combo box model
- */
-- private void add_camera_device (void *device)
-+ private void add_camera_device (Cheese.CameraDevice device)
- {
- TreeIter iter;
-- Cheese.CameraDevice dev = (Cheese.CameraDevice) device;
-
- camera_model.append (out iter);
- camera_model.set (iter,
-- 0, dev.get_name (),
-- 1, dev);
-+ 0, device.get_name (),
-+ 1, device);
-
-- if (camera.get_selected_device () == dev)
-+ if (camera.get_selected_device () == device)
- source_combo.set_active_iter (iter);
-
- if (camera_model.iter_n_children (null) > 1)
-@@ -445,12 +443,12 @@ public PreferencesDialog (Cheese.Camera camera)
- private void remove_camera_device (TreeIter iter, Cheese.CameraDevice device_node,
- Cheese.CameraDevice active_device_node)
- {
-- unowned GLib.PtrArray devices = camera.get_camera_devices ();
-+ GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
-
- // Check if the camera that we want to remove, is the active one
- if (device_node == active_device_node)
- {
-- if (devices.len > 0)
-+ if (devices.length > 0)
- set_new_available_camera_device (iter);
- else
- this.hide ();
-diff --git a/src/cheese-window.vala b/src/cheese-window.vala
-index ff069808..cc119b68 100644
---- a/src/cheese-window.vala
-+++ b/src/cheese-window.vala
-@@ -1216,9 +1216,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
- */
- public void on_switch_camera_clicked ()
- {
-- Cheese.CameraDevice selected;
-- Cheese.CameraDevice next = null;
-- GLib.PtrArray cameras;
-+ unowned Cheese.CameraDevice selected;
-+ unowned Cheese.CameraDevice next = null;
-+ GLib.GenericArray<unowned Cheese.CameraDevice> cameras;
- uint i;
-
- if (camera == null)
-@@ -1235,9 +1235,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-
- cameras = camera.get_camera_devices ();
-
-- for (i = 0; i < cameras.len; i++)
-+ for (i = 0; i < cameras.length; i++)
- {
-- next = (Cheese.CameraDevice )cameras.index (i);
-+ next = cameras.get (i);
-
- if (next == selected)
- {
-@@ -1245,13 +1245,13 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
- }
- }
-
-- if (i + 1 < cameras.len)
-+ if (i + 1 < cameras.length)
- {
-- next = (Cheese.CameraDevice )cameras.index (i + 1);
-+ next = cameras.get (i + 1);
- }
- else
- {
-- next = (Cheese.CameraDevice )cameras.index (0);
-+ next = cameras.get (0);
- }
-
- if (next == selected)
-@@ -1269,8 +1269,8 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
- */
- public void set_switch_camera_button_state ()
- {
-- Cheese.CameraDevice selected;
-- GLib.PtrArray cameras;
-+ unowned Cheese.CameraDevice selected;
-+ GLib.GenericArray<unowned Cheese.CameraDevice> cameras;
-
- if (camera == null)
- {
-@@ -1288,7 +1288,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-
- cameras = camera.get_camera_devices ();
-
-- if (cameras.len > 1)
-+ if (cameras.length > 1)
- {
- switch_camera_button.set_visible (true);
- return;
-diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
-index 6517cdfc..e4ae7ad3 100644
---- a/src/vapi/cheese-common.vapi
-+++ b/src/vapi/cheese-common.vapi
-@@ -35,7 +35,7 @@ namespace Cheese
- [CCode (has_construct_function = false)]
- public Camera (Clutter.Actor video_texture, string camera_device_node, int x_resolution, int y_resolution);
- public bool get_balance_property_range (string property, double min, double max, double def);
-- public unowned GLib.PtrArray get_camera_devices ();
-+ public GLib.GenericArray<unowned Cheese.CameraDevice> get_camera_devices ();
- public unowned Cheese.VideoFormat get_current_video_format ();
- public int get_num_camera_devices ();
- public unowned Cheese.CameraDevice get_selected_device ();
---
-GitLab
-
diff --git a/media-video/clive/Manifest b/media-video/clive/Manifest
deleted file mode 100644
index 6f7fc1dffe9..00000000000
--- a/media-video/clive/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST clive-2.3.0.1.tar.gz 43551 BLAKE2B eea428fdce2598e01e85a81f90110f2f1e4a7d9e8033d39745817d97886f80ddadfe2ba649e9778ab84f11c2f6fe2360eefda24cf5d0285c1a1a248ee7f6b1b6 SHA512 7426d6e8f19c358b30a7d33257d7ee536802eb35442d3cac68f6742613696ab1b280457a65d980237b53b692c5cf311725e46a5d8c27c7f2200172d050337cfc
diff --git a/media-video/clive/clive-2.3.0.1.ebuild b/media-video/clive/clive-2.3.0.1.ebuild
deleted file mode 100644
index 60f93ec9b36..00000000000
--- a/media-video/clive/clive-2.3.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GENTOO_DEPEND_ON_PERL_SUBSLOT=no
-inherit perl-module
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="clipboard pager password test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
- >=dev-perl/Config-Tiny-2.12
- >=virtual/perl-Digest-SHA-5.47
- >=dev-perl/HTML-TokeParser-Simple-2.37
- >=dev-perl/Class-Singleton-1.4
- >=dev-perl/WWW-Curl-4.05
- >=dev-perl/XML-Simple-2.18
- >=dev-perl/Getopt-ArgvFile-1.11
- dev-perl/JSON-XS
- dev-perl/URI
- virtual/perl-Getopt-Long
- virtual/perl-File-Spec
- clipboard? ( >=dev-perl/Clipboard-0.09 )
- pager? ( >=dev-perl/IO-Pager-0.05 )
- password? ( >=dev-perl/Expect-1.21 )
- media-libs/quvi
- || ( net-misc/wget net-misc/curl )"
-DEPEND="test? ( dev-perl/Test-Pod ${RDEPEND} )"
-
-SRC_TEST=do
-mydoc="NEWS"
-
-src_install() {
- perl-module_src_install
- dodir /etc/clive
- cat <<-EOF > "${ED}"/etc/clive/config || die
- --quvi "quvi %u"
- --get-with "if type -P wget >/dev/null 2>&1; then wget -c -O %f %u; else curl -L -C - -o %f %u; fi"
- --filename-format "%t.%s"
- EOF
-}
-
-src_test() {
- if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
- elog "If you wish to run the full testsuite of ${PN}"
- elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
- elog "Note that the tests try to download some videos from various websites"
- elog "and thus may randomly fail depending on the site's status."
- export NO_INTERNET=1
- fi
- perl-module_src_test
-}
diff --git a/media-video/clive/metadata.xml b/media-video/clive/metadata.xml
deleted file mode 100644
index dd82ce744e9..00000000000
--- a/media-video/clive/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <longdescription lang="en">Command line tool for extracting videos from Youtube, Google Video,
- Dailymotion, Guba (free) and Stage6 websites</longdescription>
- <use>
- <flag name="clipboard">Support reading from X clipboard</flag>
- <flag name="pager">Support pager!?</flag>
- <flag name="password">Support password controlled sites</flag>
- </use>
- <upstream>
- <remote-id type="google-code">clive</remote-id>
- <remote-id type="sourceforge">clive</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 0e6ab14fb5a..12f6fb49aba 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1 +1,2 @@
DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
+DIST devedeng-4.17.0.tar.bz2 1773455 BLAKE2B 46d91145f94122bb3a9e83368f50dde6f1b25cecf5101c7d79bbc237bad69cb3d80d3b78429be76af2e4652eeb09e99e12c6c014c6bac8e71a7dd01d689ba634 SHA512 942e9a969146ae87bf1f1a5fa7441459801258f7dcac5a2f2ac8def146c6d88d8d3db27c474b7741cdc980c0757f99e6ee03b0da524f71895ebdbe2fe442a179
diff --git a/media-video/devedeng/devedeng-4.16.0-r1.ebuild b/media-video/devedeng/devedeng-4.16.0-r2.ebuild
index 48ab84c28f7..af4294ad0c8 100644
--- a/media-video/devedeng/devedeng-4.16.0-r1.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 xdg
@@ -29,6 +29,9 @@ RDEPEND="
DEPEND="${PYTHON_DEPS}"
+# src/unitests only works against system installed devedeng
+RESTRICT="test"
+
PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch )
src_prepare() {
diff --git a/media-video/devedeng/devedeng-4.17.0.ebuild b/media-video/devedeng/devedeng-4.17.0.ebuild
new file mode 100644
index 00000000000..af4294ad0c8
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.17.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="https://www.rastersoft.com/programas/devede.html"
+SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-cdr/cdrtools
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3
+ || ( media-video/vlc media-video/mpv media-video/mplayer )
+ media-video/ffmpeg
+ media-video/dvdauthor
+ media-video/vcdimager
+ || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
+
+DEPEND="${PYTHON_DEPS}"
+
+# src/unitests only works against system installed devedeng
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch )
+
+src_prepare() {
+ default
+
+ # Documentation path
+ sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${P}#" \
+ -i src/devedeng/configuration_data.py || die
+ sed -e "/'doc'/s/devedeng/${P}/" -i setup.py || die
+
+ # Desktop icon
+ sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
+}
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index eaca205848f..4cb844547c7 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1 +1,2 @@
-DIST droidcam-1.8.0.tar.gz 84376 BLAKE2B 581e57e2c80dd9662764e399dd797e5893f617e69ee2501a1063d1c51434baf64d7d2b72779debede6d679127f31fa95a4e67953978da591acbf6a41bd05551d SHA512 b448f686562030b352630c6b677a098ecb5041582dd06e57809b04674cb334d02ddfdf1d09b43e1ecc70897e8073714ad6913ab14d894a7679fc433adb3fda82
+DIST droidcam-1.8.1.tar.gz 84566 BLAKE2B ba023c98159003bef39eac2fcff211243aa5fb2cc4369a333c5b78c9708b8c34ff9987d6b84628b32e436bab776e0c8c83f75b7c6a788f85831d3d17dd468833 SHA512 58ce6014004edcbf89b4847ed916f9cd2757865172c61e446a04b2f6d93395db1013f0cb31f0b10161bfd83a1436e684891c3457371a3ad62308509bb85b4cf4
+DIST droidcam-1.8.2.tar.gz 84797 BLAKE2B b2458dd04b467106a6d9a8a9f3d44058641a7c8ca429d5c92f498401c07f6bc364dc056755f21b40faac7e7aec1877250afb119ac3b7f979b24cdeb86f45c384 SHA512 507f513c8d0dffa86afe5368ccab5461931e236b6352269a6eb5e970a79e5f9b386808da3466f3b391e955170b47b24a82663632ddc3c3c84e4de5988b7d3f8f
diff --git a/media-video/droidcam/droidcam-1.8.0-r1.ebuild b/media-video/droidcam/droidcam-1.8.1-r2.ebuild
index d8148256078..819276a7b5d 100644
--- a/media-video/droidcam/droidcam-1.8.0-r1.ebuild
+++ b/media-video/droidcam/droidcam-1.8.1-r2.ebuild
@@ -30,7 +30,6 @@ DEPEND="
>=media-libs/speex-1.2.0-r1
media-video/ffmpeg
gtk? (
- dev-cpp/gtkmm:3.0
x11-libs/gdk-pixbuf
x11-libs/gtk+:3
x11-libs/libX11
@@ -44,22 +43,22 @@ BUILD_TARGETS="all"
MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV VIDEO_V4L2 MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
src_prepare() {
if ! use gtk; then
- sed -i -e '/cflags gtk+/d' Makefile || die
default
+ sed -i -e '/cflags gtk+/d' Makefile || die
else
+ xdg_src_prepare
# remove path and extension from Icon and Exec entry
sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
-e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
droidcam.desktop || die
sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
- xdg_src_prepare
fi
}
diff --git a/media-video/droidcam/droidcam-1.8.0.ebuild b/media-video/droidcam/droidcam-1.8.2.ebuild
index 60f47eb1847..5f559ce94e0 100644
--- a/media-video/droidcam/droidcam-1.8.0.ebuild
+++ b/media-video/droidcam/droidcam-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,7 +30,6 @@ DEPEND="
>=media-libs/speex-1.2.0-r1
media-video/ffmpeg
gtk? (
- dev-cpp/gtkmm:3.0
x11-libs/gdk-pixbuf
x11-libs/gtk+:3
x11-libs/libX11
@@ -44,22 +43,22 @@ BUILD_TARGETS="all"
MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV VIDEO_V4L2 MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
src_prepare() {
if ! use gtk; then
- sed -i -e '/cflags gtk+/d' Makefile || die
default
+ sed -i -e '/cflags gtk+/d' Makefile || die
else
+ xdg_src_prepare
# remove path and extension from Icon and Exec entry
sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
-e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
droidcam.desktop || die
sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
- xdg_src_prepare
fi
}
@@ -73,7 +72,19 @@ src_compile() {
emake droidcam
fi
emake droidcam-cli
- KERNELRELEASE="${KV_FULL}" linux-mod_src_compile
+
+ if linux_chkconfig_present CC_IS_CLANG; then
+ BUILD_PARAMS+=' CC=${CHOST}-clang'
+ if linux_chkconfig_present LD_IS_LLD; then
+ BUILD_PARAMS+=' LD=ld.lld'
+ if linux_chkconfig_present LTO_CLANG_THIN; then
+ # kernel enables cache by default leading to sandbox violations
+ BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+ fi
+ fi
+ fi
+ export KERNEL_DIR || die
+ linux-mod_src_compile
}
src_test() {
@@ -113,10 +124,10 @@ src_install() {
}
pkg_preinst() {
+ linux-mod_pkg_preinst
if use gtk; then
xdg_pkg_preinst
fi
- linux-mod_pkg_preinst
}
pkg_postinst() {
@@ -137,8 +148,8 @@ pkg_postinst() {
}
pkg_postrm() {
+ linux-mod_pkg_postrm
if use gtk; then
xdg_pkg_postrm
fi
- linux-mod_pkg_postrm
}
diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/media-video/droidcam/files/droidcam-makefile-fixes.patch
index 5230c18f0f3..9c6ad4c45c0 100644
--- a/media-video/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-video/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
-index 7be3c15..099a707 100644
+index 7be3c15..8af0953 100644
--- a/Makefile
+++ b/Makefile
-@@ -6,7 +6,7 @@
+@@ -6,25 +6,23 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Use at your own risk. See README file for more details.
@@ -11,7 +11,9 @@ index 7be3c15..099a707 100644
JPEG_INCLUDE ?= $(JPEG_DIR)/include
JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
-@@ -16,15 +16,15 @@ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-CC = gcc
+-CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
GTK += `pkg-config --cflags --libs appindicator3-0.1`
LIBAV = `pkg-config --libs --cflags libswscale libavutil`
LIBS = -lspeex -lasound -lpthread -lm
@@ -31,7 +33,7 @@ index 7be3c15..099a707 100644
package: clean all
zip "droidcam_$(RELEASE).zip" \
LICENSE README* icon2.png \
-@@ -40,11 +40,11 @@ gresource: .gresource.xml icon2.png
+@@ -40,11 +38,11 @@ gresource: .gresource.xml icon2.png
droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
droidcam-cli: src/droidcam-cli.c $(SRC)
@@ -45,3 +47,16 @@ index 7be3c15..099a707 100644
clean:
rm -f droidcam
+diff --git a/v4l2loopback/Makefile b/v4l2loopback/Makefile
+index 28c4502..02356e9 100644
+--- a/v4l2loopback/Makefile
++++ b/v4l2loopback/Makefile
+@@ -11,7 +11,7 @@ install:
+ $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install
+
+ test:
+- gcc test.c -o test
++ $(CC) test.c -o test
+
+ clean:
+ $(MAKE) -C $(KERNEL_DIR) M=$(PWD) clean
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
index 31a52bda60c..7065ceb972a 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit epatch flag-o-matic perl-module
+EAPI=8
+
+inherit desktop flag-o-matic perl-module
DESCRIPTION="dvd::rip is a graphical frontend for transcode"
HOMEPAGE="https://www.exit1.org/dvdrip/"
@@ -39,35 +40,46 @@ RDEPEND="${DEPEND}
>=media-video/lsdvd-0.15
"
-pkg_setup() {
- filter-flags -ftracer
- export SKIP_UNPACK_REQUIRED_MODULES=1 #255269
+DOCS=( "Changes*" Credits README TODO )
- perl_set_version
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-r5-fix_parallel_make.patch
+)
src_prepare() {
- sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
- epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
- # Fix default device for >=udev-180 wrt #224559
+ # bug #333739
+ sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die
+
+ default
+
+ # Fix default device for >=udev-180, bug #224559
sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
}
+src_configure() {
+ filter-flags -ftracer
+
+ # bug #255269
+ export SKIP_UNPACK_REQUIRED_MODULES=1
+
+ perl-module_src_configure
+}
+
src_install() {
newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
make_desktop_entry dvdrip dvd::rip
- mydoc="Changes* Credits README TODO" perl-module_src_install
+ perl-module_src_install
}
pkg_postinst() {
- # bug 173924
+ # bug #173924
if use fping; then
ewarn "For dvdrip-master to work correctly with cluster mode,"
ewarn "the fping binary must be setuid."
ewarn ""
ewarn "Run this command to fix it:"
- ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+ ewarn "chmod u=rwsx,g=rx,o=rx ${EROOT}/usr/sbin/fping"
ewarn ""
ewarn "Note that this is a security risk when enabled."
fi
diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch b/media-video/dvdrip/files/dvdrip-0.98.11-r5-fix_parallel_make.patch
index df766c07cbc..ded1f69cd28 100644
--- a/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch
+++ b/media-video/dvdrip/files/dvdrip-0.98.11-r5-fix_parallel_make.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/266739
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
@@ -3,10 +3,10 @@
all: ../bin/dvdrip-splitpipe ../bin/dvdrip-progress
@@ -15,8 +15,8 @@ http://bugs.gentoo.org/266739
clean:
rm -f dvdrip-splitpipe ../bin/dvdrip-splitpipe dvdrip-progress ../bin/dvdrip-progress
---- Makefile.PL
-+++ Makefile.PL
+--- a/Makefile.PL
++++ b/Makefile.PL
@@ -52,7 +52,7 @@
sub MY::postamble {
'
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 685628c2b43..1bfc852cc5d 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1 +1,2 @@
DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
+DIST DVDStyler-3.2.1.tar.bz2 9040634 BLAKE2B f6c3ec5d6595b650ead167ae6532a0849cc6545e1531f10483a7dd2f9962ea6cd4494b7eb8224bbc6e70588b1054fc13a13a5e2f5d977b5b80692c7cc2553d53 SHA512 09124a6c8db2b8d8072bfe2f7de98474d736a36a66d5124eab1b925da9ca830901f554ca80d9a4403365616001d869237002a2cb467cf3cc11b37aea12ff9d90
diff --git a/media-video/dvdstyler/dvdstyler-3.2.1.ebuild b/media-video/dvdstyler/dvdstyler-3.2.1.ebuild
new file mode 100644
index 00000000000..b42c542e370
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-3.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=3.0-gtk3
+
+inherit wxwidgets
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="https://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +udev"
+
+DEPEND="
+ app-cdr/cdrtools
+ >=app-cdr/dvd+rw-tools-7.1
+ media-libs/libexif:=
+ >=media-libs/wxsvg-1.5.23:=
+ >=media-video/dvdauthor-0.7.1
+ >=media-video/ffmpeg-2.6:0=[encode]
+ >=media-video/xine-ui-0.99.7
+ virtual/jpeg:0
+ x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
+ sys-apps/dbus
+ udev? ( >=virtual/libudev-215:= )"
+RDEPEND="${DEPEND}
+ >=app-cdr/dvdisaster-0.72.4
+ media-video/mjpegtools"
+BDEPEND="
+ app-arch/zip
+ app-text/xmlto
+ sys-devel/gettext
+ virtual/yacc
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/ffmpeg5.patch "${FILESDIR}"/wx30.patch )
+
+src_prepare() {
+ default
+
+ # disable obsolete GNOME 2.x libraries wrt #508854
+ sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
+ # rmdir: failed to remove `tempfoobar': Directory not empty
+ sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+ # fix underlinking wrt #367863
+ sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+ # silence desktop-file-validate QA check
+ sed -i \
+ -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
+ data/dvdstyler.desktop || die
+}
+
+src_configure() {
+ setup-wxwidgets unicode
+ econf \
+ $(use_enable debug) \
+ --with-wx-config="${WX_CONFIG}"
+}
+
+src_install() {
+ default
+ rm "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} || die
+}
diff --git a/media-video/dvdstyler/files/ffmpeg5.patch b/media-video/dvdstyler/files/ffmpeg5.patch
new file mode 100644
index 00000000000..c7ef0283307
--- /dev/null
+++ b/media-video/dvdstyler/files/ffmpeg5.patch
@@ -0,0 +1,89 @@
+Index: DVDStyler-3.2.1/src/mediaenc_ffmpeg.cpp
+===================================================================
+--- DVDStyler-3.2.1.orig/src/mediaenc_ffmpeg.cpp
++++ DVDStyler-3.2.1/src/mediaenc_ffmpeg.cpp
+@@ -26,10 +26,12 @@
+ extern "C" {
+ #define __STDC_CONSTANT_MACROS
+ #define __STDC_LIMIT_MACROS
++#include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ #include <libavutil/mathematics.h>
+ #include <libavutil/avstring.h>
++#include <libavutil/channel_layout.h>
+ }
+
+ #define AUDIO_BUF_SIZE 524288
+@@ -74,6 +76,9 @@ void print_error(const char *filename, i
+ bool wxFfmpegMediaEncoder::BeginEncode(const wxString& fileName, VideoFormat videoFormat, AudioFormat audioFormat,
+ AspectRatio aspectRatio, int videoBitrate, bool cbr) {
+ EndEncode();
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++ const
++#endif
+ AVOutputFormat* outputFormat = NULL;
+ if (videoFormat == vfNONE || audioFormat == afNONE)
+ outputFormat = av_guess_format(NULL, (const char*) fileName.ToUTF8(), NULL);
+@@ -83,13 +88,16 @@ bool wxFfmpegMediaEncoder::BeginEncode(c
+ wxLogError(wxT("Cannot open output format"));
+ return false;
+ }
+- outputFormat->video_codec = videoFormat == vfNONE ? AV_CODEC_ID_NONE : AV_CODEC_ID_MPEG2VIDEO;
++ enum AVCodecID video_codec, audio_codec;
++
++ video_codec = videoFormat == vfNONE ? AV_CODEC_ID_NONE : AV_CODEC_ID_MPEG2VIDEO;
++
+ if (audioFormat == afNONE)
+- outputFormat->audio_codec = AV_CODEC_ID_NONE;
++ audio_codec = AV_CODEC_ID_NONE;
+ else if (audioFormat == afAC3)
+- outputFormat->audio_codec = AV_CODEC_ID_AC3;
++ audio_codec = AV_CODEC_ID_AC3;
+ else
+- outputFormat->audio_codec = AV_CODEC_ID_MP2;
++ audio_codec = AV_CODEC_ID_MP2;
+
+ m_outputCtx = NULL;
+ avformat_alloc_output_context2(&m_outputCtx, outputFormat, NULL, (const char*) fileName.ToUTF8());
+@@ -101,9 +109,9 @@ bool wxFfmpegMediaEncoder::BeginEncode(c
+ m_outputCtx->packet_size = 2048;
+
+ // add video and audio streams
+- if (!addVideoStream(outputFormat->video_codec, videoFormat, aspectRatio, videoBitrate, cbr))
++ if (!addVideoStream(video_codec, videoFormat, aspectRatio, videoBitrate, cbr))
+ return false;
+- if (!addAudioStream(outputFormat->audio_codec))
++ if (!addAudioStream(audio_codec))
+ return false;
+
+ // open the output file
+@@ -170,6 +178,9 @@ bool wxFfmpegMediaEncoder::addVideoStrea
+ m_videoStm->id = 0;
+
+ // find the video encoder and open it
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++ const
++#endif
+ AVCodec* encoder = avcodec_find_encoder((AVCodecID) codecId);
+ if (!encoder) {
+ wxLogError(wxT("Video codec not found"));
+@@ -235,7 +246,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea
+ return true;
+ }
+
+-bool hasSampleFmt(AVCodec* codec, AVSampleFormat sample_fmt) {
++bool hasSampleFmt(const AVCodec* codec, AVSampleFormat sample_fmt) {
+ if (codec != NULL && codec->sample_fmts != NULL) {
+ int fIdx = 0;
+ while (codec->sample_fmts[fIdx] >= 0) {
+@@ -260,6 +271,9 @@ bool wxFfmpegMediaEncoder::addAudioStrea
+ m_audioStm->id = 1;
+
+ // find the audio encoder and open it
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++ const
++#endif
+ AVCodec* encoder = NULL;
+ AVSampleFormat sampleFmt = AV_SAMPLE_FMT_S16;
+ if ((AVCodecID) codecId == AV_CODEC_ID_AC3) {
diff --git a/media-video/dvdstyler/files/wx30.patch b/media-video/dvdstyler/files/wx30.patch
new file mode 100644
index 00000000000..1ffde52696f
--- /dev/null
+++ b/media-video/dvdstyler/files/wx30.patch
@@ -0,0 +1,14 @@
+Index: DVDStyler-3.2.1/wxVillaLib/PropDlg.cpp
+===================================================================
+--- DVDStyler-3.2.1.orig/wxVillaLib/PropDlg.cpp
++++ DVDStyler-3.2.1/wxVillaLib/PropDlg.cpp
+@@ -760,7 +760,9 @@ void wxPropDlg::OnSelectColour(wxCommand
+ ((wxButton*) event.GetEventObject())->GetName().Mid(12).ToLong(&index);
+ ColourPanel* panel = ((ColourPanel*) m_controls[index]);
+ m_colourData.SetColour(panel->GetColour());
++#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1
+ m_colourData.SetChooseAlpha(true);
++#endif
+ #ifdef __WXMSW__
+ wxGenericColourDialog dialog(propWindow, &m_colourData);
+ #else
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 5a325da1439..b3dc98cc13f 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -2,6 +2,7 @@ DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e
DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 1efaecf9dc6180539bc01a6e4f1403864ea2f9318cc1528aac0bb339d840e3eec40ddc60a531d8af52aae5592c38bbcad9d8dd260cedbe01ab655e2135766e6b SHA512 9588352af7b048ade3b681364a4edc29526241b0631e39314b9466f490d66a4e3b795f4c32afd0aadc2a3d63a9ce4e99a6bb77e4c3f79d959e68e82856882d32
DIST ffdiaporama-2.2-ffmpeg-4.4.patch 1034 BLAKE2B f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a67cccc9d2103d6ffecde80f7ca5ba48142 SHA512 14c2c8361836a0f95224577710b72d48fe9aa5c9a330777b8cb709a1ad02f95d9b8ba0f22ff9250e0a6898cfd8f6839658a94f59082d2da767299a81a38e9f8a
DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
+DIST ffdiaporama-2.2_pre20140701.tar.gz 63271629 BLAKE2B d04aa9900428373e1718b2d0542929df31d7cc53067d833b15be9b2976b7e3b23e0c1cc81353e971e04784198df19179e8fbc71c5d96c1f13eb4010a6ef2635c SHA512 19a17a5d0843368da2814c6dd6bcbc0fb72dc97ab1389df1c43b4db80a50f662db62f75afd864231c0ac4729f2b579f82d4909bc523bee570c543fa3cef65282
DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild
new file mode 100644
index 00000000000..da0e2817003
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="3c25c893a94dd3f88a7515437c42cd5628220625"
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="https://ffdiaporama.tuxfamily.org"
+SRC_URI="https://github.com/laurantino/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openclipart"
+
+RDEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-gfx/exiv2:=
+ >=media-video/ffmpeg-4:0=[encode]
+ openclipart? ( media-gfx/openclipart[svg,-gzip] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( authors.txt )
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_configure() {
+ eqmake5 QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ if use openclipart; then
+ dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart
+ fi
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index caf2ba51ace..4fac8cdb143 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,2 +1,2 @@
-DIST ffmpeg-chromium-94.tar.gz 14709687 BLAKE2B 06dedbd86befd8caed4c6cb34755b52cf70630f8fbd712f89d42e5b63e498f9d2a77935fbd7c87194f6d56fb0f83ff26beba00357dd51b3ac3e2e4480ff4351e SHA512 a6cf5404c892c878c50e3ba8369456db587e327bc3d77e857b9d34f3665ecfee7d3865b20e9871ccda570b30d9d34c03fd981cdc7f495809ea8f12cb8f15937e
+DIST ffmpeg-chromium-100.tar.gz 15144675 BLAKE2B 1195078e12ef0d8b5562b2eed068eea331a03727f3dfbd198fdd1088d70346f892bc9161ecd80ed54f7c5c842c9ae9b16f6d02858f3c4a538ce19de03b5ec9f8 SHA512 35f5ca7164d8d8f58b2f553ec7c6181629af217752fe49bd890051675734864ae4b5d1f135808d101fb0c9855d14842a0074759679a15e9b94fb571c9e2ccee7
DIST ffmpeg-chromium-96.tar.gz 14782341 BLAKE2B 686f5e0970ab49663e43d54cdb9b0216560dabc676711666c9e51840af64d2c78d47b55bcf36625751676839869e1b1f3b65516499646db00fd29f5ed2ff90d3 SHA512 169a1bf58000be0799b05b1d3f3a63b5a93ec66023d31f1ac6f5d9cd77408a390a9308fb626e94c3f1d4e1170638c1c81ac68b248e06c28d318d731ddda8e4d2
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild
index 94e03635413..da0652b2caa 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic toolchain-funcs
-COMMIT="2d6591aa0835768c437c221c88840ac0c99a50dc"
+COMMIT="574c39cce3231c69bc9a02ac475c27d944bdb113"
DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
HOMEPAGE="https://ffmpeg.org/"
SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz"
@@ -94,7 +94,7 @@ RDEPEND="
vaapi? ( >=x11-libs/libva-1.2.1-r1:0= )
video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 )
vdpau? ( >=x11-libs/libvdpau-0.7 )
- vulkan? ( >=media-libs/vulkan-loader-1.1.97:= )
+ vulkan? ( >=media-libs/vulkan-loader-1.2.189:= )
"
DEPEND="${RDEPEND}
@@ -114,7 +114,7 @@ RESTRICT="
S="${WORKDIR}"
PATCHES=(
- "${FILESDIR}"/${P}.patch
+ "${FILESDIR}"/${PN}-100.patch
"${FILESDIR}"/chromium.patch
)
@@ -181,7 +181,7 @@ src_configure() {
fi
local extra_libs
- if use arm || use ppc ; then
+ if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
# bug #782811
# bug #790590
extra_libs+="$(test-flags-CCLD -latomic) "
@@ -195,6 +195,7 @@ src_configure() {
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
--nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
--ranlib="$(tc-getRANLIB)" \
--pkg-config="$(tc-getPKG_CONFIG)" \
--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
index 8dafc5bbbac..d98240ebe12 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
@@ -16,7 +16,7 @@ LICENSE="
gpl? ( GPL-2 )
"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
# Options to use as use_enable in the foo[:bar] form.
# This will feed configure with $(use_enable foo bar)
diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch
new file mode 100644
index 00000000000..e0aa000faaa
--- /dev/null
+++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch
@@ -0,0 +1,27 @@
+diff -Naur a/configure b/configure
+--- a/configure 2022-03-22 10:20:35.000000000 +0000
++++ b/configure 2022-03-23 09:17:18.914615584 +0000
+@@ -6600,15 +6600,14 @@
+ { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
+ enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
+ enabled libopenvino && require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api
+-# Chromium uses a built in copy of libopus that is not visible to pkg-config.
+-# enabled libopus && {
+-# enabled libopus_decoder && {
+-# require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
+-# }
+-# enabled libopus_encoder && {
+-# require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
+-# }
+-# }
++enabled libopus && {
++ enabled libopus_decoder && {
++ require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
++ }
++ enabled libopus_encoder && {
++ require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
++ }
++}
+ enabled libplacebo && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create
+ enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new
+ enabled librabbitmq && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d1bac784ee0..26c66027649 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,7 +1,9 @@
DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407
DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
-DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
DIST ffmpeg-4.3.2.tar.bz2 11307134 BLAKE2B 97e1e598e4abe397b06298d545c3073ea2303e11c01e98343fe09d99174e02ca94f52c4df0d389fbefe7814686221446d30f107092f00cb0b69275c8747d6f32 SHA512 ec5566f8684f0ceb18184d59786ea1fc166ab28c46260ebcca5b919ad53137ba7317fd0c537e97df28553572a0d5e42c558773c808cf76995d67985aec2d6d4d
DIST ffmpeg-4.4.1.tar.bz2 11494996 BLAKE2B 050b0501cb21f44451d59bf3b20b18d55234636b5a69a4962103d63f80ce9af172cc2cecb1e33b92334fcf635b283afddbdfa20cbd6deb526008cdb34ae01c16 SHA512 c41e63ffa9f5465ea3a7f4a8b255b299a2f49d5868ada4310a2344b8fea02476365c44871defd5609da55c805cbb58f34063dbdd4b203ade932cba8b3cfefc72
-DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf SHA512 212c330f477e9452b9d7873d6d3c452a5c946b6b9c17b01d94c60fda66e61e53b78388ef7686b8d9415a27cd3e05d5f0d6639a02a22467dbf1ed483b5594c80f
+DIST ffmpeg-4.4.2.tar.xz 9562968 BLAKE2B be044e9895acdd71a237a343a8d047c56db845c693b8c07877fc8049b630eb254e3430b6e9916330e6b3d53cbdc9f06680d80307a1fea1377bb818f4168bb276 SHA512 abce847c607ac6d63fe32ceff8bf8724888acf2b7db9a083cba50e3235590cdcb27feb7e0a314133d0030809fb54d474f64001fc9ab7d896a819159869c09d5a
+DIST ffmpeg-4.4.2.tar.xz.asc 520 BLAKE2B 1ff4a886c7703a05a19499ae5b2b6207df24e05844861cb52f2c56a97f47ab4fefa5011de46a385bab9684964470697ec5e74553098392877f7521a04ffe0fc4 SHA512 a4df97a6328fc076b5611023bd61254f1a5043db1ec2f3426bee305206b2b0937047ede9cb51db31a3387a16218fe95a7a40296770574fa32660118938a9d301
+DIST ffmpeg-5.0.1.tar.xz 9812524 BLAKE2B 0a37d425780f7e15836848048214411829bceb0de12bb7089803feb3dda07a077be9c8e8174b72792558ed86d92224bee9d4db20cc74690ea54312fbf2f10e83 SHA512 e5810c7379748a6bbe1a903bf36b4372b67cb3973179727b6af6f0118eef46f4c990155961cc37255e08a5bafdc4b4683503ad410ebb7afe7a35b891c01fa602
+DIST ffmpeg-5.0.1.tar.xz.asc 520 BLAKE2B 686a8c372d26bd0158a0e79f6cbe8d9c46127bd200df7f4f6e2a4285bfd412cfa9aff865eca125a27a7204f32ba0cca86bcbf769ee4874e5202cc700b0eb4449 SHA512 9c4bd404196c3a3808bae92873aefc77f8c26a9419cc6130a3f2359a75c8e83189d206e9aee8ff85c5a7fe4a98da24e11cf607ec351386c18979ec2d5ad3b3ad
diff --git a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
index 2457a735302..82599993e2d 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -83,7 +83,7 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+ speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
@@ -250,7 +250,7 @@ RDEPEND="
svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
- video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] )
+ nvenc? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
vorbis? (
@@ -303,7 +303,7 @@ GPL_REQUIRED_USE="
)
"
REQUIRED_USE="
- cuda? ( video_cards_nvidia )
+ cuda? ( nvenc )
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )
@@ -320,7 +320,7 @@ PATCHES=(
"${FILESDIR}"/chromium-r1.patch
"${WORKDIR}/${PN}"-4.2.2-ppc64-gcc.patch # both ppc patches from
"${WORKDIR}/${PN}"-4.2.2-ppc64-altivec.patch # https://trac.ffmpeg.org/ticket/7861
-
+ "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch
)
MULTILIB_WRAPPED_HEADERS=(
@@ -342,6 +342,15 @@ src_prepare() {
multilib_src_configure() {
local myconf=( ${EXTRA_FFMPEG_CONF} )
+ # bug 842201
+ use ia64 && tc-is-gcc && append-flags \
+ -fno-tree-ccp \
+ -fno-tree-dominator-opts \
+ -fno-tree-fre \
+ -fno-code-hoisting \
+ -fno-tree-pre \
+ -fno-tree-vrp
+
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
use openssl && myconf+=( --enable-nonfree )
use samba && myconf+=( --enable-version3 )
@@ -463,6 +472,7 @@ multilib_src_configure() {
--cc="$(tc-getCC)" \
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
+ --strip="$(tc-getSTRIP)" \
--optflags="${CFLAGS}" \
$(use_enable static-libs static) \
"${myconf[@]}"
diff --git a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
index 25d462c1950..297bd22c24c 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -80,7 +80,7 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+ speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
@@ -248,7 +248,7 @@ RDEPEND="
svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
- video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
+ nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
vorbis? (
@@ -303,7 +303,7 @@ GPL_REQUIRED_USE="
)
"
REQUIRED_USE="
- cuda? ( video_cards_nvidia )
+ cuda? ( nvenc )
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )
@@ -320,6 +320,7 @@ PATCHES=(
"${FILESDIR}"/chromium-r1.patch
"${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch
"${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch
+ "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch
)
MULTILIB_WRAPPED_HEADERS=(
@@ -341,6 +342,15 @@ src_prepare() {
multilib_src_configure() {
local myconf=( )
+ # bug 842201
+ use ia64 && tc-is-gcc && append-flags \
+ -fno-tree-ccp \
+ -fno-tree-dominator-opts \
+ -fno-tree-fre \
+ -fno-code-hoisting \
+ -fno-tree-pre \
+ -fno-tree-vrp
+
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
use openssl && myconf+=( --enable-nonfree )
use samba && myconf+=( --enable-version3 )
@@ -464,6 +474,7 @@ multilib_src_configure() {
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
--nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
--ranlib="$(tc-getRANLIB)" \
--pkg-config="$(tc-getPKG_CONFIG)" \
--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
index 9506a778d11..6a6818ddac2 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -59,7 +59,7 @@ LICENSE="
samba? ( GPL-3 )
"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
fi
# Options to use as use_enable in the foo[:bar] form.
@@ -80,11 +80,11 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+ speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
@@ -95,10 +95,10 @@ FFMPEG_FLAG_MAP=(
# Same as above but for encoders, i.e. they do something only with USE=encode.
FFMPEG_ENCODER_FLAG_MAP=(
- amrenc:libvo-amrwbenc mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264
+ x265:libx265 xvid:libxvid
)
IUSE="
@@ -172,6 +172,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ amf? ( media-video/amdgpu-pro-amf )
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
@@ -188,8 +189,8 @@ RDEPEND="
rav1e? ( >=media-video/rav1e-0.4:=[capi] )
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
)
twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
@@ -244,16 +245,18 @@ RDEPEND="
sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh-0.5.5:=[sftp,${MULTILIB_USEDEP}] )
svg? (
gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
x11-libs/cairo[${MULTILIB_USEDEP}]
)
+ nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+ svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
- video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
@@ -266,11 +269,11 @@ RDEPEND="
>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
)
+ postproc? ( !media-libs/libpostproc )
zeromq? ( >=net-libs/zeromq-4.1.6 )
zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- postproc? ( !media-libs/libpostproc )
"
RDEPEND="${RDEPEND}
@@ -285,6 +288,7 @@ DEPEND="${RDEPEND}
BDEPEND="
>=sys-devel/make-3.81
virtual/pkgconfig
+ amf? ( media-libs/amf-headers )
cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
doc? ( sys-apps/texinfo )
@@ -306,7 +310,7 @@ GPL_REQUIRED_USE="
)
"
REQUIRED_USE="
- cuda? ( video_cards_nvidia )
+ cuda? ( nvenc )
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )
@@ -321,6 +325,7 @@ S=${WORKDIR}/${P/_/-}
PATCHES=(
"${FILESDIR}"/chromium-r1.patch
+ "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch
)
MULTILIB_WRAPPED_HEADERS=(
@@ -335,13 +340,30 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+
+ eapply "${FILESDIR}/vmaf-models-default-path.patch"
+
default
+
+ # -fdiagnostics-color=auto gets appended after user flags which
+ # will ignore user's preference.
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
}
multilib_src_configure() {
local myconf=( )
+ # bug 842201
+ use ia64 && tc-is-gcc && append-flags \
+ -fno-tree-ccp \
+ -fno-tree-dominator-opts \
+ -fno-tree-fre \
+ -fno-code-hoisting \
+ -fno-tree-pre \
+ -fno-tree-vrp
+
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
use openssl && myconf+=( --enable-nonfree )
use samba && myconf+=( --enable-version3 )
@@ -455,7 +477,7 @@ multilib_src_configure() {
)
local extra_libs
- if use arm || use ppc ; then
+ if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
# bug #782811
# bug #790590
extra_libs+="$(test-flags-CCLD -latomic) "
@@ -472,6 +494,7 @@ multilib_src_configure() {
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
--nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
--ranlib="$(tc-getRANLIB)" \
--pkg-config="$(tc-getPKG_CONFIG)" \
--optflags="${CFLAGS}" \
@@ -555,4 +578,6 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+
+ use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override
}
diff --git a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
index 4f4969b7733..5d9c4833feb 100644
--- a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# Subslot: libavutil major.libavcodec major.libavformat major
# Since FFmpeg ships several libraries, subslot is kind of limited here.
@@ -28,9 +28,14 @@ HOMEPAGE="https://ffmpeg.org/"
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
else # Release
- SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc
+ inherit verify-sig
+ SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )"
+
+ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
fi
FFMPEG_REVISION="${PV#*_p}"
@@ -59,7 +64,7 @@ LICENSE="
samba? ( GPL-3 )
"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
# Options to use as use_enable in the foo[:bar] form.
@@ -80,11 +85,11 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+ speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
@@ -95,10 +100,10 @@ FFMPEG_FLAG_MAP=(
# Same as above but for encoders, i.e. they do something only with USE=encode.
FFMPEG_ENCODER_FLAG_MAP=(
- amrenc:libvo-amrwbenc mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264
+ x265:libx265 xvid:libxvid
)
IUSE="
@@ -172,6 +177,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ amf? ( media-video/amdgpu-pro-amf )
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
@@ -188,8 +194,8 @@ RDEPEND="
rav1e? ( >=media-video/rav1e-0.4:=[capi] )
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
)
twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
@@ -244,13 +250,18 @@ RDEPEND="
sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
- svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh-0.5.5:=[sftp,${MULTILIB_USEDEP}] )
+ svg? (
+ gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ )
+ nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+ svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
- video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
@@ -261,13 +272,13 @@ RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
)
+ postproc? ( !media-libs/libpostproc )
zeromq? ( >=net-libs/zeromq-4.1.6 )
zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- postproc? ( !media-libs/libpostproc )
"
RDEPEND="${RDEPEND}
@@ -279,9 +290,12 @@ DEPEND="${RDEPEND}
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
v4l? ( sys-kernel/linux-headers )
"
-BDEPEND="
+
+# += for verify-sig above
+BDEPEND+="
>=sys-devel/make-3.81
virtual/pkgconfig
+ amf? ( media-libs/amf-headers )
cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
doc? ( sys-apps/texinfo )
@@ -303,7 +317,7 @@ GPL_REQUIRED_USE="
)
"
REQUIRED_USE="
- cuda? ( video_cards_nvidia )
+ cuda? ( nvenc )
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )
@@ -318,6 +332,7 @@ S=${WORKDIR}/${P/_/-}
PATCHES=(
"${FILESDIR}"/chromium-r1.patch
+ "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch
)
MULTILIB_WRAPPED_HEADERS=(
@@ -332,13 +347,30 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+
+ eapply "${FILESDIR}/vmaf-models-default-path.patch"
+
default
+
+ # -fdiagnostics-color=auto gets appended after user flags which
+ # will ignore user's preference.
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
}
multilib_src_configure() {
local myconf=( )
+ # bug 842201
+ use ia64 && tc-is-gcc && append-flags \
+ -fno-tree-ccp \
+ -fno-tree-dominator-opts \
+ -fno-tree-fre \
+ -fno-code-hoisting \
+ -fno-tree-pre \
+ -fno-tree-vrp
+
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
use openssl && myconf+=( --enable-nonfree )
use samba && myconf+=( --enable-version3 )
@@ -452,7 +484,7 @@ multilib_src_configure() {
)
local extra_libs
- if use arm || use ppc ; then
+ if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
# bug #782811
# bug #790590
extra_libs+="$(test-flags-CCLD -latomic) "
@@ -469,6 +501,7 @@ multilib_src_configure() {
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
--nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
--ranlib="$(tc-getRANLIB)" \
--pkg-config="$(tc-getPKG_CONFIG)" \
--optflags="${CFLAGS}" \
@@ -552,4 +585,6 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+
+ use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override
}
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
index 7d3956a9364..22a2b8e6269 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ EAPI=7
# changes its ABI then this package will be rebuilt needlessly. Hence, such a
# package is free _not_ to := depend on FFmpeg but I would strongly encourage
# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
+FFMPEG_SUBSLOT=57.59.59
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -28,9 +28,14 @@ HOMEPAGE="https://ffmpeg.org/"
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
else # Release
- SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc
+ inherit verify-sig
+ SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )"
+
+ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
fi
FFMPEG_REVISION="${PV#*_p}"
@@ -59,7 +64,7 @@ LICENSE="
samba? ( GPL-3 )
"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
# Options to use as use_enable in the foo[:bar] form.
@@ -80,11 +85,11 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+ speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
@@ -95,14 +100,14 @@ FFMPEG_FLAG_MAP=(
# Same as above but for encoders, i.e. they do something only with USE=encode.
FFMPEG_ENCODER_FLAG_MAP=(
- amrenc:libvo-amrwbenc mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame
- wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264
+ x265:libx265 xvid:libxvid
)
IUSE="
- alsa chromium doc +encode oss pic static-libs test v4l
+ alsa chromium doc +encode oss pic sndio static-libs test v4l
${FFMPEG_FLAG_MAP[@]%:*}
${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
"
@@ -172,6 +177,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ amf? ( media-video/amdgpu-pro-amf )
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
@@ -185,14 +191,13 @@ RDEPEND="
kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
- rav1e? ( media-video/rav1e:=[capi] )
+ rav1e? ( >=media-video/rav1e-0.4:=[capi] )
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
)
twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
- wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
@@ -201,7 +206,7 @@ RDEPEND="
fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- frei0r? ( media-plugins/frei0r-plugins )
+ frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
@@ -221,7 +226,7 @@ RDEPEND="
jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
- libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+ libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
@@ -242,32 +247,38 @@ RDEPEND="
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+ sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
- svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh-0.5.5:=[sftp,${MULTILIB_USEDEP}] )
+ svg? (
+ gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ )
+ nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+ svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
- video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
)
vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
- vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
+ vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
)
+ postproc? ( !media-libs/libpostproc )
zeromq? ( >=net-libs/zeromq-4.1.6 )
zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- postproc? ( !media-libs/libpostproc )
"
RDEPEND="${RDEPEND}
@@ -279,9 +290,12 @@ DEPEND="${RDEPEND}
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
v4l? ( sys-kernel/linux-headers )
"
-BDEPEND="
+
+# += for verify-sig above
+BDEPEND+="
>=sys-devel/make-3.81
virtual/pkgconfig
+ amf? ( media-libs/amf-headers )
cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
doc? ( sys-apps/texinfo )
@@ -303,7 +317,7 @@ GPL_REQUIRED_USE="
)
"
REQUIRED_USE="
- cuda? ( video_cards_nvidia )
+ cuda? ( nvenc )
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )
@@ -318,9 +332,7 @@ S=${WORKDIR}/${P/_/-}
PATCHES=(
"${FILESDIR}"/chromium-r1.patch
- "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch
- "${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch
- "${FILESDIR}"/${PN}-4.3.1-srt-1.4.2-build.patch
+ "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch
)
MULTILIB_WRAPPED_HEADERS=(
@@ -335,13 +347,30 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+
+ eapply "${FILESDIR}/vmaf-models-default-path.patch"
+
default
+
+ # -fdiagnostics-color=auto gets appended after user flags which
+ # will ignore user's preference.
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
}
multilib_src_configure() {
local myconf=( )
+ # bug 842201
+ use ia64 && tc-is-gcc && append-flags \
+ -fno-tree-ccp \
+ -fno-tree-dominator-opts \
+ -fno-tree-fre \
+ -fno-code-hoisting \
+ -fno-tree-pre \
+ -fno-tree-vrp
+
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
use openssl && myconf+=( --enable-nonfree )
use samba && myconf+=( --enable-version3 )
@@ -360,12 +389,12 @@ multilib_src_configure() {
# Indevs
use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
- for i in alsa oss jack ; do
+ for i in alsa oss jack sndio ; do
use ${i} || myconf+=( --disable-indev=${i} )
done
# Outdevs
- for i in alsa oss ; do
+ for i in alsa oss sndio ; do
use ${i} || myconf+=( --disable-outdev=${i} )
done
@@ -381,11 +410,12 @@ multilib_src_configure() {
if use openssl ; then
myconf+=( --disable-gnutls )
+ has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 )
fi
# (temporarily) disable non-multilib deps
if ! multilib_is_native_abi; then
- for i in frei0r librav1e libzmq ; do
+ for i in librav1e libzmq ; do
myconf+=( --disable-${i} )
done
fi
@@ -414,13 +444,13 @@ multilib_src_configure() {
break
done
- # LTO support, bug #566282
+ # LTO support, bug #566282, bug #754654
is-flagq "-flto*" && myconf+=( "--enable-lto" )
+ filter-flags "-flto*"
# Mandatory configuration
myconf=(
--enable-avfilter
- --enable-avresample
--disable-stripping
# This is only for hardcoded cflags; those are used in configure checks that may
# interfere with proper detections, bug #671746 and bug #645778
@@ -453,6 +483,14 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ # Fixed in 5.0.1? Waiting for verification from someone who hit the issue.
+ local extra_libs
+ if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
+ # bug #782811
+ # bug #790590
+ extra_libs+="$(test-flags-CCLD -latomic) "
+ fi
+
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -464,9 +502,11 @@ multilib_src_configure() {
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
--nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
--ranlib="$(tc-getRANLIB)" \
--pkg-config="$(tc-getPKG_CONFIG)" \
--optflags="${CFLAGS}" \
+ --extra-libs="${extra_libs}" \
$(use_enable static-libs static) \
"${myconf[@]}" \
${EXTRA_FFMPEG_CONF}
@@ -511,6 +551,11 @@ multilib_src_compile() {
fi
}
+multilib_src_test() {
+ LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
+ emake V=1 fate
+}
+
multilib_src_install() {
emake V=1 DESTDIR="${D}" install install-doc
@@ -541,9 +586,6 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-multilib_src_test() {
- LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
- emake V=1 fate
+ use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override
}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ebffc6b5508..074e2445512 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,9 +28,14 @@ HOMEPAGE="https://ffmpeg.org/"
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
else # Release
- SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc
+ inherit verify-sig
+ SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )"
+
+ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
fi
FFMPEG_REVISION="${PV#*_p}"
@@ -80,11 +85,11 @@ FFMPEG_FLAG_MAP=(
amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+ speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
@@ -95,10 +100,10 @@ FFMPEG_FLAG_MAP=(
# Same as above but for encoders, i.e. they do something only with USE=encode.
FFMPEG_ENCODER_FLAG_MAP=(
- amrenc:libvo-amrwbenc mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264
+ x265:libx265 xvid:libxvid
)
IUSE="
@@ -172,6 +177,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ amf? ( media-video/amdgpu-pro-amf )
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
@@ -188,8 +194,8 @@ RDEPEND="
rav1e? ( >=media-video/rav1e-0.4:=[capi] )
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
)
twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
@@ -220,7 +226,7 @@ RDEPEND="
jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
- libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+ libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
@@ -244,33 +250,35 @@ RDEPEND="
sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh-0.5.5:=[sftp,${MULTILIB_USEDEP}] )
svg? (
gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
x11-libs/cairo[${MULTILIB_USEDEP}]
)
+ nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+ svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
- video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
)
vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
- vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
+ vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
)
+ postproc? ( !media-libs/libpostproc )
zeromq? ( >=net-libs/zeromq-4.1.6 )
zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- postproc? ( !media-libs/libpostproc )
"
RDEPEND="${RDEPEND}
@@ -282,9 +290,12 @@ DEPEND="${RDEPEND}
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
v4l? ( sys-kernel/linux-headers )
"
-BDEPEND="
+
+# += for verify-sig above
+BDEPEND+="
>=sys-devel/make-3.81
virtual/pkgconfig
+ amf? ( media-libs/amf-headers )
cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
doc? ( sys-apps/texinfo )
@@ -306,7 +317,7 @@ GPL_REQUIRED_USE="
)
"
REQUIRED_USE="
- cuda? ( video_cards_nvidia )
+ cuda? ( nvenc )
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )
@@ -335,13 +346,28 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+
default
+
+ # -fdiagnostics-color=auto gets appended after user flags which
+ # will ignore user's preference.
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
}
multilib_src_configure() {
local myconf=( )
+ # bug 842201
+ use ia64 && tc-is-gcc && append-flags \
+ -fno-tree-ccp \
+ -fno-tree-dominator-opts \
+ -fno-tree-fre \
+ -fno-code-hoisting \
+ -fno-tree-pre \
+ -fno-tree-vrp
+
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
use openssl && myconf+=( --enable-nonfree )
use samba && myconf+=( --enable-version3 )
@@ -381,6 +407,7 @@ multilib_src_configure() {
if use openssl ; then
myconf+=( --disable-gnutls )
+ has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 )
fi
# (temporarily) disable non-multilib deps
@@ -453,8 +480,9 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ # Fixed in 5.0.1? Waiting for verification from someone who hit the issue.
local extra_libs
- if use arm || use ppc ; then
+ if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
# bug #782811
# bug #790590
extra_libs+="$(test-flags-CCLD -latomic) "
@@ -471,6 +499,7 @@ multilib_src_configure() {
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
--nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
--ranlib="$(tc-getRANLIB)" \
--pkg-config="$(tc-getPKG_CONFIG)" \
--optflags="${CFLAGS}" \
@@ -554,4 +583,6 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+
+ use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override
}
diff --git a/media-video/ffmpeg/files/amf-env-vulkan-override b/media-video/ffmpeg/files/amf-env-vulkan-override
new file mode 100644
index 00000000000..41ee2791117
--- /dev/null
+++ b/media-video/ffmpeg/files/amf-env-vulkan-override
@@ -0,0 +1 @@
+VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json
diff --git a/media-video/ffmpeg/files/ffmpeg-4.3.1-srt-1.4.2-build.patch b/media-video/ffmpeg/files/ffmpeg-4.3.1-srt-1.4.2-build.patch
deleted file mode 100644
index 691314cbacb..00000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.3.1-srt-1.4.2-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-http://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315
-https://bugs.gentoo.org/756859
-From 7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315 Mon Sep 17 00:00:00 2001
-From: Jun Zhao <barryjzhao@tencent.com>
-Date: Sun, 12 Jul 2020 13:48:48 +0800
-Subject: [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
-
-libsrt changed the:
-SRTO_SMOOTHER -> SRTO_CONGESTION
-SRTO_STRICTENC -> SRTO_ENFORCEDENCRYPTION
-and removed the front of deprecated options (SRTO_SMOOTHER/SRTO_STRICTENC)
-in the header, it's lead to build fail
-
-fix #8760
-
-Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
----
- libavformat/libsrt.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
-index 4de575b37c..4719ce0d4b 100644
---- a/libavformat/libsrt.c
-+++ b/libavformat/libsrt.c
-@@ -313,8 +313,12 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
- (s->pbkeylen >= 0 && libsrt_setsockopt(h, fd, SRTO_PBKEYLEN, "SRTO_PBKEYLEN", &s->pbkeylen, sizeof(s->pbkeylen)) < 0) ||
- (s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE, "SRTO_PASSPHRASE", s->passphrase, strlen(s->passphrase)) < 0) ||
- #if SRT_VERSION_VALUE >= 0x010302
-+#if SRT_VERSION_VALUE >= 0x010401
-+ (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_ENFORCEDENCRYPTION, "SRTO_ENFORCEDENCRYPTION", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) ||
-+#else
- /* SRTO_STRICTENC == SRTO_ENFORCEDENCRYPTION (53), but for compatibility, we used SRTO_STRICTENC */
- (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_STRICTENC, "SRTO_STRICTENC", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) ||
-+#endif
- (s->kmrefreshrate >= 0 && libsrt_setsockopt(h, fd, SRTO_KMREFRESHRATE, "SRTO_KMREFRESHRATE", &s->kmrefreshrate, sizeof(s->kmrefreshrate)) < 0) ||
- (s->kmpreannounce >= 0 && libsrt_setsockopt(h, fd, SRTO_KMPREANNOUNCE, "SRTO_KMPREANNOUNCE", &s->kmpreannounce, sizeof(s->kmpreannounce)) < 0) ||
- #endif
-@@ -333,7 +337,11 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
- (s->lossmaxttl >= 0 && libsrt_setsockopt(h, fd, SRTO_LOSSMAXTTL, "SRTO_LOSSMAXTTL", &s->lossmaxttl, sizeof(s->lossmaxttl)) < 0) ||
- (s->minversion >= 0 && libsrt_setsockopt(h, fd, SRTO_MINVERSION, "SRTO_MINVERSION", &s->minversion, sizeof(s->minversion)) < 0) ||
- (s->streamid && libsrt_setsockopt(h, fd, SRTO_STREAMID, "SRTO_STREAMID", s->streamid, strlen(s->streamid)) < 0) ||
-+#if SRT_VERSION_VALUE >= 0x010401
-+ (s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION, "SRTO_CONGESTION", s->smoother, strlen(s->smoother)) < 0) ||
-+#else
- (s->smoother && libsrt_setsockopt(h, fd, SRTO_SMOOTHER, "SRTO_SMOOTHER", s->smoother, strlen(s->smoother)) < 0) ||
-+#endif
- (s->messageapi >= 0 && libsrt_setsockopt(h, fd, SRTO_MESSAGEAPI, "SRTO_MESSAGEAPI", &s->messageapi, sizeof(s->messageapi)) < 0) ||
- (s->payload_size >= 0 && libsrt_setsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size, sizeof(s->payload_size)) < 0) ||
- ((h->flags & AVIO_FLAG_WRITE) && libsrt_setsockopt(h, fd, SRTO_SENDER, "SRTO_SENDER", &yes, sizeof(yes)) < 0)) {
---
-2.20.1
-
diff --git a/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch b/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch
new file mode 100644
index 00000000000..1c264f75209
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch
@@ -0,0 +1,59 @@
+From bc5ccea3b9d2c71929af6271bd8afe9b6cfab436 Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu <adrian.ratiu@collabora.com>
+Date: Mon, 14 Feb 2022 15:00:07 +0200
+Subject: [PATCH] configure: move ranlib -D test after setting defaults
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [from master bc5ccea3b9d2c7]
+
+In Gentoo and ChromeOS we want to allow pure LLVM builds without
+using GNU tools, so we block any unwanted mixed GNU/LLVM usages
+(GNU tools are still kept around in our chroots for projects
+like glibc which cannot yet be built otherwise).
+
+The default ${cross_prefix}${ranlib_default} points to GNU and
+fails, so move the test a bit later - after the defaults are
+set and the proper values get overriden - such that ffmpeg
+configure calls the llvm-ranlib we desire. [1]
+
+[1] https://gitweb.gentoo.org/repo/gentoo.git/tree/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild?id=7a34377e3277a6a0e2eedd40e90452a44c55f1e6#n477
+
+Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
+Signed-off-by: Martin Storsjö <martin@martin.st>
+---
+ configure | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index 7d22c2a345..82642deabe 100755
+--- a/configure
++++ b/configure
+@@ -4403,11 +4403,7 @@ cc_default="${cross_prefix}${cc_default}"
+ cxx_default="${cross_prefix}${cxx_default}"
+ nm_default="${cross_prefix}${nm_default}"
+ pkg_config_default="${cross_prefix}${pkg_config_default}"
+-if ${cross_prefix}${ranlib_default} 2>&1 | grep -q "\-D "; then
+- ranlib_default="${cross_prefix}${ranlib_default} -D"
+-else
+- ranlib_default="${cross_prefix}${ranlib_default}"
+-fi
++ranlib_default="${cross_prefix}${ranlib_default}"
+ strip_default="${cross_prefix}${strip_default}"
+ windres_default="${cross_prefix}${windres_default}"
+
+@@ -4440,6 +4436,10 @@ set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \
+ enabled cross_compile || host_cc_default=$cc
+ set_default host_cc
+
++if ${ranlib} 2>&1 | grep -q "\-D "; then
++ ranlib="${ranlib} -D"
++fi
++
+ pkg_config_fail_message=""
+ if ! $pkg_config --version >/dev/null 2>&1; then
+ warn "$pkg_config not found, library detection may fail."
+--
+2.35.1
+
diff --git a/media-video/ffmpeg/files/vmaf-models-default-path.patch b/media-video/ffmpeg/files/vmaf-models-default-path.patch
new file mode 100644
index 00000000000..a9777e94b7a
--- /dev/null
+++ b/media-video/ffmpeg/files/vmaf-models-default-path.patch
@@ -0,0 +1,13 @@
+Put default path of models to /usr/share/vmaf/model
+
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+
+ static const AVOption libvmaf_options[] = {
+- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/vmaf/model/vmaf_v0.6.1.json"}, 0, 1, FLAGS},
+ {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index be0716e194d..c07905a8339 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -5,6 +5,7 @@
<email>media-video@gentoo.org</email>
</maintainer>
<use>
+ <flag name="amf">Enables support for AMD's Advanced Media Framework (AMF)</flag>
<flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
<flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support with <pkg>media-libs/vo-amrwbenc</pkg>.</flag>
<flag name="appkit">Enables Apple AppKit framework</flag>
@@ -53,8 +54,10 @@
<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
+ <flag name="svt-av1">Enables AV1 encoding support via <pkg>media-libs/svt-av1</pkg>.</flag>
<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
<flag name="vidstab">Enables video stabilization filter using vid.stab library (<pkg>media-libs/vidstab</pkg>).</flag>
+ <flag name="vmaf">Enables Netflix's perceptual video quality assessment filter using the library (<pkg>media-libs/libvmaf</pkg>).</flag>
<flag name="vpx">Enables VP8 and VP9 codec support using libvpx: Decoding does not require this to be enabled but libvpx can also be used for decoding; encoding requires this useflag to be enabled though.</flag>
<flag name="vulkan">Enables support for the vulkan API for GPU offload.</flag>
<flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
index 4eeabf20729..20f04265bb9 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit python-any-r1 scons-utils toolchain-funcs
+inherit python-any-r1 scons-utils
DESCRIPTION="A simple converter to create Ogg Theora files"
HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild
new file mode 100644
index 00000000000..4906d000902
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
+HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
+SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gnome gtk jpeg png test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="gnome? ( gtk )
+ test? ( png jpeg )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ gtk? ( dev-libs/glib:2= )
+ jpeg? ( virtual/jpeg:0= )
+ >=media-video/ffmpeg-2.7:0=
+ png? ( media-libs/libpng:0= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+PATCHES=(
+ "${FILESDIR}/ffmpeg5-1.patch"
+ "${FILESDIR}/ffmpeg5-2.patch"
+ "${FILESDIR}/ffmpeg5-3.patch"
+ "${FILESDIR}/ffmpeg5-4.patch"
+ "${FILESDIR}/ffmpeg5-5.patch"
+ "${FILESDIR}/ffmpeg5-6.patch"
+ "${FILESDIR}/ffmpeg5-7.patch"
+ "${FILESDIR}/ffmpeg5-8.patch"
+ "${FILESDIR}/ffmpeg5-9.patch"
+ "${FILESDIR}/ffmpeg5-10.patch"
+)
+
+src_prepare() {
+ rm -rf out* || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GIO=$(usex gtk)
+ -DENABLE_TESTS=$(usex test)
+ -DENABLE_THUMBNAILER=$(usex gnome)
+ -DHAVE_JPEG=$(usex jpeg)
+ -DHAVE_PNG=$(usex png)
+ )
+ cmake_src_configure
+}
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
index 1db8f1d925c..009948d53ef 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="gnome gtk jpeg png test"
RESTRICT="!test? ( test )"
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-1.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-1.patch
new file mode 100644
index 00000000000..d852f3b4131
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-1.patch
@@ -0,0 +1,22 @@
+From 67be4abd22b726e277c4b67bfb3abf5a65cfd9b5 Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 17:23:23 +1000
+Subject: [PATCH] lib/moviedecoder: remove unused variable
+
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index 290e212..aa44adf 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -570,8 +570,6 @@ bool MovieDecoder::getVideoPacket()
+ bool framesAvailable = true;
+ bool frameDecoded = false;
+
+- int attempts = 0;
+-
+ if (m_pPacket)
+ {
+ av_packet_unref(m_pPacket);
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-10.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-10.patch
new file mode 100644
index 00000000000..81e57aab1c9
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-10.patch
@@ -0,0 +1,22 @@
+From efb5b618f1c1471c1a7900aed3a59d851ea9a210 Mon Sep 17 00:00:00 2001
+From: Paul Jonkins <paul.ionkin@gmail.com>
+Date: Wed, 23 Jun 2021 17:53:55 +0200
+Subject: [PATCH] Constify AVCodec
+
+---
+ libffmpegthumbnailer/moviedecoder.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.h b/libffmpegthumbnailer/moviedecoder.h
+index 3ef5f12..fb6add2 100644
+--- a/libffmpegthumbnailer/moviedecoder.h
++++ b/libffmpegthumbnailer/moviedecoder.h
+@@ -78,7 +78,7 @@ class MovieDecoder
+ int m_VideoStream;
+ AVFormatContext* m_pFormatContext;
+ AVCodecContext* m_pVideoCodecContext;
+- AVCodec* m_pVideoCodec;
++ const AVCodec* m_pVideoCodec;
+ AVFilterGraph* m_pFilterGraph;
+ AVFilterContext* m_pFilterSource;
+ AVFilterContext* m_pFilterSink;
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-2.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-2.patch
new file mode 100644
index 00000000000..8f22829f6bb
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-2.patch
@@ -0,0 +1,28 @@
+From 66f64668e7a063e790813c7733ca438ab112af89 Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 17:42:07 +1000
+Subject: [PATCH] lib/moviedecoder: clang-tidy fixes
+
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index aa44adf..79c950b 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -503,12 +503,12 @@ void MovieDecoder::seek(int timeInSeconds)
+ avcodec_flush_buffers(m_pFormatContext->streams[m_VideoStream]->codec);
+
+ int keyFrameAttempts = 0;
+- bool gotFrame = 0;
++ bool gotFrame;
+
+ do
+ {
+ int count = 0;
+- gotFrame = 0;
++ gotFrame = false;
+
+ while (!gotFrame && count < 20)
+ {
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-3.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-3.patch
new file mode 100644
index 00000000000..ad7625775cf
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-3.patch
@@ -0,0 +1,26 @@
+From 96c22aa66719846854895afcb72962862d5a4ffd Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 20:39:32 +1000
+Subject: [PATCH] lib/moviedecoder: remove SilenceLogLevel
+
+Was unused.
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index 79c950b..21df096 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -41,11 +41,6 @@ using namespace std;
+ namespace ffmpegthumbnailer
+ {
+
+-struct SilenceLogLevel
+-{
+- SilenceLogLevel() { av_log_set_level(AV_LOG_QUIET); }
+-};
+-
+ MovieDecoder::MovieDecoder(AVFormatContext* pavContext)
+ : m_VideoStream(-1)
+ , m_pFormatContext(pavContext)
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-4.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-4.patch
new file mode 100644
index 00000000000..eb063973ae3
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-4.patch
@@ -0,0 +1,32 @@
+From 664680f4bfeb89923f485eba270f9e49a8d02bfc Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 17:25:40 +1000
+Subject: [PATCH] lib/moviedecoder: remove registration calls
+
+They're not needed anymore.
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index 21df096..ac3e5b9 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -65,8 +65,6 @@ MovieDecoder::~MovieDecoder()
+
+ void MovieDecoder::initialize(const string& filename, bool preferEmbeddedMetadata)
+ {
+- av_register_all();
+- avcodec_register_all();
+ avformat_network_init();
+
+ string inputFile = filename == "-" ? "pipe:" : filename;
+@@ -386,8 +384,6 @@ void MovieDecoder::initializeFilterGraph(const AVRational& timeBase, const std::
+ auto del = [] (AVBufferSinkParams* p) { av_freep(p); };
+ std::unique_ptr<AVBufferSinkParams, decltype(del)> buffersinkParams(av_buffersink_params_alloc(), del);
+
+- avfilter_register_all();
+-
+ m_pFilterGraph = avfilter_graph_alloc();
+ assert(m_pFilterGraph);
+
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-5.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-5.patch
new file mode 100644
index 00000000000..e2a131b31eb
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-5.patch
@@ -0,0 +1,37 @@
+From 1ae42e664e1f3c915d186ae00aa2c8018b998708 Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 17:30:21 +1000
+Subject: [PATCH] lib/moviedecoder: remove use of AVBufferSinkParams
+
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index ac3e5b9..dece668 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -379,11 +379,6 @@ std::string MovieDecoder::createScaleString(const std::string& sizeString, bool
+
+ void MovieDecoder::initializeFilterGraph(const AVRational& timeBase, const std::string& size, bool maintainAspectRatio)
+ {
+- static const AVPixelFormat pixelFormats[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE };
+-
+- auto del = [] (AVBufferSinkParams* p) { av_freep(p); };
+- std::unique_ptr<AVBufferSinkParams, decltype(del)> buffersinkParams(av_buffersink_params_alloc(), del);
+-
+ m_pFilterGraph = avfilter_graph_alloc();
+ assert(m_pFilterGraph);
+
+@@ -395,10 +390,8 @@ void MovieDecoder::initializeFilterGraph(const AVRational& timeBase, const std::
+
+ checkRc(avfilter_graph_create_filter(&m_pFilterSource, avfilter_get_by_name("buffer"), "thumb_buffer", ss.str().c_str(), nullptr, m_pFilterGraph),
+ "Failed to create filter source");
+- buffersinkParams->pixel_fmts = pixelFormats;
+- checkRc(avfilter_graph_create_filter(&m_pFilterSink, avfilter_get_by_name("buffersink"), "thumb_buffersink", nullptr, buffersinkParams.get(), m_pFilterGraph),
++ checkRc(avfilter_graph_create_filter(&m_pFilterSink, avfilter_get_by_name("buffersink"), "thumb_buffersink", nullptr, nullptr, m_pFilterGraph),
+ "Failed to create filter sink");
+- buffersinkParams.release();
+
+ AVFilterContext* yadifFilter = nullptr;
+ if (m_pFrame->interlaced_frame != 0)
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-6.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-6.patch
new file mode 100644
index 00000000000..59860a599ef
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-6.patch
@@ -0,0 +1,23 @@
+From 19675349662a4ea4455d7d13b01cca28ab585762 Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 17:39:58 +1000
+Subject: [PATCH] lib/moviedecoder: use m_pVideoCodecContext instead of
+ AVStream::codec
+
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index dece668..0b7a280 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -484,7 +484,7 @@ void MovieDecoder::seek(int timeInSeconds)
+ }
+
+ checkRc(av_seek_frame(m_pFormatContext, -1, timestamp, 0), "Seeking in video failed");
+- avcodec_flush_buffers(m_pFormatContext->streams[m_VideoStream]->codec);
++ avcodec_flush_buffers(m_pVideoCodecContext);
+
+ int keyFrameAttempts = 0;
+ bool gotFrame;
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-7.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-7.patch
new file mode 100644
index 00000000000..ac1eb3c2542
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-7.patch
@@ -0,0 +1,27 @@
+From 4f74f83a009fa2b3f3d546adb24d4f1406910007 Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 17:49:03 +1000
+Subject: [PATCH] lib/moviedecoder: codec -> codecpar
+
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index 0b7a280..e58904e 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -145,10 +145,10 @@ int32_t MovieDecoder::findPreferedVideoStream(bool preferEmbeddedMetadata)
+ for (unsigned int i = 0; i < m_pFormatContext->nb_streams; ++i)
+ {
+ AVStream *stream = m_pFormatContext->streams[i];
+- auto ctx = m_pFormatContext->streams[i]->codec;
+- if (ctx->codec_type == AVMEDIA_TYPE_VIDEO)
++ auto par = m_pFormatContext->streams[i]->codecpar;
++ if (par->codec_type == AVMEDIA_TYPE_VIDEO)
+ {
+- if (!preferEmbeddedMetadata || !isStillImageCodec(ctx->codec_id))
++ if (!preferEmbeddedMetadata || !isStillImageCodec(par->codec_id))
+ {
+ videoStreams.push_back(i);
+ continue;
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-8.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-8.patch
new file mode 100644
index 00000000000..d160cbb2404
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-8.patch
@@ -0,0 +1,54 @@
+From 3ffdd65cbda6ef21d36c96013db1b0f4dc9fc57b Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 17:52:01 +1000
+Subject: [PATCH] lib/movedecoder: don't rely on avformat to allocate a context
+
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index e58904e..da5f32a 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -90,8 +90,7 @@ void MovieDecoder::destroy()
+ {
+ if (m_pVideoCodecContext)
+ {
+- avcodec_close(m_pVideoCodecContext);
+- m_pVideoCodecContext = nullptr;
++ avcodec_free_context(&m_pVideoCodecContext);
+ }
+
+ if ((!m_FormatContextWasGiven) && m_pFormatContext)
+@@ -196,8 +195,7 @@ void MovieDecoder::initializeVideo(bool preferEmbeddedMetadata)
+ }
+
+ m_pVideoStream = m_pFormatContext->streams[m_VideoStream];
+- m_pVideoCodecContext = m_pVideoStream->codec;
+- m_pVideoCodec = avcodec_find_decoder(m_pVideoCodecContext->codec_id);
++ m_pVideoCodec = avcodec_find_decoder(m_pVideoStream->codecpar->codec_id);
+
+ if (m_pVideoCodec == nullptr)
+ {
+@@ -207,6 +205,20 @@ void MovieDecoder::initializeVideo(bool preferEmbeddedMetadata)
+ throw logic_error("Video Codec not found");
+ }
+
++ m_pVideoCodecContext = avcodec_alloc_context3(m_pVideoCodec);
++
++ if (m_pVideoCodecContext == nullptr)
++ {
++ destroy();
++ throw logic_error("Could not allocate video codec context");
++ }
++
++ if (avcodec_parameters_to_context(m_pVideoCodecContext, m_pVideoStream->codecpar) < 0)
++ {
++ destroy();
++ throw logic_error("Could not configure video codec context");
++ }
++
+ m_pVideoCodecContext->workaround_bugs = 1;
+
+ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, nullptr) < 0)
diff --git a/media-video/ffmpegthumbnailer/files/ffmpeg5-9.patch b/media-video/ffmpegthumbnailer/files/ffmpeg5-9.patch
new file mode 100644
index 00000000000..42db9faef36
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpeg5-9.patch
@@ -0,0 +1,62 @@
+From f9273852c8e3d7af77d6c8929b1ac6c8a26eca50 Mon Sep 17 00:00:00 2001
+From: Zane van Iperen <zane@zanevaniperen.com>
+Date: Mon, 15 Mar 2021 20:57:45 +1000
+Subject: [PATCH] lib/moviedecoder: replace avcodec_decode_video2() usage
+
+---
+ libffmpegthumbnailer/moviedecoder.cpp | 31 +++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/libffmpegthumbnailer/moviedecoder.cpp b/libffmpegthumbnailer/moviedecoder.cpp
+index da5f32a..f32577a 100644
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -548,17 +548,33 @@ bool MovieDecoder::decodeVideoPacket()
+ return false;
+ }
+
+- av_frame_unref(m_pFrame);
+-
+- int frameFinished;
++ int rc = avcodec_send_packet(m_pVideoCodecContext, m_pPacket);
++ if(rc == AVERROR(EAGAIN))
++ {
++ rc = 0;
++ }
+
+- int bytesDecoded = avcodec_decode_video2(m_pVideoCodecContext, m_pFrame, &frameFinished, m_pPacket);
+- if (bytesDecoded < 0)
++ if(rc == AVERROR_EOF)
++ {
++ return false;
++ }
++ else if(rc < 0)
+ {
+- throw logic_error("Failed to decode video frame: bytesDecoded < 0");
++ throw logic_error("Failed to decode video frame: avcodec_send_packet() < 0");
+ }
+
+- return frameFinished > 0;
++ rc = avcodec_receive_frame(m_pVideoCodecContext, m_pFrame);
++ switch(rc)
++ {
++ case 0:
++ return true;
++
++ case AVERROR(EAGAIN):
++ return false;
++
++ default:
++ throw logic_error("Failed to decode video frame: avcodec_receive_frame() < 0");
++ }
+ }
+
+ bool MovieDecoder::getVideoPacket()
+@@ -574,6 +590,7 @@ bool MovieDecoder::getVideoPacket()
+
+ m_pPacket = new AVPacket();
+
++
+ while (framesAvailable && !frameDecoded)
+ {
+ framesAvailable = av_read_frame(m_pFormatContext, m_pPacket) >= 0;
diff --git a/media-video/flvstreamer/flvstreamer-2.1c.ebuild b/media-video/flvstreamer/flvstreamer-2.1c.ebuild
index 2989c8af30d..6644066dff7 100644
--- a/media-video/flvstreamer/flvstreamer-2.1c.ebuild
+++ b/media-video/flvstreamer/flvstreamer-2.1c.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
-DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
+DESCRIPTION="Open source command-line RTMP client to stream audio or video flash content"
HOMEPAGE="https://savannah.nongnu.org/projects/flvstreamer/"
SRC_URI="mirror://nongnu/${PN}/source/${P}.tar.gz"
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index a9483cc3e91..2f9ae2bc5fa 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,2 +1,2 @@
DIST gaupol-1.10.1.tar.gz 580890 BLAKE2B eb3f5bc3f9ec371d4169a9517f83bd42371aa41532f99f650b51e4649f813f0a37c0de5a01f69ee0c73f38cf2b57dd3260b5cac88f4c09785e86da2ec82c0cba SHA512 f294ea10c73dcf9941f70988ae58066917d7b321141e3a3ba3e12810e5f20a4711feca45d354dddc0e104a1ee2496fad24e529b129bdeee1cdb92010ec20be1d
-DIST gaupol-1.9.tar.gz 579382 BLAKE2B c326e800ebd56bab53757d13e075c7499d9b37c6677a3f2ef710e71ab427bc9d502d1539778e87625e43a6218a358b15dfc3c84fd22b42e95d808fc8495feb43 SHA512 c115409afe68a0981f7c29e5d6d3e23950081f186b74de460045de9976a6c7a674701d316214ee2b91bc59f1dd856fdc9cf999e328aba8abeb8eaf71911c68d2
+DIST gaupol-1.11.tar.gz 581799 BLAKE2B d0f4ad7c71086f585138bde79ba49f43e8e71eba7bc5ef5f0ac324ab962049cd1c71030f5a7d6ec859d4ac32dc7a07c8255ab01d98114629055f777f11210a2e SHA512 8c623f6ed8d189a79a994545be3dd96ae7fec399216520bfe89587a9c0b5917e07b6d80fe1f8a7b2d016b9fb1aa544bdabe103428dc97ea78e6d8c05666d0e9c
diff --git a/media-video/gaupol/gaupol-1.10.1.ebuild b/media-video/gaupol/gaupol-1.10.1.ebuild
index cc4e0d9d820..1a81955c24c 100644
--- a/media-video/gaupol/gaupol-1.10.1.ebuild
+++ b/media-video/gaupol/gaupol-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="spell"
RDEPEND="
diff --git a/media-video/gaupol/gaupol-1.9.ebuild b/media-video/gaupol/gaupol-1.11-r1.ebuild
index 1bbf9094611..b8c6438c17c 100644
--- a/media-video/gaupol/gaupol-1.9.ebuild
+++ b/media-video/gaupol/gaupol-1.11-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 virtualx xdg-utils
@@ -14,7 +13,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="spell"
RDEPEND="
@@ -35,10 +34,10 @@ BDEPEND="
distutils_enable_tests pytest
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+DOCS=( AUTHORS.md NEWS.md README.md README.aeidon.md )
python_test() {
- virtx pytest -vv
+ virtx epytest
}
pkg_postinst() {
diff --git a/media-video/google2srt/Manifest b/media-video/google2srt/Manifest
deleted file mode 100644
index 8362ae332fc..00000000000
--- a/media-video/google2srt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Google2SRT-0.5.6.zip 355167 BLAKE2B bb365ae01db8ca3eba67cfe01840a1e6da6034c86dac45a47c0164a72f9fbd958307ce545423a0c715f7ebefdae31d38686e9103d873d8cf98ecf99da579d143 SHA512 edb7b1ee4440f4962220557c794090edb9b3647a64deb70c19170bb4af3edbb5abc93ddd6061badf458c6cd92c17024b91bbdfa95bb1b366d1092b659db08094
-DIST google2srt-icon.png 1848 BLAKE2B 323ff2128b17ba6584f23869432575eeca87a0195867123193b9734cfb453d8483a79e14ba156e2b8168eb5d03c66795f6ae06d8cdb7c1e1aedcc28fbb593c79 SHA512 051d8ffe8488e2521cdfbfd045d6b5159a18619e12dc1216b1687514cf3f1cebdf2167af372c2ec46d3886412350f5872e8a8c245fee341a30fec51615b5140f
diff --git a/media-video/google2srt/files/build.xml b/media-video/google2srt/files/build.xml
deleted file mode 100644
index b1c7e3c775b..00000000000
--- a/media-video/google2srt/files/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Google2SRT" default="jar">
- <!-- some properties -->
- <property name="src.dir" value="src" />
- <property name="lib.dir" value="lib" />
- <property name="resources.dir" value="resources" />
- <property name="docs.dir" value="apidocs" />
- <property name="build.dir" value="build" />
- <property name="dist.dir" value="dist" />
- <property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
- <property name="mainclass.jar" value="GUI" />
- <property name="source.enc" value="UTF-8" />
- <property name="target.jdk" value="1.6" />
-
- <!-- classpath -->
- <path id="refcp">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <!-- init -->
- <target name="init">
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${docs.dir}" />
- <mkdir dir="${build.dir}" />
- </target>
-
- <!-- compile everything -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${build.dir}"
- source="${target.jdk}"
- target="${target.jdk}"
- classpathref="refcp"
- encoding="${source.enc}"/>
- <copy todir="${build.dir}">
- <fileset dir="${resources.dir}" />
- </copy>
- </target>
-
- <!-- build the jar files -->
- <target name="build" depends="compile">
- <jar jarfile="${project.jar}" basedir="${build.dir}">
- <manifest>
- <attribute name="Main-Class" value="${mainclass.jar}" />
- </manifest>
- </jar>
- </target>
-
- <!-- generate javadocs -->
- <target name="javadoc" depends="init">
- <javadoc sourcepath="${src.dir}"
- destdir="${docs.dir}"
- packagenames="*"
- author="true"
- version="true"
- use="true"
- charset="UTF-8"
- encoding="${source.enc}"
- defaultexcludes="yes"
- classpathref="refcp"
- windowtitle="${ant.project.name} API">
- <fileset dir="${src.dir}" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${docs.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
- <!-- zip the sources -->
- <target name="sourcezip">
- <zip destfile="${dist.dir}/${ant.project.name}-src.zip">
- <zipfileset dir="${src.dir}" />
- </zip>
- </target>
-
-</project>
diff --git a/media-video/google2srt/google2srt-0.5.6-r1.ebuild b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
deleted file mode 100644
index 4e228dc166a..00000000000
--- a/media-video/google2srt/google2srt-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="Google2SRT"
-MY_P="${MY_PN}-${PV}"
-MAINCLASS="GUI"
-
-DESCRIPTION="Convert subtitles from Google Video and YouTube to SubRip (.srt) format"
-HOMEPAGE="http://google2srt.sourceforge.net/en/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
- http://sbriesen.de/gentoo/distfiles/google2srt-icon.png"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-COMMON_DEP="dev-java/jdom:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-DEPEND="
- app-arch/unzip
- >=virtual/jdk-1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- # copy build.xml
- cp -f "${FILESDIR}/build.xml" build.xml || die
-
- # move resources
- mkdir -p "resources"
- mv -f src/*.{jpg,properties} "resources/"
-
- # update library packages
- cd lib
- rm -f jdom.jar ../${MY_PN}.jar || die
- java-pkg_jar-from jdom
- java-pkg_ensure-no-bundled-jars
-}
-
-src_compile() {
- eant build $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar dist/${MY_PN}.jar
- java-pkg_dolauncher ${MY_PN} --main ${MAINCLASS} --java_args -Xmx256m
- newicon "${DISTDIR}/${PN}-icon.png" "${MY_PN}.png"
- make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}
- use doc && java-pkg_dojavadoc apidocs
- use source && java-pkg_dosrc src
- use html && dohtml -r doc
- newdoc Changelog.txt ChangeLog
- newdoc README.TXT README
-}
diff --git a/media-video/google2srt/metadata.xml b/media-video/google2srt/metadata.xml
deleted file mode 100644
index 4af0071e5e9..00000000000
--- a/media-video/google2srt/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- <name>Gentoo Video project</name>
- </maintainer>
- <longdescription lang="en">
- Google2SRT allows you to convert subtitles from Google Video and YouTube
- to SubRip (.srt) format, which is recognized by most video players. You
- can download XML subtitles or simply type video's URL, Google2SRT will
- do the rest.
- </longdescription>
- <use>
- <flag name="html">Install HTML documentation</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">google2srt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 3119d5d920e..84cbbe3a025 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
+DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086 SHA512 e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
diff --git a/media-video/gpac/files/gpac-2.0.0-configure.patch b/media-video/gpac/files/gpac-2.0.0-configure.patch
new file mode 100644
index 00000000000..2b54d16a8d2
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.0.0-configure.patch
@@ -0,0 +1,113 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+----
+Index: gpac-2.0.0/Makefile
+===================================================================
+--- gpac-2.0.0.orig/Makefile
++++ gpac-2.0.0/Makefile
+@@ -298,8 +298,9 @@ ifeq ($(GPAC_ENST),yes)
+ endif
+
+ $(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
++ifeq ($(STATIC_LIBS), yes)
+ $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(lib_dir)" || true
+-
++endif
+ $(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig
+ $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig"
+
+Index: gpac-2.0.0/configure
+===================================================================
+--- gpac-2.0.0.orig/configure
++++ gpac-2.0.0/configure
+@@ -106,6 +106,7 @@ has_dvb4linux="no"
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -271,6 +272,7 @@ GPAC configuration options:
+ --static-modules use static modules in libgpac rather than dynamic library modules
+ --static-build link statically against libgpac but still allow dependencies to shared libraries (enable --static-modules)
+ --enable-static-bin old name for --static-build, deprecated
++ --enable-static-lib GPAC static libraries build
+ --static-bin enable static linking of MP4Box and gpac only (enable --static-build), disable MP4Client and all libraries not linkable statically.
+ --static-mp4box old name for --static-bin, deprecated
+ --enable-depth enables depth handling in the compositor
+@@ -741,14 +743,6 @@ if docc -lz -Wno-pointer-sign ; then
+ fi
+
+
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+- CFLAGS="-O3 $CFLAGS"
+-else
+- CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+ want_pic="no"
+@@ -776,10 +770,6 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+
+-if docc -msse2 $LDFLAGS ; then
+- CFLAGS="$CFLAGS -msse2"
+-fi
+-
+
+ #look for zlib
+ cat > $TMPC << EOF
+@@ -1790,6 +1780,8 @@ for opt do
+ echo "$opt deprecated, use --static-build instead"
+ static_build="yes";
+ ;;
++ --enable-static-libs) static_libs="yes";
++ ;;
+ --disable-ipv6) has_ipv6="no"
+ ;;
+ --disable-platinum) has_platinum="no"
+@@ -2521,6 +2513,7 @@ else
+ fi
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -3252,6 +3245,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.m
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "STATIC_BINARY=$static_bin" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+Index: gpac-2.0.0/src/Makefile
+===================================================================
+--- gpac-2.0.0.orig/src/Makefile
++++ gpac-2.0.0/src/Makefile
+@@ -387,7 +387,6 @@ jsmods: $(LIBGPAC_JSMODS)
+ # @echo "LIBS $(EXTRALIBS)"
+
+ ifeq ($(CONFIG_DARWIN),yes)
+-
+ $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+ $(RANLIB) ../bin/gcc/libgpac_static.a
+ ifneq ($(STATICBUILD),yes)
+@@ -395,9 +394,10 @@ ifneq ($(STATICBUILD),yes)
+ endif
+
+ else
+-
++ifeq ($(STATICLIBS), yes)
+ $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+ $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+ $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS)
+ mv $@ $@.$(VERSION_SONAME)
diff --git a/media-video/gpac/gpac-2.0.0.ebuild b/media-video/gpac/gpac-2.0.0.ebuild
new file mode 100644
index 00000000000..3a6ccfbdc05
--- /dev/null
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/gpac/gpac"
+else
+ SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+fi
+
+inherit flag-o-matic toolchain-funcs ${SCM} xdg
+
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/"
+
+LICENSE="GPL-2"
+# subslot == libgpac major
+SLOT="0/11"
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
+ pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ media-libs/libogg
+ sys-libs/zlib
+ a52? ( media-libs/a52dec )
+ aac? ( media-libs/faad2 )
+ alsa? ( media-libs/alsa-lib )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:2 )
+ mad? ( media-libs/libmad )
+ opengl? (
+ media-libs/freeglut
+ virtual/glu
+ virtual/opengl
+ )
+ png? ( media-libs/libpng:0= )
+ pulseaudio? ( media-sound/pulseaudio )
+ theora? ( media-libs/libtheora )
+ truetype? ( media-libs/freetype:2 )
+ sdl? ( media-libs/libsdl )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ vorbis? ( media-libs/libvorbis )
+ X? (
+ x11-libs/libXt
+ x11-libs/libX11
+ x11-libs/libXv
+ x11-libs/libXext
+ )
+ xml? ( dev-libs/libxml2:2= )
+ xvid? ( media-libs/xvid )
+"
+DEPEND="
+ ${RDEPEND}
+ dvb? ( sys-kernel/linux-headers )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.0-configure.patch"
+ "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+)
+
+DOCS=(
+ share/doc/CODING_STYLE
+ share/doc/GPAC\ UPnP.doc
+ share/doc/ISO\ 639-2\ codes.txt
+ share/doc/SceneGenerators
+ share/doc/ipmpx_syntax.bt
+ Changelog
+ README.md
+)
+
+HTML_DOCS="share/doc/*.html"
+
+my_use() {
+ local flag="$1" pflag="${2:-$1}"
+ if use ${flag}; then
+ echo "--use-${pflag}=system"
+ else
+ echo "--use-${pflag}=no"
+ fi
+}
+
+src_prepare() {
+ default
+ sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+}
+
+src_configure() {
+ tc-export CC CXX AR RANLIB
+
+ local myeconfargs=(
+ --cc="$(tc-getCC)"
+ --libdir="$(get_libdir)"
+ --verbose
+ --enable-pic
+ --enable-svg
+ --disable-amr
+ --use-js=no
+ --use-ogg=system
+ $(use_enable alsa)
+ $(use_enable debug)
+ $(use_enable dvb dvb4linux)
+ $(use_enable ipv6)
+ $(use_enable jack jack yes)
+ $(use_enable opengl 3d)
+ $(use_enable oss oss-audio)
+ $(use_enable pulseaudio pulseaudio yes)
+ $(use_enable sdl)
+ $(use_enable ssl)
+ $(use_enable static-libs static-lib)
+ $(use_enable X x11)
+ $(use_enable X x11-shm)
+ $(use_enable X x11-xv)
+ $(my_use a52)
+ $(my_use aac faad)
+ $(my_use dvb dvbx)
+ $(my_use ffmpeg)
+ $(my_use jpeg)
+ $(my_use jpeg2k openjpeg)
+ $(my_use mad)
+ $(my_use png)
+ $(my_use theora)
+ $(my_use truetype ft)
+ $(my_use vorbis)
+ $(my_use xvid)
+ )
+
+ if use amd64 || use x86 ; then
+ # Don't pass -mno-sse2 on non amd64/x86
+ myeconfargs+=(
+ --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')"
+ )
+ else
+ myeconfargs+=(
+ --extra-cflags="${CFLAGS}"
+ )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ einstalldocs
+ emake STRIP="true" DESTDIR="${ED}" install
+ emake STRIP="true" DESTDIR="${ED}" install-lib
+}
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index e1c72932c19..1c87f44bd3f 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
LICENSE="GPL-2"
# subslot == libgpac major
-SLOT="0/10"
+SLOT="0/11"
IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
@@ -63,7 +63,7 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-1.0.1-configure.patch"
+ "${FILESDIR}/${PN}-2.0.0-configure.patch"
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
)
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 5b2772755ce..d1aa2eedf8c 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1 +1,2 @@
DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
+DIST guvcview-src-2.0.7.tar.bz2 449392 BLAKE2B 94140845dbe1209802a7109a3f30d3f7aa391ff4f1b67396481138c65ae3a3cc27499c8dc239bf5e17b730c06e1ebe361872f2a1976f0c2802b8e84fb54a3548 SHA512 a3dcabf3fcb90171969fea76c1a05b4e47b640ba886370b048f5736e2f064f8682967c785db44a9461bdd3761b2bf264e8ce579691d37c8b9efa1a1393162ad8
diff --git a/media-video/guvcview/files/ffmpeg5.patch b/media-video/guvcview/files/ffmpeg5.patch
new file mode 100644
index 00000000000..7e8c71b2bc6
--- /dev/null
+++ b/media-video/guvcview/files/ffmpeg5.patch
@@ -0,0 +1,47 @@
+Index: work/gview_encoder/encoder.c
+===================================================================
+--- work.orig/gview_encoder/encoder.c
++++ work/gview_encoder/encoder.c
+@@ -446,10 +446,6 @@ static encoder_video_context_t *encoder_
+
+ video_codec_data->codec_context = avcodec_alloc_context3(video_codec_data->codec);
+
+- avcodec_get_context_defaults3 (
+- video_codec_data->codec_context,
+- video_codec_data->codec);
+-
+ if(video_codec_data->codec_context == NULL)
+ {
+ fprintf(stderr, "ENCODER: FATAL memory allocation failure (encoder_video_init): %s\n", strerror(errno));
+@@ -712,7 +708,6 @@ static encoder_audio_context_t *encoder_
+ }
+
+ audio_codec_data->codec_context = avcodec_alloc_context3(audio_codec_data->codec);
+- avcodec_get_context_defaults3 (audio_codec_data->codec_context, audio_codec_data->codec);
+
+ if(audio_codec_data->codec_context == NULL)
+ {
+Index: work/gview_v4l2core/jpeg_decoder.c
+===================================================================
+--- work.orig/gview_v4l2core/jpeg_decoder.c
++++ work/gview_v4l2core/jpeg_decoder.c
+@@ -1409,7 +1409,6 @@ int jpeg_init_decoder(int width, int hei
+
+ #if LIBAVCODEC_VER_AT_LEAST(53,6)
+ codec_data->context = avcodec_alloc_context3(codec_data->codec);
+- avcodec_get_context_defaults3 (codec_data->context, codec_data->codec);
+ #else
+ codec_data->context = avcodec_alloc_context();
+ avcodec_get_context_defaults(codec_data->context);
+Index: work/gview_v4l2core/uvc_h264.c
+===================================================================
+--- work.orig/gview_v4l2core/uvc_h264.c
++++ work/gview_v4l2core/uvc_h264.c
+@@ -1004,7 +1004,6 @@ int h264_init_decoder(int width, int hei
+
+ #if LIBAVCODEC_VER_AT_LEAST(53,6)
+ h264_ctx->context = avcodec_alloc_context3(h264_ctx->codec);
+- avcodec_get_context_defaults3 (h264_ctx->context, h264_ctx->codec);
+ #else
+ h264_ctx->context = avcodec_alloc_context();
+ avcodec_get_context_defaults(h264_ctx->context);
diff --git a/media-video/guvcview/guvcview-2.0.7.ebuild b/media-video/guvcview/guvcview-2.0.7.ebuild
new file mode 100644
index 00000000000..7cb8017438f
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}-src-${PV}
+inherit autotools qmake-utils toolchain-funcs
+
+DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices"
+HOMEPAGE="http://guvcview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl pulseaudio qt5"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/autoconf-archive
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+RDEPEND="
+ >=dev-libs/glib-2.10
+ media-libs/libpng:0=
+ media-libs/libsdl2
+ media-libs/libv4l
+ >=media-libs/portaudio-19_pre
+ >=media-video/ffmpeg-2.8:0=
+ virtual/libusb:1
+ virtual/udev
+ gsl? ( >=sci-libs/gsl-1.15:= )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ !qt5? ( >=x11-libs/gtk+-3.6:3 )
+"
+# linux-headers: bug 448260
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-3.4-r2
+ virtual/os-headers
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/ffmpeg5.patch" )
+
+src_prepare() {
+ default
+ sed -i '/^docdir/,/^$/d' Makefile.am || die
+ echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984
+ eautoreconf
+}
+
+src_configure() {
+ export MOC="$(qt5_get_bindir)/moc"
+
+ # 599030
+ tc-export CC CXX
+
+ local myeconfargs=(
+ --disable-debian-menu
+ --disable-static
+ $(use_enable gsl)
+ $(use_enable pulseaudio pulse)
+ $(use_enable qt5)
+ $(use_enable !qt5 gtk3)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
deleted file mode 100644
index 002400a072d..00000000000
--- a/media-video/gxine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215
diff --git a/media-video/gxine/files/gxine-0.5.909-fno-common.patch b/media-video/gxine/files/gxine-0.5.909-fno-common.patch
deleted file mode 100644
index 32ad6c3770b..00000000000
--- a/media-video/gxine/files/gxine-0.5.909-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/709306
---- a/src/main.c
-+++ b/src/main.c
-@@ -75,6 +75,7 @@
- * globals
- */
-
-+extern int gxine_init_count;
- int verbosity;
- GtkWidget *app = NULL;
- const char *plugindir, *bindir, *logodir, *pixmapdir, *icondir, *miscdir, *confdir;
---- a/src/utils.h
-+++ b/src/utils.h
-@@ -108,7 +108,7 @@ void do_pending_events (void);
-
- const char *get_copyright_notice (void);
-
--int gxine_init_count;
-+extern int gxine_init_count;
- static inline void gxine_init_add (GSourceFunc func, gpointer data)
- {
- ++gxine_init_count;
diff --git a/media-video/gxine/gxine-0.5.909-r1.ebuild b/media-video/gxine/gxine-0.5.909-r1.ebuild
deleted file mode 100644
index f8dca86551c..00000000000
--- a/media-video/gxine/gxine-0.5.909-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="GTK+ Front-End for libxine"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="l10n_cs l10n_de lirc nls udev xinerama"
-
-DEPEND="
- media-libs/xine-lib[gtk]
- x11-libs/gtk+:2
- dev-lang/spidermonkey:0
- dev-libs/glib
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libxcb
- lirc? ( app-misc/lirc )
- nls? ( virtual/libintl )
- udev? ( dev-libs/libgudev:= )
- xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
- default
- # need to disable calling of xine-list when running without
- # userpriv, otherwise we get sandbox violations (bug #233847)
- if [[ ${EUID} == 0 ]]; then
- sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-watchdog \
- --with-xcb \
- --without-browser-plugin \
- --without-dbus \
- --without-hal \
- $(use_enable nls) \
- $(use_enable lirc) \
- $(use_with udev gudev) \
- $(use_with xinerama)
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- docsdir="${EPREFIX}"/usr/share/doc/${PF} \
- install
-
- dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
-
- use l10n_cs && dodoc README.cs
- use l10n_de && dodoc README.de
-}
diff --git a/media-video/gxine/metadata.xml b/media-video/gxine/metadata.xml
deleted file mode 100644
index 43aae5be9f8..00000000000
--- a/media-video/gxine/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">xine</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 8dfc1a5454b..1838ad0338f 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1,2 @@
-DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b SHA512 ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
+DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1 SHA512 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
diff --git a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
deleted file mode 100644
index d7cc565377f..00000000000
--- a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001
-From: Damiano Galassi <damiog@gmail.com>
-Date: Sat, 10 Apr 2021 13:18:02 +0200
-Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4.
-
----
- libhb/encavcodecaudio.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
-index 52fc4565d..e6cf42414 100644
---- a/libhb/encavcodecaudio.c
-+++ b/libhb/encavcodecaudio.c
-@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t *list)
-
- // Prepare input frame
- int out_size;
-- AVFrame frame = { .nb_samples = pv->samples_per_frame, };
-+ AVFrame frame = { .nb_samples = pv->samples_per_frame,
-+ .format = pv->context->sample_fmt,
-+ .channels = pv->context->channels
-+ };
-
- out_size = av_samples_get_buffer_size(NULL,
- pv->context->channels,
---
-2.26.3
-
diff --git a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
deleted file mode 100644
index 7e8ab99730a..00000000000
--- a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/libhb/common.c
-+++ b/libhb/common.c
-@@ -243,7 +243,6 @@
- {
- // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS, },
-- { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, },
- { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, },
---- a/scripts/manicure.rb
-+++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -1298,7 +1298,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1615,7 +1615,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -1732,7 +1732,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
diff --git a/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch
new file mode 100644
index 00000000000..64360507629
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch
@@ -0,0 +1,40 @@
+# https://git.exherbo.org/media.git/commit/?id=b7a022928103184b7528d0e40ad0a4edcfbbd7a4
+
+From 8a9d11e96b771422247c458ae6b07f3a13848f3a Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Sat, 15 Jan 2022 20:44:53 +0100
+Subject: [PATCH] FFmpeg deprecations fixes for FFmpeg >= 5
+
+avcodec.h stopped including bsf.h per FFmpeg commit
+57b5ec6ba7df [1]. Fixes compilation error against
+FFmpeg later than the mentioned commit.
+[1] https://github.com/FFmpeg/FFmpeg/commit/57b5ec6ba7df442caebc401c4a7ef3ebc066b519
+---
+ libhb/decavcodec.c | 1 +
+ libhb/muxavformat.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
+index 372f86f82cf..e7a63289c0f 100644
+--- a/libhb/decavcodec.c
++++ b/libhb/decavcodec.c
+@@ -41,6 +41,7 @@
+ #include "handbrake/handbrake.h"
+ #include "handbrake/hbffmpeg.h"
+ #include "handbrake/hbavfilter.h"
++#include "libavcodec/bsf.h"
+ #include "libavfilter/avfilter.h"
+ #include "libavfilter/buffersrc.h"
+ #include "libavfilter/buffersink.h"
+diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
+index 232edd0942a..ad8e2a1d8fa 100644
+--- a/libhb/muxavformat.c
++++ b/libhb/muxavformat.c
+@@ -8,6 +8,7 @@
+ */
+
+ #include <ogg/ogg.h>
++#include "libavcodec/bsf.h"
+ #include "libavformat/avformat.h"
+ #include "libavutil/avstring.h"
+ #include "libavutil/intreadwrite.h"
diff --git a/media-video/handbrake/handbrake-1.3.3-r3.ebuild b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
deleted file mode 100644
index 84a582a27b0..00000000000
--- a/media-video/handbrake/handbrake-1.3.3-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
- inherit git-r3
-else
- MY_P="HandBrake-${PV}"
- SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/${MY_P}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="https://handbrake.fr/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
- app-arch/xz-utils
- media-libs/speex
- dev-libs/jansson:=
- dev-libs/libxml2
- media-libs/a52dec
- media-libs/libass:=
- >=media-libs/libbluray-1.0
- >=media-libs/dav1d-0.5.1
- media-libs/libdvdnav
- media-libs/libdvdread:=
- media-libs/libsamplerate
- media-libs/libtheora
- media-libs/libvorbis
- >=media-libs/libvpx-1.8
- nvenc? ( media-libs/nv-codec-headers )
- media-libs/opus
- media-libs/x264:=
- media-sound/lame
- sys-libs/zlib
- >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-a52dec:1.0
- media-plugins/gst-plugins-libav:1.0
- media-plugins/gst-plugins-x264:1.0
- media-plugins/gst-plugins-gdkpixbuf:1.0
- )
- gtk? (
- >=x11-libs/gtk+-3.10
- dev-libs/dbus-glib
- dev-libs/glib:2
- dev-libs/libgudev:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/libnotify
- x11-libs/pango
- )
- fdk? ( media-libs/fdk-aac )
- x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/nasm
- dev-util/intltool"
-
-PATCHES=(
- # Remove libdvdnav duplication and call it on the original instead.
- # It may work this way; if not, we should try to mimic the duplication.
- "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
- # Remove faac dependency; TODO: figure out if we need to do this at all.
- "${FILESDIR}/${P}-remove-faac-dependency.patch"
-
- # Use whichever python is set by portage
- "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
-
- # Fix x265 linkage... again again #730034
- "${FILESDIR}/${PN}-1.3.3-x265-link.patch"
-
- # Fix missing audio stream when using MPEG-4 avformat with ffmpeg-4.4 #791220
- "${FILESDIR}/${PN}-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch"
-)
-
-src_prepare() {
- # Get rid of leftover bundled library build definitions,
- sed -i 's:.*\(/contrib\|contrib/\).*::g' \
- "${S}"/make/include/main.defs \
- || die "Contrib removal failed."
-
- default
-
- cd "${S}/gtk"
- # Don't run autogen.sh.
- sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
- eautoreconf
-}
-
-src_configure() {
- # Libav was replaced in 1.2 with ffmpeg by default
- # but I've elected to not make people change their use flags for AAC
- # as its the same code anyway
- ./configure \
- --force \
- --verbose \
- --prefix="${EPREFIX}/usr" \
- --disable-gtk-update-checks \
- --disable-flatpak \
- --disable-gtk4 \
- $(use_enable libav-aac ffmpeg-aac) \
- $(use_enable fdk fdk-aac) \
- $(usex !gtk --disable-gtk) \
- $(usex !gstreamer --disable-gst) \
- $(use_enable numa) \
- $(use_enable nvenc) \
- $(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
- emake -C build
-
- # TODO: Documentation building is currently broken, try to fix it.
- #
- # if use doc ; then
- # emake -C build doc
- # fi
-}
-
-src_install() {
- emake -C build DESTDIR="${D}" install
-
- dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
- einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
- einfo "do not use the bundled (and often patched) upstream libraries."
- einfo ""
- einfo "Please do not raise bugs with upstream because of these ebuilds,"
- einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
- einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
- if use gtk ; then
- einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
- fi
-
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.4.2-r1.ebuild b/media-video/handbrake/handbrake-1.4.2-r2.ebuild
index 75a5cf2fa4a..920f82d8e49 100644
--- a/media-video/handbrake/handbrake-1.4.2-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2-r2.ebuild
@@ -14,7 +14,7 @@ else
MY_P="HandBrake-${PV}"
SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
@@ -31,16 +31,16 @@ RDEPEND="
dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
- >=media-libs/dav1d-0.5.1
+ >=media-libs/dav1d-0.5.1:=
media-libs/libjpeg-turbo:=
media-libs/libass:=
- >=media-libs/libbluray-1.0
+ >=media-libs/libbluray-1.0:=
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate
media-libs/libtheora
media-libs/libvorbis
- >=media-libs/libvpx-1.8
+ >=media-libs/libvpx-1.8:=
media-libs/opus
media-libs/speex
media-libs/x264:=
@@ -48,7 +48,7 @@ RDEPEND="
media-sound/lame
>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
sys-libs/zlib
- fdk? ( media-libs/fdk-aac )
+ fdk? ( media-libs/fdk-aac:= )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
diff --git a/media-video/handbrake/handbrake-1.3.3-r2.ebuild b/media-video/handbrake/handbrake-1.5.1.ebuild
index a8bf0bdbcbd..c5f8eebf74a 100644
--- a/media-video/handbrake/handbrake-1.3.3-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools gnome2-utils python-any-r1 xdg-utils
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-any-r1 toolchain-funcs xdg
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
@@ -17,7 +18,7 @@ else
fi
DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="https://handbrake.fr/"
+HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake"
LICENSE="GPL-2"
SLOT="0"
@@ -27,25 +28,27 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
RDEPEND="
app-arch/xz-utils
- media-libs/speex
dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
+ >=media-libs/dav1d-0.5.1:=
+ media-libs/libjpeg-turbo:=
media-libs/libass:=
- >=media-libs/libbluray-1.0
- >=media-libs/dav1d-0.5.1
+ >=media-libs/libbluray-1.0:=
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate
media-libs/libtheora
media-libs/libvorbis
- >=media-libs/libvpx-1.8
- nvenc? ( media-libs/nv-codec-headers )
+ >=media-libs/libvpx-1.8:=
media-libs/opus
+ media-libs/speex
media-libs/x264:=
+ media-libs/zimg
media-sound/lame
- sys-libs/zlib
>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+ sys-libs/zlib
+ fdk? ( media-libs/fdk-aac:= )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -67,13 +70,15 @@ RDEPEND="
x11-libs/libnotify
x11-libs/pango
)
- fdk? ( media-libs/fdk-aac )
- x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
+ nvenc? ( media-libs/nv-codec-headers )
+ x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+"
+DEPEND="
${PYTHON_DEPS}
+ ${RDEPEND}
dev-lang/nasm
- dev-util/intltool"
+ dev-util/intltool
+"
PATCHES=(
# Remove libdvdnav duplication and call it on the original instead.
@@ -81,13 +86,19 @@ PATCHES=(
"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
# Remove faac dependency; TODO: figure out if we need to do this at all.
- "${FILESDIR}/${P}-remove-faac-dependency.patch"
+ "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+ # Detect system tools - bug 738110
+ "${FILESDIR}/${PN}-9999-system-tools.patch"
# Use whichever python is set by portage
"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
# Fix x265 linkage... again again #730034
"${FILESDIR}/${PN}-1.3.3-x265-link.patch"
+
+ # Fix compatability with ffmpeg-5.0
+ "${FILESDIR}/${PN}-1.5.1-ffmpeg-5.0.patch"
)
src_prepare() {
@@ -98,45 +109,41 @@ src_prepare() {
default
- cd "${S}/gtk"
- # Don't run autogen.sh.
- sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+ cd "${S}/gtk" || die
eautoreconf
}
src_configure() {
+ tc-export AR RANLIB STRIP
+
# Libav was replaced in 1.2 with ffmpeg by default
# but I've elected to not make people change their use flags for AAC
# as its the same code anyway
- ./configure \
- --force \
- --verbose \
- --prefix="${EPREFIX}/usr" \
- --disable-gtk-update-checks \
- --disable-flatpak \
- --disable-gtk4 \
- $(use_enable libav-aac ffmpeg-aac) \
- $(use_enable fdk fdk-aac) \
- $(usex !gtk --disable-gtk) \
- $(usex !gstreamer --disable-gst) \
- $(use_enable numa) \
- $(use_enable nvenc) \
- $(use_enable x265) || die "Configure failed."
+ local myconfargs=(
+ --force
+ --verbose
+ --prefix="${EPREFIX}/usr"
+ --disable-gtk-update-checks
+ --disable-flatpak
+ --disable-gtk4
+ $(use_enable libav-aac ffmpeg-aac)
+ $(use_enable fdk fdk-aac)
+ $(usex !gtk --disable-gtk)
+ $(usex !gstreamer --disable-gst)
+ $(use_enable numa)
+ $(use_enable nvenc)
+ $(use_enable x265)
+ )
+
+ ./configure "${myconfargs[@]}" || die "Configure failed."
}
src_compile() {
emake -C build
-
- # TODO: Documentation building is currently broken, try to fix it.
- #
- # if use doc ; then
- # emake -C build doc
- # fi
}
src_install() {
emake -C build DESTDIR="${D}" install
-
dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
}
@@ -152,11 +159,5 @@ pkg_postinst() {
einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
fi
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
+ xdg_pkg_postinst
}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 75a5cf2fa4a..ab3d4b77a81 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -31,16 +31,16 @@ RDEPEND="
dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
- >=media-libs/dav1d-0.5.1
+ >=media-libs/dav1d-0.5.1:=
media-libs/libjpeg-turbo:=
media-libs/libass:=
- >=media-libs/libbluray-1.0
+ >=media-libs/libbluray-1.0:=
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate
media-libs/libtheora
media-libs/libvorbis
- >=media-libs/libvpx-1.8
+ >=media-libs/libvpx-1.8:=
media-libs/opus
media-libs/speex
media-libs/x264:=
@@ -48,7 +48,7 @@ RDEPEND="
media-sound/lame
>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
sys-libs/zlib
- fdk? ( media-libs/fdk-aac )
+ fdk? ( media-libs/fdk-aac:= )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index 2a996322704..f3a4081b7b2 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -15,7 +15,6 @@
<flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
<flag name="libav-aac">Support for encoding AAC using libav's internal encoder.</flag>
<flag name="numa">Adds support for x265's NUMA capabilities.</flag>
- <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
</use>
<upstream>
diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
index 8574fcbd9ad..418d9eddf93 100644
--- a/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
+++ b/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
@@ -12,32 +12,40 @@ HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player"
SRC_URI="
https://github.com/jellyfin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
-LICENSE="GPL-2"
+# GPL-2.0 for JMP itself
+# licenses for code in external/:
+# MIT for qhttp
+# BSD for qslog
+LICENSE="
+ GPL-2
+ BSD
+ MIT
+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+dbus"
DEPEND="
- dev-qt/qtxml:5
- dev-qt/qtwebengine:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dbus? ( dev-qt/qtdbus:5 )
- dev-qt/qtwebchannel:5
+ dev-libs/libcec
+ dev-qt/qtcore:5
dev-qt/qtdeclarative:5
- dev-qt/qtnetwork:5
dev-qt/qtgui:5
- dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
dev-qt/qtquickcontrols:5
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5
dev-qt/qtwidgets:5
- x11-libs/libX11
- x11-libs/libXrandr
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
media-libs/libsdl2
- dev-libs/libcec
+ media-video/mpv[libmpv]
sys-libs/zlib
virtual/opengl
- media-video/mpv[libmpv]
+ x11-libs/libX11
+ x11-libs/libXrandr
+ dbus? ( dev-qt/qtdbus:5 )
"
BDEPEND="
diff --git a/media-video/jellyfin-media-player/metadata.xml b/media-video/jellyfin-media-player/metadata.xml
index 830b7c1f6ba..fdec7f882ca 100644
--- a/media-video/jellyfin-media-player/metadata.xml
+++ b/media-video/jellyfin-media-player/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>arsen@aarsen.me</email>
<name>Arsen Arsenović</name>
</maintainer>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>telans@posteo.de</email>
<name>James Beddek</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
index 47145956d5e..46f12a5b2e4 100644
--- a/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
+++ b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-DESCRIPTION="Modified Jellyfin Web Client for use inside Jellyfin Media Player."
+DESCRIPTION="Modified Jellyfin Web Client for use inside Jellyfin Media Player"
HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player"
SRC_URI="
https://github.com/iwalton3/${PN%-bin}/releases/download/jwc-${PV}/dist.zip -> ${P}.zip
diff --git a/media-video/jellyfin-web-jmp-bin/metadata.xml b/media-video/jellyfin-web-jmp-bin/metadata.xml
index 830b7c1f6ba..fdec7f882ca 100644
--- a/media-video/jellyfin-web-jmp-bin/metadata.xml
+++ b/media-video/jellyfin-web-jmp-bin/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>arsen@aarsen.me</email>
<name>Arsen Arsenović</name>
</maintainer>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>telans@posteo.de</email>
<name>James Beddek</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/media-video/jubler/jubler-5.1.ebuild b/media-video/jubler/jubler-5.1.ebuild
index 49775bdf39e..d69368f4200 100644
--- a/media-video/jubler/jubler-5.1.ebuild
+++ b/media-video/jubler/jubler-5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit java-pkg-2 java-ant-2 xdg
+inherit desktop java-pkg-2 java-ant-2 xdg
MY_PN="${PN^}"
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index 08194f6291f..e8953d2e4dc 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,8 +1,2 @@
-DIST libva-utils-2.10.0.tar.gz 1203536 BLAKE2B c7b51e07618204c55e992f57dd2d80b289d2edd7b4f526c3afaaec1081f5497ac86614e097bc14a1e79d380ca2c529359d02cee601502e292ca8f89073d5fdbb SHA512 2d44c5e3f52ff4ce8bfb206af95c4d790b6d31ec21f899f0ec9604391359f55de06c63b446e19cd8f0ea0c36ccb4ac7cc5ae7fe68361eb263c01454682d18402
-DIST libva-utils-2.11.1.tar.gz 1205472 BLAKE2B 251a318d10eb5907e0ee54f101a153cfe76a98d61fc1f4fabf890901b52e980439d77acfbb4e1b566d361a7cda5c7ab504e575067eb932b0e121904be34b801f SHA512 d64c4767269a810386e02426fce3bde6aa693ac899ace22900e4ae4918dfe461736fe0a031db36751281d5bd78960354cdfa4ca13c5f7c30cc67d05abdd0bcd2
-DIST libva-utils-2.12.0.tar.gz 1213135 BLAKE2B 259ed063e178adc22aa9d69d92715420dd82f25c8b85ce946e13539d96723ee80d406052e4f7a646721f3d4ee4743ffea816c6916f4a5fd6aeeabf9bce1e6671 SHA512 38ef214fa8cb67b5252915e134333fab46d911cc4c9884576013083023e782bccf045ec01534024e901de1143f1ae85f52cdf6e6fe087cb9f3bf727c206d9746
DIST libva-utils-2.13.0.tar.gz 1230036 BLAKE2B 4e70a13fb9b4362713b6f461a0ee199b8f7e9d9cbac7bc664c11870db92a87873d73306b5777c554830b932a15e726965e1db3591fd1349fb62f068617dd8558 SHA512 81c7c122a4d1bdf8d390a4ea3e0d34499158fb7b7fe0f7aa9d556158895e755139975fd01d73d883897c0a4390612d131b6349febbdf16fa5edcd46a6a82acd2
-DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
-DIST libva-utils-2.8.0.tar.bz2 1037112 BLAKE2B 9168d7d489e1574d970e9e3a270946de522a4063b80c4cafe38cc6917b99deb6394570592d3ed29a0ff7b92f819b9bbc9eb2a8f3b70077625a2714f70ee1959e SHA512 b3412349234ad2923953296674926ee7cb33c43ce17df8942f751789f0208064a4557ca16e1a5878a4e1b35e5bbbd415a9c9f182ffb24e589ac4757e990576b5
-DIST libva-utils-2.8.0.tar.gz 1198057 BLAKE2B 7c3332fcd2f4631cb2f77d0775e7f542b8ffbbb77aac0fb0629fb2474563320dbbefa546999fc7c991e8081e82a2c48b1406a34d2f075c80fca391088d779fcc SHA512 2102c5bc2b9b1caa99852892b2b7c1f5db7846283781cec84fe9683ac245ea366120096c1032a2c8b36a7c5fc8e4cd68e3939b0a2712a15f453c33560217585d
-DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a0431062d1d9803d8ccb1e5c3b534edf4f91288009d5940a0ddab49beeadae92bf361bec0bee8a3214f04f3c6767b0992 SHA512 39d79d4eed1fc0890fbf89d5689d4f01f704d3c71b4986e0eaf4c4a2f836cc36338d0a01630092a31b740588426398d0381eae1dc0302b0df94859d9161d8378
+DIST libva-utils-2.14.0.tar.gz 1241072 BLAKE2B 17f1e0badb05e39f3979bde652dfe6832e8bfb2accd99fd6c5d972090cfce630e2a93ad96e5d17bc7bd9c393b12c2a7b066cb60a715c2dbb128dd263c480bcca SHA512 631e9becf5b2f6d083906962c004c9080d2e2b2d98b6003638a31dde8ad4e2549606301b97e88822471e29007232fc470a2116be09dc0c55d3cc2df6a45a7be1
diff --git a/media-video/libva-utils/libva-utils-2.10.0.ebuild b/media-video/libva-utils/libva-utils-2.10.0.ebuild
deleted file mode 100644
index 7803d68b489..00000000000
--- a/media-video/libva-utils/libva-utils-2.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} = *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-else
- # Tarball with pre-built 'configure' not always available, portage use tarballs
- # without pre-built 'configure' as they are always avaialbe upstream.
- # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
- SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm test wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} = *9999 ]] ; then
- DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
-else
- DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
-fi
-
-DEPEND+="
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? ( >=x11-libs/libX11-1.6.2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
-
-# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git
-DOCS=( NEWS CONTRIBUTING.md README.md )
-
-src_prepare() {
- default
- sed -e 's/-Werror//' -i test/Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/media-video/libva-utils/libva-utils-2.11.1.ebuild b/media-video/libva-utils/libva-utils-2.11.1.ebuild
deleted file mode 100644
index e9643c5b9ae..00000000000
--- a/media-video/libva-utils/libva-utils-2.11.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} = *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-else
- # Tarball with pre-built 'configure' not always available, portage use tarballs
- # without pre-built 'configure' as they are always avaialbe upstream.
- # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
- SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- || ( drm wayland X )
- putsurface? ( || ( wayland X ) )
- putsurface? ( drm )
- || ( examples putsurface test-va-api vainfo )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} = *9999 ]] ; then
- DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
-else
- DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
-fi
-
-DEPEND+="
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? ( >=x11-libs/libX11-1.6.2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
-
-# CONTRIBUTING.md and README.md are available only in .tar.gz tarballs and in git
-DOCS=( NEWS CONTRIBUTING.md README.md )
-
-src_prepare() {
- default
-
- sed -e 's/-Werror//' -i test/Makefile.am || die
-
- if ! use examples ; then
- sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
- fi
-
- if ! use putsurface ; then
- sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
- fi
-
- if ! use vainfo ; then
- sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
-
- if use test || use test-va-api ; then
- myeconfargs+=( --enable-tests )
- else
- myeconfargs+=( --disable-tests )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- if ! use test-va-api ; then
- if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
- rm -f "${ED}"/usr/bin/test_va_api || die
- fi
- fi
-}
diff --git a/media-video/libva-utils/libva-utils-2.12.0.ebuild b/media-video/libva-utils/libva-utils-2.12.0.ebuild
deleted file mode 100644
index a83fef48875..00000000000
--- a/media-video/libva-utils/libva-utils-2.12.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} = *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-else
- # Tarball with pre-built 'configure' not always available, portage use tarballs
- # without pre-built 'configure' as they are always avaialbe upstream.
- # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
- SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- || ( drm wayland X )
- putsurface? ( || ( wayland X ) )
- putsurface? ( drm )
- || ( examples putsurface test-va-api vainfo )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} = *9999 ]] ; then
- DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
-else
- DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
-fi
-
-DEPEND+="
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? ( >=x11-libs/libX11-1.6.2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
-
-# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git
-DOCS=( NEWS CONTRIBUTING.md README.md )
-
-src_prepare() {
- default
-
- sed -e 's/-Werror//' -i test/Makefile.am || die
-
- if ! use examples ; then
- sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
- fi
-
- if ! use putsurface ; then
- sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
- fi
-
- if ! use vainfo ; then
- sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
-
- if use test || use test-va-api ; then
- myeconfargs+=( --enable-tests )
- else
- myeconfargs+=( --disable-tests )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if ! use test-va-api ; then
- if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
- rm -f "${ED}"/usr/bin/test_va_api || die
- fi
- fi
-}
diff --git a/media-video/libva-utils/libva-utils-2.13.0.ebuild b/media-video/libva-utils/libva-utils-2.13.0.ebuild
index 5f77a232170..20c064a8733 100644
--- a/media-video/libva-utils/libva-utils-2.13.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.13.0.ebuild
@@ -15,7 +15,7 @@ else
# without pre-built 'configure' as they are always available upstream.
# SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
diff --git a/media-video/libva-utils/libva-utils-2.14.0.ebuild b/media-video/libva-utils/libva-utils-2.14.0.ebuild
new file mode 100644
index 00000000000..345f478cae2
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.14.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} = *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/intel/libva-utils"
+else
+ SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples putsurface test +vainfo wayland X"
+RESTRICT="test" # Tests must be run manually
+
+REQUIRED_USE="
+ putsurface? ( || ( wayland X ) )
+ || ( examples putsurface test vainfo )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} = *9999 ]] ; then
+ DEPEND="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]"
+else
+ DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]"
+fi
+
+DEPEND+="
+ wayland? ( >=dev-libs/wayland-1.0.6 )
+ X? ( >=x11-libs/libX11-1.6.2 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ local sed_args=()
+
+ # Fix broken dependency check
+ # https://github.com/intel/libva-utils/pull/260
+ sed_args+=(-e "s/dependency('drm'/dependency('libdrm'/")
+
+ if ! use examples ; then
+ sed_args+=(
+ -e "/^subdir('decode')$/d"
+ -e "/^subdir('encode')$/d"
+ -e "/^subdir('videoprocess')$/d"
+ -e "/^subdir('vendor\/intel')$/d"
+ -e "/^subdir('vendor\/intel\/sfcsample')$/d"
+ )
+ fi
+
+ if ! use putsurface ; then
+ sed_args+=(-e "/^subdir('putsurface')$/d")
+ fi
+
+ if ! use vainfo ; then
+ sed_args+=(-e "/^subdir('vainfo')$/d")
+ fi
+
+ if [[ ${#sed_args[@]} -gt 0 ]] ; then
+ sed "${sed_args[@]}" -i meson.build || die
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddrm=true
+ $(meson_use X x11)
+ $(meson_use wayland)
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use test ; then
+ rm -f "${ED}"/usr/bin/test_va_api || die
+ fi
+}
+
+pkg_postinst() {
+ if use test ; then
+ elog "Tests must be run manually with the test_va_api binary"
+ fi
+}
diff --git a/media-video/libva-utils/libva-utils-2.4.0.ebuild b/media-video/libva-utils/libva-utils-2.4.0.ebuild
deleted file mode 100644
index 81e7d37861c..00000000000
--- a/media-video/libva-utils/libva-utils-2.4.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-fi
-inherit autotools
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} != *9999* ]] ; then
- SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm test wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- >=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
- drm? ( >=x11-libs/libdrm-2.4 )
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? (
- >=x11-libs/libX11-1.6.2
- >=x11-libs/libXext-1.3.2
- >=x11-libs/libXfixes-5.0.1
- )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS )
-
-src_prepare() {
- default
- sed -e 's/-Werror//' -i test/Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- [[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md )
- default
-}
diff --git a/media-video/libva-utils/libva-utils-2.8.0-r1.ebuild b/media-video/libva-utils/libva-utils-2.8.0-r1.ebuild
deleted file mode 100644
index d25c79ae564..00000000000
--- a/media-video/libva-utils/libva-utils-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-fi
-
-if [[ ${PV} = 2.8.0 ]]; then
- AUTOCONFIGURED="true"
-else
- AUTOCONFIGURED="false"
-fi
-
-if ! ${AUTOCONFIGURED}; then
- inherit autotools
-fi
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} != *9999* ]] ; then
- if ${AUTOCONFIGURED}; then
- SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
- else
- SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- fi
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm test wayland X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( drm wayland X )"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- >=x11-libs/libva-${PV}:=[drm?,wayland?,X?]
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? ( >=x11-libs/libX11-1.6.2 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS )
-
-src_prepare() {
- default
- sed -e 's/-Werror//' -i test/Makefile.am || die
- if ${AUTOCONFIGURED}; then
- sed -e 's/-Werror//' -i test/Makefile.in || die
- touch ./configure || die
- else
- eautoreconf
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- [[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md )
- default
-}
diff --git a/media-video/libva-utils/libva-utils-2.8.0-r2.ebuild b/media-video/libva-utils/libva-utils-2.8.0-r2.ebuild
deleted file mode 100644
index 7803d68b489..00000000000
--- a/media-video/libva-utils/libva-utils-2.8.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} = *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-else
- # Tarball with pre-built 'configure' not always available, portage use tarballs
- # without pre-built 'configure' as they are always avaialbe upstream.
- # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
- SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm test wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} = *9999 ]] ; then
- DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
-else
- DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
-fi
-
-DEPEND+="
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? ( >=x11-libs/libX11-1.6.2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
-
-# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git
-DOCS=( NEWS CONTRIBUTING.md README.md )
-
-src_prepare() {
- default
- sed -e 's/-Werror//' -i test/Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/media-video/libva-utils/libva-utils-2.8.0.ebuild b/media-video/libva-utils/libva-utils-2.8.0.ebuild
deleted file mode 100644
index f5a0b8cea6d..00000000000
--- a/media-video/libva-utils/libva-utils-2.8.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-fi
-
-inherit autotools
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} != *9999* ]] ; then
- SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm test wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- >=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
- drm? ( >=x11-libs/libdrm-2.4 )
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? (
- >=x11-libs/libX11-1.6.2
- >=x11-libs/libXext-1.3.2
- >=x11-libs/libXfixes-5.0.1
- )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS )
-
-src_prepare() {
- default
- sed -e 's/-Werror//' -i test/Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- [[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md )
- default
-}
diff --git a/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild b/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild
deleted file mode 100644
index 7803d68b489..00000000000
--- a/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} = *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-else
- # Tarball with pre-built 'configure' not always available, portage use tarballs
- # without pre-built 'configure' as they are always avaialbe upstream.
- # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
- SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm test wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} = *9999 ]] ; then
- DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
-else
- DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
-fi
-
-DEPEND+="
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? ( >=x11-libs/libX11-1.6.2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
-
-# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git
-DOCS=( NEWS CONTRIBUTING.md README.md )
-
-src_prepare() {
- default
- sed -e 's/-Werror//' -i test/Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/media-video/libva-utils/libva-utils-2.9.1.ebuild b/media-video/libva-utils/libva-utils-2.9.1.ebuild
deleted file mode 100644
index 5c4c9e2040a..00000000000
--- a/media-video/libva-utils/libva-utils-2.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/intel/libva-utils"
-fi
-inherit autotools
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} != *9999* ]] ; then
- SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm test wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- >=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
- drm? ( >=x11-libs/libdrm-2.4 )
- wayland? ( >=dev-libs/wayland-1.0.6 )
- X? (
- >=x11-libs/libX11-1.6.2
- >=x11-libs/libXext-1.3.2
- >=x11-libs/libXfixes-5.0.1
- )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS )
-
-src_prepare() {
- default
- sed -e 's/-Werror//' -i test/Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- [[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md )
- default
-}
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 2f790d95839..4decf846c63 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools
+inherit meson
DESCRIPTION="Collection of utilities and tests for VA-API"
HOMEPAGE="https://01.org/linuxmedia/vaapi"
@@ -11,31 +11,26 @@ if [[ ${PV} = *9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/intel/libva-utils"
else
- # Tarball with pre-built 'configure' not always available, portage use tarballs
- # without pre-built 'configure' as they are always available upstream.
- # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
SLOT="0"
-IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
-RESTRICT="!test? ( test )"
+IUSE="examples putsurface test +vainfo wayland X"
+RESTRICT="test" # Tests must be run manually
REQUIRED_USE="
- || ( drm wayland X )
putsurface? ( || ( wayland X ) )
- putsurface? ( drm )
- || ( examples putsurface test-va-api vainfo )
+ || ( examples putsurface test vainfo )
"
BDEPEND="virtual/pkgconfig"
if [[ ${PV} = *9999 ]] ; then
- DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
+ DEPEND="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]"
else
- DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
+ DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]"
fi
DEPEND+="
@@ -44,54 +39,58 @@ DEPEND+="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
-
-# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git
-DOCS=( NEWS CONTRIBUTING.md README.md )
-
src_prepare() {
default
- sed -e 's/-Werror//' -i test/Makefile.am || die
+ local sed_args=()
+
+ # Fix broken dependency check
+ # https://github.com/intel/libva-utils/pull/260
+ sed_args+=(-e "s/dependency('drm'/dependency('libdrm'/")
if ! use examples ; then
- sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
+ sed_args+=(
+ -e "/^subdir('decode')$/d"
+ -e "/^subdir('encode')$/d"
+ -e "/^subdir('videoprocess')$/d"
+ -e "/^subdir('vendor\/intel')$/d"
+ -e "/^subdir('vendor\/intel\/sfcsample')$/d"
+ )
fi
if ! use putsurface ; then
- sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
+ sed_args+=(-e "/^subdir('putsurface')$/d")
fi
if ! use vainfo ; then
- sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
+ sed_args+=(-e "/^subdir('vainfo')$/d")
fi
- eautoreconf
+ if [[ ${#sed_args[@]} -gt 0 ]] ; then
+ sed "${sed_args[@]}" -i meson.build || die
+ fi
}
src_configure() {
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable test tests)
- $(use_enable wayland)
- $(use_enable X x11)
+ local emesonargs=(
+ -Ddrm=true
+ $(meson_use X x11)
+ $(meson_use wayland)
+ $(meson_use test tests)
)
-
- if use test || use test-va-api ; then
- myeconfargs+=( --enable-tests )
- else
- myeconfargs+=( --disable-tests )
- fi
-
- econf "${myeconfargs[@]}"
+ meson_src_configure
}
src_install() {
- default
+ meson_src_install
+
+ if ! use test ; then
+ rm -f "${ED}"/usr/bin/test_va_api || die
+ fi
+}
- if ! use test-va-api ; then
- if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
- rm -f "${ED}"/usr/bin/test_va_api || die
- fi
+pkg_postinst() {
+ if use test ; then
+ elog "Tests must be run manually with the test_va_api binary"
fi
}
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
index 35df8fb6540..5d2684c07c8 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig 2014-03-17 15:40:30.886570544 -0600
-+++ Makefile 2014-03-17 15:41:22.729159468 -0600
+--- a/Makefile
++++ b/Makefile
@@ -3,31 +3,15 @@
HINWEIS1 = 'Check the configuration file in /etc with the Changelog'
HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
index 7c32d44ef37..325e4cb0506 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
@@ -1,6 +1,11 @@
---- vamps/Makefile.orig 2014-03-17 15:44:50.086513525 -0600
-+++ vamps/Makefile 2014-03-17 15:44:56.443321441 -0600
-@@ -21,7 +21,7 @@
+--- a/vamps/Makefile
++++ b/vamps/Makefile
+@@ -17,11 +17,11 @@
+
+ PREFIX ?= /usr/local
+
+-CC = gcc
++CC ?= gcc
CFLAGS ?= -O2 -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
CFLAGS += -Wall
diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
index f925ac98c66..367fd049470 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Command line tool to automate the process of ripping and burning DVDs"
-SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
HOMEPAGE="https://sourceforge.net/projects/lxdvdrip/"
+SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
DEPEND="media-libs/libdvdread"
RDEPEND="${DEPEND}
>=media-video/dvdauthor-0.6.9
media-video/streamdvd
- media-video/mpgtx"
+ media-video/mpgtx
+"
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-makefile.patch"
- epatch "${FILESDIR}/${P}-vamps-makefile.patch"
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-vamps-makefile.patch
+)
src_compile() {
- CC="$(tc-getCC)" emake
- cd "${S}/vamps"
- emake CC="$(tc-getCC)"
+ tc-export CC
+ emake
+ emake -C vamps
}
src_install() {
@@ -45,6 +45,6 @@ src_install() {
insinto /etc
newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf
- cd "${S}/vamps"
+ cd vamps || die
emake PREFIX="${D}/usr" install
}
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index d0d8cd97cc7..e74db0a7a5a 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,4 +1,2 @@
-DIST makemkv-bin-1.16.4.tar.gz 15455839 BLAKE2B 5d29416beeb06f5fc66db39e5323de4d3491b120ec1b734183c9aaf937baf8a63a277ddb378b668d9659c34449c474e2ab9a7bb82a448f33de85abf82e5e791b SHA512 d2d12a18ef64e77d7a47e1e68ced265fbd2071fd60fb8118085c2b8c892132e9ef81f1a54c09e5f45be6f880a91cef3bb25ed5e86e3735f5b449c6b7fb88a72f
-DIST makemkv-bin-1.16.5.tar.gz 15585124 BLAKE2B c006b47af571089de5a3283f0f4094556b3fbd9b67d26f7fc57e05e6feb0b3a6875742d8eb5536c561dbd8e6914b9255e38b97eb0b9acaba761daa28e532c3af SHA512 4e0ee2f2d9036a46dc3d3bdf13048c17f7efe886ddf808911d7694c319b0b887439907a0d5f47a7ff3824ef7bfb036d5900a66d3f500dc1b57223012479a0609
-DIST makemkv-oss-1.16.4.tar.gz 6536730 BLAKE2B 8f5167c6b5056f9ea38a47b60875aac8394c130b40f08ef7a102f00937c34feb58e6436a9140509da9fc2d2b835956dede6bd8485827f3037b2026b0421a7094 SHA512 e25b41cbc348a49f13914af6b2dd040376c7517273dd4f49dc68fe9e363e28e336fb6d3d525b190c11d70e7c9b7127ffabdd89b3130cd1aab55a6a6f708d7452
-DIST makemkv-oss-1.16.5.tar.gz 6541723 BLAKE2B e628fa65a883e69b51a84bdc0d46da5628c1981017f2e64a31e36e3b7bc45e16d2a94831a6e0fd405676d8385ce11afb9db7d5fc81f2cb174e9ca44dde775f1d SHA512 865f621fb326541dcc05231667510895cb20e3bccb4705d67533aefec57b043d6fd33f0541290428f45226123f2dc419f7d0f2c071518f6f7a548c5aeea8978e
+DIST makemkv-bin-1.16.7.tar.gz 16130689 BLAKE2B 6535cbeb65d0166c5093920f2064065f4d7a3ea0232878dfeda76f5ea53dad68e2da10894dcbeaab706c93b733f32e9c316a07a9365f43943a1f0710a48af83f SHA512 8233affac002a4ec9b0d37746371d2f582f5ebbb18621bb4801442bab2f8b79616b7f641893b896c350a8a7e8f09368b8b4acae58a6ab32a591926d98b808be1
+DIST makemkv-oss-1.16.7.tar.gz 6541953 BLAKE2B 28273db7300532b1ce2ab63629aa5ceb90059e4e02ea22e6f2764e727946fe6e6dbc45e16c743bf239e3bdfe015e447e662d0c5e838ada8564d0e251721a6bcc SHA512 6e8159b344caa70103369585f5a2f12dcfb6e5d6f65fb19466dab97dbf690cecaa1f08f6501342007966c23a08aa13f625eca078e270c8bb651d9b896a5977ff
diff --git a/media-video/makemkv/makemkv-1.16.4.ebuild b/media-video/makemkv/makemkv-1.16.4.ebuild
deleted file mode 100644
index ea05fb9afbb..00000000000
--- a/media-video/makemkv/makemkv-1.16.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info xdg
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/"
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
- http://www.makemkv.com/download/${MY_PB}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui +java"
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
- dev-libs/expat
- dev-libs/openssl:0=[-bindist(-)]
- >=media-video/ffmpeg-1.0.0:0=
- sys-libs/glibc
- sys-libs/zlib
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="
- ${DEPEND}
- net-misc/wget
- java? ( >=virtual/jre-1.8 )
-"
-BDEPEND="
- virtual/pkgconfig
- gui? ( dev-qt/qtcore:5 )
-"
-
-CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-path.patch
- "${FILESDIR}"/${PN}-flags.patch
-)
-
-src_prepare() {
- default
-
- if ! use java; then
- rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
- fi
-}
-
-src_configure() {
- # See bug #439380.
- replace-flags -O* -Os
-
- econf \
- --enable-debug \
- --disable-noec \
- $(use_enable gui) \
- $(use_enable gui qt5)
-}
-
-src_install() {
- local myarch
- case "${ARCH}" in
- arm) myarch=armel ;;
- x86) myarch=i386 ;;
- *) myarch=${ARCH} ;;
- esac
-
- default
-
- # add missing symlinks for QA
- dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
- dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
- dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
- dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
- dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so
- dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
-
- cd "${WORKDIR}"/${MY_PB} || die
-
- # install prebuilt bin
- dobin bin/"${myarch}"/makemkvcon
-
- # additional tool is actually part of makemkvcon
- dosym makemkvcon /usr/bin/sdftool
-
- # install profiles and locales
- insinto /usr/share/MakeMKV
- doins src/share/*
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog "While MakeMKV is in beta mode, upstream has provided a license"
- elog "to use if you do not want to purchase one."
- elog ""
- elog "See this forum thread for more information, including the key:"
- elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053"
- elog ""
- elog "Note that beta license may have an expiration date and you will"
- elog "need to check for newer licenses/releases. "
- elog ""
- elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
- elog "is no longer necessary and you should delete it from there to"
- elog "avoid warning messages."
- elog ""
- elog "MakeMKV can also act as a drop-in replacement for libaacs and"
- elog "libbdplus, allowing transparent decryption of a wider range of"
- elog "titles under players like VLC and mplayer. To enable this, set"
- elog "the following variables when launching the player:"
- elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
-}
diff --git a/media-video/makemkv/makemkv-1.16.5.ebuild b/media-video/makemkv/makemkv-1.16.7.ebuild
index 23a32955e74..23a32955e74 100644
--- a/media-video/makemkv/makemkv-1.16.5.ebuild
+++ b/media-video/makemkv/makemkv-1.16.7.ebuild
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 0d99235cd45..9cea8804ec2 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1 +1,3 @@
DIST mediainfo_20.09.tar.xz 1984148 BLAKE2B 6926d9ce787b9f9e5c07fe0ddf98e186139ea25c7ab6b3573dc1732850a7f98aeefdeca2157fdcad83d652332705028df12a1cf1e6377f9c1e23b7865578cfd8 SHA512 b6c8bf661585fa6b8e82c7f4bafacae8505078c5c57bc1c703ed16ac237dad0829569dd33fdaaadccd394bdd93088d9b71e5ad2c2294f75aa641004ec91feca9
+DIST mediainfo_21.09.tar.xz 1992000 BLAKE2B 8deb996c84ededd390a4fb91f77a4dd0ba60f3a165aefde2fe862720a7a3158888ba56f911533c347703e0a722f05b94edc5f649edef26031b519fc7bd4012cd SHA512 81545c936ec5f17f94246b2cd5343afd105d0b0791f151689fbecdb084778dd4e84da79f47529f16b8383542894819af995ec608588fc6d9f45e9be38a4304db
+DIST mediainfo_22.03.tar.xz 2005340 BLAKE2B 232f077a1e202271de8c0d07f1f2a27efac38c998cb5b7f465bf5e8e44c24d6dad9fcafc1a6d981863c13822bd8cbe921b4a06adf3b1f3ac7c8690de4026b597 SHA512 981c9fe410cf6fff1a87ecfe250216977e036e8606034621c18bbf66cc75261c2e0f411bbbf298a409b5b306f7f7ee993a1e24e70040cf48a7728550ef7d830b
diff --git a/media-video/mediainfo/mediainfo-21.09.ebuild b/media-video/mediainfo/mediainfo-21.09.ebuild
new file mode 100644
index 00000000000..6ac37d88f03
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-21.09.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with media-libs/libmediainfo!
+
+WX_GTK_VER="3.0-gtk3"
+inherit xdg-utils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}/MediaInfo"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="~media-libs/libmediainfo-${PV}[curl=,mms=]
+ >=media-libs/libzen-0.4.37
+ sys-libs/zlib
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+ TARGETS="CLI"
+
+ if use wxwidgets; then
+ TARGETS+=" GUI"
+ setup-wxwidgets
+ fi
+}
+
+src_prepare() {
+ default
+
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target} || die
+ sed -i -e "s:-O2::" configure.ac || die
+ eautoreconf
+ done
+}
+
+src_configure() {
+ local target
+
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target} || die
+ local args=""
+ [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+ econf ${args}
+ done
+}
+
+src_compile() {
+ local target
+
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target} || die
+ default
+ done
+}
+
+src_install() {
+ local target
+
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target} || die
+ default
+ dodoc "${S}"/History_${target}.txt
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/mediainfo/mediainfo-22.03.ebuild b/media-video/mediainfo/mediainfo-22.03.ebuild
new file mode 100644
index 00000000000..a0c63dc542e
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-22.03.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with media-libs/libmediainfo!
+
+WX_GTK_VER="3.0-gtk3"
+inherit xdg-utils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}/MediaInfo"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="~media-libs/libmediainfo-${PV}[curl=,mms=]
+ >=media-libs/libzen-0.4.37
+ sys-libs/zlib
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+ TARGETS="CLI"
+
+ if use wxwidgets; then
+ TARGETS+=" GUI"
+ setup-wxwidgets
+ fi
+}
+
+src_prepare() {
+ default
+
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target} || die
+ sed -i -e "s:-O2::" configure.ac || die
+ eautoreconf
+ done
+}
+
+src_configure() {
+ local target
+
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target} || die
+ local args=""
+ [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+ econf ${args}
+ done
+}
+
+src_compile() {
+ local target
+
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target} || die
+ default
+ done
+}
+
+src_install() {
+ local target
+
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target} || die
+ default
+ dodoc "${S}"/History_${target}.txt
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index b1342f697e6..06067cc179f 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,2 +1 @@
-DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b SHA512 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830
diff --git a/media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild
deleted file mode 100644
index 0616cbf4c0a..00000000000
--- a/media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Compare with version in SONAME on major bumps (e.g. 2.1 -> 2.2)
-SLOT="1/2.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
-REQUIRED_USE="sdlgfx? ( sdl )"
-
-BDEPEND="
- virtual/pkgconfig
-"
-RDEPEND="
- virtual/jpeg:0=[${MULTILIB_USEDEP}]
- dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
- gtk? ( x11-libs/gtk+:2 )
- png? ( media-libs/libpng:0= )
- quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
- sdl? (
- >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- sdlgfx? ( media-libs/sdl-gfx )
- )
-"
-DEPEND="
- ${RDEPEND}
- >=sys-apps/sed-4
- virtual/awk
- cpu_flags_x86_mmx? ( dev-lang/nasm )
-"
-
-src_prepare() {
- default
-
- eautoreconf
- sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-multilib_src_configure() {
- [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
- local myconf=(
- --enable-compile-warnings
- $(use_enable cpu_flags_x86_mmx simd-accel)
- $(use_enable static-libs static)
- --enable-largefile
-
- $(use_with quicktime libquicktime)
- $(use_with dv libdv)
- $(use_with sdl libsdl)
- --without-v4l
- $(use_with sdl x)
-
- # used by tools only
- $(multilib_native_use_with gtk)
- $(multilib_native_use_with png libpng)
- $(multilib_native_use_with sdlgfx)
- )
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- # avoid building programs
- emake bin_PROGRAMS=
- fi
-}
-
-multilib_src_test() {
- # there are no tests at the moment, so it would just build
- # all programs in non-native ABIs...
- multilib_is_native_abi && default
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- default
- else
- emake DESTDIR="${D}" install \
- bin_PROGRAMS=
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "mjpegtools installs user contributed scripts which require additional"
- elog "dependencies not pulled in by the installation."
- elog "These have to be installed manually."
- elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
- elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
- fi
-}
diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index 54975b16164..4be0d04f001 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
LICENSE="GPL-2"
# Compare with version in SONAME on major bumps (e.g. 2.1 -> 2.2)
SLOT="1/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
REQUIRED_USE="sdlgfx? ( sdl )"
@@ -46,8 +46,6 @@ src_prepare() {
}
multilib_src_configure() {
- [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
local myconf=(
--enable-compile-warnings
$(use_enable cpu_flags_x86_mmx simd-accel)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 49693a8e052..696b51f30dc 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,5 @@
DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1 SHA512 9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
+DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede SHA512 252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844
+DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c SHA512 eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
new file mode 100644
index 00000000000..a5f5fd2009b
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/844097
+
+We should only check for UIC (provided by qtwidgets) if we're building the GUI.
+
+Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
+for e.g. MIME type detection since 59.0.0), but the rest of Qt
+(like qtwidgets) is only needed for the GUI build.
+
+The build system incorrectly unconditionally checks for UIC. We fix it here
+to only check for it when doing a GUI build.
+
+First hunk (ac/qt5.m4, removing UIC check): Signed-off-by: Duane Robertson duane@duanerobertson.com
+Second hunk (rest, adding UIC check conditional on enable_gui): Signed-off-by: Sam James <sam@gentoo.org>
+--- a/ac/qt5.m4
++++ b/ac/qt5.m4
+@@ -51,7 +51,6 @@ check_qt5() {
+ AC_PATH_PROG(LCONVERT, lconvert,, [$qt_searchpath])
+ AC_PATH_PROG(MOC, moc,, [$qt_searchpath])
+ AC_PATH_PROG(RCC, rcc,, [$qt_searchpath])
+- AC_PATH_PROG(UIC, uic,, [$qt_searchpath])
+
+ if test x"$MOC" = x; then
+ AC_MSG_CHECKING(for Qt 5)
+@@ -62,11 +61,6 @@ check_qt5() {
+ AC_MSG_CHECKING(for Qt 5)
+ AC_MSG_RESULT(no: could not find the rcc executable)
+ return
+-
+- elif test x"$UIC" = x; then
+- AC_MSG_CHECKING(for Qt 5)
+- AC_MSG_RESULT(no: could not find the uic executable)
+- return
+ fi
+
+
+
+--- a/ac/qt_common.m4
++++ b/ac/qt_common.m4
+@@ -5,6 +5,37 @@ fi
+ if test x"$enable_gui" = xyes; then
+ BUILD_GUI=yes
+
++ # Copied from ac/qt6.m4.
++ qmake_properties="`mktemp`"
++
++ "$QMAKE" -query > "$qmake_properties"
++
++ qmake_ver="`$ac_cv_path_EGREP '^QT_VERSION:' "$qmake_properties" | sed 's/^QT_VERSION://'`"
++
++ AC_MSG_CHECKING(for qmake's version)
++ if test -z "qmake_ver"; then
++ AC_MSG_RESULT(unknown; please contact the author)
++ return
++ elif ! check_version $qt_min_ver $qmake_ver; then
++ AC_MSG_RESULT(too old: $qmake_ver, neet at least $qt_mIN-ver)
++ return
++ else
++ AC_MSG_RESULT($qmake_ver)
++ fi
++
++ qt_bindir="`$ac_cv_path_EGREP '^QT_INSTALL_BINS:' "$qmake_properties" | sed 's/^QT_INSTALL_BINS://'`"
++ qt_libexecdir="`$ac_cv_path_EGREP '^QT_INSTALL_LIBEXECS:' "$qmake_properties" | sed 's/^QT_INSTALL_LIBEXECS://'`"
++ qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH"
++
++ rm -f "$qmake_properties"
++
++ AC_PATH_PROG(UIC, uic,, [$qt_searchpath])
++ if test x"$UIC" = x; then
++ AC_MSG_CHECKING(for Qt 5 UIC (qtwidgets))
++ AC_MSG_RESULT(no: could not find the uic executable)
++ exit 1
++ fi
++
+ if test x"$have_qt6" = "xyes" ; then
+ opt_features_yes="$opt_features_yes\n * MKVToolNix GUI (with Qt 6)"
+ else
diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
index 11a26571c2e..cd4d49f2c42 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ppc ppc64 x86"
fi
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
new file mode 100644
index 00000000000..7e1ffe9d637
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+ EGIT_SUBMODULES=()
+ inherit git-r3
+else
+ SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus debug dvd gui nls pch test"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+ >=dev-libs/boost-1.66:=
+ dev-libs/gmp:=
+ >=dev-libs/libebml-1.4.2:=
+ >=dev-libs/libfmt-8.0.1:=
+ >=dev-libs/pugixml-1.11:=
+ media-libs/flac:=
+ >=media-libs/libmatroska-1.6.3:=
+ media-libs/libogg:=
+ media-libs/libvorbis:=
+ sys-libs/zlib
+ dvd? ( media-libs/libdvdread:= )
+ dev-qt/qtcore:5
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtmultimedia:5
+ )
+ app-text/cmark:0=
+ dbus? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-cpp/nlohmann_json-3.9.1
+ >=dev-libs/utfcpp-3.1.2
+ test? ( dev-cpp/gtest )
+"
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-ruby/rake
+ virtual/pkgconfig
+ nls? (
+ sys-devel/gettext
+ app-text/po4a
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+
+ if [[ ${PV} == *9999 ]]; then
+ ./autogen.sh || die
+ fi
+
+ # https://bugs.gentoo.org/692018
+ sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
+
+ eautoreconf
+
+ # remove bundled libs
+ rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+ # bug #692322, use system dev-libs/utfcpp
+ append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(usex pch "" --disable-precompiled-headers)
+ $(use_enable dbus)
+ $(use_enable gui)
+ --disable-qt6
+ --enable-qt5
+ --with-qmake=$(qt5_get_bindir)/qmake
+ $(use_with dvd dvdread)
+ $(use_with nls gettext)
+ $(usex nls "" --with-po4a-translate=false)
+ --disable-update-check
+ --disable-optimization
+ --with-boost="${ESYSROOT}"/usr
+ --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+ rake V=1 -j$(makeopts_jobs) tests:unit || die
+ rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+ DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+ einstalldocs
+ dodoc NEWS.md
+ doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
new file mode 100644
index 00000000000..0939d7201a9
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+ EGIT_SUBMODULES=()
+ inherit git-r3
+else
+ SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus debug dvd gui nls pch test"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+ >=dev-libs/boost-1.66:=
+ dev-libs/gmp:=
+ >=dev-libs/libebml-1.4.2:=
+ >=dev-libs/libfmt-8.0.1:=
+ >=dev-libs/pugixml-1.11:=
+ media-libs/flac:=
+ >=media-libs/libmatroska-1.6.3:=
+ media-libs/libogg:=
+ media-libs/libvorbis:=
+ sys-libs/zlib
+ dvd? ( media-libs/libdvdread:= )
+ dev-qt/qtcore:5
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtmultimedia:5
+ )
+ app-text/cmark:0=
+ dbus? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-cpp/nlohmann_json-3.9.1
+ >=dev-libs/utfcpp-3.1.2
+ test? ( dev-cpp/gtest )
+"
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-ruby/rake
+ virtual/pkgconfig
+ nls? (
+ sys-devel/gettext
+ app-text/po4a
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
+ "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == *9999 ]]; then
+ ./autogen.sh || die
+ fi
+
+ # bug #692018
+ sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
+
+ eautoreconf
+
+ # remove bundled libs
+ rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+ # bug #692322, use system dev-libs/utfcpp
+ append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(usex pch "" --disable-precompiled-headers)
+ $(use_enable dbus)
+
+ # Qt (of some version) is always needed, even for non-GUI builds,
+ # to do e.g. MIME detection. See e.g. bug #844097.
+ # But most of the Qt deps are conditional on a GUI build.
+ --disable-qt6
+ --enable-qt5
+ $(use_enable gui)
+ --with-qmake="$(qt5_get_bindir)"/qmake
+
+ $(use_with dvd dvdread)
+ $(use_with nls gettext)
+ $(usex nls "" --with-po4a-translate=false)
+ --disable-update-check
+ --disable-optimization
+ --with-boost="${ESYSROOT}"/usr
+ --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+ rake V=1 -j$(makeopts_jobs) tests:unit || die
+ rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+ DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+ einstalldocs
+ dodoc NEWS.md
+ doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 6bb7e14ab30..0939d7201a9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools flag-o-matic multiprocessing qmake-utils xdg
@@ -19,36 +19,37 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
LICENSE="GPL-2"
SLOT="0"
-IUSE="dbus debug dvd nls pch test"
+IUSE="dbus debug dvd gui nls pch test"
RESTRICT="!test? ( test )"
# check NEWS.md for build system changes entries for boost/libebml/libmatroska
# version requirement updates and other packaging info
RDEPEND="
>=dev-libs/boost-1.66:=
- >=dev-libs/libebml-1.4.0:=
- >=dev-libs/libfmt-6.1.0:=
- dev-libs/libpcre2:=
- dev-libs/pugixml:=
+ dev-libs/gmp:=
+ >=dev-libs/libebml-1.4.2:=
+ >=dev-libs/libfmt-8.0.1:=
+ >=dev-libs/pugixml-1.11:=
media-libs/flac:=
>=media-libs/libmatroska-1.6.3:=
media-libs/libogg:=
media-libs/libvorbis:=
- sys-apps/file
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtmultimedia:5
+ )
app-text/cmark:0=
dbus? ( dev-qt/qtdbus:5 )
"
DEPEND="${RDEPEND}
- dev-cpp/nlohmann_json
- dev-libs/utfcpp
+ >=dev-cpp/nlohmann_json-3.9.1
+ >=dev-libs/utfcpp-3.1.2
test? ( dev-cpp/gtest )
"
BDEPEND="
@@ -62,16 +63,20 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
+PATCHES=(
+ "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
+ "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+)
src_prepare() {
- xdg_src_prepare
+ default
+
if [[ ${PV} == *9999 ]]; then
./autogen.sh || die
fi
- # https://bugs.gentoo.org/692018
- sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
+ # bug #692018
+ sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
eautoreconf
@@ -80,16 +85,22 @@ src_prepare() {
}
src_configure() {
- # bug 692322, use system dev-libs/utfcpp
+ # bug #692322, use system dev-libs/utfcpp
append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
local myeconfargs=(
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
$(use_enable dbus)
+
+ # Qt (of some version) is always needed, even for non-GUI builds,
+ # to do e.g. MIME detection. See e.g. bug #844097.
+ # But most of the Qt deps are conditional on a GUI build.
--disable-qt6
--enable-qt5
- --with-qmake=$(qt5_get_bindir)/qmake
+ $(use_enable gui)
+ --with-qmake="$(qt5_get_bindir)"/qmake
+
$(use_with dvd dvdread)
$(use_with nls gettext)
$(usex nls "" --with-po4a-translate=false)
diff --git a/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild b/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
index 58f8ed1713a..c5379bd671f 100644
--- a/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
+++ b/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://motiontrack.sourceforge.net"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug graphicsmagick imagemagick multiprocess"
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index d8a3c63108e..aeaf57a37d8 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,4 +1,2 @@
-DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc5cbac3d72e4a88f33cbe572b6f61b5323acb7ea6dfc67f92c0ba231bedc5251c276831ea7a9e77ab6d570 SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07
-DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7
DIST movit-1.6.3.tar.gz 605922 BLAKE2B b207e587a20aeccc16017b7b1a7334d88381d4268dfb516d0a030b864e41eb06771e6e2c466699ee6ff01a2c972456152b6450bed654e1961dacc9ff2b800c5d SHA512 6f7169710fbb60f79c44393aea57619f4c83d64fb296ea946d591e78fb9a71b513869dc6325f90e4c2dc843b7ed4841eaef41ca69f64787c8a57f4fde583b1e5
DIST movit-googletest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
diff --git a/media-video/movit/files/movit-1.6.3-gcc12.patch b/media-video/movit/files/movit-1.6.3-gcc12.patch
new file mode 100644
index 00000000000..00b9e9203b1
--- /dev/null
+++ b/media-video/movit/files/movit-1.6.3-gcc12.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/839915
+
+--- a/test_util.cpp
++++ b/test_util.cpp
+@@ -2,6 +2,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <algorithm>
++#include <memory>
+ #include <epoxy/gl.h>
+ #include <gtest/gtest.h>
+ #include <gtest/gtest-message.h>
diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
deleted file mode 100644
index f84a2283a7f..00000000000
--- a/media-video/movit/movit-1.6.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="https://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="https://movit.sesse.net/${P}.tar.gz
- https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[X(+)]
- >=dev-cpp/eigen-3.2.0:3
- media-libs/libepoxy[egl]
- >=sci-libs/fftw-3
- media-libs/libsdl2
- "
-DEPEND="
- ${RDEPEND}
- app-arch/unzip
-"
-
-src_configure() {
- econf --disable-static
-}
-
-src_compile() {
- GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
- GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-video/movit/movit-1.6.3.ebuild b/media-video/movit/movit-1.6.3-r1.ebuild
index 01c10ef697a..bc9144f4e5d 100644
--- a/media-video/movit/movit-1.6.3.ebuild
+++ b/media-video/movit/movit-1.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://movit.sesse.net/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
# no sane way to use OpenGL from within tests?
RESTRICT="test"
@@ -21,12 +21,15 @@ RESTRICT="test"
RDEPEND="media-libs/mesa[X(+)]
>=dev-cpp/eigen-3.2.0:3
media-libs/libepoxy[egl]
- >=sci-libs/fftw-3
- media-libs/libsdl2
- "
+ >=sci-libs/fftw-3:=
+ media-libs/libsdl2"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.3-gcc12.patch
+)
+
src_compile() {
GTEST_DIR="${WORKDIR}/googletest-release-${GTEST_PV}/googletest" emake
}
diff --git a/media-video/mplayer-sh/Manifest b/media-video/mplayer-sh/Manifest
deleted file mode 100644
index 53f55055422..00000000000
--- a/media-video/mplayer-sh/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mplayer.sh-0.8.6.tar.gz 7568 BLAKE2B 4eecf46b75368028f54f090e13575287bbbe9ab6fedaf2def221f539b95fcdd4fba8c3a1ad59d9aca2fd72b6ec770ee159a410383e45d53148d270043fe464c6 SHA512 ff4a11f1b8dae014646f101fcab16d6cebc0c3250bc8d259500c2819b484913270051ed9ec9b1442e647e811030f927db07f71aa64edd6221a875e067e22e36a
-DIST mplayer.sh-0.8.7.tar.gz 7851 BLAKE2B b7dbaf93c509a3d2bb38f226dafed2261ddadbff24a6e450f3fe2cf5cb5208bb3e89a1830fc3e59d674e9b045360208e7c221498e32f228be9c6e0147aef2588 SHA512 5e83dd2f83b104f7043d828b713e34f47c9a42a93324424c802d4d448b770e36515accf67bd67ce7461201b5e9cd5596da2bbd182eccef9578c9b31b5fed50d9
diff --git a/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff b/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff
deleted file mode 100644
index 3b329215564..00000000000
--- a/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff
+++ /dev/null
@@ -1,84 +0,0 @@
---- mplayer.sh.orig 2006-03-26 23:31:10.000000000 +0200
-+++ mplayer.sh 2006-03-26 23:50:39.000000000 +0200
-@@ -6,6 +6,7 @@
- declare VERSION="0.8.6"
-
- # History (as always in the source code :-)
-+# - add -aid to mplayer when AID is given (Matthias Schwarzott <zzam@gentoo.org>)
- # 0.8.6 - fixed a copy'n'paste bug regarding the subtitle background
- # alpha color (thanks to Christian Haider)
- # - changed the fps values from rational values to integer ones
-@@ -208,6 +209,11 @@
- fi
- debugvar REMOTE "$REMOTE"
-
-+ if test -n "${AID}"; then
-+ AUDIO="-aid ${AID}"
-+ fi
-+ debugvar AUDIO "${AUDIO}"
-+
- if ! test -z "$USERDEF"; then echolog "*** Use Option USERDEF at your own risk!"; fi
- debugvar USERDEF "$USERDEF"
-
-@@ -478,15 +484,24 @@
- declare -i NEW_X NEW_Y
- declare -i HALF_Y FULL_Y
- declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC
--declare CMDLINE AOUT REMOTE USERDEF SUFFIX
-+declare CMDLINE AOUT REMOTE AUDIO USERDEF SUFFIX
- declare FILE="$1"
--declare SLAVE="$2"
-+shift
- declare -a XResPAL[0]
- declare -a XResNTSC[0]
- declare FDSTR=""
- declare SUBTITLES=""
- declare DETC=""
-
-+while [[ -n $1 ]]; do
-+ case ${1} in
-+ SLAVE) SLAVE=SLAVE ;;
-+ AID) AID=${2}; shift ;;
-+ esac
-+
-+ shift
-+done
-+
- echolog "*** Starting mplayer.sh Version $VERSION"
-
- if test -z "$FILE"; then echolog "*** USAGE: mplayer.sh <File_to_be_played>"; exit; fi
-@@ -504,18 +519,18 @@
- if test \( "$FILE" == "$DVDFiles/DVD" -o "$FILE" == "$DVDFiles/VCD" \) -a -n "$DVDFiles" -a -n "$DVD"; then
- if test "$FILE" == "$DVDFiles/DVD"; then
- $USEAC3 && AOUT="$AC3AOUT"
-- CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -dvd-device $DVD dvd://"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -dvd-device $DVD dvd://"
- fi
- if test "$FILE" == "$DVDFiles/VCD"; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -cdrom-device $DVD vcd://"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -cdrom-device $DVD vcd://"
- fi
- unset FILE
- elif test "${SUFFIX}" == ".cue"; then
- if $MPLAYER_V1; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF cue://$FILE:2"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF cue://$FILE:2"
- unset FILE
- else
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF -vcd 2 -cuefile"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -vcd 2 -cuefile"
- fi
- else
- # Try to determine the video attributes
-@@ -545,9 +560,9 @@
- \( $NTSC -a $NEW_FPS == "30" -a \( \( $ORIG_X == "352" -a $ORIG_Y == "240" \) -o \( $ORIG_Y == "480" -a \
- \( $ORIG_X == "352" -o $ORIG_X == "480" -o $ORIG_X == "512" -o $ORIG_X == "640" -o $ORIG_X == "704" -o $ORIG_X == "720" \) \) \) \) \
- \) ; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF"
- else
-- CMDLINE="$MPLAYER -vo $VO $AOUT -vop $VOP:$NEW_FPS,expand=$NEW_X:$REAL_Y:-1:-1:1,scale=$NEW_X:${NEW_Y}${DETC} $SPEED $FDSTR $CACHESTR $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT -vop $VOP:$NEW_FPS,expand=$NEW_X:$REAL_Y:-1:-1:1,scale=$NEW_X:${NEW_Y}${DETC} $SPEED $FDSTR $CACHESTR $AUDIO $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
- fi
- fi
-
diff --git a/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff b/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff
deleted file mode 100644
index 3de61e76cd1..00000000000
--- a/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff
+++ /dev/null
@@ -1,84 +0,0 @@
---- mplayer.sh.orig 2007-02-11 16:34:07.000000000 +0100
-+++ mplayer.sh 2007-05-05 18:17:48.000000000 +0200
-@@ -12,6 +12,7 @@
- # - calculate USE_SPEED with 30 fps instead of 29.97
- # - use '-vf' and '-af' instead of '-vop' and '-aop', as the
- # latter are deprecated
-+# - add -aid to mplayer when AID is given (Matthias Schwarzott <zzam@gentoo.org>)
- #
- # 0.8.6 - fixed a copy'n'paste bug regarding the subtitle background
- # alpha color (thanks to Christian Haider)
-@@ -215,6 +216,11 @@
- fi
- debugvar REMOTE "$REMOTE"
-
-+ if test -n "${AID}"; then
-+ AUDIO="-aid ${AID}"
-+ fi
-+ debugvar AUDIO "${AUDIO}"
-+
- if ! test -z "$USERDEF"; then echolog "*** Use Option USERDEF at your own risk!"; fi
- debugvar USERDEF "$USERDEF"
-
-@@ -485,15 +491,24 @@
- declare -i NEW_X NEW_Y
- declare -i HALF_Y FULL_Y
- declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC
--declare CMDLINE AOUT REMOTE USERDEF SUFFIX
-+declare CMDLINE AOUT REMOTE AUDIO USERDEF SUFFIX
- declare FILE="$1"
--declare SLAVE="$2"
-+shift
- declare -a XResPAL[0]
- declare -a XResNTSC[0]
- declare FDSTR=""
- declare SUBTITLES=""
- declare DETC=""
-
-+while [[ -n $1 ]]; do
-+ case ${1} in
-+ SLAVE) SLAVE=SLAVE ;;
-+ AID) AID=${2}; shift ;;
-+ esac
-+
-+ shift
-+done
-+
- echolog "*** Starting mplayer.sh Version $VERSION"
-
- if test -z "$FILE"; then echolog "*** USAGE: mplayer.sh <File_to_be_played>"; exit; fi
-@@ -511,18 +526,18 @@
- if test \( "$FILE" == "$DVDFiles/DVD" -o "$FILE" == "$DVDFiles/VCD" \) -a -n "$DVDFiles" -a -n "$DVD"; then
- if test "$FILE" == "$DVDFiles/DVD"; then
- $USEAC3 && AOUT="$AC3AOUT"
-- CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -dvd-device $DVD dvd://"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -dvd-device $DVD dvd://"
- fi
- if test "$FILE" == "$DVDFiles/VCD"; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -cdrom-device $DVD vcd://"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -cdrom-device $DVD vcd://"
- fi
- unset FILE
- elif test "${SUFFIX}" == ".cue"; then
- if $MPLAYER_V1; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF cue://$FILE:2"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF cue://$FILE:2"
- unset FILE
- else
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF -vcd 2 -cuefile"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -vcd 2 -cuefile"
- fi
- else
- # Try to determine the video attributes
-@@ -552,9 +567,9 @@
- \( $NTSC -a $NEW_FPS == "30" -a \( \( $ORIG_X == "352" -a $ORIG_Y == "240" \) -o \( $ORIG_Y == "480" -a \
- \( $ORIG_X == "352" -o $ORIG_X == "480" -o $ORIG_X == "512" -o $ORIG_X == "544" -o $ORIG_X == "640" -o $ORIG_X == "704" -o $ORIG_X == "720" \) \) \) \) \
- \) ; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF"
- else
-- CMDLINE="$MPLAYER -vo $VO $AOUT -vf scale=$NEW_X:${NEW_Y}${DETC},expand=$NEW_X:$REAL_Y:-1:-1:1,$VOP:$NEW_FPS $SPEED $FDSTR $CACHESTR $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT -vf scale=$NEW_X:${NEW_Y}${DETC},expand=$NEW_X:$REAL_Y:-1:-1:1,$VOP:$NEW_FPS $SPEED $FDSTR $CACHESTR $AUDIO $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
- fi
- fi
-
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
deleted file mode 100644
index 982453ffa89..00000000000
--- a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-RESTRICT="mirror bindist"
-
-inherit epatch
-
-DESCRIPTION="Video Disk Recorder Mplayer API Script"
-HOMEPAGE="http://batleth.sapienti-sat.org/"
-SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/mplayer.sh-${PV}.tar.gz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="all-rights-reserved"
-IUSE=""
-
-RDEPEND=">=media-video/mplayer-0.90_rc4"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-parameter-aid.diff"
-
- sed -i "s:^declare CFGFIL.*$:declare CFGFIL=\"\/etc\/vdr\/plugins\/mplayer\/mplayer.sh.conf\":" mplayer.sh
- sed -i mplayer.sh.conf -e "s:^LIRCRC.*$:LIRCRC=\/etc\/lircd.conf:" \
- -e "s:^MPLAYER=.*$:MPLAYER=\/usr\/bin\/mplayer:"
-}
-
-src_install() {
-
- insinto /etc/vdr/plugins/mplayer
- doins mplayer.sh.conf
-
- into /usr/share/vdr/mplayer
- dobin mplayer.sh
-
- dodir /etc/vdr/plugins/DVD-VCD
- touch "${D}"/etc/vdr/plugins/DVD-VCD/{DVD,VCD}
- fowners vdr:video /etc/vdr/plugins/DVD-VCD/{DVD,VCD}
-}
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
deleted file mode 100644
index c5826b56616..00000000000
--- a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch
-
-RESTRICT="mirror bindist"
-
-DESCRIPTION="Video Disk Recorder Mplayer API Script"
-HOMEPAGE="http://batleth.sapienti-sat.org/projects/VDR/"
-SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-${PV}.tar.gz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="all-rights-reserved"
-IUSE=""
-
-RDEPEND=">=media-video/mplayer-0.1.20070321"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-parameter-aid.diff"
-
- sed -i "s:^declare CFGFIL.*$:declare CFGFIL=\"\/etc\/vdr\/plugins\/mplayer\/mplayer.sh.conf\":" mplayer.sh
- sed -i mplayer.sh.conf -e "s:^LIRCRC.*$:LIRCRC=\/etc\/lircd.conf:" \
- -e "s:^MPLAYER=.*$:MPLAYER=\/usr\/bin\/mplayer:"
-}
-
-src_install() {
-
- insinto /etc/vdr/plugins/mplayer
- doins mplayer.sh.conf
-
- into /usr/share/vdr/mplayer
- dobin mplayer.sh
-
- dodir /etc/vdr/plugins/DVD-VCD
- touch "${D}"/etc/vdr/plugins/DVD-VCD/{DVD,VCD}
- fowners vdr:vdr /etc/vdr/plugins/DVD-VCD/{DVD,VCD}
-}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 4fd4e60d363..bd9910e5e79 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,3 +2,4 @@ DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
+DIST mplayer-1.4-ffmpeg5.patch.bz2 11428 BLAKE2B 2cc9839333161fd00db87b7dd103e10414c910eb5b21b39454daed36440d54f5947216b80ac91947932c760c21c275328b3a642d0a2c8cd6963fe4b7671c9f90 SHA512 61038ad8ef8a55a99dd7e7a20ff38805c86f6a6ecb876261d0e3f4db7f30f36a9dfedbd6c895fd8168fef8833b856b3d3501a89fd041365ba07c81c3ebd36a69
diff --git a/media-video/mplayer/files/mplayer-1.4-riscv-support.patch b/media-video/mplayer/files/mplayer-1.4-riscv-support.patch
new file mode 100644
index 00000000000..282cdf3cef8
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.4-riscv-support.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/812855
+
+diff --git a/configure b/configure
+index d1aa8cd..bdac866 100755
+--- a/configure
++++ b/configure
+@@ -1761,6 +1761,7 @@ if test -z "$_target" ; then
+ nios2) host_arch=nios2 ;;
+ vax) host_arch=vax ;;
+ xtensa*) host_arch=xtensa ;;
++ riscv*) host_arch=generic ;;
+ *) host_arch=UNKNOWN ;;
+ esac
+ }
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 097379320a8..a6f47c026ec 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
@@ -39,6 +39,7 @@ else
RELEASE_URI="mirror://gentoo/${P}.tar.xz"
fi
SRC_URI="${RELEASE_URI}
+ https://dev.gentoo.org/~aballier/distfiles/${P}-ffmpeg5.patch.bz2
!truetype? ( ${FONT_URI} )"
DESCRIPTION="Media Player for Linux"
@@ -141,7 +142,6 @@ DEPEND="${RDEPEND}
app-text/docbook-xsl-stylesheets
)
x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
"
RDEPEND+="
selinux? ( sec-policy/selinux-mplayer )
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
fi
# faac codecs are nonfree
@@ -175,6 +175,8 @@ REQUIRED_USE="
xv? ( X )"
RESTRICT="faac? ( bindist )"
+PATCHES=( "${FILESDIR}/${P}-riscv-support.patch" )
+
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
@@ -230,9 +232,11 @@ src_prepare() {
subversion_wc_info
printf "${ESVN_WC_REVISION}" > $svf
else
- eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+ eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch \
+ "${FILESDIR}"/ffmpeg44.patch
+ has_version '>=media-video/ffmpeg-5' && eapply \
+ "${WORKDIR}"/${P}-ffmpeg5.patch
fi
- eapply "${FILESDIR}"/ffmpeg44.patch
if [ ! -f VERSION ] ; then
[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
local sv=$(<$svf)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 44bc6b156c2..247a9c42852 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
@@ -141,7 +141,6 @@ DEPEND="${RDEPEND}
app-text/docbook-xsl-stylesheets
)
x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
"
RDEPEND+="
selinux? ( sec-policy/selinux-mplayer )
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index ffbf466d89a..d82046a8b54 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,5 @@
DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B 9fc412544d81b249c71eed0d6669121a1942771ecb48d50d3fda16b8f967c8a777529e28a234d7169617981cd909ff03aed0deaf15db900d605b8d8849939218 SHA512 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
+DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 976440320d4..8f8efa40992 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -10,7 +10,6 @@
<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
<flag name="cli">Build mpv CLI player</flag>
<flag name="cplugins">Enable C plugins support</flag>
- <flag name="cuda">Enable hardware video decoding via Nvidia CUDA</flag>
<flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
<flag name="egl">Enable support for various EGL-based video outputs / backends</flag>
<flag name="gamepad">Enable gamepad input support</flag>
diff --git a/media-video/mpv/mpv-0.33.1-r2.ebuild b/media-video/mpv/mpv-0.33.1-r3.ebuild
index 6dc6afe6bc8..101a71f0731 100644
--- a/media-video/mpv/mpv-0.33.1-r2.ebuild
+++ b/media-video/mpv/mpv-0.33.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,20 +29,20 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
- openal +opengl pulseaudio raspberry-pi rubberband sdl
+ nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
REQUIRED_USE="
|| ( cli libmpv )
aqua? ( opengl )
- cuda? ( opengl )
egl? ( || ( gbm X wayland ) )
gamepad? ( sdl )
gbm? ( drm egl opengl )
lcms? ( opengl )
lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( opengl )
opengl? ( || ( aqua egl X raspberry-pi !cli ) )
raspberry-pi? ( opengl )
test? ( opengl )
@@ -90,7 +90,7 @@ COMMON_DEPEND="
raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
rubberband? ( >=media-libs/rubberband-1.8.0 )
sdl? ( media-libs/libsdl2[sound,threads,video] )
- vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+ vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] )
vdpau? ( x11-libs/libvdpau )
vulkan? (
<media-libs/libplacebo-3.104.0:=[vulkan]
@@ -118,11 +118,11 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
- cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
dvb? ( virtual/linuxtv-dvb-headers )
+ nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
"
RDEPEND="${COMMON_DEPEND}
- cuda? ( x11-drivers/nvidia-drivers[X] )
+ nvenc? ( x11-drivers/nvidia-drivers[X] )
selinux? ( sec-policy/selinux-mplayer )
tools? ( ${PYTHON_DEPS} )
"
@@ -146,8 +146,8 @@ src_configure() {
tc-export CC PKG_CONFIG AR
if use raspberry-pi; then
- append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
- append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+ append-cflags -I"${ESYSROOT}/opt/vc/include"
+ append-ldflags -L"${ESYSROOT}/opt/vc/lib"
fi
local mywafargs=(
@@ -224,8 +224,8 @@ src_configure() {
# HWaccels:
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
- $(use_enable cuda cuda-hwaccel)
- $(use_enable cuda cuda-interop)
+ $(use_enable nvenc cuda-hwaccel)
+ $(use_enable nvenc cuda-interop)
# TV features:
$(use_enable dvb dvbin)
diff --git a/media-video/mpv/mpv-0.34.0.ebuild b/media-video/mpv/mpv-0.34.0-r1.ebuild
index dd43d1178ad..c6bf9d1ac4a 100644
--- a/media-video/mpv/mpv-0.34.0.ebuild
+++ b/media-video/mpv/mpv-0.34.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,20 +29,20 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
- openal +opengl pulseaudio raspberry-pi rubberband sdl
+ nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
REQUIRED_USE="
|| ( cli libmpv )
aqua? ( opengl )
- cuda? ( opengl )
egl? ( || ( gbm X wayland ) )
gamepad? ( sdl )
gbm? ( drm egl opengl )
lcms? ( opengl )
lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( opengl )
opengl? ( || ( aqua egl X raspberry-pi !cli ) )
raspberry-pi? ( opengl )
test? ( opengl )
@@ -90,7 +90,7 @@ COMMON_DEPEND="
raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
rubberband? ( >=media-libs/rubberband-1.8.0 )
sdl? ( media-libs/libsdl2[sound,threads,video] )
- vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+ vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] )
vdpau? ( x11-libs/libvdpau )
vulkan? (
>=media-libs/libplacebo-3.104.0:=[vulkan]
@@ -118,11 +118,11 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
- cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
dvb? ( virtual/linuxtv-dvb-headers )
+ nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
"
RDEPEND="${COMMON_DEPEND}
- cuda? ( x11-drivers/nvidia-drivers[X] )
+ nvenc? ( x11-drivers/nvidia-drivers[X] )
selinux? ( sec-policy/selinux-mplayer )
tools? ( ${PYTHON_DEPS} )
"
@@ -146,8 +146,8 @@ src_configure() {
tc-export CC PKG_CONFIG AR
if use raspberry-pi; then
- append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
- append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+ append-cflags -I"${ESYSROOT}/opt/vc/include"
+ append-ldflags -L"${ESYSROOT}/opt/vc/lib"
fi
local mywafargs=(
@@ -224,8 +224,8 @@ src_configure() {
# HWaccels:
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
- $(use_enable cuda cuda-hwaccel)
- $(use_enable cuda cuda-interop)
+ $(use_enable nvenc cuda-hwaccel)
+ $(use_enable nvenc cuda-interop)
# TV features:
$(use_enable dvb dvbin)
diff --git a/media-video/mpv/mpv-0.34.1-r1.ebuild b/media-video/mpv/mpv-0.34.1-r1.ebuild
new file mode 100644
index 00000000000..74d217d9540
--- /dev/null
+++ b/media-video/mpv/mpv-0.34.1-r1.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=2.0.22
+
+inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+ inherit git-r3
+ DOCS=(); SRC_URI=""
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
+ dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
+ nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
+ selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
+
+REQUIRED_USE="
+ || ( cli libmpv )
+ aqua? ( opengl )
+ egl? ( || ( gbm X wayland ) )
+ gamepad? ( sdl )
+ gbm? ( drm egl opengl )
+ lcms? ( opengl )
+ lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( opengl )
+ opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+ raspberry-pi? ( opengl )
+ test? ( opengl )
+ tools? ( cli )
+ uchardet? ( iconv )
+ vaapi? ( || ( gbm X wayland ) )
+ vdpau? ( X )
+ vulkan? ( || ( X wayland ) )
+ wayland? ( egl )
+ X? ( egl? ( opengl ) )
+ xv? ( X )
+ ${PYTHON_REQUIRED_USE}
+"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
+ alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.4.0:= )
+ bluray? ( >=media-libs/libbluray-0.3.0:= )
+ cdda? ( dev-libs/libcdio-paranoia
+ dev-libs/libcdio:= )
+ drm? ( x11-libs/libdrm )
+ dvd? (
+ >=media-libs/libdvdnav-4.2.0:=
+ >=media-libs/libdvdread-4.1.0:=
+ )
+ egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] )
+ gamepad? ( media-libs/libsdl2 )
+ iconv? (
+ virtual/libiconv
+ uchardet? ( app-i18n/uchardet )
+ )
+ jack? ( virtual/jack )
+ javascript? ( >=dev-lang/mujs-1.0.0 )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)]
+ virtual/ttf-fonts
+ libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+ lua? ( ${LUA_DEPS} )
+ openal? ( >=media-libs/openal-1.13 )
+ pulseaudio? ( media-sound/pulseaudio )
+ raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+ rubberband? ( >=media-libs/rubberband-1.8.0 )
+ sdl? ( media-libs/libsdl2[sound,threads,video] )
+ vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] )
+ vdpau? ( x11-libs/libvdpau )
+ vulkan? (
+ >=media-libs/libplacebo-3.104.0:=[vulkan]
+ media-libs/shaderc
+ )
+ wayland? (
+ >=dev-libs/wayland-1.6.0
+ >=dev-libs/wayland-protocols-1.14
+ >=x11-libs/libxkbcommon-0.3.0
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ opengl? (
+ x11-libs/libXdamage
+ virtual/opengl
+ )
+ xv? ( x11-libs/libXv )
+ )
+ zlib? ( sys-libs/zlib )
+ zimg? ( >=media-libs/zimg-2.9.2 )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dvb? ( virtual/linuxtv-dvb-headers )
+ nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
+"
+RDEPEND="${COMMON_DEPEND}
+ nvenc? ( x11-drivers/nvidia-drivers[X] )
+ selinux? ( sec-policy/selinux-mplayer )
+ tools? ( ${PYTHON_DEPS} )
+"
+BDEPEND="dev-python/docutils
+ virtual/pkgconfig
+ test? ( >=dev-util/cmocka-1.0.0 )
+"
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
+ default
+}
+
+src_configure() {
+ python_setup
+ tc-export CC PKG_CONFIG AR
+
+ if use raspberry-pi; then
+ append-cflags -I"${ESYSROOT}/opt/vc/include"
+ append-ldflags -L"${ESYSROOT}/opt/vc/lib"
+ fi
+
+ local mywafargs=(
+ --confdir="${EPREFIX}/etc/${PN}"
+
+ $(usex cli '' '--disable-cplayer')
+ $(use_enable libmpv libmpv-shared)
+
+ --disable-libmpv-static
+ --disable-static-build
+ # See deep down below for build-date.
+ --disable-optimize # Don't add '-O2' to CFLAGS.
+ $(usex debug '' '--disable-debug-build')
+
+ $(use_enable doc html-build)
+ --disable-pdf-build
+ --enable-manpage-build
+ $(use_enable cplugins)
+ $(use_enable test)
+
+ $(use_enable iconv)
+ $(use_enable lua)
+ $(use_enable javascript)
+ $(use_enable zlib)
+ $(use_enable bluray libbluray)
+ $(use_enable dvd dvdnav)
+ $(use_enable cdda)
+ $(use_enable uchardet)
+ $(use_enable rubberband)
+ $(use_enable lcms lcms2)
+ --disable-vapoursynth # Only available in overlays.
+ $(use_enable archive libarchive)
+
+ --enable-libavdevice
+
+ # Audio outputs:
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video.
+ $(use_enable pulseaudio pulse)
+ $(use_enable jack)
+ $(use_enable openal)
+ --disable-opensles
+ $(use_enable alsa)
+ $(use_enable coreaudio)
+
+ # Video outputs:
+ $(use_enable aqua cocoa)
+ $(use_enable drm)
+ $(use_enable gbm)
+ $(use_enable wayland wayland-scanner)
+ $(use_enable wayland wayland-protocols)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ $(use_enable xv)
+ $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+ $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+ $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+ $(use_enable vdpau)
+ $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+ $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+ $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+ $(use_enable libcaca caca)
+ $(use_enable jpeg)
+ $(use_enable vulkan shaderc)
+ $(use_enable vulkan libplacebo)
+ $(use_enable raspberry-pi rpi)
+ $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+ $(usex opengl '' '--disable-gl')
+ $(use_enable vulkan)
+ $(use_enable gamepad sdl2-gamepad)
+
+ # HWaccels:
+ # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+ $(use_enable nvenc cuda-hwaccel)
+ $(use_enable nvenc cuda-interop)
+
+ # TV features:
+ $(use_enable dvb dvbin)
+
+ # Miscellaneous features:
+ $(use_enable zimg)
+ )
+ if use lua; then
+ if use lua_single_target_luajit; then
+ mywafargs+=( --lua="luajit" )
+ else
+ # Because it would be too simple to just let the user directly
+ # specify the package name to check, wouldn't it.
+ mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 $(lua_get_version)))" )
+ fi
+ fi
+
+ if use vaapi && use X; then
+ mywafargs+=(
+ $(use_enable egl vaapi-x-egl)
+ )
+ fi
+
+ # Not for us
+ mywafargs+=(
+ --disable-android
+ --disable-egl-android
+ --disable-uwp
+ --disable-audiounit
+ --disable-macos-media-player
+ --disable-wasapi
+ --disable-ios-gl
+ --disable-macos-touchbar
+ --disable-macos-cocoa-cb
+ --disable-tvos
+ --disable-egl-angle-win32
+ )
+
+ mywafargs+=(
+ --bashdir="$(get_bashcompdir)"
+ --zshdir="${EPREFIX}"/usr/share/zsh/site-functions
+)
+
+ # Create reproducible non-live builds.
+ [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+ waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+ waf-utils_src_install
+
+ if use lua; then
+ insinto /usr/share/${PN}
+ doins -r TOOLS/lua
+ fi
+
+ if use cli && use lua_single_target_luajit; then
+ pax-mark -m "${ED}"/usr/bin/${PN}
+ fi
+
+ if use tools; then
+ dobin TOOLS/{mpv_identify.sh,umpv}
+ newbin TOOLS/idet.sh mpv_idet.sh
+ python_replicate_script "${ED}"/usr/bin/umpv
+ fi
+}
+
+pkg_postinst() {
+ local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+ for rv in ${REPLACING_VERSIONS}; do
+ ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
+ ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
+ ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
+ ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
+ done
+
+ if [[ ${softvol_0_18_1} -eq 1 ]]; then
+ elog "Since version 0.18.1 the software volume control is always enabled."
+ elog "This means that volume controls don't change the system volume,"
+ elog "e.g. per-application volume with PulseAudio."
+ elog "If you want to restore the previous behaviour, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+ elog
+ fi
+
+ if [[ ${osc_0_21_0} -eq 1 ]]; then
+ elog "In version 0.21.0 the default OSC layout was changed."
+ elog "If you want to restore the previous layout, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+ elog
+ fi
+
+ if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+ elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+ elog "If you want to restore the previous behaviour, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+ elog
+ fi
+
+ if [[ ${opengl_0_25_0} -eq 1 ]]; then
+ elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+ elog "the 'opengl' video output and no longer explicitly requires"
+ elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+ fi
+
+ optfeature "URL support" net-misc/yt-dlp
+
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+src_test() {
+ cd "${S}"/build/test || die
+ local test
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index dd43d1178ad..c44511ff201 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,20 +29,20 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
- openal +opengl pulseaudio raspberry-pi rubberband sdl
+ nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
REQUIRED_USE="
|| ( cli libmpv )
aqua? ( opengl )
- cuda? ( opengl )
egl? ( || ( gbm X wayland ) )
gamepad? ( sdl )
gbm? ( drm egl opengl )
lcms? ( opengl )
lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( opengl )
opengl? ( || ( aqua egl X raspberry-pi !cli ) )
raspberry-pi? ( opengl )
test? ( opengl )
@@ -90,10 +90,10 @@ COMMON_DEPEND="
raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
rubberband? ( >=media-libs/rubberband-1.8.0 )
sdl? ( media-libs/libsdl2[sound,threads,video] )
- vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+ vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] )
vdpau? ( x11-libs/libvdpau )
vulkan? (
- >=media-libs/libplacebo-3.104.0:=[vulkan]
+ >=media-libs/libplacebo-4.192.1:=[vulkan]
media-libs/shaderc
)
wayland? (
@@ -118,11 +118,11 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
- cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
dvb? ( virtual/linuxtv-dvb-headers )
+ nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
"
RDEPEND="${COMMON_DEPEND}
- cuda? ( x11-drivers/nvidia-drivers[X] )
+ nvenc? ( x11-drivers/nvidia-drivers[X] )
selinux? ( sec-policy/selinux-mplayer )
tools? ( ${PYTHON_DEPS} )
"
@@ -146,8 +146,8 @@ src_configure() {
tc-export CC PKG_CONFIG AR
if use raspberry-pi; then
- append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
- append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+ append-cflags -I"${ESYSROOT}/opt/vc/include"
+ append-ldflags -L"${ESYSROOT}/opt/vc/lib"
fi
local mywafargs=(
@@ -224,8 +224,8 @@ src_configure() {
# HWaccels:
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
- $(use_enable cuda cuda-hwaccel)
- $(use_enable cuda cuda-interop)
+ $(use_enable nvenc cuda-hwaccel)
+ $(use_enable nvenc cuda-interop)
# TV features:
$(use_enable dvb dvbin)
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 8e4776e0119..86c897e4d5f 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,5 +1,4 @@
-DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e98cbc3da2b7cd81b3c19c4f52cfa3efcca01dce40528018996c65f026eb97520d78040165d1906b0d19236a86e76ec39c58c26 SHA512 060a5a8716a75b4b96dfb6ac28c132e22b93107915d680311c1b9d4fd12c7712a9e3497338eac6d2b9f4e74f2dc005a75d195c597bba049e4731fe3724f519ba
-DIST obs-browser-aee43000bd994022cd73e32dc50938ab777d4a06.tar.gz 89603 BLAKE2B a51b92f829ecb7055dcf969d6d5bdc4632b51288f0bc7e2ab66fda087da608869ddffccda83aa925f049c79e745a6f67e70ec72303184b970f5009fe37b34054 SHA512 8159ca02b5c30d2733ce8e566f21d6b77d6b7beabd0a5898049ee83b0b4d720b967fc55fcf876cd772fdaa12ca08163a0f8cabf249a9b3b6eb56b7666d1192c7
-DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e SHA512 3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179
-DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4 SHA512 c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3
-DIST obs-studio-27.1.3.tar.gz 15994678 BLAKE2B 5544a1ecdb04dca7f6422936ea5499a206b4beb8e5332605c18cd72a91ce73aa74ff06c49a106931822c1c413ee94d383942f173a71f2b21168a00495b4e301f SHA512 04c11c79e3b091aa9ea8fc6674c9fbcaa1c924fe049f68e9be63f63724c31305d6e4fb33aecdd4d0095d20013e2ee188983f6938b175257368d2260681c2fb39
+DIST cef_binary_4638_linux64.tar.bz2 104578246 BLAKE2B 13ee05d4a2fbf27290506297416b298c786954450c19183b493d13aa691db409c22b30870fbc55adf814ff30142a666eb8b172f16ccc48e6cf01135c72e5d6d6 SHA512 2eb01151e07adf332affce36a659c6e87da1fbc403c65db7e7c53472ff418df6cd04300a7c6ebc8789c094926429cc70d829e556e5de3127da230f8258fabe49
+DIST obs-browser-915761778ec1eae99e740ad4bf63b40db3142ee2.tar.gz 100021 BLAKE2B d72df588aaeaf199c6ea5a7e419bb4792ef8b4c4237e700f75064d96caaec83ed2be2ea4ab34ba31e30a87ec6cbf1f267dd7b100c3a6cfec36e46b2eca8c4b2e SHA512 3ab6118a9509054ea4e8aed14dade7f374495ba25fcb5295a3ef7ed29e6e3305b0ae2f12ba2c0d27fcd6886822c98ab44a48fa9a4b66ae0507ab2bf1001157cb
+DIST obs-studio-27.2.3.tar.gz 16383685 BLAKE2B 76802ba67dcebccabd9b2a1f09f505a4aea83887b445093c51a2c7a49fbaa064549b6212bd1b2f3200674a78349b2de4bfa54d14871c76be248cd62139d98a56 SHA512 c34e850e1a83e55aed952611257446a39d7ba4456b94f74d91c85d09d77361af2f76848f7d3f3d8ba7ae76c926129adad555e2f54d632658832596d0f2696a3c
+DIST obs-studio-27.2.4.tar.gz 16385399 BLAKE2B 00c05ecd055d707b7132ca4b20e1c4946b682c0f79f1477167ae55aba3ec367c97b05aac190b07260f936e68f79f2d58e19dcc0602f70408f4c056eb733a6fdd SHA512 575341dd3d9240b21881517a16d01ca11f833e08b40ca7990f0360b4cd1076e8217a9bb8dddf174eca5429e6eadaadb6cfdbd61d24e0eb13ebeaa7f29cfad8bf
diff --git a/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
deleted file mode 100644
index d9e328ea4ef..00000000000
--- a/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/754006
-
-https://github.com/obsproject/obs-studio/pull/3335
-From: Matt Gajownik <matt@obsproject.com>
-Date: Tue, 25 Aug 2020 19:28:26 +1000
-Subject: [PATCH] libobs/util: Fix loading Python binary modules on *nix
---- a/libobs/util/platform-nix.c
-+++ b/libobs/util/platform-nix.c
-@@ -71,7 +71,8 @@ void *os_dlopen(const char *path)
- #ifdef __APPLE__
- void *res = dlopen(dylib_name.array, RTLD_LAZY | RTLD_FIRST);
- #else
-- void *res = dlopen(dylib_name.array, RTLD_LAZY);
-+ void *res = dlopen(dylib_name.array,
-+ RTLD_LAZY | RTLD_DEEPBIND | RTLD_GLOBAL);
- #endif
- if (!res)
- blog(LOG_ERROR, "os_dlopen(%s->%s): %s\n", path,
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index b16a1b2e5db..0945dd8d23e 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -5,9 +5,9 @@
<email>chiitoo@gentoo.org</email>
<name>Jimi Huotari</name>
</maintainer>
- <maintainer type="person" proxied="proxy">
- <email>ionen@gentoo.org</email>
- <name>Ionen Wolkens</name>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<longdescription>
A rewrite of what was formerly known as "Open Broadcaster Software",
@@ -19,7 +19,6 @@
<flag name="browser">Enable browser source support via (precompiled) CEF.</flag>
<flag name="decklink">Build the Decklink plugin.</flag>
<flag name="fdk">Build with LibFDK AAC support.</flag>
- <flag name="nvenc">Build with NVENC encoding support for nVidia video cards.</flag>
<flag name="pipewire">Build with PipeWire support.</flag>
<flag name="python">Build with scripting support for Python 3.</flag>
<flag name="speex">Build with Speex noise suppression filter support.</flag>
diff --git a/media-video/obs-studio/obs-studio-27.1.3-r1.ebuild b/media-video/obs-studio/obs-studio-27.2.3-r1.ebuild
index 9cd43053e71..b9550e6de3d 100644
--- a/media-video/obs-studio/obs-studio-27.1.3-r1.ebuild
+++ b/media-video/obs-studio/obs-studio-27.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit cmake lua-single python-single-r1 xdg
-OBS_BROWSER_COMMIT="aee43000bd994022cd73e32dc50938ab777d4a06"
-CEF_DIR="cef_binary_4280_linux64"
+OBS_BROWSER_COMMIT="915761778ec1eae99e740ad4bf63b40db3142ee2"
+CEF_DIR="cef_binary_4638_linux64"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -58,9 +58,10 @@ DEPEND="
dev-qt/qtxml:5
media-libs/libglvnd
media-libs/x264:=
- media-video/ffmpeg:=[x264]
+ media-video/ffmpeg:=[nvenc?,x264]
net-misc/curl
sys-apps/dbus
+ sys-apps/pciutils
sys-libs/zlib:=
virtual/udev
x11-libs/libX11
@@ -82,6 +83,7 @@ DEPEND="
media-libs/fontconfig
media-libs/mesa[gbm(+)]
net-print/cups
+ x11-libs/cairo
x11-libs/libdrm
x11-libs/libXScrnSaver
x11-libs/libXcursor
@@ -94,7 +96,6 @@ DEPEND="
fdk? ( media-libs/fdk-aac:= )
jack? ( virtual/jack )
lua? ( ${LUA_DEPS} )
- nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
pipewire? ( media-video/pipewire:= )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
@@ -112,17 +113,15 @@ RDEPEND="${DEPEND}"
QA_PREBUILT="
usr/lib*/obs-plugins/chrome-sandbox
+ usr/lib*/obs-plugins/libcef.so
usr/lib*/obs-plugins/libEGL.so
usr/lib*/obs-plugins/libGLESv2.so
- usr/lib*/obs-plugins/libcef.so
+ usr/lib*/obs-plugins/libvk_swiftshader.so
+ usr/lib*/obs-plugins/libvulkan.so.1
usr/lib*/obs-plugins/swiftshader/libEGL.so
usr/lib*/obs-plugins/swiftshader/libGLESv2.so
"
-PATCHES=(
- "${FILESDIR}/${PN}-26.1.2-python-3.8.patch"
-)
-
pkg_setup() {
use lua && lua-single_pkg_setup
use python && python-single-r1_pkg_setup
@@ -153,7 +152,6 @@ src_configure() {
-DDISABLE_LIBFDK=$(usex !fdk)
-DENABLE_PIPEWIRE=$(usex pipewire)
-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
- $(cmake_use_find_package pulseaudio PulseAudio)
-DDISABLE_SPEEXDSP=$(usex !speex)
-DDISABLE_V4L2=$(usex !v4l)
-DDISABLE_VLC=$(usex !vlc)
@@ -203,12 +201,4 @@ pkg_postinst() {
elog "be enabled."
elog
fi
-
- if use python; then
- ewarn "This ebuild applies a patch that is not yet accepted upstream,"
- ewarn "and while it fixes Python support at least to some extent, it"
- ewarn "may cause other issues."
- ewarn ""
- ewarn "Please report any such issues to the Gentoo maintainer."
- fi
}
diff --git a/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild b/media-video/obs-studio/obs-studio-27.2.4.ebuild
index 4c9f4cd3f3a..b9550e6de3d 100644
--- a/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild
+++ b/media-video/obs-studio/obs-studio-27.2.4.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
LUA_COMPAT=( luajit )
PYTHON_COMPAT=( python3_{8..10} )
-inherit xdg cmake lua-single python-single-r1
+inherit cmake lua-single python-single-r1 xdg
-OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b"
-CEF_DIR="cef_binary_4280_linux64"
+OBS_BROWSER_COMMIT="915761778ec1eae99e740ad4bf63b40db3142ee2"
+CEF_DIR="cef_binary_4638_linux64"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -43,6 +43,7 @@ BDEPEND="
python? ( dev-lang/swig )
"
DEPEND="
+ dev-libs/glib:2
dev-libs/jansson:=
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
@@ -55,10 +56,12 @@ DEPEND="
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
dev-qt/qtxml:5
+ media-libs/libglvnd
media-libs/x264:=
- media-video/ffmpeg:=[x264]
+ media-video/ffmpeg:=[nvenc?,x264]
net-misc/curl
sys-apps/dbus
+ sys-apps/pciutils
sys-libs/zlib:=
virtual/udev
x11-libs/libX11
@@ -70,6 +73,7 @@ DEPEND="
alsa? ( media-libs/alsa-lib )
browser? (
app-accessibility/at-spi2-atk
+ app-accessibility/at-spi2-core:2
dev-libs/atk
dev-libs/expat
dev-libs/glib
@@ -77,7 +81,10 @@ DEPEND="
dev-libs/nss
media-libs/alsa-lib
media-libs/fontconfig
+ media-libs/mesa[gbm(+)]
net-print/cups
+ x11-libs/cairo
+ x11-libs/libdrm
x11-libs/libXScrnSaver
x11-libs/libXcursor
x11-libs/libXdamage
@@ -89,7 +96,6 @@ DEPEND="
fdk? ( media-libs/fdk-aac:= )
jack? ( virtual/jack )
lua? ( ${LUA_DEPS} )
- nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
pipewire? ( media-video/pipewire:= )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
@@ -107,17 +113,15 @@ RDEPEND="${DEPEND}"
QA_PREBUILT="
usr/lib*/obs-plugins/chrome-sandbox
+ usr/lib*/obs-plugins/libcef.so
usr/lib*/obs-plugins/libEGL.so
usr/lib*/obs-plugins/libGLESv2.so
- usr/lib*/obs-plugins/libcef.so
+ usr/lib*/obs-plugins/libvk_swiftshader.so
+ usr/lib*/obs-plugins/libvulkan.so.1
usr/lib*/obs-plugins/swiftshader/libEGL.so
usr/lib*/obs-plugins/swiftshader/libGLESv2.so
"
-PATCHES=(
- "${FILESDIR}/${PN}-26.1.2-python-3.8.patch"
-)
-
pkg_setup() {
use lua && lua-single_pkg_setup
use python && python-single-r1_pkg_setup
@@ -137,7 +141,7 @@ src_unpack() {
src_configure() {
local libdir=$(get_libdir)
local mycmakeargs=(
- $(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '')
+ $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
-DBUILD_BROWSER=$(usex browser)
-DBUILD_VST=no
-DENABLE_WAYLAND=$(usex wayland)
@@ -197,22 +201,4 @@ pkg_postinst() {
elog "be enabled."
elog
fi
-
- if ! has_version "sys-apps/dbus"; then
- elog
- elog "The 'sys-apps/dbus' package is not installed, but"
- elog "could be used for disabling hibernating, screensaving,"
- elog "and sleeping. Where it is not installed,"
- elog "'xdg-screensaver reset' is used instead"
- elog "(if 'x11-misc/xdg-utils' is installed)."
- elog
- fi
-
- if use python; then
- ewarn "This ebuild applies a patch that is not yet accepted upstream,"
- ewarn "and while it fixes Python support at least to some extent, it"
- ewarn "may cause other issues."
- ewarn ""
- ewarn "Please report any such issues to the Gentoo maintainer."
- fi
}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 6e23d6b2b47..f42ddb8941a 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit cmake lua-single python-single-r1 xdg
-OBS_BROWSER_COMMIT="2a338b7c76d5dd0a6b23f1d49affefd40213b0e9"
-CEF_DIR="cef_binary_4280_linux64"
+OBS_BROWSER_COMMIT="b798763ae75b538e405c2d7e2ab3a1edfe59ed0c"
+CEF_DIR="cef_binary_4638_linux64"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -46,28 +46,22 @@ DEPEND="
dev-libs/glib:2
dev-libs/jansson:=
dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
dev-qt/qtgui:5[wayland?]
- dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtquickcontrols:5
- dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
dev-qt/qtxml:5
media-libs/libglvnd
media-libs/x264:=
- media-video/ffmpeg:=[x264]
+ media-video/ffmpeg:=[nvenc?,x264]
net-misc/curl
sys-apps/dbus
+ sys-apps/pciutils
sys-libs/zlib:=
- virtual/udev
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrandr
x11-libs/libxcb:=
alsa? ( media-libs/alsa-lib )
browser? (
@@ -82,19 +76,23 @@ DEPEND="
media-libs/fontconfig
media-libs/mesa[gbm(+)]
net-print/cups
+ x11-libs/cairo
x11-libs/libdrm
- x11-libs/libXScrnSaver
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libXrandr
x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libxshmfence
x11-libs/libXtst
+ x11-libs/pango
)
fdk? ( media-libs/fdk-aac:= )
jack? ( virtual/jack )
lua? ( ${LUA_DEPS} )
- nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
pipewire? ( media-video/pipewire:= )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
@@ -104,25 +102,29 @@ DEPEND="
media-libs/fontconfig
media-libs/freetype
)
- v4l? ( media-libs/libv4l )
+ v4l? (
+ media-libs/libv4l
+ virtual/udev
+ )
vlc? ( media-video/vlc:= )
- wayland? ( dev-libs/wayland )
+ wayland? (
+ dev-libs/wayland
+ x11-libs/libxkbcommon
+ )
"
RDEPEND="${DEPEND}"
QA_PREBUILT="
usr/lib*/obs-plugins/chrome-sandbox
+ usr/lib*/obs-plugins/libcef.so
usr/lib*/obs-plugins/libEGL.so
usr/lib*/obs-plugins/libGLESv2.so
- usr/lib*/obs-plugins/libcef.so
+ usr/lib*/obs-plugins/libvk_swiftshader.so
+ usr/lib*/obs-plugins/libvulkan.so.1
usr/lib*/obs-plugins/swiftshader/libEGL.so
usr/lib*/obs-plugins/swiftshader/libGLESv2.so
"
-PATCHES=(
- "${FILESDIR}/${PN}-26.1.2-python-3.8.patch"
-)
-
pkg_setup() {
use lua && lua-single_pkg_setup
use python && python-single-r1_pkg_setup
@@ -139,31 +141,35 @@ src_unpack() {
fi
}
+src_prepare() {
+ # We have not enabled VST before, but now it will be looked for unconditionally if
+ # any plugins are enabled, so make the VST part a warning instead of fatal for now.
+ sed -i 's/FATAL_ERROR "obs-vst submodule not available/WARNING "obs-vst submodule not available/' \
+ plugins/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
src_configure() {
local libdir=$(get_libdir)
local mycmakeargs=(
$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
- -DBUILD_BROWSER=$(usex browser)
- -DBUILD_VST=no
- -DENABLE_WAYLAND=$(usex wayland)
- -DDISABLE_ALSA=$(usex !alsa)
- -DDISABLE_DECKLINK=$(usex !decklink)
- -DDISABLE_FREETYPE=$(usex !truetype)
- -DDISABLE_JACK=$(usex !jack)
- -DDISABLE_LIBFDK=$(usex !fdk)
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_AJA=OFF
+ -DENABLE_BROWSER=$(usex browser)
+ -DENABLE_DECKLINK=$(usex decklink)
+ -DENABLE_FREETYPE=$(usex truetype)
+ -DENABLE_JACK=$(usex jack)
+ -DENABLE_LIBFDK=$(usex fdk)
-DENABLE_PIPEWIRE=$(usex pipewire)
- -DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
- $(cmake_use_find_package pulseaudio PulseAudio)
- -DDISABLE_SPEEXDSP=$(usex !speex)
- -DDISABLE_V4L2=$(usex !v4l)
- -DDISABLE_VLC=$(usex !vlc)
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio)
+ -DENABLE_RTMPS=$(usex ssl ON OFF)
+ -DENABLE_SPEEXDSP=$(usex speex)
+ -DENABLE_V4L2=$(usex v4l)
+ -DENABLE_VLC=$(usex vlc)
+ -DENABLE_WAYLAND=$(usex wayland)
-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-DUNIX_STRUCTURE=1
- -DWITH_RTMPS=$(usex ssl)
-
- # deprecated and currently cause issues
- # https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
- -DLIBOBS_PREFER_IMAGEMAGICK=no
)
if [[ ${PV} != 9999 ]]; then
@@ -174,12 +180,12 @@ src_configure() {
if use lua || use python; then
mycmakeargs+=(
- -DDISABLE_LUA=$(usex !lua)
- -DDISABLE_PYTHON=$(usex !python)
- -DENABLE_SCRIPTING=yes
+ -DENABLE_SCRIPTING_LUA=$(usex lua)
+ -DENABLE_SCRIPTING_PYTHON=$(usex python)
+ -DENABLE_SCRIPTING=ON
)
else
- mycmakeargs+=( -DENABLE_SCRIPTING=no )
+ mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
fi
cmake_src_configure
@@ -203,12 +209,4 @@ pkg_postinst() {
elog "be enabled."
elog
fi
-
- if use python; then
- ewarn "This ebuild applies a patch that is not yet accepted upstream,"
- ewarn "and while it fixes Python support at least to some extent, it"
- ewarn "may cause other issues."
- ewarn ""
- ewarn "Please report any such issues to the Gentoo maintainer."
- fi
}
diff --git a/media-video/openshot/openshot-2.6.1.ebuild b/media-video/openshot/openshot-2.6.1.ebuild
index 48be05d1397..10693ece187 100644
--- a/media-video/openshot/openshot-2.6.1.ebuild
+++ b/media-video/openshot/openshot-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,16 +22,16 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND="$(python_gen_cond_dep '
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,widgets]
- dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
- dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ dev-python/pyzmq[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
')
>=media-libs/libopenshot-0.2.7:0=[python,${PYTHON_SINGLE_USEDEP}]"
DEPEND=""
BDEPEND="$(python_gen_cond_dep '
- doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
')"
src_prepare() {
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index e94a104be02..528468dc49d 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,4 +1,5 @@
DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
-DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
-DIST pipewire-0.3.40.tar.gz 1675384 BLAKE2B b7df4f1ca363b764a5230099d32dd5ba5dceaadc8ca2d4ce55f42810a91628b4e32891757b22fd5eb7a7f497163936c63b86330ab2d5efa261a82d450660c371 SHA512 63109b87d50be160a6cde632470849564d4743f4cb469f5e3713bb1cbefc08f80416210ddedc09439555b702193c0266a1b9724e366a3b850bdf1a346c5e80cb
+DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6 SHA512 36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
+DIST pipewire-0.3.50.tar.gz 1773182 BLAKE2B d286b73553471795ea8ed60c82e12c955f1835a7a3a8d45baeda6b1e20a795221230b50c21619af4ef5b2b4962d2783de00b1ab2b22b091220970c334de8b9dc SHA512 e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f92f1dd4c95c1e0e98f6af497d315dd463f81c2649d1e8ee23
+DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
diff --git a/media-video/pipewire/files/99-pipewire-default-hook.conf b/media-video/pipewire/files/99-pipewire-default-hook.conf
new file mode 100644
index 00000000000..7145accea80
--- /dev/null
+++ b/media-video/pipewire/files/99-pipewire-default-hook.conf
@@ -0,0 +1,17 @@
+# Load pipewire configuration at conf hook processing time. This allows to
+# override pulseaudio defaults configuration which is also applied via hook.
+#
+# Note since hooks are run after @GENTOO_PORTAGE_EPREFIX@/etc/asound.conf and ~/.asoundrc are applied,
+# we load these again here make sure that user configuration takes precedence.
+
+@hooks [
+ {
+ func load
+ files [
+ "@GENTOO_PORTAGE_EPREFIX@/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf"
+ "@GENTOO_PORTAGE_EPREFIX@/etc/asound.conf"
+ "~/.asoundrc"
+ ]
+ errors false
+ }
+]
diff --git a/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch
deleted file mode 100644
index b8d3271eecd..00000000000
--- a/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
-index 648e13069..d985208b4 100644
---- a/src/daemon/pipewire.conf.in
-+++ b/src/daemon/pipewire.conf.in
-@@ -235,12 +235,12 @@ context.exec = [
- # but it is better to start it as a systemd service.
- # Run the session manager with -h for options.
- #
-- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
-+ { path = "@session_manager_path@" args = "@session_manager_args@" }
- #
- # You can optionally start the pulseaudio-server here as well
- # but it is better to start it as a systemd service.
- # It can be interesting to start another daemon here that listens
- # on another address with the -a option (eg. -a tcp:4713).
- #
-- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
-+ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]
diff --git a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
deleted file mode 100644
index 6b56304f5d1..00000000000
--- a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ddfbd684e78e2b8b9ad40bedb4612ea0197d231a.patch
-
-From: Joshua Strobl <joshua@streambits.io>
-Date: Thu, 30 Sep 2021 23:11:50 +0300
-Subject: [PATCH] Fix readline detection by allowing fallback to cc
- find_library
-
---- a/meson.build
-+++ b/meson.build
-@@ -326,6 +326,11 @@ dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : get_option('sdl2'))
- summary({'SDL 2': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies')
- readline_dep = dependency('readline', required : false)
-+
-+if not readline_dep.found()
-+ readline_dep = cc.find_library('readline', required: false)
-+endif
-+
- summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, section: 'Misc dependencies')
- ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
-@@ -406,7 +411,12 @@ libinotify_dep = (build_machine.system() == 'freebsd'
- : dependency('', required: false))
-
- # On FreeBSD, libintl library is required for gettext
--libintl_dep = cc.find_library('intl', required: false)
-+libintl_dep = dependency('intl', required: false)
-+
-+if not libintl_dep.found()
-+ libintl_dep = cc.find_library('intl', required: false)
-+endif
-+summary({'intl support': libintl_dep.found()}, bool_yn: true)
-
- need_alsa = get_option('pipewire-alsa').enabled() or get_option('session-managers').contains('media-session')
- alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa)
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch
deleted file mode 100644
index 222aa58cce1..00000000000
--- a/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f8817b439433798bd7217dc4ae72197887b0fc96.patch
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- int arch;
-
- if (!(cpuinfo = get_cpuinfo())) {
-- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- return 1;
- }
-
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch b/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch
deleted file mode 100644
index beabd1a3029..00000000000
--- a/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d71a10b7fa9b5c560485b6bbde409c10d3fdd114.patch
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 12:54:29 +0200
-Subject: [PATCH] libcamera: handle failure gracefully
-
-Don't try to access NULL pointers
---- a/spa/plugins/libcamera/libcamera-client.c
-+++ b/spa/plugins/libcamera/libcamera-client.c
-@@ -210,10 +210,10 @@ impl_init(const struct spa_handle_factory *factory,
- SPA_DEVICE_CHANGE_MASK_PROPS;
- this->info.flags = 0;
-
-- if(this->dev.camera == NULL) {
-+ if(this->dev.camera == NULL)
- this->dev.camera = (LibCamera*)newLibCamera();
-+ if(this->dev.camera != NULL)
- libcamera_set_log(this->dev.camera, this->dev.log);
-- }
-
- return 0;
- }
---- a/spa/plugins/libcamera/libcamera-source.c
-+++ b/spa/plugins/libcamera/libcamera-source.c
-@@ -994,10 +994,10 @@ impl_init(const struct spa_handle_factory *factory,
- port->dev.log = this->log;
- port->dev.fd = -1;
-
-- if(port->dev.camera == NULL) {
-+ if(port->dev.camera == NULL)
- port->dev.camera = (LibCamera*)newLibCamera();
-+ if(port->dev.camera != NULL)
- libcamera_set_log(port->dev.camera, port->dev.log);
-- }
-
- if (info && (str = spa_dict_lookup(info, SPA_KEY_API_LIBCAMERA_PATH))) {
- strncpy(this->props.device, str, 63);
---- a/spa/plugins/libcamera/libcamera_wrapper.cpp
-+++ b/spa/plugins/libcamera/libcamera_wrapper.cpp
-@@ -540,7 +540,8 @@ extern "C" {
- }
-
- void LibCamera::close() {
-- this->cam_->release();
-+ if (this->cam_)
-+ this->cam_->release();
- }
-
- void LibCamera::connect()
-@@ -775,6 +776,9 @@ extern "C" {
- std::unique_ptr<CameraManager> cm = std::make_unique<CameraManager>();
- LibCamera* camera = new LibCamera();
-
-+ pthread_mutexattr_init(&attr);
-+ pthread_mutex_init(&camera->lock, &attr);
-+
- ret = cm->start();
- if (ret) {
- deleteLibCamera(camera);
-@@ -794,9 +798,6 @@ extern "C" {
- return nullptr;
- }
-
-- pthread_mutexattr_init(&attr);
-- pthread_mutex_init(&camera->lock, &attr);
--
- camera->ring_buffer_init();
-
- return camera;
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch b/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
new file mode 100644
index 00000000000..58b4b331e03
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
@@ -0,0 +1,20 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5a023c8c84fb053d452983a64a33a41b931fc99b
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2271
+
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 21 Apr 2022 22:12:38 +0200
+Subject: [PATCH] alsa: fix argument type for Long
+
+Fixes #2271
+--- a/spa/plugins/alsa/alsa-pcm.c
++++ b/spa/plugins/alsa/alsa-pcm.c
+@@ -311,7 +311,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state,
+ SPA_PROP_INFO_name, SPA_POD_String("latency.internal.ns"),
+ SPA_PROP_INFO_description, SPA_POD_String("Internal latency in nanoseconds"),
+ SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(state->process_latency.ns,
+- 0, 2 * SPA_NSEC_PER_SEC),
++ 0LL, 2 * SPA_NSEC_PER_SEC),
+ SPA_PROP_INFO_params, SPA_POD_Bool(true));
+ break;
+ case 15:
+GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
new file mode 100644
index 00000000000..5b9ad3cf2d7
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
@@ -0,0 +1,39 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch
+https://bugs.gentoo.org/838427
+
+From: psykose <alice@ayaya.dev>
+Date: Wed, 13 Apr 2022 21:57:49 +0000
+Subject: [PATCH] spa: fix c90 header include
+
+placing declarations after code is invalid under ISO c90
+
+Fixes !1211
+--- a/spa/include/spa/utils/string.h
++++ b/spa/include/spa/utils/string.h
+@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, .
+ static inline float spa_strtof(const char *str, char **endptr)
+ {
+ static locale_t locale = NULL;
++ locale_t prev;
+ float v;
+ if (SPA_UNLIKELY(locale == NULL))
+ locale = newlocale(LC_ALL_MASK, "C", NULL);
+- locale_t prev = uselocale(locale);
++ prev = uselocale(locale);
+ v = strtof(str, endptr);
+ uselocale(prev);
+ return v;
+@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val)
+ static inline double spa_strtod(const char *str, char **endptr)
+ {
+ static locale_t locale = NULL;
++ locale_t prev;
+ double v;
+ if (SPA_UNLIKELY(locale == NULL))
+ locale = newlocale(LC_ALL_MASK, "C", NULL);
+- locale_t prev = uselocale(locale);
++ prev = uselocale(locale);
+ v = strtod(str, endptr);
+ uselocale(prev);
+ return v;
+GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch b/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
new file mode 100644
index 00000000000..1e1a8198ef2
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
@@ -0,0 +1,70 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e28a052105f8ef35b3f469d3b85e1fcb25106f26
+
+From e28a052105f8ef35b3f469d3b85e1fcb25106f26 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
+Date: Wed, 13 Apr 2022 18:13:12 +0200
+Subject: [PATCH] treewide: retain sections to prevent linker garbage
+ collection
+
+The linker may remove sections that are actually used when
+"--gc-sections" and "-z start-stop-gc" is set. Add the `retain`
+attribute to prevent that.
+
+Furthermore, fix the alignment for `pwtest_suite_decl` objects.
+
+See: #2292
+See: https://lld.llvm.org/ELF/start-stop-gc.html
+See: https://github.com/systemd/systemd/issues/21847
+See: https://github.com/systemd/systemd/pull/21855
+---
+ src/modules/module-protocol-pulse/module.h | 1 +
+ test/pwtest-implementation.h | 2 +-
+ test/pwtest.h | 6 ++++--
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/module-protocol-pulse/module.h b/src/modules/module-protocol-pulse/module.h
+index c1153640e..f75d8786c 100644
+--- a/src/modules/module-protocol-pulse/module.h
++++ b/src/modules/module-protocol-pulse/module.h
+@@ -47,6 +47,7 @@ struct module_info {
+
+ #define DEFINE_MODULE_INFO(name) \
+ __attribute__((used)) \
++ __attribute__((retain)) \
+ __attribute__((section("pw_mod_pulse_modules"))) \
+ __attribute__((aligned(__alignof__(struct module_info)))) \
+ const struct module_info name
+diff --git a/test/pwtest-implementation.h b/test/pwtest-implementation.h
+index 7bfad01cf..1525d2056 100644
+--- a/test/pwtest-implementation.h
++++ b/test/pwtest-implementation.h
+@@ -131,7 +131,7 @@ void _pwtest_add(struct pwtest_context *ctx,
+ struct pwtest_suite_decl {
+ const char *name;
+ enum pwtest_result (*setup)(struct pwtest_context *, struct pwtest_suite *);
+-} __attribute__((aligned(16)));
++};
+
+
+ #endif /* PWTEST_IMPLEMENTATION_H */
+diff --git a/test/pwtest.h b/test/pwtest.h
+index 9c0737523..6d3070b79 100644
+--- a/test/pwtest.h
++++ b/test/pwtest.h
+@@ -494,9 +494,11 @@ enum pwtest_arg {
+ */
+ #define PWTEST_SUITE(cname) \
+ static enum pwtest_result (cname##__setup)(struct pwtest_context *ctx, struct pwtest_suite *suite); \
+- static const struct pwtest_suite_decl _test_suite \
+ __attribute__((used)) \
+- __attribute((section("pwtest_suite_section"))) = { \
++ __attribute__((retain)) \
++ __attribute__((section("pwtest_suite_section"))) \
++ __attribute__((aligned(__alignof__(struct pwtest_suite_decl)))) \
++ static const struct pwtest_suite_decl _test_suite = { \
+ .name = #cname, \
+ .setup = cname##__setup, \
+ }; \
+--
+GitLab
+
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index d6ee6bc2024..f88730b7d3b 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -6,6 +6,10 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <maintainer type="person">
<email>asturm@gentoo.org</email>
<name>Andreas Sturmlechner</name>
</maintainer>
@@ -23,6 +27,10 @@
<flag name="extra">Build pw-cat/pw-play/pw-record</flag>
<flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag>
<flag name="jack-sdk">Use PipeWire as JACK replacement</flag>
+ <flag name="lv2">Allow loading LV2 plugins via <pkg>media-libs/lv2</pkg></flag>
<flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag>
+ <flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag>
+ <flag name="system-service">Install systemd unit files for running as a system service. Not recommended.</flag>
+ <flag name="X">Enable audible bell for X11</flag>
</use>
</pkgmetadata>
diff --git a/media-video/pipewire/pipewire-0.3.40-r1.ebuild b/media-video/pipewire/pipewire-0.3.49-r1.ebuild
index 93882727fc5..f44ad9bceed 100644
--- a/media-video/pipewire/pipewire-0.3.40-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.49-r1.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
inherit git-r3
else
- SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ if [[ ${PV} == *_p* ]] ; then
+ MY_COMMIT=""
+ SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}"/${PN}-${MY_COMMIT}
+ else
+ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+ fi
+
+ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
fi
DESCRIPTION="Multimedia processing graphs"
HOMEPAGE="https://pipewire.org/"
LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
# Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally
@@ -28,7 +36,10 @@ IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-al
# JACK's sink - doing so is likely to yield no audio, cause a CPU
# cycles consuming loop (and may even cause GUI crashes)!
-REQUIRED_USE="jack-sdk? ( !jack-client )"
+REQUIRED_USE="
+ jack-sdk? ( !jack-client )
+ system-service? ( systemd )
+"
RESTRICT="!test? ( test )"
@@ -49,13 +60,13 @@ RDEPEND="
sys-libs/readline:=
sys-libs/ncurses:=[unicode(+)]
virtual/libintl[${MULTILIB_USEDEP}]
- virtual/libudev[${MULTILIB_USEDEP}]
bluetooth? (
media-libs/fdk-aac
media-libs/libldac
media-libs/libfreeaptx
media-libs/sbc
>=net-wireless/bluez-4.101:=
+ virtual/libusb:1
)
echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? (
@@ -71,20 +82,33 @@ RDEPEND="
!media-sound/jack-audio-connection-kit
!media-sound/jack2
)
+ lv2? ( media-libs/lilv )
pipewire-alsa? (
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
)
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+ ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
+ system-service? (
+ acct-user/pipewire
+ acct-group/pipewire
+ )
+ udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l )
+ X? (
+ media-libs/libcanberra
+ x11-libs/libX11
+ x11-libs/libXfixes
+ )
+ zeroconf? ( net-dns/avahi )
"
DEPEND="${RDEPEND}"
# TODO: Consider use cases where pipewire is not used for driving audio
# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND="media-video/wireplumber"
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
@@ -100,6 +124,8 @@ DOCS=( {README,INSTALL}.md NEWS )
PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+
+ "${FILESDIR}"/${PN}-0.3.49-x86-cast.patch
)
# limitsdfile related code taken from =sys-auth/realtime-base-0.1
@@ -119,13 +145,24 @@ src_prepare() {
@audio - memlock 256
+ $(use system-service && {
+ echo @pipewire - rtprio 95
+ echo @pipewire - priority -19
+ echo @pipewire - memlock 4194304
+ })
+
# End of ${limitsdfile} from ${P}
EOF
}
multilib_src_configure() {
+ # https://bugs.gentoo.org/838301
+ filter-flags -fno-semantic-interposition
+
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+ $(meson_native_use_feature zeroconf avahi)
$(meson_native_use_feature doc docs)
$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
$(meson_native_enabled man)
@@ -134,7 +171,11 @@ multilib_src_configure() {
$(meson_native_use_feature gstreamer)
$(meson_native_use_feature gstreamer gstreamer-device-provider)
$(meson_native_use_feature systemd)
- -Dsystemd-system-service=disabled # Matches upstream
+
+ $(meson_native_use_feature system-service systemd-system-service)
+ -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+ -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
$(meson_native_use_feature systemd systemd-user-service)
$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-Dspa-plugins=enabled
@@ -149,6 +190,7 @@ multilib_src_configure() {
$(meson_native_use_feature bluetooth bluez5-codec-aac)
$(meson_native_use_feature bluetooth bluez5-codec-aptx)
$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+ $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-Dcontrol=enabled # Matches upstream
-Daudiotestsrc=enabled # Matches upstream
@@ -160,18 +202,25 @@ multilib_src_configure() {
-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-Devl=disabled # Matches upstream
-Dtest=disabled # fakesink and fakesource plugins
+ $(meson_native_use_feature lv2)
$(meson_native_use_feature v4l v4l2)
-Dlibcamera=disabled # libcamera is not in Portage tree
+ $(meson_native_use_feature ssl raop)
-Dvideoconvert=enabled # Matches upstream
-Dvideotestsrc=enabled # Matches upstream
-Dvolume=enabled # Matches upstream
-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
$(meson_native_use_feature extra pw-cat)
- -Dudev=enabled
+ $(meson_feature udev)
-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+ # Just for bell sounds in X11 right now.
+ $(meson_native_use_feature X x11)
+ $(meson_native_use_feature X x11-xfixes)
+ $(meson_native_use_feature X libcanberra)
)
meson_src_configure
@@ -207,6 +256,8 @@ multilib_src_install_all() {
}
pkg_postinst() {
+ use udev && udev_reload
+
elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
elog "using PipeWire. Do it either manually or add yourself"
elog "to the 'audio' group:"
@@ -256,8 +307,9 @@ pkg_postinst() {
ewarn
if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
- elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
- elog "autospawning of the original daemon by setting:"
+ elog "are recommended to edit pulseaudio client configuration files:"
+ elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+ elog "if it exists, and disable autospawning of the original daemon by setting:"
elog
elog " autospawn = no"
elog
@@ -294,4 +346,15 @@ pkg_postinst() {
fi
ewarn
fi
+
+ if use system-service; then
+ ewarn
+ ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+ ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+ ewarn "service. This is more than likely NOT what you want. You are strongly"
+ ewarn "advised not to enable this mode and instead stick with systemd user"
+ ewarn "units. The default configuration files will likely not work out of"
+ ewarn "box, and you are on your own with configuration."
+ ewarn
+ fi
}
diff --git a/media-video/pipewire/pipewire-0.3.38.ebuild b/media-video/pipewire/pipewire-0.3.50-r3.ebuild
index a9e1b729e5b..a0b6f24526d 100644
--- a/media-video/pipewire/pipewire-0.3.38.ebuild
+++ b/media-video/pipewire/pipewire-0.3.50-r3.ebuild
@@ -1,17 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit meson-multilib optfeature python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
inherit git-r3
else
- SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+ if [[ ${PV} == *_p* ]] ; then
+ MY_COMMIT=""
+ SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}"/${PN}-${MY_COMMIT}
+ else
+ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+ fi
+
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
@@ -19,8 +26,9 @@ DESCRIPTION="Multimedia processing graphs"
HOMEPAGE="https://pipewire.org/"
LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
# Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally
@@ -28,12 +36,14 @@ IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-al
# JACK's sink - doing so is likely to yield no audio, cause a CPU
# cycles consuming loop (and may even cause GUI crashes)!
-REQUIRED_USE="jack-sdk? ( !jack-client )"
+REQUIRED_USE="
+ jack-sdk? ( !jack-client )
+ system-service? ( systemd )
+"
RESTRICT="!test? ( test )"
BDEPEND="
- app-doc/xmltoman
>=dev-util/meson-0.59
virtual/pkgconfig
${PYTHON_DEPS}
@@ -50,13 +60,13 @@ RDEPEND="
sys-libs/readline:=
sys-libs/ncurses:=[unicode(+)]
virtual/libintl[${MULTILIB_USEDEP}]
- virtual/libudev[${MULTILIB_USEDEP}]
bluetooth? (
media-libs/fdk-aac
media-libs/libldac
media-libs/libfreeaptx
media-libs/sbc
>=net-wireless/bluez-4.101:=
+ virtual/libusb:1
)
echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? (
@@ -72,17 +82,34 @@ RDEPEND="
!media-sound/jack-audio-connection-kit
!media-sound/jack2
)
+ lv2? ( media-libs/lilv )
pipewire-alsa? (
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
)
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+ ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
+ system-service? (
+ acct-user/pipewire
+ acct-group/pipewire
+ )
+ udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l )
+ X? (
+ media-libs/libcanberra
+ x11-libs/libX11
+ x11-libs/libXfixes
+ )
+ zeroconf? ( net-dns/avahi )
"
DEPEND="${RDEPEND}"
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
# (i.e. developer binaries not meant for users) and unready code
@@ -97,10 +124,10 @@ DOCS=( {README,INSTALL}.md NEWS )
PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
- # Upstream
- "${FILESDIR}"/${P}-fix-arm-build.patch
- "${FILESDIR}"/${P}-libcamera-null-deref.patch # (we don't have it in ::gentoo but let's be nice)
- "${FILESDIR}"/${P}-find-readline.patch # just in case
+
+ "${FILESDIR}"/${P}-fix-spa-header.patch
+ "${FILESDIR}"/${P}-treewide-retain-sections-to.patch
+ "${FILESDIR}"/${PN}-0.3.49-x86-cast.patch
)
# limitsdfile related code taken from =sys-auth/realtime-base-0.1
@@ -114,41 +141,47 @@ python_check_deps() {
src_prepare() {
default
- if ! use systemd; then
- # This can be applied non-conditionally but would make for a
- # significantly worse user experience on systemd then.
- eapply "${FILESDIR}"/${PN}-0.3.36-non-systemd-integration.patch
- fi
-
einfo "Generating ${limitsdfile}"
cat > ${limitsdfile} <<- EOF || die
# Start of ${limitsdfile} from ${P}
@audio - memlock 256
+ $(use system-service && {
+ echo @pipewire - rtprio 95
+ echo @pipewire - priority -19
+ echo @pipewire - memlock 4194304
+ })
+
# End of ${limitsdfile} from ${P}
EOF
}
multilib_src_configure() {
+ # https://bugs.gentoo.org/838301
+ filter-flags -fno-semantic-interposition
+
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+ $(meson_native_use_feature zeroconf avahi)
$(meson_native_use_feature doc docs)
- $(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
- # Replaced upstream by -Dsession-managers=..., needs more work, bug #812809
- # but default is same as before and right now, this is fatal with unreleased Meson.
- #$(meson_native_enabled media-session)
+ $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
$(meson_native_enabled man)
$(meson_feature test tests)
-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
$(meson_native_use_feature gstreamer)
$(meson_native_use_feature gstreamer gstreamer-device-provider)
$(meson_native_use_feature systemd)
- -Dsystemd-system-service=disabled # Matches upstream
+
+ $(meson_native_use_feature system-service systemd-system-service)
+ -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+ -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
$(meson_native_use_feature systemd systemd-user-service)
$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-Dspa-plugins=enabled
- -Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+ -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-Daudiomixer=enabled # Matches upstream
-Daudioconvert=enabled # Matches upstream
$(meson_native_use_feature bluetooth bluez5)
@@ -159,6 +192,7 @@ multilib_src_configure() {
$(meson_native_use_feature bluetooth bluez5-codec-aac)
$(meson_native_use_feature bluetooth bluez5-codec-aptx)
$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+ $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-Dcontrol=enabled # Matches upstream
-Daudiotestsrc=enabled # Matches upstream
@@ -170,24 +204,32 @@ multilib_src_configure() {
-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-Devl=disabled # Matches upstream
-Dtest=disabled # fakesink and fakesource plugins
+ $(meson_native_use_feature lv2)
$(meson_native_use_feature v4l v4l2)
-Dlibcamera=disabled # libcamera is not in Portage tree
+ $(meson_native_use_feature ssl raop)
-Dvideoconvert=enabled # Matches upstream
-Dvideotestsrc=enabled # Matches upstream
-Dvolume=enabled # Matches upstream
-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
$(meson_native_use_feature extra pw-cat)
- -Dudev=enabled
+ $(meson_feature udev)
-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+ -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+ # Just for bell sounds in X11 right now.
+ $(meson_native_use_feature X x11)
+ $(meson_native_use_feature X x11-xfixes)
+ $(meson_native_use_feature X libcanberra)
)
meson_src_configure
}
multilib_src_install() {
- # Our customs DOCS do not exist in multilib source directory
+ # Our custom DOCS do not exist in multilib source directory
DOCS= meson_src_install
}
@@ -199,7 +241,7 @@ multilib_src_install_all() {
if use pipewire-alsa; then
dodir /etc/alsa/conf.d
- # These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+ # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
# And the current dosym8 -r implementation is likely affected by the same issue, too.
dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
@@ -207,14 +249,17 @@ multilib_src_install_all() {
if ! use systemd; then
insinto /etc/xdg/autostart
- newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+ newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
- exeinto /usr/libexec
- newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+ exeinto /usr/bin
+ newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+ eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
fi
}
pkg_postinst() {
+ use udev && udev_reload
+
elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
elog "using PipeWire. Do it either manually or add yourself"
elog "to the 'audio' group:"
@@ -232,44 +277,60 @@ pkg_postinst() {
fi
if use systemd; then
- elog "To use PipeWire for audio, the user units must be manually enabled"
- elog "by running this command as each user you use for desktop activities:"
+ elog "When switching from PulseAudio, you may need to disable PulseAudio:"
elog
- elog " systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
+ elog " systemctl --user disable pulseaudio.service pulseaudio.socket"
elog
- elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
+ elog "To use PipeWire, the user units must be manually enabled"
+ elog "by running this command as each user you use for desktop activities:"
elog
- elog " systemctl --user disable --now pulseaudio.service pulseaudio.socket"
+ elog " systemctl --user enable pipewire.socket pipewire-pulse.socket"
elog
elog "A reboot is recommended to avoid interferences from still running"
elog "PulseAudio daemon."
elog
- elog "Both, new users and those upgrading, need to enable pipewire-media-session"
+ elog "Both new users and those upgrading need to enable WirePlumber"
elog "for relevant users:"
elog
- elog " systemctl --user enable --now pipewire-media-session.service"
+ elog " systemctl --user disable pipewire-media-session.service"
+ elog " systemctl --user --force enable wireplumber.service"
elog
+ elog "Root user may replace --user with --global to change system default"
+ elog "configuration for all of the above commands."
else
- elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
- elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
- elog "autospawning of the original daemon by setting:"
- elog
- elog " autospawn = no"
- elog
- elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
- elog
- elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
- elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
- elog "command near the end of the file:"
- elog
- elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
- elog
+ ewarn "PipeWire daemon startup has been moved to a launcher script!"
+ ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+ ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+ ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+ ewarn
+ ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+ ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+ ewarn "advised that a D-Bus user session is set up before starting the script."
+ ewarn
+ if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
+ elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+ elog "are recommended to edit pulseaudio client configuration files:"
+ elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+ elog "if it exists, and disable autospawning of the original daemon by setting:"
+ elog
+ elog " autospawn = no"
+ elog
+ elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+ elog
+ elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+ elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+ elog "command:"
+ elog
+ elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+ elog
+ fi
elog "NOTE:"
elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
elog "and just override the sections you want to change."
fi
+ elog
elog "For latest tips and tricks, troubleshooting information and documentation"
elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
@@ -281,10 +342,21 @@ pkg_postinst() {
if has_version 'net-misc/ofono' ; then
ewarn "Native backend has become default. Please disable oFono via:"
if systemd_is_booted ; then
- ewarn "systemctl disable --now ofono"
+ ewarn "systemctl disable ofono"
else
ewarn "rc-update delete ofono"
fi
ewarn
fi
+
+ if use system-service; then
+ ewarn
+ ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+ ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+ ewarn "service. This is more than likely NOT what you want. You are strongly"
+ ewarn "advised not to enable this mode and instead stick with systemd user"
+ ewarn "units. The default configuration files will likely not work out of"
+ ewarn "box, and you are on your own with configuration."
+ ewarn
+ fi
}
diff --git a/media-video/pipewire/pipewire-0.3.51-r1.ebuild b/media-video/pipewire/pipewire-0.3.51-r1.ebuild
new file mode 100644
index 00000000000..ebda0bf310a
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.51-r1.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+ inherit git-r3
+else
+ if [[ ${PV} == *_p* ]] ; then
+ MY_COMMIT=""
+ SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}"/${PN}-${MY_COMMIT}
+ else
+ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+ fi
+
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+ jack-sdk? ( !jack-client )
+ system-service? ( systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ >=dev-util/meson-0.59
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+"
+RDEPEND="
+ acct-group/audio
+ media-libs/alsa-lib
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-libs/readline:=
+ sys-libs/ncurses:=[unicode(+)]
+ virtual/libintl[${MULTILIB_USEDEP}]
+ bluetooth? (
+ media-libs/fdk-aac
+ media-libs/libldac
+ media-libs/libfreeaptx
+ media-libs/sbc
+ >=net-wireless/bluez-4.101:=
+ virtual/libusb:1
+ )
+ echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+ extra? (
+ >=media-libs/libsndfile-1.0.20
+ )
+ gstreamer? (
+ >=dev-libs/glib-2.32.0:2
+ >=media-libs/gstreamer-1.10.0:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+ jack-sdk? (
+ !media-sound/jack-audio-connection-kit
+ !media-sound/jack2
+ )
+ lv2? ( media-libs/lilv )
+ pipewire-alsa? (
+ >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+ )
+ !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+ ssl? ( dev-libs/openssl:= )
+ systemd? ( sys-apps/systemd )
+ system-service? (
+ acct-user/pipewire
+ acct-group/pipewire
+ )
+ udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l )
+ X? (
+ media-libs/libcanberra
+ x11-libs/libX11
+ x11-libs/libXfixes
+ )
+ zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+# media-video/ffmpeg:=
+# media-libs/libsdl2
+# >=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+# >=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+ has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+
+ einfo "Generating ${limitsdfile}"
+ cat > ${limitsdfile} <<- EOF || die
+ # Start of ${limitsdfile} from ${P}
+
+ @audio - memlock 256
+
+ $(use system-service && {
+ echo @pipewire - rtprio 95
+ echo @pipewire - priority -19
+ echo @pipewire - memlock 4194304
+ })
+
+ # End of ${limitsdfile} from ${P}
+ EOF
+}
+
+multilib_src_configure() {
+ # https://bugs.gentoo.org/838301
+ filter-flags -fno-semantic-interposition
+
+ local emesonargs=(
+ -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+ $(meson_native_use_feature zeroconf avahi)
+ $(meson_native_use_feature doc docs)
+ $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+ $(meson_native_enabled man)
+ $(meson_feature test tests)
+ -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+ $(meson_native_use_feature gstreamer)
+ $(meson_native_use_feature gstreamer gstreamer-device-provider)
+ $(meson_native_use_feature systemd)
+
+ $(meson_native_use_feature system-service systemd-system-service)
+ -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+ -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+ $(meson_native_use_feature systemd systemd-user-service)
+ $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+ -Dspa-plugins=enabled
+ -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+ -Daudiomixer=enabled # Matches upstream
+ -Daudioconvert=enabled # Matches upstream
+ $(meson_native_use_feature bluetooth bluez5)
+ $(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+ $(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+ $(meson_native_use_feature bluetooth bluez5-backend-ofono)
+ $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+ $(meson_native_use_feature bluetooth bluez5-codec-aac)
+ $(meson_native_use_feature bluetooth bluez5-codec-aptx)
+ $(meson_native_use_feature bluetooth bluez5-codec-ldac)
+ $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+ $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+ -Dcontrol=enabled # Matches upstream
+ -Daudiotestsrc=enabled # Matches upstream
+ -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+ -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+ $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+ $(meson_use jack-sdk jack-devel)
+ $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+ -Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+ -Devl=disabled # Matches upstream
+ -Dtest=disabled # fakesink and fakesource plugins
+ $(meson_native_use_feature lv2)
+ $(meson_native_use_feature v4l v4l2)
+ -Dlibcamera=disabled # libcamera is not in Portage tree
+ $(meson_native_use_feature ssl raop)
+ -Dvideoconvert=enabled # Matches upstream
+ -Dvideotestsrc=enabled # Matches upstream
+ -Dvolume=enabled # Matches upstream
+ -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+ $(meson_native_use_feature extra pw-cat)
+ $(meson_feature udev)
+ -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+ -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+ $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+ -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+ # Just for bell sounds in X11 right now.
+ $(meson_native_use_feature X x11)
+ $(meson_native_use_feature X x11-xfixes)
+ $(meson_native_use_feature X libcanberra)
+ )
+
+ meson_src_configure
+}
+
+multilib_src_install() {
+ # Our custom DOCS do not exist in multilib source directory
+ DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ insinto /etc/security/limits.d
+ doins ${limitsdfile}
+
+ if use pipewire-alsa; then
+ dodir /etc/alsa/conf.d
+
+ # Install pipewire conf loader hook
+ insinto /usr/share/alsa/alsa.conf.d
+ doins "${FILESDIR}"/99-pipewire-default-hook.conf
+ eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+ # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+ # And the current dosym8 -r implementation is likely affected by the same issue, too.
+ dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+ dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+ fi
+
+ if ! use systemd; then
+ insinto /etc/xdg/autostart
+ newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+ exeinto /usr/bin
+ newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+ eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+ fi
+}
+
+pkg_postinst() {
+ use udev && udev_reload
+
+ elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+ elog "using PipeWire. Do it either manually or add yourself"
+ elog "to the 'audio' group:"
+ elog
+ elog " usermod -aG audio <youruser>"
+ elog
+
+ if ! use jack-sdk; then
+ elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+ elog "alternative libraries have been installed to a non-default location."
+ elog "To use them, put pw-jack <application> before every JACK application."
+ elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+ elog "provider is still needed to compile the JACK applications themselves."
+ elog
+ fi
+
+ if use systemd; then
+ elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+ elog
+ elog " systemctl --user disable pulseaudio.service pulseaudio.socket"
+ elog
+ elog "To use PipeWire, the user units must be manually enabled"
+ elog "by running this command as each user you use for desktop activities:"
+ elog
+ elog " systemctl --user enable pipewire.socket pipewire-pulse.socket"
+ elog
+ elog "A reboot is recommended to avoid interferences from still running"
+ elog "PulseAudio daemon."
+ elog
+ elog "Both new users and those upgrading need to enable WirePlumber"
+ elog "for relevant users:"
+ elog
+ elog " systemctl --user disable pipewire-media-session.service"
+ elog " systemctl --user --force enable wireplumber.service"
+ elog
+ elog "Root user may replace --user with --global to change system default"
+ elog "configuration for all of the above commands."
+ else
+ ewarn "PipeWire daemon startup has been moved to a launcher script!"
+ ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+ ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+ ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+ ewarn
+ ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+ ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+ ewarn "advised that a D-Bus user session is set up before starting the script."
+ ewarn
+ if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
+ elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+ elog "are recommended to edit pulseaudio client configuration files:"
+ elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+ elog "if it exists, and disable autospawning of the original daemon by setting:"
+ elog
+ elog " autospawn = no"
+ elog
+ elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+ elog
+ elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+ elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+ elog "command:"
+ elog
+ elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+ elog
+ fi
+ elog "NOTE:"
+ elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+ elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+ elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+ elog "and just override the sections you want to change."
+ fi
+ elog
+
+ elog "For latest tips and tricks, troubleshooting information and documentation"
+ elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+ elog
+
+ optfeature_header "The following can be installed for optional runtime features:"
+ optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+ if has_version 'net-misc/ofono' ; then
+ ewarn "Native backend has become default. Please disable oFono via:"
+ if systemd_is_booted ; then
+ ewarn "systemctl disable ofono"
+ else
+ ewarn "rc-update delete ofono"
+ fi
+ ewarn
+ fi
+
+ if use system-service; then
+ ewarn
+ ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+ ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+ ewarn "service. This is more than likely NOT what you want. You are strongly"
+ ewarn "advised not to enable this mode and instead stick with systemd user"
+ ewarn "units. The default configuration files will likely not work out of"
+ ewarn "box, and you are on your own with configuration."
+ ewarn
+ fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 93882727fc5..a57b7fea5d5 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
inherit git-r3
else
- SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ if [[ ${PV} == *_p* ]] ; then
+ MY_COMMIT=""
+ SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}"/${PN}-${MY_COMMIT}
+ else
+ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+ fi
+
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DESCRIPTION="Multimedia processing graphs"
HOMEPAGE="https://pipewire.org/"
LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
# Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally
@@ -28,7 +36,10 @@ IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-al
# JACK's sink - doing so is likely to yield no audio, cause a CPU
# cycles consuming loop (and may even cause GUI crashes)!
-REQUIRED_USE="jack-sdk? ( !jack-client )"
+REQUIRED_USE="
+ jack-sdk? ( !jack-client )
+ system-service? ( systemd )
+"
RESTRICT="!test? ( test )"
@@ -49,13 +60,13 @@ RDEPEND="
sys-libs/readline:=
sys-libs/ncurses:=[unicode(+)]
virtual/libintl[${MULTILIB_USEDEP}]
- virtual/libudev[${MULTILIB_USEDEP}]
bluetooth? (
media-libs/fdk-aac
media-libs/libldac
media-libs/libfreeaptx
media-libs/sbc
>=net-wireless/bluez-4.101:=
+ virtual/libusb:1
)
echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? (
@@ -71,20 +82,33 @@ RDEPEND="
!media-sound/jack-audio-connection-kit
!media-sound/jack2
)
+ lv2? ( media-libs/lilv )
pipewire-alsa? (
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
)
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+ ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
+ system-service? (
+ acct-user/pipewire
+ acct-group/pipewire
+ )
+ udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l )
+ X? (
+ media-libs/libcanberra
+ x11-libs/libX11
+ x11-libs/libXfixes
+ )
+ zeroconf? ( net-dns/avahi )
"
DEPEND="${RDEPEND}"
# TODO: Consider use cases where pipewire is not used for driving audio
# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND="media-video/wireplumber"
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
@@ -119,13 +143,24 @@ src_prepare() {
@audio - memlock 256
+ $(use system-service && {
+ echo @pipewire - rtprio 95
+ echo @pipewire - priority -19
+ echo @pipewire - memlock 4194304
+ })
+
# End of ${limitsdfile} from ${P}
EOF
}
multilib_src_configure() {
+ # https://bugs.gentoo.org/838301
+ filter-flags -fno-semantic-interposition
+
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+ $(meson_native_use_feature zeroconf avahi)
$(meson_native_use_feature doc docs)
$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
$(meson_native_enabled man)
@@ -134,7 +169,11 @@ multilib_src_configure() {
$(meson_native_use_feature gstreamer)
$(meson_native_use_feature gstreamer gstreamer-device-provider)
$(meson_native_use_feature systemd)
- -Dsystemd-system-service=disabled # Matches upstream
+
+ $(meson_native_use_feature system-service systemd-system-service)
+ -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+ -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
$(meson_native_use_feature systemd systemd-user-service)
$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-Dspa-plugins=enabled
@@ -149,6 +188,7 @@ multilib_src_configure() {
$(meson_native_use_feature bluetooth bluez5-codec-aac)
$(meson_native_use_feature bluetooth bluez5-codec-aptx)
$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+ $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-Dcontrol=enabled # Matches upstream
-Daudiotestsrc=enabled # Matches upstream
@@ -160,18 +200,25 @@ multilib_src_configure() {
-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-Devl=disabled # Matches upstream
-Dtest=disabled # fakesink and fakesource plugins
+ $(meson_native_use_feature lv2)
$(meson_native_use_feature v4l v4l2)
-Dlibcamera=disabled # libcamera is not in Portage tree
+ $(meson_native_use_feature ssl raop)
-Dvideoconvert=enabled # Matches upstream
-Dvideotestsrc=enabled # Matches upstream
-Dvolume=enabled # Matches upstream
-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
$(meson_native_use_feature extra pw-cat)
- -Dudev=enabled
+ $(meson_feature udev)
-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+ # Just for bell sounds in X11 right now.
+ $(meson_native_use_feature X x11)
+ $(meson_native_use_feature X x11-xfixes)
+ $(meson_native_use_feature X libcanberra)
)
meson_src_configure
@@ -207,6 +254,8 @@ multilib_src_install_all() {
}
pkg_postinst() {
+ use udev && udev_reload
+
elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
elog "using PipeWire. Do it either manually or add yourself"
elog "to the 'audio' group:"
@@ -256,8 +305,9 @@ pkg_postinst() {
ewarn
if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
- elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
- elog "autospawning of the original daemon by setting:"
+ elog "are recommended to edit pulseaudio client configuration files:"
+ elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+ elog "if it exists, and disable autospawning of the original daemon by setting:"
elog
elog " autospawn = no"
elog
@@ -294,4 +344,15 @@ pkg_postinst() {
fi
ewarn
fi
+
+ if use system-service; then
+ ewarn
+ ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+ ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+ ewarn "service. This is more than likely NOT what you want. You are strongly"
+ ewarn "advised not to enable this mode and instead stick with systemd user"
+ ewarn "units. The default configuration files will likely not work out of"
+ ewarn "box, and you are on your own with configuration."
+ ewarn
+ fi
}
diff --git a/media-video/pitivi/files/pitivi-0.999-gst-0.18.patch b/media-video/pitivi/files/pitivi-0.999-gst-0.18.patch
new file mode 100644
index 00000000000..13d375f3a4e
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.999-gst-0.18.patch
@@ -0,0 +1,39 @@
+https://gitlab.gnome.org/GNOME/pitivi/-/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch (rebased)
+https://bugs.gentoo.org/804945
+
+--- a/meson.build
++++ b/meson.build
+@@ -22,7 +22,6 @@ if get_option('build-gst')
+ 'gst-plugins-base:disable_gtkdoc=true',
+ 'gstreamer:disable_gtkdoc=true',
+ ])
+- subproject('gst-transcoder')
+ endif
+
+ gst_dep = dependency('gstreamer-1.0', version : '>= 1.14.2',
+@@ -30,9 +29,6 @@ gst_dep = dependency('gstreamer-1.0', version : '>= 1.14.2',
+ cairo_dep = dependency('cairo')
+ pycairo_dep = dependency('py3cairo')
+
+-gst_transcoder_dep = dependency('gst-transcoder-1.0', version : '>= 1.8.1',
+- fallback : ['gst-transcoder', 'gst_transcoder_dep'])
+-
+ pkgdatadir = join_paths(get_option('datadir'), meson.project_name())
+
+ git = find_program('git', required : false)
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -59,12 +59,7 @@ def setup():
+
+ # Make available the compiled C code.
+ sys.path.append(configure.BUILDDIR)
+- subproject_paths = os.path.join(configure.BUILDDIR, "subprojects", "gst-transcoder")
+-
+- _prepend_env_paths(LD_LIBRARY_PATH=subproject_paths,
+- GST_PLUGIN_PATH=subproject_paths,
+- GI_TYPELIB_PATH=subproject_paths,
+- GST_PRESET_PATH=[os.path.join(pitivi_dir, "data", "videopresets"),
++ _prepend_env_paths(GST_PRESET_PATH=[os.path.join(pitivi_dir, "data", "videopresets"),
+ os.path.join(pitivi_dir, "data", "audiopresets")],
+ GST_ENCODING_TARGET_PATH=[os.path.join(pitivi_dir, "tests", "test-encoding-targets"),
+ os.path.join(pitivi_dir, "data", "encoding-profiles")])
diff --git a/media-video/pitivi/pitivi-0.999-r4.ebuild b/media-video/pitivi/pitivi-0.999-r5.ebuild
index 111b1146a2e..83d852fe982 100644
--- a/media-video/pitivi/pitivi-0.999-r4.ebuild
+++ b/media-video/pitivi/pitivi-0.999-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,10 +32,7 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.10
>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
- || (
- >media-libs/gst-plugins-bad-1.18
- >=media-plugins/gst-transcoder-1.14.1
- )
+ >media-libs/gst-plugins-bad-1.18
"
RDEPEND="${COMMON_DEPEND}
>=dev-libs/glib-2.30.0:2
@@ -92,19 +89,27 @@ PATCHES=(
# Make tests optional, bug #594096
# https://gitlab.gnome.org/GNOME/pitivi/issues/2303
"${FILESDIR}"/${P}-optional-tests.patch
+
+ # Backport upstream commit to allow building w/ newer gst
+ # bug #804945 and bug #830123
+ "${FILESDIR}"/${P}-gst-0.18.patch
)
+src_prepare() {
+ default
+
+ # Drop bundled gst, just in case
+ rm -r "${S}"/subprojects/gst-transcoder || die
+}
+
src_configure() {
local emesonargs=(
-Denable-tests=$(usex test true false)
+ -Dbuild-gst=false
)
meson_src_configure
}
-src_compile() {
- meson_src_compile
-}
-
src_test() {
export PITIVI_TOP_LEVEL_DIR="${S}"
virtx meson_src_test
diff --git a/media-video/popcorntime-bin/Manifest b/media-video/popcorntime-bin/Manifest
new file mode 100644
index 00000000000..e546f11f892
--- /dev/null
+++ b/media-video/popcorntime-bin/Manifest
@@ -0,0 +1,2 @@
+DIST Popcorn-Time-0.4.7-amd64.deb 101720792 BLAKE2B d437bbc67e7520a59ba1b37dcf17e69e860fc47e2b492c7b3d3df4f1fe0fd848af3fed3962668c296509db5aaca168b48669a6765694195378d47e884d028668 SHA512 9d29bc7a541379b248abc7d4ac4711fa3e6ac2e9645f566d5fba24430b30f1b4c55a7a0ae652f2e57b56f547eda6564a8c0696432ac4cdd099828e0fd3ff010d
+DIST Popcorn-Time-0.4.7-i386.deb 104588216 BLAKE2B 83ce8dc4d64b03a3918cafca380904ce60078ee1ba317b09884bf1d32fa46ab5b00383d1c15d5d4b6e040609a996d8a4743ae94220209c47ae4ce9e300bf1ad2 SHA512 60270178d343870707ab6d6247321cc983e19e896e09a05d412189d4c22c449768f01d612029b23f2dc449819066fcc6f5cb176a78e08e57450088b8130fd963
diff --git a/media-video/popcorntime-bin/metadata.xml b/media-video/popcorntime-bin/metadata.xml
new file mode 100644
index 00000000000..070ec4672d4
--- /dev/null
+++ b/media-video/popcorntime-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="github">popcorn-official/popcorn-desktop</remote-id>
+ <bugs-to>https://github.com/popcorn-official/popcorn-desktop/issues</bugs-to>
+ </upstream>
+ <maintainer type="person">
+ <email>andrewammerlaan@gentoo.org</email>
+ <name>Andrew Ammerlaan</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild
new file mode 100644
index 00000000000..6918fce89e4
--- /dev/null
+++ b/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker xdg
+
+DESCRIPTION="BitTorrent client that includes an integrated media player"
+HOMEPAGE="https://github.com/popcorn-official/popcorn-desktop"
+SRC_URI="
+ amd64? ( https://github.com/popcorn-official/popcorn-desktop/releases/download/v${PV}/Popcorn-Time-${PV}-amd64.deb )
+ x86? ( https://github.com/popcorn-official/popcorn-desktop/releases/download/v${PV}/Popcorn-Time-${PV}-i386.deb )
+"
+S="${WORKDIR}"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+ app-accessibility/at-spi2-core:2
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ x11-libs/pango
+"
+
+QA_PREBUILT="opt/Popcorn-Time/*"
+
+src_install() {
+ mv "${S}"/* "${ED}" || die
+ dosym ../Popcorn-Time/Popcorn-Time /opt/bin/popcorntime
+}
diff --git a/media-video/projectx/projectx-0.91.0.10-r3.ebuild b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
index a6df47e09cb..366fdb7843d 100644
--- a/media-video/projectx/projectx-0.91.0.10-r3.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -107,7 +107,7 @@ src_compile() {
eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
cd lib/PORTABLE || die
- emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
+ emake CC="$(tc-getCC)" IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
}
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 0bdf5fd10af..ed17f369d9c 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,3 +1,2 @@
-DIST QMPlay2-src-20.07.04.tar.xz 1552680 BLAKE2B cc53ef842f91312f72e8d347a2d6d2e4239fe9435d0b7ac39e47e9f1f48a9a570ce614dd496512079d3701e1823ab75123b40ad752fdd2348cdb7bc8de425225 SHA512 4a6316f03d1b77bcd6c08de0daefc3f29b4c8c575eae9f901951e2b43f2739904136b9455f567b66fc9a4e4c64fe92584608f1878dd8c30c0352ea9ee1e2e314
-DIST QMPlay2-src-21.03.09.tar.xz 1568600 BLAKE2B da3a185ae2e372b0bad697e4ad7d836647c5b4bb376f0ee3f7e85e387c10b86f1a3fdaf8eb13a2c9a8d3b7d56105e282cc82f22d31043e9e418ee907776f1db2 SHA512 311fe45a9ee237556faeee29633be6161407a31b19fd3bceca5a164e92ff1757824094d20f6b556c0a4beaac07a14179e812faafc5e41ee904cf1ce1827fb138
-DIST QMPlay2-src-21.06.07.tar.xz 1579640 BLAKE2B f687cf19ce8d4a606b5271c2e5789d5194233bd300f29d165354cc8784808a148e02536ea8a593c036cd75d1e40a335177f1b9db33016008bbb2f9516daf7e61 SHA512 41558e2df09a188cef05c2a24393e67ce4d1ef1268ff1bdd1ac97ec666d9f8f849817b0c64e384624403a8f6f60cb985dde188cb3c75afd731e42f776076d282
+DIST QMPlay2-src-21.12.24.tar.xz 1609604 BLAKE2B 0b2e1ddc0a089ee0d8d37d3d14f2273b53b4df078c6f1571a5ed44c1234133c3eb21461287eb12027ccb686d844f28939b8dfe236c11fd6cb5831dc825708301 SHA512 fddd1d28a0c7f8ad7fa8ef02bb1181ee2fe4babfd8b9c026d2b1d518c1cf28528c64d296b0050d7c51b1ae558baf2d04fe808b276816d98e839a85dbc67ac136
+DIST QMPlay2-src-22.03.19.tar.xz 1612136 BLAKE2B 5b5ff6d4b37c3d1c46e28839e078e3f7bfa4d2d9d88f552a574cc6560ee18996dda8649f47973f2af97224e2ebebbffadf3c6f52b8064fc30ff63c72d7f578e2 SHA512 687fa0b8bc7d3b99432419aeeaedc83773dc3b12d8133872f663419db7123e7093895bc8ac5b64f03acefd1c4e5cf916210ebbef6b6494284e15487763f0d571
diff --git a/media-video/qmplay2/qmplay2-20.07.04.ebuild b/media-video/qmplay2/qmplay2-20.07.04.ebuild
deleted file mode 100644
index 264d28c79f2..00000000000
--- a/media-video/qmplay2/qmplay2-20.07.04.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
- SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/QMPlay2-src-${PV}"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
- gme inputs libass modplug notifications opengl portaudio
- pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
- audiofilters? ( || ( alsa portaudio pulseaudio ) )
- extensions? ( dbus )
- shaders? ( vulkan )"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-video/ffmpeg
- || (
- dev-qt/qtgui:5[X(-)]
- dev-qt/qtgui:5[xcb(-)]
- )
- alsa? ( media-libs/alsa-lib )
- cdio? ( dev-libs/libcdio[cddb] )
- dbus? ( dev-qt/qtdbus:5 )
- extensions? (
- dev-qt/qtdeclarative:5
- media-libs/taglib
- )
- gme? ( media-libs/game-music-emu )
- libass? ( media-libs/libass )
- opengl? ( virtual/opengl )
- portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
- sid? ( media-libs/libsidplayfp )
- shaders? ( >=media-libs/shaderc-2020.1 )
- vaapi? (
- >=media-video/ffmpeg-4.1.3[vaapi]
- x11-libs/libva[drm,opengl]
- )
- vdpau? ( media-video/ffmpeg[vdpau] )
- videofilters? ( dev-qt/qtconcurrent:5 )
- vulkan? (
- >=dev-qt/qtgui-5.14.1:5[vulkan]
- >=media-libs/vulkan-loader-1.2.133
- )
- xv? ( x11-libs/libXv )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig"
-
-src_prepare() {
- # disable compress man pages
- sed -r \
- -e 's/if\(GZIP\)/if\(TRUE\)/' \
- -e 's/(install.+QMPlay2\.1)\.gz/\1/' \
- -i src/gui/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # core
- -DUSE_LINK_TIME_OPTIMIZATION=false
- -DUSE_ALSA=$(usex alsa)
- -DUSE_AUDIOCD=$(usex cdio)
- -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
- -DUSE_LIBASS=$(usex libass)
- -DUSE_NOTIFY=$(usex notifications)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_VULKAN=$(usex vulkan)
- -DUSE_GLSLC=$(usex shaders)
- -DUSE_XVIDEO=$(usex xv)
-
- # ffmpeg
- -DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
- -DUSE_FFMPEG_VAAPI=$(usex vaapi)
- -DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
- # chiptune
- -DUSE_CHIPTUNE_GME=$(usex gme)
- -DUSE_CHIPTUNE_SID=$(usex sid)
-
- # modules
- -DUSE_AUDIOFILTERS=$(usex audiofilters)
- -DUSE_CUVID=$(usex cuvid)
- -DUSE_INPUTS=$(usex inputs)
- -DUSE_MODPLUG=$(usex modplug)
- -DUSE_PORTAUDIO=$(usex portaudio)
- -DUSE_PULSEAUDIO=$(usex pulseaudio)
- -DUSE_VIDEOFILTERS=$(usex videofilters)
- -DUSE_VISUALIZATIONS=$(usex visualizations)
-
- # extensions
- -DUSE_EXTENSIONS=$(usex extensions)
- -DUSE_TAGLIB=$(usex extensions)
- -DUSE_LASTFM=$(usex extensions)
- -DUSE_LYRICS=$(usex extensions)
- -DUSE_MEDIABROWSER=$(usex extensions)
- -DUSE_MPRIS2=$(usex extensions)
- )
-
- # find and link vulkan libs permanently
- if use vulkan; then
- mycmakeargs+=( -DQMVK_FIND_VULKAN=true )
- fi
-
- if [[ ${PV} == *9999 ]]; then
- mycmakeargs+=( USE_GIT_VERSION=true )
- else
- mycmakeargs+=( USE_GIT_VERSION=false )
- fi
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-video/qmplay2/qmplay2-21.06.07-r2.ebuild b/media-video/qmplay2/qmplay2-21.12.24.ebuild
index 7af2e7f0fd0..7f6b9471ab0 100644
--- a/media-video/qmplay2/qmplay2-21.06.07-r2.ebuild
+++ b/media-video/qmplay2/qmplay2-21.12.24.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake xdg
@@ -13,16 +13,16 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
else
SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/QMPlay2-src-${PV}"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="LGPL-3"
SLOT="0"
-IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
- gme inputs libass modplug notifications opengl pipewire portaudio
- pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
+IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
+ modplug notifications opengl pipewire portaudio pulseaudio sid shaders
+ +taglib vaapi vdpau videofilters visualizations vulkan xv"
REQUIRED_USE="
audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
@@ -41,10 +41,7 @@ RDEPEND="
)
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
- extensions? (
- dev-qt/qtdeclarative:5
- media-libs/taglib
- )
+ extensions? ( dev-qt/qtdeclarative:5 )
gme? ( media-libs/game-music-emu )
libass? ( media-libs/libass )
opengl? ( virtual/opengl )
@@ -53,6 +50,7 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
+ taglib? ( media-libs/taglib )
vaapi? (
>=media-video/ffmpeg-4.1.3[vaapi]
x11-libs/libva[drm,opengl]
@@ -63,8 +61,8 @@ RDEPEND="
>=dev-qt/qtgui-5.14.1:5[vulkan]
>=media-libs/vulkan-loader-1.2.133
)
- xv? ( x11-libs/libXv )"
-
+ xv? ( x11-libs/libXv )
+"
DEPEND="${RDEPEND}"
BDEPEND="dev-qt/linguist-tools:5"
@@ -82,10 +80,11 @@ src_configure() {
local mycmakeargs=(
# core
-DUSE_LINK_TIME_OPTIMIZATION=false
+ -DUSE_UPDATES=OFF
-DUSE_ALSA=$(usex alsa)
-DUSE_AUDIOCD=$(usex cdio)
- -DUSE_DBUS_SUSPEND=$(usex dbus)
- -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
+ -DUSE_DBUS_SUSPEND=ON
+ -DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-DUSE_LIBASS=$(usex libass)
-DUSE_NOTIFY=$(usex notifications)
-DUSE_OPENGL=$(usex opengl)
@@ -110,18 +109,24 @@ src_configure() {
-DUSE_PIPEWIRE=$(usex pipewire)
-DUSE_PORTAUDIO=$(usex portaudio)
-DUSE_PULSEAUDIO=$(usex pulseaudio)
+ -DUSE_TAGLIB=$(usex taglib)
-DUSE_VIDEOFILTERS=$(usex videofilters)
-DUSE_VISUALIZATIONS=$(usex visualizations)
# extensions
-DUSE_EXTENSIONS=$(usex extensions)
- -DUSE_TAGLIB=$(usex extensions)
- -DUSE_LASTFM=$(usex extensions)
- -DUSE_LYRICS=$(usex extensions)
- -DUSE_MEDIABROWSER=$(usex extensions)
- -DUSE_MPRIS2=$(usex extensions)
)
+ if use extensions; then
+ # Move inside an if, to remove unused option warning
+ mycmakeargs+=(
+ -DUSE_LASTFM=ON
+ -DUSE_LYRICS=ON
+ -DUSE_MEDIABROWSER=ON
+ -DUSE_MPRIS2=ON
+ )
+ fi
+
if [[ ${PV} == *9999 ]]; then
mycmakeargs+=( -DUSE_GIT_VERSION=true )
else
diff --git a/media-video/qmplay2/qmplay2-21.03.09.ebuild b/media-video/qmplay2/qmplay2-22.03.19.ebuild
index b626780caa0..b7b2b595e0e 100644
--- a/media-video/qmplay2/qmplay2-21.03.09.ebuild
+++ b/media-video/qmplay2/qmplay2-22.03.19.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake xdg
@@ -13,24 +13,24 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
else
SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/QMPlay2-src-${PV}"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="LGPL-3"
SLOT="0"
-IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
- gme inputs libass modplug notifications opengl pipewire portaudio
- pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
+IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
+ modplug notifications opengl pipewire portaudio pulseaudio sid shaders
+ +taglib vaapi vdpau videofilters visualizations vulkan xv"
REQUIRED_USE="
audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
- extensions? ( dbus )
shaders? ( vulkan )"
RDEPEND="
dev-qt/qtcore:5
+ dev-qt/qtdbus:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
@@ -41,11 +41,7 @@ RDEPEND="
)
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
- dbus? ( dev-qt/qtdbus:5 )
- extensions? (
- dev-qt/qtdeclarative:5
- media-libs/taglib
- )
+ extensions? ( dev-qt/qtdeclarative:5 )
gme? ( media-libs/game-music-emu )
libass? ( media-libs/libass )
opengl? ( virtual/opengl )
@@ -54,9 +50,10 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
+ taglib? ( media-libs/taglib )
vaapi? (
>=media-video/ffmpeg-4.1.3[vaapi]
- x11-libs/libva[drm,opengl]
+ x11-libs/libva
)
vdpau? ( media-video/ffmpeg[vdpau] )
videofilters? ( dev-qt/qtconcurrent:5 )
@@ -64,12 +61,10 @@ RDEPEND="
>=dev-qt/qtgui-5.14.1:5[vulkan]
>=media-libs/vulkan-loader-1.2.133
)
- xv? ( x11-libs/libXv )"
-
+ xv? ( x11-libs/libXv )
+"
DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig"
+BDEPEND="dev-qt/linguist-tools:5"
src_prepare() {
# disable compress man pages
@@ -85,9 +80,11 @@ src_configure() {
local mycmakeargs=(
# core
-DUSE_LINK_TIME_OPTIMIZATION=false
+ -DUSE_UPDATES=OFF
-DUSE_ALSA=$(usex alsa)
-DUSE_AUDIOCD=$(usex cdio)
- -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
+ -DUSE_DBUS_SUSPEND=ON
+ -DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-DUSE_LIBASS=$(usex libass)
-DUSE_NOTIFY=$(usex notifications)
-DUSE_OPENGL=$(usex opengl)
@@ -112,27 +109,28 @@ src_configure() {
-DUSE_PIPEWIRE=$(usex pipewire)
-DUSE_PORTAUDIO=$(usex portaudio)
-DUSE_PULSEAUDIO=$(usex pulseaudio)
+ -DUSE_TAGLIB=$(usex taglib)
-DUSE_VIDEOFILTERS=$(usex videofilters)
-DUSE_VISUALIZATIONS=$(usex visualizations)
# extensions
-DUSE_EXTENSIONS=$(usex extensions)
- -DUSE_TAGLIB=$(usex extensions)
- -DUSE_LASTFM=$(usex extensions)
- -DUSE_LYRICS=$(usex extensions)
- -DUSE_MEDIABROWSER=$(usex extensions)
- -DUSE_MPRIS2=$(usex extensions)
)
- # find and link vulkan libs permanently
- if use vulkan; then
- mycmakeargs+=( -DQMVK_FIND_VULKAN=true )
+ if use extensions; then
+ # Move inside an if, to remove unused option warning
+ mycmakeargs+=(
+ -DUSE_LASTFM=ON
+ -DUSE_LYRICS=ON
+ -DUSE_MEDIABROWSER=ON
+ -DUSE_MPRIS2=ON
+ )
fi
if [[ ${PV} == *9999 ]]; then
- mycmakeargs+=( USE_GIT_VERSION=true )
+ mycmakeargs+=( -DUSE_GIT_VERSION=true )
else
- mycmakeargs+=( USE_GIT_VERSION=false )
+ mycmakeargs+=( -DUSE_GIT_VERSION=false )
fi
cmake_src_configure
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index d6a9054ddf1..b7b2b595e0e 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake xdg
@@ -13,24 +13,24 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
else
SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/QMPlay2-src-${PV}"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="LGPL-3"
SLOT="0"
-IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
- gme inputs libass modplug notifications opengl pipewire portaudio
- pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
+IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
+ modplug notifications opengl pipewire portaudio pulseaudio sid shaders
+ +taglib vaapi vdpau videofilters visualizations vulkan xv"
REQUIRED_USE="
audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
- extensions? ( dbus )
shaders? ( vulkan )"
RDEPEND="
dev-qt/qtcore:5
+ dev-qt/qtdbus:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
@@ -41,11 +41,7 @@ RDEPEND="
)
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
- dbus? ( dev-qt/qtdbus:5 )
- extensions? (
- dev-qt/qtdeclarative:5
- media-libs/taglib
- )
+ extensions? ( dev-qt/qtdeclarative:5 )
gme? ( media-libs/game-music-emu )
libass? ( media-libs/libass )
opengl? ( virtual/opengl )
@@ -54,9 +50,10 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
+ taglib? ( media-libs/taglib )
vaapi? (
>=media-video/ffmpeg-4.1.3[vaapi]
- x11-libs/libva[drm,opengl]
+ x11-libs/libva
)
vdpau? ( media-video/ffmpeg[vdpau] )
videofilters? ( dev-qt/qtconcurrent:5 )
@@ -64,12 +61,10 @@ RDEPEND="
>=dev-qt/qtgui-5.14.1:5[vulkan]
>=media-libs/vulkan-loader-1.2.133
)
- xv? ( x11-libs/libXv )"
-
+ xv? ( x11-libs/libXv )
+"
DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig"
+BDEPEND="dev-qt/linguist-tools:5"
src_prepare() {
# disable compress man pages
@@ -85,9 +80,11 @@ src_configure() {
local mycmakeargs=(
# core
-DUSE_LINK_TIME_OPTIMIZATION=false
+ -DUSE_UPDATES=OFF
-DUSE_ALSA=$(usex alsa)
-DUSE_AUDIOCD=$(usex cdio)
- -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
+ -DUSE_DBUS_SUSPEND=ON
+ -DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-DUSE_LIBASS=$(usex libass)
-DUSE_NOTIFY=$(usex notifications)
-DUSE_OPENGL=$(usex opengl)
@@ -112,18 +109,24 @@ src_configure() {
-DUSE_PIPEWIRE=$(usex pipewire)
-DUSE_PORTAUDIO=$(usex portaudio)
-DUSE_PULSEAUDIO=$(usex pulseaudio)
+ -DUSE_TAGLIB=$(usex taglib)
-DUSE_VIDEOFILTERS=$(usex videofilters)
-DUSE_VISUALIZATIONS=$(usex visualizations)
# extensions
-DUSE_EXTENSIONS=$(usex extensions)
- -DUSE_TAGLIB=$(usex extensions)
- -DUSE_LASTFM=$(usex extensions)
- -DUSE_LYRICS=$(usex extensions)
- -DUSE_MEDIABROWSER=$(usex extensions)
- -DUSE_MPRIS2=$(usex extensions)
)
+ if use extensions; then
+ # Move inside an if, to remove unused option warning
+ mycmakeargs+=(
+ -DUSE_LASTFM=ON
+ -DUSE_LYRICS=ON
+ -DUSE_MEDIABROWSER=ON
+ -DUSE_MPRIS2=ON
+ )
+ fi
+
if [[ ${PV} == *9999 ]]; then
mycmakeargs+=( -DUSE_GIT_VERSION=true )
else
diff --git a/media-video/rage/Manifest b/media-video/rage/Manifest
new file mode 100644
index 00000000000..b17b5c38aa1
--- /dev/null
+++ b/media-video/rage/Manifest
@@ -0,0 +1 @@
+DIST rage-0.4.0.tar.xz 218656 BLAKE2B 139c8ae48750c72acab5f20fbdef2e9eca6c7c55022c301059aea260e89747a608bf4e3cb97b9a3d3389b0c5fd08d13372b86a504cea53d9be2081bdaf3f13f8 SHA512 c834a4e9b7d89452dcd82e7963b49dd4bb670b495fb0e28b3d9cfad77dec024d1d1787e27d47f8ed9c35a9a824053b2a773747af32f1407064082a4bfd0edc83
diff --git a/media-video/mplayer-sh/metadata.xml b/media-video/rage/metadata.xml
index 2b167a7461d..a1fbf3c0c99 100644
--- a/media-video/mplayer-sh/metadata.xml
+++ b/media-video/rage/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>vdr@gentoo.org</email>
- <name>Gentoo VDR Project</name>
- </maintainer>
+ <maintainer type="person">
+ <email>juippis@gentoo.org</email>
+ <name>Joonas Niilola</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/rage/rage-0.4.0-r1.ebuild b/media-video/rage/rage-0.4.0-r1.ebuild
new file mode 100644
index 00000000000..d4a770f628d
--- /dev/null
+++ b/media-video/rage/rage-0.4.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Video and audio player written using EFL"
+HOMEPAGE="https://www.enlightenment.org/about-rage"
+SRC_URI="https://download.enlightenment.org/rel/apps/rage/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+ >=dev-libs/efl-1.26.1[gstreamer]
+ media-plugins/gst-plugins-meta[ffmpeg]"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "Control your media file support with media-plugins/gst-plugins-meta[*]"
+ elog "and/or media-video/ffmpeg[*]"
+}
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 4ec99919379..73d9cd0c086 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -1,39 +1,61 @@
DIST addr2line-0.14.1.crate 31201 BLAKE2B 52564dd603a9c02694ea41bafc91bf20aaf6837321407d2fdf3e7a0db9f92726c73735fb7d8424295bda9db016d319bd6ab1b3ffcd79df60656a0524006732eb SHA512 f665deccae566ec2754cd43fc1d8fc05db11320af54d0561a612faad769234e8b3b8c0235f90f86027a4db9b7ef2915c86398005c949e2c096fac8e53f3f441e
+DIST addr2line-0.17.0.crate 32260 BLAKE2B 23c3715820a04260460a41695d535da3565f76519b7313d0ed684352b339de2ea668c44fe8ca58fc1a5b9f84cc5e9d04d889440abb5985bdc04b267dbdad9d9c SHA512 ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
+DIST anyhow-1.0.52.crate 44224 BLAKE2B 79d68d3390d27e0e27f9db784ad10b5d7845dec7949fbc722f944ef3988419acd72c509b44a4544e99bea5e57407da5b1ce40a96277d307fc408c958ea915c31 SHA512 b87e0b304daff85894c34060b97379d8e3d9be03078275313035c7142c76b3e59922b25924ac98a0b1b70fc98746eb174ca4b7ef33a26e115f294c1f1200aa6a
DIST aom-sys-0.2.2.crate 3134 BLAKE2B 07b0ae83708bcbdee36df9d67657f8c178a2d6f360e1b7fa83104a44d5b035a3905ad7a6bb930eacae8c67bd1faf4068ba5cc578bfd7967c2705ad38dacb51ea SHA512 972ba26950eddb495e9d1335bd46fe91426e2d981906a1d2530ab12cf3845bbc023d47214f382f7515c9bf9a70f3da7f8f33c103752a475723d6817cd988920b
+DIST aom-sys-0.3.0.crate 3064 BLAKE2B 210de17df81b78af866336bc4f3c00803d0c62a503809b288883fcf8bcfab6262b2bec35ab9fc8d8d4ec31d38665ca74069bf5f866daa8a2ab3f04c16ecc91de SHA512 9bb02069b5951dce34a445427f3c49c9995464213104786f0a800f7cb6629e5f6cfb5c4d736dce7963d1bdddee2cc8caf3cfa9df801d5a9cea93397aaf38b53f
DIST arbitrary-0.4.7.crate 26282 BLAKE2B 1a304154926c9f24a80eced744f13379814377f067f8340672c2588edad22b26088b359b304c1c22f068bf6c7a1da09715caefa28eab046fe79085e67ecb259e SHA512 17968466d1403903a8cb5ec7f8af403e2ecbbbd8beed3df41035c34af1c19bc9d57596e1751f3aaf4c6021fe8fc7e23a7f0c1bbd1a5942d94f9dcafd0b19c1a6
DIST arg_enum_proc_macro-0.3.1.crate 4687 BLAKE2B a35b8077b49836f9f8eb310b81052414cc5c9a35c7658e2cb1262a067dd2e0319bd88a3e5dc9837942a4ac40ea622ea47816b2932d8fa6b5935d0e7add3fb769 SHA512 b4c4472393ca6ee00e5859478caefa011f0fa51acd9072457d02c0dc7a9afbf18871ff1135bfe0ac9a26b8a2c419dfdeb878f2a2cab87f8714101f1a59ea1963
+DIST arg_enum_proc_macro-0.3.2.crate 5367 BLAKE2B 18a1f8525cde149f459512913f962a2a4f76d1ca0c7733f0569d9a6293f03ff5624e4b4fcd89a6cca4e355dbad258f4568b32a75113b071a4d4cc43c3a96cd40 SHA512 c9aacb2d28c40731328f4aa2d8136745813ee6a373aef91e0c5844bf2e6a53aa90942e2c2662d3420545f86c6ad52aa9ee25206bb0e499926629ca369512f2eb
DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
+DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
+DIST assert_cmd-2.0.2.crate 29433 BLAKE2B d9f2a97bd81d1423afb6bddbc5fcf6e2cb334502c009368ed623015131d2795d705147e2ad347541a276712b45aa9b95ccb333c52b26aa85dbf58707160f68f5 SHA512 346268f1ff00416eb04ce9307bc6261a05edac4a9c10745f428c6a7c35edc7fa8f6b6c8f7fe66befe5b508e60c2763b8bc8acfcefca4b24a9d3e3e1ea85a9935
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
DIST av-metrics-0.6.2.crate 22396 BLAKE2B 300827869d546f4d093a3e1246cf3b4c67d0c7a483028b7ef1b7e400dec2f55ca31238c0c918b799cd73ae94c8184570c6a31b4b4f3c909bf603da7f83ee09bd SHA512 47aae94ef05302c0ac2bd20dfed97c3ca41db0f63ced9bbac206824bbef017e0abcd39e9805eac268c88adb2bdf6ef3b662a7865e6f3ce311795dba1e84cc996
+DIST av-metrics-0.7.2.crate 22690 BLAKE2B 938a6488d9a50c962540cb0dd7488bb0a1fba5db68a2f9ec68338961c5d31c2448f5b9536463b7e287caf3adc901d9df11bb0af8b64e7c21ae440e0df6f17983 SHA512 b98571f685a0a3eadf28b2e889964b0a7ac2853405e179e7af349d416506beb8fe18b39cb9cd452a2c0167054d2203d2fc7914e6eefab164b5973f67a0ffcd61
DIST backtrace-0.3.56.crate 73377 BLAKE2B ef13597495bc655bb01ffe3d5724ef487d48dce598d9522c737c694ebed1f4c78d8e6bb1b80c817409ec4eb8c99b4835b254ee92a2c2befd1cce2034d0b3567a SHA512 0baf075eb3a964f27306863c19a2961121b52758b58d12ec7dfb508fbae2f3136e8be21d2d9f63ca5b54d4e9db78d9cdbe65fa27b31c42b65c182ccd79a0d7e6
+DIST backtrace-0.3.63.crate 74280 BLAKE2B 825fcabaddb436d33e179630301657d212c9364b323bfe72e8ed8edda5c0c34abe36142b0bc34501d1885d40d55ab53c0f8bc6387e35ef86f14a9d010c426bf5 SHA512 25cf411ee21c796f39a45e6320374b38f62580ca853e560b3a8ec596f0ca6d60b94539662b1a8a3a3046f481b8b84a5b84983e1d2624aea297090382eb99b25a
DIST bindgen-0.56.0.crate 198300 BLAKE2B 96a4434f5cd0dc474a344e58944acf6dea915cfe27adede48bba10c9c542e5c4748f5ab90a0cbdb6901495f985f9112383e40021e60703695b5ff3afb29fd05d SHA512 e7bc3700d3db533380b40874d258d9c3132a85bb704929922f203619dc7e62d0778d92cc23e9409a3c098095e0a29d995b9feb1409a57a402f6059d094a109fb
+DIST bindgen-0.58.1.crate 201394 BLAKE2B d82f0f35d946eda77029c838660f66b1fcfc95b7369eb7207cdd988e505a489a854591d629211787f47d7cc585a824e66cbbde094563bb54713928b611ac2cc8 SHA512 53a05692d5e76f6b70a057abb9b3f7a5b24076ba69eb4d1477e7daef629c4d50198baceb02234b60c57a598446de16f6558b2dcd535a6e403c6379eb5d7801d1
DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
DIST bitstream-io-1.0.0.crate 27035 BLAKE2B 6775b22bec5d54467f83f58b6421bc247338c7a862fe5edf920f805cc2ac6a047a314ea0c6eca13cc6c97eaee7f0aa5f816704bad764e572f2db9901b6f72f78 SHA512 c1741d748e3c65d790037fef2b025db4ac1fb0a9fb3ef152d09e96d7067eff077fd74a406d5b2569f404d49b0e0fe02f2b85af8f283a36627b85007428f6fa90
+DIST bitstream-io-1.2.0.crate 27108 BLAKE2B 1e22302fa66f9afb8f45abbc319af67fdafdd33b6072b92bf7cf35b3e96750c515285f4d364d5f5160913aca3685d9f48d1a25180f56c9098d935672614ac2b5 SHA512 04c44cde341aadc2acbc38533797039c94b7c46d2c762b7824f4d1ac46518a3812ac8fe6c2853d4b5af163aba61e54b7434212d9444a46936383e72f98e32072
DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
+DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
+DIST bumpalo-3.8.0.crate 79835 BLAKE2B 3937c4ca9d7c5e2ffee229c8f5503c6a59f2fabfa3b7c81fefbf5df816efc5f601aaca4b606a62e647262acafa34146aa0906eedc09368e16eb76b3c6722e8e1 SHA512 c9825e7638bd54f97877adee8ac8f6a2cee308050c3f446f9da3996688ec3d779cb6eb935a440329794fb534958a6e89749b44a9bb27dfd219a963f64a6bcac1
DIST bytemuck-1.5.1.crate 24562 BLAKE2B 25221f8a42f7b43fcaf94351fd1c42c3640ebcec254a73d0083c5880774db63e74b831b67092e20c9d80dd04c7d6af0ff28b2c1b2a53bfda465453e8d79dea8d SHA512 23aa2ce347d8cd031e341acbdd4d3f4e0d950afe3b215e0c61d2a313a62f139710333f0fcec9510a3007e31d50c5bdbd765d52ce33713b594476de456babeb31
+DIST bytemuck-1.7.3.crate 27879 BLAKE2B b231e200fa8925f71e457a6ae3a6677366cf6a5b1a6c19845b6973f385fdaaa86b6a3d4e8b38356dbc824cde70e8f1120008d21a3d77d06575fd036b0bf20678 SHA512 03569cb6b6532ff62f406f8f6c80ea5cc3a4fc36ebe28f5a4bab32000862192eed2d26163062c62c0749d2f96ebed6968ce76d2e95a6430d9147c3648aff1f64
DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
DIST cargo-0.51.0.crate 1348742 BLAKE2B 13568c915970e7accbe41f792c3bb0ae0f2d305d4bd6c393655b06a475cc6dc35542977e950c81606af932d875b7310a679f0024daffad525c041c30581ba966 SHA512 81026a3fc8f24e4e71fa8d6d39417d497e313382eb0e8f99397ee57fa199dfb8215bda529e77f3579146e29bb79e44a5255a75a8e3a3f4072745bbaafb6521fb
DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
+DIST cast-0.2.7.crate 11222 BLAKE2B 8a09b6493d68b08539b38fef39ac3abae829c8b899d5243bda3c3d8acada44f4c57416e3247c82a9a4b82180d7f96c96f048b8cdbf21a8fc184ca6957b237ad9 SHA512 24d204acf21366e088f721714c48bb6431895882263ef3a08f6644abbca5c06f430729fa8bbb4c9f37c95a6baa1b824d3fad95c5f0889e92587490d51bebb4d6
DIST cbindgen-0.18.0.crate 180380 BLAKE2B f12f95a3e7c9af2ad933e7cf51248eaf5a30816f8aa5a160b8e7decffffc9fadf90a9bb832690be51639209470e4644154525b6cd6e51dc0a03dbea53a7e0595 SHA512 5d09c5720f5157239228f8570b18c33057cfd7e68f453d9e31bd5eb69541e21a348bbe9116c3387a00425803c6ae8eab9b2b97359fb275f5a7fb982974008909
DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
+DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
+DIST cfg-expr-0.7.4.crate 34162 BLAKE2B 24314b3e3ae62be22ecbb147272fc2dafec5e7978c98b7dfbd4865387a8219e0b2168aaba42ed0d22b584f7087e46af1d96a9c3a9cb0a4a1c45855f617e9c129 SHA512 13b52f443ea10f28a475aa6c3077a8a97743935d44dfe6567ee044893bbab696af9f95fedc9b89582f388e2eaacc2cb0786ca62d2202973ade9270082ae0f9b7
DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
DIST clang-sys-1.1.1.crate 36567 BLAKE2B f2bb14b5e984e0aba35e381bcfbdb365b28aefe9e3a06286aafaae302b9e409c037432fb5434f12478f64bf1bd30d4ae278c6c336b4596b0d26c705e5cc8284e SHA512 cf6745d021a779d49fe7271b1c940fb2c69d80d06afc4a6548a736c819f16f82875bd94f946a189c67453b346bcf73f360af846b30619189fcde82ed04fe964e
+DIST clang-sys-1.3.0.crate 37713 BLAKE2B ca7ee0771a970ed67b02d55d9027bab061c52d624540894cd00d09d847f6f35c58e76a1a6153309f8af709474df64b46f4764c2036883a688ffb8154d77ed123 SHA512 80c78c53a877cd8208730885214c135dd65a208cfd047dba7595283bbeec266f4d39cd1e0b3c2c69a474569ba68e4db93636e31a77c350d7bb2337e06ee7cb74
DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d
+DIST cmake-0.1.46.crate 15119 BLAKE2B 0889436835c16bc47cdc671615f421a50acf6c34a3ba3b6b8b4289e11bf1b803abd15d88a65ae9c1588586151f467524517e9c60d5dcc820e41ff21711f3a536 SHA512 e2749309055c85baa242cef8d0f4a91eb7e694664c5e42339df8ccc6644d1563337b835d3d931f5a0a75351efd299a21fe6eea497941802ea041916d665c7311
DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
@@ -43,28 +65,42 @@ DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549
DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
DIST crates-io-0.31.1.crate 8943 BLAKE2B ea8b4ea737ef07b27861555b8940722798306fc8c8adb908f81158f16309eca2a88db2ce6ce4a4d814d7a11f1625f2f9a13500ebe2dccb2cef1d435161baf5ad SHA512 2b04cf7ca5a79c31f25877c5d28d70d958a9bf31f5a057568272ffabdfc8131dd4fb5c76cc06700ff74fd8877b8a0096ec0a72b38a7db0054e75dcd6f2b45e74
DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
+DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
DIST criterion-0.3.4.crate 111110 BLAKE2B 1a27f32745dfedcddd1b41f1d9fa2096cecb11d90c4126bc0d7a52a14c4b97d99204a7156e55c2ca5e525d4b648a82f3126f5d2b6c3d97ce424d1d7fde9656ae SHA512 e54f73d39e54f74758710d14c970ab928b86595b2ecc3759c218e4a57a2d618f8d425049763669de6ac48ff97dda72eecbce2e48b731cf0c11a240cc20e9fb86
+DIST criterion-0.3.5.crate 110662 BLAKE2B deac65befe648cabfca827b8c37a57a0c48ba1edf34b6e32799117dba9147eceee91b652244b2eb5523c88d8521ae3800d05fbec13b3b3548eabdb13a56f2763 SHA512 ad5d0cf9270c3be5d76c87ada41198d0fbdcdd9831f092ae7179b57e16df153d2aebc0bb70ad7b6fc98966240a902ed5f6fc7adf044be0420bbaa95b951e5be1
DIST criterion-plot-0.4.3.crate 17226 BLAKE2B cf896d08a208e9e317aa7b9095086660e57e5d8e6552b3615b027847e64fd4cf135d361bca7ee45fbe55163739285907320e9a39fbd28506fcb2ba56e091497c SHA512 69620d5b215757ddd818606d1a979c411de803032391be3b56e1c1ff73fbea992ae5e6c14cd78b519eeab806a34320468b44adb04fd1c67076163658f03d2844
+DIST criterion-plot-0.4.4.crate 22546 BLAKE2B ab1326f804cbfbedcb415baadfee2d11b4a67544856fd94dae0f3f3a9bfe46550d23a29a0c8a3a84da6e18565dfb330580aaddfd69a42284499a36b2ae596fef SHA512 4f8fdfdf4ed5e1c410b8e133b36bf9add3d86d56bb23d75d37d92b1095b81850915209c7e4d19fd6aec7cf1b1270a9b968b8e37adc491cfc76b6df71c4619943
DIST crossbeam-0.8.0.crate 10993 BLAKE2B 9758a7ed1373f10da09c07875842a1fbb549dd20add43c50918276574fa57b5c5b51d15593e6611b34ff2472e51770fd965fc0810d0bf18f7740467d866c5669 SHA512 8846d29074f5e2a601e1bb741db9396b16270689f108e0b1621d29d15e774898e5f8d159e9af990fbba2cb414a13948a6236254353d4c594c38bf9cbfd2032d7
+DIST crossbeam-0.8.1.crate 10429 BLAKE2B 4f915d623533a226370eeceefa5c196438b1b332a8b5eb6223853e416385ac4e1a207bf1989646478b219f7a68c8ca0656a808e87db58361f1d77a5554cc2a76 SHA512 564f5623d1a4da7b0253f14946f2e71d14ac9195d80ab3b0ad8e2ba6fc7229745c8c70c2899852d48fc93cef009109d7d7cf2dc9c875273cb8ce9223b92b0beb
DIST crossbeam-channel-0.5.0.crate 86811 BLAKE2B 9af4384f2b74d202971f1967887cfd0e71ddba9a6456ffbdfc80bf192d527f61242239d2eb6a0d9dcbe47be22eb414736976e6b1840c021610d96a3bf03c3d18 SHA512 838b433d48b84f1fea020a1d1324e366e6cdae30ef07396140f195afc45b8f705de6347d949b68ce1ed0708fe533ffaa2cfdedc9d2e6288a7325c188ccde9aa2
+DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
+DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
DIST crossbeam-epoch-0.9.3.crate 42766 BLAKE2B a9f458d912dc247bbc8d2172792e06992ae4b51f588a7cb5a4851c6d7021b428c8225ccf07f0e4597e3e9585cf7b860781c1829d6269826893da3cddc2a753a3 SHA512 f68e1957018f7b88440492403b6812403312b7252e0e873715a2a970a4c9d2647174a19853d1533451ff1f568ac7df2deaa614f342d695c613053b1a3d5d1ef1
+DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
DIST crossbeam-queue-0.3.1.crate 14787 BLAKE2B 136cf26e3a932a4c8035c50b8d6f905f59d3116a8bfaaeb5511e48e7225d05857722240e169d8efe3aab07c370923a57178f058f05c83cee9c1992d03f907f1e SHA512 f666d14ffe4be603ada67ac1fd28526bd2517c32856dc077e5bfe512fa012c08f197e206afb2547b9b5a52ecfb1231a9bffb5b9d24cc4e58aee37ebb87b54d6f
+DIST crossbeam-queue-0.3.2.crate 14993 BLAKE2B b22d68d0bebcee8eeb53fe431f54ae2193a837a0ce8dfe7a49c3c1a42c2de895dea1ef1d71b0909abf9e89442efb14c8fde932553ba13dff8af9d155d7e6dab7 SHA512 7e67037b7a7f134a50e34728813b85a4a6e062895b9f482fa4ef7b1e1e9cc15c9c2836b9b5dec2a4ec36eee57065dc2f1066937e1ffc5b77fae253f60cf3f05a
DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
+DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
+DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
DIST curl-0.4.35.crate 85012 BLAKE2B 11ab2e14e425caf91c4c42650f68e1ea5fe5edf6759b10e66718ee2c603056facd8dd00da4acb3124669fff3c8af366bad4f163b5477c28be0e9329ca188e7a8 SHA512 255f4f8d7ed2c0a4f4f9b32b3cbd6e9f20f299bf5379e084d884107836b108f4df31b3f8ef5ad3731e7209ee5eca63568b6d3b68a0e7cdf24d83d36b80bc23b4
DIST curl-sys-0.4.41+curl-7.75.0.crate 2907738 BLAKE2B f165531da074c856e8cb6725f55b1d00f6dcabf2756dab59c35fefe193b25aeb11dadcfb7f7a5bfc986d8983ffb360637ca76cc937b8559f5da6c15a019d7244 SHA512 34bd579b80135d72c50edcedeab88b00dfd7a5aed62f4eee59ce3fbbeac43553bdeb87d5cdb513bb8c6c064a64552443fad7c02501a44b840ad35bcf22cd4179
DIST dav1d-sys-0.3.3.crate 2816 BLAKE2B c6824ee66c2a199839e56ba6f5d2ea2d5c2f7cbd2e82fc9f423127285bf99ea1473945088658846b27d2d355c87079a46a115306ac4a9d0c7d5f9b7c1a12f3ae SHA512 d29262bc5124c469d758dfc2d477273fc499082528daace2f1a5e74865e78f1540b5c09af0c3518918cfd643cd343bd6990c8d132457c5056c903af17bb08dba
+DIST dav1d-sys-0.3.4.crate 2748 BLAKE2B 64cb5dc703ca302e2348af9d81951c91dcbb52128ea1b2792e538044fd2e1007baeaab1d27b54982afbb3255b7dfc0c1cf94932e88a0f509542d035e20b8fc75 SHA512 950c1a2e4ab0072321b2e55ec3c7494e0b67bf86721563a8d3ab4ae51dd23b308552cf98cb5e293c4ef4633bade2b02412541dfc2b526352ffd0761ff56ca4fd
DIST dcv-color-primitives-0.1.16.crate 69927 BLAKE2B 7ab85222d4b4fa0a3395bb45be191a3135f9f66db13b980c1db2a3f03679173ca0fe1bb19510978f2db5a9e9b97d8fc66d72a2bb2668158ed0748d666f8e3c16 SHA512 991bde0cab882ebebfc599388dc6d508a6a53825ab484beb76259af15c6e7c49320bd4c0d3857b1cab965c420be968d7e284859ad58bfb8eb6c5d9b27ee13652
DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
+DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
DIST env_logger-0.8.3.crate 32543 BLAKE2B 513790f39c63eb096b0fb62687c74262b42b0edc3e6fc2e2f2fdd44463eb4cfbf67560136ec206e252afa1477fabf66917f4fc0e8192e040670f98f3d7c4bb51 SHA512 7f6c3c79b8f4efb8d1d4e4b879c1c78a427f15669244ce1eca869aea9bcad950ffa5b59f3f8e4513e085c2daf1f5857313b374e238fc78b731bba2646ec895ff
+DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049
DIST fern-0.6.0.crate 299856 BLAKE2B e7adf3beaa2f5fc029acc8d87411c5ef8d3288100b5521d0c1379db6868bcaae73e197f456509bf29f52429ec72bc6e5ef297e971ce9cf6d7cc6232b5d9813fd SHA512 d0524c272cba970b5193d845d4e84698d64bc28c75b38dd2f265f1a132e1c9ea177ebdc38741614f6a6f3d106c7c50565b8562378a50d59ed093e00aee8ca382
DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
@@ -74,15 +110,20 @@ DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672
DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
DIST fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
DIST gimli-0.23.0.crate 702175 BLAKE2B 9acdb3afc092e43b25a11639407eba7258d25e6dd57c1f1aa18d17ac7c2ad73b422f85d850947498deb3ad8c1b8001077f9b636f7c1c11a4215b957c990483f7 SHA512 b5dce7b563ce7b8dd6cfec5258793323d370f217779d0d57265bbbe2b1eb2704dbf0f25c189ae6e9079989b6ac7d5341e10fe49457577e482a3904c745c89b5a
+DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
DIST git2-curl-0.14.1.crate 9336 BLAKE2B ac2338bcc95315dfbc1528e29fbe7e16a4442b2e2aa94350b0f7e8a5d643db60f901d99ac5689c1b242335eee78194449c64d3e7082a2f164b6b80fcf3100134 SHA512 bd1f074631f902c1affd167db0cbff329aa07b2a46758af97c71dfbb5308a82562efa2c42e21c5be63d7c93bc1052d688beb71cfe1588a4c2e9705679cec5a1c
DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
DIST half-1.7.1.crate 36168 BLAKE2B 632fefc24ad4b44c64ef6d3da745392ac016580baa5ba898c45bf41598ebb9ea86bb11c041b8813df73aaa755e323cc762b9e95b834aff7118d0d77e1834e7d5 SHA512 cd678b9277fd909083b67eb86c1fe92f464c92e1932246c6793dd835069aac5af6b9dc16bfbdcfbcdd75d3a641bc1f2240effd83dff6068a41b6c54d3739f73e
+DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
@@ -94,29 +135,40 @@ DIST image-0.23.14.crate 226804 BLAKE2B 0debec9484b54cb56eedbf07c246b80afc6de99b
DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
DIST interpolate_name-0.2.3.crate 4165 BLAKE2B 4399a4330a833c45918b94c78a269e9166a616714faec00998a69484e3fcb8cef20b2a0fc266fa6dea5abda2830e0f9bc958f51497b249c01e1f60373e198a59 SHA512 964944384c39d0c085c05a7643ed2e8a25e224e6b28fd9da9d971567b4d56e7c4887a61e107c718cd95c19c6d83f355256d1130206491f7b286a68899eb7b894
DIST itertools-0.10.0.crate 109656 BLAKE2B 73b65db4a9f02cd6940a81966ff433c5d9d82bda15b2250907728b2305451e2914e0211ed16e9755585d6a4ea67c3f2b1a5b1ca589afb60f20f23d1c1d31da7a SHA512 ecc194ded512a0979c4429c0395125e1d3968c61f673546b755c0a8bf2fa5a604690baf77e95dbb91dc26a3004b50a856a8aee0dae0e4c1bd83073e5e7cacefd
+DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
+DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
+DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
DIST js-sys-0.3.50.crate 67123 BLAKE2B e31d81932e8c219524aca9159013e3e7e24519f154e6789b9b5e23de7da0b89e7ec5bf3f949a28a87a0a9671831d619aff1b84ed0b2011ddb01668b110c4d9b7 SHA512 961f1e2949ae8e662aac866807b2522537ed8756caaeaeca2be837329d6b684dd928aca1a7da9dbc402388625c54177dbc6b8141a1efa4087c78a3240d002d87
+DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
+DIST lab-0.11.0.crate 15140 BLAKE2B 28763aba9809eaf8ee5d90438ed973fbcde5861d78f51757a23840e5c1823ac30e53cfdcd88c6a8f0cc44c6b0d9ea7e8e50192f40c290c8ef1e93c9c58b35a7b SHA512 bb56ba0af097c5822f6e9ad51f0e4202ddd740953336f9da79af072feb0b40fcb18863f17df4ea8a076e5af719144037303b0fff4fcc0e5c37a018129a08fa91
DIST lab-0.8.2.crate 13245 BLAKE2B c8e8c42301205355a29ff165bd52a3a6425bd3ff4b4171d51547875fb99d8569816cebab8e883e84ff5a3dc0e0a3e2732f8c00baf672004343e1042f31f05b8e SHA512 a08f0fb5daa02a24ea2fdacf818a9def23793f6ba614d971ade84e05381631ded6d2d7bf7e57e7fdc0d27bf27180a28862551929874101bd8afbcc0ffe620d6c
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
+DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
DIST libc-0.2.92.crate 522480 BLAKE2B 4390c54531fc908b8d8e200fe271cd8536660b907dab3da07056b650f13fab0dda83969518438eac7ee75761bc1913ffd056a7cf98b58ab31d4ef98676193220 SHA512 bee1495a75cce8d117d5a565dcd9e2050b9b308aeef40dffe5b970cec4a0840eef07e8d65a64558cb75494a77a6b0023923ee451b29288e02573b54121fc7b34
DIST libfuzzer-sys-0.3.5.crate 112480 BLAKE2B 0c566e9f8187e51708b8df88333a9ad92f80e62be22c6dcede44729c87a245f41ad254dd4bcbb76f5f6be3c7c426770b0800e82ad6e4b1e5b598e54ac033ee9e SHA512 d07c49351ff8bdb1cfc62f60cbf9147213bfd524e26dc50ca17f2374868a05581c432822c396222fbb9c72098fe47a57d97423f4b40fc2e7577801b829a8e796
DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
+DIST libloading-0.7.2.crate 27229 BLAKE2B f85ba948aa88e7e3e32984e4a74e34efc01d3c35354ea30bc3d8f0a873094eff8d0c30b8583fbbb57e6afec8d505d4b53c8f2b7bf879921c986d5908ec6354ec SHA512 235ecd8750baef122f3f6ce673e4feae621d806851e842f33f95e8a414915776c33c11e6253da449faa12855f5e444f691c591cbe66efffcbe221d6ca2d32a67
DIST libnghttp2-sys-0.1.6+1.43.0.crate 4458350 BLAKE2B 90357f647b7ffbd1bb5debaf22f57de48da392bf6ae64a5a7fe02fdc0c791c945f918432c21c97fdec75a6aa16fbd3c7ad6619e42e04462bb58fca906984c551 SHA512 d64cef5933c01cc4243f8cd9b9b00224d1d89b00d21202ce2e0baab0491357b7bd23a5310443bddf9b2ecf3309747080aff4eaf5bf7a0e81c9ae1482a3c64cee
DIST libssh2-sys-0.2.21.crate 482836 BLAKE2B d92ef8081bd1ffceabf1be840b20722de647b50a0b95832d544afd7f1930dd51620622a9bf3031b37db9b0a1da4a925050bde16c916a8a71b3e79c73f125ea1a SHA512 654dc947e32070cd03fc8e9bc6046e28c9cc401bbc4c914319102a2c7ace7f319dbf0414a51d9812a09c9a88f7fba6b9203286fdc383d0e75f86b6a87fc78faf
DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
DIST memoffset-0.6.3.crate 7697 BLAKE2B aae9b5dedf06680bc597825653c08bcfaef6429a8367c8dbb58df7f09e91b166d04a231f28856af592590eda0e255a947294e0b8064d7651f490e44e4d1e748a SHA512 5afd2f9a282e9bbc60da1abbf911a3b4480ab975c04c565149dca8a36e9975b3262023b73c67d9dcf80b2eba3e8540aa2b91466d37a2504facb3f1eae98f52bd
+DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
DIST miniz_oxide-0.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e
DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
DIST nasm-rs-0.2.0.crate 9522 BLAKE2B f4a6266e83a5b17116eed0776003894b42d71edfb0a2a4d5ce39e8695f001233ba2ad12f59b0a564813680aae085c2366304fd16b9a127236b11b8eab6c61ffa SHA512 fcaa05cc8ec2128f25caa44772ec56a971cf9e63f3525a21d10bf2d54bb3d30e729a90f4d812e451318726c743045da24c9f31a80e218c807ef44271fa32cc2a
+DIST nasm-rs-0.2.2.crate 9733 BLAKE2B 60574883ef3215444cc3245e0b789f4f8e87813207720f0abae3b5311ce4426d3ad2629bdbf906d400ab785bac77d4736f055a4a614324481b700d9d850a5494 SHA512 83c6953e7651325b30f58a63a1cff203656dc0facd57b2f6285999e5f77e95706c9e16b2927b237ad6a67bca29253632955b9b49bd6f0600cde2ff03107b1fd7
DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
DIST noop_proc_macro-0.3.0.crate 2157 BLAKE2B 0be977f9820fe4cab4035e866d6ebc77a07cf634ee6889dc91581a9eb43f308b0fc60b87c8bcf200742bcea4af14a94c69c5b9dfbb32b95454219a4197fd5228 SHA512 a5ad22e815b8c574b42f7b70486a3fac319c24334ade74726ec07b976a838954d1de2d3632fc55ce6c8de2673e62b987fb4607a49c576f60959b1609e47b3771
DIST num-derive-0.3.3.crate 14545 BLAKE2B 3af73d35ced61f8e4fa2f2bef695f72a3cf1f1a67c77982d3518d9383331f34c1222dd7d72802cec22baa108ae08a87805a11942132c565ab8439c4983e99871 SHA512 e0f4d06fff26c2d2b140ff5ec1ba655a46c8d8fda484f03a8ad4910e8cf1392f0130d5c0bfbbe3bfb95da1f93e964f73364de6551fddd81e6fc27bfa35c15053
@@ -125,7 +177,9 @@ DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092b
DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
DIST object-0.23.0.crate 203889 BLAKE2B 41dd20ad5b43b026d032b50360bcb1efff7aab471342da1ab787d820722f4374fef8df48eae722016893618f0e1af3014e42c56a57ea8792594b5fee676a4d6b SHA512 6352624a9071bef53e4b7209b3f8cd5168d54174962565d76f8eb9201dc84dc3b26f08c81ac954bc9d4c55032a022abb35d160817bb434ef27f76949290bc7ef
+DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
@@ -135,49 +189,73 @@ DIST openssl-src-111.15.0+1.1.1k.crate 5087962 BLAKE2B 50a7528ca83e30434f14aeddb
DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
+DIST paste-1.0.6.crate 17808 BLAKE2B 8659076678f659ab0bc5d9c626d405f1f545742c79222348ad6d974beeef4541663e166247433c617829e5e65fb7a5b4d00656d95d37bad214bcfb2182d45677 SHA512 cf7795c64ded12c16ed7bc90a29bb36156abc8c424066c62d3eff8831a86b4133965d87b8b76b17ed5487ec286fc80e05fff1180833dee4b48f0429016bea25e
DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
DIST plotters-0.3.0.crate 3242931 BLAKE2B 946c47a0b15d9a0a4c44b1a086bfd366be93b47b13290681b578ebab421e7a8e0d5cdd224de29c325b213d43b11b41f8d6dd26a961dbc98bccf4d3a580dbcaa0 SHA512 c54a833b2184cf0a9e9ac93739dfe06cafbbf381b20fa8601a5d97a25998881d92197afb086d1dc40dceb283aa2bd054151f9a21d38e0eefc817247c8e2c40f6
+DIST plotters-0.3.1.crate 8595577 BLAKE2B 7c500c43c2b2875d9dc17e4eab57cbd8a470c6064deadf4e78c429abe2f1e97511f64bc67782b4e03e7cc47c8ac54aadfa5f7cc8c27d3b4453d2ee8252896c99 SHA512 c7bcdf9da56c2d1c03053f61256d44d2384fac1a9a7e0db058090c13b359bce76a2a96bbcbfde04fdcde0a9dd3db8a1a22bc57508b0b6e4a374c8b35ec6c9707
DIST plotters-backend-0.3.0.crate 13492 BLAKE2B b9963648fd1a95f557bc92781c292ab0917ef373666cba95b0a1d3821253cfe8de19677f65973fddcd96bcd2d37bc817cdd783680dcc26be9556813baf413d29 SHA512 2071a4e249277a25cabf2f39c8fbf68ee5246b853c3f054fa49ff5356492b770419ca7dd7e481465b764fe8a1606491a2ff49a3215c3a5dd7c7b28779c54f3ad
+DIST plotters-backend-0.3.2.crate 13524 BLAKE2B cfd42df0fcea4e5ee944a6b8c48e3b7fcecefd6d97f07e1c333067193c211da9eba29fb56e9fc8b861cfa2d1baa3c042fddb494bb66b9109656b26bde7901f7d SHA512 116bc6866094a2ec40a9ab9363378566ff37eeb4a4e3805562dd3e95f1d5e8664b54d3dc858a2c9974b125e308e46b77c294de2a655f836d342712c32f0242a3
DIST plotters-svg-0.3.0.crate 7488 BLAKE2B 87e22fec00b61737f3ca630fec669b277470455da19de52ea5098bdebc1061c03a15dbe0cb498f321f168d64369493f0d8c4260490a19989b5fe6bcbabb4ad18 SHA512 a706b4db5160d30d1e1e2d718b511a9c3f875947ea989d981e7cf221aab3d7b1c41ceb7704956683f2ad5415e698463c0eceb1e3e60fe1f794ac90f4dd175d82
+DIST plotters-svg-0.3.1.crate 7596 BLAKE2B ac8dffc5dea833c0506c472567056be0804e5519828b68f7b3bec9ee63dd59f9aa828c10732a50e004214512df06c7eaf164eb9613cda75b2753270fa358c0d6 SHA512 4d3cd02534440dc26f5eaa3b4966081901626c61d9fabe0092fed87c48929cb9be070d9c34486fc7c7bef308337ff4890d30f9581a613549e507db60dd9d8876
DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee
DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
+DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
DIST predicates-1.0.7.crate 274733 BLAKE2B 5275012b3759356882fc1256119b52526eb8a39f3670d8e38d10ea96918bdc3bd13fbdfc841c6784aa3dbe8147777048f751886427c1ee8c4380b5084c5a70c5 SHA512 6d72f940714d698f5ff92f16a35e26675d995ea94c82de9bddbd386e7783ce0ed726b21c85bac3dd21e8f8a92cd2d4ee37dafe1cbc42e8e6b30ba13f06858b40
+DIST predicates-2.1.0.crate 23141 BLAKE2B 32dc6455d74e4188385e196f9b9042411c0c1278d12121b4aeaffd58d5adbd201ee4a3e51d908dd59528928f5751f53a125b53e1b15542ed6064c753cd8cfe52 SHA512 824cc99e8e904e5257223bba104cc705fb2e1c93ec6b638cd898dd53fb29217978de1a61c2f11caf1e4a0e076a37efbd09a2998457bcf4af1c2e7eb3c089e0af
DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
+DIST predicates-tree-1.0.4.crate 7682 BLAKE2B 10e32e4d316bd3bb7015a6ef6d8391381d441acdce0b54a7da2ae4f741175dad7bf92c2488809e233da45360388908f200c2a2756f17210641b0e503728cf150 SHA512 f4d4f3d58c13c9b0344832709709a677d0d1f32e80a2c1e7f38a6f214efaabfc2b8e12d4bb4ac8f0c57def9a44cfe94ce9144132cacc2b6f84002a57aeb4ae5e
DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e67515cf8aa528479e14bae9c79193652c435e9513e85b7958016c105ed581fcbae19ceaa742fac6b07374a2e6f7b57a689b2 SHA512 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71
+DIST pretty_assertions-0.7.2.crate 79200 BLAKE2B b7736ce11bbc5d2a778c2525e80993858c5d2a7182123c3f5aa2cde6ffe5621ab8033a91d578f4fba9badc3f503a0f14873d234b41974161f8148f2b27510e12 SHA512 edf898bbb15f4f56d2d7688d90d44d0ee7913b7d78b4774548eb7a88e8f75b0de9635c93b107744a2501839202ecf828004d179c6edf84706ae160186d47d177
DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
+DIST proc-macro2-1.0.34.crate 41072 BLAKE2B 6b507e95802fd8dfca422deace25e328b1e4c5a9515c83ae55f8a34b1c1d34ce427afea7d7a748f582abf903245ed8c2b3f4175d78c8c9dc9f467c9805329d47 SHA512 960036a077c3869386ecb5c2019816adc70e9a9b32ceeacd4b14b39a91dbffe0b21764ead7237ab3aa553b26cb6732bbeccacbaf83c8dca9069b11b9a85dd1f8
+DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554effdde4f5d19dd55d16c1069d7915851f64526d4b4c9ed1cb6e5827572c0c96484f13669ff233baca124377ccbd48b SHA512 e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e
DIST rav1e-0.4.1.tar.gz 4536093 BLAKE2B d1200707783b5ceb13ab6403b4a4e8ac2af9a8d9a4bbd0765946d4752e98e4a5df286adc4883dd9ffbf4a21b0cd3bd486d34d563fcd955edf26f3e58181bbca6 SHA512 d8466c7392cdcd6c6693174cc7148d57a82a8b2328f27b0665a3311e24c9fba136e7f5a35a222004e0554d64005e8b676601e437dcba5365cf69e3b8c61691d8
+DIST rav1e-0.5.1.tar.gz 2697850 BLAKE2B b4c117e28130996970a75132defb619563d2f91c512c9b05f40a70904dfba0e4cb55cdce4f3a9210029e93a9065ccce0bdedc4b01a4452d1c56790ef3175b722 SHA512 54fdc65527e83bed1c57916c48f03b5701cb1c41c3990326130f56c562174a97b571fb58f0f099108ccc00d8c0fd05c8a57be3fc043750dcddf804440ceeff39
DIST rayon-1.5.0.crate 158037 BLAKE2B 6cb7f696e9c04d3aa6c3bf9c95690c2e259267024ac9701da5cd85c7d39b900a7e9e423e5b7602e108587a34c2519642ce1456dfd82fb13328ed3aba7516b569 SHA512 be15cbc7ad0fadb55e5640c78aa2eeac282872be88c5402338caad0a7ea604d2b8477648dcf7e453e22fbcdfefa915aa4bdbfa75e3d4f7a993fd8d85ed68395a
+DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
DIST rayon-core-1.9.0.crate 63787 BLAKE2B bc5f930b1ce8e9fde03c01df7a53eeb3318ae24ac1c6b22e401a0b2359f4b9d6e419fcd41c7db33881c4ec29fbb844a44e2cff747d7dde2133668e733f8b6966 SHA512 d05b4c1e7bcb1c4e9238ab08bde39f08f069a08593084f041720694bae8bd524d1761766beb93e97784d7d541bde3e290446344fe129b0e10491405c1577366f
+DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
DIST rust_hawktracer-0.7.0.crate 4718 BLAKE2B 269902116f53e1f50cfb524bedd4594c9c43d481ae5eebb16dc12f4314024afa16e224fbccc97907429534cfb74e06cc263c69da3ac1cc2f04b49ec4b8b29890 SHA512 62756c6c99a1ff1dd78565a522cebec3a9bed637a157b3d5d7ab91f7ce74d6de809604e8406b7e80807f34a7fa7b72fc9b6df51bcbd41e4fb503425d0b8cbc02
DIST rust_hawktracer_normal_macro-0.4.1.crate 3000 BLAKE2B 9126ff8bd5dd0300e4c6df4311a94c96c1b0ffc23973fdde752593c7072ed687393a5165d5e4a27df28ab56490a0cf4af67556c1829103298963f1210dab7161 SHA512 19d2d10da7728d28baf3c5be0f7a9df7b23e63188d7f6f2acae199d081a06fcc6a78c778d56cbaeeb83dfcc5e0c775f1d608074c95461a17b6a1ff84017129a9
DIST rust_hawktracer_proc_macro-0.4.1.crate 3028 BLAKE2B aa2d70be709d0926a2edc4e29c31fb2bb1412d2e9c2144a604d19a4b903e92c59ed2a9892a2182c859963704ea0d6035304e0621e8f8bb432ca7cb888b1bc4a5 SHA512 f23b23cedbf1992a58e238d03acf75d627a9a4442019597c913e8c23d133511c2501e80a839f61af816efd55d6b9d8a6b045454652dced927e06b480dec53140
DIST rust_hawktracer_sys-0.4.2.crate 319968 BLAKE2B 251fd00f03338cd5287c79a58a5589cc03890b9e044fe679b2ede657816256caab8d7b09765b540b1ff50b0fcc52b9138a63b41e6b6def35ead81168e0c3ca13 SHA512 9a145263b5debed91980151229fbf61583f67b187c904cd9976d8837c0c8b348e53b47e58cd0d34b7a23609ecec8cd40d241f08d0da585931a203915e36bcc24
DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d151efdb8098b0b3fba0ac80f0034c4891c575ba1247b04d1271fbfc8a1585f4a65200ff3836946aecae1cd653c7a1e3 SHA512 93ebaf7630c99b6c83712452aca26a42d9a173aad8ba7e85954f65e7867486519013aae1afb0006a0507fc3d6a4688df783ca091779bc0f316c5b8c4be95b793
+DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
DIST rustc_version-0.3.3.crate 12119 BLAKE2B a8cfe3dcbaf436b74e9798ee1296ea7aa372cfa26788b7a84c9ce7ab3de5c5e00c6962e4310aed9bef8584e3c30298bf1bec1ac23c3b70c6aea32394359712e8 SHA512 37732b3b28eca41de205db34479c75b31af4ddd811f0f1606933eb31e25e5ed3966a41a8b7d338be20fcf47540629824c41a267436c185a98f8acfdce608b5cf
+DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
DIST rustfix-0.5.1.crate 17768 BLAKE2B 6c1e58267fc4b81ba025d33a9bd95ab1832ed651d22d52b8808f52870aec674bffc18ce2d53bce58c4bc36f98f1e049e4c9609eb7e99e407ef78eeb756186837 SHA512 61990f482a5d490154fc55d7c052464e50268c0f752068669afb3c387d27a1e980a052ba29fe0aa301cbe4b17c7374db071a8a38d3562c943e8292605c40b3a4
DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
DIST scan_fmt-0.2.6.crate 9676 BLAKE2B eb314c3e456de46b31d4286016b9194e663f7c3aea0b699a2693d180b2f0fa549448609b845afbbd0053661b5777a8912c2c607ffb26e490f86fd43ee2c2a1ab SHA512 ac24f699aa39d6fb29c309a9716eda9bda7331769114f52ab51f4aa781ecb3c7694ac385c7d60cec9b87e134fa2a5d8f586b54166ee9d58cc4bc34c83943ecc0
DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
@@ -186,36 +264,53 @@ DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017a
DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe174c22d2680ecf5f723354e0ff5253974b07981a6266cd74d373d1993eeb145ce795201bd8e43dd0e15299b SHA512 75e39076a551cd1f4e7c011e79ac762258b7995bb021298cf2fbc7b3bc9e6715ca3c5165429834738f1cfb5ea9fa3daf173ebe1e9e0f04135845c89675c89ad4
DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
+DIST serde-1.0.132.crate 75364 BLAKE2B 7485bcf0ae578f02f7c7dcdb284fcd6d8ccb4022b7d487e19593f3b3c9bd03a369410307dbe5ecde8071ca3ab6c7e45a5ddfe332e43076b84d67444d1f105b7b SHA512 8dac512547074a6934315ebae3e7540ef8baa225cdd58f11416b4565a1335ab317e659901fd626beffd6514c5dc6ec9fc705cc1d15e9cdd2051bd28649cca555
DIST serde_cbor-0.11.1.crate 43947 BLAKE2B 4c1dc444089276b4bfb1b1237eeaefbb6954fa8b613e539fa6eabe01ddda990be50c5e5ce72e5f765835224e9de4fb0fdb26d2fada2b18d6b03f77665e2c41cc SHA512 165192ed999cfdbe162abd3aff92f86f4300ffa9347e57fda2ef3c32c69a18183d468db059d9dd80218bf01de15fec6fde7cf6dbb8cc2a6158785484353f2192
+DIST serde_cbor-0.11.2.crate 44570 BLAKE2B facc8d16886dde89125b7d69e9e77ff586c61993c3493fe4089ff03c53e6c0808c6da45a83337d3be7414dd82f3d6a7f3d43167473e49e586a7e817d47ef3014 SHA512 12ddcbd5de0d85f2da6e078e3ccfdf2115125084d57eb93d7e9b45bca6a86daf79dcc79c8e54260c56240c3b5e814b1481ac28c3aa1d1b4b982ef5956b5cc3cd
DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
+DIST serde_derive-1.0.132.crate 54725 BLAKE2B 10ba0e55a498cfb469f1a36368f66515ab3e331f337b9441b08aba857dd6c824ccb718fdc33ab467413bd755db31370d4eb52039bb28e4a6c0775e2be87db896 SHA512 04f1a738b133de752fd1f4d70ffa35bbc144208bc3495ead56cda8ce65a72c501ea9c8e5e6d088cee94a878bf62509fc9f75dfadb320eb942042ee5ea80dc76a
DIST serde_ignored-0.1.2.crate 12179 BLAKE2B 45b8cab135fac2d7b23443462fe630212ae170207061f968540dd2b86a1f8c1203a185dfaa158f87dc36ceb8f769ea6c57e67c1497f2374444424237b7275af2 SHA512 c6f76051a5397615eea4aa953535ffa227cbdd6747f8f2ed0bf57d0a0b7bfa71536d8372a6cb8eb046b9a761e36f273e019754f607e6c84ae71bce25e25132cd
DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST serde_json-1.0.73.crate 115922 BLAKE2B 5f304d127c3cee17d06cf30ace0fa8c75374293b64751e45938a283a9451e3809ccc0a1cc1b64b33f526585744073b4b35a366a404772fd37856e4fdc128d786 SHA512 0d7bcf06eb2d78f768c4bf54429439a1f6e8b7097fda6e7547b4edee1933a69307ba9b758fabb6ac918cda216c7744a0b906d7a38fd13c51e16e6e25881df748
DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
+DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
+DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
DIST signal-hook-0.3.7.crate 49462 BLAKE2B 9238e39216b0a3e2e44e43c7f55b719da8766a8d113c76be16efa5c17335d2298a30a7da6286876c39cf5ef319d773b58bdb3482ab1fae87430a97964a8406e0 SHA512 80aae49b5c780c1e4db4d1ee038681a7df35bd5902b540af5c48f756dcbd2400477a64fb7e46520f78b4376d89c5f7f8aea95d787e0fab47a2cd57eb9f1d958a
DIST signal-hook-registry-1.3.0.crate 17786 BLAKE2B fbd4284bc1020145b92557a99628b985860bd5020cc870ceb6067933c8e58be11d7bdb3c1f715231ca2f0ec2930487ceb88a82d9b9d1c0a31bfcf4a581a002f4 SHA512 2576d474c490deb6cbd759985f55340bb4e4ae0abac3ee02055bc30fa4008fc96ebf4d96f0a85c634b4f04d57b00243625194b333cf330f59fc82286bbeb30a9
+DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
DIST simd_helpers-0.1.0.crate 1527 BLAKE2B dc556646a3fc94548f1e16e837e94fa2e28b78b650260aa50535a45e92fdcd952bf0eebddfc2fcb9e653871447e9b9db82f3f8c1090fe09442b7916c65ade3e7 SHA512 20577ab7615f955ee3a88c617630fc6c88703d455629d5b3838a551baebbeae8c64a2587871ec5a4fb6bc203945cace50593a238e4765b5fa2313bac30237ca7
DIST sized-chunks-0.6.4.crate 43783 BLAKE2B 38f86301d615deebf1e6aacc7a462ff8997c5aa00eaf7e074b64c28072fd6a9649424c6f464cd804517407b9456971475eda2adcf32791ad58462dcc2ac38c75 SHA512 bf4f2b41dfd2c8f8cab9fa54f85f5ca4d600f0ccfd8d70efedce03eae3905e7c598ea19e5b11b925d2e16fd9eb633b03d9b5f61ef294e47f4b139f336bb6a71d
+DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
DIST strum-0.20.0.crate 5172 BLAKE2B 755be909504b106848079cd975331dafdf24914ebc22e5642d2b0e867a3619eb7424bea818cb3228d17baaafcc6ffe6ded22a5fa802e96e3bd685c7f94391cbc SHA512 4de0497d47ed09931107a7ee8a7b87fc00c38ea578b7c5910df98c71b3df0970b3cf0d629844c0e9a52864d43887cb435c0f419d26a68a23d0211ab0e86d1989
+DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76ff6a89dcfcb28b05353a860fc1b59412933b9c54b9ad424a1366e0b81773e38b04e9a5f9a038b2d1bf082 SHA512 687a99aa93616e16510213b66f53be35561d19cd19f9776084e9d6d33f8576f5eec7a806a0e48997da2b41e6f563a05424c1d5cb5ab2b4a2310cfe1d3b10a5a6
DIST strum_macros-0.20.1.crate 15634 BLAKE2B 61b36751545b80297a8f66391175cedb8bce5a144014eb789101f9adeecdfb85b76b598f9db556b64804158dc8118f3f9bbc49f13a4c99192bf68d40017fa4cd SHA512 c209a690370b50698c7489210dd799bb10e53b3e6fc84db370ca7aa3f205694a8f07071d25a75f37970a650bf1fc047e2e5ea4dc588c2604c980211276a6580a
+DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea
DIST syn-1.0.67.crate 231889 BLAKE2B 28807964411994b126e132c42b1361d55788a641da24773d1f1006373d3c21048f78553682441766b7257e5b4a4a1833954075fd2c4965f949d8465ee57a3ca7 SHA512 06a5f203c7e4c6f6bed489bea7e171cc8f29020401eb32405373a838526c6a5bed47e1310f41636d475358c420b82837bc7c1f90374fa6d0e842dd0224de3552
DIST syn-1.0.68.crate 231887 BLAKE2B 2e2547391fcd7a9854cfb888448eb89cdfd19ac20e9d909782ff11eb5bbd0b00717b3892199c2c88d005b8fda358ed10828a3f5a123a8d6416910d3b78971d5b SHA512 3023baeacb0164db641e809ac46fa48bdb8ff725e6c767764fa23552d53605dcad3d629f9c7a976a01ad7dd423595575d41c338223df5f7b72c417a97793414e
+DIST syn-1.0.83.crate 234750 BLAKE2B bd4162b01c8f2a1a46b60f4b380fbc1d83292c4c5400e9ecf59bf86ea35f6eda1c3e868ded25c86d6dafe973103c89aaca6dcd67a45a5bcfb111508e60e6ea08 SHA512 83bfe34f52bf20dd5c1465840652066ca8d99b10113048e753a323d7f20fa28fa1977156dd6b420a4e34ee3f674aa1c36da4e84cb8175e9c0281f0bb460b7c11
DIST system-deps-2.0.3.crate 17504 BLAKE2B 87a175214b612ce03810378f65ae36bd35f873271de9bc3ad9e29cfabc1f741ca0e4ae719807e12a8bbb172921b75c47726b1ac0676ad2abe761fa217f774dd8 SHA512 9b1c4df589b1f0d0771ca8e10cf94a884a4f615bf2e8ec993e1dfd3f42273b3b188c81e0bdad1637b9ede1e223fe9bba44542058f150379c3c87de24b414bb79
+DIST system-deps-3.1.2.crate 20920 BLAKE2B 4e5c2e208a35c59522dfbdf23b36bbfe1ab2a9e32bf4c7663de55aee4919de934ccbbe2914e4f32ef1e7f6430f24ef84ef8bd2344c2f443a6df6bc5446037d10 SHA512 ed96a370fdb4e57b575987b1a9a6985088bb4d1d59e8162e043504e7028ec1e814e39cd9b8ecd26513e362c7fde98785c2964b206da2acac8989639ef6dcc716
DIST tar-0.4.33.crate 45448 BLAKE2B 380f20835bf04624c87201f54f575ce6f94a2ddcee4e58917777ce069fcc822101994d8b9f1f3a249d25e62d59527001807842e650edc9fbf7cdf55f65615da9 SHA512 69c5932790c2448d6d754a622066564027414ceff5b555c928f55f627c9e5e7c192e0c13f93af48d64d37d4f9f56c0cf8feeb3fe17d3861b277c66bcb8b1d9ec
DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
DIST terminal_size-0.1.16.crate 8755 BLAKE2B 33cfd9a62bdb77bd096563330ee5f07465d69c16659294a9e6ebeccf3d49e17473185fb84c2a4b50d29b084da0633b2ac4bf41801b0bd17f5c927d9bf68fdce7 SHA512 afefb529a80249ec398b444f593b6010b2a85e65e29557373cec72ee18bac5a5359aa2da3cda28d494f34c8eaddfc8a82029fb936d49726261ae0c5557bd5c17
+DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
+DIST termtree-0.2.3.crate 6926 BLAKE2B 390aad5f90602785674fddf6dd5ffe5ddb37b5f2eea7cfd330e04e4b3f482c8ab3bca63fa595ee409a8bed3ffd27684bc6a1227ca679763f94cf5a75ad55ee93 SHA512 183a99ece5ba686e6fc9884c3dc702083a6f7918514a20e3af460195d8f171d9ec91fccb8e2a93319f844ca7164455c9490e4a6478ef096f44c1b57e532a7a76
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
+DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
+DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
@@ -228,8 +323,11 @@ DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9
DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
@@ -241,14 +339,20 @@ DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f73
DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
DIST wasm-bindgen-0.2.73.crate 159293 BLAKE2B 3ad8a4221d5a3824d8c7788294b3b3b571ba4d676c782f7890be6f0f8acf5fc88166b8bf28933bb7511a388defa5ebd968b8fb8a69bdc424ff8ae64fddba1d16 SHA512 69b070d71df7b5539a9b45cb61704629cb917626e8e9f892ff684007647c36aaa04b7413f1f87eee7fffbcf28550b2d9e632c3747cd1a73a2a75043ea0849722
+DIST wasm-bindgen-0.2.78.crate 162111 BLAKE2B a3311e67900961b35a59ead7a8972dcee37671921c0f524895c821658a7b1246403d4674bee1735f1b2b94aa789d5376edd02afe4c8ebda110f4344ef58c9225 SHA512 bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9
DIST wasm-bindgen-backend-0.2.73.crate 25434 BLAKE2B 63298c33497fac327ecf31f2dafa3681b906c8d0a873a80bce1282c53a6d63aa8b0d30b8962ecef1f9a0986ab481a41b79cba5b8180f48b084d04fb0c6ba4577 SHA512 853fd0e354aa41706e19de192c9872812072cc881520f8c81b94eadb0cceaa693855598380dcb7729c8c6125eb90cac440453545a5fff0e40714038c86ff2cb6
+DIST wasm-bindgen-backend-0.2.78.crate 25576 BLAKE2B 03dc6b255ab9e30f9eb54f81638eb02a05a0b994ddd51f47852bca376a02080fcce596453d688f5e8e7b5a814fd081b9709c1215f7e9f9fec0e4a7a6cba1000c SHA512 00a0ec9afb65c084b64cf9d25f778ab03bf2368a1e0ff213e07b8fe742a125ddae00c7b4d693225d6d798618b0441d4dea3c175cacdb37fdd75b0a46ba3a287b
DIST wasm-bindgen-futures-0.4.23.crate 14760 BLAKE2B 3b783c6056e7566197f68c9f18c557328b8a32a671247497999107052a3e51d2e616d5dd03f5399154b3cafd002b953dfc2850e9d018031b4d4ed3b940a09505 SHA512 344f2705a64f0618584c5a9ad0a026f156918873ad6fafbaf92d57b564445ab6d557d76233445ec263a18a0bb19b6be7d1d7710d3f83b25114ea1b621fe102d9
DIST wasm-bindgen-macro-0.2.73.crate 11545 BLAKE2B 481800c0c118048b29733a3bbe11ed5c816c1b5496b10b4142310d79ab6b825eb12280cf3c7304e768e6c8acd77105faa8574cf21afbf27810c9b7eac31010b9 SHA512 7ac842e68e6ba577b33df50ebe5c5fd250b1f4bc4e1ec1112be4fc806980d21f73f33612b14024626904a6116a8c72b83f2b7c5405fc111cd2164b4744f843d1
+DIST wasm-bindgen-macro-0.2.78.crate 11700 BLAKE2B 9f1538d79a39555f643b9ac6bfe026c259dfd129c45fdcc33cfbeeba2acb2a26ff4c9df83a3d11674c5ef8e9393af7a4d0cd7e3bd08b7eca0fa55986c893c5e3 SHA512 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d
DIST wasm-bindgen-macro-support-0.2.73.crate 17835 BLAKE2B 8e18ef319106273d3f41e947bd1f5ffa7a91e04f713fd67fa0bb697579ae51bbcce75b48a91949aca8e64e6f52ed35eda6b49cec366365126115a9c30572281c SHA512 22e322840ebda05ffdd2f4ffd07745d0f24b928e3425c66425392560f8dd59b007f80d7c4e4a01dafd83c09d76953ecc2cd61d362219791ed88f7f4ecc56960d
+DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f2cd836f56143a498d3be5fc30eced6fe4fc2e1bfe14a70f3165cdc5cc1c88f0162efec75b64e56aa9819596984afa97003601b933ce SHA512 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236
DIST wasm-bindgen-shared-0.2.73.crate 6691 BLAKE2B fbde26dfb5f36474ed3e01f7254dbe742a205cacc85848b85efda09c22e1f9fdb464bd3b7a2c429b73e4f5f3095803e9e477cfb81d6bcc779c04c2602c465bb6 SHA512 d3a28e4bf42071496f2e48c3ba3134a06856be12deac79fe13d1e2e7da8018d5e7f220f4dcc02fdda9eddfc2d52ceef18cd180db7d2bcced44e88a36304f947c
+DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134
DIST wasm-bindgen-test-0.3.23.crate 15577 BLAKE2B ad5e671ec812142fbf498ed1dcbe7e62708004e8396bfd35ea4d75589e1f4270ca926554459eb57a76b5e4971065dec4a3bfe950c7a66d3b9043720d1ea1dc57 SHA512 06c4a0f996deb0da292b126fd21f94bbddf16c4be00d9835759cbefc5f4c5eca276ce0e4a762dd3c42104fe585469c7be0fea13e66ffd791ec4e15d5aad89d5a
DIST wasm-bindgen-test-macro-0.3.23.crate 6337 BLAKE2B 31af4921ba1a6dc8b5300ce4d4b4f31efe7aae1fc3d744f5f85935aca98578622f7d087b28a7f379cc6349473f67cf2fd6b04784d656e7a23a5b0a62482dcd1f SHA512 eb7de7f94380678d2691d1cc53acb59cf27d88153422b685c6d30b42a05214001a43ed282369f8faa67aeac395e858d2bc53c285c8b3a5e8a5c11323a9f2db0a
DIST web-sys-0.3.50.crate 650100 BLAKE2B 448227dfbb6b91ab316ceebe554c9d9b89c397c25cd465f2e8a77560f185eb7308caf3b6052946e691d8fc22d6d382a0e3f164f7d29d873591ce17da792a993a SHA512 32afbfd3021c6cc4f228fc1762a4e29935373f4e7c572128723b508e6ab9588f3737167b91d5837e05a08c0bd182dd339c8f16b71e8a032f7e735cd619949d14
+DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764
DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5
DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
diff --git a/media-video/rav1e/rav1e-0.4.1-r1.ebuild b/media-video/rav1e/rav1e-0.4.1-r1.ebuild
index 473edb5e1c4..fbf85f87702 100644
--- a/media-video/rav1e/rav1e-0.4.1-r1.ebuild
+++ b/media-video/rav1e/rav1e-0.4.1-r1.ebuild
@@ -272,7 +272,7 @@ else
https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
$(cargo_crate_uris ${CRATES})
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
fi
DESCRIPTION="The fastest and safest AV1 encoder"
@@ -286,7 +286,7 @@ IUSE="+capi"
ASM_DEP=">=dev-lang/nasm-2.15"
BDEPEND="
amd64? ( ${ASM_DEP} )
- capi? ( dev-util/cargo-c )
+ capi? ( >=dev-util/cargo-c-0.6.3 )
"
src_unpack() {
diff --git a/media-video/rav1e/rav1e-0.5.1.ebuild b/media-video/rav1e/rav1e-0.5.1.ebuild
new file mode 100644
index 00000000000..e43b6e22feb
--- /dev/null
+++ b/media-video/rav1e/rav1e-0.5.1.ebuild
@@ -0,0 +1,244 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ addr2line-0.17.0
+ adler-1.0.2
+ adler32-1.2.0
+ aho-corasick-0.7.18
+ ansi_term-0.12.1
+ anyhow-1.0.52
+ aom-sys-0.3.0
+ arbitrary-0.4.7
+ arg_enum_proc_macro-0.3.2
+ arrayvec-0.7.2
+ assert_cmd-2.0.2
+ atty-0.2.14
+ autocfg-1.0.1
+ av-metrics-0.7.2
+ backtrace-0.3.63
+ bindgen-0.58.1
+ bitflags-1.3.2
+ bitstream-io-1.2.0
+ bstr-0.2.17
+ bumpalo-3.8.0
+ bytemuck-1.7.3
+ byteorder-1.4.3
+ cast-0.2.7
+ cc-1.0.72
+ cexpr-0.4.0
+ cfg-expr-0.7.4
+ cfg-if-1.0.0
+ chrono-0.4.19
+ clang-sys-1.3.0
+ clap-2.34.0
+ cmake-0.1.46
+ color_quant-1.1.0
+ console-0.14.1
+ crc32fast-1.3.0
+ criterion-0.3.5
+ criterion-plot-0.4.4
+ crossbeam-0.8.1
+ crossbeam-channel-0.5.1
+ crossbeam-deque-0.8.1
+ crossbeam-epoch-0.9.5
+ crossbeam-queue-0.3.2
+ crossbeam-utils-0.8.5
+ csv-1.1.6
+ csv-core-0.1.10
+ ctor-0.1.21
+ dav1d-sys-0.3.4
+ deflate-0.8.6
+ diff-0.1.12
+ difflib-0.4.0
+ doc-comment-0.3.3
+ either-1.6.1
+ encode_unicode-0.3.6
+ env_logger-0.8.4
+ fern-0.6.0
+ getrandom-0.2.3
+ gimli-0.26.1
+ glob-0.3.0
+ half-1.8.2
+ heck-0.3.3
+ hermit-abi-0.1.19
+ humantime-2.1.0
+ image-0.23.14
+ interpolate_name-0.2.3
+ itertools-0.8.2
+ itertools-0.10.3
+ itoa-0.4.8
+ itoa-1.0.1
+ jobserver-0.1.24
+ js-sys-0.3.55
+ lab-0.11.0
+ lazy_static-1.4.0
+ lazycell-1.3.0
+ libc-0.2.112
+ libfuzzer-sys-0.3.5
+ libloading-0.7.2
+ log-0.4.14
+ memchr-2.4.1
+ memoffset-0.6.5
+ miniz_oxide-0.3.7
+ miniz_oxide-0.4.4
+ nasm-rs-0.2.2
+ nom-5.1.2
+ noop_proc_macro-0.3.0
+ num-derive-0.3.3
+ num-integer-0.1.44
+ num-iter-0.1.42
+ num-rational-0.3.2
+ num-traits-0.2.14
+ num_cpus-1.13.1
+ object-0.27.1
+ oorandom-11.1.3
+ output_vt100-0.1.2
+ paste-1.0.6
+ peeking_take_while-0.1.2
+ pkg-config-0.3.24
+ plotters-0.3.1
+ plotters-backend-0.3.2
+ plotters-svg-0.3.1
+ png-0.16.8
+ ppv-lite86-0.2.15
+ predicates-2.1.0
+ predicates-core-1.0.2
+ predicates-tree-1.0.4
+ pretty_assertions-0.7.2
+ proc-macro2-1.0.34
+ quote-1.0.10
+ rand-0.8.4
+ rand_chacha-0.3.1
+ rand_core-0.6.3
+ rand_hc-0.3.1
+ rayon-1.5.1
+ rayon-core-1.9.1
+ regex-1.5.4
+ regex-automata-0.1.10
+ regex-syntax-0.6.25
+ rust_hawktracer-0.7.0
+ rust_hawktracer_normal_macro-0.4.1
+ rust_hawktracer_proc_macro-0.4.1
+ rust_hawktracer_sys-0.4.2
+ rustc-demangle-0.1.21
+ rustc-hash-1.1.0
+ rustc_version-0.4.0
+ ryu-1.0.9
+ same-file-1.0.6
+ scan_fmt-0.2.6
+ scopeguard-1.1.0
+ semver-1.0.4
+ serde-1.0.132
+ serde_cbor-0.11.2
+ serde_derive-1.0.132
+ serde_json-1.0.73
+ shlex-1.1.0
+ signal-hook-0.3.13
+ signal-hook-registry-1.4.0
+ simd_helpers-0.1.0
+ smallvec-1.7.0
+ strsim-0.8.0
+ strum-0.21.0
+ strum_macros-0.21.1
+ syn-1.0.83
+ system-deps-3.1.2
+ termcolor-1.1.2
+ terminal_size-0.1.17
+ termtree-0.2.3
+ textwrap-0.11.0
+ thiserror-1.0.30
+ thiserror-impl-1.0.30
+ time-0.1.43
+ tinytemplate-1.2.1
+ toml-0.5.8
+ unicode-segmentation-1.8.0
+ unicode-width-0.1.9
+ unicode-xid-0.2.2
+ vec_map-0.8.2
+ version-compare-0.0.11
+ version_check-0.9.3
+ wait-timeout-0.2.0
+ walkdir-2.3.2
+ wasi-0.10.2+wasi-snapshot-preview1
+ wasm-bindgen-0.2.78
+ wasm-bindgen-backend-0.2.78
+ wasm-bindgen-macro-0.2.78
+ wasm-bindgen-macro-support-0.2.78
+ wasm-bindgen-shared-0.2.78
+ web-sys-0.3.55
+ which-3.1.1
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ y4m-0.7.0
+"
+
+inherit cargo
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/xiph/rav1e.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="The fastest and safest AV1 encoder"
+HOMEPAGE="https://github.com/xiph/rav1e/"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT UoI-NCSA Unlicense ZLIB"
+SLOT="0"
+IUSE="+capi"
+
+ASM_DEP=">=dev-lang/nasm-2.15"
+BDEPEND="
+ amd64? ( ${ASM_DEP} )
+ capi? ( >=dev-util/cargo-c-0.6.3 )
+"
+
+# Rust
+QA_FLAGS_IGNORED="usr/lib.*/librav1e.* usr/bin/rav1e"
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-r3_src_unpack
+ cargo_live_src_unpack
+ else
+ default
+ cargo_src_unpack
+ fi
+}
+
+src_compile() {
+ export CARGO_HOME="${ECARGO_HOME}"
+ local args=$(usex debug "" --release)
+
+ cargo build ${args} \
+ || die "cargo build failed"
+
+ if use capi; then
+ cargo cbuild ${args} --target-dir="capi" \
+ --prefix="/usr" --libdir="/usr/$(get_libdir)" \
+ --library-type=cdylib \
+ || die "cargo cbuild failed"
+ fi
+}
+
+src_install() {
+ export CARGO_HOME="${ECARGO_HOME}"
+ local args=$(usex debug --debug "")
+
+ if use capi; then
+ cargo cinstall $args --target-dir="capi" \
+ --prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
+ --library-type=cdylib \
+ || die "cargo cinstall failed"
+ fi
+
+ cargo_src_install
+}
diff --git a/media-video/rav1e/rav1e-9999.ebuild b/media-video/rav1e/rav1e-9999.ebuild
index 77ee1c7cf11..a13cb191165 100644
--- a/media-video/rav1e/rav1e-9999.ebuild
+++ b/media-video/rav1e/rav1e-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 2017-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CRATES=""
@@ -11,29 +11,29 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/xiph/rav1e.git"
inherit git-r3
else
- SRC_URI="
- https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
- $(cargo_crate_uris ${CRATES})
- "
- KEYWORDS="~amd64 ~arm64 ~ppc64"
+ SRC_URI="https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="The fastest and safest AV1 encoder"
HOMEPAGE="https://github.com/xiph/rav1e/"
-RESTRICT=""
-LICENSE="BSD-2 Apache-2.0 MIT Unlicense"
-SLOT="0"
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT UoI-NCSA Unlicense ZLIB"
+SLOT="0"
IUSE="+capi"
-ASM_DEP=">=dev-lang/nasm-2.14"
+ASM_DEP=">=dev-lang/nasm-2.15"
BDEPEND="
amd64? ( ${ASM_DEP} )
capi? ( dev-util/cargo-c )
"
+# Rust
+QA_FLAGS_IGNORED="usr/lib.*/librav1e.* usr/bin/rav1e"
+
src_unpack() {
- if [[ "${PV}" == *9999* ]]; then
+ if [[ ${PV} == *9999* ]]; then
git-r3_src_unpack
cargo_live_src_unpack
else
@@ -50,7 +50,7 @@ src_compile() {
|| die "cargo build failed"
if use capi; then
- cargo cbuild ${args} \
+ cargo cbuild ${args} --target-dir="capi" \
--prefix="/usr" --libdir="/usr/$(get_libdir)" \
--library-type=cdylib \
|| die "cargo cbuild failed"
@@ -59,10 +59,10 @@ src_compile() {
src_install() {
export CARGO_HOME="${ECARGO_HOME}"
- local args=$(usex debug "" --release)
+ local args=$(usex debug --debug "")
if use capi; then
- cargo cinstall $args \
+ cargo cinstall $args --target-dir="capi" \
--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
--library-type=cdylib \
|| die "cargo cinstall failed"
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 544f56a9396..bd3f5fadcdf 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,2 +1,3 @@
DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d8f49f92075f6d4ca87992a7b9c4b4058f84333011e86cf38470f7b1dbf5e69f27e8b1fe34267104191c447342a03c18e3c SHA512 5357d01b51d3ec8c3c584c4e5aa9720a4c04b86573bc6cb7d724d660937b04b6dd35338b17721d6521fde2627e83763ed3b7c010f959bd72573016f3c47480b0
+DIST rtmpdump-2.4_p20210219.tar.gz 143043 BLAKE2B 312a44fa6caba3fbae19c248d76dccd22c637884ce37c207afe9de80eb0655a97af51101cd2800a2aea52620578f63e1ccede5070772126297e1c75baff0217b SHA512 2bcd169c8c142390e4a37a5f115bb722f8878188920818349aead50ad6c40b8e96c4f929f1b4d6c26ebc05ee264e6675d3843bf963ad4fbac04c3ce74b7fbb20
diff --git a/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch b/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch
new file mode 100644
index 00000000000..4325ed07381
--- /dev/null
+++ b/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/828082
+--- a/librtmp/rtmp.c
++++ b/librtmp/rtmp.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <assert.h>
+ #include <time.h>
++#include <limits.h>
+
+ #include "rtmp_sys.h"
+ #include "log.h"
+diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
+index 32b2eed..e3669e3 100644
+--- a/librtmp/hashswf.c
++++ b/librtmp/hashswf.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <time.h>
++#include <limits.h>
+
+ #include "rtmp_sys.h"
+ #include "log.h"
diff --git a/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch b/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch
new file mode 100644
index 00000000000..b714273273a
--- /dev/null
+++ b/media-video/rtmpdump/files/rtmpdump-fix-chunk-size.patch
@@ -0,0 +1,46 @@
+diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
+index a2863b0..ac1b3be 100644
+--- a/librtmp/rtmp.c
++++ b/librtmp/rtmp.c
+@@ -2077,6 +2077,29 @@ RTMP_SendClientBW(RTMP *r)
+ }
+
+ static int
++SendClientChunkSize(RTMP *r, int chunkSize)
++{
++ RTMPPacket packet;
++ char pbuf[256], *pend = pbuf + sizeof(pbuf);
++ int ret;
++
++ packet.m_nChannel = 0x02; /* control channel (invoke) */
++ packet.m_headerType = RTMP_PACKET_SIZE_LARGE;
++ packet.m_packetType = RTMP_PACKET_TYPE_CHUNK_SIZE;
++ packet.m_nTimeStamp = 0;
++ packet.m_nInfoField2 = 0;
++ packet.m_hasAbsTimestamp = 0;
++ packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE;
++
++ packet.m_nBodySize = 4;
++
++ AMF_EncodeInt32(packet.m_body, pend, chunkSize);
++ ret = RTMP_SendPacket(r, &packet, FALSE);
++ r->m_outChunkSize = chunkSize;
++ return ret;
++}
++
++static int
+ SendBytesReceived(RTMP *r)
+ {
+ RTMPPacket packet;
+@@ -3349,6 +3372,11 @@ HandleChangeChunkSize(RTMP *r, const RTMPPacket *packet)
+ r->m_inChunkSize = AMF_DecodeInt32(packet->m_body);
+ RTMP_Log(RTMP_LOGDEBUG, "%s, received: chunk size change to %d", __FUNCTION__,
+ r->m_inChunkSize);
++ if (r->Link.protocol & RTMP_FEATURE_WRITE)
++ {
++ RTMP_Log(RTMP_LOGDEBUG, "%s, updating outChunkSize too", __FUNCTION__);
++ SendClientChunkSize(r, r->m_inChunkSize);
++ }
+ }
+ }
+
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
new file mode 100644
index 00000000000..8632f208c91
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="RTMP client, librtmp library intended to stream audio or video flash content"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
+
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="LGPL-2.1 tools? ( GPL-2 )"
+SLOT="0"
+IUSE="gnutls ssl static-libs +tools"
+
+DEPEND="ssl? (
+ gnutls? (
+ >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
+ dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+ )
+ !gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-swf_vertification_type_2.patch"
+ "${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
+ "${FILESDIR}/${PN}-fix-chunk-size.patch"
+ "${FILESDIR}/${PN}-2.4_p20210219-gcc-11-missing-include.patch"
+)
+
+if [[ ${PV} == *9999 ]] ; then
+ SRC_URI=""
+ EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-f1b83c1"
+fi
+
+pkg_setup() {
+ if ! use ssl; then
+ if use gnutls; then
+ ewarn "USE='gnutls' is ignored without USE='ssl'."
+ ewarn "Please review the local USE flags for this package."
+ fi
+ fi
+}
+
+src_prepare() {
+ # fix #571106 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+ # fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
+ sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+ || die "failed to fix Makefile"
+ sed -i -e 's:OPT=:&-fPIC :' \
+ -e 's:OPT:OPTS:' \
+ -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
+ || die "failed to fix Makefile"
+ use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+ default
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ if use ssl ; then
+ if use gnutls ; then
+ crypto="GNUTLS"
+ else
+ crypto="OPENSSL"
+ fi
+ fi
+ if ! multilib_is_native_abi || ! use tools ; then
+ cd librtmp || die
+ fi
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+ OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+multilib_src_install() {
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
+ if multilib_is_native_abi && use tools ; then
+ dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+ else
+ cd librtmp || die
+ fi
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
+ CRYPTO="${crypto}" libdir="${EPREFIX}/usr/$(get_libdir)" install
+ find "${D}" -name '*.la' -delete || die
+ use static-libs || find "${D}" -name '*.a' -delete || die
+}
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 77b53638292..8e564b4e273 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
inherit multilib toolchain-funcs multilib-minimal flag-o-matic
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
+ "${FILESDIR}/${PN}-fix-chunk-size.patch"
)
if [[ ${PV} == *9999 ]] ; then
@@ -33,9 +34,9 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
inherit git-r3
else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
- SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-c5f04a5"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-f1b83c1"
fi
pkg_setup() {
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 8c71ff273cd..be69ec8539c 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,2 +1,2 @@
-DIST shotcut-21.09.20.tar.gz 4358591 BLAKE2B 3919cb0f5c3f0aaa665729227d077cdeac1569102509bbf6be7f9451cadda8e22b38a8e796ef5fd2f5dd84bff2abbd98103a0917eb9acacdc9db771968f723ef SHA512 6c2463c8d81c4e61b59d97ba2ee8f9aba5c420ee50b6c46c0e5f1c177e44cea6bc1fab5a7184ce8b13d2818b207efffe3c12f4d1682ce002279ba16c1c9bd624
DIST shotcut-21.10.31.tar.gz 4408987 BLAKE2B 88c77503475de21a4989d0e412a214c2d5c2c30d60abf11e06326a599e14c4b1a7d7b678c494d13223cf7e11c6dd12c810e7d112750f4f18308250693316a8cd SHA512 de5d9992a41217323b3d96cc7618ed5adc633e7d0e65b6f8f189405008f6faba011a80f38cda0126b18ab28a359f6784078cb298b2ee29dcdfdc6769963714f3
+DIST shotcut-21.12.24.tar.gz 4522616 BLAKE2B 3d6f423e888971f8913b0fa0d21fd0b122f941840b871275cd7c56e747c5637ecef56b2111b0c7be953bb71013aee66361202aea74e9d1ffe4028d07580815c0 SHA512 4173a2772cc5dcb62f113301aca7c3e0d1c32985b235e38f6c0bc17e0fdad88443123efb71d9fd4d97366d95500ce41776d4d8b1e214fc4c421219185fe112f4
diff --git a/media-video/shotcut/shotcut-21.10.31.ebuild b/media-video/shotcut/shotcut-21.10.31.ebuild
index c758f989295..288a54c92b7 100644
--- a/media-video/shotcut/shotcut-21.10.31.ebuild
+++ b/media-video/shotcut/shotcut-21.10.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,7 +36,7 @@ COMMON_DEPEND="
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- >=media-libs/mlt-7.0.1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
+ >=media-libs/mlt-7.2.0-r1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
media-video/ffmpeg
"
DEPEND="${COMMON_DEPEND}
diff --git a/media-video/shotcut/shotcut-21.09.20.ebuild b/media-video/shotcut/shotcut-21.12.24.ebuild
index c758f989295..0f1a45e0882 100644
--- a/media-video/shotcut/shotcut-21.09.20.ebuild
+++ b/media-video/shotcut/shotcut-21.12.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild
index c758f989295..288a54c92b7 100644
--- a/media-video/shotcut/shotcut-9999.ebuild
+++ b/media-video/shotcut/shotcut-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,7 +36,7 @@ COMMON_DEPEND="
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- >=media-libs/mlt-7.0.1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
+ >=media-libs/mlt-7.2.0-r1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
media-video/ffmpeg
"
DEPEND="${COMMON_DEPEND}
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index c7bcb795277..d37af0a63f3 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,2 +1,2 @@
-DIST simplescreenrecorder-0.4.2.tar.gz 1912151 BLAKE2B d8a4605a82e49693f94ecfac8853405a660a4528c3001961b1734d4387e49eeb4c91603929b3cd5d5b67a23a6ec839ace606b29666b916960f10322e6ec1b452 SHA512 60b0127d7f82f294e5a8f015363e37a10b5492089a0178b07a5e383c7e4b857102ed2bda7a95e3c67293a255f892481aeaf4037c583320d68d463637348ed7f7
DIST simplescreenrecorder-0.4.3.tar.gz 1918958 BLAKE2B 9d0e07255c7345d8752a8f49fd2e7947db4058c6e6bdbe1239955f96f06543eff24b207bcd049d07eb7d3d5815ad5f1c77721e1fa139f940b1deb3b3da7a46e0 SHA512 c930045d6763bdb026cee80fe82aa0e973de7a1bd92bce9650c5cae627f5d8f8d913f260024410a41170081c8eda61c1aea346bc2d9740b8dc169a3952b3bfd0
+DIST simplescreenrecorder-0.4.4.tar.gz 1961269 BLAKE2B 05c7635840f8461ab324f740f0cc554eb544ed91b00cdf39c80f861e6a8631f59afbdcc9fe958830b0f1e31eedb90f11d29c114ce4bbb612f1756264502f069f SHA512 a90549a2709490482d70559073e505e669417a93abf16124b98c021e6d2bf08b91b53eb68e006df4f80fcee9fe4da2624bf8de979618953adb3f37eb1d471525
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.2-cmake.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.2-cmake.patch
deleted file mode 100644
index 9f8bc408331..00000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.2-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5330a3d65b7877f5f3691c20df35fbb7856d6f38 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 11 Jan 2018 21:28:15 +0100
-Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location
-
-Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
-Available since >= Qt-5.3.1 which is well below the current minimum version.
----
- src/translations/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/translations/CMakeLists.txt b/src/translations/CMakeLists.txt
-index d9afded..174acea 100644
---- a/src/translations/CMakeLists.txt
-+++ b/src/translations/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # translations for 'simplescreenrecorder' executable
-
- if(WITH_QT5)
-- find_program(LRELEASE NAMES lrelease-qt5 lrelease)
-+ find_package(Qt5LinguistTools REQUIRED)
-+ set(LRELEASE Qt5::lrelease)
- else()
- find_program(LRELEASE NAMES lrelease-qt4 lrelease)
- endif()
---
-2.29.2
-
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild
index f0ac1589ed5..5c2e985195d 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_ECLASS=cmake
inherit cmake-multilib flag-o-matic xdg
@@ -16,12 +16,12 @@ if [[ ${PV} = 9999 ]] ; then
EGIT_BOOTSTRAP=""
else
SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PKGNAME}-${PV}"
fi
SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
+IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
RDEPEND="
dev-qt/qtcore:5
@@ -29,7 +29,6 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
media-libs/alsa-lib:0=
- media-libs/libglvnd[${MULTILIB_USEDEP},X]
media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext
@@ -37,20 +36,22 @@ RDEPEND="
x11-libs/libXi
x11-libs/libXinerama
virtual/glu[${MULTILIB_USEDEP}]
+ v4l? ( media-libs/libv4l )
jack? ( virtual/jack )
+ opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
pulseaudio? ( media-sound/pulseaudio )
"
DEPEND="${RDEPEND}"
BDEPEND="dev-qt/linguist-tools:5"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug #624480, in git master
+REQUIRED_USE="abi_x86_32? ( opengl )"
pkg_pretend() {
- if [[ "${ABI}" == amd64 ]]; then
- elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
- elog "When added 32bit GLInject libraries are also included. This is"
- elog "required if you want to use OpenGL recording on 32bit applications."
- elog
+ if [[ "${ABI}" == amd64 ]] ; then
+ einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+ einfo "When added 32bit GLInject libraries are also included. This is"
+ einfo "required if you want to use OpenGL recording on 32bit applications."
+ einfo
fi
if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
@@ -77,10 +78,13 @@ src_prepare() {
multilib_src_configure() {
local mycmakeargs=(
+ -DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
-DENABLE_X86_ASM="$(usex asm)"
+ -DWITH_OPENGL_RECORDING="$(usex opengl)"
-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
-DWITH_JACK="$(multilib_native_usex jack)"
- -DWITH_GLINJECT="true"
+ -DWITH_GLINJECT="$(usex opengl)"
+ -DWITH_V4L2="$(multilib_native_usex v4l)"
)
if multilib_is_native_abi ; then
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 337ba993d16..5c2e985195d 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_ECLASS=cmake
inherit cmake-multilib flag-o-matic xdg
@@ -21,7 +21,7 @@ else
fi
SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora v4l vorbis vpx x264"
+IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
RDEPEND="
dev-qt/qtcore:5
@@ -29,7 +29,6 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
media-libs/alsa-lib:0=
- media-libs/libglvnd[${MULTILIB_USEDEP},X]
media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext
@@ -39,17 +38,20 @@ RDEPEND="
virtual/glu[${MULTILIB_USEDEP}]
v4l? ( media-libs/libv4l )
jack? ( virtual/jack )
+ opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
pulseaudio? ( media-sound/pulseaudio )
"
DEPEND="${RDEPEND}"
BDEPEND="dev-qt/linguist-tools:5"
+REQUIRED_USE="abi_x86_32? ( opengl )"
+
pkg_pretend() {
- if [[ "${ABI}" == amd64 ]]; then
- elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
- elog "When added 32bit GLInject libraries are also included. This is"
- elog "required if you want to use OpenGL recording on 32bit applications."
- elog
+ if [[ "${ABI}" == amd64 ]] ; then
+ einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+ einfo "When added 32bit GLInject libraries are also included. This is"
+ einfo "required if you want to use OpenGL recording on 32bit applications."
+ einfo
fi
if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
@@ -78,9 +80,10 @@ multilib_src_configure() {
local mycmakeargs=(
-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
-DENABLE_X86_ASM="$(usex asm)"
+ -DWITH_OPENGL_RECORDING="$(usex opengl)"
-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
-DWITH_JACK="$(multilib_native_usex jack)"
- -DWITH_GLINJECT="true"
+ -DWITH_GLINJECT="$(usex opengl)"
-DWITH_V4L2="$(multilib_native_usex v4l)"
)
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 690ff7776a5..72b1a597dc5 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1 +1,2 @@
DIST smplayer-21.10.0.tar.bz2 5186253 BLAKE2B e2da80e64c4cbb9a3977ae9f5570800a2c3e012f21fdd011d66dce681488805c309fb40aae72aff5858cc06beaf1e8bbe052816eb91d3700a222b3b10be57228 SHA512 3e4a046c704eeb181570c56a819afbca939257df370c909dab3af448553702feeebba542f123d18cf6b786a19f92ee67ba60ba25a649d83f1f31411b715f7ae4
+DIST smplayer-22.2.0.tar.bz2 5165034 BLAKE2B b10103907dc334f65bf1d0dfc55baef5fe330e84eabb0534d77b4ebeb6b93f677b5f39b9e8ab60f8a7fdaf405fee8ab683e7c5e284256b04a6628603fc476540 SHA512 62916d9df8493efbe810a5de36c2d45fd2e39173e061060c749c87ac498f43ca08caa073bd04b05e3e9de72c5efdf9bece8e08f4c57a0d283d9f78b7687e2d14
diff --git a/media-video/smplayer/smplayer-22.2.0.ebuild b/media-video/smplayer/smplayer-22.2.0.ebuild
new file mode 100644
index 00000000000..75684168f00
--- /dev/null
+++ b/media-video/smplayer/smplayer-22.2.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2007-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit plocale qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="https://www.smplayer.eu/"
+SRC_URI="https://github.com/smplayer-dev/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtscript:5
+ dev-qt/qtsingleapplication[X,qt5(+)]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ sys-libs/zlib
+ autoshutdown? ( dev-qt/qtdbus:5 )
+ mpris? ( dev-qt/qtdbus:5 )
+"
+RDEPEND="${DEPEND}
+ || (
+ media-video/mpv[libass(+),X]
+ media-video/mplayer[bidi?,libass,png,X]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+ "${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+ "${FILESDIR}/${PN}-18.2.0-jobserver.patch"
+ "${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
+)
+
+src_prepare() {
+ use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+ default
+
+ # Upstream Makefile sucks
+ sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+ -e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+ -e '/\.\/get_svn_revision\.sh/,+2c\
+ cd src && $(DEFS) $(MAKE)' \
+ Makefile || die
+
+ # Turn off online update checker, bug #479902
+ sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+ -e 's:DEFINES += CHECK_UPGRADED:#&:' \
+ -i src/smplayer.pro || die
+
+ # Turn off intrusive share widget
+ sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+ -i src/smplayer.pro || die
+
+ # Toggle autoshutdown option which pulls in dbus, bug #524392
+ if ! use autoshutdown ; then
+ sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+ -i src/smplayer.pro || die
+ fi
+
+ # Turn debug message flooding off
+ if ! use debug ; then
+ sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+ -i src/smplayer.pro || die
+ fi
+
+ # MPRIS2 pulls in dbus, bug #553710
+ if ! use mpris ; then
+ sed -e 's:DEFINES += MPRIS2:#&:' \
+ -i src/smplayer.pro || die
+ fi
+
+ # Commented out because it gives false positives
+ #plocale_find_changes "${S}"/src/translations ${PN}_ .ts
+
+ # Do not default compress man page
+ sed '/gzip -9.*\.1$/d' -i Makefile || die
+ sed 's@\.gz$@@' -i smplayer.spec || die
+}
+
+src_configure() {
+ cd src || die
+ eqmake5
+}
+
+gen_translation() {
+ local mydir="$(qt5_get_bindir)"
+
+ ebegin "Generating $1 translation"
+ "${mydir}"/lrelease ${PN}_${1}.ts
+ eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+
+ cd src/translations || die
+ plocale_for_each_locale gen_translation
+}
+
+src_install() {
+ # remove unneeded copies of the GPL
+ rm -f Copying* docs/*/gpl.html || die
+ # don't install empty dirs
+ rmdir --ignore-fail-on-non-empty docs/* || die
+
+ default
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "If you want URL support with media-video/mpv, please install"
+ elog "net-misc/yt-dlp."
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
index 58e5b52ded2..aa33db7cb88 100644
--- a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
+++ b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit linux-info multilib toolchain-funcs
+inherit linux-info toolchain-funcs
DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)"
HOMEPAGE="http://www.stolk.org/sonic-snap/"
diff --git a/media-video/subliminal/subliminal-2.1.0-r1.ebuild b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
index 1bd69c0d6a9..17b07c7ff43 100644
--- a/media-video/subliminal/subliminal-2.1.0-r1.ebuild
+++ b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE='xml(+)'
DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 560187c90ba..f742cd5d323 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE='xml(+)'
DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
new file mode 100644
index 00000000000..98de494cf30
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
@@ -0,0 +1,122 @@
+From 167a941f8070f4a9abacb3aa2f61ee6ee00d6cb8 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Thu, 7 Oct 2021 19:37:23 +0200
+Subject: [PATCH] GLRenderer: added GLES support
+
+---
+ src/videoplayer/backend/glrenderer.cpp | 44 ++++++++++++++++++++++----
+ 1 file changed, 38 insertions(+), 6 deletions(-)
+
+diff --git a/src/videoplayer/backend/glrenderer.cpp b/src/videoplayer/backend/glrenderer.cpp
+index 7c9c38b..5cb985d 100644
+--- a/src/videoplayer/backend/glrenderer.cpp
++++ b/src/videoplayer/backend/glrenderer.cpp
+@@ -20,6 +20,7 @@ extern "C" {
+ }
+
+ #define DEBUG_GL 0
++#define FORCE_GLES 0
+ #define OPENGL_CORE 0
+ #define OPENGL_VER 2,0
+
+@@ -33,6 +34,17 @@ extern "C" {
+ #define asGL(glCall) glCall
+ #endif
+
++#if defined(GL_ES_VERSION_2_0) || FORCE_GLES
++#define USE_GLES
++#define TEXTURE_RGB_FORMAT GL_RGBA
++// NOTE: we don't currently support more than 8bpp on GLES
++#define TEXTURE_U16_FORMAT GL_R8
++#else
++#undef USE_GLES
++#define TEXTURE_RGB_FORMAT GL_BGRA
++#define TEXTURE_U16_FORMAT GL_R16
++#endif
++
+ using namespace SubtitleComposer;
+
+ enum { ID_Y, ID_U, ID_V, ID_OVR, ID_SIZE };
+@@ -82,6 +94,9 @@ void
+ GLRenderer::setupProfile()
+ {
+ QSurfaceFormat format(QSurfaceFormat::defaultFormat());
++#if FORCE_GLES
++ format.setRenderableType(QSurfaceFormat::OpenGLES);
++#endif
+ format.setVersion(OPENGL_VER);
+ #if DEBUG_GL
+ format.setOption(QSurfaceFormat::DebugContext);
+@@ -126,7 +141,7 @@ GLRenderer::setFrameFormat(int width, int height, int compBits, int crWidthShift
+ m_crHeight = crHeight;
+
+ m_glType = compBytes == 1 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
+- m_glFormat = compBytes == 1 ? GL_R8 : GL_R16;
++ m_glFormat = compBytes == 1 ? GL_R8 : TEXTURE_U16_FORMAT;
+
+ delete[] m_bufYUV;
+ m_bufSize = bufSize;
+@@ -261,7 +276,11 @@ GLRenderer::initShader()
+ delete m_vertShader;
+ m_vertShader = new QOpenGLShader(QOpenGLShader::Vertex, this);
+ bool success = m_vertShader->compileSourceCode(
++#ifdef USE_GLES
++ "#version 100\n"
++#else
+ "#version 120\n"
++#endif
+ "attribute vec4 vPos;"
+ "attribute vec2 vVidTex;"
+ "attribute vec2 vOvrTex;"
+@@ -288,7 +307,13 @@ GLRenderer::initShader()
+ csms.append(QString::number(csm[i], 'g', 10));
+ }
+
+- success = m_fragShader->compileSourceCode(QStringLiteral("#version 120\n"
++ success = m_fragShader->compileSourceCode(QStringLiteral(
++#ifdef USE_GLES
++ "#version 100\n"
++ "precision mediump float;\n"
++#else
++ "#version 120\n"
++#endif
+ "varying vec2 vfVidTex;"
+ "varying vec2 vfOvrTex;"
+ "uniform sampler2D texY;"
+@@ -348,8 +373,15 @@ GLRenderer::initializeGL()
+ QMutexLocker l(&m_texMutex);
+
+ initializeOpenGLFunctions();
+- qDebug() << "OpenGL version: " << reinterpret_cast<const char *>(glGetString(GL_VERSION));
+- qDebug() << "GLSL version: " << reinterpret_cast<const char *>(glGetString(GL_SHADING_LANGUAGE_VERSION));
++ qDebug().nospace() << "GL API: OpenGL " << (format().renderableType() == QSurfaceFormat::OpenGLES ? "ES" : "Desktop")
++ << ' ' << format().majorVersion() << "." << format().minorVersion()
++#ifdef USE_GLES
++ << " (compiled for OpenGL ES)";
++#else
++ << " (compiled for OpenGL Desktop)";
++#endif
++ qDebug() << "OpenGL version:" << reinterpret_cast<const char *>(glGetString(GL_VERSION));
++ qDebug() << "GLSL version:" << reinterpret_cast<const char *>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+
+ if(m_vao.create())
+ m_vao.bind();
+@@ -453,13 +485,13 @@ GLRenderer::uploadMM(int texWidth, int texHeight, T *texBuf, const T *texSrc)
+ if(D == 1) {
+ asGL(glTexImage2D(GL_TEXTURE_2D, level, m_glFormat, texWidth, texHeight, 0, GL_RED, m_glType, texSrc));
+ } else { // D == 4
+- asGL(glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA8, texWidth, texHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, texSrc));
++ asGL(glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA8, texWidth, texHeight, 0, TEXTURE_RGB_FORMAT, GL_UNSIGNED_BYTE, texSrc));
+ }
+ } else {
+ if(D == 1) {
+ asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, GL_RED, m_glType, texSrc));
+ } else { // D == 4
+- asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, GL_BGRA, GL_UNSIGNED_BYTE, texSrc));
++ asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, TEXTURE_RGB_FORMAT, GL_UNSIGNED_BYTE, texSrc));
+ }
+ }
+
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
index aef529fbf60..3ff7e5e962a 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -43,7 +43,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-tests-optional.patch"
+ "${FILESDIR}/${P}-gles-support.patch" # bug 820035
+)
src_configure() {
local mycmakeargs=(
diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild
deleted file mode 100644
index 83ce58f4ad7..00000000000
--- a/media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="GTK+3 subtitle editing tool"
-HOMEPAGE="https://kitone.github.io/subtitleeditor"
-SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug nls"
-# opengl would mix gtk+:2 and :3 which is not possible
-
-RDEPEND="
- >=app-text/enchant-1.4:0
- app-text/iso-codes
- >=dev-cpp/cairomm-1.12:0
- >=dev-cpp/glibmm-2.46:2
- >=dev-cpp/gtkmm-3.18:3.0
- >=dev-cpp/gstreamermm-1.0:1.0=
- >=dev-cpp/libxmlpp-2.40:2.6
- dev-libs/glib:2
- >=dev-libs/libsigc++-2.6:2
- media-libs/gst-plugins-base:1.0[X,pango]
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-plugins/gst-plugins-meta:1.0
- x11-libs/gtk+:3
- nls? ( virtual/libintl )
-"
-# opengl? (
-# >=dev-cpp/gtkglextmm-1.2.0-r2:1.0
-# virtual/opengl )
-# X needed for video output and pango needed for text overlay
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
-)
-
-src_configure() {
- # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
- use debug && append-cxxflags -DDEBUG
-
- gnome2_src_configure \
- --disable-debug \
- --disable-gl \
- $(use_enable nls)
-# $(use_enable opengl gl)
-}
diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
index 5929fb7bc8c..21f2d7e2a70 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P/_p*}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug nls"
# opengl would mix gtk+:2 and :3 which is not possible
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index b68cf5972b9..9e11ac415ec 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,2 +1,2 @@
-DIST totem-3.38.1.tar.xz 2196156 BLAKE2B a9f5771d7406df9490b6eb0f9dc03ef449bee05d6ff038fce9adbac63692b5555de6ff36fe90b3b63cf4bc59739d91b23e57b3a03bf953594567e6a21060b509 SHA512 f33583b0890bfdd0dfff0722f73242b1d38605564a3055b587a30eae4c0ba51159c105ef577ab144792ca1994f385c2b8a9375a356b7cdf2b93bfeb6317f6040
DIST totem-3.38.2.tar.xz 2190700 BLAKE2B 3b3b8166cf674b882a3a66a5729d794489fe779944bb277fad35fe027b56270e6ef578590924309b9fe28aca0544754696acd98d31a7243a33a533abe73ed6fd SHA512 1dac3a0afe31b47147a129c70dddf7480446fc1bb5432f9cd537384e3be25da6a9b87918fa7bcf7e7cd68c8dac45e75f6b1f7c1885edefac846c52f96b40567f
+DIST totem-42.0.tar.xz 2476952 BLAKE2B 45eac2e586c3c17eab9f570812ae2c79812859635d1ef6df1d0d2c526436558dbab9581699ce86d3e2cd3048f5d65bbd1927c3faa5f7575a5468d0813ce68bcc SHA512 67872d06a7d691a23b97255c5ee5f8d90a1fdf2b36f064f26c10fb4958733772eea456aab4f0fe2c89d23ec987cf5b9c2383c97ba5bec45247953296f1cd6c4b
diff --git a/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch b/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 00000000000..da494e2b61b
--- /dev/null
+++ b/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,41 @@
+https://gitlab.gnome.org/GNOME/totem/-/commit/61e3a957cb7339c6614e764fcf1120d967d687e9
+https://bugs.gentoo.org/831931
+
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 6 Jan 2022 17:21:28 +0100
+Subject: [PATCH] build: Remove unused i18n.merge_file() "name"
+
+data/meson.build:78:0: ERROR: Function does not take positional arguments.
+data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments.
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index c4d17e927..c2e646327 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata = 'org.gnome.Totem.appdata.xml'
+
+ appdata_file = i18n.merge_file (
+- 'appdata',
+ input: appdata + '.in',
+ output: appdata,
+ install: true,
+diff --git a/data/meson.build b/data/meson.build
+index b31ce755c..8eebe3db1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -76,7 +76,6 @@ desktop_in = configure_file(
+ )
+
+ desktop_file = i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
diff --git a/media-video/totem/totem-3.38.2.ebuild b/media-video/totem/totem-3.38.2.ebuild
index 277b992dec5..cbef3290c1d 100644
--- a/media-video/totem/totem-3.38.2.ebuild
+++ b/media-video/totem/totem-3.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
DEPEND="
>=dev-libs/glib-2.56.0:2
@@ -74,6 +74,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/3.38.0-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
)
pkg_setup() {
diff --git a/media-video/totem/totem-3.38.1.ebuild b/media-video/totem/totem-42.0-r1.ebuild
index 717a1d6b7ef..cbc4522cdc9 100644
--- a/media-video/totem/totem-3.38.1.ebuild
+++ b/media-video/totem/totem-42.0-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+)"
inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos https://gitlab.gnome.org/GNOME/totem/"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
@@ -19,20 +19,18 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
DEPEND="
>=dev-libs/glib-2.56.0:2
>=x11-libs/gtk+-3.22.0:3[introspection]
+ >=gui-libs/libhandy-1.5.0:1
>=media-libs/gstreamer-1.6.0:1.0
>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
>=media-libs/gst-plugins-good-1.6.0:1.0
>=media-libs/grilo-0.3.0:0.3[playlist]
>=dev-libs/libpeas-1.1.0[gtk]
>=dev-libs/totem-pl-parser-3.26.5:0=[introspection]
- >=media-libs/clutter-1.17.3:1.0[gtk]
- >=media-libs/clutter-gst-2.99.2:3.0
- >=media-libs/clutter-gtk-1.8.1:1.0
gnome-base/gnome-desktop:3=
gnome-base/gsettings-desktop-schemas
>=x11-libs/cairo-1.14
@@ -48,6 +46,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
media-plugins/grilo-plugins:0.3
+ media-plugins/gst-plugins-gtk:1.0[opengl]
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-taglib:1.0
x11-themes/adwaita-icon-theme
@@ -81,13 +80,16 @@ pkg_setup() {
}
src_prepare() {
+ default
+ xdg_environment_reset
+
# Drop pointless samplepython plugin from build
sed -e '/samplepython/d' -i src/plugins/meson.build || die
- xdg_src_prepare
}
src_configure() {
local emesonargs=(
+ -Dhelp=true
-Denable-easy-codec-installation=yes
-Denable-python=$(usex python yes no)
-Dwith-plugins=all # in 3.34.1 only builtin and python plugins are left, and python is extra controlled by enable-python
diff --git a/media-video/transcode/transcode-1.1.7-r6.ebuild b/media-video/transcode/transcode-1.1.7-r6.ebuild
index 41c7a8e4789..27b8a8cfff4 100644
--- a/media-video/transcode/transcode-1.1.7-r6.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2002-2021 Gentoo Authors
+# Copyright 2002-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools libtool multilib
+inherit autotools
DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r2.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r2.ebuild
deleted file mode 100644
index 683e20a1c53..00000000000
--- a/media-video/unifi-video/unifi-video-3.10.13-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="acct-group/unifi-video
- acct-user/unifi-video"
-RDEPEND="${DEPEND}
- dev-db/mongodb
- dev-java/commons-daemon
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-libs/libcap
- virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
-
-src_unpack() {
- default
- unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/commons-daemon-move.patch
- sed -i usr/sbin/${PN} \
- -e '/require_root$/d' \
- -e '/update_limits$/d' \
- -e '/ulimit/d' \
- -e '/coredump_filter/d' || die
- default
-}
-
-src_install() {
- export CODEPATH=/usr/lib/${PN}
- export DATAPATH=/var/lib/${PN}
- LOGPATH=${DATAPATH}/logs
- VARLOGPATH=/var/log/${PN}
-
- insinto /usr/lib
- doins -r .${CODEPATH}
- into /usr
- dosbin usr/sbin/unifi-video
-
- dodir ${LOGPATH}
- fowners -R ${PN}:${PN} ${DATAPATH}
- dosym ${LOGPATH} ${VARLOGPATH}
- dosym ${LOGPATH} ${CODEPATH}/logs
-
- dosym ${DATAPATH} ${CODEPATH}/data
-
- fperms 500 ${CODEPATH}/bin/ubnt.avtool
- fperms 500 ${CODEPATH}/bin/evostreamms
- fperms 500 /usr/sbin/${PN}
- fowners -R ${PN}:${PN} ${CODEPATH}
- fperms -R 0400 ${CODEPATH}/lib/
- fperms 500 ${CODEPATH}/lib/
-
- echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
- doenvd "${T}"/99${PN}
-
- dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- if [[ ! -f ${DATAPATH}/system.properties ]]; then
- cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
- echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
- fi
-}
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
deleted file mode 100644
index a86ef7450eb..00000000000
--- a/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="acct-group/unifi-video
- acct-user/unifi-video"
-RDEPEND="${DEPEND}
- dev-db/mongodb
- dev-java/commons-daemon
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-libs/libcap
- virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
-
-src_unpack() {
- default
- unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/commons-daemon-move.patch
- sed -i usr/sbin/${PN} \
- -e '/require_root$/d' \
- -e '/update_limits$/d' \
- -e '/ulimit/d' \
- -e '/coredump_filter/d' || die
- default
-}
-
-src_install() {
- export CODEPATH=/usr/lib/${PN}
- export DATAPATH=/var/lib/${PN}
- LOGPATH=${DATAPATH}/logs
- VARLOGPATH=/var/log/${PN}
-
- insinto /usr/lib
- doins -r .${CODEPATH}
- into /usr
- dosbin usr/sbin/unifi-video
-
- dodir ${LOGPATH}
- fowners -R ${PN}:${PN} ${DATAPATH}
- dosym ${LOGPATH} ${VARLOGPATH}
- dosym ${LOGPATH} ${CODEPATH}/logs
-
- dosym ${DATAPATH} ${CODEPATH}/data
-
- fperms 500 ${CODEPATH}/bin/ubnt.avtool
- fperms 500 ${CODEPATH}/bin/evostreamms
- fperms 500 /usr/sbin/${PN}
- fowners -R ${PN}:${PN} ${CODEPATH}
- fperms -R 0400 ${CODEPATH}/lib/
- fperms 500 ${CODEPATH}/lib/
-
- echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
- doenvd "${T}"/99${PN}
-
- dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- if [[ ! -f ${DATAPATH}/system.properties ]]; then
- cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
- echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
- fi
-}
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r4.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild
index 0ca08a362e9..09f2a37096a 100644
--- a/media-video/unifi-video/unifi-video-3.10.13-r4.ebuild
+++ b/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild
@@ -17,7 +17,8 @@ IUSE=""
RESTRICT="mirror"
DEPEND="acct-group/unifi-video
- acct-user/unifi-video"
+ acct-user/unifi-video
+ app-arch/zip"
RDEPEND="${DEPEND}
dev-db/mongodb
dev-java/commons-daemon
@@ -42,6 +43,10 @@ src_prepare() {
-e '/ulimit/d' \
-e '/coredump_filter/d' || die
default
+ #delete problematic class in bundled log4j
+ zip -q -d \
+ usr/lib/unifi-video/lib/log4j-core-2.1.jar \
+ org/apache/logging/log4j/core/lookup/JndiLookup.class || die
}
src_install() {
diff --git a/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild b/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild
index 6c744550640..6c4fb6dc4f4 100644
--- a/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild
+++ b/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,7 +40,7 @@ src_prepare() {
src_compile() {
linux-mod_src_compile
if use examples; then
- emake CC=$(tc-getCC) -C examples
+ emake CC="$(tc-getCC)" -C examples
fi
}
diff --git a/media-video/v4l2loopback/v4l2loopback-9999.ebuild b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
index 712f4d2b8c0..76095105941 100644
--- a/media-video/v4l2loopback/v4l2loopback-9999.ebuild
+++ b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,7 +41,7 @@ src_prepare() {
src_compile() {
linux-mod_src_compile
if use examples; then
- emake CC=$(tc-getCC) -C examples
+ emake CC="$(tc-getCC)" -C examples
fi
}
diff --git a/media-video/vidify/files/vidify-2.2.6-python310.patch b/media-video/vidify/files/vidify-2.2.6-python310.patch
new file mode 100644
index 00000000000..4b78ea55933
--- /dev/null
+++ b/media-video/vidify/files/vidify-2.2.6-python310.patch
@@ -0,0 +1,16 @@
+diff --git a/vidify/player/vlc.py b/vidify/player/vlc.py
+index a7c9ec0..cb50f89 100644
+--- a/vidify/player/vlc.py
++++ b/vidify/player/vlc.py
+@@ -75,9 +75,9 @@ class VLCPlayer(PlayerBase):
+ def start_video(self, media: str, is_playing: bool = True) -> None:
+ logging.info("Starting new video")
+ if CURRENT_PLATFORM in (Platform.LINUX, Platform.BSD):
+- self._player.set_xwindow(self.winId())
++ self._player.set_xwindow(int(self.winId()))
+ elif CURRENT_PLATFORM == Platform.WINDOWS:
+- self._player.set_hwnd(self.winId())
++ self._player.set_hwnd(int(self.winId()))
+ elif CURRENT_PLATFORM == Platform.MACOS:
+ self._player.set_nsobject(int(self.winId()))
+
diff --git a/media-video/vidify/files/vidify-2.2.6-yt-dlp.patch b/media-video/vidify/files/vidify-2.2.6-yt-dlp.patch
new file mode 100644
index 00000000000..6ce0f836d5f
--- /dev/null
+++ b/media-video/vidify/files/vidify-2.2.6-yt-dlp.patch
@@ -0,0 +1,122 @@
+diff --git a/README.md b/README.md
+index c4ea164..51e65e6 100644
+--- a/README.md
++++ b/README.md
+@@ -79,7 +79,7 @@ Audiosync is only available on Linux for now. It's strongly recommended to use M
+ * FFTW: `libfftw3` on Debian-based distros.
+ * ffmpeg: `ffmpeg` on most repositories. It must be available on your path.
+ * pulseaudio: `pulseaudio`, pre-installed on most repos.
+-* youtube-dl: this is installed by default with Vidify, but make sure it's available on your path.
++* yt-dlp: this is installed by default with Vidify, but make sure it's available on your path.
+
+ It's also available as [`vidify-audiosync`](https://aur.archlinux.org/packages/vidify-audiosync) on the AUR, and it comes pre-installed in the binaries.
+
+diff --git a/dev/build_requires.txt b/dev/build_requires.txt
+index ed682fd..a8bbc30 100644
+--- a/dev/build_requires.txt
++++ b/dev/build_requires.txt
+@@ -14,5 +14,5 @@ QtPy
+ SwSpotify>=1.1.1; platform_system == "Windows" or platform_system == "Darwin"
+ tekore < 2.0
+ vidify-audiosync == 0.2.*
+-youtube-dl
++yt-dlp
+ zeroconf
+diff --git a/dev/snapcraft.yaml b/dev/snapcraft.yaml
+index a5446de..00d2aae 100644
+--- a/dev/snapcraft.yaml
++++ b/dev/snapcraft.yaml
+@@ -22,7 +22,7 @@ parts:
+ - python3-pyqt5
+ - python3-appdirs
+ - python3-pydbus
+- - youtube-dl
++ - yt-dlp
+ # Mpv is used by default because it's lighter and works better
+ # with the audiosync feature.
+ - libmpv-dev
+diff --git a/setup.py b/setup.py
+index 3fdb656..9b1c093 100644
+--- a/setup.py
++++ b/setup.py
+@@ -19,7 +19,7 @@ install_deps = [
+ # Base package
+ 'QtPy',
+ 'lyricwikia',
+- 'youtube-dl',
++ 'yt-dlp',
+ 'appdirs',
+ 'qdarkstyle',
+ 'dataclasses; python_version<"3.7"',
+diff --git a/vidify/player/mpv.py b/vidify/player/mpv.py
+index 4b92571..68bd1a5 100644
+--- a/vidify/player/mpv.py
++++ b/vidify/player/mpv.py
+@@ -30,7 +30,7 @@ locale.setlocale(locale.LC_NUMERIC, 'C')
+
+ class MpvPlayer(PlayerBase):
+ # The audio is always muted, which is needed because not all the
+- # youtube-dl videos are silent. The keep-open flag stops mpv from closing
++ # yt-dlp videos are silent. The keep-open flag stops mpv from closing
+ # after the video is over.
+ DEFAULT_FLAGS = ['mute']
+ DEFAULT_ARGS = {
+diff --git a/vidify/player/vlc.py b/vidify/player/vlc.py
+index 6a0bec7..a7c9ec0 100644
+--- a/vidify/player/vlc.py
++++ b/vidify/player/vlc.py
+@@ -31,7 +31,7 @@ class VLCPlayer(PlayerBase):
+ else:
+ vlc_args += " --quiet"
+ # The audio is always muted, which is needed because not all the
+- # youtube-dl videos are silent.
++ # yt-dlp videos are silent.
+ # Needed for the audiosync feature: set the Group of Pictures size to
+ # one, so that seeking is more precise.
+ vlc_args += " --no-audio --sout-x264-min-keyint 1"
+diff --git a/vidify/youtube.py b/vidify/youtube.py
+index 1b23bfb..b959f34 100644
+--- a/vidify/youtube.py
++++ b/vidify/youtube.py
+@@ -1,5 +1,5 @@
+ """
+-This module uses youtube-dl to obtain the actual URL of a YouTube link.
++This module uses yt-dlp to obtain the actual URL of a YouTube link.
+ That way, the video can be played directly with a video player like VLC
+ or mpv.
+ """
+@@ -7,7 +7,7 @@ or mpv.
+ import logging
+ from typing import Optional
+
+-from youtube_dl import YoutubeDL
++from yt_dlp import YoutubeDL
+ from qtpy.QtCore import QObject, Signal
+
+
+@@ -63,7 +63,7 @@ class YouTubeDLWorker(QObject):
+
+ def get_url(self) -> None:
+ """
+- Getting the youtube direct link with youtube-dl, intended to be used
++ Getting the youtube direct link with yt-dlp, intended to be used
+ with a QThread. It's guaranteed that either a success signal or a
+ fail signal will be emitted.
+ """
+@@ -74,13 +74,13 @@ class YouTubeDLWorker(QObject):
+ except Exception as e:
+ # Any kind of error has to be caught, so that it doesn't only
+ # send the error signal when the download wasn't successful
+- # (a DownloadError from youtube_dl).
+- logging.info("YouTube-dl wasn't able to obtain the video: %s",
++ # (a DownloadError from yt_dlp).
++ logging.info("yt-dlp wasn't able to obtain the video: %s",
+ str(e))
+ self.fail.emit()
+ else:
+ if len(data['entries']) == 0:
+- logging.info("YouTube-dl returned no entries")
++ logging.info("yt-dlp returned no entries")
+ self.fail.emit()
+ else:
+ self.success.emit(data)
diff --git a/media-video/vidify/vidify-2.2.6.ebuild b/media-video/vidify/vidify-2.2.6-r2.ebuild
index 94b2caead30..fe640744473 100644
--- a/media-video/vidify/vidify-2.2.6.ebuild
+++ b/media-video/vidify/vidify-2.2.6-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit xdg distutils-r1 optfeature virtualx
@@ -23,7 +23,7 @@ RDEPEND="
dev-python/appdirs[${PYTHON_USEDEP}]
dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}]
net-misc/lyricwikia[${PYTHON_USEDEP}]
- net-misc/youtube-dl[${PYTHON_USEDEP}]
+ net-misc/yt-dlp[${PYTHON_USEDEP}]
dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] )
!dbus? ( dev-python/tekore[${PYTHON_USEDEP}] )
mpv? ( dev-python/python-mpv[${PYTHON_USEDEP}] )
@@ -31,6 +31,12 @@ RDEPEND="
zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
"
+# use yt-dlp instead of youtube-dl, otherwise download is too slow for playback
+PATCHES=(
+ "${FILESDIR}/${P}-yt-dlp.patch"
+ "${FILESDIR}/${P}-python310.patch"
+)
+
distutils_enable_tests unittest
python_prepare_all() {
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index fecc89d899f..738543e5e5d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1 +1,2 @@
DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
+DIST vlc-3.0.17.3.tar.xz 26393440 BLAKE2B 5079caa779335647394eb4af631ae89098b22545531ecf95ed81f9551f7004b8469a6e44de08f512e381164dc64e011d42be14d675d20c09ab043a00348f6b83 SHA512 99095b39ed600c3a89ebc0d377a2fc2522b3623a56b0f6de2df50a3c6e0148c67c28c0f2d8dec28bbdf5c62cf29b3579429a79ed00440570643778a9871022b6
diff --git a/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch b/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch
new file mode 100644
index 00000000000..deb748cdba9
--- /dev/null
+++ b/