From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- media-libs/Manifest.gz | Bin 64516 -> 64817 bytes media-libs/SoQt/Manifest | 3 + media-libs/SoQt/SoQt-1.6.0.ebuild | 48 ++ media-libs/SoQt/metadata.xml | 16 + media-libs/a52dec/Manifest | 3 +- media-libs/a52dec/a52dec-0.7.4-r8.ebuild | 63 ++ media-libs/a52dec/files/a52dec-0.7.4-freebsd.patch | 4 +- media-libs/alsa-lib/Manifest | 6 +- media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild | 81 --- media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild | 84 +++ media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild | 81 --- media-libs/alsa-lib/alsa-lib-1.2.4.ebuild | 84 +++ media-libs/alsa-topology-conf/Manifest | 4 +- .../alsa-topology-conf-1.2.3.ebuild | 2 +- .../alsa-topology-conf-1.2.4.ebuild | 21 + media-libs/alsa-ucm-conf/Manifest | 4 +- .../alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild | 2 +- .../alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild | 21 + media-libs/ampache_browser/Manifest | 4 +- .../ampache_browser/ampache_browser-1.0.1.ebuild | 28 - .../ampache_browser/ampache_browser-1.0.3.ebuild | 28 + media-libs/aubio/Manifest | 2 +- media-libs/aubio/aubio-0.4.9.ebuild | 8 +- media-libs/avidemux-core/Manifest | 4 +- .../avidemux-core/avidemux-core-2.7.4-r1.ebuild | 2 +- .../avidemux-core/avidemux-core-2.7.6.ebuild | 2 +- media-libs/avidemux-plugins/Manifest | 4 +- .../avidemux-plugins-2.7.4-r1.ebuild | 2 +- .../avidemux-plugins/avidemux-plugins-2.7.6.ebuild | 2 +- media-libs/babl/Manifest | 7 +- media-libs/babl/babl-0.1.74-r1.ebuild | 49 -- media-libs/babl/babl-0.1.74.ebuild | 46 -- media-libs/babl/babl-0.1.78.ebuild | 6 +- media-libs/babl/babl-9999.ebuild | 4 +- media-libs/bcg729/Manifest | 9 +- media-libs/bcg729/bcg729-1.0.4-r1.ebuild | 2 +- media-libs/bcg729/bcg729-1.0.4.ebuild | 32 - media-libs/bcg729/bcg729-1.1.1.ebuild | 30 + media-libs/bcg729/bcg729-999999.ebuild | 23 +- media-libs/bcg729/metadata.xml | 10 +- media-libs/bio2jack/Manifest | 2 +- media-libs/bio2jack/bio2jack-0.9-r2.ebuild | 2 +- media-libs/cogl/Manifest | 3 - media-libs/cogl/cogl-1.22.6.ebuild | 123 ---- .../cogl/files/cogl-eglmesaext-include.patch | 60 -- media-libs/coin/Manifest | 12 +- media-libs/coin/coin-3.1.3-r2.ebuild | 100 --- media-libs/coin/coin-4.0.0.ebuild | 2 +- media-libs/coin/files/coin-3.1.0-javascript.patch | 38 -- media-libs/coin/files/coin-3.1.3-freetype251.patch | 28 - media-libs/coin/files/coin-3.1.3-gcc-4.7.patch | 10 - media-libs/coin/files/coin-3.1.3-gcc-7.patch | 21 - .../coin-3.1.3-memhandler-initialization.patch | 23 - .../coin/files/coin-3.1.3-pkgconfig-partial.patch | 13 - media-libs/coin/metadata.xml | 3 +- media-libs/dav1d/Manifest | 8 +- media-libs/dav1d/dav1d-0.7.0.ebuild | 2 +- media-libs/dav1d/dav1d-0.7.1.ebuild | 57 ++ media-libs/dav1d/dav1d-0.8.0.ebuild | 57 ++ media-libs/dav1d/dav1d-9999.ebuild | 6 +- media-libs/elles_icc_profiles/Manifest | 3 +- .../elles_icc_profiles-20160501.0932-r1.ebuild | 4 +- .../elles_icc_profiles-20160501.0932.ebuild | 26 - media-libs/exiftool/Manifest | 6 +- media-libs/exiftool/exiftool-12.01.ebuild | 25 - media-libs/exiftool/exiftool-12.05.ebuild | 2 +- media-libs/exiftool/exiftool-12.08.ebuild | 25 + media-libs/faad2/Manifest | 2 + media-libs/faad2/faad2-2.10.0.ebuild | 52 ++ media-libs/fontconfig/Manifest | 2 +- media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 12 +- media-libs/freeimage/Manifest | 6 +- .../files/freeimage-3.18.0-unbundling.patch | 724 --------------------- media-libs/freeimage/freeimage-3.18.0-r1.ebuild | 5 +- media-libs/freeimage/freeimage-3.18.0-r2.ebuild | 5 +- media-libs/freetype/Manifest | 22 +- .../files/freetype-2.10.3-sizeof-types.patch | 31 + .../files/freetype-2.4.11-sizeof-types.patch | 31 - .../freetype/files/freetype-2.7-enable-valid.patch | 20 - media-libs/freetype/freetype-2.10.1.ebuild | 240 ------- media-libs/freetype/freetype-2.10.2-r1.ebuild | 242 ------- media-libs/freetype/freetype-2.10.4.ebuild | 242 +++++++ media-libs/freetype/freetype-2.9.1-r3.ebuild | 237 ------- media-libs/freetype/freetype-2.9.1-r4.ebuild | 237 ------- media-libs/freetype/freetype-9999.ebuild | 2 +- media-libs/gegl/Manifest | 10 +- media-libs/gegl/gegl-0.4.22-r1.ebuild | 158 ----- media-libs/gegl/gegl-0.4.22.ebuild | 160 ----- media-libs/gegl/gegl-0.4.24.ebuild | 6 +- media-libs/gegl/gegl-0.4.26-r1.ebuild | 165 +++++ media-libs/gegl/gegl-0.4.26.ebuild | 158 +++++ media-libs/gegl/gegl-9999.ebuild | 6 +- media-libs/gexiv2/Manifest | 9 +- .../gexiv2/files/gexiv2-0.10.10-meson-fixup.patch | 29 - .../gexiv2/files/gexiv2-0.10.10-vala-fixup.patch | 49 -- media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild | 81 --- media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild | 74 --- media-libs/gexiv2/gexiv2-0.12.0.ebuild | 73 --- media-libs/gexiv2/gexiv2-0.12.1.ebuild | 2 +- media-libs/giflib/Manifest | 2 +- media-libs/giflib/giflib-5.2.1-r1.ebuild | 2 - media-libs/glfw/Manifest | 2 +- media-libs/glfw/glfw-3.3.2.ebuild | 2 +- media-libs/glm/Manifest | 2 +- media-libs/glm/glm-0.9.9.8-r1.ebuild | 2 +- media-libs/gmmlib/Manifest | 2 +- media-libs/gmmlib/metadata.xml | 4 - media-libs/graphene/Manifest | 6 +- media-libs/graphene/graphene-1.10.0.ebuild | 57 -- media-libs/graphene/graphene-1.10.2.ebuild | 2 +- media-libs/graphene/graphene-1.8.6.ebuild | 63 -- media-libs/gst-plugins-base/Manifest | 2 +- .../gst-plugins-base-1.16.2.ebuild | 2 +- media-libs/gst-rtsp-server/Manifest | 2 - .../gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild | 70 -- media-libs/hamlib/Manifest | 3 +- media-libs/hamlib/hamlib-3.3-r1.ebuild | 93 +++ media-libs/hamlib/hamlib-4.0_rc2.ebuild | 2 +- media-libs/harfbuzz/Manifest | 8 +- media-libs/harfbuzz/harfbuzz-2.6.5.ebuild | 116 ---- media-libs/harfbuzz/harfbuzz-2.6.8.ebuild | 116 ---- media-libs/harfbuzz/harfbuzz-2.7.1.ebuild | 104 --- media-libs/harfbuzz/harfbuzz-2.7.2.ebuild | 2 +- media-libs/kodi-platform/Manifest | 4 - .../kodi-platform-18.0_pre20180301.ebuild | 32 - .../kodi-platform-18.0_pre20190429.ebuild | 32 - media-libs/lcms/Manifest | 2 +- media-libs/lcms/lcms-2.11.ebuild | 2 +- media-libs/lib3ds/Manifest | 4 +- media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild | 4 +- media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 4 +- media-libs/lib3mf/Manifest | 2 +- media-libs/lib3mf/lib3mf-1.8.1.ebuild | 2 +- media-libs/libaacs/Manifest | 2 +- media-libs/libaacs/libaacs-0.11.0.ebuild | 2 +- media-libs/libaom/Manifest | 2 +- media-libs/libaom/libaom-2.0.0.ebuild | 2 +- media-libs/libass/Manifest | 2 + media-libs/libass/libass-0.15.0.ebuild | 42 ++ media-libs/libavif/Manifest | 6 +- media-libs/libavif/libavif-0.8.1.ebuild | 2 +- media-libs/libavif/libavif-0.8.3.ebuild | 75 +++ media-libs/libavif/libavif-0.8.4.ebuild | 75 +++ media-libs/libbs2b/Manifest | 2 +- media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild | 14 +- media-libs/libcdaudio/Manifest | 2 +- media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild | 7 +- media-libs/libcdr/Manifest | 5 +- media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch | 27 + media-libs/libcdr/libcdr-0.1.6.ebuild | 6 +- media-libs/libcdr/libcdr-9999.ebuild | 4 +- media-libs/libcuefile/Manifest | 3 +- .../libcuefile/files/libcuefile-static-libs.patch | 29 + media-libs/libcuefile/libcuefile-477-r1.ebuild | 3 +- media-libs/libdca/Manifest | 5 +- media-libs/libdca/libdca-0.0.5-r3.ebuild | 53 -- media-libs/libdca/libdca-0.0.7.ebuild | 2 +- media-libs/libde265/Manifest | 2 +- media-libs/libde265/libde265-1.0.5.ebuild | 2 +- media-libs/libdvdnav/Manifest | 2 +- media-libs/libdvdnav/libdvdnav-6.1.0.ebuild | 2 +- media-libs/libepoxy/Manifest | 4 +- media-libs/libepoxy/libepoxy-1.5.4.ebuild | 2 +- media-libs/libepoxy/libepoxy-9999.ebuild | 2 +- media-libs/libexif/Manifest | 2 + media-libs/libexif/libexif-0.6.22_p20201105.ebuild | 53 ++ media-libs/libfishsound/Manifest | 2 +- media-libs/libfishsound/libfishsound-1.0.0.ebuild | 3 +- media-libs/libglvnd/Manifest | 4 +- media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild | 73 --- media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild | 73 +++ media-libs/libglvnd/libglvnd-9999.ebuild | 2 +- media-libs/libgphoto2/Manifest | 2 + media-libs/libgphoto2/libgphoto2-2.5.26.ebuild | 208 ++++++ media-libs/libhdhomerun/Manifest | 2 +- media-libs/libhdhomerun/metadata.xml | 2 +- media-libs/libheif/Manifest | 17 +- media-libs/libheif/files/heif_test.go | 155 ----- media-libs/libheif/libheif-1.5.1.ebuild | 68 -- media-libs/libheif/libheif-1.6.1.ebuild | 68 -- media-libs/libheif/libheif-1.6.2.ebuild | 68 -- media-libs/libheif/libheif-1.7.0-r1.ebuild | 62 -- media-libs/libheif/libheif-1.8.0.ebuild | 59 -- media-libs/libheif/libheif-1.9.1.ebuild | 67 ++ media-libs/libheif/libheif-9999.ebuild | 18 +- media-libs/libheif/metadata.xml | 9 +- media-libs/libinsane/Manifest | 4 +- media-libs/libinsane/libinsane-1.0.4.ebuild | 48 -- media-libs/libinsane/libinsane-1.0.8.ebuild | 48 ++ media-libs/libjpeg-turbo/Manifest | 12 +- .../libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild | 121 ---- .../libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild | 126 ++++ .../libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild | 100 --- .../libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild | 117 ---- .../libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild | 118 ---- .../libjpeg-turbo/libjpeg-turbo-2.0.5-r2.ebuild | 118 ++++ .../libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild | 118 ++++ media-libs/libjpeg-turbo/metadata.xml | 4 + media-libs/liblingoteach/Manifest | 2 +- .../liblingoteach/liblingoteach-0.2.3.ebuild | 8 +- media-libs/liblscp/Manifest | 4 +- media-libs/liblscp/liblscp-0.6.0.ebuild | 27 - media-libs/liblscp/liblscp-0.6.2.ebuild | 2 +- media-libs/libmediainfo/Manifest | 4 +- media-libs/libmediainfo/libmediainfo-20.08.ebuild | 2 +- media-libs/libmediainfo/libmediainfo-20.09.ebuild | 83 +++ media-libs/libmpdclient/Manifest | 4 +- media-libs/libmpdclient/libmpdclient-2.16.ebuild | 48 -- media-libs/libmpdclient/libmpdclient-2.19.ebuild | 2 +- media-libs/libmpris2client/Manifest | 2 +- .../libmpris2client-0.1.0-r1.ebuild | 9 +- media-libs/libmypaint/Manifest | 2 +- media-libs/libmypaint/metadata.xml | 5 +- media-libs/libofa/Manifest | 2 +- media-libs/libofa/libofa-0.9.3-r2.ebuild | 5 +- media-libs/libopenmpt/Manifest | 4 +- media-libs/libopenmpt/libopenmpt-0.5.2.ebuild | 61 -- media-libs/libopenmpt/libopenmpt-0.5.3.ebuild | 61 ++ media-libs/libpgf/Manifest | 4 +- media-libs/libpgf/libpgf-6.12.27.ebuild | 40 -- media-libs/libpgf/libpgf-7.19.3.ebuild | 38 ++ media-libs/libplacebo/Manifest | 4 +- media-libs/libplacebo/libplacebo-2.72.0.ebuild | 77 --- media-libs/libplacebo/libplacebo-2.72.2.ebuild | 77 +++ media-libs/libpng/Manifest | 2 +- media-libs/libpng/libpng-1.6.37-r2.ebuild | 2 +- media-libs/libqaccessibilityclient/Manifest | 2 +- .../libqaccessibilityclient-0.4.1.ebuild | 2 +- media-libs/libraw/Manifest | 10 +- media-libs/libraw/libraw-0.19.3.ebuild | 60 -- media-libs/libraw/libraw-0.19.4.ebuild | 60 -- media-libs/libraw/libraw-0.19.5.ebuild | 60 -- media-libs/libraw/libraw-0.20.0.ebuild | 4 +- media-libs/libraw/libraw-0.20.2.ebuild | 62 ++ media-libs/libreplaygain/Manifest | 3 +- .../files/libreplaygain-static-libs.patch | 28 + .../libreplaygain/libreplaygain-477-r1.ebuild | 3 +- media-libs/libsamplerate/Manifest | 3 +- .../libsamplerate/libsamplerate-0.1.9-r1.ebuild | 2 +- .../libsamplerate/libsamplerate-0.1.9.ebuild | 59 -- media-libs/libsdl2/Manifest | 4 +- media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild | 18 +- media-libs/libsdl2/metadata.xml | 2 + media-libs/libsndfile/Manifest | 19 +- .../files/libsndfile-1.0.28-CVE-2017-12562.patch | 88 --- .../files/libsndfile-1.0.28-CVE-2017-14634.patch | 35 - .../files/libsndfile-1.0.28-CVE-2017-6892.patch | 25 - .../files/libsndfile-1.0.28-CVE-2017-8362.patch | 50 -- .../files/libsndfile-1.0.28-CVE-2017-8363.patch | 28 - .../files/libsndfile-1.0.28-CVE-2017-8365.patch | 64 -- .../files/libsndfile-1.0.28-CVE-2018-13139.patch | 31 - .../libsndfile-1.0.28-arm-varargs-failure.patch | 32 - .../files/libsndfile-1.0.29-pointer-aliasing.patch | 128 ---- media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild | 71 -- media-libs/libsndfile/libsndfile-1.0.29.ebuild | 79 --- .../libsndfile-1.0.29_pre2_p20191024.ebuild | 67 -- media-libs/libsndfile/libsndfile-1.0.30.ebuild | 74 +++ media-libs/libsndfile/libsndfile-9999.ebuild | 14 +- media-libs/libtgvoip/Manifest | 4 +- .../libtgvoip/libtgvoip-2.4.4_p20200704.ebuild | 53 -- .../libtgvoip/libtgvoip-2.4.4_p20201030.ebuild | 53 ++ media-libs/libtimidity/Manifest | 4 +- media-libs/libtimidity/libtimidity-0.2.4.ebuild | 28 - media-libs/libtimidity/libtimidity-0.2.6.ebuild | 2 +- media-libs/libvpx/Manifest | 2 +- media-libs/libvpx/libvpx-1.9.0.ebuild | 6 +- media-libs/libwmf/Manifest | 2 +- media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 104 --- media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild | 104 +++ media-libs/libxmi/Manifest | 2 +- media-libs/libxmi/libxmi-1.3.ebuild | 2 +- media-libs/lilv/Manifest | 6 +- media-libs/lilv/lilv-0.24.10.ebuild | 72 ++ media-libs/lilv/lilv-0.24.6-r2.ebuild | 72 -- media-libs/lilv/lilv-0.24.8-r1.ebuild | 72 -- media-libs/mesa/Manifest | 16 +- media-libs/mesa/mesa-20.1.10.ebuild | 543 ++++++++++++++++ media-libs/mesa/mesa-20.1.8.ebuild | 557 ---------------- media-libs/mesa/mesa-20.1.9.ebuild | 543 ---------------- media-libs/mesa/mesa-20.2.0.ebuild | 551 ---------------- media-libs/mesa/mesa-20.2.3.ebuild | 551 ++++++++++++++++ media-libs/mesa/mesa-20.3.0_rc2.ebuild | 553 ++++++++++++++++ media-libs/mesa/mesa-9999.ebuild | 14 +- media-libs/mesa/metadata.xml | 1 - media-libs/mlt/Manifest | 13 +- .../mlt/files/mlt-6.20.0-crash-in-composite.patch | 34 - ...-6.20.0-crash-w-unsupported-preview-scale.patch | 48 -- media-libs/mlt/files/mlt-6.20.0-musl-locale.patch | 34 - media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch | 421 ------------ .../mlt/files/mlt-6.20.0-nullpointer-crash.patch | 22 - .../files/mlt-6.20.0-opencv-double-del-crash.patch | 21 - media-libs/mlt/files/mlt-6.20.0-opencv4.patch | 45 -- media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch | 49 -- ...-fix-regression-w-multiple-affine-filters.patch | 23 + media-libs/mlt/mlt-6.20.0-r2.ebuild | 208 ------ media-libs/mlt/mlt-6.22.1-r1.ebuild | 201 ++++++ media-libs/mlt/mlt-6.22.1.ebuild | 200 ------ media-libs/mutagen/Manifest | 6 +- media-libs/mutagen/mutagen-1.43.0-r1.ebuild | 2 +- media-libs/mutagen/mutagen-1.44.0.ebuild | 2 +- media-libs/mutagen/mutagen-1.45.1.ebuild | 47 ++ media-libs/netpbm/Manifest | 14 +- media-libs/netpbm/files/make-tarball.sh | 0 media-libs/netpbm/files/netpbm-10.31-build.patch | 12 +- .../netpbm/files/netpbm-10.70-system-libs.patch | 8 +- .../netpbm/files/netpbm-10.76.00-misc-deps.patch | 12 +- .../files/netpbm-10.76.00-pbmtext-test.patch | 4 +- media-libs/netpbm/files/netpbm-10.76.00-test.patch | 40 +- media-libs/netpbm/netpbm-10.70.00.ebuild | 59 +- media-libs/netpbm/netpbm-10.76.00.ebuild | 48 +- media-libs/nv-codec-headers/Manifest | 4 +- .../nv-codec-headers-10.0.26.1.ebuild | 33 + .../nv-codec-headers-9.1.23.1.ebuild | 2 +- media-libs/opencollada/Manifest | 2 +- media-libs/opencollada/opencollada-1.6.68.ebuild | 2 +- media-libs/opencolorio/Manifest | 4 + .../opencolorio-1.1.1-fix-self-assign-clang.patch | 14 + .../opencolorio-1.1.1-yaml-cpp-boost-check.patch | 35 + media-libs/opencolorio/opencolorio-1.1.1.ebuild | 94 +++ media-libs/opencv/Manifest | 11 +- ...pencv-4.4.0-disable-native-cpuflag-detect.patch | 26 + .../opencv-4.5.0-link-with-cblas-for-lapack.patch | 18 + media-libs/opencv/metadata.xml | 3 + media-libs/opencv/opencv-4.4.0-r1.ebuild | 559 ++++++++++++++++ media-libs/opencv/opencv-4.5.0.ebuild | 567 ++++++++++++++++ media-libs/openexr/Manifest | 2 +- media-libs/openexr/openexr-2.5.2-r1.ebuild | 63 ++ media-libs/openexr/openexr-2.5.2.ebuild | 63 -- media-libs/openimageio/Manifest | 7 +- .../files/openimageio-2.2.6.1-pugixml.patch | 21 + media-libs/openimageio/metadata.xml | 11 +- .../openimageio/openimageio-1.8.17-r2.ebuild | 134 ---- media-libs/openimageio/openimageio-2.2.8.0.ebuild | 138 ++++ media-libs/opensubdiv/Manifest | 2 +- media-libs/opensubdiv/opensubdiv-3.4.3.ebuild | 2 +- media-libs/opus/Manifest | 2 +- media-libs/opus/opus-1.3.1-r1.ebuild | 2 +- media-libs/partio/Manifest | 2 +- media-libs/partio/partio-1.10.1.ebuild | 2 +- media-libs/phonon-gstreamer/Manifest | 2 +- .../phonon-gstreamer-4.10.0.ebuild | 2 +- media-libs/phonon-vlc/Manifest | 2 +- media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild | 2 +- media-libs/phonon/Manifest | 2 +- media-libs/phonon/phonon-4.11.1-r1.ebuild | 2 +- media-libs/plib/Manifest | 2 +- media-libs/plib/plib-1.8.5-r2.ebuild | 2 +- media-libs/plotutils/Manifest | 4 +- .../plotutils/files/plotutils-2.6-libpng-1.5.patch | 4 +- media-libs/plotutils/plotutils-2.6-r2.ebuild | 67 +- media-libs/pulseaudio-qt/Manifest | 2 +- media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild | 2 +- media-libs/qhull/Manifest | 2 +- media-libs/qhull/qhull-2015.2.ebuild | 2 +- media-libs/quarter/Manifest | 4 + media-libs/quarter/files/quarter-1.1.0-cmake.patch | 16 + media-libs/quarter/metadata.xml | 22 + media-libs/quarter/quarter-1.1.0.ebuild | 64 ++ media-libs/raspberrypi-userland-bin/Manifest | 4 +- .../raspberrypi-userland-bin-1.20170303.ebuild | 48 -- .../raspberrypi-userland-bin-1.20201022.ebuild | 41 ++ media-libs/raspberrypi-userland/Manifest | 8 +- .../files/raspberrypi-userland-include.patch | 19 + .../files/raspberrypi-userland-libdir.patch | 316 +++++++++ .../files/raspberrypi-userland-libfdt-static.patch | 22 + .../files/raspberrypi-userland-pkgconf-arm64.patch | 38 ++ .../raspberrypi-userland-0_pre20201022.ebuild | 71 ++ .../raspberrypi-userland-9999.ebuild | 71 +- media-libs/rubberband/Manifest | 4 +- media-libs/rubberband/rubberband-1.8.2-r1.ebuild | 55 -- media-libs/rubberband/rubberband-1.9.0.ebuild | 2 +- media-libs/sdl-gfx/Manifest | 3 +- media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild | 48 ++ media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild | 2 +- media-libs/sdl2-gfx/Manifest | 2 +- media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild | 4 +- media-libs/sdl2-image/Manifest | 2 +- media-libs/sdl2-image/sdl2-image-2.0.5.ebuild | 2 +- media-libs/sdl2-mixer/Manifest | 2 +- media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild | 2 +- media-libs/sdl2-ttf/Manifest | 2 +- media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild | 2 +- media-libs/shaderc/Manifest | 5 +- .../shaderc/files/shaderc-2020.4-fix-build.patch | 13 + media-libs/shaderc/shaderc-2020.2.ebuild | 3 +- .../shaderc/shaderc-2020.4_pre20201106.ebuild | 92 +++ media-libs/smpeg2/Manifest | 2 +- media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild | 2 +- media-libs/speex/Manifest | 1 + media-libs/speex/speex-1.2.0-r2.ebuild | 71 ++ media-libs/speexdsp/Manifest | 1 + media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild | 59 ++ media-libs/sratom/Manifest | 4 +- media-libs/sratom/sratom-0.6.4.ebuild | 56 -- media-libs/sratom/sratom-0.6.6.ebuild | 58 ++ media-libs/suil/Manifest | 4 +- media-libs/suil/suil-0.10.6.ebuild | 52 -- media-libs/suil/suil-0.10.8.ebuild | 52 ++ media-libs/tg_owt/Manifest | 5 + media-libs/tg_owt/metadata.xml | 8 + media-libs/tg_owt/tg_owt-0_pre20201105.ebuild | 52 ++ media-libs/tg_owt/tg_owt-0_pre20201112.ebuild | 52 ++ media-libs/tremor/Manifest | 2 +- media-libs/tremor/tremor-0_pre20130223-r2.ebuild | 2 +- media-libs/vamp-plugin-sdk/Manifest | 4 +- .../vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild | 2 +- .../vamp-plugin-sdk-2.7.1-r1.ebuild | 69 -- media-libs/vitamtp/Manifest | 4 +- .../vitamtp/vitamtp-2.5.9_pre20160829.ebuild | 8 +- media-libs/vitamtp/vitamtp-9999.ebuild | 8 +- media-libs/vulkan-layers/Manifest | 6 +- .../vulkan-layers/vulkan-layers-1.2.141.ebuild | 2 +- .../vulkan-layers/vulkan-layers-1.2.154.ebuild | 53 ++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 7 +- media-libs/vulkan-loader/Manifest | 6 +- .../vulkan-loader/vulkan-loader-1.2.141-r1.ebuild | 2 +- .../vulkan-loader/vulkan-loader-1.2.154.ebuild | 66 ++ media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 4 +- media-libs/webvfx/Manifest | 3 - media-libs/webvfx/metadata.xml | 18 - media-libs/webvfx/webvfx-1.2.0.ebuild | 64 -- media-libs/xvid/Manifest | 2 + media-libs/xvid/xvid-1.3.7.ebuild | 68 ++ media-libs/zita-alsa-pcmi/Manifest | 2 +- .../zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild | 2 +- media-libs/zita-resampler/Manifest | 2 +- .../zita-resampler/zita-resampler-1.6.2.ebuild | 2 +- media-libs/zmusic/Manifest | 4 +- media-libs/zmusic/zmusic-1.1.2.ebuild | 51 -- media-libs/zmusic/zmusic-1.1.4.ebuild | 51 ++ media-libs/zxing-cpp/Manifest | 6 +- .../files/zxing-cpp-1.0.8-pkgconfig.patch | 10 - .../zxing-cpp/files/zxing-cpp-1.0.8-version.patch | 22 - media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild | 20 - media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild | 14 +- 435 files changed, 8556 insertions(+), 10357 deletions(-) create mode 100644 media-libs/SoQt/Manifest create mode 100644 media-libs/SoQt/SoQt-1.6.0.ebuild create mode 100644 media-libs/SoQt/metadata.xml create mode 100644 media-libs/a52dec/a52dec-0.7.4-r8.ebuild delete mode 100644 media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild create mode 100644 media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild delete mode 100644 media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild create mode 100644 media-libs/alsa-lib/alsa-lib-1.2.4.ebuild create mode 100644 media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild create mode 100644 media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild delete mode 100644 media-libs/ampache_browser/ampache_browser-1.0.1.ebuild create mode 100644 media-libs/ampache_browser/ampache_browser-1.0.3.ebuild delete mode 100644 media-libs/babl/babl-0.1.74-r1.ebuild delete mode 100644 media-libs/babl/babl-0.1.74.ebuild delete mode 100644 media-libs/bcg729/bcg729-1.0.4.ebuild create mode 100644 media-libs/bcg729/bcg729-1.1.1.ebuild delete mode 100644 media-libs/cogl/cogl-1.22.6.ebuild delete mode 100644 media-libs/cogl/files/cogl-eglmesaext-include.patch delete mode 100644 media-libs/coin/coin-3.1.3-r2.ebuild delete mode 100644 media-libs/coin/files/coin-3.1.0-javascript.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-freetype251.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-gcc-4.7.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-gcc-7.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch delete mode 100644 media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch create mode 100644 media-libs/dav1d/dav1d-0.7.1.ebuild create mode 100644 media-libs/dav1d/dav1d-0.8.0.ebuild delete mode 100644 media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932.ebuild delete mode 100644 media-libs/exiftool/exiftool-12.01.ebuild create mode 100644 media-libs/exiftool/exiftool-12.08.ebuild create mode 100644 media-libs/faad2/faad2-2.10.0.ebuild delete mode 100644 media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch create mode 100644 media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch delete mode 100644 media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch delete mode 100644 media-libs/freetype/files/freetype-2.7-enable-valid.patch delete mode 100644 media-libs/freetype/freetype-2.10.1.ebuild delete mode 100644 media-libs/freetype/freetype-2.10.2-r1.ebuild create mode 100644 media-libs/freetype/freetype-2.10.4.ebuild delete mode 100644 media-libs/freetype/freetype-2.9.1-r3.ebuild delete mode 100644 media-libs/freetype/freetype-2.9.1-r4.ebuild delete mode 100644 media-libs/gegl/gegl-0.4.22-r1.ebuild delete mode 100644 media-libs/gegl/gegl-0.4.22.ebuild create mode 100644 media-libs/gegl/gegl-0.4.26-r1.ebuild create mode 100644 media-libs/gegl/gegl-0.4.26.ebuild delete mode 100644 media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch delete mode 100644 media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch delete mode 100644 media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild delete mode 100644 media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild delete mode 100644 media-libs/gexiv2/gexiv2-0.12.0.ebuild delete mode 100644 media-libs/graphene/graphene-1.10.0.ebuild delete mode 100644 media-libs/graphene/graphene-1.8.6.ebuild delete mode 100644 media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild create mode 100644 media-libs/hamlib/hamlib-3.3-r1.ebuild delete mode 100644 media-libs/harfbuzz/harfbuzz-2.6.5.ebuild delete mode 100644 media-libs/harfbuzz/harfbuzz-2.6.8.ebuild delete mode 100644 media-libs/harfbuzz/harfbuzz-2.7.1.ebuild delete mode 100644 media-libs/kodi-platform/kodi-platform-18.0_pre20180301.ebuild delete mode 100644 media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild create mode 100644 media-libs/libass/libass-0.15.0.ebuild create mode 100644 media-libs/libavif/libavif-0.8.3.ebuild create mode 100644 media-libs/libavif/libavif-0.8.4.ebuild create mode 100644 media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch create mode 100644 media-libs/libcuefile/files/libcuefile-static-libs.patch delete mode 100644 media-libs/libdca/libdca-0.0.5-r3.ebuild create mode 100644 media-libs/libexif/libexif-0.6.22_p20201105.ebuild delete mode 100644 media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild create mode 100644 media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild create mode 100644 media-libs/libgphoto2/libgphoto2-2.5.26.ebuild delete mode 100644 media-libs/libheif/files/heif_test.go delete mode 100644 media-libs/libheif/libheif-1.5.1.ebuild delete mode 100644 media-libs/libheif/libheif-1.6.1.ebuild delete mode 100644 media-libs/libheif/libheif-1.6.2.ebuild delete mode 100644 media-libs/libheif/libheif-1.7.0-r1.ebuild delete mode 100644 media-libs/libheif/libheif-1.8.0.ebuild create mode 100644 media-libs/libheif/libheif-1.9.1.ebuild delete mode 100644 media-libs/libinsane/libinsane-1.0.4.ebuild create mode 100644 media-libs/libinsane/libinsane-1.0.8.ebuild delete mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild delete mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild delete mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild delete mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r2.ebuild create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild delete mode 100644 media-libs/liblscp/liblscp-0.6.0.ebuild create mode 100644 media-libs/libmediainfo/libmediainfo-20.09.ebuild delete mode 100644 media-libs/libmpdclient/libmpdclient-2.16.ebuild delete mode 100644 media-libs/libopenmpt/libopenmpt-0.5.2.ebuild create mode 100644 media-libs/libopenmpt/libopenmpt-0.5.3.ebuild delete mode 100644 media-libs/libpgf/libpgf-6.12.27.ebuild create mode 100644 media-libs/libpgf/libpgf-7.19.3.ebuild delete mode 100644 media-libs/libplacebo/libplacebo-2.72.0.ebuild create mode 100644 media-libs/libplacebo/libplacebo-2.72.2.ebuild delete mode 100644 media-libs/libraw/libraw-0.19.3.ebuild delete mode 100644 media-libs/libraw/libraw-0.19.4.ebuild delete mode 100644 media-libs/libraw/libraw-0.19.5.ebuild create mode 100644 media-libs/libraw/libraw-0.20.2.ebuild create mode 100644 media-libs/libreplaygain/files/libreplaygain-static-libs.patch delete mode 100644 media-libs/libsamplerate/libsamplerate-0.1.9.ebuild delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-12562.patch delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.28-arm-varargs-failure.patch delete mode 100644 media-libs/libsndfile/files/libsndfile-1.0.29-pointer-aliasing.patch delete mode 100644 media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild delete mode 100644 media-libs/libsndfile/libsndfile-1.0.29.ebuild delete mode 100644 media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild create mode 100644 media-libs/libsndfile/libsndfile-1.0.30.ebuild delete mode 100644 media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild create mode 100644 media-libs/libtgvoip/libtgvoip-2.4.4_p20201030.ebuild delete mode 100644 media-libs/libtimidity/libtimidity-0.2.4.ebuild delete mode 100644 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild create mode 100644 media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild create mode 100644 media-libs/lilv/lilv-0.24.10.ebuild delete mode 100644 media-libs/lilv/lilv-0.24.6-r2.ebuild delete mode 100644 media-libs/lilv/lilv-0.24.8-r1.ebuild create mode 100644 media-libs/mesa/mesa-20.1.10.ebuild delete mode 100644 media-libs/mesa/mesa-20.1.8.ebuild delete mode 100644 media-libs/mesa/mesa-20.1.9.ebuild delete mode 100644 media-libs/mesa/mesa-20.2.0.ebuild create mode 100644 media-libs/mesa/mesa-20.2.3.ebuild create mode 100644 media-libs/mesa/mesa-20.3.0_rc2.ebuild delete mode 100644 media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch delete mode 100644 media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch delete mode 100644 media-libs/mlt/files/mlt-6.20.0-musl-locale.patch delete mode 100644 media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch delete mode 100644 media-libs/mlt/files/mlt-6.20.0-nullpointer-crash.patch delete mode 100644 media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch delete mode 100644 media-libs/mlt/files/mlt-6.20.0-opencv4.patch delete mode 100644 media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch create mode 100644 media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch delete mode 100644 media-libs/mlt/mlt-6.20.0-r2.ebuild create mode 100644 media-libs/mlt/mlt-6.22.1-r1.ebuild delete mode 100644 media-libs/mlt/mlt-6.22.1.ebuild create mode 100644 media-libs/mutagen/mutagen-1.45.1.ebuild mode change 100755 => 100644 media-libs/netpbm/files/make-tarball.sh create mode 100644 media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild create mode 100644 media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch create mode 100644 media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch create mode 100644 media-libs/opencolorio/opencolorio-1.1.1.ebuild create mode 100644 media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch create mode 100644 media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch create mode 100644 media-libs/opencv/opencv-4.4.0-r1.ebuild create mode 100644 media-libs/opencv/opencv-4.5.0.ebuild create mode 100644 media-libs/openexr/openexr-2.5.2-r1.ebuild delete mode 100644 media-libs/openexr/openexr-2.5.2.ebuild create mode 100644 media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch delete mode 100644 media-libs/openimageio/openimageio-1.8.17-r2.ebuild create mode 100644 media-libs/openimageio/openimageio-2.2.8.0.ebuild create mode 100644 media-libs/quarter/Manifest create mode 100644 media-libs/quarter/files/quarter-1.1.0-cmake.patch create mode 100644 media-libs/quarter/metadata.xml create mode 100644 media-libs/quarter/quarter-1.1.0.ebuild delete mode 100644 media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20170303.ebuild create mode 100644 media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild create mode 100644 media-libs/raspberrypi-userland/files/raspberrypi-userland-include.patch create mode 100644 media-libs/raspberrypi-userland/files/raspberrypi-userland-libdir.patch create mode 100644 media-libs/raspberrypi-userland/files/raspberrypi-userland-libfdt-static.patch create mode 100644 media-libs/raspberrypi-userland/files/raspberrypi-userland-pkgconf-arm64.patch create mode 100644 media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild delete mode 100644 media-libs/rubberband/rubberband-1.8.2-r1.ebuild create mode 100644 media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild create mode 100644 media-libs/shaderc/files/shaderc-2020.4-fix-build.patch create mode 100644 media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild create mode 100644 media-libs/speex/speex-1.2.0-r2.ebuild create mode 100644 media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild delete mode 100644 media-libs/sratom/sratom-0.6.4.ebuild create mode 100644 media-libs/sratom/sratom-0.6.6.ebuild delete mode 100644 media-libs/suil/suil-0.10.6.ebuild create mode 100644 media-libs/suil/suil-0.10.8.ebuild create mode 100644 media-libs/tg_owt/Manifest create mode 100644 media-libs/tg_owt/metadata.xml create mode 100644 media-libs/tg_owt/tg_owt-0_pre20201105.ebuild create mode 100644 media-libs/tg_owt/tg_owt-0_pre20201112.ebuild delete mode 100644 media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild create mode 100644 media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild create mode 100644 media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild delete mode 100644 media-libs/webvfx/Manifest delete mode 100644 media-libs/webvfx/metadata.xml delete mode 100644 media-libs/webvfx/webvfx-1.2.0.ebuild create mode 100644 media-libs/xvid/xvid-1.3.7.ebuild delete mode 100644 media-libs/zmusic/zmusic-1.1.2.ebuild create mode 100644 media-libs/zmusic/zmusic-1.1.4.ebuild delete mode 100644 media-libs/zxing-cpp/files/zxing-cpp-1.0.8-pkgconfig.patch delete mode 100644 media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch delete mode 100644 media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 100787b0f621..d781097d229e 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/SoQt/Manifest b/media-libs/SoQt/Manifest new file mode 100644 index 000000000000..4cc988fd46dd --- /dev/null +++ b/media-libs/SoQt/Manifest @@ -0,0 +1,3 @@ +DIST SoQt-1.6.0-src.tar.gz 1675532 BLAKE2B 9935c32a7f0ad0d0e4248c6f81d2aacad00f3674d8e14aa192a87be5dc3b99e29213fbd96044ad4cc6548aef7f1d281aadebc48256bbfc11ad305e2136f6e12a SHA512 4221e98f51cca4dda23043428e869b60ab4d994710f97c0f44cd82631ffad2bd8bbaf0b820434a4636892df663d66ecd2aec14b185972671b2d22c0fe242b553 +EBUILD SoQt-1.6.0.ebuild 1009 BLAKE2B 912f10bb9c850b04d349ba7fc944da7836f6f602bb14c252d1cfdeb4dd5f6bf02c16cde7d04a1666ec47b7e522bb5b21c26e85654cc52e93a688c5e1435b64ce SHA512 1dfbc3c215aee64c215aa5ebf93aa607867ad7ca4f5aa1cfbf2599f2a65d7e816abc17849a0a3b8fcf6447ecb160fc72b5de602c88ff77f17327f1b50b02aff4 +MISC metadata.xml 597 BLAKE2B 8ff0a3f531a56870fa34aa5b7e9f33fbbc71bdd0572fe0d690621bf426ae774c1b2677c6d65ccd53080a8fe2f85eca5e358500df5bd1b77200d43f2b4ce0703a SHA512 94c34a663a95e6e081c991ba070b4a2ce3d8cbe65dcea1c1c34936795e9530eddf32bb22d0694feacec21022ee61af11b16131daef719aacba7b7e1abfb5cd96 diff --git a/media-libs/SoQt/SoQt-1.6.0.ebuild b/media-libs/SoQt/SoQt-1.6.0.ebuild new file mode 100644 index 000000000000..987b9268d17c --- /dev/null +++ b/media-libs/SoQt/SoQt-1.6.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +MY_P=${P/soqt/SoQt} + +HOMEPAGE="https://github.com/coin3d/coin/wiki" +DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt" +SRC_URI="https://github.com/coin3d/soqt/releases/download/${MY_P}/${P}-src.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="debug doc" + +RDEPEND=" + media-libs/coin + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtopengl:5 + virtual/opengl + x11-libs/libX11 + x11-libs/libXi +" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto + doc? ( app-doc/doxygen ) +" + +S="${WORKDIR}/soqt" + +DOCS=(AUTHORS ChangeLog HACKING NEWS README) + +src_configure() { + use debug && append-cppflags -DSOQT_DEBUG=1 + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DSOQT_BUILD_DOCUMENTATION=$(usex doc) + -DSOQT_BUILD_INTERNAL_DOCUMENTATION=OFF + -DSOQT_VERBOSE=$(usex debug) + ) + cmake_src_configure +} diff --git a/media-libs/SoQt/metadata.xml b/media-libs/SoQt/metadata.xml new file mode 100644 index 000000000000..4b5cc76b6e9c --- /dev/null +++ b/media-libs/SoQt/metadata.xml @@ -0,0 +1,16 @@ + + + + + reavertm@gentoo.org + Feel free to maintain/fix + + + SoQt is a Qt GUI component toolkit library for Coin. It is also compatible + with SGI and TGS Open Inventor, and the API is based on the API of the + InventorXt GUI component toolkit. + + + coin3d/soqt + + diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest index 43d87063967d..e9325e5ac6ff 100644 --- a/media-libs/a52dec/Manifest +++ b/media-libs/a52dec/Manifest @@ -1,8 +1,9 @@ AUX a52dec-0.7.4-build.patch 1113 BLAKE2B 21d323abd6c7cb14d9ea5b1d6e8b2ab3926c5cc1a3e2eac14cc08bd51f72046dd4af8d054070fba714b079835d936f342ed308fd445721290fdd1a01198cae31 SHA512 eee40a2871c00fc704fa49d3192a41ceadc4cf7e80d7d7cf368aa2a3e7ebb786f39ef835bdffca5685bf054316a9bacf87556b9a0c90868dbf29e7269873806e -AUX a52dec-0.7.4-freebsd.patch 343 BLAKE2B faa25733684a22eb18f27c34fec4d776e00d19999094fb2c32ec0b335d8504ea810956da727df960370cdbcfeeb912275f47f24340f65bc85a0a4935a6647dfd SHA512 3e448e36b4c0720df634efcfd1f5be50d404131e250a05d58396e9a74d92f2ea7f2d0de7b0394bf138ce033aa31d8e7fb3512e778c5b5f97f04d7dfb2ce6b964 +AUX a52dec-0.7.4-freebsd.patch 295 BLAKE2B a927fb15b6e7afbd52ebb75d1d99430d8d91048c1c6841eb9ffff7f3db95abfe967dc3c6a622753749e5fef38f4e61845f3a3295bb3153fb4eda874613f14fac SHA512 046d1dd0342836a8562d7aa997c61b6efad1240d07fbc769c19985780a07fc9990ad9429e952d9769636065fb916c69f8240d1e5ca1aae84717694e0afe4e8a2 AUX a52dec-0.7.4-test-hidden-symbols.patch 637 BLAKE2B 542d1bfbf8722d900b25fa6bce240924e82ca1b903a308634b23c23acf59e606adbad54951da39b3c1c60cf95fe9c8bad87da09cb10894ac82de3e670b199cca SHA512 097f4f9cb82f01cb42e5536bfb4fa5ed6cbe85da5f4a31c19e83e1d1e73f8724a3828f0585834142f861bad3417fb9c55b21581def85733278870c3c48c2e8fd AUX a52dec-0.7.4-tests-optional.patch 299 BLAKE2B af245be87277559c2fbc1695180d4e451ccc6a76157111d57fa86992c4cd4dd59e166b7a68a7d799bdda56d0ac5ae3ddfe5c433cbccf6eef4a999e2b336eda0e SHA512 9f5c0afbfd656287eafeba04eed34070f53a77cb53981d64ff71edb96bef6cc2c0638e0be6647086cbad87ead97aa0215cd6cb413258d0122bc3f45bcf4480b1 DIST a52dec-0.7.4.tar.gz 241507 BLAKE2B e8475b391a3afe77883f5683f58a64d2babfcf93c08a3bcbd0208476323e9c86c5d268d2738efddd2093a1c47886deb22185cb8f00c4ec8b4153f64e1af1f49e SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848 EBUILD a52dec-0.7.4-r6.ebuild 1413 BLAKE2B 45ebb82ffca81f3f3c1bb3344ecce998e1cd5a7299af97e1451cd50f43b74c45380a717e991aa0a66f20da86f918602eed72746227111d8ae915f51a8b3f9744 SHA512 50170b8a1fd4218ea832fb305fd6366ef28bcfbbd41dc4cde438e9d94ace3d476a35d845ae6204e49efb4f1b87db1baa646f202f2deead042d2cfc75bb62fe5e EBUILD a52dec-0.7.4-r7.ebuild 1543 BLAKE2B cbb898b79f8c8bdd8daaaff8fc186b8ca9c3f24d2f8c28cf2206298384eb84ba449903106673b02e746c5fe7f757a4639df1f218b63cc4f15746dec7adfe442c SHA512 2a93b8d533c84ad430c16fe0242317da4b09fd32fdefa550c99a2c682dacadb4ac03e96ece2cc4641a0021adcdf7a6011cfcd2226245b023ed42a02e7926706a +EBUILD a52dec-0.7.4-r8.ebuild 1452 BLAKE2B 77c734fd419292c20f4e2676ba7390d53bf989c82238f47ecf5f52cd33fd2f208e0bdc2a941736a2287e64f246f5c750b10caef8e650ab072ae4d7464efddd30 SHA512 58e2c6eeb982ad13eb362d7a2d6f9704528120ea3bc435b33340f2ae022f829d3767eb201c4612daa4a1a3b255c4b38d05fe6e468449c63c40dea8e5f07acf59 MISC metadata.xml 442 BLAKE2B 6e92f797dedf977ed4dd7321249af91b56488c98f9bb64cc8df4fd1ed1012a501d0f49ef5cb063d52e0636583dca77c4376df2e1071da889f598415aa91d801a SHA512 acc8d37733d5efebd4e65401dfff5926a64e13f641dd383343a26b666fe13963191782990ec4571c18803584808b249cb60646a06d91437f0a6793237eb99ca0 diff --git a/media-libs/a52dec/a52dec-0.7.4-r8.ebuild b/media-libs/a52dec/a52dec-0.7.4-r8.ebuild new file mode 100644 index 000000000000..e32e97439eda --- /dev/null +++ b/media-libs/a52dec/a52dec-0.7.4-r8.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal + +DESCRIPTION="library for decoding ATSC A/52 streams used in DVD" +HOMEPAGE="http://liba52.sourceforge.net/" +SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="djbfft oss" + +RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-freebsd.patch + "${FILESDIR}"/${P}-tests-optional.patch + "${FILESDIR}"/${P}-test-hidden-symbols.patch +) + +src_prepare() { + default + + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #466978 + mv configure.{in,ac} || die + + eautoreconf + + filter-flags -fprefetch-loop-arrays +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + --disable-static \ + --enable-shared \ + $(use_enable djbfft) \ + $(usex oss '' --disable-oss) + + # remove useless subdirs + if ! multilib_is_native_abi; then + sed -i \ + -e 's/ src//' \ + -e 's/ libao//' \ + Makefile || die + fi +} + +multilib_src_compile() { + emake CFLAGS="${CFLAGS}" +} + +multilib_src_install_all() { + einstalldocs + dodoc HISTORY doc/liba52.txt + + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/media-libs/a52dec/files/a52dec-0.7.4-freebsd.patch b/media-libs/a52dec/files/a52dec-0.7.4-freebsd.patch index 6e33f18911b3..13d83bd3b67d 100644 --- a/media-libs/a52dec/files/a52dec-0.7.4-freebsd.patch +++ b/media-libs/a52dec/files/a52dec-0.7.4-freebsd.patch @@ -1,5 +1,5 @@ ---- libao/audio_out_oss.c 2002-04-28 12:23:02 +0200 -+++ libao/audio_out_oss.c 2005-07-23 15:42:50 +0200 +--- a/libao/audio_out_oss.c ++++ b/libao/audio_out_oss.c @@ -35,7 +35,7 @@ #if defined(__OpenBSD__) #include diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest index 21a056664db4..45ff95389106 100644 --- a/media-libs/alsa-lib/Manifest +++ b/media-libs/alsa-lib/Manifest @@ -2,9 +2,9 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb130c2ed537eaf6509f54fa4970a54ddc90b82217e47e63e1161e76bed54161f5cb19f79d999ccb1079571938bb7591ac378ca13cb94527d6b629 SHA512 3be6b6a50dc570df19e77132b519aba4b5a04fc25056eaaa882c8a32f632389efd358bfe7aec833651acd63e964b1f411f86fcfbb9abf30072ba14f561af3bc5 AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033 -DIST alsa-lib-1.2.3.1.tar.bz2 1037942 BLAKE2B 0460ec9449e3936582b29af6ef019ddbe9875090ba722e00074d3d3dfe6214f40c1d96cec8827bb724a52b06abbff1d80dc5fed46f5bb1f03bc5c46a765756fd SHA512 ed0a81371117a91a5024f3bef5a881ffa9521399eab5e016924669a3f1eba2d6a02efa284b160089bc581717d39d15325ebb2faf162e4d3dabe4c29785a5fb58 DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a +DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844 EBUILD alsa-lib-1.2.2-r1.ebuild 2167 BLAKE2B a8be7297ee529e0d99df9086bf54f1f357faaf6fb69fb1217511fba8c10128f6e20fd66ea46959eb1ab2d55c6b0b24a8baabd33f255ca80ea4efdf35dce3b921 SHA512 c90194937d98a4e740aef62d79b38f75ca9b606e37809040f9dfc410c29aa2bef2a8f52decc4510fb7ad5f40a5fc3829087cddc2237e44bbcd48a879f05e3c4c -EBUILD alsa-lib-1.2.3.1.ebuild 2054 BLAKE2B 0ae472259dea51bc27b4cba0fe780e6df27dba7e81587f0a7d7d59d29505268140f2eb5b0c18689ff8bc5977ff0589128df7e2b20f8f17cff44ae6fdbe90bfce SHA512 0dec2b408fb7ad655bc6cce5ceef2e3f165a36d710c750d16de1f1e88a64463ab07eabad75872acb5f52b4fd6887995e042470cd76e381f7c0da9f7ffa71d000 -EBUILD alsa-lib-1.2.3.2.ebuild 2054 BLAKE2B 0ae472259dea51bc27b4cba0fe780e6df27dba7e81587f0a7d7d59d29505268140f2eb5b0c18689ff8bc5977ff0589128df7e2b20f8f17cff44ae6fdbe90bfce SHA512 0dec2b408fb7ad655bc6cce5ceef2e3f165a36d710c750d16de1f1e88a64463ab07eabad75872acb5f52b4fd6887995e042470cd76e381f7c0da9f7ffa71d000 +EBUILD alsa-lib-1.2.3.2-r1.ebuild 2104 BLAKE2B 8df2a9e988563fdc9c7f49ebbb6c3ff723f38feb2e9cc69bb9346dcf062955c7c2d6ae2c92302ca6c9738b64892ad5d18de730d2c27769ad032b992af40cbcc8 SHA512 94dcc4f606a06423ae30995d4736a1fcf0e19631dca736b697d26f7304b24e7cd3f1f5ffe339129463c9be75e23b06873b5b3fd11bab3a2b81b5192e45ef013d +EBUILD alsa-lib-1.2.4.ebuild 2112 BLAKE2B db57cf3e7d6353c6ff1cb5c824cd6b3504faaa1c0160b596384fe84020267e49ea4dd68c572126a4de3947d14f3150a4c30032a7ac8b0de3a7c63ed6a928e6e7 SHA512 f510ce16df02a18412e3395866e7361ed7abf205aab0f34648af18ae2f1b37910633c3033177b32412a929ca5bd002f70cfe325cdb1eff0bea5829bf14992a99 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085 diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild deleted file mode 100644 index 4b268d8fb2c6..000000000000 --- a/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit autotools multilib-minimal python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/" -SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="alisp debug doc elibc_uclibc python +thread-safety" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )" -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422 -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die - # https://bugs.gentoo.org/509886 - if use elibc_uclibc ; then - sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die - fi - # https://bugs.gentoo.org/545950 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-maintainer-mode - --disable-resmgr - --enable-aload - --enable-rawmidi - --enable-seq - --enable-shared - # enable Python only on final ABI - $(multilib_native_use_enable python) - $(use_enable alisp) - $(use_enable thread-safety) - $(use_with debug) - $(usex elibc_uclibc --without-versioned '') - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && use doc; then - emake doc - grep -FZrl "${S}" doc/doxygen/html | \ - xargs -0 sed -i -e "s:${S}::" || die - fi -} - -multilib_src_install() { - multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) - default -} - -multilib_src_install_all() { - find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die - dodoc ChangeLog doc/asoundrc.txt NOTES TODO -} diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild new file mode 100644 index 000000000000..d7b63f0c237b --- /dev/null +++ b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit autotools multilib-minimal python-single-r1 + +DESCRIPTION="Advanced Linux Sound Architecture Library" +HOMEPAGE="https://alsa-project.org/" +SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="alisp debug doc elibc_uclibc python +thread-safety" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )" +RDEPEND="python? ( ${PYTHON_DEPS} ) + media-libs/alsa-topology-conf + media-libs/alsa-ucm-conf +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422 +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die + # https://bugs.gentoo.org/509886 + if use elibc_uclibc ; then + sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die + fi + # https://bugs.gentoo.org/545950 + sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --disable-maintainer-mode + --disable-resmgr + --enable-aload + --enable-rawmidi + --enable-seq + --enable-shared + # enable Python only on final ABI + $(multilib_native_use_enable python) + $(use_enable alisp) + $(use_enable thread-safety) + $(use_with debug) + $(usex elibc_uclibc --without-versioned '') + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi && use doc; then + emake doc + grep -FZrl "${S}" doc/doxygen/html | \ + xargs -0 sed -i -e "s:${S}::" || die + fi +} + +multilib_src_install() { + multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) + default +} + +multilib_src_install_all() { + find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die + dodoc ChangeLog doc/asoundrc.txt NOTES TODO +} diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild deleted file mode 100644 index 4b268d8fb2c6..000000000000 --- a/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit autotools multilib-minimal python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/" -SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="alisp debug doc elibc_uclibc python +thread-safety" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )" -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422 -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die - # https://bugs.gentoo.org/509886 - if use elibc_uclibc ; then - sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die - fi - # https://bugs.gentoo.org/545950 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-maintainer-mode - --disable-resmgr - --enable-aload - --enable-rawmidi - --enable-seq - --enable-shared - # enable Python only on final ABI - $(multilib_native_use_enable python) - $(use_enable alisp) - $(use_enable thread-safety) - $(use_with debug) - $(usex elibc_uclibc --without-versioned '') - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && use doc; then - emake doc - grep -FZrl "${S}" doc/doxygen/html | \ - xargs -0 sed -i -e "s:${S}::" || die - fi -} - -multilib_src_install() { - multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) - default -} - -multilib_src_install_all() { - find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die - dodoc ChangeLog doc/asoundrc.txt NOTES TODO -} diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild new file mode 100644 index 000000000000..11fed2e2aa98 --- /dev/null +++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit autotools multilib-minimal python-single-r1 + +DESCRIPTION="Advanced Linux Sound Architecture Library" +HOMEPAGE="https://alsa-project.org/" +SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="alisp debug doc elibc_uclibc python +thread-safety" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )" +RDEPEND="python? ( ${PYTHON_DEPS} ) + media-libs/alsa-topology-conf + media-libs/alsa-ucm-conf +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422 +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die + # https://bugs.gentoo.org/509886 + if use elibc_uclibc ; then + sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die + fi + # https://bugs.gentoo.org/545950 + sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --disable-maintainer-mode + --disable-resmgr + --enable-aload + --enable-rawmidi + --enable-seq + --enable-shared + # enable Python only on final ABI + $(multilib_native_use_enable python) + $(use_enable alisp) + $(use_enable thread-safety) + $(use_with debug) + $(usex elibc_uclibc --without-versioned '') + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi && use doc; then + emake doc + grep -FZrl "${S}" doc/doxygen/html | \ + xargs -0 sed -i -e "s:${S}::" || die + fi +} + +multilib_src_install() { + multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) + default +} + +multilib_src_install_all() { + find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die + dodoc ChangeLog doc/asoundrc.txt NOTES TODO +} diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest index 89a6c32e35cc..e17597bb710d 100644 --- a/media-libs/alsa-topology-conf/Manifest +++ b/media-libs/alsa-topology-conf/Manifest @@ -1,5 +1,7 @@ DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce19319429340eac61bb340c29448dfa14d4fe1d80dc1e5e0c066b33ccab3d9c620efe6b95b095cf1ea52583d7543ca472f1375dc5ad57 SHA512 145ee0e16f7f84d5f97759b1efaa3df9fe35c8b33c7ae863ae1b915f361acd902ad05f59090e1d98b2a4f2ecc14933681592893564fcc45cdbc974899f789b94 DIST alsa-topology-conf-1.2.3.tar.bz2 11787 BLAKE2B 8dbeafd6a6800e826e76c0305caa01f6d7af4d32eadb49feb6fcab23041e3b3bc4c2bb9286e41b2e1a123ee363d621c46a8c96459ce4af03f8a45f834b83c6c7 SHA512 e57439212fd76d1d0c1677654ae7cecef0f89c01a6c57f5f00a02ecd2f6d9f22dc31ed4f301cf82464d98ac32c01f2015a91a5b51d08268ddfeb4265e9b951b9 +DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb EBUILD alsa-topology-conf-1.2.2.ebuild 492 BLAKE2B dadb0aa599341fff13951cedd345c38be4389896ee74f7bca463eacded6949bf1f8a508891ada15e7a07e14b6859dabb8adf327f5de79ff10774e7f8d1b8a125 SHA512 dbc98ed8ec2f3793184082c5a209c08c62bb4de649aab5ac7bc1b42d4c065407ca3c94b753e8b8bf28bd1491317e36a3ce739f3a3d489de86c3a47f58b5c9ff0 -EBUILD alsa-topology-conf-1.2.3.ebuild 500 BLAKE2B 3dcd66d24b527410c91c191b9bf3551b850559297d999e28936ea9f59d7faf7f39135dca08499ac05cac539e506feba2d87940383c723f649fa2fc005e7c87bc SHA512 0026765fbfe2dd182b1eda729624624fd36b2fdfb0ad1d9d02c60972e3c44c1539d3371f5c7227693b073e070d62dc845403f56c35481bcb06ccc4fa99468941 +EBUILD alsa-topology-conf-1.2.3.ebuild 492 BLAKE2B dadb0aa599341fff13951cedd345c38be4389896ee74f7bca463eacded6949bf1f8a508891ada15e7a07e14b6859dabb8adf327f5de79ff10774e7f8d1b8a125 SHA512 dbc98ed8ec2f3793184082c5a209c08c62bb4de649aab5ac7bc1b42d4c065407ca3c94b753e8b8bf28bd1491317e36a3ce739f3a3d489de86c3a47f58b5c9ff0 +EBUILD alsa-topology-conf-1.2.4.ebuild 500 BLAKE2B 3dcd66d24b527410c91c191b9bf3551b850559297d999e28936ea9f59d7faf7f39135dca08499ac05cac539e506feba2d87940383c723f649fa2fc005e7c87bc SHA512 0026765fbfe2dd182b1eda729624624fd36b2fdfb0ad1d9d02c60972e3c44c1539d3371f5c7227693b073e070d62dc845403f56c35481bcb06ccc4fa99468941 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611 diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild index 84b05683cf78..449bf3a78093 100644 --- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild +++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.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 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="" RDEPEND="! - -netmon@gentoo.org - + + sam@gentoo.org + Sam James + + + netmon@gentoo.org + diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest index 6dddc746ca7c..f3f25f65f78d 100644 --- a/media-libs/bio2jack/Manifest +++ b/media-libs/bio2jack/Manifest @@ -1,3 +1,3 @@ DIST bio2jack-0.9.tar.gz 527385 BLAKE2B 9f977e8f03a9de272c0b440c256569382876a62875dfc3d1f896c80388bd219d195d5544ba1dd5fb6b2141e63368f4293c3cb5081e1d2d8d3cdceef29a54285d SHA512 8faf73b9aa81d48eddb624146c0144094e466f16cad89fad3670f927963a5944d78f0342aba0f29cece422e3f012faf3e1a0c459fd5cef279406f5bebe66e66a -EBUILD bio2jack-0.9-r2.ebuild 1056 BLAKE2B 208c50d7ece4f5edddc341c183b789f4e3b64b506bae048e112e8389a299c88da945141a2f994fef51e14fe0e36217efd4de51a028d301686dc709defeaa37a3 SHA512 69cdc0865addb6f4964f775baacf884494a07274383cedf0431cc519ae528e9aecf8755e13df27d67e6481c5d51fd2d219d9ccf836059d17587c606a16e37fcc +EBUILD bio2jack-0.9-r2.ebuild 1044 BLAKE2B 15e0119a17062a46f106a4008aa6d546041527bbf1f914ccaf076b3bc87099d1143eaf392b8df1d7babecbaa015d6624126b40f46f32c15c26e92986fffc35d3 SHA512 e9b141bcca5424555c42c88057222093dfd4e2abf800474f3076fecd0e6d74edc91f87d7b48ef4bd3bdcac973a510bd04a8277b54493ac7ac914c3d42a8428dd MISC metadata.xml 331 BLAKE2B 10b8c96e08bc97853a40647f2875aafc8c7de9994ba5af8cf5e2ed429efc2cd494b65d1d6dd424da234785568ebaeec822f15c0b088a0bc8df1a12322f2472bf SHA512 57c44fcd806d4de0339c0a6041635dac52545c8aa71516aefcde41613a8ec92f293c5e28f7b04ed3ab746fdccee306b80a44ef4faef24b2ade1abd2be831ca27 diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild index 430eff7e8424..abd96bd163f8 100644 --- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild +++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="static-libs" BDEPEND=" diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest index 0d662312275d..7bac5bf10270 100644 --- a/media-libs/cogl/Manifest +++ b/media-libs/cogl/Manifest @@ -1,6 +1,3 @@ -AUX cogl-eglmesaext-include.patch 2204 BLAKE2B 307a473a606129fe7e08e65915dbe985d3765c2745ec444b41592f8c36ab5b6ad0d43bbc35a93f01666d8cff81111e0c211bddfbf5d89f48591c8bf5377cb471 SHA512 41e475d73e12e4ab517c49ae1a70d1dd71e9f8a618eb28cd7b81430bf3acec84bbdf8a31ec4e02fd87734fe402e523cda5c14c4a4c5d63928b9de930bcf23e10 -DIST cogl-1.22.6.tar.xz 1744240 BLAKE2B d3483c972705ec72d2ccbd06106bdd37ea23a7940c7d5f5d8c45da43a8e5ed7bc2fb5f07838b5a0cfe9b54d3681120008c03945ee8bac39042a9c263e84d3549 SHA512 b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483 DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f -EBUILD cogl-1.22.6.ebuild 3384 BLAKE2B c591d4942a45b55cd9bceb0dd8e438c15a2a4a8b6dc2e2ca1f56dde8e3f113c8d4b6543f5d34b065f2690dcda4553b4a32ea5a21a03ebca8e982a809f1f03920 SHA512 3aabd0e305a5391109755f90f022487aebcaf46482094d0f8894d3c94565ceb661b63ac0bc5e4b22d122d6f16d00df9009f86541970ee28e470349e64c4caaec EBUILD cogl-1.22.8.ebuild 3272 BLAKE2B f9663431b857b6719190e66eb8388f70b195107ca4ec90284e91b136e7f5c2c983ddb90c2ab4cf410ff51d5ef22bd3739a8cf716f75c383383e8906a1c8945f1 SHA512 b67a1bbd105f756518825e59b145330861fa962bef05eb8e7be9ea5f608aed7683872631465944bf508606f2014354e7196399e92e4cb2d8661212c75cefe3ee MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44 diff --git a/media-libs/cogl/cogl-1.22.6.ebuild b/media-libs/cogl/cogl-1.22.6.ebuild deleted file mode 100644 index 7f42f1ceab22..000000000000 --- a/media-libs/cogl/cogl-1.22.6.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GNOME2_EAUTORECONF="yes" -inherit gnome2 multilib - -DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures" -HOMEPAGE="https://www.cogl3d.org/" - -LICENSE="MIT BSD" -SLOT="1.0/20" # subslot = .so version - -# doc and profile disable for now due to bugs #484750 and #483332 -IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile -REQUIRED_USE=" - wayland? ( gles2 ) - || ( gles2 opengl ) -" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" - -COMMON_DEPEND=" - >=dev-libs/glib-2.32:2 - x11-libs/cairo:= - >=x11-libs/gdk-pixbuf-2:2 - x11-libs/libX11 - >=x11-libs/libXcomposite-0.4 - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-3 - >=x11-libs/libXrandr-1.2 - virtual/opengl - gles2? ( media-libs/mesa[gles2] ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 ) - introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) - kms? ( - 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] ) -" -# before clutter-1.7, cogl was part of clutter -RDEPEND="${COMMON_DEPEND} - ! -Date: Tue, 29 Oct 2019 18:17:51 +0300 -Subject: [PATCH] Fix building against libglvnd-provided EGL headers - -Add missing EGL/eglmesaext.h include. When building against mesa-provided -headers, this header is included indirectly via EGL/eglext.h. - -Also fix typo COGL_EGL_INCLUDE -> COGL_EGL_INCLUDES ---- - configure.ac | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index da188edd..b0b0c94d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -670,10 +670,15 @@ AS_IF([test "x$enable_gles1" = "xyes"], - AC_SUBST([COGL_EGL_INCLUDES]) - - AC_CHECK_HEADERS([EGL/eglext.h], -- [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE -+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES - #include "], - [], - [$COGL_EGL_INCLUDES]) -+ AC_CHECK_HEADERS([EGL/eglmesaext.h], -+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES -+#include "], -+ [], -+ [$COGL_EGL_INCLUDES]) - - # Check for a GLES 1.x Common Profile library with/without EGL. - # -@@ -1178,6 +1183,12 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], - [], - [AC_MSG_ERROR([Unable to locate required EGL headers])], - [#include ]) -+ AC_CHECK_HEADERS( -+ [EGL/eglmesaext.h], -+ [], -+ [AC_MSG_ERROR([Unable to locate required EGL headers])], -+ [#include -+#include ]) - - AC_CHECK_LIB(EGL, [eglInitialize], - [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], -@@ -1188,7 +1199,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], - ) - - COGL_EGL_INCLUDES="#include --#include " -+#include -+#include " - AC_SUBST([COGL_EGL_INCLUDES]) - ]) - --- -2.22.0 - diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest index 836581e0f568..c6e6d7049466 100644 --- a/media-libs/coin/Manifest +++ b/media-libs/coin/Manifest @@ -1,17 +1,9 @@ -AUX coin-3.1.0-javascript.patch 1259 BLAKE2B abf0edc35ad7e8f31da5d952d8c75cd9c465b421beec14ee454ee295961a40a54430bcf6a23b39079fe93bc5d53dd2b30574455545a23c4b5c098ca7490e6d45 SHA512 4b7142dae7f463616b695058b6deeac9a6d116a4647430fb6b234b30915ed5fea5d657ee49a8af553c5a946d8a04c93a5cbf98cb92fa10080c1b72ff8ac8b895 -AUX coin-3.1.3-freetype251.patch 767 BLAKE2B ff0fef5f0c91f0ae9f803f363bb6777d4f8b19510bb23b7ed2635ecd9b765532377351ed28163d8184b8c827f8d0ea54168ca05c49d1564b2f26c4b9166fc0af SHA512 f8ea66a6a21c3b20b221b4b7830feb411295e5207d0f5419183c85bfd8ae52b923f2b202f070482f1c61d4acb86b1f74d4a1ee77b09f6b86d95602db4e2c2406 -AUX coin-3.1.3-gcc-4.7.patch 347 BLAKE2B 4129b651164fd35e18469143c0728e67456ecdc04fc54899d5084212c125ff753a6240ce9e05936dc00934f76bdcd2f60607f3cbd7a6f3114616a2c947a624c5 SHA512 d6f93526203a5c2f787cb03ea34214921daf49e324f867745d6bdc1c24c78359c305396d86cdbf8590b7f1610ef558390b6aba6c488052435896f089ea71d590 -AUX coin-3.1.3-gcc-7.patch 575 BLAKE2B 5bdb1d8c2b6c63cba4224506199e26bb91d47feda853903a8461929e12ef32b13395cb78926ddac86bf25ca740ab67ac66f37a085e041272a8e520916c21b8da SHA512 c4ea88ce111dd7dba1d8b1dd30cf325e91d5617540c5cbcdbe2be95e892641015071dc61830307188cfc16ecbdf58e89129b93621e0dd43ae05f7ad754df7b53 -AUX coin-3.1.3-memhandler-initialization.patch 906 BLAKE2B 421dea48d77870d324fa333bac19c6e00ad7ca576929bf029bd9b0be193462adb23cbadaf71d96fd30025db3780408a294db2d9ae3a52232798b677dd8e62c46 SHA512 f67c7179b1a023a938a55d82cfb1c18ffabc7586211e8e89a4fb4f8a4925f9c98240fffaa9c8dc46febd528e0d0b91607a417f290c0e0c06adbafb171ba1bf6b -AUX coin-3.1.3-pkgconfig-partial.patch 431 BLAKE2B af57c0a4ec1985351db67f8f8f1d978c9ec3765e5d0d6e304e479314be3cc5cd48212094f87d8126ce84143a671fc7e000081cd0b38d149633515f121ce5f16d SHA512 6747ed14dca25017b6126ee2e542bec8cdf36cc634a8f0df059715f022a5f6c6f7126b9ea3c01e099a5564c634921fdc829c7561754df8c2dbf915659c7edb53 AUX coin-4.0.0-0001-updated-to-cmake-3.14.patch 626 BLAKE2B e6cd00a2f848f9d43d57e615d5c08e273b82e49f26b5a977457305fb254ce00a1b052e29ffed5656861ecec2581da306b66ff5727bf70cb46c63ff1baf1c8e6c SHA512 214be84a016c2625ab43b1948efee36986bf9186b69ec3bec014280a009ff22742b627f8a041b9293d3d7bdacf7b7070b3c5f0742f9739c19b193d0ea6b837d9 AUX coin-4.0.0-0002-cpack.d-is-now-optional.patch 1388 BLAKE2B 8a9665f3719e7bb4072d75b54e5aa119bdf2ae12c0ca814213fc1ee1364bf2cca0658ef19ff0f22b2661cda4286a251384c559b945613b29ae6ce41b2706929b SHA512 e1655f5d8a0d07c5b91c2c7404834295b40a12c176bea1a386e00a8dea7d1170507f9c209231023c87d560688e4ac8ccd1ee7bf8ea1a80ebbd881f2c88efb1e7 AUX coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch 3695 BLAKE2B e83118489349d7bbd0048fbbb2515be1b5ffdd8556bb951f44f2689c4616c12991efd6fba230c4372bf634f58d6e2c9e91e3794a2e4f2abff54eb3ddd1841551 SHA512 eccb82613f5801025ee7c63e3482ee5cf90fe3bfebf8b3481e423e22c8a8f3a121f0f4c679127e2ad40cb657d62c857c9956d4175c02a401a58cd3fb42789ee8 AUX coin-4.0.0-0004-Added-coin-default.cfg.patch 2531 BLAKE2B a0682e9dfaa36412109fe12a8a81381915e71da73582c397b7eb2795ddad6fe706a3c0f2e5e4d02114adbf8d31bac88b6509bcdc96423b59c8d4e5168c158814 SHA512 ed9543421f62f0ebe53ffe819cc7381316215231ab9675f7867f633ed79c47df4d37d4ba35283b55fc6d621f6c65040e9eee0cb19e7708d0653b0e56e4bede55 AUX coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch 1394 BLAKE2B 40b43a0cce0ab3e3e40723e1ac2c68185b4f10c38a3514e02d18c6ee1232b3116e1b89e6ff2cda3aa5f14eefcbc636f4b83c84d896fa485c416362e72e793bc4 SHA512 0cc392f908b044639bef3fcb960fe398ae045aba72c670b22ca48cba9c754c4a35746888fc7ee2938bb5e0309fc0104e8fe1379175886e438b00410c8f5c3a16 AUX coin-4.0.0-0006-Fix-underlinking-against-X11.patch 827 BLAKE2B 33aaa8281fc260bb382875a0b41eac83d8099e52709e93a523ba4b048e1f9ab92c1a17cb09e1c5dd091c90878c373ef973c380211f856b32581f97992a8cc83e SHA512 37709b1a853287245b0778297154a8ea15ed86d60558af541ccd60fb0ee369c296947964080bff790595030c8e41964e008b0983bcbf5146d3c5ac81756ff622 -DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394 DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae -EBUILD coin-3.1.3-r2.ebuild 2518 BLAKE2B 9652bab68031e7b0311861812b6cdf47eab72173971963f1e9b15613b1f9df0a55a2f3e8c262106e9d8fdbe87d893d6cb86e065b290d00cfed0f827905795724 SHA512 56a8baace6f1ce77bd17e1da422f096ad968a78827bd0c5c7ec3ad711a000ffe5a91192ebcdc639e3517ff5c0993c3a252d8e15455ba6f163bf33f6a4f428cea -EBUILD coin-4.0.0.ebuild 2767 BLAKE2B 5d9edb1e24187d734e861b5a1ec300d268ec2daf0daa696c9e4028c5c75d052de64db5c72e0dd479b01c02d0cfd23bcd5825b1cb81af7cb4bd7c7e319265611f SHA512 120cea13580b7e3bc54e65cbffef911761ff55ba1e4e2974a073d83584825ea06c2c75e19ecbdeeb53c794a1b5ae1e00068112b74449c3bac304662371996ff8 -MISC metadata.xml 602 BLAKE2B e4f425e15a7cf6879fc709f5cf27abddcc195b824e1158297e529a2fdb2080ff555a90832b5b287c43d73aa038d0d89c62c9f8df2a3e0ebce3c2024f2e5c3126 SHA512 d551b68c2b3f192475ee7fa187e9ab6f6bca52ec3b8c1b58901ea49a61d51ef5680d3b29d784e4c43a8b5fabeb904bdd8582ce32a0055b2420aa9c994299c142 +EBUILD coin-4.0.0.ebuild 2763 BLAKE2B 50e79002571255b544aa0e69151ed5b7e86fc916f6c4ba5f500aa2ad3a006817017ef2fe85653d801fc6a8927ca386664a9807f8a52636c501b4bf09ca00e0ce SHA512 68be6c6a83e9ca4b6f5b644d8744b88b28ce5d81801652f90ff0e5067c8c2f7715bdef818557b41ede049d9adf0d5f9ca51e8253f996723244c1d60a9fc6bb10 +MISC metadata.xml 511 BLAKE2B 0efdd7dbb4a2bbc64ba41ae5ef9da8b09b448bfdf895d86623b219bdaed02b973483e68c52933728f023695c8d26a0bfab41f40ea7d278781b55904dc50777d5 SHA512 549388ebbc1b58b66025dbce92805952de633ac4db11cd9ca7a5416671b18a2fbe7aa71a1e1f02bf2d9da4e81e4c7cb132741e28f91424f330007e2e4f16e252 diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild deleted file mode 100644 index 6e2dfe73f617..000000000000 --- a/media-libs/coin/coin-3.1.3-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-utils flag-o-matic - -MY_P=${P/c/C} - -DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1" -HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home" -SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${MY_P}.tar.gz" - -LICENSE="|| ( GPL-2 PEL )" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="bzip2 debug doc javascript openal simage static-libs threads zlib" - -# NOTE: expat is not really needed as --enable-system-expat is broken -RDEPEND=" - dev-libs/expat - media-libs/fontconfig - media-libs/freetype:2 - virtual/opengl - virtual/glu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - bzip2? ( app-arch/bzip2 ) - javascript? ( dev-lang/spidermonkey:0 ) - openal? ( media-libs/openal ) - simage? ( media-libs/simage ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-doc/doxygen ) -" -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-javascript.patch - "${FILESDIR}"/${P}-pkgconfig-partial.patch - "${FILESDIR}"/${P}-gcc-4.7.patch - "${FILESDIR}"/${P}-freetype251.patch - "${FILESDIR}"/${P}-memhandler-initialization.patch - "${FILESDIR}"/${P}-gcc-7.patch -) - -DOCS=( - AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS - docs/{ChangeLog.v${PV},HACKING,oiki-launch.txt} -) - -src_configure() { - append-cppflags -I"${EPREFIX}/usr/include/freetype2" - # Prefer link-time linking over dlopen - local myeconfargs=( - htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - --disable-dl-fontconfig - --disable-dl-freetype - --disable-dl-libbzip2 - --disable-dl-openal - --disable-dl-simage - --disable-dl-zlib - --disable-dyld - --disable-loadlibrary - --disable-man - --disable-java-wrapper - --enable-3ds-import - --enable-compact - --enable-dl-glu - --enable-dl-spidermonkey - --enable-system-expat - --includedir="${EPREFIX}/usr/include/${PN}" - --with-fontconfig - --with-freetype - $(use_with bzip2) - $(use_enable debug) - $(use_enable debug symbols) - $(use_enable doc html) - $(use_enable javascript javascript-api) - $(use_with javascript spidermonkey) - $(use_enable openal sound) - $(use_with openal) - $(use_with simage) - $(use_enable threads threadsafe) - $(use_with zlib) - ) - autotools-utils_src_configure -} - -src_install() { - # Remove Coin from Libs.private - sed -e '/Libs.private/s/ -lCoin//' -i "${BUILD_DIR}"/Coin.pc || die - - autotools-utils_src_install -} diff --git a/media-libs/coin/coin-4.0.0.ebuild b/media-libs/coin/coin-4.0.0.ebuild index 3a0b364937cc..c67bb1304313 100644 --- a/media-libs/coin/coin-4.0.0.ebuild +++ b/media-libs/coin/coin-4.0.0.ebuild @@ -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 ~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/coin/files/coin-3.1.0-javascript.patch b/media-libs/coin/files/coin-3.1.0-javascript.patch deleted file mode 100644 index f45d9cd78cf6..000000000000 --- a/media-libs/coin/files/coin-3.1.0-javascript.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: src/vrml97/JS_VRMLClasses.h -=================================================================== ---- src/vrml97/JS_VRMLClasses.h (revision 13505) -+++ src/vrml97/JS_VRMLClasses.h (revision 13506) -@@ -28,6 +28,7 @@ - #error this is a private header file - #endif /* ! COIN_INTERNAL */ - -+#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT) - /* ********************************************************************** */ - - class SoJavaScriptEngine; -@@ -37,5 +38,6 @@ - void JS_addVRMLclasses(SoJavaScriptEngine * engine); - - /* ********************************************************************** */ -+#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT - - #endif /* !COIN_JS_VRMLCLASSES_H */ -Index: src/vrml97/JS_VRMLClasses.cpp -=================================================================== ---- src/vrml97/JS_VRMLClasses.cpp (revision 13505) -+++ src/vrml97/JS_VRMLClasses.cpp (revision 13506) -@@ -2,7 +2,7 @@ - #include "config.h" - #endif // HAVE_CONFIG_H - --#ifdef HAVE_VRML97 -+#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT) - - /**************************************************************************\ - * -@@ -2097,4 +2097,4 @@ - MFVec3dHandler::jsval2field); - } - --#endif // HAVE_VRML97 -+#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT diff --git a/media-libs/coin/files/coin-3.1.3-freetype251.patch b/media-libs/coin/files/coin-3.1.3-freetype251.patch deleted file mode 100644 index 44e8eefb1f63..000000000000 --- a/media-libs/coin/files/coin-3.1.3-freetype251.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Coin-3.1.3/src/glue/freetype.cpp -+++ Coin-3.1.3/src/glue/freetype.cpp -@@ -52,9 +52,9 @@ - #ifdef HAVE_FREETYPE /* In case we're _not_ doing runtime linking. */ - #define FREETYPEGLUE_ASSUME_FREETYPE 1 - #include --#include --#include --#include -+#include FT_FREETYPE_H -+#include FT_GLYPH_H -+#include FT_OUTLINE_H - #endif /* FREETYPEGLUE_ASSUME_FREETYPE */ - - #include ---- Coin-3.1.3/src/glue/freetype.h -+++ Coin-3.1.3/src/glue/freetype.h -@@ -87,8 +87,8 @@ - - #ifdef HAVE_FREETYPE - #include --#include --#include -+#include FT_FREETYPE_H -+#include FT_GLYPH_H - #else /* HAVE_FREETYPE */ - - #include diff --git a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch b/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch deleted file mode 100644 index fd2430903802..000000000000 --- a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- coin3-3.1.3.orig/include/Inventor/SbBasic.h -+++ coin3-3.1.3/include/Inventor/SbBasic.h -@@ -24,6 +24,7 @@ - * - \**************************************************************************/ - -+#include - #include - - /* ********************************************************************** */ diff --git a/media-libs/coin/files/coin-3.1.3-gcc-7.patch b/media-libs/coin/files/coin-3.1.3-gcc-7.patch deleted file mode 100644 index c1f1f560d851..000000000000 --- a/media-libs/coin/files/coin-3.1.3-gcc-7.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN Coin-3.1.3.orig/src/3ds/SoStream.cpp Coin-3.1.3/src/3ds/SoStream.cpp ---- Coin-3.1.3.orig/src/3ds/SoStream.cpp 2010-03-02 16:20:09.000000000 +0300 -+++ Coin-3.1.3/src/3ds/SoStream.cpp 2017-07-23 15:04:43.808204691 +0300 -@@ -176,7 +176,7 @@ - if (!gotNum) { setBadBit(); return FALSE; } \ - \ - char *ce; \ -- s = '\0'; \ -+ s = NULL; \ - _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \ - \ - if (ce != s) \ -@@ -273,7 +273,7 @@ - gotAll: \ - \ - char *ce; \ -- s = '\0'; \ -+ s = NULL; \ - double tempVal = _convertFunc_(buf, &ce); \ - \ - if (ce != s) \ diff --git a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch b/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch deleted file mode 100644 index 892882b6a3db..000000000000 --- a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch +++ /dev/null @@ -1,23 +0,0 @@ -Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378 -Patch http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/tree/0012-memhandler-initialization.patch?id=ca89ec7227943bdec800ee51b920f578fab87b05 - ---- a/src/misc/SbHash.h -+++ b/src/misc/SbHash.h -@@ -89,6 +89,8 @@ - cc_memalloc_deallocate(entry->memhandler, ptr); - } - SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {} -+ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler) -+ : key(key), obj(obj), memhandler(memhandler) {} - - Key key; - Type obj; -@@ -218,7 +220,7 @@ - /* Key not already in the hash table; insert a new - * entry as the first element in the bucket - */ -- entry = new (this->memhandler) SbHashEntry(key, obj); -+ entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); - entry->next = this->buckets[i]; - this->buckets[i] = entry; - diff --git a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch deleted file mode 100644 index 3fd3bca726d4..000000000000 --- a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru ../Coin-3.1.3/Coin.pc.in ./Coin.pc.in ---- Coin.pc.in 2010-03-02 14:20:09.000000000 +0100 -+++ Coin.pc.in 2010-06-28 19:27:59.634534460 +0200 -@@ -10,7 +10,8 @@ - Version: @COIN_VERSION@ - Requires: - Conflicts: --Libs: -L${libdir} @COIN_EXTRA_LDFLAGS@ @COIN_EXTRA_LIBS@ -+Libs: -L${libdir} -lCoin -+Libs.private: -L${libdir} @COIN_EXTRA_LIBS@ - Cflags: -I${includedir} @COIN_EXTRA_CFLAGS@ @COIN_EXTRA_CPPFLAGS@ - - coin_host=@host@ diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml index 11c05aeb8175..f76f33813aaf 100644 --- a/media-libs/coin/metadata.xml +++ b/media-libs/coin/metadata.xml @@ -8,9 +8,8 @@ Compile with C++ exceptions Build and install man pages Build API documentation in QtHelp format - Texture loading via media-libs/simage library - Coin3D/coin + coin3d/coin diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest index 3a2ecb5ad484..c73a18c3c4ef 100644 --- a/media-libs/dav1d/Manifest +++ b/media-libs/dav1d/Manifest @@ -1,6 +1,10 @@ DIST dav1d-0.5.2.tar.bz2 554192 BLAKE2B 29305d0bb20a3de0048d102789fe1fdb1a030596213a1e2f025918ac6bb37c92c8c5f8078320487702ed66b16d4d63234823b5475d84bdea853b92e76be4c70e SHA512 37da9138a1dba68b9e723ba48b23eab567f839308132fc5a28727c131280f2eca3e160b074982f5265c914dcad0e4029af9ce23909b32bb9ec60f235c623e384 DIST dav1d-0.7.0.tar.bz2 613106 BLAKE2B e41dcf4c597da437c0840753eedb3d4c8c7e53494376128f7c0cabf9fe00038fbe676f093f4bce079233934c9f78def0b98b4f09a464c6bd162b7b2fb9f88410 SHA512 2ee1de4c29db6a5cbba0a1db669fb1143f3bae26595c4ea3f17c555fdccbaabc814b7af5caf738cf4dbffd22c690cfe869d33cd830533e24990679b7b9cb4b8b +DIST dav1d-0.7.1.tar.bz2 644556 BLAKE2B f3539d73b2731be882c71a0e8e90c4382282a650ff9e0aa2bb1142f59a823bbe00011e384c65ae86b8b617054a167b8c90b83d96591ad5c133b7de336c30c753 SHA512 7db0f2eb5f6cbf2809ffb9ebaa18bf1331df00dc6e9d571380b2524143ce3bfdd2e7df1a31e82a52640e7ac81b2712127a395e857d061118845011a1e5fb4751 +DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28 EBUILD dav1d-0.5.2.ebuild 1175 BLAKE2B 8be48906d6eb61ba878631fda7fd52868d936b7a662237d15ef0e0607223bdefaded31334536d4bf7d06e57ae4d784e44b3e2c7c6484076faefe28303ecff521 SHA512 8e4d96a829b824eb3ab63d391e63aabaf1685ce65bedd1a28e6984bf6322f7a77054b8317450378bfbc0c97da142d2c1daa03d0c5b46120844519942000873f8 -EBUILD dav1d-0.7.0.ebuild 1181 BLAKE2B e26b5781df9273443f32f8c913e8ad9254ab2eb70eef5fc302aef333a2477cba4f02b04dd7d3dfa9e355791b58bfdd59fae940dc640c4743959ca41699e884c6 SHA512 c08db9034f18ca6d6ccc830fdb499ae7818de86b430697bba337e9d4b18078f21306ef84cb06c58c86ac3db11b4f57acdd2d3d8d17b05323d752be0ae0e09e93 -EBUILD dav1d-9999.ebuild 1181 BLAKE2B 0e249792fe05fd2d7c9734b25f88e9116eccd34cfe5c959822070f9f5a2653fed974be6c2ebf7e579ff6eabf0c013237b2076b9297a9acde53e203d90a5d2db4 SHA512 6ee1ec6338b474090ba936710359a7e1fc97d78b52f0e6f2dc76dc8e392cb3f9c0bc202098d702dfe636f776f36aa5cd6818a81403268bf49a7398fa95b95f65 +EBUILD dav1d-0.7.0.ebuild 1175 BLAKE2B c22a14777ab513828543133397ee75aef8ffd765ffdd1b1c6ca90f21304727617e6689e4251e1ccd97db34c908c4ec981927634f9609c33db2d0486ed4960233 SHA512 1a0fd0605c5383d5a8d4094c3cf7e74d8fd369b2cbafba952c391655f20d23db5f513e4cee3597a92c432855911e4671a4efaf45dce750842bb7ee11fd8d9bec +EBUILD dav1d-0.7.1.ebuild 1178 BLAKE2B dc2fb3a87757ca83f674df994f28dfe3e9302eb022fd9eac7c3b70cccba844d3d0841a130a447827bfcdf972a1c5c44e2b12f49bbfb815a7ddf78254c783a09b SHA512 271625cacc2ef35b7bc3898ffa621fdb41165fd6ebe974b77d43a36451cb2c65a8e01d4b9f880c52b68122c6caee33dc22e44c3da9658a328ac1800f1f770250 +EBUILD dav1d-0.8.0.ebuild 1181 BLAKE2B 4438aac0f48b74545fae674b1a708e94d3c90e63e37195125f496b050b4c6f21bd52c06b5a743a1575d6f01fcf5feb34c4b371de536aa27f7dd85bd5066281ef SHA512 f7255074abf3124961d94a897413858ee8254343696902a7ec7dacad9c3fce368350ed061dc5b96c6ac3b3558dd9a3d789471f75c321298c1f8b3a472efb2c14 +EBUILD dav1d-9999.ebuild 1181 BLAKE2B 4438aac0f48b74545fae674b1a708e94d3c90e63e37195125f496b050b4c6f21bd52c06b5a743a1575d6f01fcf5feb34c4b371de536aa27f7dd85bd5066281ef SHA512 f7255074abf3124961d94a897413858ee8254343696902a7ec7dacad9c3fce368350ed061dc5b96c6ac3b3558dd9a3d789471f75c321298c1f8b3a472efb2c14 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6 diff --git a/media-libs/dav1d/dav1d-0.7.0.ebuild b/media-libs/dav1d/dav1d-0.7.0.ebuild index b5737f217f03..92d86ac5f998 100644 --- a/media-libs/dav1d/dav1d-0.7.0.ebuild +++ b/media-libs/dav1d/dav1d-0.7.0.ebuild @@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then SCM="git-r3" EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d" else - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86" SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2" fi diff --git a/media-libs/dav1d/dav1d-0.7.1.ebuild b/media-libs/dav1d/dav1d-0.7.1.ebuild new file mode 100644 index 000000000000..4517e90ea4af --- /dev/null +++ b/media-libs/dav1d/dav1d-0.7.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +SCM="" +if [[ "${PV}" == "9999" ]]; then + SCM="git-r3" + EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d" +else + KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86" + SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2" +fi + +inherit ${SCM} meson ninja-utils multilib-minimal + +DESCRIPTION="dav1d is an AV1 Decoder :)" +HOMEPAGE="https://code.videolan.org/videolan/dav1d" + +LICENSE="BSD-2" +SLOT="0/4" +IUSE="+8bit +10bit +asm" + +ASM_DEPEND=">=dev-lang/nasm-2.14.02" +BDEPEND="asm? ( + abi_x86_32? ( ${ASM_DEPEND} ) + abi_x86_64? ( ${ASM_DEPEND} ) + )" + +DOCS=( README.md doc/PATENTS THANKS.md ) + +multilib_src_configure() { + local -a bits=() + use 8bit && bits+=( 8 ) + use 10bit && bits+=( 16 ) + + local enable_asm + if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then + enable_asm=false + else + enable_asm=$(usex asm true false) + fi + + local emesonargs=( + -D bitdepths=$(IFS=,; echo "${bits[*]}") + -D enable_asm=${enable_asm} + ) + meson_src_configure +} + +multilib_src_compile() { + eninja +} + +multilib_src_install() { + DESTDIR="${D}" eninja install +} diff --git a/media-libs/dav1d/dav1d-0.8.0.ebuild b/media-libs/dav1d/dav1d-0.8.0.ebuild new file mode 100644 index 000000000000..abc2d61dfe39 --- /dev/null +++ b/media-libs/dav1d/dav1d-0.8.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +SCM="" +if [[ "${PV}" == "9999" ]]; then + SCM="git-r3" + EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d" +else + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2" +fi + +inherit ${SCM} meson ninja-utils multilib-minimal + +DESCRIPTION="dav1d is an AV1 Decoder :)" +HOMEPAGE="https://code.videolan.org/videolan/dav1d" + +LICENSE="BSD-2" +SLOT="0/5" +IUSE="+8bit +10bit +asm" + +ASM_DEPEND=">=dev-lang/nasm-2.14.02" +BDEPEND="asm? ( + abi_x86_32? ( ${ASM_DEPEND} ) + abi_x86_64? ( ${ASM_DEPEND} ) + )" + +DOCS=( README.md doc/PATENTS THANKS.md ) + +multilib_src_configure() { + local -a bits=() + use 8bit && bits+=( 8 ) + use 10bit && bits+=( 16 ) + + local enable_asm + if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then + enable_asm=false + else + enable_asm=$(usex asm true false) + fi + + local emesonargs=( + -D bitdepths=$(IFS=,; echo "${bits[*]}") + -D enable_asm=${enable_asm} + ) + meson_src_configure +} + +multilib_src_compile() { + eninja +} + +multilib_src_install() { + DESTDIR="${D}" eninja install +} diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild index df2296051be2..abc2d61dfe39 100644 --- a/media-libs/dav1d/dav1d-9999.ebuild +++ b/media-libs/dav1d/dav1d-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,10 +18,10 @@ DESCRIPTION="dav1d is an AV1 Decoder :)" HOMEPAGE="https://code.videolan.org/videolan/dav1d" LICENSE="BSD-2" -SLOT="0/4" +SLOT="0/5" IUSE="+8bit +10bit +asm" -ASM_DEPEND=">=dev-lang/nasm-2.13.02" +ASM_DEPEND=">=dev-lang/nasm-2.14.02" BDEPEND="asm? ( abi_x86_32? ( ${ASM_DEPEND} ) abi_x86_64? ( ${ASM_DEPEND} ) diff --git a/media-libs/elles_icc_profiles/Manifest b/media-libs/elles_icc_profiles/Manifest index db8fad26519b..0340fad79955 100644 --- a/media-libs/elles_icc_profiles/Manifest +++ b/media-libs/elles_icc_profiles/Manifest @@ -1,4 +1,3 @@ DIST elles_icc_profiles-20160501.0932.tar.gz 334145 BLAKE2B c2aa9b8720a83d9296e87e0dc56c18e34536a395d80412589d29a5d39bb36ea8c83929afdc1c36b335f3bff4b6d19b5793fd25b8ec45ca49ad159008a70e1f2e SHA512 10a3df45aadf923b2d7ff9c8ee906b000e70ad7d17c1a5005f889b49c6d57849c8befb5c4ed92748908bd5506789b6877c0504666de43c1a8621f646ab665e2f -EBUILD elles_icc_profiles-20160501.0932-r1.ebuild 563 BLAKE2B 4d3dfd1d174d13f26b0c83046b5a72ce8447e7f0f6a1a6f15ca6a3f8091838754d777c49b1c15be60b1939904bd038f99b8d1426d7911d74efc404892be8908a SHA512 bd95b81d20c0370bccc487caea1fad123805792fd6f65eda85b1bdf26a2aa1b009d44b75d117c41cc674c93c07a05bffa47d628612020eea49140d1be27fe7b4 -EBUILD elles_icc_profiles-20160501.0932.ebuild 602 BLAKE2B 621f166dd3794d617eefd0951f508165d38a537253ffda500d451f1a53e6f4af89f1cb4582593a2242f47f5804874aaf31e21015b2d55cfcf42625697037b8e4 SHA512 68d4b89721bfb257bfb2bd403e0876ce79eb9aad49adf2ae938dea6f894131092d514db7f7614702d721585104c457724ab44575682f43d859ab053574effec4 +EBUILD elles_icc_profiles-20160501.0932-r1.ebuild 559 BLAKE2B 473ef32b6561276e8432848f52cef71fc5bfc2087eb77a5757bfe8041ba19e740a07c9c8291c4dabf8010e924564e2a1a6d78a2feb93fe7701dc42e1267d750c SHA512 5f594d399dcafdcba8e8dc7666fe7c6061e3420ae00cfa1682b070432f25094afb780e2f08e780821388ed1542587a5f84b7e80fc2e7c4de4c8f455c99b312dc MISC metadata.xml 1155 BLAKE2B 7d65efd6ec703153a72426b810abb5ea5a2d2f705f2c2971f8196c0591726f5919ca293e82b5f230ce5d994569950249f6cc044714fd50bdb71eadc0a6343c1e SHA512 3ab1772a6f2e06380dbd61e10926dda5ca7c80f1ae28cbf6e0f62e546c343eb8d9661bd6570c575b6f70cc83ea93e7df009a13eb4cecca4fcc63d4540bad37ae diff --git a/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild b/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild index 98945f5fd3bd..109d626eb166 100644 --- a/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild +++ b/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/ellelstone/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" S="${WORKDIR}/${MY_P}" diff --git a/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932.ebuild b/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932.ebuild deleted file mode 100644 index 1e0e9380686c..000000000000 --- a/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -MY_PV="$(replace_version_separator 1 '-')EST" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Elle Stone's well-behaved RGB and grey ICC profiles" -HOMEPAGE="https://ninedegreesbelow.com/photography/lcms-make-icc-profiles.html" -SRC_URI="https://github.com/ellelstone/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64" - -S="${WORKDIR}/${MY_P}" - -src_install() { - default - - insinto /usr/share/color/icc/ellestone - doins profiles/*.icc -} diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest index 26fa177e0332..4783da0edce3 100644 --- a/media-libs/exiftool/Manifest +++ b/media-libs/exiftool/Manifest @@ -1,5 +1,5 @@ -DIST Image-ExifTool-12.01.tar.gz 4818413 BLAKE2B 4ba648e89b3492a0781b8ba67514e94f3152174fde7c410e4783377ccc8ab2498cea00da60bfc18acf691ef8c3984577a8b3a680b4db4811555060e62059c549 SHA512 1dcb6c69ba804655d0fd8d5beb5001c2cef9950fda1d66098f4a0b1cea449b5d5e35f58858626d6e947444894eb3c415ae7ef8522c8e749c766f5cd3e3f05306 DIST Image-ExifTool-12.05.tar.gz 4836500 BLAKE2B 92219a9d808bd075ae3bb9c98f519cc183cfb6513724a8a8c9d914822cfcc6d1aaf56ef06887c60f5153aee758bafadbaf5ccaead1d296f916cb2e34ce5e8c33 SHA512 0d36e3a9dd96378ac5951779a16b194cabf3cd52197ee916ff56c2a8f2a4c00392845d9675eaad1f3f08c2ba669d8802ad7bbbe754e649ac1bba315d8fbb04a4 -EBUILD exiftool-12.01.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0 -EBUILD exiftool-12.05.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01 +DIST Image-ExifTool-12.08.tar.gz 4842868 BLAKE2B 0ad8228f5b40bf51f1e29e4676ecd012de2dec6229452f7655adb543d44e59825a21311f2d09ece5190fdda06b21fbd8cc6a697b164cf6aae94c401d082459e1 SHA512 66e445fe1aca640d4b984cfacb4972f2bc64bcab61dbb014a0486a7d04612ecbd249a2691bcff704957c93467533b383c53883bb409a2064bb8c839ae7c2d4a5 +EBUILD exiftool-12.05.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0 +EBUILD exiftool-12.08.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01 MISC metadata.xml 10039 BLAKE2B da44aad7d46d49683f89fa75db8c92230b9088cd14a5c8715a9f3a982843d8a348393f1bd10bdcc08d5d6dc4e5f2fbf0fdd517ce88df2180807796fbd5c06b32 SHA512 c4647e7055ffcae7226aa2bdff458576cc0fef14f6d782a16695902f4af96740a96f0388398eafbdca22ee76a0c808c81dafc2ccc583f8218c718f69c8fd0da9 diff --git a/media-libs/exiftool/exiftool-12.01.ebuild b/media-libs/exiftool/exiftool-12.01.ebuild deleted file mode 100644 index 556e4d04a9d2..000000000000 --- a/media-libs/exiftool/exiftool-12.01.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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_TEST="do" - -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/exiftool/exiftool-12.05.ebuild b/media-libs/exiftool/exiftool-12.05.ebuild index 58ee12770a1c..556e4d04a9d2 100644 --- a/media-libs/exiftool/exiftool-12.05.ebuild +++ b/media-libs/exiftool/exiftool-12.05.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/" SRC_URI="https://exiftool.org/${DIST_P}.tar.gz" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos" +KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos" IUSE="doc" SRC_TEST="do" diff --git a/media-libs/exiftool/exiftool-12.08.ebuild b/media-libs/exiftool/exiftool-12.08.ebuild new file mode 100644 index 000000000000..58ee12770a1c --- /dev/null +++ b/media-libs/exiftool/exiftool-12.08.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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_TEST="do" + +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/faad2/Manifest b/media-libs/faad2/Manifest index 9613869f7c83..6f3fd268536f 100644 --- a/media-libs/faad2/Manifest +++ b/media-libs/faad2/Manifest @@ -1,5 +1,7 @@ +DIST faad2-2.10.0.tar.gz 803225 BLAKE2B 73ecbcbb3fce93e8ceb88f6f7669bb681d2329935018cc2a23929cf6672959a0678b47c830cfdcf8e716709ce5252a02178737a7af09de373f7c8b54f38f3d9d SHA512 92c8b5e79f85b7a7caac9e7954959c26d74ef148a658dcb37e2c1b303fc2fcc5a0d12f21e7bd476870498109bdd03916a56c13f578186a69d6eceb103222e771 DIST faad2-2.9.0.tar.gz 802390 BLAKE2B 8cd68f96a48fefcc4d75901ae67607ec4cc4c4a76efae490dcfb3330b384ff91049894af9fccae0b41ca9fd4ef22cdff35c36f11cea1baab4cc96fe1e54749ae SHA512 1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc DIST faad2-2.9.2.tar.gz 803100 BLAKE2B 093c629b81d976db760f02dc7945ae8caee66e2dc6d859499696e4978d4832c9592c2868bed575a39c778fd62f0b74fe5ee3a17b6ab22ec5c148b0dbcd7946c8 SHA512 996c279a56c6abde13da964b91d4ff87ac4c611e889f1dd59882fa3898093dec68ab0714cf106db10a5e24952e2d6dddc049ec9bf4f07ff68378a705d5debee2 +EBUILD faad2-2.10.0.ebuild 1174 BLAKE2B cd3eb9cd8c8e1fce5c72fde2bb0791dcd1e779a682f573e6df8c66cd0fc08e6efe91fed76f781c2fb0da173ea87cdb548fe6d2d8d2b5fd439d6198ab7ca119cb SHA512 1d76863099b6103571aa1cf2f112ec3a678cea54594348bb0da78dca76d3118fe0c78c0e0f00af3a18f041b98ec6de1f58be7d17b0c9d6028a1894f062701a6f EBUILD faad2-2.9.0.ebuild 1238 BLAKE2B 92be2a701af77f07abbbcd765080f2f8e823153cb9fda5f2e019691c818e2320f062de5bf5f429cc7bf34aca3d59d66fe7baa1aa940ec349e2b9f79e3cb725ce SHA512 3d78a589987f0e3e3c9b996cbc1eb23584975249862e55f1943ceb0c59af3c6e4a606500716fad32d52e58a4871137fd97277e50999abff48bf32f409e8d2cf7 EBUILD faad2-2.9.2.ebuild 1174 BLAKE2B cd3eb9cd8c8e1fce5c72fde2bb0791dcd1e779a682f573e6df8c66cd0fc08e6efe91fed76f781c2fb0da173ea87cdb548fe6d2d8d2b5fd439d6198ab7ca119cb SHA512 1d76863099b6103571aa1cf2f112ec3a678cea54594348bb0da78dca76d3118fe0c78c0e0f00af3a18f041b98ec6de1f58be7d17b0c9d6028a1894f062701a6f MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd diff --git a/media-libs/faad2/faad2-2.10.0.ebuild b/media-libs/faad2/faad2-2.10.0.ebuild new file mode 100644 index 000000000000..4c6a8bef3075 --- /dev/null +++ b/media-libs/faad2/faad2-2.10.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +MY_PV="$(ver_rs 1- _)" + +DESCRIPTION="AAC audio decoding library" +HOMEPAGE="https://www.audiocoding.com/faad2.html" +SRC_URI="https://github.com/knik0/faad2/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="digitalradio static-libs" + +RDEPEND="" +DEPEND="" + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + default + + sed -i -e 's:iquote :I:' libfaad/Makefile.am || die + + eautoreconf +} + +multilib_src_configure() { + local myconf=( + --without-xmms + $(use_with digitalradio drm) + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + # do not build the frontend for non default abis + if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then + sed -i -e 's/frontend//' Makefile || die + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die + einstalldocs +} diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 9f6319e9fbfd..fad5e1b198a7 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -11,5 +11,5 @@ DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100 EBUILD fontconfig-2.12.6.ebuild 4887 BLAKE2B 345eb589656f00006527680240e19666e509d840c27dd1d84f5ccd1767c0ab36077f3c3eef8d0d332c23ee2a71a1593d526e162f5a6a366196bda7ae6e3a04a8 SHA512 ff4c3186c81f614de2882f4792844ffdb6b94a3cd8342fd058c3dcca2382f2dcf64450801079383eab6f145e45b8475e491794e5574e030b0bf5dc4cad93556a EBUILD fontconfig-2.13.0-r4.ebuild 5166 BLAKE2B a26fa62a00f519500c02e3972c9718978e163b6b27eb67c8c8ba2fbaeaa460c870ce21cc55989e29e8fd928934ff89802a65e6bda1f774faf1566072cf22670f SHA512 751d7456a010a26002ee4749cae2eb95c00476fe3916953b577d9bb75acd68632f5e65c4c51b44ce6de6ea9be4c0f93940898e63bce25f84039ddda430ca4a6f -EBUILD fontconfig-2.13.1-r2.ebuild 5234 BLAKE2B 408968ee4421f420b687a1d68a38897ce797fe9d361d41df01af4dd1340f7846ec9555f6b2eaeb608554730e484960f34ab7237f34e958fc052c7bafaeab4621 SHA512 435fa05ce82eb0cd392830662eea6f88a4ed7dc82b455a3a69d37047df645bbde9605dfa1a1a33aee5b26520cfb705ea5a52622dc5f6e54654e9042cf0a0525a +EBUILD fontconfig-2.13.1-r2.ebuild 5630 BLAKE2B 4c19e881acc48212c9c81310d8af0275e16d79365ccddf981f0fb201638eaaaee984f0863876e357adc48f34c2643c6c9e1e1ce4d449183acdd8ed44c6bba3a9 SHA512 025bb4ee25068ef3e3a15184196029f38e2ca65e5eb4e85ed9ff8385d3aa77e9c2d74ed8a28ea97693cf2d259c67e7de2cf93865978d0e5c5a570359bb3d40df MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324 diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild index 8ccc0a909943..70a15b893a0f 100644 --- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild +++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild @@ -12,9 +12,19 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2" LICENSE="MIT" SLOT="1.0" [[ $(ver_cut 3) -ge 90 ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="doc static-libs" +# Test test-bz106632 is known to be broken, see bug #751232 +# and would require several backports. It will be fixed in +# next version. +# check-missing-doc is known to be broken, see bug #733608 +# because fontconfig-2.13.1-static_build.patch introduces a +# function FcStrBuildFilename which is lacking documentation. +# However, backporting isn't worth it. Will be fixed in +# next version. +RESTRICT="test" + BDEPEND="dev-util/gperf >=sys-devel/gettext-0.19.8 virtual/pkgconfig diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest index e50cf0a1e8e3..0f0951eb121a 100644 --- a/media-libs/freeimage/Manifest +++ b/media-libs/freeimage/Manifest @@ -4,9 +4,9 @@ AUX freeimage-3.18.0-libjpeg9.patch 520 BLAKE2B 4788a3c4c209568df7176ed7b2699f9c AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1 AUX freeimage-3.18.0-remove-jpeg-transform.patch 3392 BLAKE2B d82f5723aaff66a995ec4d748a8bc988a18ef149e525d108b458971dc3ae7278e9f0d65527576b6ebcd54b403d296810e19cc2d808397a8aa3558a13bd296331 SHA512 071b5dc814020db19d41527f2f6fe89f2a3a1340d5825c204ea3fa496d4d1c3075bdd006fa041b0a819892d5b01f1b9b32ed8827e9a180ef9bbe92bf2554a67e AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b89614c4fe3e7e37891c8ce0cc296b8e05300cd88b789e1a6551cb78761a58446f1a16d0d59af6ea05fcf73defd898fe99e6b12e6cde9de6bd7606edc SHA512 4c18f02f750c47796a718f579ae3bfda91354eba4ba991f4df9d71a09ead04e13087bcd1423374c359a39b98c729a38466e464b46d7cd1af15e9e4aadd72a3b4 -AUX freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818 -EBUILD freeimage-3.18.0-r1.ebuild 2972 BLAKE2B be0c69f23fc61d60b0587e1acb9be99d6b59028f98c03da37825a19a0ad15a20271550f15a1ab2b55b6df6c2dffeb2a993896f6b4b63e2831a5e31fff1b54e96 SHA512 3d55e13976038b63109c39dcee4bdd34a8b78dd9db98a3b07b1f90095a5a875bd1b047230a03b7364a0b2669f896956ae130bca93f663270d940345ae283d8dd -EBUILD freeimage-3.18.0-r2.ebuild 3038 BLAKE2B b7f954a18acbcdb728cb8bfdf734cb6ac294774412f4a98684e8007d01b817608f668a9b7697e4a99d1bdd77377502411fe70d28aa096176978de501e38ac946 SHA512 d7dd2c679c9890086f8ad29b7e1432b08f393a2ec6f34bf579764867f1d5624c5765bfd68ffc371c64341c5e35c7f5cb1bc1f50d591f683d81abe9153bd27484 +DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30 +EBUILD freeimage-3.18.0-r1.ebuild 3052 BLAKE2B a013e1053090f810136410e9bcadbe09d5610cf6896160fc4cbe00223adf0e386c8f294c70848f4c7da4194e8ffa5c766393bd8bb76a956cfe9aa3f5997ad96a SHA512 3b587b0c14a81c752f7c5f669aaf2f32ac077a72e98a957b3bce7458ddb6ad5d4fc3ae189224bddae1739e9cd103b0c1bbeafd01d6ec2b22564fdc77509e747e +EBUILD freeimage-3.18.0-r2.ebuild 3118 BLAKE2B 935dc4697e66fbc10ce178dab9971ef17bfc565c54d74e2ed56dd748bf88db519e95a5d61d5effba914f53b2a34b814e4ee5f0484711bae5c9f7ae1801898e06 SHA512 918d059e44653da0c6f040c8fee0e6bbf84791689a1b8e0922170b22ed5eaa74fe8be1a92981f86d6fc468ba9bccf8d261d9e236a446d98fcc0ce1d85f4da6e1 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c diff --git a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch deleted file mode 100644 index ab2e0341b324..000000000000 --- a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch +++ /dev/null @@ -1,724 +0,0 @@ -From 03a713e62529d1bcb45aedf767c7cb33ddd6e1a7 Mon Sep 17 00:00:00 2001 -From: Patrick Nicolas -Date: Tue, 13 Nov 2018 19:40:58 +0100 -Subject: [PATCH 1/4] unbundling - -diff --git a/Makefile.fip b/Makefile.fip -index b59c419..c6b82bb 100644 ---- a/Makefile.fip -+++ b/Makefile.fip -@@ -11,7 +11,26 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib - # Converts cr/lf to just lf - DOS2UNIX = dos2unix - --LIBRARIES = -lstdc++ -+PKG_CONFIG ?= pkg-config -+ -+USE_EXR ?= yes -+USE_JPEG ?= yes -+USE_JPEG2K ?= yes -+USE_MNG ?= yes -+USE_PNG ?= yes -+USE_TIFF ?= yes -+USE_RAW ?= yes -+USE_WEBP ?= yes -+ -+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib) -+LIBRARIES-$(USE_EXR) += $(shell $(PKG_CONFIG) --libs OpenEXR) -+LIBRARIES-$(USE_JPEG) += -ljpeg -+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2) -+LIBRARIES-$(USE_MNG) += -lmng -+LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng) -+LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase) -+LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw) -+LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux) - - MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) -@@ -68,16 +87,18 @@ $(STATICLIB): $(MODULES) - $(AR) r $@ $(MODULES) - - $(SHAREDLIB): $(MODULES) -- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) -+ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes) - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 $(HEADER) $(INCDIR) -+ install -m 644 $(HEADERFIP) $(INCDIR) -+ifneq ($(STATICLIB),) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) -+endif -+ install -m 755 $(SHAREDLIB) $(INSTALLDIR) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) -- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) -+ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) - - clean: - rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) -diff --git a/Makefile.gnu b/Makefile.gnu -index 92f6358..345f0db 100644 ---- a/Makefile.gnu -+++ b/Makefile.gnu -@@ -11,7 +11,26 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib - # Converts cr/lf to just lf - DOS2UNIX = dos2unix - --LIBRARIES = -lstdc++ -+PKG_CONFIG ?= pkg-config -+ -+USE_EXR ?= yes -+USE_JPEG ?= yes -+USE_JPEG2K ?= yes -+USE_MNG ?= yes -+USE_PNG ?= yes -+USE_TIFF ?= yes -+USE_RAW ?= yes -+USE_WEBP ?= yes -+ -+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib) -+LIBRARIES-$(USE_EXR) += $(shell $(PKG_CONFIG) --libs OpenEXR) -+LIBRARIES-$(USE_JPEG) += -ljpeg -+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2) -+LIBRARIES-$(USE_MNG) += -lmng -+LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng) -+LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase) -+LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw) -+LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux) - - MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) -@@ -67,13 +86,15 @@ $(STATICLIB): $(MODULES) - $(AR) r $@ $(MODULES) - - $(SHAREDLIB): $(MODULES) -- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) -+ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes) - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 $(HEADER) $(INCDIR) -+ifneq ($(STATICLIB),) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) -+endif -+ install -m 755 $(SHAREDLIB) $(INSTALLDIR) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) - # ldconfig -diff --git a/Makefile.srcs b/Makefile.srcs -index de25754..cb41903 100644 ---- a/Makefile.srcs -+++ b/Makefile.srcs -@@ -1,6 +1,15 @@ -+USE_EXR ?= yes -+USE_JPEG ?= yes -+USE_JPEG2K ?= yes -+USE_MNG ?= yes -+USE_PNG ?= yes -+USE_TIFF ?= yes -+USE_RAW ?= yes -+USE_WEBP ?= yes -+ - VER_MAJOR = 3 - VER_MINOR = 18.0 --SRCS = \ -+SRCS-yes = \ - Source/FreeImage/BitmapAccess.cpp \ - Source/FreeImage/ColorLookup.cpp \ - Source/FreeImage/ConversionRGBA16.cpp \ -@@ -12,39 +21,80 @@ SRCS = \ - Source/FreeImage/LFPQuantizer.cpp \ - Source/FreeImage/MemoryIO.cpp \ - Source/FreeImage/PixelAccess.cpp \ -+ -+SRCS-$(USE_JPEG2K) += \ - Source/FreeImage/J2KHelper.cpp \ -+ -+SRCS-$(USE_MNG) += \ - Source/FreeImage/MNGHelper.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/Plugin.cpp \ - Source/FreeImage/PluginBMP.cpp \ - Source/FreeImage/PluginCUT.cpp \ - Source/FreeImage/PluginDDS.cpp \ -+ -+SRCS-$(USE_EXR) += \ - Source/FreeImage/PluginEXR.cpp \ -+ -+SRCS-$(USE_TIFF) += \ - Source/FreeImage/PluginG3.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginGIF.cpp \ - Source/FreeImage/PluginHDR.cpp \ - Source/FreeImage/PluginICO.cpp \ - Source/FreeImage/PluginIFF.cpp \ -+ -+SRCS-$(USE_JPEG2K) += \ - Source/FreeImage/PluginJ2K.cpp \ -+ -+SRCS-$(USE_MNG) += \ - Source/FreeImage/PluginJNG.cpp \ -+ -+SRCS-$(USE_JPEG2K) += \ - Source/FreeImage/PluginJP2.cpp \ -+ -+SRCS-$(USE_JPEG) += \ - Source/FreeImage/PluginJPEG.cpp \ -- Source/FreeImage/PluginJXR.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginKOALA.cpp \ -+ -+SRCS-$(USE_MNG) += \ - Source/FreeImage/PluginMNG.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginPCD.cpp \ - Source/FreeImage/PluginPCX.cpp \ - Source/FreeImage/PluginPFM.cpp \ - Source/FreeImage/PluginPICT.cpp \ -+ -+SRCS-$(USE_PNG) += \ - Source/FreeImage/PluginPNG.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginPNM.cpp \ - Source/FreeImage/PluginPSD.cpp \ - Source/FreeImage/PluginRAS.cpp \ -+ -+SRCS-$(USE_RAW) += \ - Source/FreeImage/PluginRAW.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginSGI.cpp \ - Source/FreeImage/PluginTARGA.cpp \ -+ -+SRCS-$(USE_TIFF) += \ - Source/FreeImage/PluginTIFF.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginWBMP.cpp \ -+ -+SRCS-$(USE_WEBP) += \ - Source/FreeImage/PluginWebP.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginXBM.cpp \ - Source/FreeImage/PluginXPM.cpp \ - Source/FreeImage/PSDParser.cpp \ -@@ -78,7 +128,11 @@ SRCS = \ - Source/Metadata/IPTC.cpp \ - Source/Metadata/TagConversion.cpp \ - Source/Metadata/TagLib.cpp \ -+ -+SRCS-$(USE_TIFF) += \ - Source/Metadata/XTIFF.cpp \ -+ -+SRCS-yes += \ - Source/FreeImageToolkit/Background.cpp \ - Source/FreeImageToolkit/BSplineRotate.cpp \ - Source/FreeImageToolkit/Channels.cpp \ -@@ -87,11 +141,19 @@ SRCS = \ - Source/FreeImageToolkit/CopyPaste.cpp \ - Source/FreeImageToolkit/Display.cpp \ - Source/FreeImageToolkit/Flip.cpp \ -+ -+SRCS-$(USE_JPEG) += \ - Source/FreeImageToolkit/JPEGTransform.cpp \ -+ -+SRCS-yes += \ - Source/FreeImageToolkit/MultigridPoissonSolver.cpp \ - Source/FreeImageToolkit/Rescale.cpp \ - Source/FreeImageToolkit/Resize.cpp \ - -+SRCS-$(USE_JPEG) += \ -+ Source/transupp.c -+SRCS = $(SRCS-yes) -+ - INCLS = Dist/FreeImage.h \ - Examples/OpenGL/TextureManager/TextureManager.h \ - Examples/Plugin/PluginCradle.h \ -@@ -117,7 +179,18 @@ INCLS = Dist/FreeImage.h \ - Wrapper/FreeImagePlus/test/fipTest.h \ - TestAPI/TestSuite.h - --INCLUDE = -I. \ -+INCLUDE-yes = -I. \ - -ISource \ - -ISource/Metadata \ - -ISource/FreeImageToolkit \ -+ -+INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib) -+INCLUDE-$(USE_EXR) += -DUSE_EXR $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR) -+INCLUDE-$(USE_JPEG) += -DUSE_JPEG -+INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjp2) -+INCLUDE-$(USE_MNG) += -DUSE_MNG -+INCLUDE-$(USE_PNG) += -DUSE_PNG $(shell $(PKG_CONFIG) --cflags-only-I libpng) -+INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase) -+INCLUDE-$(USE_RAW) += -DUSE_RAW $(shell $(PKG_CONFIG) --cflags-only-I libraw) -+INCLUDE-$(USE_WEBP) += -DUSE_WEBP $(shell $(PKG_CONFIG) --cflags-only-I libwebp libwebpmux) -+INCLUDE = $(INCLUDE-yes) -diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp -index 1776c3b..538f1c5 100644 ---- a/Source/FreeImage/J2KHelper.cpp -+++ b/Source/FreeImage/J2KHelper.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // -------------------------------------------------------------------------- -diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp -index 11e7294..7768a32 100644 ---- a/Source/FreeImage/Plugin.cpp -+++ b/Source/FreeImage/Plugin.cpp -@@ -238,23 +238,33 @@ FreeImage_Initialise(BOOL load_local_plugins_only) { - */ - s_plugins->AddNode(InitBMP); - s_plugins->AddNode(InitICO); -+#ifdef USE_JPEG - s_plugins->AddNode(InitJPEG); -+#endif -+#ifdef USE_MNG - s_plugins->AddNode(InitJNG); -+#endif - s_plugins->AddNode(InitKOALA); - s_plugins->AddNode(InitIFF); -+#ifdef USE_MNG - s_plugins->AddNode(InitMNG); -+#endif - s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1"); - s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4"); - s_plugins->AddNode(InitPCD); - s_plugins->AddNode(InitPCX); - s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2"); - s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5"); -+#ifdef USE_PNG - s_plugins->AddNode(InitPNG); -+#endif - s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3"); - s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6"); - s_plugins->AddNode(InitRAS); - s_plugins->AddNode(InitTARGA); -+#ifdef USE_TIFF - s_plugins->AddNode(InitTIFF); -+#endif - s_plugins->AddNode(InitWBMP); - s_plugins->AddNode(InitPSD); - s_plugins->AddNode(InitCUT); -@@ -263,16 +273,26 @@ FreeImage_Initialise(BOOL load_local_plugins_only) { - s_plugins->AddNode(InitDDS); - s_plugins->AddNode(InitGIF); - s_plugins->AddNode(InitHDR); -+#ifdef USE_TIFF - s_plugins->AddNode(InitG3); -+#endif - s_plugins->AddNode(InitSGI); -+#ifdef USE_EXR - s_plugins->AddNode(InitEXR); -+#endif -+#ifdef USE_JPEG2K - s_plugins->AddNode(InitJ2K); - s_plugins->AddNode(InitJP2); -+#endif - s_plugins->AddNode(InitPFM); - s_plugins->AddNode(InitPICT); -+#ifdef USE_RAW - s_plugins->AddNode(InitRAW); -+#endif -+#ifdef USE_WEBP - s_plugins->AddNode(InitWEBP); --#if !(defined(_MSC_VER) && (_MSC_VER <= 1310)) -+#endif -+#if 0 - s_plugins->AddNode(InitJXR); - #endif // unsupported by MS Visual Studio 2003 !!! - -diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp -index b286430..faa8037 100644 ---- a/Source/FreeImage/PluginEXR.cpp -+++ b/Source/FreeImage/PluginEXR.cpp -@@ -28,16 +28,16 @@ - #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) - #endif - --#include "../OpenEXR/IlmImf/ImfIO.h" --#include "../OpenEXR/Iex/Iex.h" --#include "../OpenEXR/IlmImf/ImfOutputFile.h" --#include "../OpenEXR/IlmImf/ImfInputFile.h" --#include "../OpenEXR/IlmImf/ImfRgbaFile.h" --#include "../OpenEXR/IlmImf/ImfChannelList.h" --#include "../OpenEXR/IlmImf/ImfRgba.h" --#include "../OpenEXR/IlmImf/ImfArray.h" --#include "../OpenEXR/IlmImf/ImfPreviewImage.h" --#include "../OpenEXR/Half/half.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - - // ========================================================== -diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp -index 0a083b4..b3a9bd7 100644 ---- a/Source/FreeImage/PluginG3.cpp -+++ b/Source/FreeImage/PluginG3.cpp -@@ -20,7 +20,7 @@ - // Use at your own risk! - // ========================================================== - --#include "../LibTIFF4/tiffiop.h" -+#include "tiffiop.h" - - #include "FreeImage.h" - #include "Utilities.h" -diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp -index b8bcfc8..621a903 100644 ---- a/Source/FreeImage/PluginJ2K.cpp -+++ b/Source/FreeImage/PluginJ2K.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // ========================================================== -diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp -index 742fe2c..c57f626 100644 ---- a/Source/FreeImage/PluginJP2.cpp -+++ b/Source/FreeImage/PluginJP2.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // ========================================================== -diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp -index 8db177d..dd97e63 100644 ---- a/Source/FreeImage/PluginJPEG.cpp -+++ b/Source/FreeImage/PluginJPEG.cpp -@@ -35,11 +35,15 @@ extern "C" { - #undef FAR - #include - --#include "../LibJPEG/jinclude.h" --#include "../LibJPEG/jpeglib.h" --#include "../LibJPEG/jerror.h" -+#include -+#include -+#include -+#include -+#include - } - -+#define SIZEOF(object) ((size_t) sizeof(object)) -+ - #include "FreeImage.h" - #include "Utilities.h" - -diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp -index 661f160..504fafe 100644 ---- a/Source/FreeImage/PluginPNG.cpp -+++ b/Source/FreeImage/PluginPNG.cpp -@@ -40,8 +40,8 @@ - - // ---------------------------------------------------------- - --#include "../ZLib/zlib.h" --#include "../LibPNG/png.h" -+#include -+#include - - // ---------------------------------------------------------- - -diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp -index e9bd5bf..680e634 100644 ---- a/Source/FreeImage/PluginRAW.cpp -+++ b/Source/FreeImage/PluginRAW.cpp -@@ -19,7 +19,7 @@ - // Use at your own risk! - // ========================================================== - --#include "../LibRawLite/libraw/libraw.h" -+#include - - #include "FreeImage.h" - #include "Utilities.h" -diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp -index 67fab0b..36f99e8 100644 ---- a/Source/FreeImage/PluginTIFF.cpp -+++ b/Source/FreeImage/PluginTIFF.cpp -@@ -37,9 +37,9 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibTIFF4/tiffiop.h" -+#include "tiffiop.h" - #include "../Metadata/FreeImageTag.h" --#include "../OpenEXR/Half/half.h" -+#include - - #include "FreeImageIO.h" - #include "PSDParser.h" -diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp -index 7c9f62f..c401447 100644 ---- a/Source/FreeImage/PluginWebP.cpp -+++ b/Source/FreeImage/PluginWebP.cpp -@@ -24,9 +24,9 @@ - - #include "../Metadata/FreeImageTag.h" - --#include "../LibWebP/src/webp/decode.h" --#include "../LibWebP/src/webp/encode.h" --#include "../LibWebP/src/webp/mux.h" -+#include -+#include -+#include - - // ========================================================== - // Plugin Interface -diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp -index 3ab6d32..7e32110 100644 ---- a/Source/FreeImage/ZLibInterface.cpp -+++ b/Source/FreeImage/ZLibInterface.cpp -@@ -19,10 +19,10 @@ - // Use at your own risk! - // ========================================================== - --#include "../ZLib/zlib.h" -+#include - #include "FreeImage.h" - #include "Utilities.h" --#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ -+#define OS_CODE 0x03 - - /** - Compresses a source buffer into a target buffer, using the ZLib library. -diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp -index 6f9ba8e..988d777 100644 ---- a/Source/FreeImageToolkit/JPEGTransform.cpp -+++ b/Source/FreeImageToolkit/JPEGTransform.cpp -@@ -26,10 +26,11 @@ extern "C" { - #undef FAR - #include - --#include "../LibJPEG/jinclude.h" --#include "../LibJPEG/jpeglib.h" --#include "../LibJPEG/jerror.h" --#include "../LibJPEG/transupp.h" -+#include -+#include -+#include -+#include -+#include "transupp.h" - } - - #include "FreeImage.h" -diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp -index d5be902..7f2be42 100644 ---- a/Source/Metadata/XTIFF.cpp -+++ b/Source/Metadata/XTIFF.cpp -@@ -29,7 +29,7 @@ - #pragma warning (disable : 4786) // identifier was truncated to 'number' characters - #endif - --#include "../LibTIFF4/tiffiop.h" -+#include "tiffiop.h" - - #include "FreeImage.h" - #include "Utilities.h" -diff --git a/Source/tiffiop.h b/Source/tiffiop.h -index 2fe7556..1642582 100644 ---- a/Source/tiffiop.h -+++ b/Source/tiffiop.h -@@ -28,7 +28,10 @@ - * ``Library-private'' definitions. - */ - --#include "tif_config.h" -+#include -+#define HAVE_SEARCH_H -+#define HAVE_FCNTL_H -+#define HAVE_SNPRINTF - - #ifdef HAVE_FCNTL_H - # include -diff --git a/Source/transupp.c b/Source/transupp.c -index d10f57b..d50216c 100644 ---- a/Source/transupp.c -+++ b/Source/transupp.c -@@ -15,8 +15,7 @@ - /* Although this file really shouldn't have access to the library internals, - * it's helpful to let it call jround_up() and jcopy_block_row(). - */ --#define JPEG_INTERNALS -- -+#include - #include "jinclude.h" - #include "jpeglib.h" - #include "transupp.h" /* My own external interface */ -diff --git a/fipMakefile.srcs b/fipMakefile.srcs -index d271b4b..e58f046 100644 ---- a/fipMakefile.srcs -+++ b/fipMakefile.srcs -@@ -1,6 +1,15 @@ -+USE_EXR ?= yes -+USE_JPEG ?= yes -+USE_JPEG2K ?= yes -+USE_MNG ?= yes -+USE_PNG ?= yes -+USE_TIFF ?= yes -+USE_RAW ?= yes -+USE_WEBP ?= yes -+ - VER_MAJOR = 3 - VER_MINOR = 18.0 --SRCS = \ -+SRCS-yes = \ - Source/FreeImage/BitmapAccess.cpp \ - Source/FreeImage/ColorLookup.cpp \ - Source/FreeImage/ConversionRGBA16.cpp \ -@@ -12,39 +21,80 @@ SRCS = \ - Source/FreeImage/LFPQuantizer.cpp \ - Source/FreeImage/MemoryIO.cpp \ - Source/FreeImage/PixelAccess.cpp \ -+ -+SRCS-$(USE_JPEG2K) += \ - Source/FreeImage/J2KHelper.cpp \ -+ -+SRCS-$(USE_MNG) += \ - Source/FreeImage/MNGHelper.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/Plugin.cpp \ - Source/FreeImage/PluginBMP.cpp \ - Source/FreeImage/PluginCUT.cpp \ - Source/FreeImage/PluginDDS.cpp \ -+ -+SRCS-$(USE_EXR) += \ - Source/FreeImage/PluginEXR.cpp \ -+ -+SRCS-$(USE_TIFF) += \ - Source/FreeImage/PluginG3.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginGIF.cpp \ - Source/FreeImage/PluginHDR.cpp \ - Source/FreeImage/PluginICO.cpp \ - Source/FreeImage/PluginIFF.cpp \ -+ -+SRCS-$(USE_JPEG2K) += \ - Source/FreeImage/PluginJ2K.cpp \ -+ -+SRCS-$(USE_MNG) += \ - Source/FreeImage/PluginJNG.cpp \ -+ -+SRCS-$(USE_JPEG2K) += \ - Source/FreeImage/PluginJP2.cpp \ -+ -+SRCS-$(USE_JPEG) += \ - Source/FreeImage/PluginJPEG.cpp \ -- Source/FreeImage/PluginJXR.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginKOALA.cpp \ -+ -+SRCS-$(USE_MNG) += \ - Source/FreeImage/PluginMNG.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginPCD.cpp \ - Source/FreeImage/PluginPCX.cpp \ - Source/FreeImage/PluginPFM.cpp \ - Source/FreeImage/PluginPICT.cpp \ -+ -+SRCS-$(USE_PNG) += \ - Source/FreeImage/PluginPNG.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginPNM.cpp \ - Source/FreeImage/PluginPSD.cpp \ - Source/FreeImage/PluginRAS.cpp \ -+ -+SRCS-$(USE_RAW) += \ - Source/FreeImage/PluginRAW.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginSGI.cpp \ - Source/FreeImage/PluginTARGA.cpp \ -+ -+SRCS-$(USE_TIFF) += \ - Source/FreeImage/PluginTIFF.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginWBMP.cpp \ -+ -+SRCS-$(USE_WEBP) += \ - Source/FreeImage/PluginWebP.cpp \ -+ -+SRCS-yes += \ - Source/FreeImage/PluginXBM.cpp \ - Source/FreeImage/PluginXPM.cpp \ - Source/FreeImage/PSDParser.cpp \ -@@ -78,7 +128,11 @@ SRCS = \ - Source/Metadata/IPTC.cpp \ - Source/Metadata/TagConversion.cpp \ - Source/Metadata/TagLib.cpp \ -+ -+SRCS-$(USE_TIFF) += \ - Source/Metadata/XTIFF.cpp \ -+ -+SRCS-yes += \ - Source/FreeImageToolkit/Background.cpp \ - Source/FreeImageToolkit/BSplineRotate.cpp \ - Source/FreeImageToolkit/Channels.cpp \ -@@ -87,7 +141,11 @@ SRCS = \ - Source/FreeImageToolkit/CopyPaste.cpp \ - Source/FreeImageToolkit/Display.cpp \ - Source/FreeImageToolkit/Flip.cpp \ -+ -+SRCS-$(USE_JPEG) += \ - Source/FreeImageToolkit/JPEGTransform.cpp \ -+ -+SRCS-yes += \ - Source/FreeImageToolkit/MultigridPoissonSolver.cpp \ - Source/FreeImageToolkit/Rescale.cpp \ - Source/FreeImageToolkit/Resize.cpp \ -@@ -98,6 +156,11 @@ SRCS = \ - Wrapper/FreeImagePlus/src/fipTag.cpp \ - Wrapper/FreeImagePlus/src/fipWinImage.cpp \ - Wrapper/FreeImagePlus/src/FreeImagePlus.cpp -+ -+SRCS-$(USE_JPEG) += \ -+ Source/transupp.c -+ -+SRCS = $(SRCS-yes) - INCLUDE = -I. \ - -ISource \ - -ISource/Metadata \ --- -2.19.1 - diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild index e904c560e531..b6dc64c0ab98 100644 --- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild @@ -12,7 +12,8 @@ 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" + 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" @@ -43,7 +44,7 @@ S=${WORKDIR}/${MY_PN} DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt ) PATCHES=( - "${FILESDIR}"/${PN}-3.18.0-unbundling.patch + "${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 diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild index 3e551b4b3492..d8b629ca9c1f 100644 --- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild @@ -12,7 +12,8 @@ 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" + 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" @@ -43,7 +44,7 @@ S=${WORKDIR}/${MY_PN} DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt ) PATCHES=( - "${FILESDIR}"/${PN}-3.18.0-unbundling.patch + "${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 diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 1f9b30342453..c16afaaa2b46 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,17 +1,7 @@ -AUX freetype-2.4.11-sizeof-types.patch 1041 BLAKE2B dce55cf1b31d426bb5a59aee20681e1e15ec24ee4468627e3e4f19f3a8fcd2ea89402292db24efffae3a3a0293c929f5e06bac3c87e6762d380b74d68a7ef71a SHA512 0774b7b769d332cbd0e674fad545d1c2b816947188725a7528d749c6311b84bbdc7f8c1a1f2cc947c405f16e8a92e394d77094aad98a6468f154fdedacec0ecc -AUX freetype-2.7-enable-valid.patch 533 BLAKE2B 64449eceea9c394ee4a0e2dfb1722c95950561003d3d5ae894b4a571614d8ac6b89a895f883e90ed7d4bdbd225d26bb4a09e49e2b93c4354b8acf1358bb1b067 SHA512 bb8caa36cbd941a24347c761e0110f21aad3f783aab7507de831cdde1d2e83032cbca58ccedac94ce2f5233921a63436fc799f0dd615f21009f7f309d15c6863 -DIST freetype-2.10.1.tar.xz 2378784 BLAKE2B 7c177d3ca9ad923dc9534719529686c4242d87d85bfbc32fa8a12d0be87aceb4960ec84b84e433413312de17ac24a8ed2a9d092efa25a39108d28e2051ada574 SHA512 c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 -DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa -DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 -DIST freetype-doc-2.10.1.tar.xz 2079092 BLAKE2B 7d2b8ccdfeba71f1dab57f31cfb96a21afbf628ad329f798e9ac25f6e57cc662db67040a9f7c63df2d43b1c0a169c37ca0cd82bfa2d95ef382b16066859dc5b3 SHA512 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e -DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67 -DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4 -DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e1b7410cf840fa15fa1da3e6a1c980167bfedbe197b6e6637a8e1dcef1f4fd83174e47f33f090d554fab2c40380c SHA512 f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142 -DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438 -DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46 -EBUILD freetype-2.10.1.ebuild 6715 BLAKE2B 5e0e09f3a6eae8a63429935c9439c399708bb29be75a7498fa13d7cc261de77fc8aac1c0282ecb6a096e5078305b72ff52fb3a257802235ba1a8be85ffc0c752 SHA512 c3ad5724caf8671c065daf247f1131c7497f92884db7fc0296fc6bafb86b713028e4882b9db6e89a53d6f318ac060cdccdb1a8e50e0d393ebd47cd3e5882fb2e -EBUILD freetype-2.10.2-r1.ebuild 6783 BLAKE2B a11fa72fc58ab86599ec752d0b3189add79ec33ee7b1de77c6d36ac35306a88f63c947580adb9563471ff3e31f6c8f6c4d9be38f3c5c45ee8a308c92082f21f0 SHA512 e2ebce63a8b9409db873d3e739ceb3c1c9a5937b99202a9c0ab81fa0959b38e6cac548f40c3fa09206c2166c28e1d0197d14107f1fbc05d5cb858553b57309b4 -EBUILD freetype-2.9.1-r3.ebuild 6659 BLAKE2B e60afd962ec321996c11b948912e3d809a9842fad9ffb9e126028eb93640a35a22b918cbd38a977828ace531721aa2e0d0946aae44a1d82ceca2c4c618751ad0 SHA512 70b9bf7943f2e095e1b4e226831d026c0c80fd48c425140927a568cdecb7cafccfc9c9ab68f904514a4542cb08ceff18a4c9ecc624bd5954e5780a6bf5315c53 -EBUILD freetype-2.9.1-r4.ebuild 6669 BLAKE2B dadd3c7643ee9da87dabfce17e5ea8ce9bc2b106385708031e2b2483f64c90620d6f35a0ccaf12174ed4ac33e23841d4a17c6a7db0c7d686e85eaa799156b896 SHA512 1fcece6d60327b7dec038b7e368b18941dfde5527caa41639f78140423be2250518098680137e7b28121e2e65f66ec98122da3724e8cd413a2c0a3f1c2a291bc -EBUILD freetype-9999.ebuild 6792 BLAKE2B 2f652670cda49a8ef474dcc3b63c2711c0a49256214301013d53b82615215c7fa53897583df12a0585c4967b8a0fd06d17c93b455c945f6493c5447f4d69be04 SHA512 91f64c79e8065e228cd5b389f1276d499405e0e7486505eebc80ed4916da9ac1de426685ccbe331c4baa6c9223bedc7f84fe5ec520a287689b290d66032d4078 +AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31e3d5b658398afa7209c5d7c89dbbf90c98385d0827960545b83573425c6be8e4615311f76d93e40ff6237977bfe160639587 SHA512 64e3cc7820bd0b8816ad34108fa174da90f2a0b8f96a3c94425900ba5f5eb8b01074fdfa3bee699815d7eb74ec44cf043239a932a228c2971557fad0caec912f +DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f +DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8 +DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8 +EBUILD freetype-2.10.4.ebuild 6783 BLAKE2B 6fd724961b81c307b2adf945f4b18927c47cd04ecaa0f38b138a46b557dd81531e1c8f7074a030bacf99dbe1440aec5a10ced167801d45b4e965a62858fec30b SHA512 bdd92db7400516ee2622133d805c374c7668a583840c1a9c6a8c8de295ab75474bc288905fdfd97746cfe4cb36c70f56b1361150646c044125ae01c3d0f846e1 +EBUILD freetype-9999.ebuild 6792 BLAKE2B cb4d191b0847f84ce7932c5a528b0873175bd2c6f6632151b7e48e7ef4c3be2313959a1b3b7f7fcb937496333a7e4387a238699c183c054572e60328d5089b08 SHA512 b11e00a433873180df27567b23b787642ebe9517965badfb5a158fe13ec1cf119568fc11b5dd4f271a607ead2fe195b7f4581758f2ca59a4e12b93f0e875b171 MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8 diff --git a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch new file mode 100644 index 000000000000..ea02a15df115 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch @@ -0,0 +1,31 @@ +From 56e6ee69d298c0d150e2b76d2cfa2306e901df40 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 11 Oct 2020 08:59:08 +0200 +Subject: [PATCH] Prevent apps from using the autoconf sizeof branch. + +Use #error to make sure that any app trying to enable that branch fails +miserably. This guarantees the code to be multilib-friendly and also +removes the header differences triggering QA errors. +--- + builds/unix/ftconfig.h.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/builds/unix/ftconfig.h.in b/builds/unix/ftconfig.h.in +index 00b5a8226..020593a95 100644 +--- a/builds/unix/ftconfig.h.in ++++ b/builds/unix/ftconfig.h.in +@@ -45,10 +45,7 @@ + #undef FT_USE_AUTOCONF_SIZEOF_TYPES + #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES + +-#undef SIZEOF_INT +-#undef SIZEOF_LONG +-#define FT_SIZEOF_INT SIZEOF_INT +-#define FT_SIZEOF_LONG SIZEOF_LONG ++#error "Unsupported code branch enabled. Please report a bug to bugs.gentoo.org." + + #endif /* FT_USE_AUTOCONF_SIZEOF_TYPES */ + +-- +2.28.0 + diff --git a/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch b/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch deleted file mode 100644 index 5be0530ee007..000000000000 --- a/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8af7b9e403240c2c3ace1005f5a91fa2f1625ac9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 11 Mar 2013 22:13:34 +0100 -Subject: [PATCH] Prevent apps from using the autoconf sizeof branch. - -Use #error to make sure that any app trying to enable that branch fails -miserably. This guarantees the code to be multilib-friendly and also -removes the header differences triggering QA errors. ---- - builds/unix/ftconfig.in | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in -index 9531afd..457cbfc 100644 ---- a/builds/unix/ftconfig.in -+++ b/builds/unix/ftconfig.in -@@ -78,10 +78,7 @@ FT_BEGIN_HEADER - #undef FT_USE_AUTOCONF_SIZEOF_TYPES - #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES - --#undef SIZEOF_INT --#undef SIZEOF_LONG --#define FT_SIZEOF_INT SIZEOF_INT --#define FT_SIZEOF_LONG SIZEOF_LONG -+#error "Unsupported code branch enabled. Please report a bug to bugs.gentoo.org." - - #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */ - --- -1.8.1.5 - diff --git a/media-libs/freetype/files/freetype-2.7-enable-valid.patch b/media-libs/freetype/files/freetype-2.7-enable-valid.patch deleted file mode 100644 index 76600aeb162b..000000000000 --- a/media-libs/freetype/files/freetype-2.7-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.7/modules.cfg -+++ freetype-2.7/modules.cfg -@@ -120,7 +120,7 @@ - # TrueType GX/AAT table validation. Needs ftgxval.c below. - # - # No FT_CONFIG_OPTION_PIC support. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -143,7 +143,7 @@ - # OpenType table validation. Needs ftotval.c below. - # - # No FT_CONFIG_OPTION_PIC support. --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/media-libs/freetype/freetype-2.10.1.ebuild b/media-libs/freetype/freetype-2.10.1.ebuild deleted file mode 100644 index d6f5e68744d3..000000000000 --- a/media-libs/freetype/freetype-2.10.1.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs - -DESCRIPTION="A high-quality and portable font engine" -HOMEPAGE="https://www.freetype.org/" -IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils" - -if [[ "${PV}" != 9999 ]] ; then - SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz - mirror://nongnu/freetype/${P/_/}.tar.xz - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz - mirror://nongnu/freetype/ft2demos-${PV}.tar.xz ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - IUSE+=" doc" -else - inherit autotools git-r3 -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -RESTRICT="!bindist? ( bindist )" # bug 541408 - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) - utils? ( - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] - ) - )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="infinality? ( media-libs/fontconfig-infinality )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 -) - -_egit_repo_handler() { - if [[ "${PV}" == 9999 ]] ; then - local phase="${1}" - case ${phase} in - fetch|unpack) - :; - ;; - *) - die "Please use this function with either \"fetch\" or \"unpack\"" - ;; - esac - - local EGIT_REPO_URI - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git" - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git" - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -src_fetch() { - _egit_repo_handler ${EBUILD_PHASE} -} - -src_unpack() { - _egit_repo_handler ${EBUILD_PHASE} -} - -src_prepare() { - if [[ "${PV}" == 9999 ]] ; then - # inspired by shipped autogen.sh script - eval $(sed -nf version.sed include/freetype/freetype.h) - pushd builds/unix &>/dev/null || die - sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ - < configure.raw > configure.ac || die - # eautoheader produces broken ftconfig.in - eautoheader() { return 0 ; } - AT_M4DIR="." eautoreconf - unset freetype_major freetype_minor freetype_patch - popd &>/dev/null || die - fi - - default - - # This is the same as the 01 patch from infinality - sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die - - enable_option() { - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to disable option $1" - } - - # Will be the new default for >=freetype-2.7.0 - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - - if use infinality && use cleartype_hinting; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" - elif use infinality; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" - elif use cleartype_hinting; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - fi - - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" - # via environment (new since v2.8) - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES - - 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 - - if ! use adobe-cff; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - if use utils; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - cd "${S}" || die - fi - - # we need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ - "${S}"/builds/unix/configure || die - fi - - elibtoolize --patch-only -} - -multilib_src_configure() { - append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake - - local myeconfargs=( - --disable-freetype-config - --enable-biarch-config - --enable-shared - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - $(use_enable static-libs static) - - # avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - case ${CHOST} in - mingw*|*-mingw*) ;; - # Workaround windows mis-detection: bug #654712 - # Have to do it for both ${CHOST}-windres and windres - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; - esac - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils; then - einfo "Building utils" - # fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils; then - einfo "Installing utils" - rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die - dodir /usr/bin #654780 - local ft2demo - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \ - "${ED}"/usr/bin || die - done - fi -} - -multilib_src_install_all() { - if use fontforge; then - # Probably fontforge needs less but this way makes things simplier... - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header; do - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ "${PV}" != 9999 ]] && use doc ; then - docinto html - dodoc -r docs/* - fi - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/media-libs/freetype/freetype-2.10.2-r1.ebuild b/media-libs/freetype/freetype-2.10.2-r1.ebuild deleted file mode 100644 index 6166c56a0485..000000000000 --- a/media-libs/freetype/freetype-2.10.2-r1.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs - -DESCRIPTION="A 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" - -if [[ "${PV}" != 9999 ]] ; then - SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz - mirror://nongnu/freetype/${P/_/}.tar.xz - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz - mirror://nongnu/freetype/ft2demos-${PV}.tar.xz ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - IUSE+=" doc" -else - inherit autotools git-r3 -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -RESTRICT="!bindist? ( bindist )" # bug 541408 - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) - utils? ( - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] - ) - )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="infinality? ( media-libs/fontconfig-infinality )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 -) - -_egit_repo_handler() { - if [[ "${PV}" == 9999 ]] ; then - local phase="${1}" - case ${phase} in - fetch|unpack) - :; - ;; - *) - die "Please use this function with either \"fetch\" or \"unpack\"" - ;; - esac - - local EGIT_REPO_URI - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git" - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git" - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -src_fetch() { - _egit_repo_handler ${EBUILD_PHASE} -} - -src_unpack() { - _egit_repo_handler ${EBUILD_PHASE} -} - -src_prepare() { - if [[ "${PV}" == 9999 ]] ; then - # inspired by shipped autogen.sh script - eval $(sed -nf version.sed include/freetype/freetype.h) - pushd builds/unix &>/dev/null || die - sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ - < configure.raw > configure.ac || die - # eautoheader produces broken ftconfig.in - eautoheader() { return 0 ; } - AT_M4DIR="." eautoreconf - unset freetype_major freetype_minor freetype_patch - popd &>/dev/null || die - fi - - default - - # This is the same as the 01 patch from infinality - sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die - - enable_option() { - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to disable option $1" - } - - # Will be the new default for >=freetype-2.7.0 - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - - if use infinality && use cleartype_hinting; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" - elif use infinality; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" - elif use cleartype_hinting; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - fi - - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" - # via environment (new since v2.8) - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES - - 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 - - if ! use adobe-cff; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - if use utils; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - cd "${S}" || die - fi - - # we need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ - "${S}"/builds/unix/configure || die - fi - - elibtoolize --patch-only -} - -multilib_src_configure() { - append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake - - local myeconfargs=( - --disable-freetype-config - --enable-biarch-config - --enable-shared - $(use_with brotli) - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - $(use_enable static-libs static) - - # avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - case ${CHOST} in - mingw*|*-mingw*) ;; - # Workaround windows mis-detection: bug #654712 - # Have to do it for both ${CHOST}-windres and windres - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; - esac - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils; then - einfo "Building utils" - # fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils; then - einfo "Installing utils" - rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die - dodir /usr/bin #654780 - local ft2demo - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \ - "${ED}"/usr/bin || die - done - fi -} - -multilib_src_install_all() { - if use fontforge; then - # Probably fontforge needs less but this way makes things simplier... - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header; do - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ "${PV}" != 9999 ]] && use doc ; then - docinto html - dodoc -r docs/* - fi - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild new file mode 100644 index 000000000000..1402927ebaa8 --- /dev/null +++ b/media-libs/freetype/freetype-2.10.4.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs + +DESCRIPTION="A 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" + +if [[ "${PV}" != 9999 ]] ; then + SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz + mirror://nongnu/freetype/${P/_/}.tar.xz + utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz + mirror://nongnu/freetype/ft2demos-${PV}.tar.xz ) + doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + IUSE+=" doc" +else + inherit autotools git-r3 +fi + +LICENSE="|| ( FTL GPL-2+ )" +SLOT="2" +RESTRICT="!bindist? ( bindist )" # bug 541408 + +RDEPEND=" + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) + utils? ( + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] + ) + )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" +PDEPEND="infinality? ( media-libs/fontconfig-infinality )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966 +) + +_egit_repo_handler() { + if [[ "${PV}" == 9999 ]] ; then + local phase="${1}" + case ${phase} in + fetch|unpack) + :; + ;; + *) + die "Please use this function with either \"fetch\" or \"unpack\"" + ;; + esac + + local EGIT_REPO_URI + EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git" + git-r3_src_${phase} + if use utils ; then + EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git" + local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" + git-r3_src_${phase} + fi + else + default + fi +} + +src_fetch() { + _egit_repo_handler ${EBUILD_PHASE} +} + +src_unpack() { + _egit_repo_handler ${EBUILD_PHASE} +} + +src_prepare() { + if [[ "${PV}" == 9999 ]] ; then + # inspired by shipped autogen.sh script + eval $(sed -nf version.sed include/freetype/freetype.h) + pushd builds/unix &>/dev/null || die + sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ + < configure.raw > configure.ac || die + # eautoheader produces broken ftconfig.in + eautoheader() { return 0 ; } + AT_M4DIR="." eautoreconf + unset freetype_major freetype_minor freetype_patch + popd &>/dev/null || die + fi + + default + + # This is the same as the 01 patch from infinality + sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die + + enable_option() { + sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to enable option $1" + } + + disable_option() { + sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to disable option $1" + } + + # Will be the new default for >=freetype-2.7.0 + disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" + + if use infinality && use cleartype_hinting; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" + elif use infinality; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" + elif use cleartype_hinting; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" + fi + + # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" + # via environment (new since v2.8) + enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES + + 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 + + if ! use adobe-cff; then + enable_option CFF_CONFIG_OPTION_OLD_ENGINE + fi + + if use debug; then + enable_option FT_DEBUG_LEVEL_TRACE + enable_option FT_DEBUG_MEMORY + fi + + if use utils; then + cd "${WORKDIR}/ft2demos-${PV}" || die + # Disable tests needing X11 when USE="-X". (bug #177597) + if ! use X; then + sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die + fi + cd "${S}" || die + fi + + # we need non-/bin/sh to run configure + if [[ -n ${CONFIG_SHELL} ]] ; then + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ + "${S}"/builds/unix/configure || die + fi + + elibtoolize --patch-only +} + +multilib_src_configure() { + append-flags -fno-strict-aliasing + type -P gmake &> /dev/null && export GNUMAKE=gmake + + local myeconfargs=( + --disable-freetype-config + --enable-biarch-config + --enable-shared + $(use_with brotli) + $(use_with bzip2) + $(use_with harfbuzz) + $(use_with png) + $(use_enable static-libs static) + + # avoid using libpng-config + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" + ) + + case ${CHOST} in + mingw*|*-mingw*) ;; + # Workaround windows mis-detection: bug #654712 + # Have to do it for both ${CHOST}-windres and windres + *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; + esac + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use utils; then + einfo "Building utils" + # fix for Prefix, bug #339334 + emake \ + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use utils; then + einfo "Installing utils" + rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die + dodir /usr/bin #654780 + local ft2demo + for ft2demo in ../ft2demos-${PV}/bin/*; do + ./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \ + "${ED}"/usr/bin || die + done + fi +} + +multilib_src_install_all() { + if use fontforge; then + # Probably fontforge needs less but this way makes things simplier... + einfo "Installing internal headers required for fontforge" + local header + find src/truetype include/freetype/internal -name '*.h' | \ + while read header; do + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + done + fi + + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} + if [[ "${PV}" != 9999 ]] && use doc ; then + docinto html + dodoc -r docs/* + fi + + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi +} diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild deleted file mode 100644 index a44767d97c51..000000000000 --- a/media-libs/freetype/freetype-2.9.1-r3.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs - -DESCRIPTION="A high-quality and portable font engine" -HOMEPAGE="https://www.freetype.org/" -IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils" - -if [[ "${PV}" != 9999 ]] ; then - SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 - mirror://nongnu/freetype/${P/_/}.tar.bz2 - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 - mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - IUSE+=" doc" -else - inherit autotools git-r3 -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -RESTRICT="!bindist? ( bindist )" # bug 541408 - -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) - utils? ( - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] - ) - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -PDEPEND="infinality? ( media-libs/fontconfig-infinality )" - -PATCHES=( - # This is the same as the 01 patch from infinality - "${FILESDIR}"/${PN}-2.7-enable-valid.patch - - "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 -) - -_egit_repo_handler() { - if [[ "${PV}" == 9999 ]] ; then - local phase="${1}" - case ${phase} in - fetch|unpack) - :; - ;; - *) - die "Please use this function with either \"fetch\" or \"unpack\"" - ;; - esac - - local EGIT_REPO_URI - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git" - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git" - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -src_fetch() { - _egit_repo_handler fetch -} - -src_unpack() { - _egit_repo_handler unpack -} - -src_prepare() { - if [[ "${PV}" == 9999 ]] ; then - # inspired by shipped autogen.sh script - eval $(sed -nf version.sed include/freetype/freetype.h) - pushd builds/unix &>/dev/null || die - sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ - < configure.raw > configure.ac || die - # eautoheader produces broken ftconfig.in - eautoheader() { return 0 ; } - AT_M4DIR="." eautoreconf - unset freetype_major freetype_minor freetype_patch - popd &>/dev/null || die - fi - - default - - enable_option() { - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to disable option $1" - } - - # Will be the new default for >=freetype-2.7.0 - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - - if use infinality && use cleartype_hinting; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" - elif use infinality; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" - elif use cleartype_hinting; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - fi - - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" - # via environment (new since v2.8) - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES - - 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 - - if ! use adobe-cff; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - if use utils; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - cd "${S}" || die - fi - - # we need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ - "${S}"/builds/unix/configure || die - fi - - elibtoolize --patch-only -} - -multilib_src_configure() { - append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake - - local myeconfargs=( - --enable-biarch-config - --enable-freetype-config - --enable-shared - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - $(use_enable static-libs static) - - # avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - case ${CHOST} in - mingw*|*-mingw*) ;; - # Workaround windows mis-detection: bug #654712 - # Have to do it for both ${CHOST}-windres and windres - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; - esac - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils; then - einfo "Building utils" - # fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils; then - einfo "Installing utils" - rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die - dodir /usr/bin #654780 - local ft2demo - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \ - "${ED%/}"/usr/bin || die - done - fi -} - -multilib_src_install_all() { - if use fontforge; then - # Probably fontforge needs less but this way makes things simplier... - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header; do - mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ "${PV}" != 9999 ]] && use doc ; then - docinto html - dodoc -r docs/* - fi - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild deleted file mode 100644 index 159d8a075501..000000000000 --- a/media-libs/freetype/freetype-2.9.1-r4.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs - -DESCRIPTION="A high-quality and portable font engine" -HOMEPAGE="https://www.freetype.org/" -IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils" - -if [[ "${PV}" != 9999 ]] ; then - SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 - mirror://nongnu/freetype/${P/_/}.tar.bz2 - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 - mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - IUSE+=" doc" -else - inherit autotools git-r3 -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -RESTRICT="!bindist? ( bindist )" # bug 541408 - -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) - utils? ( - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] - ) - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -PDEPEND="infinality? ( media-libs/fontconfig-infinality )" - -PATCHES=( - # This is the same as the 01 patch from infinality - "${FILESDIR}"/${PN}-2.7-enable-valid.patch - - "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 -) - -_egit_repo_handler() { - if [[ "${PV}" == 9999 ]] ; then - local phase="${1}" - case ${phase} in - fetch|unpack) - :; - ;; - *) - die "Please use this function with either \"fetch\" or \"unpack\"" - ;; - esac - - local EGIT_REPO_URI - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git" - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git" - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -src_fetch() { - _egit_repo_handler fetch -} - -src_unpack() { - _egit_repo_handler unpack -} - -src_prepare() { - if [[ "${PV}" == 9999 ]] ; then - # inspired by shipped autogen.sh script - eval $(sed -nf version.sed include/freetype/freetype.h) - pushd builds/unix &>/dev/null || die - sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ - < configure.raw > configure.ac || die - # eautoheader produces broken ftconfig.in - eautoheader() { return 0 ; } - AT_M4DIR="." eautoreconf - unset freetype_major freetype_minor freetype_patch - popd &>/dev/null || die - fi - - default - - enable_option() { - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to disable option $1" - } - - # Will be the new default for >=freetype-2.7.0 - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - - if use infinality && use cleartype_hinting; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" - elif use infinality; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" - elif use cleartype_hinting; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - fi - - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" - # via environment (new since v2.8) - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES - - 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 - - if ! use adobe-cff; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - if use utils; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - cd "${S}" || die - fi - - # we need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ - "${S}"/builds/unix/configure || die - fi - - elibtoolize --patch-only -} - -multilib_src_configure() { - append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake - - local myeconfargs=( - --disable-freetype-config - --enable-biarch-config - --enable-shared - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - $(use_enable static-libs static) - - # avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - case ${CHOST} in - mingw*|*-mingw*) ;; - # Workaround windows mis-detection: bug #654712 - # Have to do it for both ${CHOST}-windres and windres - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; - esac - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils; then - einfo "Building utils" - # fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils; then - einfo "Installing utils" - rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die - dodir /usr/bin #654780 - local ft2demo - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \ - "${ED%/}"/usr/bin || die - done - fi -} - -multilib_src_install_all() { - if use fontforge; then - # Probably fontforge needs less but this way makes things simplier... - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header; do - mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ "${PV}" != 9999 ]] && use doc ; then - docinto html - dodoc -r docs/* - fi - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index 37247e155193..b8b52e17acc9 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -46,7 +46,7 @@ BDEPEND=" PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( - "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 + "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966 ) _egit_repo_handler() { diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index b3cdf2a457f2..5f3219d28529 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -1,9 +1,9 @@ AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5 AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417 -DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d -EBUILD gegl-0.4.22-r1.ebuild 4722 BLAKE2B 1d154668b7004738e5e85e850a1f106912bbba4d792892ac979c6fd628411909c0fcf513b0ff3ad47b81094f5903b975cffb08cd00f5dd206043f9f89754842c SHA512 f77899a70cfaf9d35be73f76bff9c385d6c487782b1dfe386b18c632acf052d9f8711648373ade81782f25f5014c7b683fefdbff0b5e8e364f6900958ea598b9 -EBUILD gegl-0.4.22.ebuild 4714 BLAKE2B 8a920a635ca0b9114441e41532b654ab14558882635c3f98f2d583b9cba56662407667ff08d1a3b9e5dd759d21ac3519534c95e4c708ab9c817661637e1e407d SHA512 e272e638bf876ec0c8e71e89dabbd23df345925c51e4e54dcf07c26867ecc362ee7d3c51d9a888f83089ec80596b1e86ab2aa39618a33d8494ba3112a23ca07e -EBUILD gegl-0.4.24.ebuild 4726 BLAKE2B cdb9448b41d828eb0d4786024338b01cc6783e89ddfdb78e01eaabed770b750de456620411e51fee4f45206d0e916b784cebe4695d032e98af3acef86765fd04 SHA512 6e1a1fc21feea593efec048469d1ea8b5b26afc7e6b8acfe35b35cf7e9be523b9072849797d280456cdbbfdb308b4453e66d922641a1e65db45f89cdaccc7e15 -EBUILD gegl-9999.ebuild 4336 BLAKE2B 04d0df100f84f9e0b4c016d6c8d01e6a69ccb65fe22e17afb095291c9e9afddfaa043f01b66c9c3f3e9ea0c4afb8bb9b1cadb5a5eb887279ab0359ead2dd5841 SHA512 a0fbd02d61fdd484017c1c09020616426649eb8a546408ce0bd33df939a5940917b08d246f4ab3f585d13dc3d2c0b42e2a58e8c61cfb3196be94474ba66b9655 +DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24 +EBUILD gegl-0.4.24.ebuild 4722 BLAKE2B 768487bbd09552408a209b26b9e1684b4cade9a90d83bafaf4d15ba199b38f6b82ab5a6cd885683eba8a4561200d91b8a809bb42dfa41c6619839b0f34258519 SHA512 7d0a8adbebd7abf090db4b760d015af7d5e296fd71f3412b20fa2a223a00448443e6ecbd73841aa72cc1825c1496f58e800bc00fa5dd72829479c2b31161a58d +EBUILD gegl-0.4.26-r1.ebuild 4924 BLAKE2B e60c73eac7e641d730961ba9688f96bb5e8d065bf73a05f18c6ca81a76b9f464137f8456dbfd694f2e3c968028aa551005d2d13712ea1a84fca04c25aac81fab SHA512 59f470fd33ce8c446cd19cd6a32f9d7c357cb2f32754e1bcd3e82d7b808fcb927e00c1f3c3076cf66e5b3926ed37ce82f84c986cb9fdd18ff5eae3b45c6e3c35 +EBUILD gegl-0.4.26.ebuild 4728 BLAKE2B 1c88d9b6bc615b2f3a2f653437184e0a639514656c32cb8aa42be46b66be46f4724d82583e83d36aa460d11c0e1d53254984f0db4fbae40c3bcaf816813dd9d0 SHA512 43c1769f377855207d3f5c7f240f2c91d89477aebbefa3746c3abffb048d5e68df1072ed51979e0d80b996e718213d2f216d226d668a56af62d3559e5eef0816 +EBUILD gegl-9999.ebuild 4336 BLAKE2B 3b3970328fd942cdaaf6e720382f92c2738d264961f92958ad360f182ac68c60ec9fc03c9c8457b5370741ba7cbbdb26b116567d161cfb4b24cc61c567c578cf SHA512 0d86d9e36014717402d8e15dbb6ce40e0d19ac3edd2b379712cb0f0bd5f24b558c9060a91603e1501f4bb03b239c10328c93999bbdc4da627948882e8a086bfe MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016 diff --git a/media-libs/gegl/gegl-0.4.22-r1.ebuild b/media-libs/gegl/gegl-0.4.22-r1.ebuild deleted file mode 100644 index da3d78a2c25d..000000000000 --- a/media-libs/gegl/gegl-0.4.22-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -# vala and introspection support is broken, bug #468208 -VALA_USE_DEPEND=vapigen - -inherit meson gnome2-utils python-any-r1 vala - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" - SRC_URI="" -else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A graph based image processing framework" -HOMEPAGE="http://www.gegl.org/" - -LICENSE="|| ( GPL-3+ LGPL-3 )" -SLOT="0.4" - -IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp" -REQUIRED_USE=" - svg? ( cairo ) - test? ( introspection ) - vala? ( introspection ) -" - -RESTRICT="!test? ( test )" - -# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE -# so there is no chance to support libav right now (Gentoo bug #567638) -# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! -RDEPEND=" - >=dev-libs/glib-2.44:2 - >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.74[introspection?,lcms?] - media-libs/libnsgif - >=media-libs/libpng-1.6.0:0= - >=sys-libs/zlib-1.2.0 - virtual/jpeg:0= - >=x11-libs/gdk-pixbuf-2.32:2 - >=x11-libs/pango-1.38.0 - cairo? ( >=x11-libs/cairo-1.12.2 ) - ffmpeg? ( media-video/ffmpeg:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.32:= ) - lcms? ( >=media-libs/lcms-2.8:2 ) - lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - pdf? ( >=app-text/poppler-0.71.0[cairo] ) - raw? ( >=media-libs/libraw-0.15.4:0= ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - svg? ( >=gnome-base/librsvg-2.40.6:2 ) - tiff? ( >=media-libs/tiff-4:0 ) - umfpack? ( sci-libs/umfpack ) - v4l? ( >=media-libs/libv4l-1.0.1 ) - webp? ( >=media-libs/libwebp-0.5.0:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - >=sys-devel/libtool-2.2 - virtual/pkgconfig - test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) - vala? ( $(vala_depend) ) -" - -DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch - "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch -) - -python_check_deps() { - has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # don't require Apple's OpenCL on versions of OSX that don't have it - if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then - sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die - fi - - # commit 7c78497b : tests that use gegl.png are broken on non-amd64 - sed -e '/clones.xml/d' \ - -e '/composite-transform.xml/d' \ - -i tests/compositions/meson.build || die - - # fix skipping mipmap tests due to executable not found - for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do - sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die - sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die - done - - gnome2_environment_reset - - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - # - Disable documentation as the generating is bit automagic - # if anyone wants to work on it just create bug with patch - -Ddocs=false - -Dexiv2=disabled - -Dgdk-pixbuf=enabled - -Dgexiv2=disabled - # - There are two checks for dot, one controllable by --with(out)-graphviz - # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - -Dgraphviz=disabled - -Djasper=disabled - -Dlibjpeg=enabled - -Dlibpng=enabled - # - libspiro: not in portage main tree - -Dlibspiro=disabled - -Dlua=disabled - -Dmrg=disabled - -Dpango=enabled - -Dsdl2=disabled - # - Parameter -Dworkshop=false disables any use of Lua, effectivly - -Dworkshop=false - $(meson_feature cairo) - $(meson_feature cairo pangocairo) - $(meson_feature ffmpeg libav) - $(meson_feature lcms) - $(meson_feature lensfun) - $(meson_feature openexr) - $(meson_feature pdf poppler) - $(meson_feature raw libraw) - $(meson_feature sdl sdl1) - $(meson_feature svg librsvg) - $(meson_feature test pygobject) - $(meson_feature tiff libtiff) - $(meson_feature umfpack) - # - v4l support does not work with our media-libs/libv4l-0.8.9, - # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - $(meson_feature v4l libv4l) - $(meson_feature v4l libv4l2) - $(meson_feature vala vapigen) - $(meson_feature webp) - $(meson_use introspection) - ) - meson_src_configure -} diff --git a/media-libs/gegl/gegl-0.4.22.ebuild b/media-libs/gegl/gegl-0.4.22.ebuild deleted file mode 100644 index 27f0434a0599..000000000000 --- a/media-libs/gegl/gegl-0.4.22.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -# vala and introspection support is broken, bug #468208 -VALA_USE_DEPEND=vapigen - -inherit meson gnome2-utils python-any-r1 vala - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" - SRC_URI="" -else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A graph based image processing framework" -HOMEPAGE="http://www.gegl.org/" - -LICENSE="|| ( GPL-3+ LGPL-3 )" -SLOT="0.4" - -IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp" -REQUIRED_USE=" - svg? ( cairo ) - test? ( introspection ) - vala? ( introspection ) -" - -RESTRICT="!test? ( test )" - -# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE -# so there is no chance to support libav right now (Gentoo bug #567638) -# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! -RDEPEND=" - >=dev-libs/glib-2.44:2 - >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.74[introspection?] - media-libs/libnsgif - >=media-libs/libpng-1.6.0:0= - >=sys-libs/zlib-1.2.0 - virtual/jpeg:0= - >=x11-libs/gdk-pixbuf-2.32:2 - >=x11-libs/pango-1.38.0 - cairo? ( >=x11-libs/cairo-1.12.2 ) - ffmpeg? ( media-video/ffmpeg:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.32:= ) - lcms? ( >=media-libs/lcms-2.8:2 ) - lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - pdf? ( >=app-text/poppler-0.71.0[cairo] ) - raw? ( >=media-libs/libraw-0.15.4:0= ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - svg? ( >=gnome-base/librsvg-2.40.6:2 ) - tiff? ( >=media-libs/tiff-4:0 ) - umfpack? ( sci-libs/umfpack ) - v4l? ( >=media-libs/libv4l-1.0.1 ) - webp? ( >=media-libs/libwebp-0.5.0:= ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - dev-lang/perl - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - >=sys-devel/libtool-2.2 - virtual/pkgconfig - test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) - vala? ( $(vala_depend) ) -" - -DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch - "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch -) - -python_check_deps() { - has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # don't require Apple's OpenCL on versions of OSX that don't have it - if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then - sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die - fi - - # commit 7c78497b : tests that use gegl.png are broken on non-amd64 - sed -e '/clones.xml/d' \ - -e '/composite-transform.xml/d' \ - -i tests/compositions/meson.build || die - - # fix skipping mipmap tests due to executable not found - for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do - sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die - sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die - done - - gnome2_environment_reset - - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - # - Disable documentation as the generating is bit automagic - # if anyone wants to work on it just create bug with patch - -Ddocs=false - -Dexiv2=disabled - -Dgdk-pixbuf=enabled - -Dgexiv2=disabled - # - There are two checks for dot, one controllable by --with(out)-graphviz - # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - -Dgraphviz=disabled - -Djasper=disabled - -Dlibjpeg=enabled - -Dlibpng=enabled - # - libspiro: not in portage main tree - -Dlibspiro=disabled - -Dlua=disabled - -Dmrg=disabled - -Dpango=enabled - -Dsdl2=disabled - # - Parameter -Dworkshop=false disables any use of Lua, effectivly - -Dworkshop=false - $(meson_feature cairo) - $(meson_feature cairo pangocairo) - $(meson_feature ffmpeg libav) - $(meson_feature lcms) - $(meson_feature lensfun) - $(meson_feature openexr) - $(meson_feature pdf poppler) - $(meson_feature raw libraw) - $(meson_feature sdl sdl1) - $(meson_feature svg librsvg) - $(meson_feature test pygobject) - $(meson_feature tiff libtiff) - $(meson_feature umfpack) - # - v4l support does not work with our media-libs/libv4l-0.8.9, - # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - $(meson_feature v4l libv4l) - $(meson_feature v4l libv4l2) - $(meson_feature vala vapigen) - $(meson_feature webp) - $(meson_use introspection) - ) - meson_src_configure -} diff --git a/media-libs/gegl/gegl-0.4.24.ebuild b/media-libs/gegl/gegl-0.4.24.ebuild index 4a558f3e3735..973f6d47b148 100644 --- a/media-libs/gegl/gegl-0.4.24.ebuild +++ b/media-libs/gegl/gegl-0.4.24.ebuild @@ -14,12 +14,12 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" SRC_URI="" else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" + SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" -HOMEPAGE="http://www.gegl.org/" +HOMEPAGE="https://gegl.org/" LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild new file mode 100644 index 000000000000..ebb48c1879aa --- /dev/null +++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +# vala and introspection support is broken, bug #468208 +VALA_USE_DEPEND=vapigen + +inherit meson gnome2-utils python-any-r1 vala + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" + SRC_URI="" +else + SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="A graph based image processing framework" +HOMEPAGE="https://gegl.org/" + +LICENSE="|| ( GPL-3+ LGPL-3 )" +SLOT="0.4" + +IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp" +REQUIRED_USE=" + svg? ( cairo ) + test? ( introspection ) + vala? ( introspection ) +" + +RESTRICT="!test? ( test )" + +# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE +# so there is no chance to support libav right now (Gentoo bug #567638) +# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! +RDEPEND=" + >=dev-libs/glib-2.44:2 + >=dev-libs/json-glib-1.2.6 + >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] + media-libs/libnsgif + >=media-libs/libpng-1.6.0:0= + >=sys-libs/zlib-1.2.0 + virtual/jpeg:0= + >=x11-libs/gdk-pixbuf-2.32:2 + >=x11-libs/pango-1.38.0 + cairo? ( >=x11-libs/cairo-1.12.2 ) + ffmpeg? ( media-video/ffmpeg:0= ) + introspection? ( >=dev-libs/gobject-introspection-1.32:= ) + lcms? ( >=media-libs/lcms-2.8:2 ) + lensfun? ( >=media-libs/lensfun-0.2.5 ) + openexr? ( >=media-libs/openexr-1.6.1:= ) + pdf? ( >=app-text/poppler-0.71.0[cairo] ) + raw? ( >=media-libs/libraw-0.15.4:0= ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + svg? ( >=gnome-base/librsvg-2.40.6:2 ) + tiff? ( >=media-libs/tiff-4:0 ) + umfpack? ( sci-libs/umfpack ) + v4l? ( >=media-libs/libv4l-1.0.1 ) + webp? ( >=media-libs/libwebp-0.5.0:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + >=sys-devel/libtool-2.2 + virtual/pkgconfig + test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) + vala? ( $(vala_depend) ) +" + +DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch + "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch +) + +python_check_deps() { + use test || return 0 + has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + # don't require Apple's OpenCL on versions of OSX that don't have it + if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then + sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die + fi + + # commit 7c78497b : tests that use gegl.png are broken on non-amd64 + sed -e '/clones.xml/d' \ + -e '/composite-transform.xml/d' \ + -i tests/compositions/meson.build || die + + # fix skipping mipmap tests due to executable not found + for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do + sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die + sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die + done + + # fix 'build'headers from *.cl on gentoo-hardened, bug 739816 + pushd "${S}/opencl/" || die + for file in *.cl; do + if [ -f "$file" ]; then + "${EPYTHON}" cltostring.py "${file}" || die + fi + done + popd || die + + gnome2_environment_reset + + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + # - Disable documentation as the generating is bit automagic + # if anyone wants to work on it just create bug with patch + -Ddocs=false + -Dexiv2=disabled + -Dgdk-pixbuf=enabled + -Dgexiv2=disabled + # - There are two checks for dot, one controllable by --with(out)-graphviz + # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. + -Dgraphviz=disabled + -Djasper=disabled + -Dlibjpeg=enabled + -Dlibpng=enabled + # - libspiro: not in portage main tree + -Dlibspiro=disabled + -Dlua=disabled + -Dmrg=disabled + -Dpango=enabled + -Dsdl2=disabled + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_feature cairo) + $(meson_feature cairo pangocairo) + $(meson_feature ffmpeg libav) + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature openexr) + $(meson_feature pdf poppler) + $(meson_feature raw libraw) + $(meson_feature sdl sdl1) + $(meson_feature svg librsvg) + $(meson_feature test pygobject) + $(meson_feature tiff libtiff) + $(meson_feature umfpack) + # - v4l support does not work with our media-libs/libv4l-0.8.9, + # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 + $(meson_feature v4l libv4l) + $(meson_feature v4l libv4l2) + $(meson_feature vala vapigen) + $(meson_feature webp) + $(meson_use introspection) + ) + meson_src_configure +} diff --git a/media-libs/gegl/gegl-0.4.26.ebuild b/media-libs/gegl/gegl-0.4.26.ebuild new file mode 100644 index 000000000000..33138479a21b --- /dev/null +++ b/media-libs/gegl/gegl-0.4.26.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +# vala and introspection support is broken, bug #468208 +VALA_USE_DEPEND=vapigen + +inherit meson gnome2-utils python-any-r1 vala + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" + SRC_URI="" +else + SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="A graph based image processing framework" +HOMEPAGE="https://gegl.org/" + +LICENSE="|| ( GPL-3+ LGPL-3 )" +SLOT="0.4" + +IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp" +REQUIRED_USE=" + svg? ( cairo ) + test? ( introspection ) + vala? ( introspection ) +" + +RESTRICT="!test? ( test )" + +# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE +# so there is no chance to support libav right now (Gentoo bug #567638) +# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! +RDEPEND=" + >=dev-libs/glib-2.44:2 + >=dev-libs/json-glib-1.2.6 + >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] + media-libs/libnsgif + >=media-libs/libpng-1.6.0:0= + >=sys-libs/zlib-1.2.0 + virtual/jpeg:0= + >=x11-libs/gdk-pixbuf-2.32:2 + >=x11-libs/pango-1.38.0 + cairo? ( >=x11-libs/cairo-1.12.2 ) + ffmpeg? ( media-video/ffmpeg:0= ) + introspection? ( >=dev-libs/gobject-introspection-1.32:= ) + lcms? ( >=media-libs/lcms-2.8:2 ) + lensfun? ( >=media-libs/lensfun-0.2.5 ) + openexr? ( >=media-libs/openexr-1.6.1:= ) + pdf? ( >=app-text/poppler-0.71.0[cairo] ) + raw? ( >=media-libs/libraw-0.15.4:0= ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + svg? ( >=gnome-base/librsvg-2.40.6:2 ) + tiff? ( >=media-libs/tiff-4:0 ) + umfpack? ( sci-libs/umfpack ) + v4l? ( >=media-libs/libv4l-1.0.1 ) + webp? ( >=media-libs/libwebp-0.5.0:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + >=sys-devel/libtool-2.2 + virtual/pkgconfig + test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) + vala? ( $(vala_depend) ) +" + +DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch + "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch +) + +python_check_deps() { + has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # don't require Apple's OpenCL on versions of OSX that don't have it + if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then + sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die + fi + + # commit 7c78497b : tests that use gegl.png are broken on non-amd64 + sed -e '/clones.xml/d' \ + -e '/composite-transform.xml/d' \ + -i tests/compositions/meson.build || die + + # fix skipping mipmap tests due to executable not found + for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do + sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die + sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die + done + + gnome2_environment_reset + + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + # - Disable documentation as the generating is bit automagic + # if anyone wants to work on it just create bug with patch + -Ddocs=false + -Dexiv2=disabled + -Dgdk-pixbuf=enabled + -Dgexiv2=disabled + # - There are two checks for dot, one controllable by --with(out)-graphviz + # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. + -Dgraphviz=disabled + -Djasper=disabled + -Dlibjpeg=enabled + -Dlibpng=enabled + # - libspiro: not in portage main tree + -Dlibspiro=disabled + -Dlua=disabled + -Dmrg=disabled + -Dpango=enabled + -Dsdl2=disabled + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_feature cairo) + $(meson_feature cairo pangocairo) + $(meson_feature ffmpeg libav) + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature openexr) + $(meson_feature pdf poppler) + $(meson_feature raw libraw) + $(meson_feature sdl sdl1) + $(meson_feature svg librsvg) + $(meson_feature test pygobject) + $(meson_feature tiff libtiff) + $(meson_feature umfpack) + # - v4l support does not work with our media-libs/libv4l-0.8.9, + # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 + $(meson_feature v4l libv4l) + $(meson_feature v4l libv4l2) + $(meson_feature vala vapigen) + $(meson_feature webp) + $(meson_use introspection) + ) + meson_src_configure +} diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index 6fe143f95cde..ad877bef7420 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) VALA_USE_DEPEND=vapigen inherit meson gnome2-utils python-any-r1 vala @@ -13,12 +13,12 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" SRC_URI="" else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" + SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" -HOMEPAGE="http://www.gegl.org/" +HOMEPAGE="https://gegl.org/" LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest index 4c9867678db5..b4a12c9aba25 100644 --- a/media-libs/gexiv2/Manifest +++ b/media-libs/gexiv2/Manifest @@ -1,11 +1,4 @@ -AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64 -AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f -DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7 -DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9 DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d -EBUILD gexiv2-0.10.10-r1.ebuild 1847 BLAKE2B 6df34b756c2676082fafd030e77a4f3e3616233d6de1e31b1fe6b4ac486d4a9d681e1203da8bb758619b5d52a33107e6b6d9148afc42d46cac612fcc97c3ebad SHA512 e984aee5f691d012ae3324cda44b59b56b756d871d5af79b0e7915c5aef7e98c9ce702c7afcc3276ac732771656372b440ffe04f6c18fe7f553e19af9e3521b3 -EBUILD gexiv2-0.12.0-r1.ebuild 1785 BLAKE2B 59051cdab00b0bbc4cd97b70e766b601922037e33aca40b9e274d11723ecd94664005ff5c58900911fe8b26af18c4c5757c5e5f892198b86f41b271c30e51efa SHA512 1a16de479c4d773cb399bdfa303800125c5f244c11c3847e6653cc51579904150916c8256c7f00363a071cc4ed0b47a394e40472355b90354ebb638dc3f6aeb2 -EBUILD gexiv2-0.12.0.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6 -EBUILD gexiv2-0.12.1.ebuild 1787 BLAKE2B aa912f4c5af788650e40aec8d2713f1b9857c3ebde662932485796e83b970d2a60cc66516c00a0679d5215a093fe1f1d9bc005aa04d7c740ee07267570400e01 SHA512 0dfbe138f183fea928dfc2f4d534f4869b0c1d2df913516312cb6019d5d02120419c4a82eb1b650e22559f4ead2bba22716b7990079d58698eadb9de573104dd +EBUILD gexiv2-0.12.1.ebuild 1785 BLAKE2B 4067878033d384921908fca039da503cbfd4e2a1e25edd722b27d03d4944a59e40a8e52c8f13cb321d6ae400d000d8dcfe72822223aaa2d5fbdc337981ae6c9c SHA512 bf31e36da15c885c14e6def050e750c2ea042aaeda014742c8d97466b3e02c67672852513d6932c50fb822fb4ec80963ecfabd2102f12272248a59f2f646f76a EBUILD gexiv2-9999.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6 MISC metadata.xml 513 BLAKE2B 7820281c36922b5e68aacb3c3935f7193e2725515f196eaf72f6eba42327a8c8d10ceaed6422fb95cf15b0f1a0d96a168c7a677e42ae847fe050b26c39c39a0b SHA512 deb951010c3342738d8ad5b9e79baa790913f3b906799f9f72f59d4e978f0564fc52f14482bb632ffe817488d154bd8bafe98bc5eea07b7c2da1504867d671b0 diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch deleted file mode 100644 index 03f0e4fd3162..000000000000 --- a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -9,12 +9,12 @@ gir = find_program('g-ir-scanner', requi - vapigen = find_program('vapigen', required: false) - vala = find_program('valac', required: false) - --introspection_available = gir.found() and not get_option('disable-introspection') --vapi_available = introspection_available and vapigen.found() and not get_option('disable-vala') -+introspection_available = gir.found() and get_option('introspection') -+vapi_available = introspection_available and vapigen.found() and get_option('vapi') - - subdir('gexiv2') - --if get_option('enable-gtk-doc') -+if get_option('gtk_doc') - subdir('docs') - endif - ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,5 @@ --option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference (depends on GTK-Doc)') --option('disable-introspection', type: 'boolean', value : false, description: 'Disable GObject Introspection') --option('disable-vala', type: 'boolean', value: false, description: 'Disable generation of vala vapi file') -+option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable generating the API reference (depends on GTK-Doc)') -+option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection') -+option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file') - option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2 overrides (default = auto, no disables python2)') - option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto, no disables python3)') diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch deleted file mode 100644 index daf72ef3a85b..000000000000 --- a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: "Marty E. Plummer" -Date: Sun, 13 Jan 2019 13:33:32 -0600 -Subject: [PATCH] meson.build: improve handling of vapi - -As it currently stands the vapi files are not generatable on linux -distros which do not provide unversioned valac/vapigen. Use instead -meson's add_languages function to handle detection of existing vala -toolchain, which will check the VALAC and VAPIGEN env vars. - -Signed-off-by: Marty E. Plummer - ---- a/meson.build -+++ b/meson.build -@@ -6,11 +6,9 @@ exiv2 = dependency('exiv2', version : '> - gobject = dependency('gobject-2.0', version : '>= 2.38.0') - - gir = find_program('g-ir-scanner', required: false) --vapigen = find_program('vapigen', required: false) --vala = find_program('valac', required: false) - - introspection_available = gir.found() and get_option('introspection') --vapi_available = introspection_available and vapigen.found() and get_option('vapi') -+vapi_available = introspection_available and add_languages('vala', required: false) and get_option('vapi') - - subdir('gexiv2') - ---- a/test/meson.build -+++ b/test/meson.build -@@ -17,15 +17,11 @@ regression_test = executable('gexiv2-reg - test('regression', regression_test, env : test_env) - - if vapi_available -- valac = find_program('valac') -- if valac.found() -- add_languages('vala') -- executable('gexiv2-dump', -- 'gexiv2-dump.vala', -- include_directories : include_directories('..'), -- dependencies : [gobject, vapi], -- link_with : gexiv2) -- endif -+ executable('gexiv2-dump', -+ 'gexiv2-dump.vala', -+ include_directories : include_directories('..'), -+ dependencies : [gobject, vapi], -+ link_with : gexiv2) - endif - - if python2_available diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild deleted file mode 100644 index 87a3618d7c7e..000000000000 --- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) - -inherit meson python-r1 vala xdg-utils - -DESCRIPTION="GObject-based wrapper around the Exiv2 library" -HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git" - inherit git-r3 -else - SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="gtk-doc +introspection python static-libs test +vala" -REQUIRED_USE=" - python? ( introspection ${PYTHON_REQUIRED_USE} ) - test? ( python introspection ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.38.0:2 - >=media-gfx/exiv2-0.21:= - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - test? ( - dev-python/pygobject:3 - media-gfx/exiv2[xmp] - ) - vala? ( $(vala_depend) ) -" - -PATCHES=( - # renames meson options to current git HEAD's names, current naming scheme - # is rather awkward - "${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch - "${FILESDIR}"/${PN}-0.10.10-vala-fixup.patch -) - -src_prepare() { - xdg_environment_reset - use vala && vala_src_prepare - default -} - -src_configure() { - local emesonargs=( - $(meson_use introspection) - $(meson_use vala vapi) - $(meson_use gtk-doc gtk_doc) - # prevents installation of python modules (uses install_data from meson - # which does not optimize the modules - -Dpython2-girdir=no - -Dpython3-girdir=no - ) - meson_src_configure -} - -src_install() { - meson_src_install - - if use python ; then - python_moduleinto gi/overrides/ - python_foreach_impl python_domodule GExiv2.py - fi -} diff --git a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild b/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild deleted file mode 100644 index 814a3757847b..000000000000 --- a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit meson python-r1 vala - -DESCRIPTION="GObject-based wrapper around the Exiv2 library" -HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git" - inherit git-r3 -else - SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -fi - -LICENSE="LGPL-2.1+ GPL-2" -SLOT="0" -IUSE="gtk-doc +introspection python static-libs test +vala" -REQUIRED_USE=" - python? ( introspection ${PYTHON_REQUIRED_USE} ) - test? ( python introspection ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=media-gfx/exiv2-0.26:= - >=dev-libs/glib-2.38.0:2 - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - python? ( ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - test? ( media-gfx/exiv2[xmp] ) - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -src_prepare() { - default - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - $(meson_use vala vapi) - -Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either - # Prevents installation of python modules (uses install_data from meson - # which does not optimize the modules) - -Dpython2_girdir=no - -Dpython3_girdir=no - ) - meson_src_configure -} - -src_install() { - meson_src_install - - if use python ; then - python_moduleinto gi/overrides/ - python_foreach_impl python_domodule GExiv2.py - fi -} diff --git a/media-libs/gexiv2/gexiv2-0.12.0.ebuild b/media-libs/gexiv2/gexiv2-0.12.0.ebuild deleted file mode 100644 index e496ad32ab1f..000000000000 --- a/media-libs/gexiv2/gexiv2-0.12.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit meson python-r1 vala - -DESCRIPTION="GObject-based wrapper around the Exiv2 library" -HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git" - inherit git-r3 -else - SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi - -LICENSE="LGPL-2.1+ GPL-2" -SLOT="0" -IUSE="gtk-doc +introspection python static-libs test +vala" -REQUIRED_USE=" - python? ( introspection ${PYTHON_REQUIRED_USE} ) - test? ( python introspection ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - test? ( - dev-python/pygobject:3 - media-gfx/exiv2[xmp] - ) - vala? ( $(vala_depend) ) -" -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.38.0:2 - >=media-gfx/exiv2-0.21:= - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use introspection) - $(meson_use vala vapi) - $(meson_use gtk-doc gtk_doc) - # Prevents installation of python modules (uses install_data from meson - # which does not optimize the modules) - -Dpython2_girdir=no - -Dpython3_girdir=no - ) - meson_src_configure -} - -src_install() { - meson_src_install - - if use python ; then - python_moduleinto gi/overrides/ - python_foreach_impl python_domodule GExiv2.py - fi -} diff --git a/media-libs/gexiv2/gexiv2-0.12.1.ebuild b/media-libs/gexiv2/gexiv2-0.12.1.ebuild index d39cb8d6a019..b4a53c46f9b8 100644 --- a/media-libs/gexiv2/gexiv2-0.12.1.ebuild +++ b/media-libs/gexiv2/gexiv2-0.12.1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" fi LICENSE="LGPL-2.1+ GPL-2" diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest index adab76817468..b2391298dbe5 100644 --- a/media-libs/giflib/Manifest +++ b/media-libs/giflib/Manifest @@ -1,5 +1,5 @@ AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d293573cfbc80a1105f65041d201a0231cb7e69791b8441a5b286841b507ad6b908f4fe0a514a79b8ba6546385f2fa70 SHA512 2d899722238eecd8bdfa7412cf5778c42c58d2e93c9e02e458b5dc636933f7765fd39ceb7906200425039a6c908b47403ec306dc3c79e1402f3824a351a17081 AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736 -EBUILD giflib-5.2.1-r1.ebuild 1937 BLAKE2B 1486e6f03d0a69b64c826aa4502353ccdbc9d96c1f0503573bac83aceb8a798b42266f70a227d5b515aaa0a4a4a9c4c73548637187616185f21982969d319f18 SHA512 bf1c6cc39d48ce21ccc139382ae2b7195a6629a938e7f54f92b8b6684626046ceb15431062107783efc12e4dafee9babcdb01f81a5bd343b4d11eb04a494dad0 +EBUILD giflib-5.2.1-r1.ebuild 1903 BLAKE2B 3d3784ca1f125f14444ba7b267482d5b7397e5354cc506feae1a5a2476033231ac134c3e9ea59cb884c96694ed5342bc61535318c1cf710f3de23b5d4f4cb0bb SHA512 322b8eab136c0f0917de59ea677f0584dfb64322065cfed606683cb68945a9cef41c0bb07339f0e2ce0233d758e1b907bbacafa8adf9499e5b36ad175529f41f MISC metadata.xml 248 BLAKE2B 46adedd4004568ddad75971a42a14a53916a118e2df96eec2eb420a1c55009c152f5d41510e7b3030825d81d476c3db981847f12aedafa2c0b556b549666c389 SHA512 3e9d14a9f2c2e9bf88543fb580abb09dfc35c8065b8f77579bbbae2330fa105ca808f35c8542f4db4b0dc0ac4026bc26adb9f2f45ac52755b822e0b98c751532 diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild index 7a6bc4d1161d..74daec895cf6 100644 --- a/media-libs/giflib/giflib-5.2.1-r1.ebuild +++ b/media-libs/giflib/giflib-5.2.1-r1.ebuild @@ -14,8 +14,6 @@ SLOT="0/7" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs" -DEPEND="doc? ( app-text/xmlto )" - PATCHES=( "${FILESDIR}"/${PN}-5.1.9-gentoo.patch "${FILESDIR}"/${PN}-5.2.1-fix-missing-quantize-API-symbols.patch diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest index 0fe90141ca37..90bea64e21ee 100644 --- a/media-libs/glfw/Manifest +++ b/media-libs/glfw/Manifest @@ -1,5 +1,5 @@ DIST glfw-3.2.1.tar.gz 472450 BLAKE2B abffe6580dee968baa23f8f4f38af164f7479fe0bf3c4d64cc6386b1450aee4a8e8de5f963faecd536e2bbbc925da7ac1dcc16f219984758950263e6b6d022e1 SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56 EBUILD glfw-3.2.1.ebuild 890 BLAKE2B 1547fc4dbaba7dcc405c6768cbce0fc351e1d1b089136e0ddda290ce80667c4293d9cf2b9f3c7039f5b11e83ab3886354038eaf5e96f8f2bcbeba7751227ecc6 SHA512 9f3b7e2b0c15b3883a88244b8c7e89e1dec2513a968f44839ae83471e060b29663ea343e80693bf818267ab0505e237fa03e5f081a508caa048758bd3059ce44 -EBUILD glfw-3.3.2.ebuild 907 BLAKE2B 802330dfca2487ddf282e97275ccfdef1b53808a8a99636a5fe59010203a911b43b51b6508fe536370680697b0138774b09457e446f4540351c768dda818d4b3 SHA512 96de9db15b776476b9e9a94b2c36e90f1a9bb1c3e9539228b42157ce58297257e0a552fd990bb5323a0a793314bddd5dacbe98c6818c5f31a00c92995504809e +EBUILD glfw-3.3.2.ebuild 912 BLAKE2B 91b4b9abf6369e450a1a7ece4eece6563985c88352e8fe4349afc1309bffd072281cfdb55e3d08ccad589785ece93da561edb0034793b455bce5e486ef2f35af SHA512 1060070fdfc189c7ceadc9b5cd27992ca23a605a63d0e3d0ea3fce91a3f8d750b7c59f531d5f1b12e870ecaad4131d35c63faa2841dbf7e1a9adbb1ab7e21a48 MISC metadata.xml 327 BLAKE2B fd8eb3b2c083a3f02e52ae8290f0e1105847ff17cd052eb0211bd007cddf452f34009ad2eaee0809f90a633e60baf4cd2a47e2184d21f691a16219c409ebc907 SHA512 d9d3fe05c0a07b0e0ea3f49589117dc9e3d7859bb0207dcea3d95451858b040c27bba2eaf422b2dcdc6aa8e08b0147ff32d12fea93b648fd861df0e70960a650 diff --git a/media-libs/glfw/glfw-3.3.2.ebuild b/media-libs/glfw/glfw-3.3.2.ebuild index 8639de154daf..f265b08bf58b 100644 --- a/media-libs/glfw/glfw-3.3.2.ebuild +++ b/media-libs/glfw/glfw-3.3.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~x86" +KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86" IUSE="wayland" RDEPEND=" diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest index f53e2a83f880..eec8bd98785d 100644 --- a/media-libs/glm/Manifest +++ b/media-libs/glm/Manifest @@ -6,6 +6,6 @@ DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d609 DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df EBUILD glm-0.9.9.7.ebuild 1211 BLAKE2B b567e64d07b301f9290e7ab533145497307185050b3ffea4de9fc8c27ba6c3d2f6eb3356d35b2aa1517aa1495cd2632de8afdbba0d157186246789841950f5f6 SHA512 c7ff576f73564277be087ac108e255699017ede17ead85ea50074b08bcacadf25f1bcdd6286f046893f3f4afc514ca03c7612462707cb170d8c982f409225a0a -EBUILD glm-0.9.9.8-r1.ebuild 1381 BLAKE2B a9100dc51f5c51e40f06c07cfa43cf3af9bf049f4781210af1734babfc6b06ed75a219fe582fabfbb278d90f92675cca7f68ba54160dc39796c4d50bac130227 SHA512 0ebd101cb2ba46b73809514a3ae512d902567b28e70d2786dd0ae12055dd01c7af138ae3ad2598d0de67b6f322d5cb12b07b32a77ae8d120b4169df0f34a00b4 +EBUILD glm-0.9.9.8-r1.ebuild 1386 BLAKE2B 704298a94e2bfd0276f0c7a5c78c768cfe7a2c2baa27087ca895f3a8aa1baf2a55399a95c39e9f7c38e9529e95260c7948423396f0ad32310dd2a23973bc404b SHA512 ba2dac1166a9bfbbcb264a6aaa62de06f1f7bd8aca3b54cf3173e7c8477e35385e20760141fa8eb94d4dd69300e9f085ebcd7d08f15208924d4b1b56b378fdf5 EBUILD glm-0.9.9.8.ebuild 1229 BLAKE2B 137b4407d122ed1cabce0a0083216499fd4cad705fcc0f66bc14191b5abdac188b58746c9272f7ca316311547410d9f0eb297b437adf98f36b7a5d05d80d2d22 SHA512 3b103f7db0bd6df218109da65d17f1f323aaae481dea170ae6fc34e51aab7f802478abeba6bf5d40c848b02068f7217d4c0de5adae7667f78e98420e531b80df MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971 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 23b762f4160f..74788d45b6b9 100644 --- a/media-libs/glm/glm-0.9.9.8-r1.ebuild +++ b/media-libs/glm/glm-0.9.9.8-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( HappyBunny MIT )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2" RESTRICT="!test? ( test )" diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 8e5f59e8e993..4c32882ecf05 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -6,4 +6,4 @@ EBUILD gmmlib-20.2.2.ebuild 888 BLAKE2B bb3f30b545eabfe214fa659f887c082f1fa45fd1 EBUILD gmmlib-20.2.5.ebuild 884 BLAKE2B 424f9213091b171856cfa6980d30b38de1bdf8ed58ef70ba05292b7a00799ebc53f4dbdb0fd9d40447113a0637d1c91ca3a4f94c0f1b77853a996700074ff6bb SHA512 384e50e434e5efdd7b43c2532707d5571b30b5fa3ff934118d66d3a29e4e2d3e73fecdb2d430ead8391ddfa451733f0b9c8eddfd949984f09b86d856309c0c7c EBUILD gmmlib-20.3.2.ebuild 884 BLAKE2B 424f9213091b171856cfa6980d30b38de1bdf8ed58ef70ba05292b7a00799ebc53f4dbdb0fd9d40447113a0637d1c91ca3a4f94c0f1b77853a996700074ff6bb SHA512 384e50e434e5efdd7b43c2532707d5571b30b5fa3ff934118d66d3a29e4e2d3e73fecdb2d430ead8391ddfa451733f0b9c8eddfd949984f09b86d856309c0c7c EBUILD gmmlib-9999.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28 -MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec +MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3 diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml index 7ed71e55dc04..80088c21d0ab 100644 --- a/media-libs/gmmlib/metadata.xml +++ b/media-libs/gmmlib/metadata.xml @@ -4,8 +4,4 @@ media-video@gentoo.org - - marecki@gentoo.org - Marek Szuba - diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest index 08e9600371f6..d07f5c27f040 100644 --- a/media-libs/graphene/Manifest +++ b/media-libs/graphene/Manifest @@ -1,7 +1,3 @@ -DIST graphene-1.10.0.tar.xz 289452 BLAKE2B 41af96ffcdb2d8ad2fce7a242cef74cead09ce444514f85a97ac609c6518c60cbd5fb44b58b24973fe9a372f898ca99b79cfd776c968d53b72fc20c5d076a230 SHA512 842ac2c9c2046f07f8421b99292cac348276bb1e025250c7e0dc3ec7f90cb33094b765034862f325dd78f93aa5484ad75a4ad6139fe13330d9e41e3a7cb830d0 DIST graphene-1.10.2.tar.xz 292372 BLAKE2B 94553a32dc57216402a9676e11525552c010d970caeb1256dde50ca842b4d673ad78d004d57e7c7a017b8c6e64ad75fc3b03603cba746027ab10befa76d32955 SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0 -DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c -EBUILD graphene-1.10.0.ebuild 1701 BLAKE2B d794e007a37fcebfb5450991bc326c8f5fac6093f6fb7002147fda7d3965d17544810e93f48ce56b42ba28625e3dabc4dd57c3db041eb555b59faa0236ef7b1a SHA512 64c86a8ab7601bd6d422ec8ad28736e83c91666d1576cb7f7f18e44e46ad23dfcc9f8f37f55b3456227e89bff4ab34ce8ac7da4a82886bdbfde85bfffe937bb4 -EBUILD graphene-1.10.2.ebuild 1703 BLAKE2B f27f76b4177b900fafd3f604a6985ef5e84bbcfaaacec34c8b033add58edb083d8c1fc1dc710a4f54320e5cd88cfaae369b3b4c4812dc17c93b6d5f6e064d3ab SHA512 8473c63991ac455363030490bd178e992dd79caee49915571855b6ce1bf5942f6a3c1a5f9e112f70206d41c2f88018954ffc1afe89b56863e4287e05737511af -EBUILD graphene-1.8.6.ebuild 1839 BLAKE2B eb06a3ebc7e3befed4777fabab55b9a670d5dad677a8cbba50f9afec801e29cc5557dd63a1bde8e4da675d1ececc5c760db8c983ed417c1bfee0fa96872a83ea SHA512 327723ed935545bc2cbbe5590724a2849bbef3e5f72160e4b1f768fbe9c954e39b1d97a7e4a43f81f3b30dff2abf73db66aef3e8b1c1108b0951f7f3a78c98a2 +EBUILD graphene-1.10.2.ebuild 1701 BLAKE2B d794e007a37fcebfb5450991bc326c8f5fac6093f6fb7002147fda7d3965d17544810e93f48ce56b42ba28625e3dabc4dd57c3db041eb555b59faa0236ef7b1a SHA512 64c86a8ab7601bd6d422ec8ad28736e83c91666d1576cb7f7f18e44e46ad23dfcc9f8f37f55b3456227e89bff4ab34ce8ac7da4a82886bdbfde85bfffe937bb4 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056 diff --git a/media-libs/graphene/graphene-1.10.0.ebuild b/media-libs/graphene/graphene-1.10.0.ebuild deleted file mode 100644 index 32de0b68ad43..000000000000 --- a/media-libs/graphene/graphene-1.10.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit xdg-utils meson multilib-minimal python-any-r1 - -DESCRIPTION="A thin layer of types for graphic libraries" -HOMEPAGE="https://ebassi.github.io/graphene/" -SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" -IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}] - introspection? ( dev-libs/gobject-introspection:= ) -" -DEPEND="${RDEPEND}" -# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway -BDEPEND=" - ${PYTHON_DEPS} - doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - virtual/pkgconfig -" - -multilib_src_configure() { - # TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream? - local emesonargs=( - -Dgtk_doc=$(multilib_native_usex doc true false) - -Dgobject_types=true - -Dintrospection=$(multilib_native_usex introspection true false) - -Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be "${T}"/73hamlib + doenvd "${T}"/73hamlib +} diff --git a/media-libs/hamlib/hamlib-4.0_rc2.ebuild b/media-libs/hamlib/hamlib-4.0_rc2.ebuild index 48f31be1e14a..78dd7f26161c 100644 --- a/media-libs/hamlib/hamlib-4.0_rc2.ebuild +++ b/media-libs/hamlib/hamlib-4.0_rc2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) MY_P=${P/_rc2/~rc2} inherit autotools python-single-r1 diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 28b939f8b22a..611e586afb67 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,12 +1,6 @@ -DIST harfbuzz-2.6.5.tar.xz 8510596 BLAKE2B e495fbba7e0cb58918afeb6beb3ebcf936be896ca606cef27dcbfb9b5f10add144f7fcaa50dec35a9f909d7e87deebadb7c9e6bbbadcbd799effd96076786cde SHA512 ae66211f9b4233c1da4b22b703ab4912f684390294c5c88113e6c927d5aeda8960da3ff607a7c7be5968d9fbb5a95b1f6933070d0aab2aa442a3ec8a112cd16f DIST harfbuzz-2.6.7.tar.xz 9001936 BLAKE2B bd3a195506253a1446e877c35c067cc874826fc6fdae3bc3a9bfd2b7682ce12de7e6d7fd4ebe03b8178d8b678c06aa2d71715b27236347224a68e4d98a72039e SHA512 6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de -DIST harfbuzz-2.6.8.tar.xz 8976516 BLAKE2B 46401ae06ec70172621d2aa354901f03173a273abdb0db909332946643e82b4286be690ac717a29304e9db121dd7f693b4ce19522de772f5d140986d6333e7ce SHA512 651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d -DIST harfbuzz-2.7.1.tar.gz 16603949 BLAKE2B 4c1792dfb8f2c777efb2f01dfc7e4642bda507813d21db5beee467b1368e991db0f0c3f903662da0a267e7af9a6c30bb258fa057e42d3096f9f8d23ccf4bac9e SHA512 a04864e0f5e523e9d025f066e0850afdfdf53acc9881c0284034ab4384088b118551a899ae5e77bbd821c344b97fb5e0a3d4506bbb812eb0019080be7b3f75f1 DIST harfbuzz-2.7.2.tar.gz 16605557 BLAKE2B 246ab64e29afcadc692b57bad84acdea1f9200a63f6f8b1519d12b8515ec65dc45e2edf3abdde473b71364427a689d92ce2ee25c514edf4b1e680dd423d774ee SHA512 2eeb198dab1ed1cc7d10c3890293ff40e9f37372413877a5bd44d66e88d8460a81f51cbe71c328b1300f542ca8de3269749d1d01d0c324c8b95a9c038fbe1521 -EBUILD harfbuzz-2.6.5.ebuild 3164 BLAKE2B 205fecfb2ba8f0bbcbe68bff20c0e7136589a0415270ef4f96b62941e52da1fc26a99216324eddabdccc98465fa5c466411d360387f049b1f1184c4f22043416 SHA512 988a256f1994d61e0e7e1b526617f566e6c7fe3fa05057a445995a93dcd97a3ee8859bd40e1e0fb3043f46b3ce46bddabacbf6634823e47197372079a78ec8bd EBUILD harfbuzz-2.6.7.ebuild 3164 BLAKE2B 3898c5e563aa288fa02c933d8cec30f0eb010329345efd5fb6b13d99fe06b76d75a3b815f202a6a31729670b1f7f3f3500a783397d0a390147d4b836ce00ec47 SHA512 21869f25283685a9b56e625fe719c7922a9428c6db66181e977461f3292559796224d12708269964d5748981785dd5ce34adacfa5af12a4ec12d77b4f5b69c99 -EBUILD harfbuzz-2.6.8.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540 -EBUILD harfbuzz-2.7.1.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618 -EBUILD harfbuzz-2.7.2.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618 +EBUILD harfbuzz-2.7.2.ebuild 2668 BLAKE2B 044fd4a2cfd2d6fbd827b056a9bb86e07958b4ab77905346daacb9ae7862508adfb92347a0ab81c4aae6fe0a9cfe9ce218f822be9d667765f5ab074ce0ef0a22 SHA512 ae53fa7315dbda9a5c0d5c727591d4ca4a67bf43045eee8497834a4de0b8fa146a9a5304fd459848a0b89439d2280a12d6d5620c9968e3e0a097c15d549b76ea EBUILD harfbuzz-9999.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd diff --git a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild deleted file mode 100644 index 63f6e1fd3798..000000000000 --- a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools flag-o-matic libtool multilib-minimal 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}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 +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} - test? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-util/gtk-doc-am - virtual/pkgconfig -" -# eautoreconf requires gobject-introspection-common -# ragel needed if regenerating *.hh files from *.rl -if [[ ${PV} = 9999 ]] ; then - DEPEND+=" - >=dev-libs/gobject-introspection-common-1.34 - dev-util/ragel - " -fi - -pkg_setup() { - use test && python-any-r1_pkg_setup - if ! use debug ; then - append-cppflags -DHB_NDEBUG - fi -} - -src_prepare() { - default - - xdg_environment_reset - - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then - # on Darwin/Solaris we need to link with g++, like automake defaults - # to, but overridden by upstream because on Linux this is not - # necessary, bug #449126 - sed -i \ - -e 's/\/CXXLINK/' \ - src/Makefile.am || die - sed -i \ - -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \ - src/Makefile.in || die - sed -i \ - -e '/AM_V_CCLD/s/\/CXXLINK/' \ - test/api/Makefile.in || die - fi - - sed -i \ - -e 's:tests/macos.tests::' \ - test/shaping/data/in-house/Makefile.sources \ - test/shaping/data/in-house/Makefile.in || die # bug 726120 - - eautoreconf - elibtoolize # for Solaris - - # bug 618772 - append-cxxflags -std=c++14 -} - -multilib_src_configure() { - # harfbuzz-gobject only used for instrospection, bug #535852 - local myeconfargs=( - --without-coretext - --without-fontconfig #609300 - --without-uniscribe - $(use_enable static-libs static) - $(multilib_native_use_with cairo) - $(use_with glib) - $(use_with introspection gobject) - $(use_with graphite graphite2) - $(use_with icu) - $(multilib_native_use_enable introspection) - $(use_with truetype freetype) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/media-libs/harfbuzz/harfbuzz-2.6.8.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.8.ebuild deleted file mode 100644 index bdc327af67b0..000000000000 --- a/media-libs/harfbuzz/harfbuzz-2.6.8.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools flag-o-matic libtool multilib-minimal 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}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 +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} - test? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-util/gtk-doc-am - virtual/pkgconfig -" -# eautoreconf requires gobject-introspection-common -# ragel needed if regenerating *.hh files from *.rl -if [[ ${PV} = 9999 ]] ; then - DEPEND+=" - >=dev-libs/gobject-introspection-common-1.34 - dev-util/ragel - " -fi - -pkg_setup() { - use test && python-any-r1_pkg_setup - if ! use debug ; then - append-cppflags -DHB_NDEBUG - fi -} - -src_prepare() { - default - - xdg_environment_reset - - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then - # on Darwin/Solaris we need to link with g++, like automake defaults - # to, but overridden by upstream because on Linux this is not - # necessary, bug #449126 - sed -i \ - -e 's/\/CXXLINK/' \ - src/Makefile.am || die - sed -i \ - -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \ - src/Makefile.in || die - sed -i \ - -e '/AM_V_CCLD/s/\/CXXLINK/' \ - test/api/Makefile.in || die - fi - - sed -i \ - -e 's:tests/macos.tests::' \ - test/shaping/data/in-house/Makefile.sources \ - test/shaping/data/in-house/Makefile.in || die # bug 726120 - - eautoreconf - elibtoolize # for Solaris - - # bug 618772 - append-cxxflags -std=c++14 -} - -multilib_src_configure() { - # harfbuzz-gobject only used for instrospection, bug #535852 - local myeconfargs=( - --without-coretext - --without-fontconfig #609300 - --without-uniscribe - $(use_enable static-libs static) - $(multilib_native_use_with cairo) - $(use_with glib) - $(use_with introspection gobject) - $(use_with graphite graphite2) - $(use_with icu) - $(multilib_native_use_enable introspection) - $(use_with truetype freetype) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild deleted file mode 100644 index d8d692333627..000000000000 --- a/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit flag-o-matic meson multilib-minimal 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 - test? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( dev-util/gtk-doc ) - introspection? ( dev-util/glib-utils ) -" - -pkg_setup() { - use test && 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 -} - -meson_multilib_native_feature() { - if multilib_is_native_abi && use "$1" ; then - echo "enabled" - else - echo "disabled" - fi -} - -multilib_src_configure() { - # harfbuzz-gobject only used for instrospection, bug #535852 - local emesonargs=( - -Dcairo="$(meson_multilib_native_feature cairo)" - -Dcoretext="disabled" - -Ddocs="$(meson_multilib_native_feature doc)" - -Dfontconfig="disabled" #609300 - -Dintrospection="$(meson_multilib_native_feature introspection)" - -Dstatic="$(usex static-libs true false)" - $(meson_feature glib) - $(meson_feature graphite) - $(meson_feature icu) - $(meson_feature introspection gobject) - $(meson_feature test tests) - $(meson_feature truetype freetype) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} diff --git a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild index d8d692333627..6d14ebf5eab7 100644 --- a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild @@ -15,7 +15,7 @@ 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="Old-MIT ISC icu" diff --git a/media-libs/kodi-platform/Manifest b/media-libs/kodi-platform/Manifest index c10b1be09d4f..7f625d720aec 100644 --- a/media-libs/kodi-platform/Manifest +++ b/media-libs/kodi-platform/Manifest @@ -1,6 +1,2 @@ -DIST kodi-platform-18.0_pre20180301.tar.gz 8605 BLAKE2B 8486c0777373de75c0120b3e62ef1ff43107b36471696a7329f15fc62670f230737ee382695dbcb61ca5215fa2898cf3c6ecdfc0b48043b57f48cf15adc9fbf5 SHA512 35bb8d27db3b1e9debef647e02c2cf4ba7f2b2bdde07cb57eedd5859800d0614426d82f4be9cdeb11dba6576cad93e43095a05047411dcbcb749609d51f53ec7 -DIST kodi-platform-18.0_pre20190429.tar.gz 8616 BLAKE2B 424fa1da5f2dda5343ebe8414555382be6391d9467e73a07088a9e46674508bd83aeec59277f5d0b6e4bf0e1a6c56910a338f1774b17ef4ad21ca7b1e4198fef SHA512 acbe478c2167cbd90ef8cd0ba6ea9ac657a4140f5337e840e960358b26cb3d7880e52527c0d7f6d0ae8068b92b3a3cc5719110163ecfa4520469fc64b8e1b9b7 -EBUILD kodi-platform-18.0_pre20180301.ebuild 628 BLAKE2B 03929d9e7863fc872d5cda7d580a6d91539846f213ef5bbb1e0bd572c9fa9211ec249d8e6fadc3b8b3bd26c7bd206268ebac6c995073d9063c0edca9fcb5e0f2 SHA512 466496d3c19431d76f9760460b36d69219627c9a4af7c3ec79aa53f62ced3c884770f0ce1e82c02b24cf5e72ee073b4421f0f1648ecee9b113c7cda8601d57f2 -EBUILD kodi-platform-18.0_pre20190429.ebuild 622 BLAKE2B 6bd6820ecf0f2e2671fb97ee27f979e31561c6e0d7737880ed726d20aa1d2026ac2b80d231df8ea4766aae4bb8df6fc4da76ca7b144997fee9eae9fc617f6b5a SHA512 cf22aae2a34784c97b4cd386a0dd60e9d30a683fd6dd2d8e262928ecc8e958743575b6d8924a0f67e0634a361ed239deb94461322636f30d59687531174e54a5 EBUILD kodi-platform-9999.ebuild 623 BLAKE2B 345edc3e460bbe3c5d599f11c4664bc824790684b1e2823b2988ac15c4b914c5dbec5668d102eaef163d336699ca5949fc55a8cf69b387a419780257d9ce5fff SHA512 74b534e39d9b6a71e1304967fcd6cf4c05690afb1a191f75d183dc1d1f334107cb8ab235500ebe2a405d0dc6e6ce8c0da7602f4253e673f86f8add53681c14d7 MISC metadata.xml 441 BLAKE2B 4b42fd04320e894c9693beb6f6db4a0f479da1f972710623860d43a9e553153ad079520931d9f91630c86fbab03c7b515d58f4a42456416ba5f2f72b1b632a81 SHA512 a511f2618515f70e7ce2bbdcc1dd8e98de49f17207ddfe7232733a517516cddfcb38659259b068b52cd9c8037d332e24821ad15bd65eefd1ed7dc3e4af9f2453 diff --git a/media-libs/kodi-platform/kodi-platform-18.0_pre20180301.ebuild b/media-libs/kodi-platform/kodi-platform-18.0_pre20180301.ebuild deleted file mode 100644 index 0af7be80322d..000000000000 --- a/media-libs/kodi-platform/kodi-platform-18.0_pre20180301.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="https://github.com/xbmc/${PN}.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~x86" - GIT_COMMIT="e8574b8" - SRC_URI="https://github.com/xbmc/${PN}/tarball/${GIT_COMMIT} -> ${P}.tar.gz" - S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}" -fi - -DESCRIPTION="Kodi platform support library" -HOMEPAGE="https://kodi.tv" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-18* - =dev-libs/libplatform-2* - dev-libs/tinyxml - " - -RDEPEND="${DEPEND}" diff --git a/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild b/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild deleted file mode 100644 index f094c2323f18..000000000000 --- a/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="https://github.com/xbmc/${PN}.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~x86" - GIT_COMMIT="915da08" - SRC_URI="https://github.com/xbmc/${PN}/tarball/${GIT_COMMIT} -> ${P}.tar.gz" - S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}" -fi - -DESCRIPTION="Kodi platform support library" -HOMEPAGE="https://kodi.tv" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-18* - =dev-libs/libplatform-2* - dev-libs/tinyxml - " - -RDEPEND="${DEPEND}" diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest index 5aa5c150c49d..acace06cc2e8 100644 --- a/media-libs/lcms/Manifest +++ b/media-libs/lcms/Manifest @@ -3,6 +3,6 @@ DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b EBUILD lcms-2.10.ebuild 1210 BLAKE2B 581f9a7df0e9e19fa96e5c33ef9a3e2dbdbdba5910180b700d813e6a2072c097fca73c4635d01f5c3096b6b2acd0d03ccdf87535330024917735cc563ab2651a SHA512 ae33fefe9567e72daad621ccc286e4c2906d5f70e826f3de87e9d92f34be311164b9812935d375b3d3c6ddf4788872cb0eca6bb856fc3aaadf53fb21960bf12e -EBUILD lcms-2.11.ebuild 1181 BLAKE2B b606ee845827169f4839a66c1f149c6714f5f89dc818507c2e709f56b07cadc251bad85446e423641038111fa69d21b70dfb35d24a465a30fe4886315a70d662 SHA512 0e840a799dec21b3cfb0edccd557309286807c996b27b2032daa82e10228161d4a242a0b7102f630831184e9cbfc4d7559c388cdc47661b04a7a848a4b8f4b79 +EBUILD lcms-2.11.ebuild 1175 BLAKE2B edb606f9ad9492f41a18a7580b7f35fe440af453411b68d42c75e6da04bc8b398779441c034a284d03fdc979fd9c636d0e82b9e97500412130dccf0f2312c5ce SHA512 17d45e9a6aea955ce211f8cbc609ff20e2c19694cdc354891ee9ea0c511748a2199c14216a6a3942e0e8a0fde827f93a18ada53be90fda16d2be22b551339445 EBUILD lcms-2.9.ebuild 1240 BLAKE2B df6256d156b2b0dac0acf03c4fb2f7c503edbf0915931e9273c4547688d6980b84f7c1fb03a619dbb1bd967b2ac2694adac0a3ee21eafd59772c57c1a2f13328 SHA512 564d2afaa448d6d560d0c2c6bc8c5e6b90f81e170a16e470d3193c24e71be8accc570d0414dcb0f13a9a82dbc21e0b6e9df31a790ad704b69c8348b29b589bdc MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43 diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild index 35c807f0a5c4..ccfaaba4d2d7 100644 --- a/media-libs/lcms/lcms-2.11.ebuild +++ b/media-libs/lcms/lcms-2.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz" LICENSE="MIT" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc jpeg static-libs test +threads tiff" RESTRICT="!test? ( test )" diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest index 7b1cad9431bb..69b3369ac00a 100644 --- a/media-libs/lib3ds/Manifest +++ b/media-libs/lib3ds/Manifest @@ -4,7 +4,7 @@ AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da4 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87 EBUILD lib3ds-1.3.0-r1.ebuild 554 BLAKE2B 606e9436fbbe9d2f2f8c7ff27a611dc411b2e52af03bfac3e897211365036b9f7b95f97171f40ade5a943a8482c6f920874e22381d67e95459bbc25c15467793 SHA512 67812bdf404fd8be46b8c11d38f5c1da89f3e36849add8843aa16e63a2569438941f770ff6bf0e680f1dee356d02f8a99e6d6c8714aa37f62165c5c84bca200c -EBUILD lib3ds-1.3.0-r2.ebuild 644 BLAKE2B 585ea5c886cda38e0a8bfb64bcbf5e4005ab7bbab0d3718436614ee649b44c8ae3ee0cc280727b03f3e648b0b364a7ffe2cf0aab0c114ab5e7589d66cb83ac0e SHA512 17cd4cd5b27b43dda3e2b6059f288d19b4ee26d7b9ec430f7143cd7365cc262c6de95ed8f3b7a324fbc672b2c21ad701552230fd93aaafcaf48f88e74efc556f -EBUILD lib3ds-2.0.0_rc1-r1.ebuild 703 BLAKE2B c9f519bd4a18f47c98f619a7a7582bd8395a31579ee2401642f3afd7d8e92002d727538397f5ad0820d88ef6d8544afc11dc25b898dffc844497041e2794e17d SHA512 838f040fbc069d2f0fffa8572571b20ad7d8631555e7342b8f2c9834ff045d26c044cef63ec303c9e2e055c210927ff0cdca400a071e7b277bef8f05e8e98ccd +EBUILD lib3ds-1.3.0-r2.ebuild 640 BLAKE2B 3bfb11f5a8c068985efa79b1383ba2fb064d1abb292d296896c20cea4ef82c70adeea74c7cc088c0059c35610efd6ff6f54f03b1f693a10e8e8d162e0e9be651 SHA512 b5e009cf9ba4510b6802b72e61e8de44cbea936b610c875bccfecc1e7f65f2249930aa4da7047b0834dc0d490d0c1f54eae2a0d1221a48ce1e58c12162bd12e4 +EBUILD lib3ds-2.0.0_rc1-r1.ebuild 699 BLAKE2B c7ed09eaa47b6efe577f63dd0048411a86e0d71b4b3fdd31c8fc9065542365b412c6b9f82d39cc05d30ce5ce4ba61c660d65a318e59ddce58ebc3cc99fabfd53 SHA512 9c5cb3890adc65efddc6f80cf168a92c03b5b24552f811e1815aee45f052758e29aa317b3222bc86deab6f8c35963d6b1269554ecc5788fa9e6e7dbbc5ee01a5 EBUILD lib3ds-2.0.0_rc1.ebuild 652 BLAKE2B a85855fa5d699c0e592437ba23fad789905ade2d5a3d8bc4d331c6fb0683dc451f57bd6674984324a0619a71f8bc5ee687f386dd9c569ac7ce203f21bd129594 SHA512 a1bc042ebaabe3775150cc52bda1fc5509a677057082a836b27e27181b706b1f0f00d7961df7faf2ec4e4a8d1f81be0fdecbdd4c0e4ac72d58adab07a9a256fe MISC metadata.xml 431 BLAKE2B c469c1c5f88e5e3014221c85aa47b95ac8720257705c35e79a76945aaebbe075d559696e6941d64c9237e849969c9a369c7a8db96d24965bef78b88b85ace7d5 SHA512 09ba499ac33f3a9162ac15c23d0c262a32606c731a775579a0c8d6d2a24137687e1306aa17e4f66d4aba57d141d991ab4186716e2b7a55ace4ce7526b37680f3 diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild index a6db6a0139e8..d9f40c14c6cf 100644 --- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild +++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ HOMEPAGE="https://code.google.com/p/lib3ds/" SRC_URI="https://${PN}.googlecode.com/files/${P}.zip" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="static-libs" BDEPEND="app-arch/unzip" diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild index b663c12a29cf..d5322d7ca6ec 100644 --- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild +++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ HOMEPAGE="https://code.google.com/p/lib3ds/" SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 x86" IUSE="static-libs" BDEPEND="app-arch/unzip" diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest index 8ddbdefa0bd0..41dcb26acd1e 100644 --- a/media-libs/lib3mf/Manifest +++ b/media-libs/lib3mf/Manifest @@ -3,5 +3,5 @@ AUX lib3mf-1.8.1-0002-Add-library-link-dependencies.patch 2567 BLAKE2B 10bae2bc7 AUX lib3mf-1.8.1-0003-Change-installation-include-dir.patch 1737 BLAKE2B b6ffd368f7078d8a7ee06d49fab001b7fdc8969d52ac1e54efd4ef2184c9b8d2947eb5ca2fe77d9a7b6369adca15e9362db09d0c55ee921bef3d04741162f71e SHA512 cf2ebd71308f75a620b9ac7f213e5d794350f9b59f7840fcc5b3a49e20b75cd323fc99a074900d751c81ca86171a5acb29191fa05ebf6c8305b0ee3fd55dae99 AUX lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch 1172 BLAKE2B d6e27b935d0a7644ba6a56e9da2159fd24a9f42831befe2acd0f9b26fa5c1266ac87de34c7ef2d709dfb12048f52a1a27232307a4df1c12ec099e5cb45d37c57 SHA512 f514ad5f37e6da0a45c81769ead73c6ef4c04d368dc6a129d3b3547147c3b47db2182bf630457c02fd67951c5c97ef43db2c770d4a0864003ebbc207c4974fe7 DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a -EBUILD lib3mf-1.8.1.ebuild 1078 BLAKE2B f1fcb24d062aedc87ad498b706dc50c3a15dc4daacefa4247f2a44e327d5fc1f8517d86184e1a4b00d070cb279f8a4923c76c4318291e184607c12ccacd40355 SHA512 eaf15d78819735d8dcdef151ccb763b9e42e13a1cb6c2c6723f89faeb071d866d5ee1b14c7f7707b737cf4ac338e015a053fb1cefa170817f494650282dadf7b +EBUILD lib3mf-1.8.1.ebuild 1076 BLAKE2B 3bb98e5e52aaeeb101469619e10e01da43fe2f9da661075b44042aab351e9db8a65b34d156c360df6ee8aef3ffe15b07d2a935630903be4b22482e5f51a72141 SHA512 ddb2f6e90b2cbcc048efb496577e14fe4c6600ba3ed311e8b8a9910c808c105ed46f9847a6af725b18423032957627c13cdfc5f658337a1242d4b38d88e4f247 MISC metadata.xml 710 BLAKE2B fabae078a873406cac5a29263385aea4801c30cd8d5740f824cc2440c66fffda375ff91c0c1a47a3fd74d874dde848564f268776d4bb8f31997ac7750e094f34 SHA512 d89c5b35348d6c2deff3c1409c0c111d2bdfa280c150d00afceaf9cf9eb6e91210e7566e21ac1e915523e2d7240a40e98c56295bc22918df5901742cf63dc575 diff --git a/media-libs/lib3mf/lib3mf-1.8.1.ebuild b/media-libs/lib3mf/lib3mf-1.8.1.ebuild index c703e74d4fa4..6a9e8bdc83aa 100644 --- a/media-libs/lib3mf/lib3mf-1.8.1.ebuild +++ b/media-libs/lib3mf/lib3mf-1.8.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/$PN/archive/v$PV.tar.gz -> $P.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest index fe89bdbb4c06..7dcb186c9544 100644 --- a/media-libs/libaacs/Manifest +++ b/media-libs/libaacs/Manifest @@ -2,6 +2,6 @@ DIST libaacs-0.10.0.tar.bz2 319890 BLAKE2B b7ea746e72028f718ee630d74360c52627360 DIST libaacs-0.11.0.tar.bz2 324061 BLAKE2B 8faffa270580f82b7fc6ae53922a9ec15087b754adebc84f1fd216c748dbcbe6723c14908efc9ef77b891bda149d10bf5020321906a36a3654dddbf6bdc00936 SHA512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 DIST libaacs-0.9.0.tar.bz2 316323 BLAKE2B 4fd1ecca0ba5106b1d0195884356a8a8d7163614ebc2fe09f85ed79fa1534b6376951ab90670b3a7d375129e76fae80e3c42f3e1971d0cbcabd6e4e8384bde1a SHA512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6 EBUILD libaacs-0.10.0.ebuild 996 BLAKE2B 0b67440a4d94a4cb6908ab9b977458de835fd9ea2bc161d00a10d9604c2a085c5b1bf3d6b8d4ec4470bf85f3cb5afc4bd586859635a0a3aa3fda319486e786ec SHA512 72b9bbca677307e8a58183b8cae32eda06af8d82586c95021bcc62f99bbf2d6f2bf22ba3c31c63239e4b6d82a152bb7bbc5469928ce06cc81fcc1e763e5af236 -EBUILD libaacs-0.11.0.ebuild 995 BLAKE2B a4d56e5445fc8cb182c2e49854bd59b8e09e1a957fd8833977c5885da63ae370e41356c9124d526a8fe624c12731898cce465d40fcd5c7ff77ba3fa15af05713 SHA512 14e9fe30062d13ae0d078bc163046af7796fa778bc1f518ddc53776047f0beb9636ba0da52883ad465a961013ebe4cac41be1d0230924985e1f82d72b688ce8a +EBUILD libaacs-0.11.0.ebuild 988 BLAKE2B 5a6bf138f51b3bad43d2a5f015190430d59cfb7582cbd7754b411f53c28978c52e586cb6c3705f16943838c4ef829957487345a3be65d066e431a7ebf1c2ac73 SHA512 08d62edfb243c36d0f70a3d8fd171d99b4af1246cd545bebb175db1359aeb1be067fdefb5491e51d41055daec8b72433f9fd9ab7a8147569d9f0ac7b7cc99a0f EBUILD libaacs-0.9.0.ebuild 806 BLAKE2B 1b4852f3be27474d53b4d185defdf8f68802ca9feb0fcafcfdc1b5c39f0033a3fe13d68e71ddc4dd3ab5c6edd79f8270b1dac9588c18435225d0ab57d935eddc SHA512 f8760dbd524681a777f6ac97d003d0b35c0519e2af18231bd0285063950307f1c1583f55bcebd9a33ca400223335600d45ee35e12f39e0f4ea9b420ead6e32b7 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 diff --git a/media-libs/libaacs/libaacs-0.11.0.ebuild b/media-libs/libaacs/libaacs-0.11.0.ebuild index 74cf4b7ff8d0..3554e95391a0 100644 --- a/media-libs/libaacs/libaacs-0.11.0.ebuild +++ b/media-libs/libaacs/libaacs-0.11.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86" IUSE="static-libs" RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest index 92d8033ca9e3..f44e7230a703 100644 --- a/media-libs/libaom/Manifest +++ b/media-libs/libaom/Manifest @@ -6,6 +6,6 @@ AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f56 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4 DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607 EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5 -EBUILD libaom-2.0.0.ebuild 2315 BLAKE2B 56e5f6ee7d9902442d5ca1e1c22c7059d8bcd0e33467cbd346c256e383f109b87953953d6b7b9e389f22e0a09f2bd4d4cb2eeac068c3ddc48cff523755ab0e18 SHA512 970cf77beff2c5de51342f257a50eb2c248dd23ab61ca9902bdbf34f096d00fc9d71949df49bae47543d98fd7fc23726daca3d97a4a99f81dbc3a35bd12398e6 +EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e EBUILD libaom-9999.ebuild 2413 BLAKE2B b2f16d9046d8ab50c57d76c7798a4e3f59277cbac662a0f1b3e3b4a3176b0ffd4f14dbfdede2ad651a7df19e637b19ce4f5c9aca7b48b097332055754474dfdd SHA512 ebab14a84e97a4a3a0f19f2a1836bccf10a6b1130ed49525b24ef22a73ab4da1dd99fb2e252c5fe8a0b93830b92a19a061bace04b2d7ac2989f6b50c86eaae76 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db diff --git a/media-libs/libaom/libaom-2.0.0.ebuild b/media-libs/libaom/libaom-2.0.0.ebuild index 8e92d73e9986..a11cb13d5052 100644 --- a/media-libs/libaom/libaom-2.0.0.ebuild +++ b/media-libs/libaom/libaom-2.0.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.gz" S="${WORKDIR}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" fi DESCRIPTION="Alliance for Open Media AV1 Codec SDK" diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest index 55a1e81757ab..09b1c193efb0 100644 --- a/media-libs/libass/Manifest +++ b/media-libs/libass/Manifest @@ -1,3 +1,5 @@ DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6 +DIST libass-0.15.0.tar.xz 367848 BLAKE2B 1ba444d9d718eb364cf0d3ee743404adda36384432dcdfb350db59c1769042b7bbedf1610ecc1b89c2a6c98921710d71ceeac9888371e0774c30f4701746096a SHA512 067ed519e64da7e2e45436bb09e390f1a77d966aeb9420729f36c9725d89491655ead69eb61b43f3220b8ff8f9de3891911b62757466f843ab13ee7149d88459 EBUILD libass-0.14.0.ebuild 1327 BLAKE2B f028ea85ba3ba45567bbc89bb39d53b4512e7c277ce9d15426b1fdde06c2f736580626dd06669180ae8d2c5334868b41010754e1841bb4c9ac48d68ec81c503c SHA512 e458b290efad610799460bfdf015430c57d411e47e64ccb21e027e4b8b2b8797142dd5dfc919f63a5e8256bce10e9c62a5bdb89226cd413d8a347185c3ca8638 +EBUILD libass-0.15.0.ebuild 1200 BLAKE2B 8ea27b0eae690757fde1ebb2e2ff438cd67af2aaa359453db716b2a0a4ae8838d1ce38e4117fd404a3e15e397eee688dc31149a5ffe2b62e4794ad48e3610dd2 SHA512 43266256b2c5ff7a60b391faf93d874c40fb101dcb0e594ec0df8ca0349512508027aa50223402af95a68b1eccc6c12839c6fff63c7cdf599a5cb19bc748012b MISC metadata.xml 420 BLAKE2B 160123e29ca333ee5aa8cc197a986ae489ea578e54efebab089133db45a7d3ba5b554161c2a835fa0f53537a16043b627d41f26c752460e6bf3118aab185f0d6 SHA512 ea6cdb493942844567b8acc3dddf71983ab02ba05d849aaaa0cdf0c8e435a0acd159eca447c3e049ddf27d384fb0e94826ff9aad42322eea459e4313f0319964 diff --git a/media-libs/libass/libass-0.15.0.ebuild b/media-libs/libass/libass-0.15.0.ebuild new file mode 100644 index 000000000000..a2a16f40d522 --- /dev/null +++ b/media-libs/libass/libass-0.15.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="Library for SSA/ASS subtitles rendering" +HOMEPAGE="https://github.com/libass/libass" +SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz" + +LICENSE="ISC" +SLOT="0/9" # subslot = libass soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="+fontconfig" + +BDEPEND=" + amd64? ( dev-lang/nasm ) + x86? ( dev-lang/nasm ) + virtual/pkgconfig" +RDEPEND=" + >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +DOCS="Changelog" + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable fontconfig) \ + --disable-static \ + --disable-require-system-font-provider +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest index d6333be538eb..ff9177783212 100644 --- a/media-libs/libavif/Manifest +++ b/media-libs/libavif/Manifest @@ -1,4 +1,8 @@ DIST libavif-0.8.1.tar.gz 2915941 BLAKE2B 40030a5a002e68231adf48ecc6e8012f7ec53506770872fc79dfd73496fa3a214c10cf5fb5826f145fe1f881adf2a3ecca13c33989b2f048aa72e455ab6950e0 SHA512 03692fbba49fde08d76cebb847d0404a81113824e9e65edc6a0977f323d060c394d111e2a7647788fa3115f3ae80b0fc92d4fe5be53852e6734b96a8f1c1a078 -EBUILD libavif-0.8.1.ebuild 1659 BLAKE2B 67a47e9825f0372ac63c63c3995e21f9de3fd7c678a8ea509cf1fd474165ba5de133532e3e30c6786178622bdedfa311e692cd5c0a4ab5798694e50f59b44765 SHA512 69bfed41583ee92e65078db7a63ba01012722c0b064949999bfe33e1284a1842e1e2d8a32d75222fb3b6598ba844db5bc515d56c90f80f0db26605502d4549a6 +DIST libavif-0.8.3.tar.gz 2948213 BLAKE2B 985c18c86eb7d2049bac21111ba861b141806504b38d2fe0828745f6112c254633dc27fc7257fab5dadb866991085776bd9beeaceca15f33d216eb9337db42e9 SHA512 d8624cd63489f7c17dbafe1a91d01dca21143be073295f2bed9491d5e7899ec0163881e16f3331e5653cdf447e7fb56fb52b9260264cdd7c7ad0e3aaf5695b6c +DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d9f82e1b7ca5876cb9859b96ac5b60ad86c2345654f85e97cb6d920f286b683d0bb588ce7db04f50322b158678c SHA512 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba +EBUILD libavif-0.8.1.ebuild 1664 BLAKE2B 4d23f517dfb7afe074b36a3aef30ffde2ecddc49c0570e69aa54cedf31ae5dc2a499dd1e8f944fa44b606fb6302b49231ed8337d81f6e4fa6fde503794d80844 SHA512 32cb7970ba5fc28330c6b9575e693417c36116b7a57ff5aa1c4f88d6db039b3d14ec36b325d8df0f09bc56581b928725ed33f9093a46c39151409b103ffac9f6 +EBUILD libavif-0.8.3.ebuild 1694 BLAKE2B 2c78f19dd03937d006bedc88142134a6e44932d706b9d7e48d4bf634e1887247aed5fb13d9cec1561240bba6a5a854f1a212b29f2946da15571a6a67013177d6 SHA512 df76aad645ed8f3b56db9aabd953920210ba6a9ce77cc376b30da25dad60f3b487e0eaad58137ef651dbdba3dc315834d3d8f297d8b3b5db6cc9a8dc34af3a64 +EBUILD libavif-0.8.4.ebuild 1694 BLAKE2B 2c78f19dd03937d006bedc88142134a6e44932d706b9d7e48d4bf634e1887247aed5fb13d9cec1561240bba6a5a854f1a212b29f2946da15571a6a67013177d6 SHA512 df76aad645ed8f3b56db9aabd953920210ba6a9ce77cc376b30da25dad60f3b487e0eaad58137ef651dbdba3dc315834d3d8f297d8b3b5db6cc9a8dc34af3a64 EBUILD libavif-9999.ebuild 1616 BLAKE2B 6fd97427b007b3ef0e892505eafd538cfd7eb13879fa6d5817608e4dfb027983b283b830b8a5a6fdaad10e764a3281f41a5a382286e27ffaa8db530d5f776749 SHA512 80003f7397e70ce3a50281c508fe43c96745a0c24b316a6f2f9b4abbfd6ff4312c2c3edf506d9325c5732c8ed379b050b503a9124ed62a4f3dcd6cf1c0d3bfc8 MISC metadata.xml 887 BLAKE2B 07dd6586bb1553346742120a8a79e89df0df54b7d88673f2b05e04523ba9158dc1bb8ce43fe4202eabc053e039d44db886f2ddb22047cc76e240cd917313adc3 SHA512 ad588808bf4fbfb7065053a5178df233a106b4dd57191aab3439b620238aca08370099f2618c21126a0358c7100f572b499461eddb01770b8a270aed43e82a91 diff --git a/media-libs/libavif/libavif-0.8.1.ebuild b/media-libs/libavif/libavif-0.8.1.ebuild index 4d120a5e644b..08a523500623 100644 --- a/media-libs/libavif/libavif-0.8.1.ebuild +++ b/media-libs/libavif/libavif-0.8.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" IUSE="+aom dav1d examples extras gdk-pixbuf rav1e" DEPEND="media-libs/libpng diff --git a/media-libs/libavif/libavif-0.8.3.ebuild b/media-libs/libavif/libavif-0.8.3.ebuild new file mode 100644 index 000000000000..3af174f791af --- /dev/null +++ b/media-libs/libavif/libavif-0.8.3.ebuild @@ -0,0 +1,75 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake 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" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+aom dav1d examples extras gdk-pixbuf rav1e" + +DEPEND="media-libs/libpng + sys-libs/zlib + virtual/jpeg + aom? ( >=media-libs/libaom-2.0.0 ) + dav1d? ( media-libs/dav1d ) + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) + rav1e? ( media-video/rav1e[capi] )" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE="|| ( aom dav1d )" + +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 + -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) + + # Use system libraries. + -DAVIF_LOCAL_ZLIBPNG=OFF + -DAVIF_LOCAL_JPEG=OFF + + -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF) + -DAVIF_BUILD_APPS=$(usex extras ON OFF) + -DAVIF_BUILD_TESTS=$(usex extras ON OFF) + + -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF) + + -DAVIF_ENABLE_WERROR=OFF + ) + + cmake_src_configure +} + +pkg_preinst() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_savelist + fi +} + +pkg_postinst() { + if ! use aom && ! use rav1e ; then + ewarn "aom and rav1e flags are not set," + ewarn "libavif will work in read-only mode." + ewarn "Enable aom or rav1e flag if you want to save .AVIF files." + fi + + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} + +pkg_postrm() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} diff --git a/media-libs/libavif/libavif-0.8.4.ebuild b/media-libs/libavif/libavif-0.8.4.ebuild new file mode 100644 index 000000000000..3af174f791af --- /dev/null +++ b/media-libs/libavif/libavif-0.8.4.ebuild @@ -0,0 +1,75 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake 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" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+aom dav1d examples extras gdk-pixbuf rav1e" + +DEPEND="media-libs/libpng + sys-libs/zlib + virtual/jpeg + aom? ( >=media-libs/libaom-2.0.0 ) + dav1d? ( media-libs/dav1d ) + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) + rav1e? ( media-video/rav1e[capi] )" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE="|| ( aom dav1d )" + +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 + -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) + + # Use system libraries. + -DAVIF_LOCAL_ZLIBPNG=OFF + -DAVIF_LOCAL_JPEG=OFF + + -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF) + -DAVIF_BUILD_APPS=$(usex extras ON OFF) + -DAVIF_BUILD_TESTS=$(usex extras ON OFF) + + -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF) + + -DAVIF_ENABLE_WERROR=OFF + ) + + cmake_src_configure +} + +pkg_preinst() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_savelist + fi +} + +pkg_postinst() { + if ! use aom && ! use rav1e ; then + ewarn "aom and rav1e flags are not set," + ewarn "libavif will work in read-only mode." + ewarn "Enable aom or rav1e flag if you want to save .AVIF files." + fi + + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} + +pkg_postrm() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest index eb5158d0f2d1..5563badcf3ed 100644 --- a/media-libs/libbs2b/Manifest +++ b/media-libs/libbs2b/Manifest @@ -1,4 +1,4 @@ AUX 3.1.0-format-security.patch 369 BLAKE2B f64d562fca5b305abbb3abed2c431fab6b3daa961406c83db5bfc39e2316dda288c6d6045e9a4f6fd045f8c05308744f7e01b2616a161a0f22aa5097c7a91c49 SHA512 77a803c030c4b6ce782584c9163299289e8a8cc748d08e5040ae912651ebdff92884be70f1efa1db9df4eba3f0060c77d430062dbe1143682685df3c7e7b1fbf DIST libbs2b-3.1.0.tar.bz2 606283 BLAKE2B e70becc06078ff72a4a4fb69d9ad4e906f1ca2062cd770e36fcf1ad2a6c58e6284afa7958fca89573ed83cf9a76b42f0c8367942075eb6c77ab12fa6c2e741b8 SHA512 50cf477ff9ce6adf26fa8a696831c3a4f219c80a21ec4c93be8ec3f67f077447c17abbd9588a9de5eeb3ddacac1564a7138807468fc80e853bc78f193b4afbc4 -EBUILD libbs2b-3.1.0-r2.ebuild 608 BLAKE2B 022ac66774850ade57c5b7c7924929e3653ca6646171caf83bff4b15b7ee1435b3519e1f498b8658c686497ea8671af1e00ec65f7f3ccf4a6a7c3cac6425c149 SHA512 6361032b03d256f039a61097b641ba1685cb5c61aa9a25064f20d6e9e89cd8c62cf1bd350b8d67bd6f3c21140a60f9209f21c45aaa83aad60e8665448f7bf4f4 +EBUILD libbs2b-3.1.0-r2.ebuild 709 BLAKE2B edd2aee11c00b24691932ce67427936d53c5622ee9a99048e16e18d6811f98cd1a0d92799d91e490afc3400973944a6eccea9f544b56449a00611bbc912514d8 SHA512 911d88a964b8429a31e7e5624715cb3c1e87d4f820a5d70ddcf010597d2faddc7f034d981a6bcc73765c1f5710e55bc372b2b49d8f0851775d8f2255f6a4fe63 MISC metadata.xml 449 BLAKE2B 05ac186d158a3c9ee695b8af52de5f695170ad925c0136422233df9e94010cdcce5224b8938d8b71ff260f4a468ae93898c7999163c8648d10987cdac17f289e SHA512 f9178657883acf1844ac273eaa5af2380f06fbf23641e76f6a32b08f54b410a5be6d6b0d82888637a51ad4ce13396dcdd04907cb1194eb5539be2e6d3c02e99d diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild index dc43dddf45c0..cb640251cfb5 100644 --- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild +++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild @@ -12,13 +12,19 @@ SRC_URI="mirror://sourceforge/bs2b/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86" -IUSE="" RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -# for default_src_configure to work -ECONF_SOURCE="${S}" +PATCHES=( "${FILESDIR}"/${PV}-format-security.patch ) -PATCHES=( "${FILESDIR}/${PV}-format-security.patch" ) +multilib_src_configure() { + ECONF_SOURCE="${S}" \ + econf --disable-static +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest index 6d9e1eccb28f..e1c275402d7c 100644 --- a/media-libs/libcdaudio/Manifest +++ b/media-libs/libcdaudio/Manifest @@ -1,5 +1,5 @@ AUX libcdaudio-0.99-CAN-2005-0706.patch 457 BLAKE2B d1bf9fdd84e8fd66e4e66383c69a251a71d134f36365125879384bc638a4f7ae19308041658f98e27570b7e5255f945a504f520401fed44ceceb581f31abd335 SHA512 75c95893f64bb599e00ef96c303b8daad1e8d02f017deb428eb934fa1716f6736a3388e11ff5474103b1b5afafb89aff5e0ed038c8c93e90f5be0f97585c3ebb AUX libcdaudio-0.99.12-bug245649.patch 307 BLAKE2B 690a57ec23e24040b590b93cbff6d443f8d34a273fdb63b9aa0487cc2d3b787c6ca06294641cde3dc669dd26bf4eeda70c8e979b0400cb63793c40d59f49b3ef SHA512 693a43f3c09fa09425f06103cf2d52fbc2351fee1d37948f725103768f7f063384339e518a81be10e71d0e275582daecf5ec64aa12f12f72f370e46e4437bf33 DIST libcdaudio-0.99.12.tar.gz 357150 BLAKE2B 406dcdeb801237e9aa88934bd7ca39bad0b121641de198b65a4137ff1d25500954f12f7f86b78912098a7acda3afb188a5965b69e99ccb0a84441b3bf1931327 SHA512 c00fbea7776e847da93bfbf4cbe74ccb3ee826da80e74eef84575fc211729e6a09599f5bfa332c91d678a31f9de5e5b333bdafe51438f266f6dea519652f5247 -EBUILD libcdaudio-0.99.12-r2.ebuild 503 BLAKE2B b5aad3dbc424c4fc3d29dea9f3dd616b2e3e7ab8a007aa3b6fd0b95fd80e118c91bd887eaf61e3f6c48666f62942fcad45859d8af5a1b14db832ef4c2bec9ae6 SHA512 d5b5238c42606b18c1bb528e118e40aa601b9dd6c86a061ac9d42853aec55a7664450a88a796ff2ee63abd5fc68fc4f9af1c1d6b034c0d0702af336227515e61 +EBUILD libcdaudio-0.99.12-r2.ebuild 590 BLAKE2B 60de172dca7ac8dfb91fe058943d5f80c22d586b48935cf3bd668781bba41873eb9f319fd883dea40a6b2a2581274bf5df7f0e373013024000fea5b3a9735cd9 SHA512 f4121b5efc22ebf0122636431d3ccf538216f923e752266fe8aa2c25e654a7a002da3cb0b247dbe492c6c0032345b0505b4f6b0cdc131a539771b8009af2a303 MISC metadata.xml 333 BLAKE2B f6d68462d464a5a381a3a09aa96646ecc510b0e0ddf855588b94ca2662caa4bf17112d57741d5e4b013b43ea621d856bc000c62477cc9c3273f23a6ffe2de7e8 SHA512 5ac86238b0db4069b133127f007fec468f87847cb219dc0c5dab8df5544a5e515057b4c44f44dfa843b5b81a62141a21352dec9e9a0fec98c300e9e9509cd034 diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild index 7d065081cb00..982289b9478e 100644 --- a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild +++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild @@ -18,5 +18,10 @@ PATCHES=( ) src_configure() { - econf --enable-threads + econf --enable-threads --disable-static +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die } diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest index 69eac1b3a503..3948c744f0f4 100644 --- a/media-libs/libcdr/Manifest +++ b/media-libs/libcdr/Manifest @@ -1,4 +1,5 @@ +AUX libcdr-0.1.6-icu-68.patch 977 BLAKE2B ef4fa0e61607847aa0f7d1105775224f7ebed349d163cf0dd2d190f719aef041415ec87833d39fdc90c8a128b1aa052d1b7b8dda7c1cfeed962506d6556a04ec SHA512 fd0d109a48208596a86ba6df3a022bf60a02295af686a5fe924a866e808ef00023e92b40c9dceed701dac9c4243e61c017cf04b1ced9e73903e870ca379cd1e6 DIST libcdr-0.1.6.tar.xz 612068 BLAKE2B ec5226a28f101472ea3044e9e5b87dba57b584fc813dfda29e00281182d067126bf8a5740c32bc5cb545f230f6f96163aac2fdf08879ec64379b7845839bc88a SHA512 629d55da71c7333f41f60a32e2880deffcf80088096af1bbc8c572b80ef21d851102fdebce56f77245ed60822ca98e02c0867b192abef496a2313fde54a97bb6 -EBUILD libcdr-0.1.6.ebuild 1122 BLAKE2B 402cdb2ed262e4350268d2d2caa4e01b311c660a421641db4c69b7ed7e017b64c6b3299d0b556b6e4c1081658934100bf81fc8f4156355e5a2b6b49d5f8f6861 SHA512 23ddee4eb4fdf67e6795627b54fa77d717a0ef8bdd0d3e4f9cec46ac3acda5819f0a697d0ee2721cb579ad067ee0f589b53f4bed114282583b59b571d67eebc5 -EBUILD libcdr-9999.ebuild 1127 BLAKE2B 74fb23765b40c9dfd07e08ddd36a4c24f8faeb95b0832f14f9f6d82c23df1ba2e19a863aa20efa7ecb2e95b4c40136a12fa79283fe03bb927376d40a6f600e17 SHA512 8ade7a79f4e57083628dab0b914484c7d083f37fa2fefa3a10488e71cb7ee5c777cf8a22776e83bfd653dd71e8af96ee9a574ce17c4ccf9ea612975cc98f9a97 +EBUILD libcdr-0.1.6.ebuild 1152 BLAKE2B a59172d3b3950e253f94c167f6398ff1587bc268d528b05b1f8d3c112369c1c04ba7413600b5a3d897b5d287909ae721707ccca17da7c5c003acd902b4e46e90 SHA512 8ae02a13f6ab9e0acc47821afc731c6a7d04991b99248c9cb1740f46753601d6977805ce339e5d64cb3638a4bf93f8c1695bc3b602b8f802ea9672fab67efba3 +EBUILD libcdr-9999.ebuild 1099 BLAKE2B c0ca8298f6f3d222a9d94bee445be4f079bfe381db7b334a5dd3146096938b637e454383eee00f8dcdcf3257264e2be022f87f4693e864cb50489c669c771498 SHA512 2f505734658a48e57552aebf7d216a737443712da0178500a21bb6408212adb55e4c20c914b4b8e1cc4f739c90b1fb1655bc6d17b5cf056ca05bd2dcf6169545 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 diff --git a/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch b/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch new file mode 100644 index 000000000000..b8e7ba919a96 --- /dev/null +++ b/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch @@ -0,0 +1,27 @@ +From 0dc41f8f6bd099813acb3972f75e4bbb2a5cdb2d Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Fri, 30 Oct 2020 14:28:08 +0100 +Subject: [PATCH] Fix build with icu-68.1 + +icu-68.1 removed public macro definitions for TRUE and FALSE + +Signed-off-by: Lars Wendler +--- + src/lib/libcdr_utils.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp +index 09ab42e..250f0a0 100644 +--- a/src/lib/libcdr_utils.cpp ++++ b/src/lib/libcdr_utils.cpp +@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLe + csd = ucsdet_open(&status); + if (U_FAILURE(status) || !csd) + return 0; +- ucsdet_enableInputFilter(csd, TRUE); ++ ucsdet_enableInputFilter(csd, true); + ucsdet_setText(csd, (const char *)buffer, bufferLength, &status); + if (U_FAILURE(status)) + throw libcdr::EncodingException(); +-- +2.29.2 diff --git a/media-libs/libcdr/libcdr-0.1.6.ebuild b/media-libs/libcdr/libcdr-0.1.6.ebuild index 24045430a370..1e277da8ed11 100644 --- a/media-libs/libcdr/libcdr-0.1.6.ebuild +++ b/media-libs/libcdr/libcdr-0.1.6.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" LICENSE="MPL-2.0" SLOT="0" -IUSE="doc static-libs test" +IUSE="doc test" RESTRICT="!test? ( test )" @@ -36,6 +36,8 @@ BDEPEND=" test? ( dev-util/cppunit ) " +PATCHES=( "${FILESDIR}/${P}-icu-68.patch" ) # bug 751934 + src_prepare() { default [[ -d m4 ]] || mkdir "m4" @@ -44,8 +46,8 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_with doc docs) - $(use_enable static-libs static) $(use_enable test tests) ) econf "${myeconfargs[@]}" diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild index 3397e4658eb6..2cb99bbeb299 100644 --- a/media-libs/libcdr/libcdr-9999.ebuild +++ b/media-libs/libcdr/libcdr-9999.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" LICENSE="MPL-2.0" SLOT="0" -IUSE="doc static-libs test" +IUSE="doc test" RESTRICT="!test? ( test )" @@ -44,8 +44,8 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_with doc docs) - $(use_enable static-libs static) $(use_enable test tests) ) econf "${myeconfargs[@]}" diff --git a/media-libs/libcuefile/Manifest b/media-libs/libcuefile/Manifest index 5d78c1373554..2a287b910e4a 100644 --- a/media-libs/libcuefile/Manifest +++ b/media-libs/libcuefile/Manifest @@ -1,3 +1,4 @@ +AUX libcuefile-static-libs.patch 1299 BLAKE2B 488f99588881a9b24471b1a4c02b090147125ebe4fc2865ce2bca5e03891d6ea46530a9c265df77c5663e4f99d0a841844c0ccc3c918fc36bfc973fa8bda5fe1 SHA512 efe0d8d04acbb73e666411780283e35567b87233c70c8383404965f1dc6fceed7e1b28ce5f77d8085821df70062eaa153161cd5212dd18246920d2dff2699c94 DIST libcuefile-477.tar.xz 41676 BLAKE2B 01232ed507386809cd7960f06251139fd5c11a251f68e59513b6b5e482b9b7977e5d3fd8d6147a47e4a74b8e5e320019383a4d69c6c3395ead3cee0d8c5c3b43 SHA512 9cf46f9fd1b178758b2d15fa65d67d069bba41a83354a5aedf7b57ed5752bb68ad1d10208ffbb22f2aac7bd5d938e9395f67d4248441743d45e0099638d60d5e -EBUILD libcuefile-477-r1.ebuild 692 BLAKE2B fe99c8c72a33d6917d286e6290ab3a8ee4483fa16e3bddd51962b10c9af21956049da0f2e4b2adc92114a5fdde3fd94a8c0f7752b565778bc9059014c6073b89 SHA512 f238e00332cdb2e34b12ca4aff975eae1e7e0dc6fb6c6243dda5e0f449caa4cc703cad66b3cdad82dc85f2db3f202f76517d27fa11bc00474dcf292b8aea9f60 +EBUILD libcuefile-477-r1.ebuild 735 BLAKE2B 82b81cc4840ef4fdd1b62a77db19925dfbde5c306c237aaa9412ee51fd3d356563b322f1daefd226313d0f8600cd0677e48919cc12a0677a2b04bbb6d2eca8ec SHA512 c8d4b166a77f2d0f0c1162ce8a6c928762aed598ba4479b34192e4a36bb99d80257ce21b21ed5ff51b0e41f07253e35bf80f85bd12f37ac938b8250dd0ca42a1 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-libs/libcuefile/files/libcuefile-static-libs.patch b/media-libs/libcuefile/files/libcuefile-static-libs.patch new file mode 100644 index 000000000000..ecb141281bfb --- /dev/null +++ b/media-libs/libcuefile/files/libcuefile-static-libs.patch @@ -0,0 +1,29 @@ +From 9379e01949bc8b9bc59b64a8cd60f947e2443232 Mon Sep 17 00:00:00 2001 +From: Jakov Smolic +Date: Sun, 20 Sep 2020 22:07:58 +0200 +Subject: [PATCH] src: CMakeLists: disable static libs + +Signed-off-by: Jakov Smolic +--- + src/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c07fe0d..1bac1aa 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,10 +1,7 @@ + add_definitions(-DYY_NEVER_INTERACTIVE) + include_directories(${libcuefile_SOURCE_DIR}/include) + +-add_library(cuefile-static STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan) +-set_target_properties(cuefile-static PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1) +- + add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan) + set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0) + +-install(TARGETS cuefile-static cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ++install(TARGETS cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") +-- +2.26.2 + diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild index e36722005c3e..ebe24d60469f 100644 --- a/media-libs/libcuefile/libcuefile-477-r1.ebuild +++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild @@ -16,7 +16,8 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" + +PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch ) src_install() { cmake-multilib_src_install diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest index 40a5f88498b0..0fd4a4ae0ea6 100644 --- a/media-libs/libdca/Manifest +++ b/media-libs/libdca/Manifest @@ -1,8 +1,5 @@ AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac02d00e78903654ca68a4bd3093cd9216c3911eb35223931a6dc69edf248f4952d17d9549eb4a8a9507ae973e83b SHA512 cadc239c379c271db9a62c7a314607612e9b43a18a605e414b9943b962a65d6b760a2558917a2259a3875a07f61adc12a8c2d8767cfa76ff4894f02a0842e383 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6 -DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e -DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287 DIST libdca-0.0.7.tar.bz2 158232 BLAKE2B 943ef3845f6b73d3d7a2cc47fd3c59517544c156f46e1be42b7940e11a164d8c533ba0e1436ea7bee95467bb7fdce95bb390e2816ebe7d8e208821eb325cb9de SHA512 dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a -EBUILD libdca-0.0.5-r3.ebuild 1432 BLAKE2B 10e11663856f32e42876aea5a6ae2acc618681b57827b8ca11af02803ca4f516e5272fe642f70c6b36042b7c660ef1676d77b2bfa01314f2226c2fdd1f2d80b9 SHA512 a49b93d1aa70a8d814dd1a8b00b50e3ef25208f2ae80c458ab501dc891faab77d00b85f11f272baba2f4b88682c50ee93f9354d54371a19776ef296b69b73cec -EBUILD libdca-0.0.7.ebuild 1340 BLAKE2B 7a42ae834fdfdb55ccaf41e821e5066dbc9de6673f25540ab1cef06ad5d816cba1d016db7643a636152e86206387940b623f4c31f0b6d92a1cb785d7addb0e98 SHA512 570d70930be3bcf4fe87c17cb2ffae47b0d469f1d226eb0aabba988858e94d2305d6f4a72565dfb2f0d7db84a73bfbaee6addb71570ed77b2434029cb0708d77 +EBUILD libdca-0.0.7.ebuild 1332 BLAKE2B c5d519fd41ed30953cd3bcae13daf96894e2c44afb60c6b9364be41c09e4501fff3f88747b53e6686f687d378875b316abc15ca5b840154b36ed48dae0e7c654 SHA512 5fed62a9d3dce9960940c78dc787ee081b5c84375b862b65fddf6a67691b4c147179345c7beb00d52981ecf2f127032acd1657e82f278fc0056ab366432f851d MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild deleted file mode 100644 index 415454150293..000000000000 --- a/media-libs/libdca/libdca-0.0.5-r3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils flag-o-matic multilib multilib-minimal - -DESCRIPTION="library for decoding DTS Coherent Acoustics streams used in DVD" -HOMEPAGE="https://www.videolan.org/developers/libdca.html" -SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2 - mirror://gentoo/${P}-constant.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="debug oss static-libs" - -RDEPEND="!media-libs/libdts" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-cflags.patch \ - "${FILESDIR}"/${P}-tests-optional.patch \ - "${WORKDIR}"/${P}-constant.patch - - eautoreconf -} - -multilib_src_configure() { - append-lfs-flags #328875 - - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) \ - $(use_enable static-libs static) \ - $(use_enable oss) - - # Those are thrown away afterwards, don't build them in the first place - if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then - sed -i -e 's/ libao src//' Makefile || die - fi -} - -multilib_src_compile() { - emake OPT_CFLAGS="" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - find "${ED}" -name '*.la' -exec rm -f '{}' + - rm -f "${ED}"/usr/$(get_libdir)/libdts.a -} diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild index 0e794c3f2109..2761963fd5a7 100644 --- a/media-libs/libdca/libdca-0.0.7.ebuild +++ b/media-libs/libdca/libdca-0.0.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="debug oss" DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt ) diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest index 65a8ee47a126..146e3ade4c21 100644 --- a/media-libs/libde265/Manifest +++ b/media-libs/libde265/Manifest @@ -3,6 +3,6 @@ AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4 DIST libde265-1.0.5.tar.gz 381041 BLAKE2B d561a0e5f308bed557237b88317985912537f76701783bc30d81305cf9026a853746449ece5b3092534466ea13d67bac10b3258580c8de07489844bbef0395db SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e EBUILD libde265-1.0.3.ebuild 1590 BLAKE2B 48de41d7133072b75f48b2fb954390915085931ec6f90daa56d6d437d130795039c682f36a8b053783e29bdbd4faedda8e15d48f0c50df57ba6b754462ca0360 SHA512 431fdd0871422199e7d9278fb21857e5a9a27cb34ba949767526d9f9ada57e65efe5abe3c4fae464e2bf3f021981a786cdeb84a9917032528cf08de4e30b8ac1 -EBUILD libde265-1.0.5.ebuild 2501 BLAKE2B cfef427281d76c9b1c0a7a6d8e8d7c813cd6132408effdfa5f55060724735e4110de822908bdbfa102299c6cbc9e4af42605b1ac5568b45ce02ffef670565887 SHA512 6b911086a255f7061e9fe2d6207e345d9c7a8d6218bd5e12440d95c5c4a836894d0e28cf4e68a583740e7e9b05418801f22ceefaf528b8a79fdbcb6ed7560de8 +EBUILD libde265-1.0.5.ebuild 2498 BLAKE2B d001976ca0ac8a6e043d282b673365de75992b25bff06ace079745782db15a94333e3a0a650b4cb23d33710d3e3a49b6ef1eb8dcf24578cc8e107ff58d94ed93 SHA512 c13211859fc8dd695c6e9effd04d15f4771c1be321fb0f8b09c64b8a9c3cdd03c84ab9169a82b507936d76bfcab577906d6c7776fd1c4764e11eab26a3236a87 EBUILD libde265-9999.ebuild 2496 BLAKE2B 645c7f8d7d267eee7b3cbf376ccc12463ca3fb0f3fd823f1a91016021b047f3b60726886e711006640f28843ac8883b64662740c0cbdd0820e44400b72b0f191 SHA512 b33524c9cc21c9cce9b71b29c2de42b248725aff4d790f8bcd2a2da517584b3b9ca641ab51e5a3bae5ce365b3cb6695d624c01db4ac706d70a96c5cf0ee37df7 MISC metadata.xml 691 BLAKE2B 24cf4f5585ca49df6aa5fbed6ab8daa55451446b1ab2d47953e05ce726b22457f1f2adc18774b745206a2f7342996b210edf83867578f86049e23823e43c1788 SHA512 c121ebe35ce66deb54c5d046fb74fb8096d134348b15607f7bc7f0b7239ce76a2ecc43ecee72382adb6078ac6f50859d0ac3a60bd8a3daf52f6cd04c9a56ecf9 diff --git a/media-libs/libde265/libde265-1.0.5.ebuild b/media-libs/libde265/libde265-1.0.5.ebuild index ff9f2f98af53..cd979e8c83fb 100644 --- a/media-libs/libde265/libde265-1.0.5.ebuild +++ b/media-libs/libde265/libde265-1.0.5.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" fi DESCRIPTION="Open h.265 video codec implementation" diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest index 8ecb2e3ca9fb..353042168824 100644 --- a/media-libs/libdvdnav/Manifest +++ b/media-libs/libdvdnav/Manifest @@ -3,6 +3,6 @@ DIST libdvdnav-6.0.1.tar.bz2 378491 BLAKE2B 1baccf42bab3185584d1abc455f5b972115f DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71 EBUILD libdvdnav-6.0.0.ebuild 1152 BLAKE2B f2e7ca059a0bd8b545b2fb857e555827c3b5eee4f479c0bd75e4bc189b71025f628bd57b20d394fff6e55e585b96829a2ff9c31a33d1816a0488e844953f4e0f SHA512 8486624d1b0dcc2c80f9bf1acca8447c039741b225fe59e7d71bb94b63645b4ab2c1b7af733cf05df872d904334919363faa13121271f4074484d4684a25cd2b EBUILD libdvdnav-6.0.1.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd -EBUILD libdvdnav-6.1.0.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd +EBUILD libdvdnav-6.1.0.ebuild 1172 BLAKE2B aa793ea1e8c6859f40d678bee33c92c52545a150f13ba3c16f9ef6da20c8768295eb9df1c0057fab1efe54007558348ed082990568c2cfff4dd0dafe0fe0e43b SHA512 e0eb20a2e0d443298ca4e4bf14623a4eee87c733f68031ed9780755f8fee94b597d15c562da8cc9569645fa4b68b7a5e52edac2a91acc09520de58da26598026 EBUILD libdvdnav-9999.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 diff --git a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild index 4d90610679df..24b463f1a4b5 100644 --- a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild +++ b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git" else SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest index c01852853fd7..69e400d04f97 100644 --- a/media-libs/libepoxy/Manifest +++ b/media-libs/libepoxy/Manifest @@ -1,4 +1,4 @@ DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5 -EBUILD libepoxy-1.5.4.ebuild 1133 BLAKE2B 7f64a6e6638603646035229017c440b5599cc01b7b2366610d789ebeee56e5a8638df9ad52585776da4cb1546fd592e5cd0b8f3e9cb5bffb08a5136962b5c05d SHA512 8a8df84d8ddbdd40fe5061fee3c2c67cd8d5d2e84b6b7b4b5e9fd709893a68873076e8b47a75c6110d8eccea677d36b4bb7bdf9eb702c70100e03244b0cbd977 -EBUILD libepoxy-9999.ebuild 1141 BLAKE2B b6191c69f76d4103152ccf58a23f32e27ab0a0754daf1ab2c3d5d807b7a4a1d3391aae048e1c95397ca6ad9147576f52374bdf35942571ed25adc3eda21e7516 SHA512 6c457b9c2736e4ff5f031f21bfb8d67a3f34d10b83e7a9892f5e6ab0e84dd4dc7041de7cc6973b9034ae827539aa1851a2b3efed4993035fd0b61abc0ac7b629 +EBUILD libepoxy-1.5.4.ebuild 1135 BLAKE2B f8f8855faa0a23f95ed7732e00b80ae704705264448423a22c6cfee7515c12150460dbd11c91b5e44965ec09e3691a43601b01d988733b6a2afc651fe4102989 SHA512 3321969fc45aab95051f0da5ed83b83bae560d0a51339fe21d9797fa33e2c839251a9e0f00ebe605d00d1e19ca2c77fbbeaa80d7b8a8356ccd7b7f853f1f23c8 +EBUILD libepoxy-9999.ebuild 1143 BLAKE2B dd8059028b7dc955f0ea6c1b4cc49b191f35b6805023d8db3b4af5104654781065021b5898bd9b1b64433103638b66591b8a64319d91f782936f6c6d7bafffc4 SHA512 314e349c2a6c6d4aeac04764bfe50708fc482c94e3818827196dc2b8d0d0bfb2d60387c3d346164fe860b75121614f484bde039f08eaf659acbea88506debb9b MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6 diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild index 889f03836415..0d6748e1bdbc 100644 --- a/media-libs/libepoxy/libepoxy-1.5.4.ebuild +++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE='xml(+)' inherit meson multilib-minimal python-any-r1 diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild index 17b8095b0f30..329b128e948e 100644 --- a/media-libs/libepoxy/libepoxy-9999.ebuild +++ b/media-libs/libepoxy/libepoxy-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE='xml(+)' inherit meson multilib-minimal python-any-r1 diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest index 627a2398dc4e..93710803dd2d 100644 --- a/media-libs/libexif/Manifest +++ b/media-libs/libexif/Manifest @@ -1,4 +1,6 @@ AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65 DIST libexif-0.6.22.tar.gz 2741296 BLAKE2B df57aa0ff7d20faa47ea34f4d8164c33b113887bc2179405481b2c12c0d0336dc9e5321a260ffda64d974bfa9ac6af55c0cfb4cc9a57a941c17944a3d049befd SHA512 e399804c9d67072861988638349115c585546be20f15c4d26bb6f411ff4ee5bce979c1a41305c1456ecc2f830837349f93cfa4136b7a864e0486cecd3607b469 +DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab EBUILD libexif-0.6.22.ebuild 1285 BLAKE2B 94bc4fad00f8c4ee923b70e18a875c1b061ead7b067572cadb36f2e7acf6664ce9149161bef4a4a24dad99558c76bc50e6b3e12dc082b5f9ca8ae8eea340d178 SHA512 4b4dd8ff2e2bf256b7791509217ca4c9011ca583668227d5176ca285ec11caaba0febd87234ac0fc5dbf297346d128798b4e7c331ab4e3a6edbe345d1efa1397 +EBUILD libexif-0.6.22_p20201105.ebuild 1483 BLAKE2B 456b435a9c77f6d4f24584c08e70e2fc89a3680d3e158a12cec1996269fdf81ac2cfab17e5597f55e0d87594c215c22c96a6aae4d8bf36d500cfe8e1ff303d99 SHA512 9e43f2b8d42c4104437c9a5b1232ccc60eca16a52f490a2a29e4b3157b5b2df4c05fa46356ae6fcaba30847d2382b4fc07f7edaa560ac14c82a29e914ab17caf MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0 diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild new file mode 100644 index 000000000000..1c4bfaf15476 --- /dev/null +++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +COMMIT="9266d14b5ca4e29b970fa03272318e5f99386e06" +DESCRIPTION="Library for parsing, editing, and saving EXIF data" +HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/libexif" +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}" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="doc nls static-libs" + +RDEPEND="nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch +) + +src_prepare() { + default + sed -i -e '/FLAGS=/s:-g::' configure.ac || die #390249 + # Previously elibtoolize for BSD + eautoreconf +} + +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} +} + +multilib_src_install() { + emake DESTDIR="${ED}" 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/libfishsound/Manifest b/media-libs/libfishsound/Manifest index c5e9464700f3..8e18620452a5 100644 --- a/media-libs/libfishsound/Manifest +++ b/media-libs/libfishsound/Manifest @@ -1,4 +1,4 @@ AUX libfishsound-1.0.0-pc.patch 410 BLAKE2B a949e5c3e843017f7c901ef936da4dac2f9d3300cc6fe57032d28bfba94919baee9a77054464cd97c567bc90733bbd6cd92fa25f7fb4a41cc38e5f502b075eae SHA512 b4b5f70363633702ed1932454bf8133d24ff7703f432ebd0c8721e33d48c1a21fc996c4759713fb2272f230038b40fe6cc773aea715726dfee13066669e32f1e DIST libfishsound-1.0.0.tar.gz 444980 BLAKE2B eadb6bed80d51fa7399f9557a38b65183a4f583e431bc68ee961dcca947856c79f011206fdcb04ed6ee5f709e1045b2a9c4fd4a34afa00b09656b1a4623c3ab0 SHA512 97d850fb42b394fca098a96b1784da431a0af1d54d57127179b612e4b88a7a2e406eb1411f55536e5a11ec2e8956f2659182c60ac46d49f6d14250e39a740339 -EBUILD libfishsound-1.0.0.ebuild 963 BLAKE2B b7f1b6bdfe3b5c2e58dcfb9e448b173e19ac57c83a1d555f2e9063c3e91b35117c9395144f7e39f3c32c8b616b1de8bdf33097647650033081ad297a5fc38edb SHA512 11ae0d117078a20bc80045051be6f9c904be4f3f16437388a4b9bd088f22dac832dfc2a0218afa380ebb1b1022dd112900753b2df17e1d737ad43436e3f2c426 +EBUILD libfishsound-1.0.0.ebuild 1021 BLAKE2B 6f658088e2fddb7f1ca3ff4bdc32f24daacff699650a96ab603e2fb8127207cd162b80a5f283763a78c42cb02b20a117294dffacfadd2c2978d1af1ab2e01505 SHA512 50605d6f5398ec70b5c5479420a948e562470b7aaa501b26046b1b4294700dc36a3f5fc6890fb9ee863f3c92845a70fb29ee9b1963bb366b74abe09f7828ab49 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0.ebuild index 9c9167f6dd94..3422916b0400 100644 --- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild +++ b/media-libs/libfishsound/libfishsound-1.0.0.ebuild @@ -33,7 +33,7 @@ src_prepare() { } src_configure() { - local myconf="" + local myconf="--disable-static" use flac || myconf="${myconf} --disable-flac" use speex || myconf="${myconf} --disable-speex" @@ -44,4 +44,5 @@ src_install() { emake DESTDIR="${D}" \ docdir="${D}/usr/share/doc/${PF}" install dodoc AUTHORS ChangeLog README + find "${ED}" -name '*.la' -delete || die } diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest index ee604a826a57..42c52581a34e 100644 --- a/media-libs/libglvnd/Manifest +++ b/media-libs/libglvnd/Manifest @@ -1,4 +1,4 @@ DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c -EBUILD libglvnd-1.3.2-r1.ebuild 1534 BLAKE2B 9a515f93cacd2d16dae222b0cebc4267ec893300b84a39130e75b12db36a029e488ff5e58f3379ea0ce22610073eb4690dc459f3d996d11704a64bd844297a80 SHA512 b0c4eef0ed3e236aed1c891fa912146ebcacad90215e5a150771bd1b685d00e0f6fb4e6e3b23f6717dc60f80fa59d851b207f72ecddaf1f12e66452e005da5ad -EBUILD libglvnd-9999.ebuild 1541 BLAKE2B 1734a7c993bf0023b47c7da30eee02f51171642612ef5e4e970eaaa903bf510cafa5c6aff02641c0a0ef61a77aca56705c3b808a9e58eb1e527f5fc39337704b SHA512 847ce31c298f05b67478d2d3b852afd6872fb7fcada81e4baa92e8700fddb2084a617150f3b3aac92681b399a4d82ffad562dbd1b806be802f823c17ec4b085a +EBUILD libglvnd-1.3.2-r2.ebuild 1527 BLAKE2B 6dc5864dcf4ed749e6d6f07f392beb955c6c65bdb2582dd67eeddc8ea4a2212889596018953ece75451862b05f0dbf3771c01aa2bdbe6b6931fdbd9c36724fbb SHA512 007f3b17e2cfab1d20aa56e9ccf3ad8875de1290c7f49e440895d2e2f41020e9d5d70c5ed2c78ced5dc9e1169b13bd9344ff2587997941d80ceda05fd8c3c976 +EBUILD libglvnd-9999.ebuild 1535 BLAKE2B 58ddbb76e270935587fd4baa48985b015c037c8f3cff87297cd6f784fc343494f05d376a72500aed41eb440618fd3939e31acea0002d1a94a251bfbd959996cf SHA512 933168d07eb2ce996b1c32d27ddf3bca35595f0b98fb9abc204fa31e0c378c5ddc493e26dae88eae13675143220fbf5eb2f2e524a67028c55f1ff5c2d6adc47e MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c diff --git a/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild b/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild deleted file mode 100644 index 4c9e3146130b..000000000000 --- a/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2018-2020 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_{6,7,8} ) -VIRTUALX_REQUIRED=manual - -inherit ${GIT_ECLASS} meson multilib-minimal 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=" - ! /dev/null 2>&1; then + einfo "No camera drivers will be built since you did not specify any." + fi +} + +src_prepare() { + default + + # Handle examples ourselves + sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "examples sed failed" + + sed -e 's/sleep 2//' -i configure || die +} + +multilib_src_configure() { + local myconf + use doc || myconf=( ac_cv_path_DOXYGEN=false ) + + # Upstream doesn't default to --enable-option-checking due having another + # configure in libgphoto2_port/ that also needs to be checked on every bump + # + # Serial port uses either lockdev or ttylock, but we don't have ttylock + # --with-doc-dir needed to prevent duplicate docs installation, bug #586842 + ECONF_SOURCE=${S} \ + econf \ + --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --disable-docs \ + --disable-gp2ddb \ + $(use_enable nls) \ + $(use_with exif libexif auto) \ + $(use_with gd) \ + $(use_with jpeg) \ + $(use_enable serial) \ + $(use_enable serial lockdev) \ + --with-libusb=no \ + --with-libusb-1.0=auto \ + --disable-ttylock \ + --with-camlibs=${cameras} \ + --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ + --with-rpmbuild=$(type -P true) \ + udevscriptdir="$(get_udevdir)" \ + "${myconf[@]}" +} + +src_configure() { + local cameras + local cam + local cam_warn=no + for cam in ${IUSE_CAMERAS} ; do + if use "cameras_${cam}"; then + cameras="${cameras},${cam}" + else + cam_warn=yes + fi + done + + if [ "${cam_warn}" = "yes" ]; then + [ -z "${cameras}" ] || cameras="${cameras:1}" + einfo "Enabled camera drivers: ${cameras:-none}" + einfo "Upstream will not support you if you do not compile all camera drivers first" + else + cameras="all" + einfo "Enabled camera drivers: all" + fi + + multilib-minimal_src_configure +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc; then + doxygen doc/Doxyfile || die "Documentation generation failed" + fi +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die + + einstalldocs + dodoc TESTERS MAINTAINERS + + if use examples; then + docinto /usr/share/doc/${PF}/examples + dodoc examples/README examples/*.c examples/*.h + fi + + # FIXME: fixup autoconf bug #???? + if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then + rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" + fi + # end fixup + + local udev_rules cam_list + udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules" + cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list" + + if [ -x "${ED}"${cam_list} ]; then + # Let print-camera-list find libgphoto2.so + export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" + # Let libgphoto2 find its camera-modules + export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}" + + einfo "Generating UDEV-rules ..." + mkdir -p "${ED}"/${udev_rules%/*} + echo -e "# do not edit this file, it will be overwritten on update\n#" \ + > "${ED}"/${udev_rules} + "${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \ + || die "failed to create udev-rules" + else + eerror "Unable to find print-camera-list" + eerror "and therefore unable to generate hotplug usermap." + eerror "You will have to manually generate it by running:" + eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}" + fi + +} + +pkg_postinst() { + if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then + elog "Don't forget to add yourself to the plugdev group " + elog "if you want to be able to access your camera." + fi + + local old_udev_rules="${EROOT}"/etc/udev/rules.d/99-libgphoto2.rules + if [[ -f ${old_udev_rules} ]]; then + rm -f "${old_udev_rules}" + fi +} diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest index fd5e3fe06f08..89ea6ad8b0ca 100644 --- a/media-libs/libhdhomerun/Manifest +++ b/media-libs/libhdhomerun/Manifest @@ -6,4 +6,4 @@ DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818a EBUILD libhdhomerun-20150826.ebuild 624 BLAKE2B 118b8847494bc537d9ad5a71c06c8f3b704dc574bc0f5a85008e1099c6fa698ac338c8b03684073b1eb552e6bb44292947d02c8ee1fbdcfcfcb18b51bc0e3d8d SHA512 0d0a49bffdc67789ceb896db00191c65e40e2f02b21c9cc4aa5b312c6c1edad217f35509a61488a7d59ea7e5c55894cb67f509cf5b69a28df16c6f7918b530e7 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e EBUILD libhdhomerun-20200521.ebuild 745 BLAKE2B 24f96b3e66c295f77841d2f6e5fd0bb50aceb6ab549925b82b87129c260eff20a8e49a85060d88a343097bdc47388dec7ef44efa4a7ce6f47744b29f2075497f SHA512 e6519e4fb53f129baef66b52c471cec82ee2380c91bcb70675221628c68792dbd330226cc44d8a5928f2d8707ee14b900713226fd42008c655863c3fc16a7719 -MISC metadata.xml 371 BLAKE2B d947e1bb44b48f4cb0bcdc6670cfc2158ee817b23054232a95dd2065160eef05f9c58120a7f9e8e5601bd28b52f2d3c0e26200d4895b3d9f4fd49c5d419a4632 SHA512 02d0a41cc9695ca052d6d9cef8c513a7e6a93c5048240c85b7f26e2510dd06429fa1ead13fa3052758fb2d8cdbe6dc75dcac98095d6ac451ebce062648cafbca +MISC metadata.xml 381 BLAKE2B 5ffa518c826118aec9b46d3e964d52f21ef19332b0ee956cc153b992eb5c85af27ebebfb6891156262eb19e65b0b47f076d0940b490fadb42f2b04d16889b550 SHA512 4cf06e9cd0ab6bce4c38f2b86c4875864924616746fb18816f647dfb4cacde6e7678c2f7a20c0de94194e9227d6133efded1f81ac2064b7d0532b445cf041b38 diff --git a/media-libs/libhdhomerun/metadata.xml b/media-libs/libhdhomerun/metadata.xml index 4c0ca2be0ca6..70e8a88d6f28 100644 --- a/media-libs/libhdhomerun/metadata.xml +++ b/media-libs/libhdhomerun/metadata.xml @@ -2,7 +2,7 @@ - thebitpit@earthlink.net + thebitpit@austincustomerrands.com Wilson Michaels diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest index dcd61a0ef16b..8618834ee8b6 100644 --- a/media-libs/libheif/Manifest +++ b/media-libs/libheif/Manifest @@ -1,14 +1,5 @@ -AUX heif_test.go 4326 BLAKE2B c9995e9caf35db5f936dcfc54592946e81e0fda9e785309526cce40c43c2ae9663d091a30c46adb97602a6ef1921503fd5c1873b8524774dd3f24a2b3c9f64c7 SHA512 af6212a5cf6cb4e96508cc9ce63072c42e3ec36a16192e4bf0ae2ccd3949f0259617aba544c3eeb2816ffb9747d61b4476fa152720cb2ec708153c967ef08e20 AUX libheif-1.7.0-aom.patch 1530 BLAKE2B 150b86b0b1ed872ff13dfc59933b1aec80d259456666f7bd3fac11d4c5d220349b2ca927f36835e8710f476e1df2ca13c7a5126545c80a2abd0b069953186f18 SHA512 f30474c9f31aa8676352b9848a49699c320ead37a8a59b5c62b98945e520af40fc24fcbf225240c3237cde638d7b274e45dc135a16a3e8a7b278bbafc2cfca3d -DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8 -DIST libheif-1.6.1.tar.gz 1514950 BLAKE2B d658f0c408f9a09eaac890119119327bd3e9c84db785d001b2c7a979b9574a6723403fe063ed6ce77812bface04be124e808fc90c1325c13e3d87f8b46ac0b65 SHA512 5a2104e529d59c23c988b6c0c167f9e7017ff77763eb71fee1c26f97624e9d7e2d0f863123d1886536d37f96ea6b93969a1c53e747672c54a2220aa6f47be1bf -DIST libheif-1.6.2.tar.gz 1515763 BLAKE2B e7a901394349bc8bbf633a0193d7a08a1cecf7e97a8ac709efb9c2e5e6da387c7fa5e8b551cecf1f67b4e7a7d06f034e64c20d7c55f9a7898c0badb79ed485f7 SHA512 41848c05d88f82827ebdd0662a1870ce8b7899f6a86ef5aa483b301176602da8e69d2c5a49b4d911bc0cac51bdab81a06fd43efae2722092cc09c02119c95f07 -DIST libheif-1.7.0.tar.gz 1526096 BLAKE2B 74b8284875321781d13d17b877eb8291ecdd0fe1700f73a433d3b125a8ee6b33a326310d729e62bac9d9fecfea095f21ef590e711d550dcaac79570b3f917885 SHA512 13c95540fee13f3fba8d8a4f69886bf5563e9fa22c5cd113dbe16d20670b077b5961171e5f9fb0f256cc42c4650e13465c93d3fbb03013997a7fc163463e8b3a -DIST libheif-1.8.0.tar.gz 1544438 BLAKE2B 983d3675c6788f69d7839d72064ca97d7347f5b2105b489ea6834c6ca5ab3d0ad8dd9157ab9d8636d3978a308d9f1983c8e5b0d151ffd9c013c9b2c9ef059d74 SHA512 e6edf03c0baf7d55ace57b8de1cf05d3b6708a0bd58d4191599960ad3924509dd7e9528a021586012b768a5a5b253e5bab470b944a2ead45f85274842da4913a -EBUILD libheif-1.5.1.ebuild 1556 BLAKE2B 965c7293f6f3894e58624d42b431e99e3174f087f5d2a6b4912f96ee400c2dac556d90090c9e90dbaf76e4fef3afc4978cf20184a02547c3d2b151f0fa0313b5 SHA512 b32bcfc2968ee4e85bf2467a6ad951c17556a9d4fb2b930f7ab8faa6cc60cd6b5db9ed8d06c2049773e0c8c765711466ebf86f8da0f001fbd4e7ac9373497f06 -EBUILD libheif-1.6.1.ebuild 1563 BLAKE2B c5c570831298ff99d120869260df0cf7d4820112038afc5518d48f67da7d86e362ddcb7820f9c1407a2b4bff72be57c59e694a05d573beecaf2b99dbd30fb1ce SHA512 62eee0b51e08d6323ab088611c79647e08e71da1f58ef99f214ee3762fec52f91b9682f9bbf995e8da7d02cdf9917b92ee42fb32d4fd97035963923d074ce423 -EBUILD libheif-1.6.2.ebuild 1568 BLAKE2B 7b2885d783893ff76fd2dc40e9d4ef526154be1cddfd57bb8df6faf3de9c9035138853050cb148372332e16372a61fc342f8dc6e2a650f6d3acbdcee0210f039 SHA512 1996a90ad858246103d847e90d1e1fcede142d3a61ff29be6a5a849bef41ff3adedf91bc7f42a9d01a62e1d570f5ca952b3dcd0b9895b563324581627fadaeba -EBUILD libheif-1.7.0-r1.ebuild 1489 BLAKE2B 26c3bf27f9c95a2b5d2dc93889b4048200de195a6b1fbd1b5e2853705cc132619c5b62c1829349964ffe83cba682e7c57a5ca3ceae431c929d896115a3ace566 SHA512 d87cf9eec5725c6310e38505fd05687ce485331a42851a9d828ae41601ee645e6439805e48bbffb8ff79fa5cbd2ca944d0ada078211023c5799cece0fac78a1c -EBUILD libheif-1.8.0.ebuild 1450 BLAKE2B 064f43ad10a73e251d79d076f3fc2e2db3f651f8af035e8c7248251d47d75596527b981a111f24e8f0657ca9c68fec3f50ff111722bf3df19872c4dbe2a6167f SHA512 06fe2498ddd4bd00de31aa7d673e443b7e869437f33dc3eefb72ef5f69dc869aac60496f669030294df57a96ead462e79ea274cab46ae6f3d2cfa316be773507 -EBUILD libheif-9999.ebuild 1450 BLAKE2B 064f43ad10a73e251d79d076f3fc2e2db3f651f8af035e8c7248251d47d75596527b981a111f24e8f0657ca9c68fec3f50ff111722bf3df19872c4dbe2a6167f SHA512 06fe2498ddd4bd00de31aa7d673e443b7e869437f33dc3eefb72ef5f69dc869aac60496f669030294df57a96ead462e79ea274cab46ae6f3d2cfa316be773507 -MISC metadata.xml 485 BLAKE2B 5e631eaa6f914c0a0d89bfa65a6287b466755d3cdf29461c92ed6ca4b37e673458edf2ffefb84f31b8b86340d153155b6366cc692e7c5d7fadb9461fe43baa84 SHA512 5b88224363374aeafd2b3c5a5d0666d5b22a23a260a65323bce1102b7af6ebe21e7d07c1f0409289abd7c64d2cacb3dc1a4393ee11cbfb0db94acee8481e8fbe +DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe +EBUILD libheif-1.9.1.ebuild 1594 BLAKE2B 32fcf5315081f5aa4437c88de45393c2965a391f0d37fde470f3527d8ce5a5c346088ce0e119672cafc4788eced325c7eb415f4252a16d455995249636f38912 SHA512 45026b98d6cab726bea57cc32b16ac5ee535c1b56355f75108cb5c3e566a7df07d74caa566deb8baf3046803c69c35ed71626d07dbe7676ef0a9a4c5b8cfbdbf +EBUILD libheif-9999.ebuild 1597 BLAKE2B 7cc9e56415e52d885e159897fee4ef8e1da9d8d8e3a545d409692f64d01f0cc23da0dbc994d725afd7090051dc790fc8e1e466bebfcbc9df7e53a336c1879f0f SHA512 5b9b509908870e681e34c7f037fec5682d1b18deefe3cfbbbbbfd73f9e1c0da6fb731c5aa0436c0f70544fbfaec4ec93e8ef85c7b807b7d285bb3d82bb75aea6 +MISC metadata.xml 686 BLAKE2B f28565928ef395759abf7b1cbc0bafede7f9299f74b8748534135379d1778f24af394dde234e6d727cbead1a345d2c86c7dc3d93cabf81441ff072a38e7c571a SHA512 b06a9e574156521aa7ef763aae5fb2a83c20aa7265043f3992a9b4acae775f747d7ffbbe2fe5ef57e5e04dc89906c71c9ea1c7bc8ed76f94c347b78d7115ac4f diff --git a/media-libs/libheif/files/heif_test.go b/media-libs/libheif/files/heif_test.go deleted file mode 100644 index 187d773dea60..000000000000 --- a/media-libs/libheif/files/heif_test.go +++ /dev/null @@ -1,155 +0,0 @@ -/* - * GO interface to libheif - * Copyright (c) 2018 struktur AG, Joachim Bauch - * - * This file is part of heif, an example application using libheif. - * - * heif is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * heif is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with heif. If not, see . - */ - -package heif - -import ( - "fmt" - "image" - "io/ioutil" - "os" - "path" - "testing" -) - -func TestGetVersion(t *testing.T) { - version := GetVersion() - if version == "" { - t.Fatal("Version is missing") - } -} - -func CheckHeifImage(t *testing.T, handle *ImageHandle, thumbnail bool) { - handle.GetWidth() - handle.GetHeight() - handle.HasAlphaChannel() - handle.HasDepthImage() - count := handle.GetNumberOfDepthImages() - if ids := handle.GetListOfDepthImageIDs(); len(ids) != count { - t.Errorf("Expected %d depth image ids, got %d", count, len(ids)) - } - if !thumbnail { - count = handle.GetNumberOfThumbnails() - ids := handle.GetListOfThumbnailIDs() - if len(ids) != count { - t.Errorf("Expected %d thumbnail image ids, got %d", count, len(ids)) - } - for _, id := range ids { - if thumb, err := handle.GetThumbnail(id); err != nil { - t.Errorf("Could not get thumbnail %d: %s", id, err) - } else { - CheckHeifImage(t, thumb, true) - } - } - } - - if img, err := handle.DecodeImage(ColorspaceUndefined, ChromaUndefined, nil); err != nil { - t.Errorf("Could not decode image: %s", err) - } else { - img.GetColorspace() - img.GetChromaFormat() - } -} - -func CheckHeifFile(t *testing.T, ctx *Context) { - if count := ctx.GetNumberOfTopLevelImages(); count != 2 { - t.Errorf("Expected %d top level images, got %d", 2, count) - } - if ids := ctx.GetListOfTopLevelImageIDs(); len(ids) != 2 { - t.Errorf("Expected %d top level image ids, got %+v", 2, ids) - } - if _, err := ctx.GetPrimaryImageID(); err != nil { - t.Errorf("Expected a primary image, got %s", err) - } - if handle, err := ctx.GetPrimaryImageHandle(); err != nil { - t.Errorf("Could not get primary image handle: %s", err) - } else { - if !handle.IsPrimaryImage() { - t.Error("Expected primary image") - } - CheckHeifImage(t, handle, false) - } -} - -func TestReadFromFile(t *testing.T) { - ctx, err := NewContext() - if err != nil { - t.Fatalf("Can't create context: %s", err) - } - - filename := path.Join("..", "..", "examples", "example.heic") - if err := ctx.ReadFromFile(filename); err != nil { - t.Fatalf("Can't read from %s: %s", filename, err) - } - - CheckHeifFile(t, ctx) -} - -func TestReadFromMemory(t *testing.T) { - ctx, err := NewContext() - if err != nil { - t.Fatalf("Can't create context: %s", err) - } - - filename := path.Join("..", "..", "examples", "example.heic") - data, err := ioutil.ReadFile(filename) - if err != nil { - t.Fatalf("Can't read file %s: %s", filename, err) - } - if err := ctx.ReadFromMemory(data); err != nil { - t.Fatalf("Can't read from memory: %s", err) - } - data = nil // Make sure future processing works if "data" is GC'd - - CheckHeifFile(t, ctx) -} - -func TestReadImage(t *testing.T) { - filename := path.Join("..", "..", "examples", "example.heic") - fp, err := os.Open(filename) - if err != nil { - t.Fatalf("Could not open %s: %s", filename, err) - } - defer fp.Close() - - config, format1, err := image.DecodeConfig(fp) - if err != nil { - t.Fatalf("Could not load image config from %s: %s", filename, err) - } - if format1 != "heif" { - t.Errorf("Expected format heif, got %s", format1) - } - if _, err := fp.Seek(0, 0); err != nil { - t.Fatalf("Could not seek to start of %s: %s", filename, err) - } - - img, format2, err := image.Decode(fp) - if err != nil { - t.Fatalf("Could not load image from %s: %s", filename, err) - } - if format2 != "heif" { - t.Errorf("Expected format heif, got %s", format2) - } - - r := img.Bounds() - if config.Width != (r.Max.X-r.Min.X) || config.Height != (r.Max.Y-r.Min.Y) { - fmt.Printf("Image size %+v does not match config %+v\n", r, config) - } -} diff --git a/media-libs/libheif/libheif-1.5.1.ebuild b/media-libs/libheif/libheif-1.5.1.ebuild deleted file mode 100644 index 157ef7068071..000000000000 --- a/media-libs/libheif/libheif-1.5.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm64 x86" -fi - -DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" -HOMEPAGE="https://github.com/strukturag/libheif" - -LICENSE="GPL-3" -SLOT="0/1.5" -IUSE="static-libs test +threads" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-lang/go )" -DEPEND=" - media-libs/libde265:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - media-libs/x265:=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - # heif_test.go is not included in the tarball - # https://github.com/strukturag/libheif/issues/289 - cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die - - sed -i -e 's:-Werror::' \ - configure.ac || die - - eautoreconf - - # prevent "stat heif-test.go: no such file or directory" - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable threads multithreading) - $(use_enable static-libs static) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - default - emake -C go test -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/media-libs/libheif/libheif-1.6.1.ebuild b/media-libs/libheif/libheif-1.6.1.ebuild deleted file mode 100644 index 93703270cf38..000000000000 --- a/media-libs/libheif/libheif-1.6.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" -HOMEPAGE="https://github.com/strukturag/libheif" - -LICENSE="GPL-3" -SLOT="0/1.6" -IUSE="static-libs test +threads" - -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-lang/go )" -DEPEND=" - media-libs/libde265:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - media-libs/x265:=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - # heif_test.go is not included in the tarball - # https://github.com/strukturag/libheif/issues/289 - cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die - - sed -i -e 's:-Werror::' configure.ac || die - - eautoreconf - - # prevent "stat heif-test.go: no such file or directory" - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable threads multithreading) - $(use_enable static-libs static) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - default - emake -C go test -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/media-libs/libheif/libheif-1.6.2.ebuild b/media-libs/libheif/libheif-1.6.2.ebuild deleted file mode 100644 index 9a74d8cf8cbf..000000000000 --- a/media-libs/libheif/libheif-1.6.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" -HOMEPAGE="https://github.com/strukturag/libheif" - -LICENSE="GPL-3" -SLOT="0/1.6" -IUSE="static-libs test +threads" - -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-lang/go )" -DEPEND=" - media-libs/libde265:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - media-libs/x265:=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - # heif_test.go is not included in the tarball - # https://github.com/strukturag/libheif/issues/289 - cp "${FILESDIR}/heif_test.go" "${S}/go/heif" || die - - sed -i -e 's:-Werror::' configure.ac || die - - eautoreconf - - # prevent "stat heif-test.go: no such file or directory" - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable threads multithreading) - $(use_enable static-libs static) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - default - emake -C go test -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/media-libs/libheif/libheif-1.7.0-r1.ebuild b/media-libs/libheif/libheif-1.7.0-r1.ebuild deleted file mode 100644 index 389834d35862..000000000000 --- a/media-libs/libheif/libheif-1.7.0-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -fi - -DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" -HOMEPAGE="https://github.com/strukturag/libheif" - -LICENSE="GPL-3" -SLOT="0/1.7" -IUSE="gdk-pixbuf go static-libs test +threads" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-lang/go )" -DEPEND=" - media-libs/libde265:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - media-libs/x265:=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - gdk-pixbuf? ( x11-libs/gdk-pixbuf ) - go? ( dev-lang/go ) -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${P}-aom.patch -) - -src_prepare() { - default - - sed -i -e 's:-Werror::' configure.ac || die - - eautoreconf - - # prevent "stat heif-test.go: no such file or directory" - multilib_copy_sources -} - -multilib_src_configure() { - local econf_args=( - $(multilib_is_native_abi && use_enable go || echo --disable-go) - $(use_enable gdk-pixbuf) - $(use_enable static-libs static) - $(use_enable threads multithreading) - ) - ECONF_SOURCE="${S}" econf "${econf_args[@]}" -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/libheif/libheif-1.8.0.ebuild b/media-libs/libheif/libheif-1.8.0.ebuild deleted file mode 100644 index 6c16fb0e9ab5..000000000000 --- a/media-libs/libheif/libheif-1.8.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" -HOMEPAGE="https://github.com/strukturag/libheif" - -LICENSE="GPL-3" -SLOT="0/1.8" -IUSE="gdk-pixbuf go static-libs test +threads" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-lang/go )" -DEPEND=" - media-libs/libde265:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - media-libs/x265:=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - gdk-pixbuf? ( x11-libs/gdk-pixbuf ) - go? ( dev-lang/go ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i -e 's:-Werror::' configure.ac || die - - eautoreconf - - # prevent "stat heif-test.go: no such file or directory" - multilib_copy_sources -} - -multilib_src_configure() { - local econf_args=( - $(multilib_is_native_abi && use_enable go || echo --disable-go) - $(use_enable gdk-pixbuf) - $(use_enable static-libs static) - $(use_enable threads multithreading) - ) - ECONF_SOURCE="${S}" econf "${econf_args[@]}" -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/libheif/libheif-1.9.1.ebuild b/media-libs/libheif/libheif-1.9.1.ebuild new file mode 100644 index 000000000000..49f02ffbc2bb --- /dev/null +++ b/media-libs/libheif/libheif-1.9.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools xdg multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/strukturag/libheif.git" + inherit git-r3 +else + SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +fi + +DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" +HOMEPAGE="https://github.com/strukturag/libheif" + +LICENSE="GPL-3" +SLOT="0/1.9" +IUSE="gdk-pixbuf go static-libs test +threads" +REQUIRED_USE="test? ( go )" + +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-lang/go )" +DEPEND=" + >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] + media-libs/libde265:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + media-libs/x265:=[${MULTILIB_USEDEP}] + sys-libs/zlib:=[${MULTILIB_USEDEP}] + virtual/jpeg:0=[${MULTILIB_USEDEP}] + gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] ) + go? ( dev-lang/go ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i -e 's:-Werror::' configure.ac || die + + eautoreconf + + # prevent "stat heif-test.go: no such file or directory" + multilib_copy_sources +} + +multilib_src_configure() { + local econf_args=( + $(multilib_is_native_abi && use go || echo --disable-go) + $(use_enable gdk-pixbuf) + $(use_enable static-libs static) + $(use_enable threads multithreading) + ) + ECONF_SOURCE="${S}" econf "${econf_args[@]}" +} + +multilib_src_test() { + default + emake -C go test +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild index 6c16fb0e9ab5..20821993904a 100644 --- a/media-libs/libheif/libheif-9999.ebuild +++ b/media-libs/libheif/libheif-9999.ebuild @@ -6,10 +6,10 @@ EAPI=7 inherit autotools xdg multilib-minimal if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" + EGIT_REPO_URI="https://github.com/strukturag/libheif.git" inherit git-r3 else - SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" + SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi @@ -17,18 +17,21 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" HOMEPAGE="https://github.com/strukturag/libheif" LICENSE="GPL-3" -SLOT="0/1.8" +SLOT="0/1.9" IUSE="gdk-pixbuf go static-libs test +threads" +REQUIRED_USE="test? ( go )" + RESTRICT="!test? ( test )" BDEPEND="test? ( dev-lang/go )" DEPEND=" + >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] media-libs/libde265:=[${MULTILIB_USEDEP}] media-libs/libpng:0=[${MULTILIB_USEDEP}] media-libs/x265:=[${MULTILIB_USEDEP}] sys-libs/zlib:=[${MULTILIB_USEDEP}] virtual/jpeg:0=[${MULTILIB_USEDEP}] - gdk-pixbuf? ( x11-libs/gdk-pixbuf ) + gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] ) go? ( dev-lang/go ) " RDEPEND="${DEPEND}" @@ -46,7 +49,7 @@ src_prepare() { multilib_src_configure() { local econf_args=( - $(multilib_is_native_abi && use_enable go || echo --disable-go) + $(multilib_is_native_abi && use go || echo --disable-go) $(use_enable gdk-pixbuf) $(use_enable static-libs static) $(use_enable threads multithreading) @@ -54,6 +57,11 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${econf_args[@]}" } +multilib_src_test() { + default + emake -C go test +} + multilib_src_install_all() { find "${ED}" -name '*.la' -delete || die } diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml index f92d3bad5e85..5ae142ce31e4 100644 --- a/media-libs/libheif/metadata.xml +++ b/media-libs/libheif/metadata.xml @@ -1,7 +1,14 @@ - + + jakov.smolic@sartura.hr + Jakov Smolic + + + proxy-maint@gentoo.org + Proxy Maintainers + Enable x11-libs/gdk-pixbuf plugin Enable building dev-lang/go code/examples diff --git a/media-libs/libinsane/Manifest b/media-libs/libinsane/Manifest index aa073aebf501..1604d882c58b 100644 --- a/media-libs/libinsane/Manifest +++ b/media-libs/libinsane/Manifest @@ -1,6 +1,6 @@ AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572 -DIST libinsane-1.0.4.tar.gz 950729 BLAKE2B c09257646b21421eea6312748284456bd7b6f3eb1b64b831e15ae02b519e13d8bb39e2447186f44c6345190bf5e6a38640d9b95a73cbc899ece7c669c3650760 SHA512 2a042fa55874f108b4b1a2cdb88ce60e771f6789cb5704298ce60c4373b4b60e6461e7cf2a96652e1e06a481c02dc6cf9d6aae12c97ad5ac484de815419af5be DIST libinsane-1.0.7.tar.gz 964471 BLAKE2B 8c91f9799fe0f4bd3181e62a31396f2eb0670b41bc6c231da8714d87dcf854299fd6777481fc0cfb70700d1f34dbb453695451ea2e09ab180a14d601cd678197 SHA512 9c9f884fa3f99a7b04882a4cf866ab5c0b7abb1f60ac75ba921856184ad1471de41dc5a0c312eba93eb82c75d54bea9e30c76f2ee8b647904da700e013fe3ba9 -EBUILD libinsane-1.0.4.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad +DIST libinsane-1.0.8.tar.gz 965255 BLAKE2B f87281f599b097a077b3d09457585c31d6def2b42fcf66bb4207998cdd3e609b2ae4034f6867c49869668ff411effdd150d23b1ea0e92cce45adf43e23203c80 SHA512 810a7e7005b93a4da53aefa6b3c63824800eba5fee9b945d45f64372a98e04e6fd5fd554db817f2b41c481ec78b3723b151337de6cb5784d423868e19bd36aa3 EBUILD libinsane-1.0.7.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad +EBUILD libinsane-1.0.8.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad MISC metadata.xml 1015 BLAKE2B 2e8221fd55bcf22db23935d2150a4832c32c8e7b7703b7305797da9f63eda012261a8dbd25a00a92964a2b4e3fc22b9e2252133431582ae27964f091161d1176 SHA512 2de5a23ff82cc957941ac4e21d1261743a7f4f36a13ff6402224989eb613fa3a5138b3a464b79017e1c17cc4b7bd553e16e3cb5d9f575b57a362ab4c7d2d1fc9 diff --git a/media-libs/libinsane/libinsane-1.0.4.ebuild b/media-libs/libinsane/libinsane-1.0.4.ebuild deleted file mode 100644 index bf213a427962..000000000000 --- a/media-libs/libinsane/libinsane-1.0.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit meson vala - -DESCRIPTION="Crossplatform access to image scanners" -HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane" -SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gtk-doc test" - -RDEPEND="dev-libs/gobject-introspection - media-gfx/sane-backends" -DEPEND="${RDEPEND} - doc? ( - app-doc/doxygen - dev-util/gtk-doc - ) - test? ( - dev-util/cunit - dev-util/valgrind - )" - -BDEPEND="dev-util/glib-utils - virtual/pkgconfig - $(vala_depend)" - -# Tests require an operational valgrind -# https://wiki.gentoo.org/wiki/Debugging -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch ) - -src_prepare() { - vala_src_prepare - default -} - -src_configure() { - local emesonargs=( - $(meson_use doc doc) - ) - meson_src_configure -} diff --git a/media-libs/libinsane/libinsane-1.0.8.ebuild b/media-libs/libinsane/libinsane-1.0.8.ebuild new file mode 100644 index 000000000000..bf213a427962 --- /dev/null +++ b/media-libs/libinsane/libinsane-1.0.8.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit meson vala + +DESCRIPTION="Crossplatform access to image scanners" +HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc gtk-doc test" + +RDEPEND="dev-libs/gobject-introspection + media-gfx/sane-backends" +DEPEND="${RDEPEND} + doc? ( + app-doc/doxygen + dev-util/gtk-doc + ) + test? ( + dev-util/cunit + dev-util/valgrind + )" + +BDEPEND="dev-util/glib-utils + virtual/pkgconfig + $(vala_depend)" + +# Tests require an operational valgrind +# https://wiki.gentoo.org/wiki/Debugging +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch ) + +src_prepare() { + vala_src_prepare + default +} + +src_configure() { + local emesonargs=( + $(meson_use doc doc) + ) + meson_src_configure +} diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index 4ad530d96168..9105f2ea88f7 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -4,12 +4,10 @@ AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca889205 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a AUX libjpeg-turbo-2.0.4-CVE-2020-13790.patch 1543 BLAKE2B f8a420aed675c7c5adc1d194bc43b7aabc1c0af7c1a362073c1e1006ef4598e92deacc1373d9645076b43f0277a777007b986e62c71bc84d9d2640308872fa46 SHA512 dbb8b6cfcc672e41af8150139a964deac3d926e7e4435e0d5125b36e7dcfdfcb3915267efeb1a7d891581b34790636ea2d1de48163d8c6ddc50e041dbd1ae140 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202 -DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 -DIST libjpeg-turbo-2.0.4.tar.gz 2161812 BLAKE2B 9be870a5bafaae279646941b848b69fdf7c95ec08a686b01674f473ef33fe5923a04ba8a2d57df84384530308ca46fc3880a404c0eff769129417a553faed3bb SHA512 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 DIST libjpeg-turbo-2.0.5.tar.gz 2162983 BLAKE2B d9204e06f075173a420931457c3738aba57a820719fb878765114b169ebb8212df18165a5f86f22126dd7eb8f8aab03caa2ba7f55e87d19196dba094e4a959fa SHA512 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555 +DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 -EBUILD libjpeg-turbo-1.5.3-r3.ebuild 2964 BLAKE2B 679e11de696a4ce59df452d37f0df0dad315fc1061b7a67f2897e7f0a5f31a0805d2a5fa1827a1f2cd9754aa3b21089e00237b3ddaac09f5f49c074e1cf52317 SHA512 906db6b0eb7c7798b7d40b49b5630a5321e139deda494acc84dc97cd7456e001a142eff48228d2877eb79e48bd3c7789c5dfc44a64e6bdd93e06aadd4d0c7cea -EBUILD libjpeg-turbo-2.0.3.ebuild 2589 BLAKE2B 0207ab472f818dbdec8c2ab0f5d5309a6cac15996121ab1f89492d6c0f8fa6f9525386491eedc4a39708ac70bfc5b26f35c7ef8a24e4e9090f6ab74bb07b5481 SHA512 1565a66ad1e879a4013aac977f06126219d472550ffe9d76819e4a3dd5f8fb2c9e03524ae8d0cacabd470e5ce7eddcc700143c22dbcf59248a8ae0f808961dae -EBUILD libjpeg-turbo-2.0.4-r1.ebuild 3016 BLAKE2B f1632139dc72108f4a56e439f6e10fa77c97f2eda9d439b36025feb57fc4076a5bdedf3e1635b33415d247594ae38ef071b7e899fc7a25a0cc2ec53e995b0364 SHA512 438bbc05fff22024fb00c89f3e017c77f570fdaf213501907472cebe0d8ebed033c5aa29b0cd11a3f540ab92be61a4570a3b51207cecebc8ac948808d239fda9 -EBUILD libjpeg-turbo-2.0.5-r1.ebuild 3000 BLAKE2B c7d09027b9f529457cb4332408c1b48ba42737ac9e2c2b8f2e33ec8621705ffe766307a994dc9d5a3285c70ab6e0a89ef5c95104dc80eb7e3d756e019f16c69f SHA512 967f62584faf83bdc1313bc82f30bf4518b6f08fdc61ee77e91bc94a9f4ce8209e80588123a6dcb41bf6b6d45d9b7936e5a1b5fc85448d932ad42264509421a4 -MISC metadata.xml 328 BLAKE2B 1a865bcdd6aafcc48199e509b1149bf2b6410b189ad24d58613830e8c95943d71eafb0cc35a567d8d1f7afc3eafc40e7c08e6b40a8afad5a52f7bff4ace1db1e SHA512 410df3851c2c9bc731dcd6774dcb571a50676a834f6429ed05bd8c9a0df3c77d266f73486d12fe04bf482bb39757facd9fd8d349c28ba843fc5f1624aa7f9573 +EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2997 BLAKE2B 07eb75644ba9322de5b9c926c25f7f14b88cec9c331be79dc94c93f4b85492335ac5b4bcad08cc1400e63c58345b7e18c47d3efd25c4b4df631f2900fc23ccbb SHA512 27a1dc6d9c3f23af59d16e63a78b45320aac8be1feca9dbff4714b183ff2bf5b615856cba2f06f9aa45bae65e069708564763710afea2c1a5f4e2f13488da077 +EBUILD libjpeg-turbo-2.0.5-r2.ebuild 3004 BLAKE2B f5ee859c4da49f85b3519625d1b9e0756c052a8e6a2616560a6ca6d4061915c91489d8c23ae7a1017e377355b5a55be386b673b793dd3c01284d3825d355b258 SHA512 6ae05da3888ede7bb888dcc6c2a7d78701e14df4942f1f63384e391b6a1108e2fea8593ead06cd676de4150beb43eda0540383e00d4086c3f8f8cf836dcfa0e0 +EBUILD libjpeg-turbo-2.0.6.ebuild 3012 BLAKE2B 98cbdcdef7465e1a6e1d0dc686a4dda0e1891f74fa4e6e9671b5e43d2a342d2b2a70a2aec5c58bc5b1b8d2ccf97286ca5d244a145d5069f739338c68ede2f924 SHA512 d634ff16ba2381d59fa121562d24c88c92f7412a57a68f1edf41126ba4b7ba2ee55d083b37cb4ead615b4460588b0eb90a9b2d98c6dc9e617f2bf6b6363cf5bd +MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild deleted file mode 100644 index 0c6e95570f9f..000000000000 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools libtool 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" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="java static-libs" - -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" -COMMON_DEPEND="!media-libs/jpeg:0 - !media-libs/jpeg:62" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" -DEPEND="${COMMON_DEPEND} - 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} ) - java? ( >=virtual/jdk-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}" -name '*.la' -type f -delete || die - - dodoc -r "${S}"/doc/html - newdoc "${WORKDIR}"/debian/changelog changelog.debian - if use java; then - newdoc "${S}"/java/README README.java - docinto html/java - dodoc -r "${S}"/java/doc/* - fi -} 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 new file mode 100644 index 000000000000..7801212034da --- /dev/null +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools libtool 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 ~x86-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.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild deleted file mode 100644 index 3ae6b4ab2192..000000000000 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs - -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" -[[ "$(ver_cut 3)" -ge 90 ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="java static-libs" - -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" -COMMON_DEPEND="!media-libs/jpeg:0 - !media-libs/jpeg:62" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" -DEPEND="${COMMON_DEPEND} - 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} ) - java? ( >=virtual/jdk-1.5 )" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) - -src_prepare() { - default - - cmake_src_prepare - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - if multilib_is_native_abi && use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - - local mycmakeargs=( - -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_STATIC="$(usex static-libs)" - -DWITH_JAVA="$(multilib_native_usex java)" - -DWITH_MEM_SRCDST=ON - ) - [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239 - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - - if multilib_is_native_abi ; then - pushd "${WORKDIR}/debian/extra" &>/dev/null || die - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" - popd &>/dev/null || die - fi -} - -multilib_src_install() { - cmake_src_install - - if multilib_is_native_abi ; then - pushd "${WORKDIR}/debian/extra" &>/dev/null || die - emake \ - DESTDIR="${D}" prefix="${EPREFIX}"/usr \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install - - popd || die - if use java ; then - rm -rf "${ED}"/usr/classes || die - 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.0.4-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild deleted file mode 100644 index 45da50975b47..000000000000 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs - -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" -[[ "$(ver_cut 3)" -ge 90 ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="java static-libs" - -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" -COMMON_DEPEND="!media-libs/jpeg:0 - !media-libs/jpeg:62" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" -DEPEND="${COMMON_DEPEND} - 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} ) - java? ( >=virtual/jdk-1.5 )" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2020-13790.patch -) - -src_prepare() { - local FILE - ln -snf ../debian/extra/*.c . || die - - for FILE in ../debian/extra/*.c; do - FILE=${FILE##*/} - cat >> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt < + + Reflect ABI of libturbojpeg.so. + + libjpeg-turbo/libjpeg-turbo libjpeg-turbo cpe:/a:libjpeg-turbo:libjpeg-turbo diff --git a/media-libs/liblingoteach/Manifest b/media-libs/liblingoteach/Manifest index eb0f35acb2c5..2d85b01bdd5a 100644 --- a/media-libs/liblingoteach/Manifest +++ b/media-libs/liblingoteach/Manifest @@ -1,3 +1,3 @@ DIST liblingoteach-0.2.3.tar.gz 341557 BLAKE2B 188cb5455f979225f909b88fecce34c510c6938f8b81f8949ae3d7a24209d86916d2ebcc561dc2f7332deee45a13674cdc05b892c46ee343398898daf4b36b68 SHA512 e29cd146750a8b913019c1eaff9eadceaaf9aa85ccd5e6a13174bc3e5cab548e5817fd87ada3a1820c3ad575e768caafde4d7a82ef238331b161d11c4f569c4e -EBUILD liblingoteach-0.2.3.ebuild 549 BLAKE2B b4af4cca6848fd93d9dfc78e4667ec23be298d180e86e88af527dc22443b1a99322d6412c86ab8a9b58c50606db79e0dacf4de4c553a423325d536ac1c381c83 SHA512 120417c99f9895a6c25336e90a4f431e112df3504d27baf6c6e0ed01d243b190078d5ec263f549ae98357a88360645b2cb1f945fa20a615435b722e827f83e45 +EBUILD liblingoteach-0.2.3.ebuild 637 BLAKE2B 4b44c9d5bab3a936bee608d958d81bd951c9b2ae55a1810e72175c03166ce7d872cf7b045a0fc8dfd3f9135a91573467adace5f4f20c88e1ce5b43cc50d402e8 SHA512 9db11adadf6ba98bf8fb3b857d831fce09a4242eaf99f7b4ca240e22455eea466db68c67995332f75db8da4d20f187498eebe89a95b9c4d796dcc3eac951dcdd MISC metadata.xml 343 BLAKE2B 8b665f4dcbb66dbefbafc7e563a4c8860f4b4e08dcea7f6a2b2f5aa254aa7be83dbdffc0d6491cfa0959dcd797245a04a80d806cf377a9b0fccf5a2a70927e28 SHA512 4494651c3fb84ad67bca867e5393c7960f7a8ee8de967558b3b02fc345ec947d612e62580176eeea2496993ebb870350cae0922512b3a0ce1bb3e511a6de166f diff --git a/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild b/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild index cc1b3d3936b6..4cfa64c18d6d 100644 --- a/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild +++ b/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,6 +19,12 @@ DEPEND="${RDEPEND} src_configure() { econf \ + --disable-static \ $(use_enable zlib compression) \ $(use_enable debug) } + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest index 68a93529d8ec..ecf84fd98416 100644 --- a/media-libs/liblscp/Manifest +++ b/media-libs/liblscp/Manifest @@ -1,6 +1,4 @@ -DIST liblscp-0.6.0.tar.gz 670650 BLAKE2B 0cb825743fac7b328c32844f834d59e6622fcb9d860e9a13732d5548ce1f6bd0136928ea5be9b1de0a2811878c38b2e714823973c7a340d99de4735d6c46f637 SHA512 64c5cb51ac7821d65a8769415deb68cefa24684e1d4fa592a68c7e45cf2af02ffa41a2f2300ffc98a6d1d6d880279aa1b61499ac0fe59177c60fc0a2075ada15 DIST liblscp-0.6.2.tar.gz 689354 BLAKE2B ecc365e8840c8179bd753b8b9ee2706daea7e12948fb079d1b39a4aab388204af5ecab381e27ac8f5feedcbb56fd02a5a236ff8da7041f213a7551d5cd0cb3cc SHA512 672ea452e5dfe5e34dc6a1cc8c9d40dacfd1a415fc4c3ba50b984d3cf064910da53c814dd43a572665c1cbb7a402a09225c0dc7d489b1589c2a98a3f8eb8f0db -EBUILD liblscp-0.6.0.ebuild 586 BLAKE2B e3299ff0820b51bdfdef112702dbc72acba12370df85fa74f278dadaea50a75474980de4eb3d57759c47208a8ff1f6618d58eb77f940a5e4d70287f681b0642c SHA512 f4ade6a4ea2b72a6bc0c537088633ca8c188dcdc0e3f4a2c5892a39d82d9442b70f543d2bfb5e4a1c1e2edb14559073227e1214426bed87ff1f70bccb6a55705 -EBUILD liblscp-0.6.2.ebuild 639 BLAKE2B bd20f96814da53c61dfc2dec496ce4a0ecf57927c7382126354816352812069a125878db1cb6ba741d00ec91ee47db53ec50b08e0bba8a51b37cab4b96e43db7 SHA512 597c395ee2aa3ad556b2a3434c385ca1e14532916294bef930912278a2654430492fa1f5c6f48003c1e6c70465bd5d5af5fb620b5b5165b49e1480e96135181a +EBUILD liblscp-0.6.2.ebuild 637 BLAKE2B 248a9bc252af1529c988da6775225b3d877bc7de320ddb3e6b095b7ed0a90a73a0932870440fdb7f7f084f2dfac867796d92d0d4d0989fe4ec760730781f015e SHA512 d7f2bade518b7cd3302f6ddda469f99ecdafda4b1066d9c01a33e1837c9e22b63a4daf9db49649c90da02b13b7f0e0dbfb1e7de9b22c50e02c24feaedf034098 EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-libs/liblscp/liblscp-0.6.0.ebuild b/media-libs/liblscp/liblscp-0.6.0.ebuild deleted file mode 100644 index 6ae6106ea6da..000000000000 --- a/media-libs/liblscp/liblscp-0.6.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="C++ library for the Linux Sampler control protocol" -HOMEPAGE="https://www.linuxsampler.org" -SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="doc" - -DEPEND="doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS ChangeLog TODO NEWS README ) - -src_configure() { - econf --disable-static -} - -src_install() { - use doc && local HTML_DOCS=( doc/html/. ) - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/liblscp/liblscp-0.6.2.ebuild b/media-libs/liblscp/liblscp-0.6.2.ebuild index 04dfb13d5d7e..42b207f10318 100644 --- a/media-libs/liblscp/liblscp-0.6.2.ebuild +++ b/media-libs/liblscp/liblscp-0.6.2.ebuild @@ -10,7 +10,7 @@ https://download.linuxsampler.org/packages/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="doc" BDEPEND="doc? ( app-doc/doxygen )" diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest index 864e16209eec..c9de0be3bf9c 100644 --- a/media-libs/libmediainfo/Manifest +++ b/media-libs/libmediainfo/Manifest @@ -1,6 +1,8 @@ AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb DIST libmediainfo_20.03.tar.xz 1799940 BLAKE2B a0c50ab27e29b010e33334c207872aefc110396401065d3bebdc6cf34aba325453b87e9f1f1ecfe9882bf5f63aaa26f3bbfe3d791cb0c16fa75ca4bb7ff081f0 SHA512 97dd847edf0e290f7ea0153c71a442cc54944bf295f195486f37fa81230cf4463ae2ecc154e73cf75b876b33c038020a9ff082013d57381ab5516a4a2db5ef87 DIST libmediainfo_20.08.tar.xz 1808948 BLAKE2B 90af512dc5787f01b3600852f275ed0c0e9e1d5393fc60bdb128045e11947873622f1d78f79eba7a4abd46e4537001b66e41f79008ff895680a016e22c5855fc SHA512 c68b7eb906eac2af7b6f588910824ea9a9bd32d4e7b4f8af3579b0e388f5c547583be0ebd1491cdef52dbdb0eca7e2b2731662e48fc66baaddc1e1ca76f385ff +DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354 EBUILD libmediainfo-20.03.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120 -EBUILD libmediainfo-20.08.ebuild 1853 BLAKE2B 668269c8a1db1c58e8033ee508ed9e9c55fa64165e6d7b55f967aeb2949ba71dfeb9c50ea2e5c03bdcda020c54857ab057929be9b6b727bc1b74fd41c01a8f05 SHA512 a56f9890c60876c346118f37618cf3a73f9284781a95fdd5130f620220508a41d550cca50cb636edd2a90a8e2d44819dac581f0610dba570a7a34f21ec60d90e +EBUILD libmediainfo-20.08.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120 +EBUILD libmediainfo-20.09.ebuild 1853 BLAKE2B 668269c8a1db1c58e8033ee508ed9e9c55fa64165e6d7b55f967aeb2949ba71dfeb9c50ea2e5c03bdcda020c54857ab057929be9b6b727bc1b74fd41c01a8f05 SHA512 a56f9890c60876c346118f37618cf3a73f9284781a95fdd5130f620220508a41d550cca50cb636edd2a90a8e2d44819dac581f0610dba570a7a34f21ec60d90e MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93 diff --git a/media-libs/libmediainfo/libmediainfo-20.08.ebuild b/media-libs/libmediainfo/libmediainfo-20.08.ebuild index 617f561cf174..5ec625856e57 100644 --- a/media-libs/libmediainfo/libmediainfo-20.08.ebuild +++ b/media-libs/libmediainfo/libmediainfo-20.08.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="curl doc mms static-libs" RDEPEND="sys-libs/zlib diff --git a/media-libs/libmediainfo/libmediainfo-20.09.ebuild b/media-libs/libmediainfo/libmediainfo-20.09.ebuild new file mode 100644 index 000000000000..617f561cf174 --- /dev/null +++ b/media-libs/libmediainfo/libmediainfo-20.09.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools eutils flag-o-matic + +MY_PN="MediaInfo" +DESCRIPTION="MediaInfo libraries" +HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib" +SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl doc mms static-libs" + +RDEPEND="sys-libs/zlib + dev-libs/tinyxml2:= + >=media-libs/libzen-0.4.37[static-libs=] + curl? ( net-misc/curl ) + mms? ( >=media-libs/libmms-0.6.1[static-libs=] )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +# tests try to fetch data from online sources +RESTRICT="test" + +S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library + +src_prepare() { + eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch + eapply_user + + sed -i 's:-O2::' configure.ac || die + append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0 + + eautoreconf +} + +src_configure() { + econf \ + --enable-shared \ + --with-libtinyxml2 \ + $(use_with curl libcurl) \ + $(use_with mms libmms) \ + $(use_enable static-libs static) \ + $(use_enable static-libs staticlibs) +} + +src_compile() { + default + + if use doc; then + cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc + doxygen Doxyfile || die + fi +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html ) + fi + + default + + edos2unix ${PN}.pc #414545 + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc + + for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do + insinto /usr/include/${MY_PN}/${x} + doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h + done + + insinto /usr/include/${MY_PN}DLL + doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h + + dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt + + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest index 2c4ab33cbdd9..05ae40a5f169 100644 --- a/media-libs/libmpdclient/Manifest +++ b/media-libs/libmpdclient/Manifest @@ -1,5 +1,3 @@ -DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f71792112b096b0e1741f550f215352936f30e05f4afad29c0f7a5e4340e87de6d7fd8cfcd4c27f34eda91c7d21891 SHA512 520568f61cee447e48c04075d212c46e9640fd3f82604a5b9f4c6ded94eeb4a841e857e44e9f4edad12d93c1052692e7d32d3dbf505d4c0cde6cc217cff0cae5 DIST libmpdclient-2.19.tar.xz 69144 BLAKE2B c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 SHA512 5d67b95d4b615bc750641f6d5a0240122e8f59c66108838a96bd4bc5cdda8b15288ad03d0e35d92d6e562e67c600f68aad643ca541092121074952a1bc5b3590 -EBUILD libmpdclient-2.16.ebuild 1073 BLAKE2B 2628f658dfa8e8bab40607c73316f1da841e7ac294b5f73cf410ea83879931ae544392d5a22b6b8f7086f11d0579f7efa391744bbcf012d0e196cbdf79f11b63 SHA512 869028879f6dfc6305f0611765fbf9cec4920e940a776af84ca4713e3c6d6892e72ca5ca43ce2dd39067625df9d89e3e2a32837f480c9f53cf1f0a07e87aa7c0 -EBUILD libmpdclient-2.19.ebuild 1021 BLAKE2B 1b2913fa2d6957ecc7ab321d49fd7f319a8b674945a71a39619d7886f63a5b67a1776dc17b6656998f047672bfb90b1bf596d6c17e305b2dafb581190ab7fd03 SHA512 3ffb52402ed2466b9debe98296b92121c7c9049b2460e896f954a2425d9e63775fc3c6eea201e0491f75b9a2eed64cbb8759ad181c7b12bafeb181e1f89aeac7 +EBUILD libmpdclient-2.19.ebuild 1016 BLAKE2B 5e0bc98e524e1e01f2d2005c94647b2f0aa4641db23a4053fae1efedbdf72643e93ca73fc503333eb09b6e1a51af01c9f2067b0714156c98eaca9a3c86fc411e SHA512 281f679771417c870a096958ba8800cdc68e91ecccd03668c4b3e522d90039cfdeecc0fe7fd36416ca088a18c5eade023b938a4962cc6a45021b9d70e0904075 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00 diff --git a/media-libs/libmpdclient/libmpdclient-2.16.ebuild b/media-libs/libmpdclient/libmpdclient-2.16.ebuild deleted file mode 100644 index d6d682adc180..000000000000 --- a/media-libs/libmpdclient/libmpdclient-2.16.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson - -DESCRIPTION="A 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 ~sparc x86" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND=" - doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) -" - -src_prepare() { - default - - sed -i "s:@top_srcdir@:.:" 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 - use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html -} diff --git a/media-libs/libmpdclient/libmpdclient-2.19.ebuild b/media-libs/libmpdclient/libmpdclient-2.19.ebuild index 0a52798377ee..b8ac71b8c473 100644 --- a/media-libs/libmpdclient/libmpdclient-2.19.ebuild +++ b/media-libs/libmpdclient/libmpdclient-2.19.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86" IUSE="doc examples test" RESTRICT="!test? ( test )" diff --git a/media-libs/libmpris2client/Manifest b/media-libs/libmpris2client/Manifest index 548d77cb1067..70e6655c50e5 100644 --- a/media-libs/libmpris2client/Manifest +++ b/media-libs/libmpris2client/Manifest @@ -1,3 +1,3 @@ DIST libmpris2client-0.1.0.tar.bz2 287862 BLAKE2B ab5d19c0469e3adad9734141d507ce036d4ddc9d3716b7905648f880680a496c237f2c26afa4983a2c17327171ad5d9052911a5a30e76145b1c5d3e6fc8a17e2 SHA512 29926a60c2da71c78b38154ff39e310785e089abac756a5e1adea71f9f33975028a3110473a07c2cf56271fa978400d1249e5cab44c4bdd440f48ef37775ca44 -EBUILD libmpris2client-0.1.0-r1.ebuild 682 BLAKE2B 0431cdf420648a7e0aec3a34f0b8d40688d8988348f247f44c00dda11d89b6a0fc707663904bc3fc8bf496999790cddb3e357958d6944c14c2fcddad96bf7458 SHA512 e34447e76bbebf913b874ceffa4a71f6d2480595e9f4add835d70d25f5c8db70a62a0f5ac86cc97d50cef8e352432bc6c1b44e4a8b229d7afd56dd9f39d0a206 +EBUILD libmpris2client-0.1.0-r1.ebuild 717 BLAKE2B ea1a08b142cc5d014f1061936c0f9a9e4ab6b7b401da1d6c3b34c65ab03dc476fedbcaa75756fd40842fca9044098a43c933622556e50de4a63635648426b5d8 SHA512 82cb484e713ffb13bfbb2c51b93fb576dca67790c3059a78d26951ffc936150b64aa3a17ffbb4d67d45407cc03ff1f1f8994dbba36a2f7d6282d23425ed79559 MISC metadata.xml 346 BLAKE2B f27dc0e8f01c8c2810e8920a46e87c98484cbeb0137faef98c9ece3907df3c5881ee8603a68c258b9fa6ba9b23bc18e0b29610d83c065803849b4f268f01630a SHA512 3e491f998b2ca58209ab5eb0913637b2ae55360d0f356a3fbd054ce0243e361c2852185c1ed0e5b835c7661fc2102bd0831d016320da8686d8573aa8c0b872cf diff --git a/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild b/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild index a119a972166a..154f078fd7fa 100644 --- a/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild +++ b/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,6 @@ SRC_URI="https://github.com/matiasdelellis/${PN}/releases/download/V${PV}/${P}.t LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND=">=dev-libs/glib-2 x11-libs/gtk+:2" @@ -20,10 +19,14 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS NEWS README TODO ) +src_configure() { + econf --disable-static +} + src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest index 440d7c3c87f9..717f00a4301a 100644 --- a/media-libs/libmypaint/Manifest +++ b/media-libs/libmypaint/Manifest @@ -1,3 +1,3 @@ DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608 EBUILD libmypaint-1.6.1.ebuild 1401 BLAKE2B 88ba990f1ab4247f467281fd90fbc9d69eea188350fee4309d732d73b9b2800cf26aa8a8ba032b10929997382cebdcea4630c350d8a0a8b8b7d22ba7ea82da3a SHA512 9e929c8e44a4a33257aca246da83c67f5f30c052e8109f7c56d1cb33004a789a2552d3647da2b4c5052329bc6a646360031a8ea47cc509ebc75795b737cc4034 -MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc +MISC metadata.xml 407 BLAKE2B 3c25822ad0cf7c7af7f8f322d35ac4394880dca10ab5f07c7131cd54b7f49398456d2198560130b9c43785f755fb728e2f76eb90ceaed1e00c972dd64bfdb8e5 SHA512 9710f70829c3dd64ff857b49020db0d0217b1feaff1e0b37a0c6e94672bb845d959a14c99b0e82471f272855ea0a00e69e8e74326ba6c00060f5f3b325ade1fa diff --git a/media-libs/libmypaint/metadata.xml b/media-libs/libmypaint/metadata.xml index e8f550b6768b..8a8ba0ec52ca 100644 --- a/media-libs/libmypaint/metadata.xml +++ b/media-libs/libmypaint/metadata.xml @@ -1,7 +1,10 @@ - + + sam@gentoo.org + Sam James + Add support for media-libs/gegl diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest index 694813503b1c..3255eace59f1 100644 --- a/media-libs/libofa/Manifest +++ b/media-libs/libofa/Manifest @@ -3,5 +3,5 @@ AUX libofa-0.9.3-gcc-4.4.patch 251 BLAKE2B 89e4dbfb168e528a753e7c114f8568411a2c5 AUX libofa-0.9.3-gcc-4.7.patch 651 BLAKE2B 52a20e9242f5899ad0c08b91ae2d9169642ceb51b87a22ddc0ca641f57f1ae6a342d3b658265caf1d1d3b938fc13b3b717c118839adbcf3e10a78d35cf68827c SHA512 ec337bb839ef2b7477cc4a5c45cf751c1d0371898591865725fe6db05ab25fd8c0297ecbe44d1157b2de56d9bf7284634c668cf5b72ff03a7dca66dba8d99522 AUX libofa-0.9.3-gcc-4.patch 818 BLAKE2B c49d0f1bc2c364a25c20792ad79d53a5a8abdc9370c272e4159c5a37844061cbc03aecf97933d0c2e2c4b18225d004fb0484456169f78f5caee0fa5ae5a1145b SHA512 7e80ddb700da74d1e2b6c5e65588e6329e8ae231534b3d74b98815bc4919964a9fad87fcdfa2bef0d4adf9d478efd5c1649d018fb347a93c7ae1685cccab8834 DIST libofa-0.9.3.tar.gz 384043 BLAKE2B 1b4c89e1a26e3bec1b2bde16c5d2c86ae7a66cbe8e450b96974ffd8be434062ccf21779c0eed5a809012a419d65f9de327c6b94fe6ac5365270fe382dbfa2c08 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967 -EBUILD libofa-0.9.3-r2.ebuild 1086 BLAKE2B 6bed90b4d5798302854c985fbf7bec86bc2b5d9c2bf4dcb133641e0a4ba2d9ed9114996467fbe5f1e77bc6afebf7b6b93fc26e8197b55f91079e64275a2a13ed SHA512 697c34782b0d089daad5b4da48f223883fbaa5ec5e3f544ba3c058998f21c68455dc8c74fe723e549d0a1935c95817be22c6a6f6d79fba79adb5d3640fc92e70 +EBUILD libofa-0.9.3-r2.ebuild 1100 BLAKE2B 09e62176601e4afc3a011c5ce9eea501d1b19ec22357fc99ce7261b3d09b0456017d7f139761f79a9b2d843bf0296929ee63a861df388bfcfb8de535d0434b82 SHA512 c4296b28df2676e4b0b57dee6c5195d77dfba2dd37f27fc4dd2bf326a5ba637e26bb93378efdf213c9d736660121d1cb1a105b8d96ddf5fd1f5ef8df4ec7122f MISC metadata.xml 337 BLAKE2B 3cf5fbbe6cea6c48b832cd4be4ae506a319b7d21d27b1e98c83602adf8ff4948736a7eb46e7156bb328fae2fd27886d4af194f340e06488a7f5adf266bf84e7b SHA512 ccfab3198ba95caba25340c8254d465b23aae4edff3f63a0acbc0fc7283efb45b5ad4fd250df09e1e2442b5cb2977a228375daf25ffde08004eb887f624941c8 diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild index ff6565c00a7e..ebefb6806c18 100644 --- a/media-libs/libofa/libofa-0.9.3-r2.ebuild +++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild @@ -34,10 +34,11 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ ac_cv_lib_expat_XML_ExpatVersion=yes \ - ac_cv_lib_curl_curl_global_init=yes + ac_cv_lib_curl_curl_global_init=yes \ + --disable-static } multilib_src_install_all() { einstalldocs - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest index ab410612af3b..e95d6ae3ab2a 100644 --- a/media-libs/libopenmpt/Manifest +++ b/media-libs/libopenmpt/Manifest @@ -1,3 +1,3 @@ -DIST libopenmpt-0.5.2+release.autotools.tar.gz 1466960 BLAKE2B 54d7188cc7835495e9ba9f182900c8f61309079cb4b86b23ebcde1ce4b91f9305c49b8295adcce95b26c1c5b20059a20d1f07116c9a914201370dd2838acdd31 SHA512 39143af8ef4e84cf4ec9e94724c09a12533fa7bcc0e106c506a032546a8e846ae8946f40417981eabbb7403d8e6dba53548c96a7200807e1a99bd50f278c6628 -EBUILD libopenmpt-0.5.2.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84 +DIST libopenmpt-0.5.3+release.autotools.tar.gz 1468568 BLAKE2B 02f29f1d60aa0f318d4b478291d48487c2079001f9173420c0fb5ca8c21ac0f1b3ec02c0d2958a00d7d10e994b626a673de4b5cbe85b1900bf8f0e953616aebd SHA512 003e40a4fa5c44d38931f5008beb71fd82ea57f6989cffdf2f8687e403a244bd29d497c4de9744d594ecfb7d0dd2ba8ff17046a3987123f47bc56cd163f71d7d +EBUILD libopenmpt-0.5.3.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297 diff --git a/media-libs/libopenmpt/libopenmpt-0.5.2.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.2.ebuild deleted file mode 100644 index cfb89e4fb8bc..000000000000 --- a/media-libs/libopenmpt/libopenmpt-0.5.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -MY_P="libopenmpt-${PV}+release.autotools" -DESCRIPTION="Library to decode tracked music files (modules)" -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" -IUSE="examples mp3 ogg static-libs test vorbis zlib" -RESTRICT="!test? ( test )" - -RDEPEND=" - mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] ) - ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] ) - vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" -ECONF_SOURCE="${S}" - -multilib_src_configure() { - # A lot of these optional dependencies relate to openmpt123, which - # we package separately, so we disable them here. - econf \ - $(use_enable static-libs static) \ - --disable-openmpt123 \ - --disable-examples \ - $(use_enable test tests) \ - --disable-doxygen-doc \ - $(use_with zlib) \ - $(use_with mp3 mpg123) \ - $(use_with ogg) \ - $(use_with vorbis) \ - $(use_with vorbis vorbisfile) \ - --without-pulseaudio \ - --without-portaudio \ - --without-portaudiocpp \ - --without-sdl2 \ - --without-sndfile \ - --without-flac -} - -multilib_src_install_all() { - rm \ - "${ED}"/usr/*/*.la \ - "${ED}"/usr/share/doc/${P}/LICENSE || die - - if ! use examples; then - rm -r "${ED}"/usr/share/doc/${P}/examples || die - fi -} diff --git a/media-libs/libopenmpt/libopenmpt-0.5.3.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.3.ebuild new file mode 100644 index 000000000000..cfb89e4fb8bc --- /dev/null +++ b/media-libs/libopenmpt/libopenmpt-0.5.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +MY_P="libopenmpt-${PV}+release.autotools" +DESCRIPTION="Library to decode tracked music files (modules)" +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" +IUSE="examples mp3 ogg static-libs test vorbis zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] ) + ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] ) + vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" +ECONF_SOURCE="${S}" + +multilib_src_configure() { + # A lot of these optional dependencies relate to openmpt123, which + # we package separately, so we disable them here. + econf \ + $(use_enable static-libs static) \ + --disable-openmpt123 \ + --disable-examples \ + $(use_enable test tests) \ + --disable-doxygen-doc \ + $(use_with zlib) \ + $(use_with mp3 mpg123) \ + $(use_with ogg) \ + $(use_with vorbis) \ + $(use_with vorbis vorbisfile) \ + --without-pulseaudio \ + --without-portaudio \ + --without-portaudiocpp \ + --without-sdl2 \ + --without-sndfile \ + --without-flac +} + +multilib_src_install_all() { + rm \ + "${ED}"/usr/*/*.la \ + "${ED}"/usr/share/doc/${P}/LICENSE || die + + if ! use examples; then + rm -r "${ED}"/usr/share/doc/${P}/examples || die + fi +} diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest index 4957a1c72e79..040f5ee66fbd 100644 --- a/media-libs/libpgf/Manifest +++ b/media-libs/libpgf/Manifest @@ -1,3 +1,3 @@ -DIST libpgf-6.12.27.tar.bz2 1235651 BLAKE2B d155289398d6291d49a217a97e283d28440e398c330b3bb1006cdb2cf4c31bd7efef5db4cadd9d28812ffe4ef6deb12ab978b8feaac7c9119cff61ee26658628 SHA512 ad06b34d61219a61d06b87e05a26e8639cd7a93211943217832969c03c4dbc81fbbb287fa2d628b7e087b96e78665a3cbc78920c8ff5828dfb2a7748e04fe42a -EBUILD libpgf-6.12.27.ebuild 690 BLAKE2B 4a96fdc13840fa9277e7befc0be6e5ad6c19fd41d89cbbc4a6bba7b20d1de183dd8eefa6c7323a4bb885fa8aaa01fa34be5467fefc9b66e19eba5509047f65a2 SHA512 172ac9ac033df7d2a6d4397faaa37ae286616784e240ff19a8338d7b94015942edf08700ede3d024ebe6c7ede163e752120e21aff392c198e96ae3d84175cd3f +DIST libpgf-7.19.3.zip 1303189 BLAKE2B 129ec655241f0a152814b412c1ee5d40fc5b89daef172d1e73985e49f8ffec22ce87c6aa893dbf330b5176370d985ffd0c6a015adfbb9faf72131bc63cf0c94d SHA512 68f9734b51372f7bb39b35cf99425bac6f9cf29f0351dba8813742c41f62f394798c92f674803d1315456a9337c7af03479d43455a9e611c07f5cf47ab3e5b58 +EBUILD libpgf-7.19.3.ebuild 801 BLAKE2B c55364991eb98d6ee6ef594d575e65873d878645feff7c8103f25bf301a7f2705ff1913d5ec5727447d11c16a4d83a0fbd2535281ff122532900dbaee54f6b12 SHA512 d39c5a1ca845af427d53913082172fb9db2ef3b30c951849f113ff4790ed88d851af78d5abd78e4cc15e4c8df059aa424ae36fc7928ad33697be529b77d3ac00 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 diff --git a/media-libs/libpgf/libpgf-6.12.27.ebuild b/media-libs/libpgf/libpgf-6.12.27.ebuild deleted file mode 100644 index f63845ebade5..000000000000 --- a/media-libs/libpgf/libpgf-6.12.27.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Library to load, handle and manipulate images in the PGF format" -HOMEPAGE="https://www.libpgf.org/" -SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="doc" - -BDEPEND=" - app-arch/unzip - doc? ( app-doc/doxygen )" - -src_prepare() { - default - - if ! use doc; then - sed -i -e "/HAS_DOXYGEN/{N;N;d}" Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libpgf/libpgf-7.19.3.ebuild b/media-libs/libpgf/libpgf-7.19.3.ebuild new file mode 100644 index 000000000000..b54109c076ff --- /dev/null +++ b/media-libs/libpgf/libpgf-7.19.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Library to load, handle and manipulate images in the PGF format" +HOMEPAGE="https://www.libpgf.org/" +SRC_URI="https://downloads.sourceforge.net/project/libpgf/libpgf/${PV}-latest/libPGF-codec-and-console-src.zip -> ${P}.zip" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="doc" + +BDEPEND=" + app-arch/unzip + doc? ( app-doc/doxygen )" + +S="${WORKDIR}/libPGF-codec-and-console-src/PGF/Codec" + +src_prepare() { + default + + # configure.ac has wrong version number + sed -i 's/7.15.32/7.19.3/g' configure.ac || die + + if ! use doc; then + sed -i -e "/HAS_DOXYGEN/{N;N;d}" Makefile.am || die + fi + + eautoreconf +} + +src_configure() { + econf --disable-static +} diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest index dddc20d3fc3c..d50a6ce1724e 100644 --- a/media-libs/libplacebo/Manifest +++ b/media-libs/libplacebo/Manifest @@ -1,7 +1,7 @@ AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa2ca755fb95c9a7d3f55992507ce62340897ad9419a875fac31c8e392b9eab1f896dc8feedef96e804f0c938fede16d78a31517ccf5599efbdcb6d6af2773a6 SHA512 d7bfdb158c9f4e263d1937cb400417174a996a3f116231531d8f8c9266a57adf24ca86fd5ebeebb534c9985e89618fc11ddfcf8a9621729eb741a3bbd74212e6 DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab -DIST libplacebo-v2.72.0.tar.gz 396124 BLAKE2B 8a9829add4cb8ffe94c0dc8e3c8f64e465992bb21aa8739086986b061e53fc2f0d00c5a512ad94f0b4998fe3e3bd784c0b8df3bef1ffc5ed92090a75c7e31ad7 SHA512 829d8805f8a52e082bf7c33f5be8a280480aa3cfbac73966cdf4ddaf0a01f25cc357b98a04fe85c82a53718b5d570a852edeafbb0cb12312c73cb23295fb9bd9 +DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135 EBUILD libplacebo-2.43.0.ebuild 1565 BLAKE2B a698e4b9206214bec581b84ae7b9b6d9415869ff34845f94e673a60e006bc3649389a1fccf092e5eb05318ba5e906af7a688bfc20836acbb1efcd3cb6633acee SHA512 9b35fe6eab88288b78789e78c53a6baeacd684e52010845d0194e4349ee126eaa8701aad7e7714bad051d287b586263efe4846f5ded0f156fc04db5c68af3eee -EBUILD libplacebo-2.72.0.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326 +EBUILD libplacebo-2.72.2.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326 EBUILD libplacebo-9999.ebuild 1924 BLAKE2B 5ed7fea860e50f3b0d568518ab853aaa6fe58576f9a2cd53efd5dd36c5d0968b0c927df2894ec8c5b9aabdee77a218d7f9578cfce5b07f601fcbc88da3699812 SHA512 d4d065dabde0e25e18f63afaee3086727667c27de2a510fee1420dcf36608da78864e74a3f4df58eddb72c9bc47b9f1b8e8ff54809a31657ff14d368f38eb8a3 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040 diff --git a/media-libs/libplacebo/libplacebo-2.72.0.ebuild b/media-libs/libplacebo/libplacebo-2.72.0.ebuild deleted file mode 100644 index 9303b586426d..000000000000 --- a/media-libs/libplacebo/libplacebo-2.72.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_REQ_USE="xml" -PYTHON_COMPAT=( python3_{6,7,8,9} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~ppc64 ~x86" - SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz" - S="${WORKDIR}/${PN}-v${PV}" -fi - -inherit meson multilib-minimal python-any-r1 - -DESCRIPTION="Reusable library for GPU-accelerated image processing primitives" -HOMEPAGE="https://code.videolan.org/videolan/libplacebo" - -LICENSE="LGPL-2.1+" -SLOT="0/$(ver_cut 2)" # libplacebo.so version -IUSE="glslang lcms +opengl +shaderc test +vulkan" -REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" -RESTRICT="!test? ( test )" - -RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) - opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] ) - shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] ) - vulkan? ( - dev-util/vulkan-headers - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND}" - -BDEPEND="virtual/pkgconfig - vulkan? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') - )" - -python_check_deps() { - has_version -b "dev-python/mako[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use vulkan && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=( - $(meson_feature glslang) - $(meson_feature lcms) - $(meson_feature opengl) - $(meson_feature shaderc) - $(meson_feature vulkan) - $(meson_use test tests) - # hard-code path from dev-util/vulkan-headers - -Dvulkan-registry=/usr/share/vulkan/registry/vk.xml - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -t 10 -} - -multilib_src_install() { - meson_src_install -} diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild b/media-libs/libplacebo/libplacebo-2.72.2.ebuild new file mode 100644 index 000000000000..9303b586426d --- /dev/null +++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~ppc64 ~x86" + SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" +fi + +inherit meson multilib-minimal python-any-r1 + +DESCRIPTION="Reusable library for GPU-accelerated image processing primitives" +HOMEPAGE="https://code.videolan.org/videolan/libplacebo" + +LICENSE="LGPL-2.1+" +SLOT="0/$(ver_cut 2)" # libplacebo.so version +IUSE="glslang lcms +opengl +shaderc test +vulkan" +REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" +RESTRICT="!test? ( test )" + +RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) + opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] ) + shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] ) + vulkan? ( + dev-util/vulkan-headers + media-libs/vulkan-loader[${MULTILIB_USEDEP}] + )" +DEPEND="${RDEPEND}" + +BDEPEND="virtual/pkgconfig + vulkan? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') + )" + +python_check_deps() { + has_version -b "dev-python/mako[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use vulkan && python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=( + $(meson_feature glslang) + $(meson_feature lcms) + $(meson_feature opengl) + $(meson_feature shaderc) + $(meson_feature vulkan) + $(meson_use test tests) + # hard-code path from dev-util/vulkan-headers + -Dvulkan-registry=/usr/share/vulkan/registry/vk.xml + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test -t 10 +} + +multilib_src_install() { + meson_src_install +} diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest index e44dc4174290..671b9a3bc8b7 100644 --- a/media-libs/libpng/Manifest +++ b/media-libs/libpng/Manifest @@ -1,5 +1,5 @@ DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074 -EBUILD libpng-1.6.37-r2.ebuild 1391 BLAKE2B e482aace979015b1a17353915f2280b9c83322c3d5eb9097c8a3fe85a499797d6b6e1afc7272df0902a87f0fab408c83ace8d7c18395ae3e8c9c690005c7b9fa SHA512 2d8c739eebf130fd58eb3ddf0b1edcf14ee6580c7aab9de1500a2f80eb24d6e95ea49217d88971036b0153890d98afb1151032a2c1a1adcf3cdbfff025294779 +EBUILD libpng-1.6.37-r2.ebuild 1382 BLAKE2B 059db01af5e4a013b5e661c366d1fe410790e8799b908a0ac069c4eb59ed35a663a60d9571ebe7ccfe4ec4f979a16b5cd50b41516d446c1cf8c187be7424b1b2 SHA512 f4d8e77ca255fbc604593c0bd716873119ff4191473560c478ad04dd5d8ca8975d149778893e98cc9325aacdb768440118474a1a8d5119250fd4a2f225626f78 EBUILD libpng-1.6.37.ebuild 1348 BLAKE2B a601cfa4e2705faccad25cb20901e0836e1554aec89b591bb7b76e32a0feaa76668de13f92299bcdd259df1fd332bebbeee75e46343f5a8018f20dcce2922a6f SHA512 ed90229aeb5e79924459332419966f84c59fc8dce3e43d3246783ccadbb5963815fb640e41319056521201db4eece9ad78a00c4f9844817c6f43303ed43f8398 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3 diff --git a/media-libs/libpng/libpng-1.6.37-r2.ebuild b/media-libs/libpng/libpng-1.6.37-r2.ebuild index 5ac038821903..608079236331 100644 --- a/media-libs/libpng/libpng-1.6.37-r2.ebuild +++ b/media-libs/libpng/libpng-1.6.37-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz LICENSE="libpng2" SLOT="0/16" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs" RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]" diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest index 256af0485410..5a166f325bc9 100644 --- a/media-libs/libqaccessibilityclient/Manifest +++ b/media-libs/libqaccessibilityclient/Manifest @@ -1,3 +1,3 @@ DIST libqaccessibilityclient-0.4.1.tar.xz 105280 BLAKE2B 7e8332e4d27e96c0728cecf73f13e9213f264e588dba321f0c0877954400c227e17e8bd4468b2567626407d2a283290e3b9752170ae602c6370d08beec7387d0 SHA512 d5c168ff39f4bb67f18120eea50f8e02a85d464a5bb6479c48dfdb02ea9bf0cc379cbed4da7d882b718a1e1723d3a00528fcb26903b617b43029fde25e82cb3c -EBUILD libqaccessibilityclient-0.4.1.ebuild 657 BLAKE2B 9ba068391f06bd63f4d6188c3f6ff9f0d66aa7a402193469a96e938a7c7ea15b1b218c57321e5eef3c51d4f11ffafc4e68598643f88787ed626212d1b3b1ab11 SHA512 3cc24bbbc47156bb496d8a7cc11422831815c82aa7bf922aeca04c8c5d298e1edd58c354474825e5142e468a234f932d74f4d3c21cd7cf340d6dc57294fa118f +EBUILD libqaccessibilityclient-0.4.1.ebuild 669 BLAKE2B ad968e82630b469225bc22e05dccff40752f10d3a9ea9063f4aafe9c03f878810ae22a76aa6f3e57786dc907c68fa7cc306efb76ee016dd761e3fb34f6d9c8b8 SHA512 21e2ad66618285b4d57a24a099fb173507b26abc31ba4d019b3dd7262331feccaa3a2b9da419ad28d35eeed119d30b3068344ca0b4db99d333cfda1a59b5f7aa MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild index ac55f2f8a2fb..b19c1c9c14dc 100644 --- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild +++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="amd64 arm64 x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest index 185f09846c75..a3ffc6ae75b0 100644 --- a/media-libs/libraw/Manifest +++ b/media-libs/libraw/Manifest @@ -1,9 +1,5 @@ -DIST LibRaw-0.19.3.tar.gz 1302745 BLAKE2B 3db3a07c5535a325c69d65ccc75e6a8c7d04e7b1c1d87506fd1c56a0d8f4a7c581467f6350922a4c62d4bc49372f31c86ae2a26a087c4ec11c3ab69763403a0b SHA512 e025695fb7f0016aeec76c0843a94387633457eee838cc48e65d1e84e703c8530b3fdd1e31d85dc322d3f2f6092b7c313fa6d1c3009fe1257c3d9411128b6fe2 -DIST LibRaw-0.19.4.tar.gz 1303047 BLAKE2B daa65c86ca81bee80ced5fcc3a048ef54cc5256b4b80bdda006a2b3d64c8c10436b906a238dd22c8623465288df5a86d65a4d6e2668ba5fc3ef3ad23c7e205d2 SHA512 e9f0b18b8be52119ff504d2645a011eca391a62bf651064dcbec4b6e16b3b09fda49e632453b051d3aae2ac3a8be021e5b71d7202913759ad1d61641d3318c4c -DIST LibRaw-0.19.5.tar.gz 1303806 BLAKE2B 7ab6e30d88aa4aed2ed6825898f8de02f0d139eedec0756cd184822548a7aa69416f5f599542bb264a791f8b6284d6922a160063496f0e7b682333e847cc9b32 SHA512 4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826 DIST LibRaw-0.20.0.tar.gz 1431412 BLAKE2B 455649b600926a6a53924e4cfea33143fdd8658804cc5c19f0bb6ff5bc4a0f73ce6e45385a0edd5c78e290c8a1e32a6e3cb5a2a4c53318c046b6c4c5e6476acf SHA512 98c1d61b01fd8d408297960f63ba56d23f170ca820db7cb2c2ad5f0c9494ce79d4d615d76a6835e046589e76031a553d6e1c692e7e3e66655bc96f4d4847d7ac -EBUILD libraw-0.19.3.ebuild 1405 BLAKE2B 32da66b4f6550a70acb9229f0118ce592720e90a94a9d0a262a4e26a9c6f8fa29bb86625f4522e10839857d130a815bfd556becbe19ae83cdec80073712d9605 SHA512 98e4f79907e0edbe5d4052da27c24d08b95096c12f1f620a2618d20b066e903700ea1eba448e1aadb465dcc457656c0bb9a91e818c4f6a12a350571b44501d27 -EBUILD libraw-0.19.4.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99 -EBUILD libraw-0.19.5.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99 -EBUILD libraw-0.20.0.ebuild 1366 BLAKE2B 321bd32371ba22654dbeceb6cca69aaec497e5479d59e497d953a89415bc5325e2ec73b9daa7502bf5298fe4d024a4d0e3f9887b245bdf5e9cfb41b40570b998 SHA512 74f6abae25f07559da75f00c0787e3998e23667f64fde1ef27e7118ea85b84f6c2f469a695ec4e9a9c39d0d46706ab0b59070f17c1e4e362ed6177b5d8f5e095 +DIST LibRaw-0.20.2.tar.gz 1432141 BLAKE2B 6e41d91b560951ad4595c41a1d089505ca91337f4fc6b98bafe44211971bee143709482a070bacb7daebbd643bbbf17730f544d791c0237bf1689a7a59133079 SHA512 96b1aaf09e2d46448d1b3619270c1f1c32e9bcbd866567cec67d5b1f889362f0fae3f3533ea9bf6a11a917be3b61ee6c9938bad09209d93453039ed04eaeae4a +EBUILD libraw-0.20.0.ebuild 1382 BLAKE2B f37c63dcdbbf7bdd93af2fd7bf67d04c02d0c5c3d95b9b89c30ae806f6a5c31ab8862f4a7cc1c4851584e46f76a2805e6981f0a088f672e609ed1424ebdcf2ab SHA512 4941a712d519ac88903e1912de2e8bea816339fce8695af416a6229b627df14718576d43d30b715775eb26c5f5ba5d9bce152293cce96ea3289682f367d302cb +EBUILD libraw-0.20.2.ebuild 1389 BLAKE2B d2394632a9affe6be4a55570935986d7bf1da5c3621e77077358c30931b1697ecd489ee19756266640bc6f23bddc685c3507617c23d0164d33c95826cf47411e SHA512 6889a4c0cdde5d3a77a43cb82148b090be6151e526c230ddcaee1d8c2d21a9a55e8f081309f1ca84ffe7f8270cbbeadfb4915aad9641701b95803a1d1e3b9e69 MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b diff --git a/media-libs/libraw/libraw-0.19.3.ebuild b/media-libs/libraw/libraw-0.19.3.ebuild deleted file mode 100644 index 02744b12cc8a..000000000000 --- a/media-libs/libraw/libraw-0.19.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal toolchain-funcs - -MY_PN=LibRaw -MY_PV="${PV/_b/-B}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" -HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw" -SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1 CDDL" -SLOT="0/19" # subslot = libraw soname version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="examples jpeg +lcms openmp" - -RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -DOCS=( Changelog.txt README.md ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-static - --disable-jasper - $(use_enable examples) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable openmp) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - # package installs .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libraw/libraw-0.19.4.ebuild b/media-libs/libraw/libraw-0.19.4.ebuild deleted file mode 100644 index de9464c5f187..000000000000 --- a/media-libs/libraw/libraw-0.19.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal toolchain-funcs - -MY_PN=LibRaw -MY_PV="${PV/_b/-B}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" -HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw" -SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1 CDDL" -SLOT="0/19" # subslot = libraw soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="examples jpeg +lcms openmp" - -RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -DOCS=( Changelog.txt README.md ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-static - --disable-jasper - $(use_enable examples) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable openmp) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - # package installs .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libraw/libraw-0.19.5.ebuild b/media-libs/libraw/libraw-0.19.5.ebuild deleted file mode 100644 index de9464c5f187..000000000000 --- a/media-libs/libraw/libraw-0.19.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal toolchain-funcs - -MY_PN=LibRaw -MY_PV="${PV/_b/-B}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" -HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw" -SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1 CDDL" -SLOT="0/19" # subslot = libraw soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="examples jpeg +lcms openmp" - -RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -DOCS=( Changelog.txt README.md ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-static - --disable-jasper - $(use_enable examples) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable openmp) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - # package installs .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libraw/libraw-0.20.0.ebuild b/media-libs/libraw/libraw-0.20.0.ebuild index 16da26d6896a..01ec7d870fd9 100644 --- a/media-libs/libraw/libraw-0.20.0.ebuild +++ b/media-libs/libraw/libraw-0.20.0.ebuild @@ -15,12 +15,14 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" LICENSE="LGPL-2.1 CDDL" SLOT="0/20" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples jpeg +lcms openmp" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" + BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" diff --git a/media-libs/libraw/libraw-0.20.2.ebuild b/media-libs/libraw/libraw-0.20.2.ebuild new file mode 100644 index 000000000000..b25b30eab84f --- /dev/null +++ b/media-libs/libraw/libraw-0.20.2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal toolchain-funcs + +MY_PN=LibRaw +MY_PV="${PV/_b/-B}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" +HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw" +SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1 CDDL" +SLOT="0/20" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="examples jpeg +lcms openmp" + +RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) + lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" + +DEPEND="${RDEPEND}" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +DOCS=( Changelog.txt README.md ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --disable-static + --disable-jasper + $(use_enable examples) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable openmp) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + + # package installs .pc files + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest index 4eb7a74b92da..098b114007f9 100644 --- a/media-libs/libreplaygain/Manifest +++ b/media-libs/libreplaygain/Manifest @@ -1,3 +1,4 @@ +AUX libreplaygain-static-libs.patch 1145 BLAKE2B e90da6268c258998ed333cbc89918f62f0cb2d5454c98af700cf6b9b3d62d780e4e4ce931f9d5bfff4a74cce8770c308525b895b3de163725cb8fd07445cd330 SHA512 738b50523dd527781fa7f1df1bf3f0ffe26925684ab3ae1b14b1c7cac9e150384deceab0de70c05cda474f4e3781c83ff0335255471c92dc06edfdfef330e898 DIST libreplaygain-477.tar.xz 8272 BLAKE2B 6382984643aad155b3e5e0dac8a7ca698320068c62fa87ac7f466e34e850f05df1e823d87f7cb477bd22f59c97f7e5ac8757e9bd6f59c2f5f1852efe9f083d72 SHA512 9e81deb237e35e63d67efabcbfe40f5a6fd34f4a6b0239a21e6ab8ba3c9ca172297cf323fbc4ada749dcfcdf0b711c354e39f12af9a9576900384c441657ff8e -EBUILD libreplaygain-477-r1.ebuild 794 BLAKE2B fd9099e316859f728aeec5aaa7c6716329b6fee3310ed5a141df922484ad42e090823c0f2cec7b16be2468a8f18cc91d1535b57a55ac3dc6b14df7476370c109 SHA512 65c11cec04cbb03b49935a24be91acdf565a8d8d4f44636a9efae2510a43b032836b001f1cc6f0ff93ab614dc84d6f4b4ed498c138f235f5928fe299af66aa2e +EBUILD libreplaygain-477-r1.ebuild 837 BLAKE2B 4f9cda41e5dbd8932a6e9fb94943df7b9a2fb40ae43131804937619f61120a0a246d5a1dab857fb8420e9b30285236dcc8ebf6a050ce7ca6f36aa79b9bff24e5 SHA512 19b1241dac1e2677adcecde38ffd618b4aaecc9bd5999192e0c704f61227e48e2ab6dbcdc31847f413a095ef835806daf121c9e81a40a3b92bcc6b36345c3967 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-libs/libreplaygain/files/libreplaygain-static-libs.patch b/media-libs/libreplaygain/files/libreplaygain-static-libs.patch new file mode 100644 index 000000000000..7772d620f13a --- /dev/null +++ b/media-libs/libreplaygain/files/libreplaygain-static-libs.patch @@ -0,0 +1,28 @@ +From d06ffbc7d2e213e3d3743b1959ac774340bfe1d7 Mon Sep 17 00:00:00 2001 +From: Jakov Smolic +Date: Sun, 20 Sep 2020 22:10:37 +0200 +Subject: [PATCH] src: CMakeLists: disable static libs + +Signed-off-by: Jakov Smolic +--- + src/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 121cdb4..837e959 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,9 +1,6 @@ + include_directories(${libreplaygain_SOURCE_DIR}/include) + +-add_library(replaygain-static STATIC gain_analysis) +-set_target_properties(replaygain-static PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1) +- + add_library(replaygain-shared SHARED gain_analysis) + set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1) + +-install(TARGETS replaygain-static replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ++install(TARGETS replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") +-- +2.26.2 + diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild index f1a6f5df2e81..171546eb7957 100644 --- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild +++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild @@ -16,7 +16,8 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" + +PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch ) src_prepare() { cmake_src_prepare diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest index cd0cee4ef38a..fe815e73e72b 100644 --- a/media-libs/libsamplerate/Manifest +++ b/media-libs/libsamplerate/Manifest @@ -3,7 +3,6 @@ AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf84281 AUX libsamplerate-0.1.9-htmldocdir.patch 1638 BLAKE2B 21cfc155520cdb1392925560a48317ba5850539e66544dc8c0ebf1a7d9eab0249e6ac98611695b169b4a0e984f6c4a9c1710d77cd99da53516c6bf8ec72e8c13 SHA512 859e94497d68470865f5dc198bdda8bc86135f84d67e1b06031e0acc67f10b88c354255fc6944a3c258934d71584c2cb72fbdf840cdd798a2e7712cf7cc3c9fd AUX libsamplerate-0.1.9-no-sndfile-resample.patch 1070 BLAKE2B b0e655e5162f8c77f66f57a54da132185d0f192d6e1def8aebb2ce389ed21e7460801bdacf096b7b71dcf0c067a585f4b7749680276ad28c75fd909532e93449 SHA512 d32fb092c593578060a58bab323aaad76c5a6f35a3e17a2617581f7d9309b4e2377753c13013637dc02f06343e082089b2ea229219d48a46dce2b138839f3eb4 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728 -EBUILD libsamplerate-0.1.9-r1.ebuild 1022 BLAKE2B 0a52fcb7d4c28de1938d43b190d625810ceb854d84301d6d5b3a24f759b849ad9cb9c7815f80b76c2cf5c4070b97525298f802dfd89bb8df9aee704d82f5f4fe SHA512 9e92f2cef4c3909911a740e1c28d86a2e7e8b360ea4a8e0e52e2a83af7b53554dbc2b88c9d96d57e7583238ec8d8899605cfd1b94fdd002002fff3291e39921d -EBUILD libsamplerate-0.1.9.ebuild 1392 BLAKE2B cfbe8bf1262ea6dbe91ac64897508bade3202943c640f8038b3c496aa012b0050c961d9dc845b4addb712a8a488e9cd24dfafd5dec66d7b1d6c04a4735db2014 SHA512 9a37d903d811f3ee2c4ad9e71f1e6fd1b79deae88ee47d6970b588a882bafb7a8594a07f82e2ccb0586775f34024d3efc8669e3b03f2811e9f65fef55401f2ba +EBUILD libsamplerate-0.1.9-r1.ebuild 1013 BLAKE2B deb44cc36e4978db093ebf4d142d6e3d7cc5b3dd5a35cde28993c0ffd2707244ae03784be4526740bbfdc8c102a75831be4533fe78416e980f8bdbc6bb7c3202 SHA512 47aed1364dc168f51f594a7617097fb32722417fa201df8e9a0fcd224690a9f30a80478b188a8e89101475dd40e001f24ddf4cedd25271488d98fc96eb552691 EBUILD libsamplerate-9999.ebuild 1271 BLAKE2B 500d16139947b14a359eec9ab45bfd74ec2ddf6ecd746ecbce2381f7579b8863f44772f72473008bd50a0324c11f676d6be56c3779f16bf6d9ae900d1ab7fc8e SHA512 77961d3ccdfdfe9861d4c429e3fdef3f9bbda46c37f558fd13f49a92d04d358d8f192c5a1d8f48dffdff9d00b74305a270acb1e2f03067c83d045674c05718fb MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild index 1fb03648cc2d..9243a4f7f2a4 100644 --- a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild +++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" BDEPEND="virtual/pkgconfig" diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild deleted file mode 100644 index 449bae506622..000000000000 --- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -inherit autotools-multilib - -DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio" -HOMEPAGE="http://www.mega-nerd.com/SRC/" -SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="sndfile static-libs" - -RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_prepare() { - local PATCHES=( - "${FILESDIR}/${PN}-0.1.3-dontbuild-tests-examples.patch" - "${FILESDIR}/${PN}-0.1.8-lm.patch" - ) - - AT_M4DIR="M4" \ - autotools-multilib_src_prepare -} - -src_configure() { - my_configure() { - local myeconfargs=( - --disable-fftw - ) - - if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then - myeconfargs+=( $(use_enable sndfile) ) - else - myeconfargs+=( --disable-sndfile ) - fi - - autotools-utils_src_configure - - if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then - sed -i -e "s/ doc examples//" "${BUILD_DIR}/Makefile" || die - fi - } - multilib_parallel_foreach_abi my_configure -} - -src_install() { - autotools-multilib_src_install \ - htmldocdir="${EPREFIX}/usr/share/doc/${PF}/html" -} diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 6fbb332d5476..621ddf20fa64 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -3,5 +3,5 @@ AUX libsdl2-2.0.12-static-libs.patch 2510 BLAKE2B 2c93b5a9ba38d797281d2d3b13eeb1 AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c1176055193505bc091569925f2f31f6e623254fa19df3eeb3fe477b97b4eef1973a3f9961d8f5159cf62aae39b8ab84d178ca5f8cf8346fd SHA512 20a6f433c973bb521d4db19c682b1a063b314405a0f2b68ed88a68030ef2a4ba71a8b84c45c0980c6218f2b9f332cc3cfd1354aebcd0932584169161638e011e DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd -EBUILD libsdl2-2.0.12-r2.ebuild 5561 BLAKE2B 0117b1f2e22eb15ee69cf0a821d2df7139bcdc70fc8ee77256b0ad65e600917443aef515fe5d4553c1b3bec4b26ca0fc6325e9502939b31f6cd3b0c248daf19e SHA512 0df266f12a34384e47eca0964337f7e28fa9a85c74fd275958c3432258e960fcb2ae45edf7e09c5ea481f5d4cad2c1e188be4f2325f8efcf3262b4b896c5f981 -MISC metadata.xml 1658 BLAKE2B 5c902cca2bed60d10864bd4d3524035b9472599f63a5a739348231c2471a01f40dd99ba49b63b710cffbfa51c870f06a1aa5a1d56a6a5dc6a2a3059550506443 SHA512 7c832d7bc52638ad658c4b53ffc1faf34486d551728240007b8af5f569dfa893a076df9b7ecc118c29795d1792b55e953401b2dbf81d831d002fc0cb0f28687c +EBUILD libsdl2-2.0.12-r2.ebuild 5896 BLAKE2B 278c56e6c03189366d1050cb1cf42c5bdb302ef6b19cb31ab00b891e606c5efac2a5720f8578f511391be35707cbb59594917d028cae1241f2642004fc52b345 SHA512 b3eaaa899eb5be4c94d998840d664da39d8cb8e037e5e45a6ce1a485f8204a94228b7de7252f6f525914fb8229c868cecb613d3f03561ce29251c9e1ef64808d +MISC metadata.xml 1805 BLAKE2B 16d4961cf6d0c9997fe706dd5deb51b98f153135cb4f0bedbc29e842d485ba2f4493003830385957b7ac92fd9f6d31bcf4319d800a7f2bd46a9a1772b86f3e5a SHA512 37e976d6a469c6e17e3efb178a189903c3ac2baf99d0e3aa7fb80bfc6d297e52c910ae6361e119fe1173d6d8a9d2aef47172bb4a1185ef4f99f36c75d1f8c19f diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild index 5ba649b5a7b9..83131e2c099f 100644 --- a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild @@ -11,12 +11,14 @@ 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" +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 gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" +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 tslib 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 ) @@ -29,7 +31,9 @@ REQUIRED_USE=" 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.46[${MULTILIB_USEDEP}] @@ -65,6 +69,7 @@ CDEPEND=" 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 ) " @@ -92,7 +97,7 @@ src_prepare() { # Unbundle some headers. rm -r src/video/khronos || die - ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos || die + ln -s "${ESYSROOT}/usr/include" src/video/khronos || die AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf } @@ -100,6 +105,10 @@ src_prepare() { 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) @@ -166,7 +175,8 @@ multilib_src_configure() { $(use_enable vulkan video-vulkan) $(use_enable udev libudev) $(use_enable dbus) - --disable-ibus + $(use_enable fcitx4 fcitx) + $(use_enable ibus) $(use_enable tslib input-tslib) --disable-directx --disable-rpath diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml index ec21c0415ca4..fb417beddc0a 100644 --- a/media-libs/libsdl2/metadata.xml +++ b/media-libs/libsdl2/metadata.xml @@ -24,8 +24,10 @@ Perl, PHP, Pike, Python, and Ruby. + Enable support for app-i18n/fcitx 4 include OpenGL ES 2.0 support Enable the haptic (force feedback) subsystem + Enable support for app-i18n/ibus Control joystick support (disable at your own risk) Build the KMSDRM video driver Control audio support (disable at your own risk) diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest index a820f2d167ca..22f8ed410744 100644 --- a/media-libs/libsndfile/Manifest +++ b/media-libs/libsndfile/Manifest @@ -1,17 +1,4 @@ -AUX libsndfile-1.0.28-CVE-2017-12562.patch 4360 BLAKE2B d668fa5c114e3510ff51e2331593d040e0a69476472d55d2a784ceccc71d880cdcc4cda53210d8e2c62abb2397f13d8129162567df8f5528489190ce7c102172 SHA512 8f07edf06652c56877dc5bc478daf494bcfaa45fa1d5a655719aaa8b363edffb749c4878ca11a7dac602ac5658b17eea9397ad824e2c3be38e9fe6c51cea0c63 -AUX libsndfile-1.0.28-CVE-2017-14634.patch 1295 BLAKE2B 07d4d12db67151dbd4ad3141c0c0cf4de3ab8110a9e0aea3f21a29bc78f761e36fe997f6155d37f3d7839c1f51507b06813fdce41835f2fea429cb288025738c SHA512 5c8ecd05b85ba12fe4f0f0f423a2a1d2652f7469fbc72b0475f7bd9dce8d3c4e880c5a80ded3a2dffa84d41a7e76bb2d813cde1bd2f9474c5ab42d954cd90f2f -AUX libsndfile-1.0.28-CVE-2017-6892.patch 868 BLAKE2B e90aa5a20b0bce3f2b41240b4289627ab38d87728e30b5cc59b58bf34a9c18eee07a6242ccae6ae5cdb42bd9a49558f2529ddae7f087784cdc6cb2f5f03fe08d SHA512 9183b79cc9a1c1a6de5826d67d7172010d2c57a1a600cabb3763066277e84dfd44225ff9916fb08639ec90514bebadb46634dac5b7e757f5938bee9755e472cc -AUX libsndfile-1.0.28-CVE-2017-8362.patch 1951 BLAKE2B bf0e1a9c9cd53b61884a861a3284d9fe02ee6411c16f06000fa56794859f6ce96d4d135723a8cffed10801e04be9c94342501fbf2c4caf4078a0a4b5d5b68ad9 SHA512 dfd4b5f1c7471fc416eed5c6040580a020543f145de9103751adaad6ce1c5c6a22abc1cf0ffd381aed3072644cd5ee03ba3598265aa7d202d63167da251cb595 -AUX libsndfile-1.0.28-CVE-2017-8363.patch 857 BLAKE2B 9b053a582aed746fd00efd11f6887cc81d2ef4130533b75e859bb4bed494a29b9918cf07837b6fbc0e60421c659394a9c4c3e79a8bf76c20cc1304a57ef31bfc SHA512 5ce56647b19721dd60157007d3657444c7901e8ead856fa08b6fef0d74ac39e93295294bd21c43c90a3d305750f270f806ed760cd61c93b04e90d9c53357a56e -AUX libsndfile-1.0.28-CVE-2017-8365.patch 2577 BLAKE2B 3e9af3996f9e859717281b1e59015df64797cd757bef0ccb280c86990ca8eae2ec2550da35e71fc498bfa119c1912f391372bb4a8ffcf7abe1e82e7dc3320ff1 SHA512 f98c40696fca3e7bca867df993de55bb4145c23428e65d1a669182eb2293046478ac727ae7f94bb77123ef0355c3c53be4f9d6a432665c90c74687d8d3afd9e3 -AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee40441671a623f4ba91a03c059babc4a7a49eb4903bde38d52333335749fd6a0f6501bf524add119658226f6b169565a579b8f2d SHA512 33817e7c85180635fa239e4ea38973b18312878522639f43071188a995f0e1a35dbca6d133555fb0875292b4b609950ae38e747a6b1949f8ae840db9dc3a2805 -AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09 -AUX libsndfile-1.0.29-pointer-aliasing.patch 4489 BLAKE2B 85f0e5ce1ca48fbcb23cec54560d1a3dd05f1037b7b04d5b0d06d1bcf682052e8edadbaa97e5f5d0cf93105a740595ac1d2324a6b90a8851d116c4887583446c SHA512 a11299a7d28396b11dd22b979b58c896dd15cc59b1032e83654704117122571041ea4176cdf16b1ba73ed0f4954371ecd74b7c6931e5dfa58b03d933be41bf51 -DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f -DIST libsndfile-1.0.29.tar.bz2 831090 BLAKE2B 0bdf20a0abe22f628434e80c61c6b7d31e62c40dd881f462d8e12eb4488f0bcb1c0c7712fbff4902bbbea86e08763a01f7d85b875166c5c9214ab9d8aa10a1c1 SHA512 72cf038b26c66e6e085d97ef1954bd3aa76315527f632649707c76128953bfbb2c9b52527d309720ca1107a9e04e033722995911dad43b4adda46bf4a05354d7 -DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998 -EBUILD libsndfile-1.0.28-r4.ebuild 1869 BLAKE2B a2cd5a12dce29bb9fb19a1da246299b3d66eb06ea4867bd5bbb224a78e4e9b8324f45d8ad0c1cf1b982360210af08aed49432503a885e15098da4db806d14b7b SHA512 f9babe5df3082d394660f54872cbb13e7a03dbfdb86f24a247302aa72fa139874e6425455b0dc624eee8b87a7809aab7324b8e1802db27e0f801ee91b9e7f9ed -EBUILD libsndfile-1.0.29.ebuild 1964 BLAKE2B 3ddd7c9ae3b80967e0f78aef0f762d80d60efcfc5083e427d8002243e5f0f16f39559562697200743a62fbbb5e79264e810272a0c092c70449e45bd16f06323e SHA512 072ea1534487b6d264bf5954a4a3ac5a62d72a67db8c0a1ec19090ec6a750559348b12bf8ef421b2026713ee810f74d6c7561aa0c3f9c06cf6daa9b7bb99c3f5 -EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1664 BLAKE2B 61aaac447069d3556d50efca587950f11e24672ad6342b7c646e7bf0623c9f90971c1b64f58b15f77f0d9e32590839167510cfc114e88e3b708524648e70e418 SHA512 d46c95bd3858a30c570f9cb8b9f103d9268de79a5aa914447a3f6e60fd53c8afea12eb727d2e5395bbe0218171cdf6e39cd7017b7cf1c6ea03360ccbb1a537be -EBUILD libsndfile-9999.ebuild 1858 BLAKE2B 2a30637a1dcd646d05f076b8fd9164f4f7b400404c9ece45fe0d661e0ef6ecf01c40673bdef19f9b4b202284bb9843ef8c0f493949a12a0855e2129e58cdaa39 SHA512 1cc3660d281f4c33efda5b4ee0438d07f1dfb7c9f0bf95b3e7d5e2f11e693b14aea9d5d6bbea853c5fbae93929ff8ae9173ea9c5ace30bcc18efa97939a6d425 +DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00 +EBUILD libsndfile-1.0.30.ebuild 1816 BLAKE2B 58bb0d82e821e2b44724574531c2c7128edf8c953a5c3dc1745079e6c4bb139e13ad149f067b59ba9c3ab711cba924568ad02257640b6eb144bac8421a554980 SHA512 a2a4329b515d6ff3a67fa3955350744648b91af14579ed94b2e0cce39f1b98d4de96f4a7492dee3d1bdb4b1f20958f12f24801f585e8d3a24d86d73109a4682c +EBUILD libsndfile-9999.ebuild 1824 BLAKE2B 5df7f55484c052a979c4f9b86858e4a9e11ee2311f802ddf9def6dadf0ea72386b481d5fc8e182eb481b4908e136aabdcd0a0ec223e3a32084d54f44f186ce4e SHA512 2fd90e525c47680d29596f6e974b34c5e1fdcd98b35898a341e69e412c3effb6061f9450632b5307cbb7d250b9850bf8f0dcf8e8d638a1c328c5b35cbb33c2d2 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-12562.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-12562.patch deleted file mode 100644 index 0ff2b7ef4590..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-12562.patch +++ /dev/null @@ -1,88 +0,0 @@ -From b6a9d7e95888ffa77d8c75ce3f03e6c7165587cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= -Date: Wed, 14 Jun 2017 12:25:40 +0200 -Subject: [PATCH] src/common.c: Fix heap buffer overflows when writing strings - in binheader - -Fixes the following problems: - 1. Case 's' only enlarges the buffer by 16 bytes instead of size bytes. - 2. psf_binheader_writef() enlarges the header buffer (if needed) prior to the - big switch statement by an amount (16 bytes) which is enough for all cases - where only a single value gets added. Cases 's', 'S', 'p' however - additionally write an arbitrary length block of data and again enlarge the - buffer to the required amount. However, the required space calculation does - not take into account the size of the length field which gets output before - the data. - 3. Buffer size requirement calculation in case 'S' does not account for the - padding byte ("size += (size & 1) ;" happens after the calculation which - uses "size"). - 4. Case 'S' can overrun the header buffer by 1 byte when no padding is - involved - ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;" while - the buffer is only guaranteed to have "size" space available). - 5. "psf->header.ptr [psf->header.indx] = 0 ;" in case 'S' always writes 1 byte - beyond the space which is guaranteed to be allocated in the header buffer. - 6. Case 's' can overrun the provided source string by 1 byte if padding is - involved ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;" - where "size" is "strlen (strptr) + 1" (which includes the 0 terminator, - plus optionally another 1 which is padding and not guaranteed to be - readable via the source string pointer). - -Closes: https://github.com/erikd/libsndfile/issues/292 ---- - src/common.c | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/src/common.c b/src/common.c -index 1a6204ca..6b2a2ee9 100644 ---- a/src/common.c -+++ b/src/common.c -@@ -681,16 +681,16 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) - /* Write a C string (guaranteed to have a zero terminator). */ - strptr = va_arg (argptr, char *) ; - size = strlen (strptr) + 1 ; -- size += (size & 1) ; - -- if (psf->header.indx + (sf_count_t) size >= psf->header.len && psf_bump_header_allocation (psf, 16)) -+ if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1))) - return count ; - - if (psf->rwf_endian == SF_ENDIAN_BIG) -- header_put_be_int (psf, size) ; -+ header_put_be_int (psf, size + (size & 1)) ; - else -- header_put_le_int (psf, size) ; -+ header_put_le_int (psf, size + (size & 1)) ; - memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ; -+ size += (size & 1) ; - psf->header.indx += size ; - psf->header.ptr [psf->header.indx - 1] = 0 ; - count += 4 + size ; -@@ -703,16 +703,15 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) - */ - strptr = va_arg (argptr, char *) ; - size = strlen (strptr) ; -- if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) -+ if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1))) - return count ; - if (psf->rwf_endian == SF_ENDIAN_BIG) - header_put_be_int (psf, size) ; - else - header_put_le_int (psf, size) ; -- memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ; -+ memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + (size & 1)) ; - size += (size & 1) ; - psf->header.indx += size ; -- psf->header.ptr [psf->header.indx] = 0 ; - count += 4 + size ; - break ; - -@@ -724,7 +723,7 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) - size = (size & 1) ? size : size + 1 ; - size = (size > 254) ? 254 : size ; - -- if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) -+ if (psf->header.indx + 1 + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, 1 + size)) - return count ; - - header_put_byte (psf, size) ; diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch deleted file mode 100644 index 9eab370aac47..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 85c877d5072866aadbe8ed0c3e0590fbb5e16788 Mon Sep 17 00:00:00 2001 -From: Fabian Greffrath -Date: Thu, 28 Sep 2017 12:15:04 +0200 -Subject: [PATCH] double64_init: Check psf->sf.channels against upper bound - -This prevents division by zero later in the code. - -While the trivial case to catch this (i.e. sf.channels < 1) has already -been covered, a crafted file may report a number of channels that is -so high (i.e. > INT_MAX/sizeof(double)) that it "somehow" gets -miscalculated to zero (if this makes sense) in the determination of the -blockwidth. Since we only support a limited number of channels anyway, -make sure to check here as well. - -CVE-2017-14634 - -Closes: https://github.com/erikd/libsndfile/issues/318 -Signed-off-by: Erik de Castro Lopo ---- - src/double64.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/double64.c b/src/double64.c -index b318ea86..78dfef7f 100644 ---- a/src/double64.c -+++ b/src/double64.c -@@ -91,7 +91,7 @@ int - double64_init (SF_PRIVATE *psf) - { static int double64_caps ; - -- if (psf->sf.channels < 1) -+ if (psf->sf.channels < 1 || psf->sf.channels > SF_MAX_CHANNELS) - { psf_log_printf (psf, "double64_init : internal error : channels = %d\n", psf->sf.channels) ; - return SFE_INTERNAL ; - } ; diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch deleted file mode 100644 index d5ccf726684a..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f833c53cb596e9e1792949f762e0b33661822748 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Tue, 23 May 2017 20:15:24 +1000 -Subject: [PATCH] src/aiff.c: Fix a buffer read overflow - -Secunia Advisory SA76717. - -Found by: Laurent Delosieres, Secunia Research at Flexera Software ---- - src/aiff.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/aiff.c b/src/aiff.c -index 5b5f9f53..45864b76 100644 ---- a/src/aiff.c -+++ b/src/aiff.c -@@ -1759,7 +1759,7 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword) - psf_binheader_readf (psf, "j", dword - bytesread) ; - - if (map_info->channel_map != NULL) -- { size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ; -+ { size_t chanmap_size = SF_MIN (psf->sf.channels, layout_tag & 0xffff) * sizeof (psf->channel_map [0]) ; - - free (psf->channel_map) ; - diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch deleted file mode 100644 index 54fbfb44c3b1..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Fri, 14 Apr 2017 15:19:16 +1000 -Subject: [PATCH] src/flac.c: Fix a buffer read overflow - -A file (generated by a fuzzer) which increased the number of channels -from one frame to the next could cause a read beyond the end of the -buffer provided by libFLAC. Only option is to abort the read. - -Closes: https://github.com/erikd/libsndfile/issues/231 ---- - src/flac.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/flac.c b/src/flac.c -index 5a4f8c21..e4f9aaa0 100644 ---- a/src/flac.c -+++ b/src/flac.c -@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf) - const int32_t* const *buffer = pflac->wbuffer ; - unsigned i = 0, j, offset, channels, len ; - -+ if (psf->sf.channels != (int) frame->header.channels) -+ { psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n" -+ "Nothing to do but to error out.\n" , -+ psf->sf.channels, frame->header.channels) ; -+ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; -+ return 0 ; -+ } ; -+ - /* - ** frame->header.blocksize is variable and we're using a constant blocksize - ** of FLAC__MAX_BLOCK_SIZE. -@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf) - return 0 ; - } ; - -- - len = SF_MIN (pflac->len, frame->header.blocksize) ; - - if (pflac->remain % channels != 0) -@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ - { case FLAC__METADATA_TYPE_STREAMINFO : - if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) - { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" -- "Nothing to be but to error out.\n" , -+ "Nothing to do but to error out.\n" , - psf->sf.channels, metadata->data.stream_info.channels) ; - psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; - return ; diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch deleted file mode 100644 index d0aa400bdd95..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cd7da8dbf6ee4310d21d9e44b385d6797160d9e8 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Wed, 12 Apr 2017 20:19:34 +1000 -Subject: [PATCH] src/flac.c: Fix another memory leak - -When the FLAC decoder was passed a malformed file, the associated -`FLAC__StreamDecoder` object was not getting released. - -Closes: https://github.com/erikd/libsndfile/issues/233 ---- - src/flac.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/flac.c b/src/flac.c -index 986a7b8f..5a4f8c21 100644 ---- a/src/flac.c -+++ b/src/flac.c -@@ -841,7 +841,9 @@ flac_read_header (SF_PRIVATE *psf) - - psf_log_printf (psf, "End\n") ; - -- if (psf->error == 0) -+ if (psf->error != 0) -+ FLAC__stream_decoder_delete (pflac->fsd) ; -+ else - { FLAC__uint64 position ; - - FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ; diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch deleted file mode 100644 index 1dc5b57f1d39..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch +++ /dev/null @@ -1,64 +0,0 @@ -From fd0484aba8e51d16af1e3a880f9b8b857b385eb3 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Wed, 12 Apr 2017 19:45:30 +1000 -Subject: [PATCH] FLAC: Fix a buffer read overrun - -Buffer read overrun occurs when reading a FLAC file that switches -from 2 channels to one channel mid-stream. Only option is to -abort the read. - -Closes: https://github.com/erikd/libsndfile/issues/230 ---- - src/common.h | 1 + - src/flac.c | 13 +++++++++++++ - src/sndfile.c | 1 + - 3 files changed, 15 insertions(+) - -diff --git a/src/common.h b/src/common.h -index 0bd810c3..e2669b6a 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -725,6 +725,7 @@ enum - SFE_FLAC_INIT_DECODER, - SFE_FLAC_LOST_SYNC, - SFE_FLAC_BAD_SAMPLE_RATE, -+ SFE_FLAC_CHANNEL_COUNT_CHANGED, - SFE_FLAC_UNKOWN_ERROR, - - SFE_WVE_NOT_WVE, -diff --git a/src/flac.c b/src/flac.c -index 84de0e26..986a7b8f 100644 ---- a/src/flac.c -+++ b/src/flac.c -@@ -434,6 +434,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ - - switch (metadata->type) - { case FLAC__METADATA_TYPE_STREAMINFO : -+ if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) -+ { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" -+ "Nothing to be but to error out.\n" , -+ psf->sf.channels, metadata->data.stream_info.channels) ; -+ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; -+ return ; -+ } ; -+ -+ if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate) -+ { psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n" -+ "Carrying on as if nothing happened.", -+ psf->sf.samplerate, metadata->data.stream_info.sample_rate) ; -+ } ; - psf->sf.channels = metadata->data.stream_info.channels ; - psf->sf.samplerate = metadata->data.stream_info.sample_rate ; - psf->sf.frames = metadata->data.stream_info.total_samples ; -diff --git a/src/sndfile.c b/src/sndfile.c -index 41875610..e2a87be8 100644 ---- a/src/sndfile.c -+++ b/src/sndfile.c -@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] = - { SFE_FLAC_INIT_DECODER , "Error : problem with initialization of the flac decoder." }, - { SFE_FLAC_LOST_SYNC , "Error : flac decoder lost sync." }, - { SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." }, -+ { SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." }, - { SFE_FLAC_UNKOWN_ERROR , "Error : unknown error in flac decoder." }, - - { SFE_WVE_NOT_WVE , "Error : not a WVE file." }, diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch deleted file mode 100644 index f75843267b0b..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch +++ /dev/null @@ -1,31 +0,0 @@ -From df18323c622b54221ee7ace74b177cdcccc152d7 Mon Sep 17 00:00:00 2001 -From: "Brett T. Warden" -Date: Tue, 28 Aug 2018 12:01:17 -0700 -Subject: [PATCH] Check MAX_CHANNELS in sndfile-deinterleave - -Allocated buffer has space for only 16 channels. Verify that input file -meets this limit. - -Fixes #397 ---- - programs/sndfile-deinterleave.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/programs/sndfile-deinterleave.c b/programs/sndfile-deinterleave.c -index 53660310..225b4d54 100644 ---- a/programs/sndfile-deinterleave.c -+++ b/programs/sndfile-deinterleave.c -@@ -89,6 +89,13 @@ main (int argc, char **argv) - exit (1) ; - } ; - -+ if (sfinfo.channels > MAX_CHANNELS) -+ { printf ("\nError : Input file '%s' has too many (%d) channels. Limit is %d.\n", -+ argv [1], sfinfo.channels, MAX_CHANNELS) ; -+ exit (1) ; -+ } ; -+ -+ - state.channels = sfinfo.channels ; - sfinfo.channels = 1 ; - diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-arm-varargs-failure.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-arm-varargs-failure.patch deleted file mode 100644 index ed726f829769..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.28-arm-varargs-failure.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9d470ee5577d3ccedb1c28c7e0a7295ba17feaf5 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Sun, 16 Apr 2017 17:54:17 +1000 -Subject: [PATCH] src/rf64.c: Fix varargs related bug - -C's functionality isn't type checked so that passing an -`sf_count_t` (64 bits) by mistake in place of a `unit32_t` can cause -errors. This would be fine if it was an error on every architecture -and platform, but its not. This particular problem only manifested -on armhf and some other Arm architectures. It was not an issue on -32 bit x86. - -I have now fixed variants of this same bug several times. - -Closes: https://github.com/erikd/libsndfile/issues/229 ---- - src/rf64.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rf64.c b/src/rf64.c -index b3d637fa..02dd9046 100644 ---- a/src/rf64.c -+++ b/src/rf64.c -@@ -742,7 +742,7 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length) - - pad_size = psf->dataoffset - 16 - psf->header.indx ; - if (pad_size >= 0) -- psf_binheader_writef (psf, "m4z", PAD_MARKER, pad_size, make_size_t (pad_size)) ; -+ psf_binheader_writef (psf, "m4z", PAD_MARKER, (unsigned int) pad_size, make_size_t (pad_size)) ; - - if (wpriv->rf64_downgrade && (psf->filelength < RIFF_DOWNGRADE_BYTES)) - psf_binheader_writef (psf, "tm8", data_MARKER, psf->datalength) ; diff --git a/media-libs/libsndfile/files/libsndfile-1.0.29-pointer-aliasing.patch b/media-libs/libsndfile/files/libsndfile-1.0.29-pointer-aliasing.patch deleted file mode 100644 index 644bf333413f..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.29-pointer-aliasing.patch +++ /dev/null @@ -1,128 +0,0 @@ -From e5f9469a824fc660494b52ec3edc0dda2509594c Mon Sep 17 00:00:00 2001 -From: Arthur Taylor -Date: Tue, 8 Sep 2020 09:31:37 -0700 -Subject: [PATCH] Opus: Fix integer bug in header parsing. Fixes issue #581. - -Fix errors in parsing an OggOpus header packet where aliased pointers of -different type widths are used with psf_binheader_readf(), resulting in -incorrect data or endian issues. Telling psf_binheader_readf() to read -an integer of fixed width, but then passing a pointer to an integer -of a different width is a bug. ---- - src/ogg_opus.c | 38 ++++++++++++++++++++++---------------- - 1 file changed, 22 insertions(+), 16 deletions(-) - -diff --git a/src/ogg_opus.c b/src/ogg_opus.c -index de66b061..b40a6fb1 100644 ---- a/src/ogg_opus.c -+++ b/src/ogg_opus.c -@@ -183,32 +183,32 @@ - #define OGG_OPUS_PREROLL (80 * 48) /* 80 milliseconds */ - - typedef struct --{ int version ; -+{ uint8_t version ; - - /* Number of channels, 1...255 */ -- int channels ; -+ uint8_t channels ; - - /* Encoder latency, the amount to skip before valid data comes out. */ -- int preskip ; -+ uint16_t preskip ; - - /* The sample rate of a the encoded source, as it may have been converted. */ -- int input_samplerate ; -+ int32_t input_samplerate ; - - /* 'baked-in' gain to apply, dB S7.8 format. Should be zero when possible. */ - int16_t gain ; - - /* Channel mapping type. See OggOpus spec */ -- int channel_mapping ; -+ uint8_t channel_mapping ; - - /* The rest is only used if channel_mapping != 0 */ - /* How many streams are there? */ -- int nb_streams ; -+ uint8_t nb_streams ; - - /* How man of those streams are coupled? (aka stereo) */ -- int nb_coupled ; -+ uint8_t nb_coupled ; - - /* Mapping of opus streams to output channels */ -- unsigned char stream_map [255] ; -+ uint8_t stream_map [255] ; - } OpusHeader ; - - typedef struct -@@ -637,6 +637,9 @@ ogg_opus_setup_decoder (SF_PRIVATE *psf, int input_samplerate) - static int - ogg_opus_setup_encoder (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) - { int error ; -+ int lookahead ; -+ int nb_streams ; -+ int nb_coupled ; - - /* default page latency value (1000ms) */ - oopus->u.encode.latency = 1000 * 48 ; -@@ -655,16 +658,16 @@ ogg_opus_setup_encoder (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus - - if (psf->sf.channels <= 2) - { oopus->header.channel_mapping = 0 ; -- oopus->header.nb_streams = 1 ; -- oopus->header.nb_coupled = psf->sf.channels - 1 ; -+ nb_streams = 1 ; -+ nb_coupled = psf->sf.channels - 1 ; - oopus->header.stream_map [0] = 0 ; - oopus->header.stream_map [1] = 1 ; - - oopus->u.encode.state = opus_multistream_encoder_create ( - psf->sf.samplerate, - psf->sf.channels, -- oopus->header.nb_streams, -- oopus->header.nb_coupled, -+ nb_streams, -+ nb_coupled, - oopus->header.stream_map, - OPUS_APPLICATION_AUDIO, - &error) ; -@@ -683,17 +686,20 @@ ogg_opus_setup_encoder (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus - psf->sf.samplerate, - psf->sf.channels, - oopus->header.channel_mapping, -- &oopus->header.nb_streams, -- &oopus->header.nb_coupled, -+ &nb_streams, -+ &nb_coupled, - oopus->header.stream_map, - OPUS_APPLICATION_AUDIO, - &error) ; -+ - } - - if (error != OPUS_OK) - { psf_log_printf (psf, "Opus : Error, opus_multistream_encoder_create returned %s\n", opus_strerror (error)) ; - return SFE_BAD_OPEN_FORMAT ; - } ; -+ oopus->header.nb_streams = nb_streams ; -+ oopus->header.nb_coupled = nb_coupled ; - - opus_multistream_encoder_ctl (oopus->u.encode.state, OPUS_GET_BITRATE (&oopus->u.encode.bitrate)) ; - psf_log_printf (psf, "Encoding at target bitrate of %dbps\n", oopus->u.encode.bitrate) ; -@@ -711,12 +717,12 @@ ogg_opus_setup_encoder (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus - ** GOTCHA: This returns the preskip at the encoder samplerate, not the - ** granulepos rate of 48000Hz needed for header.preskip. - */ -- error = opus_multistream_encoder_ctl (oopus->u.encode.state, OPUS_GET_LOOKAHEAD (&oopus->header.preskip)) ; -+ error = opus_multistream_encoder_ctl (oopus->u.encode.state, OPUS_GET_LOOKAHEAD (&lookahead)) ; - if (error != OPUS_OK) - { psf_log_printf (psf, "Opus : OPUS_GET_LOOKAHEAD returned: %s\n", opus_strerror (error)) ; - return SFE_BAD_OPEN_FORMAT ; - } ; -- oopus->header.preskip *= oopus->sr_factor ; -+ oopus->header.preskip = lookahead * oopus->sr_factor ; - - oopus->len = OGG_OPUS_ENCODE_PACKET_LEN (psf->sf.samplerate) ; - oopus->buffer = malloc (sizeof (float) * psf->sf.channels * oopus->len) ; diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild deleted file mode 100644 index 95ea458a1e5d..000000000000 --- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 pypy3 ) - -inherit python-any-r1 multilib-minimal - -MY_P=${P/_pre/pre} - -DESCRIPTION="C library for reading and writing files containing sampled sound" -HOMEPAGE="http://www.mega-nerd.com/libsndfile" -if [[ ${MY_P} == ${P} ]]; then - SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz" -else - SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="alsa minimal sqlite static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib ) - sqlite? ( >=dev-db/sqlite-3.2 )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( ${PYTHON_DEPS} )" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-arm-varargs-failure.patch - "${FILESDIR}"/${P}-CVE-2017-12562.patch - "${FILESDIR}"/${P}-CVE-2018-13139.patch - "${FILESDIR}"/${P}-CVE-2017-6892.patch - "${FILESDIR}"/${P}-CVE-2017-836{3,5,2}.patch - "${FILESDIR}"/${P}-CVE-2017-14634.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --disable-octave \ - --enable-gcc-pipe \ - --enable-gcc-opt \ - $(use_enable static-libs static) \ - $(use_enable !minimal external-libs) \ - $(multilib_native_enable full-suite) \ - $(multilib_native_use_enable alsa) \ - $(multilib_native_use_enable sqlite) -} - -multilib_src_install_all() { - einstalldocs - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libsndfile/libsndfile-1.0.29.ebuild b/media-libs/libsndfile/libsndfile-1.0.29.ebuild deleted file mode 100644 index 37cae9590d1e..000000000000 --- a/media-libs/libsndfile/libsndfile-1.0.29.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) - -if [[ ${PV} == *9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/erikd/libsndfile.git" -else - SRC_URI="https://github.com/erikd/libsndfile/releases/download/v${PV}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi -inherit python-any-r1 multilib-minimal - -DESCRIPTION="C library for reading and writing files containing sampled sound" -HOMEPAGE="http://www.mega-nerd.com/libsndfile" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="alsa minimal sqlite static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}] - >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] - >=media-libs/opus-1.1:=[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib:= ) - sqlite? ( >=dev-db/sqlite-3.2 )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( ${PYTHON_DEPS} )" -if [[ ${PV} == *9999 ]]; then - BDEPEND+=" - ${PYTHON_DEPS} - sys-devel/autogen - " -fi - -PATCHES=( - # bug 719020: backported, remove on version bump - "${FILESDIR}"/${P}-pointer-aliasing.patch -) - -pkg_setup() { - if use test || [[ ${PV} == *9999 ]]; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - default - - [[ ${PV} == *9999 ]] && eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --disable-octave \ - --disable-werror \ - $(use_enable static-libs static) \ - $(use_enable !minimal external-libs) \ - $(multilib_native_enable full-suite) \ - $(multilib_native_use_enable alsa) \ - $(multilib_native_use_enable sqlite) \ - PYTHON="${EPYTHON}" -} - -multilib_src_install_all() { - einstalldocs - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild deleted file mode 100644 index 78c8d372dfbc..000000000000 --- a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) - -inherit autotools python-any-r1 multilib-minimal - -MY_COMMIT="97a361afc24202b16489d8c06910277c06b18b53" - -DESCRIPTION="C library for reading and writing files containing sampled sound" -HOMEPAGE="http://www.mega-nerd.com/libsndfile" -SRC_URI="https://github.com/erikd/libsndfile/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="alsa minimal sqlite static-libs test" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}] - >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] - >=media-libs/opus-1.1:=[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib:= ) - sqlite? ( >=dev-db/sqlite-3.2 )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - ${PYTHON_DEPS} - sys-devel/autogen -" - -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --disable-octave \ - $(use_enable static-libs static) \ - $(use_enable !minimal external-libs) \ - $(multilib_native_enable full-suite) \ - $(multilib_native_use_enable alsa) \ - $(multilib_native_use_enable sqlite) \ - PYTHON="${EPYTHON}" -} - -multilib_src_install_all() { - einstalldocs - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libsndfile/libsndfile-1.0.30.ebuild b/media-libs/libsndfile/libsndfile-1.0.30.ebuild new file mode 100644 index 000000000000..21a2ad8712dc --- /dev/null +++ b/media-libs/libsndfile/libsndfile-1.0.30.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) + +if [[ ${PV} == *9999 ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/erikd/libsndfile.git" +else + SRC_URI="https://github.com/erikd/libsndfile/releases/download/v${PV}/${P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi +inherit python-any-r1 multilib-minimal + +DESCRIPTION="C library for reading and writing files containing sampled sound" +HOMEPAGE="http://www.mega-nerd.com/libsndfile" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="alsa minimal sqlite static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !minimal? ( + media-libs/flac:=[${MULTILIB_USEDEP}] + media-libs/libogg:=[${MULTILIB_USEDEP}] + media-libs/libvorbis:=[${MULTILIB_USEDEP}] + media-libs/opus:=[${MULTILIB_USEDEP}] + ) + alsa? ( media-libs/alsa-lib:= ) + sqlite? ( dev-db/sqlite )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${PYTHON_DEPS} )" +if [[ ${PV} == *9999 ]]; then + BDEPEND+=" + ${PYTHON_DEPS} + sys-devel/autogen + " +fi + +pkg_setup() { + if use test || [[ ${PV} == *9999 ]]; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + default + + [[ ${PV} == *9999 ]] && eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + --disable-octave \ + --disable-werror \ + $(use_enable static-libs static) \ + $(use_enable !minimal external-libs) \ + $(multilib_native_enable full-suite) \ + $(multilib_native_use_enable alsa) \ + $(multilib_native_use_enable sqlite) \ + PYTHON="${EPYTHON}" +} + +multilib_src_install_all() { + einstalldocs + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild index d975b6e02701..4c56a90eda78 100644 --- a/media-libs/libsndfile/libsndfile-9999.ebuild +++ b/media-libs/libsndfile/libsndfile-9999.ebuild @@ -3,14 +3,14 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) +PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/erikd/libsndfile.git" else SRC_URI="https://github.com/erikd/libsndfile/releases/download/v${PV}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi inherit python-any-r1 multilib-minimal @@ -24,13 +24,13 @@ RESTRICT="!test? ( test )" RDEPEND=" !minimal? ( - >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}] - >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] - >=media-libs/opus-1.1:=[${MULTILIB_USEDEP}] + media-libs/flac:=[${MULTILIB_USEDEP}] + media-libs/libogg:=[${MULTILIB_USEDEP}] + media-libs/libvorbis:=[${MULTILIB_USEDEP}] + media-libs/opus:=[${MULTILIB_USEDEP}] ) alsa? ( media-libs/alsa-lib:= ) - sqlite? ( >=dev-db/sqlite-3.2 )" + sqlite? ( dev-db/sqlite )" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest index 7c6770b2d929..fe36dbce99d1 100644 --- a/media-libs/libtgvoip/Manifest +++ b/media-libs/libtgvoip/Manifest @@ -1,3 +1,3 @@ -DIST libtgvoip-2.4.4_p20200704.tar.gz 1090620 BLAKE2B 27880d296eef108613cb9330344bfc133efcd7b3fc82b7e793cf623187ff491f44021d1a47703949a0b830ae50106ed2d5b41e26cb6f5849b69b836a592112ff SHA512 ffff8ce9b991e03a2b0fb9b71e04311151081b7c682f728ae7d50a88a87470249d9f6841b24df3264245c5027a06da004d9022bf3652c4f11d03b2058e00d895 -EBUILD libtgvoip-2.4.4_p20200704.ebuild 1097 BLAKE2B 14c75c46236a47a6fc49212fa59b06cb5c5045198638f04e6185b0c338fe5faf4144ec1903d7869c6913fcd91befbe3c13e38ff16d3fbd972a65029f76ca1ea5 SHA512 1a969c3cdc30d773483d412e79fed3948b2145a739b7253070209b796ba64df8705dfc8b622d4a698bd8f879851c8ff1b0f70b125dba5b1ffbf5ebf665103189 +DIST libtgvoip-2.4.4_p20201030.tar.gz 1091098 BLAKE2B 81815a0c9c7f62175493af8f3f56064f6a6a0167351d4f8baf5c846744dc03d325c106dfafb49589702e4f461865e5528395f379142af49b8722f490fdd57d1b SHA512 58dfd537c378c7e9772eab374f25b7d68d26b6db1f71bb9a88e6405e2f2e3cd0ebc2fc94733ce787288365ac9669fc50f8d5a3ab2f2900683c6399ca43172945 +EBUILD libtgvoip-2.4.4_p20201030.ebuild 1182 BLAKE2B 061dd2a7e004bc6b725c5980068cd9e20f1fb93d9d936db1aa56401e9a5d08726d4a5cb685b3f80dcb942b129b85cfd0ff9e0413ff1c15643cecf9de2e31b51e SHA512 92fdc837c12aecf4867243ff81e19d7794208366f55f9aad0e3b2a00f24366d2e36dc4fbb70e28a3c4dd12a171031b970e7d4912820347c3fb3d22a813de86ed MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89 diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild deleted file mode 100644 index cd168857e579..000000000000 --- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -EGIT_COMMIT="b98a01ea44916444cb1b9192f80b46f974d296a6" - -DESCRIPTION="VoIP library for Telegram clients" -HOMEPAGE="https://github.com/telegramdesktop/libtgvoip" -SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 ~ppc64" -IUSE="+alsa +dsp libressl pulseaudio" - -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - media-libs/opus:= - alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -REQUIRED_USE="|| ( alsa pulseaudio )" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -src_prepare() { - default - sed -i 's/-std=gnu++0x/-std=gnu++17/' Makefile.am || die - eautoreconf -} - -src_configure() { - local myconf=( - --disable-static - $(use_enable dsp) - $(use_with alsa) - $(use_with pulseaudio pulse) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20201030.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20201030.ebuild new file mode 100644 index 000000000000..b905384a4dd6 --- /dev/null +++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20201030.ebuild @@ -0,0 +1,53 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +EGIT_COMMIT="fdabfb671d818d0d4d08cb1aeef6058d4a96882b" + +DESCRIPTION="VoIP library for Telegram clients" +HOMEPAGE="https://github.com/telegramdesktop/libtgvoip" +SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 ~ppc64" +IUSE="+dsp libressl pulseaudio" + +DEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + media-libs/opus:= + media-libs/alsa-lib + !pulseaudio? ( media-sound/apulse[sdk] ) + pulseaudio? ( media-sound/pulseaudio ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +src_prepare() { + default + # https://bugs.gentoo.org/717210 + echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --with-alsa + --with-pulse + $(use_enable dsp) + ) + use dsp && append-cxxflags '-DTGVOIP_USE_DESKTOP_DSP_BUNDLED' + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libtimidity/Manifest b/media-libs/libtimidity/Manifest index e60fbce41617..8cdf001c1a80 100644 --- a/media-libs/libtimidity/Manifest +++ b/media-libs/libtimidity/Manifest @@ -1,5 +1,3 @@ -DIST libtimidity-0.2.4.tar.gz 421572 BLAKE2B b92a87ed0adbf00d74c482e17375fe42adbc86896435ebef858b87952f31f5bd4bcc61993aa03fca07f1f85367f57e227f5828f8cb5ff44561a11e5066e84b1b SHA512 185c4ae58a14f69873869a9586cc23a1f7c9b681c67bb7cc9fe3c4ce51f53600004970af6a0d76d3055d9f2cb82a7fd062699006b0c26f90340fb751cb976930 DIST libtimidity-0.2.6.tar.gz 421927 BLAKE2B 1644608591510e83b3e0fd338ada3bb1ea1846d26f06ec455c58f2bc640a2c8fc182bbcecbcc0465ac0e5da921f26c2494e5aec89014a42b22820bc1f986075c SHA512 e913cdec619001f5deb98c5e50707b1c5c110eab5d14606a6a7385cba1c47844a5143bc848dec17329788c5e1caff2efeeeada9ad37ec9ef704c545bf0e29ee9 -EBUILD libtimidity-0.2.4.ebuild 656 BLAKE2B a7aa688be6f1788d6ae7d81c395267410280e13e2f73fbd07f2cf9377566a45974095212bba990434538cface1e8ffbbc6f071baa774e38272ff4476e6607d59 SHA512 a6083399cb5c29e617ec3b1badd5bcd52f0b0f29b9be7495f696cc300c9701ef239f559587a00c3456b886e751eea4f38592c433b281e762ff20b8dfcfb2f249 -EBUILD libtimidity-0.2.6.ebuild 823 BLAKE2B 35c1b98156bdb7a439c772f892d09dfbb9a010c1db42a1f474e9048f4c3263d03781703c33a22753415b0b47897ed53a74820d180e59a9220c114a414c6fba1d SHA512 ea7635e6fc615e1895ce013003740fdbea860794dd92766f2c1e4105d8980c6e2bc7ab487ee224d9465ddb2faf58a5d9c9ea82e1d6db2bc5fd63ed86889bebc1 +EBUILD libtimidity-0.2.6.ebuild 817 BLAKE2B 752f8bb3647f5a6a04766131ccded968b7c76b2f984d3fc324d019116fa213bf056946acc21df7fef6295755dcc41785b6dc9602bb669b5682c00ec7eddb62a8 SHA512 b59d7ba2d7e87d147d38e2a621a26aa2c247ef09aed7c3bf47f508a41f561a88f46037c39068a8d23fc8183df36d0acb249069ee8a26738653c30ba03548fe4b MISC metadata.xml 334 BLAKE2B dae2cde17ce0b3493754cd7984b7c74a937ac7694cbe125d6137fa00062fe5f8406e311502cc09400b720f0f11d233726c3061f1039408236651ebab1f1b449b SHA512 9b744ea46e81fa07fdbed4bd7b71840eeb1500bc35651e9c8461f91e8041e76567fd5b20472767d2b8ebb16967005ae025bb7a8165b14c2e33ec1a891770d91b diff --git a/media-libs/libtimidity/libtimidity-0.2.4.ebuild b/media-libs/libtimidity/libtimidity-0.2.4.ebuild deleted file mode 100644 index a7f4066567ab..000000000000 --- a/media-libs/libtimidity/libtimidity-0.2.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit multilib-minimal - -DESCRIPTION="MIDI to WAVE converter library" -HOMEPAGE="http://libtimidity.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/2" -KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86" -IUSE="ao debug" - -RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -RESTRICT="test" -DOCS="AUTHORS CHANGES TODO README*" - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --disable-static \ - $(use_enable ao) \ - $(use_enable debug) -} diff --git a/media-libs/libtimidity/libtimidity-0.2.6.ebuild b/media-libs/libtimidity/libtimidity-0.2.6.ebuild index 81f340f11800..d54cd5746268 100644 --- a/media-libs/libtimidity/libtimidity-0.2.6.ebuild +++ b/media-libs/libtimidity/libtimidity-0.2.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/2" -KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86" IUSE="ao debug" RESTRICT="test" diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest index 89059e012227..f88d89a0a46e 100644 --- a/media-libs/libvpx/Manifest +++ b/media-libs/libvpx/Manifest @@ -8,5 +8,5 @@ DIST libvpx-testdata-1.8.2.tar.xz 422945340 BLAKE2B 117c26e77b9cda30ca083382981f DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea EBUILD libvpx-1.7.0-r1.ebuild 4053 BLAKE2B 3787d0620c70a248d22aa66f951eb4b39a86e5ac89af8e76e5e708185695c2aca818050027f5ff4e2e00f51d370ac90246a8c92bcf334e47d7c564273b63f2f9 SHA512 fe8d16a9ba74e96f9017b5b58113c8af86688d5600112382a23f809388590f3c39d7cdffe57c57358e67e2be01fa98ac870a31ef7d797b865b089cf20330a440 EBUILD libvpx-1.8.2.ebuild 3436 BLAKE2B 5c78fa513348cad6d6a1560a72fc4d0c15c746ea6f52843182f3b30d8d71e1f76ee245c95291ba9356a147de1f73f65f5a7a147aa1cd6d861fdaf5831ec7fe62 SHA512 2fc98db752426b5530a3c42b9a4a03a4e38e79d2746d42be3d5ffce155c9aa5e49f6d17a28c2535bb5fbdae8bea31fd90e0e15fa74ee51dface9b90a2357ae1a -EBUILD libvpx-1.9.0.ebuild 3464 BLAKE2B 0c9d235a33c0b764ebf7c5dac44cf78083d81d622ea6c939c897360850ec34fd0e46b24994d1a68e5daf7c1f89edcfb8fa31d3cd9d48d373bbab7900baf04595 SHA512 60595a1d6b225caa1e29ee4a22fd8064cf1e537b3610e1a016052c9fd4c1da2a603b7acb183ccf83ff23ef716ad052b8f88a2a9cc7aa11feca7eddf9070936c5 +EBUILD libvpx-1.9.0.ebuild 3588 BLAKE2B 68be1ad2b8b07d1be985be6de43808084460bdd5b46cf40400900f69e070e1e139731f2a29b242785e75fe3e61f6a728e8fb0c4e36ae55f66b1b97fbd73215ab SHA512 1a2ed43e8a0b45dfd97b08ed90a7b217cb1b747991d1f3b8ffc51411e3cc2a1cc36b00038068f747b5708de025fe637f2e5875fc379a6f41cd4bfb859fe266d2 MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9 diff --git a/media-libs/libvpx/libvpx-1.9.0.ebuild b/media-libs/libvpx/libvpx-1.9.0.ebuild index 7505ae66f662..7263b998acd0 100644 --- a/media-libs/libvpx/libvpx-1.9.0.ebuild +++ b/media-libs/libvpx/libvpx-1.9.0.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="BSD" SLOT="0/6" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="doc +highbitdepth postproc static-libs svc test +threads" REQUIRED_USE="test? ( threads )" @@ -104,7 +104,9 @@ multilib_src_configure() { multilib_src_compile() { # build verbose by default and do not build examples that will not be installed - emake verbose=yes GEN_EXAMPLES= + # disable stripping of debug info, bug #752057 + # (only works as long as upstream does not use non-gnu strip) + emake verbose=yes GEN_EXAMPLES= HAVE_GNU_STRIP=no } multilib_src_test() { diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest index b994344bbcaa..80c5b3da4a6d 100644 --- a/media-libs/libwmf/Manifest +++ b/media-libs/libwmf/Manifest @@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5 -EBUILD libwmf-0.2.8.4-r7.ebuild 2538 BLAKE2B 6238c48b74c5587d76dd3c964cd09db51927b7926f54602eefe3024cf9e4b37ae8b340bffbbcc892b5c6df12e92f169c71135acea2b1aa3acc6ae483159bc7f2 SHA512 f6d87a3804809e2414c9ced23ee9d469df9be3c3a4dec15ebcbdeba93c84ab3d8f550f33e0176882a8f53e7159d2b382a7edc5d6d9f91d6484c7205a1397da85 +EBUILD libwmf-0.2.8.4-r8.ebuild 2534 BLAKE2B 22f478389050d29484c2587a46e365eb858c15d9128909b239c158307444102f3a4df480a6af07bbaa4118826509e550c7cf1bd9697e2a98952255c51f35b420 SHA512 664c24ddca51f60c01a457c4393f18c8fbc793fa6e147cf77e3c118579a9d1eed125744b1f957c632a3be82fb2d7bfceaf073a20f7ba9ce1c636910b5d32c799 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild deleted file mode 100644 index 63ddb5e7ef52..000000000000 --- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome2-utils - -DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)" -HOMEPAGE="https://wvware.sourceforge.net/" -SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc expat X" - -RDEPEND="app-text/ghostscript-gpl - media-fonts/urw-fonts - media-libs/freetype:2= - media-libs/libpng:0= - sys-libs/zlib:= - x11-libs/gdk-pixbuf:2[X?] - virtual/jpeg:0= - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2:2= ) - X? ( x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" "TODO" ) - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch - "${FILESDIR}"/${P}-CVE-2015-4695.patch - "${FILESDIR}"/${P}-CVE-2015-4696.patch - "${FILESDIR}"/${P}-gdk-pixbuf.patch - "${FILESDIR}"/${P}-intoverflow.patch - "${FILESDIR}"/${P}-libpng-1.5.patch - "${FILESDIR}"/${P}-pngfix.patch - "${FILESDIR}"/${P}-use-freetype2-pkg-config.patch - "${FILESDIR}"/${P}-use-system-fonts.patch - ) - -src_prepare() { - default - - # Fixes QA warning "This package has a configure.in file which has long been deprecated" - # Since there is already a configure.ac, we don't need the deprecated configure.in - rm configure.in || die - - if ! use doc ; then - sed -i -e 's:doc::' Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - # Support for GD is disabled, since it's never linked, even, when enabled - # See https://bugs.gentoo.org/268161 - local myeconfargs=( - --disable-gd - --disable-static - $(use_enable debug) - $(use_with expat) - $(use_with !expat libxml2) - $(use_with X x) - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} - --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-freetype - --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap - --with-jpeg - --with-layers - --with-png - --with-sys-gd - --with-zlib - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # address parallel build issue, bug 677566 - MAKEOPTS=-j1 - - default -} - -pkg_preinst() { - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild new file mode 100644 index 000000000000..c26a907b2c09 --- /dev/null +++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools gnome2-utils + +DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)" +HOMEPAGE="https://wvware.sourceforge.net/" +SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc expat X" + +RDEPEND="app-text/ghostscript-gpl + media-fonts/urw-fonts + media-libs/freetype:2= + media-libs/libpng:0= + sys-libs/zlib:= + x11-libs/gdk-pixbuf:2 + virtual/jpeg:0= + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2:2= ) + X? ( x11-libs/libX11 + x11-libs/libXt + x11-libs/libXpm )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" "TODO" ) + +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch + "${FILESDIR}"/${P}-CVE-2015-4695.patch + "${FILESDIR}"/${P}-CVE-2015-4696.patch + "${FILESDIR}"/${P}-gdk-pixbuf.patch + "${FILESDIR}"/${P}-intoverflow.patch + "${FILESDIR}"/${P}-libpng-1.5.patch + "${FILESDIR}"/${P}-pngfix.patch + "${FILESDIR}"/${P}-use-freetype2-pkg-config.patch + "${FILESDIR}"/${P}-use-system-fonts.patch + ) + +src_prepare() { + default + + # Fixes QA warning "This package has a configure.in file which has long been deprecated" + # Since there is already a configure.ac, we don't need the deprecated configure.in + rm configure.in || die + + if ! use doc ; then + sed -i -e 's:doc::' Makefile.am || die + fi + + eautoreconf +} + +src_configure() { + # Support for GD is disabled, since it's never linked, even, when enabled + # See https://bugs.gentoo.org/268161 + local myeconfargs=( + --disable-gd + --disable-static + $(use_enable debug) + $(use_with expat) + $(use_with !expat libxml2) + $(use_with X x) + --with-docdir="${EPREFIX}"/usr/share/doc/${PF} + --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts + --with-freetype + --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts + --with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap + --with-jpeg + --with-layers + --with-png + --with-sys-gd + --with-zlib + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + # address parallel build issue, bug 677566 + MAKEOPTS=-j1 + + default +} + +pkg_preinst() { + gnome2_gdk_pixbuf_savelist +} + +pkg_postinst() { + gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + gnome2_gdk_pixbuf_update +} diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest index 1bd00c4ec2ce..92334016edc6 100644 --- a/media-libs/libxmi/Manifest +++ b/media-libs/libxmi/Manifest @@ -1,3 +1,3 @@ DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262 -EBUILD libxmi-1.3.ebuild 615 BLAKE2B baafae274449c9a715035f04cf6da410180332e7475eed20b99dd7ed3c98e075bf3ad45191e004a5fdd2d982fdf1db0e35791a9662ef18b6488d0d148c385f8c SHA512 d4a77965b934ae95d70b87da86b024aac5dcca94344fc7de99e5867786b723723517ad4b3532459821789f66f91e490790b6c55d40427c6eb1b3e53437e2c092 +EBUILD libxmi-1.3.ebuild 613 BLAKE2B cf6349bea018107efaafd6f072f174bcd8d032dc0e02395f124b6d07f099f00eed98457b7c9d97c0dcb21ddfd68617a29651d6863c2e99614972f63d04bba8dc SHA512 f78ff716061df535fb3fac90f7ea773fce4e5a932062d253b5f9260bcae86ea5147a557e9132c07393064cde9df361fca0ef95b63d6652120028bc6581e96a2a MISC metadata.xml 1174 BLAKE2B 9dae17714124bc3fbb5625b58a78353eb64aa9131e541943819b35ec6231fc1009d11bf90219fab08e34187eff0c0902d5e6a2a6ad64e586bc8e7cb464edef62 SHA512 0fc60c658a5e56b8d6d49c0251b2678c07d19e9a32ad59f08ae98120f28b412642030692f8c51bef994c14b4d01d9979f3286b22cd417c8a1b1211a27355b03a diff --git a/media-libs/libxmi/libxmi-1.3.ebuild b/media-libs/libxmi/libxmi-1.3.ebuild index 09f1866b72ca..86bded44f556 100644 --- a/media-libs/libxmi/libxmi-1.3.ebuild +++ b/media-libs/libxmi/libxmi-1.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" SLOT="0" LICENSE="GPL-2" -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 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" DEPEND="!<=media-libs/plotutils-2.6" diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest index a64898045018..760ad9bb0177 100644 --- a/media-libs/lilv/Manifest +++ b/media-libs/lilv/Manifest @@ -1,5 +1,3 @@ -DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad -DIST lilv-0.24.8.tar.bz2 545545 BLAKE2B 606beb68d6e277dfea85e3d2e27b58adf22f0a47a91583e4f1cd85649f237e75fac9b397eb07be69b5a278d02346d58bdf35c4c8fb248e4899a4fc9b05288c23 SHA512 f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192 -EBUILD lilv-0.24.6-r2.ebuild 1700 BLAKE2B cb5acdff832430616f13aec5b2396166d6480ef0c01c3e5b0595100cb32c5af06100bdfa9d40c083987367db579eb259b58a38d36da3e15bcbf855aa8f3cb663 SHA512 9bc6eeb31effdb6609052075b5991ec602c94ca8a0b4a0d29ff8508067716aa6140be9729ce5251808d1cf0ebe86a729153ec92163b7eb9137b55bdde561057c -EBUILD lilv-0.24.8-r1.ebuild 1705 BLAKE2B ee1a668f0bc4f3bff412a50afa672a356f931f40bf0c6a974165b41d1ba225d0a6f25c67d8bd153ed69b5f4aab7e21da9326931fdc8801b57d0a84eebb8158ef SHA512 817640469c17b68d44f77d2602cba29ebf3287b83c0dd66b994322873e605c34f1ffccc2cf6945117808521d233ec44736c26ab7bc2853fc534261ff4124249b +DIST lilv-0.24.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf +EBUILD lilv-0.24.10.ebuild 1667 BLAKE2B 9c6ebef150f1927f98b95a0976dfdf8a14cb1ecb00e8f5c3b310ae80d896a3803a69535eb9ea1be0d148f68eadc5ed689cc01b870b0ac5c7ef8be463c5b988cc SHA512 f152ae9d5acd264b9c0dbd8be22429e13e42a5ca7149004d7d62561eb760ee3bb29e0f73f5308cb01142a568fe20cecb933c9a05f88aea882b5845ba64ca13b4 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce diff --git a/media-libs/lilv/lilv-0.24.10.ebuild b/media-libs/lilv/lilv-0.24.10.ebuild new file mode 100644 index 000000000000..24f31b85a9ec --- /dev/null +++ b/media-libs/lilv/lilv-0.24.10.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE='threads(+)' + +inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal + +DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications" +HOMEPAGE="http://drobilla.net/software/lilv/" +SRC_URI="http://download.drobilla.net/${P}.tar.bz2" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" +IUSE="doc +dyn-manifest static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/serd[${MULTILIB_USEDEP}] + dev-libs/sord[${MULTILIB_USEDEP}] + media-libs/libsndfile + media-libs/lv2[${MULTILIB_USEDEP}] + media-libs/sratom[${MULTILIB_USEDEP}] +" +DEPEND=" + ${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( dev-python/unittest2 ) +" + +src_prepare() { + default + sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die + multilib_copy_sources +} + +multilib_src_configure() { + waf-utils_src_configure \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --no-bash-completion \ + $(multilib_native_usex doc --docs "") \ + $(usex test --test "") \ + $(usex static-libs --static "") \ + $(usex dyn-manifest --dyn-manifest "") +} + +multilib_src_compile() { + ./waf build || die +} + +multilib_src_test() { + ./waf test || die +} + +multilib_src_install() { + waf-utils_src_install +} + +multilib_src_install_all() { + sed -i "/lv2jack/d" utils/lilv.bash_completion + newbashcomp utils/lilv.bash_completion lv2info + + dodir /etc/env.d + echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2" + + python_optimize +} diff --git a/media-libs/lilv/lilv-0.24.6-r2.ebuild b/media-libs/lilv/lilv-0.24.6-r2.ebuild deleted file mode 100644 index bfcd8e3ac70b..000000000000 --- a/media-libs/lilv/lilv-0.24.6-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE='threads(+)' - -inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal - -DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications" -HOMEPAGE="http://drobilla.net/software/lilv/" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" -IUSE="doc +dyn-manifest static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/serd-0.30.0-r1[${MULTILIB_USEDEP}] - >=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}] - media-libs/libsndfile - >=media-libs/lv2-1.16.0[${MULTILIB_USEDEP}] - media-libs/sratom[${MULTILIB_USEDEP}] -" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( app-doc/doxygen ) - test? ( dev-python/unittest2 ) -" - -src_prepare() { - default - sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die - multilib_copy_sources -} - -multilib_src_configure() { - waf-utils_src_configure \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --no-bash-completion \ - $(multilib_native_usex doc --docs "") \ - $(usex test --test "") \ - $(usex static-libs --static "") \ - $(usex dyn-manifest --dyn-manifest "") -} - -multilib_src_compile() { - ./waf build || die -} - -multilib_src_test() { - ./waf test || die -} - -multilib_src_install() { - waf-utils_src_install -} - -multilib_src_install_all() { - sed -i "/lv2jack/d" utils/lilv.bash_completion - newbashcomp utils/lilv.bash_completion lv2info - - dodir /etc/env.d - echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2" - - python_optimize -} diff --git a/media-libs/lilv/lilv-0.24.8-r1.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild deleted file mode 100644 index c22bf170fdce..000000000000 --- a/media-libs/lilv/lilv-0.24.8-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE='threads(+)' - -inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal - -DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications" -HOMEPAGE="http://drobilla.net/software/lilv/" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc +dyn-manifest static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/serd-0.30.0-r1[${MULTILIB_USEDEP}] - >=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}] - media-libs/libsndfile - >=media-libs/lv2-1.16.0[${MULTILIB_USEDEP}] - media-libs/sratom[${MULTILIB_USEDEP}] -" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( app-doc/doxygen ) - test? ( dev-python/unittest2 ) -" - -src_prepare() { - default - sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die - multilib_copy_sources -} - -multilib_src_configure() { - waf-utils_src_configure \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --no-bash-completion \ - $(multilib_native_usex doc --docs "") \ - $(usex test --test "") \ - $(usex static-libs --static "") \ - $(usex dyn-manifest --dyn-manifest "") -} - -multilib_src_compile() { - ./waf build || die -} - -multilib_src_test() { - ./waf test || die -} - -multilib_src_install() { - waf-utils_src_install -} - -multilib_src_install_all() { - sed -i "/lv2jack/d" utils/lilv.bash_completion - newbashcomp utils/lilv.bash_completion lv2info - - dodir /etc/env.d - echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2" - - python_optimize -} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 164a6121010b..2de53c2f36aa 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,8 +1,8 @@ -DIST mesa-20.1.8.tar.xz 12846348 BLAKE2B b31680458100fc4394819a379a14237cfe39befea91f53641dc181d29891cb3e508c45f5ea1b07deee97f6bf04b6d8b2ca9cd8270bf79ab4a524035fbdc58c36 SHA512 519b0e2837982d097c362d974a90c94efd1cdf14505fc43eaa740a23c042bc0c3f04d0edaf6b371966d82667cade6d0c68c92528e1be6c12884b38c67fd064c1 -DIST mesa-20.1.9.tar.xz 12870484 BLAKE2B 01ef2387e7bfc174b40b530f2ae9ea02dc288bd171d3caedc470808502c21e3949609e94aeb1454a8001fb74c8be9684777fa7d3cc3da2c22758599a09896943 SHA512 0fb8ceff3c91ad2076efb0b2ac7e95d2d72ff1df955eb8fedf712ceaa7f49184eae9958072edd872f5c38adbaeb867988f67627b33da8b208706f69325d7e260 -DIST mesa-20.2.0.tar.xz 13675596 BLAKE2B d1c6b4ac631446a35eb916d0b2ddbe2a8d75429268b1598b35f5776953b560ac08917bde07e32cf4ca33aa4e6a2713d46dc6de86d717127fbb950f0de2aa6325 SHA512 3dd7def04ba4f196be8fd59999285febb10366e89d6e649c518b436b732c62d3f1bd235fc470de7fda4b4cc09a1baaadca4222dcdc2449225d789b151cea69d7 -EBUILD mesa-20.1.8.ebuild 14701 BLAKE2B 0cb3259a8b9f6621024c9ad3c5aae4d84cb3cc4d63f3142521554675ea9753db7b525b54049429d35abb1cc221a7269e60b80e27ed9a01b03ac070977b61a167 SHA512 96b4eaee573bca46b5c51ad438ba5fd843372dc93b97507d3edd0d230c1a7086e3f386037ec8d97ed524d25f3ffa2d603abc4387dfac3ab32fab13317b1994a8 -EBUILD mesa-20.1.9.ebuild 14429 BLAKE2B 48203f756b3f2fb10b07ed8efbd0e5141a593caadb68799d055c416d5dbef6a550d79a53fb0e9b0f11aebade3ba769a1badfbb1cf80b8ff28df9ae475b45753a SHA512 d355a6571329e6d7c673c0e949591968d8e5baa190ecae7d6858ebd92d294db6da7f3d8a683f482b5a004fe69c303904731a8cd8f1b027c46477843ffb99024d -EBUILD mesa-20.2.0.ebuild 14711 BLAKE2B 473089ec5a66bf30e4473590614ef8a29a209a3771a6bdab13e38beadabcf667c82134e2846862a2a810d24ddca321bc4c1efc0aaf2fa733aceb8da8b5e1e5a4 SHA512 82f90a9076a67f54167881b61c32675f5572a6c1b2c0ee897382c0954005f72a269f223a4559049056cc67bc43e2060ad28f1e97f2e09b712219ba7fe0904478 -EBUILD mesa-9999.ebuild 14711 BLAKE2B 473089ec5a66bf30e4473590614ef8a29a209a3771a6bdab13e38beadabcf667c82134e2846862a2a810d24ddca321bc4c1efc0aaf2fa733aceb8da8b5e1e5a4 SHA512 82f90a9076a67f54167881b61c32675f5572a6c1b2c0ee897382c0954005f72a269f223a4559049056cc67bc43e2060ad28f1e97f2e09b712219ba7fe0904478 -MISC metadata.xml 1953 BLAKE2B 809b2ae05dadf1ef3b78c8c0353032c77aaba205530a51e6e099170d186bc9fdaf289b135e68984aef8f71f69970f9e63a38de816f04199dc2e9965e71e940d0 SHA512 09b322501feafc80de4b81c7a30e1d6f4565247069dc7d80218684382a68b285ca1b80733b6f3126bd15c777cc5a896062686f06fc1822039595b3fed9bcb9e6 +DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a +DIST mesa-20.2.3.tar.xz 13844212 BLAKE2B 53eff6d43d2e05dad051c30de624bd8d872e87d6f1d2f32b631b1c4fea657b8dd9b2d5b9702bdd9138b0d9d6c78b74d737162d3f1c76ca969ce6d9ae4f561eda SHA512 e55b57523f6fdb1199586538c119c3e7c81d1a7af86be14c90d140c514f65e54ac0c56bd341686d04b770b80d3ddd92188ee17b3bc23f243aed10c25de7e19a6 +DIST mesa-20.3.0-rc2.tar.xz 14085024 BLAKE2B c87e3e48ed1dfec2da4fa6bbb549fc925d806f8681e8dc1b3fc3b54eec4864402bb34009a95998c1fc818ddb7d1df2d51347df3d20ec9e4364245ae4f750f16d SHA512 1d94100550b60a0dc6e984d898114b11b8656e2954e946478a2732cec678d1e6a0f07bb5bcdc856facf7e274aea52cfc2b4228c064eadc7bbc00147c6b17cc0e +EBUILD mesa-20.1.10.ebuild 14439 BLAKE2B 44180101e4e4c6692661cae16822ed29e292e86821df1361e733839bceeb8353883e5aff3893a91f5e09936aa8e5c0d2d14f8871f558c24590e61b78c6e8716a SHA512 d4474ce10d3cab18cc75ff5c0b9cfe2d05e0987e9c20a2a01ce2cf9873fac0b8e259fad1196327cf3426406e0a338ed326ff9309439af93403f458b104f0fde7 +EBUILD mesa-20.2.3.ebuild 14709 BLAKE2B f32b8f3f99197ad5e7a16393929ddccb1b6fb650dcf413587a74a497531b94ea7c3ba2f0490a32b37729e33271d100e52fa480c8b6422742a16e9ddb9d756911 SHA512 5223621eaf05a7f2b7500b8f31c1b0cf0a68b729c00a57527e741eb353aa57c65e1abffeb552bedf70012338beb7d49efdadd4847626cfbabbc89f59938dc5f2 +EBUILD mesa-20.3.0_rc2.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c +EBUILD mesa-9999.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c +MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a diff --git a/media-libs/mesa/mesa-20.1.10.ebuild b/media-libs/mesa/mesa-20.1.10.ebuild new file mode 100644 index 000000000000..f83e05fef141 --- /dev/null +++ b/media-libs/mesa/mesa-20.1.10.ebuild @@ -0,0 +1,543 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit llvm meson multilib-minimal python-any-r1 linux-info + +OPENGL_DIR="xorg-x11" + +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 ~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} freedreno i915 i965 intel iris lima nouveau panfrost 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 + lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa xvmc +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 ) + vulkan? ( dri3 + 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_vc4? ( gallium ) + video_cards_virgl? ( gallium ) + video_cards_vivante? ( gallium gbm ) + video_cards_vmware? ( gallium ) + xa? ( X ) + xvmc? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" +RDEPEND=" + !app-eselect/eselect-mesa + >=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.15.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/libXdamage-1.1.4-r1:=[${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}] + ) + 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="10" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:10[${MULTILIB_USEDEP}] + sys-devel/llvm:9[${MULTILIB_USEDEP}] + ) + =dev-python/mako-0.8.0[\${PYTHON_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_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" + 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 +} + +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 + CONFIG_CHECK="~CHECKPOINT_RESTORE" + 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 + + emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless ) + + if use gallium; then + emesonargs+=( + $(meson_use llvm) + $(meson_use lm-sensors lmsensors) + $(meson_use 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_use vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=false) + fi + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=false) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=false) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_use xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=false) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable video_cards_lima lima + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + + # 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_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_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + fi + + if use gallium; then + gallium_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) + else + dri_driver_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dglvnd=true + -Dshared-glapi=true + $(meson_use dri3) + $(meson_use egl) + $(meson_use gbm) + $(meson_use gles1) + $(meson_use gles2) + $(meson_use selinux) + $(meson_use zstd) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + $(meson_use vulkan vulkan-device-select-layer) + $(meson_use vulkan-overlay vulkan-overlay-layer) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs +} + +multilib_src_test() { + meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed" +} + +# $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-20.1.8.ebuild b/media-libs/mesa/mesa-20.1.8.ebuild deleted file mode 100644 index 934ec32ce41d..000000000000 --- a/media-libs/mesa/mesa-20.1.8.ebuild +++ /dev/null @@ -1,557 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit llvm meson multilib-minimal python-any-r1 linux-info - -OPENGL_DIR="xorg-x11" - -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 ~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} freedreno i915 i965 intel iris lima nouveau panfrost 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 +libglvnd +llvm - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa xvmc +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 ) - vulkan? ( dri3 - 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_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) - xa? ( X ) - xvmc? ( X ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" -RDEPEND=" - !app-eselect/eselect-mesa - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - libglvnd? ( - >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) - 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.15.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/libXdamage-1.1.4-r1:=[${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}] - ) - 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="10" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] - sys-devel/llvm:9[${MULTILIB_USEDEP}] - ) - =dev-python/mako-0.8.0[\${PYTHON_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 - libglvnd? ( 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_i965 && - ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" - 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 -} - -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 - CONFIG_CHECK="~CHECKPOINT_RESTORE" - 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 - - emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless ) - - if use gallium; then - emesonargs+=( - $(meson_use llvm) - $(meson_use lm-sensors lmsensors) - $(meson_use 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_use vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=false) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=false) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=false) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_use xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=false) - fi - - if use video_cards_freedreno || - use video_cards_lima || - use video_cards_panfrost || - use video_cards_vc4 || - use video_cards_vivante; then - gallium_enable -- kmsro - fi - - gallium_enable video_cards_lima lima - gallium_enable video_cards_panfrost panfrost - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - - # 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_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_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) - -Dshared-glapi=true - $(meson_use dri3) - $(meson_use egl) - $(meson_use gbm) - $(meson_use gles1) - $(meson_use gles2) - $(meson_use libglvnd glvnd) - $(meson_use selinux) - $(meson_use zstd) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 -} - -pkg_postinst() { - if ! use libglvnd; then - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - fi -} - -# $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-20.1.9.ebuild b/media-libs/mesa/mesa-20.1.9.ebuild deleted file mode 100644 index 2d132350da8f..000000000000 --- a/media-libs/mesa/mesa-20.1.9.ebuild +++ /dev/null @@ -1,543 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit llvm meson multilib-minimal python-any-r1 linux-info - -OPENGL_DIR="xorg-x11" - -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 ~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} freedreno i915 i965 intel iris lima nouveau panfrost 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 - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa xvmc +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 ) - vulkan? ( dri3 - 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_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) - xa? ( X ) - xvmc? ( X ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" -RDEPEND=" - !app-eselect/eselect-mesa - >=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.15.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/libXdamage-1.1.4-r1:=[${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}] - ) - 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="10" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] - sys-devel/llvm:9[${MULTILIB_USEDEP}] - ) - =dev-python/mako-0.8.0[\${PYTHON_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_i965 && - ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" - 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 -} - -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 - CONFIG_CHECK="~CHECKPOINT_RESTORE" - 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 - - emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless ) - - if use gallium; then - emesonargs+=( - $(meson_use llvm) - $(meson_use lm-sensors lmsensors) - $(meson_use 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_use vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=false) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=false) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=false) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_use xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=false) - fi - - if use video_cards_freedreno || - use video_cards_lima || - use video_cards_panfrost || - use video_cards_vc4 || - use video_cards_vivante; then - gallium_enable -- kmsro - fi - - gallium_enable video_cards_lima lima - gallium_enable video_cards_panfrost panfrost - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - - # 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_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_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) - -Dglvnd=enabled - -Dshared-glapi=true - $(meson_use dri3) - $(meson_use egl) - $(meson_use gbm) - $(meson_use gles1) - $(meson_use gles2) - $(meson_use selinux) - $(meson_use zstd) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -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-20.2.0.ebuild b/media-libs/mesa/mesa-20.2.0.ebuild deleted file mode 100644 index 7e2bd851871f..000000000000 --- a/media-libs/mesa/mesa-20.2.0.ebuild +++ /dev/null @@ -1,551 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit llvm meson multilib-minimal python-any-r1 linux-info - -OPENGL_DIR="xorg-x11" - -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 ~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} 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 - 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 ) - vulkan? ( dri3 - 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 ) - xa? ( X ) - xvmc? ( X ) - zink? ( gallium vulkan ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" -RDEPEND=" - !app-eselect/eselect-mesa - >=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.15.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/libXdamage-1.1.4-r1:=[${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="10" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] - sys-devel/llvm:9[${MULTILIB_USEDEP}] - ) - =dev-python/mako-0.8.0[\${PYTHON_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_i965 && - ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" - 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 -} - -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 - CONFIG_CHECK="~CHECKPOINT_RESTORE" - 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" - [[ -n $platforms ]] && 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 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_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_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) - -Dglvnd=true - -Dshared-glapi=true - $(meson_feature dri3) - $(meson_feature egl) - $(meson_feature gbm) - $(meson_feature gles1) - $(meson_feature gles2) - $(meson_use selinux) - $(meson_feature zstd) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -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-20.2.3.ebuild b/media-libs/mesa/mesa-20.2.3.ebuild new file mode 100644 index 000000000000..e1622cc2b02e --- /dev/null +++ b/media-libs/mesa/mesa-20.2.3.ebuild @@ -0,0 +1,551 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit llvm meson multilib-minimal python-any-r1 linux-info + +OPENGL_DIR="xorg-x11" + +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 ~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} 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 + 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 ) + vulkan? ( dri3 + 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 ) + xa? ( X ) + xvmc? ( X ) + zink? ( gallium vulkan ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" +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.15.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/libXdamage-1.1.4-r1:=[${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="11" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:11[${MULTILIB_USEDEP}] + sys-devel/llvm:10[${MULTILIB_USEDEP}] + sys-devel/llvm:9[${MULTILIB_USEDEP}] + ) + =dev-python/mako-0.8.0[\${PYTHON_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_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" + 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 +} + +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 + CONFIG_CHECK="~CHECKPOINT_RESTORE" + 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" + [[ -n $platforms ]] && 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 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_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_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + fi + + if use gallium; then + gallium_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) + else + dri_driver_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dglvnd=true + -Dshared-glapi=true + $(meson_feature dri3) + $(meson_feature egl) + $(meson_feature gbm) + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_use selinux) + $(meson_feature zstd) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + $(meson_use vulkan vulkan-device-select-layer) + $(meson_use vulkan-overlay vulkan-overlay-layer) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs +} + +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-20.3.0_rc2.ebuild b/media-libs/mesa/mesa-20.3.0_rc2.ebuild new file mode 100644 index 000000000000..1da56517de7e --- /dev/null +++ b/media-libs/mesa/mesa-20.3.0_rc2.ebuild @@ -0,0 +1,553 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit llvm meson multilib-minimal python-any-r1 linux-info + +OPENGL_DIR="xorg-x11" + +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 ~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} 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 + 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 ) + vulkan? ( dri3 + 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 ) + xa? ( X ) + xvmc? ( X ) + zink? ( gallium vulkan ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" +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.15.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/libXdamage-1.1.4-r1:=[${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="11" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:11[${MULTILIB_USEDEP}] + sys-devel/llvm:10[${MULTILIB_USEDEP}] + sys-devel/llvm:9[${MULTILIB_USEDEP}] + ) + =dev-python/mako-0.8.0[\${PYTHON_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_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" + 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 +} + +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 + CONFIG_CHECK="~CHECKPOINT_RESTORE" + 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" + [[ -n $platforms ]] && 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 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_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_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + fi + + if use gallium; then + gallium_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) + else + dri_driver_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dglvnd=true + -Dshared-glapi=true + $(meson_feature dri3) + $(meson_feature egl) + $(meson_feature gbm) + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_use selinux) + $(meson_feature zstd) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + $(meson_use vulkan vulkan-device-select-layer) + $(meson_use vulkan-overlay vulkan-overlay-layer) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs +} + +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 7e2bd851871f..1da56517de7e 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit llvm meson multilib-minimal python-any-r1 linux-info @@ -74,7 +74,6 @@ REQUIRED_USE=" LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" RDEPEND=" - !app-eselect/eselect-mesa >=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}] @@ -143,9 +142,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="10" +LLVM_MAX_SLOT="11" LLVM_DEPSTR=" || ( + sys-devel/llvm:11[${MULTILIB_USEDEP}] sys-devel/llvm:10[${MULTILIB_USEDEP}] sys-devel/llvm:9[${MULTILIB_USEDEP}] ) @@ -258,8 +258,9 @@ pkg_pretend() { if use vulkan; then if ! use video_cards_i965 && ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" + ! use video_cards_radeonsi && + ! use video_cards_v3d; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d" fi fi @@ -472,6 +473,7 @@ multilib_src_configure() { 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 if use gallium; then @@ -524,7 +526,7 @@ multilib_src_install_all() { } multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 + meson_src_test -t 100 } # $1 - VIDEO_CARDS flag (check skipped for "--") diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml index 8aecc5f66080..a2a3def69e27 100644 --- a/media-libs/mesa/metadata.xml +++ b/media-libs/mesa/metadata.xml @@ -14,7 +14,6 @@ Enable the Graphics Buffer Manager for EGL on KMS. Enable GLESv1 support. Enable GLESv2 support. - Use libglvnd for dispatch. Enable LLVM backend for Gallium3D. Enable Gallium HUD lm-sensors support. Enable the Clover Gallium OpenCL state tracker. diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index fb79e7a93b19..dbda26ce8792 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,14 +1,5 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160 -AUX mlt-6.20.0-crash-in-composite.patch 1261 BLAKE2B 80a5b75f75dde7d5b3f9a502290d3cdf3c41d0a31109aef1ca24ca90c07cd0f640c1895b2dbfcc08bab37a07d49ac16fe0da9ccfa71e0288d2d92329a6a2b4c2 SHA512 203e291f91cbbcf4f320ac84f95a814ea84c2c97c3efe085dcfdc0cc33a983d2292d77081537536837a00f48bd0dd5ecb3848dc5ba7ddc523562276f41f3c2d4 -AUX mlt-6.20.0-crash-w-unsupported-preview-scale.patch 1679 BLAKE2B 7626434796d419f2ffd2a83adb546101a04e7a3d3569cd855dc1795283c909a96d31263c2bebbb93ae63c8eaad5d4da23101580ce02d08b02a95cfe0401156ec SHA512 7948610f2f9fc1ce3b12a053a7b69e17ac2b3c63af48bfd915eb7a10801cf049e4c5845e47fd1ccc18d81deafe57fd69b8871ac0f34d5535fa9876cf79a4528a -AUX mlt-6.20.0-musl-locale.patch 961 BLAKE2B 8d129581589ddf103ef1588cb184b81ceb5622f75c065e8f0c970dcb331dfaea4a8c6227c29d18d1a2e50d524d9ef317f5e4b11c379dd3c9caa23f06093a1586 SHA512 a010d41ccd777782ef740896ff35464f7e7aea979d2d4425638ec40bdaff02b785506b8e6561d2e820425f30d7933c638274133800bef0b15df9f0d3060487c1 -AUX mlt-6.20.0-no-gtk2.patch 13767 BLAKE2B 8921d0e394fc4eb61ec3a642b6125cfb0ec87d024b207a3beaff46ff4abfe1594d14fca248728400098aa1b5ab2e8e1dc6a95cdca3b7d7acfea11828fab92a6d SHA512 ea62120f92ff7af1cac78959dd225c723bf810fef8fb31ab88e0651dbb8bb2f1ee91dae5a5fe697529203bdc84d165a738699a2de9e83634392437bb125c9742 -AUX mlt-6.20.0-nullpointer-crash.patch 873 BLAKE2B 99b967c4725352b52f5db9598b80c1f441b720ba0a26697785e04cfabd140cecc99e357176fe339c7203e4931c9a069494ab6a5bee1baebdd7a7d1c691b060ca SHA512 e0e39776ce80534299df82e3c4ada584b727029d11dd77d93d36c6cf605546ffb32184fca549dd2243db489d6c27ecf1a69990f463654a580ec8e0bdc8c131fd -AUX mlt-6.20.0-opencv-double-del-crash.patch 841 BLAKE2B 2527a09828578156815c6c644b59f01d7bc02d9eba978f58a75e26a253375b098727e578270cf24090c38ebebce2be7d61a7245766d1c2ed37f86cf5b386d827 SHA512 2019351d82975f3eb94192d6318f33eff88570a38169bf2cbc32e822ce7f6c80e3051b0d6439b75f4a58e1108f0caef8e150bb3c876adb0cb3a663aa7e104fe5 -AUX mlt-6.20.0-opencv4.patch 1631 BLAKE2B 0b132e30f992bf0d9e19eb1d3946436c981e57c750ad49cac556436c3b74909d22cbb7a3b64071d3804548ab637d4afd69545d4a4a38b764b793bcc15cb561ba SHA512 fce81528abf733e4228fdecb983f0a888ec2712de5723c623f6a1ed083065b151e3f0fb009d488b6d60b577ddb0489ccd35c798c49e9e03f6faf511f40206ef6 -AUX mlt-6.20.0-qt-5.15.patch 1571 BLAKE2B a4d5c1a009399ac0ee4d85fdc8f9f603e69ded9d77320083511a46e1c1a2c7adfa1940a97ecfb6d2ad70dfa624b844260cb0f0249fca861ab25aed8b265e9333 SHA512 2eb8934ba6bca513f7851189428c997380da09b36ea8e27bc4b1a3f69c0feebd8b5d53dbf34658693261cae13dd69e60526b26e64ee56605b3972a79c561e295 -DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B 50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac SHA512 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3 +AUX mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch 1093 BLAKE2B 12bf9abd2053868945df5e185a2a111118bfe886d3987070f75683be2f5c00bb5b6325119a99c2ed9f20e8f91b9dda8e90a712e05170c435bfc04cfa02d12306 SHA512 4869580800b3de0e68669d3ad6c4d7ae1c994d2cef7de444a130625c3ec806d9691973b0bc921a52c39361e35f11d319377a3330fbbecc7cf51afb62f1fcd99b DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B 3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb SHA512 c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74 -EBUILD mlt-6.20.0-r2.ebuild 5127 BLAKE2B e7800bc14ab226c976a6f4e0a1ce6e3bd70243eef28d8a478a9791089881725794223ea28cbeaefc7802c2e6b950575e2c74dd1205d4383ff43bc521bdd8a026 SHA512 75713657fd2c261c297716b612d8ef6027fe5eeade177d8b54c2fef7dff821e711c3c5827fa7934120fb4bc4f81a3ac440c90b96669285b8f6de43e079742182 -EBUILD mlt-6.22.1.ebuild 4749 BLAKE2B f66d4b97655be00eeeee4835b8bc8e0cd88074db523850978a85f95d39b8ec60d2871eba5584baea26777c0c2475f310dac9244b769c1b7606aa42167a1a7ff9 SHA512 1eac5c1d1a526d627ea7bb86de9c5b11001268288e0c429744d7d4372fc56c73a551aa5c001408bbc0a778cf38f6012604403352237bbbf87fbaa8450ec08e93 +EBUILD mlt-6.22.1-r1.ebuild 4813 BLAKE2B ae3cab9430d6ee2d72321b284158a7805e4dbda8b01be772b95648f0ca4e691666ac09ae4f99de129ff6a61c7d4fbb65e542e37bc14cbe4837c56c403c1d2ddf SHA512 2a143c797bf64d899895459c6abf69e4f36eae499cc9738d64a0907b77ed1933c63b97d6633ee1d483f2e36191989ffd5ce7381ee9e5911d79aa06ddb844b936 MISC metadata.xml 1539 BLAKE2B ce738031471a08f5d3969af421d214c79b8c8581daa3a40cd6bc0d04d5884d7c5c64551e18f3262ca0539663d63ea1a35e85e57bd5861816eea5c295c2430517 SHA512 2b9b1cdc067811cee0bb3a242fe3985217e223d8d2defeae9161fb187e50934e765c03d6899f121ad4a6fa86fcbdd01392ae875b65331efe2ab64f0c4f1ced61 diff --git a/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch b/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch deleted file mode 100644 index e5ae5f01c9d0..000000000000 --- a/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 46a226217d8ec5bbf66a4fa3da138fd6924dd13b Mon Sep 17 00:00:00 2001 -From: Dan Dennedy -Date: Wed, 25 Mar 2020 16:06:34 -0700 -Subject: [PATCH] fix #535 crash in composite when PGM luma fails to load - ---- - src/modules/core/transition_composite.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c -index e6d078e36..24a0d30c7 100644 ---- a/src/modules/core/transition_composite.c -+++ b/src/modules/core/transition_composite.c -@@ -1,6 +1,6 @@ - /* - * transition_composite.c -- compose one image over another using alpha channel -- * Copyright (C) 2003-2019 Meltytech, LLC -+ * Copyright (C) 2003-2020 Meltytech, LLC - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -697,10 +697,10 @@ static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int w - { - luma_width = 0; - luma_height = 0; -- } -+ } - } - } -- if ( luma_width > 0 && luma_height > 0 ) -+ if ( orig_bitmap && luma_width > 0 && luma_height > 0 ) - { - // Scale luma map - luma_bitmap = mlt_pool_alloc( width * height * sizeof( uint16_t ) ); diff --git a/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch b/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch deleted file mode 100644 index 25057b3c1aeb..000000000000 --- a/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dc585bfa5765db418923e7b4802c03bc57733111 Mon Sep 17 00:00:00 2001 -From: Dan Dennedy -Date: Mon, 2 Mar 2020 14:02:26 -0800 -Subject: [PATCH] fix crash with filters not supporting preview scale - ---- - src/modules/frei0r/transition_frei0r.c | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/src/modules/frei0r/transition_frei0r.c b/src/modules/frei0r/transition_frei0r.c -index b69011719..f11266b75 100644 ---- a/src/modules/frei0r/transition_frei0r.c -+++ b/src/modules/frei0r/transition_frei0r.c -@@ -1,7 +1,7 @@ - /* - * transition_frei0r.c -- frei0r transition - * Copyright (c) 2008 Marco Gittler -- * Copyright (C) 2009-2019 Meltytech, LLC -+ * Copyright (C) 2009-2020 Meltytech, LLC - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -67,9 +67,25 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f - } - else - { -+ mlt_image_format b_format = *format; -+ int b_width = *width; -+ int b_height = *height; -+ - error = mlt_frame_get_image( a_frame, &images[0], format, width, height, 0 ); - if ( error ) return error; - -+ if (*width != b_width || *height != b_height) { -+ if (invert) { -+ *image = images[0]; -+ } else { -+ *image = images[1]; -+ *format = b_format; -+ *width = b_width; -+ *height = b_height; -+ } -+ return error; -+ } -+ - mlt_position position = mlt_transition_get_position( transition, a_frame ); - mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( transition ) ); - double time = (double) position / mlt_profile_fps( profile ); diff --git a/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch deleted file mode 100644 index ed206108d2ed..000000000000 --- a/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d02611584d4b2f693469c72272fe369413139394 Mon Sep 17 00:00:00 2001 -From: Carlo Landmeter -Date: Sun, 6 Nov 2016 00:45:44 +0100 -Subject: testing/mlt: new aport - ---- - testing/mlt/musl-locale.patch | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - create mode 100644 testing/mlt/musl-locale.patch - -(limited to 'testing/mlt/musl-locale.patch') - -diff --git a/testing/mlt/musl-locale.patch b/testing/mlt/musl-locale.patch -new file mode 100644 -index 0000000000..030bb781d1 ---- /dev/null -+++ b/testing/mlt/musl-locale.patch -@@ -0,0 +1,13 @@ -+--- ./src/framework/mlt_property.h.orig -++++ ./src/framework/mlt_property.h -+@@ -30,8 +30,8 @@ -+ #include -+ #endif -+ -+-#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) -+-#include -++#if defined(__linux__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) -++#include -+ #else -+ typedef char* locale_t; -+ #endif --- -cgit v1.2.1 - diff --git a/media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch b/media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch deleted file mode 100644 index 5031ab374f6b..000000000000 --- a/media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch +++ /dev/null @@ -1,421 +0,0 @@ -From 1c45ceae1d06cd3df7063e2644140b647b6d0acd Mon Sep 17 00:00:00 2001 -From: martin -Date: Mon, 13 Apr 2020 19:15:32 +0000 -Subject: [PATCH] split out gdk code from gtk2 code, disable gtk2 by default - (#544) - -* split gtk2 code out from gdk code - -* remove gtk2 module from default build ---- - CMakeLists.txt | 2 +- - src/modules/gdk/CMakeLists.txt | 39 ++++++++ - src/modules/gdk/Makefile | 74 +++++++++++++++ - src/modules/gdk/configure | 82 +++++++++++++++++ - src/modules/gdk/factory.c | 92 +++++++++++++++++++ - src/modules/{gtk2 => gdk}/filter_rescale.c | 0 - src/modules/{gtk2 => gdk}/filter_rescale.yml | 0 - src/modules/{gtk2 => gdk}/have_mmx.S | 0 - src/modules/{gtk2 => gdk}/pixops.c | 0 - src/modules/{gtk2 => gdk}/pixops.h | 0 - src/modules/{gtk2 => gdk}/producer_pango.c | 1 - - src/modules/{gtk2 => gdk}/producer_pango.yml | 0 - src/modules/{gtk2 => gdk}/producer_pixbuf.c | 0 - src/modules/{gtk2 => gdk}/producer_pixbuf.yml | 0 - .../{gtk2 => gdk}/scale_line_22_yuv_mmx.S | 0 - src/modules/gtk2/deprecated | 0 - 20 files changed, 291 insertions(+), 151 deletions(-) - create mode 100644 src/modules/gdk/CMakeLists.txt - create mode 100644 src/modules/gdk/Makefile - create mode 100755 src/modules/gdk/configure - create mode 100644 src/modules/gdk/factory.c - rename src/modules/{gtk2 => gdk}/filter_rescale.c (100%) - rename src/modules/{gtk2 => gdk}/filter_rescale.yml (100%) - rename src/modules/{gtk2 => gdk}/have_mmx.S (100%) - rename src/modules/{gtk2 => gdk}/pixops.c (100%) - rename src/modules/{gtk2 => gdk}/pixops.h (100%) - rename src/modules/{gtk2 => gdk}/producer_pango.c (99%) - rename src/modules/{gtk2 => gdk}/producer_pango.yml (100%) - rename src/modules/{gtk2 => gdk}/producer_pixbuf.c (100%) - rename src/modules/{gtk2 => gdk}/producer_pixbuf.yml (100%) - rename src/modules/{gtk2 => gdk}/scale_line_22_yuv_mmx.S (100%) - create mode 100644 src/modules/gtk2/deprecated - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54afeceda..e25ca68b0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,7 +31,7 @@ set(modules - src/modules/decklink - src/modules/frei0r - src/modules/feeds -- src/modules/gtk2 -+ src/modules/gdk - src/modules/kdenlive - src/modules/motion_est - src/modules/normalize -diff --git a/src/modules/gdk/CMakeLists.txt b/src/modules/gdk/CMakeLists.txt -new file mode 100644 -index 000000000..b7bdb2c24 ---- /dev/null -+++ b/src/modules/gdk/CMakeLists.txt -@@ -0,0 +1,39 @@ -+set(mltgdk_src factory.c) -+set(mltgdk_lib mlt m Threads::Threads) -+set(mltgdk_def "") -+ -+ -+pkg_check_modules(GdkPixbuf IMPORTED_TARGET gdk-pixbuf-2.0 REQUIRED) -+if(TARGET PkgConfig::GdkPixbuf) -+ list(APPEND mltgdk_src producer_pixbuf.c pixops.c filter_rescale.c) -+ list(APPEND mltgdk_lib PkgConfig::GdkPixbuf) -+ list(APPEND mltgdk_def USE_PIXBUF) -+ message(STATUS "${mltgdk_lib}") -+else() -+ message(FATAL_ERROR "Failed to find gdk pixbuf") -+endif() -+ -+pkg_check_modules(pango IMPORTED_TARGET pango) -+if(TARGET PkgConfig::pango) -+ pkg_check_modules(fontconfig IMPORTED_TARGET fontconfig) -+ if(TARGET PkgConfig::fontconfig) -+ list(APPEND mltgdk_src producer_pango.c) -+ list(APPEND mltgdk_lib PkgConfig::pango PkgConfig::fontconfig) -+ list(APPEND mltgdk_def USE_PANGO) -+ endif() -+endif() -+ -+pkg_check_modules(libexif IMPORTED_TARGET libexif) -+if(TARGET PkgConfig::libexif) -+ list(APPEND mltgdk_lib PkgConfig::libexif) -+ list(APPEND mltgdk_def USE_EXIF) -+endif() -+# Only for MMX but not x86_64: deprecated -+# list(APPEND mltgdk_src have_mmx.S scale_line_22_yuv_mmx.S) -+add_library(mltgdk MODULE ${mltgdk_src}) -+target_link_libraries(mltgdk ${mltgdk_lib}) -+target_compile_definitions(mltgdk PRIVATE ${mltgdk_def}) -+install(TARGETS mltgdk LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt) -+file(GLOB yml *.yml) -+install(FILES ${yml} -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/gdk) -diff --git a/src/modules/gdk/Makefile b/src/modules/gdk/Makefile -new file mode 100644 -index 000000000..2e3018976 ---- /dev/null -+++ b/src/modules/gdk/Makefile -@@ -0,0 +1,74 @@ -+include ../../../config.mak -+include config.mak -+ -+CFLAGS := -I../.. $(CFLAGS) -+ -+LDFLAGS := -L../../framework -lmlt -lpthread -lm $(LDFLAGS) -+ -+TARGET = ../libmltgdk$(LIBSUF) -+ -+OBJS = factory.o -+ -+ifdef USE_PIXBUF -+OBJS += producer_pixbuf.o pixops.o filter_rescale.o -+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0) -+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0) -+endif -+ -+ifdef USE_EXIF -+CFLAGS += $(EXIFCXXFLAGS) -+LDFLAGS += $(EXIFLIBS) -+endif -+ -+ifdef MMX_FLAGS -+ifndef ARCH_X86_64 -+ASM_OBJS = have_mmx.o scale_line_22_yuv_mmx.o -+endif -+endif -+ -+ifdef USE_PANGO -+OBJS += producer_pango.o -+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2) -+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags-only-I freetype2 | awk '{for (i=1; i<=NF; i++) $$i=sprintf("%s/freetype", $$i); print}') -+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2) -+ifeq ($(targetos),Darwin) -+LDFLAGS += -liconv -+endif -+ifeq ($(targetos),FreeBSD) -+LDFLAGS += -liconv -+endif -+ifeq ($(targetos), MinGW) -+LDFLAGS += -liconv -+endif -+endif -+ -+SRCS := $(OBJS:.o=.c) -+ -+all: $(TARGET) -+ -+$(TARGET): $(OBJS) $(ASM_OBJS) -+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS) -+ -+have_mmx.o: -+ $(CC) -o $@ -c have_mmx.S -+ -+scale_line_22_yuv_mmx.o: scale_line_22_yuv_mmx.S -+ $(CC) -o $@ -c scale_line_22_yuv_mmx.S -+ -+depend: $(SRCS) -+ $(CC) -MM $(CFLAGS) $^ 1>.depend -+ -+distclean: clean -+ rm -f .depend -+ -+clean: -+ rm -f $(OBJS) $(ASM_OBJS) $(TARGET) -+ -+install: all -+ install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" -+ install -d "$(DESTDIR)$(mltdatadir)/gdk" -+ install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/gdk" -+ -+ifneq ($(wildcard .depend),) -+include .depend -+endif -diff --git a/src/modules/gdk/configure b/src/modules/gdk/configure -new file mode 100755 -index 000000000..07003b049 ---- /dev/null -+++ b/src/modules/gdk/configure -@@ -0,0 +1,82 @@ -+#!/bin/sh -+ -+if [ "$help" = "1" ] -+then -+ cat << EOF -+GDK options: -+ -+ --gdk-prefix=path - Override the gdk prefix for pkg-config -+ -+EOF -+ -+else -+ pkgconfig_prefix= -+ for i in "$@" -+ do -+ case $i in -+ --gdk-prefix=* ) pkgconfig_prefix="${i#--gdk-prefix=}" ;; -+ esac -+ done -+ [ "$pkgconfig_prefix" != "" ] && pkgconfig_prefix="--define-variable=prefix=\"$pkgconfig_prefix\"" -+ -+ pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 2> /dev/null -+ disable_pixbuf=$? -+ -+ pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 pangoft2 2> /dev/null -+ disable_pango=$? -+ -+ if [ "$disable_pixbuf" != 0 -a "$disable_pango" != "0" ] -+ then -+ echo "- GDK components not found: disabling" -+ touch ../disable-gdk -+ exit 0 -+ fi -+ -+ echo > config.mak -+ -+ if [ "$disable_pixbuf" = "0" ] -+ then -+ echo "CFLAGS += -DUSE_PIXBUF" >> config.mak -+ echo "USE_PIXBUF=1" >> config.mak -+ else -+ echo "- pixbuf not found: pixbuf loader and rescaler disabled" -+ fi -+ -+ if [ "$disable_pango" = "0" ] -+ then -+ echo "CFLAGS += -DUSE_PANGO" >> config.mak -+ echo "USE_PANGO=1" >> config.mak -+ else -+ echo "- pango not found: pango titler disabled" -+ fi -+ -+ [ "$pkgconfig_prefix" != "" ] && echo "PKGCONFIG_PREFIX=$pkgconfig_prefix" >> config.mak -+ -+ pkg-config --exists 'libexif' -+ if [ $? -eq 0 ] -+ then -+ echo "- Libexif found, enabling auto rotate" -+ echo "USE_EXIF=1" >> config.mak -+ echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak -+ echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak -+ echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak -+ elif [ -d "$exif_libdir" -a -d "$exif_includedir" ] -+ then -+ # test if we have a libexif -+ if [ -f "$exif_libdir/exif-data.h" ] -+ then -+ echo "- Libexif found, enabling auto rotate" -+ echo "USE_EXIF=1" >> config.mak -+ echo EXIFCXXFLAGS=-I$exif_includedir >> config.mak -+ echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak -+ echo EXIFLIBS=-L$exif_libdir lexif >> config.mak -+ else -+ echo "- Libexif not found, disabling exif features (auto rotate)" -+ fi -+ else -+ echo "- Libexif not found, disabling exif features (auto rotate)" -+ fi -+ -+ exit 0 -+fi -+ -diff --git a/src/modules/gdk/factory.c b/src/modules/gdk/factory.c -new file mode 100644 -index 000000000..94b89466e ---- /dev/null -+++ b/src/modules/gdk/factory.c -@@ -0,0 +1,92 @@ -+/* -+ * factory.c -- the factory method interfaces -+ * Copyright (C) 2003-2014 Meltytech, LLC -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#include -+#include -+#include -+ -+#ifdef USE_PIXBUF -+extern mlt_producer producer_pixbuf_init( char *filename ); -+extern mlt_filter filter_rescale_init( mlt_profile profile, char *arg ); -+#endif -+ -+#ifdef USE_PANGO -+extern mlt_producer producer_pango_init( const char *filename ); -+#endif -+ -+static void initialise( ) -+{ -+ static int init = 0; -+ if ( init == 0 ) -+ { -+ init = 1; -+ if ( getenv("MLT_PIXBUF_PRODUCER_CACHE") ) -+ { -+ int n = atoi( getenv("MLT_PIXBUF_PRODUCER_CACHE" ) ); -+ mlt_service_cache_set_size( NULL, "pixbuf.image", n ); -+ mlt_service_cache_set_size( NULL, "pixbuf.alpha", n ); -+ mlt_service_cache_set_size( NULL, "pixbuf.pixbuf", n ); -+ } -+ if ( getenv("MLT_PANGO_PRODUCER_CACHE") ) -+ { -+ int n = atoi( getenv("MLT_PANGO_PRODUCER_CACHE" ) ); -+ mlt_service_cache_set_size( NULL, "pango.image", n ); -+ } -+ } -+} -+ -+void *create_service( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) -+{ -+ initialise( ); -+ -+#ifdef USE_PIXBUF -+ if ( !strcmp( id, "pixbuf" ) ) -+ return producer_pixbuf_init( arg ); -+#endif -+ -+#ifdef USE_PANGO -+ if ( !strcmp( id, "pango" ) ) -+ return producer_pango_init( arg ); -+#endif -+ -+#ifdef USE_PIXBUF -+ if ( !strcmp( id, "gtkrescale" ) ) -+ return filter_rescale_init( profile, arg ); -+#endif -+ -+ return NULL; -+} -+ -+static mlt_properties metadata( mlt_service_type type, const char *id, void *data ) -+{ -+ char file[ PATH_MAX ]; -+ snprintf( file, PATH_MAX, "%s/gtk2/%s", mlt_environment( "MLT_DATA" ), (char*) data ); -+ return mlt_properties_parse_yaml( file ); -+} -+ -+MLT_REPOSITORY -+{ -+ MLT_REGISTER( filter_type, "gtkrescale", create_service ); -+ MLT_REGISTER( producer_type, "pango", create_service ); -+ MLT_REGISTER( producer_type, "pixbuf", create_service ); -+ -+ MLT_REGISTER_METADATA( filter_type, "gtkrescale", metadata, "filter_rescale.yml" ); -+ MLT_REGISTER_METADATA( producer_type, "pango", metadata, "producer_pango.yml" ); -+ MLT_REGISTER_METADATA( producer_type, "pixbuf", metadata, "producer_pixbuf.yml" ); -+} -diff --git a/src/modules/gtk2/filter_rescale.c b/src/modules/gdk/filter_rescale.c -similarity index 100% -rename from src/modules/gtk2/filter_rescale.c -rename to src/modules/gdk/filter_rescale.c -diff --git a/src/modules/gtk2/filter_rescale.yml b/src/modules/gdk/filter_rescale.yml -similarity index 100% -rename from src/modules/gtk2/filter_rescale.yml -rename to src/modules/gdk/filter_rescale.yml -diff --git a/src/modules/gtk2/have_mmx.S b/src/modules/gdk/have_mmx.S -similarity index 100% -rename from src/modules/gtk2/have_mmx.S -rename to src/modules/gdk/have_mmx.S -diff --git a/src/modules/gtk2/pixops.c b/src/modules/gdk/pixops.c -similarity index 100% -rename from src/modules/gtk2/pixops.c -rename to src/modules/gdk/pixops.c -diff --git a/src/modules/gtk2/pixops.h b/src/modules/gdk/pixops.h -similarity index 100% -rename from src/modules/gtk2/pixops.h -rename to src/modules/gdk/pixops.h -diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gdk/producer_pango.c -similarity index 99% -rename from src/modules/gtk2/producer_pango.c -rename to src/modules/gdk/producer_pango.c -index b3e11b942..ead6e9123 100644 ---- a/src/modules/gtk2/producer_pango.c -+++ b/src/modules/gdk/producer_pango.c -@@ -172,7 +172,6 @@ mlt_producer producer_pango_init( const char *filename ) - pthread_mutex_lock( &pango_mutex ); - if ( fontmap == NULL ) - fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new(); -- g_type_init(); - pthread_mutex_unlock( &pango_mutex ); - - producer->get_frame = producer_get_frame; -diff --git a/src/modules/gtk2/producer_pango.yml b/src/modules/gdk/producer_pango.yml -similarity index 100% -rename from src/modules/gtk2/producer_pango.yml -rename to src/modules/gdk/producer_pango.yml -diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gdk/producer_pixbuf.c -similarity index 100% -rename from src/modules/gtk2/producer_pixbuf.c -rename to src/modules/gdk/producer_pixbuf.c -diff --git a/src/modules/gtk2/producer_pixbuf.yml b/src/modules/gdk/producer_pixbuf.yml -similarity index 100% -rename from src/modules/gtk2/producer_pixbuf.yml -rename to src/modules/gdk/producer_pixbuf.yml -diff --git a/src/modules/gtk2/scale_line_22_yuv_mmx.S b/src/modules/gdk/scale_line_22_yuv_mmx.S -similarity index 100% -rename from src/modules/gtk2/scale_line_22_yuv_mmx.S -rename to src/modules/gdk/scale_line_22_yuv_mmx.S -diff --git a/src/modules/gtk2/deprecated b/src/modules/gtk2/deprecated -new file mode 100644 -index 000000000..e69de29bb diff --git a/media-libs/mlt/files/mlt-6.20.0-nullpointer-crash.patch b/media-libs/mlt/files/mlt-6.20.0-nullpointer-crash.patch deleted file mode 100644 index 6bff797c0a92..000000000000 --- a/media-libs/mlt/files/mlt-6.20.0-nullpointer-crash.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b32be6e56e328bb2e580aa13cd757aa211310bae Mon Sep 17 00:00:00 2001 -From: Dan Dennedy -Date: Thu, 27 Feb 2020 23:49:07 -0800 -Subject: [PATCH] fix null pointer crash in mix transition - ---- - src/modules/core/transition_mix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/core/transition_mix.c b/src/modules/core/transition_mix.c -index ab7a166d0..89c07a285 100644 ---- a/src/modules/core/transition_mix.c -+++ b/src/modules/core/transition_mix.c -@@ -139,7 +139,7 @@ static int transition_get_audio( mlt_frame frame_a, void **buffer, mlt_audio_for - mlt_frame_get_audio( frame_a, (void**) &buffer_a, format, &frequency_a, &channels_a, &samples_a ); - - // Prevent dividing by zero. -- if ( !channels_a || !channels_b ) -+ if ( !channels_a || !channels_b || !buffer_a || !buffer_b ) - return 1; - - if ( buffer_b == buffer_a ) diff --git a/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch b/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch deleted file mode 100644 index 7f764965046d..000000000000 --- a/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 5e906b13cab7f28bbef43a33c20dbe24c2ca1f8d Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Mardelle -Date: Tue, 17 Mar 2020 18:22:04 +0100 -Subject: [PATCH] Fix OpenCV tracker double deletion crash. Fixes #532 - ---- - src/modules/opencv/filter_opencv_tracker.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp -index 04a5f0b09..533f0f513 100644 ---- a/src/modules/opencv/filter_opencv_tracker.cpp -+++ b/src/modules/opencv/filter_opencv_tracker.cpp -@@ -351,7 +351,6 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame ) - static void filter_close( mlt_filter filter ) - { - private_data* data = (private_data*) filter->child; -- free ( data->tracker ); - free ( data ); - filter->child = NULL; - filter->close = NULL; diff --git a/media-libs/mlt/files/mlt-6.20.0-opencv4.patch b/media-libs/mlt/files/mlt-6.20.0-opencv4.patch deleted file mode 100644 index e3e27904d5a2..000000000000 --- a/media-libs/mlt/files/mlt-6.20.0-opencv4.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f4329c7e8f4704d3f8e8f2a96bd774e6d966194b Mon Sep 17 00:00:00 2001 -From: martin -Date: Tue, 7 Apr 2020 19:48:01 +0000 -Subject: [PATCH] fix opencv4 support (#545) - ---- - src/modules/opencv/configure | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/src/modules/opencv/configure b/src/modules/opencv/configure -index 36851f678..4e7fdcf4a 100755 ---- a/src/modules/opencv/configure -+++ b/src/modules/opencv/configure -@@ -26,18 +26,27 @@ else - exit 0 - fi - -- pkg-config --atleast-version=3.1.0 'opencv' -+ opencvname=opencv -+ pkg-config "$opencvname" -+ if [ $? -ne 0 ] -+ then -+ # Try v4, they renamed -+ opencvname=opencv4 -+ fi -+ -+ pkg-config --atleast-version=3.1.0 "$opencvname" -+ - if [ $? -eq 0 ] - then -- result=`pkg-config --libs opencv | grep "opencv_tracking"` -+ result=`pkg-config --libs "$opencvname" | grep "opencv_tracking"` - if [ -z "$result" ] - then - echo "- OpenCV tracking contrib module NOT found, disabling OpenCV modules" - touch ../disable-opencv - exit 0 - else -- echo "CFLAGS += $(pkg-config --cflags opencv)" >> config.mak -- echo "LDFLAGS += $(pkg-config --libs opencv)" >> config.mak -+ echo "CFLAGS += $(pkg-config --cflags "$opencvname")" >> config.mak -+ echo "LDFLAGS += $(pkg-config --libs "$opencvname")" >> config.mak - fi - else - echo "- OpenCV >= 3.1.0 NOT found: disabling" diff --git a/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch b/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch deleted file mode 100644 index edc183725d61..000000000000 --- a/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f58b44d73442986eeffec7431e59b7d19d214c1b Mon Sep 17 00:00:00 2001 -From: Heiko Becker -Date: Tue, 24 Mar 2020 21:17:05 +0100 -Subject: [PATCH] Fix build with Qt 5.15.0 - -QPainterPath is no longer included via qtransform.h (since -5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). ---- - src/modules/qt/filter_qtext.cpp | 1 + - src/modules/qt/graph.cpp | 1 + - src/modules/qt/producer_qtext.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/modules/qt/filter_qtext.cpp b/src/modules/qt/filter_qtext.cpp -index c3de1fadc..c3e10f1a3 100644 ---- a/src/modules/qt/filter_qtext.cpp -+++ b/src/modules/qt/filter_qtext.cpp -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - - static QRectF get_text_path( QPainterPath* qpath, mlt_properties filter_properties, const char* text, double scale ) -diff --git a/src/modules/qt/graph.cpp b/src/modules/qt/graph.cpp -index 6d4d669ca..7e91bb12f 100644 ---- a/src/modules/qt/graph.cpp -+++ b/src/modules/qt/graph.cpp -@@ -18,6 +18,7 @@ - */ - - #include "graph.h" -+#include - #include - #include - -diff --git a/src/modules/qt/producer_qtext.cpp b/src/modules/qt/producer_qtext.cpp -index 603c2b780..ff95a8e26 100644 ---- a/src/modules/qt/producer_qtext.cpp -+++ b/src/modules/qt/producer_qtext.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch b/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch new file mode 100644 index 000000000000..d60976c11855 --- /dev/null +++ b/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch @@ -0,0 +1,23 @@ +From 8b778aaee121c6b381bd570c2b6f526989866f8e Mon Sep 17 00:00:00 2001 +From: Dan Dennedy +Date: Fri, 11 Sep 2020 21:24:24 -0700 +Subject: [PATCH] fix regression in 2c354d6e with multiple affine filters + +See #9 in https://forum.shotcut.org/t/v20-09-beta-is-now-available-to- +test/20766/31 +--- + src/modules/plus/transition_affine.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c +index 63bbaa1df..b1147c8c6 100644 +--- a/src/modules/plus/transition_affine.c ++++ b/src/modules/plus/transition_affine.c +@@ -564,6 +564,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f + b_height = result.h; + // Set the rescale interpolation to match the frame + mlt_properties_set( b_props, "rescale.interp", mlt_properties_get( a_props, "rescale.interp" ) ); ++ mlt_properties_set_int( b_props, "distort", 1 ); + } else if (scale_width != 1.0 || scale_height != 1.0) { + // Scale request of b frame image to consumer scale maintaining its aspect ratio. + b_height = *height; diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild deleted file mode 100644 index d2bb530035af..000000000000 --- a/media-libs/mlt/mlt-6.20.0-r2.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9} ) -inherit 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 kdenlive kernel_linux libsamplerate lua melt opencv opengl python -qt5 rtaudio sdl vdpau vidstab xine xml" -# java perl php tcl - -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? ( >=dev-lang/lua-5.1.4-r4:= ) - opencv? ( >=media-libs/opencv-3.2.0:= ) - 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 ) - ) - 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 ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch - "${FILESDIR}"/${P}-qt-5.15.patch - "${FILESDIR}"/${P}-no-gtk2.patch - "${FILESDIR}"/${P}-opencv4.patch - "${FILESDIR}"/${P}-nullpointer-crash.patch - "${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch - "${FILESDIR}"/${P}-crash-in-composite.patch - "${FILESDIR}"/${P}-opencv-double-del-crash.patch - "${FILESDIR}"/${P}-musl-locale.patch # from Alpine, pending upstream -) - -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-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 kdenlive) - $(use_enable libsamplerate resample) - $(use_enable melt) - $(use_enable opencv) - $(use_enable opengl) - $(use_enable qt5 qt) - $(use_enable rtaudio) - $(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 - - if ! use melt ; then - sed -i -e "s;src/melt;;" Makefile || die - 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 - for i in lua 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_install() { - default - - insinto /usr/share/${PN} - doins -r demo - - docinto swig - - # Install SWIG bindings - if use lua; then - cd "${S}"/src/swig/lua || die - exeinto $(pkg-config --variable INSTALL_CMOD lua) - doexe mlt.so - dodoc 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-6.22.1-r1.ebuild b/media-libs/mlt/mlt-6.22.1-r1.ebuild new file mode 100644 index 000000000000..703672aeabdc --- /dev/null +++ b/media-libs/mlt/mlt-6.22.1-r1.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +inherit 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 kdenlive kernel_linux libsamplerate lua melt opencv opengl python +qt5 rtaudio sdl vdpau vidstab xine xml" +# java perl php tcl + +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? ( >=dev-lang/lua-5.1.4-r4:= ) + opencv? ( >=media-libs/opencv-3.2.0:= ) + 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 ) + ) + 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}"/${P}-fix-regression-w-multiple-affine-filters.patch +) + +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-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 kdenlive) + $(use_enable libsamplerate resample) + $(use_enable melt) + $(use_enable opencv) + $(use_enable opengl) + $(use_enable qt5 qt) + $(use_enable rtaudio) + $(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 + + if ! use melt ; then + sed -i -e "s;src/melt;;" Makefile || die + 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 + for i in lua 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_install() { + default + + insinto /usr/share/${PN} + doins -r demo + + docinto swig + + # Install SWIG bindings + if use lua; then + cd "${S}"/src/swig/lua || die + exeinto $(pkg-config --variable INSTALL_CMOD lua) + doexe mlt.so + dodoc 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-6.22.1.ebuild b/media-libs/mlt/mlt-6.22.1.ebuild deleted file mode 100644 index 66eac2a219cb..000000000000 --- a/media-libs/mlt/mlt-6.22.1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9} ) -inherit 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 kdenlive kernel_linux libsamplerate lua melt opencv opengl python -qt5 rtaudio sdl vdpau vidstab xine xml" -# java perl php tcl - -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? ( >=dev-lang/lua-5.1.4-r4:= ) - opencv? ( >=media-libs/opencv-3.2.0:= ) - 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 ) - ) - 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 -) - -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-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 kdenlive) - $(use_enable libsamplerate resample) - $(use_enable melt) - $(use_enable opencv) - $(use_enable opengl) - $(use_enable qt5 qt) - $(use_enable rtaudio) - $(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 - - if ! use melt ; then - sed -i -e "s;src/melt;;" Makefile || die - 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 - for i in lua 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_install() { - default - - insinto /usr/share/${PN} - doins -r demo - - docinto swig - - # Install SWIG bindings - if use lua; then - cd "${S}"/src/swig/lua || die - exeinto $(pkg-config --variable INSTALL_CMOD lua) - doexe mlt.so - dodoc 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/mutagen/Manifest b/media-libs/mutagen/Manifest index 62c09e132950..8dff87bdb27b 100644 --- a/media-libs/mutagen/Manifest +++ b/media-libs/mutagen/Manifest @@ -1,5 +1,7 @@ DIST mutagen-1.43.0.tar.gz 1143839 BLAKE2B 044906b730763e001fa2cb863c8bb1fec45713aca57b6311f783f66218e4f3410987d04d56a1e4fbf41a229860bbb574b4077401e1f2384e70d80fdc9f3b23ad SHA512 66df63705a43befa9cf6688bc8b3acc4fd1559eb28920c105b47a97c35422b5e19527051445daa7aed66facc2e4c14d71058f8560bbd564fecbe56a076491e3f DIST mutagen-1.44.0.tar.gz 1143320 BLAKE2B 9e4ad11b7ee560a4940e3eaaecdb8b0fad4db54fd1fa9e4f925d84e55c217eb002e07602817fa92f6db9fdd6b6b339d5e147874bf587604c18b665d980d6604a SHA512 88c8c181b1333989451533951727b7c43e4a012defd3fd1f7ddd970d083f938783d61f98970e74c677ee9725dac92c47ee37af4bd7a474e85c7a56793c6063a8 -EBUILD mutagen-1.43.0-r1.ebuild 1114 BLAKE2B 11fa4894e029448db8d903a9a63224c7803b3fdd64a49e820468a2fd40e0f089a917daa4b78edda79643ba759e0002aee394bb3b6392dd3f3afab0c7bfbfa4f1 SHA512 82659768180b836890c90750c62c6ea1583cd2d43badde3b54a29d2d9194f613ed1835877d436f4b3e279c72d50fdcf1d62c11ca86898f84fb306a87833155f0 -EBUILD mutagen-1.44.0.ebuild 1104 BLAKE2B f36d2c00a4e64d2998d6771cd8cf79b560b5bfc90f68e3ee975e3f04266543cec934ba75c683b710ec18fc84f9f04e40b55db035f16e4bddd63e4304daeac71c SHA512 32dbe431944c217a85dcd32d85558498cca8e0bf997142e833d0a9606ccbf33de553c24a217d40f9c569904c84221c655aa47551bdb454e19c20c91372462337 +DIST mutagen-1.45.1.tar.gz 1285455 BLAKE2B a1e29698d96b4c98f16e18dd8b3f902e41dcc4409d01da861a726a6a9fbd7f116e07b4e1872b8b3857f0eec080d18bac736de741635746f5c71416a3a8ef6e78 SHA512 c5244efa01b9de5ec22ceca39e55f34b933ca4a5bec0f2088fd3adca657f0230cbe85cd5e156db1d90fb44d9339bc94dc3bdcd3e49f1b0d46bc3d71ece6b45d8 +EBUILD mutagen-1.43.0-r1.ebuild 1115 BLAKE2B d7ca29d571488db37782846860a2eca28baddf97fc40c00c17171a06d6836cff74e1b23756b0d34f6bafe6aae3d90b36ce85002aa092288368e1588fa51c8c33 SHA512 2490d6f772e52dabb34e1f317ef04cfcb1a346f58ecab47e7bd54b2efd5160359d011c2d488359043c61bedf694736ddef177094870ba5da51a5649add39c612 +EBUILD mutagen-1.44.0.ebuild 1103 BLAKE2B c9ad68730308e3a190bb5fb4e7edbd705fee179905c079ff807f3539cf9035343c50acb481e7fb922bde7c34cb09f6ecc241b9da120190857103170fed0affec SHA512 268c7cf83d7871f743c3860190595b6b54391282f0a3ee393bb0eafe4fd2bd8c6a9336a1d37549b88571e5d08e73cb9adb008942b863d6d68c0672a4740d606f +EBUILD mutagen-1.45.1.ebuild 1139 BLAKE2B 0616c08a3b3e4e4ce380eb18ddf8b93e469ab62385dcc6f75b80b09cbab81333fe33d3598a0a7b8ba6949a6d8473ac0a7fecb7e4d57f9e26d93ffbde7c29d985 SHA512 0e017ceee75577baef06ac481fb3d84610d8cbf9a857ffe2b6b3e0b47103fcc1506da2e11950e70d6138c5ecfed0c2383007980d9401381ade4d878696160e30 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59 diff --git a/media-libs/mutagen/mutagen-1.43.0-r1.ebuild b/media-libs/mutagen/mutagen-1.43.0-r1.ebuild index 9bf25d7b1334..7a24a1f153d0 100644 --- a/media-libs/mutagen/mutagen-1.43.0-r1.ebuild +++ b/media-libs/mutagen/mutagen-1.43.0-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${ LICENSE="GPL-2" 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="doc test" # TODO: Missing support for >=dev-python/eyeD3-0.7 API diff --git a/media-libs/mutagen/mutagen-1.44.0.ebuild b/media-libs/mutagen/mutagen-1.44.0.ebuild index fbfc42e0aad5..2f2e567b1c03 100644 --- a/media-libs/mutagen/mutagen-1.44.0.ebuild +++ b/media-libs/mutagen/mutagen-1.44.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${ LICENSE="GPL-2" 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="doc test" # TODO: Missing support for >=dev-python/eyeD3-0.7 API diff --git a/media-libs/mutagen/mutagen-1.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild new file mode 100644 index 000000000000..eef29499eb0b --- /dev/null +++ b/media-libs/mutagen/mutagen-1.45.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python" +HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/" +SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="doc test" + +# TODO: Missing support for >=dev-python/eyeD3-0.7 API +# test? ( >=dev-python/eyeD3-0.7 ) +BDEPEND=" + doc? ( + dev-python/sphinx + dev-python/sphinx_rtd_theme + ) + test? ( + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/pyflakes[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ) +" + +RESTRICT="!test? ( test )" + +python_compile_all() { + use doc && emake -C docs +} + +python_test() { + esetup.py test --no-quality +} + +python_install_all() { + local DOCS=( NEWS README.rst ) + use doc && local HTML_DOCS=( docs/_build/. ) + distutils-r1_python_install_all +} diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 72f977d884af..2dd713c957ca 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,13 +1,13 @@ AUX make-tarball.sh 1364 BLAKE2B 40001ac396b0ff26bb8e5d1a1a160b1467b4f9453d930394cf66dbc5e60b9d1e04c419801ca4ea2cbcb930797fe07df305549b7d5155e3cac3ce099a4dddbfbf SHA512 89b0ebfe6f5a82c3e3fc678ec4599d7281a0978c3a53437f0fbcfcb33607f8087bca1263d8a52c5b25cb1ab91a6635385cf423213464af858fc2f9663d5446a7 -AUX netpbm-10.31-build.patch 1629 BLAKE2B 26d46715ac933420fe5a9a0209edad51a754ad4f030cddd39d08f1d41418cb20ac8b0b9cc3dbaa847d6406a6778cff1b55618dee45a4a112c89a5d61be50efb3 SHA512 53e88bd1c85aa04d60ca2de7a32e5d00d9f959f3443e0c951c0694c814f6956708d8d12427a0fa8a8f76a1613d2982c3aa9b0c6ddd12b9cad3419ced1e5bb59e +AUX netpbm-10.31-build.patch 1641 BLAKE2B 2102aa5a41b89beea645842ebaf72d472464c161601673f25d100f030c8058c86a98ae1d402387c7ce09eaa2558d099ab6cc8551fe1f231ea5a7e71b813d84ee SHA512 352b4390c7b622a7509ce370ba03d596bdee9ed19f63ab72990f15cec74eee42e768525aeaff87a160c8edb0034189c0a09a86189f7324675091484652cc1abd AUX netpbm-10.66-test.patch 347 BLAKE2B e4f88878dd61c2d7e8ad642d5a32aec8351cdcf8ef2d4bf81dd9174a69d17b6c56fc3eb7160f63764360a7bdea99bcb2cb3e8dd47d04f881185f86e2a8f6cbf5 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74 -AUX netpbm-10.70-system-libs.patch 1016 BLAKE2B 84a9b4bb4552f98f0cc8b653c84e1efa437624f1895bd321ec0ef415284c93b59785ef451b9116a4e470394c43670b5c1d1028198931cce81ad166d573aca10d SHA512 156e668ff209ca42dc3bf7e9b89232065d1f5ed3284885beeb67c8c9728eb7f142aceb98898c8d8e2c2a90dd9fab927a698b4372f2f3bcbf06f6df44d1a81629 +AUX netpbm-10.70-system-libs.patch 1024 BLAKE2B 8fe242dad22030b66613a9c3c3e1c5d0a00589581f68dccf2940b9991a16cf6e1c5deec86562ec696db65e0d1465e7dacf840c6d9220be1bce3505d9dccf96ff SHA512 e25f58186621820612923e50d1342262cc30a790725d31a8ff2a9e8eae8415db600b6601539e1124eb9dcc5fed2f7db9738d6b8effe9e8e118af1f517111eb81 AUX netpbm-10.76.00-build.patch 1295 BLAKE2B 5ce1a973f503ded256fad7d8c2dddf24663466e8be04acbf52d30ca1ff50dae40dc24b0714cb50b00667f2d560c7f2ab5c7d457c90e8b31f322ca85498c3ba3d SHA512 db1d0593db6987933d7c937beeac65716866adaa079fb5329f8597b208c7dea9f6dd40b803f9dc4b3ef6cf61189c45dde9e139435b7d8e224bb83e037a7f076b -AUX netpbm-10.76.00-misc-deps.patch 1665 BLAKE2B b4e87fa86fee8d66a354999ee6731cfad4238fc0c56015a5db17bcc058ca13849cd1ed2efc8d9f4bc370ac255528fc28bca30e9c82152f64000249e3eed9458e SHA512 81afe7189ac0d3cf24ec691eee89dc8fa1a1f6503c9d2e530dcdbbcf1c67c6a834b6b205c99ef633461e090baf6e8b4179954482c09b68370bea9eceabd1d3bd -AUX netpbm-10.76.00-pbmtext-test.patch 707 BLAKE2B 42cbda583198a173a8210e0e6dd65392a9f138af6ee8f0271196841dd3adba65a34c59698eb5897982d5297500f8e456fa1de6e17d546f6957adf5b68237ae2e SHA512 d43a59bd92bbe7ebb8fcf60bf13fb4095beb546cb964108da740dd23c564beb2f97422535067189d49255a2ce8b7a89c01f8f98c807e6e37bfadf32e01f30bde -AUX netpbm-10.76.00-test.patch 6005 BLAKE2B 0c8b0d9b1d7a0c5b139f85eb3a91838cc49687516cbd6fc12b00aef785877365503778b8c20226b07cf0f798eadf2da27ed5a6b9ce25ad4419358ccc88ebe8ea SHA512 49ee2306173e9cf39052e567aedf313ca7c7dd31a090defcd838a08a062d26e1320573a0ad6555e752edc8d0e8fd2e071016e2b075b20ac7e61ee3d60a3b7f14 +AUX netpbm-10.76.00-misc-deps.patch 1677 BLAKE2B 2b54610958755b452bffd186e6bdbac16db9c7b0a0242776798a7cc4b6685c4b0a26bcea7810e392437bba25a8839b5852a84fc3acc2daa50e1a893d7c58d702 SHA512 a632c2eb9afd3fcd4ed7a9467293ad9ac6201296c0910d150f6a1c94121cf0dac9654531fd18c5aec7b412c3fae203a28e62b00cff877629f89e4f995ab730b2 +AUX netpbm-10.76.00-pbmtext-test.patch 711 BLAKE2B 7e1b825bd9735ace1e91c1e705df4843aebbec61d090ec3903e680aac3facba80075ffa518340140657e33cd6c36ae84cd669e9dcddb920d832caed218b6651e SHA512 32be11758652105a6964bca3a9b08c06ed34e2f9ea00370c8d3a961a0ba8b64102120881238fe016d0b0ca4f10882b25f655691bbd75be8ceb700e68a624d5ca +AUX netpbm-10.76.00-test.patch 6045 BLAKE2B ec4bf18a2022e67b26b78a591f3949552e103d9dbaec0793707988265ecd9f1006e576b094e4a47c9a94de5aa0ac2be00702493d3234364e91e727ac90ca4f61 SHA512 36244194a688d7b3f9ef632ecc3a56ea9aae3e28ad68d4dc5f1a804c19203a76b76fd75c1d999661dea4aa6e529e7200fd195383d8585d129d6df088a0c633b5 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3 -EBUILD netpbm-10.70.00.ebuild 5291 BLAKE2B 44d1e0f2a83811ad87ccbedc12787fd9ad45e8379ffe3901c8314515654c1dc5059a2c155e8730785287712f74d6ef5599943dc4add93458cb855b4675050c3f SHA512 1e0fd672914d2b607204a9ac7da290bc3b858395135a062218567879b110ecdbc8f24b63e06e60b1724aaf9bdf846473d9aa23705e8e11fcbf3732ab55eb8f7f -EBUILD netpbm-10.76.00.ebuild 5181 BLAKE2B b0c32184934b4640f21f727ea579f9dc59c2f7e5562f346c3b61d5d3537cc18d19b2be3ee710b467b53ba342989fec56af6015213e666b52a56bca0c6b268361 SHA512 ba51a645c80128e8589a0c1f3193df358533e7f2da3e642c682e1d3e8d0596fcda6009540149c79bae0005f9fe7e5e229e431870cfd2d9560b8493b868a38957 +EBUILD netpbm-10.70.00.ebuild 5373 BLAKE2B bae61227e2fd3e65aa4005e4abb612cbf8e4ab749ff61921c9999eb4fa9203eea7efc9256df0149b47f3877aa2dad9c91a05df774801272e3c467e16ea578fb2 SHA512 b94aeeb1d9c1b7e721708711e1eb5d2bbdfd69692540edd1b79a102c191fb8bad1cc57e6ce18a0ba2e36a417416ddb7ec233381a0ca482cbad8757b90cde5e02 +EBUILD netpbm-10.76.00.ebuild 5231 BLAKE2B a3105e726071fab669d9f59a07df34c7adf8081d034ce778869daf1f97ab51eeb5750fb0ab7d777cb9b5c91a489f59f37565998b687a6665955e3fc4c3d62dd7 SHA512 3df139907d414150a8d3815f1b58e2d23b9faeaf5dd997a737a7af9d9629db986afb481c1edd8cd9e3865c29875047f1fe29a002eccc812c2dfdafe3a3f3b4fb MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh old mode 100755 new mode 100644 diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch index cd744743636c..281f8ee928f7 100644 --- a/media-libs/netpbm/files/netpbm-10.31-build.patch +++ b/media-libs/netpbm/files/netpbm-10.31-build.patch @@ -2,8 +2,8 @@ - Try to fix parallel building - Make the libopt tool less 'helpful' ---- lib/Makefile -+++ lib/Makefile +--- a/lib/Makefile ++++ b/lib/Makefile @@ -249,7 +249,7 @@ .PHONY: install.staticlib install.staticlib: $(PKGDIR)/link @@ -25,8 +25,8 @@ libnetpbm.$(NETPBMLIBSUFFIX) endif ifeq ($(NETPBMLIBTYPE),dll) ---- GNUmakefile -+++ GNUmakefile +--- a/GNUmakefile ++++ b/GNUmakefile @@ -87,6 +87,9 @@ .PHONY: nonmerge @@ -37,8 +37,8 @@ OMIT_CONFIG_RULE = 1 include $(SRCDIR)/Makefile.common ---- buildtools/libopt.c -+++ buildtools/libopt.c +--- a/buildtools/libopt.c ++++ b/buildtools/libopt.c @@ -502,7 +502,7 @@ strcpy(outputLine, ""); /* initial value */ diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch index ef50ff2435dd..efe9fd8dd3c4 100644 --- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch +++ b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch @@ -1,7 +1,7 @@ when we disable the bundled libs, make sure we don't try to run install in them ---- converter/other/jbig/Makefile -+++ converter/other/jbig/Makefile +--- a/converter/other/jbig/Makefile ++++ b/converter/other/jbig/Makefile @@ -5,7 +5,7 @@ endif SUBDIR = converter/other/jbig VPATH=.:$(SRCDIR)/$(SUBDIR) @@ -19,8 +19,8 @@ when we disable the bundled libs, make sure we don't try to run install in them else # It's not our internal version; user's on his own to make sure it's built endif ---- converter/other/jpeg2000/Makefile -+++ converter/other/jpeg2000/Makefile +--- a/converter/other/jpeg2000/Makefile ++++ b/converter/other/jpeg2000/Makefile @@ -5,7 +5,7 @@ endif SUBDIR = converter/other/jpeg2000 VPATH=.:$(SRCDIR)/$(SUBDIR) 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 index 392eae0f40e4..bd894bfb3159 100644 --- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch +++ b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch @@ -1,7 +1,7 @@ do not autoprobe deps when we disabled them ---- GNUmakefile -+++ GNUmakefile +--- a/GNUmakefile ++++ b/GNUmakefile @@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk PROG_SUBDIRS = converter analyzer editor generator other @@ -14,8 +14,8 @@ do not autoprobe deps when we disabled them SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS) ---- converter/other/Makefile -+++ converter/other/Makefile +--- a/converter/other/Makefile ++++ b/converter/other/Makefile @@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/config.mk @@ -48,8 +48,8 @@ do not autoprobe deps when we disabled them ifneq ($(JPEGLIB),NONE) ifneq ($(JPEGHDR_DIR)x,x) ---- other/pamx/Makefile -+++ other/pamx/Makefile +--- a/other/pamx/Makefile ++++ b/other/pamx/Makefile @@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk EXTERN_INCLUDE = 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 index cdc075e5293f..717c86a72ac5 100644 --- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch +++ b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch @@ -3,8 +3,8 @@ what awk generates. force it to C/ASCII to avoid that. https://bugs.gentoo.org/601012 ---- test/pbmtext.test -+++ test/pbmtext.test +--- a/test/pbmtext.test ++++ b/test/pbmtext.test @@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm} # One long row diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch index 870998bc98a8..8bb1b17e15fa 100644 --- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch +++ b/media-libs/netpbm/files/netpbm-10.76.00-test.patch @@ -1,7 +1,7 @@ automatically skip tests of disabled tools ---- GNUmakefile -+++ GNUmakefile +--- a/GNUmakefile ++++ b/GNUmakefile @@ -455,6 +458,21 @@ deb: .PHONY: check-package .PHONY: check-install @@ -60,8 +60,8 @@ automatically skip tests of disabled tools $(SRCDIR)/test/Execute-Tests 2>&1 ---- test/all-in-place.test -+++ test/all-in-place.test +--- a/test/all-in-place.test ++++ b/test/all-in-place.test @@ -367,11 +367,62 @@ ordinary_testprogs="\ zeisstopnm \ " @@ -125,8 +125,8 @@ automatically skip tests of disabled tools $i --version 2>&1 | \ egrep -v -e fiascotopnm -e \ "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \ ---- test/fiasco-roundtrip.test -+++ test/fiasco-roundtrip.test +--- a/test/fiasco-roundtrip.test ++++ b/test/fiasco-roundtrip.test @@ -2,6 +2,10 @@ # This script tests: pnmtofiasco fiascotopnm # Also requires: pnmpad @@ -138,8 +138,8 @@ automatically skip tests of disabled tools # Should print 215556145 102615 pnmpad --black --bottom 1 --left 1 testimg.ppm | \ ---- test/jbig-roundtrip.test -+++ test/jbig-roundtrip.test +--- a/test/jbig-roundtrip.test ++++ b/test/jbig-roundtrip.test @@ -2,6 +2,9 @@ # This script tests: pnmtojbig jbigtopnm # Also requires: pamchannel pamtopnm @@ -150,8 +150,8 @@ automatically skip tests of disabled tools # Test 1. Should print 2425386270 41 pnmtojbig testgrid.pbm | jbigtopnm | cksum ---- test/legacy-names.test -+++ test/legacy-names.test +--- a/test/legacy-names.test ++++ b/test/legacy-names.test @@ -94,8 +94,30 @@ ordinary_testprogs="\ ppmtouil \ " @@ -183,8 +183,8 @@ automatically skip tests of disabled tools $i --version 2>&1 | \ egrep -v \ "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \ ---- test/png-roundtrip.test -+++ test/png-roundtrip.test +--- 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. @@ -196,8 +196,8 @@ automatically skip tests of disabled tools # Test 1. Should print 1926073387 101484 18 times for flags in "" -interlace \ -gamma=.45 \ ---- test/png-roundtrip2.test -+++ test/png-roundtrip2.test +--- 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. @@ -209,8 +209,8 @@ automatically skip tests of disabled tools # Test 1. Should print 1926073387 101484 twice for flags in "" -gamma=.45 do ---- test/ps-roundtrip.test -+++ test/ps-roundtrip.test +--- a/test/ps-roundtrip.test ++++ b/test/ps-roundtrip.test @@ -8,6 +8,10 @@ ## (1) zlib was not linked. ## (2) ghostscript is not available. @@ -222,8 +222,8 @@ automatically skip tests of disabled tools tmpdir=${tmpdir:-/tmp} # pstopnm does not use libnetpbm functions for output. ---- test/tiff-roundtrip.test -+++ test/tiff-roundtrip.test +--- a/test/tiff-roundtrip.test ++++ b/test/tiff-roundtrip.test @@ -2,6 +2,9 @@ # This script tests: pamtotiff tifftopnm # Also requires: @@ -234,8 +234,8 @@ automatically skip tests of disabled tools # Failure message ## Second test fails if Netpbm was built without the flate library ---- test/utahrle-roundtrip.test -+++ test/utahrle-roundtrip.test +--- a/test/utahrle-roundtrip.test ++++ b/test/utahrle-roundtrip.test @@ -2,6 +2,9 @@ # This script tests: pnmtorle rletopnm # Also requires: pamchannel pamtopnm diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild index 9819f53b3fc7..1824974a3eec 100644 --- a/media-libs/netpbm/netpbm-10.70.00.ebuild +++ b/media-libs/netpbm/netpbm-10.70.00.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 -inherit toolchain-funcs eutils multilib +inherit toolchain-funcs DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" HOMEPAGE="http://netpbm.sourceforge.net/" @@ -14,6 +14,8 @@ 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 ) @@ -23,38 +25,43 @@ RDEPEND="jbig? ( media-libs/jbigkit ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - app-arch/xz-utils - sys-devel/flex" +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;; + *-darwin*) echo dylib;; + *) echo unixshared;; esac } + netpbm_libsuffix() { local suffix=$(get_libname) - echo ${suffix//\.} + echo "${suffix//\.}" || die } + netpbm_ldshlib() { case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + *-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 + echo NONE || die fi } src_prepare() { - epatch "${FILESDIR}"/netpbm-10.31-build.patch - epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530 - epatch "${FILESDIR}"/netpbm-10.70-system-libs.patch + default # make sure we use system libs sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die @@ -66,9 +73,11 @@ src_prepare() { $(usex rle '' 'utahrle-roundtrip') $(usex tiff '' 'tiff-roundtrip') ) - if [[ ${#del[@]} -gt 0 ]] ; then + + 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') @@ -77,7 +86,8 @@ src_prepare() { $(usex rle '' 'pnmtorle rletopnm') $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') ) - if [[ ${#del[@]} -gt 0 ]] ; then + + 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 @@ -88,6 +98,7 @@ src_prepare() { -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 @@ -149,7 +160,7 @@ src_configure() { 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" + [[ $? -eq 0 ]] || die "writing config.mk failed" } src_compile() { @@ -168,21 +179,27 @@ src_install() { # without any actual dependencies, thus the -j1. emake -j1 package pkgdir="${ED}"/usr - [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) + 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] - use doc && dohtml -r userguide dodoc README - cd doc + + cd doc || die dodoc HISTORY Netpbm.programming USERDOC - dohtml -r . + + docinto html + dodoc -r *.html + use doc && dodoc -r ../userguide/*.html } diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild index 77c99fa54c23..32f9f2ae5d2b 100644 --- a/media-libs/netpbm/netpbm-10.76.00.ebuild +++ b/media-libs/netpbm/netpbm-10.76.00.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit toolchain-funcs eutils multilib +inherit toolchain-funcs DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" HOMEPAGE="http://netpbm.sourceforge.net/" @@ -14,6 +14,8 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 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" +BDEPEND="app-arch/xz-utils + sys-devel/flex" RDEPEND="jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) @@ -24,24 +26,31 @@ RDEPEND="jbig? ( media-libs/jbigkit ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - app-arch/xz-utils - sys-devel/flex" +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 +) netpbm_libtype() { case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; + *-darwin*) echo dylib;; + *) echo unixshared;; esac } + netpbm_libsuffix() { local suffix=$(get_libname) echo ${suffix//\.} } + netpbm_ldshlib() { case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; esac } netpbm_config() { @@ -53,10 +62,7 @@ netpbm_config() { } src_prepare() { - epatch "${FILESDIR}"/netpbm-10.76.00-build.patch - epatch "${FILESDIR}"/netpbm-10.76.00-test.patch #450530 - epatch "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch - epatch "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012 + default # make sure we use system libs sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die @@ -145,7 +151,7 @@ src_configure() { 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" + [[ $? -eq 0 ]] || die "writing config.mk failed" } src_compile() { @@ -164,21 +170,27 @@ src_install() { # without any actual dependencies, thus the -j1. emake -j1 package pkgdir="${ED}"/usr - [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) + 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] - use doc && dohtml -r userguide dodoc README - cd doc + + cd doc || die dodoc HISTORY Netpbm.programming USERDOC - dohtml -r . + docinto html + dodoc -r *.html + + use doc && dodoc -r ../userguide/*.html } diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest index b116f15ae3b1..ec785e47a0b1 100644 --- a/media-libs/nv-codec-headers/Manifest +++ b/media-libs/nv-codec-headers/Manifest @@ -1,9 +1,11 @@ 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-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 EBUILD nv-codec-headers-10.0.26.0.ebuild 759 BLAKE2B 7ec2db5c03c43de930ccbcf0345a83037c8bda64d104134d66dd53171f2d169c2948dec4ed772ac3f2173fa98a890dba20d83547daa1411bf73025fdf84635c7 SHA512 e9bc9c52ae0edd7bebedca223f3abfd7f9e117d95a793fb3dd6477dd066c1af0e2bfc66da11904436c8e58e7764c73efaf767bb3a67b9cd82012ae0351d2f977 +EBUILD nv-codec-headers-10.0.26.1.ebuild 759 BLAKE2B 7ec2db5c03c43de930ccbcf0345a83037c8bda64d104134d66dd53171f2d169c2948dec4ed772ac3f2173fa98a890dba20d83547daa1411bf73025fdf84635c7 SHA512 e9bc9c52ae0edd7bebedca223f3abfd7f9e117d95a793fb3dd6477dd066c1af0e2bfc66da11904436c8e58e7764c73efaf767bb3a67b9cd82012ae0351d2f977 EBUILD nv-codec-headers-8.1.24.2.ebuild 791 BLAKE2B 1a30ee929c9619f0497c4912b709b3e860227ef5daf466e9319bb4799aaf6de7b377324f779d674b78b45ae23041d65188a4ede6827a1cf35cd913ad36a2c9fb SHA512 258ad2e47ed9dcfabe870010f15670e318d064e35bbc1ed60347b48b91d0be65c941125794e817df013851263657628ee844e08d1c000390ad244960f5b58675 EBUILD nv-codec-headers-9.0.18.1.ebuild 791 BLAKE2B 883e69bfc8304eff9f48c6095f2356df69ad16f6cfcfe2f4ef23cc648641a69ea9a3f50740e1f1b8305e00d72e10812d69714603bd96c8f2dc42e0322a5b66b4 SHA512 0a947197e469c989d2fe76adc2f303c96ce6e9d441521daa7ca87c4aaf99d7890d19b59c3727d83be54bef1b2279097033d5441ba274b9212958289086e453e6 -EBUILD nv-codec-headers-9.1.23.1.ebuild 759 BLAKE2B d09b9c5863b543e4f8f58891013cab461c5750ea9bff3caab8d4d5f2064d12e4b0180479ce0616537f9c3238c3f81adb2743e0b71c7ecea94adeb9458265764e SHA512 56b6dbe1c3248fd8045c2c5d9375a7f497ed96f0f5498baf2a35bc1587ed6af737586f6da7c2ca36755b252991c933b8c2a0aa62c6e1c202008b1614860208b3 +EBUILD nv-codec-headers-9.1.23.1.ebuild 758 BLAKE2B 1e5096e56aababfe603c97bc548b18f44cd3f025f23ac2fc522bacc6029848e13a12d5cb9686e2b4b8a9ab4d4cd31849659897e97a1da9be8e2ed43bc4dbbbc8 SHA512 2f4e666dd3d801a775761f836c04b782a87b40aaf0936805b2abadb3c074b2314e1db0e98f7b91b64270367756682c0d72b437c677a5b3c3a66fc5e9e354805a MISC metadata.xml 319 BLAKE2B 227369d173003d904c042ec479371e9a483e6d7d58af0f8f1a03317e773bbbd0a06250e06583cf2cbbbe9020a1d7cd416b51467dc96649ead55f51785c79a019 SHA512 c1815f8f72b994c4f4fbd3edf1a856c89848e092b3b6515e706ef26b6b09d0096582219b7670b2b822ccecdfeefcbbbe768141acc3f4e55ca8879045a8ed51cd diff --git a/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild new file mode 100644 index 000000000000..74d91fe786d8 --- /dev/null +++ b/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + >=x11-drivers/nvidia-drivers-445.87[${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/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild index 53d4bd8e6f39..81c82774fc00 100644 --- a/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild +++ b/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" DEPEND="" diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index c6c091875ab4..4c21275b4754 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -5,5 +5,5 @@ AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01 DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173 EBUILD opencollada-1.6.63-r1.ebuild 1640 BLAKE2B 18ac545d76b9ebc99b5f85d44503e184fa195ec691ddc6cb2453ce9cd8d095784df884a029caba88cb1a962ea40a525efe309032a4bc93b1e69cbe05580b5b69 SHA512 04c9b1453208e360d449adb678876f0d6856704222e1cfeb5de4c1448f34b73b407c00235b62848a7fd9b6e4360dfd1be419a8815acbd7bf24f719d9169fbf75 -EBUILD opencollada-1.6.68.ebuild 1874 BLAKE2B c3b50085f4e57def1bf52f713ad630b73a8f3167cff8814041515d92ef5d764dc788c07e04da281cbdf290bbe495967d24d840174a2c9fba23745a12edf78c46 SHA512 bd64254f549da23fadbbba96d58d5624fd48482e6a3db257b4fce09672efa9ba4ff19d5b87284db3dede63009732fb02c96a128dc11cfac4111dc408ab4b4df9 +EBUILD opencollada-1.6.68.ebuild 1873 BLAKE2B ec57fd450e0f622999428485ff9dd4dc31ccbb9b4cab915a45794f8db6e29f0b8efa88ca28c7abca9a7221b1d32c3505dcb25be4b0353d5046988bc238343b2d SHA512 c64b0d3134fdeacc794e99615bd93c5aa9b0fc5caccb81a4d93da717019e24e5e986100d56bd2210e87df147614ad077d2622da37b70ff3c9b4b7b0241c058b5 MISC metadata.xml 458 BLAKE2B 5ca8dec8f5e0c58c4351c20d64bfe6e45a3e673e337f2e5bebf3cea759cc44c10de579e33ca7f99a64908a0553b99f206ee6440432eb142097cf184361526b7f SHA512 45cf8dc7088652a5982c5535afbe54fb2afab57417b811148e91c0530f57c5d4801cecf28d1ed9a8a097fbb55b9389caf568c8f94972665bb7b53e0cc7ed876c diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild index f5f42819616b..9be28a0a789c 100644 --- a/media-libs/opencollada/opencollada-1.6.68.ebuild +++ b/media-libs/opencollada/opencollada-1.6.68.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${ LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" IUSE="static-libs" RDEPEND=" diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest index 9c52bf672c51..e9bbb716cdd4 100644 --- a/media-libs/opencolorio/Manifest +++ b/media-libs/opencolorio/Manifest @@ -3,6 +3,10 @@ AUX opencolorio-1.1.0-remove-Werror.patch 473 BLAKE2B add95a92f243df8abe26f51dbd AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd13c22cdcf23e7af75b0c92dd1b85f86e9046c76eadb22b0c1b2bad06f1937bc0d2220a4e2c9a85c0b1b5e6d356b9257fd149ba503944d1bd1356b3d0d51bf SHA512 e14370a15e3e6fc5e3dc70fa52d4e11cf7ac35c2dbc8635e94c52cb02a47f10936e57b1b713f8ee2ca8481ed467e2e6835bf392468bd82d1236a50289df6584e AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5 +AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22 +AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998 +DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33 EBUILD opencolorio-1.1.0-r4.ebuild 2327 BLAKE2B b3064acecd3582ee6aa687e0bb4a56a68e598002194d96227705e0b9b3bc77d907600478181876684d33efbf9e1339a3ddfc43c1102cdbbae377c44a8eaf516d SHA512 9ce4183f83ae5a3d9d1a33d811ad89a4f5d92613e8b83b337fb83e943125ef976fb483cf13057598a7c5a91f0c18ce229da7f8869f238501ae1989979373589d +EBUILD opencolorio-1.1.1.ebuild 2398 BLAKE2B d4a1bdf1551818847622d2f3ad21886056e6edd7edc6da36eba5477441a970fe9d5bd6094afce2cd38f4b3560ba09403809d893af3eeaf3db50992ba1d01f0fb SHA512 60012a9caa19a3a0682e32af0354ef416afa9fdab3c79f3dc9c0f88f7b6cf8b3a9bdda62bc144861fd3b3c23c0463199bb360726cb13f22a1aca401770b1c513 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9 diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch new file mode 100644 index 000000000000..c6193277458f --- /dev/null +++ b/media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/754966 +https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/563 +Fixed upstream in a larger set of changes. +--- a/src/core/Config.cpp ++++ b/src/core/Config.cpp +@@ -330,7 +330,7 @@ + sanitytext_ = rhs.sanitytext_; + + cacheids_ = rhs.cacheids_; +- cacheidnocontext_ = cacheidnocontext_; ++ cacheidnocontext_ = rhs.cacheidnocontext_; + } + return *this; + } diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch new file mode 100644 index 000000000000..0f3c3e3ba19b --- /dev/null +++ b/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch @@ -0,0 +1,35 @@ +This check is redundant. The appropriate versions of yaml-cpp +already had a dependency on Boost, but that's not even the case anymore. + +Check has been dropped upstream since. +https://bugs.gentoo.org/747553 +---- +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eb20913..434e38b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -272,24 +272,6 @@ if(USE_EXTERNAL_YAML) + mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND) + + if(YAML_CPP_FOUND) +- if(YAML_CPP_VERSION VERSION_GREATER "0.5.0") +- # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them. +- # Don't bother doing this step if we are already including the boost headers for shared_ptr +- if(NOT OCIO_USE_BOOST_PTR) +- set(Boost_ADDITIONAL_VERSIONS "1.49" "1.45" "1.44" "1.43" "1.43.0" "1.42" +- "1.42.0" "1.41" "1.41.0" "1.40" +- "1.40.0" "1.39" "1.39.0" "1.38" +- "1.38.0" "1.37" "1.37.0" "1.34.1" +- "1_34_1") +- set(Boost_USE_MULTITHREADED ON) +- find_package(Boost 1.34) +- if(NOT Boost_FOUND) +- message(FATAL_ERROR "Error: Detected system yaml-cpp version ${YAML_CPP_VERSION} is greater than 0.5.0, and therefore requires boost, but a boost installation could not be found.") +- endif() +- +- set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}) +- endif() +- endif() + set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${YAML_CPP_INCLUDE_DIRS}) + else(YAML_CPP_FOUND) + message(FATAL_ERROR "ERROR: System yaml-cpp library was not found. Make sure the library is installed and the pkg-config file exists.") diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild new file mode 100644 index 000000000000..f5179fea4002 --- /dev/null +++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit cmake flag-o-matic python-single-r1 + +DESCRIPTION="A color management framework for visual effects and animation" +HOMEPAGE="https://opencolorio.org/" +SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OpenColorIO-${PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~ppc64 x86" +IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test" +REQUIRED_USE=" + doc? ( python ) + python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-cpp/yaml-cpp-0.5 + dev-libs/tinyxml + opengl? ( + media-libs/lcms:2 + media-libs/openimageio + media-libs/glew:= + media-libs/freeglut + virtual/opengl + ) + python? ( ${PYTHON_DEPS} ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ') + ) +" + +# Restricting tests, bugs #439790 and #447908 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch" + "${FILESDIR}/${PN}-1.1.0-remove-building-of-bundled-programs.patch" + "${FILESDIR}/${PN}-1.1.0-yaml-cpp-0.6.patch" + "${FILESDIR}/${PN}-1.1.0-remove-Werror.patch" + "${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch" + "${FILESDIR}/${P}-fix-self-assign-clang.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + use python && python_fix_shebang . +} + +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=( + -DOCIO_BUILD_JNIGLUE=OFF + -DOCIO_BUILD_NUKE=OFF + -DOCIO_BUILD_SHARED=ON + -DOCIO_BUILD_STATIC=$(usex static-libs) + -DOCIO_STATIC_JNIGLUE=OFF + -DOCIO_BUILD_TRUELIGHT=OFF + -DUSE_EXTERNAL_LCMS=ON + -DUSE_EXTERNAL_TINYXML=ON + -DUSE_EXTERNAL_YAML=ON + -DOCIO_BUILD_DOCS=$(usex doc) + -DOCIO_BUILD_APPS=$(usex opengl) + -DOCIO_BUILD_PYGLUE=$(usex python) + -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2) + -DOCIO_BUILD_TESTS=$(usex test) + ) + + use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON ) # broken + cmake_src_configure +} diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 37cb176cb012..4349225e55d2 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -3,10 +3,19 @@ AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d87762453 AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653 AUX opencv-4.1.2-pkg-config-file.patch 345 BLAKE2B ba3968a5dbdcc981cc513055ca99b8726ba2fe993cb8c128d574688a748dbd6fc287089bc0c04af89f6b9b62b37cae9663a81c329b6a2dab4919470450b9f6c7 SHA512 0fa66ca24c0fa72dc9e13c0c40592cf5ca5aa5856d1747613f9c4528f0b00f05dd224662c022563db994f7e43879b97d1ba1f0afa2703c30e4a3efc520dc332d +AUX opencv-4.4.0-disable-native-cpuflag-detect.patch 1218 BLAKE2B 06569f6b7d33eccb11cae74624a2cc7d7e1eb788145813509220dc8436d2380892392be8c4af03fec845f3eade74b6277985cf80e38785317b15f17890bcaa4c SHA512 3be60f7ee28e3b001ef0c791e3ce1c849ff6fa9fdb70731716668b2698eed9abb24ee3aead1dbc857ed68fc46a645c70a1e3831e8a3e5a5b1791aa06bd2f9ee1 +AUX opencv-4.5.0-link-with-cblas-for-lapack.patch 726 BLAKE2B adbffd961c88229bf810e13fe20705352ff506a653c1d55bb0687c03d8daf9e05aed0f2ba9cd6e306c625837d6ddf64eeb99dc6cbf2b15fae833f4a7eea6aad0 SHA512 4c3108e304721c2cd78eb82f5d7bccc18831db5f47bc628a98ae6a37da389deef30e7e9b6dc5644e3bc0e0fafdd907dc37822a58a25555999698527d2ac364b0 DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622 +DIST opencv-4.4.0.tar.gz 88887103 BLAKE2B 87838e2c837074c445eeead11b76b0ab6f433873195169fe288dfb5e4844f27b13126ef9c0d973857693c77db82168826df698ee7f34bc10eec3bda869b30d32 SHA512 ce4bada7b57c1a00439eca02abcba262732d5eabfd26090f6f83642d747a9a1a7908230bcd01a2b999c509e0c43c8b0dcb2b93ac824518b79cffe533f22652bb +DIST opencv-4.4.0_contrib.tar.gz 59968818 BLAKE2B 2e2c1bf776fef0b4d9f92406665adfbce96e6185a4b5fda82cfdd1e7899b3ca7e7615c4dce508082fcf94a10cfa160154ac0aa7a90ce2635f566a65176678dcd SHA512 d1a29a4a343f55fe2ae04966d2fc2d20765de719619bea68b84ee72f432777062727d8105b0aa168f359e468544b2ea930b1a4f8dc059e51de27d8af229c6b6b +DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e +DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3 SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f +DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 EBUILD opencv-4.1.2-r3.ebuild 18316 BLAKE2B 8775108cacc4c8f89fec915f73a4ba2c3908cf69c3e9c6d59c14dde2239c597845c04b5875591bef753ef6076e0009eb0630b95b0024660ac8d5ea773749eef2 SHA512 ed1cc7ba12fff122c700c5d88a2055677db459d0547a1eb465313a0b1db4efa75663618607facc1d33c97c9dd02a517d09bd627140082374851c97a9bec1a38c -MISC metadata.xml 2786 BLAKE2B 1a29ddd9b75277f52d0a66cfb60fe2ad240ffdbdbf58a74038c684658405e90e858470b84fc0ff0935c972020152cfe6b6570a53ac68b71c299036e06516f469 SHA512 aa72fe71384691be664703e35c2f1342f9c90881d761b04e16357869c515fba551940b5bb624f9a7085f1ffa2e26067ac28b42fd97375d8a81a1901158b86ffc +EBUILD opencv-4.4.0-r1.ebuild 20301 BLAKE2B 822f7c3d46de91b998481fbf26731ea1ca5d134c73ff22dd0cf0f8a325a9e58208ad99ce545f56ab97de1e2c17fd15d61dffbe72093be93eb2150be6beaec161 SHA512 ed3ab5ad91c438a383b5037ec35c1713244dca7bd20fb0c770ca27d4cd8afe3516be6b76f5be3f383765a9064ef974b4a85dfe77538127375966ee873ab1536a +EBUILD opencv-4.5.0.ebuild 20529 BLAKE2B 67363a3f10feeeacf0b24156257acb65004939c15b700381df5729f275450c3d440cda7779f9db1a5cab676308b2e26177391c08f74a71ef655fba5dbbf14cf0 SHA512 04cc308127b2c80996e651028ed8ddb015a44c3b05dfc3515b146292542e604e5267b2a6bb30e4a8f4d66ff59725baf80b9dde1142114d6a499a2937fea27c82 +MISC metadata.xml 3132 BLAKE2B 7a499ebf8678ccae68c4947075f925b439ecdcca8a56c77c8a57895d57ffda6ecaade65e1124d12a78bbdf15eef8f9c4524c921bc53009aeb7defd5c489396a6 SHA512 ff59cff9b8f41e69f421bee8d2680eb655c3336f2eafa8c3567ec0d0509707bf9cd0ba41190a8012564d43d87ac5b35e5dc2c827167ed6d315e422a53a13900a diff --git a/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch b/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch new file mode 100644 index 000000000000..89ac1ff47ca1 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch @@ -0,0 +1,26 @@ + cmake/OpenCVCompilerOptimizations.cmake | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/cmake/OpenCVCompilerOptimizations.cmake b/cmake/OpenCVCompilerOptimizations.cmake +index 970dd28903..b56892bb12 100644 +--- a/cmake/OpenCVCompilerOptimizations.cmake ++++ b/cmake/OpenCVCompilerOptimizations.cmake +@@ -156,12 +156,12 @@ if(";${CPU_BASELINE};" MATCHES ";NATIVE;" OR ";${CPU_BASELINE};" MATCHES ";HOST; + set(_add_native_flag ON) + elseif(";${CPU_BASELINE};" MATCHES ";DETECT;") + set(CPU_BASELINE_DETECT ON) +-elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ") +- if(DEFINED CPU_BASELINE) +- message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.") +- endif() +- set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") +- set(CPU_BASELINE_DETECT ON) ++#elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ") ++# if(DEFINED CPU_BASELINE) ++# message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.") ++# endif() ++# set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") ++# set(CPU_BASELINE_DETECT ON) + endif() + + if(X86 OR X86_64) diff --git a/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch b/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch new file mode 100644 index 000000000000..acee677052d6 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/OpenCVFindLAPACK.cmake b/cmake/OpenCVFindLAPACK.cmake +index 342bebc..9ebd206 100644 +--- a/cmake/OpenCVFindLAPACK.cmake ++++ b/cmake/OpenCVFindLAPACK.cmake +@@ -136,10 +136,12 @@ if(WITH_LAPACK) + ocv_lapack_check() + endif() + if(NOT HAVE_LAPACK) +- if(LAPACKE_INCLUDE_DIR) ++ find_package(CBLAS) ++ if(LAPACKE_INCLUDE_DIR AND CBLAS_FOUND) + set(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDE_DIR}) + set(LAPACK_CBLAS_H "cblas.h") + set(LAPACK_LAPACKE_H "lapacke.h") ++ set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${CBLAS_LIBRARIES}) + set(LAPACK_IMPL "LAPACK/Generic") + ocv_lapack_check() + elseif(APPLE) diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index 98984a7467b5..ad1fde1b865e 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/metadata.xml @@ -18,6 +18,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under Enable features2d module Enable support for sci-libs/gdal library Enable x11-libs/gtk+:3 support + Build using Link Time Optimizations (LTO) Enable compilation with opencvapps Use Google's C++ argument parsing library Use Google's C++ loggin library @@ -26,6 +27,8 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under DNN module contrib requires tiny dnn HDF module requires sci-libs/hdf5 SFM module requires eigen, gflags, and glog + Enable Drawing UTF-8 strings with freetype/harfbuzz + Enable Ogre vision module support Download dnn caffeemodel samples Add support for OpenCL Use Google's OCR Engine diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild new file mode 100644 index 000000000000..df2a210f927d --- /dev/null +++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild @@ -0,0 +1,559 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +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/${PV}.tar.gz -> ${P}_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="BSD" +SLOT="0/${PV}" # subslot = libopencv* soname version +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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. +REQUIRED_USE=" + cuda? ( 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 ) + 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.6:* ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) + lapack? ( virtual/lapack ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr[${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 + =virtual/jdk-1.6 )" +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 +) + +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 -rf 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-${PV}" "${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 + use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};" + 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 -rf 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 -rf modules/python2 || 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.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild new file mode 100644 index 000000000000..c9bf0e907840 --- /dev/null +++ b/media-libs/opencv/opencv-4.5.0.ebuild @@ -0,0 +1,567 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +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 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. +REQUIRED_USE=" + cuda? ( 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.6:* ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) + lapack? ( + virtual/cblas + virtual/lapack + virtual/lapacke + ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr[${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 + =virtual/jdk-1.6 )" +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 +) + +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 cef17c2bed5e..6331a56a45cb 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -12,5 +12,5 @@ AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123 DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382 -EBUILD openexr-2.5.2.ebuild 1653 BLAKE2B 5d341c8b4cd28dfcbf025bd318041aad576875f89216f2cdcded4184562535d176baf2ad937537f0fbf5af87dbea0642258346df1efd053fd8427b41861a35d0 SHA512 a1c5c8d09aef7b99cda117cb25bf8c3af18a6ae0c744be65c0bb6aca081adf7e938f7803caf183b163309be431d5cb445ea84f33c9d6a3245fc35debac7948ba +EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 3f2a16ce4851e58e74641e617eeb4c7399f9901f8d3e4b283f2611b21bf918723b7509b13706cdbd52d5f62ebcddd2402de17145c79ff5eaed9109dabda5a2a1 SHA512 24bf09e27d774868612f08fa2f50e44f91e3717a85cae5afba47f1e5c2e8931c84cf42879fbe1573a6d2bcf98cd39d1f2659c095e7bd49e6c9f978b869453a6c MISC metadata.xml 666 BLAKE2B 0faed6c1a1dfecdea8436ef7890af82b565dc9dd1bcc93b5e961ab53939cf6b62d6903e7f9a15ed6e8891de8e6f429cf5811cd2a2126105d71c9fbcc4fdadb2c SHA512 f81d6266a7af651a1e76aa60e3d40107b940548f6a34f4a47b08bc32e37aad32cff31a85d7c58c414b01d54835d224c2ca387f9a0dd1025e1bd5ddc7207281f2 diff --git a/media-libs/openexr/openexr-2.5.2-r1.ebuild b/media-libs/openexr/openexr-2.5.2-r1.ebuild new file mode 100644 index 000000000000..63da2483c2cb --- /dev/null +++ b/media-libs/openexr/openexr-2.5.2-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib flag-o-matic toolchain-funcs + +DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" +HOMEPAGE="https://www.openexr.com/" +SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +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" +IUSE="cpu_flags_x86_avx doc examples static-libs utils test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/ilmbase:=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${P}/OpenEXR" + +DOCS=( PATENTS README.md ) + +MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfigInternal.h ) + +src_prepare() { + cmake_src_prepare + + # Fix path for testsuite + sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests" + + if use abi_x86_32 && use test; then + eapply "${FILESDIR}/${P}-0001-IlmImfTest-main.cpp-disable-tests.patch" + fi +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DINSTALL_OPENEXR_DOCS=$(usex doc) + -DINSTALL_OPENEXR_EXAMPLES=$(usex examples) + -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) + -DOPENEXR_BUILD_UTILS=$(usex utils) + -DOPENEXR_INSTALL_PKG_CONFIG=ON # default + ) + + cmake_src_configure +} + +multilib_src_install_all() { + if use doc; then + DOCS+=( doc/*.pdf ) + fi + einstalldocs + + use examples && docompress -x /usr/share/doc/${PF}/examples +} diff --git a/media-libs/openexr/openexr-2.5.2.ebuild b/media-libs/openexr/openexr-2.5.2.ebuild deleted file mode 100644 index 8741703f3082..000000000000 --- a/media-libs/openexr/openexr-2.5.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic toolchain-funcs - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -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" -IUSE="cpu_flags_x86_avx doc examples static-libs utils test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/ilmbase:= - sys-libs/zlib[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${P}/OpenEXR" - -DOCS=( PATENTS README.md ) - -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfigInternal.h ) - -src_prepare() { - cmake_src_prepare - - # Fix path for testsuite - sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests" - - if use abi_x86_32 && use test; then - eapply "${FILESDIR}/${P}-0001-IlmImfTest-main.cpp-disable-tests.patch" - fi -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DINSTALL_OPENEXR_DOCS=$(usex doc) - -DINSTALL_OPENEXR_EXAMPLES=$(usex examples) - -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) - -DOPENEXR_BUILD_UTILS=$(usex utils) - -DOPENEXR_INSTALL_PKG_CONFIG=ON # default - ) - - cmake_src_configure -} - -multilib_src_install_all() { - if use doc; then - DOCS+=( doc/*.pdf ) - fi - einstalldocs - - use examples && docompress -x /usr/share/doc/${PF}/examples -} diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index bc6cc034bbcc..8dedb352c584 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,4 +1,5 @@ AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6 -DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7 -EBUILD openimageio-1.8.17-r2.ebuild 3303 BLAKE2B 36740a48bf14c437d92bdf5882e63353c60745fd3f3677c5398569af267749644ca2423ee42b5f4e4b0e17dc63774e68372e0f47b0b992fd777128b8d91787cd SHA512 911a1f992f1f298e4d496834b1c20f8db8779a02681d572b992a27f7d32b4a8860fc304e2f7e6d893479402fdd799b9c81465d6f3984b541d8a219f386944c99 -MISC metadata.xml 748 BLAKE2B e89aa731461192e01b368333a0832a106ced96d7a6d6dc1aa749e6c8658e28f654e9f4901946fa547d5ffca5c10364277814850d9b9936f5831d86bfa418cca7 SHA512 3ff7883072966c763052d32c6fff17732ccc551e9cddfa4548c1613a08bdc93644f16c1e8e8f88a3ecbe7a10b21a0a920517094ff13e40003adc97ecc0936bec +AUX openimageio-2.2.6.1-pugixml.patch 919 BLAKE2B 3f10cf27a3a521fed3b95183119da62333f3103998ad463c58b9e654ce23faedb0551a34d564899882d586411035bb0531c844425fa639f6def8bba9c10afe6a SHA512 fc834e27b2b166367d9aa2b4016bac70de1561ff6babfd543a6bd503785bd84a251b76a95bf15dbc76367e9482dc4589f208f57a537c2dc430c7e0999cd98bcf +DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e +EBUILD openimageio-2.2.8.0.ebuild 3333 BLAKE2B 89179cf97ee4ecea05dcd854485c4eebd47c1b4efe42f8296d5d7afc9960ce6acc720affffb80a498df8ba20a63ba76b3963e89a34cff151191c72dd3214f6d3 SHA512 eed484e60fa85a4ecf7f4553f25459f24909e46f60fd97e21bbbedfbeec50bcd3787716ed05e05f5de9663b22b13376a2d08bf11b0c5bf57db35c7db49efb332 +MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e diff --git a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch new file mode 100644 index 000000000000..d5cef06d38db --- /dev/null +++ b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch @@ -0,0 +1,21 @@ +https://github.com/OpenImageIO/oiio/issues/2732 + +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 1240f22..5cc5a2e 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -227,6 +227,14 @@ endif () + # allow this to be overridden to use the distro-provided package if desired. + option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF) + if (USE_EXTERNAL_PUGIXML) ++ find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp) ++ find_library (PUGIXML_LIBRARIES NAMES pugixml) ++ ++ set (PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR}) ++ set (PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR}) ++ set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARIES}) ++ set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR}) ++ + checked_find_package (pugixml REQUIRED + DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1) + endif() diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml index 4593e8d4cbff..dbbc1a37515e 100644 --- a/media-libs/openimageio/metadata.xml +++ b/media-libs/openimageio/metadata.xml @@ -1,12 +1,19 @@ - + + gentoo@aisha.cc + Aisha Tammy + + + sci@gentoo.org + Gentoo Science Project + - Enable color management via media-libs/opencolorio Enable DICOM medical image file support via sci-libs/dcmtk Enable f3d file (write) support via media-libs/Field3D Enable OpenCV support via media-libs/opencv + Enable OpenVDB support via media-gfx/openvdb Enable Ptex texture mapping system file support via media-libs/ptex diff --git a/media-libs/openimageio/openimageio-1.8.17-r2.ebuild b/media-libs/openimageio/openimageio-1.8.17-r2.ebuild deleted file mode 100644 index e0e7eafa62ad..000000000000 --- a/media-libs/openimageio/openimageio-1.8.17-r2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit cmake 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" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc64 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="color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="test" # bug 431412 - -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-libs/pugixml:= - >=media-libs/ilmbase-2.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=media-libs/openexr-2.2.0-r2:= - media-libs/tiff:0= - sys-libs/zlib:= - virtual/jpeg:0 - color-management? ( media-libs/opencolorio:= ) - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - field3d? ( media-libs/Field3D:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) - opencv? ( media-libs/opencv:= ) - opengl? ( - media-libs/glew:= - virtual/glu - virtual/opengl - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}] - ') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raw? ( media-libs/libraw:= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf ) - -PATCHES=( "${FILESDIR}/${P}-boostpython.patch" ) - -S="${WORKDIR}/oiio-Release-${PV}" - -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=( - -DINSTALL_DOCS=$(usex doc) - -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed - -DSTOP_ON_WARNING=OFF - -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_JPEGTURBO=ON - -DUSE_NUKE=NO # Missing in Gentoo - -DUSE_NUKE=OFF - -DUSE_OCIO=$(usex color-management) - -DUSE_DICOM=$(usex dicom) - -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_PTEX=$(usex ptex) - -DUSE_PYTHON=$(usex python) - -DUSE_QT=$(usex qt5) - -DUSE_LIBRAW=$(usex raw) - -DUSE_OPENSSL=$(usex ssl) - -DUSE_FREETYPE=$(usex truetype) - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - - cmake_src_configure -} diff --git a/media-libs/openimageio/openimageio-2.2.8.0.ebuild b/media-libs/openimageio/openimageio-2.2.8.0.ebuild new file mode 100644 index 000000000000..934cf38bd1c8 --- /dev/null +++ b/media-libs/openimageio/openimageio-2.2.8.0.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake 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 ~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 + -DBUILD_DOCS=$(usex doc) + -DINSTALL_DOCS=$(usex doc) + -DSTOP_ON_WARNING=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 +} diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest index 149168b615ba..e76662b945b9 100644 --- a/media-libs/opensubdiv/Manifest +++ b/media-libs/opensubdiv/Manifest @@ -8,5 +8,5 @@ DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e2 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2 EBUILD opensubdiv-3.3.3-r1.ebuild 2353 BLAKE2B 4eccc2e751cbce369404a84cf63e4df2d34af2a4294d881318517b9720ec1907c9066596f8eab720753ad3113de2589ae20eedcaf1fe29439f3d6ce3f7e5f339 SHA512 c56ea6354772d7837b7649d43e2e221b76a0abbca1d5d2ef7aa0e422596d9e85d0faf9d61b1b75b5fd5bb42518793c0595bc2bd27f1fab3e618ac2ebc3a5f0b9 EBUILD opensubdiv-3.3.3.ebuild 1598 BLAKE2B bdd3778c1189c2237ca5b2fbc4b68645c055654a877b125545fa2c528431ef0fcc73bff69118e3997289f7d5698043358c4aedea42fd6236bd4f2cef0629cade SHA512 643d0fc5dde3b521b3a4e794f836df3bf7f0a097626719858b86caa19ee05443961b16823ef3f72dc9e263326966fe07cec2532e4f0908c7ab4634a65e60a82f -EBUILD opensubdiv-3.4.3.ebuild 2353 BLAKE2B 4eccc2e751cbce369404a84cf63e4df2d34af2a4294d881318517b9720ec1907c9066596f8eab720753ad3113de2589ae20eedcaf1fe29439f3d6ce3f7e5f339 SHA512 c56ea6354772d7837b7649d43e2e221b76a0abbca1d5d2ef7aa0e422596d9e85d0faf9d61b1b75b5fd5bb42518793c0595bc2bd27f1fab3e618ac2ebc3a5f0b9 +EBUILD opensubdiv-3.4.3.ebuild 2352 BLAKE2B 4f63d66a6e3f273fb78cccfde28f9f32d0cb77751ca8fb728450c3db8309c4bbe8326f849b339a13b24778db6939789d15c1a81669c3690a7ddfa961ded16c5b SHA512 ff3f3bcda330f307973e8ac2cf3e3e550d45b40ba141f59883083b6bbc9f3a07e3ffa74b40a709af710104dcfead3505d91acb15b2554504087d26de571f8316 MISC metadata.xml 1005 BLAKE2B 8672aa4423818052199d3a4d3e594b1d838accbb5e332f9eeb075593c7a466f93698d171a543a6e39829028baaf62a1713d09682aefeb4a904ab41dde43ea4f0 SHA512 cd592ca220b954b57199944e41a9904bfe5efde067eb4d7640d008adc2dacfb02ebebb3783f5bbc99436f7213b2b9397b2e1d4408cb837462909070649aa093d diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild index 92f1b42c70ad..6944163c7dfd 100644 --- a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild +++ b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t # See for example CMakeLists.txt for details. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="cuda doc examples opencl openmp ptex tbb test tutorials" RDEPEND=" diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest index 1e2013f8164b..e82652f07b23 100644 --- a/media-libs/opus/Manifest +++ b/media-libs/opus/Manifest @@ -1,3 +1,3 @@ DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd -EBUILD opus-1.3.1-r1.ebuild 1056 BLAKE2B 007c19973dd340c1688f7cd5ee3e789cafbc2a61b39ec7a3abc621b4b5f0485b6cf0221c27e068146b048c59689abbdd58a77e8e25e6af043cb4bd198a06342c SHA512 34196a2aed66f993640b099df200faddcfb49da8680ee81fb924d545c38171e6d92be70bde1a554aab8340c0bff12d4610ac4403c278529852f0379862683bb5 +EBUILD opus-1.3.1-r1.ebuild 1057 BLAKE2B f4cacf3dfc8eeb21f4e5c873a25b1a5b14e0c559b01b92d4f5742447405d21fe67ffc136b9a01cd1f1eb7a37dc2a974a26d55768eef9aa3c22ff4f8647bc6390 SHA512 aea7979015a90853da761e949b2c8f0c0e0f5de5df437c06b4550116f1c40e54332a07ffe99ee28bffa490e3a7e94c059c0ede83bd65fd1ea378928ff9139ea5 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387 diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild index d952bb8f91f6..d012b9cbb222 100644 --- a/media-libs/opus/opus-1.3.1-r1.ebuild +++ b/media-libs/opus/opus-1.3.1-r1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon" IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}" -DEPEND="doc? ( +BDEPEND="doc? ( app-doc/doxygen media-gfx/graphviz )" diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest index a8ab90409479..5acbdbf40cae 100644 --- a/media-libs/partio/Manifest +++ b/media-libs/partio/Manifest @@ -3,7 +3,7 @@ DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448 DIST partio-1.10.1.tar.gz 333129 BLAKE2B 82d1dd36e9854e221af036d386ecdc558ac032ad7cd720403787ddc83ac236f05fd86e8c07ade07ca93b06a12ac2b834c96a6d43265e396934e44a815df003d3 SHA512 7d3c6449ebd1e8b8a29298a3119acfd1036970b287e9cd5f288a63c7e2b3bf451e9e1ba8fc72f203e225eb2b062d59cd7373817ccc6467de67427d02c0b12477 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636 EBUILD partio-1.1.0_p20170829.ebuild 1150 BLAKE2B a231c54b7d256e40540c0afff5da3dbdee3efde48322fcda74301ca083e9b181f80c6230a19bcd6bfc3959e6a6d91a0eadc3fdb079e1aed7711a4068c00bfc70 SHA512 1b1d06b0fbdd883bcb4c7753817c8e9c752cf0eb62fd03539fa9379da17ea6696e7eb7955ed74da411b3e5fa4d777974ad81f00409984755dda3ac074f00e2d9 -EBUILD partio-1.10.1.ebuild 1008 BLAKE2B b7b073f4e798a8292704cad36d74621b9cbdcd8e77e7f8f7c5b2779b930c802362a831108653188f8d033999046c820fe4620d8dbcd1d67aa8c1de2a233a9d7a SHA512 fcfca86824e9e87fe70059795ae4be995a4ab885fc0fe1810b672626f938c09772450d5e0046e8bb7c0960170cabca422c330ec6e007986c5d3dbe5fb204b479 +EBUILD partio-1.10.1.ebuild 1006 BLAKE2B 48267d8ad4309d0cb2c6721ec2831e3ed1cff8522ac96100a33e2c1b19e2368314a64698082d540a520adee4b4c0048dab7a809540a58e0fe3ab83863bf08108 SHA512 0895dbc4efee1668ef9e6ee11a2805d0cd042dd51c32a7056feb168433581d24daa4b7d142f18186b9af937d6e263943b4eead2a739bf28ce1b80bb6b69b1085 EBUILD partio-1.5.4.ebuild 1007 BLAKE2B 2d44a22f5f7f0ccf83072d81bc9ff2a05e767ad48ca196437ddbd55954030409da5f9e0c2af22021757ddd543ac06442919b75c0223b196f93dfa5c47b86c950 SHA512 35eb6faca53eb3ba6485e91bbba32baf42f0287b7ac08e45448eee579898f18a6d1f01c6ca4dfd02060193545f1f19a93bc8df13abe878ea3b46c48b9f305ae2 EBUILD partio-9999.ebuild 1009 BLAKE2B 27d69d8550e950548db3f6c63382f1f35c6d686813bef5081cf3a6cedd042df191e9d3b84ace2fe6c7a07415411fd0b616df1ddb92294a30dfb10e919fee3e73 SHA512 c0bd8bb432d4408737e971a4689c5f413e028661da957527f7208b90fac6dd0ee2ec029e30404f585ddb9bc6e27b894578b4c60c838e852e4865a4a5bb57dd1e MISC metadata.xml 444 BLAKE2B f9a6abe05db032e6425daecb9a5ccb29f5f0a1a2642f1184ccee43b7473efd5d1b014c656e7349b9326d7e7a7e15b3ae035a287ab129e69235c81b6dd0f9109c SHA512 78259bbbc1fce6259ea0c6ab0b6cb19aa570407ccb31a58183480c954a385941ecad95667318494d87fd3a3480e59faad55e029faf050d371a61592151d8544b diff --git a/media-libs/partio/partio-1.10.1.ebuild b/media-libs/partio/partio-1.10.1.ebuild index 670bbd70b484..5c5e61ef9717 100644 --- a/media-libs/partio/partio-1.10.1.ebuild +++ b/media-libs/partio/partio-1.10.1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/wdas/partio.git" else SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi DESCRIPTION="Library for particle IO and manipulation" diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest index 877b32594623..9df1f45b8a13 100644 --- a/media-libs/phonon-gstreamer/Manifest +++ b/media-libs/phonon-gstreamer/Manifest @@ -1,3 +1,3 @@ DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4 -EBUILD phonon-gstreamer-4.10.0.ebuild 956 BLAKE2B 7b6477b9b3eb92f46e7903d83fb04a26ab9d92f85a33e87522d280aa0a4b8df250c46df6e93f2405828d188e3b987602da970feffe69d3b711529ca582601cb1 SHA512 18544e6177af879704ca4bc3eb600d8c50ea3ba3717ebbedcb12f11fa4ff31cbc2b08a349943b947d6ddae6d323493939ea9765a2ab10b1595f8779aa3f56248 +EBUILD phonon-gstreamer-4.10.0.ebuild 965 BLAKE2B 50507e41322983cadaf219607607a6267fa9b42708ac2fcffd8125211d99c536a8a38a2ac9fed20c3ffcd73d04c1b33699d2c23d82696b04a596d1119d12ea25 SHA512 8829d0f26463be8778c7b824831af6defda36dec4426c302d49dd2bb2e98e661ed08ed624752ab9a6d037311625051369cd2e2559905bf7c612c4c52d83cb669 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild index 456356c259ff..0b30bf392228 100644 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild +++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild @@ -7,7 +7,7 @@ MY_PN="phonon-backend-gstreamer" inherit ecm kde.org DESCRIPTION="GStreamer backend for the Phonon multimedia library" -HOMEPAGE="https://phonon.kde.org/" +HOMEPAGE="https://community.kde.org/Phonon" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz" diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest index cf05fa2efeac..937ecb68a0d1 100644 --- a/media-libs/phonon-vlc/Manifest +++ b/media-libs/phonon-vlc/Manifest @@ -1,3 +1,3 @@ DIST phonon-backend-vlc-0.11.1.tar.xz 65064 BLAKE2B 2380d31f574b71e2552b37e5c2a8b22239268aac9c2875417486fd77496c89820b5b4c7e94d39bfebad62a5175a35767945e3f57830e69041ed7c58be4b978cc SHA512 4a068478eb1467477cf5c21813723779742eb15766aee2df8184da8c0b58598c5eff8aecefdcfed8e6136495f3caf7691c99d43e98226ab477c162ff19e1fa4e -EBUILD phonon-vlc-0.11.1.ebuild 709 BLAKE2B bf668e8d74709027bded7a2496db9393ea36880ad3fbcfde22d5232209d1900d915df7390d1c5235b4c2023d8ed0a4dc2c990e9c01f5cc60d0916c4fbdbde7be SHA512 03cf7b3953d003960eb2c8d44563f03c710d77f4235f73b516af9b9f625c774bae85b7c4fb0b56e80597d07236066b32d124a78db69e580a169c37adf641c226 +EBUILD phonon-vlc-0.11.1.ebuild 718 BLAKE2B bcbf42bd4e10829152e90b2a0a72a9f5c9268b04c32de53c5490ac606ac9796ce4cabde9ea0e62d32c35249d9d534287d5d33764bb53ac4c33b1fbc39f695523 SHA512 2a8d082490d0e2477a6804baf4c38da1a91ae89243107023a4f8b0ac55cd17ad0f22127d69ed0bfb4bf27aec5eac0d86502e1950f7630472d5d8c3f3e486077d MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild index e186b6bba7d7..36e81365b54a 100644 --- a/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild +++ b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild @@ -7,7 +7,7 @@ MY_PN="phonon-backend-vlc" inherit ecm kde.org DESCRIPTION="VLC backend for the Phonon multimedia library" -HOMEPAGE="https://phonon.kde.org/" +HOMEPAGE="https://community.kde.org/Phonon" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz" diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index a487f31e9f74..8d0f298756f9 100644 --- a/media-libs/phonon/Manifest +++ b/media-libs/phonon/Manifest @@ -1,3 +1,3 @@ DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74 -EBUILD phonon-4.11.1-r1.ebuild 1220 BLAKE2B bd2abaf505c48db7be2f0be7713dd866f227ea5a94fd5991b93f3eb6c070aa2c6b51e335636f9ae013a53df8326286127ddd353b408c521dce2eab8bf10ed1c2 SHA512 3e649d8dd4f6f078ed166abf6b2bbabd4c24d790cb257f0f43c2f00e57d7192a4577a47196a2ccd113694ce691e7eab33e60744a2e7c30d214a2267583b8becf +EBUILD phonon-4.11.1-r1.ebuild 1229 BLAKE2B fdb7c877d51d24c94c241abb90ad3309955c5f14ac1439887646c983050408669403f0ebe449fcc46f85ae4c82f69e87d1e706c9a12df7e8c5147fca09398ba5 SHA512 78c6ad72910486f576b137f3b3e93a1a9db0603caa6c12ec6f97568ca29bb713187567051dddfbf2db69cc7294940a6db3f30c5db30d1bd8c0a1ef47b6363bd4 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6 diff --git a/media-libs/phonon/phonon-4.11.1-r1.ebuild b/media-libs/phonon/phonon-4.11.1-r1.ebuild index 1f8000e23411..88892bcd4952 100644 --- a/media-libs/phonon/phonon-4.11.1-r1.ebuild +++ b/media-libs/phonon/phonon-4.11.1-r1.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit desktop ecm kde.org DESCRIPTION="KDE multimedia abstraction library" -HOMEPAGE="https://phonon.kde.org/" +HOMEPAGE="https://community.kde.org/Phonon" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest index aadcff8fba85..ec301324ab8d 100644 --- a/media-libs/plib/Manifest +++ b/media-libs/plib/Manifest @@ -4,5 +4,5 @@ AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1 AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d EBUILD plib-1.8.5-r1.ebuild 782 BLAKE2B 2418061653e841c61a6cb5874849636e60dd3f6ecc11f4c4fc3dafbd1a9490c4804b75e0bb54a2d54125e1ea6a62a47e77cfdc697f6c80835452f71f95c005a3 SHA512 ed05e1ed616fd53c057da8c8376006a4f10852b46eb589e30545ef2e14f88e468d5226b9366e923d8e79e521d1e22df50d66af83510a0f391ac5bff54aa2ee7e -EBUILD plib-1.8.5-r2.ebuild 832 BLAKE2B 26c7ec4fbe5fa4e96fb653d42f42e626c7cd42bf9e36309b642b7be15e05ab22f7bd1b3a9a0631f28fa5b5099f6d2ccf76bc159835e3a8d6f5ef1693a90365f5 SHA512 9f52795f637c303a8649965ad2dc32946bdc7dcd60c9b0854ea6cddaaf63eb9ad5af44bc4152f6fea6c4f92d238f22e249b96566922b181aaf037ada1b7864aa +EBUILD plib-1.8.5-r2.ebuild 828 BLAKE2B b27bddb3996feb71f6f7f6021e8507e974e41d1874139e3f13fdf9c1ca43b628debbdf999857123c3ca9151ba75262d4cd8145dd564c6200d0496df85e7fa7b9 SHA512 ae4958b5ff7ee436565b4ed13e82804a26800ea2fc789f9ebfa1269c6b79bb589ce77cae206c594549893076b6a544a4233e8a6f3d3d1c19c525f042a615f24a MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a diff --git a/media-libs/plib/plib-1.8.5-r2.ebuild b/media-libs/plib/plib-1.8.5-r2.ebuild index 8b02e9ee1777..3e94919f26f6 100644 --- a/media-libs/plib/plib-1.8.5-r2.ebuild +++ b/media-libs/plib/plib-1.8.5-r2.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc ~x86" +KEYWORDS="~alpha amd64 hppa ppc sparc x86" DEPEND="virtual/opengl" RDEPEND=${DEPEND} diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest index cf4925970a7f..0c689cf9ad2c 100644 --- a/media-libs/plotutils/Manifest +++ b/media-libs/plotutils/Manifest @@ -1,8 +1,8 @@ AUX plotutils-2.5.1-rangecheck.patch 792 BLAKE2B e855deee019d6c73ea442ec91f01c799120178cacd750fab01e29ea9770e5fa91ff8bfe4398ed00932036243c34b3d670afa3c333f2f011d42a33c45c842676c SHA512 b514a9502cd64f39c4a8b7e63761ecf4a82f1565a8f44abff60ee6f46d4b1ba1ed514c1094582521ed63b9f21ebafd4dcf18e482f030bd51b5ed7b59607cf07e AUX plotutils-2.6-format-security.patch 660 BLAKE2B 16f5ad83fcc73f6c7640b3608de8148b38b1ebd9c105c099a8606906f7ed2b2c02b5a014a283bfdad69d9c2ce80f992af198481acc7b18bdbb4f14146721f002 SHA512 2e53074f21d781e6081f8e7e0b365fed848f4447fba292be94b5a421aa26eedc98024f7bad83ef5dc24c1896f571fc1726c5afa1313cbadf558162249b3fe12e -AUX plotutils-2.6-libpng-1.5.patch 575 BLAKE2B b35dc9895e5a2f17ad1d5b71d8dfc1d04fbef89246f8cf39d38378a12b456747859e8f049e59730d38acb0b156b93aa9a2d322dcdd0692cdc0bbf7fa6c0ac016 SHA512 bb250e520f37d1ccaa33af1267fe7b6972f709cc411ec411897d1e61a994ec4284ff3218a9abc6de9ba6345d546377e49f058f5d6cdb894b151b8f15dd7fc4e6 +AUX plotutils-2.6-libpng-1.5.patch 579 BLAKE2B b2c4b5f2fcae4a44f6817f61d92ba04624e02a6c756aef403f4a4f1631622a4f72e0ac48c6a5459b3eb474e710ba166f96495a1168d165e745f210aea3684fe1 SHA512 46080acf7154f8d63e9c340fd78df6967e820bd61617fc436eef98f62c8c3fff8b4401d0ba5877f537e1d6c40000910bd3d153d3bf7ceebcb447cc65ac2029ac AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d39f01aa763f5388de8dc502ca5119f5bc153ec9537a1f1934940fe253125460844e8090459890132d4ade90e446b SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1 AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7 -EBUILD plotutils-2.6-r2.ebuild 1994 BLAKE2B 5a2cddc7109c695d79e37abb2dbaf2dff998cdb832396f7dfed5b96571198456f53b942f6090f185a5287f48a6c7c229f10194be45ef5ebef0737091c0f3cf8b SHA512 4dc96936d7a6851525844d3eb9c1040e0722613afcacc2150e8f3ecca0191d5ef38bff8143ed6094bd0b22a9f9f12b7d480e2f7fa0fb8a38a853353048cdb0dc +EBUILD plotutils-2.6-r2.ebuild 1948 BLAKE2B cfdd285b014f4224327d00868a11f6bdce5ee4764f4aa044603a316a5629f07ecabcc71c0780f57a8857dd35329b9c4262fb26fe247860ef938e9181340823b7 SHA512 a8872ec92957124f5896ac054362c2ee6063a2aea9ae5b991f87eadab5baf0bd54412018dfddab2a51bdf866a54f7980029b3b7eea7235ddfd54017208fa27b4 MISC metadata.xml 265 BLAKE2B 90437751c83b28b75582d0e1588732b99bfc1da98cfeedf982178e01192da161352633d821465f38c4f31a6a75c562b54c5d1a6dff0173ff6c064d524073d56c SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4 diff --git a/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch b/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch index b86d9f457421..431c638a553e 100644 --- a/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch +++ b/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch @@ -1,7 +1,7 @@ fix building with libpng-1.5 ---- libplot/z_write.c -+++ libplot/z_write.c +--- a/libplot/z_write.c ++++ b/libplot/z_write.c @@ -164,7 +164,7 @@ } diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild index d3c6f4302a93..19f52b52bf56 100644 --- a/media-libs/plotutils/plotutils-2.6-r2.ebuild +++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit libtool eutils autotools +inherit libtool autotools DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics" HOMEPAGE="https://www.gnu.org/software/plotutils/" @@ -11,48 +11,51 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+png static-libs X" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+png X" DEPEND=" - ! + + + + reavertm@gentoo.org + Feel free to maintain/fix + + + Quarter is a light-weight glue library that provides seamless + integration between Systems in Motions's Coin high-level 3D + visualization library and Trolltech's Qt 2D user interface library. + It supersedes previous Qt binding - SoQt - by subclassing QGLWidget. + + + Install plugin for dev-qt/designer + Build and install man pages + Build API documentation in QtHelp format + + + coin3d/quarter + + diff --git a/media-libs/quarter/quarter-1.1.0.ebuild b/media-libs/quarter/quarter-1.1.0.ebuild new file mode 100644 index 000000000000..71fc4f42430f --- /dev/null +++ b/media-libs/quarter/quarter-1.1.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +MY_P=${P/quarter/Quarter} + +HOMEPAGE="https://github.com/coin3d/coin/wiki" +DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt" +SRC_URI="https://github.com/coin3d/quarter/releases/download/${MY_P}/${P}-src.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="debug designer doc man qthelp" + +REQUIRED_USE=" + man? ( doc ) + qthelp? ( doc ) +" + +RDEPEND=" + media-libs/coin + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtopengl:5 + virtual/opengl + designer? ( dev-qt/designer:5 ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + app-doc/doxygen + qthelp? ( dev-qt/qthelp:5 ) + ) +" + +S="${WORKDIR}/quarter" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.0-cmake.patch +) + +DOCS=(AUTHORS ChangeLog NEWS README) + +src_configure() { + use debug && append-cppflags -DQUARTER_DEBUG=1 + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DQUARTER_BUILD_SHARED_LIBS=ON + -DQUARTER_BUILD_PLUGIN=$(usex designer) + -DQUARTER_BUILD_EXAMPLES=OFF + -DQUARTER_BUILD_DOCUMENTATION=$(usex doc) + -DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF + -DQUARTER_BUILD_DOC_MAN=$(usex man) + -DQUARTER_BUILD_DOC_QTHELP=$(usex qthelp) + -DQUARTER_BUILD_DOC_CHM=OFF + -DQUARTER_USE_QT5=ON + ) + cmake_src_configure +} diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest index c8bcebd06447..24650049a400 100644 --- a/media-libs/raspberrypi-userland-bin/Manifest +++ b/media-libs/raspberrypi-userland-bin/Manifest @@ -1,6 +1,6 @@ AUX 04raspberrypi-userland-bin 21 BLAKE2B c494bde8627a6068bf924d722cbc7ccb48e4d49cf9b875f0420e621018b61d83fc27de0017586f21cb839414e4aa49118bf3e2ab90e049e47a7a9e15658d2f87 SHA512 15fc252a183d45f0d80cc27edc93c40a7b577abed3e2f664c8bf635178e73875245835e770b82fda0e983c7c5878975ffe3008a937fbb7656fc01860c2219854 -DIST raspberrypi-firmware-1.20170303.tar.gz 118888867 BLAKE2B d90fc012d4371a797ed52172f0d0f94ea33901bbf10fc59f1ce0f54fbeb74a849b46dbbd4f71a73a7de655a4ed27586ee354e1535079e304bd66513452a33193 SHA512 cb0015fcaa607039db2ff40cadcfcafd0cf2ec7dd1df47f38414540fb1f86d626648bf6403989007895b0617c13ff4ec233a7b1987986224c09a8209e7732501 DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522 -EBUILD raspberrypi-userland-bin-1.20170303.ebuild 980 BLAKE2B bbb6e6844a73c96d9cf58a2addaf12dd884897b82240c0619ba31ffdacaa2c7d30608f168cfcea0ae1f2beeccb3f9f2d87e671095fcdb81042abfa0dc653daf8 SHA512 ef356c392cea33c03d98990004235b6ba3bd5d8c50883b91a6568c0beaaba23313d1b0edcf29f6fbbc53d3f6feae1901088d541b3dfaf3dc1b048f775a5e2f48 +DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8 EBUILD raspberrypi-userland-bin-1.20190709.ebuild 879 BLAKE2B 312786fded4a752e8d2a7252f9fa487e52a1bd8954a213c5e864ed4e7ba6cd76e06e1c2439afaa30bca89c084565fbffc2241ed067f9b69ddc2eeb64eff8ea4f SHA512 f453b77801bc519f69b2a332f0a029a3b9345878c63ac13b5ebe818bf90b16738cc001b4a5a01fa02f423e868d4603f30e8b298081d00877d2db19a4b5ba6842 +EBUILD raspberrypi-userland-bin-1.20201022.ebuild 871 BLAKE2B c1259a9bd3b8271cb14c77ce1b32bae3f7d977b0552212699029397f64af0d500226cd9385d475d72b327f4fd07515c940d3fa9a12b8cb0c5c1f08411f11a249 SHA512 4fa85e5de5f00b0bfadf7abe72e7677e31fefd935f4344e43cf16bcb7742cd70027ae1cbacf1eae810ce387ee82fc704727611f065416f0dcd676009d7dd1145 MISC metadata.xml 389 BLAKE2B d3577d29c94a74d9cc3cbf749fe2cdc46e37ffc5aeed828e280e04fec248f71a1dcbea5aee4c1e178c9699771c88bbb03228aba956069be5f07818d21ea65a67 SHA512 83074595bc89f763ca63b370aeaf44ca973ddfe6cd411de09dc89bc90f986078a7e2af98354f5ed7442a2b526d41851e8312d6b70e131d13377a69daf32e4f54 diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20170303.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20170303.ebuild deleted file mode 100644 index de28e90041a5..000000000000 --- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20170303.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib vcs-snapshot - -DESCRIPTION="Raspberry Pi userspace tools and libraries" -HOMEPAGE="https://github.com/raspberrypi/firmware" -MY_P="raspberrypi-firmware-${PV}" -SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="BSD GPL-2 raspberrypi-videocore-bin" -SLOT="0" -KEYWORDS="-* ~arm" -IUSE="+hardfp examples" - -RDEPEND="!media-libs/raspberrypi-userland" -DEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -RESTRICT="binchecks" - -src_prepare() { - rm {,hardfp/}opt/vc/LICENCE || die -} - -src_install() { - cd $(usex hardfp hardfp/ "")opt/vc || die - - insinto /opt/vc - doins -r include - into /opt - dobin bin/* - dobin sbin/* - insopts -m 0755 - insinto "/opt/vc/$(get_libdir)" - doins -r lib/* - - doenvd "${FILESDIR}"/04${PN} - - if use examples ; then - insopts -m 0644 - insinto /usr/share/doc/${PF}/examples - doins -r src/hello_pi - fi -} diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild new file mode 100644 index 000000000000..dedbb39c6c92 --- /dev/null +++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="raspberrypi-firmware-${PV}" +DESCRIPTION="Raspberry Pi userspace tools and libraries" +HOMEPAGE="https://github.com/raspberrypi/firmware" +SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/firmware-${PV}" + +LICENSE="BSD GPL-2 raspberrypi-videocore-bin" +SLOT="0" +KEYWORDS="-* ~arm ~arm64" +IUSE="+hardfp examples" + +RDEPEND="!media-libs/raspberrypi-userland" +DEPEND="${DEPEND}" +RESTRICT="binchecks strip" + +src_install() { + cd $(usex hardfp hardfp/ "")opt/vc || die + + insinto /opt/vc + doins -r include + + into /opt + dobin bin/* + + insopts -m 0755 + insinto "/opt/vc/lib" + doins -r lib/* + + doenvd "${FILESDIR}"/04${PN} + + if use examples ; then + insopts -m 0644 + docinto examples + dodoc -r src/hello_pi + fi +} diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index c9bd7bfa9200..086316bf661e 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -4,7 +4,13 @@ AUX bcm_host.pc 338 BLAKE2B 2afdd23a6b200a04650c4ea0b669b14e4f6aac9f2fbcbc77a606 AUX egl.pc 227 BLAKE2B e3b205358a0891f58d95fbd0494e6d6a07c550363b60373c0f3b14686b5c3967dfa7e76fb2a65ca703c770f7bd9e5ba2232e1932ebebdd799fb99555afa55402 SHA512 15e2cdf73be35640a951a7e841963902bb056d96025b52c1551359ec7671baf710699c642a08a5543d52d27f424d900e2fd1d584976a056a54a20116b59a21f6 AUX glesv2.pc 230 BLAKE2B eb3405f7e867b7e8d1ecde9498ac396c11931dac0bb03ae1e78a3bb6ed376b468917ed6363f08341934f1b97ed3df00bfc9c0af22e6e5aa7c91def517df586e7 SHA512 a821afcf22d52ea48b4b94b3f4317553bed2ed2e1aadee2862b4d925ee3c78cc0d3a023c62842758de5c2b168dfc8b1ba6838ccb9b0749aef9fc782aa33fa8ec AUX next-resource-handle.patch 12535 BLAKE2B b7dbf4152f92ce7bbbf9d2b8b72fddc8cf2f32e576b2d8096b0b17ac89a4cc8ab2cfd0e11137b8da3b2c7b7414d02855a14e1dbffd77d26e087989184ab88001 SHA512 f0368ffff54f989f2541f1891fe3b244d9ff4f2fc464adf2387c04045aca2f1e1f35622d2bd6c6d42e9581c45c417d1961e235b063d892b17e7dbe3e4724f5c5 +AUX raspberrypi-userland-include.patch 1484 BLAKE2B 7563874b54b168bd4858ecb65112ef48a7e010feae7a68c22f6d3f47dc1b855222df124df808fd6be427fea5763a9afd4c55ae2e3223c7bd55aa95333e55fe88 SHA512 fe73bcd1182b36e8ccaf81f0d7717f299a482545f08b352af8ead80f134a7be0f5269adb6972a1979a390046b9b94cab55c7a50a493740c72c5084e0e4995baf +AUX raspberrypi-userland-libdir.patch 12348 BLAKE2B ed0dcc454b13589244204cf2cb26d9e38b75887c2d4d1ec4db02e7d4a206661f0ae4fc9d06467e353310a6b69f49a72a53b2882acab6a3959d57c7c0d34434b5 SHA512 213f04d859a0134143cf0e98650ed69096934c1600577d28bb24d62272f9da7ca12d0f3b59a19d3ff06a5fc67547f8e5a8684738b534bfa6e429722b320fee9f +AUX raspberrypi-userland-libfdt-static.patch 724 BLAKE2B 1e2901c69d9bf855c1db9e7f5776041d9d83e9e3025a31ab54fa136bfd67dd944ed631017de33ef15a948324b1392711fb2535b65fea4e4d5a59177b866114ea SHA512 1841061596a98157d7ed25f358e5d63d78f7f808f777b909c271c0b4aa9b45c4dfa498d5623bc53466d9b81e5c064ae45423910d180816b7e39563cedb1809d8 +AUX raspberrypi-userland-pkgconf-arm64.patch 1453 BLAKE2B 42dae98ead22bf8c37adae584ca5b8230176f290202124cf61677b9d13deb627637f5eef230db4e4628524c2056096139a1a9311b9530d7cceaa246111f70780 SHA512 fa259fe0ea348dfe4b5718dfc27b4b18289abd10d7b160a29fd01c62b4ed95e518259adaeadb1b300e7957d2a824ce1748b9216cc7679be2aed105d6883ad042 DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b +DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 EBUILD raspberrypi-userland-0_pre20160424.ebuild 3280 BLAKE2B 74a7ac7e2fdaa85c45c7a6352f8d30024e33d0b6c10740082447d874bab8e59d7a04d31351b7fe8a69d89cece234709e8444207c4d9960ab20ff08f12b2c1cc2 SHA512 f1fca6c1cf73336d482c4cd400667e22d6493402fa23389e62e40af86dc605af98dddee39b5f553fc33cc03c766f40b8009f41c8af004d540e28b01a8bb24ac1 -EBUILD raspberrypi-userland-9999.ebuild 784 BLAKE2B a088f6dce3d0df70c06b3c78e699ca6779925225439331f4802199a556d8c4e3f6479346bdf03edf73623999c50034ab0b18eae104d98415ea4c9b214e6c489e SHA512 2688a1ec3bb75618593ca6770cf18c6289b6cf0498b4d147ab596fe3cb886176a01fb4d95113125289470ad131a27abbc9b7fb7092c91bfe41c01b8d24b6ceaf +EBUILD raspberrypi-userland-0_pre20201022.ebuild 2165 BLAKE2B 11958652dcfbab355a9bd8187a8736f4f8ba2e0b71cb594eabcb1cf61173cf18344541463d21c22778ae39b158e681bb860efb0f3eab4c6495c538dc3ae2f4f1 SHA512 6d50e25e52580d0dbc4932329eae3f63f465bfebe1209b4832e80dccb7bd3ecd87b59b9c776d8c3b32f805a3a712ad57a673a21b75501599a11ed92412e62f65 +EBUILD raspberrypi-userland-9999.ebuild 2165 BLAKE2B 11958652dcfbab355a9bd8187a8736f4f8ba2e0b71cb594eabcb1cf61173cf18344541463d21c22778ae39b158e681bb860efb0f3eab4c6495c538dc3ae2f4f1 SHA512 6d50e25e52580d0dbc4932329eae3f63f465bfebe1209b4832e80dccb7bd3ecd87b59b9c776d8c3b32f805a3a712ad57a673a21b75501599a11ed92412e62f65 MISC metadata.xml 351 BLAKE2B ba576d7f61b104574b6a6691584dd75e632a637ded0bce055a267822a86574e35a6d71f5bb3616939af1a964aa007cbe49fd5cf3b64939b387dc0d46d356fc82 SHA512 f0d9ddcb8e1e7df5ff767f33824c5f2b6ab5a9afc508e1d39864a046f2ffc05665011a1a08e2624dd41d6e1c150ed0d14ce888401cb5c52069eb4a8958d167e2 diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-include.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-include.patch new file mode 100644 index 000000000000..83556be3ae46 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-include.patch @@ -0,0 +1,19 @@ +diff -NrU5 1/makefiles/cmake/vmcs.cmake 2/makefiles/cmake/vmcs.cmake +--- 1/makefiles/cmake/vmcs.cmake 2020-11-06 14:21:49.103179336 +0100 ++++ 2/makefiles/cmake/vmcs.cmake 2020-11-06 17:00:57.410230948 +0100 +@@ -72,10 +72,14 @@ + install(DIRECTORY ${vmcs_root}/interface/vctypes DESTINATION ${VMCS_INSTALL_PREFIX}/include/interface FILES_MATCHING PATTERN "*.h") + install(DIRECTORY ${vmcs_root}/vcinclude DESTINATION ${VMCS_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h") + install(DIRECTORY ${vmcs_root}/interface/peer DESTINATION ${VMCS_INSTALL_PREFIX}/include/interface FILES_MATCHING PATTERN "*.h") + install(DIRECTORY ${vmcs_root}/interface/vmcs_host DESTINATION ${VMCS_INSTALL_PREFIX}/include/interface FILES_MATCHING PATTERN "*.h" PATTERN "${vmcs_root}/interface/vmcs_host/khronos" EXCLUDE) + +-install(DIRECTORY ${vmcs_root}/interface/khronos/include DESTINATION ${VMCS_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY ${vmcs_root}/interface/khronos/include DESTINATION ${VMCS_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.h" ++ PATTERN EGL EXCLUDE ++ PATTERN GLES EXCLUDE ++ PATTERN GLES2 EXCLUDE ++ PATTERN KHR EXCLUDE ) + install(DIRECTORY ${vmcs_root}/interface/vmcs_host/khronos/IL DESTINATION ${VMCS_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h") + + install(DIRECTORY ${vmcs_root}/host_applications/linux/libs/bcm_host/include DESTINATION ${VMCS_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.h") + diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-libdir.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-libdir.patch new file mode 100644 index 000000000000..b1367a982321 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-libdir.patch @@ -0,0 +1,316 @@ +From 9f2ba8c56e473fa05a5f216260571f4269fc16cc Mon Sep 17 00:00:00 2001 +From: Damian Wrobel +Date: Mon, 14 Sep 2020 09:23:07 +0200 +Subject: [PATCH] Install libraries as per GNU Coding Standards + +Includes GNUInstallDirs and uses LIBDIR (instead of hardcoded lib) +to install libraries. + +Fixes packaging on aarch64 systems where LIBDIR=lib64 (not lib). + +Signed-off-by: Damian Wrobel +--- + CMakeLists.txt | 4 +++- + containers/CMakeLists.txt | 2 +- + helpers/dtoverlay/CMakeLists.txt | 2 +- + host_applications/linux/libs/bcm_host/CMakeLists.txt | 2 +- + host_applications/linux/libs/debug_sym/CMakeLists.txt | 4 ++-- + host_applications/linux/libs/sm/CMakeLists.txt | 2 +- + interface/khronos/CMakeLists.txt | 6 +++--- + interface/mmal/CMakeLists.txt | 2 +- + interface/mmal/components/CMakeLists.txt | 2 +- + interface/mmal/core/CMakeLists.txt | 2 +- + interface/mmal/util/CMakeLists.txt | 2 +- + interface/mmal/vc/CMakeLists.txt | 2 +- + interface/vchiq_arm/CMakeLists.txt | 2 +- + interface/vcos/pthreads/CMakeLists.txt | 2 +- + interface/vmcs_host/CMakeLists.txt | 2 +- + middleware/openmaxil/CMakeLists.txt | 2 +- + pkgconfig/bcm_host.pc.in | 2 +- + pkgconfig/brcmegl.pc.in | 2 +- + pkgconfig/brcmglesv2.pc.in | 2 +- + pkgconfig/brcmvg.pc.in | 2 +- + pkgconfig/mmal.pc.in | 2 +- + pkgconfig/vcsm.pc.in | 2 +- + 22 files changed, 27 insertions(+), 25 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe67fc87..035b16fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ SET(PROJECT_VER_PATCH 0) + SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}") + SET(PROJECT_APIVER "${PROJECT_VER}") + ++include(GNUInstallDirs) ++ + if(ARM64) + set(BUILD_MMAL FALSE) + set(BUILD_MMAL_APPS FALSE) +@@ -125,7 +127,7 @@ if(PKG_CONFIG_FOUND) + foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc) + configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig") + endforeach() + endif() + # Remove cache entry, if one added by command line +diff --git a/containers/CMakeLists.txt b/containers/CMakeLists.txt +index 5570038c..3578fe80 100644 +--- a/containers/CMakeLists.txt ++++ b/containers/CMakeLists.txt +@@ -66,7 +66,7 @@ set(packetizers_SRCS ${packetizers_SRCS} ${SOURCE_DIR}/h264/avc1_packetizer.c) + + add_library(containers ${LIBRARY_TYPE} ${core_SRCS} ${io_SRCS} ${net_SRCS} ${packetizers_SRCS}) + target_link_libraries(containers vcos) +-install(TARGETS containers DESTINATION lib) ++install(TARGETS containers DESTINATION ${LIBDIR}) + + set(container_readers) + set(container_writers) +diff --git a/helpers/dtoverlay/CMakeLists.txt b/helpers/dtoverlay/CMakeLists.txt +index b3bd30f1..5e1a3a4a 100644 +--- a/helpers/dtoverlay/CMakeLists.txt ++++ b/helpers/dtoverlay/CMakeLists.txt +@@ -22,4 +22,4 @@ add_library (dtovl ${SHARED} + + target_link_libraries(dtovl fdt) + +-install (TARGETS dtovl DESTINATION lib) ++install (TARGETS dtovl DESTINATION ${LIBDIR}) +diff --git a/host_applications/linux/libs/bcm_host/CMakeLists.txt b/host_applications/linux/libs/bcm_host/CMakeLists.txt +index 2f4beb93..e18d611c 100644 +--- a/host_applications/linux/libs/bcm_host/CMakeLists.txt ++++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt +@@ -19,5 +19,5 @@ add_library(bcm_host ${SHARED} bcm_host.c) + + target_link_libraries(bcm_host vcos vchostif) + +-install(TARGETS bcm_host DESTINATION lib) ++install(TARGETS bcm_host DESTINATION ${LIBDIR}) + +diff --git a/host_applications/linux/libs/debug_sym/CMakeLists.txt b/host_applications/linux/libs/debug_sym/CMakeLists.txt +index d437b995..40e0bc77 100644 +--- a/host_applications/linux/libs/debug_sym/CMakeLists.txt ++++ b/host_applications/linux/libs/debug_sym/CMakeLists.txt +@@ -11,6 +11,6 @@ include_directories ( + add_library(debug_sym ${SHARED} debug_sym.c) + add_library(debug_sym_static STATIC debug_sym.c) + +-install(TARGETS debug_sym DESTINATION lib) +-install(TARGETS debug_sym_static DESTINATION lib) ++install(TARGETS debug_sym DESTINATION ${LIBDIR}) ++install(TARGETS debug_sym_static DESTINATION ${LIBDIR}) + install(FILES debug_sym.h DESTINATION include/interface/debug_sym) +diff --git a/host_applications/linux/libs/sm/CMakeLists.txt b/host_applications/linux/libs/sm/CMakeLists.txt +index 5ce5aca7..f85959bd 100644 +--- a/host_applications/linux/libs/sm/CMakeLists.txt ++++ b/host_applications/linux/libs/sm/CMakeLists.txt +@@ -14,5 +14,5 @@ add_library(vcsm ${SHARED} user-vcsm.c) + + target_link_libraries(vcsm vcos) + +-install(TARGETS vcsm DESTINATION lib) ++install(TARGETS vcsm DESTINATION ${LIBDIR}) + install(FILES user-vcsm.h DESTINATION include/interface/vcsm) +diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt +index 9ad615b8..97683049 100644 +--- a/interface/khronos/CMakeLists.txt ++++ b/interface/khronos/CMakeLists.txt +@@ -78,8 +78,8 @@ target_link_libraries(GLESv2 EGL khrn_client vcos) + target_link_libraries(WFC EGL) + target_link_libraries(OpenVG EGL) + +-install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib) +-install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib) ++install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION ${LIBDIR}) ++install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION ${LIBDIR}) + + # recommended names to use to avoid conflicts with mesa libs + add_library(brcmEGL ${SHARED} ${EGL_SOURCE}) +@@ -92,4 +92,4 @@ target_link_libraries(brcmGLESv2 brcmEGL khrn_client vcos) + target_link_libraries(brcmWFC brcmEGL) + target_link_libraries(brcmOpenVG brcmEGL) + +-install(TARGETS brcmEGL brcmGLESv2 brcmOpenVG brcmWFC DESTINATION lib) ++install(TARGETS brcmEGL brcmGLESv2 brcmOpenVG brcmWFC DESTINATION ${LIBDIR}) +diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt +index 46f149df..544f173b 100644 +--- a/interface/mmal/CMakeLists.txt ++++ b/interface/mmal/CMakeLists.txt +@@ -16,7 +16,7 @@ add_subdirectory(client) + + target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components) + +-install(TARGETS mmal DESTINATION lib) ++install(TARGETS mmal DESTINATION ${LIBDIR}) + install(FILES + mmal.h + mmal_buffer.h +diff --git a/interface/mmal/components/CMakeLists.txt b/interface/mmal/components/CMakeLists.txt +index d65fa37d..5b929098 100644 +--- a/interface/mmal/components/CMakeLists.txt ++++ b/interface/mmal/components/CMakeLists.txt +@@ -30,5 +30,5 @@ set(container_libs ${container_libs} containers) + target_link_libraries(mmal_components ${container_libs} mmal_util) + target_link_libraries(mmal_components mmal_core) + +-install(TARGETS mmal_components DESTINATION lib) ++install(TARGETS mmal_components DESTINATION ${LIBDIR}) + +diff --git a/interface/mmal/core/CMakeLists.txt b/interface/mmal/core/CMakeLists.txt +index de0bcb25..7f1adb86 100644 +--- a/interface/mmal/core/CMakeLists.txt ++++ b/interface/mmal/core/CMakeLists.txt +@@ -13,7 +13,7 @@ add_library (mmal_core ${LIBRARY_TYPE} + + target_link_libraries (mmal_core vcos) + +-install(TARGETS mmal_core DESTINATION lib) ++install(TARGETS mmal_core DESTINATION ${LIBDIR}) + install(FILES + mmal_buffer_private.h + mmal_clock_private.h +diff --git a/interface/mmal/util/CMakeLists.txt b/interface/mmal/util/CMakeLists.txt +index b2a6858b..acabed6f 100644 +--- a/interface/mmal/util/CMakeLists.txt ++++ b/interface/mmal/util/CMakeLists.txt +@@ -12,7 +12,7 @@ add_library (mmal_util ${LIBRARY_TYPE} + + target_link_libraries (mmal_util vcos) + +-install(TARGETS mmal_util DESTINATION lib) ++install(TARGETS mmal_util DESTINATION ${LIBDIR}) + install(FILES + mmal_component_wrapper.h + mmal_connection.h +diff --git a/interface/mmal/vc/CMakeLists.txt b/interface/mmal/vc/CMakeLists.txt +index d6e80db7..ecba8112 100644 +--- a/interface/mmal/vc/CMakeLists.txt ++++ b/interface/mmal/vc/CMakeLists.txt +@@ -13,7 +13,7 @@ endif(BUILD_MMAL_APPS) + + include_directories ( ../../../host_applications/linux/libs/sm ) + +-install(TARGETS mmal_vc_client DESTINATION lib) ++install(TARGETS mmal_vc_client DESTINATION ${LIBDIR}) + install(FILES + mmal_vc_api.h + mmal_vc_api_drm.h +diff --git a/interface/vchiq_arm/CMakeLists.txt b/interface/vchiq_arm/CMakeLists.txt +index 7af383de..75080655 100644 +--- a/interface/vchiq_arm/CMakeLists.txt ++++ b/interface/vchiq_arm/CMakeLists.txt +@@ -5,7 +5,7 @@ add_library(vchiq_arm SHARED + # pull in VCHI cond variable emulation + target_link_libraries(vchiq_arm vcos) + +-install(TARGETS vchiq_arm DESTINATION lib) ++install(TARGETS vchiq_arm DESTINATION ${LIBDIR}) + #install(FILES etc/10-vchiq.rules DESTINATION /etc/udev/rules.d) + + include_directories(../..) +diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt +index 1d81ca3c..c6a80cf3 100644 +--- a/interface/vcos/pthreads/CMakeLists.txt ++++ b/interface/vcos/pthreads/CMakeLists.txt +@@ -43,4 +43,4 @@ endif () + + + #install(FILES ${HEADERS} DESTINATION include) +-install(TARGETS vcos DESTINATION lib) ++install(TARGETS vcos DESTINATION ${LIBDIR}) +diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt +index cbef80c5..f61067f0 100755 +--- a/interface/vmcs_host/CMakeLists.txt ++++ b/interface/vmcs_host/CMakeLists.txt +@@ -32,5 +32,5 @@ target_link_libraries(vchostif vchiq_arm vcos) + + #target_link_libraries(bufman WFC) + +-install(TARGETS ${INSTALL_TARGETS} DESTINATION lib) ++install(TARGETS ${INSTALL_TARGETS} DESTINATION ${LIBDIR}) + +diff --git a/middleware/openmaxil/CMakeLists.txt b/middleware/openmaxil/CMakeLists.txt +index 3e9c5f9d..6b6c36a6 100644 +--- a/middleware/openmaxil/CMakeLists.txt ++++ b/middleware/openmaxil/CMakeLists.txt +@@ -49,4 +49,4 @@ else () + + endif () + +-install (TARGETS openmaxil DESTINATION lib) ++install (TARGETS openmaxil DESTINATION ${LIBDIR}) +diff --git a/pkgconfig/bcm_host.pc.in b/pkgconfig/bcm_host.pc.in +index c7237c53..2988b42f 100644 +--- a/pkgconfig/bcm_host.pc.in ++++ b/pkgconfig/bcm_host.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: bcm_host +diff --git a/pkgconfig/brcmegl.pc.in b/pkgconfig/brcmegl.pc.in +index 5dd3d5b9..a45bf22a 100644 +--- a/pkgconfig/brcmegl.pc.in ++++ b/pkgconfig/brcmegl.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: brcmEGL +diff --git a/pkgconfig/brcmglesv2.pc.in b/pkgconfig/brcmglesv2.pc.in +index e0e36f5a..902fbf33 100644 +--- a/pkgconfig/brcmglesv2.pc.in ++++ b/pkgconfig/brcmglesv2.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: brcmGLESv2 +diff --git a/pkgconfig/brcmvg.pc.in b/pkgconfig/brcmvg.pc.in +index 763a44b0..98489ee4 100644 +--- a/pkgconfig/brcmvg.pc.in ++++ b/pkgconfig/brcmvg.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: brcmOpenVG +diff --git a/pkgconfig/mmal.pc.in b/pkgconfig/mmal.pc.in +index 37d344c4..1ffa4f51 100644 +--- a/pkgconfig/mmal.pc.in ++++ b/pkgconfig/mmal.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: MMAL +diff --git a/pkgconfig/vcsm.pc.in b/pkgconfig/vcsm.pc.in +index b12c56fc..6f762cbf 100644 +--- a/pkgconfig/vcsm.pc.in ++++ b/pkgconfig/vcsm.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: VCSM diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-libfdt-static.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-libfdt-static.patch new file mode 100644 index 000000000000..7ba0cd0852d3 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-libfdt-static.patch @@ -0,0 +1,22 @@ +From 55999626af756874012f0163718152a77b14ff51 Mon Sep 17 00:00:00 2001 +From: crabbed halo ablution + <17379795+crabbedhaloablution@users.noreply.github.com> +Date: Sun, 8 Nov 2020 13:49:09 +0100 +Subject: [PATCH] Make explicit that libfdt should be built static + +--- + opensrc/helpers/libfdt/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/opensrc/helpers/libfdt/CMakeLists.txt b/opensrc/helpers/libfdt/CMakeLists.txt +index f57c61cb..fad86d32 100755 +--- a/opensrc/helpers/libfdt/CMakeLists.txt ++++ b/opensrc/helpers/libfdt/CMakeLists.txt +@@ -1,6 +1,6 @@ + include_directories(.) + +-add_library(fdt ++add_library(fdt STATIC + fdt.c + fdt_empty_tree.c + fdt_ro.c diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-pkgconf-arm64.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-pkgconf-arm64.patch new file mode 100644 index 000000000000..48ccea1f6811 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-pkgconf-arm64.patch @@ -0,0 +1,38 @@ +From 6d666d333f2022004fa453b28faad91021cd13d3 Mon Sep 17 00:00:00 2001 +From: crabbedhaloablution + <17379795+crabbedhaloablution@users.noreply.github.com> +Date: Mon, 16 Nov 2020 13:41:12 +0100 +Subject: [PATCH] Only install .pc files for which we build a .so. + +Many .so files are not built on arm64, but currently we install +the .pc files anyway. Fix by including the .pc files in the ARM64 +conditional. +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe67fc87..8393a8bd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,9 +11,11 @@ SET(PROJECT_APIVER "${PROJECT_VER}") + if(ARM64) + set(BUILD_MMAL FALSE) + set(BUILD_MMAL_APPS FALSE) ++ set(PKGCONFFILES bcm_host.pc) + else() + set(BUILD_MMAL TRUE) + set(BUILD_MMAL_APPS TRUE) ++ set(PKGCONFFILES bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc) + endif() + set(vmcs_root ${PROJECT_SOURCE_DIR}) + get_filename_component(VIDEOCORE_ROOT . ABSOLUTE) +@@ -122,7 +124,7 @@ include_directories("${PROJECT_BINARY_DIR}") + include(FindPkgConfig QUIET) + if(PKG_CONFIG_FOUND) + # Produce a pkg-config file +- foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc) ++ foreach(PCFILE IN LISTS PKGCONFFILES) + configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}" + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild new file mode 100644 index 000000000000..7fa3e5909284 --- /dev/null +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cmake flag-o-matic udev + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN/-//}.git" + SRC_URI="" +else + # We base our versioning on Raspbian + # Go to https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-userland/ + # Example: + # * libraspberrypi-bin-dbgsym_2+git20201022~151804+e432bc3-1_arm64.deb + # * "e432bc3" is the first 7 hex digits of the commit hash. + # * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash + GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00" + SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~arm ~arm64" + S="${WORKDIR}/userland-${GIT_COMMIT}" +fi + +DESCRIPTION="Raspberry Pi userspace tools and libraries" +HOMEPAGE="https://github.com/raspberrypi/userland" + +LICENSE="BSD" +SLOT="0" + +DEPEND="" +RDEPEND="acct-group/video + !media-libs/raspberrypi-userland-bin" + +PATCHES=( + # Install in $(get_libdir) + # See https://github.com/raspberrypi/userland/pull/650 + "${FILESDIR}/${PN}-libdir.patch" + # Don't install includes that collide. + "${FILESDIR}/${PN}-include.patch" + # See https://github.com/raspberrypi/userland/pull/655 + "${FILESDIR}/${PN}-libfdt-static.patch" + # See https://github.com/raspberrypi/userland/pull/659 + "${FILESDIR}/${PN}-pkgconf-arm64.patch" +) + +src_prepare() { + cmake_src_prepare + sed -i \ + -e 's:DESTINATION ${VMCS_INSTALL_PREFIX}/src:DESTINATION ${VMCS_INSTALL_PREFIX}/'"share/doc/${PF}:" \ + "${S}/makefiles/cmake/vmcs.cmake" || die "Failed sedding makefiles/cmake/vmcs.cmake" + sed -i \ + -e 's:^install(TARGETS EGL GLESv2 OpenVG WFC:install(TARGETS:' \ + -e '/^install(TARGETS EGL_static GLESv2_static/d' \ + "${S}/interface/khronos/CMakeLists.txt" || die "Failed sedding interface/khronos/CMakeLists.txt" +} + +src_configure() { + append-ldflags $(no-as-needed) + + mycmakeargs=( + -DVMCS_INSTALL_PREFIX="${EPREFIX}/usr" + -DARM64=$(usex arm64) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules" +} diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild index 6906bbc70397..7fa3e5909284 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild @@ -1,42 +1,71 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit cmake-utils flag-o-matic git-r3 +EAPI=7 +inherit cmake flag-o-matic udev + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN/-//}.git" + SRC_URI="" +else + # We base our versioning on Raspbian + # Go to https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-userland/ + # Example: + # * libraspberrypi-bin-dbgsym_2+git20201022~151804+e432bc3-1_arm64.deb + # * "e432bc3" is the first 7 hex digits of the commit hash. + # * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash + GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00" + SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~arm ~arm64" + S="${WORKDIR}/userland-${GIT_COMMIT}" +fi DESCRIPTION="Raspberry Pi userspace tools and libraries" HOMEPAGE="https://github.com/raspberrypi/userland" -SRC_URI="" LICENSE="BSD" SLOT="0" -KEYWORDS="" -IUSE="" DEPEND="" -RDEPEND="" +RDEPEND="acct-group/video + !media-libs/raspberrypi-userland-bin" -EGIT_REPO_URI="https://github.com/raspberrypi/userland" +PATCHES=( + # Install in $(get_libdir) + # See https://github.com/raspberrypi/userland/pull/650 + "${FILESDIR}/${PN}-libdir.patch" + # Don't install includes that collide. + "${FILESDIR}/${PN}-include.patch" + # See https://github.com/raspberrypi/userland/pull/655 + "${FILESDIR}/${PN}-libfdt-static.patch" + # See https://github.com/raspberrypi/userland/pull/659 + "${FILESDIR}/${PN}-pkgconf-arm64.patch" +) -pkg_setup() { - append-ldflags $(no-as-needed) +src_prepare() { + cmake_src_prepare + sed -i \ + -e 's:DESTINATION ${VMCS_INSTALL_PREFIX}/src:DESTINATION ${VMCS_INSTALL_PREFIX}/'"share/doc/${PF}:" \ + "${S}/makefiles/cmake/vmcs.cmake" || die "Failed sedding makefiles/cmake/vmcs.cmake" + sed -i \ + -e 's:^install(TARGETS EGL GLESv2 OpenVG WFC:install(TARGETS:' \ + -e '/^install(TARGETS EGL_static GLESv2_static/d' \ + "${S}/interface/khronos/CMakeLists.txt" || die "Failed sedding interface/khronos/CMakeLists.txt" } src_configure() { - local mycmakeargs=( - -DVMCS_INSTALL_PREFIX="/usr" + append-ldflags $(no-as-needed) + + mycmakeargs=( + -DVMCS_INSTALL_PREFIX="${EPREFIX}/usr" + -DARM64=$(usex arm64) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install - - insinto /lib/udev/rules.d - doins "${FILESDIR}"/92-local-vchiq-permissions.rules - - dodir /usr/share/doc/${PF} - mv "${D}"/usr/src/hello_pi "${D}"/usr/share/doc/${PF}/ - rmdir "${D}"/usr/src + cmake_src_install + udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules" } diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index 455c9a98d646..fa82100df269 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,6 +1,4 @@ AUX rubberband-1.9.0-makefile.patch 339 BLAKE2B 93a60dde06e197578f8279b60551541bf69ac756fef348128bfbd3289ece20c98ccaebed6856cf7697588440c61bcfa6ac65b6480648cf63aed9f21ac642f270 SHA512 3921eb71daee708ace0c4f28075ac67a2b10af71ddeb85edea1cde0c2e0721d09ca590ce90255f49be0f284cc43a0cfda9b4805c82a09baeb4303cadb06ad3c3 -DIST rubberband-1.8.2.tar.bz2 182232 BLAKE2B 991debac51e0a5516a35e1d063d5ea2c51b9d193b6a183200b0869a6743e184fe4296168d6caaea7b811a4022d25c08ca7909f05491a0e91cfe7dda532ed29cb SHA512 da677f9a843711c44c52c0153faa62e587ac7c010569523ef4fef7ce941b9d292e566f46147700e496f6cfff4c9f22f9901dcc93f2d701fdb9de152ddac0c3a6 DIST rubberband-1.9.0.tar.bz2 192240 BLAKE2B dd97f80e01b05883645bf7c78730f8a3f873a60379cc209887591a28d0b6292e083c2f522db35ef9435c0a446eaa9b5acab8b5e2c9703514019491a939a804c9 SHA512 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8 -EBUILD rubberband-1.8.2-r1.ebuild 1480 BLAKE2B fae62ef316e3f342bc3b860378913a3e079a8d5a9c51489ac1fc5d5ef8e2db05bb9d2c300f48a09d44e7f83fc5330307cc6d554b096909ac0be66706963d7fae SHA512 00aca9daf40563191ad1771fcc7941eacca21112f4d70fcbc8059c149906c416fdca45e404586606229a1f4549c02f34a62dde0bbeba3e5b6bba1d525f6c91c2 -EBUILD rubberband-1.9.0.ebuild 1796 BLAKE2B 717c03cb18b8d1838b21fe1cc3317982cbf8b1d2f141552cfe5649fbb85491e6208c171189597198ce7cf68ec15e3602054afec19e9d0fb5ac5419806992695d SHA512 565506a42268d1019c00c5e93e444f5d2792ac21b669c4c2950bdb3dd8370547070516991a8cf22dfc4103eea581b29ea3844635bc2825cbcaf0cd6c5f660cdf +EBUILD rubberband-1.9.0.ebuild 1789 BLAKE2B 70ba2c20e0d04fbdb0068b9dbddab4f3dd8f6d8d0a83c67eadaa564139eb017e8bde6ff67b1678771fee5c47c960fc143849494ec1a4beee6f3e7049f7a04902 SHA512 fc713cab853d49ccb554a22179e5cfc9f6df396cad558e294ba41da5873a5b9b480e4cad56da849b720e33b0d8b00df76df6126e1175e3770e8f5c457f571639 MISC metadata.xml 415 BLAKE2B 316ab3a0d89221f5db790350e3d6fb609656ffac3ab36ab1d53b1ea56d537005f41d5d4fec24e14000ba8dd32a094da7d05c1e814fba77bb4e209599129c685b SHA512 7b34bb720df7941a22d174b9f83407071110c9421b4207471f44a74c1bdb5cb6ef7b085386277c3d1f852ba48fc749e665337bc5d3b9fe862e76378a6d7ad4a0 diff --git a/media-libs/rubberband/rubberband-1.8.2-r1.ebuild b/media-libs/rubberband/rubberband-1.8.2-r1.ebuild deleted file mode 100644 index 6d957814fa31..000000000000 --- a/media-libs/rubberband/rubberband-1.8.2-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program" -HOMEPAGE="https://www.breakfastquay.com/rubberband/" -SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86" -IUSE="static-libs" - -RDEPEND=" - media-libs/ladspa-sdk - media-libs/libsamplerate[${MULTILIB_USEDEP}] - media-libs/libsndfile - media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] - sci-libs/fftw:3.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - if ! use static-libs ; then - sed -e '/^all:/s/$(STATIC_TARGET)//' \ - -e '/^\tcp $(STATIC_TARGET)/d' \ - -i Makefile.in || die - fi - - sed -e '/cp -f.*JNI_TARGET/d' -i Makefile.in || die - - multilib_copy_sources -} - -multilib_src_install() { - # fix libdir in .pc file - sed -iE "s%/lib$%/$(get_libdir)%g" "${BUILD_DIR}/rubberband.pc.in" || die "Failed to fix .pc file" - - emake INSTALL_BINDIR="${ED}/usr/bin" \ - INSTALL_INCDIR="${ED}/usr/include/rubberband" \ - INSTALL_LIBDIR="${ED}/usr/$(get_libdir)" \ - INSTALL_VAMPDIR="${ED}/usr/$(get_libdir)/vamp" \ - INSTALL_LADSPADIR="${ED}/usr/$(get_libdir)/ladspa" \ - INSTALL_LRDFDIR="${ED}/usr/share/ladspa/rdf" \ - INSTALL_PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \ - install -} - -multilib_src_install_all() { - einstalldocs -} diff --git a/media-libs/rubberband/rubberband-1.9.0.ebuild b/media-libs/rubberband/rubberband-1.9.0.ebuild index 38036981a9ee..cbc15608cb7d 100644 --- a/media-libs/rubberband/rubberband-1.9.0.ebuild +++ b/media-libs/rubberband/rubberband-1.9.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86" IUSE="ladspa static-libs +programs vamp" BDEPEND=" diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest index 2d422b2d1d1f..d3d921b573e2 100644 --- a/media-libs/sdl-gfx/Manifest +++ b/media-libs/sdl-gfx/Manifest @@ -1,5 +1,6 @@ DIST SDL_gfx-2.0.25.tar.gz 1760656 BLAKE2B f0779c725529d52b675312a3f6fffac7581f2e3a6f609c433e0c1fc636a3f73660727ce8996764578dcb486252ceaf6064a6710a6b60a82fc3cc106097d2e7ab SHA512 42a5d78fe1a9b644d329fb688ed6c98558f8dd0aa029a1a0d99b1c59f94859269e0aef8f9e420b8018b687d8eae151652890be3994775644e1d3a80ba7b6fe8c DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01 EBUILD sdl-gfx-2.0.25.ebuild 1093 BLAKE2B da17fb59a9352bd2f274228aef2f782b86fff1b957df3e8c8e949e586c633759b97c7101e2b04f442b14388004120890457a708222b17d18cdc734431a842dbd SHA512 606aa7a5da5b4c8ff97030e289e7bc7f3c39ad08676a15dc1c7b9a3e5e9856a9226ff2b54ee4e38e83780fb3811033e6a6cf1f684ee32ee217892bab72d0cc76 -EBUILD sdl-gfx-2.0.26.ebuild 1182 BLAKE2B 8ae285589be226f483e952a136dbcddba3a0f3367870e89913abc4663a62b906843f5c5e928701bfa71d6b22dc1eeb6937dbeacaa58fd31e72c0418eb261af3c SHA512 1312627f16e764ae2c4b2ee06e70522181c1a0199d4dff6ba0fe82e755ac8dc2066b5bfc03ccdea7da0d865b00c07ab3923bbcf73ac1719d3bc7d702df899cad +EBUILD sdl-gfx-2.0.26-r1.ebuild 1205 BLAKE2B c16b4bd22a9cff9db800c4e0a9496bf0ab0a7d27729cd4f6876b266c79fc60519a3a88245569ff7f5e0afcda4c585508b3877dec104367b48ecd73ee2035c353 SHA512 f5a723b7405eeb12d47fdbe06db5dbf92d6684dc93ea65ce364bb193e4684b9b71ebfdcfc91e1b4994b54b19eacb5c66ddce15242d04bd453793d9d9dbecc269 +EBUILD sdl-gfx-2.0.26.ebuild 1178 BLAKE2B 17142db946bbea88c24da66cc2d9408b22a2ee4bbdf0c04879498740709b6e77d6d042f7bd1038b5f7756f4b103039e7f761999c884a9dda019481d506ad07c7 SHA512 ae49f5ea61fe6616f4986b41bf8d719185dfd18802da0a1dea0def0718ff0d1793b9b5a21449014e4ebdac57e3968aadbf1452f0cfbdf3f2ea21eab9ffc81fdf MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162 diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild new file mode 100644 index 000000000000..87355eea9721 --- /dev/null +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools multilib-minimal + +MY_P="${P/sdl-/SDL_}" +DESCRIPTION="Graphics drawing primitives library for SDL" +HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" +SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0/16" # libSDL_gfx.so.16 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="doc cpu_flags_x86_mmx static-libs" + +RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS ChangeLog README ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + sed -i -e 's/-O //' configure.in || die + mv configure.in configure.ac || die + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable cpu_flags_x86_mmx mmx) \ + $(use_enable static-libs static) +} + +#multilib_src_install() { +# emake DESTDIR="${D}" install +#} + +multilib_src_install_all() { + einstalldocs + if use doc ; then + docinto html + dodoc -r Docs/* + fi + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild index 552639de3182..25a871326f1b 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="doc cpu_flags_x86_mmx static-libs" RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]" diff --git a/media-libs/sdl2-gfx/Manifest b/media-libs/sdl2-gfx/Manifest index 2f03d59ad9d5..1092e4e6126f 100644 --- a/media-libs/sdl2-gfx/Manifest +++ b/media-libs/sdl2-gfx/Manifest @@ -1,3 +1,3 @@ DIST SDL2_gfx-1.0.4.tar.gz 1230588 BLAKE2B a14cf8433aa171b8185aab765c934262fd4ecde4e45e9c8bdfb4aa7feb97676cd8fb5274ad0452bcf77fcc8f268254184fedc73f1c791ff42305d518d01a8cc7 SHA512 81a100d3c8c3a7c6bd37a23f1290ff10685f8e62fbecd83b0086aae4edc721483e2153cd4219fbd9168f115eea0ea6b25f9be375faf5761f0babdfb1b52fe482 -EBUILD sdl2-gfx-1.0.4.ebuild 1066 BLAKE2B 368a13387d99a6a3076fc939b08d0a75666b7e82e42f35576491ca2301be51f8dc2a873d47ee0a546aaed8e0dacd5bc7734abef83790cffeca59b1651a4acfd1 SHA512 b5518be0697813b18a2585cf02b9ec681b7339f79a53f5fbd16106f8ed0a7228bb4d742a1dcf0391a39dbd55b43bbff73e6c114094d30b84c4baf3eae9d1955b +EBUILD sdl2-gfx-1.0.4.ebuild 1070 BLAKE2B 6eab3d78de54c079d17f8f6db470886b715e7c651134e7d6c6d223d60cfc5a80df9e9461caf598f1684b7f9faf6bff4103e6aaa9bcf4646b103785eb28b72ccc SHA512 2c4fec1bf3034b956892ed4cbfd4b7bdbced7b060e485733f492a747217ae94028f7ee01582f3de5b4e0b67ef62cecda1bfea50a9b3034fbb489d14178b38dbc MISC metadata.xml 801 BLAKE2B f50f493cdd14251d398a3cd92dc0b282fb7cfeb631998e70654c8c2132a698b375be5bd778cce89944b1ddf98161961e54dcf7db0442ba0b09b61c675a36c9d6 SHA512 9ea5f88ee86ff482c56e86b0e83d4f7c56ec17c46824eac8273981c7f6988df4f83299c98972036551a2bfe96b9b099a9f943de77f3586e9db99dd99909085d4 diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild index b4e1c4ee1c0e..860562eafdb9 100644 --- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild +++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="doc cpu_flags_x86_mmx static-libs" DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]" diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest index 6e4c28141f30..4c2d6f1fc8fa 100644 --- a/media-libs/sdl2-image/Manifest +++ b/media-libs/sdl2-image/Manifest @@ -1,5 +1,5 @@ DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a DIST SDL2_image-2.0.5.tar.gz 11736518 BLAKE2B 8009fc4ff76d8f8f4093c02304329218e1d8b7d6fd9c747387f239bc6ee09133f8f3faee0005267ce29c083a6bf4ddcf8db72f502ea047f7288ec57ebbb16380 SHA512 77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7 EBUILD sdl2-image-2.0.4.ebuild 1537 BLAKE2B bab86ecdd66de54d4f10fb95da27cf77c9195c80dd8593137baff0ab0bc22ccf265301d1c84eec80278c9bd377f27734c636c182e17e3393591703208e407a5d SHA512 805d2cc5436ab8fafe5c834246cf7900b7b45f1fc256ba23014bc37250e20f73e2645ae5bfbf2e54f99239c7c647900d5f09007d7456cab24f6d4e5e05c3b5b5 -EBUILD sdl2-image-2.0.5.ebuild 1590 BLAKE2B 127f0429ef0e466bdf5358a8a3e7582e21140a00657ee359b2345e6b38b359185b48e20a1a1a6117819cc84a7b156b2b195719b7798aa561705b955b1fa065bf SHA512 cdef60e7b96c16aa9bd2e7a642f2fba8994c83efd8ac1c478b841b2683fc5a5ebbba4f7eadfecaf2cfacf05e4c12b1df87746b431b8d1e3413e1eff843e8db76 +EBUILD sdl2-image-2.0.5.ebuild 1585 BLAKE2B 3456a3bc1370b5da676259e635454bae4d259d3179e79773cfd92c57ce6ebf2bc8b8d35d1fe1abb651932717935cef81f9a02912f530928210624bc4242f615f SHA512 3c27a42d57d34f4d7c6e11836f14c377befbc2627e68575fbba5101259776b2cb4b07a36c53db155584d35f74125e0a005f4d094b722ddd1d5b27aa617b4cc5e MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089 diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild index 0d2abb514257..e669cf20924b 100644 --- a/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild +++ b/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="gif jpeg png static-libs tiff webp" RDEPEND=" diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest index f2de5e382af3..66e17eb493fe 100644 --- a/media-libs/sdl2-mixer/Manifest +++ b/media-libs/sdl2-mixer/Manifest @@ -2,5 +2,5 @@ AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3 EBUILD sdl2-mixer-2.0.2-r1.ebuild 3252 BLAKE2B 1f894bcdb4436283dfc19a83ad70e057c7537f5240682973e24b564a1fed2b129a9a26a46c584a60de2cf1dbca0c2df0d36a0013d62dba171939ccf1d91306a1 SHA512 55a79b5c7eaca6b86017df5df83a4c9300800ee5553167fb250dac171658ec781bff5c621347e92507037139bb15e70f8ef90791ec2ef77435f34b0e1c550881 -EBUILD sdl2-mixer-2.0.4.ebuild 3274 BLAKE2B 0e3b4d7f589384ad492e23e92fd6df867575c4e4eac74244ada80e693858813b409dadc8ecadcecb3346b066e31fcdf34eb49053d220c5148c027bbe86d082c6 SHA512 bf88c4336e387e75fb95e1b869dd900b2c9f0ef64c699672f0fa64b848cebc97782a7ec4c56fede5a29885434036e08bb6a40c424670dd396457748a4bf9e258 +EBUILD sdl2-mixer-2.0.4.ebuild 3271 BLAKE2B ef556afbbcd50ee12a9b7bf6b01430e96433469f60064ecf40c420cb1664034ad9b57a8880b9d458328170c1ad3fca91f0ad0cc097f7432a8881dea6b0383ee1 SHA512 5e4c12f6e78bbfc2ffbd05b119e62bc7c29396d87af00332745fdb681bb1cc6473e7a6df9d492e4adbeaa1d2780a1862b5112d0ab636ee48bae24c0360bd281f MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild index cb12ca97cba9..f1e6b4c12e1c 100644 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav" REQUIRED_USE=" midi? ( || ( timidity fluidsynth ) ) diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest index 54cb75cf0037..07015c07ac45 100644 --- a/media-libs/sdl2-ttf/Manifest +++ b/media-libs/sdl2-ttf/Manifest @@ -2,5 +2,5 @@ AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066 DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099 DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd EBUILD sdl2-ttf-2.0.14.ebuild 1099 BLAKE2B 0295afa0a1c642fe8bbab2e71d52e53b5c00a812cd42be08b5f950f7dd61cab1ec196a39e600be3a275ac3c03f2f1557278b42c1fd1af64463d7c8d12d8c67ab SHA512 3c7099971f3c7e1980bfb6765f38dc2ec8fe9abf28cd5028517dfdb7d38ce5c86545ac9aee0fa5ac6ec0f62f677e2bd54c920e61ef4da363c3e366368c4f98a0 -EBUILD sdl2-ttf-2.0.15.ebuild 1011 BLAKE2B 930ea1ccfc265b0fdd41096e2f82afabacf1058d3439f55074eb7c1fef603a61797d13d41976a4bfde28567ba9e8433402824a6d52d2ddff39ff559ae8c84b62 SHA512 3daf7579f5d21ce021112924d5e5860b5445e5b8f082db89af2229432a219d9c905dc0e412ac780e61508c936876743132cfe83666f2b694daf5dc17db3ee063 +EBUILD sdl2-ttf-2.0.15.ebuild 1006 BLAKE2B df5f5af3fd071a488184bd829aa80ea491f41ecf7f52c1c163f8b859b7754db781f640bea6297c0078b7eac8501ef3b6be867ae68825bf859652b54e0709bf8c SHA512 3147ec6f09e9eca575f55c049626a09ed2bda4494d0cc8f016bbc50a5888cbd0bf6021e02d2036872a72c75f0ad3d7f726fba6bce0d2a3532f3f9b19992dc1a0 MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7 diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild index f15d1fb62f22..4427f02aab97 100644 --- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild +++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="static-libs X" RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index 87fbe422d00a..ce0e9d87b8be 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -2,12 +2,15 @@ AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eab AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067ca6b8e2a10e890b7b006680856fa3df2565df3da97759c45445606530e81eee46b1d576d8cdb43b4a84c3241fcd14828c769d418c72f880402c25 SHA512 96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4 AUX shaderc-2020.1-fix-build.patch 960 BLAKE2B 1124ca1dce0ea480e2af0fd44da957b99a3d8c7d6d759438471b41f50d36d0daf323f68378cbf5b1d53647a5f0494d5de3f7efe71df1dcdb09c9984f0e108d95 SHA512 f299b731c109026d0d8dfa000e377cf48b43a121eff9e5529e91c0bbdf3f54ebd9c692688b23255e8073258b03a3729e0cc3e0904a478a47a448e56b4b27a0ef +AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2 SHA512 3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e DIST shaderc-2020.2.tar.gz 278161 BLAKE2B 8c8eaf610eb4b6ee44ecf2535eaefe6cca6b39e084293981f1ba50677d8e9d0ee5a88371ccb94696746c830246fac7b48d25568971ee40e504cc4aef57f69320 SHA512 1316445d3310db75b3513ef9cd3012485d945c4b775c29b74d29bb7b7ccad9b2c80dcb4a904eaa6854a3273c569349b186bed8dcc70bc33d6caacfd4c0e12d97 +DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2 EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716 EBUILD shaderc-2019.0-r1.ebuild 2092 BLAKE2B 6b8a0b3eda40a6de6ca1bd4ab98fcddd6e1fb18e642c0a92d45b776b8f10a802c02d5ce0e4962c8d0e7c00b5f465cd6f2e2f86c8319fb9bc53384507d2e785cf SHA512 7d71e75785b4348976aae21e482e14fab20730cd1b882bcea56206e6c10804b655c80208fb73283007cf625e7f3b72fa3fbbfc9cc40a27eed03d8abc74955098 EBUILD shaderc-2020.1.ebuild 2011 BLAKE2B 75cc8aebf8d3bdba61d554892a5a9365385e897b4f11c69b142f7d861e3e981f45c2b5feeb86d0d7617d4467eaf60ee291da07b5578a99c0b24611f909d03865 SHA512 3adbcba356cb30e0b42ab804d6ea96ba6e4b901be83c0214f0c7f233405a55df96177c9f3a788832c1e50bb7f4e321d6885ee0c5e4e239502c458e8231673cee -EBUILD shaderc-2020.2.ebuild 2012 BLAKE2B c99e5c0c92f3e584b62c10d3b99a0d6b52c1d4fc5e70e921d29d32caa4ffd78ca9d6a16f9766492d12c0201c2c3fb0d038a80fa5eae61d06ebc4455945413304 SHA512 c91256889f973a62e234527931f401706848dfc5900e5cd1ee6dd3149c6df1011a026db7343a03230c1dc9d4fe0d11013e9483bcf3c2b79efe2f8619acc57eae +EBUILD shaderc-2020.2.ebuild 2052 BLAKE2B 95da500f52ef178674c307872f0ea8858e9f9afd926e2c5b06cb9f243c309f7b8675abbf5645891c1008f051fd1abe478c6c7235ec5a45bc336970b90b44d43a SHA512 2464bae776ce827b30db90a398f9b096865a792061bbb699722ff9aef2eb017242ce5062f8af7ddae28eac5950d797c5b72bbb3c2a907aafe047b4fa181d72fd +EBUILD shaderc-2020.4_pre20201106.ebuild 2165 BLAKE2B 5626b8ccc743239e7c070bf5b3deb0b2e7b84b9dd8fc0cf288ea0ae3ad968806a2ff7f62b4caa23b1ca82072431c947455a90240248166071d335fb9c725b0a9 SHA512 b2d47d0592c8df7a1f768cff7e28ce84c26ac358b8b5cb62c76af50c7732b6f59e49e2b7f041a017d79ea34d2ad25f03c24349a0f3ca9f69d35aa9625a9fc237 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5 diff --git a/media-libs/shaderc/files/shaderc-2020.4-fix-build.patch b/media-libs/shaderc/files/shaderc-2020.4-fix-build.patch new file mode 100644 index 000000000000..93f8252831fc --- /dev/null +++ b/media-libs/shaderc/files/shaderc-2020.4-fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc +index c5ce37e..4703634 100644 +--- a/libshaderc_util/src/compiler.cc ++++ b/libshaderc_util/src/compiler.cc +@@ -20,7 +20,7 @@ + #include + #include + +-#include "SPIRV/GlslangToSpv.h" ++#include "glslang/SPIRV/GlslangToSpv.h" + #include "libshaderc_util/format.h" + #include "libshaderc_util/io.h" + #include "libshaderc_util/message.h" diff --git a/media-libs/shaderc/shaderc-2020.2.ebuild b/media-libs/shaderc/shaderc-2020.2.ebuild index c58c861b64fd..d059007510d3 100644 --- a/media-libs/shaderc/shaderc-2020.2.ebuild +++ b/media-libs/shaderc/shaderc-2020.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="doc test" RDEPEND=" @@ -70,6 +70,7 @@ src_prepare() { multilib_src_configure() { local mycmakeargs=( -DSHADERC_SKIP_TESTS="$(usex !test)" + -DSHADERC_ENABLE_WERROR_COMPILE="false" ) cmake_src_configure } diff --git a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild new file mode 100644 index 000000000000..9a8b97deedfe --- /dev/null +++ b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) + +CMAKE_ECLASS=cmake + +inherit cmake-multilib python-any-r1 + +DESCRIPTION="Collection of tools, libraries and tests for shader compilation" +HOMEPAGE="https://github.com/google/shaderc" +EGIT_COMMIT="fcafd5b49266d65ab7e4268c825224e8b6c1b8bb" +SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="doc test" + +RDEPEND=" + >=dev-util/glslang-10.11.0.0_pre20200924[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2020.5_pre20201107[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-util/spirv-headers-1.5.4 + doc? ( dev-ruby/asciidoctor ) + test? ( + dev-cpp/gtest + $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2020.4-fix-build.patch +) + +# https://github.com/google/shaderc/issues/470 +RESTRICT=test + +python_check_deps() { + if use test; then + has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]" + fi +} + +src_prepare() { + cmake_comment_add_subdirectory examples + + # Unbundle glslang, spirv-headers, spirv-tools + cmake_comment_add_subdirectory third_party + sed -i \ + -e "s|\$|${EPREFIX}/usr/bin/spirv-dis|" \ + glslc/test/CMakeLists.txt || die + + # Disable git versioning + sed -i -e '/build-version/d' glslc/CMakeLists.txt || die + + # Manually create build-version.inc as we disabled git versioning + cat <<- EOF > glslc/src/build-version.inc || die + "${P}\n" + "$(best_version dev-util/spirv-tools)\n" + "$(best_version dev-util/glslang)\n" + EOF + + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DSHADERC_SKIP_TESTS="$(usex !test)" + -DSHADERC_ENABLE_WERROR_COMPILE="false" + ) + cmake_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi && use doc; then + cmake_src_make glslc_doc_README + fi + cmake_src_compile +} + +multilib_src_install() { + if multilib_is_native_abi; then + use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" ) + fi + cmake_src_install +} diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest index 438842eb80d0..577072fecb50 100644 --- a/media-libs/smpeg2/Manifest +++ b/media-libs/smpeg2/Manifest @@ -1,5 +1,5 @@ AUX smpeg2-2.0.0-gcc6.patch 857 BLAKE2B b0e94293db4d4b2389ea6d75c8f958e36a8f503c552bc2255f3169c6d647b839ae4612a7e94f7763b5ccda29d14f0cee00ddb98697f34ec23c4340c03153acf4 SHA512 506a9aa8714927466dcef913d566b1acdd705e3eb8bb8d4e8bfe103428af9a7fc16e71a79ff126328c36a76c6cd2fd727804f5de1c3ae00bd0a7a82aa3a1dfc7 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950 -EBUILD smpeg2-2.0.0-r3.ebuild 1342 BLAKE2B f69b89f02037b838568e1cc32e063c090dab36a5ee59eec20a1b9cd384036071da92e6e5a9e1beb390424138aa5aa8f67d666b4d349a4eb50a7c0931eea43448 SHA512 d581d46d47e6091da0fdf38bc177242aec3cbaab8cac82be52a08c30c2ce7fbf46e0a9642f309cd2dbe047a11abbbf07351259c4f106db2305d64c453511fc82 +EBUILD smpeg2-2.0.0-r3.ebuild 1339 BLAKE2B c75c411c5729bedc04c2520a47a12ba2216c36112b6a344f5782e09b390538fec7ccd358185c11b9bf5dd2dbb18cbaceeab9f06fa25137d85076d2566b757733 SHA512 9e6677f9a2a74544c1110f74b52456bf4c5dd719e2861652c04edb7520783028bd20e469c221865567e5864a5ad839756b8b482b61063b233782a8d69a35d264 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild index 3cb20043b524..a2a7e3d58c80 100644 --- a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild +++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.bz2" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="debug cpu_flags_x86_mmx static-libs" DEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]" diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest index bc2cc14a0153..9a20be8b5982 100644 --- a/media-libs/speex/Manifest +++ b/media-libs/speex/Manifest @@ -1,4 +1,5 @@ AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b EBUILD speex-1.2.0-r1.ebuild 1641 BLAKE2B 5aa08d9dc5a676c1887d2e062f2c0f679fd89fad5f9360a2c2e0acc77c19622717f652c5793b2f0f1fbeaf514941240974490f661e5fc70e8e8fae66f7996f5f SHA512 298c786b759025d3752338bd8b115d3508febf0bcb0ace2daeae6a27bfc8998445e1355dbc7513a5989c44dccc849506ab2c56db5f7c151a1b083c0ede74138d +EBUILD speex-1.2.0-r2.ebuild 1661 BLAKE2B fc9dc12c2153cc9fe57e178617c892023d08159ee22b5e68b67318ea47dfacc41db8f0c8c4afcc07537d3d60d6f94f4b257f030dae2e876d0a699884e84ba4dd SHA512 de8457914635be6c32460cf54279fc37c25c46c68879950a6c5a17cc68d617922fd06363e1f6d5beeabd4b865a432c84e6ed9be0f3c33e885a39cb7214e0ba75 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8 diff --git a/media-libs/speex/speex-1.2.0-r2.ebuild b/media-libs/speex/speex-1.2.0-r2.ebuild new file mode 100644 index 000000000000..a1aeaecbc054 --- /dev/null +++ b/media-libs/speex/speex-1.2.0-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal + +MY_P=${P/_} +MY_P=${MY_P/_p/.} + +DESCRIPTION="Audio compression format designed for speech" +HOMEPAGE="https://www.speex.org/" +SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr" + +RDEPEND=" + utils? ( + media-libs/libogg:= + media-libs/speexdsp[${MULTILIB_USEDEP}] + )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}"/${P}-configure.patch ) + +src_prepare() { + default + + sed -i \ + -e 's:noinst_PROGRAMS:check_PROGRAMS:' \ + libspeex/Makefile.am || die + + eautoreconf +} + +multilib_src_configure() { + append-lfs-flags + + local FIXED_ARG="--disable-fixed-point" + local ARM4_ARG="--disable-arm4-asm" + local ARM5_ARG="--disable-arm5e-asm" + + if use arm && ! use cpu_flags_arm_v6; then + FIXED_ARG="--enable-fixed-point" + + if use cpu_flags_arm_v5; then + ARM5_ARG="--enable-arm5e-asm" + elif use cpu_flags_arm_v4; then + ARM4_ARG="--enable-arm4-asm" + fi + fi + + ECONF_SOURCE="${S}" econf \ + --disable-static \ + $(use_enable cpu_flags_x86_sse sse) \ + $(use_enable vbr) \ + $(use_with utils speexdsp) \ + $(use_enable utils binaries) \ + ${FIXED_ARG} ${ARM4_ARG} ${ARM5_ARG} +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest index c90d8b52d98e..3d73f1abaa2c 100644 --- a/media-libs/speexdsp/Manifest +++ b/media-libs/speexdsp/Manifest @@ -3,4 +3,5 @@ AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60e AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858 EBUILD speexdsp-1.2_rc3-r2.ebuild 1464 BLAKE2B 9746d51418ef2f7043c14e8a9e7c2e278806deb2a69e4a23af0d1ffb35c1756748fb8beb57cea176b0334977d0d778eea2eec2291706dbe824f10335dc278e5b SHA512 aa31f8b6965be744dc03017b4df4ef8feec264a59e01f883ac8935df7f14765b74730b6cd719e16e73e994b2192748deff66ec51b69a91996eaabce51ace2488 +EBUILD speexdsp-1.2_rc3-r3.ebuild 1470 BLAKE2B 6c6a3a511660ec5e8630d5af68bbe26cf1ab7774a21241630275ed57ed8fddf95c4c3b80d3b1e53295704d36a72ac1ef41d8ab2dfe276e72940e3cbd08ce280a SHA512 cad7adbdaac73a9bae38dd3843b13a389a7abe0acb4de55f5c8bced0e4a03db75f1fdc860a87f5528a6b44c62ce1e0820161464eb24db6f78efc29995412b655 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457 diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild new file mode 100644 index 000000000000..4e88346d0619 --- /dev/null +++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal + +MY_P=${P/_} +MY_P=${MY_P/_p/.} + +DESCRIPTION="Audio compression format designed for speech -- DSP" +HOMEPAGE="https://www.speex.org/" +SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon" + +RDEPEND="! + + + + gyakovlev@gentoo.org + Georgy Yakovlev + + diff --git a/media-libs/tg_owt/tg_owt-0_pre20201105.ebuild b/media-libs/tg_owt/tg_owt-0_pre20201105.ebuild new file mode 100644 index 000000000000..b385716b4137 --- /dev/null +++ b/media-libs/tg_owt/tg_owt-0_pre20201105.ebuild @@ -0,0 +1,52 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +TG_OWT_COMMIT="12f4a27f2f02f9dd40f9891d8ec6e58bc1ff5263" + +DESCRIPTION="WebRTC build for Telegram" +HOMEPAGE="https://github.com/desktop-app/tg_owt" +SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~ppc64" +IUSE="pulseaudio" + +# some things from this list are bundled +# work on unbundling in progress +DEPEND=" + dev-libs/openssl:= + dev-libs/protobuf:= + media-libs/alsa-lib + media-libs/libjpeg-turbo:= + media-libs/libvpx:= + media-libs/openh264:= + media-libs/opus + media-video/ffmpeg:= + !pulseaudio? ( media-sound/apulse[sdk] ) + pulseaudio? ( media-sound/pulseaudio ) +" + +RDEPEND="${DEPEND}" + +BDEPEND=" + virtual/pkgconfig + amd64? ( dev-lang/yasm ) +" + +S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}" + +src_configure() { + # lacks nop, can't restore toc + append-flags '-fPIC' + local mycmakeargs=( + -DBUILD_SHARED_LIBS=TRUE + -DTG_OWT_PACKAGED_BUILD=TRUE + -DTG_OWT_USE_PROTOBUF=TRUE + ) + cmake_src_configure +} diff --git a/media-libs/tg_owt/tg_owt-0_pre20201112.ebuild b/media-libs/tg_owt/tg_owt-0_pre20201112.ebuild new file mode 100644 index 000000000000..d962696ed699 --- /dev/null +++ b/media-libs/tg_owt/tg_owt-0_pre20201112.ebuild @@ -0,0 +1,52 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +TG_OWT_COMMIT="10b988aa9111fd25358443ac34d0d422b5108029" + +DESCRIPTION="WebRTC build for Telegram" +HOMEPAGE="https://github.com/desktop-app/tg_owt" +SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="pulseaudio" + +# some things from this list are bundled +# work on unbundling in progress +DEPEND=" + dev-libs/openssl:= + dev-libs/protobuf:= + media-libs/alsa-lib + media-libs/libjpeg-turbo:= + media-libs/libvpx:= + media-libs/openh264:= + media-libs/opus + media-video/ffmpeg:= + !pulseaudio? ( media-sound/apulse[sdk] ) + pulseaudio? ( media-sound/pulseaudio ) +" + +RDEPEND="${DEPEND}" + +BDEPEND=" + virtual/pkgconfig + amd64? ( dev-lang/yasm ) +" + +S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}" + +src_configure() { + # lacks nop, can't restore toc + append-flags '-fPIC' + local mycmakeargs=( + -DBUILD_SHARED_LIBS=TRUE + -DTG_OWT_PACKAGED_BUILD=TRUE + -DTG_OWT_USE_PROTOBUF=TRUE + ) + cmake_src_configure +} diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest index 5186b857f4b0..cb2abb509376 100644 --- a/media-libs/tremor/Manifest +++ b/media-libs/tremor/Manifest @@ -1,4 +1,4 @@ AUX tremor-0_pre20130223-out-of-bounds-write.patch 2721 BLAKE2B a9d254873d08d261c72197fbe44875aefe9f48f97464ccc5653e88e50fe3546d2426d80e62a67c0a595695737fb2b7c95df1a850b612688c02b2574a3b986fcc SHA512 022a8e813f42e3e9a0983cd2e948898dc36689433cc76d292b8b24bb3c7318bbe71a2618022a16025ee25dea0dab063266212499e5d84669603414b6c769f74e DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514 -EBUILD tremor-0_pre20130223-r2.ebuild 1106 BLAKE2B 1963ff16f0059534f0776a503b7f69a1fffdca36f221a9790ca9b1635049fe6ba4dea586d26b85f19664db7ba88ef60509aa3f0f2425f4482d5bbb16aeac50ab SHA512 9351da68931373b599f1be5b4876e1f0087609236a4cc6c2837f3bafa739cdce7bfd21745ad1d8e2fa57cd15d0ddf81f98d7f7c3873d6db27dde4a993b38478d +EBUILD tremor-0_pre20130223-r2.ebuild 1105 BLAKE2B cdd9133c5a4e9cf8ba70df04ff1910a221cf9c7f367fc808587033f548c77268dc9a6d60e786555032d69a5474f9fe1b686636f9330993ea203ea89d7afddecd SHA512 a1363cb7dbb0487fda39c365601b9b136a9ce4337bde2114385e848481645d611ca53f970b04e0767c3ba84fda960c40d952a8dc86c12e1d59ab64877ab7016f MISC metadata.xml 341 BLAKE2B f36ce19410676996a1ea63ed668fc17bb9d6bd795f4cc83d3fe4a01c4fc71bb43ec4982474f549a87b7d38ddd08a8d24c049a9243c1adeee5da8dc59f1fb265b SHA512 d386b0e5f226a6459d41ef8ac18fb129ecff461db36e5b26faeabc52b8814535d669ba1cf816e921eabc8786c6d073ed1ce8c9dde57c91bc186f282706b0c7c0 diff --git a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild index 6b4f301c3d52..e1b1b40d875b 100644 --- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild +++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="low-accuracy static-libs" RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]" diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest index 6bba9d1e6aba..d6c94603edc8 100644 --- a/media-libs/vamp-plugin-sdk/Manifest +++ b/media-libs/vamp-plugin-sdk/Manifest @@ -1,5 +1,3 @@ DIST vamp-plugin-sdk-2.10.tar.gz 316165 BLAKE2B ba206443d4a6f94f56c1e3b7e8f47b7c8f893d2df6601f9d26a613d56bf58fee7d0a4a996964aa0690ecf69fd1d686db28165e73a0d37880a7891c67ecaaae5f SHA512 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0 -DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 BLAKE2B d8e765f54cb3544efcca4b08241afc070026adeaa4c0273cc01dae26e0ad60a976bc443184cc83413c6e32f4cf6fbee6590954e7ab12872993abb78c2541653f SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 -EBUILD vamp-plugin-sdk-2.10.ebuild 1711 BLAKE2B 1a26d3a99fafffe9163651580e12f6c5c83feea68d5700a0b650f015661a0748288929b45f131d326d520576a7036e45aeb4ba3870ee4a4ec2191f5f56ae8782 SHA512 e02c906432e7ec78bca3b3493f4001ef3653e9b56adfbce2dcadb68261502321e50de8595e7bf5f9897cd17d68acfe9ca3a3249757f3dbe6a82d4ad775e34ac7 -EBUILD vamp-plugin-sdk-2.7.1-r1.ebuild 1647 BLAKE2B 4b08eb7d49ea76bc132e3ee90e9f71be68c453978356fa89eadf7381b4a3d143861a2ec6409c1472cfa24bbed1269bac1794833aa31ae8dc1e83a6dbc694fdbb SHA512 cc59376395f69f3b7615f2484803f6b9f8b0d673ddf349e0ebc79784766f055aee09f69f0350a956e593500419c6b00da32926eca0a954c660ffa6640cdf5418 +EBUILD vamp-plugin-sdk-2.10.ebuild 1706 BLAKE2B 26de3c8c996d4fcc6f27ad731638b35caeeab630ecb7da5675a3e779b9820a70c4666181a6105ec922b8e12b2c3808e40f0a1fd2118c50ef23b4910a420ca51a SHA512 e76d38037a41f2292b061f2859ef51c2e131aae3f17440d4a03c9fe3c7e16285cb04b9f8d1a546d6bbf659f21705a2ed3119dc0bcd9cace4ec8986e473023d84 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild index f7752aceb915..60194e585c58 100644 --- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild +++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/c4dm/${PN}/archive/${PN}-v${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86" IUSE="doc" RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]" diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild deleted file mode 100644 index 47ba03d2c003..000000000000 --- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multilib-minimal - -DESCRIPTION="Audio processing system for plugins to extract information from audio data" -HOMEPAGE="https://www.vamp-plugins.org" -SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2206/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="doc" - -RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - # multilib for default search paths - sed -i -e "s:/usr/lib/vamp:${EPREFIX}/usr/$(get_libdir)/vamp:" \ - src/vamp-hostsdk/PluginHostAdapter.cpp || die - econf -} - -multilib_src_compile() { - emake \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" - - if multilib_is_native_abi && use doc; then - cd build || die - doxygen || die "creating doxygen doc failed" - HTML_DOCS=( "${BUILD_DIR}"/build/doc/html/. ) - fi -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - INSTALL_SDK_LIBS="${EPREFIX}"/usr/$(get_libdir) \ - INSTALL_PKGCONFIG="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \ - INSTALL_PLUGINS="${EPREFIX}"/usr/$(get_libdir)/vamp \ - install - - # fix .pc files - sed -Ei "s/lib$/$(get_libdir)/g" "${D}"/usr/$(get_libdir)/pkgconfig/*.pc -} - -multilib_src_install_all() { - einstalldocs - - # don't want static archives, #474768 - find "${D}" -name '*.a' -delete || die -} - -pkg_postinst() { - elog - elog "You might also want to install some Vamp plugins." - elog "See media-plugins/vamp-*" - elog -} diff --git a/media-libs/vitamtp/Manifest b/media-libs/vitamtp/Manifest index 480781d7cbdb..3670fc818972 100644 --- a/media-libs/vitamtp/Manifest +++ b/media-libs/vitamtp/Manifest @@ -1,4 +1,4 @@ DIST vitamtp-2.5.9_pre20160829.tar.gz 201289 BLAKE2B 1ef7d55afd32ac27cc7f4ce233644ab54d760c906e4073a77b3e0b0d2d5c90289d5bba22d54448effe675e28275068f9c20cd15c7b6223e6d6f42950dd5c6da8 SHA512 fae1c509d30610191e20ed12426118599feb95b7a3aa0e31b43f6c0ac72a3dc9d72407ccb4f14818574c313548f521c35ad0a3264b861b745ec991b5cfda4c97 -EBUILD vitamtp-2.5.9_pre20160829.ebuild 967 BLAKE2B cef74cffdd354a2479727aa860ca60eae417bdb7f9eb068f6737f559a023a2a5eefb0d4c9c715df42d06a66dc33775e1045f63751e8f8bf5f43fe973f7b4525f SHA512 c3fadc97df73049a9ae0c67b91ad3ba328a05f359e3ce294f190b13e9ea16a73ad4d26eedc357e58d1a321bef4d716104c84652d01d6c66e3c1b84298ef73714 -EBUILD vitamtp-9999.ebuild 836 BLAKE2B a8a314cc2d8a72be178f684290fc67e528bdf7f9191a9160a18c5839183c341f85d2becab37a8e8716289d43d4be08d97fdafe7da661968d758d49a73672801e SHA512 7dc9291a8455143897ce721b777e271fc8ef3b421a788c8879da06187a9585a6ea7777d5a7e6f03deed93a2f02b49d2568f80b16034dbef4a06b57510c19e3a9 +EBUILD vitamtp-2.5.9_pre20160829.ebuild 1005 BLAKE2B 0261569f80ac090f43f56293bd611fb8111b6680844f1fcef65c43dcf4dbb9a67a55b3d3211f6de96f3a0d8894a72c3eb3a11819e6bfbe529c8372e5c6d63416 SHA512 eff12aa9b54fa8cb8ef369f62d1626da91a2962160846fd5ae62d76f6bf5f41daa11b43a3345856f3c3f17d844ca29a888ef6dd6b7c45aa07026adc2b869c182 +EBUILD vitamtp-9999.ebuild 874 BLAKE2B 8fdb370defa3abd6c2a72bc1b629067c7b01e844659bf7da1dfc20189c4cf8d2575e0f909f1f780bcbf35188395cbad48c4b3dd258169e8a59791312071487e4 SHA512 15f8a62ea5dffe7e6bebec364fcebcb5f0b7fa812bc9ae256649765285e537934a4968ae9083298afb83149fa447f0543ee813b0c6b4808a91db338cbb37616e MISC metadata.xml 336 BLAKE2B f185d2a559425bbd9e32498b3aa75c52c8561fb79f0aa8cb2b60a75001e318a5a445ed229019899560fd6c1c8aa2584578238a50dd3ea4d4f7f4e926c604ce93 SHA512 37c7ce34e4f9f08773b9971263205b8e472ab73cfe66af8e4d1063431a2bc82384d8275c253a794ccb2f1700772ca002a396aa51959a60cbd5ebb1a4cf5b22a7 diff --git a/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild b/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild index daed23602791..c1a028b1ab19 100644 --- a/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild +++ b/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,9 +34,13 @@ src_prepare() { eautoreconf } +src_configure() { + econf --disable-static +} + src_install() { default - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -delete || die insinto /lib/udev/rules.d newins debian/libvitamtp5.udev 10-vitamtp.rules } diff --git a/media-libs/vitamtp/vitamtp-9999.ebuild b/media-libs/vitamtp/vitamtp-9999.ebuild index 03249b880bcf..90e58fb32077 100644 --- a/media-libs/vitamtp/vitamtp-9999.ebuild +++ b/media-libs/vitamtp/vitamtp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,9 +30,13 @@ src_prepare() { eautoreconf } +src_configure() { + econf --disable-static +} + src_install() { default - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -delete || die insinto /lib/udev/rules.d newins debian/libvitamtp5.udev 10-vitamtp.rules } diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 47a2f55d4afc..ea2d7ac4e6fb 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,4 +1,6 @@ DIST vulkan-layers-1.2.141.tar.gz 2046629 BLAKE2B 03f334b365e39d3e89c3896e1eb407876c4f56841e64f25b267c66e37478825519b41599d228a4d65b89a49ecf806c92270d43016c40d562c0ec4ea053f78f2c SHA512 482594bdcd780276f9b7b42256951c143b798f2de2be8e54515aece30fd94fc0f913fc52f5b5cc6d8a9b5f38eb345b941a1853532df9d3e6c686fa6f79e8a5ac -EBUILD vulkan-layers-1.2.141.ebuild 1411 BLAKE2B 8fc7557c693d0e7adaff3009b961e45d3491c677cdd402b440bc440d5afa2026f92d59d1f7c22b27e5c5dda9209bb5e2ca2b8c216c036877a12648fe4fc082f9 SHA512 5804a0e8d01b6b76513b3e6612142fe63a9b1ffe86e61d6ca05a269a641f4b2cd4be71de23c9410f549515aaf53bfd19f2415427029a37620d1410504b72f44f -EBUILD vulkan-layers-9999.ebuild 1406 BLAKE2B 6777687928575283d4a4158e3ec0420b28a787c354128dcefaf8256acf98b2129277684de4fbc05bda6a9114a18cc852e8fa3a53fb461a915fc568ce44622d1b SHA512 2787784a813412464c2e28573062fb5a36cb950ed66e31f7dda6b80abe04049dae6c69ef934279e55bdba06b0641e3e5d3384a63522e68a369576112377aa7eb +DIST vulkan-layers-1.2.154.tar.gz 2312569 BLAKE2B 01415b6bb1a2b3e89569ac1a5010be12f752d1a6cb8885aa8ba2d062e5742313f75c8cb51c078b2020afcecffbbf8139a8a97220beae556191427bbcbc7a21e7 SHA512 44cdf3c72d6933969959ee959121de8e32a225bb941d9d7f3b2785bbae26d56cfdb0efb072c11649c316b5cef00b44f2f2415071c39faa0fe00a9e7c66098b7f +EBUILD vulkan-layers-1.2.141.ebuild 1408 BLAKE2B 5084798d4af3b3b5b63bcf16dbe971382e381ca10ce370e4c21df9d0f7752ea914142101cc70d54efc05f915226815dcab2de64c95facd857a56cc2f4b9044a7 SHA512 5f0e13a63b0f05a5af1ac17314ee6d5a04cd39985ecf65f1b08c22af95829c0202a8ef13a2cb0f5d06b5c60a3628f3a63aa7e60582319c5e90fb50c80325309e +EBUILD vulkan-layers-1.2.154.ebuild 1498 BLAKE2B 18183368dbde81f5d194e8ae13ebb80bd6fbf85d133d9817feafd3213a234192d866b5a58d4c4b339e4dac645923f5207bb8c43a4c52a8b87c189042a254205b SHA512 fbc0d04e7bef008c49da23ef236302aeab2003ea0fcdeba4ac3ebb57c00a1cf983fc79902654528157cdad9d22ba19c91229a38daf16729064b4fab51da30e79 +EBUILD vulkan-layers-9999.ebuild 1498 BLAKE2B 18183368dbde81f5d194e8ae13ebb80bd6fbf85d133d9817feafd3213a234192d866b5a58d4c4b339e4dac645923f5207bb8c43a4c52a8b87c189042a254205b SHA512 fbc0d04e7bef008c49da23ef236302aeab2003ea0fcdeba4ac3ebb57c00a1cf983fc79902654528157cdad9d22ba19c91229a38daf16729064b4fab51da30e79 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild index d9be98b4afb0..c069c162086e 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" + KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" S="${WORKDIR}"/${MY_PN}-${PV} fi diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild new file mode 100644 index 000000000000..b8f6fafe2d3d --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=Vulkan-ValidationLayers +CMAKE_ECLASS="cmake" +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + S="${WORKDIR}"/${MY_PN}-${PV} +fi + +DESCRIPTION="Vulkan Validation Layers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="wayland X" + +BDEPEND=">=dev-util/cmake-3.10.2" +DEPEND="${PYTHON_DEPS} + >=dev-util/glslang-10.11.0.0_pre20200924:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2020.5_pre20201107:=[${MULTILIB_USEDEP}] + >=dev-util/vulkan-headers-${PV} + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_LAYER_SUPPORT_FILES=ON + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DBUILD_TESTS=OFF + -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr" + -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" + -DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv" + ) + cmake_src_configure +} diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 2b938a6f8414..b8f6fafe2d3d 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -27,8 +27,8 @@ IUSE="wayland X" BDEPEND=">=dev-util/cmake-3.10.2" DEPEND="${PYTHON_DEPS} - >=dev-util/glslang-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-9999:=[${MULTILIB_USEDEP}] + >=dev-util/glslang-10.11.0.0_pre20200924:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2020.5_pre20201107:=[${MULTILIB_USEDEP}] >=dev-util/vulkan-headers-${PV} wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( @@ -47,6 +47,7 @@ multilib_src_configure() { -DBUILD_TESTS=OFF -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr" -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" + -DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv" ) cmake_src_configure } diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index 9537c0519761..27ae8cc6132f 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,4 +1,6 @@ DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26 -EBUILD vulkan-loader-1.2.141-r1.ebuild 1728 BLAKE2B 0ebf14b0acede3f370ac139c69ff2f92c354de9145aa8d96a1ea0ef23e2251e3827f23e231010c77e8663ba8a0f46cba1ecb6d937acdb04e9d004bab27195f37 SHA512 fc789bb294e1d99e5609c8db8e97c6765e83ac92ca70bb683ba35a9df6754d2835cef2ca1e52a02d7707e4fa90c36d2d55a7ea6ec674df9e6325a88bbb949474 -EBUILD vulkan-loader-9999.ebuild 1712 BLAKE2B 357fc2e387a06a491ed88d020fe49cfb711207746d8efb1399540295d433c3a146402ba922b21af6d7972b31b23b78a6e0e4a59b2ea8161c70a49fbea6494316 SHA512 2c549cad68ca8363b97c4cd9354398b458789eb80fb724f79b40be7ad05bd076df003f00b19035e7f43a953d33e434b9bdee7070d0a2fd6ee8f17204d5a04067 +DIST vulkan-loader-1.2.154.tar.gz 1417349 BLAKE2B b134932b31325884639e94ef74f7b97c9111554ef904777df9b4e398d927e89bdf2394593ce8e4483e9fda1cd1f299df0841471ac11263580b04bc97786ac973 SHA512 003f16bff7eb24791e458b757d0fee5db9ab68d6e7b56eae623af0c4702c534cc19099c79d2ec2493cd3c30c796f1dff060bc3aaa4057b9215749de65566c157 +EBUILD vulkan-loader-1.2.141-r1.ebuild 1725 BLAKE2B 9c7064acb06fef62321cab2d0290477e6d428759ad3015a620c3948ea0a42d4891befdced4bbf51b04f1c1ae1ec2395be37364e6a8c9c0119a81e150124bbb6a SHA512 a99664f8c2b9397e6d55dd695956904b20e192880e5ae429338cc5224ecf35d2e910a0c1f5d63fee1c1cb63f645d35e4a99ca09ba2e6f4287225eadda4fa2247 +EBUILD vulkan-loader-1.2.154.ebuild 1730 BLAKE2B 0d494dd4a975d178f9874da3e1d42c97c42c275d56785a834fb600818abc4546f706ae679a1fcaf8c1d85e21702fd8f77de56d1de50e72ccb79282bfef23951a SHA512 d252845fefd90b1df6f7ae572442027350bc0bb8d2a6528dcdbcfe62768273df131243c9e53f1d89d494e5263f5574a41902c00d33942781105356149ed7a785 +EBUILD vulkan-loader-9999.ebuild 1730 BLAKE2B 0d494dd4a975d178f9874da3e1d42c97c42c275d56785a834fb600818abc4546f706ae679a1fcaf8c1d85e21702fd8f77de56d1de50e72ccb79282bfef23951a SHA512 d252845fefd90b1df6f7ae572442027350bc0bb8d2a6528dcdbcfe62768273df131243c9e53f1d89d494e5263f5574a41902c00d33942781105356149ed7a785 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417 diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild index 1d88e48af04f..affad9ddf648 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" + KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" S="${WORKDIR}"/${MY_PN}-${PV} fi diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild new file mode 100644 index 000000000000..8807c9d94dfb --- /dev/null +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=Vulkan-Loader +CMAKE_ECLASS="cmake" +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + S="${WORKDIR}"/${MY_PN}-${PV} +fi + +DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="layers wayland X" + +BDEPEND=">=dev-util/cmake-3.10.2" +DEPEND="${PYTHON_DEPS} + ~dev-util/vulkan-headers-1.2.154 + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" +PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" + +multilib_src_configure() { + # Integrated clang assembler doesn't work with x86 - Bug #698164 + if tc-is-clang && [[ ${ABI} == x86 ]]; then + append-cflags -fno-integrated-as + fi + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_TESTS=OFF + -DBUILD_LOADER=ON + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" + ) + cmake_src_configure +} + +multilib_src_install() { + keepdir /etc/vulkan/icd.d + + cmake_src_install +} + +pkg_postinst() { + einfo "USE=demos has been dropped as per upstream packaging" + einfo "vulkaninfo is now available in the dev-util/vulkan-tools package" +} diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index c09d888cf7a6..8807c9d94dfb 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -27,7 +27,7 @@ IUSE="layers wayland X" BDEPEND=">=dev-util/cmake-3.10.2" DEPEND="${PYTHON_DEPS} - >=dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-headers-1.2.154 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] diff --git a/media-libs/webvfx/Manifest b/media-libs/webvfx/Manifest deleted file mode 100644 index 90903aaa4c21..000000000000 --- a/media-libs/webvfx/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST webvfx-1.2.0.txz 1178880 BLAKE2B 7ef08f791b291897f39e170f0572db2fb98c78bced9ed3560b1b94cfe48bedf0af3af5e57381bd039f6cf3dc1d558fb07a6a959b28f1c6a380d0dd0f1bfc64fd SHA512 84473df90553d2d85e1860eb98326fc65ebca02f1cbd8415b83e02ea032442d2aa42c000e366b6ca217bb59526b2b4409d85b169cc7e60d86443b79a1ff5614a -EBUILD webvfx-1.2.0.ebuild 1264 BLAKE2B 9da350ec2a526e4801a38ce74e35ffe8051649e35318891a744d19029f894fb851312182cb2ac7ae18fe4cc733ecfd053034cd968f3d48a0836fdafe9b039ddb SHA512 d3de8a82e28ed6ebc93a5579a1a29b7bafc305d66dbd8ae8ec25671e5455b6a8ac8dff5e7634010558d2a56aaf77b285f80f57f818a03931c121643ce9469fd5 -MISC metadata.xml 531 BLAKE2B b433d295dd15a81b40b288e8d311f5219709d467a1a23169d2f85831d12500b34b50f03d274e44e9347caa3b964750d04bdd0df8f935f649118b94fc974ab8bc SHA512 d722ad1ef255c1a02a4b7dd9f58f08aebb32dc84ff2034db48d76ec0ad3ae1641c8be969e9b9dabdfaffaf71eaf35557f839fcef84c8b0262efb9243886ebb8d diff --git a/media-libs/webvfx/metadata.xml b/media-libs/webvfx/metadata.xml deleted file mode 100644 index 3ca5303fe87e..000000000000 --- a/media-libs/webvfx/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - reagentoo@gmail.com - Dmitry Baranov - - - proxy-maint@gentoo.org - Proxy Maintainers - - - mltframework/webvfx - - - Install doxygen developer documentation - - diff --git a/media-libs/webvfx/webvfx-1.2.0.ebuild b/media-libs/webvfx/webvfx-1.2.0.ebuild deleted file mode 100644 index 7ad5951c5e01..000000000000 --- a/media-libs/webvfx/webvfx-1.2.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Video effects library based on web technologies" -HOMEPAGE="https://github.com/mltframework/webvfx/" -SRC_URI="https://github.com/mltframework/${PN}/releases/download/${PV}/${P}.txz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -BDEPEND=" - doc? ( app-doc/doxygen ) -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtquickcontrols:5[widgets] - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - >=media-libs/mlt-6.20.0 - virtual/opengl -" -DEPEND="${RDEPEND} - dev-qt/qtnetwork:5 -" - -src_prepare() { - default - - find -name "*.pro" -exec \ - sed -i -e "s/\(system.*\)pkg-config/\1$(tc-getPKG_CONFIG)/" {} + || die - - sed -i -e "s/\(target.*path.*PREFIX.*\)lib/\1$(get_libdir)/" \ - webvfx/webvfx.pro || die - - sed -i -e "s/PROJECT_NUMBER=\`.*\`/PROJECT_NUMBER=${PV}/" \ - all.pro || die -} - -src_configure() { - append-cxxflags -Wno-deprecated-declarations - - eqmake5 PREFIX="${EPREFIX}/usr" -} - -src_compile() { - emake - use doc && emake doxydoc -} - -src_install() { - emake INSTALL_ROOT="${D}" install - - use doc && local HTML_DOCS=( doxydoc/. ) - einstalldocs -} diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest index 483588482817..4aeb17523c8f 100644 --- a/media-libs/xvid/Manifest +++ b/media-libs/xvid/Manifest @@ -1,4 +1,6 @@ DIST xvidcore-1.3.5.tar.bz2 698846 BLAKE2B c65c90a2a51d993af65becd760364b495ca1714f888c640b577ee3cb509afc5dbe56d1f536aa710a5322106ca65bed4ad162ad97440e9c14deeabbcbe00984b5 SHA512 3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441 +DIST xvidcore-1.3.7.tar.bz2 698615 BLAKE2B 19bea63226c2223e74e5202d3b671c5b292c03ce5de240df7d8ce34101de4036b28fad516b2a56712a099819b905e68922fa83a01fbe4f200dc880ca56c10a96 SHA512 e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed EBUILD xvid-1.3.5-r1.ebuild 1749 BLAKE2B 524b85ade8e5b1102227cc13912f6162e78a43e4ba91d17dfb4240e5bb2db8762dd9ecb9605ed02121936038ad716f497b2a85b4fa78d6f894d881f413143c97 SHA512 3be60bb77595d630dc186942bd9786653871b175473c4fba5809f6804db45bc5394e2ea4827d3cfd25ff5cb77a2369b168df623a0c28e3b3e7e6e25927a7f3ee EBUILD xvid-1.3.5.ebuild 1670 BLAKE2B ce06176a07776e33b5a34b1774b1a2aafd0678ad85e5bc9f9e12611449aeda401440244679d8a00d40975d0adc9206d644798a86d2fa3c6b90fe2dcdb8d4707c SHA512 4b81bf15e6599c3feb608e1a7fece487c9e1f531cdb02cb3ca2a36af6516f7b94fe7f970ad7a02c63e32b40836031a0a827b7096c1d7dfa855c54838a9a7f653 +EBUILD xvid-1.3.7.ebuild 1750 BLAKE2B 6f5305f7caae6afadf61832c4008b1984dea4d67a0bb50b4311974b47e4b8ceb3dee21cad53096ea625cefe3993f15da6749f3871c4d8192b4dcefa21194a6f0 SHA512 5d8be6b1885097ebf7b6426462c6f718b553ef6002266a1cc794c49200255191c2eeb62e43f3309d41de702b83985d09b1cf472b37116a416248ba4b67342d60 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98 diff --git a/media-libs/xvid/xvid-1.3.7.ebuild b/media-libs/xvid/xvid-1.3.7.ebuild new file mode 100644 index 000000000000..bfd41066754c --- /dev/null +++ b/media-libs/xvid/xvid-1.3.7.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="${PN}core" +MY_P="${MY_PN}-${PV}" +inherit flag-o-matic multilib-minimal + +DESCRIPTION="High performance/quality MPEG-4 video de-/encoding solution" +HOMEPAGE="https://www.xvid.org/" +SRC_URI="https://downloads.xvid.com/downloads/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="elibc_FreeBSD examples pic +threads" + +NASM=">=dev-lang/nasm-2" +YASM=">=dev-lang/yasm-1" + +BDEPEND="sys-apps/grep" +DEPEND="amd64? ( || ( ${YASM} ${NASM} ) ) + x86? ( || ( ${YASM} ${NASM} ) ) + x86-macos? ( ${NASM} ) + x64-macos? ( ${NASM} )" + +S="${WORKDIR}/${MY_PN}/build/generic" + +src_prepare() { + default + + # make build verbose + sed \ + -e 's/@$(CC)/$(CC)/' \ + -e 's/@$(AS)/$(AS)/' \ + -e 's/@$(RM)/$(RM)/' \ + -e 's/@$(INSTALL)/$(INSTALL)/' \ + -e 's/@cd/cd/' \ + -e '/\$(libdir)\/\$(STATIC_LIB)/d' \ + -e 's/\$(BUILD_DIR)\/\$(STATIC_LIB)//g' \ + -e 's/info \$(STATIC_LIB)/info/g' \ + -i Makefile || die + # Since only the build system is in $S, this will only copy it but not the + # entire sources. + multilib_copy_sources +} + +multilib_src_configure() { + use sparc && append-cflags -mno-vis #357149 + use elibc_FreeBSD && export ac_cv_prog_ac_yasm=no #477736 + + local myconf=( $(use_enable threads pthread) ) + if use pic || [[ ${ABI} == "x32" ]] ; then #421841 + myconf+=( --disable-assembly ) + fi + + econf "${myconf[@]}" +} + +multilib_src_install_all() { + dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO} + + if use examples; then + insinto /usr/share/${PN} + doins -r "${S}"/../../examples + fi +} diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest index 2604e7917a46..62ffc99239bd 100644 --- a/media-libs/zita-alsa-pcmi/Manifest +++ b/media-libs/zita-alsa-pcmi/Manifest @@ -1,4 +1,4 @@ AUX zita-alsa-pcmi-0.3.2-Makefile.patch 789 BLAKE2B b6105b972818ed184ef1e3d4963885d34b3d52e4ec0bbf397d85d03c67ea22f82f6c2f8ef0c2e1e7f5e1f19b2adb5372f9c56cb60597dfe94623414ff9edf9a7 SHA512 aa9cae5d9d8fb7567b1723ce8334880bbdef1bf0f361ff5cdb8b1932316ed531e410b32e20d919cd1c7b0c24647e810f4cec754360d72c99c18dee9bb9894483 DIST zita-alsa-pcmi-0.3.2.tar.bz2 21480 BLAKE2B dfd37f3cee647b7100ff1cb9f696ba7968bec4e6f11165955de67f38f48838f17c2efc0936780ce30ca0e2d7438b78ddd8a27960f6c54e7a8a5e87b1f9b50044 SHA512 9d6040d0ec636ebcf02a033cdc017105bbed8e0ddb99584890d8e027402a85791e0983a1a9cd677dc6f1da0ced530afb5e65a8e863329a5e785ef09e0b7124f0 -EBUILD zita-alsa-pcmi-0.3.2.ebuild 907 BLAKE2B 263d80dc7ae0411228a04a6a8d42682965ea9fd5e87c8817db3346a336c4312c27a48a4b449736b6efff6f3b0bd8334ff9f24a53c6f5e7513975f80424fc8aa3 SHA512 519e93d770c212014f22660d0f1f05006155858329ad49f905a577e011231e903f54c1ace0a6a2d61621d4afff1a5adb7aac6c6c23278f504f51979246734409 +EBUILD zita-alsa-pcmi-0.3.2.ebuild 902 BLAKE2B 11ad746414826f94749f5d10e50cc5a66db82285a22be6499e22c9cbf55cb5c857fc6a6ed926daaaad9c92250eca5025f07771c8ecb8859c9206bd04de52532e SHA512 5d2475d19d75fae406b7b4999044c299c9fb9a73278c01287e8a722b9ddfdc2fee4d96c44fb7c0fd03262ef2733737f89e5fc2b0500b179f6d469703da23ac73 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild index 7c91724b6924..be1d3950a60b 100644 --- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild +++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" IUSE="" CDEPEND="media-libs/alsa-lib" diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest index 2bc20fa26557..a2a57d22a669 100644 --- a/media-libs/zita-resampler/Manifest +++ b/media-libs/zita-resampler/Manifest @@ -1,4 +1,4 @@ AUX zita-resampler-1.6.2-makefile.patch 3036 BLAKE2B 595ebbae53d4c0ec344d02f4602eec599e9d301a308384f3a4d3c99a9e64111f7b183ccee92c9f7e069a00275f3304712b9644409bbe23030961aeeadf9c8b52 SHA512 a7bb5621c761ab36502303053872782cf275e55b248f0387765c1251ab43c58577862c5fc2b321f6746fd7ec0a8e7c7766bcac290cb204f2e94947aa27cb1992 DIST zita-resampler-1.6.2.tar.bz2 125539 BLAKE2B d2e04fb5e0efbde3432ce973df59a11d2a184146d124b662712a5de2d9c243f6564899f190f7a7b68a9e01bcaab05c92b91ebcbf942473134a12a85e4e08c603 SHA512 d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c -EBUILD zita-resampler-1.6.2.ebuild 905 BLAKE2B f92ea41283f018e2b2803b41c1863e2b404b133968a2abcc5908bdde13876b3097be34f3a81bd6ba62cda1a89c53381ff840803cd2d19fc66e7ef6e86fbeb064 SHA512 40668c26db7c76c3013aba1e6e8a5f9da0c1bab9e43c5614654ecb5fd793080e0c4d6fd3a28abc9c42f45bde8cba678c69e2859f67f2d51a4802f3cdf9b6c0b3 +EBUILD zita-resampler-1.6.2.ebuild 899 BLAKE2B ab844529d67e9284f42fbd8a7e7a6ba536188ace3e778c370e30c39d46fd8de400869d6093cfbc6cb461008667a7cd9f253ab4e4634adaaa6d3326631f9e99f1 SHA512 deaf05a05be70b4d72f07495a64a880cab200d259315314736c192528efe6a502918cd074f7750dc48344b468907ea4727d10faad3d1f761f36149762f8cb091 MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf diff --git a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild b/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild index c722032a7a55..af41a8918a7f 100644 --- a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild +++ b/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0/1" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" IUSE="tools" RDEPEND="tools? ( media-libs/libsndfile )" diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest index 11663e12b389..afddb7cd4fac 100644 --- a/media-libs/zmusic/Manifest +++ b/media-libs/zmusic/Manifest @@ -1,3 +1,3 @@ -DIST zmusic-1.1.2.tar.gz 1528782 BLAKE2B 0d6896b6aaa290fbc88ac9da3e0a3a34265d93e906ef9aa5039e96a1e39c626f843667c04601bfbfd055e53c30bc843ce3d127e89e14ea56b0112a355ed1ee75 SHA512 97fbedd08b7d0ae84c10b87c615e166b0f14a50173df5081baaa9656d2ce161d413c4568e3985122befe30f36dce4fbad049bf5df3cccb3f2a5147a7bd0d2886 -EBUILD zmusic-1.1.2.ebuild 1217 BLAKE2B cf7b4f239ec92f4b30de6e6da808a4af75ceb670de9a1b7d79e7e9427c3dc0a65d399df1e99621e101ae7958a751a83261789773c8f262ea55bca19a6b4fdcfb SHA512 404258e03424192993d44c5dc9793f0f0a6e78f2f274557099dc0c93c0a91dcd4a36d9b8ec8724cd189f36747eaeb630cfb61cac96dc730150492a0d4e56875f +DIST zmusic-1.1.4.tar.gz 1809045 BLAKE2B aae64fa8b10b44d79ce4738527e613e65c65a8e367dc998f966938ccc10b9689a58decb702c1ca943ed3371092b69ed91dbe4645b707626ac525d29d750334d5 SHA512 5188fb095897769514c4a4698fabb5640e7ca86fe0665d4bfe6649a940b00ac02d87decda626be8a848ba6db0a468cc985d74d0fda2d3da8657fee079e0bde73 +EBUILD zmusic-1.1.4.ebuild 1218 BLAKE2B 042b06053d278bf663869dc6ab0072cf80f5fd722c3600ed94ce0208544bd1b50c541f6ecc05315d3646cee8c0aa8e88da62c171f085baf4a4d46191a9be2264 SHA512 8652d101e8dbc0a6fae7a1a49f347dc3b20c1f98e91423c6517e08cda5f3332bfab508bb7e5b13f572ac91a16b87a61a3f1109b784e852668f6681b148036741 MISC metadata.xml 610 BLAKE2B 34110c522d52e8bc9c2e46f5d819a6a985d32bb262587d8d7246b94a280443a89c5af0a53d166b7b1c67eeb352648ad95d90499909de05896cba938f3ca378ce SHA512 ec25e4d0ae839793d8def2a4a319887d334749b8e61d133c2e0e512003dbb4a9bacc0b45a12d4a093d7ef7fcffed63f2c0c4b98273eef46aef346365a3f976f4 diff --git a/media-libs/zmusic/zmusic-1.1.2.ebuild b/media-libs/zmusic/zmusic-1.1.2.ebuild deleted file mode 100644 index 95bb2cf5c6f6..000000000000 --- a/media-libs/zmusic/zmusic-1.1.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -MY_PN="ZMusic" -DESCRIPTION="GZDoom's music system as a standalone library" -HOMEPAGE="https://github.com/coelckers/ZMusic" -SRC_URI="https://github.com/coelckers/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="alsa fluidsynth mpg123 sndfile" - -DEPEND=" - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - fluidsynth? ( media-sound/fluidsynth:= ) - mpg123? ( media-sound/mpg123 ) - sndfile? ( media-libs/libsndfile )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - rm -rf licenses || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DFORCE_INTERNAL_ZLIB=OFF - -DFORCE_INTERNAL_GME=ON - -DDYN_FLUIDSYNTH=OFF - -DDYN_SNDFILE=OFF - -DDYN_MPG123=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)" - -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)" - -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)" - -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)" - -DBUILD_SHARED_LIBS=ON - ) - cmake_src_configure -} - -src_install() { - cmake_src_install -} diff --git a/media-libs/zmusic/zmusic-1.1.4.ebuild b/media-libs/zmusic/zmusic-1.1.4.ebuild new file mode 100644 index 000000000000..221e294349f7 --- /dev/null +++ b/media-libs/zmusic/zmusic-1.1.4.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PN="ZMusic" +DESCRIPTION="GZDoom's music system as a standalone library" +HOMEPAGE="https://github.com/coelckers/ZMusic" +SRC_URI="https://github.com/coelckers/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="alsa fluidsynth mpg123 +sndfile" + +DEPEND=" + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + fluidsynth? ( media-sound/fluidsynth:= ) + mpg123? ( media-sound/mpg123 ) + sndfile? ( media-libs/libsndfile )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + rm -rf licenses || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DFORCE_INTERNAL_ZLIB=OFF + -DFORCE_INTERNAL_GME=ON + -DDYN_FLUIDSYNTH=OFF + -DDYN_SNDFILE=OFF + -DDYN_MPG123=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)" + -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)" + -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)" + -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)" + -DBUILD_SHARED_LIBS=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install +} diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest index 5faf31f1aed0..9370551c35c1 100644 --- a/media-libs/zxing-cpp/Manifest +++ b/media-libs/zxing-cpp/Manifest @@ -1,7 +1,3 @@ -AUX zxing-cpp-1.0.8-pkgconfig.patch 302 BLAKE2B 9b1588b618a1ddd829c2bbc8ed9f8a19c2d69e1e7a2c7903a190d36e4672f8ff0979e8d6afd7f3ebecccf06e86421e2a7ff35120e1090620277210cacda446b9 SHA512 f43ed72a23d955d3e621e261c80ec409538b80bb2b046dcf24c37e09ecea1b4208f3d4227afbfbfeda9764f23b69cf87363a3a85a3057fef40f1a7199e1f69ac -AUX zxing-cpp-1.0.8-version.patch 671 BLAKE2B f44f0b4a3f253f8f856d6c4b957ee8a636b0d8caaf567e6e4587005c50119db64fc7a0f1a62537af8a394f3268c4a82aca516fb3a3ba1779c63f8dec6b98cc20 SHA512 ed8fae42db39c49eaaac7a352aa6832d0b493c5a6c40a8acb36863222dce2232a545004f600b007d5f61abcfd6142f238773f30c7d476323809eebced1de202d -DIST zxing-cpp-1.0.8.tar.gz 128506816 BLAKE2B 5f9e70c5cd123c27ee779a955cc112449094069c5be3defac57a906ea6a301e8f04886c7cb51b79007456e517db06f9f61c39228f8d8bb6a520602cac70aa7a4 SHA512 0749b3bd4d810ef024f2d8045ecf3024bba6d1816be3f5baeb3325724ac5a7359bec72b4070f8e34fbc1bc5ba2636e488b17cc8b35578b0703352d448c9d22f6 DIST zxing-cpp-1.1.1.tar.gz 128925736 BLAKE2B d2d6b4b13c26ee1bf8c9f1188809207f895d9ab4bde83e7e06d85d7105c56021bb9f82f34b9f11e1c8ff5b82825de127d1bc873745fa6ef603a8d206f3eaedec SHA512 c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7 -EBUILD zxing-cpp-1.0.8-r1.ebuild 501 BLAKE2B 0eae08515984a7afa9fc1034fd7513f5a7b14198eba294f07ed87e98352a13eeee385a9d69f89245b8624e9e0f7c109db5b11170483b931b3589bb5230362051 SHA512 3ca7f943c841043d95f7bfd100f8f1f36e447265791307154f40dc2628123cb5a9115c5fb4c36c87390a1daed210808d3b831071242bc62fb85cc8501bfc2e1b -EBUILD zxing-cpp-1.1.1.ebuild 402 BLAKE2B a9e4b0ddefafe3e002dacd42dd6caa470b12984661a04a78607476a31cc6cab6084214b04e24c5fa0b73f5afa29e525c4f6fb7ff2d85aa1ee991fe99e3335ca2 SHA512 e4fdf1251ca059a0dd76af092284ef4b2d00a29d36735414bb97a33b245e1d775313e923f3710d7e3fc1350fdfee7548d8da737516ade48c999d7d037765d306 +EBUILD zxing-cpp-1.1.1.ebuild 581 BLAKE2B d8f997530e0fece0dc6f2e20bd1c7237e8c7d9fbb83e022a944546142cf4c4f1b8a82f74f1387ec57db065ff0280aeb68f2b27824cc4052e2a217d1825c7fc1d SHA512 4fbb4435837c59c75bcd075cd83304a405dc578d6e06414404a9c1a5ea2bf59e00320c0674158f3f16b37d2ae13f5800f1324a944fabe9703c86e2c65bfd6336 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-pkgconfig.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-pkgconfig.patch deleted file mode 100644 index d1dda4f584ef..000000000000 --- a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/zxing.pc.in 2020-04-09 11:43:22.494219440 -0400 -+++ b/zxing.pc.in 2020-04-09 11:49:03.884867034 -0400 -@@ -5,6 +5,6 @@ - - Name: ZXing - Description: ZXing library set --Version: @VERSION@ -+Version: @PROJECT_VERSION@ - Libs: -L${libdir} -l@TARGET_ZXING@ - Cflags: -I${includedir} -I${includedir}/ZXing \ No newline at end of file diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch deleted file mode 100644 index 12f379e7c7ea..000000000000 --- a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 66cc26b25633cb7f1e20f2bf7711960c321e3a7b Mon Sep 17 00:00:00 2001 -From: Huy Cuong Nguyen -Date: Thu, 19 Mar 2020 13:58:48 -0400 -Subject: [PATCH] Pump version to 1.0.8 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d851580..c996e4a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.1.3) - - set (ZXING_VERSION_MAJOR 1) - set (ZXING_VERSION_MINOR 0) --set (ZXING_VERSION_PATCH 7) -+set (ZXING_VERSION_PATCH 8) - - project (ZXingCpp VERSION ${ZXING_VERSION_MAJOR}.${ZXING_VERSION_MINOR}.${ZXING_VERSION_PATCH}) - diff --git a/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild deleted file mode 100644 index fb0c6d9f4284..000000000000 --- a/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library" -HOMEPAGE="https://github.com/nu-book/zxing-cpp" -SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 x86" -IUSE="" - -PATCHES=( - "${FILESDIR}/${P}-pkgconfig.patch" # bug 716818 - "${FILESDIR}/${P}-version.patch" # bug 716818 -) diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild index f31cea8e8ba1..a43d3881a651 100644 --- a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild +++ b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild @@ -11,5 +11,15 @@ SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="" +KEYWORDS="amd64 arm64 ~ppc64 x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF # nothing is installed + -DBUILD_BLACKBOX_TESTS=$(usex test) + ) + cmake_src_configure +} -- cgit v1.2.3