summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Field3D/Field3D-1.7.2-r3.ebuild42
-rw-r--r--media-libs/Field3D/files/Field3D-1.7.2-openexr-3-imath.patch233
-rw-r--r--media-libs/allegro/Manifest1
-rw-r--r--media-libs/allegro/allegro-5.2.6.0.ebuild93
-rw-r--r--media-libs/alsa-lib/Manifest1
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.4.ebuild9
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild9
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild87
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.6.ebuild9
-rw-r--r--media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild4
-rw-r--r--media-libs/alsa-ucm-conf/Manifest3
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.1.ebuild21
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.2.ebuild21
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild21
-rw-r--r--media-libs/amdgpu-pro-vulkan/Manifest6
-rw-r--r--media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild108
-rw-r--r--media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild108
-rw-r--r--media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.0.1395274.ebuild134
-rw-r--r--media-libs/amdgpu-pro-vulkan/files/icd_amd64.patch8
-rw-r--r--media-libs/amdgpu-pro-vulkan/files/icd_x86.patch8
-rw-r--r--media-libs/amdgpu-pro-vulkan/metadata.xml12
-rw-r--r--media-libs/amf-headers/Manifest1
-rw-r--r--media-libs/amf-headers/amf-headers-1.4.23.ebuild34
-rw-r--r--media-libs/amf-headers/metadata.xml16
-rw-r--r--media-libs/aribb24/metadata.xml9
-rw-r--r--media-libs/assimp/Manifest2
-rw-r--r--media-libs/assimp/assimp-5.2.2.ebuild59
-rw-r--r--media-libs/assimp/assimp-5.2.3.ebuild70
-rw-r--r--media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch52
-rw-r--r--media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch24
-rw-r--r--media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch25
-rw-r--r--media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch134
-rw-r--r--media-libs/assimp/metadata.xml9
-rw-r--r--media-libs/aubio/aubio-0.4.9-r1.ebuild4
-rw-r--r--media-libs/aubio/files/ffmpeg5.patch28
-rw-r--r--media-libs/audiofile/audiofile-0.3.6-r4.ebuild4
-rw-r--r--media-libs/avidemux-core/Manifest1
-rw-r--r--media-libs/avidemux-core/avidemux-core-2.7.6.ebuild102
-rw-r--r--media-libs/avidemux-core/metadata.xml1
-rw-r--r--media-libs/avidemux-plugins/Manifest1
-rw-r--r--media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild161
-rw-r--r--media-libs/avidemux-plugins/metadata.xml1
-rw-r--r--media-libs/babl/Manifest4
-rw-r--r--media-libs/babl/babl-0.1.90-r1.ebuild (renamed from media-libs/babl/babl-0.1.86.ebuild)9
-rw-r--r--media-libs/babl/babl-0.1.92.ebuild (renamed from media-libs/babl/babl-0.1.84.ebuild)11
-rw-r--r--media-libs/babl/babl-9999.ebuild7
-rw-r--r--media-libs/bcg729/bcg729-1.1.1.ebuild2
-rw-r--r--media-libs/chromaprint/Manifest2
-rw-r--r--media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild (renamed from media-libs/chromaprint/chromaprint-1.5.0.ebuild)29
-rw-r--r--media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild9
-rw-r--r--media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild9
-rw-r--r--media-libs/codec2/Manifest3
-rw-r--r--media-libs/codec2/codec2-1.0.0.ebuild26
-rw-r--r--media-libs/codec2/codec2-1.0.3.ebuild (renamed from media-libs/codec2/codec2-1.0.1-r1.ebuild)14
-rw-r--r--media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch48
-rw-r--r--media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch13
-rw-r--r--media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch19
-rw-r--r--media-libs/cogl/cogl-1.22.8-r1.ebuild7
-rw-r--r--media-libs/compface/compface-1.5.2.ebuild4
-rw-r--r--media-libs/ctl/ctl-1.5.2-r1.ebuild30
-rw-r--r--media-libs/ctl/ctl-1.5.2-r2.ebuild4
-rw-r--r--media-libs/cubeb/Manifest14
-rw-r--r--media-libs/cubeb/cubeb-0.2_p20211213.ebuild110
-rw-r--r--media-libs/cubeb/files/cubeb-0.2_p20211213-automagic.patch51
-rw-r--r--media-libs/cubeb/metadata.xml16
-rw-r--r--media-libs/dav1d/Manifest5
-rw-r--r--media-libs/dav1d/dav1d-0.8.0.ebuild49
-rw-r--r--media-libs/dav1d/dav1d-0.9.0.ebuild61
-rw-r--r--media-libs/dav1d/dav1d-0.9.1.ebuild61
-rw-r--r--media-libs/dav1d/dav1d-0.9.2.ebuild4
-rw-r--r--media-libs/dav1d/dav1d-1.0.0.ebuild (renamed from media-libs/dav1d/dav1d-0.8.2.ebuild)28
-rw-r--r--media-libs/dav1d/dav1d-9999.ebuild27
-rw-r--r--media-libs/devil/devil-1.7.8-r4.ebuild (renamed from media-libs/devil/devil-1.7.8-r2.ebuild)33
-rw-r--r--media-libs/devil/metadata.xml21
-rw-r--r--media-libs/embree/Manifest1
-rw-r--r--media-libs/embree/embree-3.13.0-r2.ebuild10
-rw-r--r--media-libs/embree/embree-3.13.2.ebuild10
-rw-r--r--media-libs/embree/embree-3.13.3.ebuild132
-rw-r--r--media-libs/esdl/esdl-1.3.1.ebuild7
-rw-r--r--media-libs/exiftool/exiftool-12.30.ebuild5
-rw-r--r--media-libs/exiftool/exiftool-12.33.ebuild5
-rw-r--r--media-libs/fcft/Manifest4
-rw-r--r--media-libs/fcft/fcft-3.0.0.ebuild89
-rw-r--r--media-libs/fcft/fcft-3.0.1.ebuild89
-rw-r--r--media-libs/fcft/fcft-3.1.1.ebuild93
-rw-r--r--media-libs/fcft/fcft-3.1.2.ebuild93
-rw-r--r--media-libs/fcft/metadata.xml18
-rw-r--r--media-libs/flac/Manifest2
-rw-r--r--media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch13
-rw-r--r--media-libs/flac/flac-1.3.4.ebuild (renamed from media-libs/flac/flac-1.3.3-r1.ebuild)15
-rw-r--r--media-libs/flickcurl/flickcurl-1.26.ebuild4
-rw-r--r--media-libs/fontconfig/Manifest1
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch6
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch10
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch10
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch29
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch66
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch14
-rw-r--r--media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild8
-rw-r--r--media-libs/fontconfig/fontconfig-2.13.93.ebuild15
-rw-r--r--media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild224
-rw-r--r--media-libs/freeglut/Manifest1
-rw-r--r--media-libs/freeglut/freeglut-3.2.2.ebuild45
-rw-r--r--media-libs/freeimage/files/freeimage-3.18.0-openexr-3-imath.patch144
-rw-r--r--media-libs/freeimage/freeimage-3.18.0-r6.ebuild (renamed from media-libs/freeimage/freeimage-3.18.0-r2.ebuild)13
-rw-r--r--media-libs/freetype/Manifest13
-rw-r--r--media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch31
-rw-r--r--media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch58
-rw-r--r--media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch26
-rw-r--r--media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch41
-rw-r--r--media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch31
-rw-r--r--media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch56
-rw-r--r--media-libs/freetype/freetype-2.11.0-r2.ebuild251
-rw-r--r--media-libs/freetype/freetype-2.12.0-r1.ebuild (renamed from media-libs/freetype/freetype-2.11.0-r1.ebuild)47
-rw-r--r--media-libs/freetype/freetype-2.12.1.ebuild (renamed from media-libs/freetype/freetype-2.11.1.ebuild)37
-rw-r--r--media-libs/freetype/freetype-9999.ebuild2
-rw-r--r--media-libs/freeverb3/freeverb3-3.2.1-r3.ebuild44
-rw-r--r--media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch24
-rw-r--r--media-libs/ftgl/ftgl-2.1.3_rc5.ebuild1
-rw-r--r--media-libs/ganv/ganv-1.8.0-r1.ebuild (renamed from media-libs/ganv/ganv-1.8.0.ebuild)6
-rw-r--r--media-libs/gd/Manifest2
-rw-r--r--media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch62
-rw-r--r--media-libs/gd/files/gd-2.3.0-getlib.patch81
-rw-r--r--media-libs/gd/gd-2.3.0.ebuild83
-rw-r--r--media-libs/gd/gd-2.3.1.ebuild81
-rw-r--r--media-libs/gd/gd-2.3.3-r1.ebuild4
-rw-r--r--media-libs/gegl/Manifest6
-rw-r--r--media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch43
-rw-r--r--media-libs/gegl/files/gegl-0.4.18-program-suffix.patch39
-rw-r--r--media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch24
-rw-r--r--media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch22
-rw-r--r--media-libs/gegl/gegl-0.4.26-r1.ebuild167
-rw-r--r--media-libs/gegl/gegl-0.4.28.ebuild167
-rw-r--r--media-libs/gegl/gegl-0.4.34.ebuild (renamed from media-libs/gegl/gegl-0.4.32.ebuild)4
-rw-r--r--media-libs/gegl/gegl-0.4.36-r1.ebuild (renamed from media-libs/gegl/gegl-0.4.30.ebuild)23
-rw-r--r--media-libs/gegl/gegl-9999.ebuild18
-rw-r--r--media-libs/gexiv2/Manifest2
-rw-r--r--media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch175
-rw-r--r--media-libs/gexiv2/gexiv2-0.12.2.ebuild4
-rw-r--r--media-libs/gexiv2/gexiv2-0.14.0.ebuild (renamed from media-libs/gexiv2/gexiv2-0.13.0.ebuild)24
-rw-r--r--media-libs/giblib/metadata.xml3
-rw-r--r--media-libs/giflib/giflib-5.2.1-r1.ebuild4
-rw-r--r--media-libs/glfw/Manifest3
-rw-r--r--media-libs/glfw/glfw-3.3.6.ebuild (renamed from media-libs/glfw/glfw-3.3.4-r3.ebuild)30
-rw-r--r--media-libs/glfw/glfw-3.3.7.ebuild50
-rw-r--r--media-libs/glm/Manifest1
-rw-r--r--media-libs/glm/glm-0.9.9.7.ebuild52
-rw-r--r--media-libs/glm/glm-0.9.9.8-r1.ebuild6
-rw-r--r--media-libs/glm/glm-0.9.9.8.ebuild53
-rw-r--r--media-libs/glu/glu-9.0.2.ebuild4
-rw-r--r--media-libs/glyr/files/glyr-1.0.10-fix-version.patch23
-rw-r--r--media-libs/glyr/glyr-1.0.10-r1.ebuild (renamed from media-libs/glyr/glyr-1.0.10.ebuild)24
-rw-r--r--media-libs/gmmlib/Manifest7
-rw-r--r--media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch (renamed from media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch)26
-rw-r--r--media-libs/gmmlib/gmmlib-21.2.1.ebuild48
-rw-r--r--media-libs/gmmlib/gmmlib-21.2.2.ebuild48
-rw-r--r--media-libs/gmmlib/gmmlib-21.3.1.ebuild48
-rw-r--r--media-libs/gmmlib/gmmlib-22.1.2.ebuild (renamed from media-libs/gmmlib/gmmlib-21.3.3.ebuild)6
-rw-r--r--media-libs/gmmlib/gmmlib-22.1.3.ebuild (renamed from media-libs/gmmlib/gmmlib-21.3.2.ebuild)6
-rw-r--r--media-libs/gmmlib/gmmlib-9999.ebuild6
-rw-r--r--media-libs/graphene/Manifest1
-rw-r--r--media-libs/graphene/files/1.10.6-fix-vector-check.patch24
-rw-r--r--media-libs/graphene/graphene-1.10.6-r1.ebuild (renamed from media-libs/graphene/graphene-1.10.6.ebuild)4
-rw-r--r--media-libs/graphene/graphene-1.10.8.ebuild47
-rw-r--r--media-libs/grilo/Manifest1
-rw-r--r--media-libs/grilo/grilo-0.3.13.ebuild77
-rw-r--r--media-libs/grilo/grilo-0.3.14.ebuild4
-rw-r--r--media-libs/gsound/Manifest1
-rw-r--r--media-libs/gsound/gsound-1.0.2-r1.ebuild40
-rw-r--r--media-libs/gst-plugins-bad/Manifest3
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild9
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild87
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.20.1.ebuild88
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild88
-rw-r--r--media-libs/gst-plugins-base/Manifest3
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild150
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.20.1.ebuild149
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild149
-rw-r--r--media-libs/gst-plugins-good/Manifest3
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild49
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.20.1.ebuild53
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild53
-rw-r--r--media-libs/gst-plugins-ugly/Manifest3
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild10
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild31
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.1.ebuild28
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild28
-rw-r--r--media-libs/gst-rtsp-server/Manifest3
-rw-r--r--media-libs/gst-rtsp-server/gst-rtsp-server-1.18.6.ebuild45
-rw-r--r--media-libs/gst-rtsp-server/gst-rtsp-server-1.20.1.ebuild43
-rw-r--r--media-libs/gst-rtsp-server/gst-rtsp-server-1.20.2.ebuild43
-rw-r--r--media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild4
-rw-r--r--media-libs/gstreamer/Manifest3
-rw-r--r--media-libs/gstreamer/files/gstreamer-1.20-loong.patch28
-rw-r--r--media-libs/gstreamer/gstreamer-1.18.6.ebuild70
-rw-r--r--media-libs/gstreamer/gstreamer-1.20.1.ebuild72
-rw-r--r--media-libs/gstreamer/gstreamer-1.20.2.ebuild76
-rw-r--r--media-libs/gupnp-dlna/Manifest3
-rw-r--r--media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild60
-rw-r--r--media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild (renamed from media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild)4
-rw-r--r--media-libs/hamlib/files/hamlib-4.4-slibtool.patch73
-rw-r--r--media-libs/hamlib/hamlib-4.3.1.ebuild4
-rw-r--r--media-libs/hamlib/hamlib-4.4.ebuild14
-rw-r--r--media-libs/harfbuzz/Manifest5
-rw-r--r--media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch24
-rw-r--r--media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild (renamed from media-libs/harfbuzz/harfbuzz-3.1.1.ebuild)8
-rw-r--r--media-libs/harfbuzz/harfbuzz-4.2.1.ebuild (renamed from media-libs/harfbuzz/harfbuzz-3.1.2.ebuild)8
-rw-r--r--media-libs/harfbuzz/harfbuzz-4.3.0.ebuild98
-rw-r--r--media-libs/harfbuzz/harfbuzz-9999.ebuild6
-rw-r--r--media-libs/icclib/metadata.xml3
-rw-r--r--media-libs/ilmbase/Manifest2
-rw-r--r--media-libs/ilmbase/ilmbase-2.5.7-r2.ebuild (renamed from media-libs/ilmbase/ilmbase-2.5.7.ebuild)2
-rw-r--r--media-libs/ilmbase/ilmbase-2.5.7-r3.ebuild (renamed from media-libs/ilmbase/ilmbase-2.5.6.ebuild)6
-rw-r--r--media-libs/ilmbase/ilmbase-2.5.8.ebuild43
-rw-r--r--media-libs/imlib2/Manifest3
-rw-r--r--media-libs/imlib2/imlib2-1.7.1-r2.ebuild2
-rw-r--r--media-libs/imlib2/imlib2-1.7.5.ebuild (renamed from media-libs/imlib2/imlib2-1.6.1-r2.ebuild)11
-rw-r--r--media-libs/imlib2/imlib2-1.9.0.ebuild89
-rw-r--r--media-libs/imlib2/metadata.xml3
-rw-r--r--media-libs/jbig2dec/jbig2dec-0.19.ebuild6
-rw-r--r--media-libs/jbig2enc/jbig2enc-0.29.ebuild4
-rw-r--r--media-libs/jbigkit/jbigkit-2.1.ebuild4
-rw-r--r--media-libs/kimageannotator/kimageannotator-0.5.3.ebuild4
-rw-r--r--media-libs/kquickimageeditor/kquickimageeditor-0.2.0.ebuild4
-rw-r--r--media-libs/kvazaar/Manifest1
-rw-r--r--media-libs/kvazaar/kvazaar-2.1.0.ebuild64
-rw-r--r--media-libs/kvazaar/kvazaar-9999.ebuild4
-rw-r--r--media-libs/lasi/lasi-1.1.3.ebuild4
-rw-r--r--media-libs/lcms/Manifest2
-rw-r--r--media-libs/lcms/files/lcms-2.13-grayscale-regression.patch38
-rw-r--r--media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch22
-rw-r--r--media-libs/lcms/lcms-2.13-r1.ebuild55
-rw-r--r--media-libs/lcms/lcms-2.13.1.ebuild57
-rw-r--r--media-libs/lensfun/Manifest1
-rw-r--r--media-libs/lensfun/lensfun-0.3.2-r1.ebuild2
-rw-r--r--media-libs/lensfun/lensfun-0.3.3.ebuild65
-rw-r--r--media-libs/leptonica/leptonica-1.82.0.ebuild4
-rw-r--r--media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch45
-rw-r--r--media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild12
-rw-r--r--media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild14
-rw-r--r--media-libs/lib3mf/Manifest1
-rw-r--r--media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch141
-rw-r--r--media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild65
-rw-r--r--media-libs/libaacs/Manifest1
-rw-r--r--media-libs/libaacs/libaacs-0.11.1-r1.ebuild40
-rw-r--r--media-libs/libaacs/libaacs-0.11.1.ebuild43
-rw-r--r--media-libs/libaom/Manifest7
-rw-r--r--media-libs/libaom/files/libaom-1.0.0-armv7l.patch13
-rw-r--r--media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch126
-rw-r--r--media-libs/libaom/files/libaom-1.0.0-version.patch10
-rw-r--r--media-libs/libaom/files/libdirpc2.patch48
-rw-r--r--media-libs/libaom/files/pthread_lib2.patch14
-rw-r--r--media-libs/libaom/libaom-1.0.0-r2.ebuild91
-rw-r--r--media-libs/libaom/libaom-2.0.0.ebuild78
-rw-r--r--media-libs/libaom/libaom-2.0.1.ebuild78
-rw-r--r--media-libs/libaom/libaom-3.0.0.ebuild77
-rw-r--r--media-libs/libaom/libaom-3.1.2.ebuild78
-rw-r--r--media-libs/libaom/libaom-3.3.0.ebuild (renamed from media-libs/libaom/libaom-3.1.1.ebuild)56
-rw-r--r--media-libs/libaom/libaom-9999.ebuild29
-rw-r--r--media-libs/libass/Manifest3
-rw-r--r--media-libs/libass/libass-0.15.2.ebuild4
-rw-r--r--media-libs/libass/libass-0.16.0.ebuild (renamed from media-libs/libass/libass-0.15.1-r2.ebuild)23
-rw-r--r--media-libs/libavif/Manifest5
-rw-r--r--media-libs/libavif/files/libavif-0.9.0-pkg-config.patch28
-rw-r--r--media-libs/libavif/files/libavif-0.9.3-dav1d-1.0.0.patch32
-rw-r--r--media-libs/libavif/libavif-0.10.1.ebuild (renamed from media-libs/libavif/libavif-0.9.1-r1.ebuild)15
-rw-r--r--media-libs/libavif/libavif-0.8.4-r1.ebuild76
-rw-r--r--media-libs/libavif/libavif-0.9.0-r3.ebuild109
-rw-r--r--media-libs/libavif/libavif-0.9.3-r2.ebuild (renamed from media-libs/libavif/libavif-0.9.3-r1.ebuild)6
-rw-r--r--media-libs/libavif/libavif-0.9.3-r3.ebuild (renamed from media-libs/libavif/libavif-0.9.2-r1.ebuild)13
-rw-r--r--media-libs/libavif/libavif-9999.ebuild10
-rw-r--r--media-libs/libbdplus/Manifest1
-rw-r--r--media-libs/libbdplus/libbdplus-0.2.0.ebuild49
-rw-r--r--media-libs/libbdplus/libbdplus-9999.ebuild12
-rw-r--r--media-libs/libbluray/Manifest3
-rw-r--r--media-libs/libbluray/libbluray-1.2.0.ebuild92
-rw-r--r--media-libs/libbluray/libbluray-1.3.1.ebuild (renamed from media-libs/libbluray/libbluray-1.2.1.ebuild)49
-rw-r--r--media-libs/libbluray/libbluray-9999.ebuild24
-rw-r--r--media-libs/libcanberra/libcanberra-0.30-r6.ebuild (renamed from media-libs/libcanberra/libcanberra-0.30-r5.ebuild)10
-rw-r--r--media-libs/libcanberra/metadata.xml2
-rw-r--r--media-libs/libcdaudio/files/libcdaudio-0.99.12-libdir-fix.patch12
-rw-r--r--media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild (renamed from media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild)3
-rw-r--r--media-libs/libchamplain/libchamplain-0.12.20.ebuild4
-rw-r--r--media-libs/libde265/libde265-1.0.8.ebuild4
-rw-r--r--media-libs/libde265/libde265-9999.ebuild4
-rw-r--r--media-libs/libdiscid/libdiscid-0.6.2.ebuild4
-rw-r--r--media-libs/libdvdcss/Manifest1
-rw-r--r--media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild28
-rw-r--r--media-libs/libdvdnav/Manifest1
-rw-r--r--media-libs/libdvdnav/libdvdnav-6.1.0.ebuild46
-rw-r--r--media-libs/libdvdread/Manifest1
-rw-r--r--media-libs/libdvdread/libdvdread-6.1.1.ebuild44
-rw-r--r--media-libs/libebur128/libebur128-1.2.6.ebuild4
-rw-r--r--media-libs/libeot/libeot-0.01.ebuild4
-rw-r--r--media-libs/libepoxy/Manifest1
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.10.ebuild46
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild4
-rw-r--r--media-libs/libepoxy/libepoxy-9999.ebuild6
-rw-r--r--media-libs/libexif/Manifest1
-rw-r--r--media-libs/libexif/libexif-0.6.23.ebuild50
-rw-r--r--media-libs/libexif/libexif-0.6.24.ebuild4
-rw-r--r--media-libs/libffado/Manifest2
-rw-r--r--media-libs/libffado/libffado-2.4.5.ebuild (renamed from media-libs/libffado/libffado-2.4.4-r1.ebuild)4
-rw-r--r--media-libs/libffado/metadata.xml8
-rw-r--r--media-libs/libfpx/libfpx-1.3.1_p10.ebuild9
-rw-r--r--media-libs/libfreeaptx/libfreeaptx-0.1.1-r1.ebuild (renamed from media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild)17
-rw-r--r--media-libs/libfreehand/libfreehand-0.1.2.ebuild4
-rw-r--r--media-libs/libggi/files/libggi-2.2.2-slibtool.patch65
-rw-r--r--media-libs/libggi/libggi-2.2.2-r1.ebuild18
-rw-r--r--media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild4
-rw-r--r--media-libs/libglvnd/Manifest2
-rw-r--r--media-libs/libglvnd/libglvnd-1.4.0.ebuild (renamed from media-libs/libglvnd/libglvnd-1.3.4.ebuild)8
-rw-r--r--media-libs/libglvnd/libglvnd-9999.ebuild8
-rw-r--r--media-libs/libgphoto2/Manifest3
-rw-r--r--media-libs/libgphoto2/files/2.5.28-configure-Allow-with-jpeg-yes-argument-again.patch197
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.28.ebuild (renamed from media-libs/libgphoto2/libgphoto2-2.5.27-r1.ebuild)12
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.29.ebuild210
-rw-r--r--media-libs/libgroove/metadata.xml9
-rw-r--r--media-libs/libhdhomerun/libhdhomerun-20190621.ebuild6
-rw-r--r--media-libs/libhdhomerun/libhdhomerun-20200521.ebuild6
-rw-r--r--media-libs/libid3tag/Manifest2
-rw-r--r--media-libs/libid3tag/libid3tag-0.16.2.ebuild (renamed from media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild)2
-rw-r--r--media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild4
-rw-r--r--media-libs/libilbc/files/libilbc-3.0.4-support-ia64.patch32
-rw-r--r--media-libs/libilbc/libilbc-3.0.4.ebuild5
-rw-r--r--media-libs/libilbc/libilbc-9999.ebuild5
-rw-r--r--media-libs/libinsane/Manifest2
-rw-r--r--media-libs/libinsane/libinsane-1.0.7.ebuild48
-rw-r--r--media-libs/libinsane/libinsane-1.0.8.ebuild48
-rw-r--r--media-libs/libjpeg-turbo/Manifest2
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild4
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild (renamed from media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild)23
-rw-r--r--media-libs/libjsw/metadata.xml3
-rw-r--r--media-libs/libjxl/Manifest2
-rw-r--r--media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild80
-rw-r--r--media-libs/libjxl/libjxl-0.7.0_pre20220511.ebuild74
-rw-r--r--media-libs/libjxl/libjxl-9999.ebuild73
-rw-r--r--media-libs/libjxl/metadata.xml21
-rw-r--r--media-libs/libkeyfinder/Manifest3
-rw-r--r--media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild34
-rw-r--r--media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild (renamed from media-libs/libkeyfinder/libkeyfinder-2.2.4.ebuild)6
-rw-r--r--media-libs/libldac/libldac-2.0.2.3-r1.ebuild (renamed from media-libs/libldac/libldac-2.0.2.3.ebuild)11
-rw-r--r--media-libs/liblqr/liblqr-0.4.2-r1.ebuild4
-rw-r--r--media-libs/libltc/libltc-1.3.1-r1.ebuild4
-rw-r--r--media-libs/libltc/libltc-9999.ebuild4
-rw-r--r--media-libs/libmatemixer/libmatemixer-1.24.1-r1.ebuild (renamed from media-libs/libmatemixer/libmatemixer-1.24.1.ebuild)4
-rw-r--r--media-libs/libmatroska/Manifest1
-rw-r--r--media-libs/libmatroska/libmatroska-1.6.2.ebuild23
-rw-r--r--media-libs/libmediaart/Manifest1
-rw-r--r--media-libs/libmediaart/files/1.9.5-meson-add-introspection-option.patch87
-rw-r--r--media-libs/libmediaart/files/1.9.5-meson-add-vapi-option.patch48
-rw-r--r--media-libs/libmediaart/libmediaart-1.9.5.ebuild55
-rw-r--r--media-libs/libmediainfo/Manifest2
-rw-r--r--media-libs/libmediainfo/files/libmediainfo-21.09-link-fix.patch29
-rw-r--r--media-libs/libmediainfo/libmediainfo-21.09.ebuild88
-rw-r--r--media-libs/libmediainfo/libmediainfo-22.03.ebuild84
-rw-r--r--media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild4
-rw-r--r--media-libs/libmp3splt/libmp3splt-0.9.2-r5.ebuild3
-rw-r--r--media-libs/libmpdclient/Manifest1
-rw-r--r--media-libs/libmpdclient/libmpdclient-2.19.ebuild43
-rw-r--r--media-libs/libmpdclient/libmpdclient-2.20.ebuild2
-rw-r--r--media-libs/libmpeg3/Manifest2
-rw-r--r--media-libs/libmpeg3/files/libmpeg3-1.8-impldecl.patch24
-rw-r--r--media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild60
-rw-r--r--media-libs/libmpeg3/libmpeg3-1.8-r2.ebuild66
-rw-r--r--media-libs/libmypaint/libmypaint-1.6.1-r1.ebuild (renamed from media-libs/libmypaint/libmypaint-1.6.1.ebuild)13
-rw-r--r--media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild4
-rw-r--r--media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild4
-rw-r--r--media-libs/libofa/libofa-0.9.3-r2.ebuild4
-rw-r--r--media-libs/libogg/libogg-1.3.5.ebuild4
-rw-r--r--media-libs/liboggz/liboggz-1.1.1.ebuild4
-rw-r--r--media-libs/libopenaptx/libopenaptx-0.2.0-r1.ebuild (renamed from media-libs/libopenaptx/libopenaptx-0.2.0.ebuild)15
-rw-r--r--media-libs/libopenaptx/libopenaptx-0.2.1-r1.ebuild (renamed from media-libs/libopenaptx/libopenaptx-0.2.1.ebuild)15
-rw-r--r--media-libs/libopenmpt/Manifest4
-rw-r--r--media-libs/libopenmpt/libopenmpt-0.5.14.ebuild (renamed from media-libs/libopenmpt/libopenmpt-0.5.13.ebuild)2
-rw-r--r--media-libs/libopenmpt/libopenmpt-0.6.2.ebuild61
-rw-r--r--media-libs/libopenmpt/libopenmpt-0.6.3.ebuild61
-rw-r--r--media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild15
-rw-r--r--media-libs/libopenshot/libopenshot-0.2.6.ebuild15
-rw-r--r--media-libs/libopenshot/libopenshot-0.2.7.ebuild15
-rw-r--r--media-libs/libpagemaker/libpagemaker-0.0.4.ebuild6
-rw-r--r--media-libs/libpano13/Manifest1
-rw-r--r--media-libs/libpano13/libpano13-2.9.21.ebuild33
-rw-r--r--media-libs/libpano13/metadata.xml3
-rw-r--r--media-libs/libplacebo/Manifest1
-rw-r--r--media-libs/libplacebo/libplacebo-3.120.3.ebuild4
-rw-r--r--media-libs/libplacebo/libplacebo-4.192.1.ebuild69
-rw-r--r--media-libs/libplacebo/libplacebo-9999.ebuild6
-rw-r--r--media-libs/libpng/libpng-1.6.37-r2.ebuild4
-rw-r--r--media-libs/libpulse/Manifest2
-rw-r--r--media-libs/libpulse/files/15.0-no-aec.patch45
-rw-r--r--media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch25
-rw-r--r--media-libs/libpulse/libpulse-15.99.1-r1.ebuild (renamed from media-libs/libpulse/libpulse-15.0.ebuild)29
-rw-r--r--media-libs/libraw/libraw-0.20.2.ebuild4
-rw-r--r--media-libs/librosprite/librosprite-0.1.3-r2.ebuild4
-rw-r--r--media-libs/librtprocess/Manifest1
-rw-r--r--media-libs/librtprocess/librtprocess-0.12.0.ebuild14
-rw-r--r--media-libs/librtprocess/metadata.xml20
-rw-r--r--media-libs/libsamplerate/libsamplerate-0.2.2.ebuild4
-rw-r--r--media-libs/libsamplerate/libsamplerate-9999.ebuild4
-rw-r--r--media-libs/libsbsms/libsbsms-2.3.0.ebuild3
-rw-r--r--media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild4
-rw-r--r--media-libs/libsdl2/Manifest2
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild (renamed from media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild)7
-rw-r--r--media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch14
-rw-r--r--media-libs/libsfml/libsfml-2.5.1.ebuild6
-rw-r--r--media-libs/libshout/Manifest2
-rw-r--r--media-libs/libshout/libshout-2.4.6.ebuild (renamed from media-libs/libshout/libshout-2.4.5.ebuild)4
-rw-r--r--media-libs/libsidplay/files/libsidplay-2.1.1-autoconf.patch172
-rw-r--r--media-libs/libsidplay/files/libsidplay-2.1.1-slibtool.patch39
-rw-r--r--media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild81
-rw-r--r--media-libs/libsidplay/metadata.xml4
-rw-r--r--media-libs/libsidplayfp/Manifest2
-rw-r--r--media-libs/libsidplayfp/libsidplayfp-2.3.1.ebuild (renamed from media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild)4
-rw-r--r--media-libs/libsixel/files/libsixel-musl.patch57
-rw-r--r--media-libs/libsixel/libsixel-1.10.3.ebuild5
-rw-r--r--media-libs/libsmf/libsmf-1.3.ebuild4
-rw-r--r--media-libs/libsndfile/Manifest2
-rw-r--r--media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild (renamed from media-libs/libsndfile/libsndfile-1.0.31.ebuild)11
-rw-r--r--media-libs/libsndfile/libsndfile-9999.ebuild11
-rw-r--r--media-libs/libsoundio/metadata.xml9
-rw-r--r--media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild13
-rw-r--r--media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild4
-rw-r--r--media-libs/libtaginfo/Manifest1
-rw-r--r--media-libs/libtaginfo/libtaginfo-0.2.1.ebuild21
-rw-r--r--media-libs/libtgvoip/Manifest2
-rw-r--r--media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild (renamed from media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r3.ebuild)16
-rw-r--r--media-libs/libtheora/libtheora-1.1.1-r2.ebuild4
-rw-r--r--media-libs/libtimidity/libtimidity-0.2.7.ebuild2
-rw-r--r--media-libs/libuninameslist/Manifest2
-rw-r--r--media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch64
-rw-r--r--media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild22
-rw-r--r--media-libs/libuninameslist/libuninameslist-20211114.ebuild33
-rw-r--r--media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch36
-rw-r--r--media-libs/libuvc/libuvc-0.0.6-r2.ebuild (renamed from media-libs/libuvc/libuvc-0.0.6-r1.ebuild)27
-rw-r--r--media-libs/libv4l/Manifest1
-rw-r--r--media-libs/libv4l/files/libv4l-1.20.0-automagic.patch52
-rw-r--r--media-libs/libv4l/libv4l-1.20.0.ebuild78
-rw-r--r--media-libs/libv4l/libv4l-1.22.1.ebuild4
-rw-r--r--media-libs/libvmaf/Manifest1
-rw-r--r--media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild64
-rw-r--r--media-libs/libvmaf/metadata.xml22
-rw-r--r--media-libs/libvorbis/libvorbis-1.3.7.ebuild4
-rw-r--r--media-libs/libvpx/Manifest6
-rw-r--r--media-libs/libvpx/files/libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch211
-rw-r--r--media-libs/libvpx/libvpx-1.11.0.ebuild (renamed from media-libs/libvpx/libvpx-1.10.0.ebuild)36
-rw-r--r--media-libs/libvpx/libvpx-1.7.0-r1.ebuild131
-rw-r--r--media-libs/libvpx/libvpx-1.9.0.ebuild6
-rw-r--r--media-libs/libvpx/metadata.xml1
-rw-r--r--media-libs/libwebp/Manifest2
-rw-r--r--media-libs/libwebp/libwebp-1.1.0.ebuild4
-rw-r--r--media-libs/libwebp/libwebp-1.2.0.ebuild4
-rw-r--r--media-libs/libwebp/libwebp-1.2.1.ebuild70
-rw-r--r--media-libs/libwebp/libwebp-1.2.2.ebuild70
-rw-r--r--media-libs/libwebp/metadata.xml2
-rw-r--r--media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild (renamed from media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild)5
-rw-r--r--media-libs/libxmp/Manifest1
-rw-r--r--media-libs/libxmp/libxmp-4.5.0.ebuild27
-rw-r--r--media-libs/libxmp/libxmp-9999.ebuild27
-rw-r--r--media-libs/libxmp/metadata.xml (renamed from media-libs/libtaginfo/metadata.xml)8
-rw-r--r--media-libs/libxtract/libxtract-0.6.6.ebuild21
-rw-r--r--media-libs/libzen/Manifest1
-rw-r--r--media-libs/libzen/libzen-0.4.38.ebuild6
-rw-r--r--media-libs/libzen/libzen-0.4.39.ebuild67
-rw-r--r--media-libs/libzmf/libzmf-0.0.2.ebuild4
-rw-r--r--media-libs/lilv/lilv-0.24.12.ebuild2
-rw-r--r--media-libs/lv2/lv2-1.18.2.ebuild4
-rw-r--r--media-libs/mesa-amber/Manifest1
-rw-r--r--media-libs/mesa-amber/mesa-amber-21.3.8.ebuild206
-rw-r--r--media-libs/mesa-amber/metadata.xml18
-rw-r--r--media-libs/mesa/Manifest8
-rw-r--r--media-libs/mesa/mesa-21.2.6.ebuild560
-rw-r--r--media-libs/mesa/mesa-21.3.1.ebuild552
-rw-r--r--media-libs/mesa/mesa-21.3.8.ebuild (renamed from media-libs/mesa/mesa-21.2.5.ebuild)7
-rw-r--r--media-libs/mesa/mesa-22.0.3.ebuild462
-rw-r--r--media-libs/mesa/mesa-22.0.4.ebuild (renamed from media-libs/mesa/mesa-21.3.0.ebuild)380
-rw-r--r--media-libs/mesa/mesa-22.1.0.ebuild463
-rw-r--r--media-libs/mesa/mesa-9999.ebuild20
-rw-r--r--media-libs/mesa/metadata.xml1
-rw-r--r--media-libs/mlt/Manifest3
-rw-r--r--media-libs/mlt/files/mlt-7.6.0-impl-func-decl-gps_parser.patch19
-rw-r--r--media-libs/mlt/mlt-7.4.0.ebuild (renamed from media-libs/mlt/mlt-7.2.0-r1.ebuild)6
-rw-r--r--media-libs/mlt/mlt-7.6.0.ebuild157
-rw-r--r--media-libs/munt-mt32emu/Manifest2
-rw-r--r--media-libs/munt-mt32emu/files/munt-mt32emu-2.4.2-docs.patch14
-rw-r--r--media-libs/munt-mt32emu/files/munt-mt32emu-2.6.1-docs.patch14
-rw-r--r--media-libs/munt-mt32emu/munt-mt32emu-2.6.3.ebuild (renamed from media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild)6
-rw-r--r--media-libs/nas/Manifest2
-rw-r--r--media-libs/nas/files/nas-1.9.4-fno-config.patch42
-rw-r--r--media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch36
-rw-r--r--media-libs/nas/nas-1.9.5.ebuild (renamed from media-libs/nas/nas-1.9.4-r2.ebuild)16
-rw-r--r--media-libs/netpbm/Manifest1
-rw-r--r--media-libs/netpbm/netpbm-10.86.27.ebuild4
-rw-r--r--media-libs/netpbm/netpbm-10.86.30.ebuild229
-rw-r--r--media-libs/nv-codec-headers/Manifest7
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-10.0.26.0.ebuild33
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild33
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-11.0.10.0.ebuild29
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild4
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild23
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild35
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-9.0.18.1.ebuild35
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild33
-rw-r--r--media-libs/oidn/Manifest1
-rw-r--r--media-libs/oidn/oidn-1.4.2.ebuild29
-rw-r--r--media-libs/openal/Manifest1
-rw-r--r--media-libs/openal/openal-1.22.0.ebuild83
-rw-r--r--media-libs/opencolorio/Manifest5
-rw-r--r--media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch14
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.3.ebuild (renamed from media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild)0
-rw-r--r--media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild (renamed from media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild)8
-rw-r--r--media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild (renamed from media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild)53
-rw-r--r--media-libs/openctm/openctm-1.0.3-r1.ebuild4
-rw-r--r--media-libs/opencv/Manifest11
-rw-r--r--media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch123
-rw-r--r--media-libs/opencv/metadata.xml5
-rw-r--r--media-libs/opencv/opencv-4.5.0-r3.ebuild566
-rw-r--r--media-libs/opencv/opencv-4.5.1-r3.ebuild568
-rw-r--r--media-libs/opencv/opencv-4.5.2-r3.ebuild570
-rw-r--r--media-libs/opencv/opencv-4.5.2-r5.ebuild571
-rw-r--r--media-libs/opencv/opencv-4.5.5-r1.ebuild (renamed from media-libs/opencv/opencv-4.5.4.ebuild)27
-rw-r--r--media-libs/openexr/Manifest7
-rw-r--r--media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch119
-rw-r--r--media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch252
-rw-r--r--media-libs/openexr/openexr-2.5.8.ebuild (renamed from media-libs/openexr/openexr-2.5.6.ebuild)25
-rw-r--r--media-libs/openexr/openexr-3.1.1.ebuild78
-rw-r--r--media-libs/openexr/openexr-3.1.4-r1.ebuild (renamed from media-libs/openexr/openexr-3.1.2.ebuild)25
-rw-r--r--media-libs/openexr/openexr-3.1.5.ebuild (renamed from media-libs/openexr/openexr-3.1.3.ebuild)31
-rw-r--r--media-libs/openh264/Manifest3
-rw-r--r--media-libs/openh264/openh264-2.1.1.ebuild115
-rw-r--r--media-libs/openh264/openh264-2.2.0.ebuild (renamed from media-libs/openh264/openh264-2.1.1_p20190331.ebuild)21
-rw-r--r--media-libs/openimageio/Manifest7
-rw-r--r--media-libs/openimageio/openimageio-2.2.19.0.ebuild168
-rw-r--r--media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild (renamed from media-libs/openimageio/openimageio-2.3.10.1.ebuild)26
-rw-r--r--media-libs/openimageio/openimageio-2.3.13.0.ebuild (renamed from media-libs/openimageio/openimageio-2.3.9.1.ebuild)26
-rw-r--r--media-libs/openimageio/openimageio-2.3.15.0.ebuild (renamed from media-libs/openimageio/openimageio-2.3.10.0.ebuild)28
-rw-r--r--media-libs/openjpeg/Manifest2
-rw-r--r--media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch435
-rw-r--r--media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch17
-rw-r--r--media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch52
-rw-r--r--media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch57
-rw-r--r--media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch302
-rw-r--r--media-libs/openjpeg/metadata.xml9
-rw-r--r--media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild139
-rw-r--r--media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild140
-rw-r--r--media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild142
-rw-r--r--media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild140
-rw-r--r--media-libs/opensubdiv/Manifest1
-rw-r--r--media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch25
-rw-r--r--media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch51
-rw-r--r--media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch65
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild90
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild85
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild (renamed from media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild)7
-rw-r--r--media-libs/opus/opus-1.3.1-r3.ebuild (renamed from media-libs/opus/opus-1.3.1-r2.ebuild)6
-rw-r--r--media-libs/opusfile/opusfile-0.12.ebuild4
-rw-r--r--media-libs/osl/Manifest4
-rw-r--r--media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch24
-rw-r--r--media-libs/osl/files/osl-1.11.17.0-llvm14.patch35
-rw-r--r--media-libs/osl/files/osl-1.12.0.2-llvm-11.patch29
-rw-r--r--media-libs/osl/files/osl-1.12.0.2-llvm-12.patch240
-rw-r--r--media-libs/osl/osl-1.11.16.0-r2.ebuild4
-rw-r--r--media-libs/osl/osl-1.11.17.0-r4.ebuild (renamed from media-libs/osl/osl-1.11.15.0-r1.ebuild)29
-rw-r--r--media-libs/osl/osl-1.12.0.2.ebuild88
-rw-r--r--media-libs/osl/osl-1.12.4.1-r2.ebuild (renamed from media-libs/osl/osl-1.12.0.2-r3.ebuild)25
-rw-r--r--media-libs/partio/Manifest1
-rw-r--r--media-libs/partio/partio-1.14.6.ebuild (renamed from media-libs/partio/partio-9999.ebuild)13
-rw-r--r--media-libs/pcaudiolib/pcaudiolib-1.1.ebuild4
-rw-r--r--media-libs/phat/files/phat-0.4.1-libm-underlinking.patch16
-rw-r--r--media-libs/phat/phat-0.4.1-r2.ebuild (renamed from media-libs/phat/phat-0.4.1-r1.ebuild)23
-rw-r--r--media-libs/pnglite/pnglite-0.1.17-r1.ebuild2
-rw-r--r--media-libs/pnglite/pnglite-0.1.17.ebuild51
-rw-r--r--media-libs/portaudio/portaudio-19.07.00-r2.ebuild4
-rw-r--r--media-libs/portmidi/portmidi-234.ebuild3
-rw-r--r--media-libs/ptex/ptex-2.3.2.ebuild4
-rw-r--r--media-libs/qhull/qhull-2020.2-r3.ebuild4
-rw-r--r--media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch22
-rw-r--r--media-libs/quarter/metadata.xml42
-rw-r--r--media-libs/quarter/quarter-1.1.0-r1.ebuild (renamed from media-libs/quarter/quarter-1.1.0.ebuild)25
-rw-r--r--media-libs/raptor/raptor-2.0.15-r4.ebuild2
-rw-r--r--media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild11
-rw-r--r--media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild6
-rw-r--r--media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild6
-rw-r--r--media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild7
-rw-r--r--media-libs/rtaudio/Manifest1
-rw-r--r--media-libs/rtaudio/rtaudio-5.1.0.ebuild62
-rw-r--r--media-libs/rtaudio/rtaudio-5.2.0.ebuild4
-rw-r--r--media-libs/rtmidi/Manifest1
-rw-r--r--media-libs/rtmidi/metadata.xml15
-rw-r--r--media-libs/rtmidi/rtmidi-5.0.0.ebuild30
-rw-r--r--media-libs/rubberband/Manifest3
-rw-r--r--media-libs/rubberband/files/rubberband-2.0.1-build.patch (renamed from media-libs/rubberband/files/rubberband-1.9.2-build.patch)46
-rw-r--r--media-libs/rubberband/rubberband-1.9.2.ebuild54
-rw-r--r--media-libs/rubberband/rubberband-2.0.2.ebuild (renamed from media-libs/rubberband/rubberband-2.0.0.ebuild)6
-rw-r--r--media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild4
-rw-r--r--media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild4
-rw-r--r--media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild2
-rw-r--r--media-libs/sdl2-ttf/Manifest1
-rw-r--r--media-libs/sdl2-ttf/metadata.xml3
-rw-r--r--media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild45
-rw-r--r--media-libs/sdl_audiolib/Manifest1
-rw-r--r--media-libs/sdl_audiolib/metadata.xml17
-rw-r--r--media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild59
-rw-r--r--media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild59
-rw-r--r--media-libs/sge/sge-030809.ebuild8
-rw-r--r--media-libs/shaderc/Manifest2
-rw-r--r--media-libs/shaderc/shaderc-2021.3.ebuild4
-rw-r--r--media-libs/shaderc/shaderc-2022.1-r1.ebuild92
-rw-r--r--media-libs/shaderc/shaderc-2022.1.ebuild (renamed from media-libs/shaderc/shaderc-2021.2.ebuild)14
-rw-r--r--media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild4
-rw-r--r--media-libs/soxr/soxr-0.1.3-r1.ebuild4
-rw-r--r--media-libs/spandsp/spandsp-0.0.6-r1.ebuild4
-rw-r--r--media-libs/spandsp/spandsp-0.0.6.ebuild66
-rw-r--r--media-libs/speexdsp/speexdsp-1.2.0.ebuild4
-rw-r--r--media-libs/sratom/sratom-0.6.8.ebuild2
-rw-r--r--media-libs/stk/Manifest1
-rw-r--r--media-libs/stk/stk-4.6.1.ebuild79
-rw-r--r--media-libs/stk/stk-4.6.2.ebuild5
-rw-r--r--media-libs/suil/suil-0.10.10.ebuild4
-rw-r--r--media-libs/svgalib/svgalib-1.9.25-r8.ebuild11
-rw-r--r--media-libs/svt-av1/Manifest1
-rw-r--r--media-libs/svt-av1/svt-av1-0.8.7.ebuild4
-rw-r--r--media-libs/svt-av1/svt-av1-0.9.1.ebuild40
-rw-r--r--media-libs/svt-av1/svt-av1-9999.ebuild4
-rw-r--r--media-libs/t1lib/t1lib-5.1.2-r3.ebuild (renamed from media-libs/t1lib/t1lib-5.1.2-r2.ebuild)8
-rw-r--r--media-libs/tg_owt/Manifest3
-rw-r--r--media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch36
-rw-r--r--media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch90
-rw-r--r--media-libs/tg_owt/files/tg_owt-0_pre20211207-fix-dcsctp-references.patch17
-rw-r--r--media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch (renamed from media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch)51
-rw-r--r--media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild113
-rw-r--r--media-libs/tg_owt/tg_owt-0_pre20220209.ebuild (renamed from media-libs/tg_owt/tg_owt-0_pre20210914.ebuild)48
-rw-r--r--media-libs/tiff/Manifest2
-rw-r--r--media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch32
-rw-r--r--media-libs/tiff/tiff-4.3.0.ebuild4
-rw-r--r--media-libs/tiff/tiff-4.4.0_rc1.ebuild91
-rw-r--r--media-libs/urt/urt-3.1b-r3.ebuild8
-rw-r--r--media-libs/vidstab/vidstab-1.1.0-r2.ebuild12
-rw-r--r--media-libs/vidstab/vidstab-9999.ebuild12
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-openexr3.patch37
-rw-r--r--media-libs/vigra/vigra-1.11.1-r4.ebuild160
-rw-r--r--media-libs/vigra/vigra-1.11.1-r6.ebuild161
-rw-r--r--media-libs/vigra/vigra-9999.ebuild37
-rw-r--r--media-libs/virglrenderer/virglrenderer-0.9.1.ebuild4
-rw-r--r--media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild13
-rw-r--r--media-libs/vitamtp/vitamtp-9999.ebuild13
-rw-r--r--media-libs/volpack/volpack-1.0_p7-r1.ebuild7
-rw-r--r--media-libs/vulkan-layers/Manifest3
-rw-r--r--media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch27
-rw-r--r--media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch90
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild (renamed from media-libs/vulkan-layers/vulkan-layers-1.2.198.ebuild)4
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild (renamed from media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild)23
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild55
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-9999.ebuild11
-rw-r--r--media-libs/vulkan-loader/Manifest4
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild67
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild2
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild (renamed from media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild)6
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.3.211.ebuild66
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-9999.ebuild4
-rw-r--r--media-libs/woff2/woff2-1.0.2-r5.ebuild (renamed from media-libs/woff2/woff2-1.0.2-r4.ebuild)12
-rw-r--r--media-libs/wxsvg/Manifest1
-rw-r--r--media-libs/wxsvg/files/ffmpeg5.patch64
-rw-r--r--media-libs/wxsvg/wxsvg-1.5.23.ebuild44
-rw-r--r--media-libs/x264/Manifest1
-rw-r--r--media-libs/x264/x264-0.0.20220222.ebuild66
-rw-r--r--media-libs/x264/x264-9999.ebuild12
-rw-r--r--media-libs/x265/x265-3.5-r2.ebuild4
-rw-r--r--media-libs/x265/x265-3.5.ebuild218
-rw-r--r--media-libs/x265/x265-9999.ebuild4
-rw-r--r--media-libs/xine-lib/Manifest1
-rw-r--r--media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch22
-rw-r--r--media-libs/xine-lib/files/xine-lib-1.2.12-fix-mmap-crash.patch15
-rw-r--r--media-libs/xine-lib/metadata.xml3
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild (renamed from media-libs/xine-lib/xine-lib-1.2.11.ebuild)5
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild234
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.9999.ebuild15
-rw-r--r--media-libs/xvid/xvid-1.3.7.ebuild5
-rw-r--r--media-libs/zimg/Manifest1
-rw-r--r--media-libs/zimg/zimg-3.0.3.ebuild32
-rw-r--r--media-libs/zimg/zimg-9999.ebuild4
-rw-r--r--media-libs/zita-alsa-pcmi/Manifest2
-rw-r--r--media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild (renamed from media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild)8
-rw-r--r--media-libs/zvbi/zvbi-0.2.35-r1.ebuild51
-rw-r--r--media-libs/zvbi/zvbi-0.2.35-r2.ebuild2
-rw-r--r--media-libs/zxing-cpp/Manifest1
-rw-r--r--media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild24
687 files changed, 14366 insertions, 11978 deletions
diff --git a/media-libs/Field3D/Field3D-1.7.2-r3.ebuild b/media-libs/Field3D/Field3D-1.7.2-r3.ebuild
new file mode 100644
index 00000000000..834067f5713
--- /dev/null
+++ b/media-libs/Field3D/Field3D-1.7.2-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A library for storing voxel data"
+HOMEPAGE="http://opensource.imageworks.com/?p=field3d"
+SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="mpi"
+
+RDEPEND="
+ >=dev-libs/boost-1.62:=
+ >=dev-libs/imath-3.1.4-r2:=
+ >=media-libs/openexr-3:0=
+ sci-libs/hdf5:=
+ mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.2-openexr-3-imath.patch
+)
+
+src_configure() {
+ # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
+ # bug #808731
+ append-cppflags -DH5_USE_110_API
+
+ local mycmakeargs=(
+ -DINSTALL_DOCS=OFF # Docs are not finished yet.
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+ $(cmake_use_find_package mpi MPI)
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/Field3D/files/Field3D-1.7.2-openexr-3-imath.patch b/media-libs/Field3D/files/Field3D-1.7.2-openexr-3-imath.patch
new file mode 100644
index 00000000000..a4155403d46
--- /dev/null
+++ b/media-libs/Field3D/files/Field3D-1.7.2-openexr-3-imath.patch
@@ -0,0 +1,233 @@
+https://src.fedoraproject.org/rpms/Field3D/raw/rawhide/f/Field3D-openexr.patch
+https://github.com/imageworks/Field3D/issues/101
+
+--- a/export/StdMathLib.h
++++ b/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+
+-#include <OpenEXR/ImathBox.h>
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h>
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
+
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathBox.h>
++# include <Imath/ImathBoxAlgo.h>
++# include <Imath/ImathColor.h>
++# include <Imath/ImathMatrix.h>
++# include <Imath/ImathMatrixAlgo.h>
++# include <Imath/ImathPlane.h>
++# include <Imath/ImathRandom.h>
++# include <Imath/ImathRoots.h>
++# include <Imath/ImathVec.h>
++# include <Imath/half.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathBox.h>
++# include <OpenEXR/ImathBoxAlgo.h>
++# include <OpenEXR/ImathColor.h>
++# include <OpenEXR/ImathHalfLimits.h>
++# include <OpenEXR/ImathMatrix.h>
++# include <OpenEXR/ImathMatrixAlgo.h>
++# include <OpenEXR/ImathPlane.h>
++# include <OpenEXR/ImathRandom.h>
++# include <OpenEXR/ImathRoots.h>
++# include <OpenEXR/ImathVec.h>
++# include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+
+ #include "ns.h"
+--- a/export/Curve.h
++++ b/export/Curve.h
+@@ -53,8 +53,25 @@
+
+ #include <boost/lexical_cast.hpp>
+
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathFun.h>
++# include <Imath/ImathMatrix.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathFun.h>
++# include <OpenEXR/ImathMatrix.h>
++#endif
++
+
+ //----------------------------------------------------------------------------//
+
+--- a/include/OgUtil.h
++++ b/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathVec.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathVec.h>
++#endif
+
+ #include "All.h"
+ #include "UtilFoundation.h"
+--- a/include/UtilFoundation.h
++++ b/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+
+ #include <memory>
+
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/half.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/half.h>
++#endif
+
+ #include <iomanip>
+ #include <iostream>
+--- a/include/OgIAttribute.h
++++ b/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+
+ #include "OgUtil.h"
+
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathMatrix.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathMatrix.h>
++#endif
+
+ //----------------------------------------------------------------------------//
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++ # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++ find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+ LIST ( APPEND Field3D_Libraries_Shared
+ ${MPI_LIBRARIES} )
+ ENDIF ( MPI_FOUND )
+- LIST ( APPEND Field3D_Libraries_Shared
+- Iex Half IlmThread Imath
+- pthread dl z )
++ if(TARGET Imath::Imath)
++ list(APPEND Field3D_Libraries_Shared
++ # For OpenEXR/Imath 3.x:
++ $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++ $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++ $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++ pthread
++ dl
++ z)
++ else()
++ LIST ( APPEND Field3D_Libraries_Shared
++ Iex Half IlmThread Imath
++ pthread dl z )
++ endif()
+ SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+ SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+ ${Boost_LIBRARIES} )
+--- a/test/unit_tests/UnitTest.cpp
++++ b/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathFrustum.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathFrustum.h>
++#endif
+
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 3c46d84a068..c66334ab958 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,3 +1,2 @@
DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
-DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
DIST allegro-5.2.7.0.tar.gz 7911231 BLAKE2B 9cc588a42d461ce06db94c1dd57642a2e9445c4930fcc164f2da57edfb463552a279a5e50f46740561a88c974c96605bb09fcc596e7bc6afb5e30b18ff7b74d5 SHA512 300bb951c661e7a220d913cca4116aba99afdcb5346af7c57b09bbdfa892d446cd64fde54397c57edb3c5f57d3380fbc2b6c4d9c9e17f48ff8180cfbf59e7d99
diff --git a/media-libs/allegro/allegro-5.2.6.0.ebuild b/media-libs/allegro/allegro-5.2.6.0.ebuild
deleted file mode 100644
index 32f11a6aac4..00000000000
--- a/media-libs/allegro/allegro-5.2.6.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
-
-DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="X? ( opengl )
- xinerama? ( X )
- || ( alsa openal oss pulseaudio )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- dumb? ( >=media-libs/dumb-0.9.3-r2:=[${MULTILIB_USEDEP}] )
- flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
- gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
- opengl? (
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- )
- opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
- physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
- )
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
-
-src_configure() {
- # We forego freeimage for now because ebuild is not multilib
- # No known consumers yet anyway
- local mycmakeargs=(
- -DWANT_ALSA=$(usex alsa)
- -DWANT_DEMO=OFF
- -DWANT_EXAMPLES=OFF
- -DWANT_FLAC=$(usex flac)
- -DWANT_IMAGE_FREEIMAGE=OFF
- -DWANT_IMAGE_JPG=$(usex jpeg)
- -DWANT_IMAGE_PNG=$(usex png)
- -DWANT_IMAGE_WEBP=$(usex webp)
- -DWANT_MODAUDIO=$(usex dumb)
- -DWANT_NATIVE_DIALOG=$(usex gtk)
- -DWANT_OGG_VIDEO=$(usex vorbis)
- -DWANT_OPENAL=$(usex openal)
- -DWANT_OPENGL=$(usex opengl)
- -DWANT_OPUS=$(usex opus)
- -DWANT_OSS=$(usex oss)
- -DWANT_PHYSFS=$(usex physfs)
- -DWANT_PRIMITIVES=$(usex opengl)
- -DWANT_PULSEAUDIO=$(usex pulseaudio)
- -DWANT_TESTS=$(usex test)
- -DWANT_TTF=$(usex truetype)
- -DWANT_VORBIS=$(usex vorbis)
- -DWANT_X11=$(usex X)
- -DWANT_X11_XINERAMA=$(usex xinerama)
- )
-
- cmake-multilib_src_configure
-}
-
-src_install() {
- local HTML_DOCS=( docs/html/refman/. )
- cmake-multilib_src_install
-
- dodoc CHANGES-5.0.txt CHANGES-5.1.txt CHANGES-5.2.txt
- doman docs/man/*.3
-}
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index baae0ac54fb..84d1c4db738 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,3 +1,4 @@
DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
+DIST alsa-lib-1.2.6.1.tar.bz2 1079670 BLAKE2B 4f3d1d078678773b4f6a569d0eea95d0cf89a846605c3a95e11b92f1fe0bd9fb164b8f710906f0de9675ade7ef2123375eb1221945bec511708d6fdd85c051b9 SHA512 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45
DIST alsa-lib-1.2.6.tar.bz2 1079598 BLAKE2B 84a7a20fbea4025f2ac08acefa3a9ea9d2737585c5d5f09c8df3b5ccb998eaa09a7ec16a019a40c4d3e3e4b5209b961f9da23ec57c0bb9824bade9a3a0dd4350 SHA512 ae95718813abf62811fe44c6df2a8de5a1227da4b022c4dd97dd8e7c1001f48307ba36bf04208bdbe24e8a8eebf4ed5a59f40ee6750dcbe976678071c3f2f5b7
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index dcdaabb3320..a79d156fc21 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.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
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+IUSE="alisp debug doc python +thread-safety"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -35,10 +35,6 @@ pkg_setup() {
src_prepare() {
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # https://bugs.gentoo.org/509886
- if use elibc_uclibc ; then
- sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
- fi
# https://bugs.gentoo.org/545950
sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
default
@@ -58,7 +54,6 @@ multilib_src_configure() {
$(use_enable alisp)
$(use_enable thread-safety)
$(use_with debug)
- $(usex elibc_uclibc --without-versioned '')
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
index 78afa733c3c..5bae5dbf873 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.5.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
@@ -21,7 +21,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+IUSE="alisp debug doc python +thread-safety"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -42,10 +42,6 @@ pkg_setup() {
src_prepare() {
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # https://bugs.gentoo.org/509886
- if use elibc_uclibc ; then
- sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
- fi
# https://bugs.gentoo.org/545950
sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
default
@@ -65,7 +61,6 @@ multilib_src_configure() {
$(use_enable alisp)
$(use_enable thread-safety)
$(use_with debug)
- $(usex elibc_uclibc --without-versioned '')
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
new file mode 100644
index 00000000000..6368e7ce3b6
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ ${PV} == *_p* ]] ; then
+ # Please set correct commit ID for a snapshot release!!!
+ COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+ SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+ # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc python +thread-safety"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ media-libs/alsa-topology-conf
+ media-libs/alsa-ucm-conf
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+ # https://bugs.gentoo.org/545950
+ sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-maintainer-mode
+ --disable-resmgr
+ --enable-aload
+ --enable-rawmidi
+ --enable-seq
+ --enable-shared
+ # enable Python only on final ABI
+ $(multilib_native_use_enable python)
+ $(use_enable alisp)
+ $(use_enable thread-safety)
+ $(use_with debug)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ emake
+
+ if multilib_is_native_abi && use doc; then
+ emake doc
+ grep -FZrl "${S}" doc/doxygen/html | \
+ xargs -0 sed -i -e "s:${S}::" || die
+ fi
+}
+
+multilib_src_install() {
+ multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+ default
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+ dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
index 1b9c1819ad9..c9ea9965ca3 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.6.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
@@ -21,7 +21,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+IUSE="alisp debug doc python +thread-safety"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -42,10 +42,6 @@ pkg_setup() {
src_prepare() {
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # https://bugs.gentoo.org/509886
- if use elibc_uclibc ; then
- sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
- fi
# https://bugs.gentoo.org/545950
sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
default
@@ -65,7 +61,6 @@ multilib_src_configure() {
$(use_enable alisp)
$(use_enable thread-safety)
$(use_with debug)
- $(usex elibc_uclibc --without-versioned '')
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
index 886558fd2b4..410f32645d0 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.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
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
IUSE=""
RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 14fefe47ee0..d4ac3b1e369 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,3 +1,6 @@
DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
DIST alsa-ucm-conf-1.2.5.1.tar.bz2 24124 BLAKE2B 317bcb8e866a68fe467047c67bd15fc88dc1e745e9bbe05f7b091ea1febdac6bd0fd512c2ce410970eb2593c0f8500c28c8405098de2bc56e1438e5b33b00d4a SHA512 774d6da1a0ee6fb1fcd764c1d4b3eb5812a35508cf27db71f6c82784f125eca207992da9081d25783fecb31e548d8b34124d4b3b3d506e33215b76ea48f71012
+DIST alsa-ucm-conf-1.2.6.1.tar.bz2 27682 BLAKE2B 12ff26daefa4ab0c66d1d0778dfd8a588a30b331dcaa783350510e439cefc83c15422b027ca2119d5a1ecd98257c3f2022219d4096f0d1d3c5122b69eb396e48 SHA512 2fca5f6dd87ff46865b57c6224aac9d0a8ca6f09f26c4116b0b0db6379236db7322b240186e3bef05e97c4ccbbd12a73299aca35d85aed0cb20b0019696d6a16
+DIST alsa-ucm-conf-1.2.6.2.tar.bz2 27720 BLAKE2B 98d0ad854b510f8ef41d014686e87776141cb8d3cc2989d5e91407bd2b412c0cb986d0ed726c9849bfc99472d6ca1f875e4c3ce16ac1b9181f031a210f13eb13 SHA512 d7122279bc36ab16dfe1a5f2e24b9dda57e1b59b7c7aeac3c8755af62b464053ed038aa56ebb52d7707ecae01674cac920ea784bb7493d978276a98cbf78d873
+DIST alsa-ucm-conf-1.2.6.3.tar.bz2 28153 BLAKE2B c14e50f2bcf95fbc038d3b2b5801850d4d22ab041fdb57dd9f4b161a748326671687585279801a9d3f803abd3d253d86b6b3e891e8c3024c5641f8a24ccccbb7 SHA512 14031173dd9b44c506f13172fcf89d1119e4b2d409a749ec8ef4948e75231a5e5091206e826dff9e70f1f803de8cfb9fd94886ef70764c705f65c1c7ebdf649f
DIST alsa-ucm-conf-1.2.6.tar.bz2 27309 BLAKE2B 4f1f0ff361d11775799a215ffbd85acc229fb25e9e65321147e942ec5168997780003686a98f3d49dadd11cebc3156812d01ebcac385b0b7bbbbcbab78745951 SHA512 5fe85643b60c8defeafcdfcf97e61b5d05e6db28cef2466a70f63b8fffba22bdd50b83a5ca88806a6350de6e9d802dd3c2240b293190b9d05daea515c03d4397
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.1.ebuild
new file mode 100644
index 00000000000..fc541a8256d
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ insinto /usr/share/alsa
+ doins -r ucm{,2}
+}
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.2.ebuild
new file mode 100644
index 00000000000..fc541a8256d
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ insinto /usr/share/alsa
+ doins -r ucm{,2}
+}
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild
new file mode 100644
index 00000000000..93fd2550be0
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ insinto /usr/share/alsa
+ doins -r ucm{,2}
+}
diff --git a/media-libs/amdgpu-pro-vulkan/Manifest b/media-libs/amdgpu-pro-vulkan/Manifest
new file mode 100644
index 00000000000..98be7e7cd09
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/Manifest
@@ -0,0 +1,6 @@
+DIST amdgpu-pro-vulkan-21.50.1.1376756-amd64.deb 8342920 BLAKE2B a99ba48ded384e39beca0f7321ee6cc77f751843c7ee5d9b45e284740ac1a0932497e3029e95e6f7f6bc1a0d3772619be01a0bc22b4b3857bf24a47f1cfa7b2d SHA512 ff9479652c6b7d359e3b1b1c8f5038f4e447fe2f5f5f186414ecae30ed99be75373bacb599045b23d530c93a78d8049d2bedf129e655c198c9e9e9f8b528d951
+DIST amdgpu-pro-vulkan-21.50.1.1376756-i386.deb 8124604 BLAKE2B 5d325d2b6fe0b22c227df41049330f394315f17aa97203c7032131d5932e75d494539eac4d5e7ea89193a2736068e3a8e5f7a60de9a1a94b8af0b7fba757da21 SHA512 11480ebec72408a5727f99055c32d979912f838256d622c77c7efec37735d2805cf5c52e78d3c86dc0420d29ad52df2d65cd788b67cef1b2df1cfaa5a30c4bc2
+DIST amdgpu-pro-vulkan-21.50.2.1384496-amd64.deb 8320356 BLAKE2B 1a5997ee983bf4729c429dae7d333fd49f8bb24a5022238299fd87e4ad8a7579c0535a8198fc3869db3b8079634b1e06e9bb90ff761239486cb4ffb7ea6ead4a SHA512 16299cb567d9573080d6e3b83124e931692392c5282a3be5f39638682b2c8d4aa9395787382e0145d61dc5a5df3f3e143d9f01b1710ad11e940f3e8ea5137c7a
+DIST amdgpu-pro-vulkan-21.50.2.1384496-i386.deb 8124180 BLAKE2B 697899e40cedc584d8507c3c4c908c54db3676d47d720fb7b7fcab6e1f542e1d1e5efedb5b46231d4cd6974d3d03a19816d6ab4cc6d2f0279547058b5e4143e3 SHA512 8662efb65f14172f4261401115737f3c7eebbe071a9660f5146eaee9a1d4684c30174b18bea94d31686dbe679d66ab77f252192c1cda27ed57784cc9a57e5fdf
+DIST amdgpu-pro-vulkan-22.10.0.1395274-amd64.deb 9243596 BLAKE2B b083b636cc2f4e1b62a1e89a168a718a16690e7a605daa93693da5ce03b7a03c501db6ddf59b2823016c90cac28ba5e7f9288486799408b76bb85ca86bdd9424 SHA512 6791e536700fcc3558b74978b2a717a8da4e24f4a391fbd00264d1bf505b09fe8fc9bffd3817cfc1cbf5294761dcf6ad38c4c0191d20948b9e219c1b7f393100
+DIST amdgpu-pro-vulkan-22.10.0.1395274-i386.deb 8992376 BLAKE2B 7b3ea214e5cc6a987cc8cfefa3bce1e06426fca6e0cf125b71e90b5f3d350a8f15c635abb541d479703b5ca0f546a968076a522d526a68e1ec12a90b466721da SHA512 5e5ba42933c820be524cd21685f85c0efc3787e9f1f2bf1d985aea7fd3a386ca98ea7f9f75d32d15d3f9d66e444177cbc7e6f357fe1092bbf193bc9b0f97ee8a
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild
new file mode 100644
index 00000000000..b391b5756ff
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild
@@ -0,0 +1,108 @@
+# 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="vulkan-amdgpu-pro"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV}/ubuntu/pool/proprietary/v/${MY_PN}"
+
+DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="
+ abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}-amd64.deb )
+ abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_i386.deb -> ${P}-i386.deb )
+"
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
+
+REQUIRED_USE="video_cards_amdgpu"
+
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="
+ usr/lib64/amdvlkpro64.so*
+ usr/lib/amdvlkpro32.so*
+"
+
+src_unpack() {
+ if use abi_x86_64 ; then
+ mkdir "${S}/${PN}-amd64" || die
+ cd "${S}/${PN}-amd64" || die
+ unpack_deb "${DISTDIR}/${P}-amd64.deb"
+ fi
+
+ if use abi_x86_32 ; then
+ mkdir "${S}/${PN}-i386" || die
+ cd "${S}/${PN}-i386" || die
+ unpack_deb "${DISTDIR}/${P}-i386.deb"
+ fi
+}
+
+src_prepare() {
+ if use abi_x86_64 ; then
+ cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
+ mv amdvlk64.so.1.0 amdvlkpro64.so.1.0 || die
+ patchelf --set-soname amdvlkpro64.so.1.0 "${PWD}"/amdvlkpro64.so.1.0 || die
+
+ cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+ eapply "${FILESDIR}"/icd_amd64.patch
+ mv amd_icd64.json amd_pro_icd64.json || die
+ fi
+
+ if use abi_x86_32 ; then
+ cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
+ mv amdvlk32.so.1.0 amdvlkpro32.so.1.0 || die
+ patchelf --set-soname amdvlkpro32.so.1.0 "${PWD}"/amdvlkpro32.so.1.0 || die
+
+ cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+ eapply "${FILESDIR}"/icd_x86.patch
+ mv amd_icd32.json amd_pro_icd32.json || die
+ fi
+
+ default
+}
+
+src_install() {
+ if use abi_x86_64 ; then
+ insinto /usr/lib64
+
+ # Vulkan
+ doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so.1.0
+ dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so
+ dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so.1
+
+ # ICD loader
+ insinto /usr/share/vulkan/icd.d
+ doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
+ fi
+
+ if use abi_x86_32 ; then
+ insinto /usr/lib
+
+ # Vulkan
+ doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so.1.0
+ dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so
+ dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so.1
+
+ # ICD loader
+ insinto /usr/share/vulkan/icd.d
+ doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
+ fi
+}
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
new file mode 100644
index 00000000000..b391b5756ff
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
@@ -0,0 +1,108 @@
+# 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="vulkan-amdgpu-pro"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV}/ubuntu/pool/proprietary/v/${MY_PN}"
+
+DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="
+ abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}-amd64.deb )
+ abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_i386.deb -> ${P}-i386.deb )
+"
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
+
+REQUIRED_USE="video_cards_amdgpu"
+
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="
+ usr/lib64/amdvlkpro64.so*
+ usr/lib/amdvlkpro32.so*
+"
+
+src_unpack() {
+ if use abi_x86_64 ; then
+ mkdir "${S}/${PN}-amd64" || die
+ cd "${S}/${PN}-amd64" || die
+ unpack_deb "${DISTDIR}/${P}-amd64.deb"
+ fi
+
+ if use abi_x86_32 ; then
+ mkdir "${S}/${PN}-i386" || die
+ cd "${S}/${PN}-i386" || die
+ unpack_deb "${DISTDIR}/${P}-i386.deb"
+ fi
+}
+
+src_prepare() {
+ if use abi_x86_64 ; then
+ cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
+ mv amdvlk64.so.1.0 amdvlkpro64.so.1.0 || die
+ patchelf --set-soname amdvlkpro64.so.1.0 "${PWD}"/amdvlkpro64.so.1.0 || die
+
+ cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+ eapply "${FILESDIR}"/icd_amd64.patch
+ mv amd_icd64.json amd_pro_icd64.json || die
+ fi
+
+ if use abi_x86_32 ; then
+ cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
+ mv amdvlk32.so.1.0 amdvlkpro32.so.1.0 || die
+ patchelf --set-soname amdvlkpro32.so.1.0 "${PWD}"/amdvlkpro32.so.1.0 || die
+
+ cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+ eapply "${FILESDIR}"/icd_x86.patch
+ mv amd_icd32.json amd_pro_icd32.json || die
+ fi
+
+ default
+}
+
+src_install() {
+ if use abi_x86_64 ; then
+ insinto /usr/lib64
+
+ # Vulkan
+ doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so.1.0
+ dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so
+ dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so.1
+
+ # ICD loader
+ insinto /usr/share/vulkan/icd.d
+ doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
+ fi
+
+ if use abi_x86_32 ; then
+ insinto /usr/lib
+
+ # Vulkan
+ doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so.1.0
+ dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so
+ dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so.1
+
+ # ICD loader
+ insinto /usr/share/vulkan/icd.d
+ doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
+ fi
+}
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.0.1395274.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.0.1395274.ebuild
new file mode 100644
index 00000000000..dabe6936012
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.0.1395274.ebuild
@@ -0,0 +1,134 @@
+# 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_LOW = "0" ]] && MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}"
+
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="vulkan-amdgpu-pro"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV}/ubuntu/pool/proprietary/v/${MY_PN}"
+
+DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="
+ abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}-amd64.deb )
+ abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_i386.deb -> ${P}-i386.deb )
+"
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
+
+REQUIRED_USE="video_cards_amdgpu"
+
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="
+ usr/lib64/amdvlkpro64.so*
+ usr/lib/amdvlkpro32.so*
+"
+
+src_unpack() {
+ if use abi_x86_64 ; then
+ mkdir "${S}/${PN}-amd64" || die
+ cd "${S}/${PN}-amd64" || die
+ unpack_deb "${DISTDIR}/${P}-amd64.deb"
+ fi
+
+ if use abi_x86_32 ; then
+ mkdir "${S}/${PN}-i386" || die
+ cd "${S}/${PN}-i386" || die
+ unpack_deb "${DISTDIR}/${P}-i386.deb"
+ fi
+}
+
+src_prepare() {
+ if use abi_x86_64 ; then
+ cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
+
+ # Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
+ [[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/x86_64-linux-gnu/"
+
+ # Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk64.so.1"
+ mv amdvlk64.so* amdvlkpro64.so || die
+
+ # same with the SONAME
+ patchelf --set-soname amdvlkpro64.so "${PWD}"/amdvlkpro64.so || die
+
+ cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+ eapply "${FILESDIR}"/icd_amd64.patch
+ mv amd_icd64.json amd_pro_icd64.json || die
+ fi
+
+ if use abi_x86_32 ; then
+ cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
+
+ # Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
+ [[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/i386-linux-gnu/"
+
+ # Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk32.so.1"
+ mv amdvlk32.so* amdvlkpro32.so || die
+
+ # same with the SONAME
+ patchelf --set-soname amdvlkpro32.so "${PWD}"/amdvlkpro32.so || die
+
+ cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+ eapply "${FILESDIR}"/icd_x86.patch
+ mv amd_icd32.json amd_pro_icd32.json || die
+ fi
+
+ default
+}
+
+src_install() {
+ if use abi_x86_64 ; then
+ # Vulkan driver
+ insinto /usr/lib64
+ doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so
+
+ # ICD loader
+ insinto /usr/share/vulkan/icd.d
+ doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
+ fi
+
+ if use abi_x86_32 ; then
+ # Vulkan driver
+ insinto /usr/lib
+ doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so
+
+ # ICD loader
+ insinto /usr/share/vulkan/icd.d
+ doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
+ fi
+}
+
+pkg_postinst() {
+
+ if use abi_x86_32; then
+ elog "To run a 32bit program using the amdgpu-pro vulkan driver, the environment variable"
+ elog " VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd32.json"
+ elog "must be set beforehand"
+ elog
+ fi
+
+ if use abi_x86_64; then
+ elog "To run a 64bit program using the amdgpu-pro vulkan driver, the environment variable"
+ elog " VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json"
+ elog "must be set beforehand"
+ fi
+}
diff --git a/media-libs/amdgpu-pro-vulkan/files/icd_amd64.patch b/media-libs/amdgpu-pro-vulkan/files/icd_amd64.patch
new file mode 100644
index 00000000000..ac55e40a0f2
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/files/icd_amd64.patch
@@ -0,0 +1,8 @@
+--- a/amd_icd64.json
++++ b/amd_icd64.json
+@@ -4 +4 @@
+- "library_path": "/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlk64.so",
++ "library_path": "/usr/lib64/amdvlkpro64.so",
+@@ -10 +10 @@
+- "library_path": "/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlk64.so",
++ "library_path": "/usr/lib64/amdvlkpro64.so",
diff --git a/media-libs/amdgpu-pro-vulkan/files/icd_x86.patch b/media-libs/amdgpu-pro-vulkan/files/icd_x86.patch
new file mode 100644
index 00000000000..5d70ac2af94
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/files/icd_x86.patch
@@ -0,0 +1,8 @@
+--- a/amd_icd32.json
++++ b/amd_icd32.json
+@@ -4 +4 @@
+- "library_path": "/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlk32.so",
++ "library_path": "/usr/lib/amdvlkpro32.so",
+@@ -10 +10 @@
+- "library_path": "/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlk32.so",
++ "library_path": "/usr/lib/amdvlkpro32.so",
diff --git a/media-libs/amdgpu-pro-vulkan/metadata.xml b/media-libs/amdgpu-pro-vulkan/metadata.xml
new file mode 100644
index 00000000000..6d07c8aa625
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/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-libs/amf-headers/Manifest b/media-libs/amf-headers/Manifest
new file mode 100644
index 00000000000..321a8313dba
--- /dev/null
+++ b/media-libs/amf-headers/Manifest
@@ -0,0 +1 @@
+DIST amf-headers-1.4.23.tar.gz 14971091 BLAKE2B d569851ccb5b3cd57bfff3e6475207e9f01681c2215add160a83165653efce2f0c8acc41a49c227952a649f0cfe92e7e713fbee8bd45b0489844c19e83fa5c74 SHA512 98b2b7d634ac24be5c5234fad99d58c9668b2dab83e89162a0508f9b06efec5de29b307534dc1dd677f9586be2c4fa58c8f04a535d5e66fa0be3b233a117a5d7
diff --git a/media-libs/amf-headers/amf-headers-1.4.23.ebuild b/media-libs/amf-headers/amf-headers-1.4.23.ebuild
new file mode 100644
index 00000000000..f96ac72bc0e
--- /dev/null
+++ b/media-libs/amf-headers/amf-headers-1.4.23.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
+else
+ SRC_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="The Advanced Media Framework (AMF) SDK"
+HOMEPAGE="https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/AMF-${PV}"
+
+src_unpack() {
+ default
+
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ fi
+}
+
+src_install() {
+ insinto "/usr/include/AMF"
+ doins -r "${S}/amf/public/include/"*
+}
diff --git a/media-libs/amf-headers/metadata.xml b/media-libs/amf-headers/metadata.xml
new file mode 100644
index 00000000000..4c80ed58001
--- /dev/null
+++ b/media-libs/amf-headers/metadata.xml
@@ -0,0 +1,16 @@
+<?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>
+ <upstream>
+ <remote-id type="github">GPUOpen-LibrariesAndSDKs/AMF</remote-id>
+ <bugs-to>https://github.com/GPUOpen-LibrariesAndSDKs/AMF/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/media-libs/aribb24/metadata.xml b/media-libs/aribb24/metadata.xml
index 45f620f2942..bef24d2c233 100644
--- a/media-libs/aribb24/metadata.xml
+++ b/media-libs/aribb24/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>marcan@marcan.st</email>
- <name>Hector Martin</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index a4842c4c29f..c8a058fd549 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,2 +1,4 @@
DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
+DIST assimp-5.2.2.tar.gz 49600909 BLAKE2B f5f8b5fc43a44c59c95ac3a1f2ce861a5198851ca910ec7688a818550aa0cde787901f7a7beb9f90f7fe731e18f3c31c7350d3b3070f7437153ff9d041f6ffdf SHA512 7f11f3e53bdcd43a81be49ce2ad90d97769ae1c3c6157f57e8a0b2b41c72f394ad1afcdc5f5fa6fbfa1a44233fed4b9a578d5548ec5b9aae2113ef88c2ec843a
+DIST assimp-5.2.3.tar.gz 49606233 BLAKE2B d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84edaaaa2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863 SHA512 accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa
DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild b/media-libs/assimp/assimp-5.2.2.ebuild
new file mode 100644
index 00000000000..b6c80ce8206
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
+IUSE="samples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/boost:=
+ sys-libs/zlib[minizip]
+ samples? (
+ media-libs/freeglut
+ virtual/opengl
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-usage-of-incompatible-minizip-data-structure.patch
+ "${FILESDIR}"/${P}-disable-failing-tests.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DASSIMP_ASAN=OFF
+ -DASSIMP_BUILD_DOCS=OFF
+ -DASSIMP_BUILD_SAMPLES=$(usex samples)
+ -DASSIMP_BUILD_TESTS=$(usex test)
+ -DASSIMP_ERROR_MAX=ON
+ -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
+ -DASSIMP_IGNORE_GIT_HASH=ON
+ -DASSIMP_UBSAN=OFF
+ )
+
+ if use samples; then
+ mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}/bin/unit" || die
+}
diff --git a/media-libs/assimp/assimp-5.2.3.ebuild b/media-libs/assimp/assimp-5.2.3.ebuild
new file mode 100644
index 00000000000..d74e3f10d1f
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="samples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/boost:=
+ sys-libs/zlib[minizip]
+ samples? (
+ media-libs/freeglut
+ virtual/opengl
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
+ "${FILESDIR}"/${P}-drop-Werror-gcc-option.patch
+ "${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
+)
+
+DOCS=( CodeConventions.md Readme.md )
+
+src_prepare() {
+ if use x86 ; then
+ eapply "${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DASSIMP_ASAN=OFF
+ -DASSIMP_BUILD_DOCS=OFF
+ -DASSIMP_BUILD_SAMPLES=$(usex samples)
+ -DASSIMP_BUILD_TESTS=$(usex test)
+ -DASSIMP_ERROR_MAX=ON
+ -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
+ -DASSIMP_IGNORE_GIT_HASH=ON
+ -DASSIMP_UBSAN=OFF
+ )
+
+ if use samples; then
+ mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}/bin/unit" || die
+}
diff --git a/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
new file mode 100644
index 00000000000..3c423ac5107
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
@@ -0,0 +1,52 @@
+From 8bff102329461e88a879472672b584585c6fbd7e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 11 Mar 2022 11:24:13 +0100
+Subject: [PATCH] disable failing tests
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
++++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+@@ -249,11 +249,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
+ aiMatrix4Scaling(&result_c, &scaling);
+ EXPECT_EQ(result_cpp, result_c);
+ }
+-
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
+- // Use predetermined vectors to prevent running into division by zero.
+- const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize();
+- aiMatrix4x4::FromToMatrix(from, to, result_cpp);
+- aiMatrix4FromTo(&result_c, &from, &to);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+--- a/test/unit/AssimpAPITest_aiQuaternion.cpp
++++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
+@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromAxisAngleTest) {
+ EXPECT_EQ(result_cpp, result_c);
+ }
+
+-TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) {
+- const auto qvec3 = random_unit_vec3();
+- result_cpp = aiQuaternion(qvec3);
+- aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) {
+ result_c = result_cpp = random_quat();
+ EXPECT_EQ(result_cpp == result_c,
+--- a/test/unit/utVersion.cpp
++++ b/test/unit/utVersion.cpp
+@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
+ EXPECT_NE( aiGetCompileFlags(), 0U );
+ }
+
+-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+- EXPECT_NE( aiGetVersionRevision(), 0U );
+-}
+-
+ TEST_F( utVersion, aiGetBranchNameTest ) {
+ EXPECT_NE( nullptr, aiGetBranchName() );
+ }
+--
+2.35.1
+
diff --git a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
new file mode 100644
index 00000000000..6d48161646e
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
@@ -0,0 +1,24 @@
+From https://github.com/assimp/assimp/issues/4334#issue-1097591121
+From: Brecht Sanders (@brechtsanders)
+Date: Fri, 11 Mar 2022 10:01:15 +0100
+Subject: [PATCH] fix usage of incompatible minizip data structure
+
+Suggested-by: Brecht Sanders (@brechtsanders)
+Bug: https://github.com/assimp/assimp/issues/4334
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/code/Common/ZipArchiveIOSystem.cpp
++++ b/code/Common/ZipArchiveIOSystem.cpp
+@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
+ zlib_filefunc_def mapping;
+
+ mapping.zopen_file = (open_file_func)open;
++#ifdef ZOPENDISK64
+ mapping.zopendisk_file = (opendisk_file_func)opendisk;
++#endif
+ mapping.zread_file = (read_file_func)read;
+ mapping.zwrite_file = (write_file_func)write;
+ mapping.ztell_file = (tell_file_func)tell;
+--
+2.35.1
+
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
new file mode 100644
index 00000000000..73675769377
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/840616
+https://github.com/assimp/assimp/issues/4433
+
+From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 25 Apr 2022 17:39:33 +0200
+Subject: [PATCH] drop -Werror gcc option
+
+Temporary hack to allow building with gcc-12
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/code/CMakeLists.txt
++++ b/code/CMakeLists.txt
+@@ -1179,8 +1179,6 @@ TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp)
+ # enable warnings as errors ########################################
+ IF (MSVC)
+ TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX)
+-ELSE()
+- TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)
+ ENDIF()
+
+ # adds C_FLAGS required to compile zip.c on old GCC 4.x compiler
+--
+2.35.1
+
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
new file mode 100644
index 00000000000..1de4f661fa5
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
@@ -0,0 +1,134 @@
+https://bugs.gentoo.org/840767
+https://github.com/assimp/assimp/issues/4438
+
+From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 28 Apr 2022 07:59:26 +0200
+Subject: [PATCH] drop failing tests for abi_x86_32
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
++++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
+@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) {
+ EXPECT_EQ(result_cpp, result_c);
+ }
+
+-TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) {
+- const auto q = random_quat();
+- result_cpp = q.GetMatrix();
+- aiMatrix3FromQuaternion(&result_c, &q);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) {
+ result_c = result_cpp = random_mat3();
+ EXPECT_EQ(result_cpp == result_c,
+--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
++++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) {
+ EXPECT_EQ(result_cpp, result_c);
+ }
+
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) {
+- const aiVector3D s = random_vec3();
+- const aiQuaternion q = random_quat();
+- const aiVector3D t = random_vec3();
+- result_cpp = aiMatrix4x4(s, q, t);
+- aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) {
+ const aiMatrix4x4 temp = random_mat4();
+ result_c = result_cpp = random_mat4();
+@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) {
+ EXPECT_EQ(result_cpp, result_c);
+ }
+
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) {
+- result_c = result_cpp = random_mat4();
+- EXPECT_EQ(result_cpp.Determinant(),
+- aiMatrix4Determinant(&result_c));
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) {
+ EXPECT_EQ(result_cpp.IsIdentity(),
+ (bool)aiMatrix4IsIdentity(&result_c));
+--- a/test/unit/AssimpAPITest_aiQuaternion.cpp
++++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
+@@ -54,19 +54,6 @@ protected:
+ aiQuaternion result_c, result_cpp;
+ };
+
+-TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) {
+- // Use a predetermined transformation matrix
+- // to prevent running into division by zero.
+- aiMatrix3x3 m, r;
+- aiMatrix3x3::Translation(aiVector2D(14,-25), m);
+- aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r);
+- m = m * r;
+-
+- result_cpp = aiQuaternion(m);
+- aiCreateQuaternionFromMatrix(&result_c, &m);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) {
+ const float x(RandPI.next()),
+ y(RandPI.next()),
+--- a/test/unit/AssimpAPITest_aiVector2D.cpp
++++ b/test/unit/AssimpAPITest_aiVector2D.cpp
+@@ -67,28 +67,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AreEqualEpsilonTest) {
+ (bool)aiVector2AreEqualEpsilon(&result_cpp, &result_c, Epsilon));
+ }
+
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
+- result_c = result_cpp = random_vec2();
+- result_cpp += temp;
+- aiVector2Add(&result_c, &temp);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) {
+- result_c = result_cpp = random_vec2();
+- result_cpp -= temp;
+- aiVector2Subtract(&result_c, &temp);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) {
+- const float FACTOR = RandNonZero.next();
+- result_c = result_cpp = random_vec2();
+- result_cpp *= FACTOR;
+- aiVector2Scale(&result_c, FACTOR);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
+ result_c = result_cpp = random_vec2();
+ result_cpp = result_cpp.SymMul(temp);
+@@ -96,21 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
+ EXPECT_EQ(result_cpp, result_c);
+ }
+
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
+- const float DIVISOR = RandNonZero.next();
+- result_c = result_cpp = random_vec2();
+- result_cpp /= DIVISOR;
+- aiVector2DivideByScalar(&result_c, DIVISOR);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByVectorTest) {
+- result_c = result_cpp = random_vec2();
+- result_cpp = result_cpp / temp;
+- aiVector2DivideByVector(&result_c, &temp);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiVector2D, aiVector2LengthTest) {
+ result_c = result_cpp = random_vec2();
+ EXPECT_EQ(result_cpp.Length(), aiVector2Length(&result_c));
+--
+2.35.1
+
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index 31a4d44a05c..5525e184d20 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>waebbl-gentoo@posteo.net</email>
+ <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Gentoo Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="samples">Build viewer library</flag>
</use>
diff --git a/media-libs/aubio/aubio-0.4.9-r1.ebuild b/media-libs/aubio/aubio-0.4.9-r1.ebuild
index 33eae76c51c..48d70ea69fd 100644
--- a/media-libs/aubio/aubio-0.4.9-r1.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-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=6
DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 waf-utils
@@ -52,6 +51,7 @@ PYTHON_SRC_DIR="${S}"
PATCHES=(
"${FILESDIR}"/${PN}-0.4.9-docdir.patch
+ "${FILESDIR}"/ffmpeg5.patch
)
src_prepare() {
diff --git a/media-libs/aubio/files/ffmpeg5.patch b/media-libs/aubio/files/ffmpeg5.patch
new file mode 100644
index 00000000000..e4901ad69c0
--- /dev/null
+++ b/media-libs/aubio/files/ffmpeg5.patch
@@ -0,0 +1,28 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <piem@piem.org>
+Date: Tue, 25 Jan 2022 18:30:27 +0100
+Subject: [PATCH 1/1] [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec
+ > 59, thx @berolinux (closes gh-353)
+
+---
+ src/io/source_avcodec.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
+index e0ae93b5..1421bd9a 100644
+--- a/src/io/source_avcodec.c
++++ b/src/io/source_avcodec.c
+@@ -68,6 +68,10 @@
+ #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+ #endif
+
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++#define FF_API_LAVF_AVCTX 1
++#endif
++
+ struct _aubio_source_avcodec_t {
+ uint_t hop_size;
+ uint_t samplerate;
+--
+2.11.0
+
diff --git a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
index 69e2783676d..6c7e0419827 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r4.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://audiofile.68k.org/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/1" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="flac"
RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 9fc07834baa..f4c59a24eb9 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,2 +1 @@
-DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
deleted file mode 100644
index 6f2b5d5eb4b..00000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${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 sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="dev-db/sqlite:3
- nvenc? ( media-video/nvidia_video_sdk )
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0= )
- vdpau? ( x11-libs/libvdpau:0 )
- xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${DEPEND}
- !<media-libs/avidemux-core-${PV}
- !<media-video/avidemux-${PV}
- nls? ( virtual/libintl:0 )
-"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
- cmake_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because
- # it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove bundled ffmpeg."
-
- rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
- buildCore/ffmpeg || die "${error}"
- sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
- -i avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -e 's/include(admFFmpegBuild)//g' \
- -i avidemux_core/CMakeLists.txt || die "${error}"
- else
- local ffmpeg_args=(
- --cc=$(tc-getCC)
- --cxx=$(tc-getCXX)
- --ar=$(tc-getAR)
- --nm=$(tc-getNM)
- --ranlib=$(tc-getRANLIB)
- "--optflags='${CFLAGS}'"
- )
-
- sed -i \
- -e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" \
- cmake/ffmpeg_configure.sh.cmake \
- || die
- fi
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
- # Bug 768210
- append-cxxflags -std=gnu++14
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DNVENC="$(usex nvenc)"
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
-}
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index 3e232c066cc..b1eda22c693 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -6,7 +6,6 @@
<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>
<flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
</use>
<upstream>
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 9fc07834baa..f4c59a24eb9 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,2 +1 @@
-DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
deleted file mode 100644
index 05c23cdcca6..00000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
- ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
- dev-lang/spidermonkey:0=
- dev-libs/libxml2:2
- media-libs/a52dec
- media-libs/libass:0=
- media-libs/libmad
- media-libs/libmp4v2
- media-libs/libpng:0=
- virtual/libiconv
- aac? (
- media-libs/faac
- media-libs/faad2
- )
- aften? ( media-libs/aften )
- alsa? ( media-libs/alsa-lib )
- amr? ( media-libs/opencore-amr )
- dcaenc? ( media-sound/dcaenc )
- dts? ( media-libs/libdca )
- fdk? ( media-libs/fdk-aac:0= )
- fontconfig? ( media-libs/fontconfig:1.0 )
- fribidi? ( dev-libs/fribidi )
- jack? (
- virtual/jack
- libsamplerate? ( media-libs/libsamplerate )
- )
- lame? ( media-sound/lame )
- nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- truetype? ( media-libs/freetype:2 )
- twolame? ( media-sound/twolame )
- vorbis? ( media-libs/libvorbis )
- vpx? ( media-libs/libvpx:0= )
- x264? ( media-libs/x264:0= )
- x265? ( media-libs/x265:0= )
- xv? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXv
- )
- xvid? ( media-libs/xvid )
-"
-DEPEND="${COMMON_DEPEND}
- oss? ( virtual/os-headers )
-"
-RDEPEND="${COMMON_DEPEND}
- !<media-libs/avidemux-plugins-${PV}
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
-
-src_prepare() {
- default
-
- # Don't reapply PATCHES during cmake_src_prepare
- unset PATCHES
-
- processes="buildPluginsCommon:avidemux_plugins
- buildPluginsCLI:avidemux_plugins"
- use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
- done
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
- -DFAAC="$(usex aac)"
- -DFAAD="$(usex aac)"
- -DALSA="$(usex alsa)"
- -DAFTEN="$(usex aften)"
- -DDCAENC="$(usex dcaenc)"
- -DFDK_AAC="$(usex fdk)"
- -DOPENCORE_AMRWB="$(usex amr)"
- -DOPENCORE_AMRNB="$(usex amr)"
- -DLIBDCA="$(usex dts)"
- -DFONTCONFIG="$(usex fontconfig)"
- -DJACK="$(usex jack)"
- -DLAME="$(usex lame)"
- -DNVENC="$(usex nvenc)"
- -DOPENGL="$(usex opengl)"
- -DOPUS="$(usex opus)"
- -DOSS="$(usex oss)"
- -DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
- -DQT4=OFF
- -DFREETYPE2="$(usex truetype)"
- -DTWOLAME="$(usex twolame)"
- -DX264="$(usex x264)"
- -DX265="$(usex x265)"
- -DXVIDEO="$(usex xv)"
- -DXVID="$(usex xvid)"
- -DVDPAU="$(usex vdpau)"
- -DVORBIS="$(usex vorbis)"
- -DLIBVORBIS="$(usex vorbis)"
- -DVPXDEC="$(usex vpx)"
- -DUSE_EXTERNAL_LIBA52=yes
- -DUSE_EXTERNAL_LIBASS=yes
- -DUSE_EXTERNAL_LIBMAD=yes
- -DUSE_EXTERNAL_LIBMP4V2=yes
- )
-
- use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- 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_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_install
- done
-}
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index 8d0f32d4e20..bfc77676349 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -11,7 +11,6 @@
<flag name="dcaenc">Enable DTS Coherent Acoustics audio encoder support via <pkg>media-sound/dcaenc</pkg>.</flag>
<flag name="fdk">Adds support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
<flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
- <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
<flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
<flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>
<flag name="x265">Enables HEVC support with <pkg>media-libs/x265</pkg>.</flag>
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index ae77487ee51..f676bcb26b9 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,3 +1,3 @@
-DIST babl-0.1.84.tar.xz 299216 BLAKE2B 80db725230f5bee71a9e2056e40cfe9c4dda7669fe3004d73c2d1525c9a89362491edc5addef47f28a94938ab3cdefef0496b38404fc4ab11931e7b9e0daaebe SHA512 a8cba80bd3a434ee9bbd1a0d1fcd6e5e38f9c657b189a70631ff3fe4e4c270e64762d1be13d48e8514d4166ac4175745001499fcda68eb1ea93e03c18b2a5d06
-DIST babl-0.1.86.tar.xz 299868 BLAKE2B 2189659ef5b3890bc78329808dcff5e7577a85c9728d54f848fa2f6ed085cea53deeaa734c600b1d73dcb5a8acd2f680800459c0a4c5b7dce61bc69a54ab9d3c SHA512 aff3b0069f7cdb515e6ace880500f4b89521062f9030ef452f0555b3cd993fffdd5f700c403a7be8e6758957073e7623360fc6ac41d86d5d31551c0fd0ff6048
DIST babl-0.1.88.tar.xz 299972 BLAKE2B a22811196e306e3b846da63f361ecf792715d461cd8af85017af8dd353a406a38130f3e675214edc261557b6a0f6d3ed5586bfe7ecdf9b08ed5b8e7bc4aeb7f7 SHA512 1260133e44aa1878e13e2c64387e8540ca93edd7a905e2f8eebc58679444ba8815b9b6801b538a759c9b7b60294d7d7c33418bb1feee1879dcb8381450fe1742
+DIST babl-0.1.90.tar.xz 309324 BLAKE2B 9fbbbe06539fd85007875e697529aa071d32a2d9e65f9750ceeb4a1f1ec1a3ac4a74dc40f932f7ff669bafdb1e9506df05414c7765f57b7d818901bffc55ccc2 SHA512 c0eac3c7d5eb328de2f97ccc9743bc2f78d79c23dc4d3465e979d98827b1643a0f2a257f0445e4acd09f15a9f95c79f67d09cb18c2c94b4f3d290944a0341e3c
+DIST babl-0.1.92.tar.xz 309784 BLAKE2B c3c716ba1b54082743ba6ea33da99fb458dc971ab78ae72170af9840eadbc7f2aeb0a26d3270ede2a6e0d7b55489fc8f700b1c69731a4612ba4106f9672762d0 SHA512 c2baf39f576bf7f57786c59f2de0818257f4d1d62cadf44fdd802c9a534ed94390dd1616e7e72fcc9de1fb85a24a10fbacdbbabbe376a45ae598be46817e3bc0
diff --git a/media-libs/babl/babl-0.1.86.ebuild b/media-libs/babl/babl-0.1.90-r1.ebuild
index 4efedaf83c7..bd0399f8e4c 100644
--- a/media-libs/babl/babl-0.1.86.ebuild
+++ b/media-libs/babl/babl-0.1.90-r1.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
VALA_USE_DEPEND=vapigen
@@ -37,10 +37,13 @@ DEPEND="${RDEPEND}"
src_prepare() {
default
gnome2_environment_reset
- use vala && vala_src_prepare
+
+ sed -i -e 's/Description/description/' meson.build || die # bug 843266
}
src_configure() {
+ use vala && vala_setup
+
# Automagic rsvg support is just for website generation we do not call,
# so we don't need to fix it
# w3m is used for dist target thus no issue for us that it is automagically
diff --git a/media-libs/babl/babl-0.1.84.ebuild b/media-libs/babl/babl-0.1.92.ebuild
index 721b1da802d..bd0399f8e4c 100644
--- a/media-libs/babl/babl-0.1.84.ebuild
+++ b/media-libs/babl/babl-0.1.92.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
VALA_USE_DEPEND=vapigen
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A dynamic, any to any, pixel format conversion library"
@@ -37,10 +37,13 @@ DEPEND="${RDEPEND}"
src_prepare() {
default
gnome2_environment_reset
- use vala && vala_src_prepare
+
+ sed -i -e 's/Description/description/' meson.build || die # bug 843266
}
src_configure() {
+ use vala && vala_setup
+
# Automagic rsvg support is just for website generation we do not call,
# so we don't need to fix it
# w3m is used for dist target thus no issue for us that it is automagically
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 4efedaf83c7..9c019093af4 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-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
VALA_USE_DEPEND=vapigen
@@ -37,10 +37,11 @@ DEPEND="${RDEPEND}"
src_prepare() {
default
gnome2_environment_reset
- use vala && vala_src_prepare
}
src_configure() {
+ use vala && vala_setup
+
# Automagic rsvg support is just for website generation we do not call,
# so we don't need to fix it
# w3m is used for dist target thus no issue for us that it is automagically
diff --git a/media-libs/bcg729/bcg729-1.1.1.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild
index b0918c6a824..626a270c12b 100644
--- a/media-libs/bcg729/bcg729-1.1.1.ebuild
+++ b/media-libs/bcg729/bcg729-1.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_/-}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
IUSE="test"
RESTRICT="test"
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 4d58a476612..1987f7e1c6b 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,2 +1,2 @@
-DIST chromaprint-1.5.0.tar.gz 615217 BLAKE2B 14bf219c23360028ac232e67b7eb36e3226bb6e19838ef239266a9d826e1bd50d798f69f961bcb78f36baf48630a93f53243f8f9ab6187c403382bab23042630 SHA512 25ab3f7834581a8204ac09614fef6036c801f5f8b7b72a864701ca0de8082b2458a2bd7c075d53451581d770898576411cdcfb23ce609bc82f9d9b395cc1a129
+DIST chromaprint-1.5.1.tar.gz 1581159 BLAKE2B 9f7f030e97d3114cf679df298d313ea826c0fb05e7e7d8a10090d0a27ed0811b380b81b29fce973e0493826c478964367396311fd0484619cb2fc4c2d8e0d4c0 SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
diff --git a/media-libs/chromaprint/chromaprint-1.5.0.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
index 67c9ef1d4a7..123873b6076 100644
--- a/media-libs/chromaprint/chromaprint-1.5.0.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
@@ -1,9 +1,8 @@
-# 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_ECLASS=cmake
GTEST_VERSION="1.10.0"
GTEST_DIR_VERSION="1.10.x"
inherit cmake-multilib
@@ -20,24 +19,30 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="test tools"
RESTRICT="!test? ( test )"
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}]
-"
+# Default to fftw to avoid awkward circular dependency w/ ffmpeg
+# See bug #833821 for an example
+RDEPEND="tools? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
+ !tools? ( sci-libs/fftw:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
DOCS=( NEWS.txt README.md )
-S="${WORKDIR}/${PN}-v${PV}"
-
multilib_src_configure() {
export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
+
local mycmakeargs=(
- -DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
- -DBUILD_TESTS=$(usex test ON OFF)
- -DFFT_LIB=avfft
- -DAUDIO_PROCESSOR_LIB="swresample"
+ -DBUILD_TESTS=$(usex test)
+
+ -DBUILD_TOOLS=$(multilib_native_usex tools)
+ -DFFT_LIB=$(usex tools 'avfft' 'fftw3')
+ $(multilib_native_usex tools '-DAUDIO_PROCESSOR_LIB=swresample' '')
+ # Automagicallyish looks for ffmpeg, but there's no point
+ # even doing the check unless we're building with tools
+ # (=> without fftw3, and with ffmpeg).
+ -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=$(multilib_native_usex !tools)
)
+
cmake_src_configure
}
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
index 0f04009f44e..6ee1ebd7c80 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-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
@@ -11,7 +11,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="X debug examples +introspection udev"
# >=cogl-1.18 provides cogl-2.0-experimental
@@ -49,7 +49,8 @@ src_install() {
gnome2_src_install
if use examples; then
- insinto /usr/share/doc/"${PF}"/examples
- doins examples/{*.c,*.png,README}
+ docinto examples
+ dodoc examples/{*.c,*.png,README}
+ docompress -x /usr/share/doc/${PF}/examples
fi
}
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild
index ed4eb6a8d79..7d499e79ff9 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.8.4.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
LICENSE="LGPL-2.1+"
SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="X debug examples gtk +introspection wayland"
RDEPEND="
@@ -38,7 +38,8 @@ src_install() {
gnome2_src_install
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins examples/{*.c,redhand.png}
+ docinto examples
+ dodoc examples/{*.c,redhand.png}
+ docompress -x /usr/share/doc/${PF}/examples
fi
}
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index b4448103a0d..6318858cee0 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,2 +1 @@
-DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
-DIST codec2-1.0.1.tar.gz 15062219 BLAKE2B 81f2784d7aa7180fcc4345fd27e7dd0beda0eba3bbee43d8379a48dc854fe1c9e50038c90c9ae41daacb5aef0f337841fa64ce061e2831523a71d5d52d1b8211 SHA512 e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6
+DIST codec2-1.0.3.tar.gz 15000670 BLAKE2B 784f3f522ff6de0f5d6622ca379e5b61081c999b1310e0f45891758c818005d12418907bc9627c1a177cb961f54d20e330e646426b4eb885a548af70014ab521 SHA512 1b59a0520d55b0f92b72a51dde0f58a0cd845056195734d23bf59bf44e7b5c7431bdc3cebe7c60aef7dadf3ec02f9edd62f041b4b283c05a4b50a0380f3ed67c
diff --git a/media-libs/codec2/codec2-1.0.0.ebuild b/media-libs/codec2/codec2-1.0.0.ebuild
deleted file mode 100644
index f9d617bb611..00000000000
--- a/media-libs/codec2/codec2-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
-SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="examples test"
-# Not yet passing, but infrastructure added to run
-RESTRICT="test"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DUNITTEST=$(usex test)
- -DINSTALL_EXAMPLES=$(usex examples)
- )
- cmake_src_configure
-}
diff --git a/media-libs/codec2/codec2-1.0.1-r1.ebuild b/media-libs/codec2/codec2-1.0.3.ebuild
index 07461c98499..e9d3f48e123 100644
--- a/media-libs/codec2/codec2-1.0.1-r1.ebuild
+++ b/media-libs/codec2/codec2-1.0.3.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
@@ -6,20 +6,26 @@ EAPI=8
CMAKE_ECLASS=cmake
inherit cmake-multilib
+MY_PV="${PV%.*}${PV##*.}"
DESCRIPTION="Low bit rate speech codec"
HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
-SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/drowe67/codec2/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
LICENSE="LGPL-2.1"
SLOT="0/1.0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
IUSE="examples test"
+
# Not yet passing, but infrastructure added to run
+# Needs Octave dependencies like "signal"?
+# https://github.com/drowe67/codec2/commit/9a129f1b3ad12ecbf3df7f4460f496ee11e49c08#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R155
RESTRICT="test"
+#BDEPEND="test? ( sci-mathematics/octave )"
+
PATCHES=(
- "${FILESDIR}/codec2-1.0.1-static-rx_filter_coh.patch"
- "${FILESDIR}/${P}-fix-freedv-callback.patch" # Bug 816453
+ "${FILESDIR}"/${P}-fix-build-with-Os.patch
)
multilib_src_configure() {
diff --git a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch b/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
deleted file mode 100644
index 595e71a139d..00000000000
--- a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7a554bad2f28a4cf19cddf43c619fe5921ddaea3 Mon Sep 17 00:00:00 2001
-From: drowe67 <david@rowetel.com>
-Date: Sat, 2 Oct 2021 15:48:09 +0930
-Subject: [PATCH] moved freedv_callback_rx_sym typedef and function into
- freedv_api_internal.h
-
-Project-Bug-URL: https://github.com/drowe67/codec2/pull/235
-Gentoo-Bug-URL: https://bugs.gentoo.org/816453
----
- src/freedv_api.h | 2 --
- src/freedv_api_internal.h | 4 ++++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/freedv_api.h b/src/freedv_api.h
-index 23c5fef8..9393bd80 100644
---- a/src/freedv_api.h
-+++ b/src/freedv_api.h
-@@ -145,7 +145,6 @@ struct freedv_advanced {
-
- // Called when text message char is decoded
- typedef void (*freedv_callback_rx)(void *, char);
--typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float);
- // Called when new text message char is needed
- typedef char (*freedv_callback_tx)(void *);
- typedef void (*freedv_calback_error_pattern)
-@@ -212,7 +211,6 @@ int freedv_check_crc16_unpacked(unsigned char *unpacked_bits, int nbits);
- // Set parameters ------------------------------------------------------------
-
- void freedv_set_callback_txt (struct freedv *freedv, freedv_callback_rx rx, freedv_callback_tx tx, void *callback_state);
--void freedv_set_callback_txt_sym (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state);
- void freedv_set_callback_protocol (struct freedv *freedv, freedv_callback_protorx rx, freedv_callback_prototx tx, void *callback_state);
- void freedv_set_callback_data (struct freedv *freedv, freedv_callback_datarx datarx, freedv_callback_datatx datatx, void *callback_state);
- void freedv_set_test_frames (struct freedv *freedv, int test_frames);
-diff --git a/src/freedv_api_internal.h b/src/freedv_api_internal.h
-index 0197e184..e7a9526c 100644
---- a/src/freedv_api_internal.h
-+++ b/src/freedv_api_internal.h
-@@ -230,6 +230,10 @@ int freedv_rx_fsk_ldpc_data(struct freedv *f, COMP demod_in[]);
-
- int freedv_bits_to_speech(struct freedv *f, short speech_out[], short demod_in[], int rx_status);
-
-+// for the reliable text protocol we need to pass symbols back rather than text
-+typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float);
-+void freedv_set_callback_txt_sym (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state);
-+
- #ifdef __cplusplus
- }
- #endif
diff --git a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch b/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
deleted file mode 100644
index 9290ea9b2cf..00000000000
--- a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cohpsk.c b/src/cohpsk.c
-index f4f8dcdc..0b0ead9c 100644
---- a/src/cohpsk.c
-+++ b/src/cohpsk.c
-@@ -809,7 +809,7 @@ typedef float float4 __attribute__ ((vector_size (16)));
-
- \*---------------------------------------------------------------------------*/
-
--inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin)
-+static inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin)
- {
- int c,i,j,k,l;
- int n=COHPSK_M/P;
diff --git a/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch b/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch
new file mode 100644
index 00000000000..4f3f3066142
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch
@@ -0,0 +1,19 @@
+https://github.com/drowe67/codec2/commit/a8d4226859548ceb050619160af562e0b43bb05c
+https://github.com/drowe67/codec2/issues/293#issuecomment-1025665342
+
+From: drowe67 <david@rowetel.com>
+Date: Tue, 1 Feb 2022 07:20:50 +1030
+Subject: [PATCH] change required to build with -Os
+
+--- a/src/cohpsk.c
++++ b/src/cohpsk.c
+@@ -816,7 +816,7 @@ typedef float float4 __attribute__ ((vector_size (16)));
+
+ \*---------------------------------------------------------------------------*/
+
+-inline void rx_filter_coh(COMP rx_filt[COHPSK_NC*COHPSK_ND][P+1], int Nc, COMP rx_baseband[COHPSK_NC*COHPSK_ND][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC*COHPSK_ND][COHPSK_NFILTER], int nin)
++inline extern void rx_filter_coh(COMP rx_filt[COHPSK_NC*COHPSK_ND][P+1], int Nc, COMP rx_baseband[COHPSK_NC*COHPSK_ND][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC*COHPSK_ND][COHPSK_NFILTER], int nin)
+ {
+ int c,i,j,k,l;
+ int n=COHPSK_M/P;
+
diff --git a/media-libs/cogl/cogl-1.22.8-r1.ebuild b/media-libs/cogl/cogl-1.22.8-r1.ebuild
index 037d055dd7d..a5e772c9b85 100644
--- a/media-libs/cogl/cogl-1.22.8-r1.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-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
@@ -114,8 +114,9 @@ src_configure() {
src_install() {
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins examples/{*.c,*.jpg}
+ docinto examples
+ dodoc examples/{*.c,*.jpg}
+ docompress -x /usr/share/doc/${PF}/examples
fi
gnome2_src_install
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index ab907d8abc4..5342b31cf2a 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.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="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="dev-lang/perl"
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
deleted file mode 100644
index 7562ed9c901..00000000000
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="AMPAS' Color Transformation Language"
-HOMEPAGE="https://github.com/ampas/CTL"
-SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
-
-LICENSE="AMPAS"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
-
-RDEPEND="media-libs/ilmbase:=
- media-libs/openexr:=
- media-libs/tiff:=
- !media-libs/openexr_ctl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/CTL-ctl-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch"
- "${FILESDIR}/${P}-openexr-2.3.patch"
-)
-
-mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
diff --git a/media-libs/ctl/ctl-1.5.2-r2.ebuild b/media-libs/ctl/ctl-1.5.2-r2.ebuild
index 45d613f9e71..f545786ec06 100644
--- a/media-libs/ctl/ctl-1.5.2-r2.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-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
@@ -35,7 +35,7 @@ PATCHES=(
mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
src_test() {
- pushd ${BUILD_DIR} >/dev/null || die
+ pushd "${BUILD_DIR}" >/dev/null || die
eninja check
popd >/dev/null || die
}
diff --git a/media-libs/cubeb/Manifest b/media-libs/cubeb/Manifest
new file mode 100644
index 00000000000..3361c26d070
--- /dev/null
+++ b/media-libs/cubeb/Manifest
@@ -0,0 +1,14 @@
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
+DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
+DIST cmake-0.1.46.crate 15119 BLAKE2B 0889436835c16bc47cdc671615f421a50acf6c34a3ba3b6b8b4289e11bf1b803abd15d88a65ae9c1588586151f467524517e9c60d5dcc820e41ff21711f3a536 SHA512 e2749309055c85baa242cef8d0f4a91eb7e694664c5e42339df8ccc6644d1563337b835d3d931f5a0a75351efd299a21fe6eea497941802ea041916d665c7311
+DIST cubeb-0.2_p20211213.tar.gz 220413 BLAKE2B 65cf123351f1d465e15c3822f4ae2890cb62e7b5cec22beffd444ac452650b71c1bbc71e50836da6d0474ae6847fdf57c4ee85975f26a35f6db4e1f7a21fef76 SHA512 33abe2bc426b06c3c6cb557fe1be62725f1dc56776d02ec6651ef8710d3a5d302b1f730ceaefe516ff1974775cdabd3753f24436c705af3c6e98fd5dabb6b015
+DIST cubeb-backend-0.9.0.crate 5871 BLAKE2B ac8cfd9a43eefa336fbad67c7183c3bd2375f7de36dfe17df55aef0003b950cd8eb45c823b51302f60773ebafbe6de8a80f276f5bc4c2fe250be6073fe95ae1c SHA512 e02c4703b630cbecfbe20bf3193fa88a130385885fecc18c2a8d6e464b13f0f395251afb35049cd1371532e372a6a5addc856e959fd2d6da63615f1cfdb20f14
+DIST cubeb-core-0.9.0.crate 10782 BLAKE2B 60feec670c0d0d74f45a2c8ef4d0d564aae3e79f28087b7392f61baf3a0f31822929cdbbf1dd2506ea5d4249765eead516e6adb8d1867fbc2e77eeec9b06eb4a SHA512 2a7b660f6a1c36e6cbdaef4e26589240675d1e553f75d2093b39e4dfc4c82327ce080f68143e7c8383cb198796d7ab764cd4038532010847d9829b98f07f530e
+DIST cubeb-pulse-rs-0.2_p20211213.tar.gz 37658 BLAKE2B 82b137df7072a048b6115a17a8f973f1464470094468f19c0e56835db6d8d7355115e712b02f29be3055868435c21915423cfc48c8b55f856e0b008f14802e3b SHA512 1bee7bbeacccf31e51a420cb28c37fb6747ff4b364cbf633e18e507959bbf46d4b706b35c7a200421b68295244289a56b4e8193c63f87c5996ddcdfd7c527054
+DIST cubeb-sys-0.9.1.crate 677935 BLAKE2B a6e10ee95e67ef03e2fa1915007a69227b28c0ade055cdff8e7941634690c6f34de8509e9b10b870097f3b17ca478794577a480232534aa1e593b6813eedbeee SHA512 594e7be07e2558ae81506ca52724bebaf51d2b99158af3808edee827f827dbfef24dc9f1a160bf23e3ac39043b17b920578164697f48a7e0fd544c0196b4f773
+DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
+DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
+DIST ringbuf-0.2.6.crate 18882 BLAKE2B 048402ee7e0fbe81597fa8450a50f89faaffac8dbe2cba1d1ddb870127e0a85f0e4f7553a806ea94530c00e113ee039a9c5df4d5e458bffdd3d483f09b39fc0a SHA512 e8a038342226f13c88137a91c27f14323b02dbafb8991c369c0332024a421edbb797db665e31ff9b35f40147fd1d71235a059930b574195add9a6613312472d6
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
diff --git a/media-libs/cubeb/cubeb-0.2_p20211213.ebuild b/media-libs/cubeb/cubeb-0.2_p20211213.ebuild
new file mode 100644
index 00000000000..46cafe446b9
--- /dev/null
+++ b/media-libs/cubeb/cubeb-0.2_p20211213.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+CRATES="
+ bitflags-1.3.2
+ cache-padded-1.2.0
+ cc-1.0.72
+ cmake-0.1.46
+ cubeb-backend-0.9.0
+ cubeb-core-0.9.0
+ cubeb-sys-0.9.1
+ libc-0.2.112
+ pkg-config-0.3.24
+ ringbuf-0.2.6
+ semver-0.9.0
+ semver-parser-0.7.0"
+inherit cargo cmake
+
+CUBEB_COMMIT="773f16b7ea308392c05be3e290163d1f636e6024"
+PULSERS_COMMIT="f2456201dbfdc467b80f0ff6bbb1b8a6faf7df02"
+
+DESCRIPTION="Cross-platform audio library"
+HOMEPAGE="https://github.com/mozilla/cubeb/"
+SRC_URI="
+ https://github.com/mozilla/cubeb/archive/${CUBEB_COMMIT}.tar.gz -> ${P}.tar.gz
+ pulseaudio? ( rust? (
+ https://github.com/mozilla/cubeb-pulse-rs/archive/${PULSERS_COMMIT}.tar.gz -> ${PN}-pulse-rs-${PV}.tar.gz
+ $(cargo_crate_uris)
+ ) )"
+S="${WORKDIR}/${PN}-${CUBEB_COMMIT}"
+
+LICENSE="ISC pulseaudio? ( rust? ( || ( Apache-2.0 MIT ) ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc jack pulseaudio +rust sndio test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/speexdsp
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-sound/pulseaudio )
+ sndio? ( media-sound/sndio:= )"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-cpp/gtest )"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ pulseaudio? ( rust? ( ${RUST_DEPEND} ) )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-automagic.patch
+)
+
+src_unpack() {
+ use pulseaudio && use rust && cargo_src_unpack || default
+}
+
+src_prepare() {
+ if use pulseaudio && use rust; then
+ mv ../${PN}-pulse-rs-${PULSERS_COMMIT} src/${PN}-pulse-rs || die
+ fi
+
+ cmake_src_prepare
+
+ use !debug || sed -i 's|/release/|/debug/|' CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_RUST_LIBS=$(usex rust)
+ -DBUILD_TESTS=$(usex test)
+ -DCHECK_ALSA=$(usex alsa)
+ -DCHECK_JACK=$(usex jack)
+ -DCHECK_PULSE=$(usex pulseaudio)
+ -DCHECK_SNDIO=$(usex sndio)
+ -DLAZY_LOAD_LIBS=no
+ -DUSE_SANITIZERS=no
+ $(cmake_use_find_package doc Doxygen)
+ )
+
+ use pulseaudio && use rust &&
+ cargo_src_configure --manifest-path src/${PN}-pulse-rs/Cargo.toml
+
+ cmake_src_configure
+}
+
+src_compile() {
+ use pulseaudio && use rust && cargo_src_compile
+
+ cmake_src_compile
+}
+
+src_test() {
+ use pulseaudio && use rust && cargo_src_test
+
+ # these tests need access to audio devices and no sandbox
+ cmake_src_test -E '(audio|callback_ret|device_changed_callback|devices|duplex|latency|record|sanity|tone)'
+}
+
+src_install() {
+ cmake_src_install
+
+ use doc && dodoc -r "${BUILD_DIR}"/docs/html
+
+ use !test || rm "${ED}"/usr/bin/test_* || die
+}
diff --git a/media-libs/cubeb/files/cubeb-0.2_p20211213-automagic.patch b/media-libs/cubeb/files/cubeb-0.2_p20211213-automagic.patch
new file mode 100644
index 00000000000..5dd4a955356
--- /dev/null
+++ b/media-libs/cubeb/files/cubeb-0.2_p20211213-automagic.patch
@@ -0,0 +1,51 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -175,38 +175,48 @@
+
+ find_package(PkgConfig REQUIRED)
+
++ if(CHECK_PULSE)
+ pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
+ if(libpulse_FOUND)
+ set(USE_PULSE ON)
+ target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
+ target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
+ endif()
++ endif()
+
++ if(CHECK_ALSA)
+ pkg_check_modules(alsa IMPORTED_TARGET alsa)
+ if(alsa_FOUND)
+ set(USE_ALSA ON)
+ target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
+ target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
+ endif()
++ endif()
+
++ if(CHECK_JACK)
+ pkg_check_modules(jack IMPORTED_TARGET jack)
+ if(jack_FOUND)
+ set(USE_JACK ON)
+ target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
+ target_link_libraries(cubeb PRIVATE PkgConfig::jack)
+ endif()
++ endif()
+
++ if(CHECK_SNDIO)
+ check_include_files(sndio.h USE_SNDIO)
+ if(USE_SNDIO)
+ target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
+ target_link_libraries(cubeb PRIVATE sndio)
+ endif()
++ endif()
+
++ if(CHECK_AAUDIO)
+ check_include_files(aaudio/AAudio.h USE_AAUDIO)
+ if(USE_AAUDIO)
+ target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
+ target_link_libraries(cubeb PRIVATE aaudio)
+ endif()
++ endif()
+ endif()
+
+ if(USE_PULSE)
diff --git a/media-libs/cubeb/metadata.xml b/media-libs/cubeb/metadata.xml
new file mode 100644
index 00000000000..2d8dcbf48bf
--- /dev/null
+++ b/media-libs/cubeb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
+ <name>Ionen Wolkens</name>
+ </maintainer>
+ <use>
+ <flag name="rust">Use the newer rust-based audio backends if available</flag>
+ <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mozilla/cubeb</remote-id>
+ <remote-id type="github">mozilla/cubeb-pulse-rs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 7176ecbc364..ac63c1cc47f 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,5 +1,2 @@
-DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
-DIST dav1d-0.8.2.tar.bz2 695931 BLAKE2B cfe7667e583e05f8fd84b226a26ea23a901336fd8cf62900b47cd6b3bf92f8fe58d14224d1e063cc3bf7abdb17da437d291dc3f604cb68e99fc0615619f76880 SHA512 73335594950b08596356a1950213abf57c6d48060da37149e700565f9689ca82b7427e320040bf43b2e97eff7b6da7116a6aca77cb717f7ce140039ebdae5595
-DIST dav1d-0.9.0.tar.bz2 771739 BLAKE2B 9cf24b142a1148200766a1a20010ff14d1baec507a7ecb477117826784b668178ba753049abf316aacbe1b957340c157f960f748ab8e6f74caf567edba2be3a9 SHA512 cfbfa4cb4508e1b975d7247bf0fa09d3b7adfd224adcf181153365677237b98a6d53b0b7bb91055a26e5668d58b3dcda5f675f68aceb1b020d14b53c4488575e
-DIST dav1d-0.9.1.tar.bz2 810641 BLAKE2B 6ad40f6a339a71bc2bf79c508bc7a8a58cda98c6814981d252a3a40ae8df1cc5ad120c42fc881cb560c84e01186ca3daa09cbb5f6152d7da475d9479aa306f2c SHA512 b688f4743106ceed5f450978a9c265391c0ee906dd5adb8632e563378b316ffb3a7098fb6ea2ef4b160ca880fc03c16e3e3b9d8aa3c90ee7341dd0cbfccecc46
DIST dav1d-0.9.2.tar.bz2 833722 BLAKE2B b05edd1ca627906e57923be08f1ecd73469f9a8e2ed585edf81f1fe1ffc173f1e4ba52eb766b82d9ea1349a6c1cf2a5a48cc9a5bcf2debeb9d640d9842e266f4 SHA512 adfb822734a3fc8b73e9cf5f757bfd78fb144b00d95f1e942254c5caf1d801b05438d39571486ef37a94d2226166937fc56160a862e8d6d45c4f6d790531dc3f
+DIST dav1d-1.0.0.tar.bz2 960470 BLAKE2B 79355eeceea37df81e30be49dfea3dee9747fbbb82c0a08be3bbda525881112a8eb847afe3c3ccd0447fd6ee67ae540c5120ea00d4f891ac422850c611850c97 SHA512 86c6481e787fb6b8c28521e1efb1876d1be99f5fa5332cddab1111059b44775e05203cfc5c80a1b404ee00f35a1f5e1099e21b1f0851d77fb0101567e8b1a892
diff --git a/media-libs/dav1d/dav1d-0.8.0.ebuild b/media-libs/dav1d/dav1d-0.8.0.ebuild
deleted file mode 100644
index 68aff46355e..00000000000
--- a/media-libs/dav1d/dav1d-0.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
- SCM="git-r3"
- EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
- KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
- SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson-multilib
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-IUSE="+8bit +10bit +asm"
-
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
-BDEPEND="asm? (
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )
- )"
-
-DOCS=( README.md doc/PATENTS THANKS.md )
-
-multilib_src_configure() {
- local -a bits=()
- use 8bit && bits+=( 8 )
- use 10bit && bits+=( 16 )
-
- local enable_asm
- if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
- enable_asm=false
- else
- enable_asm=$(usex asm true false)
- fi
-
- local emesonargs=(
- -D bitdepths=$(IFS=,; echo "${bits[*]}")
- -D enable_asm=${enable_asm}
- )
- meson_src_configure
-}
diff --git a/media-libs/dav1d/dav1d-0.9.0.ebuild b/media-libs/dav1d/dav1d-0.9.0.ebuild
deleted file mode 100644
index f111b62346e..00000000000
--- a/media-libs/dav1d/dav1d-0.9.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
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
- SCM="git-r3"
- EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
- SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-fi
-
-inherit ${SCM} meson-multilib
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-IUSE="+8bit +10bit +asm test xxhash"
-RESTRICT="!test? ( test )"
-
-ASM_DEPEND=">=dev-lang/nasm-2.15.05"
-BDEPEND="asm? (
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )
- )
- xxhash? ( dev-libs/xxhash )
- "
-
-DOCS=( README.md doc/PATENTS THANKS.md )
-PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
-
-multilib_src_configure() {
- local -a bits=()
- use 8bit && bits+=( 8 )
- use 10bit && bits+=( 16 )
-
- local enable_asm
- if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
- enable_asm=false
- else
- enable_asm=$(usex asm true false)
- fi
-
- local emesonargs=(
- -D bitdepths=$(IFS=,; echo "${bits[*]}")
- -D enable_asm=${enable_asm}
- -D enable_tests=$(usex test true false)
- -D xxhash_muxer=$(usex xxhash enabled disabled)
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- meson_src_test
- fi
-}
diff --git a/media-libs/dav1d/dav1d-0.9.1.ebuild b/media-libs/dav1d/dav1d-0.9.1.ebuild
deleted file mode 100644
index f7ae3e3273b..00000000000
--- a/media-libs/dav1d/dav1d-0.9.1.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
-
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
- SCM="git-r3"
- EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
-else
- SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
- KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit ${SCM} meson-multilib
-
-DESCRIPTION="dav1d is an AV1 Decoder :)"
-HOMEPAGE="https://code.videolan.org/videolan/dav1d"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-IUSE="+8bit +10bit +asm test xxhash"
-RESTRICT="!test? ( test )"
-
-ASM_DEPEND=">=dev-lang/nasm-2.15.05"
-BDEPEND="asm? (
- abi_x86_32? ( ${ASM_DEPEND} )
- abi_x86_64? ( ${ASM_DEPEND} )
- )
- xxhash? ( dev-libs/xxhash )
- "
-
-DOCS=( README.md doc/PATENTS THANKS.md )
-PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
-
-multilib_src_configure() {
- local -a bits=()
- use 8bit && bits+=( 8 )
- use 10bit && bits+=( 16 )
-
- local enable_asm
- if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
- enable_asm=false
- else
- enable_asm=$(usex asm true false)
- fi
-
- local emesonargs=(
- -D bitdepths=$(IFS=,; echo "${bits[*]}")
- -D enable_asm=${enable_asm}
- -D enable_tests=$(usex test true false)
- -D xxhash_muxer=$(usex xxhash enabled disabled)
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- meson_src_test
- fi
-}
diff --git a/media-libs/dav1d/dav1d-0.9.2.ebuild b/media-libs/dav1d/dav1d-0.9.2.ebuild
index fb91a0e8cc7..7328056c980 100644
--- a/media-libs/dav1d/dav1d-0.9.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.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
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
else
SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
fi
inherit ${SCM} meson-multilib
diff --git a/media-libs/dav1d/dav1d-0.8.2.ebuild b/media-libs/dav1d/dav1d-1.0.0.ebuild
index caaf9cb8784..9db50e7b2ff 100644
--- a/media-libs/dav1d/dav1d-0.8.2.ebuild
+++ b/media-libs/dav1d/dav1d-1.0.0.ebuild
@@ -1,24 +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
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
- SCM="git-r3"
+if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+ inherit git-r3
else
- KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
-inherit ${SCM} meson-multilib
+inherit meson-multilib
DESCRIPTION="dav1d is an AV1 Decoder :)"
HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
-SLOT="0/5"
+# Check SONAME on version bumps!
+SLOT="0/6"
IUSE="+8bit +10bit +asm test xxhash"
RESTRICT="!test? ( test )"
@@ -27,11 +27,9 @@ BDEPEND="asm? (
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )
)
- xxhash? ( dev-libs/xxhash )
- "
+ xxhash? ( dev-libs/xxhash )"
DOCS=( README.md doc/PATENTS THANKS.md )
-PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
multilib_src_configure() {
local -a bits=()
@@ -46,10 +44,10 @@ multilib_src_configure() {
fi
local emesonargs=(
- -D bitdepths=$(IFS=,; echo "${bits[*]}")
- -D enable_asm=${enable_asm}
- -D enable_tests=$(usex test true false)
- -D xxhash_muxer=$(usex xxhash enabled disabled)
+ -Dbitdepths=$(IFS=,; echo "${bits[*]}")
+ -Denable_asm=${enable_asm}
+ $(meson_use test enable_tests)
+ $(meson_feature xxhash xxhash_muxer)
)
meson_src_configure
}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index c0d92e63904..9db50e7b2ff 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -1,24 +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
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
- SCM="git-r3"
+if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+ inherit git-r3
else
SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
-inherit ${SCM} meson-multilib
+inherit meson-multilib
DESCRIPTION="dav1d is an AV1 Decoder :)"
HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
-SLOT="0/5"
+# Check SONAME on version bumps!
+SLOT="0/6"
IUSE="+8bit +10bit +asm test xxhash"
RESTRICT="!test? ( test )"
@@ -27,8 +27,7 @@ BDEPEND="asm? (
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )
)
- xxhash? ( dev-libs/xxhash )
- "
+ xxhash? ( dev-libs/xxhash )"
DOCS=( README.md doc/PATENTS THANKS.md )
@@ -45,10 +44,10 @@ multilib_src_configure() {
fi
local emesonargs=(
- -D bitdepths=$(IFS=,; echo "${bits[*]}")
- -D enable_asm=${enable_asm}
- -D enable_tests=$(usex test true false)
- -D xxhash_muxer=$(usex xxhash enabled disabled)
+ -Dbitdepths=$(IFS=,; echo "${bits[*]}")
+ -Denable_asm=${enable_asm}
+ $(meson_use test enable_tests)
+ $(meson_feature xxhash xxhash_muxer)
)
meson_src_configure
}
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r4.ebuild
index 2e70bc70215..4abab857c9b 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r4.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,28 +14,33 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm"
+IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng opengl png sdl static-libs tiff X xpm"
+# OpenEXR support dropped b/c no support for OpenEXR 3
+# See bug #833833
RDEPEND="
allegro? ( media-libs/allegro:0 )
gif? ( media-libs/giflib:= )
glut? ( media-libs/freeglut )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
mng? ( media-libs/libmng:= )
- nvtt? ( media-gfx/nvidia-texture-tools )
- openexr? ( media-libs/openexr:= )
- opengl? ( virtual/opengl
- virtual/glu )
+ opengl? (
+ virtual/opengl
+ virtual/glu
+ )
png? ( media-libs/libpng:0= )
sdl? ( media-libs/libsdl )
tiff? ( media-libs/tiff:0 )
- X? ( x11-libs/libXext
+ X? (
+ x11-libs/libXext
x11-libs/libX11
- x11-libs/libXrender )
+ x11-libs/libXrender
+ )
xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+DEPEND="
+ ${RDEPEND}
X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}"-CVE-2009-3994.patch
@@ -61,7 +66,7 @@ src_configure() {
$(use_enable cpu_flags_x86_sse sse) \
$(use_enable cpu_flags_x86_sse2 sse2) \
$(use_enable cpu_flags_x86_sse3 sse3) \
- $(use_enable openexr exr) \
+ --disable-exr \
$(use_enable gif) \
$(use_enable jpeg) \
--enable-jp2 \
@@ -79,12 +84,12 @@ src_configure() {
$(use_enable X render) \
$(use_enable glut) \
$(use_with X x) \
- $(use_with nvtt)
+ --without-nvtt
}
src_install() {
default
- # package provides .pc files
+ # Package provides .pc files
find "${ED}" -name '*.la' -delete || die
}
diff --git a/media-libs/devil/metadata.xml b/media-libs/devil/metadata.xml
index 58783541108..5b50790d86f 100644
--- a/media-libs/devil/metadata.xml
+++ b/media-libs/devil/metadata.xml
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <use>
- <flag name="allegro">Add support for Allegro</flag>
- <flag name="nvtt">Add support for <pkg>media-gfx/nvidia-texture-tools</pkg></flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">openil</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <use>
+ <flag name="allegro">Add support for Allegro</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">openil</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index f7fae53b125..9807f553283 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,2 +1,3 @@
DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f
+DIST embree-3.13.3.tar.gz 13712462 BLAKE2B 02edef26b4c4f3676e792c06490e5947d3a2cedd4ce1bbf4731e60feea0b3714bf4bbf9d859d464f179674e4e0c9462d1565869713c5612705df273baa41923f SHA512 eef8d9101f0bf95d6706a495a9aa628c10749862aeb2baa6bba2f82fcc3a96467a28ca1f522d672eb5aa7b29824363674feda25832724da361b3334334a218cd
diff --git a/media-libs/embree/embree-3.13.0-r2.ebuild b/media-libs/embree/embree-3.13.0-r2.ebuild
index 136ad000762..f72392a0812 100644
--- a/media-libs/embree/embree-3.13.0-r2.ebuild
+++ b/media-libs/embree/embree-3.13.0-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="3"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
RESTRICT="mirror"
BDEPEND="
@@ -56,13 +56,13 @@ src_prepare() {
src_configure() {
# NOTE: You can make embree accept custom CXXFLAGS by turning off
# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
- # any "march" compile flags. This is because embree builds modules for the
+ # any "m*" compile flags. This is because embree builds modules for the
# different supported ISAs and picks the correct one at runtime.
- # "march" will pull in cpu instructions that shouldn't be in specific modules
+ # "m*" will pull in cpu instructions that shouldn't be in specific modules
# and it fails to link properly.
# https://github.com/embree/embree/issues/115
- filter-flags -march=*
+ filter-flags -m*
local mycmakeargs=(
# Currently Intel only host their test files on their internal network.
@@ -93,7 +93,7 @@ src_configure() {
-DEMBREE_RAY_MASK=$(usex raymask)
-DEMBREE_RAY_PACKETS=ON # default
-DEMBREE_STACK_PROTECTOR=$(usex ssp)
- -DEMBREE_STATIC_LIB=$(usex static-libs)
+ -DEMBREE_STATIC_LIB=OFF
-DEMBREE_STAT_COUNTERS=OFF
-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
-DEMBREE_TUTORIALS=$(usex tutorial) )
diff --git a/media-libs/embree/embree-3.13.2.ebuild b/media-libs/embree/embree-3.13.2.ebuild
index 94efef93e9b..40002cff3ac 100644
--- a/media-libs/embree/embree-3.13.2.ebuild
+++ b/media-libs/embree/embree-3.13.2.ebuild
@@ -14,7 +14,7 @@ SLOT="3"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
# Let's be explicit here even though we could simplify it.
REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )"
@@ -56,13 +56,13 @@ src_prepare() {
src_configure() {
# NOTE: You can make embree accept custom CXXFLAGS by turning off
# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
- # any "march" compile flags. This is because embree builds modules for the
+ # any "m*" compile flags. This is because embree builds modules for the
# different supported ISAs and picks the correct one at runtime.
- # "march" will pull in cpu instructions that shouldn't be in specific modules
+ # "m*" will pull in cpu instructions that shouldn't be in specific modules
# and it fails to link properly.
# https://github.com/embree/embree/issues/115
- filter-flags -march=*
+ filter-flags -m*
local mycmakeargs=(
# Currently Intel only host their test files on their internal network.
@@ -111,7 +111,7 @@ src_configure() {
# default
-DEMBREE_RAY_PACKETS=ON
-DEMBREE_STACK_PROTECTOR=$(usex ssp)
- -DEMBREE_STATIC_LIB=$(usex static-libs)
+ -DEMBREE_STATIC_LIB=OFF
-DEMBREE_STAT_COUNTERS=OFF
-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
-DEMBREE_TUTORIALS=$(usex tutorial))
diff --git a/media-libs/embree/embree-3.13.3.ebuild b/media-libs/embree/embree-3.13.3.ebuild
new file mode 100644
index 00000000000..40002cff3ac
--- /dev/null
+++ b/media-libs/embree/embree-3.13.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
+# Let's be explicit here even though we could simplify it.
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )"
+
+RESTRICT="mirror"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ >=media-libs/glfw-3.2.1
+ virtual/opengl
+ ispc? ( dev-lang/ispc )
+ tbb? ( dev-cpp/tbb:= )
+ tutorial? (
+ >=media-libs/libpng-1.6.34:0=
+ >=media-libs/openimageio-1.8.7:0=
+ virtual/jpeg:0
+ )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+pkg_setup() {
+ CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+ WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # disable RPM package building
+ sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # NOTE: You can make embree accept custom CXXFLAGS by turning off
+ # EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+ # any "m*" compile flags. This is because embree builds modules for the
+ # different supported ISAs and picks the correct one at runtime.
+ # "m*" will pull in cpu instructions that shouldn't be in specific modules
+ # and it fails to link properly.
+ # https://github.com/embree/embree/issues/115
+
+ filter-flags -m*
+
+ local mycmakeargs=(
+ # Currently Intel only host their test files on their internal network.
+ # So it seems like users can't easily get a hold of these and do
+ # regression testing on their own.
+ -DBUILD_TESTING:BOOL=OFF
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+ # default
+ -DEMBREE_BACKFACE_CULLING=OFF
+ -DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+ # default
+ -DEMBREE_FILTER_FUNCTION=ON
+ # default
+ -DEMBREE_GEOMETRY_CURVE=ON
+ # default
+ -DEMBREE_GEOMETRY_GRID=ON
+ # default
+ -DEMBREE_GEOMETRY_INSTANCE=ON
+ # default
+ -DEMBREE_GEOMETRY_POINT=ON
+ # default
+ -DEMBREE_GEOMETRY_QUAD=ON
+ # default
+ -DEMBREE_GEOMETRY_SUBDIVISION=ON
+ # default
+ -DEMBREE_GEOMETRY_TRIANGLE=ON
+ # default
+ -DEMBREE_GEOMETRY_USER=ON
+ # default
+ -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+ # default
+ -DEMBREE_IGNORE_INVALID_RAYS=OFF
+
+ # Set to NONE so we can manually switch on ISAs below
+ -DEMBREE_MAX_ISA:STRING="NONE"
+ -DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+ -DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+ -DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+ -DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+ -DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+ -DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DEMBREE_ISPC_SUPPORT=$(usex ispc)
+ -DEMBREE_RAY_MASK=$(usex raymask)
+ # default
+ -DEMBREE_RAY_PACKETS=ON
+ -DEMBREE_STACK_PROTECTOR=$(usex ssp)
+ -DEMBREE_STATIC_LIB=OFF
+ -DEMBREE_STAT_COUNTERS=OFF
+ -DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+ -DEMBREE_TUTORIALS=$(usex tutorial))
+
+ # Disable asserts
+ append-cppflags -DNDEBUG
+
+ if use tutorial; then
+ mycmakeargs+=(
+ -DEMBREE_ISPC_ADDRESSING:STRING="64"
+ -DEMBREE_TUTORIALS_LIBJPEG=ON
+ -DEMBREE_TUTORIALS_LIBPNG=ON
+ -DEMBREE_TUTORIALS_OPENIMAGEIO=ON
+ )
+ fi
+
+ cmake_src_configure
+}
diff --git a/media-libs/esdl/esdl-1.3.1.ebuild b/media-libs/esdl/esdl-1.3.1.ebuild
index 39c66807461..914c6cb7ef4 100644
--- a/media-libs/esdl/esdl-1.3.1.ebuild
+++ b/media-libs/esdl/esdl-1.3.1.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=6
-inherit fixheadtails multilib
+
+inherit fixheadtails
DESCRIPTION="Erlang bindings for the SDL library"
HOMEPAGE="http://esdl.sourceforge.net/"
@@ -22,7 +23,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- dev-util/rebar
+ dev-util/rebar:0
"
src_compile() {
diff --git a/media-libs/exiftool/exiftool-12.30.ebuild b/media-libs/exiftool/exiftool-12.30.ebuild
index 579e441d942..debd1e4016e 100644
--- a/media-libs/exiftool/exiftool-12.30.ebuild
+++ b/media-libs/exiftool/exiftool-12.30.ebuild
@@ -3,11 +3,14 @@
EAPI=7
+# Check https://exiftool.org/history.html for whether a release is 'production'
+# Ideally don't bump to non-production at all, but certainly don't stable.
+
DIST_NAME=Image-ExifTool
inherit perl-module
DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://exiftool.org/"
+HOMEPAGE="https://exiftool.org/ http://exiftool.sourceforge.net/"
SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
SLOT="0"
diff --git a/media-libs/exiftool/exiftool-12.33.ebuild b/media-libs/exiftool/exiftool-12.33.ebuild
index b40b4ece01c..cdbb44a589d 100644
--- a/media-libs/exiftool/exiftool-12.33.ebuild
+++ b/media-libs/exiftool/exiftool-12.33.ebuild
@@ -3,11 +3,14 @@
EAPI=8
+# Check https://exiftool.org/history.html for whether a release is 'production'
+# Ideally don't bump to non-production at all, but certainly don't stable.
+
DIST_NAME=Image-ExifTool
inherit perl-module
DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://exiftool.org/"
+HOMEPAGE="https://exiftool.org/ http://exiftool.sourceforge.net"
SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
SLOT="0"
diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest
new file mode 100644
index 00000000000..65be8f97d42
--- /dev/null
+++ b/media-libs/fcft/Manifest
@@ -0,0 +1,4 @@
+DIST fcft-3.0.0.tar.gz 441458 BLAKE2B 9ff83691435953285f1b3f8b51dac7b17453a457eeb910f035e39c6fa3bb39098d3adbb7179f734261a4034e9ea8b034dd03a20ba0c364b7de2efe9b781dfdaa SHA512 fbf7ac7d777bdb530b90b79a0bd8b90d3f7ae8b099c2733304dbe89fbcc1a1a3493d1eac0478bcdee291d8c804da21461737fc3e34164637e86ff737023622b1
+DIST fcft-3.0.1.tar.gz 441493 BLAKE2B 79fe864edf04b21fe88fa167e3390836e5c7254710082312068ff4c39624508e086f4eed2ea5706b52421b2276a6f2d1f2211ff0b256112d989764e667c44fe2 SHA512 856bec504a253678a2962c0a7c5029e5fd3d26e305ca3fcae8d9df398bcc84a03e9d67522673d1f1bb0ec91606c0627d6ab4bf2780cbb5965a01c91e6f0aac89
+DIST fcft-3.1.1.tar.gz 741229 BLAKE2B ef3fdca8f88893f0c69ed48181dce2a185d5e67ba6fc94d2f782b64f3078700c6be909560448f2625d43517f94aac2d82f58df29804b0fae5a72372a5b4a4004 SHA512 0344fc55906dee2588162f805ad703fe0efd26f3a8ce794273721d6111dd29bdb3589bd863f24998346018932f78b4c2dc04c4e2c8b49286db1efa9ecbc5521f
+DIST fcft-3.1.2.tar.gz 741659 BLAKE2B d4c3b9ef444771f255b7b19e9645d53558caed2022a59759418fe0b9961f74833da2b760c0c961ce5fbbf91f3e0291dd87590fe00ab300ee194a497accba392e SHA512 b3874819ef90a4f1d1975cae72b925c928bc9758629e63b2083dab807166133bc68308ba4f9481c34c9e0b5262a1d2558e47cccf6ce9d34516583e48d03a5bf9
diff --git a/media-libs/fcft/fcft-3.0.0.ebuild b/media-libs/fcft/fcft-3.0.0.ebuild
new file mode 100644
index 00000000000..32aafcd5669
--- /dev/null
+++ b/media-libs/fcft/fcft-3.0.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="Simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples +harfbuzz +libutf8proc test"
+REQUIRED_USE="
+ libutf8proc? ( harfbuzz )
+ examples? ( libutf8proc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/pixman
+ examples? (
+ dev-libs/libutf8proc:=
+ dev-libs/wayland
+ )
+ harfbuzz? (
+ media-libs/harfbuzz:=
+ )
+ libutf8proc? (
+ dev-libs/libutf8proc:=
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ app-i18n/unicode-data
+ dev-libs/tllist
+ examples? (
+ dev-libs/wayland-protocols
+ )
+ test? (
+ dev-libs/check
+ harfbuzz? ( media-fonts/noto-emoji )
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ app-text/scdoc
+ examples? (
+ dev-util/wayland-scanner
+ )
+"
+
+src_prepare() {
+ default
+
+ rm -r unicode || die "Failed removing vendored unicode-data"
+
+ sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+ meson.build || die "Failed changing UnicodeData.txt to system's copy"
+ sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
+ meson.build || die "Failed changing emoji-data.txt to system's copy"
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature harfbuzz grapheme-shaping)
+ $(meson_feature libutf8proc run-shaping)
+ $(meson_use examples)
+ $(use test && meson_use harfbuzz test-text-shaping)
+ -Ddocs=enabled
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ local DOCS=( CHANGELOG.md README.md )
+ meson_src_install
+
+ rm -r "${ED}"/usr/share/doc/${PN} || die
+
+ use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+}
diff --git a/media-libs/fcft/fcft-3.0.1.ebuild b/media-libs/fcft/fcft-3.0.1.ebuild
new file mode 100644
index 00000000000..075480c9464
--- /dev/null
+++ b/media-libs/fcft/fcft-3.0.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="Simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="examples +harfbuzz +libutf8proc test"
+REQUIRED_USE="
+ libutf8proc? ( harfbuzz )
+ examples? ( libutf8proc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/pixman
+ examples? (
+ dev-libs/libutf8proc:=
+ dev-libs/wayland
+ )
+ harfbuzz? (
+ media-libs/harfbuzz:=
+ )
+ libutf8proc? (
+ dev-libs/libutf8proc:=
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ app-i18n/unicode-data
+ dev-libs/tllist
+ examples? (
+ dev-libs/wayland-protocols
+ )
+ test? (
+ dev-libs/check
+ harfbuzz? ( media-fonts/noto-emoji )
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ app-text/scdoc
+ examples? (
+ dev-util/wayland-scanner
+ )
+"
+
+src_prepare() {
+ default
+
+ rm -r unicode || die "Failed removing vendored unicode-data"
+
+ sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+ meson.build || die "Failed changing UnicodeData.txt to system's copy"
+ sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
+ meson.build || die "Failed changing emoji-data.txt to system's copy"
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature harfbuzz grapheme-shaping)
+ $(meson_feature libutf8proc run-shaping)
+ $(meson_use examples)
+ $(use test && meson_use harfbuzz test-text-shaping)
+ -Ddocs=enabled
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ local DOCS=( CHANGELOG.md README.md )
+ meson_src_install
+
+ rm -r "${ED}"/usr/share/doc/${PN} || die
+
+ use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+}
diff --git a/media-libs/fcft/fcft-3.1.1.ebuild b/media-libs/fcft/fcft-3.1.1.ebuild
new file mode 100644
index 00000000000..bedcbca8b1f
--- /dev/null
+++ b/media-libs/fcft/fcft-3.1.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="Simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+# MIT for fcft
+# ZLIB for nanosvg
+LICENSE="MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="examples +harfbuzz +libutf8proc test"
+REQUIRED_USE="
+ libutf8proc? ( harfbuzz )
+ examples? ( libutf8proc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/pixman
+ examples? (
+ dev-libs/libutf8proc:=
+ dev-libs/wayland
+ )
+ harfbuzz? (
+ media-libs/harfbuzz:=
+ )
+ libutf8proc? (
+ dev-libs/libutf8proc:=
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ app-i18n/unicode-data
+ dev-libs/tllist
+ examples? (
+ dev-libs/wayland-protocols
+ )
+ test? (
+ dev-libs/check
+ harfbuzz? ( media-fonts/noto-emoji )
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ app-text/scdoc
+ examples? (
+ dev-util/wayland-scanner
+ )
+"
+
+src_prepare() {
+ default
+
+ rm -r unicode || die "Failed removing vendored unicode-data"
+
+ sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+ meson.build || die "Failed changing UnicodeData.txt to system's copy"
+ sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
+ meson.build || die "Failed changing emoji-data.txt to system's copy"
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature harfbuzz grapheme-shaping)
+ $(meson_feature libutf8proc run-shaping)
+ $(meson_use examples)
+ $(use test && meson_use harfbuzz test-text-shaping)
+ # bundled, tiny, I believe this means we should always include it
+ -Dsvg-backend=nanosvg
+ -Ddocs=enabled
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ local DOCS=( CHANGELOG.md README.md )
+ meson_src_install
+
+ rm -r "${ED}"/usr/share/doc/${PN} || die
+
+ use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+}
diff --git a/media-libs/fcft/fcft-3.1.2.ebuild b/media-libs/fcft/fcft-3.1.2.ebuild
new file mode 100644
index 00000000000..bedcbca8b1f
--- /dev/null
+++ b/media-libs/fcft/fcft-3.1.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="Simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+# MIT for fcft
+# ZLIB for nanosvg
+LICENSE="MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="examples +harfbuzz +libutf8proc test"
+REQUIRED_USE="
+ libutf8proc? ( harfbuzz )
+ examples? ( libutf8proc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/pixman
+ examples? (
+ dev-libs/libutf8proc:=
+ dev-libs/wayland
+ )
+ harfbuzz? (
+ media-libs/harfbuzz:=
+ )
+ libutf8proc? (
+ dev-libs/libutf8proc:=
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ app-i18n/unicode-data
+ dev-libs/tllist
+ examples? (
+ dev-libs/wayland-protocols
+ )
+ test? (
+ dev-libs/check
+ harfbuzz? ( media-fonts/noto-emoji )
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ app-text/scdoc
+ examples? (
+ dev-util/wayland-scanner
+ )
+"
+
+src_prepare() {
+ default
+
+ rm -r unicode || die "Failed removing vendored unicode-data"
+
+ sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+ meson.build || die "Failed changing UnicodeData.txt to system's copy"
+ sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
+ meson.build || die "Failed changing emoji-data.txt to system's copy"
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature harfbuzz grapheme-shaping)
+ $(meson_feature libutf8proc run-shaping)
+ $(meson_use examples)
+ $(use test && meson_use harfbuzz test-text-shaping)
+ # bundled, tiny, I believe this means we should always include it
+ -Dsvg-backend=nanosvg
+ -Ddocs=enabled
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ local DOCS=( CHANGELOG.md README.md )
+ meson_src_install
+
+ rm -r "${ED}"/usr/share/doc/${PN} || die
+
+ use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+}
diff --git a/media-libs/fcft/metadata.xml b/media-libs/fcft/metadata.xml
new file mode 100644
index 00000000000..f209916337f
--- /dev/null
+++ b/media-libs/fcft/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>arsen@aarsen.me</email>
+ <name>Arsen Arsenović</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for grapheme
+ and run shaping</flag>
+ <flag name="libutf8proc">Use <pkg>media-libs/harfbuzz</pkg> and
+ <pkg>dev-libs/libutf8proc</pkg> for run shaping</flag>
+ </use>
+</pkgmetadata>
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index c1191ab0464..b8a23c4d2cb 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1 +1 @@
-DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
+DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5 SHA512 4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9
diff --git a/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch b/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
deleted file mode 100644
index bcad809374e..00000000000
--- a/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/flac/decode.c b/src/flac/decode.c
-index c26d3f60..bd3f6524 100644
---- a/src/flac/decode.c
-+++ b/src/flac/decode.c
-@@ -1307,7 +1307,7 @@ void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMet
- if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
- FLAC__uint64 skip, until;
- decoder_session->got_stream_info = true;
-- decoder_session->has_md5sum = memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16);
-+ decoder_session->has_md5sum = memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16) != 0;
- decoder_session->bps = metadata->data.stream_info.bits_per_sample;
- decoder_session->channels = metadata->data.stream_info.channels;
- decoder_session->sample_rate = metadata->data.stream_info.sample_rate;
diff --git a/media-libs/flac/flac-1.3.3-r1.ebuild b/media-libs/flac/flac-1.3.4.ebuild
index 5f99d9e1104..1e006661d08 100644
--- a/media-libs/flac/flac-1.3.3-r1.ebuild
+++ b/media-libs/flac/flac-1.3.4.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-minimal
@@ -11,19 +11,16 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
-RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
+RDEPEND="ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"
BDEPEND="
app-arch/xz-utils
+ sys-devel/gettext
virtual/pkgconfig
- abi_x86_32? ( dev-lang/nasm )
- !elibc_uclibc? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-zero-first-byte-md5sum-check.patch" )
+ abi_x86_32? ( dev-lang/nasm )"
multilib_src_configure() {
local myeconfargs=(
diff --git a/media-libs/flickcurl/flickcurl-1.26.ebuild b/media-libs/flickcurl/flickcurl-1.26.ebuild
index 96f1e11eec8..44be660a945 100644
--- a/media-libs/flickcurl/flickcurl-1.26.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.26.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
@@ -11,7 +11,7 @@ SRC_URI="http://download.dajobe.org/flickcurl/${P}.tar.gz"
LICENSE="|| ( LGPL-2.1 GPL-2 Apache-2.0 )"
SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="raptor"
RDEPEND="
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 21aef1e5b15..a42cf3ac987 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,2 +1,3 @@
DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
+DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
index 33d6549c814..94bea632714 100644
--- a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
@@ -1,6 +1,6 @@
-diff --unified -uNrp fontconfig-2.10.2-orig/configure.ac fontconfig-2.10.2/configure.ac
---- fontconfig-2.10.2-orig/configure.ac 2012-11-26 09:21:13.000000000 +0100
-+++ fontconfig-2.10.2/configure.ac 2013-01-05 15:40:54.541682239 +0100
+https://bugs.gentoo.org/310157
+--- fontconfig-2.10.2-orig/configure.ac
++++ fontconfig-2.10.2/configure.ac
@@ -570,7 +570,11 @@ AC_SUBST(XMLDIR)
# Let people not build/install docs if they don't have docbook
#
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
index 19aee94ba98..71c27f56f64 100644
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
@@ -7,8 +7,6 @@ Subject: [PATCH] Fix the issue that '~' wasn't extracted to the proper homedir
this behavior was broken by d1f48f11. this change fixes it back to the correct behavior.
https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110
-diff --git a/src/fccfg.c b/src/fccfg.c
-index d7c48e8..4a53581 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -2207,17 +2207,19 @@ FcConfigFilename (const FcChar8 *url)
@@ -40,8 +38,6 @@ index d7c48e8..4a53581 100644
return file;
}
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 79bcede..9f4d48a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -91,6 +91,22 @@ test_bz106632_CFLAGS = \
@@ -67,9 +63,6 @@ index 79bcede..9f4d48a 100644
EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
CLEANFILES=out out1 out2 fonts.conf out.expected
-diff --git a/test/test-issue110.c b/test/test-issue110.c
-new file mode 100644
-index 0000000..28a3bd2
--- /dev/null
+++ b/test/test-issue110.c
@@ -0,0 +1,245 @@
@@ -318,6 +311,3 @@ index 0000000..28a3bd2
+ return retval;
+}
+
---
-2.18.0
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
index 7a0edfd849a..d78317da0b3 100644
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
@@ -4,9 +4,6 @@ Date: Mon, 3 Sep 2018 04:56:16 +0000
Subject: [PATCH] Fix the build issue with --enable-static
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109
----
-diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
-index bac1dda..af870d0 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8 *string,
@@ -20,8 +17,6 @@ index bac1dda..af870d0 100644
FcPublic FcChar8 *
FcStrDirname (const FcChar8 *file);
-diff --git a/src/fcint.h b/src/fcint.h
-index de78cd8..a9d075a 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s);
@@ -35,8 +30,6 @@ index de78cd8..a9d075a 100644
FcPrivate FcChar8 *
FcStrLastSlash (const FcChar8 *path);
-diff --git a/test/test-bz106632.c b/test/test-bz106632.c
-index daa0c1e..2d67c2e 100644
--- a/test/test-bz106632.c
+++ b/test/test-bz106632.c
@@ -25,25 +25,26 @@
@@ -96,6 +89,3 @@ index daa0c1e..2d67c2e 100644
int
main (void)
{
---
-2.18.0
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch
new file mode 100644
index 00000000000..b9d5e8e5b5e
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch
@@ -0,0 +1,29 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/223
+
+From d4a8381169984246dbb14b7a810abd170d7d0afd Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 2 Apr 2022 02:36:24 +0100
+Subject: [PATCH] configure.ac: allow disabling docbook
+
+Sometimes we might want to build docs (install man pages, etc)
+but allow disabling use of docbook.
+
+Bug: https://bugs.gentoo.org/310157
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -736,7 +736,13 @@ dnl ===========================================================================
+ # Let people not build/install docs if they don't have docbook
+ #
+
+-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++AC_ARG_ENABLE(docbook,
++ [AS_HELP_STRING([--disable-docbook],
++ [Disable building docs with docbook2html (default: no)])],,)
++
++if test x$enable_docbook != xno; then
++ AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++fi
+
+ AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
+
diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch
new file mode 100644
index 00000000000..2ae36f4ae4d
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/130466
+--- a/conf.d/60-latin.conf
++++ b/conf.d/60-latin.conf
+@@ -5,47 +5,50 @@
+ <alias>
+ <family>serif</family>
+ <prefer>
++ <family>Liberation Serif</family>
+ <family>Noto Serif</family>
+ <family>DejaVu Serif</family>
+ <family>Times New Roman</family>
+- <family>Thorndale AMT</family>
+ <family>Luxi Serif</family>
+ <family>Nimbus Roman No9 L</family>
+ <family>Nimbus Roman</family>
+ <family>Times</family>
++ <family>Thorndale AMT</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
++ <family>Liberation Sans</family>
+ <family>Noto Sans</family>
+ <family>DejaVu Sans</family>
+- <family>Verdana</family>
+ <family>Arial</family>
+- <family>Albany AMT</family>
+ <family>Luxi Sans</family>
+ <family>Nimbus Sans L</family>
+ <family>Nimbus Sans</family>
+ <family>Helvetica</family>
+ <family>Lucida Sans Unicode</family>
+ <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
++ <family>Verdana</family>
+ <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
++ <family>Albany AMT</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
++ <family>Liberation Mono</family>
+ <family>Noto Sans Mono</family>
+ <family>DejaVu Sans Mono</family>
+ <family>Inconsolata</family>
+ <family>Andale Mono</family>
+ <family>Courier New</family>
+- <family>Cumberland AMT</family>
+ <family>Luxi Mono</family>
+ <family>Nimbus Mono L</family>
+ <family>Nimbus Mono</family>
+ <family>Nimbus Mono PS</family>
+ <family>Courier</family>
++ <family>Cumberland AMT</family>
+ </prefer>
+ </alias>
+ <!--
+@@ -66,6 +69,7 @@
+ <alias>
+ <family>cursive</family>
+ <prefer>
++ <family>Comic Neue</family>
+ <family>ITC Zapf Chancery Std</family>
+ <family>Zapfino</family>
+ <family>Comic Sans MS</family>
diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch
new file mode 100644
index 00000000000..7d0041ad976
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch
@@ -0,0 +1,14 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/320
+--- a/test/run-test.sh
++++ b/test/run-test.sh
+@@ -40,9 +40,7 @@ EXPECTED=${EXPECTED-"out.expected"}
+ FCLIST="$LOG_COMPILER ../fc-list/fc-list$EXEEXT"
+ FCCACHE="$LOG_COMPILER ../fc-cache/fc-cache$EXEEXT"
+
+-if [ -x "$(command -v bwrap)" ]; then
+- BWRAP="$(command -v bwrap)"
+-fi
++BWRAP=""
+
+ FONT1=$TESTDIR/4x6.pcf
+ FONT2=$TESTDIR/8x16.pcf
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 6b51d5adc5b..b00c1b232b1 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-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
@@ -54,8 +54,6 @@ PATCHES=(
"${FILESDIR}"/${P}-proper_homedir.patch
)
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
pkg_setup() {
DOC_CONTENTS="Please make fontconfig configuration changes using
\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
@@ -102,6 +100,8 @@ multilib_src_configure() {
}
multilib_src_install() {
+ MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
default
# avoid calling this multiple times, bug #459210
@@ -170,7 +170,7 @@ pkg_postinst() {
readme.gentoo_print_elog
- if [[ ${ROOT} == "" ]]; then
+ if [[ -z ${ROOT} ]]; then
multilib_pkg_postinst() {
ebegin "Creating global font cache for ${ABI}"
"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index 329ec7d1678..deaa7fcd009 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.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,8 +41,11 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
elibc_SunOS? ( sys-libs/libuuid )
virtual/libintl[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
- virtual/ttf-fonts"
+PDEPEND="virtual/ttf-fonts"
+# Put the eselect module in BDEPEND until EAPI 8 is ready for IDEPEND, so that
+# it is natively usable in BROOT to update ROOT when cross-compiling.
+BDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
+RDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
PATCHES=(
"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
@@ -51,8 +54,6 @@ PATCHES=(
# Patches from upstream (can usually be removed with next version bump)
)
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
pkg_setup() {
DOC_CONTENTS="Please make fontconfig configuration changes using
\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
@@ -110,6 +111,8 @@ multilib_src_configure() {
}
multilib_src_install() {
+ MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
default
# avoid calling this multiple times, bug #459210
@@ -183,7 +186,7 @@ pkg_postinst() {
readme.gentoo_print_elog
- if [[ ${ROOT} == "" ]] ; then
+ if [[ -z ${ROOT} ]] ; then
multilib_pkg_postinst() {
ebegin "Creating global font cache for ${ABI}"
"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
new file mode 100644
index 00000000000..e476d074801
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Cannot yet migrate to Meson as of 2.14.0:
+# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/244
+inherit autotools multilib-minimal readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/"
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+# Note that FT versioning is confusing, need to map it using
+# https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+# But sometimes it's actually greater than that, e.g. see Fedora's spec file
+# https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+# default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+# It might become an optional(?) runtime dep in future though. Who knows.
+# Keep an eye on it.
+RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+ !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
+ elibc_Darwin? ( sys-libs/native-uuid )
+ elibc_SunOS? ( sys-libs/libuuid )
+ virtual/libintl[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/json-c )"
+BDEPEND="dev-util/gperf
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ doc? (
+ =app-text/docbook-sgml-dtd-3.1*
+ app-text/docbook-sgml-utils[jadetex]
+ )"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )"
+
+PATCHES=(
+ # bug #310157
+ "${FILESDIR}"/${PN}-2.14.0-docbook.patch
+ # bug #130466 + make liberation default
+ "${FILESDIR}"/${PN}-2.14.0-latin-update.patch
+ # Avoid test failure (bubblewrap doesn't work within sandbox)
+ "${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch
+
+ # Patches from upstream (can usually be removed with next version bump)
+)
+
+DOC_CONTENTS="Please make fontconfig configuration changes using
+\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+overwritten. If you need to reset your configuration to upstream defaults,
+delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
+
+src_prepare() {
+ default
+
+ # Needed for docbook patch
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local addfonts=(
+ "${EPREFIX}"/usr/local/share/fonts
+ )
+
+ # Harvest some font locations, such that users can benefit from the
+ # host OS's installed fonts
+ case ${CHOST} in
+ *-darwin*)
+ addfonts+=(
+ /Library/Fonts
+ /System/Library/Fonts
+ )
+ ;;
+
+ *-solaris*)
+ [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+ addfonts+=( /usr/X/lib/X11/fonts/TrueType )
+ [[ -d /usr/X/lib/X11/fonts/Type1 ]] &&
+ addfonts+=( /usr/X/lib/X11/fonts/Type1 )
+ ;;
+
+ *-linux-gnu)
+ use prefix && [[ -d /usr/share/fonts ]] && \
+ addfonts+=( /usr/share/fonts )
+ ;;
+ esac
+
+ local myeconfargs=(
+ $(use_enable doc docbook)
+ $(use_enable static-libs static)
+
+ # man pages. We split out the docbook parts into its own flag.
+ --enable-docs
+ # We handle this ourselves.
+ --disable-cache-build
+ # See comment above *DEPEND. We use Expat instead.
+ --disable-libxml2
+
+ --localstatedir="${EPREFIX}"/var
+ --with-default-fonts="${EPREFIX}"/usr/share/fonts
+ --with-add-fonts=$(IFS=, ; echo "${addfonts[*]}" )
+ --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ # Test needs network access
+ # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319
+ # On bumps after 2.14.0, please check to see if this has been fixed
+ # to allow local access!
+ chmod -x test/test-crbug1004254 || die
+
+ default
+}
+
+multilib_src_install() {
+ MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+ default
+
+ # Avoid calling this multiple times, bug #459210
+ if multilib_is_native_abi; then
+ # Stuff installed from build-dir
+ emake -C doc DESTDIR="${D}" install-man
+
+ insinto /etc/fonts
+ doins fonts.conf
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ find "${ED}" -name "*.la" -delete || die
+
+ # fc-lang directory contains language coverage datafiles
+ # which are needed to test the coverage of fonts.
+ insinto /usr/share/fc-lang
+ doins fc-lang/*.orth
+
+ dodoc doc/fontconfig-user.{txt,pdf}
+
+ if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ; then
+ mv "${ED}"/usr/share/doc/fontconfig/* \
+ "${ED}"/usr/share/doc/${P} || die
+ rm -rf "${ED}"/usr/share/doc/fontconfig || die
+ fi
+
+ # Changes should be made to /etc/fonts/local.conf, and as we had
+ # too much problems with broken fonts.conf we force update it ...
+ echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' \
+ > "${T}"/37fontconfig || die
+ doenvd "${T}"/37fontconfig
+
+ # As of fontconfig 2.7, everything sticks their noses in here.
+ dodir /etc/sandbox.d
+ echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' \
+ > "${ED}"/etc/sandbox.d/37fontconfig || die
+
+ readme.gentoo_create_doc
+
+ # We allow the cache generation to make this later
+ # bug #587492
+ rm -r "${ED}"/var/cache/ || die
+}
+
+pkg_preinst() {
+ # bug #193476
+ # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+ # config files. If we install as-is, we'll blow away user settings.
+ ebegin "Syncing fontconfig configuration to system"
+ if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then
+ local file f
+ for file in "${EROOT}"/etc/fonts/conf.avail/* ; do
+ f=${file##*/}
+ if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then
+ [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+ && ln -sf ../conf.avail/"${f}" \
+ "${ED}"/etc/fonts/conf.d/ &>/dev/null
+ else
+ [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+ && rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
+ fi
+ done
+ fi
+ eend $?
+}
+
+pkg_postinst() {
+ einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
+ find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
+
+ readme.gentoo_print_elog
+
+ if [[ -z ${ROOT} ]] ; then
+ multilib_pkg_postinst() {
+ ebegin "Creating global font cache for ${ABI}"
+ "${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
+ eend $?
+ }
+
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+ fi
+}
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 65e5ed2d160..2fbe9733f0d 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1 +1,2 @@
DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
+DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
diff --git a/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild
new file mode 100644
index 00000000000..6c9d9afe555
--- /dev/null
+++ b/media-libs/freeglut/freeglut-3.2.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library"
+HOMEPAGE="http://freeglut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static-libs"
+
+# enabling GLES support seems to cause build failures
+RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
+# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] )
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ local mycmakeargs=(
+# "-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006
+ "-DFREEGLUT_GLES=OFF"
+ "-DFREEGLUT_BUILD_DEMOS=OFF"
+ "-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)"
+ )
+# $(cmake-utils_use gles FREEGLUT_GLES)
+ cmake-multilib_src_configure
+}
+
+multilib_src_install() {
+ cmake_src_install
+ cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
+}
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-openexr-3-imath.patch b/media-libs/freeimage/files/freeimage-3.18.0-openexr-3-imath.patch
new file mode 100644
index 00000000000..693c71fef32
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-openexr-3-imath.patch
@@ -0,0 +1,144 @@
+diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
+index faa8037..e88bd2d 100644
+--- a/Source/FreeImage/PluginEXR.cpp
++++ b/Source/FreeImage/PluginEXR.cpp
+@@ -28,16 +28,32 @@
+ #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
+ #endif
+
+-#include <ImfIO.h>
+-#include <Iex.h>
+-#include <ImfOutputFile.h>
+-#include <ImfInputFile.h>
+-#include <ImfRgbaFile.h>
+-#include <ImfChannelList.h>
+-#include <ImfRgba.h>
+-#include <ImfArray.h>
+-#include <ImfPreviewImage.h>
+-#include <half.h>
++#include <OpenEXR/ImfIO.h>
++#include <OpenEXR/Iex.h>
++#include <OpenEXR/ImfOutputFile.h>
++#include <OpenEXR/ImfInputFile.h>
++#include <OpenEXR/ImfRgbaFile.h>
++#include <OpenEXR/ImfChannelList.h>
++#include <OpenEXR/ImfRgba.h>
++#include <OpenEXR/ImfArray.h>
++#include <OpenEXR/ImfPreviewImage.h>
++
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/half.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/half.h>
++#endif
+
+
+ // ==========================================================
+@@ -66,11 +82,11 @@ public:
+ return ((unsigned)n != _io->read_proc(c, 1, n, _handle));
+ }
+
+- virtual Imath::Int64 tellg() {
++ virtual uint64_t tellg() {
+ return _io->tell_proc(_handle);
+ }
+
+- virtual void seekg(Imath::Int64 pos) {
++ virtual void seekg(uint64_t pos) {
+ _io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
+ }
+
+@@ -100,11 +116,11 @@ public:
+ }
+ }
+
+- virtual Imath::Int64 tellp() {
++ virtual uint64_t tellp() {
+ return _io->tell_proc(_handle);
+ }
+
+- virtual void seekp(Imath::Int64 pos) {
++ virtual void seekp(uint64_t pos) {
+ _io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
+ }
+ };
+diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
+index b9da767..96da4d7 100644
+--- a/Source/FreeImage/PluginTIFF.cpp
++++ b/Source/FreeImage/PluginTIFF.cpp
+@@ -39,7 +39,24 @@
+ #include "Utilities.h"
+ #include "tiffiop.h"
+ #include "../Metadata/FreeImageTag.h"
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathVec.h>
++# include <Imath/half.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathVec.h>
++# include <OpenEXR/half.h>
++#endif
+
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+diff --git a/Makefile.fip b/Makefile.fip
+index 60bedbc..193126d 100644
+--- a/Makefile.fip
++++ b/Makefile.fip
+@@ -28,7 +28,7 @@ LIBRARIES-$(USE_JPEG) += -ljpeg
+ LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
+ LIBRARIES-$(USE_MNG) += -lmng
+ LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng)
+-LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 Imath)
+ LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw)
+ LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux)
+
+diff --git a/Makefile.gnu b/Makefile.gnu
+index b11c554..3de5a1b 100644
+--- a/Makefile.gnu
++++ b/Makefile.gnu
+@@ -28,7 +28,7 @@ LIBRARIES-$(USE_JPEG) += -ljpeg
+ LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
+ LIBRARIES-$(USE_MNG) += -lmng
+ LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng)
+-LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 Imath)
+ LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw)
+ LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux)
+
+diff --git a/Makefile.srcs b/Makefile.srcs
+index 26e1a6d..d97eacf 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -180,7 +180,7 @@ INCLUDE-$(USE_JPEG) += -DUSE_JPEG
+ INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjp2)
+ INCLUDE-$(USE_MNG) += -DUSE_MNG
+ INCLUDE-$(USE_PNG) += -DUSE_PNG $(shell $(PKG_CONFIG) --cflags-only-I libpng)
+-INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
++INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 Imath)
+ INCLUDE-$(USE_RAW) += -DUSE_RAW $(shell $(PKG_CONFIG) --cflags-only-I libraw)
+ INCLUDE-$(USE_WEBP) += -DUSE_WEBP $(shell $(PKG_CONFIG) --cflags-only-I libwebp libwebpmux)
+ INCLUDE = $(INCLUDE-yes)
diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
index 3240d3021ec..fc774456990 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r6.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 edos2unix toolchain-funcs
@@ -17,10 +17,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
LICENSE="|| ( GPL-2 FIPL-1.0 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
-# The tiff/ilmbase isn't a typo. The TIFF plugin cheats and
+# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
# uses code from it to handle 16bit<->float conversions.
RDEPEND="
sys-libs/zlib
@@ -31,7 +31,8 @@ RDEPEND="
png? ( media-libs/libpng:0= )
raw? ( media-libs/libraw:= )
tiff? (
- media-libs/ilmbase:=
+ >=dev-libs/imath-3.1.4-r2:=
+ >=media-libs/openexr-3:0=
media-libs/tiff:0
)
webp? ( media-libs/libwebp:= )"
@@ -43,6 +44,7 @@ BDEPEND="
S=${WORKDIR}/${MY_PN}
DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+
PATCHES=(
"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
@@ -51,6 +53,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.18.0-raw.patch
"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+ "${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
)
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 6f1f0ea25be..8cc5622db11 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,7 +1,6 @@
-DIST freetype-2.11.0-COLR_v1_clipbox.patch.xz 3940 BLAKE2B 45b84b1070a9a9e1e13058ce7200555f4f9e26df4fe25eab4a644869df86f267cc91bfcf2ab10a9f0673be51504f05eec730300dee13ca34bb6f8afdc32ee354 SHA512 bf0cc00b3f27cb3408881cec46654be57b96b099cfd3df06e33b94aa47f35a7c9499a9935837be0f652d4f17ab2b6c78bc1fcef328754cde64f0b139d00ceb29
-DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d
-DIST freetype-2.11.1.tar.xz 2270728 BLAKE2B 15cc03e7b8ba93b2f240b0eee3f1cc07bca77d9ef67a1971d44d6c061a0dff2b13737fa417f7f2dc4e7e6df660223325931f69a107a6b2eaf14425fc71b7ca7b SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
-DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301
-DIST freetype-doc-2.11.1.tar.xz 2038348 BLAKE2B 2248d16bb12b29294226a67a10328c61b064c8e0ad7fb5f004c2e6da1237175f03d51a48d5df03a3de3bbe935307e573014c079c31468c9f59416bc4e9057a9c SHA512 c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36
-DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531
-DIST ft2demos-2.11.1.tar.xz 257240 BLAKE2B 1d620af52e76d1152a0a6aeeb0036d2423e498e371b75c01c408cc0974845abfe2f3f562ad638ca5640ec1b24023d7a47e1688743ca738c2bb1ceea6ee05cfcf SHA512 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5
+DIST freetype-2.12.0.tar.xz 2340352 BLAKE2B 09227c883e52b4e4aefd68d8e4bfaf36eed0c4d92d22d6f5f88e2a69a94be6040ecff7285ca92f30cd9ce71a4af0ffa74141f3263f7a75e29d87b8a4fe27bf08 SHA512 d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54
+DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
+DIST freetype-doc-2.12.0.tar.xz 2038684 BLAKE2B ac5197f1a31a4c29a218c0a35af4658a289afbea9ad6b5a200dd0518d63a1b647467b3c460b72863a4048269c249ca2fbc83146ba3de6594e00bfa88a701d979 SHA512 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6
+DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
+DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
+DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
diff --git a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
deleted file mode 100644
index ea02a15df11..00000000000
--- a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 56e6ee69d298c0d150e2b76d2cfa2306e901df40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 11 Oct 2020 08:59:08 +0200
-Subject: [PATCH] Prevent apps from using the autoconf sizeof branch.
-
-Use #error to make sure that any app trying to enable that branch fails
-miserably. This guarantees the code to be multilib-friendly and also
-removes the header differences triggering QA errors.
----
- builds/unix/ftconfig.h.in | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/builds/unix/ftconfig.h.in b/builds/unix/ftconfig.h.in
-index 00b5a8226..020593a95 100644
---- a/builds/unix/ftconfig.h.in
-+++ b/builds/unix/ftconfig.h.in
-@@ -45,10 +45,7 @@
- #undef FT_USE_AUTOCONF_SIZEOF_TYPES
- #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
-
--#undef SIZEOF_INT
--#undef SIZEOF_LONG
--#define FT_SIZEOF_INT SIZEOF_INT
--#define FT_SIZEOF_LONG SIZEOF_LONG
-+#error "Unsupported code branch enabled. Please report a bug to bugs.gentoo.org."
-
- #endif /* FT_USE_AUTOCONF_SIZEOF_TYPES */
-
---
-2.28.0
-
diff --git a/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch b/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch
deleted file mode 100644
index af24a09ef21..00000000000
--- a/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e40ae7569aa4ef591f66ff9066df2f91de75bb77 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott@chromium.org>
-Date: Mon, 9 Aug 2021 13:44:55 +0300
-Subject: [PATCH] [sfnt] Add missing blend mode 'plus' to 'COLR' v1.
-
-* include/freetype/ftcolor.h (FT_Composite_Mode): Add missing blend mode
-'plus' after it was added to the spec.
----
- include/freetype/ftcolor.h | 33 +++++++++++++++++----------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h
-index b98289917..cbd2d85bb 100644
---- a/include/freetype/ftcolor.h
-+++ b/include/freetype/ftcolor.h
-@@ -740,22 +740,23 @@ FT_BEGIN_HEADER
- FT_COLR_COMPOSITE_SRC_ATOP = 9,
- FT_COLR_COMPOSITE_DEST_ATOP = 10,
- FT_COLR_COMPOSITE_XOR = 11,
-- FT_COLR_COMPOSITE_SCREEN = 12,
-- FT_COLR_COMPOSITE_OVERLAY = 13,
-- FT_COLR_COMPOSITE_DARKEN = 14,
-- FT_COLR_COMPOSITE_LIGHTEN = 15,
-- FT_COLR_COMPOSITE_COLOR_DODGE = 16,
-- FT_COLR_COMPOSITE_COLOR_BURN = 17,
-- FT_COLR_COMPOSITE_HARD_LIGHT = 18,
-- FT_COLR_COMPOSITE_SOFT_LIGHT = 19,
-- FT_COLR_COMPOSITE_DIFFERENCE = 20,
-- FT_COLR_COMPOSITE_EXCLUSION = 21,
-- FT_COLR_COMPOSITE_MULTIPLY = 22,
-- FT_COLR_COMPOSITE_HSL_HUE = 23,
-- FT_COLR_COMPOSITE_HSL_SATURATION = 24,
-- FT_COLR_COMPOSITE_HSL_COLOR = 25,
-- FT_COLR_COMPOSITE_HSL_LUMINOSITY = 26,
-- FT_COLR_COMPOSITE_MAX = 27
-+ FT_COLR_COMPOSITE_PLUS = 12,
-+ FT_COLR_COMPOSITE_SCREEN = 13,
-+ FT_COLR_COMPOSITE_OVERLAY = 14,
-+ FT_COLR_COMPOSITE_DARKEN = 15,
-+ FT_COLR_COMPOSITE_LIGHTEN = 16,
-+ FT_COLR_COMPOSITE_COLOR_DODGE = 17,
-+ FT_COLR_COMPOSITE_COLOR_BURN = 18,
-+ FT_COLR_COMPOSITE_HARD_LIGHT = 19,
-+ FT_COLR_COMPOSITE_SOFT_LIGHT = 20,
-+ FT_COLR_COMPOSITE_DIFFERENCE = 21,
-+ FT_COLR_COMPOSITE_EXCLUSION = 22,
-+ FT_COLR_COMPOSITE_MULTIPLY = 23,
-+ FT_COLR_COMPOSITE_HSL_HUE = 24,
-+ FT_COLR_COMPOSITE_HSL_SATURATION = 25,
-+ FT_COLR_COMPOSITE_HSL_COLOR = 26,
-+ FT_COLR_COMPOSITE_HSL_LUMINOSITY = 27,
-+ FT_COLR_COMPOSITE_MAX = 28
-
- } FT_Composite_Mode;
-
---
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch b/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch
deleted file mode 100644
index f602866f591..00000000000
--- a/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fed5521016227bf8cc4475f66450a9963568d162 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Mon, 9 Aug 2021 19:27:34 +0200
-Subject: [PATCH] * src/sfnt/ttcolr.c (tt_face_get_color_glyph_clipbox): Minor
- fix.
-
----
- src/sfnt/ttcolr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
-index 2f3e8846d..68807127f 100644
---- a/src/sfnt/ttcolr.c
-+++ b/src/sfnt/ttcolr.c
-@@ -863,7 +863,7 @@
-
- format = FT_NEXT_BYTE( p1 );
-
-- if ( format < 0 || format > 1 )
-+ if ( format > 1 )
- return 0;
-
- /* `face->root.size->metrics.x_scale` and `y_scale` are factors */
---
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch b/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch
deleted file mode 100644
index 46206465ffa..00000000000
--- a/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001
-From: Alexei Podtelezhnikov <apodtele@gmail.com>
-Date: Fri, 20 Aug 2021 16:01:32 -0400
-Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs.
-
-Fixes #1076.
-
-* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when
-rendering a bitmap glyph.
----
- src/base/ftobjs.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
-index 342ac4a27..7b40c6421 100644
---- a/src/base/ftobjs.c
-+++ b/src/base/ftobjs.c
-@@ -4703,7 +4703,7 @@
- else
- renderer = FT_Lookup_Renderer( library, slot->format, &node );
-
-- error = FT_ERR( Unimplemented_Feature );
-+ error = FT_ERR( Cannot_Render_Glyph );
- while ( renderer )
- {
- error = renderer->render( renderer, slot, render_mode, NULL );
-@@ -4719,6 +4719,11 @@
- /* format. */
- renderer = FT_Lookup_Renderer( library, slot->format, &node );
- }
-+
-+ /* it is not an error if we cannot render a bitmat glyph */
-+ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) &&
-+ slot->format == FT_GLYPH_FORMAT_BITMAP )
-+ error = FT_Err_Ok;
- }
- }
-
---
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch b/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
new file mode 100644
index 00000000000..6578475f4d7
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
@@ -0,0 +1,31 @@
+From 978eefee5401abee6bf702c6bcde9afb47893145 Mon Sep 17 00:00:00 2001
+From: Georg Brandl <georg@python.org>
+Date: Tue, 12 Apr 2022 11:43:37 +0000
+Subject: [PATCH] * src/cff/cffgload.c (cff_slot_load) [FT_CONFIG_OPTION_SVG]:
+ Fix segfault.
+
+This can happen if the function is called with `size` being `NULL`.
+
+Fixes #1147.
+---
+ src/cff/cffgload.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
+index 5c15c804b..7586b886f 100644
+--- a/src/cff/cffgload.c
++++ b/src/cff/cffgload.c
+@@ -370,8 +370,8 @@
+ SFNT_Service sfnt;
+
+
+- if ( size->root.metrics.x_ppem < 1 ||
+- size->root.metrics.y_ppem < 1 )
++ if ( size && (size->root.metrics.x_ppem < 1 ||
++ size->root.metrics.y_ppem < 1 ) )
+ {
+ error = FT_THROW( Invalid_Size_Handle );
+ return error;
+--
+GitLab
+
diff --git a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch b/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
new file mode 100644
index 00000000000..bb6854e9ecb
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
@@ -0,0 +1,56 @@
+https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/156
+
+--- freetype-2.12.0/builds/unix/configure.ac
++++ freetype-2.12.0/builds/unix/configure.ac
+@@ -530,13 +530,20 @@
+ [test "$ac_cv_search_clock_gettime" = "none required" \
+ || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+
+-# 'librsvg' is needed to demonstrate SVG support.
+-PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
+- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
+-
+ FT_DEMO_CFLAGS=""
+ FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
+
++# 'librsvg' is needed to demonstrate SVG support.
++AC_ARG_WITH([librsvg],
++ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
++ [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
++ [], [with_librsvg=auto])
++
++have_librsvg=no
++AS_IF([test x"$with_librsvg" != xno], [
++ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
++ [have_librsvg="yes (pkg-config)"])
++])
+ if test "$have_librsvg" != no; then
+ FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
+ FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
+--- freetype-2.12.0/builds/unix/configure.raw
++++ freetype-2.12.0/builds/unix/configure.raw
+@@ -530,13 +530,20 @@
+ [test "$ac_cv_search_clock_gettime" = "none required" \
+ || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+
+-# 'librsvg' is needed to demonstrate SVG support.
+-PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
+- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
+-
+ FT_DEMO_CFLAGS=""
+ FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
+
++# 'librsvg' is needed to demonstrate SVG support.
++AC_ARG_WITH([librsvg],
++ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
++ [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
++ [], [with_librsvg=auto])
++
++have_librsvg=no
++AS_IF([test x"$with_librsvg" != xno], [
++ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
++ [have_librsvg="yes (pkg-config)"])
++])
+ if test "$have_librsvg" != no; then
+ FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
+ FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
diff --git a/media-libs/freetype/freetype-2.11.0-r2.ebuild b/media-libs/freetype/freetype-2.11.0-r2.ebuild
deleted file mode 100644
index 658322e92af..00000000000
--- a/media-libs/freetype/freetype-2.11.0-r2.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="High-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
-
-if [[ "${PV}" != 9999 ]] ; then
- SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
- mirror://nongnu/freetype/${P/_/}.tar.xz
- utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
- mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
- doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
- mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
- SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-COLR_v1_clipbox.patch.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
- IUSE+=" doc"
-else
- inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-
-RDEPEND="
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
- utils? (
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
- )
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
- "${WORKDIR}"/${P}-COLR_v1_clipbox.patch
- "${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch
- "${FILESDIR}"/${P}-COLR_missing_blend_mode.patch
- "${FILESDIR}"/${P}-quiet_noop.patch #820500
-)
-
-_egit_repo_handler() {
- if [[ "${PV}" == 9999 ]] ; then
- local phase="${1}"
- case ${phase} in
- fetch|unpack)
- :;
- ;;
- *)
- die "Please use this function with either \"fetch\" or \"unpack\""
- ;;
- esac
-
- local EGIT_REPO_URI
- EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
- git-r3_src_${phase}
- if use utils ; then
- EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
- local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
- git-r3_src_${phase}
- fi
- else
- default
- fi
-}
-
-src_fetch() {
- _egit_repo_handler ${EBUILD_PHASE}
-}
-
-src_unpack() {
- _egit_repo_handler ${EBUILD_PHASE}
-
- if [[ "${PV}" == 9999 ]] ; then
- # Need to copy stuff from dlg subproject (#758902)
- local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
- local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
- local dlg_dest_dir="${S}/include"
- mkdir -p "${dlg_dest_dir}/dlg" || die
- cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
- cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
- fi
-}
-
-src_prepare() {
- if [[ "${PV}" == 9999 ]] ; then
- # Do NOT automagically mess with submodules!!!
- sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
- # inspired by shipped autogen.sh script
- eval $(sed -n \
- -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \
- -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \
- -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \
- include/freetype/freetype.h || die)
- FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
- [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
- pushd builds/unix &>/dev/null || die
- sed -e "s;@VERSION@;${FREETYPE};" \
- < configure.raw > configure.ac || die
- # eautoheader produces broken ftconfig.in
- AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
- unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
- popd &>/dev/null || die
- fi
-
- default
-
- # This is the same as the 01 patch from infinality
- sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
-
- enable_option() {
- sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
- include/${PN}/config/ftoption.h \
- || die "unable to enable option $1"
- }
-
- disable_option() {
- sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
- include/${PN}/config/ftoption.h \
- || die "unable to disable option $1"
- }
-
- # Will be the new default for >=freetype-2.7.0
- disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
-
- if use infinality && use cleartype-hinting ; then
- enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )"
- elif use infinality ; then
- enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1"
- elif use cleartype-hinting ; then
- enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
- fi
-
- # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
- # via environment (new since v2.8)
- enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
- # See https://freetype.org/patents.html (expired!)
- enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
- if ! use adobe-cff ; then
- enable_option CFF_CONFIG_OPTION_OLD_ENGINE
- fi
-
- if use debug ; then
- enable_option FT_DEBUG_LEVEL_TRACE
- enable_option FT_DEBUG_MEMORY
- fi
-
- if use utils ; then
- cd "${WORKDIR}/ft2demos-${PV}" || die
- # Disable tests needing X11 when USE="-X". (bug #177597)
- if ! use X ; then
- sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
- fi
- cd "${S}" || die
- fi
-
- # we need non-/bin/sh to run configure
- if [[ -n ${CONFIG_SHELL} ]] ; then
- sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
- "${S}"/builds/unix/configure || die
- fi
-
- elibtoolize --patch-only
-}
-
-multilib_src_configure() {
- append-flags -fno-strict-aliasing
- type -P gmake &> /dev/null && export GNUMAKE=gmake
-
- local myeconfargs=(
- --disable-freetype-config
- --enable-biarch-config
- --enable-shared
- $(use_with brotli)
- $(use_with bzip2)
- $(use_with harfbuzz)
- $(use_with png)
- $(use_enable static-libs static)
-
- # avoid using libpng-config
- LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
- LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
- )
-
- case ${CHOST} in
- mingw*|*-mingw*) ;;
- # Workaround windows mis-detection: bug #654712
- # Have to do it for both ${CHOST}-windres and windres
- *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
- esac
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi && use utils ; then
- einfo "Building utils"
- # fix for Prefix, bug #339334
- emake \
- X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
- FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi && use utils ; then
- einfo "Installing utils"
- emake DESTDIR="${D}" FT2DEMOS=1 \
- TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
- fi
-}
-
-multilib_src_install_all() {
- if use fontforge ; then
- # Probably fontforge needs less but this way makes things simplier...
- einfo "Installing internal headers required for fontforge"
- local header
- find src/truetype include/freetype/internal -name '*.h' | \
- while read header ; do
- mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
- cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
- done
- fi
-
- dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
- if [[ "${PV}" != 9999 ]] && use doc ; then
- docinto html
- dodoc -r docs/*
- fi
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/media-libs/freetype/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.12.0-r1.ebuild
index b4e9e81a703..51df8e5fb2d 100644
--- a/media-libs/freetype/freetype-2.11.0-r1.ebuild
+++ b/media-libs/freetype/freetype-2.12.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
DESCRIPTION="High-quality and portable font engine"
HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
if [[ "${PV}" != 9999 ]] ; then
SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -16,11 +16,10 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
- SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-COLR_v1_clipbox.patch.xz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+=" doc"
else
- inherit autotools git-r3
+ inherit git-r3
fi
LICENSE="|| ( FTL GPL-2+ )"
@@ -33,22 +32,20 @@ RDEPEND="
harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
utils? (
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
- )
- )"
+ svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
+ X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+ )
+"
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
- "${WORKDIR}"/${P}-COLR_v1_clipbox.patch
- "${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch
- "${FILESDIR}"/${P}-COLR_missing_blend_mode.patch
+ "${FILESDIR}/${PN}-2.12.0-librsvg_automagic.patch"
+
+ # https://bugs.gentoo.org/836898
+ "${FILESDIR}/${P}-cffgload_segfault_fix.patch"
)
_egit_repo_handler() {
@@ -64,10 +61,10 @@ _egit_repo_handler() {
esac
local EGIT_REPO_URI
- EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
git-r3_src_${phase}
if use utils ; then
- EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
git-r3_src_${phase}
fi
@@ -76,6 +73,12 @@ _egit_repo_handler() {
fi
}
+pkg_pretend() {
+ if use svg && ! use utils ; then
+ einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
+ fi
+}
+
src_fetch() {
_egit_repo_handler ${EBUILD_PHASE}
}
@@ -117,6 +120,11 @@ src_prepare() {
default
+ pushd builds/unix &>/dev/null || die
+ # eautoheader produces broken ftconfig.in
+ AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+ popd &>/dev/null || die
+
# This is the same as the 01 patch from infinality
sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
@@ -183,13 +191,14 @@ multilib_src_configure() {
local myeconfargs=(
--disable-freetype-config
- --enable-biarch-config
--enable-shared
+ --with-zlib
$(use_with brotli)
$(use_with bzip2)
$(use_with harfbuzz)
$(use_with png)
$(use_enable static-libs static)
+ $(usex utils $(use_with svg librsvg) --without-librsvg)
# avoid using libpng-config
LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
@@ -203,6 +212,8 @@ multilib_src_configure() {
*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
esac
+ export CC_BUILD="$(tc-getBUILD_CC)"
+
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
diff --git a/media-libs/freetype/freetype-2.11.1.ebuild b/media-libs/freetype/freetype-2.12.1.ebuild
index d0c71e729b9..7ff4910e41e 100644
--- a/media-libs/freetype/freetype-2.11.1.ebuild
+++ b/media-libs/freetype/freetype-2.12.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
DESCRIPTION="High-quality and portable font engine"
HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
if [[ "${PV}" != 9999 ]] ; then
SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -16,10 +16,10 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+=" doc"
else
- inherit autotools git-r3
+ inherit git-r3
fi
LICENSE="|| ( FTL GPL-2+ )"
@@ -32,17 +32,18 @@ RDEPEND="
harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
utils? (
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
- )
- )"
+ svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
+ X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+ )
+"
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+)
+
_egit_repo_handler() {
if [[ "${PV}" == 9999 ]] ; then
local phase="${1}"
@@ -68,6 +69,12 @@ _egit_repo_handler() {
fi
}
+pkg_pretend() {
+ if use svg && ! use utils ; then
+ einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
+ fi
+}
+
src_fetch() {
_egit_repo_handler ${EBUILD_PHASE}
}
@@ -109,6 +116,11 @@ src_prepare() {
default
+ pushd builds/unix &>/dev/null || die
+ # eautoheader produces broken ftconfig.in
+ AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+ popd &>/dev/null || die
+
# This is the same as the 01 patch from infinality
sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
@@ -182,6 +194,7 @@ multilib_src_configure() {
$(use_with harfbuzz)
$(use_with png)
$(use_enable static-libs static)
+ $(usex utils $(use_with svg librsvg) --without-librsvg)
# avoid using libpng-config
LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
@@ -195,6 +208,8 @@ multilib_src_configure() {
*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
esac
+ export CC_BUILD="$(tc-getBUILD_CC)"
+
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index d0c71e729b9..7e891890302 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -195,6 +195,8 @@ multilib_src_configure() {
*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
esac
+ export CC_BUILD="$(tc-getBUILD_CC)"
+
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
diff --git a/media-libs/freeverb3/freeverb3-3.2.1-r3.ebuild b/media-libs/freeverb3/freeverb3-3.2.1-r3.ebuild
new file mode 100644
index 00000000000..bcb433a11e0
--- /dev/null
+++ b/media-libs/freeverb3/freeverb3-3.2.1-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Reverb and Impulse Response Convolution plug-ins (Audacious/JACK)"
+HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="forcefpu openmp plugdouble threads"
+
+RDEPEND="sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local myeconfargs=(
+ --enable-release
+ --enable-undenormal
+ --disable-autocflags
+ --disable-pluginit
+ --disable-profile
+ --disable-sample
+ --disable-srcnewcoeffs
+ --disable-audacious
+ --disable-jack
+ $(use_enable openmp omp)
+ $(use_enable plugdouble)
+ $(use_enable threads pthread)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ einstalldocs
+
+ insinto /usr/share/${PN}/samples/IR
+ doins samples/IR/*.wav
+
+ find "${D}" -name '*.la' -delete || die # bug 847403
+}
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch
new file mode 100644
index 00000000000..d9866a59173
--- /dev/null
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch
@@ -0,0 +1,24 @@
+--- a/demo/simple.cpp
++++ b/demo/simple.cpp
+@@ -105,14 +105,14 @@
+ float t2 = sin(n / 50 + 1);
+ float t3 = sin(n / 30 + 2);
+
+- float ambient[4] = { (t1 + 2.0) / 3,
+- (t2 + 2.0) / 3,
+- (t3 + 2.0) / 3, 0.3 };
+- float diffuse[4] = { 1.0, 0.9, 0.9, 1.0 };
+- float specular[4] = { 1.0, 0.7, 0.7, 1.0 };
+- float position[4] = { 100.0, 100.0, 0.0, 1.0 };
++ float ambient[4] = { (t1 + 2.0f) / 3,
++ (t2 + 2.0f) / 3,
++ (t3 + 2.0f) / 3, 0.3 };
++ float diffuse[4] = { 1.0f, 0.9f, 0.9f, 1.0f };
++ float specular[4] = { 1.0f, 0.7f, 0.7f, 1.0f };
++ float position[4] = { 100.0f, 100.0f, 0.0f, 1.0f };
+
+- float front_ambient[4] = { 0.7, 0.7, 0.7, 0.0 };
++ float front_ambient[4] = { 0.7f, 0.7f, 0.7f, 0.0f };
+
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 8d9baca0cd0..22107b5dd36 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-underlink.patch
"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+ "${FILESDIR}"/${P}-clang.patch
)
src_prepare() {
diff --git a/media-libs/ganv/ganv-1.8.0.ebuild b/media-libs/ganv/ganv-1.8.0-r1.ebuild
index 44fd56077d0..6ed5c20f508 100644
--- a/media-libs/ganv/ganv-1.8.0.ebuild
+++ b/media-libs/ganv/ganv-1.8.0-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=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE='threads(+)'
inherit flag-o-matic waf-utils python-any-r1
@@ -19,7 +19,7 @@ RDEPEND="
dev-cpp/glibmm:2
dev-cpp/gtkmm:2.4
x11-libs/gtk+:2
- graphviz? ( media-gfx/graphviz[gtk] )
+ graphviz? ( media-gfx/graphviz[gtk2] )
introspection? (
app-text/yelp-tools
dev-libs/gobject-introspection:=[doctool] )
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 6ff83934a00..8c849150052 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,4 +1,2 @@
-DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
-DIST libgd-2.3.1.tar.xz 2632076 BLAKE2B 22457c4a2fc493872ccbc8a2c45283e785ab200ca671c48f00f3f22a037fac3b97afb35534f5ec7288714a16dfaa59ed53acbbd39c3e7f89f16cdec72ef1bed1 SHA512 0b96406a1d62129d7d63f78fc4558062c223a3bfbf9719be86362fd922b72b5dac294524dd1b0a996a4a7a709ee9d2dfc790ee32564add70adad41d044a0ed80
DIST libgd-2.3.2.tar.xz 2821096 BLAKE2B a126fbac1c20113fe8f27187e70b1b81712212b7da01c9a0b3e5e38fb4d4356b7992a0cfd7db55a2f94877f6ecf82d775c39977a523db1f948cf215c6c0d7672 SHA512 a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
DIST libgd-2.3.3.tar.xz 2809056 BLAKE2B bde7a3218e5b07758b0beb96a654a44a97ba79abfe1ebe115ffd44aa34301be8e76f33840824362826dbfe93b16a4c4403b00b34aa631a0b18398cd46a09889d SHA512 aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c
diff --git a/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch b/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch
deleted file mode 100644
index eef62fca676..00000000000
--- a/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ec0b4397698bd358557d33641aac4beb1912f43b Mon Sep 17 00:00:00 2001
-From: wilson chen <willson.chenwx@gmail.com>
-Date: Wed, 15 Apr 2020 00:25:01 +0800
-Subject: [PATCH] Improve test cases for gdImageString16 and gdImageStringUp16
- (#625)
-
-Fixed #623. wchar_t is 32 bits on 64-bits AIX, which will result in test case failure.
-So we replace wchar_t with unsigned short array.
----
- tests/gdimagestring16/gdimagestring16.c | 6 ++----
- tests/gdimagestringup16/gdimagestringup16.c | 6 ++----
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/tests/gdimagestring16/gdimagestring16.c b/tests/gdimagestring16/gdimagestring16.c
-index 57eae978..0ca06680 100644
---- a/tests/gdimagestring16/gdimagestring16.c
-+++ b/tests/gdimagestring16/gdimagestring16.c
-@@ -9,9 +9,7 @@ int main()
- {
- /* Declare the image */
- gdImagePtr im = NULL;
-- wchar_t *wchr = L"H";
-- unsigned short *sptr;
-- sptr = (unsigned short *)wchr;
-+ unsigned short s[2] = {'H', 0};
- int foreground;
- int errorcode = 0;
- gdFontPtr fontptr = gdFontGetLarge();
-@@ -20,7 +18,7 @@ int main()
- gdImageColorAllocate(im, 255, 255, 255);
- foreground = gdImageColorAllocate(im, 22, 4, 238);
-
-- gdImageString16(im, fontptr, 2, 2, sptr, foreground);
-+ gdImageString16(im, fontptr, 2, 2, s, foreground);
-
- if (!gdAssertImageEqualsToFile("gdimagestring16/gdimagestring16_exp.png", im))
- errorcode = 1;
-diff --git a/tests/gdimagestringup16/gdimagestringup16.c b/tests/gdimagestringup16/gdimagestringup16.c
-index c843abec..c24639fd 100644
---- a/tests/gdimagestringup16/gdimagestringup16.c
-+++ b/tests/gdimagestringup16/gdimagestringup16.c
-@@ -9,9 +9,7 @@ int main()
- {
- /* Declare the image */
- gdImagePtr im = NULL;
-- wchar_t *wchr = L"H";
-- unsigned short *sptr;
-- sptr = (unsigned short *)wchr;
-+ unsigned short s[2] = {'H', 0};
- int foreground;
- int errorcode = 0;
- gdFontPtr fontptr = gdFontGetLarge();
-@@ -20,7 +18,7 @@ int main()
- gdImageColorAllocate(im, 255, 255, 255);
- foreground = gdImageColorAllocate(im, 22, 4, 238);
-
-- gdImageStringUp16(im, fontptr, 2, 18, sptr, foreground);
-+ gdImageStringUp16(im, fontptr, 2, 18, s, foreground);
-
- if (!gdAssertImageEqualsToFile("gdimagestringup16/gdimagestringup16_exp.png", im))
- errorcode = 1;
-
diff --git a/media-libs/gd/files/gd-2.3.0-getlib.patch b/media-libs/gd/files/gd-2.3.0-getlib.patch
deleted file mode 100644
index 91884e93292..00000000000
--- a/media-libs/gd/files/gd-2.3.0-getlib.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 635dd9a3065ed88e1741e6b963044b80e913f96a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 24 Mar 2020 08:01:01 +0100
-Subject: [PATCH] distribute getlib.sh
-
----
- config/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/Makefile.am b/config/Makefile.am
-index 122287ee..6416dda4 100644
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in -*-Makefile-*-
--EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getver.pl
-+EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getlib.sh getver.pl
-
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gdlib.pc
-
-diff -ruN a/config/getlib.sh b/config/getlib.sh
---- a/config/getlib.sh 1970-01-01 00:00:00.000000000 -0000
-+++ b/config/getlib.sh 2020-05-05 17:37:31.638896089 -0000
-@@ -0,0 +1,43 @@
-+#!/bin/sh
-+
-+GETVER="${0%/*}/getver.pl"
-+GDLIB_MAJOR=$("${GETVER}" MAJOR)
-+GDLIB_MINOR=$("${GETVER}" MINOR)
-+GDLIB_REVISION=$("${GETVER}" RELEASE)
-+
-+# Dynamic library version information
-+# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-+
-+GDLIB_LT_CURRENT=3
-+# This is the version where the soname (current above) changes. We use it
-+# to reset the revision base back to zero. It's a bit of a pain, but some
-+# systems restrict the revision range below to [0..255] (like OS X).
-+GDLIB_PREV_MAJOR=2
-+GDLIB_PREV_MINOR=2
-+# This isn't 100% correct, but it tends to be a close enough approximation
-+# for how we manage the codebase. It's rare to do a release that doesn't
-+# modify the library since this project is centered around the library.
-+GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION ))
-+GDLIB_LT_AGE=0
-+
-+# The first three fields we feed into libtool and the OS target determines how
-+# they get used. The last two fields we feed into cmake. We use the same rules
-+# as Linux SONAME versioning in libtool, but cmake should handle it for us.
-+case $1 in
-+CURRENT)
-+ printf '%s' "${GDLIB_LT_CURRENT}"
-+ ;;
-+REVISION)
-+ printf '%s' "${GDLIB_LT_REVISION}"
-+ ;;
-+AGE)
-+ printf '%s' "${GDLIB_LT_AGE}"
-+ ;;
-+VERSION)
-+ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}"
-+ ;;
-+SONAME)
-+ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))"
-+ ;;
-+esac
-+
-diff --git a/configure.ac b/configure.ac
-index 8996053..86d0bc9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ AC_CANONICAL_HOST
-
- dnl Keep the libtool version details in an external script so cmake can
- dnl access the values too.
--define([lt_gv], [config/getlib.sh ]$1)
-+define([lt_gv], [${SHELL} config/getlib.sh ]$1)
- m4_define([gd_LT_CURRENT], esyscmd(lt_gv(CURRENT)))
- m4_define([gd_LT_REVISION], esyscmd(lt_gv(REVISION)))
- m4_define([gd_LT_AGE], esyscmd(lt_gv(AGE)))
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
deleted file mode 100644
index 2bbd3e5bb1d..00000000000
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ /dev/null
@@ -1,83 +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
-
-DESCRIPTION="Graphics library for fast image creation"
-HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-S="${WORKDIR}/lib${P}"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
-RESTRICT="!test? ( test )"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="
- prefix? ( fontconfig )
- test? ( png )
-"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
- "${FILESDIR}/${PN}-2.3.0-getlib.patch"
- "${FILESDIR}/${P}-fix-tests-bug722448.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- # bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
- if use cpu_flags_x86_sse ; then
- append-cflags -msse -mfpmath=sse
- else
- append-cflags -ffloat-store
- fi
-
- # bug 632076, https://github.com/libgd/libgd/issues/278
- if use arm64 || use ppc64 || use s390 ; then
- append-cflags -ffp-contract=off
- fi
-
- # we aren't actually {en,dis}abling X here ... the configure
- # script uses it just to add explicit -I/-L paths which we
- # don't care about on Gentoo systems.
- local myeconfargs=(
- --disable-werror
- --without-x
- --without-liq
- $(use_enable static-libs static)
- $(use_with fontconfig)
- $(use_with png)
- $(use_with tiff)
- $(use_with truetype freetype)
- $(use_with jpeg)
- $(use_with webp)
- $(use_with xpm)
- $(use_with zlib)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- dodoc README.md
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gd/gd-2.3.1.ebuild b/media-libs/gd/gd-2.3.1.ebuild
deleted file mode 100644
index 99fe254589b..00000000000
--- a/media-libs/gd/gd-2.3.1.ebuild
+++ /dev/null
@@ -1,81 +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
-
-DESCRIPTION="Graphics library for fast image creation"
-HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-S="${WORKDIR}/lib${P}"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
-RESTRICT="!test? ( test )"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="
- prefix? ( fontconfig )
- test? ( png )
-"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- # bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
- if use cpu_flags_x86_sse ; then
- append-cflags -msse -mfpmath=sse
- else
- append-cflags -ffloat-store
- fi
-
- # bug 632076, https://github.com/libgd/libgd/issues/278
- if use arm64 || use ppc64 || use s390 ; then
- append-cflags -ffp-contract=off
- fi
-
- # we aren't actually {en,dis}abling X here ... the configure
- # script uses it just to add explicit -I/-L paths which we
- # don't care about on Gentoo systems.
- local myeconfargs=(
- --disable-werror
- --without-x
- --without-liq
- $(use_enable static-libs static)
- $(use_with fontconfig)
- $(use_with png)
- $(use_with tiff)
- $(use_with truetype freetype)
- $(use_with jpeg)
- $(use_with webp)
- $(use_with xpm)
- $(use_with zlib)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- dodoc README.md
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gd/gd-2.3.3-r1.ebuild b/media-libs/gd/gd-2.3.3-r1.ebuild
index a50c264c6bb..861f26ea055 100644
--- a/media-libs/gd/gd-2.3.3-r1.ebuild
+++ b/media-libs/gd/gd-2.3.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=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib"
RESTRICT="!test? ( test )"
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 8f38bb97db7..b97cbb75d48 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,4 +1,2 @@
-DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
-DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
-DIST gegl-0.4.30.tar.xz 5398052 BLAKE2B c57b34ed64d3b9305d3e639b872c283bd4c9c798d13f7bde49b991044139bb4e433a3adb0a9e991b78b2905985496ca3bf4ed116333ceaaccc043b8a66426131 SHA512 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378
-DIST gegl-0.4.32.tar.xz 5633796 BLAKE2B a4ba5d19291a61c6903dcc368e6cc3e1934e8d89b555e81afd22709504fbb8a7ed104890af5f1e7bfbdd5664caef8f5e015341c7882f2171ecb518afe32a65ef SHA512 68da02b8df0a1d234063958896f3678ead62772e611bddb39a6f21ec58cc744599d0a691224c057f2da4d04f2ccfb155a545deea92e77c728dbaeeb90e68cad6
+DIST gegl-0.4.34.tar.xz 5647516 BLAKE2B 7d9e0c395e6bf38e407ed55f43c090789e29692254990a341e7b9a391ae67423a9948821c1b8a4dd156fb42c16fe6b8572de2ee7b5be09b9f802b892e82df580 SHA512 13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e
+DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
diff --git a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
deleted file mode 100644
index 4be09057d89..00000000000
--- a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 27 Oct 2019 21:55:03 +0100
-Subject: [PATCH] Drop failing tests
-
----
- tests/compositions/meson.build | 2 ++
- tests/python/meson.build | 2 --
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build
-index 8699e7c..5e76e8c 100644
---- a/tests/compositions/meson.build
-+++ b/tests/compositions/meson.build
-@@ -87,6 +87,7 @@ test('compositions_with_opencl',
- )
- endif
-
-+if false
- test('compositions_without_opencl',
- python,
- args: [
-@@ -100,3 +101,4 @@ test('compositions_without_opencl',
- suite: 'compositions',
- is_parallel: false,
- )
-+endif
-diff --git a/tests/python/meson.build b/tests/python/meson.build
-index c6782e6..47a160b 100644
---- a/tests/python/meson.build
-+++ b/tests/python/meson.build
-@@ -2,8 +2,6 @@
- testnames = [
- 'gegl-buffer',
- 'gegl-color',
-- 'gegl-format',
-- 'gegl-node',
- 'gegl',
- ]
-
---
-2.23.0
-
diff --git a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
deleted file mode 100644
index be4498ccee4..00000000000
--- a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 27 Oct 2019 22:05:58 +0100
-Subject: [PATCH] Add suffix "-0.4" to installed programs
-
----
- bin/meson.build | 2 +-
- tools/meson.build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bin/meson.build b/bin/meson.build
-index 4daf6cb..b77b692 100644
---- a/bin/meson.build
-+++ b/bin/meson.build
-@@ -42,7 +42,7 @@ if libspiro.found()
- gegl_deps += [ libspiro, ]
- endif
-
--gegl_bin = executable('gegl',
-+gegl_bin = executable('gegl-0.4',
- gegl_sources,
- include_directories: [ rootInclude, geglInclude, ],
- dependencies: gegl_deps,
-diff --git a/tools/meson.build b/tools/meson.build
-index 43c5495..c1b0d63 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -19,7 +19,7 @@ detect_opencl = executable(
- install: false,
- )
- gegl_imgcmp = executable(
-- 'gegl-imgcmp',
-+ 'gegl-imgcmp-0.4',
- 'gegl-imgcmp.c',
- include_directories: [ rootInclude, geglInclude, ],
- dependencies: [ tools_deps, ],
---
-2.23.0
-
diff --git a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
deleted file mode 100644
index 00e1b8ab484..00000000000
--- a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001
-From: Olivier Tilloy <olivier.tilloy@canonical.com>
-Date: Fri, 5 Mar 2021 12:58:18 +0100
-Subject: [PATCH] Fix build with glib 2.67.3 (see
- https://gitlab.gnome.org/GNOME/glib/-/issues/2331).
-
----
- operations/external/exr-load.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
-index e864f7e3e..28403639c 100644
---- a/operations/external/exr-load.cpp
-+++ b/operations/external/exr-load.cpp
-@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
- #define GEGL_OP_NAME exr_load
- #define GEGL_OP_C_FILE "exr-load.cpp"
-
--extern "C" {
- #include "gegl-op.h"
--}
-
- #include <ImfInputFile.h>
- #include <ImfChannelList.h>
diff --git a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
deleted file mode 100644
index e0e938acc22..00000000000
--- a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 499a239d158fadb3a04499255b5b282a8a6023bb Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Sat, 24 Apr 2021 10:51:09 +0000
-Subject: [PATCH] Fix build with OpenEXR 3
-
-Add a header that is no longer transitively included
----
- operations/external/exr-save.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
-index 1e8c09d96..87abed511 100644
---- a/operations/external/exr-save.cc
-+++ b/operations/external/exr-save.cc
-@@ -45,6 +45,7 @@ extern "C" {
- #include <ImfChromaticities.h>
- #include <ImfStandardAttributes.h>
- #include <ImfArray.h>
-+#include <ImfFrameBuffer.h>
- #include "ImathRandom.h"
-
-
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
deleted file mode 100644
index 71107e34e87..00000000000
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ /dev/null
@@ -1,167 +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} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
- SRC_URI=""
-else
- SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- test? ( introspection )
- vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
- media-libs/libnsgif
- >=media-libs/libpng-1.6.0:0=
- >=sys-libs/zlib-1.2.0
- virtual/jpeg:0=
- >=x11-libs/gdk-pixbuf-2.32:2
- >=x11-libs/pango-1.38.0
- cairo? ( >=x11-libs/cairo-1.12.2 )
- ffmpeg? ( media-video/ffmpeg:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- lcms? ( >=media-libs/lcms-2.8:2 )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- pdf? ( >=app-text/poppler-0.71.0[cairo] )
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- svg? ( >=gnome-base/librsvg-2.40.6:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-lang/perl
- >=dev-util/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
- test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
- "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
- "${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch
- "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
-)
-
-python_check_deps() {
- use test || return 0
- has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- # don't require Apple's OpenCL on versions of OSX that don't have it
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/meson.build || die
-
- # fix skipping mipmap tests due to executable not found
- for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
- sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
- sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
- done
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [ -f "$file" ]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || die
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- # - Disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
- -Ddocs=false
- -Dexiv2=disabled
- -Dgdk-pixbuf=enabled
- -Dgexiv2=disabled
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- -Dgraphviz=disabled
- -Djasper=disabled
- -Dlibjpeg=enabled
- -Dlibpng=enabled
- # - libspiro: not in portage main tree
- -Dlibspiro=disabled
- -Dlua=disabled
- -Dmrg=disabled
- -Dpango=enabled
- -Dsdl2=disabled
- # - Parameter -Dworkshop=false disables any use of Lua, effectivly
- -Dworkshop=false
- $(meson_feature cairo)
- $(meson_feature cairo pangocairo)
- $(meson_feature ffmpeg libav)
- $(meson_feature lcms)
- $(meson_feature lensfun)
- $(meson_feature openexr)
- $(meson_feature pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(meson_feature svg librsvg)
- $(meson_feature test pygobject)
- $(meson_feature tiff libtiff)
- $(meson_feature umfpack)
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- $(meson_feature v4l libv4l)
- $(meson_feature v4l libv4l2)
- $(meson_feature vala vapigen)
- $(meson_feature webp)
- $(meson_use introspection)
- )
- meson_src_configure
-}
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
deleted file mode 100644
index 6952d3f4fa8..00000000000
--- a/media-libs/gegl/gegl-0.4.28.ebuild
+++ /dev/null
@@ -1,167 +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} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
- SRC_URI=""
-else
- SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- test? ( introspection )
- vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
- media-libs/libnsgif
- >=media-libs/libpng-1.6.0:0=
- >=sys-libs/zlib-1.2.0
- virtual/jpeg:0=
- >=x11-libs/gdk-pixbuf-2.32:2
- >=x11-libs/pango-1.38.0
- cairo? ( >=x11-libs/cairo-1.12.2 )
- ffmpeg? ( media-video/ffmpeg:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- lcms? ( >=media-libs/lcms-2.8:2 )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- pdf? ( >=app-text/poppler-0.71.0[cairo] )
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- svg? ( >=gnome-base/librsvg-2.40.6:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-lang/perl
- >=dev-util/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
- test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
- "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
- "${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch
- "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
-)
-
-python_check_deps() {
- use test || return 0
- has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- # don't require Apple's OpenCL on versions of OSX that don't have it
- if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/meson.build || die
-
- # fix skipping mipmap tests due to executable not found
- for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
- sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
- sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
- done
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [ -f "$file" ]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || die
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- # - Disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
- -Ddocs=false
- -Dexiv2=disabled
- -Dgdk-pixbuf=enabled
- -Dgexiv2=disabled
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- -Dgraphviz=disabled
- -Djasper=disabled
- -Dlibjpeg=enabled
- -Dlibpng=enabled
- # - libspiro: not in portage main tree
- -Dlibspiro=disabled
- -Dlua=disabled
- -Dmrg=disabled
- -Dpango=enabled
- -Dsdl2=disabled
- # - Parameter -Dworkshop=false disables any use of Lua, effectivly
- -Dworkshop=false
- $(meson_feature cairo)
- $(meson_feature cairo pangocairo)
- $(meson_feature ffmpeg libav)
- $(meson_feature lcms)
- $(meson_feature lensfun)
- $(meson_feature openexr)
- $(meson_feature pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(meson_feature svg librsvg)
- $(meson_feature test pygobject)
- $(meson_feature tiff libtiff)
- $(meson_feature umfpack)
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- $(meson_feature v4l libv4l)
- $(meson_feature v4l libv4l2)
- $(meson_feature vala vapigen)
- $(meson_feature webp)
- $(meson_use introspection)
- )
- meson_src_configure
-}
diff --git a/media-libs/gegl/gegl-0.4.32.ebuild b/media-libs/gegl/gegl-0.4.34.ebuild
index dab149b166a..a95469a52e9 100644
--- a/media-libs/gegl/gegl-0.4.32.ebuild
+++ b/media-libs/gegl/gegl-0.4.34.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..9} )
+PYTHON_COMPAT=( python3_{8..10} )
# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.36-r1.ebuild
index 6aacb2afe2a..6a4a84a8223 100644
--- a/media-libs/gegl/gegl-0.4.30.ebuild
+++ b/media-libs/gegl/gegl-0.4.36-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
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
@@ -39,7 +39,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
+ >=media-libs/babl-0.1.90[introspection?,lcms?,vala?]
media-libs/libnsgif
>=media-libs/libpng-1.6.0:0=
>=sys-libs/zlib-1.2.0
@@ -73,11 +73,7 @@ BDEPEND="
vala? ( $(vala_depend) )
"
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-build-openexr-3.patch
-)
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
python_check_deps() {
use test || return 0
@@ -99,11 +95,6 @@ src_prepare() {
sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
fi
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/meson.build || die
-
# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
pushd "${S}/opencl/" || die
for file in *.cl; do
@@ -112,11 +103,11 @@ src_prepare() {
fi
done
popd || die
-
- use vala && vala_src_prepare
}
src_configure() {
+ use vala && vala_setup
+
local emesonargs=(
# - Disable documentation as the generating is bit automagic
# if anyone wants to work on it just create bug with patch
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 241f4ce6cfa..bd02e5d34ad 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,9 +1,10 @@
-# 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..9} )
+PYTHON_COMPAT=( python3_{8..10} )
+# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
inherit meson optfeature python-any-r1 vala
@@ -38,7 +39,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.88[introspection?,lcms?,vala?]
+ >=media-libs/babl-0.1.90[introspection?,lcms?,vala?]
media-libs/libnsgif
>=media-libs/libpng-1.6.0:0=
>=sys-libs/zlib-1.2.0
@@ -93,16 +94,11 @@ src_prepare() {
if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
fi
-
- # commit 7c78497b : tests that use gegl.png are broken on non-amd64
- sed -e '/clones.xml/d' \
- -e '/composite-transform.xml/d' \
- -i tests/compositions/meson.build || die
-
- use vala && vala_src_prepare
}
src_configure() {
+ use vala && vala_setup
+
local emesonargs=(
# - Disable documentation as the generating is bit automagic
# if anyone wants to work on it just create bug with patch
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 96ab6312326..295bcc0ee66 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,2 +1,2 @@
DIST gexiv2-0.12.2.tar.xz 378428 BLAKE2B bb3fd6310cdb76f3e88bb31e018d78013bb626559b9e95bf59688601388cff10739c20c431fa9539c1d24c9045d2b3590a0f783a994d3b8966c4df12e9127f4e SHA512 850bf41f6180b0fdd050ab08da6e3bbd8d25ffc25a1f48e17a1d7a65771893cc79fba9cbd6718bf1754251ac4a4754983f0ab8f006a05f8c4a15085846d001a5
-DIST gexiv2-0.13.0.tar.xz 387188 BLAKE2B 25550fd0b711e1363da1f6144af482709b52b0334e326a211919fcc97ccaef1832978a31d8d7ec111caf3f3b9b4db3537d818d35199da2e0b6250098c6d99d01 SHA512 dcd94a8e8ab7e3764bf652514222c3cce4537bf2658905405a25d1dd18878e67343060f5b1cf9fd8b11acf4dd2b727a9d49a0d8f379838c60c92de69f0bed2c5
+DIST gexiv2-0.14.0.tar.xz 387288 BLAKE2B bdbb4547486a248cd9c6559276ebac20d3af5211474b86eb6ebfb3a8c76670ff7c2d162435e0cbcb270f96c64f5bc1eedc2d63c021b65f57e1ad9ec8cf9a4bf8 SHA512 d745ae2d8ddcf0c8a2a7980eaa489f9b520af54242c5e4ddded9c3ae4a579c824c8cb659bd7e985ffa09f9fe37bdf73d6d9181d456711e0953b73023eb0f9f50
diff --git a/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch b/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch
new file mode 100644
index 00000000000..0e2fbaa33fe
--- /dev/null
+++ b/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch
@@ -0,0 +1,175 @@
+https://gitlab.gnome.org/GNOME/gexiv2/-/merge_requests/64
+
+From 7e36a7dfeadfff134beabf502ca4d551f505fd8e Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Fri, 24 Sep 2021 11:48:34 -0400
+Subject: [PATCH] clean up python support
+
+- fix always failing gexiv2 test due to missing import gi
+- actually use override during testing
+- fix totally ignoring gexiv2 test status
+- fix broken build with -Dpython3=false
+- remove unnecessary configure_file
+- remove misleading explanation of -Dpython3=false (it also disables
+ installing GExiv2.py)
+- remove unnecessary python3_girdir
+---
+ meson.build | 21 +++++--------------
+ meson_options.txt | 1 -
+ test/meson.build | 13 +++---------
+ test/python/{gexiv2.py.in => gexiv2.py} | 3 ++-
+ test/python/meson.build | 10 ---------
+ .../{test_metadata.py.in => test_metadata.py} | 4 ++--
+ test/python3-test.in | 4 ----
+ 7 files changed, 12 insertions(+), 44 deletions(-)
+ rename test/python/{gexiv2.py.in => gexiv2.py} (94%)
+ rename test/python/{test_metadata.py.in => test_metadata.py} (99%)
+ delete mode 100755 test/python3-test.in
+
+diff --git a/meson.build b/meson.build
+index 42f70cb..3f9426f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,6 @@ gio = dependency('gio-2.0', version : '>= 2.46.0')
+ cc = meson.get_compiler('c')
+ cpp = meson.get_compiler('cpp')
+ math = cc.find_library('m', required : false)
+-python3 = import('python').find_installation('python3', modules: 'gi', required: get_option('python3'))
+
+ bmff_test = '''#include <exiv2/exiv2.hpp>
+ #ifndef EXV_ENABLE_BMFF
+@@ -48,24 +47,14 @@ if get_option('gtk_doc')
+ subdir('docs')
+ endif
+
+-if get_option('python3') == false
+- warning('\'python3\' is disabled, any Python tests will not be run.')
+-else
++if get_option('python3')
+ if get_option('introspection') == false
+ error('Build option \'python3\' requires \'introspection\' to be enabled.')
+ endif
+-
+- girdir = get_option('python3_girdir')
+- if girdir == 'auto'
+- python3_output = run_command(python3, ['-c', 'import gi; print(gi._overridesdir)'])
+- if python3_output.returncode() != 0
+- error('Finding the Python 3 gi/override path: ' + python3_output.stderr())
+- endif
+- girdir = python3_output.stdout().strip()
+- endif
+-
+- message('Installing \'GExiv2.py\' into \'' + girdir + '\'')
+- python3.install_sources('GExiv2.py', subdir : girdir)
++ python3 = import('python').find_installation('python3', modules: 'gi')
++ python3.install_sources('GExiv2.py', subdir: 'gi/overrides')
++else
++ python3 = disabler()
+ endif
+
+ subdir('test')
+diff --git a/meson_options.txt b/meson_options.txt
+index 5e76789..edb3cfd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -2,5 +2,4 @@ option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable
+ option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
+ option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
+ option('tools', type: 'boolean', value: true, description: 'Enable or disable building the commandline tools')
+-option('python3_girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto)')
+ option('python3', type: 'boolean', value : true, description : 'Enable or disable using Python 3 (and PyGObject module)')
+diff --git a/test/meson.build b/test/meson.build
+index c4f287d..0ae50ed 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -1,12 +1,11 @@
+ test_sample_path = join_paths(meson.current_source_dir(), 'data')
+-python_module_path = join_paths(meson.current_build_dir(), 'python')
+
+ test_env = environment()
+ test_env.set('G_SLICE', 'always-malloc')
+ test_env.set('TEST_DATA_DIR', test_sample_path)
+ test_env.prepend('GI_TYPELIB_PATH', typelib_path)
+ test_env.prepend('LD_LIBRARY_PATH', typelib_path)
+-test_env.prepend('PYTHONPATH', python_module_path)
++test_env.prepend('PYTHONPATH', join_paths(meson.current_source_dir(), 'python'))
+
+ regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
+ dependencies : [gobject, gio, math],
+@@ -19,11 +18,5 @@ regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
+
+ test('regression', regression_test, env : test_env)
+
+-subdir('python')
+-
+-python3_test_conf = configuration_data()
+-python3_test_conf.set('PYTHON3_PATH', python3.path())
+-python3_test = configure_file(input: 'python3-test.in',
+- output : 'python3-test',
+- configuration: python3_test_conf)
+-test('python3', find_program(python3_test), env : test_env)
++test('python3-gexiv2', python3, args: ['-m', 'unittest', 'gexiv2'], env: test_env)
++test('python3-metadata', python3, args: ['-m', 'unittest', 'test_metadata'], env: test_env)
+diff --git a/test/python/gexiv2.py.in b/test/python/gexiv2.py
+similarity index 94%
+rename from test/python/gexiv2.py.in
+rename to test/python/gexiv2.py
+index 4e01ff5..503815c 100644
+--- a/test/python/gexiv2.py.in
++++ b/test/python/gexiv2.py
+@@ -22,7 +22,8 @@
+ import unittest
+ import os
+
+-gi.require_version('GExiv2', '@PROJECT_API_VERSION@')
++import gi.overrides
++gi.overrides.__path__.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+ from gi.repository import GExiv2
+
+
+diff --git a/test/python/meson.build b/test/python/meson.build
+index 783ba0b..e69de29 100644
+--- a/test/python/meson.build
++++ b/test/python/meson.build
+@@ -1,10 +0,0 @@
+-python_conf = configuration_data()
+-python_conf.set('PROJECT_API_VERSION', project_api_version)
+-
+-gexiv2_py_file = configure_file(input: 'gexiv2.py.in',
+- output : 'gexiv2.py',
+- configuration: python_conf)
+-
+-test_metadata_py_file = configure_file(input: 'test_metadata.py.in',
+- output : 'test_metadata.py',
+- configuration: python_conf)
+diff --git a/test/python/test_metadata.py.in b/test/python/test_metadata.py
+similarity index 99%
+rename from test/python/test_metadata.py.in
+rename to test/python/test_metadata.py
+index 45d9d45..8d4296c 100644
+--- a/test/python/test_metadata.py.in
++++ b/test/python/test_metadata.py
+@@ -30,8 +30,8 @@ import tempfile
+
+ PY3K = sys.version_info[0] == 3
+
+-import gi
+-gi.require_version('GExiv2', '@PROJECT_API_VERSION@')
++import gi.overrides
++gi.overrides.__path__.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+ from gi.repository import GExiv2, GLib
+ from fractions import Fraction
+
+diff --git a/test/python3-test.in b/test/python3-test.in
+deleted file mode 100755
+index 6fb3bf8..0000000
+--- a/test/python3-test.in
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#!/bin/sh
+-
+-'@PYTHON3_PATH@' -m unittest gexiv2
+-'@PYTHON3_PATH@' -m unittest test_metadata
+--
+2.34.1
+
diff --git a/media-libs/gexiv2/gexiv2-0.12.2.ebuild b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
index 391e3904bce..5fc59d4f31c 100644
--- a/media-libs/gexiv2/gexiv2-0.12.2.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.2.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..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit meson python-r1 vala
diff --git a/media-libs/gexiv2/gexiv2-0.13.0.ebuild b/media-libs/gexiv2/gexiv2-0.14.0.ebuild
index 00f117fc268..2de5eadc27c 100644
--- a/media-libs/gexiv2/gexiv2-0.13.0.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.14.0.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
+EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit meson python-r1 vala
@@ -32,22 +32,30 @@ RDEPEND="
>=media-gfx/exiv2-0.26:=
>=dev-libs/glib-2.46.0:2
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- python? ( ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ )
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/glib-utils
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.3 )
+ gtk-doc? (
+ dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.3
+ )
test? ( media-gfx/exiv2[xmp] )
virtual/pkgconfig
vala? ( $(vala_depend) )
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-clean-up-python-support.patch
+)
+
src_prepare() {
default
- use vala && vala_src_prepare
+ use vala && vala_setup
}
src_configure() {
diff --git a/media-libs/giblib/metadata.xml b/media-libs/giblib/metadata.xml
index 1f1adfb1220..f70c8f227f0 100644
--- a/media-libs/giblib/metadata.xml
+++ b/media-libs/giblib/metadata.xml
@@ -10,7 +10,4 @@ fontstyles, which can be loaded from files, saved to files or defined
dynamically through the API. It also, and more importantly, wraps
imlib2's context API changing.
</longdescription>
- <upstream>
- <remote-id type="freecode">giblib</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index aa570a52f46..035521fb7a5 100644
--- a/media-libs/giflib/giflib-5.2.1-r1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
PATCHES=(
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index f1af4ed2fe4..2d1ce1685f0 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,2 +1,3 @@
-DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
DIST glfw-3.3.5.tar.gz 776593 BLAKE2B ce92a42ef7361ae2580c9d6722d340106f9ca26e7fb436b9a4be2f25bf4a15d2b08d82ff71ad4ce4cd6a59e31d934d0fe6ab0e546474a3e7de38e229795ee0e8 SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb
+DIST glfw-3.3.6.tar.gz 776716 BLAKE2B 6bd3ef60e637e96dc71013ce8caada2ad0aba47eb72fd35a7b3060344f604f497ea87d17689723f4bd968098f9b3828c258f35cb3a6128d1a8b649c523dd3287 SHA512 4c295c5f4c02f6ede125fce67c52a97450f552f3985b664745bd8a836c1d6d69c04727c956fd26ec61f1e5fd9c074a28dcf6b1d1800f118444eef066f048b201
+DIST glfw-3.3.7.tar.gz 779531 BLAKE2B f8ea04a6556ca35631d354f92f298c8942a0491e4a96ebcf56a5a88ce5ae68931f7c9cd638ce1951407ed8cb09e9e86272a944d85e1e8010dd6e68135c38de37 SHA512 7b71a5a564633c3617bb0e765566069de9d54e0381fb828959a77a42ca94546623fda514292adee72ddacacc305b219a2e6c4bb799bfab8186010642bc2dffe8
diff --git a/media-libs/glfw/glfw-3.3.4-r3.ebuild b/media-libs/glfw/glfw-3.3.6.ebuild
index 73e3566ec70..32cac19f845 100644
--- a/media-libs/glfw/glfw-3.3.4-r3.ebuild
+++ b/media-libs/glfw/glfw-3.3.6.ebuild
@@ -1,9 +1,8 @@
-# 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_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Portable OpenGL FrameWork"
@@ -12,30 +11,28 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
IUSE="wayland-only"
-# note: libglfw uses dlopen() for most of these at runtime
RDEPEND="
- x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
- wayland-only? (
- dev-libs/wayland[${MULTILIB_USEDEP}]
- media-libs/mesa[egl(+),wayland,${MULTILIB_USEDEP}]
- )
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ wayland-only? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
!wayland-only? (
- virtual/opengl[${MULTILIB_USEDEP}]
+ media-libs/libglvnd[X]
x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXinerama[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
)"
DEPEND="
${RDEPEND}
- wayland-only? ( dev-libs/wayland-protocols )
+ wayland-only? (
+ dev-libs/wayland-protocols
+ x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+ )
!wayland-only? (
x11-base/xorg-proto
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXinerama[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
)"
BDEPEND="
wayland-only? (
@@ -48,5 +45,6 @@ src_configure() {
-DGLFW_BUILD_EXAMPLES=no
-DGLFW_USE_WAYLAND=$(usex wayland-only)
)
+
cmake-multilib_src_configure
}
diff --git a/media-libs/glfw/glfw-3.3.7.ebuild b/media-libs/glfw/glfw-3.3.7.ebuild
new file mode 100644
index 00000000000..32cac19f845
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Portable OpenGL FrameWork"
+HOMEPAGE="https://www.glfw.org/"
+SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+IUSE="wayland-only"
+
+RDEPEND="
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ wayland-only? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+ !wayland-only? (
+ media-libs/libglvnd[X]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ )"
+DEPEND="
+ ${RDEPEND}
+ wayland-only? (
+ dev-libs/wayland-protocols
+ x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+ )
+ !wayland-only? (
+ x11-base/xorg-proto
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXinerama[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ )"
+BDEPEND="
+ wayland-only? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DGLFW_BUILD_EXAMPLES=no
+ -DGLFW_USE_WAYLAND=$(usex wayland-only)
+ )
+
+ cmake-multilib_src_configure
+}
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 1c55b37d8d8..b2981f94c41 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,2 +1 @@
-DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d6092ce3cd7fa93bbf29f5247c42645bc920a3dbf3f0b4b61eb1e47f46514d9cd98c4e6df133ced0072ba6a570ee SHA512 9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b
DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
diff --git a/media-libs/glm/glm-0.9.9.7.ebuild b/media-libs/glm/glm-0.9.9.7.ebuild
deleted file mode 100644
index 23177ad7f0d..00000000000
--- a/media-libs/glm/glm-0.9.9.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="OpenGL Mathematics"
-HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( HappyBunny MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.9.6-simd.patch
-)
-
-src_prepare() {
- sed \
- -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
- -e "s:@GLM_VERSION@:0.9.9:" \
- "${FILESDIR}"/glm.pc.in \
- > glm.pc
- cmake-utils_src_prepare
-}
-
-src_configure() {
- if use test; then
- local mycmakeargs=(
- -DGLM_TEST_ENABLE=ON
- -DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- doheader -r glm
- insinto /usr/$(get_libdir)/pkgconfig
- doins glm.pc
- dodoc readme.md manual.md
-}
diff --git a/media-libs/glm/glm-0.9.9.8-r1.ebuild b/media-libs/glm/glm-0.9.9.8-r1.ebuild
index 744910fd87c..32a1a04eaf5 100644
--- a/media-libs/glm/glm-0.9.9.8-r1.ebuild
+++ b/media-libs/glm/glm-0.9.9.8-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( HappyBunny MIT )"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
RESTRICT="!test? ( test )"
@@ -26,7 +26,7 @@ src_configure() {
if use test; then
# See https://github.com/g-truc/glm/pull/1087
# https://bugs.gentoo.org/818235
- append-cxxflags -fno-ipa-modref
+ test-flag-CXX -fno-ipa-modref && append-cxxflags -fno-ipa-modref
local mycmakeargs=(
-DGLM_TEST_ENABLE=ON
diff --git a/media-libs/glm/glm-0.9.9.8.ebuild b/media-libs/glm/glm-0.9.9.8.ebuild
deleted file mode 100644
index 6fd8711eea6..00000000000
--- a/media-libs/glm/glm-0.9.9.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="OpenGL Mathematics"
-HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( HappyBunny MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.9.6-simd.patch
- "${FILESDIR}"/${P}-clang.patch
-)
-
-src_prepare() {
- sed \
- -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
- -e "s:@GLM_VERSION@:0.9.9:" \
- "${FILESDIR}"/glm.pc.in \
- > glm.pc
- cmake_src_prepare
-}
-
-src_configure() {
- if use test; then
- local mycmakeargs=(
- -DGLM_TEST_ENABLE=ON
- -DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- doheader -r glm
- insinto /usr/$(get_libdir)/pkgconfig
- doins glm.pc
- dodoc readme.md manual.md
-}
diff --git a/media-libs/glu/glu-9.0.2.ebuild b/media-libs/glu/glu-9.0.2.ebuild
index ad57aeafee9..da35e84be92 100644
--- a/media-libs/glu/glu-9.0.2.ebuild
+++ b/media-libs/glu/glu-9.0.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
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="SGI-B-2.0"
diff --git a/media-libs/glyr/files/glyr-1.0.10-fix-version.patch b/media-libs/glyr/files/glyr-1.0.10-fix-version.patch
new file mode 100644
index 00000000000..0d0c126faa7
--- /dev/null
+++ b/media-libs/glyr/files/glyr-1.0.10-fix-version.patch
@@ -0,0 +1,23 @@
+https://github.com/sahib/glyr/pull/104
+
+From bf0a0f0a040aed89f7fef3dadf52754b73efc597 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 27 Feb 2022 00:48:25 +0000
+Subject: [PATCH] CMakeLists.txt: fix version
+
+This avoids e.g. the pkg-config file installed having the wrong version.
+
+It must be updated on new tags/releases (just before tagging).
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,7 @@ ENDIF()
+ # ------------------------------------------------
+ SET(GLYR_VERSION_MAJOR "1")
+ SET(GLYR_VERSION_MINOR "0")
+-SET(GLYR_VERSION_MICRO "9")
++SET(GLYR_VERSION_MICRO "10")
+ SET(GLYR_VERSION_NAME "Raving Raven")
+ # ------------------------------------------------
+
diff --git a/media-libs/glyr/glyr-1.0.10.ebuild b/media-libs/glyr/glyr-1.0.10-r1.ebuild
index 65ac5aac4cf..b4710e88573 100644
--- a/media-libs/glyr/glyr-1.0.10.ebuild
+++ b/media-libs/glyr/glyr-1.0.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Music related metadata searchengine, both with commandline interface and C API"
HOMEPAGE="https://github.com/sahib/glyr"
@@ -12,21 +12,21 @@ SRC_URI="https://github.com/sahib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="
- dev-db/sqlite:3
+RDEPEND="dev-db/sqlite:3
>=dev-libs/glib-2.10:2
- net-misc/curl
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+ net-misc/curl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
DOCS=( AUTHORS README.textile ) # CHANGELOG is obsolete in favour of git history
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-version.patch
+)
+
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
sed -i \
-e '/GCC_ONLY_OPT.*-s/d' \
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 8549f8b718f..f9000496152 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,5 +1,2 @@
-DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db5328d155b591c08b763c2b02f2728c04c6f96b79547ff3a1e6b8b8cb940cdd01b33ee04f946ac6fa9eefda5439cc49414 SHA512 457d2815204c8e12292fbe6e642a7409df4b3de597972e3c956d5dfae23b5032fc07cf60c0a10bd58aa6dc62a89225a5b704c98689112d23b81f91c1129bcb97
-DIST intel-gmmlib-21.2.2.tar.gz 746635 BLAKE2B abc73cfa209b8212bfe185e1f27a84cefb7ece9134f287e85e67c09bfd4f48e097e410a95d966d2f85c79bc95f753b6ae462a67db031dcd1fc6f46bec9452e22 SHA512 eaca3595c28afb8873b172fff3e178489b7ff736e6e9d80e75939ffd94af6c9c5f7f7429a74e98c9af478ab218cd25242d7c69037afb7193a983f8f02616e81f
-DIST intel-gmmlib-21.3.1.tar.gz 746732 BLAKE2B 537d446839136d6d048d15eb79e18214d797c68dd4288670448e4104e8d6d0701cb93366f77093f264f5392c0c37470b4fbdd0b0da43c9e319c2b334c3315bdf SHA512 54ae92bedadfe8cf7e39786f96bd29b5ace8bbafe8f32620034de8775c5e31fbbd99dd61b10e5fdf12c9f967196c11840e6a202cfb549e5f950f1743cb9b098b
-DIST intel-gmmlib-21.3.2.tar.gz 746990 BLAKE2B b9cc1937d551ff48e317b6a6b70a07f96e6ed1a4a1d27a4cf5be61e97a7ece71cf75a7f2d773f9a42e2c4ad8badf97c06a5cc0dd4a4fa38159a43839f1ac11ac SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be
-DIST intel-gmmlib-21.3.3.tar.gz 747305 BLAKE2B ef055bfdb6efccec5e2e7618677a97b38e314f44486c0d99e704281f2cb78acdf64a1737a8ae2c33b9dde6f60a284b83d9b5ca1949c5a5c7a34894cdbfbb9347 SHA512 9680b2c38f71467a7c4f2c1a6136d1de9c906355ca675ebbafc697daea15fe615aa45f3af3140330f1610946f9c55471038eeb815b1d677b64efb4896515d8fb
+DIST intel-gmmlib-22.1.2.tar.gz 813247 BLAKE2B 5d2c632239bbe12779f3aa07744de966501a5182ae415746f9bdf141f1ec9f94fae67df21424effeefbbfe2b5bd58d267687ca7623e7d1e736c92da09135868b SHA512 fa265f8cdb1a0c6ec067073cf5e188c86540709d98d384c61dfb34863f61d93d78cfaadba1b5bfb04bb8808bb1702282f76b57507c2a8946d0291419ac558c53
+DIST intel-gmmlib-22.1.3.tar.gz 813386 BLAKE2B 6946423e3a58bea36ac6ca7619f68a30997910e0041b60e3b6a34ad3d76308cf0af69c46abc4008d19a5cee88e8f423503560598d2006645771f2eb2b224201c SHA512 cbf0164e7604f6214f6e1d3d9a283d385fac0efbd83afad02a76e3090d680ec000b17a257d5e004c296764330888dbd0a3e5bd46a760ac5c5f3e67436a7c9437
diff --git a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch b/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch
index befd33f83bb..d4acb515bf3 100644
--- a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch
+++ b/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch
@@ -4,7 +4,7 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
--- a/Source/GmmLib/CMakeLists.txt
+++ b/Source/GmmLib/CMakeLists.txt
-@@ -54,6 +54,10 @@ if(NOT DEFINED BS_USE_OSDM_BUILD_SYSTEM)
+@@ -74,6 +74,10 @@
endif()
endif()
@@ -17,7 +17,7 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
# and so must precede the inclusion below of bs_init.cmake .
--- a/Source/GmmLib/Linux.cmake
+++ b/Source/GmmLib/Linux.cmake
-@@ -38,7 +38,10 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+@@ -76,7 +76,10 @@
-Werror=format-security
-Werror=non-virtual-dtor
-Werror=return-type
@@ -28,7 +28,7 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
# General optimization options
-march=${GMMLIB_MARCH}
-mpopcnt
-@@ -47,19 +50,31 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+@@ -85,19 +88,31 @@
-msse3
-mssse3
-msse4
@@ -61,7 +61,7 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
# Other common flags
-fstack-protector
-fdata-sections
-@@ -67,10 +82,15 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+@@ -105,11 +120,16 @@
-fmessage-length=0
-fvisibility=hidden
-fPIC
@@ -73,11 +73,12 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
# -m32 or -m64
-m${GMMLIB_ARCH}
)
+ endif()
+endif()
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
#Gcc only flags
-@@ -128,13 +148,17 @@ SET( GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL ${GMMLIB_COMPILER_FLAGS_RELEASE})
+@@ -167,10 +187,12 @@
#set predefined compiler flags set
add_compile_options("${GMMLIB_COMPILER_FLAGS_COMMON}")
@@ -90,9 +91,12 @@ Note: code should detect CPU features at runtime and use sse4.1 paths only if su
foreach (flag ${GMMLIB_COMPILER_CXX_FLAGS_COMMON})
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
endforeach()
-
-+if (OVERRIDE_COMPILER_FLAGS)
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m${GMMLIB_ARCH}")
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m${GMMLIB_ARCH}")
-+endif()
-
+@@ -179,6 +201,8 @@
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+ else()
++ if (OVERRIDE_COMPILER_FLAGS)
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m${GMMLIB_ARCH}")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m${GMMLIB_ARCH}")
++ endif()
+ endif()
diff --git a/media-libs/gmmlib/gmmlib-21.2.1.ebuild b/media-libs/gmmlib/gmmlib-21.2.1.ebuild
deleted file mode 100644
index daef825f99e..00000000000
--- a/media-libs/gmmlib/gmmlib-21.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
- S="${WORKDIR}/${PN}-intel-${P}"
- KEYWORDS="amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test +custom-cflags"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
- "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
- cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-21.2.2.ebuild b/media-libs/gmmlib/gmmlib-21.2.2.ebuild
deleted file mode 100644
index 4e796e2186d..00000000000
--- a/media-libs/gmmlib/gmmlib-21.2.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=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
- S="${WORKDIR}/${PN}-intel-${P}"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test +custom-cflags"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
- "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
- cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-21.3.1.ebuild b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
deleted file mode 100644
index daef825f99e..00000000000
--- a/media-libs/gmmlib/gmmlib-21.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
- S="${WORKDIR}/${PN}-intel-${P}"
- KEYWORDS="amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test +custom-cflags"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
- "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
- )
- cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-21.3.3.ebuild b/media-libs/gmmlib/gmmlib-22.1.2.ebuild
index 66e98449ad8..7d8a6f81eb2 100644
--- a/media-libs/gmmlib/gmmlib-21.3.3.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.1.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=8
@@ -12,14 +12,14 @@ S="${WORKDIR}/${PN}-intel-${P}"
KEYWORDS="amd64"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/12.1"
IUSE="+custom-cflags test"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
- "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+ "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
)
src_configure() {
diff --git a/media-libs/gmmlib/gmmlib-21.3.2.ebuild b/media-libs/gmmlib/gmmlib-22.1.3.ebuild
index 75f21bc6ea0..f0fd281de97 100644
--- a/media-libs/gmmlib/gmmlib-21.3.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.1.3.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
@@ -12,14 +12,14 @@ S="${WORKDIR}/${PN}-intel-${P}"
KEYWORDS="~amd64"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/12.1"
IUSE="+custom-cflags test"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
- "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+ "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
)
src_configure() {
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 1f972c3b191..c70f66b3948 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-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
@@ -18,14 +18,14 @@ HOMEPAGE="https://github.com/intel/gmmlib"
SRC_URI=""
LICENSE="MIT"
-SLOT="0"
+SLOT="0/12.1"
IUSE="test +custom-cflags"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
- "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+ "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
)
src_configure() {
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 684a9cb2f00..c03c56a8821 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1 +1,2 @@
DIST graphene-1.10.6.tar.xz 333332 BLAKE2B d353efb22510b78c7360b748b7e83237309b88c170909e521d50e95618e907bd8b2424c3583a5db3ff2ca57954bf793646a69251bbb31caac55155c15981ed3a SHA512 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
+DIST graphene-1.10.8.tar.gz 178557 BLAKE2B 57739a9cfc246a38968fa8352e0c05ce9e32e50753e7d18b8b25ecebd1ea294cfad26168437e290209011b51085fad7d8a47852b99510a7402f9a7dd00ac17f0 SHA512 526b0c17049459b687ceb7f6c26c9d982535e4048e74a0b6282704f9811d3c2e7e0e6cfef166aa953306b6cf77add6677bc600ae0c66cc052dc04c3d0345bd68
diff --git a/media-libs/graphene/files/1.10.6-fix-vector-check.patch b/media-libs/graphene/files/1.10.6-fix-vector-check.patch
new file mode 100644
index 00000000000..71d1e28c16a
--- /dev/null
+++ b/media-libs/graphene/files/1.10.6-fix-vector-check.patch
@@ -0,0 +1,24 @@
+From 3ce7bf419e366d88a141d1210ae96182986ea8e9 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Jun 2021 15:47:14 +0200
+Subject: [PATCH] meson: fix gcc vector 64-bit check
+
+the previous behavior only ever enabled gcc vectors no x86_64
+patch origin: https://github.com/ebassi/graphene/pull/233
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5dbfb63..fd37036 100644
+--- a/meson.build
++++ b/meson.build
+@@ -328,7 +328,7 @@ if get_option('gcc_vector')
+ # error "GCC vector intrinsics are disabled on GCC prior to 4.9"
+ # elif defined(__arm__)
+ # error "GCC vector intrinsics are disabled on ARM"
+-# elif !defined(__x86_64__)
++# elif (__SIZEOF_POINTER__ < 8)
+ # error "GCC vector intrinsics are disabled on 32bit"
+ # endif
+ #else
diff --git a/media-libs/graphene/graphene-1.10.6.ebuild b/media-libs/graphene/graphene-1.10.6-r1.ebuild
index ab7fb554651..b632a2b91b3 100644
--- a/media-libs/graphene/graphene-1.10.6.ebuild
+++ b/media-libs/graphene/graphene-1.10.6-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
@@ -31,6 +31,8 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}/${PV}-fix-vector-check.patch" )
+
multilib_src_configure() {
# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
local emesonargs=(
diff --git a/media-libs/graphene/graphene-1.10.8.ebuild b/media-libs/graphene/graphene-1.10.8.ebuild
new file mode 100644
index 00000000000..21035513a31
--- /dev/null
+++ b/media-libs/graphene/graphene-1.10.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit xdg-utils meson-multilib python-any-r1
+
+DESCRIPTION="A thin layer of types for graphic libraries"
+HOMEPAGE="https://ebassi.github.io/graphene/"
+SRC_URI="https://github.com/ebassi/graphene/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
+ introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
+BDEPEND="
+ ${PYTHON_DEPS}
+ doc? (
+ dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.3
+ )
+ virtual/pkgconfig
+"
+
+multilib_src_configure() {
+ # TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
+ local emesonargs=(
+ $(meson_native_use_bool doc gtk_doc)
+ -Dgobject_types=true
+ $(meson_native_use_feature introspection)
+ -Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
+ $(meson_use cpu_flags_x86_sse2 sse2)
+ $(meson_use cpu_flags_arm_neon arm_neon)
+ $(meson_use test tests)
+ -Dinstalled_tests=false
+ )
+ meson_src_configure
+}
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index ef250142196..9d2307aacfe 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,2 +1 @@
-DIST grilo-0.3.13.tar.xz 236420 BLAKE2B 8f891507edce92bccbc12aa9ecce78e8bd0804e548deec9a3651a656a27e9e87156e8cd7e1959a662c23e16fe958ff09f95755f825116f785784271883579dfc SHA512 b229b9b7524c1be63ed8891a9438844ebb87013074b394330f25316feb015040b304cd98bf3c89dc3248e6898c587a5e51666776a5b4ba5026a80ee8ad3e6d01
DIST grilo-0.3.14.tar.xz 236620 BLAKE2B 25c81fb9b4ebce456f24aea19518d0a9c3b98a216e50fe9cbe9fa8b7e089535b5d695fb915497e8f812a0fc964b1f2b591fb0c0e382771af88318d94dd659fe8 SHA512 128464e51040ea121b19640c708fa996743a18e047ab11d4c3047db7d24732eac6da65393c16f987e834cb301385ef0c349eb0fabd7d67b2d10a230c8f03492a
diff --git a/media-libs/grilo/grilo-0.3.13.ebuild b/media-libs/grilo/grilo-0.3.13.ebuild
deleted file mode 100644
index 8f94f4a5cd4..00000000000
--- a/media-libs/grilo/grilo-0.3.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk gtk-doc +introspection +playlist test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
-RDEPEND="
- >=dev-libs/glib-2.58:2
- dev-libs/libxml2:2
- >=net-libs/libsoup-2.41.3:2.4[introspection?]
- playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
- gtk? (
- net-libs/liboauth
- >=x11-libs/gtk+-3.14:3
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gtk-doc? (
- >=dev-util/gtk-doc-1.10
- app-text/docbook-xml-dtd:4.3
- )
- ${PYTHON_DEPS}
- test? ( sys-apps/dbus )
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
- sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
- sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
-
- # Drop explicit unversioned vapigen check
- sed -i -e "/find_program.*vapigen/d" meson.build || die
-
- # Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
- sed -i -e "/subdir('examples')/d" meson.build || die
-
- xdg_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Denable-grl-net=true # Fails to build
- $(meson_use playlist enable-grl-pls)
- $(meson_use gtk-doc enable-gtk-doc)
- $(meson_use introspection enable-introspection)
- $(meson_use gtk enable-test-ui)
- $(meson_use vala enable-vala)
- )
- meson_src_configure
-}
-
-src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
diff --git a/media-libs/grilo/grilo-0.3.14.ebuild b/media-libs/grilo/grilo-0.3.14.ebuild
index d8c385b4b57..53e6714a22d 100644
--- a/media-libs/grilo/grilo-0.3.14.ebuild
+++ b/media-libs/grilo/grilo-0.3.14.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 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
LICENSE="LGPL-2.1+"
SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="gtk gtk-doc +introspection +playlist test vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index dae323c5850..cf673349dc5 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,2 +1 @@
-DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
DIST gsound-1.0.3.tar.xz 22592 BLAKE2B 01c61e859aa6b726ba6f49a4791b22d769b495d589d6d8b1c15c92d217433e6dc9a1e17ee2741f451b3ef32b4252677b47d46e149635ad4a58a5b323639c4ecb SHA512 5d7c4f17154b840abb94b432c33ba950929ddc5aba8c2795b54834d6c6b0280d3d8846acebb1e4e02688045bfb44cfac7dbb96fef44af5a73a12a70f3ece84eb
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
deleted file mode 100644
index 3813c899e90..00000000000
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Thin GObject wrapper around the libcanberra sound event library"
-HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.36:2
- media-libs/libcanberra
- introspection? ( >=dev-libs/gobject-introspection-1.2.9:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-util/gtk-doc-am-1.20
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable vala)
-}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 58d6f817bb8..386a4b50cda 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,3 +1,6 @@
DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
DIST gst-plugins-bad-1.18.4-glib-volatile.patch.bz2 8492 BLAKE2B 7a6e4a3fc1d68c39ae08cb052eed1fcef9c5507c655525bcb48ab789f20027632136fb195643dc5d2e04728b4c3ac94b1dcbf9a14343333fb80d65c64244e1c8 SHA512 0d9e04b883a803cec518469f46dbcf47bfef614694cad6b2bb6e8cb31c3fcc80b0f3d81633b16cd05ca0516f49893aa67f4745dc22e80192ed385fb97ee8b97c
DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
+DIST gst-plugins-bad-1.18.6.tar.xz 5652788 BLAKE2B d877c8b6d39b67de957f180fbcc942fc658631dfc75b90f342f088e58c4655b1591651fbcd2a98259c95f0a7e830bb0ec67f65eb87d4b13c9f2adc733da7f12f SHA512 78731e0db04afd3dcdd5c5ea84df4e096a5db121fd9cb6eb79197844482a3b36b2764a664f171f80c809e6182ceae2350113d47f3f7c684d2d88f752bc092baf
+DIST gst-plugins-bad-1.20.1.tar.xz 6212148 BLAKE2B e88f6553668329abb7b787c5efb89d760e60009fb9bd23884aa54e5a8de94f50b9fc9cd74cb2d303d43511207574f447bf616d8f9836df5dcde767c4ee5bff4d SHA512 3113fc93bba59716e7a506cf00f88cb05ccfe3406515ecf7e377dcfd3a8f4e555ff45126c048dc736ae6a28acf430c96422be4a120889fbe04ed69c5acb1cad6
+DIST gst-plugins-bad-1.20.2.tar.xz 6216208 BLAKE2B bbbe77a1255991a2f96696996fb0c99f14f6d63fef455feb1ce90ae518bb9f80fd61bcfb223c20407b8d6240faaa93478495f8e9fda16fab36a311d167e88e25 SHA512 3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
index 93b00d92d83..6077b45e9cc 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
@@ -3,8 +3,8 @@
EAPI=7
GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer-meson
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic gstreamer-meson python-any-r1
DESCRIPTION="Less plugins for GStreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
@@ -37,7 +37,10 @@ RDEPEND="
orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ ${PYTHON_DEPS}
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.12
"
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild
new file mode 100644
index 00000000000..86ca99f9cc8
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-bad"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic gstreamer-meson python-any-r1
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+# FIXME gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+RDEPEND="
+ !media-plugins/gst-transcoder
+ >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+ wayland? (
+ >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.4
+ )
+
+ orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.12
+"
+
+# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
+RESTRICT="test"
+
+# Fixes backported to 1.18.x, to be removed in 1.18.7
+PATCHES=(
+)
+
+src_prepare() {
+ default
+ addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+ GST_PLUGINS_NOAUTO="shm ipcpipeline librfb hls"
+ local emesonargs=(
+ -Dshm=enabled
+ -Dipcpipeline=enabled
+ -Dhls=disabled
+ $(meson_feature vnc librfb)
+
+ $(meson_feature wayland)
+ )
+
+ if use opengl || use gles2; then
+ myconf+=( -Dgl=enabled )
+ else
+ myconf+=( -Dgl=disabled )
+ fi
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+ # Tests are slower than upstream expects
+ CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.1.ebuild
new file mode 100644
index 00000000000..ffccda97c31
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-bad"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic gstreamer-meson python-any-r1
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+# FIXME gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+RDEPEND="
+ !media-plugins/gst-transcoder
+ >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+ wayland? (
+ >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.15
+ )
+
+ orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/glib-utils
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
+RESTRICT="test"
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+src_prepare() {
+ default
+ addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+ GST_PLUGINS_NOAUTO="shm ipcpipeline librfb hls"
+
+ local emesonargs=(
+ -Dshm=enabled
+ -Dipcpipeline=enabled
+ -Dhls=disabled
+ $(meson_feature vnc librfb)
+
+ $(meson_feature wayland)
+ )
+
+ if use opengl || use gles2; then
+ myconf+=( -Dgl=enabled )
+ else
+ myconf+=( -Dgl=disabled )
+ fi
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+ # Tests are slower than upstream expects
+ CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild
new file mode 100644
index 00000000000..5cfe57e6eab
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-bad"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic gstreamer-meson python-any-r1
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+# FIXME gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+RDEPEND="
+ !media-plugins/gst-transcoder
+ >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+ wayland? (
+ >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.15
+ )
+
+ orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/glib-utils
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
+RESTRICT="test"
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+src_prepare() {
+ default
+ addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+ GST_PLUGINS_NOAUTO="shm ipcpipeline librfb hls"
+
+ local emesonargs=(
+ -Dshm=enabled
+ -Dipcpipeline=enabled
+ -Dhls=disabled
+ $(meson_feature vnc librfb)
+
+ $(meson_feature wayland)
+ )
+
+ if use opengl || use gles2; then
+ myconf+=( -Dgl=enabled )
+ else
+ myconf+=( -Dgl=disabled )
+ fi
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+ # Tests are slower than upstream expects
+ CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index b5169db2edc..cd869a910f2 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,2 +1,5 @@
DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
+DIST gst-plugins-base-1.18.6.tar.xz 3180564 BLAKE2B ad68cd65cff362ea990b26b9669edc6fe9be21e178e84d7db9d5d4fb13e31326ad7d40cc6228ed5bd54b74aad8a085332d6ce005519208ce6c3d397c29ca0a94 SHA512 b63c80354f1e7363e776726246328781a598a9739ab51b91db552935e5e4e96145ceb7b5b16bff6d054497ed37189bf742ae66774c23b1921b8b19bd9ab93945
+DIST gst-plugins-base-1.20.1.tar.xz 3290068 BLAKE2B 56619a3c267d38daedc1d05b6ab95e8b66dba7bd9e30b019801146688b706f84551290de607d5d2e6f31f2a87302ab75db5cb9704623b4cc11e4aa5c327922c5 SHA512 679a0eee1973fa9612e2e24978e2c2d9d8fdc5732e1699b4a87712881f1549d0811719a13ff4fe77b91322ca4425c39623b371703f6b3a36fb7238b977d3e541
+DIST gst-plugins-base-1.20.2.tar.xz 3295552 BLAKE2B 23b306c566cdd57e31b84082bd14c93e84a10329d83ac71365c0ba7f523d1415ac36aa8217c982abe0c33a40da6e884fac66737227eb794b5bc0c64944d7ea36 SHA512 144ae965a3e487c70e9ac55099ae49f54bff7110d5a92867ebe8a91760dd94fb7f13dc23f34e55923c2150012f81b55be22c840fe89d97e4e78290cb6d51bc51
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild
new file mode 100644
index 00000000000..2936e0a396f
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+# * glx platform requires opengl API
+# * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+# and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+ || ( gbm wayland X )
+ wayland? ( egl )
+ gbm? ( egl )
+"
+REQUIRED_USE="
+ ivorbis? ( ogg )
+ theora? ( ogg )
+ vorbis? ( ogg )
+ opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+ gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+ >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
+ egl? (
+ x11-libs/libdrm
+ )
+ gbm? (
+ >=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ )
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.15
+ )
+
+ >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+ media-libs/libpng:0[${MULTILIB_USEDEP}]
+ virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+ app-text/iso-codes
+ >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+ ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+ orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+ pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+ theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+ vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${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}]
+ )
+
+ gles2? ( ${GL_DEPS} )
+ opengl? ( ${GL_DEPS} )
+
+ !<media-libs/gst-plugins-bad-1.15.0:1.0
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.12
+ X? ( x11-base/xorg-proto )
+"
+
+DOCS="AUTHORS NEWS README RELEASE"
+
+# Fixes backported to 1.18.x, to be removed in 1.18.7
+PATCHES=(
+)
+
+multilib_src_configure() {
+ filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+ # opus: split to media-plugins/gst-plugins-opus
+ GST_PLUGINS_NOAUTO="alsa ogg pango theora vorbis x11 xshm xvideo"
+ local emesonargs=(
+ -Dtools=enabled
+
+ $(meson_feature alsa)
+ $(meson_feature ogg)
+ $(meson_feature orc)
+ $(meson_feature pango)
+ $(meson_feature theora)
+ $(meson_feature vorbis)
+ $(meson_feature X x11)
+ $(meson_feature X xshm)
+ $(meson_feature X xvideo)
+ )
+
+ if use opengl || use gles2; then
+ # because meson doesn't likes extraneous commas
+ local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) )
+ local gl_platform=( $(use X && echo glx) $(use egl && echo egl) )
+ local gl_winsys=(
+ $(use X && echo x11)
+ $(use wayland && echo wayland)
+ $(use egl && echo egl)
+ $(use gbm && echo gbm)
+ )
+
+ emesonargs+=(
+ -Dgl=enabled
+ -Dgl-graphene=enabled
+ -Dgl_api=$(IFS=, ; echo "${gl_api[*]}")
+ -Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}")
+ -Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}")
+ )
+ else
+ emesonargs+=(
+ -Dgl=disabled
+ -Dgl_api=
+ -Dgl_platform=
+ -Dgl_winsys=
+ )
+ fi
+
+ # Workaround EGL/eglplatform.h being built with X11 present
+ use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+ gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.20.1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.20.1.ebuild
new file mode 100644
index 00000000000..11cce3fa5f2
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.20.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+# * glx platform requires opengl API
+# * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+# and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+ || ( gbm wayland X )
+ wayland? ( egl )
+ gbm? ( egl )
+"
+REQUIRED_USE="
+ ivorbis? ( ogg )
+ theora? ( ogg )
+ vorbis? ( ogg )
+ opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+ gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+ >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
+ egl? (
+ x11-libs/libdrm
+ )
+ gbm? (
+ >=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ )
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.15
+ )
+
+ >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+ media-libs/libpng:0[${MULTILIB_USEDEP}]
+ virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+ app-text/iso-codes
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+ ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+ orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+ pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+ theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+ vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${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}]
+ )
+
+ gles2? ( ${GL_DEPS} )
+ opengl? ( ${GL_DEPS} )
+
+ !<media-libs/gst-plugins-bad-1.15.0:1.0
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ X? ( x11-base/xorg-proto )
+"
+
+DOCS=( AUTHORS NEWS README.md RELEASE )
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+multilib_src_configure() {
+ filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+ # opus: split to media-plugins/gst-plugins-opus
+ GST_PLUGINS_NOAUTO="alsa ogg pango theora vorbis x11 xshm xvideo"
+
+ local emesonargs=(
+ -Dtools=enabled
+
+ $(meson_feature alsa)
+ $(meson_feature ogg)
+ $(meson_feature orc)
+ $(meson_feature pango)
+ $(meson_feature theora)
+ $(meson_feature vorbis)
+ $(meson_feature X x11)
+ $(meson_feature X xshm)
+ $(meson_feature X xvideo)
+ )
+
+ if use opengl || use gles2; then
+ # because meson doesn't likes extraneous commas
+ local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) )
+ local gl_platform=( $(use X && echo glx) $(use egl && echo egl) )
+ local gl_winsys=(
+ $(use X && echo x11)
+ $(use wayland && echo wayland)
+ $(use egl && echo egl)
+ $(use gbm && echo gbm)
+ )
+
+ emesonargs+=(
+ -Dgl=enabled
+ -Dgl-graphene=enabled
+ -Dgl_api=$(IFS=, ; echo "${gl_api[*]}")
+ -Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}")
+ -Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}")
+ )
+ else
+ emesonargs+=(
+ -Dgl=disabled
+ -Dgl_api=
+ -Dgl_platform=
+ -Dgl_winsys=
+ )
+ fi
+
+ # Workaround EGL/eglplatform.h being built with X11 present
+ use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+ gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild
new file mode 100644
index 00000000000..eebb22b7fc8
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+# * glx platform requires opengl API
+# * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+# and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+ || ( gbm wayland X )
+ wayland? ( egl )
+ gbm? ( egl )
+"
+REQUIRED_USE="
+ ivorbis? ( ogg )
+ theora? ( ogg )
+ vorbis? ( ogg )
+ opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+ gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+ >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
+ egl? (
+ x11-libs/libdrm
+ )
+ gbm? (
+ >=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ )
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.15
+ )
+
+ >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+ media-libs/libpng:0[${MULTILIB_USEDEP}]
+ media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+ app-text/iso-codes
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+ ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+ orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+ pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+ theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+ vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${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}]
+ )
+
+ gles2? ( ${GL_DEPS} )
+ opengl? ( ${GL_DEPS} )
+
+ !<media-libs/gst-plugins-bad-1.15.0:1.0
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ X? ( x11-base/xorg-proto )
+"
+
+DOCS=( AUTHORS NEWS README.md RELEASE )
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+multilib_src_configure() {
+ filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+ # opus: split to media-plugins/gst-plugins-opus
+ GST_PLUGINS_NOAUTO="alsa ogg pango theora vorbis x11 xshm xvideo"
+
+ local emesonargs=(
+ -Dtools=enabled
+
+ $(meson_feature alsa)
+ $(meson_feature ogg)
+ $(meson_feature orc)
+ $(meson_feature pango)
+ $(meson_feature theora)
+ $(meson_feature vorbis)
+ $(meson_feature X x11)
+ $(meson_feature X xshm)
+ $(meson_feature X xvideo)
+ )
+
+ if use opengl || use gles2; then
+ # because meson doesn't likes extraneous commas
+ local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) )
+ local gl_platform=( $(use X && echo glx) $(use egl && echo egl) )
+ local gl_winsys=(
+ $(use X && echo x11)
+ $(use wayland && echo wayland)
+ $(use egl && echo egl)
+ $(use gbm && echo gbm)
+ )
+
+ emesonargs+=(
+ -Dgl=enabled
+ -Dgl-graphene=enabled
+ -Dgl_api=$(IFS=, ; echo "${gl_api[*]}")
+ -Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}")
+ -Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}")
+ )
+ else
+ emesonargs+=(
+ -Dgl=disabled
+ -Dgl_api=
+ -Dgl_platform=
+ -Dgl_winsys=
+ )
+ fi
+
+ # Workaround EGL/eglplatform.h being built with X11 present
+ use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+ gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index fe7f1df89ec..1ef4a23337d 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,2 +1,5 @@
DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
+DIST gst-plugins-good-1.18.6.tar.xz 3296552 BLAKE2B 551ae9cf9beb512ae418db20cd50dc8826ed60421a40d6c9c9fc558f32c9db2a9bada309a8075306542c53382ecb728dac3dd6252d1efc7255cffde0bea35895 SHA512 e0be5f1eaffe65d7871f23e42645fa4cee30953d16d54c4f4707c094859659cff1e4609b086afebaf08777b6d01dcba4f4b2b338e722bf729e9ed0482a2417a5
+DIST gst-plugins-good-1.20.1.tar.xz 3415220 BLAKE2B 62a0e0b4d60412350c3aad692e7b3d0dd5c7ebed098e21e7d4d7c599ffec9be5795c88cbdece0b219d1aad607ad1a0209a376a8f3543793c9c905cb1401e92c4 SHA512 6e56f6290465da03bfe162228829e51091896b2c5fe9d1d0718f663a3ab14edf5c790b37998a783981b9c77034252e7dee9fec5136f92ced44c4898e2fbd402e
+DIST gst-plugins-good-1.20.2.tar.xz 3411008 BLAKE2B 45eb497d240bf9b05cfbf85babe5ef85fb8a7f25f1b470f131f319064e1dc04f334d4b7dede4f0aedd73dca01605b7e00e2ddc587bcf9ccce6989a9e99776cb1 SHA512 a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild
new file mode 100644
index 00000000000..afd8caebeb9
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+IUSE="+orc"
+
+RDEPEND="
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.12
+"
+
+DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+
+multilib_src_configure() {
+ GST_PLUGINS_NOAUTO="bz2"
+ local emesonargs=(
+ -Dbz2=enabled
+
+ # gst-plugins-ximagesrc
+ -Dximagesrc=disabled
+ -Dximagesrc-xshm=disabled
+ -Dximagesrc-xfixes=disabled
+ -Dximagesrc-xdamage=disabled
+
+ # gst-plugins-v4l2
+ -Dv4l2=disabled
+ )
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.20.1.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.20.1.ebuild
new file mode 100644
index 00000000000..de6939296c0
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.20.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+orc"
+
+RDEPEND="
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+multilib_src_configure() {
+ GST_PLUGINS_NOAUTO="bz2"
+
+ local emesonargs=(
+ -Dbz2=enabled
+
+ # gst-plugins-ximagesrc
+ -Dximagesrc=disabled
+ -Dximagesrc-xshm=disabled
+ -Dximagesrc-xfixes=disabled
+ -Dximagesrc-xdamage=disabled
+
+ # gst-plugins-v4l2
+ -Dv4l2=disabled
+ )
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild
new file mode 100644
index 00000000000..3e7ce187e8b
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE="+orc"
+
+RDEPEND="
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+multilib_src_configure() {
+ GST_PLUGINS_NOAUTO="bz2"
+
+ local emesonargs=(
+ -Dbz2=enabled
+
+ # gst-plugins-ximagesrc
+ -Dximagesrc=disabled
+ -Dximagesrc-xshm=disabled
+ -Dximagesrc-xfixes=disabled
+ -Dximagesrc-xdamage=disabled
+
+ # gst-plugins-v4l2
+ -Dv4l2=disabled
+ )
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index d6be25e36be..b70d5366d92 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,2 +1,5 @@
DIST gst-plugins-ugly-1.16.3.tar.xz 899124 BLAKE2B f848c7bbf36cdfca6e3dec4893b9b1bdc363feb697ee7cc89f4c664aa7aa700b76678873e5dae23f277ad99d6034c1e3617d760acc9cd075e0044fae3f4bb88d SHA512 0223f4ceebd1482329cfc7c3faa094d9f3b1d3eaa51eab3ff42da781f0aede8e838221bdc8d1a3ffc43318fb424421447d5548ebaf9ecaf8a290975d178df9ca
DIST gst-plugins-ugly-1.18.4.tar.xz 509920 BLAKE2B a7aec6ac6e5739205c9567072596a8fb6dfcabc2f56ee0800c430c9bfc9549bf7ac75cb65719dadeb84036130d5b58f9be574f2a6531992ee7a8f23e9fb32d16 SHA512 eac02000ac3e0a54a953fe1531cb29bc6bc9913a707d1508905bf64fe0a4ef92f7d01b196259fc217fac8a344f0b2d683dd6d32210ce6b8c0acab08cb3b1322a
+DIST gst-plugins-ugly-1.18.6.tar.xz 515236 BLAKE2B 9f68321e5b58e49989630838fb8fa33da22b887c11735efde1460e0d857644c14a856f7dbd5337e0f2a4791f6934ddeb4defb22e7be70aa8c246b0439fdd9136 SHA512 86c8c536644885d4e1c6691d390ff13faa401f62baa964453c61909f1a1d13a7c43f0cfa5f7a05cc7a34cc90227b1b77244e84024c4c776797f1501c8defe10f
+DIST gst-plugins-ugly-1.20.1.tar.xz 504136 BLAKE2B a3e0e7934feab2efb38dcfa8a034eca9bd3010051b0a6b6c09f100f4a356dc9e8654c45b7e124e4a0e3ac5174f2be6b4362df26bb94df61d899453e10dfbb2ff SHA512 cf4db5da474cba86e19ed399014dff8d0ed3a51feaaaf3a25779af23f5996b6d28c8c9237ad7b4d47051e4336c3b2b467094aed39bf15c8c25b7a6fe9508e6d5
+DIST gst-plugins-ugly-1.20.2.tar.xz 506672 BLAKE2B d1ca3075182a7fe431884c29f12ce9ec60bea3fa0e701a02981f1bf4f6ba393890712373be7a5f0b76734ccf80a5dc1240f62505f2ffe1ab12f1a314ce82bbe4 SHA512 bbe6c60003dc180084995aa00c8aefc5238f9e826db03f5cadac4a39900f2e9ca529b8f63787ca59c830e12bf4f426408b185ca228bd5e9255c2a4f452a48d6a
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
index afd4f5f7faf..d05955f6687 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
@@ -3,8 +3,8 @@
EAPI=7
GST_ORG_MODULE="gst-plugins-ugly"
-
-inherit gstreamer-meson
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
@@ -12,12 +12,14 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="orc"
+IUSE="+orc"
RDEPEND="
>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
>=dev-util/gtk-doc-am-1.12
"
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild
new file mode 100644
index 00000000000..8f20334eb44
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-ugly"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+
+IUSE="+orc"
+
+RDEPEND="
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-util/gtk-doc-am-1.12
+"
+
+DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.1.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.1.ebuild
new file mode 100644
index 00000000000..4c3c48b389b
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-ugly"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+orc"
+
+RDEPEND="
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild
new file mode 100644
index 00000000000..59fff787c4d
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-ugly"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+
+IUSE="+orc"
+
+RDEPEND="
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 7d67f596660..6c2490c919a 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,2 +1,5 @@
DIST gst-rtsp-server-1.16.3.tar.xz 699472 BLAKE2B 8937ce9d0550b11657496dec5a79c00f74de4da9deb9236693a25f4e266a779c8d4f439b127c2af87c874327e10f01f6a1d74fc1cd1bd0eca20093341568cb82 SHA512 f9ca08cfef92b74a63279a5480cfc1b18557f3062aadc765dd4d3de57d62b9ddf3ca98a4680dcd0f050812128c5c03592cdbf9d8329b85a6c2f3a39209c07701
DIST gst-rtsp-server-1.18.4.tar.xz 358140 BLAKE2B 3c8dae60742cc35580d5dbb4bbc5175ee93de2d2bb64c0de0dd09df5137b2b1518f6a39a2538d1eca86e8bd756299cada6f26ae23f33e1af1d6317e1e30d9d63 SHA512 1cda671f43e608d89aa024a8b4a39cbe1b83e1cd822b1190c777dd18c2000b5c8370e50598821b9c3f348776a418286a26993acf4255c6ff488682e0addeefab
+DIST gst-rtsp-server-1.18.6.tar.xz 364472 BLAKE2B 7fe0f70130f2e8022cc9308e8bde1c889c918e34edcfb633c0edf4e674f1b88610ec975cf67aca123193a22025512afbd3d5ab71df6b3d69eea44e56fab30602 SHA512 11c637fe263a9a55820be51fc3cef0aef06af5dc06ab20786b804412ee16ca7abdf20261b10e7483accde390ba75a921b050ab7a2f737145780815cd47f8f5f8
+DIST gst-rtsp-server-1.20.1.tar.xz 358032 BLAKE2B 53dc0936a6a67b75c636d5170549b10456a68679e7fb5cfc6ad5a9d3e56044ddd93bbe25353fdd9f102155d831de48e8dbecc0697b767f9c2e03e4c1d1460a4e SHA512 8f1cf76602e55fbeaa77cd757c2a1380a792909a53e00cb29a4978789f37ee56493ce3fcb652769cdd47ccb935bba0291908d16fa506b58bcc65f34d303ac963
+DIST gst-rtsp-server-1.20.2.tar.xz 360388 BLAKE2B 6593a83e8746001c26abe623608390448f8cbe6710e3215eeea483940a2fb544617ac159a2e03ba3c84918d8132fbad1a91d638491a226dd13e83f87a3219d7d SHA512 fac3338603f1e31cb1da3c163784fbed1663e0cee722b47c3a6bb369296e5fbff3fdc9925952fe387d51f05ffaeef2a7400369a7006b805f3cb8b454566642bd
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.6.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.6.ebuild
new file mode 100644
index 00000000000..470918b177f
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+ >=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dintrospection=$(multilib_native_usex introspection enabled disabled)
+ )
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples ; then
+ docinto examples
+ dodoc "${S}"/examples/*.c
+ fi
+}
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.1.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.1.ebuild
new file mode 100644
index 00000000000..b48154a1292
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+ >=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dintrospection=$(multilib_native_usex introspection enabled disabled)
+ )
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples ; then
+ docinto examples
+ dodoc "${S}"/examples/*.c
+ fi
+}
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.2.ebuild
new file mode 100644
index 00000000000..b48154a1292
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+ >=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dintrospection=$(multilib_native_usex introspection enabled disabled)
+ )
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples ; then
+ docinto examples
+ dodoc "${S}"/examples/*.c
+ fi
+}
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild
index 8b428d9256f..ea68e1b65af 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.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=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
GNOME2_LA_PUNT="yes"
inherit bash-completion-r1 gnome2 python-r1
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 7d170d36e78..cdd8b601c7a 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,2 +1,5 @@
DIST gstreamer-1.16.3.tar.xz 3338692 BLAKE2B 79eb08bc446073fadf881adea0f60a2caf6384836df975f80ce0e57db6469e6a016cab38413d3de00d11b491a0281f95dcbcd1f782b31f2d1a07b866c1ed7dd5 SHA512 4a879e71f65c89609c2e106dc79222853e6f37830638d5b9624c436fc9d8974cc6474d399eff02cdc13ff7189fcd13e9450450d36c3a6092aa53cb97056f5854
DIST gstreamer-1.18.4.tar.xz 2703948 BLAKE2B b11be1309e7a6ad0aff24aa99b10b1c16df4b1720b821421a72ec9d9b20087488901bb4667e797d32ef616f909c3aefd301fac6be9c4c4120ec9e4af3acc7b48 SHA512 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a
+DIST gstreamer-1.18.6.tar.xz 2713892 BLAKE2B 93642e33f0812cae60318ac821fcda450b15894e44d17e1e4dae3a9d84f20e86bbb418bf924fdf2cc52e4bcbbea8cf8fac530157bc48e43fb86819c587ad1aab SHA512 9598da87a6e87ddd134542dd72e110ce53bb673a8f29484d85ce4daff2a19e1fb5c392ddad460d0bb9138a51ae65f06ba2e7251636bbee272070feea428facac
+DIST gstreamer-1.20.1.tar.xz 2674128 BLAKE2B c05c29ac53df2ed5d60c3f2e9dcbc130e4733bc19fbb23b31285190cd68e5abd2a9209e87b4cd481719944b4fcdf6b0e1dbc1a7ba93cfa96fd305e698f971b3a SHA512 d6f67cce81ba15fba3fcf70850e3c84b25e8da3e53fd56e6f2c87c7ee1701071ea44deb754a0ea371b3cb17877f26aab94d9eccb6729cbb370d6d6d5c324aa1a
+DIST gstreamer-1.20.2.tar.xz 2677552 BLAKE2B 0e6a818fd900c4f0c2748f15262e1d166755e3c419dfa04d7fc4a434ad9a84474d0eb43b9cf0286008497d7ff3e5340b737aeafc45d2994d7c713d5a12e3e2e3 SHA512 994378b656fa593e134624d5d4d5014e78074199d80152eafce29bc09864bd6d0f32a31eafda6cb8caec60aa85b0bda7c42a8c3b388b47d59f2cf4bc729d551f
diff --git a/media-libs/gstreamer/files/gstreamer-1.20-loong.patch b/media-libs/gstreamer/files/gstreamer-1.20-loong.patch
new file mode 100644
index 00000000000..833c217ca82
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-1.20-loong.patch
@@ -0,0 +1,28 @@
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2443,
+with file path tweaked to suit dist tarball layout.
+
+From: WANG Xuerui <xen0n@gentoo.org>
+Date: Wed, 18 May 2022 10:04:08 +0800
+Subject: [PATCH] gstreamer/gst/gstconfig.h.in: Add support for LoongArch
+
+While current and future LoongArch machines that are supposed to run
+GStreamer all support unaligned accesses, there might be future
+lower-end cores (e.g. the embedded product line) without such support,
+and we may not want to penalize these use cases.
+
+So, mark LoongArch as not supporting unaligned accesses for now, and
+hope the compilers do a good job optimizing them. We can always flip
+switch later.
+
+Suggested-by: CHEN Tao <redeast_cn@outlook.com>
+--- a/gst/gstconfig.h.in
++++ b/gst/gstconfig.h.in
+@@ -124,7 +124,7 @@
+ * http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6
+ * https://software.intel.com/en-us/node/583402
+ */
+-#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_ARM64) || defined(_M_IA64) || defined(__xtensa__) || defined(__e2k__) || defined(__riscv) || defined(__ARC64__)
++#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_ARM64) || defined(_M_IA64) || defined(__xtensa__) || defined(__e2k__) || defined(__riscv) || defined(__ARC64__) || defined(__loongarch__)
+ # define GST_HAVE_UNALIGNED_ACCESS 0
+ #elif defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__)
+ # define GST_HAVE_UNALIGNED_ACCESS 1
diff --git a/media-libs/gstreamer/gstreamer-1.18.6.ebuild b/media-libs/gstreamer/gstreamer-1.18.6.ebuild
new file mode 100644
index 00000000000..9570ec8cef9
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.18.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection +orc unwind"
+
+RDEPEND="
+ caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ unwind? (
+ >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+ dev-libs/elfutils[${MULTILIB_USEDEP}]
+ )
+ !<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.12
+ sys-devel/bison
+ sys-devel/flex
+"
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dbenchmarks=disabled
+ -Dexamples=disabled
+ -Dcheck=enabled
+ $(meson_feature unwind libunwind)
+ $(meson_feature unwind libdw)
+ )
+
+ if use caps ; then
+ emesonargs+=( -Dptp-helper-permissions=capabilities )
+ else
+ emesonargs+=(
+ -Dptp-helper-permissions=setuid-root
+ -Dptp-helper-setuid-user=nobody
+ -Dptp-helper-setuid-group=nobody
+ )
+ fi
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install() {
+ # can't do "default", we want to install docs in multilib_src_install_all
+ DESTDIR="${D}" eninja install
+
+ # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+ use orc && pax-mark -m "${ED}/usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+
+ # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+ use orc && pax-mark -m "${ED}/usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/gstreamer/gstreamer-1.20.1.ebuild b/media-libs/gstreamer/gstreamer-1.20.1.ebuild
new file mode 100644
index 00000000000..ffbe7db340d
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.20.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection +orc unwind"
+
+RDEPEND="
+ >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+ caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ unwind? (
+ >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+ dev-libs/elfutils[${MULTILIB_USEDEP}]
+ )
+ !<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ sys-devel/bison
+ sys-devel/flex
+"
+
+DOCS=( AUTHORS ChangeLog NEWS MAINTAINERS README.md RELEASE )
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dbenchmarks=disabled
+ -Dexamples=disabled
+ -Dcheck=enabled
+ $(meson_feature unwind libunwind)
+ $(meson_feature unwind libdw)
+ )
+
+ if use caps ; then
+ emesonargs+=( -Dptp-helper-permissions=capabilities )
+ else
+ emesonargs+=(
+ -Dptp-helper-permissions=setuid-root
+ -Dptp-helper-setuid-user=nobody
+ -Dptp-helper-setuid-group=nobody
+ )
+ fi
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install() {
+ # can't do "default", we want to install docs in multilib_src_install_all
+ DESTDIR="${D}" eninja install
+
+ # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+ use orc && pax-mark -m "${ED}/usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+
+ # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+ use orc && pax-mark -m "${ED}/usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/gstreamer/gstreamer-1.20.2.ebuild b/media-libs/gstreamer/gstreamer-1.20.2.ebuild
new file mode 100644
index 00000000000..edc41eb9b74
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.20.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection +orc unwind"
+
+RDEPEND="
+ >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+ caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ unwind? (
+ >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+ dev-libs/elfutils[${MULTILIB_USEDEP}]
+ )
+ !<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ sys-devel/bison
+ sys-devel/flex
+"
+
+DOCS=( AUTHORS ChangeLog NEWS MAINTAINERS README.md RELEASE )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.20-loong.patch"
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dbenchmarks=disabled
+ -Dexamples=disabled
+ -Dcheck=enabled
+ $(meson_feature unwind libunwind)
+ $(meson_feature unwind libdw)
+ )
+
+ if use caps ; then
+ emesonargs+=( -Dptp-helper-permissions=capabilities )
+ else
+ emesonargs+=(
+ -Dptp-helper-permissions=setuid-root
+ -Dptp-helper-setuid-user=nobody
+ -Dptp-helper-setuid-group=nobody
+ )
+ fi
+
+ gstreamer_multilib_src_configure
+}
+
+multilib_src_install() {
+ # can't do "default", we want to install docs in multilib_src_install_all
+ DESTDIR="${D}" eninja install
+
+ # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+ use orc && pax-mark -m "${ED}/usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+
+ # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+ use orc && pax-mark -m "${ED}/usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/gupnp-dlna/Manifest b/media-libs/gupnp-dlna/Manifest
index 6a20ce19173..64d074b2caf 100644
--- a/media-libs/gupnp-dlna/Manifest
+++ b/media-libs/gupnp-dlna/Manifest
@@ -1,2 +1 @@
-DIST gupnp-dlna-0.10.5.tar.xz 329468 BLAKE2B 045c890bc05e7a8e8321c46b333b27ec112b470f484961b24dad5652c0d065db52187c4ac19ed392319e12d2cf7b835b43304edf1307ffc3bb5f2c5c7baded4c SHA512 060e997dc85d840722bc31c8eb2c7f986151220ac6f3de9e073f4dd62fdd57ffa049b628080832d6b96c1988f49eacc29d539f738ed61797019264f68ebf7680
-DIST gupnp-dlna-0.11.0.tar.xz 87920 BLAKE2B 8391503c66da267d936563b1b39b1f390bdeb2d4511a900fb99faf968307026e857b66d2f43dd14309e9e4e9790801538947f6c8506391c0da39db6a7b854a6b SHA512 26aad6eb3f7705fa586552a1e4d6931b3ff28b6dbcfd7a626dea297ffd90e67f02957b68e0bb6c80e4fd445dbba1bd47dc47bcf8ac389ff2bb0622cd9ca7f3d1
+DIST gupnp-dlna-0.12.0.tar.xz 89480 BLAKE2B 1e281fa2d8f80bcad146c37ab91c3036ced91b2eae8d7cf29bd34551e38b599f4551a7317f58851b8f3a85ad65313558608f15d42e6d6bccec580be7aa3b19a1 SHA512 a626fe77426b607325bb8cacb6af5c434d451c1aa550272f0cbe59f84103f7ec8d2be5ebc79a9ea4e56b755ad9cadabdcbd059c49b1c0df143ba15a52fcd0ce0
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
deleted file mode 100644
index 8ab1d92eced..00000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.34:2
- >=dev-libs/libxml2-2.5:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.11
- virtual/pkgconfig
- introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
- # Make doc parallel installable
- cd "${S}"/doc/gupnp-dlna
- sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
- -e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
- -i Makefile.am Makefile.in || die
- sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \
- -i html/${PN}.devhelp2 || die
- mv ${PN}-docs{,-${SLOT}}.sgml || die
- mv ${PN}-overrides{,-${SLOT}}.txt || die
- mv ${PN}-sections{,-${SLOT}}.txt || die
- mv ${PN}{,-${SLOT}}.types || die
- mv html/${PN}{,-${SLOT}}.devhelp2
-
- cd "${S}"
-
- use introspection && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection)
-}
-
-src_install() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=720053
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild
index 47221219da9..ad288a0f8a5 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.12.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 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
LICENSE="LGPL-2"
SLOT="2.0/4" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/media-libs/hamlib/files/hamlib-4.4-slibtool.patch b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
new file mode 100644
index 00000000000..140534e744b
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
@@ -0,0 +1,73 @@
+From 4fa9a211adbcb1ae9329db41c27854af70f39d64 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 6 May 2022 17:13:36 -0700
+Subject: [PATCH] bindings: Fix tcl build with slibtool
+
+---
+ bindings/Makefile.am | 3 ++-
+ configure.ac | 16 ++++++++++++----
+ macros/tcl.m4 | 1 +
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index f9f17d567..7e2647945 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -149,8 +149,9 @@ PKG_VER = $(ABI_VERSION).$(ABI_REVISION)
+ DLL = hamlibtcl-$(PKG_VER)$(TCL_SHLIB_SUFFIX)
+
+ nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
++hamlibtcl_la_CFLAGS = $(TCL_CFLAGS)
+ hamlibtcl_la_LDFLAGS = -no-undefined -module -release $(PKG_VER) -avoid-version
+-hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC)
++hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC) $(TCL_LIBS)
+
+ hamlibtcl_ladir = $(tcldir)
+ hamlibtcl_la_DATA = pkgIndex.tcl
+diff --git a/configure.ac b/configure.ac
+index f58eb0925..ab6e120f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -589,11 +589,16 @@ AC_ARG_WITH([tcl-binding],
+ [build_tcl=no])
+ AC_MSG_RESULT([$build_tcl])
+
+-dnl SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
++dnl tcl.pc or SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
+ AS_IF([test x"${build_tcl}" = "xyes"],[
+- dnl Search for and load tclConfig.sh.
+- SC_PATH_TCLCONFIG
+- SC_LOAD_TCLCONFIG
++ dnl Search for and load tcl.pc or tclConfig.sh.
++ PKG_CHECK_MODULES([TCL], [tcl],
++ [],
++ [
++ AC_MSG_WARN([Unable to find Tcl pkgconfig])
++ SC_PATH_TCLCONFIG
++ SC_LOAD_TCLCONFIG
++ ])
+
+ tcl_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
+@@ -617,6 +622,9 @@ AC_SUBST([TCL_VERSION])
+ AC_SUBST([TCL_LIB_SPEC])
+ AC_SUBST([TCL_INCLUDE_SPEC])
+ AC_SUBST([TCL_SHLIB_SUFFIX])
++dnl These variables are set once tcl.pc is found.
++AC_SUBST([TCL_LIBS])
++AC_SUBST([TCL_CFLAGS])
+
+
+ dnl Check for lua availability, so we can enable HamlibLua
+diff --git a/macros/tcl.m4 b/macros/tcl.m4
+index feed05ce3..c1d308cf4 100644
+--- a/macros/tcl.m4
++++ b/macros/tcl.m4
+@@ -130,6 +130,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
+ . $TCL_BIN_DIR/tclConfig.sh
+ else
+ AC_MSG_RESULT([file not found])
++ AC_MSG_ERROR([failed to load tclConfig.sh])
+ fi
+
+ #
diff --git a/media-libs/hamlib/hamlib-4.3.1.ebuild b/media-libs/hamlib/hamlib-4.3.1.ebuild
index ab42e282b75..905bf3bb1fd 100644
--- a/media-libs/hamlib/hamlib-4.3.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.3.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
@@ -92,4 +92,6 @@ src_install() {
echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
doenvd "${T}"/73hamlib
+
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/media-libs/hamlib/hamlib-4.4.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild
index b741ce89b03..7a49e596723 100644
--- a/media-libs/hamlib/hamlib-4.4.ebuild
+++ b/media-libs/hamlib/hamlib-4.4.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="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
LICENSE="LGPL-2 GPL-2"
SLOT="0/4.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
IUSE="doc perl python tcl"
RESTRICT="test"
@@ -38,6 +38,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
+PATCHES=(
+ "${FILESDIR}/${P}-slibtool.patch" # 798273
+)
+
S="${WORKDIR}/${MY_P}"
pkg_setup() {
@@ -45,6 +49,8 @@ pkg_setup() {
}
src_prepare() {
+ default
+
# fix hardcoded libdir paths
sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-e "s#fix}/include#fix}/include/hamlib#" \
@@ -60,8 +66,6 @@ src_prepare() {
sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
eautoreconf
-
- eapply_user
}
src_configure() {
@@ -92,4 +96,6 @@ src_install() {
echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
doenvd "${T}"/73hamlib
+
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b03bffaac86..b78b79d22cd 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,2 +1,3 @@
-DIST harfbuzz-3.1.1.tar.gz 24966288 BLAKE2B f655d6a175dc495c00a76838d101705a32270668b7d989b8e82b9c34d2c16a5c10d210c0ed99a334515f73f7cad5c22e35c97f3a2c3f40f686380dd0559d0d7f SHA512 ccb1c840d07e28871893c40b2bb687cc78dfd25992ee20192f1faf8cae4356f401abd5947d7480a268edea10dd9f1d1d7e113b29b6e2d958220bf53799ae01b0
-DIST harfbuzz-3.1.2.tar.gz 26678706 BLAKE2B 231687fa77983217cf60eda2b4796431c15a9efa79e8925363e6d8374ea2710d167eb1bcf5e14a7c738a98f6be06e24ee6b038ea5697b380b81425c9d4244dad SHA512 4d1093904bd450c6d65130b3d7198c07cfc5cce9a5d234fcb14bae1101b28e697ba42cb455217f863d8d5c83830784f716ae59a2dbb38e88156677213bdb4799
+DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B 7b779149b34353ebb85143f74e9efdd8f8ba3616cd192df63ae43aa86f3f08d9a4104554f1f43624824549cf957625e496a307470dd1a9599e492cbf490ab1f3 SHA512 c0b3802fc084cb781acb717f07ca7811685e6834d97ae1a2f13ddc68ce0a31d672cb92e1192705c6d5ed870cb735f5d37150f7bf661b95d806a9d8f362520c01
+DIST harfbuzz-4.2.1.tar.gz 29096419 BLAKE2B eb523c2e3c956559e2445bd12719b14c244cfdedd239041afec71a17912e489adb94c0b6fe148c60ae9e908cc3e740752de2a33a255c123ef937debe6008d78b SHA512 de14b673f6bd03d561c45f94e9bda44ee41897a643ab8837493260a83b1eb1f1ca0fe105c1bee241f2ecd6ab869dbccf3ffba8e2c4ee9a3a1fca4e1c6c7ca4f3
+DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb05d1994b922d3124c97270f34353384c0161d8815fb2e379e82c8bdf046843902ba53db38daa4348e99d99255900 SHA512 bccf7cfb06ac18a9a9bf465c30dbfb51d73762a6667b3a069a85f9f597e6d27858e9e39a36cce12e23ec5b002b9e572638bf00c76bdea66545ae67a2bb7915f4
diff --git a/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch b/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch
new file mode 100644
index 00000000000..64aebcfc03f
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch
@@ -0,0 +1,24 @@
+From 256dcde149737246a04cfc0fe388cb91acb65522 Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1@gmail.com>
+Date: Mon, 21 Feb 2022 00:07:03 -0700
+Subject: [PATCH] [meson] handle multiple element ICU DEFS
+
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e22859a265..27cd3daa97 100644
+--- a/meson.build
++++ b/meson.build
+@@ -105,8 +105,8 @@ else
+ endif
+
+ if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
+- icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '')
+- if icu_defs != ''
++ icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '').split()
++ if icu_defs.length() > 0
+ add_project_arguments(icu_defs, language: ['c', 'cpp'])
+ endif
+ endif
diff --git a/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
index c342b2dfe8f..7966387b760 100644
--- a/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.4.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=8
@@ -45,6 +45,10 @@ BDEPEND="
introspection? ( dev-util/glib-utils )
"
+PATCHES=(
+ "${FILESDIR}/${P}-multiple_icu_defs.patch" #833891
+)
+
pkg_setup() {
python-any-r1_pkg_setup
if ! use debug ; then
@@ -76,7 +80,7 @@ src_prepare() {
}
multilib_src_configure() {
- # harfbuzz-gobject only used for instrospection, bug #535852
+ # harfbuzz-gobject only used for introspection, bug #535852
local emesonargs=(
-Dcoretext="disabled"
-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild b/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
index f6617befe9b..36d9b9aebfc 100644
--- a/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.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=8
@@ -15,13 +15,13 @@ if [[ ${PV} = 9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="Old-MIT ISC icu"
# 0.9.18 introduced the harfbuzz-icu split; bug #472416
# 3.0.0 dropped some unstable APIs; bug #813705
-SLOT="0/3.0.0"
+SLOT="0/4.0.0"
IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
RESTRICT="!test? ( test )"
@@ -76,7 +76,7 @@ src_prepare() {
}
multilib_src_configure() {
- # harfbuzz-gobject only used for instrospection, bug #535852
+ # harfbuzz-gobject only used for introspection, bug #535852
local emesonargs=(
-Dcoretext="disabled"
-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
new file mode 100644
index 00000000000..36d9b9aebfc
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
@@ -0,0 +1,98 @@
+# 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 python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/4.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+ cairo? ( x11-libs/cairo:= )
+ glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+ graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+ truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )
+ introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ if ! use debug ; then
+ append-cppflags -DHB_NDEBUG
+ fi
+}
+
+src_prepare() {
+ default
+
+ xdg_environment_reset
+
+ sed -i \
+ -e '/tests\/macos\.tests/d' \
+ test/shape/data/in-house/Makefile.sources \
+ || die # bug 726120
+
+ # bug 618772
+ append-cxxflags -std=c++14
+
+ # bug 790359
+ filter-flags -fexceptions -fthreadsafe-statics
+
+ # bug 762415
+ local pyscript
+ for pyscript in $(find -type f -name "*.py") ; do
+ python_fix_shebang -q "${pyscript}"
+ done
+}
+
+multilib_src_configure() {
+ # harfbuzz-gobject only used for introspection, bug #535852
+ local emesonargs=(
+ -Dcoretext="disabled"
+ -Dchafa="disabled"
+
+ $(meson_feature glib)
+ $(meson_feature graphite graphite2)
+ $(meson_feature icu)
+ $(meson_feature introspection gobject)
+ $(meson_feature test tests)
+ $(meson_feature truetype freetype)
+
+ $(meson_native_use_feature cairo)
+ $(meson_native_use_feature doc docs)
+ $(meson_native_use_feature introspection)
+
+ $(meson_use experimental experimental_api)
+ )
+ meson_src_configure
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index f6617befe9b..899f139ec71 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-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
@@ -21,7 +21,7 @@ fi
LICENSE="Old-MIT ISC icu"
# 0.9.18 introduced the harfbuzz-icu split; bug #472416
# 3.0.0 dropped some unstable APIs; bug #813705
-SLOT="0/3.0.0"
+SLOT="0/4.0.0"
IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
RESTRICT="!test? ( test )"
@@ -76,7 +76,7 @@ src_prepare() {
}
multilib_src_configure() {
- # harfbuzz-gobject only used for instrospection, bug #535852
+ # harfbuzz-gobject only used for introspection, bug #535852
local emesonargs=(
-Dcoretext="disabled"
-Dchafa="disabled"
diff --git a/media-libs/icclib/metadata.xml b/media-libs/icclib/metadata.xml
index cf41b28b407..882504794e1 100644
--- a/media-libs/icclib/metadata.xml
+++ b/media-libs/icclib/metadata.xml
@@ -5,7 +5,4 @@
<email>printing@gentoo.org</email>
<name>Gentoo Printing Project</name>
</maintainer>
- <upstream>
- <remote-id type="freecode">icclib</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 7b70c13344a..8a397225e63 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,2 +1,2 @@
-DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
+DIST ilmbase-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
diff --git a/media-libs/ilmbase/ilmbase-2.5.7.ebuild b/media-libs/ilmbase/ilmbase-2.5.7-r2.ebuild
index 9b78d8f3475..f059ec0f2bc 100644
--- a/media-libs/ilmbase/ilmbase-2.5.7.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.7-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
diff --git a/media-libs/ilmbase/ilmbase-2.5.6.ebuild b/media-libs/ilmbase/ilmbase-2.5.7-r3.ebuild
index 98ea51175b7..4e17a1bf8da 100644
--- a/media-libs/ilmbase/ilmbase-2.5.6.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.7-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
@@ -13,10 +13,12 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
LICENSE="BSD"
SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="large-stack static-libs test"
RESTRICT="!test? ( test )"
+RDEPEND="!media-libs/openexr:3"
+DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
DOCS=( README.md )
diff --git a/media-libs/ilmbase/ilmbase-2.5.8.ebuild b/media-libs/ilmbase/ilmbase-2.5.8.ebuild
new file mode 100644
index 00000000000..04019509e22
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.5.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/openexr-${PV}/IlmBase"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="large-stack static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!media-libs/openexr:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md )
+
+src_prepare() {
+ if use abi_x86_32 && use test; then
+ eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch
+ fi
+
+ multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+ -DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
+ -DILMBASE_INSTALL_PKG_CONFIG=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 386f7e92f85..53c2c96ce9c 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,2 +1,3 @@
-DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
DIST imlib2-1.7.1.tar.bz2 893631 BLAKE2B 637bf70ea223a63c51def0fac4102683a090de41a1f5904d6232fd2fa004915e3dcde54eac51d16532d2df83a0f8df127266766ac3700ae2948d39fefef512b8 SHA512 36e457855da0f129c7e7ba3dfcb44162b6624b1d56df5f84448495a96fe9ad1ce3e6c628222630be7274476722c4feaa8e1648d1e463439ca758e66ce9645970
+DIST imlib2-1.7.5.tar.xz 793124 BLAKE2B bc47f81aeb635ca2f3d4962e1be5c53111a25a88ccbfcd8f9a7c87717b256966ca6b8cd78fb897287dab656ef2ade41a0955f7d3770d6d670e675954f000cebb SHA512 6e0a79359d6cac297b7a074a75bf577c8c1e3932d9993616834ea9076a7df544fafcfa960fe8ed7468f1291533f3c828260ccb809a882dadb3f3650ba9dd3f28
+DIST imlib2-1.9.0.tar.xz 807740 BLAKE2B 5fc1694a4a419434d2308f0bd76e7a2fe086a00159c5fe73a383bee4d0c721f2bf294e9a9e7cb86416f702d1991646b56fd3a876c573584c4a18c7bd5e5f5f88 SHA512 958fdabc938ec03ab48001ca4df72c8352cb261b12b09334d38348b22b8859cff16a1cda0d4447b73261723f223f62a799f80eb85a710ac5a44a3fa4f90734fd
diff --git a/media-libs/imlib2/imlib2-1.7.1-r2.ebuild b/media-libs/imlib2/imlib2-1.7.1-r2.ebuild
index 84f7a25b689..3845de03d7c 100644
--- a/media-libs/imlib2/imlib2-1.7.1-r2.ebuild
+++ b/media-libs/imlib2/imlib2-1.7.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
static-libs +tiff +webp zlib"
diff --git a/media-libs/imlib2/imlib2-1.6.1-r2.ebuild b/media-libs/imlib2/imlib2-1.7.5.ebuild
index f53bb460894..16f9305666f 100644
--- a/media-libs/imlib2/imlib2-1.6.1-r2.ebuild
+++ b/media-libs/imlib2/imlib2-1.7.5.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit multilib-minimal toolchain-funcs
DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
HOMEPAGE="https://www.enlightenment.org/
https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug doc +gif +jpeg mp3 +png +shm
static-libs +tiff +webp zlib"
REQUIRED_USE="shm? ( X )"
@@ -32,7 +32,7 @@ RDEPEND="
x11-libs/libXext[${MULTILIB_USEDEP}]
)
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- !<media-plugins/imlib2_loaders-1.6.0
+ !<media-plugins/imlib2_loaders-1.7.0
"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
@@ -42,6 +42,7 @@ multilib_src_configure() {
local myeconfargs=(
$(use_with X x)
$(use_with bzip2)
+ $(use_enable debug)
$(use_with gif)
$(use_with jpeg)
$(use_with mp3 id3)
diff --git a/media-libs/imlib2/imlib2-1.9.0.ebuild b/media-libs/imlib2/imlib2-1.9.0.ebuild
new file mode 100644
index 00000000000..af1d1b90b2a
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.9.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="https://www.enlightenment.org/
+ https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug doc +gif +jpeg mp3 +png +shm
+ static-libs +tiff +webp zlib svg heif eps jpeg2k jpegxl"
+
+REQUIRED_USE="shm? ( X )"
+
+RDEPEND="
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+ mp3? ( media-libs/libid3tag:=[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ svg? ( >=gnome-base/librsvg-2.46.0:=[${MULTILIB_USEDEP}] )
+ heif? ( media-libs/libheif:=[${MULTILIB_USEDEP}] )
+ eps? ( app-text/libspectre )
+ jpeg2k? ( media-libs/openjpeg:=[${MULTILIB_USEDEP}] )
+ jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+ !<media-plugins/imlib2_loaders-1.7.0
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_with X x)
+ $(use_with bzip2 bz2)
+ $(use_enable debug)
+ $(use_with gif)
+ $(use_with jpeg)
+ $(use_with mp3 id3)
+ $(use_with png)
+ $(use_with shm x-shm-fd)
+ $(use_enable static-libs static)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with zlib)
+ $(use_with svg)
+ $(use_with heif)
+ $(multilib_native_use_with eps ps)
+ $(use_with jpeg2k j2k)
+ $(use_with jpegxl jxl)
+ )
+
+ # imlib2 has different configure options for x86/amd64 assembly
+ if [[ $(tc-arch) == amd64 ]]; then
+ myeconfargs+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
+ else
+ myeconfargs+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
+ fi
+
+ ECONF_SOURCE="${S}" \
+ econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+ V=1 emake install DESTDIR="${D}"
+ find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+ if use doc; then
+ local HTML_DOCS=( "${S}"/doc/. )
+ rm "${S}"/doc/Makefile.{am,in} || die
+ fi
+ einstalldocs
+}
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 9194df3a2ef..6129b2fd00f 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -10,6 +10,9 @@
<flag name="bzip2">Bzip2 loader support</flag>
<flag name="gif">Gif image loader support</flag>
<flag name="jpeg">Jpeg image loader support</flag>
+ <flag name="heif">Heif and Avif image loader support</flag>
+ <flag name="eps">Eps image loader support</flag>
+ <flag name="jpegxl">Jxl image loader support</flag>
<flag name="mp3">ID3 loader support</flag>
<flag name="png">PNG image loader support</flag>
<flag name="shm">Use MIT shared memory support for X image transfer</flag>
diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
index 5b86b95bee6..a0d409bdf50 100644
--- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.19.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} )
inherit autotools python-any-r1
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="AGPL-3"
SLOT="0/$(ver_cut 1-2)" #698428
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="png static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/jbig2enc/jbig2enc-0.29.ebuild b/media-libs/jbig2enc/jbig2enc-0.29.ebuild
index 272370bdf53..fa9f4ee5a60 100644
--- a/media-libs/jbig2enc/jbig2enc-0.29.ebuild
+++ b/media-libs/jbig2enc/jbig2enc-0.29.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/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos"
+KEYWORDS="amd64 ~loong x86 ~ppc-macos"
IUSE="gif jpeg png tiff webp"
RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]"
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index b6912dc7290..6855236bd36 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-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
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/${PV}" # Since we install unversioned libraries, use ${PV} subslots.
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
diff --git a/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
index 1fc3ed36ab2..5212919e215 100644
--- a/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
IUSE="test"
RDEPEND="
diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.2.0.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.2.0.ebuild
index 6152489b786..b2795d580be 100644
--- a/media-libs/kquickimageeditor/kquickimageeditor-0.2.0.ebuild
+++ b/media-libs/kquickimageeditor/kquickimageeditor-0.2.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=8
@@ -13,7 +13,7 @@ https://api.kde.org/kquickimageeditor/html/index.html"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc64"
+ KEYWORDS="~amd64 ~arm64 ~ppc64"
fi
LICENSE="LGPL-2.1+"
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 5544282afc6..0082a0d8472 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1,3 +1,4 @@
DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211
DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
DIST kvazaar-2.0.0.tar.gz 589661 BLAKE2B 253085784bb3481b578206d5a406d0c25c002905f420337939489d01604f7b5f4ee13a17e596ce96e5d577c508f93f72d2befa5851ab95d7ba9db2030de02550 SHA512 9b2564643f4470d59160f7addffbc6b9e22c0d8bd04dbcd77705aa7263dfdc0195a8642255c45b94049b88ba9cbf4ffd49f968d766e31bc404c612b8f18bdbca
+DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec
diff --git a/media-libs/kvazaar/kvazaar-2.1.0.ebuild b/media-libs/kvazaar/kvazaar-2.1.0.ebuild
new file mode 100644
index 00000000000..5e1ab5d32af
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-2.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GREATEST_PV="1.2.1"
+
+if [[ ${PV} = *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+else
+ SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+LICENSE="LGPL-2.1"
+# subslot = libkvazaar major
+SLOT="0/6"
+IUSE="static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RESTRICT="!test? ( test )"
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? (
+ media-video/ffmpeg
+ )
+ abi_x86_32? ( ${ASM_DEP} )
+ abi_x86_64? ( ${ASM_DEP} )
+"
+
+src_prepare() {
+ default
+ sed -e "/^dist_doc_DATA/s/COPYING //" -i Makefile.am || die
+ eautoreconf
+ if use test && [[ ${PV} != *9999 ]]; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=595932
+ rmdir "${S}/greatest" || die
+ mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
+ fi
+ # Some m4 macros append Werror, we do not want that.
+ append-flags "-Wno-error"
+
+ # valgrind isn't available on all archs
+ # also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3)
+ # see https://github.com/ultravideo/kvazaar/issues/216
+ find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --disable-werror \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
index f0ff4dca352..5e1ab5d32af 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 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
else
SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
inherit autotools flag-o-matic multilib-minimal toolchain-funcs
diff --git a/media-libs/lasi/lasi-1.1.3.ebuild b/media-libs/lasi/lasi-1.1.3.ebuild
index 01ac413b454..2951d2a9549 100644
--- a/media-libs/lasi/lasi-1.1.3.ebuild
+++ b/media-libs/lasi/lasi-1.1.3.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="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
RDEPEND="
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index b60c8e20c4a..0e2f5f4026f 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,2 +1,4 @@
DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed
+DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617
+DIST lcms2-2.13.tar.gz 7259337 BLAKE2B 243e45852a31fb980c80f4468da14eaf1a2b6824cfa4ca0d6260064945faf0ededfa3b69fa8b041cbad49be1ddb7c6099d3b25873ec0d6e31beecea014808c8f SHA512 28cc5310b54b6254447c04ec8072878eb59e539095c400c05a15975b636f2f49daa2e5fa9021a3f9886a1b50e6c85bd950cefa8f171e3f4ee3be269a8dadc4d2
diff --git a/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch b/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch
new file mode 100644
index 00000000000..d1ce0483ee6
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch
@@ -0,0 +1,38 @@
+https://github.com/mm2/Little-CMS/commit/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7
+https://bugs.gentoo.org/832520
+
+From: Marti Maria <marti.maria@littlecms.com>
+Date: Sun, 30 Jan 2022 16:56:48 +0100
+Subject: [PATCH] Fix for optimisation error on grayscale
+
+Thanks to Aaron Boxer for reporting this issue
+--- a/src/cmsintrp.c
++++ b/src/cmsintrp.c
+@@ -278,10 +278,10 @@ void Eval1Input(CMSREGISTER const cmsUInt16Number Input[],
+ // if last value...
+ if (Input[0] == 0xffff || p16->Domain[0] == 0) {
+
+- cmsUInt16Number y0 = LutTable[p16->Domain[0]];
+-
++ cmsUInt32Number y0 = p16->Domain[0] * p16->opta[0];
++
+ for (OutChan = 0; OutChan < p16->nOutputs; OutChan++) {
+- Output[OutChan] = y0;
++ Output[OutChan] = LutTable[y0 + OutChan];
+ }
+ }
+ else
+@@ -324,10 +324,10 @@ void Eval1InputFloat(const cmsFloat32Number Value[],
+ // if last value...
+ if (val2 == 1.0 || p->Domain[0] == 0) {
+
+- y0 = LutTable[p->Domain[0]];
++ cmsUInt32Number start = p->Domain[0] * p->opta[0];
+
+ for (OutChan = 0; OutChan < p->nOutputs; OutChan++) {
+- Output[OutChan] = y0;
++ Output[OutChan] = LutTable[start + OutChan];
+ }
+ }
+ else
+
diff --git a/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch b/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch
new file mode 100644
index 00000000000..41e12fdf1f4
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/832733
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+
+-LIB_PLUGINS = ''
++LIB_PLUGINS=''
+
+ # Add configure option --enable-maintainer-mode which enables dependency
+ # checking and generation useful to package maintainers. This is made an
+@@ -149,7 +149,7 @@
+ [
+ with_fastfloat='no'
+ ])
+-if test "$with_fastfloat" == "yes"
++if test "$with_fastfloat" = "yes"
+ then
+ LIB_PLUGINS="$LIB_PLUGINS -llcms2_fast_float"
+ fi
+
diff --git a/media-libs/lcms/lcms-2.13-r1.ebuild b/media-libs/lcms/lcms-2.13-r1.ebuild
new file mode 100644
index 00000000000..c93f0392ede
--- /dev/null
+++ b/media-libs/lcms/lcms-2.13-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz"
+S="${WORKDIR}/lcms2-${PV}"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs test +threads tiff zlib"
+REQUIRED_USE="tiff? ( zlib )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-grayscale-regression.patch
+)
+
+src_prepare() {
+ default
+
+ # for Prefix/Solaris
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_with jpeg)
+ $(use_enable static-libs static)
+ $(use_with threads)
+ $(use_with tiff)
+ $(use_with zlib)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ use doc && dodoc doc/*.pdf
+}
diff --git a/media-libs/lcms/lcms-2.13.1.ebuild b/media-libs/lcms/lcms-2.13.1.ebuild
new file mode 100644
index 00000000000..4da7f13161c
--- /dev/null
+++ b/media-libs/lcms/lcms-2.13.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz"
+S="${WORKDIR}/lcms2-${PV}"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs test +threads tiff zlib"
+REQUIRED_USE="tiff? ( zlib )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.13.1-fix-configure-bashisms.patch
+)
+
+src_prepare() {
+ default
+
+ # TODO: Swap back to elibtoolize once dropped eautoreconf (for bashism patch)
+ # for Prefix/Solaris
+ #elibtoolize
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_with jpeg)
+ $(use_enable static-libs static)
+ $(use_with threads)
+ $(use_with tiff)
+ $(use_with zlib)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ use doc && dodoc doc/*.pdf
+}
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 3c89adacf4f..34fb903338a 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1 +1,2 @@
DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
+DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index 1853d83462d..0cf6eb2b6e1 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-single-r1 cmake
DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
diff --git a/media-libs/lensfun/lensfun-0.3.3.ebuild b/media-libs/lensfun/lensfun-0.3.3.ebuild
new file mode 100644
index 00000000000..8911ea725f1
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.3.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1 cmake
+
+DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="https://lensfun.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ dev-python/docutils
+ )
+"
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.40
+ media-libs/libpng:0=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md docs/mounts.txt ChangeLog )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.2-warnings.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+ -DSETUP_PY_INSTALL_PREFIX=/usr
+ -DBUILD_LENSTOOL=ON
+ -DBUILD_STATIC=OFF
+ -DBUILD_DOC=$(usex doc)
+ -DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse)
+ -DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
+ -DBUILD_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ mkdir -p "${T}/db/lensfun" || die
+ cp data/db/* "${T}/db/lensfun/" || die
+
+ XDG_DATA_HOME="${T}/db" cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ python_optimize
+}
diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild b/media-libs/leptonica/leptonica-1.82.0.ebuild
index f831a57c4e7..1a5b2148e48 100644
--- a/media-libs/leptonica/leptonica-1.82.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.82.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 @@ SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
LICENSE="Apache-2.0"
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
# N.B. Tests need some features enabled:
REQUIRED_USE="test? ( jpeg png tiff zlib )"
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
deleted file mode 100644
index af9040883c1..00000000000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 562d1412a705b6667bc9fa594133366fb7e787ab
-Author: hasufell <hasufell@gentoo.org>
-Date: Thu Sep 26 20:49:44 2013 +0200
-
- avoid autoreconf
-
-diff --git a/examples/3ds2obj/Makefile.in b/examples/3ds2obj/Makefile.in
-index 1b5b1fe..d2fda8a 100644
---- a/examples/3ds2obj/Makefile.in
-+++ b/examples/3ds2obj/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3ds2obj_SOURCES = 3ds2obj.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3ds2obj.vcproj
- all: all-am
-
-diff --git a/examples/3dsdump/Makefile.in b/examples/3dsdump/Makefile.in
-index 4c915cc..f9f7bba 100644
---- a/examples/3dsdump/Makefile.in
-+++ b/examples/3dsdump/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3dsdump_SOURCES = 3dsdump.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3dsdump.vcproj
- all: all-am
-
-diff --git a/examples/cube/Makefile.in b/examples/cube/Makefile.in
-index 76b7946..1c4b5b6 100644
---- a/examples/cube/Makefile.in
-+++ b/examples/cube/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- cube_SOURCES = cube.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = cube.vcproj cube.tga
- all: all-am
-
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index 22bfc9ac8e3..a2a9fdb2ba6 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -1,11 +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
+inherit autotools
+
DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
HOMEPAGE="https://code.google.com/p/lib3ds/"
SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
@@ -18,6 +21,13 @@ PATCHES=(
"${FILESDIR}"/${P}-mesh.c.patch
)
+src_prepare() {
+ default
+
+ # Always eautoreconf to renew libtool (e.g. Clang)
+ eautoreconf
+}
+
src_configure() {
econf $(use_enable static-libs static)
}
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
index b7da0c9e8a8..54f706d2246 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -1,14 +1,17 @@
-# 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
+
MY_PV="20080909"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
HOMEPAGE="https://code.google.com/p/lib3ds/"
SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
+
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
@@ -18,9 +21,12 @@ BDEPEND="app-arch/unzip"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
-)
+src_prepare() {
+ default
+
+ # Always eautoreconf to renew libtool (e.g. Clang)
+ eautoreconf
+}
src_configure() {
econf $(use_enable static-libs static)
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 42f1c787d50..be0a6fe8db3 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,2 +1 @@
-DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
diff --git a/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch b/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch
deleted file mode 100644
index 00089c58468..00000000000
--- a/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From c4e004aa8580f799dbbb7ec6951e0826dc387811 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 6 Apr 2021 08:45:45 +0200
-Subject: [PATCH] patch to use system-provided act binary
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 109 +++++++++++++++++++++++++++++++++----------------
- 1 file changed, 73 insertions(+), 36 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64a11d9..55abdde 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,14 +54,19 @@ if (${MSVC})
- endif()
-
- ### The API generation target
--if(CMAKE_HOST_UNIX)
-- if(APPLE)
-- set(ACT_COMMANDENDING darwin)
-- else()
-- set(ACT_COMMANDENDING linux)
-+option(USE_SYSTEM_ACT "Use system-provided act binary" OFF)
-+if(NOT USE_SYSTEM_ACT)
-+ if(CMAKE_HOST_UNIX)
-+ if(APPLE)
-+ set(ACT_COMMANDENDING darwin)
-+ else()
-+ set(ACT_COMMANDENDING linux)
-+ endif()
-+ elseif(CMAKE_HOST_WIN32)
-+ set(ACT_COMMANDENDING exe)
- endif()
--elseif(CMAKE_HOST_WIN32)
-- set(ACT_COMMANDENDING exe)
-+else()
-+ find_program(ACT act)
- endif()
-
- set(CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED ${CMAKE_CURRENT_BINARY_DIR}/Autogenerated)
-@@ -71,35 +76,67 @@ set(ACT_GENERATED_SOURCE
- ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation/lib3mf_interfacewrapper.cpp
- ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation/lib3mf_interfacejournal.cpp
- )
--add_custom_command(
-- BYPRODUCTS
-- ${ACT_GENERATED_SOURCE}
-- OUTPUT
-- ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-- WORKING_DIRECTORY
-- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-- COMMAND
-- cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-- COMMAND
-- cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-- COMMAND
-- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-- COMMAND
-- cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-- COMMAND
-- cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-- COMMAND
-- cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-- COMMAND
-- cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
-- COMMAND
-- cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-- COMMENT
-- "Generating hourglass API bindings and implementation stub"
-- DEPENDS
-- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-- VERBATIM
--)
-+if(NOT USE_SYSTEM_ACT)
-+ add_custom_command(
-+ BYPRODUCTS
-+ ${ACT_GENERATED_SOURCE}
-+ OUTPUT
-+ ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-+ WORKING_DIRECTORY
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-+ COMMAND
-+ cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-+ COMMAND
-+ cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-+ COMMAND
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-+ COMMAND
-+ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-+ COMMAND
-+ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-+ COMMENT
-+ "Generating hourglass API bindings and implementation stub"
-+ DEPENDS
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+ VERBATIM
-+ )
-+else()
-+ add_custom_command(
-+ BYPRODUCTS
-+ ${ACT_GENERATED_SOURCE}
-+ OUTPUT
-+ ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-+ WORKING_DIRECTORY
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-+ COMMAND
-+ cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-+ COMMAND
-+ cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-+ COMMAND
-+ ${ACT} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-+ COMMAND
-+ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-+ COMMAND
-+ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-+ COMMENT
-+ "Generating hourglass API bindings and implementation stub"
-+ DEPENDS
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+ VERBATIM
-+ )
-+endif()
-
- add_custom_target(lib3mfACT
- DEPENDS
---
-2.31.1
-
diff --git a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
deleted file mode 100644
index bae4219d6bb..00000000000
--- a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake eapi8-dosym
-
-DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
-SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+system-act test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libzip:=
- sys-apps/util-linux
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- system-act? ( dev-go/act )
- test? (
- dev-cpp/gtest
- dev-libs/openssl
- dev-util/valgrind
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
- "${FILESDIR}"/${P}-0001-patch-to-use-system-provided-act-binary.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
- -DLIB3MF_TESTS=$(usex test)
- -DUSE_INCLUDED_LIBZIP=OFF
- -DUSE_INCLUDED_ZLIB=OFF
- -DUSE_SYSTEM_ACT=$(usex system-act)
- )
-
- if use test; then
- mycmakeargs+=(
- -DUSE_INCLUDED_GTEST=OFF
- # code says it uses libressl, but works with openssl too
- -DUSE_INCLUDED_SSL=OFF
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- for suf in abi types implicit; do
- dosym8 -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
- done
-}
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index 0b776676ee1..942647a7dcb 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1 +1,2 @@
DIST libaacs-0.11.0.tar.bz2 324061 BLAKE2B 8faffa270580f82b7fc6ae53922a9ec15087b754adebc84f1fd216c748dbcbe6723c14908efc9ef77b891bda149d10bf5020321906a36a3654dddbf6bdc00936 SHA512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388
+DIST libaacs-0.11.1.tar.bz2 325669 BLAKE2B be8553ef8d312d3c62005b12d0473f9f3a8e1d0fbe86b0c0e69ffe213b26658489a1d0b0414222d2a5088d157832e5b27b989945d4a25b1a16e858e43e67629d SHA512 42dcba5fd593c9a8ec7af11251006b083ad2c49ec198734d1d66f67c2ded4557d77617600edbf0c5250e9b0407ef9a2f906d59d154bda8ecfc8adfd234fb2c42
diff --git a/media-libs/libaacs/libaacs-0.11.1-r1.ebuild b/media-libs/libaacs/libaacs-0.11.1-r1.ebuild
new file mode 100644
index 00000000000..4ea18d29a0b
--- /dev/null
+++ b/media-libs/libaacs/libaacs-0.11.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
+HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
+SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+
+RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+ >=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex
+ virtual/yacc"
+
+DOCS=( ChangeLog KEYDB.cfg README.md )
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-optimizations
+ --enable-shared
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+ # Workaround automake bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54390
+ mkdir -p "${BUILD_DIR}"/src/file || die
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libaacs/libaacs-0.11.1.ebuild b/media-libs/libaacs/libaacs-0.11.1.ebuild
new file mode 100644
index 00000000000..0a75f45c2db
--- /dev/null
+++ b/media-libs/libaacs/libaacs-0.11.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
+HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
+SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+ >=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex
+ virtual/yacc"
+
+DOCS=( ChangeLog KEYDB.cfg README.md )
+
+src_prepare() {
+ default
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-optimizations
+ --enable-shared
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 26a8a2404a8..f6fc727b9eb 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,6 +1 @@
-DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
-DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
-DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a4307358fe8d3d9cc0e16e63dd52e54d41163bd14a583c059c9881a6980b1a8c54323b499dbef8301e9fa90094cd0e02 SHA512 2e7e2a9f456d51641ded44cb3ff639982e996276157d34e6a38895a68b7a8f36e209bcbad3dea7a04bd5b45b8cfe8a3bf202ab630f93388ea6dfb516f13ed82f
-DIST libaom-3.0.0.tar.xz 3272588 BLAKE2B ffe3dae3d275818e1fa8819d016ed7a1f01d374ea058a1daa0cfde2a43f3d065a0be08bcd55db7cb823e0a1802a0cf0ae8cdcae63d7fadad9fa1b53e3f654e13 SHA512 6845d7139b1f5d49a0dea98b08de66904909ed0280d90ac56e740f26f17fe1ec3f49c454aded311db5505d7a4133eedc05a09eb6a0c45a43a4895223f5dc35a2
-DIST libaom-3.1.1.tar.gz 4604400 BLAKE2B b5e5030639fd7e33a4d0479cf0b5a174f2e0d0f67f6338bec6df7de333fd9bafa3821c7eb721959c1733a678209981f4893e4f228ed339e93f7b0b6fd136d967 SHA512 de91a47c23200ae83c34899c487db7f3b71872890f0506ffa7e2d9a1153ec389fc121b4df5ab1b30b28020599af34bb5d301eac3cdf2a34ce48dd26e07d7fc5b
-DIST libaom-3.1.2.tar.gz 4605501 BLAKE2B 7aac22da4103408f04a5c2e5d11a96d5a12651fd52e980b547427ebe3e235ba7c16700a131f4bb1b6b4e8a7f82f3175e526281eb593cf604ad491bd7fed0184e SHA512 466c2923115dcf0b0e29fafc8922a057814a84d0e61780ab9b6816bea31d0b741695326183884da5a04afffa5c925ff8ec8f6073e0a1e48ed4914066da975c3b
+DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
diff --git a/media-libs/libaom/files/libaom-1.0.0-armv7l.patch b/media-libs/libaom/files/libaom-1.0.0-armv7l.patch
deleted file mode 100644
index 25fb9e0ff41..00000000000
--- a/media-libs/libaom/files/libaom-1.0.0-armv7l.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Only in libaom.orig/build/cmake: .aom_configure.cmake.swp
-diff -ru libaom.orig/build/cmake/aom_configure.cmake libaom/build/cmake/aom_configure.cmake
---- libaom.orig/build/cmake/aom_configure.cmake 2018-06-13 21:22:56.295771914 +0200
-+++ libaom/build/cmake/aom_configure.cmake 2018-06-13 21:23:10.489772591 +0200
-@@ -16,7 +16,7 @@
- include(FindThreads)
-
- set(AOM_SUPPORTED_CPU_TARGETS
-- "arm64 armv7 armv7s generic mips32 mips64 ppc x86 x86_64")
-+ "arm64 armv7 armv7l armv7s generic mips32 mips64 ppc x86 x86_64")
-
- # Generate the user config settings. This must occur before include of
- # aom_config_defaults.cmake (because it turns every config variable into a cache
diff --git a/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch b/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch
deleted file mode 100644
index 7293c1a75e3..00000000000
--- a/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 2f8587a8b30cb2e4b45df36c6c8461a440a77336 Mon Sep 17 00:00:00 2001
-From: Luca Barbato <lu_zero@gentoo.org>
-Date: Sat, 23 Jun 2018 02:47:16 -0500
-Subject: [PATCH] Update the VSX support
-
-The CFL function signature takes a source and destination pointer.
-Also make the typedef compatible with clang.
-
-Change-Id: Ia633d10141ac0fd10af0a40b9878d18293463fb8
----
- av1/common/ppc/cfl_ppc.c | 85 ++++++++++++++++++++--------------------
- 1 file changed, 42 insertions(+), 43 deletions(-)
-
-diff --git a/av1/common/ppc/cfl_ppc.c b/av1/common/ppc/cfl_ppc.c
-index 58933a7b3..026a07809 100644
---- a/av1/common/ppc/cfl_ppc.c
-+++ b/av1/common/ppc/cfl_ppc.c
-@@ -24,19 +24,21 @@
- #define CFL_LINE_2 128
- #define CFL_LINE_3 192
-
--typedef vector int8_t int8x16_t;
--typedef vector uint8_t uint8x16_t;
--typedef vector int16_t int16x8_t;
--typedef vector uint16_t uint16x8_t;
--typedef vector int32_t int32x4_t;
--typedef vector uint32_t uint32x4_t;
--typedef vector uint64_t uint64x2_t;
-+typedef vector signed char int8x16_t; // NOLINT(runtime/int)
-+typedef vector unsigned char uint8x16_t; // NOLINT(runtime/int)
-+typedef vector signed short int16x8_t; // NOLINT(runtime/int)
-+typedef vector unsigned short uint16x8_t; // NOLINT(runtime/int)
-+typedef vector signed int int32x4_t; // NOLINT(runtime/int)
-+typedef vector unsigned int uint32x4_t; // NOLINT(runtime/int)
-+typedef vector unsigned long long uint64x2_t; // NOLINT(runtime/int)
-
--static INLINE void subtract_average_vsx(int16_t *pred_buf, int width,
-- int height, int round_offset,
-+static INLINE void subtract_average_vsx(const uint16_t *src_ptr, int16_t *dst,
-+ int width, int height, int round_offset,
- int num_pel_log2) {
-- const int16_t *end = pred_buf + height * CFL_BUF_LINE;
-- const int16_t *sum_buf = pred_buf;
-+ // int16_t *dst = dst_ptr;
-+ const int16_t *dst_end = dst + height * CFL_BUF_LINE;
-+ const int16_t *sum_buf = (const int16_t *)src_ptr;
-+ const int16_t *end = sum_buf + height * CFL_BUF_LINE;
- const uint32x4_t div_shift = vec_splats((uint32_t)num_pel_log2);
- const uint8x16_t mask_64 = { 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
-@@ -71,43 +73,40 @@ static INLINE void subtract_average_vsx(int16_t *pred_buf, int width,
- const int32x4_t avg = vec_sr(sum_32x4, div_shift);
- const int16x8_t vec_avg = vec_pack(avg, avg);
- do {
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0, pred_buf), vec_avg), OFF_0, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_1, pred_buf), vec_avg),
-- OFF_0 + CFL_BUF_LINE_BYTES, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_2, pred_buf), vec_avg),
-- OFF_0 + CFL_LINE_2, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_3, pred_buf), vec_avg),
-- OFF_0 + CFL_LINE_3, pred_buf);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0, dst), vec_avg), OFF_0, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_1, dst), vec_avg),
-+ OFF_0 + CFL_BUF_LINE_BYTES, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_2, dst), vec_avg),
-+ OFF_0 + CFL_LINE_2, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_3, dst), vec_avg),
-+ OFF_0 + CFL_LINE_3, dst);
- if (width >= 16) {
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1, pred_buf), vec_avg), OFF_1,
-- pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_1, pred_buf), vec_avg),
-- OFF_1 + CFL_LINE_1, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_2, pred_buf), vec_avg),
-- OFF_1 + CFL_LINE_2, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_3, pred_buf), vec_avg),
-- OFF_1 + CFL_LINE_3, pred_buf);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1, dst), vec_avg), OFF_1, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_1, dst), vec_avg),
-+ OFF_1 + CFL_LINE_1, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_2, dst), vec_avg),
-+ OFF_1 + CFL_LINE_2, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_3, dst), vec_avg),
-+ OFF_1 + CFL_LINE_3, dst);
- }
- if (width == 32) {
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2, pred_buf), vec_avg), OFF_2,
-- pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_1, pred_buf), vec_avg),
-- OFF_2 + CFL_LINE_1, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_2, pred_buf), vec_avg),
-- OFF_2 + CFL_LINE_2, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_3, pred_buf), vec_avg),
-- OFF_2 + CFL_LINE_3, pred_buf);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2, dst), vec_avg), OFF_2, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_1, dst), vec_avg),
-+ OFF_2 + CFL_LINE_1, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_2, dst), vec_avg),
-+ OFF_2 + CFL_LINE_2, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_3, dst), vec_avg),
-+ OFF_2 + CFL_LINE_3, dst);
-
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3, pred_buf), vec_avg), OFF_3,
-- pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_1, pred_buf), vec_avg),
-- OFF_3 + CFL_LINE_1, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_2, pred_buf), vec_avg),
-- OFF_3 + CFL_LINE_2, pred_buf);
-- vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_3, pred_buf), vec_avg),
-- OFF_3 + CFL_LINE_3, pred_buf);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3, dst), vec_avg), OFF_3, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_1, dst), vec_avg),
-+ OFF_3 + CFL_LINE_1, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_2, dst), vec_avg),
-+ OFF_3 + CFL_LINE_2, dst);
-+ vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_3, dst), vec_avg),
-+ OFF_3 + CFL_LINE_3, dst);
- }
-- } while ((pred_buf += CFL_BUF_LINE * 4) < end);
-+ } while ((dst += CFL_BUF_LINE * 4) < dst_end);
- }
-
- // Declare wrappers for VSX sizes
---
-2.22.0
-
diff --git a/media-libs/libaom/files/libaom-1.0.0-version.patch b/media-libs/libaom/files/libaom-1.0.0-version.patch
deleted file mode 100644
index 6b2145d5ba9..00000000000
--- a/media-libs/libaom/files/libaom-1.0.0-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/cmake/version.cmake 2018-09-21 01:20:32.299238765 +0200
-+++ b/build/cmake/version.cmake 2018-09-21 01:21:01.473106534 +0200
-@@ -46,6 +46,7 @@
- endif()
-
- if(NOT "${aom_version}" STREQUAL "${last_aom_version}")
-+ set(aom_version "v1.0.0")
-
- # TODO(tomfinegan): Perl dependency is unnecessary. CMake can do everything
- # that is done by version.pl on its own (if a bit more verbose...).
diff --git a/media-libs/libaom/files/libdirpc2.patch b/media-libs/libaom/files/libdirpc2.patch
deleted file mode 100644
index cbd1b901fb3..00000000000
--- a/media-libs/libaom/files/libdirpc2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: libaom-9999/CMakeLists.txt
-===================================================================
---- libaom-9999.orig/CMakeLists.txt
-+++ libaom-9999/CMakeLists.txt
-@@ -234,8 +234,9 @@ if(NOT MSVC)
- -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
- -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
- -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
-- -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H} -P
-- "${AOM_ROOT}/build/cmake/pkg_config.cmake"
-+ -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H}
-+ -DLIB_SUFFIX=${LIB_SUFFIX}
-+ -P "${AOM_ROOT}/build/cmake/pkg_config.cmake"
- COMMENT "Writing aom.pc" VERBATIM)
- add_dependencies(aom_pc aom_version)
- endif()
-Index: libaom-9999/build/cmake/pkg_config.cmake
-===================================================================
---- libaom-9999.orig/build/cmake/pkg_config.cmake
-+++ libaom-9999/build/cmake/pkg_config.cmake
-@@ -34,12 +34,13 @@ endif()
-
- # Write pkg-config info.
- set(prefix "${CMAKE_INSTALL_PREFIX}")
-+set(libdir "lib${LIB_SUFFIX}")
- set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")
- string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)
- file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")
- fi