From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- media-libs/Manifest.gz | Bin 66315 -> 66777 bytes media-libs/dssi/Manifest | 2 +- media-libs/dssi/dssi-1.1.1-r1.ebuild | 14 +- media-libs/fluidsynth-dssi/Manifest | 2 +- .../fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild | 9 +- media-libs/fnlib/Manifest | 2 +- media-libs/fnlib/fnlib-0.5-r2.ebuild | 15 +- media-libs/freetype/Manifest | 2 +- media-libs/freetype/freetype-2.9.1-r3.ebuild | 2 +- media-libs/lastfmlib/Manifest | 2 +- media-libs/lastfmlib/lastfmlib-0.4.0.ebuild | 10 +- media-libs/libbluray/Manifest | 2 +- media-libs/libbluray/libbluray-1.0.2.ebuild | 2 +- media-libs/libdvbpsi/Manifest | 4 +- media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild | 44 -- media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild | 2 +- media-libs/libglvnd/Manifest | 4 + media-libs/libglvnd/libglvnd-1.0.0.20180524.ebuild | 54 +++ media-libs/libglvnd/libglvnd-9999.ebuild | 54 +++ media-libs/libglvnd/metadata.xml | 11 + media-libs/libmtp/Manifest | 2 +- media-libs/libmtp/libmtp-1.1.14.ebuild | 2 +- media-libs/libpqstego/Manifest | 2 +- media-libs/libpqstego/libpqstego-0.0.1.ebuild | 10 +- media-libs/libptp2/Manifest | 6 +- .../libptp2/files/libptp2-1.1.10-configure.patch | 4 +- .../libptp2/files/libptp2-1.1.10-makefile.patch | 4 +- media-libs/libptp2/libptp2-1.1.10.ebuild | 20 +- media-libs/libraw/Manifest | 2 +- media-libs/libraw/libraw-0.18.11.ebuild | 2 +- media-libs/libsdl2/Manifest | 4 +- media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild | 12 +- media-libs/libsdl2/metadata.xml | 1 + media-libs/mesa/Manifest | 3 +- media-libs/mesa/mesa-18.1.0-r1.ebuild | 531 +++++++++++++++++++++ media-libs/mesa/mesa-9999.ebuild | 43 +- media-libs/openal/Manifest | 3 +- ...l-1.18.2-dont-specify-macros-as-arguments.patch | 50 ++ media-libs/openal/openal-1.18.2-r1.ebuild | 4 + media-libs/opencolorio/Manifest | 9 +- .../opencolorio-1.0.8-documentation-gen.patch | 54 --- ...lorio-1.0.9-remove-external-doc-utilities.patch | 65 --- media-libs/opencolorio/metadata.xml | 4 - media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild | 87 ---- media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild | 2 +- media-libs/opencv/Manifest | 14 +- .../files/opencv-3.1.0-cmake-no-opengl.patch | 22 - .../opencv/files/opencv-3.1.0-git-autodetect.patch | 42 -- .../opencv-3.1.0-remove-graphcut-for-cuda-8.patch | 23 - .../files/opencv-3.4.0-disable-download.patch | 29 ++ media-libs/opencv/metadata.xml | 1 + media-libs/opencv/opencv-3.1.0-r8.ebuild | 328 ------------- media-libs/opencv/opencv-3.4.1-r1.ebuild | 494 +++++++++++++++++++ media-libs/phonon-gstreamer/Manifest | 3 +- .../phonon-gstreamer-4.9.0-r1.ebuild | 88 ---- .../phonon-gstreamer-4.9.0-r2.ebuild | 2 +- media-libs/phonon-vlc/Manifest | 4 +- media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild | 2 +- media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild | 81 ---- media-libs/phonon/Manifest | 4 +- media-libs/phonon/phonon-4.10.1.ebuild | 2 +- media-libs/phonon/phonon-4.9.1-r1.ebuild | 132 ----- media-libs/skstream/Manifest | 4 +- .../skstream/files/skstream-0.3.9-test.patch | 4 +- media-libs/skstream/skstream-0.3.9.ebuild | 15 +- media-libs/taglib/Manifest | 2 +- media-libs/taglib/taglib-1.11.1-r1.ebuild | 7 +- media-libs/tiff/Manifest | 4 +- .../tiff/files/tiff-4.0.9-CVE-2017-18013.patch | 39 ++ media-libs/tiff/tiff-4.0.9-r3.ebuild | 2 +- media-libs/tiff/tiff-4.0.9-r4.ebuild | 81 ++++ media-libs/vulkan-layers/Manifest | 6 + ...e-a-file-to-get-the-spirv-tools-commit-ID.patch | 40 ++ .../vulkan-layers-Use-usr-for-vulkan-headers.patch | 57 +++ media-libs/vulkan-layers/metadata.xml | 16 + .../vulkan-layers-0_pre20180526.ebuild | 55 +++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 55 +++ media-libs/vulkan-loader/Manifest | 4 +- ...loader-9999-Do-not-install-vulkan-headers.patch | 24 + ...an-loader-9999-Use-usr-for-vulkan-headers.patch | 51 ++ media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 33 +- media-libs/vulkan-tools/Manifest | 5 + .../vulkan-tools-Use-usr-for-vulkan-headers.patch | 35 ++ media-libs/vulkan-tools/metadata.xml | 16 + .../vulkan-tools/vulkan-tools-0_p20180526.ebuild | 51 ++ media-libs/vulkan-tools/vulkan-tools-9999.ebuild | 51 ++ 86 files changed, 1945 insertions(+), 1146 deletions(-) delete mode 100644 media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild create mode 100644 media-libs/libglvnd/Manifest create mode 100644 media-libs/libglvnd/libglvnd-1.0.0.20180524.ebuild create mode 100644 media-libs/libglvnd/libglvnd-9999.ebuild create mode 100644 media-libs/libglvnd/metadata.xml create mode 100644 media-libs/mesa/mesa-18.1.0-r1.ebuild create mode 100644 media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch delete mode 100644 media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch delete mode 100644 media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch delete mode 100644 media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild delete mode 100644 media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch delete mode 100644 media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch delete mode 100644 media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch create mode 100644 media-libs/opencv/files/opencv-3.4.0-disable-download.patch delete mode 100644 media-libs/opencv/opencv-3.1.0-r8.ebuild create mode 100644 media-libs/opencv/opencv-3.4.1-r1.ebuild delete mode 100644 media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild delete mode 100644 media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild delete mode 100644 media-libs/phonon/phonon-4.9.1-r1.ebuild create mode 100644 media-libs/tiff/files/tiff-4.0.9-CVE-2017-18013.patch create mode 100644 media-libs/tiff/tiff-4.0.9-r4.ebuild create mode 100644 media-libs/vulkan-layers/Manifest create mode 100644 media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch create mode 100644 media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch create mode 100644 media-libs/vulkan-layers/metadata.xml create mode 100644 media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild create mode 100644 media-libs/vulkan-layers/vulkan-layers-9999.ebuild create mode 100644 media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch create mode 100644 media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch create mode 100644 media-libs/vulkan-tools/Manifest create mode 100644 media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch create mode 100644 media-libs/vulkan-tools/metadata.xml create mode 100644 media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild create mode 100644 media-libs/vulkan-tools/vulkan-tools-9999.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index abd11e33b5c6..48524e1199ff 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/dssi/Manifest b/media-libs/dssi/Manifest index 061f73570d1f..fcd1b4b3f0f8 100644 --- a/media-libs/dssi/Manifest +++ b/media-libs/dssi/Manifest @@ -1,3 +1,3 @@ DIST dssi-1.1.1.tar.gz 712038 BLAKE2B 426fcbf5eb9024b6b0a4fad34fd8c0e0b18ff8eefdab22902cd929dae86be55d8cdc01e92c0c75c9cf1c6e5918317109b78f8aad4d2db0abafd6d9405eb285e4 SHA512 faf35ae851b889ad17a8ba624c713af8a5f33bb93db8e34842e8b778a0e36c3eab9ab712a40e4ca7ecd96954f3e70504d89a75b3826dd138332085e176c0d34d -EBUILD dssi-1.1.1-r1.ebuild 950 BLAKE2B ffbc7834b17ba026819acf11ec8e91b68582d219ac13dd55f8482574d8b8a472de87b79b00e2d02ac55057669e852fb76e3c72ce197ea58c108483fbbc4458a2 SHA512 8c21b4032422a405c7b4bb4c1dd29b50487e7340af90ce4f2bc44dc6f41e191d1a69229fa22a3a360ec2fdf442c92467189b49f6f32ecce4f76f098ae0ed048e +EBUILD dssi-1.1.1-r1.ebuild 900 BLAKE2B 1df3be9f267ebe240ffdd8bfbca1611b6d39323c13d8badd6076898ac8f428e57accb057f5e6a06ca08ba17aeed578bf155223ad384bdcd615890770bf02075e SHA512 54c49d8adeac4e847ee60421063b6331af41d68dcec8ff44d5f44f02e6991324bfe18f247c09f2ec4f54c238a750c74b36ef5a8eef895ae189bcca92ecc0a4b8 MISC metadata.xml 333 BLAKE2B e39f496c64a33bc34c7f8f6401731cad91786984d96c0707e4fa3c8d21157f54a0b4efba3d654a3fb19b51a85422f93962730e28ad1699ed0b2e80f1d8864f1a SHA512 051e33a55f071b13cb45d35abc79ae192a053e55186051f5cf166c126145d222739e16e96e59ee58d119b103568714eae67d149a6861332d19fc0a5a8c8fb83f diff --git a/media-libs/dssi/dssi-1.1.1-r1.ebuild b/media-libs/dssi/dssi-1.1.1-r1.ebuild index bdb76d8a6085..ee5f8943082e 100644 --- a/media-libs/dssi/dssi-1.1.1-r1.ebuild +++ b/media-libs/dssi/dssi-1.1.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=6 inherit autotools DESCRIPTION="Plugin API for software instruments with user interfaces" @@ -24,6 +24,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { + eapply_user sed -i \ -e 's:libdir=.*:libdir=@libdir@:' \ dssi.pc.in || die @@ -33,13 +34,8 @@ src_prepare() { eautoreconf } -src_configure() { - econf \ - --disable-dependency-tracking -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc README doc/TODO doc/*.txt - find "${D}" -name '*.la' -delete + DOCS=( README doc/TODO doc/*.txt ) + default + find "${D}" -name '*.la' -delete || die "Pruning failed" } diff --git a/media-libs/fluidsynth-dssi/Manifest b/media-libs/fluidsynth-dssi/Manifest index 201fe3b3d959..d65c36078f96 100644 --- a/media-libs/fluidsynth-dssi/Manifest +++ b/media-libs/fluidsynth-dssi/Manifest @@ -1,3 +1,3 @@ DIST fluidsynth-dssi-1.0.0.tar.gz 325047 BLAKE2B 1290a3eda38e9381bba3fcdaeac7cdcd6fe4bd33e521d40ae084118da77f8aa00c45456b5bf71c919c3009b47aa18f4cfc4eb9a643e66c9e0e6b25b6f2fa021d SHA512 e67ef9c4133c1c0bdba16a094f2e179ddc4c0ed5cff22bfd832dd29697604211de6dc5092e9d6cc82dfe6243fa2a91fe6fc41cccb1d9f5a8ee5b31ebc9d2b724 -EBUILD fluidsynth-dssi-1.0.0.ebuild 538 BLAKE2B 5adae188020f5e34db54bc1db431ee7fc77bbb0024ec5b5b0c40db17ed15a95e3fdb91f99510cc7aa768635794ce361d73d4874a29ea8a416adadfd7592eac27 SHA512 9f2c31759913d987c59cdd23ddd18932ddefe4d054077d30aa85df7745bfa0b0e5fa23cb91540cbf546bb857d0a02ca599d8886230fa1e84e834774939ddfca5 +EBUILD fluidsynth-dssi-1.0.0.ebuild 453 BLAKE2B 6a8abd215ddf4cf8a78b80d67c526bdb9c69758de28f0a4205108d2b329c8ac19318f0623db4adf70e5632d29052a24d405ac74fa004bed595989dee06b14b0e SHA512 db5f0af73dbea7e49c458055edad07e83ce429789d91c2cd3125cf725e1124a8ace450c3729339d5f3ef5c98f830460602edf085c5f5846a7128c2d0b5e05cd1 MISC metadata.xml 343 BLAKE2B e857bc160f1b72d05f1395dea52fac9f2084e559480515b1f123c027d24e3e2c170045006dcf877a7dc7fdd5df7e8cb412d74f6c0f8f3ddd5df7242da15f57e5 SHA512 a7eb8732dae53f7a4c9766de1a04a093483149b52c4b180bcb44b32c751741414b075e65c191c0fa01d50af75ca24d569c0d001211a826e546fff94886b0a44d diff --git a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild index bc5c85782e60..ab3fb0a9843b 100644 --- a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild +++ b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=6 DESCRIPTION="DSSI Soft Synth Interface" HOMEPAGE="http://dssi.sourceforge.net/" @@ -19,8 +19,3 @@ RDEPEND=">=media-libs/dssi-0.9.0 DEPEND="${RDEPEND} virtual/pkgconfig" - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog README TODO -} diff --git a/media-libs/fnlib/Manifest b/media-libs/fnlib/Manifest index 29dccdfceb72..7b784547399b 100644 --- a/media-libs/fnlib/Manifest +++ b/media-libs/fnlib/Manifest @@ -1,3 +1,3 @@ DIST fnlib-0.5.tar.gz 431588 BLAKE2B 9137fcb3bf9a7f2df193c6d13a39b10c09a90b5a6ab9ef65d18b4873611434461ab14b5abc3ea562d79a1d5219797a61b88d101b19a26aadf2ca922f1b789cee SHA512 de126e62941f5f7958ef243261140147ece3296fc2adab1107c561b16691ef49830d202bb9c7921f8b9a2bda9fd3d59005274d091679be83b7d133a20dbf4ed9 -EBUILD fnlib-0.5-r2.ebuild 616 BLAKE2B 0200c1e3ad41f9eddfaaf55886cf68ba811d40f89a8a9c75c7357288d9afba78d6021c89afc219e66e8af3b0c4ebf8594b79be9a9ab132dd2a0760e151a2058d SHA512 50fc01927cc5f10ca518e5379f8caaaed33fea0b559ba8e683343affc230d203b31b93bddd84bb194796562376f0ac8b1969bab4f4942598c4c761be0e991984 +EBUILD fnlib-0.5-r2.ebuild 575 BLAKE2B a612777d16253aec00dd8a45370338944935f63c90fe2d79b0992ab5d6469c29645ac1b3d354ba47054bd7a79fe9fa69ac7fffbee81b5ab81f3306c15fc2df27 SHA512 409674e74cf41773eee2c3c41f4aee02de42317d6407b34f41a71654ac6d9fb1ef88d168cf0eb914973ac3cdbfcc67f5c5bef355d424248d9b2f9461c33b0f03 MISC metadata.xml 246 BLAKE2B 8e42a79334d5ae7cf62794aa2d53ec5b472d6bc28550d58d37b09b26e68b87e22749bdd2c23cd120da320a5af5f0346569dd93cc417c04e83c5913864557e066 SHA512 460d202301d84244b49bd0eac9611142f8800f9f79dd0f42872b35c39b439e1be231cad8c3cd5cfabc162f26198df38aabcd65fcd6c13e9fff0c58ae939dad7f diff --git a/media-libs/fnlib/fnlib-0.5-r2.ebuild b/media-libs/fnlib/fnlib-0.5-r2.ebuild index 791991112da9..db892e87ab20 100644 --- a/media-libs/fnlib/fnlib-0.5-r2.ebuild +++ b/media-libs/fnlib/fnlib-0.5-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 inherit autotools @@ -17,16 +17,13 @@ IUSE="" DEPEND="media-libs/imlib" RDEPEND="${DEPEND}" +DOCS=( AUTHORS ChangeLog HACKING NEWS README doc/fontinfo.README ) + src_prepare() { + default eautoreconf } src_configure() { - econf --sysconfdir=/etc/fnlib -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog HACKING NEWS README - dodoc doc/fontinfo.README + econf --sysconfdir="${EPREFIX}"/etc/fnlib } diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 410f1c340861..02b728fbdf52 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -10,7 +10,7 @@ DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051c DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1 EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68 -EBUILD freetype-2.9.1-r3.ebuild 6703 BLAKE2B af83a3e972a7d1dead1696fdc54832a1ae237af0f1cf0afb5618e6aeb7a26b1eeaea2693f78f2963db0e279e113c51e5a1073819aa20be6f7bbc3b4390cb9a1b SHA512 fd5d45c5645887459f851c01f8ca66d346d8c464188293763ef0b2e9478640267fa1cb5bf45f63c61d4b5ef28c8f5eee7f27a8fb4237d745638bd5978cbd8ad6 +EBUILD freetype-2.9.1-r3.ebuild 6702 BLAKE2B 828fbbde1c28ac78fb4dafd65a564680df30fe014569ff6d4758f11b7316f074590b8cfb392ee07d21af1ac8327246db2a5ea6a69218b887e719bce0bc0a976d SHA512 dbcf3b9e89949dc75d008b575ebc5acec806fa8f5160fc21179f90be15b1ef1042a28a2423d7ccdf47d2eb374a02177f1da08cb4f31e9ac80bdebc3041287598 EBUILD freetype-2.9.1-r4.ebuild 6713 BLAKE2B 161173b75bd41db18db1fad4a515a8fefbe0174ebd145f983af3931572d3f1af036929d2d1773d4a188521898de160cf0d272147b55feb521bce55db098192dc SHA512 88f99dd4163c515cb9150b629472a8ed3f46814bfb8277461b23cdf0248a6acdc17e160e7f2f669daed7ae9e594a2b5d933be0f764012f5e58c2e7104964ddb2 EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26 EBUILD freetype-9999.ebuild 6713 BLAKE2B 161173b75bd41db18db1fad4a515a8fefbe0174ebd145f983af3931572d3f1af036929d2d1773d4a188521898de160cf0d272147b55feb521bce55db098192dc SHA512 88f99dd4163c515cb9150b629472a8ed3f46814bfb8277461b23cdf0248a6acdc17e160e7f2f669daed7ae9e594a2b5d933be0f764012f5e58c2e7104964ddb2 diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild index 9060267bef2e..69fd00a6ac47 100644 --- a/media-libs/freetype/freetype-2.9.1-r3.ebuild +++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild @@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then 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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 diff --git a/media-libs/lastfmlib/Manifest b/media-libs/lastfmlib/Manifest index fb8b0dcfd308..aa2e43c197bc 100644 --- a/media-libs/lastfmlib/Manifest +++ b/media-libs/lastfmlib/Manifest @@ -1,3 +1,3 @@ DIST lastfmlib-0.4.0.tar.gz 333224 BLAKE2B 2e38adb90a468eccf959950d89e2e0b903e7e96c871b4d20216ee233933392fda7cd3bd86d90472e0f305922dc11e1dc998206c669a13be76eab7fdd07e6b45b SHA512 88e26bab04eda06f77f4684a5fe14aa9761acfcb5d7d8726c4d3ae5e1a4acd73e6b0c9bedff5d51bce07afd7b883085f1adba98714e8ebfc5bbd20b8aca66748 -EBUILD lastfmlib-0.4.0.ebuild 727 BLAKE2B 82d659679ec9aa2d3b2371d18202170bc9bed6b393dbb6917d33a57729e9297b1620bfa6d09d2dc52217c6e635dfc2efb55bdf730e22ebd0e001353cecfd6cf0 SHA512 610c65e7c22e0540ee9bb4d41c97e8ebe4645b95d4e216bc06e00e4e3214eb2cd9478a41def1890a8514dbed8c92f96e88badbc30b9df69d3756a57787fe69dc +EBUILD lastfmlib-0.4.0.ebuild 664 BLAKE2B 3a0cf60999baa26e7d202fc3ef50bbe6e49d02c5ed328523abd05b78442ee8d7fbfb79376fe7504eac58a7a91fea97a1677c76e4dfa2d63511e5c328ad2e556c SHA512 2b263e34261d74d174fec0270d2b7510484514c497089a23d5a504d85a500052065030d5dcf5420f80ff4d5097b43092f3b71c11325f40c45de9a6f749c4f17d MISC metadata.xml 335 BLAKE2B dabbb4b4997e73611fb77582fbb5b2f07bb0f41106dd68de366039342d2d1de1021e5d2133dc606baa6cc7f0510f7e532a955740c1735377d122f2387883fb9d SHA512 ecbb5547e38a68d686192d03224578355575915d90db53615a0b9aba928e4e2d1eec4b40a08da2eb8fb8e1a26a8b06e861cbad9b31a6af61087fe048e98b814f diff --git a/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild b/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild index ed124b016c70..3b55a002f90e 100644 --- a/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild +++ b/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=6 DESCRIPTION="C++ library to scrobble tracks on Last.fm" HOMEPAGE="https://github.com/dirkvdb/lastfmlib/releases" @@ -18,7 +18,6 @@ DEPEND="${RDEPEND} src_configure() { econf \ - --disable-dependency-tracking \ --disable-static \ $(use_enable debug) \ $(use_enable syslog logging) \ @@ -26,7 +25,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog - find "${D}"/usr -name '*.la' -delete + default + find "${D}"/usr -name '*.la' -delete || die "Pruning failed" } diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest index dc675e98f1d6..032676b09246 100644 --- a/media-libs/libbluray/Manifest +++ b/media-libs/libbluray/Manifest @@ -5,6 +5,6 @@ DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484 EBUILD libbluray-0.9.3.ebuild 2186 BLAKE2B 811d0c37422c0a9425084573f25c19be5a272a88654a227338029de63b4217a6ffe644cd88e45410fd66cd810d1931130e973ce839e8721ab3214710890ec1db SHA512 e2fa9e014338231de6f2811439f88bc861a8765eac08e25121c3200307d01dd478a537b368dd4b9a28966d4f3b2fe73f2d451369dacde8ef441400c0add68629 EBUILD libbluray-1.0.0.ebuild 2194 BLAKE2B 16b08e28b74eb2d8635092ab2a02d2225d8d69b0b100346170abef947f2a56cb3a3aba7e8a52307c0781e11b74b35ec13b11e15bf2b2e78f46c3481e7ce57976 SHA512 33d28c33eb451f6360426efcde049a9250bcc8ed63e35132f37517bc1630e9c95d189b40fc69ae642e5444ed19bd9a19f4521a92bdaa2640c62fbad8c0060952 EBUILD libbluray-1.0.1.ebuild 2202 BLAKE2B 486111965f4623e1f9b894f4533276c3e626a1152cbfb4ca0417bab5c4fc11489a7e564b6724123312bb7759e711db945cdbd4f508a0bef77df94ab65ea60353 SHA512 d6666bcc3db0d2c0407b364eccfda76710da9fb66710e93bb71707e4a5ea5941b7bcca4d06a1afa4273d20e1224496f8b60f2106f35ccfe6121efd25d1aae896 -EBUILD libbluray-1.0.2.ebuild 2220 BLAKE2B ad0848c9a6e6a507439addbd366368003e4fd593c1633738707c773464772a97a92f31da798e86540c8ef3127edb725dc8dbbce4b309bda549fce916f23498c8 SHA512 ccae5f7cadd1b5dc072b642d9983f493c02153ef34846407aa1d02e398ba712de5dbf3f15026ec0b9b01b0a08b5fb2e11ce2e8d5d5e33ad6a2c4299fefc91781 +EBUILD libbluray-1.0.2.ebuild 2219 BLAKE2B 61ae1ff3e3cb928616fc61eea6e27014242ce6bb07e4ff813b789ff2db7287c063b9d205af28c72dda594042fcc3ec7d59d9cac61178b0b79826000a39cb34f4 SHA512 8090244f0be463dc1c6627d30787eabc1c4e94b5235988ce62e5d16bdd05d81f656496647cb185d988373edba2477fb80fdc2874e1830cfcc1c765cc258d939d EBUILD libbluray-9999.ebuild 2201 BLAKE2B 161cdc3be5991a0462a1d4fd90d361032d44e8d6c21ab4166e2db49698803b7a561a1e5f78c5dbcd95708658b46e33a968c78d0f4466387833eeb02afdde8451 SHA512 a3d54041b72299fa25da8c4ec957f77aff6f8b4f1c0be1d775172fdbf6162bcd51c36275e16b71951f1e6f267bd12bc799a99b87f97a723b74aad7522da7b81a MISC metadata.xml 606 BLAKE2B f492e640b388b4aadaad89a5e282f3c09044baee74d8698b57c554d0cef6c99ebb64c13aaefbc0d4e2dabd3d5d4c0942465ed4ed2d4d439734f6c9ad55307ade SHA512 649b1a57ebffc011f011a0adc13b3d9a04a43f74dd9e24e4a233de59cd7fa0408ab14b67db21618e1c3e7cd7d78300b181dd22f4110ced4cf4ca12ce0c4951bb diff --git a/media-libs/libbluray/libbluray-1.0.2.ebuild b/media-libs/libbluray/libbluray-1.0.2.ebuild index 955ed347c52f..6fa860eb5b28 100644 --- a/media-libs/libbluray/libbluray-1.0.2.ebuild +++ b/media-libs/libbluray/libbluray-1.0.2.ebuild @@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git" else - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" fi diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest index 610888295a04..f632b1febf6e 100644 --- a/media-libs/libdvbpsi/Manifest +++ b/media-libs/libdvbpsi/Manifest @@ -1,7 +1,5 @@ -DIST libdvbpsi-1.3.0.tar.bz2 459083 BLAKE2B 50e8e1780ddaf9a07bd8121d1e179464a6105eaad3d0aa162f9b217863cfc63168a84f60be9de071cf5ee8389a671fcd1375629d452ed77727bb3eaed19a7b19 SHA512 59f097a1032e8cf461210128c7468da4204f077a61f68f2be3310e60004774157335cd7cba82271fcc89b7b6b17a12a06b6214357227ec9976281d9b50565c54 DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309 -EBUILD libdvbpsi-1.3.0-r1.ebuild 973 BLAKE2B 4fea8917073fd09569ac206febc7087ec1d6637c306d2eb23631e51c129227ae5e4781e2dc5bc7834c8ceaf6560d4951d6d624c8edaeba56dfc91326f28622b0 SHA512 6616a1d618c225c612b88b6b7b9f2fdba68e24bea57d3105d3290f1bc87756f7be5b28a712684252a61da7d0f3e8adc923afb9ee6a48840c9a086bf45b6a2889 -EBUILD libdvbpsi-1.3.1.ebuild 962 BLAKE2B c3d9eff14aeaaeb850557e31e45026304b0011d809e471f08439e907b8e382416f364eee460c4d7cd6f7d967439bc83b38fff836ac14221a7a12cdefb97faa01 SHA512 281b68c15e49d933fa88e9ab15b5719af3edb730030bfb5556ceeef81fe56300f9b3db8e725187c788bdae7c9ad242f563b4af24c973325cf3d339a3ce1ec1a9 +EBUILD libdvbpsi-1.3.1.ebuild 961 BLAKE2B 6fbc4e59378ee2267ceb69f740cabf84e3a2c4ce6775a93db3a890c1ecfb9219ceed8383e24323a3f9b306d2623b4266e6fde41190ba46e9eb0b5f7f779c7145 SHA512 04b0ef6a8239d868a357964bb97a54f188fd27f767ed52b0d14e6eb9932f286c1e1a2fbe134ab663461a9436afcebc781934ea0279cf4dacd2df11e0a6a16bed EBUILD libdvbpsi-1.3.2.ebuild 968 BLAKE2B c6c59945ea3796164158b9a8623468253f0085050f29d64e34e9e13c0791322e7a8079fcf2a8c300bbd1358aa274dcd68a28f7ba98a0cf99620408fde0984f47 SHA512 fb7484cb854a93e04aa0d199e64751127976af47d1d8f4c5f876b3fd29fa1a9cbcef310d5a42bcedce42b01a2f9d2f96f9a9d05e01b322cd261d2895f84a4ccd MISC metadata.xml 212 BLAKE2B f25483a51eb36c195e77aee58c9f94951dbbd719edb1d088524ef3db4f2d8ffc628b6c0c01efb9d5f3083a81e6cd0edeba56af12a9dc643bc3facbf16e89c0b7 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild deleted file mode 100644 index bfe3dc8a5cbc..000000000000 --- a/media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="library for MPEG TS/DVB PSI tables decoding and generation" -HOMEPAGE="https://www.videolan.org/libdvbpsi" -SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -# Sublot == libdvbpsi.so major -SLOT="0/10" -KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND=" - doc? ( - app-doc/doxygen - >=media-gfx/graphviz-2.26 - )" # Require recent enough graphviz wrt #181147 - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_prepare() { - sed -e '/CFLAGS/s:-O2::' -e '/CFLAGS/s:-O6::' -e '/CFLAGS/s:-Werror::' -i configure || die -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - --enable-release -} - -src_compile() { - emake - use doc && emake doc -} - -src_install() { - default - use doc && dohtml doc/doxygen/html/* - rm -f "${ED}"usr/lib*/${PN}.la -} diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild index bdad26e392da..a522c5ffad22 100644 --- a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild +++ b/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" # Sublot == libdvbpsi.so major SLOT="0/10" -KEYWORDS="alpha amd64 arm ~arm64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="doc static-libs" RDEPEND="" diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest new file mode 100644 index 000000000000..3df7efc29f9c --- /dev/null +++ b/media-libs/libglvnd/Manifest @@ -0,0 +1,4 @@ +DIST libglvnd-1.0.0.20180524.tar.gz 796997 BLAKE2B 75c50d2eb864b84e97af5b5f0c9bfde2651436acbad323312ca8b88df8cfa4dd170a743748e8c2269f39d9cb492d6ffaabd66a76ffca3062be2462adca4c79cd SHA512 3e49e4647b50f04dd534282b2f7ae76d84ea3dcd071771492a6560ae327d6167fcd071d32c447af097e68d84e6560d6b2c2b00d1409664e8b6a628b49ccdbdad +EBUILD libglvnd-1.0.0.20180524.ebuild 1038 BLAKE2B 42a2ae7f9e5d3a923c6590b00357523811ec2b8ae29314f9aa1340f7544e9bd7ec1e3880fc616b51afebf07c512e0d1b70d01513b1d2b28cb8b33aca4b4e5791 SHA512 d83158a4f7bde62e3096e320f488d1bce3418f2a45814c06e51518642eaff1fba22717ed803ae22e824043039710a0c681335ba448485777771ac0edba122b1a +EBUILD libglvnd-9999.ebuild 998 BLAKE2B 4796525b97166079c2364bb0d75157ae405a6f8089742d7b691934bc67f32f2e8273a3ff25e47f6bdd083e7fcae64ef705a96d7e99c9d88ec7aa30449b5d4ad2 SHA512 6d2ec15fe6c651997152f39f64060f98cca6c9f2ffacb78a4f485e76c8e160dcec14cd85b9407f6a080871e0a38422e61e630051e547137ccf4eb8509d7b7e03 +MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c diff --git a/media-libs/libglvnd/libglvnd-1.0.0.20180524.ebuild b/media-libs/libglvnd/libglvnd-1.0.0.20180524.ebuild new file mode 100644 index 000000000000..b1d53c3d68eb --- /dev/null +++ b/media-libs/libglvnd/libglvnd-1.0.0.20180524.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +PYTHON_COMPAT=( python2_7 ) +inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1 + +DESCRIPTION="The GL Vendor-Neutral Dispatch library" +HOMEPAGE="https://github.com/NVIDIA/libglvnd" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + KEYWORDS="~amd64" + COMMIT="8709003ffdc905d144855c3117a31da220149d4c" + SRC_URI="https://github.com/NVIDIA/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${PN}-${COMMIT} +fi + +LICENSE="MIT" +SLOT="0" +IUSE="" + +RDEPEND=" + !media-libs/mesa[-libglvnd(-)] + x11-libs/libX11[${MULTILIB_USEDEP}] + " +DEPEND="${PYTHON_DEPS} + ${RDEPEND}" + +src_unpack() { + default + [[ $PV = 9999* ]] && git-r3_src_unpack +} + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf +} + +multilib_src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild new file mode 100644 index 000000000000..9f9f724cecc2 --- /dev/null +++ b/media-libs/libglvnd/libglvnd-9999.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +PYTHON_COMPAT=( python2_7 ) +inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1 + +DESCRIPTION="The GL Vendor-Neutral Dispatch library" +HOMEPAGE="https://github.com/NVIDIA/libglvnd" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + KEYWORDS="~amd64" + COMMIT="" + SRC_URI="https://github.com/NVIDIA/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${PN}-${COMMIT} +fi + +LICENSE="MIT" +SLOT="0" +IUSE="" + +RDEPEND=" + !media-libs/mesa[-libglvnd(-)] + x11-libs/libX11[${MULTILIB_USEDEP}] + " +DEPEND="${PYTHON_DEPS} + ${RDEPEND}" + +src_unpack() { + default + [[ $PV = 9999* ]] && git-r3_src_unpack +} + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf +} + +multilib_src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libglvnd/metadata.xml b/media-libs/libglvnd/metadata.xml new file mode 100644 index 000000000000..7a349da8f2d1 --- /dev/null +++ b/media-libs/libglvnd/metadata.xml @@ -0,0 +1,11 @@ + + + + + x11@gentoo.org + X11 + + + NVIDIA/libglvnd + + diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest index e7a3b0cd575d..386e522cbcac 100644 --- a/media-libs/libmtp/Manifest +++ b/media-libs/libmtp/Manifest @@ -2,7 +2,7 @@ DIST libmtp-1.1.13.tar.gz 801519 BLAKE2B f0452515f83d001a4e7a32528265d46814898fb DIST libmtp-1.1.14.tar.gz 804354 BLAKE2B 8a5ec431b3a3c1445b3ae62dd0f6ebee36a473ce3d7da07400263434d6e1be49624b8c807bce015f9e55d450f9e25eb2dcf0831c639b97e39cb900ac4d62f81c SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1 DIST libmtp-1.1.15.tar.gz 805983 BLAKE2B f464c58a9844706ecc066a4a744b525ac6e8020ab80e35b01eab2813562ea1452deb5e6fb4477eb243b6631c24f8bc11887ec35279cb6cd89e1a459aca6b36cb SHA512 c85f47ef4e05d7f5b47d06463ca97c123fa068c4b7369aeba496cb1cfa03f0148b3ba73feed7da96269ba94b76b4b81858ee4bda5af67b0aac3b07fe39b5354a EBUILD libmtp-1.1.13.ebuild 1596 BLAKE2B 34ae4dc534b04f1a010155aa2c20c956e1ff692a57b3b291bd701a1c20f291c79eb4f7dd9263749374c3b3b13796379f0eba1fb2acd65c77882214258a0e71ac SHA512 fc4452159dd8d8d7285002ea14f8ed64739cacf00551dd0408450f8370480de0388ee27b27ef617e239c24aef63e239d22265e8b75e97af49bd875a71f55df8b -EBUILD libmtp-1.1.14.ebuild 1598 BLAKE2B ab94b3ae468ec7305b4c3314ef706a12f2f80b70db5c7a4d88ab6e22caa08eeb492d31009c62fcbaa252343d0df9cd31b91e7899b1e18e8e173aea704f90bfd3 SHA512 20075ea39de174f9286ac33299e0d3133606de6e50fea9751e1c419628cb57d9d20367d3462c8722cc3426da44422969f691f68cc3fff29bf9b63bc28ce865c7 +EBUILD libmtp-1.1.14.ebuild 1597 BLAKE2B fb0ff0ba1478dd9c6d8b1e6be56f88d288a0cce2294ff271a1c392881c009dbf41ee457ff8a97282e76faede81a35296fd04507d64c9bd5cdb425e593e50df93 SHA512 ed6d56fa731f121082cc27e7790530ef4c4a02885685a8f0fdaea693c963d0b9a18c6b74bba8772c4965d2d910590131cf4da96fdc1f35568c7135f4da11ccea EBUILD libmtp-1.1.15.ebuild 1603 BLAKE2B 52649939b562e4af906e7ee5613afa6cb35d3c7834a6593a426553f19a921f87a7a2a0bd763843a7c115e236de9c7919855af60702d88d128c8fbf0648e7d652 SHA512 8de4ae97012b8c8cbe4d7b5408834a048c73d91b8e9371d936c48a93193a8b528d5b3e148d14d31cdbbb669bb995f796c8bdb22cf9e708e60e1c59a74e2885f1 EBUILD libmtp-9999.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a MISC metadata.xml 329 BLAKE2B 4d7d938ffffc075084e5d43ca37040cb1612e7d6bdfed9c12d5edb00e0ce536d2d19b070dcd26d64a46a6664985db1f07aed073e2912c3dfc743ff6d55e8d187 SHA512 99fed0095b41d435c1bf82d7fa9c51b03fadc01646d959735693219cbfe2b69f784610fb296d5f1fdc8bb7c84dca4dbf3718effd350745de6483f8a8f9407d6c diff --git a/media-libs/libmtp/libmtp-1.1.14.ebuild b/media-libs/libmtp/libmtp-1.1.14.ebuild index 3618594e6231..98e17849b096 100644 --- a/media-libs/libmtp/libmtp-1.1.14.ebuild +++ b/media-libs/libmtp/libmtp-1.1.14.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then inherit autotools git-r3 else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)" diff --git a/media-libs/libpqstego/Manifest b/media-libs/libpqstego/Manifest index c63472102b42..ce0f38f327da 100644 --- a/media-libs/libpqstego/Manifest +++ b/media-libs/libpqstego/Manifest @@ -1,3 +1,3 @@ DIST libpqstego-0.0.1.tar.gz 360725 BLAKE2B b1ea4559f424205bcc08310b0e49f24cdaaa2b049b42f9c89ca5a4197cef054aabb6ef5e0c610605b1e4757a217be4dbb1dc1b7e90beb69029c79669fcafaca7 SHA512 bad57743da674be597b6d648821190b6bddb9463e6665751def1a3dead88279ffbc71b0f05b362e61a25f67112f5a49de80ac4691dc3670792097b4830895c44 -EBUILD libpqstego-0.0.1.ebuild 589 BLAKE2B a578c2524e7a6705c68df0ac67d269266049894d23dd1a79044a480fe0f31dd5d39b1a71b40906ca586e877699cba95105fbae1a917cf80da0bb9160cf81497f SHA512 fce84ae60fac40127124913438c4ceee80fa19e874864d77d44e274af5cc5a6c8a27635bbb3df61ab39451c0064eaa52e9e9d7d7f2e38948061f99dd6717769e +EBUILD libpqstego-0.0.1.ebuild 516 BLAKE2B 5a53474652dcab8de65f4cdcc3e795f9b29081c2ce02ed0cb64bacc353d439de29ce502c548f2a07e7f114ce5a6f5357df75cae07857cc731701222cfea8c4a4 SHA512 11ac05dae5444118e805df5972f1280b5e8928191cc6a64fff27f79dd03d88ff6e995426980d9b63e06a07037e4a484aa6718f92b6bff7bfba0f28738626f832 MISC metadata.xml 346 BLAKE2B 69416f47156576f7e842d6452198ac2715d5c4ee8fc215cdb7104d071331a767f2b053981e6cc63ba754d769e5f71322d357cc783158bb97ac2329268a66c735 SHA512 f49877aff2dc6429963ac5d9bce07797df793bbd89ef82cbb745d13fa2aed484a0758b6209f554fe3f21b3bde84827c6125cdca6fdaa5d6b6b1a4764c5d34d8e diff --git a/media-libs/libpqstego/libpqstego-0.0.1.ebuild b/media-libs/libpqstego/libpqstego-0.0.1.ebuild index 088e27b62925..8546dad6caee 100644 --- a/media-libs/libpqstego/libpqstego-0.0.1.ebuild +++ b/media-libs/libpqstego/libpqstego-0.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="Library for Perturbed Quantization Steganography" HOMEPAGE="https://sourceforge.net/projects/pqstego/" @@ -16,12 +16,10 @@ DEPEND="sci-libs/gsl[cblas-external]" src_configure() { econf \ - --disable-dependency-tracking \ --disable-static } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS CHANGES README TODO - find "${D}" -name '*.la' -delete + default + find "${D}" -name '*.la' -delete || die "Pruning failed" } diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest index dc3eb261bf64..12c6ad3e37b9 100644 --- a/media-libs/libptp2/Manifest +++ b/media-libs/libptp2/Manifest @@ -1,5 +1,5 @@ -AUX libptp2-1.1.10-configure.patch 1119 BLAKE2B 6a688f8ec540f0b6e1f8a0a52295ccbc5e16cdcfc27786c5169fdbb27bebbbe819d2b59c4c0aced5f4759031966b2eb2195aa2a626395d6126559acd9ddeb5e5 SHA512 1bfab2967ac108c2329ea83d86ddf80bab0a778f4ccfed32866503d37f1ac99aefdd479565152a306b9f2a1403401416fb7b243aa25baf99e07acd766fbad33b -AUX libptp2-1.1.10-makefile.patch 373 BLAKE2B 2f119df2f91b0286bbf8e6d5e2ea79c0fb37c956040a55aa2c4b51c8beb1d976a8a444b1ad860c6554395d7fb39f63102e7dcbaabf20ea64b9f5925be5c137ef SHA512 6567cf03c85e73a1f3dbbea8fb2bef6539491ffe1a729efbf5ae93e5e5ff0efda9634ebac1b7d33db16432fa7cae20cdbea5839da0179997df0cfa3e709a0a01 +AUX libptp2-1.1.10-configure.patch 1088 BLAKE2B 850c6cae1dbeff2f445c5c5bee6a2d0f3b26ca75579d42727e92225c3a58f7197fb7c57634595b15e094a273f5c8c9199f2d8f16a47d849398b91798603b17bb SHA512 3680f6166736816595ebf85c1bf0435d3db8c38c5efa2e60d35df61ed77e8d5204eb25d64bc317ba982a1319afde55d02e1438f67e19b4869e00135d5873a43e +AUX libptp2-1.1.10-makefile.patch 342 BLAKE2B 956fc9c05873ec4906d86a705cbd298d0fa99c97ff2ab509a6f6dec10d2c165b38c0a92540df4e54bd70f5378822de680b5781ab7b766ad8a051e4ec932c840e SHA512 7d81142155a61821ce2bce4b8999720685b996fa84f95615e9c83b7b8e3b320afa1275fc565307ffc3cc09de8d29441d2155a76b7365a58f065fea751681cf5b DIST libptp2-1.1.10.tar.gz 380767 BLAKE2B 479739abc45d8feff4dd0f70fbee1ac7ad24f78aec99ad176858e8b835cef73135ae3537ffe000cf8321a91e4437cc2606ddaf4f24c8725bc4e2540baddfc4d8 SHA512 9c6140c389f995d08cf49e5215e407131f51b17fc901e47c5ee675d9fff9d49075554ebc21549b239013fd7d2bd5ab8fb8ad9645ded149901479f6b85c808d44 -EBUILD libptp2-1.1.10.ebuild 686 BLAKE2B f98f1fed9344500350363fe4f490b97179100575b00d6394c575ced4ea22b32b018899dc740ba6662319bc42d139551c0429fcf7dcacbe61f475538535e3c5d4 SHA512 63253a72f1d6ada12dbbb1cc000e4b315668e7cc96cc9b2755ed116cf424b7feec7fb3aaf68c8f9f1f82fa4df4a00c1a887e75c3389eed261defc96da4c88e7c +EBUILD libptp2-1.1.10.ebuild 630 BLAKE2B 5ac252b4b4471c166f8ef4b099737b3e678766ecaf3b8a91f0dd65383bbe76e3ee34864ffab2c27a6f4fed3abdecd920a89f73b8c60e09d5aab0edcc278f81f3 SHA512 4fc5256bcc4f29e91860e3f68e491968f392954e5771b02456ea206e7e55ee002c7551c680031e440481829d80cf190204efd409d075424f817214e770c240c6 MISC metadata.xml 248 BLAKE2B 971b392f3b96576417ef6c659ac405ad884d73547191b312ea466790e3827ded89f585758471e52acb356ad7271b27cd033861f900519bcd1897aa2cf7cb469a SHA512 205bb9045d9fdc9cc2eaa9e7f67694a70ecd74934a9067a6de0413edbed1a1a651d8658f9d61f4a3671858445ab82616883fb6236c499072e3d6223971ac9477 diff --git a/media-libs/libptp2/files/libptp2-1.1.10-configure.patch b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch index d8f1260f5e34..5036ff683cbf 100644 --- a/media-libs/libptp2/files/libptp2-1.1.10-configure.patch +++ b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch @@ -1,5 +1,5 @@ ---- libptp2-1.1.10/configure.in.orig 2007-12-28 10:28:36.000000000 +1100 -+++ libptp2-1.1.10/configure.in 2007-12-28 10:36:14.000000000 +1100 +--- a/configure.in 2007-12-28 10:28:36.000000000 +1100 ++++ b/configure.in 2007-12-28 10:36:14.000000000 +1100 @@ -25,6 +25,10 @@ # Checks for programs. diff --git a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch index 0e7b5adec8fc..19fd2590ee28 100644 --- a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch +++ b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch @@ -1,5 +1,5 @@ ---- libptp2-1.1.10.orig/src/Makefile.am 2005-11-01 02:39:40.000000000 +1100 -+++ libptp2-1.1.10/src/Makefile.am 2007-12-28 09:51:01.000000000 +1100 +--- a/src/Makefile.am 2005-11-01 02:39:40.000000000 +1100 ++++ b/src/Makefile.am 2007-12-28 09:51:01.000000000 +1100 @@ -17,7 +17,7 @@ else ptpcam_SOURCES = ptpcam.c ptpcam.h diff --git a/media-libs/libptp2/libptp2-1.1.10.ebuild b/media-libs/libptp2/libptp2-1.1.10.ebuild index e41d7e0a657b..53c5e01c7093 100644 --- a/media-libs/libptp2/libptp2-1.1.10.ebuild +++ b/media-libs/libptp2/libptp2-1.1.10.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit autotools eutils +EAPI=6 +inherit autotools DESCRIPTION="Library and client to communicate with cameras via PTP" HOMEPAGE="https://sourceforge.net/projects/libptp/" @@ -16,18 +16,16 @@ IUSE="" RDEPEND="virtual/libusb:0" DEPEND="${RDEPEND}" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-configure.patch +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" + "${FILESDIR}/${P}-configure.patch" +) +src_prepare() { + default AT_M4DIR="m4" eautoreconf } src_test() { env LD_LIBRARY_PATH=./src/.libs/ ./src/ptpcam -l || die } - -src_install() { - emake DESTDIR="${D}" install || die -} diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest index d2cd00a457a8..6669adfef9cb 100644 --- a/media-libs/libraw/Manifest +++ b/media-libs/libraw/Manifest @@ -7,7 +7,7 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500 -EBUILD libraw-0.18.11.ebuild 1848 BLAKE2B e17828060310981447af3318510c713f1c5ee65246a22e2cc337da360b0bf96799503d5376e9baf6f42ed98e58b69d637031e36cdd5dfe9a5a974f57d0cec9d4 SHA512 a1e47c7c6dd414a5e23c5a4e02fca6e4efb88894e22fc05cc0d1fb67f15a02009ee473c1ac40a24b9ee540c458396275d63214d6ed6c28992afa839684afaefa +EBUILD libraw-0.18.11.ebuild 1847 BLAKE2B 92b905400196ccdca17decb4b25049a08ebcca89e5c584834265291a1863ce4e8afebecf6f964215229985712715e845b8c24f7309776c510542557bb87a9b5d SHA512 0ce9ef55645e335f7669db97ce3ed8ccbbb8e525bdcf5e8e1b18034e96325d201308a645208f4afba2056cd677dfd23af0b84f1272114fb7629b55470e0be134 EBUILD libraw-0.18.4.ebuild 1774 BLAKE2B b34582c011016beb415bf262bb8a5db89e9a6a2e641b0cb3bc26b93d86fd4b95616255a42fe5a6e50a76a0974875ebe151f9684b674435966265a16e97845442 SHA512 a0277cda774fc2ec3f318544655dbb3a39266828bf9bdac80a839577f4fb5a2028b34548c7aeea33a61560753ff4631ccfb0ae3fa558440cc507e23c9bc246db EBUILD libraw-0.18.8.ebuild 1723 BLAKE2B f48d3b7e4d07c1d48064a8dc16d5af25f532bde1501cc1a6714f5412c42b824b6e9c1ae936a2d548746871925df553f3f7f722aa450930f70006ffdd2e4026e8 SHA512 679c029b6628eaa141085c1a4788ddc17b927eda419a6ebdd6d398341293aec4703e00e0aef81ef7c5ee9794ccd8eb45cfcea682bee006b75621325cbf0692ed EBUILD libraw-0.18.9.ebuild 1815 BLAKE2B a17813cba8285e7dddbb7c13db642faed63dc11d4b32b69a8d9ca7cb46bcc8c55a3c0a415afbf243e9fa487f05a6f933feddd48a35ac9ec919379401896a8508 SHA512 55ca2174034614f008fd9c2daa96ff5dcfb612353c5d3b1ccebd28b71b91c5b40bcb130efc98b263f17eab46d13019d06dcd41d37bb5ddf22d257d830ec8dd01 diff --git a/media-libs/libraw/libraw-0.18.11.ebuild b/media-libs/libraw/libraw-0.18.11.ebuild index ffecd964bdf8..676dbd1dc244 100644 --- a/media-libs/libraw/libraw-0.18.11.ebuild +++ b/media-libs/libraw/libraw-0.18.11.ebuild @@ -22,7 +22,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )" SLOT="0/16" # subslot = libraw soname version -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="demosaic examples jpeg jpeg2k +lcms openmp" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 325678e8a505..d4b09c018ffa 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -5,5 +5,5 @@ DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 EBUILD libsdl2-2.0.4.ebuild 4642 BLAKE2B 4076b8040962f3640151a53798ed20baba3bb07e8a607191f76a0cc7fc1015fb8fca6b11184403d798819dae2b3b963d5aef21732b5092c8e4497bc2fa4d1f50 SHA512 a83ffe2f864f559c359b9315f50b82735ccbf246719b5598482a85afd3000ee52a261c17076dbde86078f31a8f7f46a22ac8d2891635d287f71e83715c8a4452 EBUILD libsdl2-2.0.8-r1.ebuild 4745 BLAKE2B d9225e03e3099971db730d3b03554ab6be323cd5db8b73e5eed0b9eb476b9e6f355122c0eed8b7a5f1ecc48ece714f9d71f6baf2b22c476456e6beabe71b75a6 SHA512 fe18bb622ff74b93637010304dce886cba44ca43985c505de6c02f443fe6dd7d09c1c2db1a4ee266f9f8a64ed89827ffb25040d408534bf1feebdb330997c4a7 -EBUILD libsdl2-2.0.8-r2.ebuild 4943 BLAKE2B 8794f3f6a7a67dee86c898129d79a24e578f1055a8e347890030f6cf4084af5f126c7697681d1e4ac651dd725247278d4c56bb7806a9af63602b3cc79677d121 SHA512 72a23a11f6c242495fb22aa2a99892d3f3a0200d2b95efce9a914ea2eec4543c495138383523082eb584f37acd19edc0ec27c670886a1af204b25de7dd3023c1 -MISC metadata.xml 1609 BLAKE2B 036c0f14aa213417757191a7b05d957bb24723733e2a847f6d6e3e23539674eacec37e5e569ab35c8382f0fafdd156b323f3a0468182854848ba3c944e30d9dd SHA512 5e04e0574226a2f3d0bcce5b1aa38b9c95226d9a7192beae0e77ca8769e0ad02d0c8f3b72fa699f4a6704e9ae7f543aa1e5607f3346ba1c021a30aa1b72287a6 +EBUILD libsdl2-2.0.8-r2.ebuild 5173 BLAKE2B 03b84a9b6888a3fe83e3f689dc8f554eb612f64f1f258c15dfc7f8349ad08d38a4c4cf20a5a3a8aa3592225dfd6690db4724af32cf4d27943a97b336bf05a07d SHA512 7d7c1f59f492c7a856e947284a239d3b3a2d22a0259d80422af01fb77a0a48ddf49221faf965c46c1af9588da9bd4e08d7f24f507c816b228d729bf673bc73ee +MISC metadata.xml 1665 BLAKE2B 7f469ffb0096991ffcd95d5cac92ded15aa0b6d0d60f0d38bcaf966336a8c782b51a4fd61e2984b97bf65896438517868836b251619647f330004c4795acd008 SHA512 dc0fae98711a1a79ccd76371e6747c8cf722dfb84d75d1d414bb90980886d649c53f9bdbee96e627854ace0fc6b30160688dc906aa74cc943e71172737ae659c diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild index 4708e54718be..53817491c9cf 100644 --- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild @@ -13,7 +13,7 @@ LICENSE="ZLIB" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" +IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 wayland X xinerama xscreensaver" REQUIRED_USE=" alsa? ( sound ) gles? ( video ) @@ -28,10 +28,15 @@ RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) + kms? ( + >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] + >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm] + ) libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] @@ -125,6 +130,7 @@ multilib_src_configure() { $(use_enable wayland video-wayland) --disable-wayland-shared --disable-video-mir + $(use_enable video_cards_vc4 video-rpi) $(use_enable X video-x11) --disable-x11-shared $(use_enable X video-x11-xcursor) @@ -139,6 +145,8 @@ multilib_src_configure() { --disable-video-directfb --disable-fusionsound --disable-fusionsound-shared + $(use_enable kms video-kmsdrm) + --disable-kmsdrm-shared $(use_enable video video-dummy) $(use_enable opengl video-opengl) --disable-video-opengles1 diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml index d72b5fdb4d5c..f10ebbd6297d 100644 --- a/media-libs/libsdl2/metadata.xml +++ b/media-libs/libsdl2/metadata.xml @@ -28,6 +28,7 @@ include OpenGL ES support Enable the haptic (force feedback) subsystem Control joystick support (disable at your own risk) + Build the KMSDRM video driver Control audio support (disable at your own risk) Build with tslib support for touchscreen devices Control video support (disable at your own risk) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 54977063f527..7c63912a7248 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -4,6 +4,7 @@ DIST mesa-18.0.4.tar.xz 10939356 BLAKE2B 6bbf19f4e547be3be7385f6e8b094444fe78c0e DIST mesa-18.1.0.tar.xz 11118776 BLAKE2B 0da5486e96596b3f919f15d2db9cd12de825811a0f2222bb76859bb7d275914dda0cc19a518b269fa0745d52982b92d5d645b6da639a870709193db721262658 SHA512 8b26af2df8b94373cbc339521974cd568c1d4ff4204986ee7b439e4cf3ebe14d822ea081a7769b68eca9263b7bc6dbca01836b8bb0d6495d2e2614c4e3d601ad EBUILD mesa-17.3.9.ebuild 14426 BLAKE2B 1b6e0152cae7d03daff8c214d5ba17e2e320d8f989c8ade3b1c146bfe6d3da14540cf43a78b244d855acc709f9a464d0362ce145fc51ae0b6b3bd24f75c7964e SHA512 dd5f69042a0432a4b820ecd5263c8269956b6e2063e95f645d1b845d744d322d348c67d6aa017666c0694f38e03cda1609e1dc507107328255363700a2796ce3 EBUILD mesa-18.0.4.ebuild 14381 BLAKE2B d96d38ef80c12c0e9b11ce47a85fa4b3a0c4b384909b925100415d294b5b7a71b3c88669c819f212fcf768c14f1b5efbe51bc7963e9e80cbaebc6378c1158567 SHA512 8b921bed35cd1005bceb0b05855a0043e556b2353fb66bb2bef42e826a0da44719aace06d57f494dce1435fbe947a25e65c39e285bfc63d90a832b7aa76fcbeb +EBUILD mesa-18.1.0-r1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1 EBUILD mesa-18.1.0.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847 -EBUILD mesa-9999.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847 +EBUILD mesa-9999.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705 diff --git a/media-libs/mesa/mesa-18.1.0-r1.ebuild b/media-libs/mesa/mesa-18.1.0-r1.ebuild new file mode 100644 index 000000000000..70702be097dc --- /dev/null +++ b/media-libs/mesa/mesa-18.1.0-r1.ebuild @@ -0,0 +1,531 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git" + +if [[ ${PV} = 9999 ]]; then + GIT_ECLASS="git-r3" + EXPERIMENTAL="true" +fi + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} + +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 + SRC_URI="" +else + SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT="!bindist? ( bindist )" + +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind + +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind + vdpau vulkan wayland xvmc xa" + +REQUIRED_USE=" + d3d9? ( dri3 gallium ) + llvm? ( gallium ) + opencl? ( gallium llvm ) + openmax? ( gallium ) + gles1? ( egl ) + gles2? ( egl ) + vaapi? ( gallium ) + vdpau? ( gallium ) + vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) + video_cards_radeonsi? ( llvm ) ) + wayland? ( egl gbm ) + xa? ( gallium ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_imx? ( gallium video_cards_vivante ) + video_cards_nouveau? ( || ( classic 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 ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91" +RDEPEND=" + !app-eselect/eselect-mesa + >=app-eselect/eselect-opengl-1.3.0 + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + >=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}] + 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}] + ) + ) + opencl? ( + app-eselect/eselect-opencl + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + openmax? ( + >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] + x11-misc/xdg-utils + ) + vaapi? ( + >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.8 + ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ${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] ) +" +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. < 7. +# 3. Specify LLVM_MAX_SLOT, e.g. 6. +LLVM_DEPSTR=" + || ( + sys-devel/llvm:7[${MULTILIB_USEDEP}] + sys-devel/llvm:6[${MULTILIB_USEDEP}] + sys-devel/llvm:5[${MULTILIB_USEDEP}] + sys-devel/llvm:4[${MULTILIB_USEDEP}] + >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] + ) + sys-devel/llvm:=[${MULTILIB_USEDEP}] +" +LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} +CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +RDEPEND="${RDEPEND} + llvm? ( + opencl? ( + video_cards_r600? ( + ${CLANG_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${CLANG_DEPSTR} + ) + ) + ) + ) + !opencl? ( + video_cards_r600? ( + ${LLVM_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${LLVM_DEPSTR} + ) + ) + ) + ) + ) +" +unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + opencl? ( + >=sys-devel/gcc-4.6 + ) + sys-devel/gettext + virtual/pkgconfig + valgrind? ( dev-util/valgrind ) + x11-base/xorg-proto + vulkan? ( + $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") + ) +" +[[ ${PV} == 9999 ]] && DEPEND+=" + sys-devel/bison + sys-devel/flex + $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + !pic? ( + 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 + ) +)" + +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[${flags}]" || return 1 + fi + has_version "sys-devel/llvm[${flags}]" +} + +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 llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + eapply_user + [[ ${PV} == 9999 ]] && eautoreconf +} + +multilib_src_configure() { + local myconf + + if use classic; then + # Configurable DRI drivers + driver_enable swrast + + # Intel code + driver_enable video_cards_i915 i915 + driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + driver_enable video_cards_nouveau nouveau + + # ATI code + driver_enable video_cards_r100 radeon + driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + driver_enable video_cards_radeon radeon r200 + fi + fi + + if use egl; then + myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")" + fi + + if use gallium; then + myconf+=" + $(use_enable d3d9 nine) + $(use_enable llvm) + $(use_enable openmax omx-bellagio) + $(use_enable vaapi va) + $(use_enable vdpau) + $(use_enable xa) + $(use_enable xvmc) + " + use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers" + + gallium_enable swrast + 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 video_cards_i915 i915 + gallium_enable video_cards_imx imx + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + # opencl stuff + if use opencl; then + myconf+=" + $(use_enable opencl) + --with-clang-libdir="${EPREFIX}/usr/lib" + " + fi + + gallium_enable video_cards_virgl virgl + fi + + if use vulkan; then + vulkan_enable video_cards_i965 intel + vulkan_enable video_cards_radeonsi radeon + fi + + # x86 hardened pax_kernel needs glx-rts, bug 240956 + if [[ ${ABI} == x86 ]]; then + myconf+=" $(use_enable pax_kernel glx-read-only-text)" + fi + + # on abi_x86_32 hardened we need to have asm disable + if [[ ${ABI} == x86* ]] && use pic; then + myconf+=" --disable-asm" + fi + + if use gallium; then + myconf+=" $(use_enable osmesa gallium-osmesa)" + else + myconf+=" $(use_enable osmesa)" + fi + + # build fails with BSD indent, bug #428112 + use userland_GNU || export INDENT=cat + + ECONF_SOURCE="${S}" \ + econf \ + --enable-dri \ + --enable-glx \ + --enable-shared-glapi \ + $(use_enable !bindist texture-float) \ + $(use_enable d3d9 nine) \ + $(use_enable debug) \ + $(use_enable dri3) \ + $(use_enable egl) \ + $(use_enable gbm) \ + $(use_enable gles1) \ + $(use_enable gles2) \ + $(use_enable nptl glx-tls) \ + $(use_enable unwind libunwind) \ + --enable-valgrind=$(usex valgrind auto no) \ + --enable-llvm-shared-libs \ + --disable-opencl-icd \ + --with-dri-drivers=${DRI_DRIVERS} \ + --with-gallium-drivers=${GALLIUM_DRIVERS} \ + --with-vulkan-drivers=${VULKAN_DRIVERS} \ + PYTHON2="${PYTHON}" \ + ${myconf} +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if use opencl; then + ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" + local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" + dodir ${cl_dir}/{lib,include} + if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then + mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ + "${ED}"${cl_dir} + fi + if [ -f "${ED}/usr/include/CL/opencl.h" ]; then + mv -f "${ED}"/usr/include/CL \ + "${ED}"${cl_dir}/include + fi + eend $? + fi + + if use openmax; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx" + doenvd "${T}"/99mesaxdgomx + keepdir /usr/share/mesa/xdg + fi +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete + einstalldocs + + if use !bindist; then + dodoc docs/patents.txt + fi +} + +multilib_src_test() { + if use llvm; then + local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf' + pushd src/gallium/drivers/llvmpipe >/dev/null || die + emake ${llvm_tests} + pax-mark m ${llvm_tests} + popd >/dev/null || die + fi + emake check +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} + + # Switch to mesa opencl + if use opencl; then + eselect opencl set --use-old ${PN} + fi + + # run omxregister-bellagio to make the OpenMAX drivers known system-wide + if use openmax; then + ebegin "Registering OpenMAX drivers" + BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \ + OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \ + omxregister-bellagio + eend $? + fi + + # warn about patent encumbered texture-float + if use !bindist; then + elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" + elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an" + elog "explanation." + fi +} + +pkg_prerm() { + if use openmax; then + rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister + fi +} + +# $1 - VIDEO_CARDS flag +# other args - names of DRI drivers to enable +# TODO: avoid code duplication for a more elegant implementation +driver_enable() { + case $# in + # for enabling unconditionally + 1) + DRI_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + DRI_DRIVERS+=",${i}" + done + fi + ;; + esac +} + +gallium_enable() { + case $# in + # for enabling unconditionally + 1) + GALLIUM_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + GALLIUM_DRIVERS+=",${i}" + done + fi + ;; + esac +} + +vulkan_enable() { + case $# in + # for enabling unconditionally + 1) + VULKAN_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + VULKAN_DRIVERS+=",${i}" + done + fi + ;; + esac +} diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index cf00b47b8bc8..70702be097dc 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -77,8 +77,7 @@ REQUIRED_USE=" LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91" RDEPEND=" - classic? ( app-eselect/eselect-mesa ) - gallium? ( app-eselect/eselect-mesa ) + !app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] @@ -402,37 +401,6 @@ multilib_src_configure() { multilib_src_install() { emake install DESTDIR="${D}" - if use classic || use gallium; then - ebegin "Moving DRI/Gallium drivers for dynamic switching" - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) - keepdir /usr/$(get_libdir)/dri - dodir /usr/$(get_libdir)/mesa - for x in ${gallium_drivers[@]}; do - if [ -f "$(get_libdir)/gallium/${x}" ]; then - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ - || die "Failed to move ${x}" - fi - done - if use classic; then - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install - fi - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${x/dri/mesa}" \ - || die "Failed to move ${x}" - fi - done - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" - ln -s ../mesa/*.so . || die "Creating symlink failed" - # remove symlinks to drivers known to eselect - for x in ${gallium_drivers[@]}; do - if [ -f ${x} -o -L ${x} ]; then - rm "${x}" || die "Failed to remove ${x}" - fi - done - popd - eend $? - fi if use opencl; then ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" @@ -462,10 +430,6 @@ multilib_src_install_all() { if use !bindist; then dodoc docs/patents.txt fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf } multilib_src_test() { @@ -484,11 +448,6 @@ pkg_postinst() { echo eselect opengl set --use-old ${OPENGL_DIR} - # Select classic/gallium drivers - if use classic || use gallium; then - eselect mesa set --auto - fi - # Switch to mesa opencl if use opencl; then eselect opencl set --use-old ${PN} diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest index a7c1987d6280..f78e39baf881 100644 --- a/media-libs/openal/Manifest +++ b/media-libs/openal/Manifest @@ -1,3 +1,4 @@ +AUX openal-1.18.2-dont-specify-macros-as-arguments.patch 2072 BLAKE2B b42ed02e6be499198c2fbfb212a47a3c08aba72a63699e725f504b18662086335513a0a177fa85f2dd019d65b18074ea5e7b19348e34dbf17bcce208fe96ba11 SHA512 e28b2ad70c35fd7018491cba84f33bcd5e6d6dd9944d47ad4cbba5852663d436be16a901e3e643b48f5e29d72d5b154c79ce83cd291075ff4ad272a1c77a2fb4 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d -EBUILD openal-1.18.2-r1.ebuild 2021 BLAKE2B 44489eef1d525bcd7a2e7c46f3cf356d922497fa3d07edd2854e4a0e00288db938373e9a6dbf86782b3327579cf248d6c071a60bf3d053b79fa672b5f8452231 SHA512 fb5f6f3895c9c73733604e3d5331825323e11a9a5aa966efcd59da5497b41b86af2b35b0e712ee34b3e1a05bb53455d6efa6b4b68e5fb2b87e196b296411e04e +EBUILD openal-1.18.2-r1.ebuild 2101 BLAKE2B 83cff184faf5b02db58bae5c56cc833bdf86a4908befc02079fc0915331e1b512c7c2aa61345829e55f7c9b07d8f2846fe3fc0c708420e5887b3e5b8145be683 SHA512 5388d9b1be607efd03d180c355703160ea02aebbed1fc0116ae174bc3d09ec0640a2082ce9fd41fb80643e2eebf6f43a3ac4b6cfcab65ca69f165e933c319ea9 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch b/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch new file mode 100644 index 000000000000..83fc33d0a332 --- /dev/null +++ b/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch @@ -0,0 +1,50 @@ +From cae4b1a062b53dd25eba7caa41622be730106749 Mon Sep 17 00:00:00 2001 +From: Chris Robinson +Date: Wed, 28 Mar 2018 14:34:58 -0700 +Subject: [PATCH] Don't specify macros as arguments to CHECK_INCLUDE_FILE(S) + +--- + CMakeLists.txt | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df1dfe63..07454f15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -577,7 +577,12 @@ ENDIF() + + + # Check if we have Windows headers +-CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H -D_WIN32_WINNT=0x0502) ++SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}) ++SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502) ++CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) ++SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS}) ++UNSET(OLD_REQUIRED_DEFINITIONS) ++ + IF(NOT HAVE_WINDOWS_H) + CHECK_SYMBOL_EXISTS(gettimeofday sys/time.h HAVE_GETTIMEOFDAY) + IF(NOT HAVE_GETTIMEOFDAY) +@@ -975,8 +980,11 @@ OPTION(ALSOFT_REQUIRE_WINMM "Require Windows Multimedia backend" OFF) + OPTION(ALSOFT_REQUIRE_DSOUND "Require DirectSound backend" OFF) + OPTION(ALSOFT_REQUIRE_WASAPI "Require WASAPI backend" OFF) + IF(HAVE_WINDOWS_H) ++ SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}) ++ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502) ++ + # Check MMSystem backend +- CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502) ++ CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H) + IF(HAVE_MMSYSTEM_H) + CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM) + IF(HAVE_LIBWINMM) +@@ -1013,6 +1021,9 @@ IF(HAVE_WINDOWS_H) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/wasapi.c) + ENDIF() + ENDIF() ++ ++ SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS}) ++ UNSET(OLD_REQUIRED_DEFINITIONS) + ENDIF() + IF(ALSOFT_REQUIRE_WINMM AND NOT HAVE_WINMM) + MESSAGE(FATAL_ERROR "Failed to enabled required WinMM backend") diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild index ffa1242cc0c4..f9fc8923f875 100644 --- a/media-libs/openal/openal-1.18.2-r1.ebuild +++ b/media-libs/openal/openal-1.18.2-r1.ebuild @@ -38,6 +38,10 @@ S="${WORKDIR}/${MY_P}" DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README ) +PATCHES=( + "${FILESDIR}"/${PN}-1.18.2-dont-specify-macros-as-arguments.patch +) + src_configure() { # -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670 my_configure() { diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest index 5fa3e59a0695..3dfc43bb453b 100644 --- a/media-libs/opencolorio/Manifest +++ b/media-libs/opencolorio/Manifest @@ -1,12 +1,7 @@ -AUX opencolorio-1.0.8-documentation-gen.patch 1973 BLAKE2B dd84c68f70af7cd6ebef7b2651f1edc8352e97fa08290e6854175f30ddfda4fa3c2451d8313cdf3791777ced76974d0944b855eca8a52c76d034dcb94ae6c61c SHA512 779fa5311a889afb30a31b278e60aaa5253311d071ded8764d2f33e6f69432a41bffd9745059e0b20e28db8445494bdee4aa69908e709e1248a08ea5c2f9c93c -AUX opencolorio-1.0.9-remove-external-doc-utilities.patch 2674 BLAKE2B b5fc774305224345c642c2d1f8813e1229519768679e9ea9a21b6922d90831fcdefcd77b5462a581cd00349476a18c76eb02ba14ad806c23e355597a9b5f06c8 SHA512 f04dc9255dc9c84fd842eab14bb46d3084f1accfc9746a559a0b428a580669e8486d03229f9d00204c761c11c3962f15754d9667daf6b968a95ae2fc2b0f3ac5 AUX opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch 2786 BLAKE2B 91747af3ceac6477d6847c1f87fa69cd77e2cdaaced18cc038ca231af006d453ce4382229b642e8c38ae1642c1f4788c7e9062951e867881bd20012c26a6dcd4 SHA512 2338e1b0994486a7be896d4edddcef67b3b84df9d609e7aebe7a87172163b5f6e7636341e0bfeb0e45d7fdb663932c273ca0568a49ac9d4aa2b827d3808493bc 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 -DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc -DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998 -EBUILD opencolorio-1.0.9-r2.ebuild 2375 BLAKE2B 6e50184ecd9df51cec933a55fbdb9365c82661b7e9d66d804bebdc329433c996d616898334bd3f1856b381371083584488faa46476962fe3c306db324d891575 SHA512 0e3d7dc603f5811e547ba6de400ae05c519e87ba6135bcda8d7fdbc1d5d87526c0fd8a2f8dd26062b39826bacdc6590fda538036d3cd7d09a0b86e70ccb202c1 -EBUILD opencolorio-1.1.0-r1.ebuild 2351 BLAKE2B 9818f4e13c1ff8f1b5df8eea1e1ba290cbb8383a503d8b9d251f869613b856d1c13a504499c25d8d5c831b78fe67ceb5d0c7a0af45eacf682a44f64ab1c8ffda SHA512 ec1b4d164872dab45dbd7b89c6cea5394f943f31a1afc407cd00d88abaa270cc7986c2dc8816ae17ceb592ba56f8bec9e9cfa2e734471f827c340889da3fd049 -MISC metadata.xml 686 BLAKE2B d2e3b9c9bc524854acf2fdd3d67d596606434bee2bbe5ceef3c2f45823e2948be0c0dc3bbcce82f90d2fb77e1fb5ae74b4e82ec737051f31c2726f82aecf05ee SHA512 68ba2a2e1063a0f8c3e345aa908f4327f38b876581f0cf3cce0e2075a06919c60ca77b40545fcbc923a61700d00e46bb0ff2ce5d44ac5cbe40b1523491e34822 +EBUILD opencolorio-1.1.0-r1.ebuild 2350 BLAKE2B ffebd68258e6c0d21ef892801413a4a20e754504ca9487a6f92d7ab8c10a54f31d96a08d5452cc0632303518fb6f137478d9d81d18ab9e269e9416d501c16bf4 SHA512 2aae32b426b4955266ec5838b57838beaf36a49e07105e6afbc5c25e0744685bd73a9bf52ea8bdb3e3f4f99d8e1d68f165ea0b38988588c40427d26c5f6cd8bb +MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846 diff --git a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch deleted file mode 100644 index 7a396b3b735c..000000000000 --- a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/docs/CMakeLists.txt 2013-01-08 03:19:23.649162615 +0400 -+++ b/docs/CMakeLists.txt 2013-01-08 03:22:29.647329174 +0400 -@@ -81,7 +81,7 @@ - ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst) - - add_custom_target(doc ALL -- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html -+ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html - DEPENDS - OpenColorIO - PyOpenColorIO -@@ -93,20 +93,18 @@ - COMMENT "Building html docs" - SOURCES ${DOCFILES}) - --# note: ExternalProject will not build when added to a add_custom_target this --# works around this problem. This seems to be fixed in the cmake ^HEAD --add_dependencies(doc Sphinx) -- - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/ -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html - PATTERN .* EXCLUDE - ) - -+if(OCIO_BUILD_PDF_DOCS) -+ - find_package(LATEX) - if(PDFLATEX_COMPILER) - - add_custom_target(latex -- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex -+ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex - DEPENDS - OpenColorIO - ${CMAKE_BINARY_DIR}/docs/conf.py -@@ -116,7 +114,6 @@ - ${RSTDOC_OUTPUT} - COMMENT "Building latex doc" - SOURCES ${DOCFILES}) -- add_dependencies(latex Sphinx) - - add_custom_target(pdf ALL - COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex -@@ -126,6 +123,8 @@ - add_dependencies(pdf latex) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/) - - endif() -+ -+endif() diff --git a/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch b/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch deleted file mode 100644 index d30b662e6132..000000000000 --- a/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/docs/CMakeLists.txt 2013-09-24 13:13:47.572222731 +0400 -+++ b/docs/CMakeLists.txt 2013-09-24 13:14:07.931224505 +0400 -@@ -1,62 +1,3 @@ -- --############################################################################### --### External Doc Apps ### -- --# distribute --set(DISTRIBUTE_VERSION 0.6.36) --ExternalProject_Add(distribute -- URL ${CMAKE_SOURCE_DIR}/ext/distribute-${DISTRIBUTE_VERSION}.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --) -- --# docutils --set(DOCUTILS_VERSION 0.10) --ExternalProject_Add(docutils -- DEPENDS distribute -- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --) -- --# jinja2 --set(JINJA2_VERSION 2.5.5) --ExternalProject_Add(Jinja2 -- DEPENDS distribute -- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --) -- --# Pygments --set(PYGMENTS_VERSION 1.3.1) --ExternalProject_Add(Pygments -- DEPENDS distribute -- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --) -- --# sphinx --set(SPHINX_VERSION 1.2b1) --ExternalProject_Add(Sphinx -- DEPENDS distribute docutils Jinja2 Pygments -- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz -- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin --) -- - ############################################################################### - ### Create Doc Targets ### - diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml index 8622e02f2f8b..ea85c9e1ea2c 100644 --- a/media-libs/opencolorio/metadata.xml +++ b/media-libs/opencolorio/metadata.xml @@ -6,10 +6,6 @@ Gentoo Graphics Project OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. - - - Install extra documentation in PDF format - imageworks/OpenColorIO diff --git a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild b/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild deleted file mode 100644 index 1d80450f58a3..000000000000 --- a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils python-single-r1 vcs-snapshot - -DESCRIPTION="A color management framework for visual effects and animation" -HOMEPAGE="http://opencolorio.org/" -SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \ - -> ${P}.tar.gz - https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-yaml-0.5-compat-v2.patch.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc opengl pdf python cpu_flags_x86_sse2 test" - -RDEPEND="opengl? ( - media-libs/lcms:2 - >=media-libs/openimageio-1.1.0 - media-libs/glew:0= - media-libs/freeglut - virtual/opengl - ) - python? ( ${PYTHON_DEPS} ) - >=dev-cpp/yaml-cpp-0.5 - dev-libs/tinyxml - " -DEPEND="${RDEPEND} - doc? ( - pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] ) - !pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - ) - " - -# Documentation building requires Python bindings building -REQUIRED_USE="doc? ( python ) python? ( ${PYTHON_REQUIRED_USE} )" - -# Restricting tests, bugs #439790 and #447908 -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.8-documentation-gen.patch" - "${FILESDIR}/${P}-remove-external-doc-utilities.patch" - "${WORKDIR}/${P}-yaml-0.5-compat-v2.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_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=OFF - -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_PDF_DOCS="$(usex pdf)" - -DOCIO_BUILD_PYGLUE="$(usex python)" - -DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)" - -DOCIO_BUILD_TESTS="$(usex test)" - ) - cmake-utils_src_configure -} diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild index 8343ce9ccba4..9fba65db5983 100644 --- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild +++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test" REQUIRED_USE=" doc? ( python ) diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index e682197eda6e..8c068e3b9506 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -6,11 +6,8 @@ AUX opencv-2.4.3-gcc47.patch 835 BLAKE2B 2e0f71fff77a23c2db9747d8bb7f9301de18acd AUX opencv-2.4.8-javamagic.patch 1165 BLAKE2B 0f12fd471145e1e303a517e5bc704fb5abc5ac5731fb1eadf08ef61e618bd70f9348c9c7a23296eefeb37826fd6701baaab0fc475ad0c441302b20516cf9bb9a SHA512 fd8a0d33997889c9316c0a4474c836b2528b676cd26bbb0e6ee2262377e45c5a0c465534831bd7fec3c0aa9cb198bc792a53f958b05a5217009314b678076d64 AUX opencv-2.4.9-cuda-pkg-config.patch 373 BLAKE2B 389a27607926170c38c69cba955e91e0dfde65a51ee88dd0aec315056ba0f36a303ef2d4b95e226f323e92c59a251b93e9deae5cb3822ad69d257e1cb3cb1f34 SHA512 5b8f931758c6c8edfc3cae35a16d1c8674f17716f13b424ee0510eb313f06ed334b80205262e6bfcce22db235467cad81fddfa96e0cf669972794cc8524f6937 AUX opencv-3.0.0-gles.patch 481 BLAKE2B 3eecd8c754abd9fdbfc2878b8b5a8b5ac3c6410342eb0756162ac901fe0903f7e1236bf2cc6e2ec5c7eeb638037f0dfad2b5aa9ebc905c485c4084936daed24e SHA512 37cac226bc39b91a87e4891e1d58169a0c2723240215670ebaecbfaf9b066b571296041fc5140aff7274cc44ca132b6f1b3bd4cf6d6dd23b950cac6eca548ad9 -AUX opencv-3.1.0-cmake-no-opengl.patch 867 BLAKE2B afa14f7a299546dd06885ad3239c2e7280444d974659e1a3078083517ce126c7fbef952264ac1642ddc3ef441ff2257d91ab0bb51a7554be6df4fce1a6ea1c47 SHA512 668a41e2bc4419c3b5f0e0e89f3b62514a9f3489bf8db4d32653288688894c9b647c7abbe45b3f23ec1dcf7dfb645ef308ceb61ab87129229fde0ba87346bb20 AUX opencv-3.1.0-find-libraries-fix.patch 2056 BLAKE2B 5527e02dfe9545b7d3959ef98f1f6402c199115bb337c1f3f3d7228ea5d640a74bb41c1866a60826d689e341b40fcaad56f9fe25ffdeee96f4642b5747d19938 SHA512 3246a866f347f5f9715edf1ae759ef7097bc2fe54dab84838cf1e229bcbcc33d5c97224a13ab20546615cee03d4475b3ec1b44ee894676808b7212f1b4b45bd2 -AUX opencv-3.1.0-git-autodetect.patch 1417 BLAKE2B 04c2335c647f4f4c33b56391e4e30baf10072dde0a96d6262b1dde8c3b58b619e031d62634041e6c9fc5e47e2c9e15c861842a89c0d9c3fcdfd425bc79d2e641 SHA512 af437e6f57a716f26b6840f32f89042fc6886e13ab8111cfc3b3a67694362705ea54128e898588184105b3cac37e451514cb84aff18fab24f54d5960d9aad3f7 AUX opencv-3.1.0-java-magic.patch 2302 BLAKE2B c380c7563dff740ff4105a8c50f298939596c5a2d787f2de1c9a9d77d8e2c3acfa971791426138869d8e9dde2b1235d7217e35e78e535d8e43b6d44846d2e391 SHA512 ee10c3fd6897ab1a8c4e006994b15a53d3d3ba7fc40975b67fc0a4104daa4473e4edabe9b7cdf1b82f87b14500d6db29485a1ee197aa7381551f030a7ba23a22 -AUX opencv-3.1.0-remove-graphcut-for-cuda-8.patch 1032 BLAKE2B 088c3c472707e395bfdf9542c8bdc4f823e34050761b591667976d118d1a237fc40c142c5abd228ac17b4bb33a4fbcd6d36f7105e93660c88aefd8a1074ef546 SHA512 ab30a26bf31767efd81933a6c0aa24517a467e8cb78184c161f0515ae04ded9dcaabb7eb4eb5b3cc61d510e5712d1b39e065074eae3fba984f43ba329fe46a20 AUX opencv-3.2.0-contrib_xfeatures2d-autodownload.patch 626 BLAKE2B a505fc9a45cbb783c2eb43b6f54f4be8c00b54a85f8bee7d1294ddbb54b02b34a03185773e24e3d5b4cc9d2ed1f61f65609430b4a205f34a18da6171124d0beb SHA512 74d21eb562a6b1bf28d20bad4221b3d158ed76925a255498f548726b83fa0c9d4e234ba7df8c58deaf662744a5e9da82d2635ea60048ef90f63a97e76fc10a02 AUX opencv-3.2.0-cpu-mno-sse2.patch 383 BLAKE2B dff2ca26a8c0055afc82e04ed4131baadcbb895519c4d311f8f896e5ffcd2bb4bced791cb7455ad4039ceb3d112df2958e05af07780303ebe73924fb4e53dcad SHA512 139a4e0bad15b3e0a8856716d4621d5e7d49a0ba1338d16bd32e27eb881849a43ed22fdcc6d1502a295e023abc325835677e8683aac35f6d561c4a04ce46e978 AUX opencv-3.2.0-fix_ussage_cpu_instructions.patch 1931 BLAKE2B 7a4764d8b0a6d5f50042e4435bf046a1d139dd041942fc6064b7758f3c0d6f531ec7b16ecd4099356b6e545bdcc5ce3ed80ddb8b4afafa729321c9572d5d624f SHA512 6d041966540c9fadb98d13cf3c3302bd800268fd03ebdf38e5da79fde604f3839244c78e7989e8e354ff7e265636f27ebcaabed4f9e0d57f46e3ced988182f01 @@ -21,21 +18,24 @@ AUX opencv-3.3.0-cuda9-cmake.patch 4676 BLAKE2B 9de3c4b988720a0b5fad1674d3967271 AUX opencv-3.3.0-cuda9-compute20.patch 775 BLAKE2B 7a818042ba9c75fd835b7fc8f6c0793aab8fef6f72964e9b57738e164c67ca16f885a8ad362360065b13bd35d4045e9c1a2683b59cc5d2b4162dc7794558a542 SHA512 00468ac115865acaba15efcf3791a927d6434ee54e37af3dd78bae3485868108ce4d1068ce94739a4d92b1673dd2111ebc30831446d69db4c999b95c5454c9cf AUX opencv-3.3.0-cuda9-saturate.patch 1075 BLAKE2B 9e7af021924e84d0f12e8f9b764630dbd35e8d732550f2c16d7f812e9cbd4d4a1499182d7239b266985d39061a8a3f3e95b65e876c8dd339de9f1b764e769089 SHA512 e19b95957c282af846d08d2d6a7d8290c32692af165bc9c627a3d2e42319775d5128a832a4f639915b1331f8db979f2b88c1528e6059aeb78159a8f5409e1644 AUX opencv-3.3.0-remove-tiny-dnn-autodownload.patch 1138 BLAKE2B 0bf85ca7a0e3759a4de14a844f2929120a47f9c0c212992d078b19cc7a602e157d5233ebc30d7eb6dcfa8c5a9606e3acea15e5a96717842fa80d2d8b3fa3189c SHA512 6824c3fc193491d0d776a7a904d71515309a5b67b0dfa1790bbd402c40b68e813c9fdfc3037a60f31893341ea78553d97470d152e90f34485004e0e50e6d66f6 +AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d877624538a49654ec8cf63091f8d0251cd01cc14684f2f5264c295a149c4a5754a9336e1ad4d1760cc26471fd85a6f571404f7c8d540d SHA512 95f2043c286a7de33fb4718fc1e2ded1fd943b20a5c4cc0c3d7af84fc317e53e3aa6358a33e4781195f8a80904d6bc615171142cde5d30a83d16045d36f85826 DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6 -DIST opencv-3.1.0.tar.gz 76135587 BLAKE2B 59d0facba6573ae7b6ec8b4d8097693181244988c8c460a738004b975a65442230f387eef172920cd56682a4fa19f28368262ad85b7c79f243e2063c56275755 SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f -DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 BLAKE2B 0e73381acea4cc8552579208ac438239f52c6ebafd1cc533c658b237bfd010754bf19a2645db766dffe1e7613470f1dee99eb867eed95f627182a101defd788b SHA512 d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 6d44263792b9cd2d009c7eeaddc2ef87acb01482cc9d36f2fe7717f981ff85a4e5007e4018d3ae15f383f6c3b1a0e009049f319bde0bce98575f04ccd6062cd8 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d DIST opencv-3.2.0_contrib.tar.gz 54765210 BLAKE2B 6c5bcb1c18da937751f234cc1edaae58416ab9ab5a3407a2ab2c22f4e174ffeb800396d34fe489f424b288fbd608e106cd5f5b458a06a509cea5f7d8e23a67a7 SHA512 eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e +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-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1a28f3e34cc885eff7eb080a2258cfa1aa494cd56b32f1098ab158c17c23fc8464fcbe70642a3a1842f2fd1b4ac SHA512 e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b +DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8f1d4820f3e0e486593d6f64ee8f918ea4362152f050baec16f17904c03a6cdc0abc6e5fb2510308dcbabebe97b29285fbc SHA512 431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 EBUILD opencv-2.4.13-r3.ebuild 6007 BLAKE2B 1b78cbb84733a057876a8e0a942c753786ac0b836b4e1116b9225b46cb36c37deca4c53d5df78784b99ce628e15010bf60ee750691c657d935ffa75733f54cdf SHA512 eb633e9f6e19de369a8bfcc75ca644a47cb2ca2fb2ccc8a91703e1c964d952dbdbcbae635163014839d62a647b0fa9a6c6ad8ae20c9d72fa87b270de55a57a44 -EBUILD opencv-3.1.0-r8.ebuild 10666 BLAKE2B cb0777a26f6258df80001bedb0705bd1804d1bc3a01592eba66c9d52d0d93b1538697e41ceeef7ca90ef57c7d7e6a834450cfb463bdb5b0a4614dae1f662a0aa SHA512 a8c40927311623d1b40f96c4a49bf7f135c74e7956246ea0b8f817a49faeaf694216afae498786fb4d46bfefa9222bab25fc01e4f544f521fc4d19b1db14c3ff EBUILD opencv-3.2.0-r2.ebuild 10387 BLAKE2B d9b6b704e465ee03862a2b264af592025197b7b7a79b8ce61ca0e2535bd4b7d0930d53d5e4acefb44774a1135488c394424066ce3320560bc8f694358272628f SHA512 e065790498734f16ce6f5fa4446e44e776b7097467f4ce8dc9da39d65038f4c8a646ef0e286daa4c1a5070c41595cbfe7731cc6965206b7650969306385db8af EBUILD opencv-3.2.0-r3.ebuild 12171 BLAKE2B f5fdc59285166a2a4e2e31901eef8d66cf0bfa948ce4b06ee9f80c91f2acceeefccc6fa4a03cbf05f609d1d51ebe58f9b192df071a016d157f921b738d00ef13 SHA512 b4dc53882ea13aeb90454dd54818d5d7ea3f0d00425c2f3eaea9ee493f84dd0956115bf2289e58b36b5de35dff455a86e24df0a804faf0f53db490030e99affb EBUILD opencv-3.3.0-r2.ebuild 12169 BLAKE2B a6ed4ce0fc0f3a2bd432979c2caa88f8e27ad2dfe2b94e8c871d394496b7443452323463e7cbc47b52a8bdfaf02d9573d146746bd38248e26da05bcf36d0203e SHA512 d56942b7173929b842e068fcc83dceba38c9cad6e48dfc745438d2bd007a1db604e312034a423e299fd082a3d22ae0cbe52ad82219ffe8a228fb3a8e3ecc80f6 EBUILD opencv-3.3.0-r4.ebuild 16525 BLAKE2B 053b335e77f6a85ccc3d31de2e0ab7211fff0ef93d37d43f659161581d130c2fd64d9e5558e4f3c0fb2628dee01e37093782ed05e57c74a1eff74064d4c194bd SHA512 4b2a62017bc97ea01c08e56fb33a55f48abebea743cb6d6b9be15cc42c7fbc26707bc016b4f27f39c183abbeca1c4666e7c98844413e2495ebd6a93cf85d42ba EBUILD opencv-3.3.0-r5.ebuild 17096 BLAKE2B b831fe5601493b228023ee9f2d86d265b3841375beec391c1c2622df8c7b673c239086d249470a98b09aade2be3c7f983e7748b386f385d23dd2762ccd8cfa0e SHA512 9f8b51d1adaae620133c144ca3f4c1ad6d249a4bc77db883a7318eb3d80034978e371852d003866de5376824e1808fc2644da2308365920842f4c3590b0b452f -MISC metadata.xml 2541 BLAKE2B cc1a2f017f2cc80c76edc9e20cc4bb224a2f55351575d6faf5fba43e82906f9a99bd4abeb1de2677c527d40354dca3bd0bc69015145a339285341f3d46760cde SHA512 9800b705fa2571dee354b3fd6b34a71505ac66482d47b1bd974b49afdf42b7c27f37a375053c5cf469991f2d095535c3e96f4c5c89dc9a4e9820c57b8f1a21bc +EBUILD opencv-3.4.1-r1.ebuild 18274 BLAKE2B 1bcf6b99f53bc30edb77f73810edceca0de7baa06e60b99843448d23d98769096abf725bb4d20bbba72b5c4a02bd25fdec604e44969ecab7aaf4aed58453f0c0 SHA512 caed3d62f9b8bb3c7dd2380a3bcf4c736a876442d5b9dc1d40ba2df495327a690436e4b27d8ad10d76dd278b8593bc72a21005dbafb61ed7440a4386c74ceaa6 +MISC metadata.xml 2648 BLAKE2B fe794c98503b602b365ea04bf32c1011fc485faf7da60e4475db32a3403be3f13be3c713270121feab8f5ec7dc6ac4caa7cbd9dbefaa121fa337273184d5a326 SHA512 60544f21407bffb30e12a2207288832487f0e2ff535343f06d103c0db13441776d84c0645d568ee7a9f7d502ca4267a8be923fe1cbbb8902a950ca7395616848 diff --git a/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch b/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch deleted file mode 100644 index d6d70d717d3b..000000000000 --- a/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cdb9c60dcb65e04e7c0bd6bef9b86841191c785a Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin -Date: Thu, 31 Dec 2015 02:24:54 +0300 -Subject: [PATCH] gpu samples: fix REMOVE_ITEM error - ---- - samples/gpu/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt -index 6085cac..852a8c2 100644 ---- a/samples/gpu/CMakeLists.txt -+++ b/samples/gpu/CMakeLists.txt -@@ -97,7 +97,7 @@ endif() - if(INSTALL_C_EXAMPLES AND NOT WIN32) - file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) - if(NOT WITH_OPENGL) -- list(REMOVE_ITEM all_samples "opengl.cpp") -+ list(REMOVE_ITEM install_list "opengl.cpp") - endif(NOT WITH_OPENGL) - install(FILES ${install_list} - DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu diff --git a/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch b/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch deleted file mode 100644 index f4bf0da2cc92..000000000000 --- a/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/CMakeLists.txt 2016-04-07 14:34:35.090937125 +0200 -+++ b/CMakeLists.txt 2016-04-07 14:35:18.492935300 +0200 -@@ -444,23 +444,23 @@ - # ---------------------------------------------------------------------------- - # Autodetect if we are in a GIT repository - # ---------------------------------------------------------------------------- --find_host_package(Git QUIET) -+#find_host_package(Git QUIET) - --if(GIT_FOUND) -- execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*" -- WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}" -- OUTPUT_VARIABLE OPENCV_VCSVERSION -- RESULT_VARIABLE GIT_RESULT -- ERROR_QUIET -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ) -- if(NOT GIT_RESULT EQUAL 0) -- set(OPENCV_VCSVERSION "unknown") -- endif() --else() -- # We don't have git: -- set(OPENCV_VCSVERSION "unknown") --endif() -+#if(GIT_FOUND) -+# execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*" -+# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}" -+# OUTPUT_VARIABLE OPENCV_VCSVERSION -+# RESULT_VARIABLE GIT_RESULT -+# ERROR_QUIET -+# OUTPUT_STRIP_TRAILING_WHITESPACE -+# ) -+# if(NOT GIT_RESULT EQUAL 0) -+# set(OPENCV_VCSVERSION "unknown") -+# endif() -+#else() -+# # We don't have git: -+# set(OPENCV_VCSVERSION "unknown") -+#endif() - - - # ---------------------------------------------------------------------------- diff --git a/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch b/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch deleted file mode 100644 index 64761a263a17..000000000000 --- a/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 10896129b39655e19e4e7c529153cb5c2191a1db Mon Sep 17 00:00:00 2001 -From: Vladislav Vinogradov -Date: Fri, 6 May 2016 11:37:32 +0300 -Subject: [PATCH] GraphCut deprecated in CUDA 7.5 and removed in 8.0 - ---- - modules/cudalegacy/src/graphcuts.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/cudalegacy/src/graphcuts.cpp b/modules/cudalegacy/src/graphcuts.cpp -index eb08c3c..1a1eb85 100644 ---- a/modules/cudalegacy/src/graphcuts.cpp -+++ b/modules/cudalegacy/src/graphcuts.cpp -@@ -42,7 +42,8 @@ - - #include "precomp.hpp" - --#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) -+// GraphCut has been removed in NPP 8.0 -+#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || (CUDART_VERSION >= 8000) - - void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); } - void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); } diff --git a/media-libs/opencv/files/opencv-3.4.0-disable-download.patch b/media-libs/opencv/files/opencv-3.4.0-disable-download.patch new file mode 100644 index 000000000000..245ad3b3d028 --- /dev/null +++ b/media-libs/opencv/files/opencv-3.4.0-disable-download.patch @@ -0,0 +1,29 @@ +--- a/CMakeLists.txt 2018-05-13 20:47:11.635871328 +0200 ++++ b/CMakeLists.txt 2018-05-13 20:47:49.289872617 +0200 +@@ -187,6 +187,7 @@ + # ---------------------------------------------------------------------------- + + OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable non-free algorithms" OFF) ++OCV_OPTION(ENABLE_DOWNLOAD "Enable download during configure" ON) + + # 3rd party libs + OCV_OPTION(BUILD_ZLIB "Build zlib from source" WIN32 OR APPLE) + +--- a/cmake/OpenCVDownload.cmake 2018-05-13 21:22:14.966943336 +0200 ++++ b/cmake/OpenCVDownload.cmake 2018-05-13 21:23:15.959945424 +0200 +@@ -32,6 +32,7 @@ + + + function(ocv_download) ++ if(ENABLE_DOWNLOAD) + cmake_parse_arguments(DL "UNPACK;RELATIVE_URL" "FILENAME;HASH;DESTINATION_DIR;ID;STATUS" "URL" ${ARGN}) + + macro(ocv_download_log) +@@ -236,4 +237,7 @@ + if(OCV_DOWNLOAD_HASH_NAME) + set(${OCV_DOWNLOAD_HASH_NAME} "${DL_HASH}" CACHE INTERNAL "") + endif() ++ else() ++ message( "Download was disabled during configure phase by ENABLE_DOWNLOAD=OFF" ) ++ endif() + endfunction() diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index 5e3541cd325b..f87770fadafa 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/metadata.xml @@ -27,6 +27,7 @@ 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 + Download dnn caffeemodel samples Add support for OpenCL Use Google's OCR Engine Build and install programs for testing OpenCV (performance) diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild deleted file mode 100644 index e794ca1e0802..000000000000 --- a/media-libs/opencv/opencv-3.1.0-r8.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 \ - cmake-multilib - -DESCRIPTION="A collection of algorithms and sample code for - various computer vision problems" -HOMEPAGE="https://opencv.org" - -BASE_URI="https://github.com/${PN}/${PN}" -#commit from Thu, 02 Jun 2016 -CONTRIB_URI="75b3ea9f72fdb083140fc63855b7677d67748376" -CONTRIB_P="${P}_contrib-${CONTRIB_URI:0:7}" - -SRC_URI="${BASE_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz - contrib? ( ${BASE_URI}_contrib/archive/${CONTRIB_URI}.tar.gz -> ${CONTRIB_P}.tar.gz )" -LICENSE="BSD" -SLOT="0/3.1" # subslot = libopencv* soname version -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux" -IUSE="contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk \ - ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \ - +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine \ - contrib_cvv contrib_hdf contrib_sfm" - -# OpenGL needs gtk or Qt installed to activate, otherwise build system -# will silently disable it without the user knowing, which defeats the -# purpose of the opengl use flag. -REQUIRED_USE=" - cuda? ( tesseract? ( opencl ) ) - gflags? ( contrib ) - glog? ( contrib ) - contrib_cvv? ( contrib qt5 ) - contrib_hdf? ( contrib ) - contrib_sfm? ( contrib eigen gflags glog ) - opengl? ( || ( gtk qt5 ) ) - python? ( ${PYTHON_REQUIRED_USE} ) - tesseract? ( contrib )" - -# The following logic is intrinsic in the build system, but we do not enforce -# it on the useflags since this just blocks emerging pointlessly: -# gtk? ( !qt5 ) -# openmp? ( !threads ) - -RDEPEND=" - app-arch/bzip2[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - cuda? ( dev-util/nvidia-cuda-toolkit:0= ) - ffmpeg? ( - libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] ) - !libav? ( 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}] - ) - gtk? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:2[${MULTILIB_USEDEP}] - opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] ) - ) - java? ( >=virtual/jre-1.6:* ) - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) - ieee1394? ( - media-libs/libdc1394[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] - ) - ipp? ( sci-libs/ipp ) - contrib_hdf? ( sci-libs/hdf5 ) - 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=] ) - threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) - vtk? ( sci-libs/vtk[rendering] ) - webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) - xine? ( media-libs/xine-lib )" -DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] - eigen? ( dev-cpp/eigen:3 ) - java? ( >=virtual/jdk-1.6 )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/opencv2/cvconfig.h - /usr/include/opencv2/opencv_modules.hpp - # [contrib_cvv] - /usr/include/opencv2/cvv.hpp - /usr/include/opencv2/cvv/call_meta_data.hpp - /usr/include/opencv2/cvv/cvv.hpp - /usr/include/opencv2/cvv/debug_mode.hpp - /usr/include/opencv2/cvv/dmatch.hpp - /usr/include/opencv2/cvv/filter.hpp - /usr/include/opencv2/cvv/final_show.hpp - /usr/include/opencv2/cvv/show_image.hpp - # [contrib_hdf] - /usr/include/opencv2/hdf.hpp - /usr/include/opencv2/hdf/hdf5.hpp - # [vtk] - /usr/include/opencv2/viz.hpp - /usr/include/opencv2/viz/types.hpp - /usr/include/opencv2/viz/viz3d.hpp - /usr/include/opencv2/viz/vizcore.hpp - /usr/include/opencv2/viz/widget_accessor.hpp - /usr/include/opencv2/viz/widgets.hpp -) - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.0-gles.patch - "${FILESDIR}"/${P}-cmake-no-opengl.patch - "${FILESDIR}"/${P}-git-autodetect.patch - "${FILESDIR}"/${P}-java-magic.patch - "${FILESDIR}"/${P}-remove-graphcut-for-cuda-8.patch - "${FILESDIR}"/${P}-find-libraries-fix.patch -) - -GLOBALCMAKEARGS=() - -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-utils_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 - - 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 - # =================================================== - -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 gtk) - -DWITH_GTK_2_X=$(usex gtk) - -DWITH_IPP=$(multilib_native_usex ipp) - -DWITH_JASPER=$(usex jpeg2k) - -DWITH_JPEG=$(usex jpeg) - -DWITH_WEBP=$(usex webp) - -DWITH_OPENEXR=$(usex openexr) - -DWITH_OPENGL=$(usex opengl) - -DWITH_OPENNI=OFF # Not packaged - -DWITH_OPENNI2=OFF # Not packaged - -DWITH_PNG=$(usex png) - -DWITH_PVAPI=OFF # Not packaged - -DWITH_GIGEAPI=OFF - -DWITH_QT=$(multilib_native_usex qt5 5 OFF) - -DWITH_WIN32UI=OFF # Windows only - -DWITH_QUICKTIME=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_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag - -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) - # =================================================== - # 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) - -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "") - # =================================================== - # OpenCV build components - # =================================================== - -DBUILD_SHARED_LIBS=ON - -DBUILD_ANDROID_EXAMPLES=OFF - -DBUILD_DOCS=OFF # Doesn't install anyways. - -DBUILD_EXAMPLES=$(multilib_native_usex examples) - -DBUILD_PERF_TESTS=OFF - -DBUILD_TESTS=$(multilib_native_usex testprograms) - -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${CONTRIB_URI}/modules" "") - # =================================================== - # OpenCV installation options - # =================================================== - -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples) - -DINSTALL_TESTS=$(multilib_native_usex testprograms) - # =================================================== - # OpenCV build options - # =================================================== - -DENABLE_PRECOMPILED_HEADERS=$(usex pch) - -DHAVE_opencv_java=$(multilib_native_usex java YES NO) - # =================================================== - # things we want to be hard off or not yet figured out - # =================================================== - -DBUILD_PACKAGE=OFF - -DENABLE_PROFILING=OFF - # =================================================== - # things we want to be hard enabled not worth useflag - # =================================================== - -DCMAKE_SKIP_RPATH=ON - -DOPENCV_DOC_INSTALL_PATH= - ) - - # =================================================== - # OpenCV Contrib Modules - # =================================================== - if use contrib; then - GLOBALCMAKEARGS+=( - -DBUILD_opencv_dnn=OFF - -DBUILD_opencv_dnns_easily_fooled=OFF - -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF) - -DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF) - -DBUILD_opencv_sfm=$(usex contrib_sfm 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 - ) - - cmake-utils_src_configure -} - -python_module_compile() { - local BUILD_DIR=${orig_BUILD_DIR} - local mycmakeargs=( ${GLOBALCMAKEARGS[@]} ) - - # Set all python variables to load the correct Gentoo paths - mycmakeargs+=( - # upstream doesn't really care about 2/3, and if we don't - # disable this, it builds python2 + python3 module for the same - # version of Python 3 (i.e. two identical modules)... - -DPYTHON3_EXECUTABLE=/bin/false - -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-utils_src_configure - cmake-utils_src_compile - cmake-utils_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" -} - -multilib_src_install() { - cmake-utils_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-3.4.1-r1.ebuild b/media-libs/opencv/opencv-3.4.1-r1.ebuild new file mode 100644 index 000000000000..578d147619a3 --- /dev/null +++ b/media-libs/opencv/opencv-3.4.1-r1.ebuild @@ -0,0 +1,494 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib + +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 + dnn_samples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz ) + contrib? ( + https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz + contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz + https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz + ) + contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) + )" + +LICENSE="BSD" +SLOT="0/3.4.1" # subslot = libopencv* soname version +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" +IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" +# 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 ) ) + dnn_samples? ( examples ) + gflags? ( contrib ) + glog? ( contrib ) + contrib_cvv? ( contrib qt5 ) + contrib_dnn? ( contrib ) + contrib_hdf? ( contrib ) + contrib_sfm? ( contrib eigen gflags glog ) + contrib_xfeatures2d? ( contrib cuda ) + java? ( python ) + opengl? ( || ( gtk qt5 ) ) + python? ( ${PYTHON_REQUIRED_USE} ) + tesseract? ( contrib )" + +# The following logic is intrinsic in the build system, but we do not enforce +# it on the useflags since this just blocks emerging pointlessly: +# gtk? ( !qt5 ) +# 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= ) + contrib_hdf? ( sci-libs/hdf5 ) + ffmpeg? ( + libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] ) + !libav? ( 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}] + ) + gtk? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:2[${MULTILIB_USEDEP}] + opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] ) + ) + ieee1394? ( + media-libs/libdc1394[${MULTILIB_USEDEP}] + sys-libs/libraw1394[${MULTILIB_USEDEP}] + ) + ipp? ( sci-libs/ipp ) + java? ( >=virtual/jre-1.6:* ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + jpeg2k? ( media-libs/jasper:=[${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=] ) + threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) + vtk? ( sci-libs/vtk[rendering] ) + webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) + xine? ( media-libs/xine-lib )" +DEPEND="${RDEPEND} + virtual/pkgconfig[${MULTILIB_USEDEP}] + contrib_dnn? ( dev-libs/cereal ) + eigen? ( dev-cpp/eigen:3 ) + java? ( >=virtual/jdk-1.6 )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/opencv2/cvconfig.h + /usr/include/opencv2/opencv_modules.hpp + # [contrib_cvv] + /usr/include/opencv2/cvv.hpp + /usr/include/opencv2/cvv/call_meta_data.hpp + /usr/include/opencv2/cvv/cvv.hpp + /usr/include/opencv2/cvv/debug_mode.hpp + /usr/include/opencv2/cvv/dmatch.hpp + /usr/include/opencv2/cvv/filter.hpp + /usr/include/opencv2/cvv/final_show.hpp + /usr/include/opencv2/cvv/show_image.hpp + # [contrib_hdf] + /usr/include/opencv2/hdf.hpp + /usr/include/opencv2/hdf/hdf5.hpp + # [vtk] + /usr/include/opencv2/viz.hpp + /usr/include/opencv2/viz/types.hpp + /usr/include/opencv2/viz/viz3d.hpp + /usr/include/opencv2/viz/vizcore.hpp + /usr/include/opencv2/viz/widget_accessor.hpp + /usr/include/opencv2/viz/widgets.hpp + # [cudev] + /usr/include/opencv2/cudaarithm.hpp + /usr/include/opencv2/cudabgsegm.hpp + /usr/include/opencv2/cudacodec.hpp + /usr/include/opencv2/cudafeatures2d.hpp + /usr/include/opencv2/cudafilters.hpp + /usr/include/opencv2/cudaimgproc.hpp + /usr/include/opencv2/cudalegacy.hpp + /usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp + /usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp + /usr/include/opencv2/cudalegacy/NCV.hpp + /usr/include/opencv2/cudalegacy/NCVPyramid.hpp + /usr/include/opencv2/cudalegacy/NPP_staging.hpp + /usr/include/opencv2/cudaobjdetect.hpp + /usr/include/opencv2/cudaoptflow.hpp + /usr/include/opencv2/cudastereo.hpp + /usr/include/opencv2/cudawarping.hpp + /usr/include/opencv2/cudev/block/block.hpp + /usr/include/opencv2/cudev/block/detail/reduce.hpp + /usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp + /usr/include/opencv2/cudev/block/dynamic_smem.hpp + /usr/include/opencv2/cudev/block/reduce.hpp + /usr/include/opencv2/cudev/block/scan.hpp + /usr/include/opencv2/cudev/block/vec_distance.hpp + /usr/include/opencv2/cudev/common.hpp + /usr/include/opencv2/cudev/expr/binary_func.hpp + /usr/include/opencv2/cudev/expr/binary_op.hpp + /usr/include/opencv2/cudev/expr/color.hpp + /usr/include/opencv2/cudev/expr/deriv.hpp + /usr/include/opencv2/cudev/expr/expr.hpp + /usr/include/opencv2/cudev/expr/per_element_func.hpp + /usr/include/opencv2/cudev/expr/reduction.hpp + /usr/include/opencv2/cudev/expr/unary_func.hpp + /usr/include/opencv2/cudev/expr/unary_op.hpp + /usr/include/opencv2/cudev/expr/warping.hpp + /usr/include/opencv2/cudev/functional/color_cvt.hpp + /usr/include/opencv2/cudev/functional/detail/color_cvt.hpp + /usr/include/opencv2/cudev/functional/functional.hpp + /usr/include/opencv2/cudev/functional/tuple_adapter.hpp + /usr/include/opencv2/cudev/grid/copy.hpp + /usr/include/opencv2/cudev/grid/detail/copy.hpp + /usr/include/opencv2/cudev/grid/detail/histogram.hpp + /usr/include/opencv2/cudev/grid/detail/integral.hpp + /usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp + /usr/include/opencv2/cudev/grid/detail/pyr_down.hpp + /usr/include/opencv2/cudev/grid/detail/pyr_up.hpp + /usr/include/opencv2/cudev/grid/detail/reduce.hpp + /usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp + /usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp + /usr/include/opencv2/cudev/grid/detail/split_merge.hpp + /usr/include/opencv2/cudev/grid/detail/transform.hpp + /usr/include/opencv2/cudev/grid/detail/transpose.hpp + /usr/include/opencv2/cudev/grid/histogram.hpp + /usr/include/opencv2/cudev/grid/integral.hpp + /usr/include/opencv2/cudev/grid/pyramids.hpp + /usr/include/opencv2/cudev/grid/reduce.hpp + /usr/include/opencv2/cudev/grid/reduce_to_vec.hpp + /usr/include/opencv2/cudev/grid/split_merge.hpp + /usr/include/opencv2/cudev/grid/transform.hpp + /usr/include/opencv2/cudev/grid/transpose.hpp + /usr/include/opencv2/cudev.hpp + /usr/include/opencv2/cudev/ptr2d/constant.hpp + /usr/include/opencv2/cudev/ptr2d/deriv.hpp + /usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp + /usr/include/opencv2/cudev/ptr2d/extrapolation.hpp + /usr/include/opencv2/cudev/ptr2d/glob.hpp + /usr/include/opencv2/cudev/ptr2d/gpumat.hpp + /usr/include/opencv2/cudev/ptr2d/interpolation.hpp + /usr/include/opencv2/cudev/ptr2d/lut.hpp + /usr/include/opencv2/cudev/ptr2d/mask.hpp + /usr/include/opencv2/cudev/ptr2d/remap.hpp + /usr/include/opencv2/cudev/ptr2d/resize.hpp + /usr/include/opencv2/cudev/ptr2d/texture.hpp + /usr/include/opencv2/cudev/ptr2d/traits.hpp + /usr/include/opencv2/cudev/ptr2d/transform.hpp + /usr/include/opencv2/cudev/ptr2d/warping.hpp + /usr/include/opencv2/cudev/ptr2d/zip.hpp + /usr/include/opencv2/cudev/util/atomic.hpp + /usr/include/opencv2/cudev/util/detail/tuple.hpp + /usr/include/opencv2/cudev/util/detail/type_traits.hpp + /usr/include/opencv2/cudev/util/limits.hpp + /usr/include/opencv2/cudev/util/saturate_cast.hpp + /usr/include/opencv2/cudev/util/simd_functions.hpp + /usr/include/opencv2/cudev/util/tuple.hpp + /usr/include/opencv2/cudev/util/type_traits.hpp + /usr/include/opencv2/cudev/util/vec_math.hpp + /usr/include/opencv2/cudev/util/vec_traits.hpp + /usr/include/opencv2/cudev/warp/detail/reduce.hpp + /usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp + /usr/include/opencv2/cudev/warp/reduce.hpp + /usr/include/opencv2/cudev/warp/scan.hpp + /usr/include/opencv2/cudev/warp/shuffle.hpp + /usr/include/opencv2/cudev/warp/warp.hpp +) + +PATCHES=( + "${FILESDIR}/${PN}-3.0.0-gles.patch" + "${FILESDIR}/${PN}-3.4.0-disable-download.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-utils_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 dnn_samples; 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 + eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch" + + if use contrib_xfeatures2d; then + mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die + fi + 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=OFF + -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 gtk) + -DWITH_GTK_2_X=$(usex gtk) + -DWITH_IPP=$(multilib_native_usex ipp) + -DWITH_JASPER=$(usex jpeg2k) + -DWITH_JPEG=$(usex jpeg) + -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 + -BUILD_opencv_apps= + -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=$(multilib_native_usex java) + # -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 + # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX} + # to set its destination libdir + -DLIB_SUFFIX= + # =================================================== + # OpenCV build options + # =================================================== + -DENABLE_CCACHE=OFF + -DENABLE_PRECOMPILED_HEADERS=$(usex pch) + -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 + # =================================================== + # 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= + # ================================================== + # cpu flags, should solve 633900 + #=================================================== + -DCPU_DISPATCH=OFF + -DENABLE_SSE=$(usex cpu_flags_x86_sse) + -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) + -DENABLE_SSE3=$(usex cpu_flags_x86_sse3) + -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3) + -DENABLE_SSE41=$(usex cpu_flags_x86_sse4_1) + -DENABLE_SSE42=$(usex cpu_flags_x86_sse4_2) + -DENABLE_POPCNT=$(usex cpu_flags_x86_popcnt) + -DENABLE_AVX=$(usex cpu_flags_x86_avx) + -DENABLE_AVX2=$(usex cpu_flags_x86_avx2) + -DENABLE_FMA3=$(usex cpu_flags_x86_fma3) + ) + + # =================================================== + # OpenCV Contrib Modules + # =================================================== + if use contrib; then + GLOBALCMAKEARGS+=( + -DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF) + -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}" + -DBUILD_opencv_dnns_easily_fooled=OFF + -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF) + -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF) + -DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF) + -DBUILD_opencv_sfm=$(usex contrib_sfm 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 + ) + + cmake-utils_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 contrib_dnn; 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+=( + # cheap trick: python_setup sets one of them as a symlink + # to the correct interpreter, and the other to fail-wrapper + -DPYTHON2_EXECUTABLE=$(type -P python2) + -DPYTHON3_EXECUTABLE=$(type -P python3) + -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-utils_src_configure + cmake-utils_src_compile + cmake-utils_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" +} + +multilib_src_install() { + cmake-utils_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/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest index a6deacb7c949..9b2d4c5d1902 100644 --- a/media-libs/phonon-gstreamer/Manifest +++ b/media-libs/phonon-gstreamer/Manifest @@ -1,6 +1,5 @@ AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe -EBUILD phonon-gstreamer-4.9.0-r1.ebuild 1978 BLAKE2B ab48d3cd7486242e6eaedf43434f32d6f857a5ac3f6bf80b63bb41f28acf6b9dc52d900a0e6de6667f88dffd2aa174c59586f4d5837358b42c71267c8e88315d SHA512 062854f40de54080251b0490a359b9579941b8f3fd6300ecb505c500e1f373d8ec818fa477d18306463144211e5e1c80b49c896713b50fab201ace9f53aadf30 -EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1113 BLAKE2B 0d4e098bc9b6c6905471b840f4021ea6450707dbb931295697562e146147da221f6ff949ea4e9be95d4046ee5d1339fadab68cacbcda83ca27c2a3a2855c1dbb SHA512 a6cb5624ce4eb471bbba9ab0ce71a91b8a0310229d6a2d8a43b3aa5eeed163871c09a10ea7360e6cecdeebca33c4d1138f51a3e5c8b12e9c6b435fbbd219e75e +EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1112 BLAKE2B d89617cbae84c6cfc8aada90399857bb9da793b1eb5e9521c0dbc2bd98c1510b5e1c9a34a013180070898713290b343ed7dffd697a608df7b3a513321882bffc SHA512 d57323dda5dd554e8ac0b6fae3bb3fad57b255b3d4f396eb70765a8088b509f0f34ddf10b3723fb048feb7aa0c1eddc4463e37513ffcd0268e8cf31adfb33599 EBUILD phonon-gstreamer-9999.ebuild 1056 BLAKE2B aa1afd5ade889a59c5ec4218fe9cba15f50d863483e5b379077c5a832e35a9c57eecf9eddb307e04ccc5bf6882ef72f845749b54407fa57cdfb79bb230882e71 SHA512 17a27ab64a08f7be157a59106e3f8871b631533164d517130c37448fa6d2d26eb2ceb2056cd31c35cc4af15bbe821d0c2792e89ffe86a3d832aa4b10862d9efc MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild deleted file mode 100644 index c24ca2f0c163..000000000000 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="phonon-backend-gstreamer" -MY_P=${MY_PN}-${PV} - -if [[ ${PV} != *9999* ]]; then - SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz" - KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" -else - EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) - inherit git-r3 -fi - -inherit cmake-utils multibuild - -DESCRIPTION="Phonon GStreamer backend" -HOMEPAGE="https://phonon.kde.org/" - -LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" -SLOT="0" -IUSE="alsa debug +network qt4 +qt5" - -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=media-libs/phonon-4.9.0[qt4?,qt5?] - media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] - virtual/opengl - network? ( media-plugins/gst-plugins-soup:1.0 ) - qt4? ( - >=dev-qt/qtcore-4.8.7-r2:4[glib] - >=dev-qt/qtgui-4.8.7:4[glib] - >=dev-qt/qtopengl-4.8.7:4 - ! +Date: Sun, 31 Dec 2017 15:09:41 +0100 +Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer + dereference on corrupted file. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2770 + +--- + libtiff/tif_print.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c +index 9959d353b1f9..8deceb2b054d 100644 +--- a/libtiff/tif_print.c ++++ b/libtiff/tif_print.c +@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", + (unsigned long) s, +- (unsigned __int64) td->td_stripoffset[s], +- (unsigned __int64) td->td_stripbytecount[s]); ++ td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0, ++ td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0); + #else + fprintf(fd, " %3lu: [%8llu, %8llu]\n", + (unsigned long) s, +- (unsigned long long) td->td_stripoffset[s], +- (unsigned long long) td->td_stripbytecount[s]); ++ td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0, ++ td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0); + #endif + } + } +-- +2.16.1 + diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild index 922ac56426c6..4acf1197bc61 100644 --- a/media-libs/tiff/tiff-4.0.9-r3.ebuild +++ b/media-libs/tiff/tiff-4.0.9-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz LICENSE="libtiff" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+cxx jbig jpeg lzma static-libs test zlib" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild new file mode 100644 index 000000000000..4787ecd348eb --- /dev/null +++ b/media-libs/tiff/tiff-4.0.9-r4.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit autotools libtool ltprune multilib-minimal + +DESCRIPTION="Tag Image File Format (TIFF) library" +HOMEPAGE="http://libtiff.maptools.org" +SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz + ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz" + +LICENSE="libtiff" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="+cxx jbig jpeg lzma static-libs test zlib" + +RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" + +REQUIRED_USE="test? ( jpeg )" #483132 + +PATCHES=( + "${FILESDIR}"/${PN}-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch + "${FILESDIR}"/${PN}-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch + "${FILESDIR}"/${P}-CVE-2017-9935.patch #624696 + "${FILESDIR}"/${P}-CVE-2017-9935-fix-incorrect-type.patch #624696 + "${FILESDIR}"/${P}-CVE-2017-18013.patch #645982 + "${FILESDIR}"/${P}-CVE-2018-5784.patch #645730 +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/tiffconf.h +) + +src_prepare() { + default + + # tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7 + sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die + + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --without-x + $(use_enable cxx) + $(use_enable jbig) + $(use_enable jpeg) + $(use_enable lzma) + $(use_enable static-libs static) + $(use_enable zlib) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + # remove useless subdirs + if ! multilib_is_native_abi ; then + sed -i \ + -e 's/ tools//' \ + -e 's/ contrib//' \ + -e 's/ man//' \ + -e 's/ html//' \ + Makefile || die + fi +} + +multilib_src_test() { + if ! multilib_is_native_abi ; then + emake -C tools + fi + emake check +} + +multilib_src_install_all() { + prune_libtool_files --all + rm -f "${ED%/}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} +} diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest new file mode 100644 index 000000000000..99175be6f267 --- /dev/null +++ b/media-libs/vulkan-layers/Manifest @@ -0,0 +1,6 @@ +AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b +AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 2610 BLAKE2B a7ae2f31d1eed1bf0120d09e91b67a45a3ef3dae62e19221185eab7edbf7a23bcd6397cea2153ef893e3e958c70a165fbaecb9192c69e81f586c06cb04e124dd SHA512 f55ab09cdaa10562a472001be4613ab2eaf3fed97bd77618d13047d5040d2181236dd8d0366ea13494dcd37abc535448493a9521006bcfd95e89b0bdc57ad51c +DIST vulkan-layers-0_pre20180526.tar.gz 1138198 BLAKE2B 33788256d82c1bc3dd071d15ecd0e3bb024fc35693b6b988e12990d0af7a6d209b02a01893b288e3ae3b1a499803e23118429de1efe3189c9a8369c0ec9ab02f SHA512 412c9cf95415d93191529fd4c9712e93e1939d74dece028d42f7f9199f0b686a7aa15554249590a0777cb9c6fd4cbb85cfd87b9eea11bc02400976cbd81a52f1 +EBUILD vulkan-layers-0_pre20180526.ebuild 1591 BLAKE2B f1a8ed816e0094c81b0ee222529b85390b145b8ca4ce95bb7b6b8e0ed3bb9eff300a29dbe7e03320541f57846edffebeb940729e915fb25595c094055552be7c SHA512 2d3062f930bd070c312d360fee4506c616db0a22607e51d6ae7521f7f80d5dbcbc35887a20597a7c55af57e90a2e38c7cc28ae06c050c24951582f5ae4d931f8 +EBUILD vulkan-layers-9999.ebuild 1591 BLAKE2B f1a8ed816e0094c81b0ee222529b85390b145b8ca4ce95bb7b6b8e0ed3bb9eff300a29dbe7e03320541f57846edffebeb940729e915fb25595c094055552be7c SHA512 2d3062f930bd070c312d360fee4506c616db0a22607e51d6ae7521f7f80d5dbcbc35887a20597a7c55af57e90a2e38c7cc28ae06c050c24951582f5ae4d931f8 +MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch new file mode 100644 index 000000000000..7688eb8d5cf6 --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch @@ -0,0 +1,40 @@ +From 2bcf0e5097070532ebfb0bf0ee0b28e1065be1e8 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +Date: Tue, 22 May 2018 20:11:17 -0400 +Subject: [PATCH] Use a file to get the spirv-tools commit ID + +Signed-off-by: Nick Sarnie +--- + layers/CMakeLists.txt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index 5b3758d1..2a9c2f32 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -51,6 +51,13 @@ macro(run_external_revision_generate symbol_name output) + ) + endmacro() + ++macro(run_external_revision_generate_spirv_tools source_dir symbol_name output) ++ add_custom_command(OUTPUT ${output} ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/spirv-tools-commit.h -s ${symbol_name} -o ${output} ++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/spirv-tools-commit.h ++ ) ++endmacro() ++ + # Custom targets for generated validation layer helper file dependencies + add_custom_target(spirv_tools_revision_file DEPENDS + spirv_tools_commit_id.h +@@ -78,7 +85,7 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h) + run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) + run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) + if(BUILD_LAYERS) +- run_external_revision_generate(SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) ++ run_external_revision_generate_spirv_tools(/usr/include/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) + endif() + + # Layer Utils Library +-- +2.17.0 + diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch new file mode 100644 index 000000000000..a4829d9997a7 --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch @@ -0,0 +1,57 @@ +From 42fb7b4c73b0cae196a2eb6d97bfa6cc635f23fb Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +Date: Sat, 26 May 2018 17:39:08 -0400 +Subject: [PATCH] Use usr for vulkan headers + +Signed-off-by: Nick Sarnie +--- + CMakeLists.txt | 2 +- + layers/CMakeLists.txt | 5 +++-- + scripts/lvl_genvk.py | 2 +- + 3 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 178debdd..dc742304 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + find_package(PythonInterp 3 REQUIRED) + + # TODO: Add option to override this with env var, or even to use SDK +-set(VULKAN_HEADERS_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers") ++set(VULKAN_HEADERS_LOCATION "/usr") + + # Output warning if vulkan headers submodule contents are not present + if (NOT EXISTS "${VULKAN_HEADERS_LOCATION}/include/vulkan/vulkan_core.h") +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index 962c4be6..26e5abaf 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -38,8 +38,9 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts") + # Define macro used for building vkxml generated files + macro(run_vk_xml_generate dependency output) + add_custom_command(OUTPUT ${output} +- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${output} +- DEPENDS ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${VULKAN_HEADERS_LOCATION}/registry/reg.py ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/vk.xml ${output} ++ DEPENDS ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ++${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/reg.py + ) + endmacro() + +diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py +index 4dac9ca2..6ea83ddb 100644 +--- a/scripts/lvl_genvk.py ++++ b/scripts/lvl_genvk.py +@@ -16,7 +16,7 @@ + + import argparse, cProfile, pdb, string, sys, time, os + scripts_directory_path = os.path.dirname(os.path.abspath(__file__)) +-registry_headers_path = os.path.join(scripts_directory_path, '../Vulkan-Headers/registry') ++registry_headers_path = os.path.join(scripts_directory_path, '/usr/include/vulkan/registry') + sys.path.insert(0, registry_headers_path) + + from reg import * +-- +2.17.0 + diff --git a/media-libs/vulkan-layers/metadata.xml b/media-libs/vulkan-layers/metadata.xml new file mode 100644 index 000000000000..d87b452b7dbc --- /dev/null +++ b/media-libs/vulkan-layers/metadata.xml @@ -0,0 +1,16 @@ + + + + + x11@gentoo.org + X11 + + + sarnex@gentoo.org + Nick Sarnie + + + KhronosGroup/Vulkan-ValidationLayers + + + diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild new file mode 100644 index 000000000000..ca8180bed039 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}" +fi + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Vulkan Validation Layers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="X wayland" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" + "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" + ) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_WSI_MIR_SUPPORT=False + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DBUILD_TESTS=False + -DGLSLANG_INSTALL_DIR="/usr" + ) + cmake-utils_src_configure +} diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild new file mode 100644 index 000000000000..ca8180bed039 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}" +fi + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Vulkan Validation Layers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="X wayland" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" + "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" + ) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_WSI_MIR_SUPPORT=False + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DBUILD_TESTS=False + -DGLSLANG_INSTALL_DIR="/usr" + ) + cmake-utils_src_configure +} diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index 7cd108c83f6d..2d358cc18b66 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,8 +1,10 @@ AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918 +AUX vulkan-loader-9999-Do-not-install-vulkan-headers.patch 725 BLAKE2B 6b48104a774c0981af5625e9908b752494e3603c86f7d2ca59181d7510acdb859e445b366ef55b574b169476b84a2c81894f90191edaa83bdd3d4e8d747d14c9 SHA512 8cf05233a575108f29dd7f4bea2a92e68067b9fa87c1a6f5a29072d5044833d8b9eb9a7fe79e8b75d0c23c46fb4129f2fd1cf655a69223d68ac894805c3fcbab +AUX vulkan-loader-9999-Use-usr-for-vulkan-headers.patch 2084 BLAKE2B d8dbb0df82d5bb3b570b1233e5bfbf7c80bd8eab1e7127d3964cb7307a324e91b6e964c26161f6e824ab2dc5ee3519d1bb2ed792c355a23ce7bd5e5ccbbfacc4 SHA512 8406ccbde73bd9d5868c1c3fb33ef1799bee653d177839ed576ecc2e78a2286d67228ba035d38f9dba9e43819995c950f88f300832170f333541649fd4774d2d AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297 DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26 EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1780 BLAKE2B ee2078c51a1368e97e347565d0152b70b636ff094b39e3c44c348c2d37aecba7781140a36deb74f803e90c25d272d34e46dfa4853345c05bb2490cb4c702623d SHA512 4c9254c7cc300db6107e77755117e0c1a86c4e5e5750aaff31f753aa7222516c48e84a4cdabe7fb7f84f92bfbc8f4f84b8ad4287126c423627898ab1fbe3cccd EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681 -EBUILD vulkan-loader-9999.ebuild 1649 BLAKE2B cbd06a6d61272d7b4c5a72cd78386bc133c8789c7f0b98af3bdec194262837412398eb4bdff8441d3b05b96f5aae1fa06b62df672e2e892e6490edb8366ba408 SHA512 550bab7fd8d6de1d2c1ddf8071edfa63d69ae89e462ecf2d806ed330cd9b4f2d12708374b87557bfef9b38bd5af5f5698fb753cf74c9e7a9e7f64857491a5b8d +EBUILD vulkan-loader-9999.ebuild 1588 BLAKE2B 55c21df60e6919ccbe0646414f0ea4c9efca6f243665640acdc77a3807f3cab5c6c4b42b3a598cac622d3d6292755e87c2fef2de5d0c51e8737291b8bac48fc6 SHA512 bcdcee331cfe38008ce58aff629f52ccf75337649cc38af9e2e0801d2a700e1a027391294c6da08775bdd3d30285aa70529f339e041a6fa15346a4d71ca75945 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574 diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch new file mode 100644 index 000000000000..b0cc73c44868 --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch @@ -0,0 +1,24 @@ +From d3d9f1b73732d4f9d4d33bc7fa782cadbc10d80f Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +Date: Mon, 21 May 2018 22:34:25 -0400 +Subject: [PATCH] Do not install vulkan headers + +Signed-off-by: Nick Sarnie +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 627de6f70..65f5ea0d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -170,7 +170,6 @@ if(NOT WIN32) + endif() + endif() + +-install(DIRECTORY "${HEADERS_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan") + + # uninstall target +-- +2.17.0 diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch new file mode 100644 index 000000000000..49dd54c83c8f --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch @@ -0,0 +1,51 @@ +From d9b3835e1ad455853e3a58ec0d2a0653e5952a21 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +Date: Mon, 26 May 2018 16:57:33 -0400 +Subject: [PATCH] Use /usr for vulkan-headers + +Signed-off-by: Nick Sarnie +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0b744a87..14034d33c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,7 +68,7 @@ if(WIN32) + endif() + + set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts") +-set(HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers") ++set(HEADERS_DIR "/usr") + + # Output warning if vulkan headers submodule contents are not present + if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h") +@@ -131,8 +131,9 @@ set (PYTHON_CMD ${PYTHON_EXECUTABLE}) + # Define macro used for building vkxml generated files + macro(run_vk_xml_generate dependency output) + add_custom_command(OUTPUT ${output} +- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/registry/vk.xml ${output} +- DEPENDS ${HEADERS_DIR}/registry/vk.xml ${HEADERS_DIR}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/registry/reg.py ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${output} ++ DEPENDS ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${HEADERS_DIR}/include/vulkan/registry/generator.py ++ ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/include/vulkan/registry/reg.py + ) + endmacro() + +diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py +index 0de555fae..dab543ed3 100644 +--- a/scripts/lvl_genvk.py ++++ b/scripts/lvl_genvk.py +@@ -17,7 +17,7 @@ + import argparse, cProfile, pdb, string, sys, time, os + + scripts_dir = os.path.dirname(os.path.abspath(__file__)) +-registry_dir = os.path.join(scripts_dir, '../Vulkan-Headers/registry') ++registry_dir = os.path.join(scripts_dir, '/usr/include/vulkan/registry') + sys.path.insert(0, registry_dir) + + from reg import * +-- +2.17.0 + diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index b83dbcb76bcd..33afbd7d8348 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -5,46 +5,42 @@ EAPI=6 PYTHON_COMPAT=( python3_{4,5,6} ) if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git" + EGIT_SUBMODULES=() inherit git-r3 else KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" + SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-Loader-sdk-${PV}" fi inherit python-any-r1 cmake-multilib DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" LICENSE="Apache-2.0" SLOT="0" -IUSE="demos layers wayland X" -REQUIRED_USE="demos? ( X )" +IUSE="layers wayland X" -RDEPEND="" +PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" DEPEND="${PYTHON_DEPS} - demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) - layers? ( - dev-util/glslang:=[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] - ) + dev-util/vulkan-headers wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] )" -PATCHES=( "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" ) +PATCHES=( + "${FILESDIR}/${P}-Do-not-install-vulkan-headers.patch" + "${FILESDIR}/${P}-Use-usr-for-vulkan-headers.patch" +) multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True -DBUILD_TESTS=False - -DBUILD_LAYERS=$(usex layers) - -DBUILD_DEMOS=$(usex demos) - -DBUILD_VKJSON=False -DBUILD_LOADER=True -DBUILD_WSI_MIR_SUPPORT=False -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) @@ -59,3 +55,8 @@ multilib_src_install() { cmake-utils_src_install } + +pkg_postinst() { + einfo "USE=demos has been dropped as per upstream packaging" + einfo "vulkaninfo is now available in the media-libs/vulkan-tools package" +} diff --git a/media-libs/vulkan-tools/Manifest b/media-libs/vulkan-tools/Manifest new file mode 100644 index 000000000000..f12d88202b48 --- /dev/null +++ b/media-libs/vulkan-tools/Manifest @@ -0,0 +1,5 @@ +AUX vulkan-tools-Use-usr-for-vulkan-headers.patch 1240 BLAKE2B 2206e0777c2c7fea95a1e0b43e09de372b6a898275b3dbfa3bc1cac84125be42ade8834ffb8b2fd872f8d8ffa64aa70b456ad5c2e63c98c9aa4abd1995777043 SHA512 c96da656fe2d32af3ea5fbf348e6297be88b1581bda55e65a97d8d96229363b26285495929d5fa749b8e8fc9c20aa16ee529bcdf020191d46eac9bf97bab4511 +DIST vulkan-tools-0_p20180526.tar.gz 437094 BLAKE2B 95e738567ee041730ce94aaf02e543cbb3d1e838af2de41cd0bd56069703f5b8250ca4e45c2bd3d9c4314b388b7aa6379b4778c52c01f3de43789d3b84a8fe8d SHA512 b9319f1baaa8e9ae42579608dabaeee3c0503192e3469d82cbad2a550f9fa78b3a19b37426e0391d2ce308a44e63b6a2deff32917995edc07c5cd65f87465222 +EBUILD vulkan-tools-0_p20180526.ebuild 1481 BLAKE2B d58e8af3352d27bf10d8d9fc2dad5838a37fa1a063f30492e188d97451c089849bce362c295e88bb1a6115e56433551ea35816a67c449713b599d78d5efbcd5d SHA512 cb26f400997a4690f47ae5ed9094f183e5d64a255c8672e330946c3d32f295a83877679bc6280ba497a7b1ba96a9ddf1f79492c5cabcde35d2cf98b08ed4af11 +EBUILD vulkan-tools-9999.ebuild 1481 BLAKE2B d58e8af3352d27bf10d8d9fc2dad5838a37fa1a063f30492e188d97451c089849bce362c295e88bb1a6115e56433551ea35816a67c449713b599d78d5efbcd5d SHA512 cb26f400997a4690f47ae5ed9094f183e5d64a255c8672e330946c3d32f295a83877679bc6280ba497a7b1ba96a9ddf1f79492c5cabcde35d2cf98b08ed4af11 +MISC metadata.xml 430 BLAKE2B dd9ef031ce380e8c4f37ab9d1c6bde97ce580b860ddcb6d41ba6b367e1c049528dc1562f228e9e8fd9d8109ed60a32d82faaec5b60e204bda4fc62d054feebc5 SHA512 8a2d53130be6108388981f63b4c2102ad901135254bb14a0568910fc0dc599374962cd39f1d7920cc5d1cab6700f67440f5b637e2850449a9ae16b666c153668 diff --git a/media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch new file mode 100644 index 000000000000..b9797e19ad2f --- /dev/null +++ b/media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch @@ -0,0 +1,35 @@ +From 9498942c820525dc531f643696b7938d3f5fa482 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +Date: Tue, 22 May 2018 19:55:59 -0400 +Subject: [PATCH] Use usr for vulkan headers + +Signed-off-by: Nick Sarnie +--- + CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa9a3d3b..2998edfa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,13 +29,15 @@ endif() + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + set(TOOLS_TARGET_FOLDER lvl_cmake_targets) + ++set(HEADERS_DIR "/usr") ++ + # Output warning if vulkan headers submodule contents are not present +-if (NOT EXISTS "${PROJECT_SOURCE_DIR}/Vulkan-Headers/include/vulkan/vulkan_core.h") ++if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h") + message(FATAL_ERROR "Please run 'git submodule update --init' before running cmake") + endif() + + # Header file for CMake settings +-include_directories("${PROJECT_SOURCE_DIR}/Vulkan-Headers/include") ++include_directories("${HEADERS_DIR}/include") + + if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") + set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers") +-- +2.17.0 + diff --git a/media-libs/vulkan-tools/metadata.xml b/media-libs/vulkan-tools/metadata.xml new file mode 100644 index 000000000000..a670686d9eb6 --- /dev/null +++ b/media-libs/vulkan-tools/metadata.xml @@ -0,0 +1,16 @@ + + + + + x11@gentoo.org + X11 + + + sarnex@gentoo.org + Nick Sarnie + + + KhronosGroup/Vulkan-Tools + + + diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild new file mode 100644 index 000000000000..143583c65a59 --- /dev/null +++ b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="5e1623ca6860f3e393b1dabbdd19ba216871fa61" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" +fi + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="X wayland" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + dev-util/glslang:=[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" ) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_WSI_MIR_SUPPORT=False + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DGLSLANG_INSTALL_DIR="/usr" + ) + cmake-utils_src_configure +} diff --git a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild b/media-libs/vulkan-tools/vulkan-tools-9999.ebuild new file mode 100644 index 000000000000..143583c65a59 --- /dev/null +++ b/media-libs/vulkan-tools/vulkan-tools-9999.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="5e1623ca6860f3e393b1dabbdd19ba216871fa61" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" +fi + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="X wayland" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + dev-util/glslang:=[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" ) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_WSI_MIR_SUPPORT=False + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DGLSLANG_INSTALL_DIR="/usr" + ) + cmake-utils_src_configure +} -- cgit v1.2.3