summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/aalib/aalib-1.4_rc5-r9.ebuild2
-rw-r--r--media-libs/alsa-lib/Manifest2
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild2
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.6.ebuild (renamed from media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild)23
-rw-r--r--media-libs/alsa-topology-conf/Manifest1
-rw-r--r--media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild2
-rw-r--r--media-libs/alsa-ucm-conf/Manifest2
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild25
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.ebuild2
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.ebuild (renamed from media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild)10
-rw-r--r--media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch20
-rw-r--r--media-libs/audiofile/audiofile-0.3.6-r4.ebuild2
-rw-r--r--media-libs/avidemux-core/Manifest1
-rw-r--r--media-libs/avidemux-core/avidemux-core-2.7.8.ebuild99
-rw-r--r--media-libs/avidemux-plugins/Manifest1
-rw-r--r--media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild165
-rw-r--r--media-libs/babl/babl-0.1.88.ebuild2
-rw-r--r--media-libs/cal3d/cal3d-0.11.0-r1.ebuild45
-rw-r--r--media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch25
-rw-r--r--media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch4
-rw-r--r--media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch4
-rw-r--r--media-libs/cal3d/files/cal3d-0.11.0-tests.patch4
-rw-r--r--media-libs/cal3d/files/cal3d-0.11.0-verbose.patch4
-rw-r--r--media-libs/clutter/clutter-1.26.4.ebuild2
-rw-r--r--media-libs/codec2/Manifest1
-rw-r--r--media-libs/codec2/codec2-0.9.2-r1.ebuild26
-rw-r--r--media-libs/codec2/codec2-1.0.0.ebuild2
-rw-r--r--media-libs/codec2/codec2-1.0.1-r1.ebuild (renamed from media-libs/codec2/codec2-1.0.1.ebuild)9
-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/cogl/cogl-1.22.8-r1.ebuild (renamed from media-libs/cogl/cogl-1.22.8.ebuild)4
-rw-r--r--media-libs/coin/coin-4.0.0.ebuild4
-rw-r--r--media-libs/ctl/ctl-1.5.2-r1.ebuild2
-rw-r--r--media-libs/ctl/ctl-1.5.2-r2.ebuild2
-rw-r--r--media-libs/dav1d/dav1d-0.8.2.ebuild12
-rw-r--r--media-libs/dav1d/dav1d-0.9.0.ebuild12
-rw-r--r--media-libs/dav1d/dav1d-0.9.1.ebuild12
-rw-r--r--media-libs/dav1d/dav1d-0.9.2.ebuild12
-rw-r--r--media-libs/dav1d/dav1d-9999.ebuild11
-rw-r--r--media-libs/dav1d/files/build-avoid-meson-s-symbols_have_underscore_prefix.patch35
-rw-r--r--media-libs/dav1d/metadata.xml1
-rw-r--r--media-libs/embree/Manifest1
-rw-r--r--media-libs/embree/embree-3.13.0-r2.ebuild (renamed from media-libs/embree/embree-3.13.0-r1.ebuild)4
-rw-r--r--media-libs/embree/embree-3.13.2.ebuild132
-rw-r--r--media-libs/exiftool/Manifest3
-rw-r--r--media-libs/exiftool/exiftool-12.30.ebuild (renamed from media-libs/exiftool/exiftool-12.26.ebuild)0
-rw-r--r--media-libs/exiftool/exiftool-12.33.ebuild23
-rw-r--r--media-libs/flac/flac-1.3.3-r1.ebuild2
-rw-r--r--media-libs/flickcurl/flickcurl-1.26.ebuild26
-rw-r--r--media-libs/freeglut/freeglut-3.2.1-r2.ebuild (renamed from media-libs/freeglut/freeglut-3.2.1-r1.ebuild)2
-rw-r--r--media-libs/freeimage/freeimage-3.18.0-r3.ebuild121
-rw-r--r--media-libs/freetype/Manifest6
-rw-r--r--media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch42
-rw-r--r--media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch40
-rw-r--r--media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch41
-rw-r--r--media-libs/freetype/files/ft2demos-2.10.4-install_target.patch58
-rw-r--r--media-libs/freetype/freetype-2.11.0-r1.ebuild2
-rw-r--r--media-libs/freetype/freetype-2.11.0-r2.ebuild (renamed from media-libs/freetype/freetype-2.10.4.ebuild)72
-rw-r--r--media-libs/freetype/freetype-2.11.1.ebuild (renamed from media-libs/freetype/freetype-2.11.0.ebuild)10
-rw-r--r--media-libs/freetype/freetype-9999.ebuild6
-rw-r--r--media-libs/freetype/metadata.xml3
-rw-r--r--media-libs/gd/gd-2.3.2-r1.ebuild (renamed from media-libs/gd/gd-2.3.2.ebuild)4
-rw-r--r--media-libs/gd/gd-2.3.3-r1.ebuild (renamed from media-libs/gd/gd-2.3.3.ebuild)4
-rw-r--r--media-libs/gegl/gegl-0.4.32.ebuild2
-rw-r--r--media-libs/glfw/Manifest1
-rw-r--r--media-libs/glfw/glfw-3.3.4-r2.ebuild48
-rw-r--r--media-libs/glfw/glfw-3.3.5.ebuild50
-rw-r--r--media-libs/glm/Manifest1
-rw-r--r--media-libs/glm/glm-0.9.9.5.ebuild32
-rw-r--r--media-libs/glm/glm-0.9.9.8-r1.ebuild6
-rw-r--r--media-libs/gmmlib/Manifest2
-rw-r--r--media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch8
-rw-r--r--media-libs/gmmlib/gmmlib-21.3.1.ebuild2
-rw-r--r--media-libs/gmmlib/gmmlib-21.3.2.ebuild33
-rw-r--r--media-libs/gmmlib/gmmlib-21.3.3.ebuild33
-rw-r--r--media-libs/gmmlib/gmmlib-9999.ebuild27
-rw-r--r--media-libs/gmmlib/metadata.xml24
-rw-r--r--media-libs/grilo/Manifest1
-rw-r--r--media-libs/grilo/grilo-0.3.14.ebuild77
-rw-r--r--media-libs/gsound/gsound-1.0.3.ebuild2
-rw-r--r--media-libs/gst-plugins-bad/Manifest1
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild (renamed from media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild)6
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.16.3-r1.ebuild (renamed from media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild)2
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.18.4-r1.ebuild (renamed from media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild)2
-rw-r--r--media-libs/hamlib/Manifest2
-rw-r--r--media-libs/hamlib/hamlib-4.3.1.ebuild5
-rw-r--r--media-libs/hamlib/hamlib-4.4.ebuild (renamed from media-libs/hamlib/hamlib-4.2.ebuild)11
-rw-r--r--media-libs/harfbuzz/Manifest6
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.8.1.ebuild93
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild97
-rw-r--r--media-libs/harfbuzz/harfbuzz-3.1.1.ebuild (renamed from media-libs/harfbuzz/harfbuzz-2.9.1.ebuild)8
-rw-r--r--media-libs/harfbuzz/harfbuzz-3.1.2.ebuild (renamed from media-libs/harfbuzz/harfbuzz-3.0.0.ebuild)6
-rw-r--r--media-libs/harfbuzz/harfbuzz-9999.ebuild8
-rw-r--r--media-libs/imlib2/imlib2-1.7.1-r2.ebuild2
-rw-r--r--media-libs/kcolorpicker/Manifest1
-rw-r--r--media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild41
-rw-r--r--media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild2
-rw-r--r--media-libs/kimageannotator/Manifest5
-rw-r--r--media-libs/kimageannotator/kimageannotator-0.4.1.ebuild47
-rw-r--r--media-libs/kimageannotator/kimageannotator-0.5.2.ebuild (renamed from media-libs/kimageannotator/kimageannotator-0.4.2.ebuild)6
-rw-r--r--media-libs/kimageannotator/kimageannotator-0.5.3.ebuild (renamed from media-libs/kimageannotator/kimageannotator-0.5.1.ebuild)5
-rw-r--r--media-libs/kquickimageeditor/Manifest2
-rw-r--r--media-libs/kquickimageeditor/kquickimageeditor-0.2.0.ebuild (renamed from media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild)10
-rw-r--r--media-libs/ladspa-sdk/Manifest1
-rw-r--r--media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch118
-rw-r--r--media-libs/ladspa-sdk/ladspa-sdk-1.17-r1.ebuild (renamed from media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild)10
-rw-r--r--media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild68
-rw-r--r--media-libs/lib3mf/Manifest1
-rw-r--r--media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch141
-rw-r--r--media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch29
-rw-r--r--media-libs/lib3mf/lib3mf-2.2.0.ebuild66
-rw-r--r--media-libs/libafterimage/libafterimage-1.20-r3.ebuild105
-rw-r--r--media-libs/libafterimage/libafterimage-1.20-r4.ebuild2
-rw-r--r--media-libs/libavif/Manifest1
-rw-r--r--media-libs/libavif/libavif-0.8.4-r1.ebuild (renamed from media-libs/libavif/libavif-0.8.4.ebuild)3
-rw-r--r--media-libs/libavif/libavif-0.9.0-r3.ebuild (renamed from media-libs/libavif/libavif-0.9.0-r2.ebuild)3
-rw-r--r--media-libs/libavif/libavif-0.9.1-r1.ebuild (renamed from media-libs/libavif/libavif-0.9.1.ebuild)3
-rw-r--r--media-libs/libavif/libavif-0.9.2-r1.ebuild (renamed from media-libs/libavif/libavif-0.9.2.ebuild)3
-rw-r--r--media-libs/libavif/libavif-0.9.3-r1.ebuild105
-rw-r--r--media-libs/libavif/libavif-9999.ebuild11
-rw-r--r--media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild (renamed from media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild)6
-rw-r--r--media-libs/libdv/libdv-1.0.0-r4.ebuild7
-rw-r--r--media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild2
-rw-r--r--media-libs/libemf/libemf-1.0.13.ebuild4
-rw-r--r--media-libs/libepoxy/Manifest1
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.5.ebuild46
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild (renamed from media-libs/libepoxy/libepoxy-1.5.9.ebuild)4
-rw-r--r--media-libs/libepoxy/libepoxy-9999.ebuild2
-rw-r--r--media-libs/libexif/Manifest2
-rw-r--r--media-libs/libexif/libexif-0.6.23.ebuild2
-rw-r--r--media-libs/libexif/libexif-0.6.24.ebuild (renamed from media-libs/libexif/libexif-0.6.22_p20201105.ebuild)18
-rw-r--r--media-libs/libextractor/libextractor-1.9-r2.ebuild2
-rw-r--r--media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild2
-rw-r--r--media-libs/libglvnd/Manifest1
-rw-r--r--media-libs/libglvnd/libglvnd-1.3.3.ebuild65
-rw-r--r--media-libs/libglvnd/libglvnd-1.3.4.ebuild2
-rw-r--r--media-libs/libid3tag/Manifest1
-rw-r--r--media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch24
-rw-r--r--media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch33
-rw-r--r--media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch13
-rw-r--r--media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch52
-rw-r--r--media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch11
-rw-r--r--media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch17
-rw-r--r--media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch25
-rw-r--r--media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch21
-rw-r--r--media-libs/libid3tag/files/id3tag.pc11
-rw-r--r--media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch12
-rw-r--r--media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild62
-rw-r--r--media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild4
-rw-r--r--media-libs/libjpeg-turbo/Manifest3
-rw-r--r--media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch38
-rw-r--r--media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch43
-rw-r--r--media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch45
-rw-r--r--media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch18
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild126
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild2
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild (renamed from media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild)18
-rw-r--r--media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild2
-rw-r--r--media-libs/libmatemixer/libmatemixer-1.24.1.ebuild2
-rw-r--r--media-libs/libmpd/libmpd-11.8.17-r1.ebuild4
-rw-r--r--media-libs/libmpdclient/Manifest1
-rw-r--r--media-libs/libmpdclient/libmpdclient-2.20.ebuild43
-rw-r--r--media-libs/libmtp/Manifest1
-rw-r--r--media-libs/libmtp/libmtp-1.1.18.ebuild72
-rw-r--r--media-libs/libmtp/libmtp-1.1.19.ebuild2
-rw-r--r--media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild2
-rw-r--r--media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild2
-rw-r--r--media-libs/libogg/libogg-1.3.5.ebuild2
-rw-r--r--media-libs/libopenmpt/Manifest2
-rw-r--r--media-libs/libopenmpt/libopenmpt-0.5.13.ebuild (renamed from media-libs/libopenmpt/libopenmpt-0.5.11.ebuild)4
-rw-r--r--media-libs/libopenshot-audio/Manifest1
-rw-r--r--media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild24
-rw-r--r--media-libs/libopenshot/Manifest1
-rw-r--r--media-libs/libopenshot/libopenshot-0.2.7.ebuild100
-rw-r--r--media-libs/libpano13/libpano13-2.9.20-r1.ebuild2
-rw-r--r--media-libs/libplacebo/libplacebo-3.120.3.ebuild4
-rw-r--r--media-libs/libpng-compat/Manifest1
-rw-r--r--media-libs/libpng-compat/libpng-compat-1.5.30.ebuild13
-rw-r--r--media-libs/libpng-compat/metadata.xml9
-rw-r--r--media-libs/libpng/metadata.xml6
-rw-r--r--media-libs/librosprite/librosprite-0.1.3-r2.ebuild2
-rw-r--r--media-libs/libsamplerate/Manifest1
-rw-r--r--media-libs/libsamplerate/libsamplerate-0.2.1.ebuild50
-rw-r--r--media-libs/libsamplerate/libsamplerate-0.2.2.ebuild2
-rw-r--r--media-libs/libsbsms/Manifest1
-rw-r--r--media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild37
-rw-r--r--media-libs/libsbsms/libsbsms-2.3.0.ebuild2
-rw-r--r--media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild1
-rw-r--r--media-libs/libsdl2/Manifest1
-rw-r--r--media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch34
-rw-r--r--media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch13
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild210
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild (renamed from media-libs/libsdl2/libsdl2-2.0.16.ebuild)6
-rw-r--r--media-libs/libsidplayfp/Manifest1
-rw-r--r--media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild29
-rw-r--r--media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild2
-rw-r--r--media-libs/libsixel/Manifest1
-rw-r--r--media-libs/libsixel/files/libsixel-meson.patch65
-rw-r--r--media-libs/libsixel/files/libsixel-static-libs.patch11
-rw-r--r--media-libs/libsixel/libsixel-1.10.3.ebuild89
-rw-r--r--media-libs/libsixel/libsixel-1.8.6.ebuild52
-rw-r--r--media-libs/libsixel/metadata.xml1
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.31.ebuild2
-rw-r--r--media-libs/libsndfile/libsndfile-9999.ebuild2
-rw-r--r--media-libs/libsoundtouch/Manifest1
-rw-r--r--media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild55
-rw-r--r--media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild2
-rw-r--r--media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild2
-rw-r--r--media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild2
-rw-r--r--media-libs/libv4l/Manifest1
-rw-r--r--media-libs/libv4l/libv4l-1.22.1.ebuild74
-rw-r--r--media-libs/libvpx/libvpx-1.10.0.ebuild2
-rw-r--r--media-libs/libxmi/libxmi-1.3-r1.ebuild2
-rw-r--r--media-libs/libyami/Manifest1
-rw-r--r--media-libs/libyami/libyami-1.3.2.ebuild94
-rw-r--r--media-libs/libyami/libyami-9999.ebuild94
-rw-r--r--media-libs/libyami/metadata.xml16
-rw-r--r--media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch12
-rw-r--r--media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild11
-rw-r--r--media-libs/mesa/Manifest7
-rw-r--r--media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch46
-rw-r--r--media-libs/mesa/mesa-21.2.5.ebuild (renamed from media-libs/mesa/mesa-21.1.7.ebuild)36
-rw-r--r--media-libs/mesa/mesa-21.2.6.ebuild (renamed from media-libs/mesa/mesa-21.2.2.ebuild)18
-rw-r--r--media-libs/mesa/mesa-21.3.0.ebuild (renamed from media-libs/mesa/mesa-21.1.8-r1.ebuild)54
-rw-r--r--media-libs/mesa/mesa-21.3.1.ebuild552
-rw-r--r--media-libs/mesa/mesa-9999.ebuild381
-rw-r--r--media-libs/mesa/metadata.xml1
-rw-r--r--media-libs/mlt/Manifest3
-rw-r--r--media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch50
-rw-r--r--media-libs/mlt/metadata.xml2
-rw-r--r--media-libs/mlt/mlt-6.26.1-r1.ebuild232
-rw-r--r--media-libs/mlt/mlt-7.2.0-r1.ebuild (renamed from media-libs/mlt/mlt-7.0.1-r2.ebuild)17
-rw-r--r--media-libs/munt-mt32emu/Manifest1
-rw-r--r--media-libs/munt-mt32emu/munt-mt32emu-2.5.1.ebuild28
-rw-r--r--media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild (renamed from media-libs/munt-mt32emu/munt-mt32emu-2.5.3.ebuild)7
-rw-r--r--media-libs/mutagen/mutagen-1.45.1.ebuild3
-rw-r--r--media-libs/netpbm/Manifest5
-rw-r--r--media-libs/netpbm/files/netpbm-10.31-build.patch50
-rw-r--r--media-libs/netpbm/files/netpbm-10.66-test.patch17
-rw-r--r--media-libs/netpbm/files/netpbm-10.70-system-libs.patch40
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-build.patch38
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch68
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch22
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-test.patch248
-rw-r--r--media-libs/netpbm/files/netpbm-10.86.21-format-security.patch18
-rw-r--r--media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch22
-rw-r--r--media-libs/netpbm/netpbm-10.70.00.ebuild205
-rw-r--r--media-libs/netpbm/netpbm-10.86.24-r1.ebuild (renamed from media-libs/netpbm/netpbm-10.86.22.ebuild)32
-rw-r--r--media-libs/netpbm/netpbm-10.86.27.ebuild (renamed from media-libs/netpbm/netpbm-10.76.00.ebuild)78
-rw-r--r--media-libs/nv-codec-headers/Manifest1
-rw-r--r--media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild29
-rw-r--r--media-libs/oidn/oidn-1.3.0-r1.ebuild (renamed from media-libs/oidn/oidn-1.3.0.ebuild)7
-rw-r--r--media-libs/oidn/oidn-1.4.1-r1.ebuild (renamed from media-libs/oidn/oidn-1.4.1.ebuild)9
-rw-r--r--media-libs/opencolorio/Manifest1
-rw-r--r--media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild (renamed from media-libs/opencolorio/opencolorio-1.1.1-r1.ebuild)5
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild (renamed from media-libs/opencolorio/opencolorio-2.0.0.ebuild)5
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild (renamed from media-libs/opencolorio/opencolorio-2.0.1.ebuild)7
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild (renamed from media-libs/opencolorio/opencolorio-2.0.2.ebuild)6
-rw-r--r--media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild102
-rw-r--r--media-libs/opencv/Manifest2
-rw-r--r--media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch123
-rw-r--r--media-libs/opencv/opencv-4.5.0-r3.ebuild (renamed from media-libs/opencv/opencv-4.5.0-r1.ebuild)4
-rw-r--r--media-libs/opencv/opencv-4.5.1-r3.ebuild (renamed from media-libs/opencv/opencv-4.5.1-r1.ebuild)4
-rw-r--r--media-libs/opencv/opencv-4.5.2-r3.ebuild (renamed from media-libs/opencv/opencv-4.5.2-r1.ebuild)4
-rw-r--r--media-libs/opencv/opencv-4.5.2-r5.ebuild571
-rw-r--r--media-libs/opencv/opencv-4.5.4.ebuild582
-rw-r--r--media-libs/openexr/Manifest3
-rw-r--r--media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch119
-rw-r--r--media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch229
-rw-r--r--media-libs/openexr/openexr-2.5.6.ebuild3
-rw-r--r--media-libs/openexr/openexr-2.5.7.ebuild3
-rw-r--r--media-libs/openexr/openexr-3.1.1.ebuild3
-rw-r--r--media-libs/openexr/openexr-3.1.2.ebuild (renamed from media-libs/openexr/openexr-3.0.5.ebuild)33
-rw-r--r--media-libs/openexr/openexr-3.1.3.ebuild78
-rw-r--r--media-libs/openh264/openh264-2.1.1_p20190331.ebuild2
-rw-r--r--media-libs/openimageio/Manifest10
-rw-r--r--media-libs/openimageio/metadata.xml4
-rw-r--r--media-libs/openimageio/openimageio-2.2.12.0.ebuild156
-rw-r--r--media-libs/openimageio/openimageio-2.2.13.1.ebuild156
-rw-r--r--media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild (renamed from media-libs/openimageio/openimageio-2.2.15.1.ebuild)13
-rw-r--r--media-libs/openimageio/openimageio-2.3.10.0.ebuild (renamed from media-libs/openimageio/openimageio-2.2.18.0.ebuild)50
-rw-r--r--media-libs/openimageio/openimageio-2.3.10.1.ebuild (renamed from media-libs/openimageio/openimageio-2.2.15.0.ebuild)52
-rw-r--r--media-libs/openimageio/openimageio-2.3.9.1.ebuild (renamed from media-libs/openimageio/openimageio-2.2.14.0.ebuild)52
-rw-r--r--media-libs/openjpeg/metadata.xml1
-rw-r--r--media-libs/opensubdiv/Manifest1
-rw-r--r--media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch19
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild (renamed from media-libs/opensubdiv/opensubdiv-3.4.3.ebuild)2
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild85
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild93
-rw-r--r--media-libs/osl/Manifest3
-rw-r--r--media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch35
-rw-r--r--media-libs/osl/files/osl-1.11.16.0-no-imath.patch49
-rw-r--r--media-libs/osl/osl-1.10.13.ebuild87
-rw-r--r--media-libs/osl/osl-1.11.15.0-r1.ebuild (renamed from media-libs/osl/osl-1.11.15.0.ebuild)9
-rw-r--r--media-libs/osl/osl-1.11.16.0-r2.ebuild (renamed from media-libs/osl/osl-1.11.9.0-r1.ebuild)21
-rw-r--r--media-libs/osl/osl-1.11.9.0.ebuild93
-rw-r--r--media-libs/osl/osl-1.12.0.2-r3.ebuild (renamed from media-libs/osl/osl-1.12.0.2-r1.ebuild)7
-rw-r--r--media-libs/osl/osl-1.12.0.2.ebuild2
-rw-r--r--media-libs/pcaudiolib/pcaudiolib-1.1.ebuild2
-rw-r--r--media-libs/plotutils/plotutils-2.6-r2.ebuild4
-rw-r--r--media-libs/pnglite/pnglite-0.1.17-r1.ebuild45
-rw-r--r--media-libs/pnglite/pnglite-0.1.17.ebuild2
-rw-r--r--media-libs/pulseaudio-qt/Manifest1
-rw-r--r--media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild34
-rw-r--r--media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r1.ebuild2
-rw-r--r--media-libs/qhull/qhull-2020.2-r3.ebuild2
-rw-r--r--media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild2
-rw-r--r--media-libs/quesoglc/quesoglc-0.7.2.ebuild55
-rw-r--r--media-libs/quvi/Manifest1
-rw-r--r--media-libs/quvi/files/quvi-0.9.1-automagic.patch47
-rw-r--r--media-libs/quvi/files/quvi-0.9.5-autoconf-2.70.patch13
-rw-r--r--media-libs/quvi/metadata.xml14
-rw-r--r--media-libs/quvi/quvi-0.9.5.ebuild47
-rw-r--r--media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild2
-rw-r--r--media-libs/rtaudio/Manifest1
-rw-r--r--media-libs/rtaudio/rtaudio-5.2.0.ebuild75
-rw-r--r--media-libs/rubberband/Manifest1
-rw-r--r--media-libs/rubberband/rubberband-2.0.0.ebuild61
-rw-r--r--media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild39
-rw-r--r--media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild2
-rw-r--r--media-libs/sdl-terminal/Manifest1
-rw-r--r--media-libs/sdl-terminal/files/sdl-terminal-1.1.3-nopython.patch24
-rw-r--r--media-libs/sdl-terminal/metadata.xml11
-rw-r--r--media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild38
-rw-r--r--media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild2
-rw-r--r--media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild2
-rw-r--r--media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild2
-rw-r--r--media-libs/shaderc/Manifest4
-rw-r--r--media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild92
-rw-r--r--media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild92
-rw-r--r--media-libs/shaderc/shaderc-2021.2.ebuild2
-rw-r--r--media-libs/shaderc/shaderc-2021.3.ebuild (renamed from media-libs/shaderc/shaderc-2021.0.ebuild)12
-rw-r--r--media-libs/simage/simage-1.8.1.ebuild2
-rw-r--r--media-libs/smpeg/smpeg-0.4.4-r10.ebuild75
-rw-r--r--media-libs/smpeg/smpeg-0.4.4-r11.ebuild2
-rw-r--r--media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild55
-rw-r--r--media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild2
-rw-r--r--media-libs/spandsp/spandsp-0.0.6-r1.ebuild63
-rw-r--r--media-libs/stk/Manifest1
-rw-r--r--media-libs/stk/stk-4.6.2.ebuild79
-rw-r--r--media-libs/stops/stops-0.3.0-r1.ebuild5
-rw-r--r--media-libs/svt-av1/Manifest3
-rw-r--r--media-libs/svt-av1/svt-av1-0.8.6.ebuild8
-rw-r--r--media-libs/svt-av1/svt-av1-0.8.7.ebuild40
-rw-r--r--media-libs/svt-av1/svt-av1-9999.ebuild22
-rw-r--r--media-libs/tg_owt/tg_owt-0_pre20210914.ebuild2
-rw-r--r--media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch26
-rw-r--r--media-libs/tremor/tremor-0_pre20130223-r2.ebuild32
-rw-r--r--media-libs/urt/metadata.xml8
-rw-r--r--media-libs/urt/urt-3.1b-r3.ebuild27
-rw-r--r--media-libs/vulkan-layers/Manifest2
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild55
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild (renamed from media-libs/vulkan-layers/vulkan-layers-1.2.189.ebuild)13
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.2.198.ebuild (renamed from media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild)21
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-9999.ebuild21
-rw-r--r--media-libs/vulkan-loader/Manifest2
-rw-r--r--media-libs/vulkan-loader/metadata.xml4
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild (renamed from media-libs/vulkan-loader/vulkan-loader-1.2.182.ebuild)2
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.189.ebuild70
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild (renamed from media-libs/vulkan-loader/vulkan-loader-1.2.182-r1.ebuild)17
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-9999.ebuild17
-rw-r--r--media-libs/waffle/waffle-1.7.0-r1.ebuild (renamed from media-libs/waffle/waffle-1.7.0.ebuild)2
-rw-r--r--media-libs/waffle/waffle-9999.ebuild2
-rw-r--r--media-libs/x265/files/arm-r1.patch34
-rw-r--r--media-libs/x265/files/x265-9999-arm.patch64
-rw-r--r--media-libs/x265/files/x265-9999-ppc64.patch11
-rw-r--r--media-libs/x265/x265-3.5-r2.ebuild (renamed from media-libs/x265/x265-3.5-r1.ebuild)1
-rw-r--r--media-libs/x265/x265-9999.ebuild7
-rw-r--r--media-libs/zvbi/zvbi-0.2.35-r2.ebuild62
-rw-r--r--media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild2
370 files changed, 5589 insertions, 5895 deletions
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 2b187dc03bd..6e678dbc6d5 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="X slang gpm static-libs"
RDEPEND="
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 7d94b680606..baae0ac54fb 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,3 +1,3 @@
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.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
+DIST alsa-lib-1.2.6.tar.bz2 1079598 BLAKE2B 84a7a20fbea4025f2ac08acefa3a9ea9d2737585c5d5f09c8df3b5ccb998eaa09a7ec16a019a40c4d3e3e4b5209b961f9da23ec57c0bb9824bade9a3a0dd4350 SHA512 ae95718813abf62811fe44c6df2a8de5a1227da4b022c4dd97dd8e7c1001f48307ba36bf04208bdbe24e8a8eebf4ed5a59f40ee6750dcbe976678071c3f2f5b7
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 7b6a92ccd5f..78afa733c3c 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
@@ -20,7 +20,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+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"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
index 88c9ad860cf..1b9c1819ad9 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
@@ -1,19 +1,16 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit autotools multilib-minimal python-single-r1
-# When COMMIT is defined, this ebuild turns from a release into a snapshot ebuild:
-COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-# Also set SNAPSHOT_PV to match the correct PV, so that the ebuild can detect a naive rename:
-SNAPSHOT_PV="1.2.5_p20210604"
-
DESCRIPTION="Advanced Linux Sound Architecture Library"
HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-if [[ -n ${COMMIT} ]]; then
+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
@@ -23,7 +20,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+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"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -39,14 +36,6 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
)
-pkg_pretend() {
- if [[ -n ${COMMIT} && -z ${SNAPSHOT_PV} || -z ${COMMIT} && -n ${SNAPSHOT_PV} ]]; then
- eerror "Please either set both COMMIT and SNAPSHOT_PV or neither!"
- elif [[ -n ${SNAPSHOT_PV} && ${PV} != ${SNAPSHOT_PV} ]]; then
- eerror "Rename of snapshot ebuild detected - please check COMMIT & SNAPSHOT_PV!"
- fi
-}
-
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 11340bf1868..dae967fc841 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,3 +1,2 @@
DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
DIST alsa-topology-conf-1.2.5.1.tar.bz2 11697 BLAKE2B 1f8bb172510d86bd0530f2ba437dd1132401c0bd436085c07c61e5ef296a6da6a1c24fb8d585572186fc0073172c82d40948c5c39fd293a01762d49c9c393662 SHA512 b34176b213e1afcb61fee19b569d6422a7692b62cf08b0ef651f2fbb1eefe49f25ca6386d0bfcec7152d4b5ed3daa84edb900181d40169e777751ae033125374
-DIST alsa-topology-conf-1.2.5.tar.bz2 11657 BLAKE2B 0870aa5db05d7b82e5312ac5bd3c2d887f0cafc25a317cbc416ce0ac6982ce296620833c4459ccb357b4b014d300329fc3d0028d3ec2024495cc21f9cc122e1f SHA512 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
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 85f9fc04462..886558fd2b4 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
@@ -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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 e03a0d28918..14fefe47ee0 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,3 +1,3 @@
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.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
+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.5-r1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
deleted file mode 100644
index 444cc259d28..00000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-MY_P="${PN}-1.2.4.81.g4884e"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch" ) # bug #793410
-
-src_install() {
- insinto /usr/share/alsa
- doins -r ucm{,2}
-}
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.ebuild
index 8e350b19b6f..8769e636d2e 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.ebuild
@@ -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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE=""
RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.ebuild
index 421ef552019..fc541a8256d 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.ebuild
@@ -1,23 +1,21 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-DESCRIPTION="ALSA topology configuration files"
+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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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}"
-MY_P="${PN}-1.2.4.2.g15998"
-S="${WORKDIR}/${MY_P}"
src_install() {
insinto /usr/share/alsa
- doins -r topology
+ doins -r ucm{,2}
}
diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
deleted file mode 100644
index 6564be8977c..00000000000
--- a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 3f34021beffba4e39f064a14c5faceeaa224b766 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 1 Jun 2021 21:08:53 +0200
-Subject: [PATCH] HDA-Intel: the lookups are supported from syntax 4
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/HDA-Intel/HDA-Intel.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
-index 5794e72..8a8e0e7 100644
---- a/ucm2/HDA-Intel/HDA-Intel.conf
-+++ b/ucm2/HDA-Intel/HDA-Intel.conf
-@@ -1,4 +1,4 @@
--Syntax 3
-+Syntax 4
-
- Define.Use "" # a non-empty string to use UCM configuration for HDA devices
-
diff --git a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
index 331752eb102..69e2783676d 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
@@ -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 ~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 ~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 d9b9b78a2a0..9fc07834baa 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +1,2 @@
DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
+DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
new file mode 100644
index 00000000000..f1b9a125c6c
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
@@ -0,0 +1,99 @@
+# 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-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index d9b9b78a2a0..9fc07834baa 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1 +1,2 @@
DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
+DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
new file mode 100644
index 00000000000..64a8542f194
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{8..10} )
+
+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}"
+
+# dev-lang/spidermonkey is not required anymore
+# see https://github.com/mean00/avidemux2/blob/master/avidemux_plugins/ADM_scriptEngines/CMakeLists.txt
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
+ ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
+ 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/babl/babl-0.1.88.ebuild b/media-libs/babl/babl-0.1.88.ebuild
index 4efedaf83c7..eddbea853de 100644
--- a/media-libs/babl/babl-0.1.88.ebuild
+++ b/media-libs/babl/babl-0.1.88.ebuild
@@ -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 ~riscv -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"
diff --git a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
index 4ed4f9c971d..14ba7aa6fe8 100644
--- a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
+++ b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit epatch autotools
+EAPI=8
+
+inherit autotools
DESCRIPTION="Cal3D is a skeletal based character animation library"
-HOMEPAGE="http://home.gna.org/cal3d"
+HOMEPAGE="https://mp3butcher.github.io/Cal3D/"
SRC_URI="http://download.gna.org/cal3d/sources/${P}.tar.gz"
LICENSE="LGPL-2.1"
@@ -13,23 +14,22 @@ SLOT="0"
KEYWORDS="amd64 ~ia64 ppc x86"
IUSE="16bit-indices debug doc"
-DEPEND="doc? (
+BDEPEND="
+ doc? (
app-doc/doxygen
app-text/docbook-sgml-utils
)"
-RDEPEND=""
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-tests.patch
+ "${FILESDIR}"/${P}-verbose.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-docbook2html.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-tests.patch \
- "${FILESDIR}"/${P}-verbose.patch \
- "${FILESDIR}"/${P}-gcc6.patch
- sed -i \
- -e "s:db2html:docbook2html:g" \
- configure.in \
- docs/Makefile.am \
- || die "sed for doc failed"
+ default
eautoreconf
}
@@ -41,17 +41,14 @@ src_configure() {
src_compile() {
emake
+
if use doc; then
- cd docs
+ cd docs || die
emake doc-api
emake doc-guide
- mkdir -p html/{guide,api}
- mv *.{html,gif} html/guide/
- mv api/html/* html/api/
+ mkdir -p html/{guide,api} || die
+ mv *.{html,gif} html/guide/ || die
+ mv api/html/* html/api/ || die
+ HTML_DOCS=( docs/html/api docs/html/guide )
fi
}
-
-src_install() {
- default
- use doc && dohtml -r docs/html/api docs/html/guide
-}
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch b/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch
new file mode 100644
index 00000000000..2e3e88e318e
--- /dev/null
+++ b/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch
@@ -0,0 +1,25 @@
+--- a/configure.in
++++ b/configure.in
+@@ -50,9 +50,9 @@
+ AC_MSG_WARN([cannot find doxygen, unable to generate Cal3D API Reference!])
+ fi
+
+-AC_CHECK_PROG(DB2HTML, db2html, true, false)
++AC_CHECK_PROG(DB2HTML, docbook2html, true, false)
+ if test "$DB2HTML" = false; then
+- AC_MSG_WARN([cannot find db2html, unable to generate Cal3D User's Guide!])
++ AC_MSG_WARN([cannot find docbook2html, unable to generate Cal3D User's Guide!])
+ fi
+
+ AC_PATH_PROG(BLENDER, [blender])
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -18,7 +18,7 @@
+ doxygen cal3d.doxygen
+
+ doc-guide:
+- db2html guide.sgml
++ docbook2html guide.sgml
+
+ clean-local:
+ rm -rf guide guide.junk
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch b/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
index 80d73b27474..6f5bad7293e 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
@@ -1,5 +1,5 @@
---- src/cal3d/platform.h.old 2008-04-27 23:08:41.000000000 +0200
-+++ src/cal3d/platform.h 2008-04-27 23:08:56.000000000 +0200
+--- a/src/cal3d/platform.h
++++ b/src/cal3d/platform.h
@@ -77,6 +77,7 @@
// standard includes
#include <stdlib.h>
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch b/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
index 98fc546eace..f17d063e935 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
@@ -1,5 +1,5 @@
---- cal3d-0.11.0/src/cal3d/loader.cpp.old 2016-09-24 00:58:09.968689367 -0400
-+++ cal3d-0.11.0/src/cal3d/loader.cpp 2016-09-24 01:06:54.867068386 -0400
+--- a/src/cal3d/loader.cpp
++++ b/src/cal3d/loader.cpp
@@ -886,7 +886,7 @@
if(!dataSrc.ok())
{
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-tests.patch b/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
index 3a6754f4015..d676d86f2d9 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
@@ -1,5 +1,5 @@
---- tests/Makefile.am.old 2014-10-27 12:14:44.534607920 +0100
-+++ tests/Makefile.am 2014-10-27 12:16:00.825891248 +0100
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
@@ -14,7 +14,7 @@
EXTRA_DIST = \
$(wildcard cal3d_converter/base.??f)
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch b/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
index a6dfbd677bf..c50918cd899 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
@@ -1,5 +1,5 @@
---- tests/run.in.old 2012-06-29 13:27:55.413765822 +0200
-+++ tests/run.in 2012-06-29 13:29:02.092084095 +0200
+--- a/tests/run.in
++++ b/tests/run.in
@@ -43,7 +43,7 @@
exit 1
;;
diff --git a/media-libs/clutter/clutter-1.26.4.ebuild b/media-libs/clutter/clutter-1.26.4.ebuild
index 656f9efb48e..cf8a1f4f2a1 100644
--- a/media-libs/clutter/clutter-1.26.4.ebuild
+++ b/media-libs/clutter/clutter-1.26.4.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
wayland? ( egl )
"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
# NOTE: glx flavour uses libdrm + >=mesa-7.3
# >=libX11-1.3.1 needed for X Generic Event support
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index b13ab783bfd..b4448103a0d 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,3 +1,2 @@
-DIST codec2-0.9.2.tar.gz 12244006 BLAKE2B b7fdff34e41f93f237235db5cf1352e7165565ae13bc88cfe41bc6eb280e16f49c71f6b9947ced81612b0fa6b2630a9f2f75fe257ff09bae5eef1a0b6b39c95b SHA512 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
DIST codec2-1.0.1.tar.gz 15062219 BLAKE2B 81f2784d7aa7180fcc4345fd27e7dd0beda0eba3bbee43d8379a48dc854fe1c9e50038c90c9ae41daacb5aef0f337841fa64ce061e2831523a71d5d52d1b8211 SHA512 e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6
diff --git a/media-libs/codec2/codec2-0.9.2-r1.ebuild b/media-libs/codec2/codec2-0.9.2-r1.ebuild
deleted file mode 100644
index b024a5cabf3..00000000000
--- a/media-libs/codec2/codec2-0.9.2-r1.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/0.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~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.0.ebuild b/media-libs/codec2/codec2-1.0.0.ebuild
index b403037a4ae..f9d617bb611 100644
--- a/media-libs/codec2/codec2-1.0.0.ebuild
+++ b/media-libs/codec2/codec2-1.0.0.ebuild
@@ -12,7 +12,7 @@ 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"
+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"
diff --git a/media-libs/codec2/codec2-1.0.1.ebuild b/media-libs/codec2/codec2-1.0.1-r1.ebuild
index 43e5b77c8f4..07461c98499 100644
--- a/media-libs/codec2/codec2-1.0.1.ebuild
+++ b/media-libs/codec2/codec2-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_ECLASS=cmake
inherit cmake-multilib
@@ -12,11 +12,16 @@ 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"
+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"
+PATCHES=(
+ "${FILESDIR}/codec2-1.0.1-static-rx_filter_coh.patch"
+ "${FILESDIR}/${P}-fix-freedv-callback.patch" # Bug 816453
+)
+
multilib_src_configure() {
local mycmakeargs=(
-DUNITTEST=$(usex test)
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
new file mode 100644
index 00000000000..595e71a139d
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 00000000000..9290ea9b2cf
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
@@ -0,0 +1,13 @@
+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/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8-r1.ebuild
index 75c0d96cf93..037d055dd7d 100644
--- a/media-libs/cogl/cogl-1.22.8.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r1.ebuild
@@ -40,12 +40,12 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0 )
introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
kms? (
- media-libs/mesa[egl,gbm]
+ media-libs/mesa[egl(+),gbm(+)]
x11-libs/libdrm:= )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
wayland? (
>=dev-libs/wayland-1.1.90
- media-libs/mesa[egl,wayland] )
+ media-libs/mesa[egl(+),wayland] )
"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
diff --git a/media-libs/coin/coin-4.0.0.ebuild b/media-libs/coin/coin-4.0.0.ebuild
index c67bb130431..90ef8396eb8 100644
--- a/media-libs/coin/coin-4.0.0.ebuild
+++ b/media-libs/coin/coin-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/coin3d/coin/wiki"
SRC_URI="https://github.com/coin3d/coin/releases/download/${MY_P}/${P}-src.tar.gz"
LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="debug doc +exceptions javascript man openal qthelp test threads"
RESTRICT="!test? ( test )"
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index 8342a003007..7562ed9c901 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
LICENSE="AMPAS"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
RDEPEND="media-libs/ilmbase:=
media-libs/openexr:=
diff --git a/media-libs/ctl/ctl-1.5.2-r2.ebuild b/media-libs/ctl/ctl-1.5.2-r2.ebuild
index 31d4f99a354..45d613f9e71 100644
--- a/media-libs/ctl/ctl-1.5.2-r2.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/CTL-ctl-${PV}"
LICENSE="AMPAS"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/dav1d/dav1d-0.8.2.ebuild b/media-libs/dav1d/dav1d-0.8.2.ebuild
index 69f48374833..caaf9cb8784 100644
--- a/media-libs/dav1d/dav1d-0.8.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.2.ebuild
@@ -19,15 +19,19 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+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=()
@@ -44,6 +48,8 @@ multilib_src_configure() {
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
}
diff --git a/media-libs/dav1d/dav1d-0.9.0.ebuild b/media-libs/dav1d/dav1d-0.9.0.ebuild
index ae26cc566f3..f111b62346e 100644
--- a/media-libs/dav1d/dav1d-0.9.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.0.ebuild
@@ -19,15 +19,19 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+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=()
@@ -44,6 +48,8 @@ multilib_src_configure() {
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
}
diff --git a/media-libs/dav1d/dav1d-0.9.1.ebuild b/media-libs/dav1d/dav1d-0.9.1.ebuild
index 7dedeea1b79..f7ae3e3273b 100644
--- a/media-libs/dav1d/dav1d-0.9.1.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.1.ebuild
@@ -19,15 +19,19 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+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=()
@@ -44,6 +48,8 @@ multilib_src_configure() {
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
}
diff --git a/media-libs/dav1d/dav1d-0.9.2.ebuild b/media-libs/dav1d/dav1d-0.9.2.ebuild
index 850f1843db9..fb91a0e8cc7 100644
--- a/media-libs/dav1d/dav1d-0.9.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.2.ebuild
@@ -19,15 +19,19 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+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=()
@@ -44,6 +48,8 @@ multilib_src_configure() {
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
}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 850f1843db9..c0d92e63904 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -19,13 +19,16 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+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 )
@@ -44,6 +47,8 @@ multilib_src_configure() {
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
}
diff --git a/media-libs/dav1d/files/build-avoid-meson-s-symbols_have_underscore_prefix.patch b/media-libs/dav1d/files/build-avoid-meson-s-symbols_have_underscore_prefix.patch
new file mode 100644
index 00000000000..f9c0dbbfaf2
--- /dev/null
+++ b/media-libs/dav1d/files/build-avoid-meson-s-symbols_have_underscore_prefix.patch
@@ -0,0 +1,35 @@
+https://code.videolan.org/videolan/dav1d/-/issues/370
+https://code.videolan.org/videolan/dav1d/-/commit/c6a08b3aa1ee99dade53e5e32033bc1d14455a22
+
+From c6a08b3aa1ee99dade53e5e32033bc1d14455a22 Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-vlc@jannau.net>
+Date: Tue, 21 Sep 2021 09:30:14 +0200
+Subject: [PATCH 1/5] build: avoid meson's symbols_have_underscore_prefix
+
+Meson's dynamic check is unreliable when additional compiler flags are
+passed via CFLAGS. For example '-fprofile-instr-generate' in oss-fuzz'
+coverage build. Fixes #370.
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1bf69ab..1a7c409 100644
+--- a/meson.build
++++ b/meson.build
+@@ -382,7 +382,11 @@ endif
+
+ cdata.set10('ARCH_PPC64LE', host_machine.cpu() == 'ppc64le')
+
+-if cc.symbols_have_underscore_prefix()
++# meson's cc.symbols_have_underscore_prefix() is unfortunately unrelieably
++# when additional flags like '-fprofile-instr-generate' are passed via CFLAGS
++# see following meson issue https://github.com/mesonbuild/meson/issues/5482
++if (host_machine.system() == 'darwin' or
++ (host_machine.system() == 'windows' and host_machine.cpu_family() == 'x86'))
+ cdata.set10('PREFIX', true)
+ cdata_asm.set10('PREFIX', true)
+ endif
+--
+2.32.0
+
diff --git a/media-libs/dav1d/metadata.xml b/media-libs/dav1d/metadata.xml
index edef4df0c98..fbe7f555d99 100644
--- a/media-libs/dav1d/metadata.xml
+++ b/media-libs/dav1d/metadata.xml
@@ -8,6 +8,7 @@
<flag name="8bit">Add support for decoding 8-bit AV1.</flag>
<flag name="10bit">Add support for building 10-bit and 12-bit AV1.</flag>
<flag name="asm">Enable custom assembly for faster decoding.</flag>
+ <flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing muxer</flag>
</use>
<upstream>
<bugs-to>https://code.videolan.org/videolan/dav1d/issues</bugs-to>
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index cc27e4a85af..f7fae53b125 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1 +1,2 @@
DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
+DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f
diff --git a/media-libs/embree/embree-3.13.0-r1.ebuild b/media-libs/embree/embree-3.13.0-r2.ebuild
index ad1b682ba09..136ad000762 100644
--- a/media-libs/embree/embree-3.13.0-r1.ebuild
+++ b/media-libs/embree/embree-3.13.0-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+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[@]%:*}"
@@ -24,7 +24,7 @@ RDEPEND="
>=media-libs/glfw-3.2.1
virtual/opengl
ispc? ( dev-lang/ispc )
- tbb? ( dev-cpp/tbb )
+ tbb? ( dev-cpp/tbb:= )
tutorial? (
>=media-libs/libpng-1.6.34:0=
>=media-libs/openimageio-1.8.7:0=
diff --git a/media-libs/embree/embree-3.13.2.ebuild b/media-libs/embree/embree-3.13.2.ebuild
new file mode 100644
index 00000000000..94efef93e9b
--- /dev/null
+++ b/media-libs/embree/embree-3.13.2.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 static-libs ${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 "march" 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
+ # and it fails to link properly.
+ # https://github.com/embree/embree/issues/115
+
+ filter-flags -march=*
+
+ 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=$(usex static-libs)
+ -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/exiftool/Manifest b/media-libs/exiftool/Manifest
index c4c4e2179f3..e8357415c74 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1 +1,2 @@
-DIST Image-ExifTool-12.26.tar.gz 4933296 BLAKE2B e45683243b82f8276aee498d52a88d5b34eaf8b28aebdd631f70e30bb91ceb52224dc994ed189b914f024be4eb471b07bf9f1d860d96af2ab211e482b9ea194e SHA512 15bbff738e151d3ed5c77a17c99ded6cc3da2050fe7df94c42aea544aa31d7f539d70d07fd5336ae018af05b7f168712f1367046d8004861fce58442c03f82bd
+DIST Image-ExifTool-12.30.tar.gz 4948601 BLAKE2B 359c06dc5d4f71e186d7a265488cb16e47e40438d8a0e2d4e74f75b6aac7efd1c5b3271a158cb8b822eace5f6b437d5d39458c31ae8e6e886e93f2e643f8c9a9 SHA512 2966854d8fd163fd5aaaca5608eeab2a3f0681fe9e22e006840acacd2ff2aaecd6076bcec23989facb7baf64aa96425ad7eeceb4045da44004421b8f10050935
+DIST Image-ExifTool-12.33.tar.gz 4958375 BLAKE2B 699529e71e87cf2a5b4d1a69049f48b7b00ce8e720918cb25c2f2b35453fd44c580444bca2ff14d6cef76de99568b2e22b98ea87f45e550d69b40dda464831fe SHA512 7d6bb1942597535cc982e77397b4dc2edee3f361338f82cf2b5f24fd7fa94c148312b125d1d4f37c8dd303eed45173a805eb79ba61a6e74205e21c52f7561d90
diff --git a/media-libs/exiftool/exiftool-12.26.ebuild b/media-libs/exiftool/exiftool-12.30.ebuild
index 579e441d942..579e441d942 100644
--- a/media-libs/exiftool/exiftool-12.26.ebuild
+++ b/media-libs/exiftool/exiftool-12.30.ebuild
diff --git a/media-libs/exiftool/exiftool-12.33.ebuild b/media-libs/exiftool/exiftool-12.33.ebuild
new file mode 100644
index 00000000000..b40b4ece01c
--- /dev/null
+++ b/media-libs/exiftool/exiftool-12.33.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://exiftool.org/"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+src_install() {
+ perl-module_src_install
+ use doc && dodoc -r html/
+
+ insinto /usr/share/${PN}
+ doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/flac/flac-1.3.3-r1.ebuild b/media-libs/flac/flac-1.3.3-r1.ebuild
index 86c9e3eda8e..5f99d9e1104 100644
--- a/media-libs/flac/flac-1.3.3-r1.ebuild
+++ b/media-libs/flac/flac-1.3.3-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~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 ~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}] )"
diff --git a/media-libs/flickcurl/flickcurl-1.26.ebuild b/media-libs/flickcurl/flickcurl-1.26.ebuild
index ae2503f8cd3..96f1e11eec8 100644
--- a/media-libs/flickcurl/flickcurl-1.26.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.26.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
inherit autotools
@@ -12,33 +12,29 @@ 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"
-IUSE="doc raptor static-libs"
+IUSE="raptor"
-RDEPEND=">=net-misc/curl-7.10.0
+RDEPEND="
+ >=net-misc/curl-7.10.0
>=dev-libs/libxml2-2.6.8:2
raptor? ( media-libs/raptor:2 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/gtk-doc-am
virtual/pkgconfig"
src_prepare() {
- if ! use doc ; then
- # Only install html documentation when the use flag is enabled
- sed -e '/gtk-doc.make/d' \
- -e 's:+=:=:' \
- -i docs/Makefile.am || die
- fi
-
+ default
eautoreconf
}
src_configure() {
econf \
- $(use_with raptor) \
- $(use_enable static-libs static)
+ --disable-gtk-doc \
+ $(use_with raptor)
}
src_install() {
- emake DESTDIR="${D}" TARGET_DIR=/usr/share/doc/${PF}/html install
- dodoc AUTHORS ChangeLog NEWS README
+ default
find "${ED}" -name '*.la' -delete || die
}
diff --git a/media-libs/freeglut/freeglut-3.2.1-r1.ebuild b/media-libs/freeglut/freeglut-3.2.1-r2.ebuild
index 8cac34cf3c4..f99b7bafeb9 100644
--- a/media-libs/freeglut/freeglut-3.2.1-r1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${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}] )
+# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] )
DEPEND="${RDEPEND}
x11-base/xorg-proto"
BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
new file mode 100644
index 00000000000..e0aea4f7eb1
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+ mirror://sourceforge/${PN}/${MY_P}.pdf
+ https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+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
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+ sys-libs/zlib
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ mng? ( media-libs/libmng:= )
+ openexr? ( media-libs/openexr:0= )
+ png? ( media-libs/libpng:0= )
+ raw? ( media-libs/libraw:= )
+ tiff? (
+ media-libs/ilmbase:=
+ media-libs/tiff:0
+ )
+ webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig"
+
+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
+ "${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+ "${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+ "${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-libraw-0.20.0.patch
+)
+
+src_prepare() {
+ pushd Source >/dev/null || die
+ cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+ cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+ rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+ popd >/dev/null || die
+
+ edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+ sed -i \
+ -e "s:/./:/:g" \
+ -e "s: ./: :g" \
+ -e 's: Source: \\\n\tSource:g' \
+ -e 's: Wrapper: \\\n\tWrapper:g' \
+ -e 's: Examples: \\\n\tExamples:g' \
+ -e 's: TestAPI: \\\n\tTestAPI:g' \
+ -e 's: -ISource: \\\n\t-ISource:g' \
+ -e 's: -IWrapper: \\\n\t-IWrapper:g' \
+ -e 's:INCLS:\nINCLS:g' \
+ Makefile.srcs fipMakefile.srcs || die
+ sed -i \
+ -e "/LibJPEG/d" \
+ -e "/LibJXR/d" \
+ -e "/LibPNG/d" \
+ -e "/LibTIFF/d" \
+ -e "/Source\/ZLib/d" \
+ -e "/LibOpenJPEG/d" \
+ -e "/OpenEXR/d" \
+ -e "/LibRawLite/d" \
+ -e "/LibMNG/d" \
+ -e "/LibWebP/d" \
+ -e "/LibJXR/d" \
+ Makefile.srcs fipMakefile.srcs || die
+
+ default
+}
+
+foreach_make() {
+ local m
+ for m in Makefile.{gnu,fip} ; do
+ emake -f ${m} \
+ USE_EXR=$(usex openexr) \
+ USE_JPEG=$(usex jpeg) \
+ USE_JPEG2K=$(usex jpeg2k) \
+ USE_MNG=$(usex mng) \
+ USE_PNG=$(usex png) \
+ USE_TIFF=$(usex tiff) \
+ USE_RAW=$(usex raw) \
+ USE_WEBP=$(usex webp) \
+ $(usex static-libs '' STATICLIB=) \
+ "$@"
+ done
+}
+
+src_compile() {
+ tc-export AR PKG_CONFIG
+ foreach_make \
+ CXX="$(tc-getCXX) -fPIC" \
+ CC="$(tc-getCC) -fPIC" \
+ ${MY_PN}
+}
+
+src_install() {
+ foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+ einstalldocs
+}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index a5b0d55df12..6f1f0ea25be 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,7 +1,7 @@
-DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
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-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
+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 ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
+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
diff --git a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
deleted file mode 100644
index 310b5aaca93..00000000000
--- a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 597566b2301deeff4e9832aebdab1bf659a2accf Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 22 Mar 2021 16:15:37 -0700
-Subject: [PATCH] * Makefile, mac/Makefile (LINK_CMD): Don't hard-code
- `libtool`.
-
----
- Makefile | 3 +--
- mac/Makefile | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 810142f..949402f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -165,8 +165,7 @@ else
-
- ifeq ($(PLATFORM),unix)
- override CC = $(CCraw)
-- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
-- --mode=link $(CC) \
-+ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \
- $(subst /,$(COMPILER_SEP),$(LDFLAGS))
- LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
- else
-diff --git a/mac/Makefile b/mac/Makefile
-index 73ae99c..52038a4 100644
---- a/mac/Makefile
-+++ b/mac/Makefile
-@@ -68,8 +68,7 @@ else
- LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
-
- CC = $(CCraw)
-- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
-- --mode=link $(CC) \
-+ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \
- $(subst /,$(COMPILER_SEP),$(LDFLAGS))
- ifeq ($(findstring CoreServices,$(LDFLAGS)),)
- LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \
---
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
deleted file mode 100644
index 895a86c444d..00000000000
--- a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8e9447b32dae7e6c95bee3f878ee1877f9b628a4 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 22 Mar 2021 16:15:09 -0700
-Subject: [PATCH] [graph] Fix build with `slibtool`.
-
-* graph/rules.mk (GRAPH_LIB): Handle the case specially where
-`LIBTOOL` is defined.
-(COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
----
- rules.mk | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/graph/rules.mk b/graph/rules.mk
-index 4903a38..a3f0de1 100644
---- a/graph/rules.mk
-+++ b/graph/rules.mk
-@@ -12,7 +12,6 @@
-
-
- GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph)
--GRAPH_LIB := $(OBJ_DIR_2)/graph.$(SA)
-
- GRAPH := $(TOP_DIR_2)/graph
-
-@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O) \
- # this value can be modified by the system-specific graphics drivers.
- #
- ifneq ($(LIBTOOL),)
-- COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \
-+ GRAPH_LIB := $(OBJ_DIR_2)/graph.$(A)
-+ COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \
- -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
- else
-+ GRAPH_LIB := $(OBJ_DIR_2)/graph.$(SA)
- COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
- endif
-
---
-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
new file mode 100644
index 00000000000..46206465ffa
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch
@@ -0,0 +1,41 @@
+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/ft2demos-2.10.4-install_target.patch b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
deleted file mode 100644
index f3d7f8de43e..00000000000
--- a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b88cd2f027e77bd26d1334fc13c4eda796423d19 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 24 Mar 2021 09:04:41 -0700
-Subject: [PATCH] [build] Add an `install` target for binaries and man pages.
-
-* Makefile (MANPAGES): New variable.
-(install) <unix>: New target.
----
- Makefile | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 949402f..8352f61 100644
---- a/Makefile
-+++ b/Makefile
-@@ -194,7 +194,7 @@ else
- $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \
- $(GRAPH_LINK) $(MATH)
-
-- .PHONY: exes clean distclean
-+ .PHONY: exes clean distclean install
-
-
- ###################################################################
-@@ -317,6 +317,11 @@ else
- # EXES += fttimer
- # EXES += testname
-
-+ # Not all demo programs have a man page; we thus check for existence in a
-+ # loop.
-+ #
-+ MANPAGES := $(foreach man,$(EXES),$(wildcard $(TOP_DIR_2)/man/$(man).1))
-+
- exes: $(EXES:%=$(BIN_DIR_2)/%$E)
-
-
-@@ -567,6 +572,18 @@ else
- $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
- $(LINK_NEW)
-
-+ ifeq ($(PLATFORM),unix)
-+ install: exes
-+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \
-+ $(DESTDIR)$(mandir)/man1
-+ $(foreach bin,$(EXES), \
-+ $(LIBTOOL) --mode=install \
-+ $(INSTALL) $(BIN_DIR_2)/$(bin) \
-+ $(DESTDIR)$(bindir)/$(bin);)
-+ $(foreach man,$(MANPAGES), \
-+ $(INSTALL) $(man) \
-+ $(DESTDIR)$(mandir)/man1/$(notdir $(man));)
-+ endif
- endif
-
-
---
-GitLab
-
diff --git a/media-libs/freetype/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.11.0-r1.ebuild
index 373dc84039d..b4e9e81a703 100644
--- a/media-libs/freetype/freetype-2.11.0-r1.ebuild
+++ b/media-libs/freetype/freetype-2.11.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" != 9999 ]] ; then
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"
+ 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
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.11.0-r2.ebuild
index 4bec88e1dd4..658322e92af 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.11.0-r2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-DESCRIPTION="A high-quality and portable font engine"
+DESCRIPTION="High-quality and portable font engine"
HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist 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 utils"
if [[ "${PV}" != 9999 ]] ; then
SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -16,7 +16,8 @@ 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"
+ 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
@@ -24,7 +25,6 @@ fi
LICENSE="|| ( FTL GPL-2+ )"
SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
RDEPEND="
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -46,6 +46,10 @@ BDEPEND="
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() {
@@ -79,18 +83,36 @@ src_fetch() {
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 -nf version.sed include/freetype/freetype.h)
+ 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_major$freetype_minor$freetype_patch;" \
+ 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
+ unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
popd &>/dev/null || die
fi
@@ -114,11 +136,11 @@ src_prepare() {
# 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
+ if use infinality && use cleartype-hinting ; then
enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )"
- elif use infinality; then
+ elif use infinality ; then
enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1"
- elif use cleartype_hinting; then
+ elif use cleartype-hinting ; then
enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
fi
@@ -126,32 +148,24 @@ src_prepare() {
# via environment (new since v2.8)
enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
- if ! use bindist; then
- # See http://freetype.org/patents.html
- # ClearType is covered by several Microsoft patents in the US
- enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
- fi
+ # See https://freetype.org/patents.html (expired!)
+ enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
- if ! use adobe-cff; then
+ if ! use adobe-cff ; then
enable_option CFF_CONFIG_OPTION_OLD_ENGINE
fi
- if use debug; then
+ if use debug ; then
enable_option FT_DEBUG_LEVEL_TRACE
enable_option FT_DEBUG_MEMORY
fi
- if use utils; then
+ if use utils ; then
cd "${WORKDIR}/ft2demos-${PV}" || die
# Disable tests needing X11 when USE="-X". (bug #177597)
- if ! use X; then
+ if ! use X ; then
sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
fi
-
- # Taken from upstream (https://bugs.gentoo.org/775881)
- eapply "${FILESDIR}/${P}-slibtool_build_fix.patch"
- eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch"
- eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch"
cd "${S}" || die
fi
@@ -196,7 +210,7 @@ multilib_src_configure() {
multilib_src_compile() {
default
- if multilib_is_native_abi && use utils; then
+ if multilib_is_native_abi && use utils ; then
einfo "Building utils"
# fix for Prefix, bug #339334
emake \
@@ -216,12 +230,12 @@ multilib_src_install() {
}
multilib_src_install_all() {
- if use fontforge; then
+ 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
+ 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
@@ -233,5 +247,5 @@ multilib_src_install_all() {
dodoc -r docs/*
fi
- find "${ED}" -name '*.la' -delete || die
+ find "${ED}" -type f -name '*.la' -delete || die
}
diff --git a/media-libs/freetype/freetype-2.11.0.ebuild b/media-libs/freetype/freetype-2.11.1.ebuild
index 7f20a7b5a1d..d0c71e729b9 100644
--- a/media-libs/freetype/freetype-2.11.0.ebuild
+++ b/media-libs/freetype/freetype-2.11.1.ebuild
@@ -43,10 +43,6 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-)
-
_egit_repo_handler() {
if [[ "${PV}" == 9999 ]] ; then
local phase="${1}"
@@ -60,10 +56,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
@@ -179,8 +175,8 @@ multilib_src_configure() {
local myeconfargs=(
--disable-freetype-config
- --enable-biarch-config
--enable-shared
+ --with-zlib
$(use_with brotli)
$(use_with bzip2)
$(use_with harfbuzz)
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 85c3544019b..d0c71e729b9 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -43,10 +43,6 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-)
-
_egit_repo_handler() {
if [[ "${PV}" == 9999 ]] ; then
local phase="${1}"
@@ -179,8 +175,8 @@ multilib_src_configure() {
local myeconfargs=(
--disable-freetype-config
- --enable-biarch-config
--enable-shared
+ --with-zlib
$(use_with brotli)
$(use_with bzip2)
$(use_with harfbuzz)
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index a1abb71c48e..f57f580a8c2 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -14,9 +14,6 @@
<flag name="brotli">Enable brotli decompression support via <pkg>app-arch/brotli</pkg></flag>
<flag name="cleartype-hinting">Bytecode hinting mode for TrueType fonts that
activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
- <flag name="cleartype_hinting">New bytecode hinting mode for TrueType fonts that
- activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
- <flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>
<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
<flag name="fontforge">Install internal headers required for TrueType
debugger in <pkg>media-gfx/fontforge</pkg> (built with
diff --git a/media-libs/gd/gd-2.3.2.ebuild b/media-libs/gd/gd-2.3.2-r1.ebuild
index 9e697c051d8..d145563ca1d 100644
--- a/media-libs/gd/gd-2.3.2.ebuild
+++ b/media-libs/gd/gd-2.3.2-r1.ebuild
@@ -24,10 +24,10 @@ REQUIRED_USE="
BDEPEND="virtual/pkgconfig"
RDEPEND="
- avif? ( media-libs/libavif[${MULTILIB_USEDEP}] )
+ avif? ( media-libs/libavif:=[${MULTILIB_USEDEP}] )
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- heif? ( media-libs/libheif[${MULTILIB_USEDEP}] )
+ heif? ( media-libs/libheif:=[${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}] )
diff --git a/media-libs/gd/gd-2.3.3.ebuild b/media-libs/gd/gd-2.3.3-r1.ebuild
index e890c90f2dd..a50c264c6bb 100644
--- a/media-libs/gd/gd-2.3.3.ebuild
+++ b/media-libs/gd/gd-2.3.3-r1.ebuild
@@ -24,10 +24,10 @@ REQUIRED_USE="
BDEPEND="virtual/pkgconfig"
RDEPEND="
- avif? ( media-libs/libavif[${MULTILIB_USEDEP}] )
+ avif? ( media-libs/libavif:=[${MULTILIB_USEDEP}] )
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- heif? ( media-libs/libheif[${MULTILIB_USEDEP}] )
+ heif? ( media-libs/libheif:=[${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}] )
diff --git a/media-libs/gegl/gegl-0.4.32.ebuild b/media-libs/gegl/gegl-0.4.32.ebuild
index 95d000ce76a..dab149b166a 100644
--- a/media-libs/gegl/gegl-0.4.32.ebuild
+++ b/media-libs/gegl/gegl-0.4.32.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 30dd003a8d3..f1af4ed2fe4 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1 +1,2 @@
DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
+DIST glfw-3.3.5.tar.gz 776593 BLAKE2B ce92a42ef7361ae2580c9d6722d340106f9ca26e7fb436b9a4be2f25bf4a15d2b08d82ff71ad4ce4cd6a59e31d934d0fe6ab0e546474a3e7de38e229795ee0e8 SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb
diff --git a/media-libs/glfw/glfw-3.3.4-r2.ebuild b/media-libs/glfw/glfw-3.3.4-r2.ebuild
deleted file mode 100644
index a8d714e18ba..00000000000
--- a/media-libs/glfw/glfw-3.3.4-r2.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
-
-inherit cmake
-
-DESCRIPTION="The 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 x86"
-IUSE="wayland"
-
-RDEPEND="
- x11-libs/libxkbcommon
- !wayland? (
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- )
- wayland? (
- dev-libs/wayland
- media-libs/mesa[egl(+),wayland]
- )
-"
-DEPEND="
- ${RDEPEND}
- !wayland? ( x11-libs/libXi )
- wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
- wayland? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DGLFW_BUILD_EXAMPLES=no
- -DGLFW_USE_WAYLAND="$(usex wayland)"
- -DBUILD_SHARED_LIBS=1
- )
- cmake_src_configure
-}
diff --git a/media-libs/glfw/glfw-3.3.5.ebuild b/media-libs/glfw/glfw-3.3.5.ebuild
new file mode 100644
index 00000000000..3fcd9a61ae4
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 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 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 e165587e7d2..1c55b37d8d8 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,3 +1,2 @@
-DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
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.5.ebuild b/media-libs/glm/glm-0.9.9.5.ebuild
deleted file mode 100644
index b439b0bf903..00000000000
--- a/media-libs/glm/glm-0.9.9.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 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="virtual/opengl"
-
-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
-}
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 04922fcc211..744910fd87c 100644
--- a/media-libs/glm/glm-0.9.9.8-r1.ebuild
+++ b/media-libs/glm/glm-0.9.9.8-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake
+inherit cmake flag-o-matic
DESCRIPTION="OpenGL Mathematics"
HOMEPAGE="http://glm.g-truc.net/"
@@ -24,6 +24,10 @@ PATCHES=(
src_configure() {
# Header-only library
if use test; then
+ # See https://github.com/g-truc/glm/pull/1087
+ # https://bugs.gentoo.org/818235
+ append-cxxflags -fno-ipa-modref
+
local mycmakeargs=(
-DGLM_TEST_ENABLE=ON
-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index b241a056b2e..8549f8b718f 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,3 +1,5 @@
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
diff --git a/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch
new file mode 100644
index 00000000000..628e9f0b295
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
++project(gmmlib)
+
+ include(CTest)
+
diff --git a/media-libs/gmmlib/gmmlib-21.3.1.ebuild b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
index 4e796e2186d..daef825f99e 100644
--- a/media-libs/gmmlib/gmmlib-21.3.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
S="${WORKDIR}/${PN}-intel-${P}"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
LICENSE="MIT"
diff --git a/media-libs/gmmlib/gmmlib-21.3.2.ebuild b/media-libs/gmmlib/gmmlib-21.3.2.ebuild
new file mode 100644
index 00000000000..75f21bc6ea0
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-21.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+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
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_TYPE="Release"
+ -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-21.3.3.ebuild
new file mode 100644
index 00000000000..66e98449ad8
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="amd64"
+LICENSE="MIT"
+SLOT="0"
+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
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_TYPE="Release"
+ -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 4e796e2186d..1f972c3b191 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -1,11 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
+inherit cmake
if [[ ${PV} == *9999 ]] ; then
: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
@@ -17,32 +15,25 @@ 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
+SRC_URI=""
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
+ "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
)
-multilib_src_configure() {
+src_configure() {
local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_TYPE="Release"
+ -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
)
+
cmake_src_configure
}
diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml
index b2e33617543..79f6bc657e5 100644
--- a/media-libs/gmmlib/metadata.xml
+++ b/media-libs/gmmlib/metadata.xml
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>k2k@narod.ru</email>
- <name>Evgeny Grin</name>
- </maintainer>
- <use>
- <flag name="custom-cflags">Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
- </use>
+ <maintainer type="project">
+ <email>media-video@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>k2k@narod.ru</email>
+ <name>Evgeny Grin</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <use>
+ <flag name="custom-cflags">Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
+ </use>
</pkgmetadata>
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 217be1dd1cc..ef250142196 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1 +1,2 @@
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.14.ebuild b/media-libs/grilo/grilo-0.3.14.ebuild
new file mode 100644
index 00000000000..d8c385b4b57
--- /dev/null
+++ b/media-libs/grilo/grilo-0.3.14.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+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/gsound/gsound-1.0.3.ebuild b/media-libs/gsound/gsound-1.0.3.ebuild
index 4f9abaad4bf..62a1dc5013c 100644
--- a/media-libs/gsound/gsound-1.0.3.ebuild
+++ b/media-libs/gsound/gsound-1.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
IUSE="gtk-doc +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 410a851ca65..58d6f817bb8 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
index 1fd698e16f5..93b00d92d83 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
@@ -8,6 +8,8 @@ inherit flag-o-matic gstreamer-meson
DESCRIPTION="Less plugins for GStreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
+# glib/misuse of volatile fix, can be dropped in 1.18.5
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-volatile.patch.bz2"
LICENSE="LGPL-2"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
@@ -43,6 +45,10 @@ DEPEND="${RDEPEND}
# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
RESTRICT="test"
+PATCHES=(
+ "${WORKDIR}"/${P}-glib-volatile.patch
+)
+
src_prepare() {
default
addpredict /dev # Prevent sandbox violations bug #570624
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3-r1.ebuild
index 23555ecd81a..73da5000cb0 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3-r1.ebuild
@@ -43,7 +43,7 @@ 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}]
+ >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
egl? (
x11-libs/libdrm
)
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4-r1.ebuild
index 218d6f4f256..4e27d0ccf6d 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4-r1.ebuild
@@ -43,7 +43,7 @@ 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}]
+ >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
egl? (
x11-libs/libdrm
)
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 625133f7cba..6e041160e12 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,2 +1,2 @@
-DIST hamlib-4.2.tar.gz 2311775 BLAKE2B 4fe8d3e6d489369aede1a4cd59f01be44a7787ca71c21c5b92d436666c67de68013f488834d0f57238e6a947c24cd5b4c6c667397dec30392f1cccd695df252e SHA512 08ccf4e592fbae938ae1aaa5afede7e2e6ec7d23b449a65b00e093502f4aeb36930624f055d9802349f77df9dd2b7b983aa44d83f8c62a6de5789e7df627f804
DIST hamlib-4.3.1.tar.gz 2356944 BLAKE2B c803d253c867303cbde98b6f2e10f610aac111b7bd81fd343e1396cb86384b1c26942e5ccb8e395e073f9aa3d48e6f9edc1b64da14b2ec5ca09f98fbd3dee667 SHA512 8dee4676a19de7ac1ef733a4285b76e918f11aad6594d0557d36df295faf04c615e0993edb2f9ed5e7aea718c184603fec831caf28b75026c705f0b2e4b9eca7
+DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
diff --git a/media-libs/hamlib/hamlib-4.3.1.ebuild b/media-libs/hamlib/hamlib-4.3.1.ebuild
index f7d9f12e8a3..ab42e282b75 100644
--- a/media-libs/hamlib/hamlib-4.3.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.3.1.ebuild
@@ -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 x86"
IUSE="doc perl python tcl"
RESTRICT="test"
@@ -31,7 +31,8 @@ DEPEND=" ${RDEPEND}
virtual/pkgconfig
dev-lang/swig
>=sys-devel/libtool-2.2
- doc? ( app-doc/doxygen )"
+ doc? ( app-doc/doxygen
+ dev-util/source-highlight )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/hamlib/hamlib-4.2.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild
index c26283d90ea..b741ce89b03 100644
--- a/media-libs/hamlib/hamlib-4.2.ebuild
+++ b/media-libs/hamlib/hamlib-4.4.ebuild
@@ -1,20 +1,20 @@
# Copyright 1999-2021 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_{7..10} )
MY_P=${P/_rc2/~rc2}
inherit autotools python-single-r1
DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.org"
+HOMEPAGE="http://www.hamlib.org"
SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
LICENSE="LGPL-2 GPL-2"
SLOT="0/4.2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc perl python tcl"
RESTRICT="test"
@@ -31,7 +31,8 @@ DEPEND=" ${RDEPEND}
virtual/pkgconfig
dev-lang/swig
>=sys-devel/libtool-2.2
- doc? ( app-doc/doxygen )"
+ doc? ( app-doc/doxygen
+ dev-util/source-highlight )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 6842af93c51..b03bffaac86 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,4 +1,2 @@
-DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
-DIST harfbuzz-2.8.2.tar.gz 18506485 BLAKE2B 39a43d643339a5bc27d886e418695d2864ad7b9094dc508f5ccf52bf635b340adb7ec6958a15349e0b2580444ec98c5850e4022f708287fbe44cb7ea90065881 SHA512 51eee8c8fa6f839512e0dfc5c80ae8ed1e09d747d0ffc6736e5a1cbf86de956322f23e6ea25a90985e2317e98229a133e208da2a7b5177d65894cc64706ee8d4
-DIST harfbuzz-2.9.1.tar.gz 19154048 BLAKE2B e6cdc3936606e3d9a4bacf385db13c54f328d5be6c20ab20f844650351dd34f8f2015954f4ac7a6e0b8a1258ed9a6e71f43871c768c892d87af5c399c4499c63 SHA512 f8bb1d75b498d1581e76c57e5a15999e2c0d745d7d73dad17bfc91daf000f96d17c4924e6fb31270c90c26693dd504a7e7b2add152a013acca2491a86256b07b
-DIST harfbuzz-3.0.0.tar.gz 20360786 BLAKE2B acc1e4d7d59908a23ae1015700cfbf1737cdb0b26ba811d752954356baffb2ab18c3d22b5964d200c4cc7e312a79655c3437aff9f5a85b72c472e324dc3257ba SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5
+DIST harfbuzz-3.1.1.tar.gz 24966288 BLAKE2B f655d6a175dc495c00a76838d101705a32270668b7d989b8e82b9c34d2c16a5c10d210c0ed99a334515f73f7cad5c22e35c97f3a2c3f40f686380dd0559d0d7f SHA512 ccb1c840d07e28871893c40b2bb687cc78dfd25992ee20192f1faf8cae4356f401abd5947d7480a268edea10dd9f1d1d7e113b29b6e2d958220bf53799ae01b0
+DIST harfbuzz-3.1.2.tar.gz 26678706 BLAKE2B 231687fa77983217cf60eda2b4796431c15a9efa79e8925363e6d8374ea2710d167eb1bcf5e14a7c738a98f6be06e24ee6b038ea5697b380b81425c9d4244dad SHA512 4d1093904bd450c6d65130b3d7198c07cfc5cce9a5d234fcb14bae1101b28e697ba42cb455217f863d8d5c83830784f716ae59a2dbb38e88156677213bdb4799
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
deleted file mode 100644
index 4cb7ec1c415..00000000000
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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 ~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"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs 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 's:tests/macos.tests::' \
- test/shaping/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 instrospection, bug #535852
- local emesonargs=(
- $(meson_native_use_feature cairo)
- -Dcoretext="disabled"
- $(meson_native_use_feature doc docs)
- -Dfontconfig="disabled" #609300
- $(meson_native_use_feature introspection)
- $(meson_use static-libs static)
- $(meson_feature glib)
- $(meson_feature graphite)
- $(meson_feature icu)
- $(meson_feature introspection gobject)
- $(meson_feature test tests)
- $(meson_feature truetype freetype)
- )
- meson_src_configure
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
deleted file mode 100644
index cef9400fbdb..00000000000
--- a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 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 ~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"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection static-libs 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 's:tests/macos.tests::' \
- test/shaping/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 instrospection, bug #535852
- local emesonargs=(
- -Dcoretext="disabled"
- -Dchafa="disabled"
-
- $(meson_feature glib)
- $(meson_feature graphite)
- $(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_use static-libs static)
- )
- meson_src_configure
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild b/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
index 97b2c40ebcc..c342b2dfe8f 100644
--- a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
@@ -15,11 +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 ~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"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/3.0.0"
IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
RESTRICT="!test? ( test )"
@@ -80,7 +82,7 @@ multilib_src_configure() {
-Dchafa="disabled"
$(meson_feature glib)
- $(meson_feature graphite)
+ $(meson_feature graphite graphite2)
$(meson_feature icu)
$(meson_feature introspection gobject)
$(meson_feature test tests)
diff --git a/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
index 27e92e9b2b4..f6617befe9b 100644
--- a/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
@@ -19,7 +19,9 @@ else
fi
LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/3.0.0"
IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
RESTRICT="!test? ( test )"
@@ -80,7 +82,7 @@ multilib_src_configure() {
-Dchafa="disabled"
$(meson_feature glib)
- $(meson_feature graphite)
+ $(meson_feature graphite graphite2)
$(meson_feature icu)
$(meson_feature introspection gobject)
$(meson_feature test tests)
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 6b8cea0dd15..f6617befe9b 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,11 +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 ~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"
fi
LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/3.0.0"
IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
RESTRICT="!test? ( test )"
@@ -80,7 +82,7 @@ multilib_src_configure() {
-Dchafa="disabled"
$(meson_feature glib)
- $(meson_feature graphite)
+ $(meson_feature graphite graphite2)
$(meson_feature icu)
$(meson_feature introspection gobject)
$(meson_feature test tests)
diff --git a/media-libs/imlib2/imlib2-1.7.1-r2.ebuild b/media-libs/imlib2/imlib2-1.7.1-r2.ebuild
index 02d3e4155bb..84f7a25b689 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 ~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/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index 614d969319e..1c84a5bca80 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,2 +1 @@
-DIST kColorPicker-0.1.5.tar.gz 12013 BLAKE2B b4141e45b44e05c4769d008014817327a560c8ad74996010a1d16d22b6503547ce2ba657eee01c3893bb9a72cecd8fc368afe8e503d2c582cb02f1ab4b371a12 SHA512 6792cb79fe96f00c073f3f4b84c2c0a713523c33ee9f29113a9ed4f4c5f8e5509fefa4127a28546b1b44f73e0df7be9364a1c04498c36efcb6c2764df25250a8
DIST kColorPicker-0.1.6.tar.gz 12028 BLAKE2B dda08211b56186a34afa9049a2770d98b25659fb0e9fed344f9305420ddc5f69517684236d2d1b1613cec0661f6af43fc463a0cc403bead27d0b6c535030d7d4 SHA512 9702b0dfd9d340aa2b043711b27f2ac1994ff6cdd06e912deb410bd3500a2b68fa046d91bbd1392f3c95905e4cf7660819d70864cc85e55cb4c8879e820e7cec
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
deleted file mode 100644
index 356f123bc91..00000000000
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-MY_PN=kColorPicker
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Qt based color picker with popup menu"
-HOMEPAGE="https://github.com/ksnip/kColorPicker"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5[png]
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs+=(
- -DBUILD_TESTS=$(usex test)
- )
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
index 9b5805c8717..60dfc3b9c95 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
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/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 17fbd8d5d4b..8239fd2d1eb 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,3 +1,2 @@
-DIST kImageAnnotator-0.4.1.tar.gz 165976 BLAKE2B e25679416b411082aeaefa8d56aba203443c5a8fedef418caf7bd48b6facc07bfa4ed336d3f49970366023200bd4c0456ac631edc6b6c858b095f4410195761c SHA512 f133bfc81dc0aafd31a4deae2cb6a45b9d7941b27be3027ded7ffa59efe35c0f0a313b3076f672b93acbbfeccedf4832193fafe90c0fef004fab644d1da0dadb
-DIST kImageAnnotator-0.4.2.tar.gz 166061 BLAKE2B 83e53b89a09800ebd4fbbd23b893811b20375b24e43289bf4b21766f1b77851f86686a6c18f0da7baf78b7317ddc7f9348460d4c4c7cc0fb2b4767c549355fbe SHA512 33323c774bd3e6a72d3fb575c006c9e00111840c7a277e0f20554cef184b256d4e3b810bba11dd71cee8c257d0a48103e52b24b458bad2ece8b0d0cb94db4ec9
-DIST kImageAnnotator-0.5.1.tar.gz 214671 BLAKE2B 0dc6496534c045408e64fea7d9cc80acb7891fa009cfae5be28415e80914e726b4a2927d55156520414f35bed727e7d4470f593d5b3feb04da3e8c47a8d612c7 SHA512 221ed21c5a5156a9d7cdff70d7f4c1dd186fa40f7ba0d6d0bcfd87e6d045967b83c647378f1981b33307bd6e1b52722e2e9f4229c12fc18c840040fb4f405552
+DIST kImageAnnotator-0.5.2.tar.gz 219008 BLAKE2B 6d2d53a55b013b8bb87291ffcb13126437291145a4d869c9e4b031711b8592ef465eb2b24b6473c09f9d02067d2404da15a4170a2f4e288cb1475d3c5d7d00be SHA512 42785f92954bf8fe28f5114d8ba7da9a1a22e79d1c0356642e34754218e580b147670a119d94e3b6b704deb1230a0d0f4d998541d5532783e4d569c66789af99
+DIST kImageAnnotator-0.5.3.tar.gz 219782 BLAKE2B 30f532a563761a665da1f926629ebd66888f820b305c98f2b0afc316d8a94010196e68221a4ffd4871ffbae19582eee685af56c763f873b38a7ac5219f4a3b3d SHA512 a858e0f8694f3f989c36db586e6e3a302ad2aa9bf32b26afa170c165327fa33b6f3053682420c788f701abdea4daa35158058edddf52af1566364976b2d2f9f7
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
deleted file mode 100644
index ae004e293da..00000000000
--- a/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5[png]
- >=media-libs/kcolorpicker-0.1.5
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs+=(
- -DBUILD_TESTS=$(usex test)
- )
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.2.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild
index 0959a13d976..e9449c3b95f 100644
--- a/media-libs/kimageannotator/kimageannotator-0.4.2.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
VIRTUALX_REQUIRED="test"
inherit cmake virtualx
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
IUSE="test"
RDEPEND="
@@ -23,7 +23,7 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5[png]
- >=media-libs/kcolorpicker-0.1.5
+ >=media-libs/kcolorpicker-0.1.6
x11-libs/libX11
"
DEPEND="${RDEPEND}
diff --git a/media-libs/kimageannotator/kimageannotator-0.5.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
index f4810beb37c..1fc3ed36ab2 100644
--- a/media-libs/kimageannotator/kimageannotator-0.5.1.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
@@ -1,7 +1,7 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
VIRTUALX_REQUIRED="test"
inherit cmake virtualx
@@ -12,6 +12,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Tool for annotating images"
HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-3+"
SLOT="0"
@@ -33,8 +34,6 @@ BDEPEND="
dev-qt/linguist-tools:5
"
-S="${WORKDIR}/${MY_P}"
-
src_configure() {
local mycmakeargs=(
-DBUILD_TESTS=$(usex test)
diff --git a/media-libs/kquickimageeditor/Manifest b/media-libs/kquickimageeditor/Manifest
index 200c46989da..37ce4fe6ffa 100644
--- a/media-libs/kquickimageeditor/Manifest
+++ b/media-libs/kquickimageeditor/Manifest
@@ -1 +1 @@
-DIST kquickimageeditor-0.1.3.tar.xz 3281972 BLAKE2B 314d492f841f1786d8e958f0b925a5485d8ee4644488e26fefaaf67bd9388403d5b88c7fc52826555ca91b762ec6caec79ae6a363a2c1d688d26076287a6e72a SHA512 ce04ca71aa6232cde2303a07dd800db9bc590a3fafda8c3843d46e994a37858934ee98914dde4c29e03cd01a247059b577375e57ac5d1449f9029d4865eae4ef
+DIST kquickimageeditor-0.2.0.tar.xz 3285204 BLAKE2B 320813b90fb62ee6b29ebc8cffc463bbbec88c1251639e93c927ea568d4208286f1206354351b152abcd2fe02ba7f1d0d1e659d737ced47ab12a993fcf5fe21f SHA512 86a2abb6d07737bbfff1e6395d6610bd24384c9e376fac74092d6d7fa888beb03c378e3e8cfeaca1a38a54c54ef8721098efb832154c9fcd22d27355f186ad65
diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.2.0.ebuild
index 6a90ca4cdcd..6152489b786 100644
--- a/media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild
+++ b/media-libs/kquickimageeditor/kquickimageeditor-0.2.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.82.0
+QTMIN=5.15.2
inherit ecm kde.org
DESCRIPTION="QtQuick components providing basic image editing capabilities"
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/kquickimageeditor
https://api.kde.org/kquickimageeditor/html/index.html"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~ppc64"
fi
@@ -21,7 +21,9 @@ SLOT="5"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
"
RDEPEND="${DEPEND}
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
"
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index 94d76bad5d7..35f7514ef12 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -1,2 +1 @@
-DIST ladspa_sdk_1.15.tgz 71179 BLAKE2B 7a201fd968433241fda190874d51b835f425c8f35270dc8fac9acf4e9e1546fa20d48f85e894b9eb263dd5d84c2b407481d168e18256dfe2cdd026fe0c805a65 SHA512 a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65
DIST ladspa_sdk_1.17.tgz 71052 BLAKE2B cfb80e8ced314d5cc62fcb7f0b82e58f572503f2a732b2bb8a58343e8f69e417c0b0a2919bbb40629567fb331bf60a7f0c6f186db47e5b2651725b039526cdbb SHA512 37f94aa52b5a2f8709528989dea289eb01342f3bcb9e85d0f4829ddd9d90b2934a113db11100f09375a50f6612122b78156fec916f2c78a22406253d5cb394c7
diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
deleted file mode 100644
index 709ec7c8456..00000000000
--- a/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index c339524..2166624 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -13,12 +13,12 @@ INSTALL_BINARY_DIR = /usr/bin/
- # GENERAL
- #
-
-+CFLAGS = -Wall -Werror -O3
-+CXXFLAGS = -Wall -Werror -O3
-+
- INCLUDES = -I.
--LIBRARIES = -ldl -lm
--CFLAGS = $(INCLUDES) -Wall -Werror -O2 -fPIC \
-- -DDEFAULT_LADSPA_PATH=$(INSTALL_PLUGINS_DIR)
--BINFLAGS = -fPIE -pie
--CXXFLAGS = $(CFLAGS)
-+DYNAMIC_LD_LIBS = -ldl
-+LIBRARIES = $(DYNAMIC_LD_LIBS) -lm
- PLUGINS = ../plugins/amp.so \
- ../plugins/delay.so \
- ../plugins/filter.so \
-@@ -28,34 +28,25 @@ PROGRAMS = ../bin/analyseplugin \
- ../bin/applyplugin \
- ../bin/listplugins
- CC = cc
--CPP = c++
-+CXX = c++
-+MKDIR_P = mkdirhier
-
- ###############################################################################
- #
- # RULES TO BUILD PLUGINS FROM C OR C++ CODE
- #
-
-+../plugins/filter.so: plugins/filter.c ladspa.h gcc_exports.map
-+ $(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/filter.o -c plugins/filter.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/filter.so plugins/filter.o -nostartfiles -shared -lm
-+
- ../plugins/%.so: plugins/%.c ladspa.h gcc_exports.map
-- $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
-- $(CC) -o ../plugins/$*.so \
-- plugins/$*.o \
-- -shared \
-- $(CFLAGS) \
-- -fvisibility=hidden \
-- -fvisibility-inlines-hidden \
-- -s \
-- -Wl,--version-script=gcc_exports.map
-+ $(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -nostartfiles -shared
-
- ../plugins/%.so: plugins/%.cpp ladspa.h gcc_exports.map
-- $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
-- $(CPP) -o ../plugins/$*.so \
-- plugins/$*.o \
-- -shared \
-- $(CXXFLAGS) \
-- -fvisibility=hidden \
-- -fvisibility-inlines-hidden \
-- -s \
-- -Wl,--version-script=gcc_exports.map
-+ $(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp
-+ $(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared
-
- ###############################################################################
- #
-@@ -66,7 +57,7 @@ test: /tmp/test.wav ../snd/noise.wav always
- @echo ---------------------------------------------
- @echo First listen to the white noise input signal:
- @echo ---------------------------------------------
-- -sndfile-play ../snd/noise.wav
-+ @echo -sndfile-play ../snd/noise.wav
- @echo -------------------------
- @echo Compare to plugin output.
- @echo -------------------------
-@@ -75,12 +66,12 @@ test: /tmp/test.wav ../snd/noise.wav always
- @echo Test complete.
-
- install: targets
-- -mkdir -p $(INSTALL_PLUGINS_DIR)
-- -mkdir -p $(INSTALL_INCLUDE_DIR)
-- -mkdir -p $(INSTALL_BINARY_DIR)
-- cp ../plugins/* $(INSTALL_PLUGINS_DIR)
-- cp ladspa.h $(INSTALL_INCLUDE_DIR)
-- cp ../bin/* $(INSTALL_BINARY_DIR)
-+ -$(MKDIR_P) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
-+ -$(MKDIR_P) $(DESTDIR)$(INSTALL_INCLUDE_DIR)
-+ -$(MKDIR_P) $(DESTDIR)$(INSTALL_BINARY_DIR)
-+ cp ../plugins/* $(DESTDIR)$(INSTALL_PLUGINS_DIR)
-+ cp ladspa.h $(DESTDIR)$(INSTALL_INCLUDE_DIR)
-+ cp ../bin/* $(DESTDIR)$(INSTALL_BINARY_DIR)
-
- /tmp/test.wav: targets ../snd/noise.wav
- ../bin/listplugins
-@@ -106,19 +97,19 @@ targets: $(PLUGINS) $(PROGRAMS)
- #
-
- ../bin/applyplugin: applyplugin.o load.o default.o
-- $(CC) $(CFLAGS) $(BINFLAGS) \
-+ $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \
- -o ../bin/applyplugin \
- applyplugin.o load.o default.o \
- $(LIBRARIES)
-
- ../bin/analyseplugin: analyseplugin.o load.o default.o
-- $(CC) $(CFLAGS) $(BINFLAGS) \
-+ $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \
- -o ../bin/analyseplugin \
- analyseplugin.o load.o default.o \
- $(LIBRARIES)
-
- ../bin/listplugins: listplugins.o search.o
-- $(CC) $(CFLAGS) $(BINFLAGS) \
-+ $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \
- -o ../bin/listplugins \
- listplugins.o search.o \
- $(LIBRARIES)
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.17-r1.ebuild
index acdd022d073..014dffe6473 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.17-r1.ebuild
@@ -3,22 +3,22 @@
EAPI=7
-inherit multilib toolchain-funcs portability flag-o-matic multilib-minimal
+inherit toolchain-funcs portability multilib-minimal
MY_PN=${PN/-/_}
MY_P=${MY_PN}_${PV}
DESCRIPTION="The Linux Audio Developer's Simple Plugin API"
-HOMEPAGE="http://www.ladspa.org/"
-SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
+HOMEPAGE="https://www.ladspa.org/"
+SRC_URI="https://www.ladspa.org/download/${MY_P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE=""
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
+RDEPEND="media-libs/libsndfile[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
deleted file mode 100644
index 209b002aa3e..00000000000
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs portability multilib-minimal
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="The Linux Audio Developer's Simple Plugin API"
-HOMEPAGE="http://www.ladspa.org/"
-SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-CDEPEND="media-libs/libsndfile"
-RDEPEND="${CDEPEND}"
-DEPEND="
- ${CDEPEND}
- >=sys-apps/sed-4
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-properbuild.patch"
-)
-
-HTML_DOCS="doc/*.html"
-
-src_prepare() {
- default
-
- multilib_copy_sources
-}
-
-multilib_src_compile() {
- cd src
- emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
- DYNAMIC_LD_LIBS="$(dlopen_lib)" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
- targets
-}
-
-multilib_src_test() {
- cd src
- emake test
-}
-
-multilib_src_install() {
- cd src
- emake INSTALL_PLUGINS_DIR="/usr/$(get_libdir)/ladspa" \
- DESTDIR="${ED}" \
- MKDIR_P="mkdir -p" \
- install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # Needed for apps like rezound
- dodir /etc/env.d
- echo "LADSPA_PATH=${EPREFIX}/usr/$(get_libdir)/ladspa" > "${ED}/etc/env.d/60ladspa"
-}
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 957eb0a7970..42f1c787d50 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1 +1,2 @@
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.2.0-0001-use-system-provided-act-binary.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch
new file mode 100644
index 00000000000..35beebf1930
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch
@@ -0,0 +1,141 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 25 Aug 2021 09:29:17 +0200
+Subject: [PATCH] use system provided act binary
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 110 ++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 73 insertions(+), 37 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d70a030..9c91496 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,14 +62,19 @@ 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_SOURCE_DIR_AUTOGENERATED ${CMAKE_CURRENT_SOURCE_DIR}/Autogenerated)
+@@ -80,36 +85,67 @@ set(ACT_GENERATED_SOURCE
+ ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/lib3mf_interfacewrapper.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/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_SOURCE_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_SOURCE_DIR_AUTOGENERATED}/Source"
+- COMMAND
+- cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings"
+- COMMAND
+- cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings
+- COMMAND
+- cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/"
+- 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_SOURCE_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_SOURCE_DIR_AUTOGENERATED}/Source"
++ COMMAND
++ cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings"
++ COMMAND
++ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings
++ COMMAND
++ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/"
++ 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/"
++ 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
+ ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
+--
+2.32.0
+
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch
new file mode 100644
index 00000000000..742c877e2b4
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch
@@ -0,0 +1,29 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 25 Aug 2021 18:19:25 +0200
+Subject: [PATCH] [Gentoo specific] remove add_dependencies
+
+Remove the add_dependencies commands on ssl and crypto.
+We use global openssl support instead of package libressl.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Tests/CPP_Bindings/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Tests/CPP_Bindings/CMakeLists.txt b/Tests/CPP_Bindings/CMakeLists.txt
+index 4a816a5..c26c498 100644
+--- a/Tests/CPP_Bindings/CMakeLists.txt
++++ b/Tests/CPP_Bindings/CMakeLists.txt
+@@ -47,9 +47,6 @@ if (WIN32)
+ target_compile_options(${TESTNAME} PUBLIC "$<$<CONFIG:RELEASE>:/O2;/sdl;/WX;/Oi;/Gy;/FC;/MD;/wd4996>")
+ endif()
+
+-add_dependencies(${TESTNAME} ssl)
+-add_dependencies(${TESTNAME} crypto)
+-
+ target_include_directories(${TESTNAME} PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/Include
+ ${gtest_SOURCE_DIR}/include
+--
+2.32.0
+
diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
new file mode 100644
index 00000000000..65a29e035e5
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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-use-system-provided-act-binary.patch
+ "${FILESDIR}"/${P}-0002-Gentoo-specific-remove-add_dependencies.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
+ dosym -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
+ done
+}
diff --git a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
deleted file mode 100644
index 026e4af1c4a..00000000000
--- a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PN=libAfterImage
-
-DESCRIPTION="Afterstep's standalone generic image manipulation library"
-HOMEPAGE="http://www.afterstep.org/afterimage/index.php"
-SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
-
-RDEPEND="
- X? ( x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXrender )
- gif? ( media-libs/giflib:0= )
- jpeg? ( virtual/jpeg:0 )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( gnome-base/librsvg:2 )
- tiff? ( media-libs/tiff:0 )
- truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
- virtual/pkgconfig
- !!x11-wm/afterstep"
-REQUIRED_USE="
- shaping? ( X )
- shm? ( X )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- default
-
- # fix some ldconfig problem in makefile.in
- eapply -p0 "${FILESDIR}"/${PN}-makefile.in.patch
- # fix lib paths in afterimage-config
- eapply -p0 "${FILESDIR}"/${PN}-config.patch
- # fix gif unbundle
- eapply -p0 "${FILESDIR}"/${PN}-gif.patch
- # fix for libpng15 compability
- eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
- # add giflib-5 API support, bug 571654
- eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
- # do not build examples
- use examples || sed -i \
- -e '/^all:/s/apps//' \
- -e '/^install:/s/install.apps//' \
- Makefile.in || die "sed failed"
- # remove forced flags
- sed -i \
- -e 's/CFLAGS="-O3"//' \
- -e 's/ -rdynamic//' \
- configure.in || die "sed failed"
-
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable cpu_flags_x86_mmx mmx-optimization) \
- $(use_enable nls i18n) \
- $(use_enable shaping) \
- $(use_enable shm shmimage ) \
- $(use_enable static-libs staticlibs) \
- $(use_with X x) \
- $(use_with gif) \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with svg) \
- $(use_with tiff) \
- $(use_with truetype ttf) \
- --disable-glx \
- --enable-sharedlibs \
- --with-xpm \
- --without-builtin-gif \
- --without-builtin-jpeg \
- --without-builtin-png \
- --without-builtin-zlib \
- --without-afterbase
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- AFTER_DOC_DIR="${ED}/usr/share/doc/${PF}" \
- install
- dodoc ChangeLog README
- if use examples; then
- cd apps || die
- mv ascompose.man ascompose.1 || die
- doman ascompose.1
- emake clean
- rm Makefile* ascompose.1 || die
- insinto /usr/share/doc/${PF}/examples
- doins *
- fi
-}
diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index a682ba6f4ee..7d656730f2a 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
RDEPEND="
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 830b394f870..686b39d3ebd 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -2,3 +2,4 @@ DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d
DIST libavif-0.9.0.tar.gz 2961252 BLAKE2B 75a3d9c0f9ada1934fdafb8208571c6a863ffe04210d84b26207952028280d4e5c4efe42a6d4bc1fe417e3bbc06e8b93c416472c79ccd08d760ab65a663e16d9 SHA512 220ef27edf716af4ffc5b035c63f84e2848f165a3fe9c1b74dc0ba29f0de65147610fd4266f1b2419f60cfbb72159368da840fcb574c7a07364a60548d3db179
DIST libavif-0.9.1.tar.gz 1985366 BLAKE2B b498f00c56fe3058cf11f10cc629aad618ad297b625155ec8012f88493f8ae076933e4a4ebc7d97249019a64f01b68db34ab7ff5f9c35db0b1b74dd9048bd191 SHA512 15fa857ee40aeae2ee077d244c6e11a34193f2348e922b5dfa8579a91fa6ceff05c7146e85f9222ebaa6ef2d76e876ea050e8056990cad80850fb4d9581de9a5
DIST libavif-0.9.2.tar.gz 1987058 BLAKE2B a734014945498d29121d64e54f34b367582688bd230f16b58635c363a9722b36ccd58ae0a95918c0322c0cb38b3e29b68bdc344bb99f61adc1397969db39f480 SHA512 04400ae76214d2f0361a14897d6ee97be675375865bb96c8d237e9a4a1152ac1a966db903c11df82da71b0bc68599a5857e038cc90d63c5d3bc77b13169a3e75
+DIST libavif-0.9.3.tar.gz 2000521 BLAKE2B b9dbaf01e58058a1ab9191081242a0f669b714d319075b6330963bc8ae31f576fb77b108de4745125eb42d39682e74a3174d062a029ccb765b3030f4092a96b8 SHA512 8e95666c784d1badc7e18d27a7c21cae3b8ef3b8da9a762eb8f7216d77fba29b9ca309c01d13bcf4890e03c6bc335ba4baf3f5877396bd0584be9ea60018daa7
diff --git a/media-libs/libavif/libavif-0.8.4.ebuild b/media-libs/libavif/libavif-0.8.4-r1.ebuild
index 156e8afb6ac..a1703c043d3 100644
--- a/media-libs/libavif/libavif-0.8.4.ebuild
+++ b/media-libs/libavif/libavif-0.8.4-r1.ebuild
@@ -10,7 +10,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="+aom dav1d examples extras gdk-pixbuf rav1e"
diff --git a/media-libs/libavif/libavif-0.9.0-r2.ebuild b/media-libs/libavif/libavif-0.9.0-r3.ebuild
index 34901837734..b4846ff1d5c 100644
--- a/media-libs/libavif/libavif-0.9.0-r2.ebuild
+++ b/media-libs/libavif/libavif-0.9.0-r3.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
KEYWORDS="amd64 arm arm64 ppc64 x86"
IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
diff --git a/media-libs/libavif/libavif-0.9.1.ebuild b/media-libs/libavif/libavif-0.9.1-r1.ebuild
index 5deb7882783..d06dd645a54 100644
--- a/media-libs/libavif/libavif-0.9.1.ebuild
+++ b/media-libs/libavif/libavif-0.9.1-r1.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
diff --git a/media-libs/libavif/libavif-0.9.2.ebuild b/media-libs/libavif/libavif-0.9.2-r1.ebuild
index 4a9f25f041f..bf857c5b280 100644
--- a/media-libs/libavif/libavif-0.9.2.ebuild
+++ b/media-libs/libavif/libavif-0.9.2-r1.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
diff --git a/media-libs/libavif/libavif-0.9.3-r1.ebuild b/media-libs/libavif/libavif-0.9.3-r1.ebuild
new file mode 100644
index 00000000000..ee304de7b30
--- /dev/null
+++ b/media-libs/libavif/libavif-0.9.3-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg[${MULTILIB_USEDEP}]
+ aom? ( >=media-libs/libaom-3.1.2:=[${MULTILIB_USEDEP}] )
+ dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
+ gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
+ rav1e? ( media-video/rav1e[capi] )
+ svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DAVIF_CODEC_AOM=$(usex aom ON OFF)
+ -DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+ -DAVIF_CODEC_LIBGAV1=OFF
+
+ # Use system libraries.
+ -DAVIF_LOCAL_ZLIBPNG=OFF
+ -DAVIF_LOCAL_JPEG=OFF
+
+ -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+ -DAVIF_ENABLE_WERROR=OFF
+ )
+
+ if multilib_is_native_abi; then
+ mycmakeargs+=(
+ -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+ -DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+ -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+ -DAVIF_BUILD_APPS=$(usex extras ON OFF)
+ -DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+ )
+ else
+ mycmakeargs+=(
+ -DAVIF_CODEC_RAV1E=OFF
+ -DAVIF_CODEC_SVT=OFF
+
+ -DAVIF_BUILD_EXAMPLES=OFF
+ -DAVIF_BUILD_APPS=OFF
+ -DAVIF_BUILD_TESTS=OFF
+ )
+
+ if ! use aom ; then
+ if use rav1e || use svt-av1 ; then
+ ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+ ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+ ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+ fi
+ fi
+ fi
+
+ cmake_src_configure
+}
+
+pkg_preinst() {
+ if use gdk-pixbuf ; then
+ gnome2_gdk_pixbuf_savelist
+ fi
+}
+
+pkg_postinst() {
+ if ! use aom && ! use rav1e && ! use svt-av1 ; then
+ ewarn "No AV1 encoder is set,"
+ ewarn "libavif will work in read-only mode."
+ ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+ fi
+
+ if use gdk-pixbuf ; then
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+ multilib_foreach_abi gnome2_gdk_pixbuf_update
+ fi
+}
+
+pkg_postrm() {
+ if use gdk-pixbuf ; then
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+ multilib_foreach_abi gnome2_gdk_pixbuf_update
+ fi
+}
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index 1cb15d73dc4..3b89a6e5324 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -11,14 +11,17 @@ HOMEPAGE="https://github.com/AOMediaCodec/libavif"
EGIT_REPO_URI="https://github.com/AOMediaCodec/libavif.git"
LICENSE="BSD-2"
-SLOT="0"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
KEYWORDS=""
IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+REQUIRED_USE="|| ( aom dav1d )"
+
DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
virtual/jpeg[${MULTILIB_USEDEP}]
- aom? ( >=media-libs/libaom-2.0.0[${MULTILIB_USEDEP}] )
+ aom? ( >=media-libs/libaom-3.1.2:=[${MULTILIB_USEDEP}] )
dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
rav1e? ( media-video/rav1e[capi] )
@@ -26,8 +29,6 @@ DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
-REQUIRED_USE="|| ( aom dav1d )"
-
multilib_src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
@@ -40,6 +41,8 @@ multilib_src_configure() {
-DAVIF_LOCAL_JPEG=OFF
-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+ -DAVIF_ENABLE_WERROR=OFF
)
if multilib_is_native_abi; then
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
index bc7b204dd36..07175fc779e 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
RESTRICT="!test? ( test )"
@@ -40,7 +40,7 @@ DEPEND="
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
)
"
-RDEPEND="java? ( >=virtual/jre-1.5 )"
+RDEPEND="java? ( >=virtual/jre-1.8:* )"
BDEPEND="
virtual/pkgconfig
doc? (
@@ -50,7 +50,7 @@ BDEPEND="
>=dev-texlive/texlive-latexextra-2012
dev-texlive/texlive-latexrecommended
)
- java? ( >=virtual/jdk-1.5 )
+ java? ( >=virtual/jdk-1.8:* )
test? ( dev-util/cppunit )
"
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index 9259a8b9b85..17f8a37fa11 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools flag-o-matic multilib-minimal
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
DESCRIPTION="Software codec for dv-format video (camcorders etc)"
HOMEPAGE="http://libdv.sourceforge.net/"
@@ -36,7 +36,10 @@ src_prepare() {
}
multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
+ # bug #622662
+ tc-ld-disable-gold
+
+ ECONF_SOURCE="${S}" econf \
--disable-static \
--without-debug \
--disable-gtk \
diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
index bc96ad4de4b..9328797e48f 100644
--- a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
+++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
IUSE="cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug"
# https://github.com/buildroot/buildroot/blob/master/package/libdvbcsa/
diff --git a/media-libs/libemf/libemf-1.0.13.ebuild b/media-libs/libemf/libemf-1.0.13.ebuild
index c389b3d7a9b..0cd5e48d246 100644
--- a/media-libs/libemf/libemf-1.0.13.ebuild
+++ b/media-libs/libemf/libemf-1.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libemf/${P}.tar.gz"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc static-libs"
src_configure() {
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 2868a48ec64..7f9272737a8 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,2 +1 @@
-DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
DIST libepoxy-1.5.9.tar.gz 331982 BLAKE2B 2bac6dae7fa2fcc70c1a5cacb1e6b6d21aaf65a65792d3c60eb0745acc4967092136aad1fbba6009a8c8e9bb1091a5d0a38fca05e63be2b9141d9c7e3042b426 SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8
diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
deleted file mode 100644
index 62036c1ad5b..00000000000
--- a/media-libs/libepoxy/libepoxy-1.5.5.ebuild
+++ /dev/null
@@ -1,46 +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} )
-PYTHON_REQ_USE='xml(+)'
-inherit meson-multilib python-any-r1 virtualx
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Library for handling OpenGL function pointer management"
-HOMEPAGE="https://github.com/anholt/libepoxy"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+egl test +X"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
-BDEPEND="${PYTHON_DEPS}
- virtual/pkgconfig"
-
-multilib_src_configure() {
- local emesonargs=(
- -Degl=$(usex egl)
- -Dglx=$(usex X)
- $(meson_use X x11)
- $(meson_use test tests)
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- virtx meson_src_test
-}
diff --git a/media-libs/libepoxy/libepoxy-1.5.9.ebuild b/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
index e29ce87c328..653d6c7f085 100644
--- a/media-libs/libepoxy/libepoxy-1.5.9.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Library for handling OpenGL function pointer management"
@@ -25,7 +25,7 @@ IUSE="+egl test +X"
RESTRICT="!test? ( test )"
RDEPEND="
- egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
+ egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
BDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index e29ce87c328..8a0359a68ec 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -25,7 +25,7 @@ IUSE="+egl test +X"
RESTRICT="!test? ( test )"
RDEPEND="
- egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
+ egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
BDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 0c0f3de4fa5..11771ebe20d 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,2 +1,2 @@
-DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
DIST libexif-0.6.23.tar.gz 2764684 BLAKE2B 517eaadc71b6ccaa7899b89b770a14fc051f365c728d5518fe6f0c05aa14690eaa6a33323c9305d02398df6ba2fceb806537202224a3c00018f7bcf835a3ff84 SHA512 c382b5f36e4fc1501664e3bad18553abb1b18f752f93111af5081e996bcc37b425ac9f0b0e1ffd7145270254ac44a4adb7875d5b0d8379113da6162b17442e23
+DIST libexif-0.6.24.tar.bz2 1992163 BLAKE2B 75d3a2b4fefd7b7706226e70d31250ef7e99eeb81a4839ddc36cc9e3180534542d8a02851f8e6fd5034bbc925a616ead8c4bfb0cce8bc5886c3ec54811914a6b SHA512 35c9e7af2c3d44a638dc6bbe8f96962d41c0f3fe4a257494f7a73baefab9aba507477175289ccf9002a66cc16ca53d5d1f44d6fef9e014b27f687ecdc58f5111
diff --git a/media-libs/libexif/libexif-0.6.23.ebuild b/media-libs/libexif/libexif-0.6.23.ebuild
index f8e8ac1b629..c195ebb72b5 100644
--- a/media-libs/libexif/libexif-0.6.23.ebuild
+++ b/media-libs/libexif/libexif-0.6.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="doc nls static-libs"
RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.24.ebuild
index 221fff98bbf..8d78a770bc8 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.24.ebuild
@@ -1,21 +1,18 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools multilib-minimal
-COMMIT="9266d14b5ca4e29b970fa03272318e5f99386e06"
DESCRIPTION="Library for parsing, editing, and saving EXIF data"
HOMEPAGE="https://libexif.github.io/"
-SRC_URI="https://github.com/libexif/libexif/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-#SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="doc nls"
RDEPEND="nls? ( virtual/libintl )"
DEPEND="${RDEPEND}"
@@ -30,7 +27,10 @@ PATCHES=(
src_prepare() {
default
- sed -i -e '/FLAGS=/s:-g::' configure.ac || die #390249
+
+ # bug #390249
+ sed -i -e '/FLAGS=/s:-g::' configure.ac || die
+
# Previously elibtoolize for BSD
eautoreconf
}
@@ -39,7 +39,6 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable doc docs) \
$(use_enable nls) \
- $(use_enable static-libs static) \
--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
}
@@ -49,5 +48,6 @@ multilib_src_install() {
multilib_src_install_all() {
find "${ED}" -name '*.la' -delete || die
+
rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
}
diff --git a/media-libs/libextractor/libextractor-1.9-r2.ebuild b/media-libs/libextractor/libextractor-1.9-r2.ebuild
index 38f88b87e42..0fdd4b76eed 100644
--- a/media-libs/libextractor/libextractor-1.9-r2.ebuild
+++ b/media-libs/libextractor/libextractor-1.9-r2.ebuild
@@ -41,7 +41,7 @@ DEPEND="
midi? ( media-libs/libsmf )
mp4? ( media-libs/libmp4v2:0 )
mpeg? ( media-libs/libmpeg2 )
- tidy? ( || ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 ) )
+ tidy? ( >=app-text/htmltidy-5.0.0 )
tiff? ( media-libs/tiff:0 )
vorbis? (
media-libs/libogg
diff --git a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
index c7a81b9cd71..d27cd8ed191 100644
--- a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
+++ b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/iamthehorker/${PN}"
else
SRC_URI="https://github.com/iamthehorker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
fi
LICENSE="LGPL-2.1+"
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 701bb5028ab..fbb91a44c4e 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,2 +1 @@
-DIST libglvnd-1.3.3.tar.bz2 715179 BLAKE2B 781550cbda489dca31596115c78edd1d4f1fe66062218c83ccf6cb34707501fce839b649c2b0aee3621c283397acca8fb40ad16c0388551ce7caa7fd79b7dbf5 SHA512 7da9e12c010a8f109cd24ca4c2ffc846dd7d23f82157e1e39b8ae69575fabcc9592c0b639b23d2112fe2026b679f1536f1b705a5c948fefea105418803e1b629
DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
diff --git a/media-libs/libglvnd/libglvnd-1.3.3.ebuild b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
deleted file mode 100644
index 8c83eaea578..00000000000
--- a/media-libs/libglvnd/libglvnd-1.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{7..9} )
-VIRTUALX_REQUIRED=manual
-
-inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
- SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
- S=${WORKDIR}/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-RDEPEND="
- !media-libs/mesa[-libglvnd(+)]
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-
-src_prepare() {
- default
- sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
- bin/symbols-check.py || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_feature X x11)
- $(meson_feature X glx)
- )
- use elibc_musl && emesonargs+=( -Dtls=disabled )
-
- meson_src_configure
-}
-
-multilib_src_test() {
- if use X; then
- virtx meson_src_test
- else
- meson_src_test
- fi
-}
diff --git a/media-libs/libglvnd/libglvnd-1.3.4.ebuild b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
index 43050041496..8c83eaea578 100644
--- a/media-libs/libglvnd/libglvnd-1.3.4.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
S=${WORKDIR}/${PN}-v${PV}
fi
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 5b20ce8d0c6..3ca1f1af506 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -1,2 +1 @@
-DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
DIST libid3tag-0.16.1.tar.gz 98074 BLAKE2B f7acbe4117ef54e5d1705289af3b31ded7e87a7d2ba6e19a02863a391ce4fffee9110011cae42568d7ccbe256f899d7868182f02ed0b662d46f3f78e14c1eb43 SHA512 621cbdf7a0ea5cdca6a9133c88fb07ff0c519ed73bc26a535de3928f4784b912bb44315b45362600d53cd03083b66f38d674d1880ca30e5f6c342321977a6eb2
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
deleted file mode 100644
index bb320c7aa70..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/id3tag.h
-+++ b/id3tag.h
-@@ -25,6 +25,8 @@
- # ifndef LIBID3TAG_ID3TAG_H
- # define LIBID3TAG_ID3TAG_H
-
-+#include <stdint.h>
-+
- # ifdef __cplusplus
- extern "C" {
- # endif
-@@ -36,10 +38,10 @@
- typedef unsigned char id3_byte_t;
- typedef unsigned long id3_length_t;
-
--typedef unsigned long id3_ucs4_t;
-+typedef uint32_t id3_ucs4_t;
-
- typedef unsigned char id3_latin1_t;
--typedef unsigned short id3_utf16_t;
-+typedef uint16_t id3_utf16_t;
- typedef signed char id3_utf8_t;
-
- struct id3_tag {
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
deleted file mode 100644
index e196cb4df26..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/genre.dat
-+++ b/genre.dat
-@@ -277,8 +277,8 @@
- { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 };
- static id3_ucs4_t const genre_DRUM_SOLO[] =
- { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 };
--static id3_ucs4_t const genre_A_CAPPELLA[] =
-- { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 };
-+static id3_ucs4_t const genre_A_CAPELLA[] =
-+ { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 };
- static id3_ucs4_t const genre_EURO_HOUSE[] =
- { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 };
- static id3_ucs4_t const genre_DANCE_HALL[] =
-@@ -452,7 +452,7 @@
- genre_DUET,
- genre_PUNK_ROCK,
- genre_DRUM_SOLO,
-- genre_A_CAPPELLA,
-+ genre_A_CAPELLA,
- genre_EURO_HOUSE,
- genre_DANCE_HALL,
- genre_GOA,
---- a/genre.dat.in
-+++ b/genre.dat.in
-@@ -153,7 +153,7 @@
- Duet
- Punk Rock
- Drum Solo
--A Cappella
-+A Capella
- Euro-House
- Dance Hall
- Goa
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch
deleted file mode 100644
index 6ef1a22d5a6..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur libid3tag-0.15.1b/compat.gperf libid3tag-0.15.1b.fixed/compat.gperf
---- libid3tag-0.15.1b/compat.gperf Fri Jan 23 01:41:32 2004
-+++ libid3tag-0.15.1b.fixed/compat.gperf Thu Oct 19 12:21:10 2006
-@@ -237,6 +237,9 @@
- encoding = id3_parse_uint(&data, 1);
- string = id3_parse_string(&data, end - data, encoding, 0);
-
-+ if (string == 0)
-+ continue;
-+
- if (id3_ucs4_length(string) < 4) {
- free(string);
- continue;
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch
deleted file mode 100644
index aa61d09f874..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur -x '*.lo' -x '*.o' -x config.h -x config.log libid3tag-0.15.1b/file.c libid3tag-0.15.1b-fixed/file.c
---- libid3tag-0.15.1b/file.c 2004-01-23 12:41:32.000000000 +0300
-+++ libid3tag-0.15.1b-fixed/file.c 2005-05-24 23:34:08.000000000 +0400
-@@ -37,6 +37,10 @@
- # include <assert.h>
- # endif
-
-+# ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+# endif
-+
- # include "id3tag.h"
- # include "file.h"
- # include "tag.h"
-@@ -575,6 +579,10 @@
- int v2_write(struct id3_file *file,
- id3_byte_t const *data, id3_length_t length)
- {
-+ struct stat st;
-+ char *buffer;
-+ id3_length_t datalen, offset;
-+
- assert(!data || length > 0);
-
- if (data &&
-@@ -592,9 +600,25 @@
- }
-
- /* hard general case: rewrite entire file */
-+ if (stat(file->path, &st) == -1)
-+ return -1;
-
-- /* ... */
-+ offset = file->tags ? file->tags[0].length : 0;
-+ datalen = st.st_size - offset;
-+ if ((buffer = (char *) malloc(datalen)) == NULL)
-+ return -1;
-
-+ if (fseek(file->iofile, offset, SEEK_SET) == -1 ||
-+ fread(buffer, datalen, 1, file->iofile) != 1 ||
-+ fseek(file->iofile, 0, SEEK_SET) == -1 ||
-+ fwrite(data, length, 1, file->iofile) != 1 ||
-+ fwrite(buffer, datalen, 1, file->iofile) != 1 ||
-+ fflush(file->iofile) == EOF) {
-+ free(buffer);
-+ return -1;
-+ }
-+ free(buffer);
-+
- done:
- return 0;
- }
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
deleted file mode 100644
index 5e0a1f60e7a..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/field.c
-+++ b/field.c
-@@ -291,7 +291,7 @@
-
- end = *ptr + length;
-
-- while (end - *ptr > 0) {
-+ while (end - *ptr > 0 && **ptr != '\0') {
- ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0);
- if (ucs4 == 0)
- goto fail;
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
deleted file mode 100644
index 4d13e47018c..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/tag.c
-+++ b/tag.c
-@@ -714,9 +714,12 @@
-
- frame = id3_tag_findframe(tag, ID3_FRAME_TRACK, 0);
- if (frame) {
-- unsigned int track;
-+ id3_ucs4_t const *string;
-+ unsigned int track = 0;
-
-- track = id3_ucs4_getnumber(id3_field_getstrings(&frame->fields[1], 0));
-+ string = id3_field_getstrings(&frame->fields[1], 0);
-+ if (string)
-+ track = id3_ucs4_getnumber(string);
- if (track > 0 && track <= 0xff) {
- ptr[-2] = 0;
- ptr[-1] = track;
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
deleted file mode 100644
index 91b3d2a5eb0..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/compat.gperf
-+++ b/compat.gperf
-@@ -236,6 +236,10 @@
-
- encoding = id3_parse_uint(&data, 1);
- string = id3_parse_string(&data, end - data, encoding, 0);
-+ if (!string)
-+ {
-+ continue;
-+ }
-
- if (string == 0)
- continue;
---- a/parse.c
-+++ b/parse.c
-@@ -165,6 +165,9 @@
- case ID3_FIELD_TEXTENCODING_UTF_8:
- ucs4 = id3_utf8_deserialize(ptr, length);
- break;
-+ default:
-+ /* FIXME: Unknown encoding! Print warning? */
-+ return NULL;
- }
-
- if (ucs4 && !full) {
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch
deleted file mode 100644
index e2e6eaeb6df..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libid3tag-0.15.1b/utf16.c
-+++ libid3tag-0.15.1b/utf16.c
-@@ -282,5 +282,18 @@
-
- free(utf16);
-
-+ if (end == *ptr && length % 2 != 0)
-+ {
-+ /* We were called with a bogus length. It should always
-+ * be an even number. We can deal with this in a few ways:
-+ * - Always give an error.
-+ * - Try and parse as much as we can and
-+ * - return an error if we're called again when we
-+ * already tried to parse everything we can.
-+ * - tell that we parsed it, which is what we do here.
-+ */
-+ (*ptr)++;
-+ }
-+
- return ucs4;
- }
diff --git a/media-libs/libid3tag/files/id3tag.pc b/media-libs/libid3tag/files/id3tag.pc
deleted file mode 100644
index e6860006891..00000000000
--- a/media-libs/libid3tag/files/id3tag.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: id3tag
-Description: ID3 tag reading library
-Requires:
-Version: 0.15.0b
-Libs: -L${libdir} -lid3tag -lz
-Cflags: -I${includedir}
diff --git a/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch b/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch
deleted file mode 100644
index a365811c55f..00000000000
--- a/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pur libid3tag-0.15.1b-orig/compat.h libid3tag-0.15.1b/compat.h
---- libid3tag-0.15.1b-orig/compat.h 2004-01-23 10:41:32.000000000 +0100
-+++ libid3tag-0.15.1b/compat.h 2017-03-15 01:49:23.808834401 +0100
-@@ -34,7 +34,7 @@ struct id3_compat {
- };
-
- struct id3_compat const *id3_compat_lookup(register char const *,
-- register unsigned int);
-+ register size_t);
-
- int id3_compat_fixup(struct id3_tag *);
-
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
deleted file mode 100644
index 6e6a0e634ee..00000000000
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="The MAD id3tag library"
-HOMEPAGE="http://www.underbit.com/products/mad/"
-SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- >=dev-util/gperf-3.1"
-
-PATCHES=(
- "${FILESDIR}"/${PV}/${P}-64bit-long.patch
- "${FILESDIR}"/${PV}/${P}-a_capella.patch
- "${FILESDIR}"/${PV}/${P}-compat.patch
- "${FILESDIR}"/${PV}/${P}-file-write.patch
- "${FILESDIR}"/${PV}/${P}-fix_overflow.patch
- "${FILESDIR}"/${PV}/${P}-tag.patch
- "${FILESDIR}"/${PV}/${P}-unknown-encoding.patch
- "${FILESDIR}"/${PV}/${P}-utf16.patchlibid3tag-0.15.1b-utf16.patch
- "${FILESDIR}"/${P}-fix-signature.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-static \
- $(use_enable debug debugging)
-}
-
-multilib_src_install() {
- default
-
- # This file must be updated with every version update
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${FILESDIR}"/id3tag.pc
- sed -i \
- -e "s:prefix=.*:prefix=${EPREFIX}/usr:" \
- -e "s:libdir=\${exec_prefix}/lib:libdir=${EPREFIX}/usr/$(get_libdir):" \
- -e "s:0.15.0b:${PV}:" \
- "${ED}"/usr/$(get_libdir)/pkgconfig/id3tag.pc || die
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild b/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
index 98b57a4b19a..3c41650c221 100644
--- a/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake-multilib
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tenacityteam/libid3tag/archive/refs/tags/${PV}.tar.g
LICENSE="GPL-2"
SLOT="0/${PV}" # SOVERSION = ${CMAKE_PROJECT_VERSION} in CMakeLists.txt
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index cfac31e30b1..eb6fe97ace2 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,4 +1,3 @@
-DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
+DIST libjpeg-turbo-2.1.2.tar.gz 2257645 BLAKE2B ae8b7db9fd634b3b29a916098e2b54a8e045cb7a9d883de1f2e8a34542154a724e5d7788fb4b4d816c36d6503fc2a7427165dc3af9d47c77bfb7c51a42bc1d51 SHA512 f0377b58d00310b2e644da31f807ac6c3425823f362ea88bcbed32991dddbea4e7a478676a7c1c4874a34bc578f262bf1d32c925e2f14fa517a50fd911ba8dd5
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
deleted file mode 100644
index 523eed7557d..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/420239
-
-https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160
-
---- a/configure
-+++ b/configure
-@@ -33,7 +33,11 @@ case "$host_os" in
- linux*)
- case "$host_cpu" in
- x86_64)
-- objfmt='ELF64'
-+ if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; then
-+ objfmt='ELF64'
-+ else
-+ objfmt='ELFX32'
-+ fi
- ;;
- *)
- objfmt='ELF'
-@@ -94,6 +98,7 @@ case "$objfmt" in
- a.out) NAFLAGS='-faout -DAOUT';;
- BSD-a.out) NAFLAGS='-faoutb -DAOUT';;
- ELF) NAFLAGS='-felf -DELF';;
-+ ELFX32) NAFLAGS='-felfx32 -DELF -D__x86_64__';;
- ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';;
- RDF) NAFLAGS='-frdf -DRDF';;
- Mach-O) NAFLAGS='-fmacho -DMACHO';;
---- a/simd/nasm_lt.sh
-+++ b/simd/nasm_lt.sh
-@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do
- pic=yes
- fi
- ;;
-- -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \
-+ -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \
- -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64)
- # it's a file format specifier for nasm.
- command="$command $1"
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
deleted file mode 100644
index 8a9fcbd7972..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1bfb0b5247f4fc8f6677639781ce468543490216 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 2 Jun 2020 14:15:37 -0500
-Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM
-
-This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to
-include binary PPM files with maximum values < 255, thus preventing a
-malformed binary PPM input file with those specifications from
-triggering an overrun of the rescale array and potentially crashing
-cjpeg, TJBench, or any program that uses the tjLoadImage() function.
-
-Fixes #433
-diff --git a/rdppm.c b/rdppm.c
-index c0c096218..899436eec 100644
---- a/rdppm.c
-+++ b/rdppm.c
-@@ -5,7 +5,7 @@
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * Modified 2009 by Bill Allombert, Guido Vollbeding.
- * libjpeg-turbo Modifications:
-- * Copyright (C) 2015, 2016, D. R. Commander.
-+ * Copyright (C) 2015, 2016, 2020, D. R. Commander.
- * For conditions of distribution and use, see the accompanying README.ijg
- * file.
- *
-@@ -22,6 +22,7 @@
- * the file is indeed PPM format).
- */
-
-+#define JPEG_INTERNALS
- #include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */
-
- #ifdef PPM_SUPPORTED
-@@ -425,7 +426,7 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
- /* On 16-bit-int machines we have to be careful of maxval = 65535 */
- source->rescale = (JSAMPLE *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-- (size_t) (((long) maxval + 1L) *
-+ (size_t) (((long) MAX(maxval, 255) + 1L) *
- sizeof(JSAMPLE)));
- half_maxval = maxval / 2;
- for (val = 0; val <= (long) maxval; val++) {
-
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
deleted file mode 100644
index f99a1ab27f9..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 909a8cfc7bca9b2e6707425bdb74da997e8fa499 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 12 Jun 2018 16:08:26 -0500
-Subject: [PATCH] Fix CVE-2018-11813
-
-Refer to change log for details.
-
-Fixes #242
----
- ChangeLog.md | 14 ++++++++++++++
- rdtarga.c | 6 ++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
---- libjpeg-turbo-1.5.3/rdtarga.c
-+++ libjpeg-turbo-1.5.3/rdtarga.c
-@@ -125,11 +125,10 @@
- read_non_rle_pixel (tga_source_ptr sinfo)
- /* Read one Targa pixel from the input file; no RLE expansion */
- {
-- register FILE *infile = sinfo->pub.input_file;
- register int i;
-
- for (i = 0; i < sinfo->pixel_size; i++) {
-- sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
-+ sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
- }
- }
-
-@@ -138,7 +137,6 @@
- read_rle_pixel (tga_source_ptr sinfo)
- /* Read one Targa pixel from the input file, expanding RLE data as needed */
- {
-- register FILE *infile = sinfo->pub.input_file;
- register int i;
-
- /* Duplicate previously read pixel? */
-@@ -160,7 +158,7 @@
-
- /* Read next pixel */
- for (i = 0; i < sinfo->pixel_size; i++) {
-- sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
-+ sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
- }
- }
-
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
deleted file mode 100644
index c7e6d105676..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Backported from
-https://github.com/libjpeg-turbo/libjpeg-turbo/commit/43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6
-
---- libjpeg-turbo-1.5.3/rdbmp.c
-+++ libjpeg-turbo-1.5.3/rdbmp.c
-@@ -434,6 +434,12 @@
- progress->total_extra_passes++; /* count file input as separate pass */
- }
-
-+ /* Ensure that biWidth * cinfo->input_components doesn't exceed the maximum
-+ value of the JDIMENSION type. This is only a danger with BMP files, since
-+ their width and height fields are 32-bit integers. */
-+ if ((unsigned long long)biWidth *
-+ (unsigned long long)cinfo->input_components > 0xFFFFFFFFULL)
-+ ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
- /* Allocate one-row buffer for returned data */
- source->pub.buffer = (*cinfo->mem->alloc_sarray)
- ((j_common_ptr) cinfo, JPOOL_IMAGE,
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
deleted file mode 100644
index 0df02e0f65e..00000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools java-pkg-opt-2 toolchain-funcs multilib-minimal
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
- !media-libs/jpeg:62"
-
-BDEPEND="amd64? ( ${ASM_DEPEND} )
- x86? ( ${ASM_DEPEND} )
- amd64-fbsd? ( ${ASM_DEPEND} )
- x86-fbsd? ( ${ASM_DEPEND} )
- amd64-linux? ( ${ASM_DEPEND} )
- x86-linux? ( ${ASM_DEPEND} )
- x64-macos? ( ${ASM_DEPEND} )
- x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
- "${FILESDIR}"/${P}-divzero_fix.patch #658624
- "${FILESDIR}"/${P}-cve-2018-11813.patch
- "${FILESDIR}"/${P}-CVE-2020-13790.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
- if multilib_is_native_abi; then
- myconf+=( $(use_with java) )
- if use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
- fi
- else
- myconf+=( --without-java )
- fi
- [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
-
- # Force /bin/bash until upstream generates a new version. #533902
- CONFIG_SHELL="${EPREFIX}"/bin/bash \
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable static-libs static) \
- --with-mem-srcdst \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- local _java_makeopts
- use java && _java_makeopts="-j1"
- emake ${_java_makeopts}
-
- if multilib_is_native_abi; then
- pushd ../debian/extra >/dev/null
- emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
- popd >/dev/null
- fi
-}
-
-multilib_src_test() {
- emake test
-}
-
-multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- exampledir="${EPREFIX}"/usr/share/doc/${PF} \
- install
-
- if multilib_is_native_abi; then
- pushd "${WORKDIR}"/debian/extra >/dev/null
- emake \
- DESTDIR="${D}" prefix="${EPREFIX}"/usr \
- INSTALL="install -m755" INSTALLDIR="install -d -m755" \
- install
- popd >/dev/null
-
- if use java; then
- rm -rf "${ED}"/usr/classes
- java-pkg_dojar java/turbojpeg.jar
- fi
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name '*.la' -delete || die
-
- docinto html
- dodoc -r "${S}"/doc/html/*
- newdoc "${WORKDIR}"/debian/changelog changelog.debian
- if use java; then
- docinto html/java
- dodoc -r "${S}"/java/doc/*
- newdoc "${S}"/java/README README.java
- fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
index 07b93758d89..a93dbfc0baa 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG ZLIB"
SLOT="0/0.2"
if [[ "$(ver_cut 3)" -lt 90 ]] ; then
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
fi
IUSE="cpu_flags_arm_neon java static-libs"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
index c9b38904748..2b46c483b24 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG ZLIB"
SLOT="0/0.2"
if [[ "$(ver_cut 3)" -lt 90 ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
fi
IUSE="cpu_flags_arm_neon java static-libs"
@@ -34,7 +34,7 @@ BDEPEND=">=dev-util/cmake-3.16.5
x64-cygwin? ( ${ASM_DEPEND} )"
DEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.8:* )"
+ java? ( >=virtual/jdk-1.8:*[-headless-awt] )"
RDEPEND="${COMMON_DEPEND}
java? ( >=virtual/jre-1.8:* )"
@@ -53,18 +53,6 @@ install(TARGETS ${FILE%.c})
EOF
done
- for FILE in ../debian/extra/exifautotran; do
- cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
-EOF
- done
-
- for FILE in ../debian/extra/*.[0-9]*; do
- cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
-EOF
- done
-
cmake_src_prepare
java-pkg-opt-2_src_prepare
}
@@ -116,6 +104,8 @@ multilib_src_install_all() {
einstalldocs
newdoc "${WORKDIR}"/debian/changelog changelog.debian
+ dobin "${WORKDIR}"/debian/extra/exifautotran
+ doman "${WORKDIR}"/debian/extra/*.[0-9]*
docinto html
dodoc -r "${S}"/doc/html/.
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
index b102bfc23bf..43183be273e 100644
--- a/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
index 61b5f29e508..f74391f426f 100644
--- a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
fi
DESCRIPTION="Mixer library for MATE Desktop"
diff --git a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
index 896019b910a..b55583c788e 100644
--- a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
+++ b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="doc static-libs"
BDEPEND="
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 6558cadb2f6..a830a005dfc 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1 +1,2 @@
DIST libmpdclient-2.19.tar.xz 69144 BLAKE2B c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 SHA512 5d67b95d4b615bc750641f6d5a0240122e8f59c66108838a96bd4bc5cdda8b15288ad03d0e35d92d6e562e67c600f68aad643ca541092121074952a1bc5b3590
+DIST libmpdclient-2.20.tar.xz 71552 BLAKE2B d80c343d7655ccddb253275694d40665d286bf9c59729d0c836c927ab479b1ab4819f36a69c62a29c3ad220fcbfa712da5418cf8c3cc9f9e24af4e3c39ce1e11 SHA512 3271c8eae017402976dbfabc51c7cb8d39912c8a3fd6cd075adc978d490f2eb850d86ccec9f7bccbda48c9d6ca1cda89918ac7c76b21f7f63ca1a276b67e94b6
diff --git a/media-libs/libmpdclient/libmpdclient-2.20.ebuild b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
new file mode 100644
index 00000000000..dbea91ce11a
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Library for interfacing Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="test? ( dev-libs/check )"
+
+src_prepare() {
+ default
+
+ sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in || die
+
+ # meson doesn't support setting docdir
+ sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+ -e "/^install_data(/s/'COPYING', //" \
+ -i meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddocumentation=$(usex doc true false)
+ -Dtest=$(usex test true false)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ use examples && dodoc src/example.c
+}
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 168cf53153f..b10f5bdacd7 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,2 +1 @@
-DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
diff --git a/media-libs/libmtp/libmtp-1.1.18.ebuild b/media-libs/libmtp/libmtp-1.1.18.ebuild
deleted file mode 100644
index a4a77ee37e4..00000000000
--- a/media-libs/libmtp/libmtp-1.1.18.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
- inherit autotools git-r3
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="
- acct-group/plugdev
- virtual/libiconv
- virtual/libusb:1
- crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >sys-devel/gettext-0.18.3
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
- default
-
- # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011)
- rm ChangeLog || die
-
- if [[ ${PV} == 9999* ]]; then
- if [[ -e /usr/share/gettext/config.rpath ]]; then
- cp /usr/share/gettext/config.rpath . || die
- else
- touch config.rpath || die # This is from upstream autogen.sh
- fi
- eautoreconf
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable crypt mtpz)
- $(use_enable doc doxygen)
- $(use_enable static-libs static)
- --with-udev="$(get_udevdir)"
- --with-udev-group=plugdev
- --with-udev-mode=0660
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name "*.la" -delete || die
-
- if use examples; then
- docinto examples
- dodoc examples/*.{c,h,sh}
- fi
-}
diff --git a/media-libs/libmtp/libmtp-1.1.19.ebuild b/media-libs/libmtp/libmtp-1.1.19.ebuild
index 6a4e3f9455e..a4a77ee37e4 100644
--- a/media-libs/libmtp/libmtp-1.1.19.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
fi
DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
index dad9d8f1c50..614724d0ed8 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
+++ b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
BDEPEND="
diff --git a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
index 68a4a03b876..8e2c5470d5f 100644
--- a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
BDEPEND="
diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild
index 960eea10c8d..4bf0577da51 100644
--- a/media-libs/libogg/libogg-1.3.5.ebuild
+++ b/media-libs/libogg/libogg-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
LICENSE="BSD"
SLOT="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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
PATCHES=(
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 2e8635a8ed7..4ac3fe07118 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1 +1 @@
-DIST libopenmpt-0.5.11+release.autotools.tar.gz 1477946 BLAKE2B 8fed41af7e5fe1d822716eaa51912e7c5f7d3cd7bef2dbf2266f5e474c4d6300b988636d08bc750602beb831fbf25e532ec137311c84a150806164edc7b5fe30 SHA512 29e19ef2add316fd824f82095db9e81a9a60c07f0b6a54a224c0416452d566c4376e688c5e1b1556461e0f5a1b1543ff45d1388d611d010a646efb8bf1ba733e
+DIST libopenmpt-0.5.13+release.autotools.tar.gz 1479605 BLAKE2B dd8abffb89950e14843a19d8f8066b052a773a1ca8f441c5fd02b191886d605db693dc861ddc7d9d50979231554aea2e76b82d74d35f92a6218a6d1b3fc4c5b8 SHA512 5ddf293755ca9696acaeaf2130a38dece3bba9a45519e1d4b61b594b2e014e67e6f3f79f55d54e7cc2528b9e40feac6d36bbe78788b6f2a1888f89c090872242
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.11.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.13.ebuild
index 0e4a4efa3c6..ecc623d2308 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.11.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.13.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit multilib-minimal
@@ -11,7 +11,7 @@ HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
IUSE="examples mp3 ogg static-libs test vorbis zlib"
RESTRICT="!test? ( test )"
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 8ce2b75d6e6..77cdd1ee144 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,2 +1,3 @@
DIST libopenshot-audio-0.2.0.tar.gz 1711504 BLAKE2B 144502ac7074039861b16309fdf7d79b4846f4fdc7e4e14cf8e96456bf974b82af289e37454b6a93fd393d5faaf46e2685851ecd867bd5bef8df9f798a00cbc2 SHA512 c014a619f32283a8482e0df9224785610a9563073fbd98378367f28f713afa1dc9873d212a40352d3c96040004344f16084e5fe30e4cf64c57309f96e66068c1
DIST libopenshot-audio-0.2.1.tar.gz 1808335 BLAKE2B bde891328991050497f284b1ac9367c2102af9ec224fe0fb36db8bd80432aa86f5d189e74a9e1b3cfb3f8f1385c9b0a07f484210463e17f1e5b698b88d043dce SHA512 2d9182f6e25df188a4502cea331de15363e4fa013e7f6d173602326cce60530d317300682d057bf03c7af6fbdc930a76226c3c5b135ef040145c0c997bc394d6
+DIST libopenshot-audio-0.2.2.tar.gz 1808059 BLAKE2B fcf242bdd678d2e79e2775f3aff7507520a4e8b9ddc7696e1506beca0c1f8e0687d66dfa35a31748e2e622def6e1c22c160e9424c1c27527854ebcafc24413ca SHA512 9960c6225dd9b843d18134e851761bf12861220a2c63970055bc73d554725e56abd6d35339f7490b672faaf0699f58e3701ff8a966ab07af3264325a9d0dc472
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild
new file mode 100644
index 00000000000..d3de3e1956d
--- /dev/null
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for audio editing and playback used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/8"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/alsa-lib
+ media-libs/freetype
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXrandr"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index d7b81431b76..48544415cd1 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,2 +1,3 @@
DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
DIST libopenshot-0.2.6.tar.gz 22472140 BLAKE2B 7ad35cfb927e637c4ded38de751f3f484ab6f051a2eea15153dcf4a66a378023883e76ffde361725a2285018741765fece01a60443421d95a8a772065d9de199 SHA512 13706733280e8c70638a02ad220e6a84f3d26a5a35f5f8f1b820408236aeda8bd8683e19a85a0d466007a1d711ca31bb436f8d4ca4fb6ffbfe169b2976dea525
+DIST libopenshot-0.2.7.tar.gz 22472544 BLAKE2B 511ed214f0ecc43294a787e1c0119f036e274a1e8d051cb6e926bf7a9b5cea416325a2e051fca758d1f80ec2b9d746a4dd268e5ac5322fe8539fa2041a8c4d9d SHA512 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
diff --git a/media-libs/libopenshot/libopenshot-0.2.7.ebuild b/media-libs/libopenshot/libopenshot-0.2.7.ebuild
new file mode 100644
index 00000000000..45cad1c947a
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.2.7.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cmake python-single-r1 toolchain-funcs
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/21"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +imagemagick +opencv +python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/jsoncpp:0=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ >=media-libs/libopenshot-audio-0.2.1:0=
+ media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis]
+ net-libs/cppzmq
+ net-libs/zeromq
+ imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
+ opencv? ( >=media-libs/opencv-4.5.2:=[contrib,contribdnn] )
+ python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+ python? ( dev-lang/swig )
+ test? (
+ dev-cpp/catch:0
+ dev-libs/unittest++
+ )"
+
+check_compiler() {
+ if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
+ eerror "${P} requires a compiler with OpenMP support. Your current"
+ eerror "compiler does not support it. If you use gcc, you can"
+ eerror "re-emerge it with the 'openmp' use flag enabled."
+ die "The current compiler does not support OpenMP"
+ fi
+}
+
+pkg_pretend() {
+ check_compiler
+}
+
+pkg_setup() {
+ check_compiler
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+ # https://github.com/OpenShot/libopenshot/issues/17
+ use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDISABLE_BUNDLED_JSONCPP=ON
+ -DENABLE_MAGICK=$(usex imagemagick)
+ -DENABLE_OPENCV=$(usex opencv)
+ -DENABLE_RUBY=OFF # TODO: add ruby support
+ -DENABLE_PYTHON=$(usex python)
+ -DENABLE_TESTS=$(usex test)
+ -DUSE_SYSTEM_JSONCPP=ON
+ $(cmake_use_find_package imagemagick ImageMagick)
+ )
+ use python && mycmakeargs+=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_build doc
+}
+
+src_test() {
+ cmake_build test
+}
+
+src_install() {
+ local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
+ use examples && DOCS+=( examples/ )
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+ cmake_src_install
+ use python && python_optimize
+}
diff --git a/media-libs/libpano13/libpano13-2.9.20-r1.ebuild b/media-libs/libpano13/libpano13-2.9.20-r1.ebuild
index 098c193153d..e5f3b4c3013 100644
--- a/media-libs/libpano13/libpano13-2.9.20-r1.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.20-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/3"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="java static-libs"
DEPEND="media-libs/libpng:0=
diff --git a/media-libs/libplacebo/libplacebo-3.120.3.ebuild b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
index 3fac521ec40..61eab11b1f7 100644
--- a/media-libs/libplacebo/libplacebo-3.120.3.ebuild
+++ b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
@@ -60,6 +60,10 @@ multilib_src_configure() {
$(meson_use test tests)
# hard-code path from dev-util/vulkan-headers
-Dvulkan-registry=/usr/share/vulkan/registry/vk.xml
+ -Ddemos=false
+ # ^ useless, and also semi-broken
+ # (well, actually, looks like it requires some new just-for-demos deps and even with versions restrictions (say, >=glfw-3.3))
+ # feel free to patch if you need demos for some strange reason.
)
meson_src_configure
}
diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest
index 4ca0b598965..be88fa876a9 100644
--- a/media-libs/libpng-compat/Manifest
+++ b/media-libs/libpng-compat/Manifest
@@ -1,3 +1,2 @@
DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
-DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index 21c669bb96b..a906a0b6825 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -10,14 +10,13 @@ inherit libtool multilib-minimal
MY_P="libpng-${PV}"
DESCRIPTION="Portable Network Graphics library"
HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz
- apng? ( https://dev.gentoo.org/~polynomial-c/${MY_P}-apng.patch.gz )"
+SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="libpng"
SLOT="1.5"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng cpu_flags_arm_neon"
+IUSE="cpu_flags_arm_neon"
RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
!=media-libs/libpng-1.5*"
@@ -35,14 +34,6 @@ pkg_setup() {
src_prepare() {
default
- if use apng; then
- # fix windows path in patch file. Please check for each release if this can be removed again.
- sed 's@scripts\\symbols.def@scripts/symbols.def@' \
- -i "${WORKDIR}"/${PN/-compat}-*-apng.patch || die
- eapply "${WORKDIR}"/${PN/-compat}-*-apng.patch
- # Don't execute symbols check with apng patch wrt #378111
- sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
- fi
elibtoolize
}
diff --git a/media-libs/libpng-compat/metadata.xml b/media-libs/libpng-compat/metadata.xml
index 28e5b3dcd41..5f08da95b1c 100644
--- a/media-libs/libpng-compat/metadata.xml
+++ b/media-libs/libpng-compat/metadata.xml
@@ -5,16 +5,15 @@
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
- <use>
- <flag name="apng">support unofficial APNG (Animated PNG) spec</flag>
- </use>
+ <maintainer type="project">
+ <email>codec@gentoo.org</email>
+ <name>Codec project</name>
+ </maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:libpng:libpng</remote-id>
<remote-id type="sourceforge">libpng</remote-id>
</upstream>
<slots>
- <slot name="0">For building against. This is the only slot
- that provides headers and command line tools.</slot>
<slot name="1.2">For binary compatibility, provides libpng12.so.0
only.</slot>
<slot name="1.5">For binary compatibility, provides libpng15.so.15
diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index e798373f1df..10e62abda65 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -18,12 +18,6 @@
<remote-id type="sourceforge">libpng</remote-id>
</upstream>
<slots>
- <slot name="0">For building against. This is the only slot
- that provides headers and command line tools.</slot>
- <slot name="1.2">For binary compatibility, provides libpng12.so.0
- only.</slot>
- <slot name="1.5">For binary compatibility, provides libpng15.so.15
- only.</slot>
<subslots>Reflect ABI compatibility for libpng.so.</subslots>
</slots>
</pkgmetadata>
diff --git a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
index 73c0b7ed565..5cfed1d13e1 100644
--- a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
+++ b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND="dev-util/netsurf-buildsystem"
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index fb0051a0279..28d16c08693 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,2 +1 @@
-DIST libsamplerate-0.2.1.tar.bz2 3747188 BLAKE2B 83540f3e75cfa79cbd166f075d22cab6a63e0e057b90ac6a3760c07196cac962df7d1ca26620a9033de046e0528bee3ded2b482e8629b1ae316844b5b31f3074 SHA512 f54f7f12c9536868d7a11fc9cbb86857505e7b75fe34cedaf0b9bfc864da6037296b3eae303a33d4c87b7fd20d96933b91ef59c8cc3d1313b9fc21654e5daa2d
DIST libsamplerate-0.2.2.tar.xz 3319468 BLAKE2B 71b1e8a1644a94fff019abc6bf98c557df84994293f1e9bc651ad3ad3f0afeb24f54b8c75fc26e5202ae7c3a3e34e783fd1be7f7c6fdefe9eac9a5dfe7100b91 SHA512 d23ae54d23209ba22baae9e5fd178dd8e0e99205dada7e7c3a7b3a3d8cf816ed427a411bfeb008427f64da7767d645edce40811f238af11c8c386f5ef25a9f0c
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
deleted file mode 100644
index 283b46dc02b..00000000000
--- a/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
-HOMEPAGE="https://libsndfile.github.io/libsamplerate/"
-
-if [[ ${PV} == *9999 ]]; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
-else
- SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Alsa/FFTW are only required for tests
-# libsndfile is only used by examples and tests
-DEPEND="
- test? (
- media-libs/alsa-lib[${MULTILIB_USEDEP}]
- media-libs/libsndfile[${MULTILIB_USEDEP}]
- sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
- )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- default
- [[ ${PV} == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-static \
- $(use_enable test alsa) \
- $(use_enable test fftw) \
- $(use_enable test sndfile)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
index 698fa623a51..a38ac235842 100644
--- a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
else
SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
LICENSE="BSD-2"
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index 9451b5824f5..be7249ff1e2 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,2 +1 @@
-DIST libsbsms-2.0.2.tar.gz 450170 BLAKE2B a9e75f1f2a3da2a407d21bd267fe842d2c2367f85e4cb588902ae34e56b76297c2f60968113ae7a08a6652e57bc20376f1a60e97d6d59863f9f1ae30589e0723 SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c
DIST libsbsms-2.3.0.tar.gz 450111 BLAKE2B 3707b573ffef414e5373526704d4e54bf0f53b6bc5d9ce6e69bf22e11e5380eccb65a6c26e3598ee4bf43f341a7dcc6e1a7d7f5113bb649ef9e94b01ba36cc0f SHA512 e5b544c2bdbaa2169236987c7a043838c8d1761b25280c476d7a32656d482c6485cb33f579ea9d1ce586ec7b2913ed8fdcf1abe5c7cc8b9e4eef9ce87de54627
diff --git a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
deleted file mode 100644
index cc6a6e5d89e..00000000000
--- a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AUTOTOOLS_AUTORECONF=true
-inherit autotools
-
-DESCRIPTION="A library for high quality time and pitch scale modification"
-HOMEPAGE="http://sbsms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
-IUSE="cpu_flags_x86_sse static-libs"
-
-PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-shared \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_sse sse) \
- --disable-multithreaded
- # threaded version causes segfaults
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsbsms/libsbsms-2.3.0.ebuild b/media-libs/libsbsms/libsbsms-2.3.0.ebuild
index 0519a044dd7..a3e87db0a45 100644
--- a/media-libs/libsbsms/libsbsms-2.3.0.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/claytonotey/${PN}/archive/refs/tags/${PV}.tar.gz ->
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
IUSE="cpu_flags_x86_sse static-libs"
PATCHES=( "${FILESDIR}/${PN}-2.0.2-cflags.patch" )
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index e8a0a07ccce..07ad4f42215 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -125,6 +125,7 @@ multilib_src_configure() {
--enable-cpuinfo \
--disable-alsa-shared \
--disable-esd-shared \
+ --disable-sndio \
--disable-pulseaudio-shared \
--disable-arts-shared \
--disable-nas-shared \
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 580340a47af..f599232c762 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1 @@
-DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
deleted file mode 100644
index 0d4dfdcb445..00000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix --disable-static.
-
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-
---- SDL2-2.0.14/configure.ac
-+++ SDL2-2.0.14/configure.ac
-@@ -3863,7 +3863,7 @@
- if test -f /lib/w32api/libuuid.a; then
- LIBUUID=/lib/w32api/libuuid.a
- else
-- LIBUUID=-luuid
-+ LIBUUID=-Wl,-luuid
- fi
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
- # The Windows platform requires special setup
---- SDL2-2.0.14/Makefile.in
-+++ SDL2-2.0.14/Makefile.in
-@@ -151,13 +151,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
-
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
-
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
-
- install: all install-bin install-hdrs install-lib install-data
- install-bin:
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch
deleted file mode 100644
index 948f68fe234..00000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- SDL2-2.0.14/src/video/SDL_vulkan_utils.c
-+++ SDL2-2.0.14/src/video/SDL_vulkan_utils.c
-@@ -91,8 +91,10 @@
- return "VK_ERROR_VALIDATION_FAILED_EXT";
- case VK_ERROR_INVALID_SHADER_NV:
- return "VK_ERROR_INVALID_SHADER_NV";
-+#if VK_HEADER_VERSION < 162
- case VK_ERROR_INCOMPATIBLE_VERSION_KHR:
- return "VK_ERROR_INCOMPATIBLE_VERSION_KHR";
-+#endif
- case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT:
- return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT";
- case VK_ERROR_NOT_PERMITTED_EXT:
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
deleted file mode 100644
index 263553b6bc0..00000000000
--- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
+++ /dev/null
@@ -1,210 +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
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://www.libsdl.org/"
-SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
-REQUIRED_USE="
- alsa? ( sound )
- fcitx4? ( dbus )
- gles2? ( video )
- ibus? ( dbus )
- jack? ( sound )
- nas? ( sound )
- opengl? ( video )
- pulseaudio? ( sound )
- vulkan? ( video )
- wayland? ( gles2 )
- xinerama? ( X )
- xscreensaver? ( X )"
-
-CDEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
- fcitx4? ( app-i18n/fcitx:4 )
- gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
- ibus? ( app-i18n/ibus )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- kms? (
- >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
- )
- libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
- nas? (
- >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- )
- opengl? (
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
- >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
- )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.14[${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}]
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
- xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
- )"
-RDEPEND="${CDEPEND}
- vulkan? ( media-libs/vulkan-loader )"
-DEPEND="${CDEPEND}
- ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
- vulkan? ( dev-util/vulkan-headers )
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/SDL2/SDL_config.h
- /usr/include/SDL2/SDL_platform.h
- /usr/include/SDL2/begin_code.h
- /usr/include/SDL2/close_code.h
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.14-static-libs.patch
- "${FILESDIR}"/${PN}-2.0.14-vulkan.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Unbundle some headers.
- rm -r src/video/khronos || die
- ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
-
- # SDL seems to customize SDL_config.h.in to remove macros like
- # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
- # being reintroduced.
- # https://bugs.gentoo.org/764959
- AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \
- eautoreconf
-
- # libsdl2-2.0.14 build regression. Please check if still needed
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- use custom-cflags || strip-flags
-
- if use ibus; then
- local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
- fi
-
- # sorted by `./configure --help`
- local myeconfargs=(
- $(use_enable static-libs static)
- --enable-atomic
- $(use_enable sound audio)
- $(use_enable video)
- --enable-render
- --enable-events
- $(use_enable joystick)
- $(use_enable haptic)
- --enable-power
- --enable-filesystem
- $(use_enable threads)
- --enable-timers
- --enable-file
- --enable-loadso
- --enable-cpuinfo
- --enable-assembly
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable cpu_flags_x86_sse ssemath)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_3dnow 3dnow)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable cpu_flags_x86_sse2 sse2)
- $(use_enable oss)
- $(use_enable alsa)
- --disable-alsa-shared
- $(use_enable jack)
- --disable-jack-shared
- --disable-esd
- $(use_enable pulseaudio)
- --disable-pulseaudio-shared
- --disable-arts
- $(use_enable libsamplerate)
- $(use_enable nas)
- --disable-nas-shared
- --disable-sndio
- --disable-sndio-shared
- $(use_enable sound diskaudio)
- $(use_enable sound dummyaudio)
- $(use_enable wayland video-wayland)
- --disable-wayland-shared
- $(use_enable video_cards_vc4 video-rpi)
- $(use_enable X video-x11)
- --disable-x11-shared
- $(use_enable X video-x11-xcursor)
- $(use_enable X video-x11-xdbe)
- $(use_enable xinerama video-x11-xinerama)
- $(use_enable X video-x11-xinput)
- $(use_enable X video-x11-xrandr)
- $(use_enable xscreensaver video-x11-scrnsaver)
- $(use_enable X video-x11-xshape)
- $(use_enable X video-x11-vm)
- $(use_enable aqua video-cocoa)
- --disable-video-directfb
- --disable-fusionsound
- --disable-fusionsound-shared
- $(use_enable kms video-kmsdrm)
- --disable-kmsdrm-shared
- $(use_enable video video-dummy)
- $(use_enable opengl video-opengl)
- --disable-video-opengles1
- $(use_enable gles2 video-opengles2)
- $(use_enable vulkan video-vulkan)
- $(use_enable udev libudev)
- $(use_enable dbus)
- $(use_enable fcitx4 fcitx)
- $(use_enable ibus)
- --disable-directx
- --disable-rpath
- --disable-render-d3d
- $(use_with X x)
- )
-
- #ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake V=1
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- # Do not delete the static .a libraries here as some are
- # mandatory. They may be needed even when linking dynamically.
- find "${ED}" -type f -name "*.la" -delete || die
- dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
-}
diff --git a/media-libs/libsdl2/libsdl2-2.0.16.ebuild b/media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild
index c5c5e876b3c..c74bfff69b2 100644
--- a/media-libs/libsdl2/libsdl2-2.0.16.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
REQUIRED_USE="
@@ -42,7 +42,7 @@ CDEPEND="
jack? ( virtual/jack[${MULTILIB_USEDEP}] )
kms? (
>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
+ >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
)
libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
nas? (
@@ -59,7 +59,7 @@ CDEPEND="
udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
wayland? (
>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
+ >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
)
X? (
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 6707ea7b058..6afa5a98c90 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,2 +1 @@
-DIST libsidplayfp-2.2.2.tar.gz 794119 BLAKE2B eb0fd39e8bffdce45d081f5dab9074db9642e74f9bd06a5f17453254bb1ab4f0348a9b49e43a00a0f5cbff57fe3ddd1408cbf048bd228784fd5b1ac19700f944 SHA512 46882c5edd20a5b00ee5b46b0b6c65c0987c33406532f0b1f1750b0f8faf2968ee45e68ee65e6ca9cc39123273b08e139a8614ba9878d14099388e647e3bad1b
DIST libsidplayfp-2.3.0.tar.gz 794863 BLAKE2B 5727cdaf155711f8fe582cfa49d868be89fcf7e9f58cb7b8d83fefecbb04830a04957f8f176527928da26cb47c7508d534c1b35607cc713610ddcd920b760049 SHA512 2141bc9768353fadbb8c6f4ba6904388048d4d1432424b87fe60162135059d5c9312f7bf01c67a75eda8b4697d801bc2020f88b696794311eef88864ae65d974
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild
deleted file mode 100644
index c7f632d763d..00000000000
--- a/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 ~hppa ~riscv x86"
-IUSE="static-libs"
-
-src_prepare() {
- default
- # fix automagic. warning: modifying .ac triggers maintainer mode.
- sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
index 59fb066277d..c7f632d763d 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~riscv x86"
IUSE="static-libs"
src_prepare() {
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index 0fae304e52a..de4f62e9023 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1 +1,2 @@
+DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020 SHA512 ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
DIST libsixel-1.8.6.tar.gz 4791628 BLAKE2B 5fa197d0d759eecd4040c4c1101e6d85fb9af7405ccdff75be571b3ac6b2b0aab6415bc3fdbb37157795f89190fcc1d0fea1bdf705e83a34762e2b05f5588c69 SHA512 460a5d46bada705b4a7ec2e250e2bde7f4b8ba155281fa5a102d1121f79c1c79145f042cd1f4bf93a2fc29e784e89afd539e963470663fc659d4fe72ea49fdaf
diff --git a/media-libs/libsixel/files/libsixel-meson.patch b/media-libs/libsixel/files/libsixel-meson.patch
new file mode 100644
index 00000000000..b912288e2e6
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-meson.patch
@@ -0,0 +1,65 @@
+--- a/meson.build
++++ b/meson.build
+@@ -27,7 +27,7 @@
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ __attribute__((deprecated)) void test(void) {}
+ ''')
+- conf_data.set('HAVE_DIAGNOSTIC_DEPRECATED_DECLARATIONS', true)
++ conf_data.set('HAVE_DIAGNOSTIC_DEPRECATED_DECLARATIONS', 1)
+ endif
+
+ c_args = [
+@@ -101,24 +101,24 @@
+ python2_installation = pymod.find_installation('python2', required: get_option('python2'))
+
+ if get_option('libcurl').enabled() and curl_found.found()
+- conf_data.set('HAVE_LIBCURL', true)
++ conf_data.set('HAVE_LIBCURL', 1)
+ libsixel_deps += [curl_found]
+ endif
+
+-if get_option('jpeg').enabled() and jpeg_found
+- conf_data.set('HAVE_JPEG', true)
++if get_option('jpeg').enabled() and jpeg_found.found()
++ conf_data.set('HAVE_JPEG', 1)
+ libsixel_deps += [jpeg_found]
+ endif
+
+-if get_option('png').enabled() and png_found
+- conf_data.set('HAVE_PNG', true)
++if get_option('png').enabled() and png_found.found()
++ conf_data.set('HAVE_PNG', 1)
+ libsixel_deps += [png_found]
+ endif
+
+ loaders = ['stb-image']
+
+ if get_option('gd').enabled() and gd_found.found()
+- conf_data.set('HAVE_GD', true)
++ conf_data.set('HAVE_GD', 1)
+ libsixel_deps += [gd_found]
+ loaders += ['gd']
+
+@@ -132,19 +132,19 @@
+
+ foreach f : gd_funcs
+ if cc.has_function(f, dependencies: gd_found)
+- conf_data.set('HAVE_DECL_@0@'.format(f.to_upper()), true)
++ conf_data.set('HAVE_DECL_@0@'.format(f.to_upper()), 1)
+ endif
+ endforeach
+ endif
+
+ if get_option('gdk-pixbuf2').enabled() and gdkpixbuf2_found.found()
+- conf_data.set('HAVE_GDK_PIXBUF2', true)
++ conf_data.set('HAVE_GDK_PIXBUF2', 1)
+ libsixel_deps += [gdkpixbuf2_found]
+ loaders += ['gdk-pixbuf2']
+ endif
+
+ if have_getopt_long
+- conf_data.set('HAVE_GETOPT_LONG', true)
++ conf_data.set('HAVE_GETOPT_LONG', 1)
+ endif
+
+ configure_file(output: 'config.h', configuration: conf_data)
diff --git a/media-libs/libsixel/files/libsixel-static-libs.patch b/media-libs/libsixel/files/libsixel-static-libs.patch
new file mode 100644
index 00000000000..5184debb2b6
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-static-libs.patch
@@ -0,0 +1,11 @@
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -21,7 +21,7 @@
+ 'writer.c'
+ ]
+
+-libsixel = both_libraries('sixel',
++libsixel = shared_library('sixel',
+ sources,
+ include_directories: [inc, inc_config],
+ dependencies: libsixel_deps,
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
new file mode 100644
index 00000000000..4e9128a773d
--- /dev/null
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL="1"
+
+inherit bash-completion-r1 distutils-r1 meson
+
+DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
+HOMEPAGE="https://github.com/libsixel/libsixel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="curl gd gtk jpeg png python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="curl? ( net-misc/curl )
+ gd? ( media-libs/gd )
+ gtk? ( x11-libs/gdk-pixbuf:2 )
+ jpeg? ( virtual/jpeg:0 )
+ png? ( media-libs/libpng:0 )
+ python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-meson.patch
+ "${FILESDIR}"/${PN}-static-libs.patch
+)
+
+src_prepare() {
+ default
+ if use python; then
+ cd python || die
+ distutils-r1_src_prepare
+ cd - >/dev/null || die
+ fi
+}
+
+src_configure() {
+ emesonargs=(
+ $(meson_feature curl libcurl)
+ $(meson_feature gd)
+ $(meson_feature gtk gdk-pixbuf2)
+ $(meson_feature jpeg)
+ $(meson_feature png)
+ $(meson_feature test tests)
+ -Dbashcompletiondir="$(get_bashcompdir)"
+ )
+ meson_src_configure
+ if use python; then
+ cd python || die
+ distutils-r1_src_configure
+ cd - >/dev/null || die
+ fi
+}
+
+src_compile() {
+ meson_src_compile
+ if use python; then
+ cd python || die
+ distutils-r1_src_compile
+ cd - >/dev/null || die
+ fi
+}
+
+src_install() {
+ meson_src_install
+
+ cd images || die
+ docompress -x /usr/share/doc/${PF}/images
+ docinto images
+ dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
+ cd - >/dev/null || die
+
+ if use python; then
+ cd python || die
+ distutils-r1_src_install
+ cd - >/dev/null || die
+ fi
+}
diff --git a/media-libs/libsixel/libsixel-1.8.6.ebuild b/media-libs/libsixel/libsixel-1.8.6.ebuild
index ad139ad3d01..0cb049507e8 100644
--- a/media-libs/libsixel/libsixel-1.8.6.ebuild
+++ b/media-libs/libsixel/libsixel-1.8.6.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL="1"
-inherit bash-completion-r1
+inherit bash-completion-r1 distutils-r1
DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
HOMEPAGE="https://github.com/saitoha/libsixel"
@@ -12,15 +14,30 @@ SRC_URI="https://github.com/saitoha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT public-domain"
SLOT="0"
KEYWORDS="amd64 ~ia64 x86"
-IUSE="curl gd gtk jpeg png static-libs"
+IUSE="curl gd gtk jpeg png python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="curl? ( net-misc/curl )
gd? ( media-libs/gd )
gtk? ( x11-libs/gdk-pixbuf:2 )
jpeg? ( virtual/jpeg:0 )
- png? ( media-libs/libpng:0 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ png? ( media-libs/libpng:0 )
+ python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )"
+
+src_prepare() {
+ default
+ if use python; then
+ cd python || die
+ distutils-r1_src_prepare
+ cd - >/dev/null || die
+ fi
+}
src_configure() {
econf \
@@ -32,6 +49,20 @@ src_configure() {
$(use_enable static-libs static) \
--with-bashcompletiondir=$(get_bashcompdir) \
--disable-python
+ if use python; then
+ cd python || die
+ distutils-r1_src_configure
+ cd - >/dev/null || die
+ fi
+}
+
+src_compile() {
+ default
+ if use python; then
+ cd python || die
+ distutils-r1_src_compile
+ cd - >/dev/null || die
+ fi
}
src_test() {
@@ -42,8 +73,15 @@ src_install() {
default
use static-libs || find "${ED}" -name '*.la' -delete || die
- cd images
+ cd images || die
docompress -x /usr/share/doc/${PF}/images
docinto images
dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
+ cd - >/dev/null || die
+
+ if use python; then
+ cd python || die
+ distutils-r1_src_install
+ cd - >/dev/null || die
+ fi
}
diff --git a/media-libs/libsixel/metadata.xml b/media-libs/libsixel/metadata.xml
index 457207a9bc1..3bd897a7c98 100644
--- a/media-libs/libsixel/metadata.xml
+++ b/media-libs/libsixel/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="github">saitoha/libsixel</remote-id>
+ <remote-id type="github">libsixel/libsixel</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-libs/libsndfile/libsndfile-1.0.31.ebuild b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
index c897eaf1d6e..29bd5e0419d 100644
--- a/media-libs/libsndfile/libsndfile-1.0.31.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 39c0f12398c..9a3d895a3dd 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 66892412a16..76ff18b6626 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,2 +1 @@
-DIST soundtouch-2.3.0.tar.bz2 528840 BLAKE2B e76627c323c223a067db6fd65a08661f39c9b55e0eb8ead7d643f92707dc56b8d235eded27a95d5eb1ea751d15336d4cb4b757c4abb2f6780258d81899484241 SHA512 f85974d7afd010bd874a4ffc51abf4013694334bfb09071f1c4d478641d34b5eecb9efc6ac41d8f0e6a5d1cb4095289316c124c522b4ca3fbd6a91b6cfc83083
DIST soundtouch-2.3.1.tar.bz2 529126 BLAKE2B f8ba587ac199cd1e91f3d3487b81457b7c7bb2b4dca8867376ae47f92bf4d5e60aef3d310eab56510995d5ce72e94ce55ecc4e601bfb3b4eba52c40982032d6b SHA512 9fac7484aead1a20aae019b29847ea13ad6d8cb72272313fcffd859b31479d2ab2fe2f69cfef2b3fd35e9b03923d095bf44a67b46f2b313ac711aa31df0fdd59
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
deleted file mode 100644
index 6d1ccebfc71..00000000000
--- a/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-MY_PN=${PN/lib}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
-SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-# subslot = libSoundTouch.so soname
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse openmp static-libs"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
- sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
- sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-shared
- --disable-integer-samples
- $(use_enable cpu_flags_x86_sse x86-optimizations)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
index f9bd2650355..fd181f34ded 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1"
# subslot = libSoundTouch.so soname
SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="cpu_flags_x86_sse openmp static-libs"
BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
index 5b62e937edc..7efd6b88007 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND="
diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
index 105229eb310..fce8a10ceeb 100644
--- a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${
LICENSE="BSD"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
PATCHES=(
"${FILESDIR}/${PN}-20200413-makefile.patch"
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 8ad11332de4..b7cae8ef239 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1 +1,2 @@
DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
+DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
diff --git a/media-libs/libv4l/libv4l-1.22.1.ebuild b/media-libs/libv4l/libv4l-1.22.1.ebuild
new file mode 100644
index 00000000000..af9048e8367
--- /dev/null
+++ b/media-libs/libv4l/libv4l-1.22.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info multilib-minimal
+
+MY_P="v4l-utils-${PV}"
+
+DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dvb jpeg"
+
+RDEPEND="
+ dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
+ !elibc_glibc? ( sys-libs/argp-standalone )
+ jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ !media-tv/v4l2-ctl
+ !<media-tv/ivtv-utils-1.4.0-r2
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ CONFIG_CHECK="~SHMEM"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # Hard disable the flags that apply only to the utils.
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ $(use_enable dvb libdvbv5) \
+ --disable-qv4l2 \
+ --disable-qvidcap \
+ --disable-v4l-utils \
+ $(use_with jpeg) \
+ $(use_with dvb libudev)
+}
+
+multilib_src_compile() {
+ emake -C lib
+}
+
+multilib_src_install() {
+ emake -j1 -C lib DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog README.lib* TODO
+
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libvpx/libvpx-1.10.0.ebuild b/media-libs/libvpx/libvpx-1.10.0.ebuild
index e049dd9007b..a5e65422d5c 100644
--- a/media-libs/libvpx/libvpx-1.10.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.10.0.ebuild
@@ -67,7 +67,7 @@ multilib_src_configure() {
--enable-vp8
--enable-vp9
--enable-shared
- --extra-cflags="${CFLAGS}"
+ --disable-optimizations
$(use_enable postproc)
$(use_enable static-libs static)
$(use_enable test unit-tests)
diff --git a/media-libs/libxmi/libxmi-1.3-r1.ebuild b/media-libs/libxmi/libxmi-1.3-r1.ebuild
index de24622b704..1f6d89aec8f 100644
--- a/media-libs/libxmi/libxmi-1.3-r1.ebuild
+++ b/media-libs/libxmi/libxmi-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
src_prepare() {
default
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
deleted file mode 100644
index f01ed2c29a2..00000000000
--- a/media-libs/libyami/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libyami-1.3.2.tar.gz 820517 BLAKE2B 189ef95bcd504422550f6df38433d042a45e2a1c36b30b1b5445ce69076c95f4d1b60e12e09ff4b11245e3fcdc70a4fa5e0879e3976c4891ca98fa00d79360c1 SHA512 25300d589119b5f5211b5a2445b408dbb35aea83bf18bc3d3b42d6b29151495f5118cf0f32bcc8c3756ac58fccb16932e78c8b6e7b29daffcc9ee08a3e0b5b54
diff --git a/media-libs/libyami/libyami-1.3.2.ebuild b/media-libs/libyami/libyami-1.3.2.ebuild
deleted file mode 100644
index b521ead3f99..00000000000
--- a/media-libs/libyami/libyami-1.3.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM=git-r3
- EGIT_REPO_URI="https://github.com/01org/libyami"
-fi
-
-inherit ${SCM} autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
-HOMEPAGE="https://github.com/01org/libyami"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-else
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/01org/libyami/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug egl dmabuf doc md5 v4l X test wayland"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
- v4l? (
- >=virtual/opengl-7[${MULTILIB_USEDEP}]
- >=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
- >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
- )
- X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
- md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( >=dev-cpp/gtest-1.7 )
-"
-
-src_prepare() {
- sed -i -e 's/-Werror//' configure.ac || die
- sed -e 's#$(top_srcdir)/gtestsrc/libgtest.la#-lgtest#' -i */Makefile.unittest || die
- sed -e 's#-I$(top_srcdir)/gtestsrc/gtest/include##' -i */Makefile.unittest || die
- sed -e 's/gtestsrc//' -i Makefile.am || die
- eautoreconf
-}
-
-multilib_src_configure() {
- append-cppflags -I"${S}/" -I"${BUILD_DIR}/interface"
- ECONF_SOURCE="${S}" econf \
- $(use_enable debug) \
- $(use_enable egl) \
- $(use_enable v4l v4l2) \
- $(use_enable v4l v4l2-ops) \
- $(use_enable X x11) \
- $(use_enable dmabuf) \
- $(use_enable md5) \
- $(use_enable wayland) \
- $(use_enable test tests) \
- $(multilib_native_use_enable doc docs) \
- --enable-h265dec \
- --enable-vc1dec \
- --enable-h264dec \
- --enable-jpegdec \
- --enable-mpeg2dec \
- --enable-vp8dec \
- --enable-vp9dec \
- --enable-h265enc \
- --enable-h264enc \
- --enable-jpegenc \
- --enable-vp8enc \
- --enable-vp9enc
-}
-
-multilib_src_compile() {
- emake
- multilib_is_native_abi && use doc && emake -C doc
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- multilib_is_native_abi && use doc && dohtml -r doc/html/*
-}
-
-src_install() {
- multilib-minimal_src_install
- find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libyami/libyami-9999.ebuild b/media-libs/libyami/libyami-9999.ebuild
deleted file mode 100644
index b521ead3f99..00000000000
--- a/media-libs/libyami/libyami-9999.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM=git-r3
- EGIT_REPO_URI="https://github.com/01org/libyami"
-fi
-
-inherit ${SCM} autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
-HOMEPAGE="https://github.com/01org/libyami"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-else
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/01org/libyami/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug egl dmabuf doc md5 v4l X test wayland"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
- v4l? (
- >=virtual/opengl-7[${MULTILIB_USEDEP}]
- >=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
- >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
- )
- X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
- md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( >=dev-cpp/gtest-1.7 )
-"
-
-src_prepare() {
- sed -i -e 's/-Werror//' configure.ac || die
- sed -e 's#$(top_srcdir)/gtestsrc/libgtest.la#-lgtest#' -i */Makefile.unittest || die
- sed -e 's#-I$(top_srcdir)/gtestsrc/gtest/include##' -i */Makefile.unittest || die
- sed -e 's/gtestsrc//' -i Makefile.am || die
- eautoreconf
-}
-
-multilib_src_configure() {
- append-cppflags -I"${S}/" -I"${BUILD_DIR}/interface"
- ECONF_SOURCE="${S}" econf \
- $(use_enable debug) \
- $(use_enable egl) \
- $(use_enable v4l v4l2) \
- $(use_enable v4l v4l2-ops) \
- $(use_enable X x11) \
- $(use_enable dmabuf) \
- $(use_enable md5) \
- $(use_enable wayland) \
- $(use_enable test tests) \
- $(multilib_native_use_enable doc docs) \
- --enable-h265dec \
- --enable-vc1dec \
- --enable-h264dec \
- --enable-jpegdec \
- --enable-mpeg2dec \
- --enable-vp8dec \
- --enable-vp9dec \
- --enable-h265enc \
- --enable-h264enc \
- --enable-jpegenc \
- --enable-vp8enc \
- --enable-vp9enc
-}
-
-multilib_src_compile() {
- emake
- multilib_is_native_abi && use doc && emake -C doc
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- multilib_is_native_abi && use doc && dohtml -r doc/html/*
-}
-
-src_install() {
- multilib-minimal_src_install
- find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
deleted file mode 100644
index eef0bdb8e3f..00000000000
--- a/media-libs/libyami/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="egl">Enable EGL support.</flag>
- <flag name="v4l">Add support for V4L2 hardware codecs.</flag>
- <flag name="md5">Add support for generating md5 sums for each frame.</flag>
- <flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
- </use>
- <upstream>
- <remote-id type="github">01org/libyami</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch b/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch
new file mode 100644
index 00000000000..2603b4c8a4c
--- /dev/null
+++ b/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch
@@ -0,0 +1,12 @@
+--- a/src/dsp/Makefile
++++ b/src/dsp/Makefile
+@@ -44,6 +44,9 @@ endif
+ ifeq ($(BUILD_PROFILE), armv7ve)
+ LINK_OBJECTS += $(ARM_IMPL) $(NEON_D32_IMPL)
+ endif
++ifeq ($(BUILD_PROFILE), armv8a)
++LINK_OBJECTS += $(ARM_IMPL) $(NEON_D32_IMPL)
++endif
+ ifeq ($(BUILD_PROFILE), arm32)
+ LINK_OBJECTS += $(ARM_IMPL) $(NEON_D32_IMPL)
+ endif
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
index 0247cef3a96..739dcd9932e 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
@@ -20,8 +20,11 @@ fi
LICENSE="LGPL-3"
SLOT="0"
-IUSE="doc jack ladspa +lv2"
-REQUIRED_USE="|| ( jack ladspa lv2 )"
+IUSE="doc jack ladspa +lv2 test"
+REQUIRED_USE="|| ( jack ladspa lv2 )
+ test? ( jack )"
+
+RESTRICT="!test? ( test )"
DEPEND="
dev-libs/expat
@@ -41,6 +44,10 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND=""
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.29_armv8a-dsp.patch
+)
+
src_compile() {
use doc && MODULES+="doc"
use jack && MODULES+=" jack"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 73683a600c8..ac222e4aaa4 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,3 +1,4 @@
-DIST mesa-21.1.7.tar.xz 15391776 BLAKE2B a9138f189ef953d5efa4e287fbbe795ef2539c113dc7e0f565d3f35dcfaa59ab08674bf37fda196ba34e5963637c3ebb133db40b558bd275e29c8387b1acfdfa SHA512 1fd677437f292c30fbf08bfef8c1088557841f426090ccba20ab2a222b08fb5c3ec48a7a0301466e03a23019d09414c700a4f5e299479cacd6972a9f3ba030c8
-DIST mesa-21.1.8.tar.xz 15410504 BLAKE2B 430a1a5f3120bb69b7eaab13438d9a09201f5b11c9d4581d7dd39f48041a1b70d7c125f36553a5c504d1164fe6e0e3d50853c209c4280787f4fa6935ab385b86 SHA512 80fcf2b1d59b49e384e9aa1ae63a3ce709833059af1ffd8eb821054c1976709134098cfc79fac1578a2f08a003223f1c96b38e2e650c5be49821c6f2fe1047af
-DIST mesa-21.2.2.tar.xz 15755212 BLAKE2B a9c0f847d8d372fac076bd1a2a2113f34d4f5f57d5d459f88b2d1a14bd8a2a442d70c2959637ac17836d8be13941c2192bf639f42d3a7eaf7d8cdb5175268389 SHA512 0a4877b405384088c8bdac3031444cd22377d19552c41c08fb8928d6edf23d5f5a237ef1d6c5f96e3293c2e90c63f4702813226b85cb304fe5e01dd2710ba697
+DIST mesa-21.2.5.tar.xz 15829684 BLAKE2B a5d00d6c566e699acd1f8cfcf1b52024c92cfa8a4cc9a6fb1d6493526ea0d65790ed97c47c5c174d4369e589caf1a361351df6d43aba89f818970f87f9a81059 SHA512 aaa1ebaa1e18eea76c3784c9a65942c3e417c1079d7bf75dcede574999dc459fb4d68d041cf2f767afb9cbfa834a985e0a4edd5a56b0fc90f8fdc506359aa5da
+DIST mesa-21.2.6.tar.xz 15868208 BLAKE2B aaa6447a2f5a472c2ee2b7d6b12effb79d02804684358fd233aa00bda945c66efa3850931cd9114c51ddd492033b9f66372380395540a11fe40229edfe7ee125 SHA512 e65d77e2609cba85bd2cdbd4ba2072729c1556a43defdd24a91e708e3223f84b23657e63a91b16c5729684ea12fe31f45bae88294c572e057f2981a5d6c0f5a0
+DIST mesa-21.3.0.tar.xz 16427424 BLAKE2B d3feac77b61ea724b841b88882569871eb8ff59561fa47b65a2358a0e912cd27f728a226795b23d63232daab6532b9931dd0d2fc8f001a1902dc6b75d474b44e SHA512 b27c0ccf2fc9b96bbece715612cec4f4e267ab25dc5386c3debd2346c385afa0146317c67a3d2eec198dbf5338fb182b458c5fe5567216b265153c0b7b560de1
+DIST mesa-21.3.1.tar.xz 16439988 BLAKE2B 0b6f8bbee2de199a4fedf0e663d5c19f29deeccc4da59327fbf3586a54747e16f12cd1e08a8653e9c86ca25e33db8a4bed86d453c864478a777bedbf937a4474 SHA512 43f019d4810bafd177b1a41207ae20a77982e4e6df3ab2b7a700273748cbc766694bd44594c898c4bd7848a94200fd28237a67d290c4e06595e6eab71cb716e8
diff --git a/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch b/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
deleted file mode 100644
index ebbb8abb1fe..00000000000
--- a/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8de60a1654a875d0b55512a1508f541f706f9b97 Mon Sep 17 00:00:00 2001
-From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
-Date: Sat, 4 Sep 2021 03:32:21 +0200
-Subject: [PATCH] util/fossilize_db: Don't corrupt keys during entry read.
-
-We change the hash that is still used to set entry->key.
-
-Fixes: d2d642cc014 "util/fossilize_db: Only allocate entries after full read."
-Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12725>
----
- src/util/fossilize_db.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
-index e1709a1ff64..26024101b83 100644
---- a/src/util/fossilize_db.c
-+++ b/src/util/fossilize_db.c
-@@ -156,18 +156,18 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
- offset += header->payload_size;
- parsed_offset = offset;
-
-- /* Truncate the entry's hash string to a 64bit hash for use with a
-- * 64bit hash table for looking up file offsets.
-- */
-- hash_str[16] = '\0';
-- uint64_t key = strtoull(hash_str, NULL, 16);
--
- struct foz_db_entry *entry = ralloc(foz_db->mem_ctx,
- struct foz_db_entry);
- entry->header = *header;
- entry->file_idx = file_idx;
- _mesa_sha1_hex_to_sha1(entry->key, hash_str);
-
-+ /* Truncate the entry's hash string to a 64bit hash for use with a
-+ * 64bit hash table for looking up file offsets.
-+ */
-+ hash_str[16] = '\0';
-+ uint64_t key = strtoull(hash_str, NULL, 16);
-+
- entry->offset = cache_offset;
-
- _mesa_hash_table_u64_insert(foz_db->index_db, key, entry);
---
-2.32.0
-
diff --git a/media-libs/mesa/mesa-21.1.7.ebuild b/media-libs/mesa/mesa-21.2.5.ebuild
index 60dbbe0f706..922ef8bc5f5 100644
--- a/media-libs/mesa/mesa-21.1.7.ebuild
+++ b/media-libs/mesa/mesa-21.2.5.ebuild
@@ -3,12 +3,10 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit llvm meson-multilib python-any-r1 linux-info
-OPENGL_DIR="xorg-x11"
-
MY_P="${P/_/-}"
DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -19,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://archive.mesa3d.org/${MY_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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
@@ -29,25 +27,25 @@ RESTRICT="
"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+ +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
vulkan-overlay wayland +X xa xvmc zink +zstd"
REQUIRED_USE="
- d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
gles1? ( egl )
gles2? ( egl )
osmesa? ( gallium )
- vulkan? ( dri3
- video_cards_radeonsi? ( llvm ) )
+ vulkan? ( video_cards_radeonsi? ( llvm ) )
vulkan-overlay? ( vulkan )
wayland? ( egl gbm )
+ video_cards_crocus? ( gallium )
video_cards_freedreno? ( gallium )
video_cards_intel? ( classic )
video_cards_i915? ( || ( classic gallium ) )
@@ -73,7 +71,7 @@ REQUIRED_USE="
zink? ( gallium vulkan )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
RDEPEND="
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -142,12 +140,12 @@ RDEPEND="${RDEPEND}
# 1. List all the working slots (with min versions) in ||, newest first.
# 2. Update the := to specify *max* version, e.g. < 10.
# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="12"
+LLVM_MAX_SLOT="13"
LLVM_DEPSTR="
|| (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
sys-devel/llvm:12[${MULTILIB_USEDEP}]
sys-devel/llvm:11[${MULTILIB_USEDEP}]
- sys-devel/llvm:10[${MULTILIB_USEDEP}]
)
<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
"
@@ -257,11 +255,12 @@ llvm_check_deps() {
pkg_pretend() {
if use vulkan; then
- if ! use video_cards_i965 &&
+ if ! use video_cards_freedreno &&
+ ! use video_cards_i965 &&
! use video_cards_iris &&
! use video_cards_radeonsi &&
! use video_cards_v3d; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
fi
fi
@@ -470,6 +469,7 @@ multilib_src_configure() {
fi
fi
+ gallium_enable video_cards_crocus crocus
gallium_enable video_cards_iris iris
gallium_enable video_cards_r300 r300
@@ -490,6 +490,7 @@ multilib_src_configure() {
fi
if use vulkan; then
+ vulkan_enable video_cards_freedreno freedreno
vulkan_enable video_cards_i965 intel
vulkan_enable video_cards_iris intel
vulkan_enable video_cards_radeonsi amd
@@ -510,7 +511,7 @@ multilib_src_configure() {
$(meson_use test build-tests)
-Dglx=$(usex X dri disabled)
-Dshared-glapi=enabled
- $(meson_feature dri3)
+ -Ddri3=enabled
$(meson_feature egl)
$(meson_feature gbm)
$(meson_feature gles1)
@@ -518,7 +519,10 @@ multilib_src_configure() {
$(meson_use osmesa)
$(meson_use selinux)
$(meson_feature zstd)
- -Dvalgrind=$(usex valgrind auto false)
+ $(meson_use video_cards_crocus prefer-crocus)
+ $(meson_use video_cards_iris prefer-iris)
+ $(meson_use cpu_flags_x86_sse2 sse2)
+ -Dvalgrind=$(usex valgrind auto disabled)
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
diff --git a/media-libs/mesa/mesa-21.2.2.ebuild b/media-libs/mesa/mesa-21.2.6.ebuild
index e3fd921bbaa..5829adce48f 100644
--- a/media-libs/mesa/mesa-21.2.2.ebuild
+++ b/media-libs/mesa/mesa-21.2.6.ebuild
@@ -27,13 +27,13 @@ RESTRICT="
"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+ +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
vulkan-overlay wayland +X xa xvmc zink +zstd"
@@ -45,6 +45,7 @@ REQUIRED_USE="
vulkan? ( video_cards_radeonsi? ( llvm ) )
vulkan-overlay? ( vulkan )
wayland? ( egl gbm )
+ video_cards_crocus? ( gallium )
video_cards_freedreno? ( gallium )
video_cards_intel? ( classic )
video_cards_i915? ( || ( classic gallium ) )
@@ -139,9 +140,10 @@ RDEPEND="${RDEPEND}
# 1. List all the working slots (with min versions) in ||, newest first.
# 2. Update the := to specify *max* version, e.g. < 10.
# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="12"
+LLVM_MAX_SLOT="13"
LLVM_DEPSTR="
|| (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
sys-devel/llvm:12[${MULTILIB_USEDEP}]
sys-devel/llvm:11[${MULTILIB_USEDEP}]
)
@@ -253,11 +255,12 @@ llvm_check_deps() {
pkg_pretend() {
if use vulkan; then
- if ! use video_cards_i965 &&
+ if ! use video_cards_freedreno &&
+ ! use video_cards_i965 &&
! use video_cards_iris &&
! use video_cards_radeonsi &&
! use video_cards_v3d; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
fi
fi
@@ -466,6 +469,7 @@ multilib_src_configure() {
fi
fi
+ gallium_enable video_cards_crocus crocus
gallium_enable video_cards_iris iris
gallium_enable video_cards_r300 r300
@@ -486,6 +490,7 @@ multilib_src_configure() {
fi
if use vulkan; then
+ vulkan_enable video_cards_freedreno freedreno
vulkan_enable video_cards_i965 intel
vulkan_enable video_cards_iris intel
vulkan_enable video_cards_radeonsi amd
@@ -514,6 +519,9 @@ multilib_src_configure() {
$(meson_use osmesa)
$(meson_use selinux)
$(meson_feature zstd)
+ $(meson_use video_cards_crocus prefer-crocus)
+ $(meson_use video_cards_iris prefer-iris)
+ $(meson_use cpu_flags_x86_sse2 sse2)
-Dvalgrind=$(usex valgrind auto disabled)
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
diff --git a/media-libs/mesa/mesa-21.1.8-r1.ebuild b/media-libs/mesa/mesa-21.3.0.ebuild
index 482b96c702a..47b93133f0d 100644
--- a/media-libs/mesa/mesa-21.1.8-r1.ebuild
+++ b/media-libs/mesa/mesa-21.3.0.ebuild
@@ -3,12 +3,10 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit llvm meson-multilib python-any-r1 linux-info
-OPENGL_DIR="xorg-x11"
-
MY_P="${P/_/-}"
DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -29,25 +27,22 @@ RESTRICT="
"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+ +classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
vulkan-overlay wayland +X xa xvmc zink +zstd"
REQUIRED_USE="
- d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
- gles1? ( egl )
- gles2? ( egl )
+ d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
osmesa? ( gallium )
- vulkan? ( dri3
- video_cards_radeonsi? ( llvm ) )
+ vulkan? ( video_cards_radeonsi? ( llvm ) )
vulkan-overlay? ( vulkan )
- wayland? ( egl gbm )
+ video_cards_crocus? ( gallium )
video_cards_freedreno? ( gallium )
video_cards_intel? ( classic )
video_cards_i915? ( || ( classic gallium ) )
@@ -66,14 +61,14 @@ REQUIRED_USE="
video_cards_v3d? ( gallium )
video_cards_vc4? ( gallium )
video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
+ video_cards_vivante? ( gallium )
video_cards_vmware? ( gallium )
xa? ( X )
xvmc? ( X )
zink? ( gallium vulkan )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
RDEPEND="
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -142,12 +137,12 @@ RDEPEND="${RDEPEND}
# 1. List all the working slots (with min versions) in ||, newest first.
# 2. Update the := to specify *max* version, e.g. < 10.
# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="12"
+LLVM_MAX_SLOT="13"
LLVM_DEPSTR="
|| (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
sys-devel/llvm:12[${MULTILIB_USEDEP}]
sys-devel/llvm:11[${MULTILIB_USEDEP}]
- sys-devel/llvm:10[${MULTILIB_USEDEP}]
)
<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
"
@@ -229,10 +224,6 @@ BDEPEND="
wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
"
-PATCHES=(
- "${FILESDIR}"/${PV}-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
-)
-
S="${WORKDIR}/${MY_P}"
EGIT_CHECKOUT_DIR=${S}
@@ -261,11 +252,12 @@ llvm_check_deps() {
pkg_pretend() {
if use vulkan; then
- if ! use video_cards_i965 &&
+ if ! use video_cards_freedreno &&
+ ! use video_cards_i965 &&
! use video_cards_iris &&
! use video_cards_radeonsi &&
! use video_cards_v3d; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
fi
fi
@@ -389,12 +381,6 @@ multilib_src_configure() {
use wayland && platforms+=",wayland"
emesonargs+=(-Dplatforms=${platforms#,})
- if use X || use egl; then
- emesonargs+=(-Dglvnd=true)
- else
- emesonargs+=(-Dglvnd=false)
- fi
-
if use gallium; then
emesonargs+=(
$(meson_feature llvm)
@@ -474,6 +460,7 @@ multilib_src_configure() {
fi
fi
+ gallium_enable video_cards_crocus crocus
gallium_enable video_cards_iris iris
gallium_enable video_cards_r300 r300
@@ -494,6 +481,7 @@ multilib_src_configure() {
fi
if use vulkan; then
+ vulkan_enable video_cards_freedreno freedreno
vulkan_enable video_cards_i965 intel
vulkan_enable video_cards_iris intel
vulkan_enable video_cards_radeonsi amd
@@ -514,15 +502,19 @@ multilib_src_configure() {
$(meson_use test build-tests)
-Dglx=$(usex X dri disabled)
-Dshared-glapi=enabled
- $(meson_feature dri3)
- $(meson_feature egl)
- $(meson_feature gbm)
+ -Ddri3=enabled
+ -Degl=true
+ -Dgbm=true
+ -Dglvnd=true
$(meson_feature gles1)
$(meson_feature gles2)
$(meson_use osmesa)
$(meson_use selinux)
$(meson_feature zstd)
- -Dvalgrind=$(usex valgrind auto false)
+ $(meson_use video_cards_crocus prefer-crocus)
+ $(meson_use video_cards_iris prefer-iris)
+ $(meson_use cpu_flags_x86_sse2 sse2)
+ -Dvalgrind=$(usex valgrind auto disabled)
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
diff --git a/media-libs/mesa/mesa-21.3.1.ebuild b/media-libs/mesa/mesa-21.3.1.ebuild
new file mode 100644
index 00000000000..47b93133f0d
--- /dev/null
+++ b/media-libs/mesa/mesa-21.3.1.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ inherit git-r3
+else
+ SRC_URI="https://archive.mesa3d.org/${MY_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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
+ lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+ vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+ d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ osmesa? ( gallium )
+ vulkan? ( video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ video_cards_crocus? ( gallium )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_lima? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_panfrost? ( gallium )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_v3d? ( gallium )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium )
+ video_cards_vmware? ( gallium )
+ xa? ( X )
+ xvmc? ( X )
+ zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+RDEPEND="
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ gallium? (
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ >=virtual/opencl-3[${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ )
+ zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="13"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
+ sys-devel/llvm:12[${MULTILIB_USEDEP}]
+ sys-devel/llvm:11[${MULTILIB_USEDEP}]
+ )
+ <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+ gallium? (
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+ wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use vulkan; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_i965 &&
+ ! use video_cards_iris &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_v3d; then
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
+ fi
+ fi
+
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+
+ if use osmesa && ! use llvm; then
+ ewarn "OSMesa will be slow without enabling USE=llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use video_cards_i965 ||
+ use video_cards_iris ||
+ use video_cards_radeonsi; then
+ if kernel_is -ge 5 11 3; then
+ CONFIG_CHECK="~KCMP"
+ elif kernel_is -ge 5 11; then
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ elif kernel_is -ge 5 10 20; then
+ CONFIG_CHECK="~KCMP"
+ else
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ fi
+ linux-info_pkg_setup
+ fi
+
+ if use gallium && use llvm; then
+ llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ local platforms
+ use X && platforms+="x11"
+ use wayland && platforms+=",wayland"
+ emesonargs+=(-Dplatforms=${platforms#,})
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_feature llvm)
+ $(meson_feature lm-sensors lmsensors)
+ $(meson_feature unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=disabled)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_feature xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=disabled)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_v3d ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable -- swrast
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_v3d v3d
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable zink zink
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_crocus crocus
+ gallium_enable video_cards_iris iris
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_freedreno freedreno
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ vulkan_enable video_cards_v3d broadcom
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ local vulkan_layers
+ use vulkan && vulkan_layers+="device-select"
+ use vulkan-overlay && vulkan_layers+=",overlay"
+ emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=$(usex X dri disabled)
+ -Dshared-glapi=enabled
+ -Ddri3=enabled
+ -Degl=true
+ -Dgbm=true
+ -Dglvnd=true
+ $(meson_feature gles1)
+ $(meson_feature gles2)
+ $(meson_use osmesa)
+ $(meson_use selinux)
+ $(meson_feature zstd)
+ $(meson_use video_cards_crocus prefer-crocus)
+ $(meson_use video_cards_iris prefer-iris)
+ $(meson_use cpu_flags_x86_sse2 sse2)
+ -Dvalgrind=$(usex valgrind auto disabled)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e3fd921bbaa..f5d8fe0c106 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -26,90 +26,62 @@ RESTRICT="
!test? ( test )
"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+ cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
vulkan-overlay wayland +X xa xvmc zink +zstd"
REQUIRED_USE="
- d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
- gles1? ( egl )
- gles2? ( egl )
- osmesa? ( gallium )
+ d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
vulkan? ( video_cards_radeonsi? ( llvm ) )
vulkan-overlay? ( vulkan )
- wayland? ( egl gbm )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_iris? ( gallium )
- video_cards_lima? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_panfrost? ( gallium )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_v3d? ( gallium )
- video_cards_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
+ video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_radeonsi? ( llvm )
xa? ( X )
xvmc? ( X )
- zink? ( gallium vulkan )
+ zink? ( vulkan )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
RDEPEND="
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- gallium? (
- unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
- llvm? (
- video_cards_radeonsi? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_r600? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_radeon? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
)
- lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
- opencl? (
- >=virtual/opencl-3[${MULTILIB_USEDEP}]
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- vaapi? (
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
)
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
)
+ lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ >=virtual/opencl-3[${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
wayland? (
>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
- video_cards_intel? (
- !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
)
- video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
@@ -139,9 +111,10 @@ RDEPEND="${RDEPEND}
# 1. List all the working slots (with min versions) in ||, newest first.
# 2. Update the := to specify *max* version, e.g. < 10.
# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="12"
+LLVM_MAX_SLOT="13"
LLVM_DEPSTR="
|| (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
sys-devel/llvm:12[${MULTILIB_USEDEP}]
sys-devel/llvm:11[${MULTILIB_USEDEP}]
)
@@ -151,53 +124,51 @@ LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
RDEPEND="${RDEPEND}
- gallium? (
- llvm? (
- opencl? (
- video_cards_r600? (
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
${CLANG_DEPSTR_AMDGPU}
)
- !video_cards_r600? (
- video_cards_radeonsi? (
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
${CLANG_DEPSTR_AMDGPU}
)
)
- !video_cards_r600? (
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
!video_cards_radeonsi? (
- video_cards_radeon? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${CLANG_DEPSTR}
- )
+ ${CLANG_DEPSTR}
)
)
)
- !opencl? (
- video_cards_r600? (
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
${LLVM_DEPSTR_AMDGPU}
)
- !video_cards_r600? (
- video_cards_radeonsi? (
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
${LLVM_DEPSTR_AMDGPU}
)
)
- !video_cards_r600? (
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
!video_cards_radeonsi? (
- video_cards_radeon? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${LLVM_DEPSTR}
- )
+ ${LLVM_DEPSTR}
)
)
)
@@ -208,6 +179,7 @@ unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )
+ wayland? ( >=dev-libs/wayland-protocols-1.24 )
X? (
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-base/xorg-proto
@@ -253,11 +225,11 @@ llvm_check_deps() {
pkg_pretend() {
if use vulkan; then
- if ! use video_cards_i965 &&
- ! use video_cards_iris &&
+ if ! use video_cards_freedreno &&
+ ! use video_cards_intel &&
! use video_cards_radeonsi &&
! use video_cards_v3d; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
fi
fi
@@ -300,17 +272,6 @@ pkg_pretend() {
fi
fi
- if ! use gallium; then
- use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
- use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
- use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
- use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
- use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
- use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
- use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
- fi
-
if ! use llvm; then
use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
fi
@@ -331,8 +292,7 @@ pkg_setup() {
ewarn "detected! This can cause problems. For details, see bug 459306."
fi
- if use video_cards_i965 ||
- use video_cards_iris ||
+ if use video_cards_intel ||
use video_cards_radeonsi; then
if kernel_is -ge 5 11 3; then
CONFIG_CHECK="~KCMP"
@@ -346,7 +306,7 @@ pkg_setup() {
linux-info_pkg_setup
fi
- if use gallium && use llvm; then
+ if use llvm; then
llvm_pkg_setup
fi
python-any-r1_pkg_setup
@@ -355,139 +315,93 @@ pkg_setup() {
multilib_src_configure() {
local emesonargs=()
- if use classic; then
- # Intel code
- dri_driver_enable video_cards_i915 i915
- dri_driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- dri_driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- dri_driver_enable video_cards_nouveau nouveau
-
- # ATI code
- dri_driver_enable video_cards_r100 r100
- dri_driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- dri_driver_enable video_cards_radeon r100 r200
- fi
- fi
-
local platforms
use X && platforms+="x11"
use wayland && platforms+=",wayland"
emesonargs+=(-Dplatforms=${platforms#,})
- if use X || use egl; then
- emesonargs+=(-Dglvnd=true)
+ if use video_cards_intel ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
else
- emesonargs+=(-Dglvnd=false)
+ emesonargs+=(-Dgallium-nine=false)
fi
- if use gallium; then
- emesonargs+=(
- $(meson_feature llvm)
- $(meson_feature lm-sensors lmsensors)
- $(meson_feature unwind libunwind)
- )
-
- if use video_cards_iris ||
- use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_use d3d9 gallium-nine))
- else
- emesonargs+=(-Dgallium-nine=false)
- fi
-
- if use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature vaapi gallium-va))
- use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
- else
- emesonargs+=(-Dgallium-va=disabled)
- fi
-
- if use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature vdpau gallium-vdpau))
- else
- emesonargs+=(-Dgallium-vdpau=disabled)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_feature xa gallium-xa))
- else
- emesonargs+=(-Dgallium-xa=disabled)
- fi
-
- if use video_cards_r600 ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature xvmc gallium-xvmc))
- else
- emesonargs+=(-Dgallium-xvmc=disabled)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_lima ||
- use video_cards_panfrost ||
- use video_cards_v3d ||
- use video_cards_vc4 ||
- use video_cards_vivante; then
- gallium_enable -- kmsro
- fi
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=disabled)
+ fi
- gallium_enable -- swrast
- gallium_enable video_cards_lima lima
- gallium_enable video_cards_panfrost panfrost
- gallium_enable video_cards_v3d v3d
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable zink zink
-
- # Only one i915 driver (classic vs gallium). Default to classic.
- if ! use classic; then
- gallium_enable video_cards_i915 i915
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
- fi
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=disabled)
+ fi
- gallium_enable video_cards_iris iris
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_feature xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=disabled)
+ fi
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=disabled)
+ fi
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_virgl virgl
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_v3d ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
- # opencl stuff
- emesonargs+=(
- -Dgallium-opencl="$(usex opencl icd disabled)"
- )
+ gallium_enable -- swrast
+ gallium_enable video_cards_freedreno freedreno
+ gallium_enable video_cards_intel crocus i915 iris
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_v3d v3d
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_virgl virgl
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable zink zink
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
fi
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+
if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_freedreno freedreno
+ vulkan_enable video_cards_intel intel
vulkan_enable video_cards_radeonsi amd
vulkan_enable video_cards_v3d broadcom
fi
@@ -507,15 +421,19 @@ multilib_src_configure() {
-Dglx=$(usex X dri disabled)
-Dshared-glapi=enabled
-Ddri3=enabled
- $(meson_feature egl)
- $(meson_feature gbm)
+ -Degl=true
+ -Dgbm=true
+ -Dglvnd=true
$(meson_feature gles1)
$(meson_feature gles2)
+ $(meson_feature llvm)
+ $(meson_feature lm-sensors lmsensors)
$(meson_use osmesa)
$(meson_use selinux)
+ $(meson_feature unwind libunwind)
$(meson_feature zstd)
+ $(meson_use cpu_flags_x86_sse2 sse2)
-Dvalgrind=$(usex valgrind auto disabled)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
--buildtype $(usex debug debug plain)
@@ -530,13 +448,6 @@ multilib_src_test() {
# $1 - VIDEO_CARDS flag (check skipped for "--")
# other args - names of DRI drivers to enable
-dri_driver_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- DRI_DRIVERS+=("$@")
- fi
-}
-
gallium_enable() {
if [[ $1 == -- ]] || use $1; then
shift
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index f94241f238a..2b18aba1b08 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="classic">Build drivers based on the classic architecture.</flag>
<flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
- <flag name="dri3">Enable DRI3 support.</flag>
<flag name="egl">Enable EGL support.</flag>
<flag name="gallium">Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 25022518c89..488270c45cf 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,2 +1 @@
-DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B f5b7e733090ae60cb55556893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974 SHA512 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
-DIST mlt-7.0.1.tar.gz 1181298 BLAKE2B 90547ebeeb90b5ab20ec39e3fa97454e9c502af08981f20e433deafc5bbbb45caeea485c18b4229821fcdcef2ed7767e8936af273200a233f18251fa8bc73dd0 SHA512 9268889f0fbe69180651a592ac0b328d18f8b60c7d83f9d6c506dc21254afcb2281662f4d19faf3520976ae100600d00cd6eb2aa42c83880fa4c4c36e760c68a
+DIST mlt-7.2.0.tar.gz 1203489 BLAKE2B 2b53a813146f4868469c945208b4e7b509f67667357df615954a7d0f02ebe809dba0c15acd302f9a8609978929d00dd1e20fb03fc5d29a7dd5196253f37f70b7 SHA512 cee8d6cef2db5aae5747a80a292eca29d25adedd7754ea88a1857b429c0ccd35f689bcd9381c069c0e9e04b9eae5b7301e7c9548c536b43e4a9d54af664d629f
diff --git a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch b/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch
deleted file mode 100644
index 4ad7ff5de41..00000000000
--- a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7063e88e09977282470c4f2f93e56e05f21b7c2b Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 16 Apr 2021 11:15:37 -0700
-Subject: [PATCH] fix #704 by properly identifying cover art
-
-(cherry picked from commit 6b0829df726aa9a840b8b34e923e9faf17a3a5ca)
----
- src/modules/avformat/producer_avformat.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
-index 049452f9d..e079e6f70 100644
---- a/src/modules/avformat/producer_avformat.c
-+++ b/src/modules/avformat/producer_avformat.c
-@@ -398,10 +398,7 @@ static mlt_properties find_default_streams( producer_avformat self )
- if ( first_video_index < 0 )
- first_video_index = i;
- // Only set the video stream if not album art
-- if (self->video_index < 0 &&
-- (codec_params->codec_id != AV_CODEC_ID_MJPEG ||
-- codec_context->time_base.num != 1 ||
-- codec_context->time_base.den != 90000)) {
-+ if (self->video_index < 0 && !(context->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC)) {
- self->video_index = i;
- }
- mlt_properties_set( meta_media, key, "video" );
-@@ -1682,11 +1679,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
- codec_params = stream->codecpar;
-
- // Always use the image cache for album art.
-- int is_album_art = ((codec_context->codec_id == AV_CODEC_ID_MJPEG
-- || codec_context->codec_id == AV_CODEC_ID_GIF
-- || codec_context->codec_id == AV_CODEC_ID_PNG)
-- && mlt_properties_get_int(properties, "meta.media.frame_rate_num") == 90000
-- && mlt_properties_get_int(properties, "meta.media.frame_rate_den") == 1);
-+ int is_album_art = stream->disposition & AV_DISPOSITION_ATTACHED_PIC;
- if (is_album_art)
- position = 0;
-
-@@ -2296,8 +2289,8 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
- mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num );
- mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
-
-- // MP3 album art is a single JPEG at 90000 fps, which is not seekable.
-- if ( codec->id == AV_CODEC_ID_MJPEG && frame_rate.num == 90000 && frame_rate.den == 1 )
-+ // Cover art is a single image at 90000 fps, which is not seekable.
-+ if (stream->disposition & AV_DISPOSITION_ATTACHED_PIC)
- self->video_seekable = 0;
-
- // Set the YUV colorspace from override or detect
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 70c25a2a106..632bde59b9d 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -10,9 +10,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="compressed-lumas">Compress the luma files in png.</flag>
<flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
- <flag name="lua">Build SWIG bindings for Lua</flag>
<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
<flag name="python">Build SWIG bindings for Python</flag>
<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms</flag>
diff --git a/media-libs/mlt/mlt-6.26.1-r1.ebuild b/media-libs/mlt/mlt-6.26.1-r1.ebuild
deleted file mode 100644
index b811f88b94b..00000000000
--- a/media-libs/mlt/mlt-6.26.1-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit lua python-single-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
-ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
-qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-# perl? ( ${SWIG_DEPEND} )
-# php? ( ${SWIG_DEPEND} )
-# tcl? ( ${SWIG_DEPEND} )
-# ruby? ( ${SWIG_DEPEND} )
-BDEPEND="
- virtual/pkgconfig
- compressed-lumas? ( virtual/imagemagick-tools[png] )
- lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
- python? ( ${SWIG_DEPEND} )
-"
-#rtaudio will use OSS on non linux OSes
-DEPEND="
- >=media-libs/libebur128-1.2.2:=
- ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
- fftw? ( sci-libs/fftw:3.0= )
- frei0r? ( media-plugins/frei0r-plugins )
- gtk? (
- media-libs/libexif
- x11-libs/pango
- )
- jack? (
- >=dev-libs/libxml2-2.5
- media-libs/ladspa-sdk
- virtual/jack
- )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
- lua? ( ${LUA_DEPS} )
- opencv? ( >=media-libs/opencv-4.5.1:= )
- opengl? ( media-video/movit )
- python? ( ${PYTHON_DEPS} )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/libexif
- x11-libs/libX11
- )
- rtaudio? (
- >=media-libs/rtaudio-4.1.2
- kernel_linux? ( media-libs/alsa-lib )
- )
- rubberband? ( media-libs/rubberband )
- sdl? (
- media-libs/libsdl2[X,opengl,video]
- media-libs/sdl2-image
- )
- vidstab? ( media-libs/vidstab )
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
- xml? ( >=dev-libs/libxml2-2.5 )"
-# java? ( >=virtual/jre-1.5 )
-# perl? ( dev-lang/perl )
-# php? ( dev-lang/php )
-# ruby? ( ${RUBY_DEPS} )
-# sox? ( media-sound/sox )
-# tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
- "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
- "${FILESDIR}"/${P}-fix-crash-w-ogg-album-art.patch # git master
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
- for x in python lua; do
- sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
- done
-
- use python && python_fix_shebang src/swig/python
-}
-
-src_configure() {
- tc-export CC CXX
-
- local myconf=(
- --enable-gpl
- --enable-gpl3
- --enable-kdenlive
- --enable-melt
- --enable-motion-est
- --target-arch=$(tc-arch)
- --disable-gtk2
- --disable-kde
- --disable-sdl
- --disable-swfdec
- $(use_enable debug)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable cpu_flags_x86_sse2 sse2)
- $(use_enable ffmpeg avformat)
- $(use_enable fftw plus)
- $(use_enable frei0r)
- $(use_enable gtk gdk)
- $(use_enable jack jackrack)
- $(use_enable libsamplerate resample)
- $(use_enable opencv)
- $(use_enable opengl)
- $(use_enable qt5 qt)
- $(use_enable rtaudio)
- $(use_enable rubberband)
- $(use_enable sdl sdl2)
- $(use_enable vidstab vid.stab)
- $(use_enable xine)
- $(use_enable xml)
- --disable-sox
- )
- #$(use_enable sox) FIXME
-
- use compressed-lumas && myconf+=( --luma-compress )
- use ffmpeg && myconf+=( --avformat-swscale )
- use vdpau && myconf+=( --avformat-vdpau )
-
- if use qt5 ; then
- myconf+=(
- --qt-includedir=$(qt5_get_headerdir)
- --qt-libdir=$(qt5_get_libdir)
- )
- fi
-
- if use amd64 || use x86 ; then
- myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
- else
- myconf+=( --disable-mmx )
- fi
-
- # TODO: add swig language bindings
- # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
- local swig_lang=()
- # not done: java perl php ruby tcl
- # handled separately: lua
- for i in python; do
- use $i && swig_lang+=( $i )
- done
- [[ -z "${swig_lang}" ]] && swig_lang=( none )
-
- econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
-
- sed -i -e s/^OPT/#OPT/ config.mak || die
-}
-
-src_compile() {
- default
-
- if use lua; then
- # Only copy sources now to avoid unnecessary rebuilds
- lua_copy_sources
-
- lua_compile() {
- pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
-
- sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
- ./build
-
- popd > /dev/null || die
- }
- lua_foreach_impl lua_compile
- fi
-}
-
-src_install() {
- default
-
- insinto /usr/share/${PN}
- doins -r demo
-
- #
- # Install SWIG bindings
- #
-
- docinto swig
-
- if use lua; then
- lua_install() {
- pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
-
- exeinto "$(lua_get_cmod_dir)"
- doexe mlt.so
-
- popd > /dev/null || die
- }
- lua_foreach_impl lua_install
-
- dodoc "${S}"/src/swig/lua/play.lua
- fi
-
- if use python; then
- cd "${S}"/src/swig/python || die
- python_domodule mlt.py _mlt.so
- chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
- dodoc play.py
- python_optimize
- fi
-
- # not done: java perl php ruby tcl
-}
diff --git a/media-libs/mlt/mlt-7.0.1-r2.ebuild b/media-libs/mlt/mlt-7.2.0-r1.ebuild
index 0766ee0dea8..9e992f95599 100644
--- a/media-libs/mlt/mlt-7.0.1-r2.ebuild
+++ b/media-libs/mlt/mlt-7.2.0-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit python-single-r1 cmake toolchain-funcs
+inherit python-single-r1 cmake
DESCRIPTION="Open source multimedia framework for television broadcasting"
HOMEPAGE="https://www.mltframework.org/"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-3"
SLOT="0/7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug ffmpeg frei0r gtk jack kernel_linux libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -21,8 +21,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test"
# rtaudio will use OSS on non linux OSes
+# Qt already needs FFTW/PLUS so let's just always have it on to ensure
+# MLT is useful: bug #603168.
DEPEND="
>=media-libs/libebur128-1.2.2:=
+ sci-libs/fftw:3.0=
ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
frei0r? ( media-plugins/frei0r-plugins )
gtk? (
@@ -48,7 +51,6 @@ DEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-libs/libexif
- sci-libs/fftw:3.0=
x11-libs/libX11
)
rtaudio? (
@@ -64,7 +66,7 @@ DEPEND="
xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
xml? ( >=dev-libs/libxml2-2.5 )
"
-# java? ( >=virtual/jre-1.5 )
+# java? ( >=virtual/jre-1.8:* )
# perl? ( dev-lang/perl )
# php? ( dev-lang/php )
# ruby? ( ${RUBY_DEPS} )
@@ -108,9 +110,7 @@ src_configure() {
-DMOD_SDL1=OFF
-DMOD_SDL2=$(usex sdl)
-DMOD_AVFORMAT=$(usex ffmpeg)
- # TODO: does anything need plus?
- # plus or qt
- #$(use_enable fftw plus)
+ -DMOD_PLUS=ON
-DMOD_FREI0R=$(usex frei0r)
-DMOD_GDK=$(usex gtk)
-DMOD_JACKRACK=$(usex jack)
@@ -126,7 +126,6 @@ src_configure() {
-DMOD_SOX=OFF
)
- # TODO: We currently have USE=fftw but both Qt and plus require it, removing flag for now.
# TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
# TODO: add swig language bindings?
# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index 51b1288246e..6a00dd1d8f5 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,2 +1 @@
-DIST libmt32emu_2_5_1.tar.gz 526351 BLAKE2B 34af97107f54e22513e31cd36d35c155acb2f83cfc5dd670ace9d888a3f5bb5a9af1b5424379b3904253073f2b7fe736099c08b17bd7cfc24406d118b81a9b6c SHA512 8775f095c6a759db6d62b5f0693b64b13408806549349760f703553f6eae5e0face7b84577cf2511f25da9f87eb2bd14d4df6153fb53ff5109510ff1876f1978
DIST libmt32emu_2_5_3.tar.gz 527698 BLAKE2B 1ca31f2da92d77f9c3d34bb8c9f19e34e83cc82751ba08dfda1240a28b49e36c2acf3a6d8aab6e62107df4d88645e77d447e332968007fe865882d54e71475de SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.5.1.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.5.1.ebuild
deleted file mode 100644
index f1a27e25b8c..00000000000
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P="libmt32emu_${PV//./_}"
-DESCRIPTION="Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
-HOMEPAGE="https://github.com/munt/munt"
-SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/munt-${MY_P}/mt32emu"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4.2-docs.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- )
-
- cmake_src_configure
-}
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.5.3.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
index f1a27e25b8c..ccfcba7eded 100644
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.5.3.ebuild
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/munt/munt"
SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}/munt-${MY_P}/mt32emu"
@@ -20,8 +20,11 @@ PATCHES=(
)
src_configure() {
+ local libdir=${EPREFIX}/usr/$(get_libdir)
+
local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+ -DLIB_INSTALL_DIR="${libdir}"
+ -Dlibmt32emu_PKGCONFIG_INSTALL_PREFIX="${libdir}"
)
cmake_src_configure
diff --git a/media-libs/mutagen/mutagen-1.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild
index 77ec394e10d..12c469eebaa 100644
--- a/media-libs/mutagen/mutagen-1.45.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.45.1.ebuild
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
dev-python/eyeD3[${PYTHON_USEDEP}]
dev-python/hypothesis[${PYTHON_USEDEP}]
dev-python/pyflakes[${PYTHON_USEDEP}]
+ media-libs/flac[ogg]
)
"
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index c25afd0362b..c1b2c7ff12b 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,3 +1,2 @@
-DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
-DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
-DIST netpbm-10.86.22.tar.xz 3696588 BLAKE2B eabc11b4928681f2d96c8b6da1e23284868d7ba2f610f496d1ddf5b6ceb34c991160780f79c69b2c905e5210b024a1a5868656b89e23d6b63e587ce0cd70a950 SHA512 5840d0e88158ac77be7dfc5430e696701a740d56c98efdaf02b3c4e92bdf10268572ef0087b3bf263937073e0fbda3183aa7ed56bfe12dba30b3a3ff382bd4ff
+DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
+DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch
deleted file mode 100644
index 281f8ee928f..00000000000
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-- Make the libopt tool less 'helpful'
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
-+ $(PKGDIR)/lib
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
-+ cd $(PKGDIR)/lib ; \
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
- libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -87,6 +87,9 @@
-
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
-
- OMIT_CONFIG_RULE = 1
- include $(SRCDIR)/Makefile.common
---- a/buildtools/libopt.c
-+++ b/buildtools/libopt.c
-@@ -502,7 +502,7 @@
-
- strcpy(outputLine, ""); /* initial value */
- runtime = FALSE; /* initial value */
-- quiet = FALSE; /* initial value */
-+ quiet = TRUE; /* initial value */
- error = FALSE; /* no error yet */
- for (arg = 1; arg < argc && !error; arg++) {
- if (strcmp(argv[arg], "-runtime") == 0)
diff --git a/media-libs/netpbm/files/netpbm-10.66-test.patch b/media-libs/netpbm/files/netpbm-10.66-test.patch
deleted file mode 100644
index 7c80648bafa..00000000000
--- a/media-libs/netpbm/files/netpbm-10.66-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/450530
-
-we disable fiascotopnm all the time, so delete the test too
-
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -387,10 +387,6 @@ for i in $ordinary_testprogs
-
-
-
--# Test fiascotopnm, which has a unique -v flag.
--
--${PBM_TESTPREFIX}fiascotopnm -v 2> /dev/null
-- testExitStatus fiascotopnm 2 $?
-
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
deleted file mode 100644
index efe9fd8dd3c..00000000000
--- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-when we disable the bundled libs, make sure we don't try to run install in them
-
---- a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -5,7 +5,7 @@ endif
- SUBDIR = converter/other/jbig
- VPATH=.:$(SRCDIR)/$(SUBDIR)
-
--SUBDIRS = libjbig
-+SUBDIRS =
-
- include $(BUILDDIR)/config.mk
-
-@@ -35,6 +35,7 @@ SCRIPTS =
-
- ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB))
- JBIGLIB_DEP = $(JBIGLIB)
-+ SUBDIRS += libjbig
- else
- # It's not our internal version; user's on his own to make sure it's built
- endif
---- a/converter/other/jpeg2000/Makefile
-+++ b/converter/other/jpeg2000/Makefile
-@@ -5,7 +5,7 @@ endif
- SUBDIR = converter/other/jpeg2000
- VPATH=.:$(SRCDIR)/$(SUBDIR)
-
--SUBDIRS = libjasper
-+SUBDIRS =
-
- include $(BUILDDIR)/config.mk
-
-@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB)
- # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better
- # be relative to the current directory.
- MERGE_OBJECTS += $(JASPERLIB)
-+ SUBDIRS += libjasper
- endif
- MERGEBINARIES = $(BINARIES)
-
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
deleted file mode 100644
index 231da544671..00000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
-+ $(PKGDIR)/lib
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
-+ cd $(PKGDIR)/lib ; \
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
- libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -87,6 +87,9 @@
-
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
-
- # Parallel make (make --jobs) is not smart enough to coordinate builds
- # between submakes, so a naive parallel make would cause certain
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
deleted file mode 100644
index bd894bfb315..00000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-do not autoprobe deps when we disabled them
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
-
- PROG_SUBDIRS = converter analyzer editor generator other
- PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
--SUPPORT_SUBDIRS = urt icon buildtools test
-+SUPPORT_SUBDIRS = icon buildtools test
-+ifeq ($(URTLIB),$(BUNDLED_URTLIB))
-+SUPPORT_SUBDIRS += urt
-+endif
-
- SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
-
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
-
- include $(BUILDDIR)/config.mk
-
-+ifneq ($(XML2_LIBS),NONE)
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
-
- ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
-@@ -22,6 +23,7 @@ else
- XML2_CFLAGS=$(shell xml2-config --cflags)
- endif
- endif
-+endif
-
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
- ifneq ($(BUILD_FIASCO), N)
-@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE)
- endif
- endif
-
-+ifneq ($(PNGLIB),NONE)
- TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi
-
- ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
-@@ -58,6 +61,7 @@ else
- endif
- endif
- endif
-+endif
-
- ifneq ($(JPEGLIB),NONE)
- ifneq ($(JPEGHDR_DIR)x,x)
---- a/other/pamx/Makefile
-+++ b/other/pamx/Makefile
-@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
-
- EXTERN_INCLUDE =
-
-+ifneq ($(X11LIB),NONE)
- ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
- # Pkg-config has never heard of X11, or doesn't even exist
-
-@@ -23,6 +24,7 @@ else
- X11LIB = $(shell pkg-config x11 --libs)
- EXTERN_INCLUDES += $(shell pkg-config x11 --cflags)
- endif
-+endif
-
- ifeq ($(HAVE_X11LIB),Y)
- PORTBINARIES += pamx
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
deleted file mode 100644
index 717c86a72ac..00000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-the tool tries to generate binary output, but the current locale might change
-what awk generates. force it to C/ASCII to avoid that.
-
-https://bugs.gentoo.org/601012
-
---- a/test/pbmtext.test
-+++ b/test/pbmtext.test
-@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
-
- # One long row
- # Should print 3233136020 4535
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i);
- for (i=160;i<=255;++i) printf("%c",i); }' | \
- pbmtext -builtin bdf | cksum
-
- # One tall column
- # Should print 1216262214 5711
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i);
- for (i=160;i<=255;++i) printf("%c\n",i); }' | \
- pbmtext -nomargins -builtin bdf | cksum
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
deleted file mode 100644
index 8bb1b17e15f..00000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-automatically skip tests of disabled tools
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -455,6 +458,21 @@ deb:
- .PHONY: check-package
- .PHONY: check-install
-
-+# Variables from the make env we pass down to the test scripts.
-+CHECK_VARS = \
-+ BUILDDIR=$(BUILDDIR) \
-+ RGBDEF=$(RGBDEF) \
-+ BUILD_FIASCO=$(BUILD_FIASCO) \
-+ JASPERLIB="$(JASPERLIB)" \
-+ JBIGLIB="$(JBIGLIB)" \
-+ JPEGLIB="$(JPEGLIB)" \
-+ PNGLIB="$(PNGLIB)" \
-+ TIFFLIB="$(TIFFLIB)" \
-+ URTLIB="$(URTLIB)" \
-+ X11LIB="$(X11LIB)" \
-+ XML2_LIBS="$(XML2_LIBS)" \
-+ ZLIB="$(ZLIB)"
-+
- # Test files in source tree.
-
- check-tree : BUILDBINDIRS :=./analyzer \
-@@ -525,10 +543,10 @@ resultdir-backup: FORCE
-
- check-tree: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=tree \
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
- # Execute-Tests needs to know BUILDDIR in order to locate testrandom.
-@@ -545,19 +563,18 @@ check: check-package
-
- check-package: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=package \
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
-
- # Check after install
- check-install: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=install \
-- BUILDDIR=$(BUILDDIR) \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
-
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -367,11 +367,62 @@ ordinary_testprogs="\
- zeisstopnm \
- "
-
-+enabled_testprog() {
-+ case $1 in
-+ fiascotopnm|\
-+ pnmtofiasco)
-+ [ "${BUILD_FIASCO}" = "N" ] && return 1 ;;
-+
-+ jpeg2ktopam|\
-+ pamtojpeg2k)
-+ [ "${JASPERLIB}" = "NONE" ] && return 1 ;;
-+
-+ jbigtopnm|\
-+ pnmtojbig)
-+ [ "${JBIGLIB}" = "NONE" ] && return 1 ;;
-+
-+ jpegtopnm|\
-+ pnmtojpeg|\
-+ ppmtojpeg)
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamtopng|\
-+ pngtopam|\
-+ pnmtopng)
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+ svgtopam)
-+ [ "${PNGLIB}" = "NONE" ] && return 1
-+ [ "${XML2_LIBS}" = "NONE" ] && return 1
-+ ;;
-+
-+ pamtotiff|\
-+ pnmtotiffcmyk|\
-+ tifftopnm)
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+
-+ pnmtorle|\
-+ rletopnm)
-+ [ "${URTLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamx)
-+ [ "${X11LIB}" = "NONE" ] && return 1 ;;
-+ esac
-+
-+ return 0
-+}
-+
- # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm
- # has a slightly different version report format.
-
- for i in $ordinary_testprogs
- do
-+ # Stub out programs that aren't built.
-+ if ! enabled_testprog "$i"; then
-+ echo "$i: ok"
-+ continue
-+ fi
-+
- $i --version 2>&1 | \
- egrep -v -e fiascotopnm -e \
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/fiasco-roundtrip.test
-+++ b/test/fiasco-roundtrip.test
-@@ -2,6 +2,10 @@
- # This script tests: pnmtofiasco fiascotopnm
- # Also requires: pnmpad
-
-+if [ "${BUILD_FIASCO}" = "N" ]; then
-+ exit 80
-+fi
-+
- # Should print 215556145 102615
-
- pnmpad --black --bottom 1 --left 1 testimg.ppm | \
---- a/test/jbig-roundtrip.test
-+++ b/test/jbig-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtojbig jbigtopnm
- # Also requires: pamchannel pamtopnm
-
-+if [ "${JBIGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- # Test 1. Should print 2425386270 41
- pnmtojbig testgrid.pbm | jbigtopnm | cksum
---- a/test/legacy-names.test
-+++ b/test/legacy-names.test
-@@ -94,8 +94,30 @@ ordinary_testprogs="\
- ppmtouil \
- "
-
-+enabled_testprog() {
-+ case $1 in
-+ ppmtojpeg)
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamrgbatopng|\
-+ pngtopnm)
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pnmtotiff)
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+ esac
-+
-+ return 0
-+}
-+
- for i in $ordinary_testprogs
- do
-+ # Stub out programs that aren't built.
-+ if ! enabled_testprog "$i"; then
-+ echo "$i: ok"
-+ continue
-+ fi
-+
- $i --version 2>&1 | \
- egrep -v \
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/png-roundtrip.test
-+++ b/test/png-roundtrip.test
-@@ -6,6 +6,10 @@
- ## If this test fails and pnm-roundtrip2.test succeeds, it indicates
- ## some problem with pnmtopng.
-
-+if [ "${PNGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- # Test 1. Should print 1926073387 101484 18 times
- for flags in "" -interlace \
- -gamma=.45 \
---- a/test/png-roundtrip2.test
-+++ b/test/png-roundtrip2.test
-@@ -9,6 +9,10 @@
- ## If both tests fail, the likely cause is a problem with pngtopam.
- ## It is also possible that there is some problem in libpng.
-
-+if [ "${PNGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- # Test 1. Should print 1926073387 101484 twice
- for flags in "" -gamma=.45
- do
---- a/test/ps-roundtrip.test
-+++ b/test/ps-roundtrip.test
-@@ -8,6 +8,10 @@
- ## (1) zlib was not linked.
- ## (2) ghostscript is not available.
-
-+if [ "${ZLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- tmpdir=${tmpdir:-/tmp}
-
- # pstopnm does not use libnetpbm functions for output.
---- a/test/tiff-roundtrip.test
-+++ b/test/tiff-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pamtotiff tifftopnm
- # Also requires:
-
-+if [ "${TIFFLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- # Failure message
- ## Second test fails if Netpbm was built without the flate library
---- a/test/utahrle-roundtrip.test
-+++ b/test/utahrle-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtorle rletopnm
- # Also requires: pamchannel pamtopnm
-
-+if [ "${URTLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- #Test 1. Should produce 1571496937 33838, cksum of testimg.red
- pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch b/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch
deleted file mode 100644
index a7afc259ff5..00000000000
--- a/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix compiling with `CFLAGS` `-Werror=format-security`
-See also https://bugs.gentoo.org/517524
-
---- a/converter/ppm/ximtoppm.c
-+++ b/converter/ppm/ximtoppm.c
-@@ -117,9 +117,9 @@
- */
- header->bits_channel = atoi(a_head.bits_per_channel);
- header->alpha_flag = atoi(a_head.alpha_channel);
-- pm_asprintf(&header->author, a_head.author);
-- pm_asprintf(&header->date, a_head.date);
-- pm_asprintf(&header->program, a_head.program);
-+ pm_asprintf(&header->author, "%s", a_head.author);
-+ pm_asprintf(&header->date, "%s", a_head.date);
-+ pm_asprintf(&header->program, "%s", a_head.program);
- /* Do double checking for bakwards compatibility */
- if (header->npics == 0)
- header->npics = 1;
diff --git a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
new file mode 100644
index 00000000000..e1b558d5911
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
@@ -0,0 +1,22 @@
+char is unsigned by default on ppc64
+
+--- a/converter/other/pnmtopalm/palmtopnm.c
++++ b/converter/other/pnmtopalm/palmtopnm.c
+@@ -823,7 +823,7 @@
+ unsigned int j;
+
+ for (j = 0; j < bytesPerRow; ) {
+- char incount;
++ signed char incount;
+ pm_readchar(ifP, &incount);
+ if (incount < 0) {
+ /* How do we handle incount == -128 ? */
+@@ -865,7 +865,7 @@
+ unsigned int j;
+
+ for (j = 0; j < bytesPerRow; ) {
+- char incount;
++ signed char incount;
+ pm_readchar(ifP, &incount);
+ if (incount < 0) {
+ /* How do we handle incount == -128 ? */
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
deleted file mode 100644
index 595ad00ef03..00000000000
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-BDEPEND="app-arch/xz-utils
- sys-devel/flex"
-RDEPEND="jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- png? ( >=media-libs/libpng-1.4:0 )
- rle? ( media-libs/urt )
- svga? ( media-libs/svgalib )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- xml? ( dev-libs/libxml2 )
- zlib? ( sys-libs/zlib )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/netpbm-10.31-build.patch
- "${FILESDIR}"/netpbm-10.66-test.patch #450530
- "${FILESDIR}"/netpbm-10.70-system-libs.patch
-)
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo "${suffix//\.}" || die
-}
-
-netpbm_ldshlib() {
- case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
- esac
-}
-
-netpbm_config() {
- if use $1 ; then
- [[ $2 != "!" ]] && echo -l${2:-$1}
- else
- echo NONE || die
- fi
-}
-
-src_prepare() {
- default
-
- # make sure we use system libs
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
- # disable certain tests based on active USE flags
- local del=(
- $(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip')
- $(usex rle '' 'utahrle-roundtrip')
- $(usex tiff '' 'tiff-roundtrip')
- )
-
- if [[ "${#del[@]}" -gt 0 ]] ; then
- sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die
- fi
-
- del=(
- pnmtofiasco fiascotopnm # We always disable fiasco
- $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
- $(usex jbig '' 'jbigtopnm pnmtojbig')
- jpeg2ktopam pamtojpeg2k # jasper has been removed
- $(usex rle '' 'pnmtorle rletopnm')
- $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
- )
-
- if [[ "${#del[@]}" -gt 0 ]] ; then
- sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die
- sed -i '/^$/d' test/all-in-place.ok || die
- fi
-
- # take care of the importinc stuff ourselves by only doing it once
- # at the top level and having all subdirs use that one set #149843
- sed -i \
- -e '/^importinc:/s|^|importinc:\nmanual_|' \
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
- common.mk || die
-
- sed -i \
- -e '/%.c/s: importinc$::' \
- common.mk lib/Makefile lib/util/Makefile || die
-
- # avoid ugly depend.mk warnings
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
- cat config.mk.in - >> config.mk <<-EOF
- # Misc crap
- BUILD_FIASCO = N
- SYMLINK = ln -sf
-
- # These vars let src_test work by default
- PKGDIR_DEFAULT = ${T}/netpbm
- RESULTDIR_DEFAULT = ${T}/netpbm-test
-
- # Toolchain options
- CC = $(tc-getCC) -Wall
- LD = \$(CC)
- CC_FOR_BUILD = $(tc-getBUILD_CC)
- LD_FOR_BUILD = \$(CC_FOR_BUILD)
- AR = $(tc-getAR)
- RANLIB = $(tc-getRANLIB)
-
- STRIPFLAG =
- CFLAGS_SHLIB = -fPIC
-
- LDRELOC = \$(LD) -r
- LDSHLIB = $(netpbm_ldshlib)
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
- LINKERISCOMPILER = Y
- NETPBMLIBSUFFIX = $(netpbm_libsuffix)
- NETPBMLIBTYPE = $(netpbm_libtype)
- STATICLIB_TOO = $(usex static-libs Y N)
-
- # The var is called SSE, but the code is actually SSE2.
- WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
- # Gentoo build options
- TIFFLIB = $(netpbm_config tiff)
- # Let tiff worry about its own dependencies #395753
- TIFFLIB_NEEDS_JPEG = N
- TIFFLIB_NEEDS_Z = N
- JPEGLIB = $(netpbm_config jpeg)
- PNGLIB = $(netpbm_config png)
- ZLIB = $(netpbm_config zlib z)
- LINUXSVGALIB = $(netpbm_config svga vga)
- XML2_LIBS = $(netpbm_config xml xml2)
- JBIGLIB = $(netpbm_config jbig)
- JBIGHDR_DIR =
- JASPERLIB = NONE
- JASPERHDR_DIR =
- URTLIB = $(netpbm_config rle)
- URTHDR_DIR =
- X11LIB = $(netpbm_config X X11)
- X11HDR_DIR =
- EOF
- # cannot chain the die with the heredoc above as bash-3
- # has a parser bug in that setup #282902
- [[ $? -eq 0 ]] || die "writing config.mk failed"
-}
-
-src_compile() {
- emake -j1 pm_config.h version.h manual_importinc #149843
- emake
-}
-
-src_test() {
- # The code wants to install everything first and then test the result.
- emake install.{bin,lib}
- emake check
-}
-
-src_install() {
- # Subdir make targets like to use `mkdir` all over the place
- # without any actual dependencies, thus the -j1.
- emake -j1 package pkgdir="${ED}"/usr
-
- if [[ $(get_libdir) != "lib" ]] ; then
- mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
- fi
-
- # Remove cruft that we don't need, and move around stuff we want
- rm "${ED}"/usr/bin/{doc.url,manweb} || die
- rm -r "${ED}"/usr/man/web || die
- rm -r "${ED}"/usr/link || die
- rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-
- dodir /usr/share
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
- doman userguide/*.[0-9]
- dodoc README
-
- cd doc || die
- dodoc HISTORY Netpbm.programming USERDOC
-
- docinto html
- dodoc -r *.html
- use doc && dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-10.86.22.ebuild b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
index 402cbd40216..bef703001a8 100644
--- a/media-libs/netpbm/netpbm-10.86.22.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit multilib toolchain-funcs
@@ -11,23 +11,32 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+# zlib USE flag is no longer used, enabled by default.
+# cannot remove it yet because of #801445
BDEPEND="
app-arch/xz-utils
sys-devel/flex
virtual/pkgconfig
"
-RDEPEND="jbig? ( media-libs/jbigkit )
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+RDEPEND="jbig? ( media-libs/jbigkit:= )
jpeg? ( virtual/jpeg:0 )
- png? ( >=media-libs/libpng-1.4:0 )
- postscript? ( app-text/ghostscript-gpl )
- rle? ( media-libs/urt )
+ png? (
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ )
+ postscript? (
+ app-text/ghostscript-gpl
+ sys-libs/zlib
+ )
+ rle? ( media-libs/urt:= )
svga? ( media-libs/svgalib )
tiff? ( >=media-libs/tiff-3.5.5:0 )
xml? ( dev-libs/libxml2 )
- zlib? ( sys-libs/zlib )
X? ( x11-libs/libX11 )"
DEPEND="${RDEPEND}"
@@ -35,8 +44,8 @@ PATCHES=(
"${FILESDIR}"/netpbm-10.86.21-build.patch
"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
- "${FILESDIR}"/netpbm-10.86.21-format-security.patch #517524
"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+ "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
)
netpbm_libtype() {
@@ -117,7 +126,8 @@ src_prepare() {
}
src_configure() {
- # cannot chain the die with the heredoc, please check the comment below
+ # cannot chain the die with the heredoc
+ # repoman tries to parse the heredoc and fails
cat config.mk.in - >> config.mk <<-EOF
# Misc crap
BUILD_FIASCO = N
@@ -157,7 +167,7 @@ src_configure() {
TIFFLIB_NEEDS_Z = N
JPEGLIB = $(netpbm_config jpeg)
PNGLIB = $(netpbm_config png)
- ZLIB = $(netpbm_config zlib z)
+ ZLIB = -lz
LINUXSVGALIB = $(netpbm_config svga vga)
XML2_LIBS = $(netpbm_config xml xml2)
JBIGLIB = $(netpbm_config jbig)
@@ -169,8 +179,6 @@ src_configure() {
X11LIB = $(netpbm_config X X11)
X11HDR_DIR =
EOF
- # cannot chain the die with the heredoc above as bash-3
- # has a parser bug in that setup #282902
[[ $? -eq 0 ]] || die "writing config.mk failed"
}
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.86.27.ebuild
index b27af756a53..c43a3d9a31f 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.27.ebuild
@@ -1,41 +1,50 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit multilib toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs
DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+# zlib USE flag is no longer used, enabled by default.
+# cannot remove it yet because of #801445
BDEPEND="
app-arch/xz-utils
sys-devel/flex
virtual/pkgconfig
"
-RDEPEND="jbig? ( media-libs/jbigkit )
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+RDEPEND="jbig? ( media-libs/jbigkit:= )
jpeg? ( virtual/jpeg:0 )
- png? ( >=media-libs/libpng-1.4:0 )
- postscript? ( app-text/ghostscript-gpl )
- rle? ( media-libs/urt )
+ png? (
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ )
+ postscript? (
+ app-text/ghostscript-gpl
+ sys-libs/zlib
+ )
+ rle? ( media-libs/urt:= )
svga? ( media-libs/svgalib )
tiff? ( >=media-libs/tiff-3.5.5:0 )
xml? ( dev-libs/libxml2 )
- zlib? ( sys-libs/zlib )
X? ( x11-libs/libX11 )"
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/netpbm-10.76.00-build.patch
- "${FILESDIR}"/netpbm-10.76.00-test.patch #450530
- "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
- "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
+ "${FILESDIR}"/netpbm-10.86.21-build.patch
+ "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
+ "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
+ "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
)
netpbm_libtype() {
@@ -57,13 +66,20 @@ netpbm_ldshlib() {
esac
}
netpbm_config() {
- if use $1 ; then
- [[ $2 != "!" ]] && echo -l${2:-$1}
+ if use ${1} ; then
+ [[ ${2} != "!" ]] && echo -l${2:-$1}
else
echo NONE
fi
}
+# for bug #828127
+netpbm_cflags_for_build() {
+ if is-flagq -fPIC; then
+ echo -fPIC
+ fi
+}
+
src_prepare() {
default
@@ -92,15 +108,32 @@ src_prepare() {
sed -i -r \
-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
test/all-in-place.{ok,test} || die
+ sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
sed -i -e '/^$/d' test/all-in-place.ok || die
- sed -i '2iexit 80' test/ps-{alt-,}roundtrip.test || die
+ sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
fi
- # avoid ugly depend.mk warnings
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
+ # the new postscript test needs +x
+ chmod +x test/lps-roundtrip.test
+
+ # Do not test png if not built
+ if ! use png ; then
+ sed -i -r \
+ -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i -e '/^$/d' test/all-in-place.ok || die
+
+ sed -i -r \
+ -e 's:(pamrgbatopng|pngtopnm).*::' \
+ test/legacy-names.{ok,test} || die
+ sed -i -e '/^$/d' test/legacy-names.ok || die
+ sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
+ fi
}
src_configure() {
+ # cannot chain the die with the heredoc
+ # repoman tries to parse the heredoc and fails
cat config.mk.in - >> config.mk <<-EOF
# Misc crap
BUILD_FIASCO = N
@@ -121,6 +154,7 @@ src_configure() {
STRIPFLAG =
CFLAGS_SHLIB = -fPIC
+ CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
LDRELOC = \$(LD) -r
LDSHLIB = $(netpbm_ldshlib)
@@ -140,7 +174,7 @@ src_configure() {
TIFFLIB_NEEDS_Z = N
JPEGLIB = $(netpbm_config jpeg)
PNGLIB = $(netpbm_config png)
- ZLIB = $(netpbm_config zlib z)
+ ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
LINUXSVGALIB = $(netpbm_config svga vga)
XML2_LIBS = $(netpbm_config xml xml2)
JBIGLIB = $(netpbm_config jbig)
@@ -152,8 +186,6 @@ src_configure() {
X11LIB = $(netpbm_config X X11)
X11HDR_DIR =
EOF
- # cannot chain the die with the heredoc above as bash-3
- # has a parser bug in that setup #282902
[[ $? -eq 0 ]] || die "writing config.mk failed"
}
@@ -178,13 +210,9 @@ src_install() {
fi
# Remove cruft that we don't need, and move around stuff we want
- rm "${ED}"/usr/bin/{doc.url,manweb} || die
- rm -r "${ED}"/usr/man/web || die
- rm -r "${ED}"/usr/link || die
rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
dodir /usr/share
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die
mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
doman userguide/*.[0-9]
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index ef645b32e8c..cf6652d8165 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,6 +1,7 @@
DIST nv-codec-headers-10.0.26.0.tar.gz 61978 BLAKE2B 0f91a3e9f0be19658a519ad4d9091aea4e8a59c0a857d997ce49060d84f35ba7fe5f5fc2e19ee63ad054df16df08946990cc70abe867ceefd40867fb3a06f9ee SHA512 707a2151e5045939be69083bca8b8219439e1edb218a3eb3a8f1ebf38e6c8fd9ef2066e5f986c57b63573603c1fa2ae34f24acee118d1f69e39b3d7b747a28f0
DIST nv-codec-headers-10.0.26.1.tar.gz 62544 BLAKE2B a19d87101fe0bb511383ca6d5f61fe5a8ecce54827a09ae5526d6b546f50cf14368887550f7689180041e8a36b61ba53c103b8a225a7765670b5d97169d62a62 SHA512 18c507d73efc8b7194bcc79a2e25f88c81390d10766511f9b0c4826cb7b9332e9d0f2667441dd5529575dd1d2c0e0625304ee489c643c9f66ec90f2dbab566c9
DIST nv-codec-headers-11.0.10.0.tar.gz 66724 BLAKE2B 98fb8cd663ac61ad58f5d463ded9852e94b377991de2f980ec0a0088fcd5d0af98090b76f82e9e7ca242a0ff55e4d4c1ef91c9c6466a6de8d81e97ba2d721e66 SHA512 f4964499a834ba31e073f0b0deabba354eb8351cd135846efd3387313ef4af0750a875d450674ef416f2b2cc7176e9154c1e5033de07f6091b9d0cc7c7ef9cb1
+DIST nv-codec-headers-11.1.5.0.tar.gz 67850 BLAKE2B 27c1ae4a8710bbb1ca72d5009ec4b62c71f1899c128009bf7017603429dc9c47df9894bb0e1eb2fd21986ee713aa24a82e0753a4b196347ad51371d67b2f3dbf SHA512 b973ba763476b083870d7701b63cb98cc5e22d3698e431316c82b8ffd887d430df296938af52ed54478440105ac34f4282b0a8471eb541c1ff77cac9ad33ec3d
DIST nv-codec-headers-8.1.24.2.tar.gz 53627 BLAKE2B 482c86824f81652b439fba1b765261de107d51a3bd780d3f0c58e1cdd53cd21ddad3fea59e8ab5d920fb34c73e43c10c007a5efe32024bfd3523ed8d4ad26f44 SHA512 daa45ae8bcc11eb6b8d671c2d720d5c3edce9e4ef68f913ed25a8c4d1a4b165e0576b03eff9ce2fe355156ab5a5d8d74573158ef190feec5cfb5ac0838e0caa7
DIST nv-codec-headers-9.0.18.1.tar.gz 58850 BLAKE2B 8e940ffb929f67c4e459cfd55113298527cf8430b94d20e9bb7148cf532dbed798138e63801f29d168d0b4b465c0eb6ef3c58596289063f461b7d5e8832ce7e8 SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
DIST nv-codec-headers-9.1.23.1.tar.gz 59400 BLAKE2B a4f437b5abc8bac05bafde4f01a4fa42f7acf2fd4a1d8b7e58f6a5a5e54c95a6ef9d6b510829bed9ed63f804220de460adc6441bf3c0bd451774dacc6f11e43e SHA512 0c1112cb1db98f60e64eeee24e3592b65c31ea8a808de707d4d0a56efb71c9a483bb3af45a641bff1f8422ab44e6be4bffd548b6567305021a448bcd66202b29
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild
new file mode 100644
index 00000000000..a00618c3dc9
--- /dev/null
+++ b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="FFmpeg version of headers required to interface with Nvidias codec APIs"
+HOMEPAGE="https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
+SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=x11-drivers/nvidia-drivers-470.57.02[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+ multilib_copy_sources
+ default
+}
+
+multilib_src_compile() {
+ emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+}
+
+multilib_src_install() {
+ emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
+}
diff --git a/media-libs/oidn/oidn-1.3.0.ebuild b/media-libs/oidn/oidn-1.3.0-r1.ebuild
index 9a557e648b0..d4457dbdc0d 100644
--- a/media-libs/oidn/oidn-1.3.0.ebuild
+++ b/media-libs/oidn/oidn-1.3.0-r1.ebuild
@@ -26,11 +26,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- dev-cpp/tbb
+ dev-cpp/tbb:=
dev-lang/ispc"
-BDEPEND="
- ${RDEPEND}
- dev-util/cmake"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake"
CMAKE_BUILD_TYPE=Release
diff --git a/media-libs/oidn/oidn-1.4.1.ebuild b/media-libs/oidn/oidn-1.4.1-r1.ebuild
index 86732c4f1ae..0583a3ff620 100644
--- a/media-libs/oidn/oidn-1.4.1.ebuild
+++ b/media-libs/oidn/oidn-1.4.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999 ]]; then
EGIT_BRANCH="master"
else
SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
LICENSE="Apache-2.0"
@@ -25,11 +25,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- dev-cpp/tbb
+ dev-cpp/tbb:=
dev-lang/ispc"
-BDEPEND="
- ${RDEPEND}
- dev-util/cmake"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake"
CMAKE_BUILD_TYPE=Release
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 6c79cbbec3a..921e7a73a12 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -2,3 +2,4 @@ DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78
DIST opencolorio-2.0.0.tar.gz 9892414 BLAKE2B fdff2e144eadb444624f059f7582ea99d4e2dbd53cad5b89f92d19c7ca9dda2ff9ec4f8c8d00e6ac083da21134f9bc783b297c553a8e7d11936c936e5c41a2f3 SHA512 7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0
DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
DIST opencolorio-2.0.2.tar.gz 10812416 BLAKE2B 36f008035c36bef9473f9f79e9362eec20abb8e217a2131d3a2be5766de60cdab36e137547d414bf18e97ad368e30fb89a0ad4d8095b24bd184704d88ef192ae SHA512 ebc6b4b4251f69cb69f7203bc9ae962010f7f60ed5d53eb3ff14b64d5ef8cac2b98d0482485f1adaaf6b8c065cd4edd01c4e0577324a86ed4ebfe8e33e9fa667
+DIST opencolorio-2.1.0.tar.gz 10970849 BLAKE2B 3703ab90c7dfa853583e3018eee9a28c9f471207b3c6743095cf681a4659da708893be508b521195bf84f59ac2c058f844a8f70f83666beaed208812cf845420 SHA512 a0f4fb62c768b392ca1129e2046df96d670d785fc057d4103768440b7adb65d8faf5b7d39729060791794e83e6cd4e67821aed9b30f3f04b410c60809cd72267
diff --git a/media-libs/opencolorio/opencolorio-1.1.1-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
index ba79f07d083..4a6a5c7dd95 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
@@ -20,12 +20,15 @@ REQUIRED_USE="
doc? ( python )
python? ( ${PYTHON_REQUIRED_USE} )"
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
RDEPEND="
<dev-cpp/yaml-cpp-0.7.0:=
dev-libs/tinyxml
opengl? (
media-libs/lcms:2
- media-libs/openimageio
+ <media-libs/openimageio-2.3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.0.ebuild b/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild
index b5898ec2ed4..d582251eb11 100644
--- a/media-libs/opencolorio/opencolorio-2.0.0.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild
@@ -26,6 +26,9 @@ REQUIRED_USE="
doc? ( python )
python? ( ${PYTHON_REQUIRED_USE} )"
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
RDEPEND="
dev-cpp/pystring
dev-python/pybind11
@@ -34,7 +37,7 @@ RDEPEND="
dev-libs/tinyxml
opengl? (
media-libs/lcms:2
- >=media-libs/openimageio-2.2.13.0
+ <media-libs/openimageio-2.3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.1.ebuild b/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
index 48d1c400dd1..8b6fd27357c 100644
--- a/media-libs/opencolorio/opencolorio-2.0.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/O
SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/OpenColorIO-${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
LICENSE="BSD"
SLOT="0"
IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
@@ -21,6 +21,9 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
RDEPEND="
dev-cpp/pystring
dev-python/pybind11
@@ -29,7 +32,7 @@ RDEPEND="
dev-libs/tinyxml
opengl? (
media-libs/lcms:2
- >=media-libs/openimageio-2.2.13.0
+ <media-libs/openimageio-2.3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.2.ebuild b/media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild
index 1367951a8fd..9897f5ded78 100644
--- a/media-libs/opencolorio/opencolorio-2.0.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild
@@ -21,6 +21,9 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
RDEPEND="
dev-cpp/pystring
dev-python/pybind11
@@ -29,7 +32,7 @@ RDEPEND="
dev-libs/tinyxml
opengl? (
media-libs/lcms:2
- >=media-libs/openimageio-2.2.13.0
+ <media-libs/openimageio-2.3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
@@ -77,6 +80,7 @@ src_configure() {
-DOCIO_BUILD_DOCS=$(usex doc)
-DOCIO_BUILD_APPS=$(usex opengl)
-DOCIO_BUILD_PYTHON=$(usex python)
+ -DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
-DOCIO_BUILD_JAVA=OFF
-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
-DOCIO_BUILD_TESTS=$(usex test)
diff --git a/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild
new file mode 100644
index 00000000000..9a4f6d7d90e
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+ doc? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
+# 2.1.1 should be?
+#
+# See bug #802363 for yaml-cpp < dep
+RDEPEND="
+ dev-cpp/pystring
+ dev-python/pybind11
+ <dev-cpp/yaml-cpp-0.7.0:=
+ dev-libs/tinyxml
+ media-libs/ilmbase:=
+ opengl? (
+ media-libs/lcms:2
+ <media-libs/openimageio-2.3:=
+ media-libs/glew:=
+ media-libs/freeglut
+ virtual/opengl
+ )
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-util/cmake-3.16.2-r1
+ virtual/pkgconfig
+ doc? (
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/testresources[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+ sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+}
+
+src_configure() {
+ # Missing features:
+ # - Truelight and Nuke are not in portage for now, so their support are disabled
+ # - Java bindings was not tested, so disabled
+ # Notes:
+ # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+ # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+ local mycmakeargs=(
+ # Don't use imath yet, needs some poking to find the right headers
+ -DOCIO_USE_OPENEXR_HALF=ON
+ -DBUILD_SHARED_LIBS=ON
+ -DOCIO_BUILD_STATIC=$(usex static-libs)
+ -DOCIO_BUILD_DOCS=$(usex doc)
+ -DOCIO_BUILD_APPS=$(usex opengl)
+ -DOCIO_BUILD_PYTHON=$(usex python)
+ -DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
+ -DOCIO_BUILD_JAVA=OFF
+ -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+ -DOCIO_BUILD_TESTS=$(usex test)
+ -DOCIO_BUILD_GPU_TESTS=$(usex test)
+ -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
+ -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ )
+
+ # We need this to work around asserts that can trigger even in proper use cases.
+ # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
+ append-flags -DNDEBUG
+
+ cmake_src_configure
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index d09b3e97e0c..7778d4d286a 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -7,4 +7,6 @@ DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85
DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
+DIST opencv-4.5.4.tar.gz 89724634 BLAKE2B 76ce5ab8182c87e5f9e18faf62f2ee0eb629e4997877c59aa0f6ac334c27d737cf5205f4b85f64cabfdd587a57096fa3241ae6e48cebbd963ec8ad3ebe07ad35 SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
+DIST opencv-4.5.4_contrib.tar.gz 61054226 BLAKE2B c553bfc6fd1b5fd17f562b27248ddd4bd946089cd8cce346f152b47d4a8a22faa35ceb9bd501c31901189b884d782fbfec1dc041d69e1b8cc0ac0d5d079e610e SHA512 a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch b/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch
new file mode 100644
index 00000000000..31e2fc60d12
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch
@@ -0,0 +1,123 @@
+https://bugs.gentoo.org/800539
+
+--- a/modules/core/src/hal_internal.cpp
++++ b/modules/core/src/hal_internal.cpp
+@@ -163,9 +163,9 @@
+ if(n == 1 && b_step == sizeof(fptype))
+ {
+ if(typeid(fptype) == typeid(float))
+- sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
++ LAPACK_sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
+ else if(typeid(fptype) == typeid(double))
+- dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
++ LAPACK_dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
+ }
+ else
+ {
+@@ -174,9 +174,9 @@
+ transpose(b, ldb, tmpB, m, m, n);
+
+ if(typeid(fptype) == typeid(float))
+- sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
++ LAPACK_sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
+ else if(typeid(fptype) == typeid(double))
+- dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
++ LAPACK_dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
+
+ transpose(tmpB, m, b, ldb, n, m);
+ delete[] tmpB;
+@@ -185,9 +185,9 @@
+ else
+ {
+ if(typeid(fptype) == typeid(float))
+- spotrf_(L, &m, (float*)a, &lda, &lapackStatus);
++ LAPACK_spotrf_(L, &m, (float*)a, &lda, &lapackStatus);
+ else if(typeid(fptype) == typeid(double))
+- dpotrf_(L, &m, (double*)a, &lda, &lapackStatus);
++ LAPACK_dpotrf_(L, &m, (double*)a, &lda, &lapackStatus);
+ }
+
+ if(lapackStatus == 0) *info = true;
+@@ -227,17 +227,17 @@
+ }
+
+ if(typeid(fptype) == typeid(float))
+- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
++ LAPACK_sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
+ else if(typeid(fptype) == typeid(double))
+- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
++ LAPACK_dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
+
+ lwork = (int)round(work1); //optimal buffer size
+ fptype* buffer = new fptype[lwork + 1];
+
+ if(typeid(fptype) == typeid(float))
+- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
++ LAPACK_sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
+ else if(typeid(fptype) == typeid(double))
+- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
++ LAPACK_dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
+
+ if(!(flags & CV_HAL_SVD_NO_UV))
+ transpose_square_inplace(vt, ldv, n);
+@@ -288,18 +288,18 @@
+ if (k == 1 && b_step == sizeof(fptype))
+ {
+ if (typeid(fptype) == typeid(float))
+- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
++ LAPACK_sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
+ else if (typeid(fptype) == typeid(double))
+- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
++ LAPACK_dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
+
+ lwork = cvRound(work1); //optimal buffer size
+ std::vector<fptype> workBufMemHolder(lwork + 1);
+ fptype* buffer = &workBufMemHolder.front();
+
+ if (typeid(fptype) == typeid(float))
+- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
++ LAPACK_sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
+ else if (typeid(fptype) == typeid(double))
+- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
++ LAPACK_dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
+ }
+ else
+ {
+@@ -309,18 +309,18 @@
+ transpose(b, ldb, tmpB, m, m, k);
+
+ if (typeid(fptype) == typeid(float))
+- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
++ LAPACK_sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
+ else if (typeid(fptype) == typeid(double))
+- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
++ LAPACK_dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
+
+ lwork = cvRound(work1); //optimal buffer size
+ std::vector<fptype> workBufMemHolder(lwork + 1);
+ fptype* buffer = &workBufMemHolder.front();
+
+ if (typeid(fptype) == typeid(float))
+- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
++ LAPACK_sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
+ else if (typeid(fptype) == typeid(double))
+- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
++ LAPACK_dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
+
+ transpose(tmpB, m, b, ldb, k, m);
+ }
+--- a/cmake/checks/lapack_check.cpp
++++ b/cmake/checks/lapack_check.cpp
+@@ -2,9 +2,9 @@
+ #include "opencv_lapack.h"
+
+ static char* check_fn1 = (char*)sgesv_;
+-static char* check_fn2 = (char*)sposv_;
+-static char* check_fn3 = (char*)spotrf_;
+-static char* check_fn4 = (char*)sgesdd_;
++static char* check_fn2 = (char*)LAPACK_sposv_;
++static char* check_fn3 = (char*)LAPACK_spotrf_;
++static char* check_fn4 = (char*)LAPACK_sgesdd_;
+
+ int main(int argc, char* argv[])
+ {
diff --git a/media-libs/opencv/opencv-4.5.0-r1.ebuild b/media-libs/opencv/opencv-4.5.0-r3.ebuild
index 80cfca7c7c3..60d93595119 100644
--- a/media-libs/opencv/opencv-4.5.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.0-r3.ebuild
@@ -83,7 +83,7 @@ REQUIRED_USE="
RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
@@ -135,7 +135,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:5= )
)
tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.5.1-r1.ebuild b/media-libs/opencv/opencv-4.5.1-r3.ebuild
index 8e273550454..4c0223aebb8 100644
--- a/media-libs/opencv/opencv-4.5.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1-r3.ebuild
@@ -85,7 +85,7 @@ REQUIRED_USE="
RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
@@ -137,7 +137,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:5= )
)
tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.5.2-r1.ebuild b/media-libs/opencv/opencv-4.5.2-r3.ebuild
index c3c644f988c..9b1bb3c11c7 100644
--- a/media-libs/opencv/opencv-4.5.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r3.ebuild
@@ -87,7 +87,7 @@ REQUIRED_USE="
RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
@@ -139,7 +139,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:5= )
)
tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.5.2-r5.ebuild b/media-libs/opencv/opencv-4.5.2-r5.ebuild
new file mode 100644
index 00000000000..21f9624b904
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.2-r5.ebuild
@@ -0,0 +1,571 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tesseract? ( contrib )
+ ?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+# openmp? ( !threads )
+
+RDEPEND="
+ app-arch/bzip2[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+ gdal? ( sci-libs/gdal:= )
+ gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+ glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/opengl[${MULTILIB_USEDEP}]
+ virtual/glu[${MULTILIB_USEDEP}]
+ )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ qt5? (
+ dev-qt/qtgui:5=
+ dev-qt/qtwidgets:5=
+ dev-qt/qttest:5=
+ dev-qt/qtconcurrent:5=
+ opengl? ( dev-qt/qtopengl:5= )
+ )
+ tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+ eigen? (
+ || (
+ >=dev-cpp/eigen-3.3.8-r1:3
+ <dev-cpp/eigen-3.3.8:3
+ )
+ )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+ "${FILESDIR}"/${PN}-4.5.2-lapack-3.10.patch
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; then
+ mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+ fi
+
+ if use contrib; then
+ cd "${WORKDIR}/${PN}_contrib-${PV}" || die
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+ fi
+
+ java-pkg-opt-2_src_prepare
+
+ # this really belongs in src_prepare() too
+ JAVA_ANT_ENCODING="iso-8859-1"
+ # set encoding so even this cmake build will pick it up.
+ export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+ java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+ # please dont sort here, order is the same as in CMakeLists.txt
+ GLOBALCMAKEARGS=(
+ # Optional 3rd party components
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -DWITH_1394=$(usex ieee1394)
+ # -DWITH_AVFOUNDATION=OFF # IOS
+ -DWITH_VTK=$(multilib_native_usex vtk)
+ -DWITH_EIGEN=$(usex eigen)
+ -DWITH_VFW=OFF # Video windows support
+ -DWITH_FFMPEG=$(usex ffmpeg)
+ -DWITH_GSTREAMER=$(usex gstreamer)
+ -DWITH_GSTREAMER_0_10=OFF # Don't want this
+ -DWITH_GTK=$(usex gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(usex openexr)
+ -DWITH_OPENGL=$(usex opengl)
+ -DWITH_OPENVX=OFF
+ -DWITH_OPENNI=OFF # Not packaged
+ -DWITH_OPENNI2=OFF # Not packaged
+ -DWITH_PNG=$(usex png)
+ -DWITH_GDCM=OFF
+ -DWITH_PVAPI=OFF
+ -DWITH_GIGEAPI=OFF
+ -DWITH_ARAVIS=OFF
+ -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+ -DWITH_WIN32UI=OFF # Windows only
+ # -DWITH_QUICKTIME=OFF
+ # -DWITH_QTKIT=OFF
+ -DWITH_TBB=$(usex threads)
+ -DWITH_OPENMP=$(usex openmp)
+ -DWITH_CSTRIPES=OFF
+ -DWITH_PTHREADS_PF=ON
+ -DWITH_TIFF=$(usex tiff)
+ -DWITH_UNICAP=OFF # Not packaged
+ -DWITH_V4L=$(usex v4l)
+ -DWITH_LIBV4L=$(usex v4l)
+ # -DWITH_DSHOW=ON # direct show supp
+ -DWITH_MSMF=OFF
+ -DWITH_XIMEA=OFF # Windows only
+ -DWITH_XINE=$(multilib_native_usex xine)
+ -DWITH_CLP=OFF
+ -DWITH_OPENCL=$(usex opencl)
+ -DWITH_OPENCL_SVM=OFF
+ -DWITH_OPENCLAMDFFT=$(usex opencl)
+ -DWITH_OPENCLAMDBLAS=$(usex opencl)
+ -DWITH_DIRECTX=OFF
+ -DWITH_INTELPERC=OFF
+ -DWITH_IPP_A=OFF
+ -DWITH_MATLAB=OFF
+ -DWITH_VA=$(usex vaapi)
+ -DWITH_VA_INTEL=$(usex vaapi)
+ -DWITH_GDAL=$(multilib_native_usex gdal)
+ -DWITH_GPHOTO2=$(usex gphoto2)
+ -DWITH_LAPACK=$(multilib_native_usex lapack)
+ -DWITH_ITT=OFF # 3dparty libs itt_notify
+ # ===================================================
+ # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+ # ===================================================
+ -DWITH_CUDA=$(multilib_native_usex cuda)
+ -DWITH_CUBLAS=$(multilib_native_usex cuda)
+ -DWITH_CUFFT=$(multilib_native_usex cuda)
+ -DWITH_NVCUVID=OFF
+ # -DWITH_NVCUVID=$(usex cuda)
+ -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+ # ===================================================
+ # OpenCV build components
+ # ===================================================
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -DBUILD_DOCS=OFF # Doesn't install anyways.
+ -DBUILD_EXAMPLES=$(multilib_native_usex examples)
+ -DBUILD_PERF_TESTS=OFF
+ -DBUILD_TESTS=$(multilib_native_usex testprograms)
+ -DBUILD_WITH_DEBUG_INFO=$(usex debug)
+ # -DBUILD_WITH_STATIC_CRT=OFF
+ -DBUILD_WITH_DYNAMIC_IPP=OFF
+ -DBUILD_FAT_JAVA_LIB=OFF
+ # -DBUILD_ANDROID_SERVICE=OFF
+ -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+ -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+ # ===================================================
+ # OpenCV installation options
+ # ===================================================
+ -DINSTALL_CREATE_DISTRIB=OFF
+ -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+ -DINSTALL_TESTS=$(multilib_native_usex testprograms)
+ -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+ # -DINSTALL_ANDROID_EXAMPLES=OFF
+ -DINSTALL_TO_MANGLED_PATHS=OFF
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -DENABLE_SOLUTION_FOLDERS=OFF
+ -DENABLE_PROFILING=OFF
+ -DENABLE_COVERAGE=OFF
+
+ -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+ -DENABLE_NOISY_WARNINGS=OFF
+ -DOPENCV_WARNINGS_ARE_ERRORS=OFF
+ -DENABLE_IMPL_COLLECTION=OFF
+ -DENABLE_INSTRUMENTATION=OFF
+ -DGENERATE_ABI_DESCRIPTOR=OFF
+ -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # things we want to be hard off or not yet figured out
+ # ===================================================
+ -DBUILD_PACKAGE=OFF
+ # ===================================================
+ # Not building protobuf but update files bug #631418
+ # ===================================================
+ -DBUILD_PROTOBUF=OFF
+ -DPROTOBUF_UPDATE_FILES=ON
+ # ===================================================
+ # things we want to be hard enabled not worth useflag
+ # ===================================================
+ -DCMAKE_SKIP_RPATH=ON
+ -DOPENCV_DOC_INSTALL_PATH=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+ )
+
+ if multilib_is_native_abi; then
+ GLOBALCMAKEARGS+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+ )
+ else
+ GLOBALCMAKEARGS+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+ )
+ fi
+ fi
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ local mycmakeargs=(
+ ${GLOBALCMAKEARGS[@]}
+ -DPYTHON_EXECUTABLE=OFF
+ -DINSTALL_PYTHON_EXAMPLES=OFF
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_src_configure
+
+ # Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+ # TODO patch ocv_download to copy files into destination dirs
+ if use contribdnn; then
+ mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+ cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+ fi
+
+}
+
+python_module_compile() {
+ local BUILD_DIR="${orig_BUILD_DIR}"
+ local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+ # Set all python variables to load the correct Gentoo paths
+ mycmakeargs+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_src_install
+
+ # Build and install the python modules for all targets
+ if multilib_is_native_abi && use python; then
+ local orig_BUILD_DIR="${BUILD_DIR}"
+ python_foreach_impl python_module_compile
+ fi
+}
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
new file mode 100644
index 00000000000..55c89688fe8
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.4.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tesseract? ( contrib )
+ ?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+# openmp? ( !threads )
+
+RDEPEND="
+ app-arch/bzip2[${MULTILIB_USEDEP}]
+ dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+ gdal? ( sci-libs/gdal:= )
+ gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+ glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/opengl[${MULTILIB_USEDEP}]
+ virtual/glu[${MULTILIB_USEDEP}]
+ )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ qt5? (
+ dev-qt/qtgui:5=
+ dev-qt/qtwidgets:5=
+ dev-qt/qttest:5=
+ dev-qt/qtconcurrent:5=
+ opengl? ( dev-qt/qtopengl:5= )
+ )
+ tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+ eigen? (
+ || (
+ >=dev-cpp/eigen-3.3.8-r1:3
+ <dev-cpp/eigen-3.3.8:3
+ )
+ )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+ "${FILESDIR}"/${PN}-4.5.2-lapack-3.10.patch
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; then
+ mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+ fi
+
+ if use contrib; then
+ cd "${WORKDIR}/${PN}_contrib-${PV}" || die
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+ fi
+
+ java-pkg-opt-2_src_prepare
+
+ # this really belongs in src_prepare() too
+ JAVA_ANT_ENCODING="iso-8859-1"
+ # set encoding so even this cmake build will pick it up.
+ export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+ java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+ # please dont sort here, order is the same as in CMakeLists.txt
+ GLOBALCMAKEARGS=(
+ # Optional 3rd party components
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -DWITH_1394=$(usex ieee1394)
+ # -DWITH_AVFOUNDATION=OFF # IOS
+ -DWITH_VTK=$(multilib_native_usex vtk)
+ -DWITH_EIGEN=$(usex eigen)
+ -DWITH_VFW=OFF # Video windows support
+ -DWITH_FFMPEG=$(usex ffmpeg)
+ -DWITH_GSTREAMER=$(usex gstreamer)
+ -DWITH_GSTREAMER_0_10=OFF # Don't want this
+ -DWITH_GTK=$(usex gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(usex openexr)
+ -DWITH_OPENGL=$(usex opengl)
+ -DWITH_OPENVX=OFF
+ -DWITH_OPENNI=OFF # Not packaged
+ -DWITH_OPENNI2=OFF # Not packaged
+ -DWITH_PNG=$(usex png)
+ -DWITH_GDCM=OFF
+ -DWITH_PVAPI=OFF
+ -DWITH_GIGEAPI=OFF
+ -DWITH_ARAVIS=OFF
+ -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+ -DWITH_WIN32UI=OFF # Windows only
+ # -DWITH_QUICKTIME=OFF
+ # -DWITH_QTKIT=OFF
+ -DWITH_TBB=$(usex threads)
+ -DWITH_OPENMP=$(usex openmp)
+ -DWITH_CSTRIPES=OFF
+ -DWITH_PTHREADS_PF=ON
+ -DWITH_TIFF=$(usex tiff)
+ -DWITH_UNICAP=OFF # Not packaged
+ -DWITH_V4L=$(usex v4l)
+ -DWITH_LIBV4L=$(usex v4l)
+ # -DWITH_DSHOW=ON # direct show supp
+ -DWITH_MSMF=OFF
+ -DWITH_XIMEA=OFF # Windows only
+ -DWITH_XINE=$(multilib_native_usex xine)
+ -DWITH_CLP=OFF
+ -DWITH_OPENCL=$(usex opencl)
+ -DWITH_OPENCL_SVM=OFF
+ -DWITH_OPENCLAMDFFT=$(usex opencl)
+ -DWITH_OPENCLAMDBLAS=$(usex opencl)
+ -DWITH_DIRECTX=OFF
+ -DWITH_INTELPERC=OFF
+ -DWITH_IPP_A=OFF
+ -DWITH_MATLAB=OFF
+ -DWITH_VA=$(usex vaapi)
+ -DWITH_VA_INTEL=$(usex vaapi)
+ -DWITH_GDAL=$(multilib_native_usex gdal)
+ -DWITH_GPHOTO2=$(usex gphoto2)
+ -DWITH_LAPACK=$(multilib_native_usex lapack)
+ -DWITH_ITT=OFF # 3dparty libs itt_notify
+ # ===================================================
+ # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+ # ===================================================
+ -DWITH_CUDA=$(multilib_native_usex cuda)
+ -DWITH_CUBLAS=$(multilib_native_usex cuda)
+ -DWITH_CUFFT=$(multilib_native_usex cuda)
+ -DWITH_NVCUVID=OFF
+ # -DWITH_NVCUVID=$(usex cuda)
+ -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+ # ===================================================
+ # OpenCV build components
+ # ===================================================
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -DBUILD_DOCS=OFF # Doesn't install anyways.
+ -DBUILD_EXAMPLES=$(multilib_native_usex examples)
+ -DBUILD_PERF_TESTS=OFF
+ -DBUILD_TESTS=$(multilib_native_usex testprograms)
+ -DBUILD_WITH_DEBUG_INFO=$(usex debug)
+ # -DBUILD_WITH_STATIC_CRT=OFF
+ -DBUILD_WITH_DYNAMIC_IPP=OFF
+ -DBUILD_FAT_JAVA_LIB=OFF
+ # -DBUILD_ANDROID_SERVICE=OFF
+ -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+ -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+ # ===================================================
+ # OpenCV installation options
+ # ===================================================
+ -DINSTALL_CREATE_DISTRIB=OFF
+ -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+ -DINSTALL_TESTS=$(multilib_native_usex testprograms)
+ -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+ # -DINSTALL_ANDROID_EXAMPLES=OFF
+ -DINSTALL_TO_MANGLED_PATHS=OFF
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -DENABLE_SOLUTION_FOLDERS=OFF
+ -DENABLE_PROFILING=OFF
+ -DENABLE_COVERAGE=OFF
+
+ -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+ -DENABLE_NOISY_WARNINGS=OFF
+ -DOPENCV_WARNINGS_ARE_ERRORS=OFF
+ -DENABLE_IMPL_COLLECTION=OFF
+ -DENABLE_INSTRUMENTATION=OFF
+ -DGENERATE_ABI_DESCRIPTOR=OFF
+ -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # things we want to be hard off or not yet figured out
+ # ===================================================
+ -DBUILD_PACKAGE=OFF
+ # ===================================================
+ # Not building protobuf but update files bug #631418
+ # ===================================================
+ -DBUILD_PROTOBUF=OFF
+ -DPROTOBUF_UPDATE_FILES=ON
+ # ===================================================
+ # things we want to be hard enabled not worth useflag
+ # ===================================================
+ -DCMAKE_SKIP_RPATH=ON
+ -DOPENCV_DOC_INSTALL_PATH=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+ )
+
+ if multilib_is_native_abi; then
+ GLOBALCMAKEARGS+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+ )
+ else
+ GLOBALCMAKEARGS+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+ )
+ fi
+ fi
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ local mycmakeargs=(
+ ${GLOBALCMAKEARGS[@]}
+ -DPYTHON_EXECUTABLE=OFF
+ -DINSTALL_PYTHON_EXAMPLES=OFF
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_src_configure
+
+ # Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+ # TODO patch ocv_download to copy files into destination dirs
+ if use contribdnn; then
+ mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+ cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+ fi
+
+}
+
+python_module_compile() {
+ local BUILD_DIR="${orig_BUILD_DIR}"
+ local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+ # Set all python variables to load the correct Gentoo paths
+ mycmakeargs+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_src_install
+
+ # Build and install the python modules for all targets
+ if multilib_is_native_abi && use python; then
+ local orig_BUILD_DIR="${BUILD_DIR}"
+ python_foreach_impl python_module_compile
+ fi
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 741a982337e..efa5923bcf6 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,4 +1,5 @@
DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
DIST openexr-3.1.1.tar.gz 25588029 BLAKE2B c2ce9622ad7b8a328ce556b6120a868cddb86e908917e001f543e70501b6d31ce549fc10d65806dd9d63e63872b273ad3a1d4f6813b5d23ea238c238f5815304 SHA512 430becbb214cedec5a57e9ff2363badd8a2d94e8a00edffbc75fbcf30d26d887a6eb3f4ff96e371cb26f9d44e63bf0fe2dc511493a0951171ddc64bba7aed735
+DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b120e5683137a0b38f64e2862c226aebff7c17e79344da4a1be5a1967fb8ab0493ff919a7fb5bec16b34e494e49e2 SHA512 34fb28f149e49bb23b2dc230dd5277229f2c780de66aff0acc819601e6802a1dbf83110b5df455dffd63be6eaa286d4aedb4b0af559b8b034d98c3208ee9d969
+DIST openexr-3.1.3.tar.gz 20322346 BLAKE2B e65cb00d1d9ae7544f6d1adf9c6f05193986b8de7b657fa22d20466f2b6dfccf244b5aa3dbe7f2abb0c934aec68d2007dd9edb3eeee91b2bbd8aab331eea7e90 SHA512 12a8f3660104e68ccea0856caf334d1fafbf0ee79115aae23cdce5b835299294ab8a23bafed282acfacd159ce9bc7f6ffc620b1e0df0d40f9ca0eb15a288964d
diff --git a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index 30991f423b0..00000000000
--- a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 2 Jul 2021 17:46:33 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- cmake/CMakeLists.txt | 8 ++++----
- cmake/LibraryDefine.cmake | 8 ++++----
- cmake/OpenEXR.pc.in | 4 ++--
- cmake/OpenEXRLibraryDefine.cmake | 8 ++++----
- 4 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 2014d27..7dfb2f2 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -200,7 +200,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
- endfunction()
-- openexr_pkg_config_help(OpenEXR.pc.in)
-+ openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in)
- else()
- message(STATUS "-- pkg-config generation disabled")
- endif()
-@@ -220,7 +220,7 @@ include(CMakePackageConfigHelpers)
- if(OPENEXR_INSTALL)
- configure_package_config_file(${PROJECT_NAME}Config.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
- )
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
- VERSION ${PROJECT_VERSION}
-@@ -229,11 +229,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
- )
-
- install(EXPORT ${PROJECT_NAME}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
- FILE ${PROJECT_NAME}Targets.cmake
- NAMESPACE ${PROJECT_NAME}::
- EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake
-index aa5bb46..2767420 100644
---- a/cmake/LibraryDefine.cmake
-+++ b/cmake/LibraryDefine.cmake
-@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
- install(TARGETS ${libname}
- EXPORT ${PROJECT_NAME}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
-@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
-- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
-+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+ install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
- set(verlibname)
- set(baselibname)
- endif()
-diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in
-index 7d9bb7c..c7e1dd6 100644
---- a/cmake/OpenEXR.pc.in
-+++ b/cmake/OpenEXR.pc.in
-@@ -5,9 +5,9 @@
-
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@
- includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
-diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake
-index 8022e2e..9f919c8 100644
---- a/cmake/OpenEXRLibraryDefine.cmake
-+++ b/cmake/OpenEXRLibraryDefine.cmake
-@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
- install(TARGETS ${libname}
- EXPORT ${PROJECT_NAME}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
-@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
-- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")")
-+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+ install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
- set(verlibname)
- set(baselibname)
- endif()
---
-2.32.0
-
diff --git a/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
deleted file mode 100644
index d6c6b532c87..00000000000
--- a/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 22 May 2021 17:04:12 +0200
-Subject: [PATCH] add version to binaries for slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/bin/exr2aces/CMakeLists.txt | 10 +++++-----
- src/bin/exrenvmap/CMakeLists.txt | 10 +++++-----
- src/bin/exrheader/CMakeLists.txt | 10 +++++-----
- src/bin/exrmakepreview/CMakeLists.txt | 10 +++++-----
- src/bin/exrmaketiled/CMakeLists.txt | 10 +++++-----
- src/bin/exrmultipart/CMakeLists.txt | 10 +++++-----
- src/bin/exrmultiview/CMakeLists.txt | 10 +++++-----
- src/bin/exrstdattr/CMakeLists.txt | 10 +++++-----
- 8 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt
-index 72c4e1c..ede5973 100644
---- a/src/bin/exr2aces/CMakeLists.txt
-+++ b/src/bin/exr2aces/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exr2aces main.cpp)
--target_link_libraries(exr2aces OpenEXR::OpenEXR)
--set_target_properties(exr2aces PROPERTIES
-+add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt
-index bbd26c0..cbe8401 100644
---- a/src/bin/exrenvmap/CMakeLists.txt
-+++ b/src/bin/exrenvmap/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable( exrenvmap
-+add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR}
- makeLatLongMap.cpp
- readInputImage.cpp
- resizeImage.cpp
-@@ -11,13 +11,13 @@ add_executable( exrenvmap
- EnvmapImage.cpp
- )
-
--target_link_libraries(exrenvmap OpenEXR::OpenEXR)
--set_target_properties(exrenvmap PROPERTIES
-+target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt
-index c427445..b8b0e9a 100644
---- a/src/bin/exrheader/CMakeLists.txt
-+++ b/src/bin/exrheader/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrheader main.cpp)
--target_link_libraries(exrheader OpenEXR::OpenEXR)
--set_target_properties(exrheader PROPERTIES
-+add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrheader PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt
-index bb8b548..03c0687 100644
---- a/src/bin/exrmakepreview/CMakeLists.txt
-+++ b/src/bin/exrmakepreview/CMakeLists.txt
-@@ -1,17 +1,17 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrmakepreview
-+add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR}
- main.cpp
- makePreview.cpp
- )
--target_link_libraries(exrmakepreview OpenEXR::OpenEXR)
--set_target_properties(exrmakepreview PROPERTIES
-+target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt
-index 6c8dfa5..7116b54 100644
---- a/src/bin/exrmaketiled/CMakeLists.txt
-+++ b/src/bin/exrmaketiled/CMakeLists.txt
-@@ -1,18 +1,18 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors (c) to the OpenEXR Project.
-
--add_executable(exrmaketiled
-+add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR}
- makeTiled.cpp
- main.cpp
- Image.cpp
- )
--target_link_libraries(exrmaketiled OpenEXR::OpenEXR)
--set_target_properties(exrmaketiled PROPERTIES
-+target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt
-index 7f8fc1b..dad8c8d 100644
---- a/src/bin/exrmultipart/CMakeLists.txt
-+++ b/src/bin/exrmultipart/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrmultipart exrmultipart.cpp)
--target_link_libraries(exrmultipart OpenEXR::OpenEXR)
--set_target_properties(exrmultipart PROPERTIES
-+add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp)
-+target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt
-index bbac3a6..eba48c1 100644
---- a/src/bin/exrmultiview/CMakeLists.txt
-+++ b/src/bin/exrmultiview/CMakeLists.txt
-@@ -1,18 +1,18 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrmultiview
-+add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR}
- makeMultiView.cpp
- main.cpp
- Image.cpp
- )
--target_link_libraries(exrmultiview OpenEXR::OpenEXR)
--set_target_properties(exrmultiview PROPERTIES
-+target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt
-index 79205fc..35ac580 100644
---- a/src/bin/exrstdattr/CMakeLists.txt
-+++ b/src/bin/exrstdattr/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrstdattr main.cpp)
--target_link_libraries(exrstdattr OpenEXR::OpenEXR)
--set_target_properties(exrstdattr PROPERTIES
-+add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
---
-2.31.1
-
diff --git a/media-libs/openexr/openexr-2.5.6.ebuild b/media-libs/openexr/openexr-2.5.6.ebuild
index ec9bb6f201d..639ad56563a 100644
--- a/media-libs/openexr/openexr-2.5.6.ebuild
+++ b/media-libs/openexr/openexr-2.5.6.ebuild
@@ -13,7 +13,8 @@ S="${WORKDIR}/${P}/OpenEXR"
LICENSE="BSD"
SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
index 241131a5bc3..990a17843d0 100644
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ b/media-libs/openexr/openexr-2.5.7.ebuild
@@ -13,7 +13,8 @@ S="${WORKDIR}/${P}/OpenEXR"
LICENSE="BSD"
SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/openexr/openexr-3.1.1.ebuild b/media-libs/openexr/openexr-3.1.1.ebuild
index 572fb41e950..915f1405d3d 100644
--- a/media-libs/openexr/openexr-3.1.1.ebuild
+++ b/media-libs/openexr/openexr-3.1.1.ebuild
@@ -16,7 +16,8 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
LICENSE="BSD"
SLOT="3/30" # based on SONAME
# imath needs keywording: x64-macos, x86-solaris
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
RESTRICT="!test? ( test )"
diff --git a/media-libs/openexr/openexr-3.0.5.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild
index 242e04c9541..9a8c70d88e6 100644
--- a/media-libs/openexr/openexr-3.0.5.ebuild
+++ b/media-libs/openexr/openexr-3.1.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake flag-o-matic toolchain-funcs
+inherit cmake
MY_PN=OpenEXR
MY_PV=$(ver_cut 1)
@@ -14,22 +14,26 @@ HOMEPAGE="https://www.openexr.com/"
SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-SLOT="3/29" # based on SONAME
-# imath needs keywording: arm{,64}, hppa, ia64, ppc{,64}, sparc, x64-macos, x86-solaris
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+SLOT="3/30" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
RESTRICT="!test? ( test )"
RDEPEND="
- ~dev-libs/imath-${PV}:=
+ >=dev-libs/imath-3.1.0:=
sys-libs/zlib
"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+ doc? ( dev-python/breathe )
+ virtual/pkgconfig
+"
PATCHES=(
- "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch
- "${FILESDIR}"/${P}-0002-add-version-to-binaries-for-slotting.patch
+ "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch
+ "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch
+ "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
)
DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
@@ -48,7 +52,8 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=$(usex !static-libs)
-DBUILD_TESTING=$(usex test)
- -DOPENEXR_BUILD_UTILS=$(usex utils)
+ -DDOCS=$(usex doc)
+ -DOPENEXR_BUILD_TOOLS=$(usex utils)
-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
-DOPENEXR_ENABLE_THREADING=$(usex threads)
-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
@@ -64,14 +69,10 @@ src_configure() {
}
src_install() {
- if use doc; then
- DOCS+=( docs/*.pdf )
- fi
use examples && docompress -x /usr/share/doc/${PF}/examples
cmake_src_install
- cat > "${T}"/99${PN}3 <<-EOF || die
- LDPATH=/usr/$(get_libdir)/${MY_P}
+ newenvd - 99${PN}3 <<-EOF
+ LDPATH=/usr/$(get_libdir)/${MY_P}
EOF
- doenvd "${T}"/99${PN}3
}
diff --git a/media-libs/openexr/openexr-3.1.3.ebuild b/media-libs/openexr/openexr-3.1.3.ebuild
new file mode 100644
index 00000000000..d465d49cb95
--- /dev/null
+++ b/media-libs/openexr/openexr-3.1.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=OpenEXR
+MY_PV=$(ver_cut 1)
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3/30" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/imath-3.1.0:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? ( dev-python/breathe )
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch
+ "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch
+ "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
+
+src_prepare() {
+ # Fix path for testsuite
+ sed -e "s:/var/tmp/:${T}:" \
+ -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
+
+ cmake_src_prepare
+
+ mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=$(usex !static-libs)
+ -DBUILD_TESTING=$(usex test)
+ -DDOCS=$(usex doc)
+ -DOPENEXR_BUILD_TOOLS=$(usex utils)
+ -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+ -DOPENEXR_ENABLE_THREADING=$(usex threads)
+ -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+ -DOPENEXR_INSTALL_PKG_CONFIG=ON
+ -DOPENEXR_INSTALL_TOOLS=$(usex utils)
+ -DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
+ -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+ )
+
+ use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+ cmake_src_configure
+}
+
+src_install() {
+ use examples && docompress -x /usr/share/doc/${PF}/examples
+ cmake_src_install
+
+ newenvd - 99${PN}3 <<-EOF
+ LDPATH=/usr/$(get_libdir)/${MY_P}
+ EOF
+}
diff --git a/media-libs/openh264/openh264-2.1.1_p20190331.ebuild b/media-libs/openh264/openh264-2.1.1_p20190331.ebuild
index 23354673eca..0121478cca8 100644
--- a/media-libs/openh264/openh264-2.1.1_p20190331.ebuild
+++ b/media-libs/openh264/openh264-2.1.1_p20190331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV/_p*/}.tar.gz -> ${P/_p*/}.
https://github.com/mozilla/gmp-api/archive/${MY_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_COMMIT}.tar.gz"
LICENSE="BSD"
SLOT="0/6" # subslot = openh264 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
RESTRICT="bindist test"
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index a42a2de0374..a89d0456a79 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,6 +1,6 @@
-DIST openimageio-2.2.12.0.tar.gz 29251419 BLAKE2B 7ab1b611f9354d4a8d3fc33bc30acfbc193d6fda012945af2e3b41343419755a211df1a051fc5e6f00149a78db0896ec0f8c59d559e06294dc2626401e66df87 SHA512 14c7ce8b5f71622ca5ffbcae36044a02ae760f6f0173d5efb90472c40970f1bbf355059ca06a47aba895e365892fdf91aa2fdb0f38a7ba04d148ed33f51db80d
-DIST openimageio-2.2.13.1.tar.gz 29265740 BLAKE2B 98403db440410d391ff150a988ac5cb970e0f8d30758c73200d54f07594b458d1f6a8bee58dc92bd254338da678fc4494555df94d8f865b09bd9c13bac7f8f6c SHA512 911e3671557df3c8bdbada00b83b7631750f5bf4dfc0568a4978c91d28a6e408c69dbe0e4e113b13702eab27176d3c84043d73778a0213eac0b2ac94d2e942d6
-DIST openimageio-2.2.14.0.tar.gz 29226972 BLAKE2B 29daaf4fb987b77dffdd8cb29c5f67a80c20c49cd5dc369e68a5588a61fae7119aeb22814886e68eb055f2a66e02e75afba25991f8edc14752ccacf6599d889f SHA512 063291c0bd742b79a7b6065a41856b84732af2e2e404265262aa9ba91d07209fb308ecf0403a139d7021b8062f9c3e1b92a725a7cad091af1bcf45499ae47a82
-DIST openimageio-2.2.15.0.tar.gz 29238071 BLAKE2B f74f779635b7ff068f87ab6231756cb22acb80185c717c556750d964025aa343f8b3a30b9e73acf6237328b8bdd3fcb6588321d37a3752a6f1d0dd1e3a976363 SHA512 7ade071ae8a78427fb51d75f81e6fcc2d9a3632f0854aea70b985794a53a386072fb171dc8179fa762de19067d402c7ab9f2ea1a44bd3196d3a201ea2cb9ec22
-DIST openimageio-2.2.15.1.tar.gz 29237852 BLAKE2B 0f5050e888e82721aa7012cc5c5eb229b5ac314b067406ef003369431241228d91904fbe455da8423ff978411052b2c960b0688a6b943a0e2bfdb47c489d26a5 SHA512 c06df310f91938b25f1f66cd98d995dcaba51c6a0041b47882c52f5ad4a098a9016fc99f41de250dd1b1b7af3ad22f6ed63d5e76f95f1f1cf0f45c80eee9c8e0
DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be
+DIST openimageio-2.3.10.0.tar.gz 32443970 BLAKE2B 90b4f39ed654cafe24905c3d9e32a04057d80d3fc1cb7a1b2ad5e1d3c239b112e9af8d28ee49d54721aa78778118562106c4bcfe2509a1337e15bd13993f144b SHA512 9e8768d743056a7d115b47611d4e6dfc43f3b8b155224e3746075b407a265fcd509d406e78f1b6a5aa0b55270729cbb2049cfeb9d5c1af9a9a8f05a7333292b1
+DIST openimageio-2.3.10.1.tar.gz 32443281 BLAKE2B 10308f87b390747a4e0af4bce2c7636e8cca61fe695dc4a43a1021a411c3887fedee6c88ffa89c439bf00f23c4b862036149244eda5887812943845f446ce361 SHA512 9e911f5c4b0df02502ed0195b8acd3eff2b3d9398b33f956544306eda57f972fda0a69bd1d1448a385c92753e3a9127209c5937559df6ad594c5a6125c5870c7
+DIST openimageio-2.3.9.1.tar.gz 29248072 BLAKE2B 22cd31dc51670a388f232874d2f3831fb87df09de3fe8d2492a34f2c9d96f2e3ae13426e30c1b9627926a3ec3150ca9b37377642ea6621a184e14d7358e9d0e5 SHA512 0522d22eca5c9858ef2b6407053f8a74872b9b05214efe01d88f0abee6b21c48cf23444987a21364261e4addcc5cddef38d7f87deda8bc5167a1cd40770327bb
+DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
+DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 0ed335cbea3..82c6c1129ce 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@aisha.cc</email>
- <name>Aisha Tammy</name>
- </maintainer>
<maintainer type="project">
<email>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
diff --git a/media-libs/openimageio/openimageio-2.2.12.0.ebuild b/media-libs/openimageio/openimageio-2.2.12.0.ebuild
deleted file mode 100644
index 278bed688e9..00000000000
--- a/media-libs/openimageio/openimageio-2.2.12.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
- aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-RDEPEND="
- >=dev-libs/boost-1.62:=
- dev-cpp/robin-map
- dev-libs/libfmt:=
- dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
- >=media-libs/libheif-1.7.0:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- media-libs/opencolorio:=
- >=media-libs/openexr-2.2.0-r2:=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- dicom? ( sci-libs/dcmtk )
- ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- media-libs/glew:=
- virtual/glu
- virtual/opengl
- )
- openvdb? (
- dev-cpp/tbb:=
- media-gfx/openvdb:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DVERBOSE=ON
- -DOIIO_BUILD_TESTS=OFF
- -DINSTALL_FONTS=OFF
- -DBUILD_DOCS=$(usex doc)
- -DINSTALL_DOCS=$(usex doc)
- -DSTOP_ON_WARNING=OFF
- -DUSE_CCACHE=OFF
- -DUSE_DCMTK=$(usex dicom)
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_JPEGTURBO=ON
- -DUSE_NUKE=OFF # not in Gentoo
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
- -DUSE_GIF=$(usex gif)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENVDB=$(usex openvdb)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # can't use font_src_install
- # it does directory hierarchy recreation
- FONT_S=(
- "${S}/src/fonts/Droid_Sans"
- "${S}/src/fonts/Droid_Sans_Mono"
- "${S}/src/fonts/Droid_Serif"
- )
- insinto ${FONTDIR}
- for dir in "${FONT_S[@]}"; do
- doins "${dir}"/*.ttf
- done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.13.1.ebuild b/media-libs/openimageio/openimageio-2.2.13.1.ebuild
deleted file mode 100644
index 278bed688e9..00000000000
--- a/media-libs/openimageio/openimageio-2.2.13.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
- aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-RDEPEND="
- >=dev-libs/boost-1.62:=
- dev-cpp/robin-map
- dev-libs/libfmt:=
- dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
- >=media-libs/libheif-1.7.0:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- media-libs/opencolorio:=
- >=media-libs/openexr-2.2.0-r2:=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- dicom? ( sci-libs/dcmtk )
- ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- media-libs/glew:=
- virtual/glu
- virtual/opengl
- )
- openvdb? (
- dev-cpp/tbb:=
- media-gfx/openvdb:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DVERBOSE=ON
- -DOIIO_BUILD_TESTS=OFF
- -DINSTALL_FONTS=OFF
- -DBUILD_DOCS=$(usex doc)
- -DINSTALL_DOCS=$(usex doc)
- -DSTOP_ON_WARNING=OFF
- -DUSE_CCACHE=OFF
- -DUSE_DCMTK=$(usex dicom)
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_JPEGTURBO=ON
- -DUSE_NUKE=OFF # not in Gentoo
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
- -DUSE_GIF=$(usex gif)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENVDB=$(usex openvdb)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # can't use font_src_install
- # it does directory hierarchy recreation
- FONT_S=(
- "${S}/src/fonts/Droid_Sans"
- "${S}/src/fonts/Droid_Sans_Mono"
- "${S}/src/fonts/Droid_Serif"
- )
- insinto ${FONTDIR}
- for dir in "${FONT_S[@]}"; do
- doins "${dir}"/*.ttf
- done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.15.1.ebuild b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild
index d12beb042a0..0aa03a21997 100644
--- a/media-libs/openimageio/openimageio-2.2.15.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake font python-single-r1
DESCRIPTION="A library for reading and writing images"
@@ -49,7 +49,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libwebp-0.2.1:=
media-libs/opencolorio:=
- >=media-libs/openexr-2.2.0-r2:=
+ >=media-libs/openexr-2.2.0-r2:0=
media-libs/tiff:0=
sys-libs/zlib:=
virtual/jpeg:0
@@ -95,6 +95,15 @@ pkg_setup() {
}
src_prepare() {
+ # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+ # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+ # (because it mix and matches which version it uses; sed this to
+ # make sure it'll use OpenEXR 3 if it can, but it won't.)
+ # bug #821193
+ sed -i \
+ -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
+ src/cmake/modules/FindOpenEXR.cmake || die
+
cmake_src_prepare
cmake_comment_add_subdirectory src/fonts
}
diff --git a/media-libs/openimageio/openimageio-2.2.18.0.ebuild b/media-libs/openimageio/openimageio-2.3.10.0.ebuild
index c1a41b46db0..88f1d6b8b49 100644
--- a/media-libs/openimageio/openimageio-2.2.18.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.10.0.ebuild
@@ -5,15 +5,22 @@ EAPI=7
FONT_PN=OpenImageIO
PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
inherit cmake font python-single-r1
DESCRIPTION="A library for reading and writing images"
HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+ https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+ https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+ )"
+S="${WORKDIR}/oiio-${PV}"
LICENSE="BSD"
-SLOT="0/2.2"
+SLOT="0/2.3"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
@@ -22,12 +29,11 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
BDEPEND="
doc? (
@@ -39,23 +45,24 @@ BDEPEND="
dev-texlive/texlive-latexextra
)
"
+# 2.3.8.0 should support OpenEXR 3 but it seems to prefer OpenEXR 2
+# when installed, so let's stick with that for now.
RDEPEND="
>=dev-libs/boost-1.62:=
dev-cpp/robin-map
dev-libs/libfmt:=
dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
>=media-libs/libheif-1.7.0:=
media-libs/libpng:0=
>=media-libs/libwebp-0.2.1:=
+ media-libs/ilmbase:=
media-libs/opencolorio:=
- >=media-libs/openexr-2.2.0-r2:=
+ media-libs/openexr:0=
media-libs/tiff:0=
sys-libs/zlib:=
virtual/jpeg:0
dicom? ( sci-libs/dcmtk )
ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
gif? ( media-libs/giflib:0= )
jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
opencv? ( media-libs/opencv:= )
@@ -95,8 +102,23 @@ pkg_setup() {
}
src_prepare() {
+ # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+ # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+ # (because it mix and matches which version it uses; sed this to
+ # make sure it'll use OpenEXR 3 if it can, but it won't.)
+ # bug #821193
+ sed -i \
+ -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
+ src/cmake/modules/FindOpenEXR.cmake || die
+
cmake_src_prepare
cmake_comment_add_subdirectory src/fonts
+
+ if use test ; then
+ mkdir -p "${BUILD_DIR}"/testsuite || die
+ mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+ mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+ fi
}
src_configure() {
@@ -112,7 +134,7 @@ src_configure() {
local mycmakeargs=(
-DVERBOSE=ON
- -DOIIO_BUILD_TESTS=OFF
+ -DOIIO_BUILD_TESTS=$(usex test)
-DINSTALL_FONTS=OFF
-DBUILD_DOCS=$(usex doc)
-DINSTALL_DOCS=$(usex doc)
@@ -123,7 +145,6 @@ src_configure() {
-DUSE_JPEGTURBO=ON
-DUSE_NUKE=OFF # not in Gentoo
-DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
-DUSE_GIF=$(usex gif)
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_OPENCV=$(usex opencv)
@@ -137,7 +158,10 @@ src_configure() {
-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
)
if use python; then
- mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+ mycmakeargs+=(
+ -DPYTHON_VERSION=${EPYTHON#python}
+ -DPYTHON_SITE_DIR=$(python_get_sitedir)
+ )
fi
cmake_src_configure
diff --git a/media-libs/openimageio/openimageio-2.2.15.0.ebuild b/media-libs/openimageio/openimageio-2.3.10.1.ebuild
index 36c2ee69a52..88f1d6b8b49 100644
--- a/media-libs/openimageio/openimageio-2.2.15.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.10.1.ebuild
@@ -4,16 +4,23 @@
EAPI=7
FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
inherit cmake font python-single-r1
DESCRIPTION="A library for reading and writing images"
HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+ https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+ https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+ )"
+S="${WORKDIR}/oiio-${PV}"
LICENSE="BSD"
-SLOT="0/2.2"
+SLOT="0/2.3"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
@@ -22,12 +29,11 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
BDEPEND="
doc? (
@@ -39,23 +45,24 @@ BDEPEND="
dev-texlive/texlive-latexextra
)
"
+# 2.3.8.0 should support OpenEXR 3 but it seems to prefer OpenEXR 2
+# when installed, so let's stick with that for now.
RDEPEND="
>=dev-libs/boost-1.62:=
dev-cpp/robin-map
dev-libs/libfmt:=
dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
>=media-libs/libheif-1.7.0:=
media-libs/libpng:0=
>=media-libs/libwebp-0.2.1:=
+ media-libs/ilmbase:=
media-libs/opencolorio:=
- >=media-libs/openexr-2.2.0-r2:=
+ media-libs/openexr:0=
media-libs/tiff:0=
sys-libs/zlib:=
virtual/jpeg:0
dicom? ( sci-libs/dcmtk )
ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
gif? ( media-libs/giflib:0= )
jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
opencv? ( media-libs/opencv:= )
@@ -95,8 +102,23 @@ pkg_setup() {
}
src_prepare() {
+ # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+ # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+ # (because it mix and matches which version it uses; sed this to
+ # make sure it'll use OpenEXR 3 if it can, but it won't.)
+ # bug #821193
+ sed -i \
+ -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
+ src/cmake/modules/FindOpenEXR.cmake || die
+
cmake_src_prepare
cmake_comment_add_subdirectory src/fonts
+
+ if use test ; then
+ mkdir -p "${BUILD_DIR}"/testsuite || die
+ mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+ mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+ fi
}
src_configure() {
@@ -112,7 +134,7 @@ src_configure() {
local mycmakeargs=(
-DVERBOSE=ON
- -DOIIO_BUILD_TESTS=OFF
+ -DOIIO_BUILD_TESTS=$(usex test)
-DINSTALL_FONTS=OFF
-DBUILD_DOCS=$(usex doc)
-DINSTALL_DOCS=$(usex doc)
@@ -123,7 +145,6 @@ src_configure() {
-DUSE_JPEGTURBO=ON
-DUSE_NUKE=OFF # not in Gentoo
-DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
-DUSE_GIF=$(usex gif)
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_OPENCV=$(usex opencv)
@@ -137,7 +158,10 @@ src_configure() {
-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
)
if use python; then
- mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+ mycmakeargs+=(
+ -DPYTHON_VERSION=${EPYTHON#python}
+ -DPYTHON_SITE_DIR=$(python_get_sitedir)
+ )
fi
cmake_src_configure
diff --git a/media-libs/openimageio/openimageio-2.2.14.0.ebuild b/media-libs/openimageio/openimageio-2.3.9.1.ebuild
index 36c2ee69a52..88f1d6b8b49 100644
--- a/media-libs/openimageio/openimageio-2.2.14.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.9.1.ebuild
@@ -4,16 +4,23 @@
EAPI=7
FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
inherit cmake font python-single-r1
DESCRIPTION="A library for reading and writing images"
HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+ https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+ https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+ )"
+S="${WORKDIR}/oiio-${PV}"
LICENSE="BSD"
-SLOT="0/2.2"
+SLOT="0/2.3"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
@@ -22,12 +29,11 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
BDEPEND="
doc? (
@@ -39,23 +45,24 @@ BDEPEND="
dev-texlive/texlive-latexextra
)
"
+# 2.3.8.0 should support OpenEXR 3 but it seems to prefer OpenEXR 2
+# when installed, so let's stick with that for now.
RDEPEND="
>=dev-libs/boost-1.62:=
dev-cpp/robin-map
dev-libs/libfmt:=
dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
>=media-libs/libheif-1.7.0:=
media-libs/libpng:0=
>=media-libs/libwebp-0.2.1:=
+ media-libs/ilmbase:=
media-libs/opencolorio:=
- >=media-libs/openexr-2.2.0-r2:=
+ media-libs/openexr:0=
media-libs/tiff:0=
sys-libs/zlib:=
virtual/jpeg:0
dicom? ( sci-libs/dcmtk )
ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
gif? ( media-libs/giflib:0= )
jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
opencv? ( media-libs/opencv:= )
@@ -95,8 +102,23 @@ pkg_setup() {
}
src_prepare() {
+ # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+ # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+ # (because it mix and matches which version it uses; sed this to
+ # make sure it'll use OpenEXR 3 if it can, but it won't.)
+ # bug #821193
+ sed -i \
+ -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
+ src/cmake/modules/FindOpenEXR.cmake || die
+
cmake_src_prepare
cmake_comment_add_subdirectory src/fonts
+
+ if use test ; then
+ mkdir -p "${BUILD_DIR}"/testsuite || die
+ mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+ mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+ fi
}
src_configure() {
@@ -112,7 +134,7 @@ src_configure() {
local mycmakeargs=(
-DVERBOSE=ON
- -DOIIO_BUILD_TESTS=OFF
+ -DOIIO_BUILD_TESTS=$(usex test)
-DINSTALL_FONTS=OFF
-DBUILD_DOCS=$(usex doc)
-DINSTALL_DOCS=$(usex doc)
@@ -123,7 +145,6 @@ src_configure() {
-DUSE_JPEGTURBO=ON
-DUSE_NUKE=OFF # not in Gentoo
-DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
-DUSE_GIF=$(usex gif)
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_OPENCV=$(usex opencv)
@@ -137,7 +158,10 @@ src_configure() {
-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
)
if use python; then
- mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+ mycmakeargs+=(
+ -DPYTHON_VERSION=${EPYTHON#python}
+ -DPYTHON_SITE_DIR=$(python_get_sitedir)
+ )
fi
cmake_src_configure
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 2001f66c697..7fa8ba2aacf 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
- <remote-id type="google-code">openjpeg</remote-id>
<remote-id type="sourceforge">openjpeg.mirror</remote-id>
<remote-id type="github">uclouvain/openjpeg</remote-id>
</upstream>
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 9d551e63ade..ab281bfc665 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1 +1,2 @@
DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
+DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445 SHA512 fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
new file mode 100644
index 00000000000..8f5bfab43a9
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
@@ -0,0 +1,19 @@
+From: "Alexander Golubev" <fatzer2@gmail.com>
+
+Set correct default minimal -arch for CUDA 9 and 11
+--- OpenSubdiv-3_4_4/CMakeLists.txt 2021-11-07 02:01:07.899484952 +0300
++++ OpenSubdiv-3_4_4/CMakeLists.txt.new 2021-11-07 02:01:23.402764409 +0300
+@@ -587,8 +587,12 @@
+ if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
+ if (CUDA_VERSION_MAJOR LESS 6)
+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
+- else()
++ elseif (CUDA_VERSION_MAJOR LESS 9)
+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
++ elseif (CUDA_VERSION_MAJOR LESS 11)
++ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
++ else()
++ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_35 )
+ endif()
+ endif()
+ endif()
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
index 765b0146696..f9593b44235 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- tbb? ( dev-cpp/tbb )
+ tbb? ( <dev-cpp/tbb-2021.4.0:= )
"
BDEPEND="
doc? (
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
new file mode 100644
index 00000000000..fe2e02e7075
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/glew:=
+ media-libs/glfw:=
+ x11-libs/libXinerama
+ cuda? ( dev-util/nvidia-cuda-toolkit:* )
+ opencl? ( virtual/opencl )
+ ptex? ( media-libs/ptex )
+"
+DEPEND="
+ ${RDEPEND}
+ tbb? ( <dev-cpp/tbb-2021.4.0:= )
+"
+BDEPEND="
+ cuda? ( <sys-devel/gcc-9[cxx] )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+ "${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
+ "${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
+)
+
+pkg_pretend() {
+ if use cuda; then
+ [[ $(gcc-major-version) -gt 8 ]] && \
+ eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \
+ die "Need gcc version earlier than 9"
+ fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+ # GLTESTS are disabled as portage is unable to open a display during test phase
+ # TODO: virtx work?
+ local mycmakeargs=(
+ -DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+ -DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+ -DNO_CLEW=ON
+ -DNO_CUDA=$(usex !cuda)
+ # Docs needed Python 2 so disabled
+ # bug #815172
+ -DNO_DOC=ON
+ -DNO_EXAMPLES=$(usex !examples)
+ -DNO_GLTESTS=ON
+ -DNO_OMP=$(usex !openmp)
+ -DNO_OPENCL=$(usex !opencl)
+ -DNO_PTEX=$(usex !ptex)
+ -DNO_REGRESSION=$(usex !test)
+ -DNO_TBB=$(usex !tbb)
+ -DNO_TESTS=$(usex !test)
+ -DNO_TUTORIALS=$(usex !tutorials)
+ )
+
+ # Fails with building cuda kernels when using multiple jobs
+ export MAKEOPTS="-j1"
+
+ cmake_src_configure
+}
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
new file mode 100644
index 00000000000..e175e9f4968
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake cuda toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/glew:=
+ media-libs/glfw:=
+ x11-libs/libXinerama
+ cuda? ( dev-util/nvidia-cuda-toolkit:* )
+ opencl? ( virtual/opencl )
+ ptex? ( media-libs/ptex )
+"
+DEPEND="
+ ${RDEPEND}
+ tbb? ( <dev-cpp/tbb-2021.4.0:= )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+ "${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
+ "${FILESDIR}/${P}-add-CUDA11-compatibility.patch"
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ use cuda && cuda_src_prepare
+}
+
+src_configure() {
+ # GLTESTS are disabled as portage is unable to open a display during test phase
+ # TODO: virtx work?
+ local mycmakeargs=(
+ -DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+ -DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+ -DNO_CLEW=ON
+ -DNO_CUDA=$(usex !cuda)
+ # Docs needed Python 2 so disabled
+ # bug #815172
+ -DNO_DOC=ON
+ -DNO_EXAMPLES=$(usex !examples)
+ -DNO_GLTESTS=ON
+ -DNO_OMP=$(usex !openmp)
+ -DNO_OPENCL=$(usex !opencl)
+ -DNO_PTEX=$(usex !ptex)
+ -DNO_REGRESSION=$(usex !test)
+ -DNO_TBB=$(usex !tbb)
+ -DNO_TESTS=$(usex !test)
+ -DNO_TUTORIALS=$(usex !tutorials)
+ )
+
+ if use cuda; then
+ # old cmake CUDA module doesn't use environment variable to initialize flags
+ mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS}" )
+
+ # check if user provided --gpu-architecture/-arch flag and prevent cmake from overriding it if so
+ for f in ${NVCCFLAGS}; do
+ if [[ ${f} == -arch* || ${f} == --gpu-architecture* ]]; then
+ mycmakeargs+=( -DOSD_CUDA_NVCC_FLAGS="" )
+ break
+ fi
+ done
+ fi
+
+ cmake_src_configure
+}
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index a23760d3674..1c6d13087eb 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1,3 @@
-DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
-DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
+DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
diff --git a/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch b/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch
deleted file mode 100644
index 8e45efd96ab..00000000000
--- a/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 296ee89fcdec8ff6e514a3aebf5cb6c177f7f0c1 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Mon, 10 Jun 2019 13:02:14 +0200
-Subject: [PATCH] fix install location of shaders (Gentoo specific)
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- src/shaders/CMakeLists.txt | 2 +-
- src/shaders/MaterialX/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/shaders/CMakeLists.txt b/src/shaders/CMakeLists.txt
-index 9b263ff..5c47918 100644
---- a/src/shaders/CMakeLists.txt
-+++ b/src/shaders/CMakeLists.txt
-@@ -63,4 +63,4 @@ add_custom_target (shaders ALL
- SOURCES ${shader_source} ${shader_headers})
-
- install (FILES ${shader_headers} ${shader_source} ${shader_objs}
-- DESTINATION shaders)
-+ DESTINATION include/OSL/shaders)
-diff --git a/src/shaders/MaterialX/CMakeLists.txt b/src/shaders/MaterialX/CMakeLists.txt
-index 88b52f3..f0e0a23 100644
---- a/src/shaders/MaterialX/CMakeLists.txt
-+++ b/src/shaders/MaterialX/CMakeLists.txt
-@@ -258,5 +258,5 @@ add_custom_target (mxshaders ALL
- SOURCES ${shader_source} ${mx_shader_headers})
-
- install (FILES ${mx_shader_headers} ${mx_shader_objs} ${mx_shader_osls}
-- DESTINATION shaders/MaterialX)
-+ DESTINATION include/OSL/shaders/MaterialX)
-
---
-2.21.0
-
diff --git a/media-libs/osl/files/osl-1.11.16.0-no-imath.patch b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
new file mode 100644
index 00000000000..a8e5c1f2311
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
@@ -0,0 +1,49 @@
+Force finding OpenEXR / IlmBase instead of imath for now.
+--- a/src/cmake/modules/FindOpenEXR.cmake
++++ b/src/cmake/modules/FindOpenEXR.cmake
+@@ -39,43 +39,10 @@
+ #
+
+ # First, try to fine 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(IlmBase CONFIG)
+ find_package(OpenEXR CONFIG)
+
+-if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath)
+- # OpenEXR 3.x if both of these targets are found
+- set (FOUND_OPENEXR_WITH_CONFIG 1)
+- if (NOT OpenEXR_FIND_QUIETLY)
+- message (STATUS "Found CONFIG for OpenEXR 3 (OPENEXR_VERSION=${OpenEXR_VERSION})")
+- endif ()
+-
+- # Mimic old style variables
+- set (OPENEXR_VERSION ${OpenEXR_VERSION})
+- get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(ILMBASE_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+- get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+- get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex INTERFACE_LINK_LIBRARIES)
+- get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread INTERFACE_LINK_LIBRARIES)
+- set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY})
+- set (ILMBASE_FOUND true)
+-
+- get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR INTERFACE_LINK_LIBRARIES)
+- set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES})
+- set (OPENEXR_FOUND true)
+-
+- # Link with pthreads if required
+- find_package (Threads)
+- if (CMAKE_USE_PTHREADS_INIT)
+- list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+- endif ()
+-
+-elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
++if (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
+ (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION VERSION_GREATER_EQUAL 2.4))
+ # OpenEXR 2.4 or 2.5 with exported config
+ set (FOUND_OPENEXR_WITH_CONFIG 1)
diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild
deleted file mode 100644
index fdab29afa48..00000000000
--- a/media-libs/osl/osl-1.10.13.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake llvm toolchain-funcs
-
-# check this on updates
-LLVM_MAX_SLOT=10
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~x86"
-
-X86_CPU_FEATURES=(
- sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- media-libs/openexr:=
- media-libs/openimageio:=
- <sys-devel/clang-11:=
- sys-libs/zlib
- partio? ( media-libs/partio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch"
-)
-
-# Restricting tests as Make file handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
-
-llvm_check_deps() {
- has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local gcc=$(tc-getCC)
- # LLVM needs CPP11. Do not disable.
- local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=14
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DENABLERTTI=OFF
- -DINSTALL_DOCS=$(usex doc)
- -DLLVM_STATIC=OFF
- -DOSL_BUILD_TESTS=$(usex test)
- -DSTOP_ON_WARNING=OFF
- -DUSE_PARTIO=$(usex partio)
- -DUSE_QT=$(usex qt5)
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- )
-
- cmake_src_configure
-}
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0-r1.ebuild
index f4a19303d28..5f806806db4 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9,10} )
# check this on updates
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=12
CMAKE_REMOVE_MODULES_LIST=()
@@ -29,11 +29,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:=
- media-libs/openimageio:=
+ <media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib
partio? ( media-libs/partio )
@@ -60,9 +61,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-cmake.patch
)
-CMAKE_REMOVE_MODULES_LIST=()
-
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild
index 10bd18b8492..3dd9f84f2cf 100644
--- a/media-libs/osl/osl-1.11.9.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9,10} )
# check this on updates
-LLVM_MAX_SLOT=10
+LLVM_MAX_SLOT=13
CMAKE_REMOVE_MODULES_LIST=()
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
X86_CPU_FEATURES=(
@@ -29,11 +29,13 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
- media-libs/openexr:=
- media-libs/openimageio:=
+ media-libs/openexr:0=
+ media-libs/ilmbase:=
+ <media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib
partio? ( media-libs/partio )
@@ -56,13 +58,15 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=()
-
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.16.0-no-imath.patch
+)
+
llvm_check_deps() {
has_version -r "sys-devel/clang:${LLVM_SLOT}"
}
@@ -92,7 +96,8 @@ src_configure() {
-DUSE_CCACHE=OFF
-DLLVM_STATIC=OFF
-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DOSL_BUILD_TESTS=$(usex test)
+ # Breaks build for now: bug #827949
+ #-DOSL_BUILD_TESTS=$(usex test)
-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
-DSTOP_ON_WARNING=OFF
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
deleted file mode 100644
index ea80a949044..00000000000
--- a/media-libs/osl/osl-1.11.9.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
-inherit cmake llvm toolchain-funcs
-
-# check this on updates
-LLVM_MAX_SLOT=10
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-X86_CPU_FEATURES=(
- sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- media-libs/openexr:=
- media-libs/openimageio:=
- <sys-devel/clang-11:=
- sys-libs/zlib
- partio? ( media-libs/partio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-python/pybind11
-"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-PATCHES=()
-
-CMAKE_REMOVE_MODULES_LIST=()
-
-# Restricting tests as Make file handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
-
-llvm_check_deps() {
- has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local gcc=$(tc-getCC)
- # LLVM10+ needs CPP14+
- local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=14
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DINSTALL_DOCS=$(usex doc)
- -DLLVM_STATIC=OFF
- -DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DOSL_BUILD_TESTS=$(usex test)
- -DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
- -DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
- -DSTOP_ON_WARNING=OFF
- -DUSE_PARTIO=$(usex partio)
- -DUSE_QT=$(usex qt5)
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- )
-
- cmake_src_configure
-}
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r3.ebuild
index d8094d70371..1006a0b1636 100644
--- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9,10} )
# check this on updates
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=12
inherit cmake llvm toolchain-funcs python-single-r1
@@ -27,11 +27,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:=
- media-libs/openimageio:=
+ <media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib:=
python? (
@@ -60,7 +61,7 @@ PATCHES=(
${FILESDIR}/${P}-llvm-12.patch
)
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index 7532e89f4dd..155cb0665f2 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -51,7 +51,7 @@ PATCHES=(
${FILESDIR}/${P}-llvm-12.patch
)
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
diff --git a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild b/media-libs/pcaudi