diff options
Diffstat (limited to 'media-libs')
41 files changed, 515 insertions, 1411 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 12f21b6529e0..9b21453fa968 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest index 84660a56fb24..46af0889354d 100644 --- a/media-libs/exempi/Manifest +++ b/media-libs/exempi/Manifest @@ -2,6 +2,8 @@ AUX exempi-2.1.1-iconv.patch 660 BLAKE2B c0eb393c242b3aea2c184efe2e2da325003ec69 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736 DIST exempi-2.2.1.tar.gz 3566843 BLAKE2B f174bdf7fe88491694adef8dfa7f25184882deae967bb955972bcef71cff1cc42b0ddee38a356833bd35579f2b9f3e3310dbdcc8312fd4c60737323de5611a3e SHA512 f4b97ec7af89924755a0695464bad5081de6a5d6a6f28c06984c051d677f8771c39df12951761ecd28d6ff520ddec4e21179dcba8b58f0ef649bbdad1a53aa9c DIST exempi-2.4.2.tar.gz 3911796 BLAKE2B 73fc84dfff84b608e1408678af06b017617c3be62d0b3ae1606676b5c47d68683f3f94cb9b9a4afcfa76beabbac01997eb421491b51a8cc44912990af4ad0dc5 SHA512 47d0737a95dbd31c3c39ef9a9a8c00e87135c2eb909bea1d89fa8df31c0e73dadd7e9f9f0e6445d3b17457396e0c1381b93f5751494e1061822df47f7099b568 +DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c EBUILD exempi-2.2.1.ebuild 1067 BLAKE2B 0c3a3a919e27ed78ef0cd4c9912dd48aff0ed0b378214fe11b6abd25a67ec4ced85b0fc8191c2df91981535199ae7ac65e1a823b9b1a3aac0dbd6588dc758e6f SHA512 4671cc734e821f6fddea6a84c7b67f3dd58549be5d76acf8f99c44aaafda9cfcdf1ffca73262c8b67f355431f58a5fe3ebe37566c64ac58d154442305c35c8fa EBUILD exempi-2.4.2.ebuild 1169 BLAKE2B 5c5da2c06ef3da670f077f33eaae6aafc9780233c486b6a19e5520ee3c09d778a4d1a7aed2833da11c6bfd5742c9d5ff46bf2dd406bf4ffbd343426fa0885044 SHA512 1880073d53b300ecae2f036a8ee882db18c5fd3fc61f202e9021fc2c1ee9bfe508fb67cda1bc99b7fd16b0652ceda3ac0ca8ccd27303a907a98bcd5d747d2ad7 +EBUILD exempi-2.4.5.ebuild 1181 BLAKE2B 2743cc7256384302c14096f481084a58c167b725b5e6d551d6bf3f5a5492e182f4e04d5a2fbd1d57c2aa036ee4ed773cd5fb32d3d808af04090faec4bb9d5fe7 SHA512 4e437c989ba21665bd571aae85c90da5ac8f28bafc8423b3691572ee2d89349b228d948296dbd8c2357d327cd9a797b6464b748b804b8494c8c9a31cfd903e6d MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4 diff --git a/media-libs/exempi/exempi-2.4.5.ebuild b/media-libs/exempi/exempi-2.4.5.ebuild new file mode 100644 index 000000000000..2782b8b68f3c --- /dev/null +++ b/media-libs/exempi/exempi-2.4.5.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools ltprune + +DESCRIPTION="Exempi is a port of the Adobe XMP SDK to work on UNIX" +HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi" +SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz" + +LICENSE="BSD" +SLOT="2/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="examples static-libs test" + +RDEPEND=" + >=dev-libs/expat-2:= + virtual/libiconv + sys-libs/zlib:= +" +DEPEND="${RDEPEND} + sys-devel/autoconf-archive + sys-devel/gettext + test? ( >=dev-libs/boost-1.48 ) +" + +src_prepare() { + default + eapply "${FILESDIR}"/${PN}-2.4.2-iconv.patch + cp /usr/share/gettext/config.rpath . || die + eautoreconf +} + +src_configure() { + # Valgrind detection is "disabled" due to bug #295875 + econf \ + $(use_enable static-libs static) \ + $(use_enable test unittest) \ + VALGRIND="" +} + +src_install() { + default + prune_libtool_files --all + + if use examples; then + emake -C samples/source distclean + rm samples/{,source,testfiles}/Makefile* || die + insinto /usr/share/doc/${PF}/examples + doins -r samples/* + fi +} diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest index 02ca4b3a6b05..3bf5d09fb1cb 100644 --- a/media-libs/freeimage/Manifest +++ b/media-libs/freeimage/Manifest @@ -2,9 +2,10 @@ AUX freeimage-3.15.4-CVE-2015-0852.patch 6191 BLAKE2B 1b5c66b65ced14f45a9cb87b3e AUX freeimage-3.15.4-CVE-2016-5684-1.patch 690 BLAKE2B dc22eefe8b21c960095a4b531cc13762e6042dc2f4d1718e116bb83cf1d1efc6111116c7ed5c4e55fcfeef1c0e9250065205104b83e2ba06adf3a65a8de0db30 SHA512 7c535725fddb0a4f97c2634cf6144c9fea9d5963279265e0f08d9cc2f6a4aaf24a6fa27096dc5a50457db90bb93b895936d5967ae08ea9d93ebea89cd2ff724d AUX freeimage-3.15.4-CVE-2016-5684-2.patch 369 BLAKE2B d1c7950cb6839b8782d1c409d3f96ad9da09b6f7bf1728b01e4ce4ece8ce1d37838640fceabbc4357aad5e0f53ba2fbf34b5ffbd53aedb7dd6a4b6a1f981e6de SHA512 275871b569301af72d7db03c390113124b15a16d043bb7c95d10b4fe7a79cd092e2d320efe0ec6038f64f29e07ea443b97c367ff78dbd718ae04393e956be533 AUX freeimage-3.15.4-libjpeg-turbo.patch 20346 BLAKE2B 38ecea346812c292e697717319db206c658cc30a04de9b7e5dff2bd531c03424982aba7b3206ad69ffb75132779b1e0c07e0a49c7e8e127d59ce0d85afdf8335 SHA512 effe0dd7d47400e57d4754a5d9b4533051aae0410fc9b579dd4af902c39538bf071bcc492a68cb027b0a28bc2f627357f26f4cb4f1d0ba93a34d0d5c0dfc524e +AUX freeimage-3.15.4-libjpeg9.patch 1581 BLAKE2B 717a2e0b757c5d7ca540ec5ef6cfa2a2bc06bfc2de86e7b67bfc6c8010b7b32272456ed67d3297f02477318b3c3af8075df004c432cd1bd795652dab4096f7e5 SHA512 76f05f35118e96405977ebe746b600a3887677c30ce1fe0600d1e8f0c2aa0238f4dd418a0c612021ec8551692c2420190bcfb2f6b305a24c5a4070c77f1b7899 AUX freeimage-3.15.4-raw.patch 350 BLAKE2B 4f97bc847878eef03c4af249fb20353979aa043fd37840b9cdb3159fa097a8b52455c2a0f4bd6f97140ebcf15739692c270f7ae1e62859da7188b835fb28a9f8 SHA512 2429bec7ec8f4963d3b0bd658093e8c3ff83d8ea5d934beb28526b80e89cb3aee6fe849800d80a81680614fa98e962744ced33ee198e04e32fc4be4d105e528b AUX freeimage-3.15.4-unbundling.patch 17258 BLAKE2B 309707fe4b07c3808fb2824a07eeef77a6b424267b5363e7b67c5677f33903962b887d1116e6c8bdd786c244cb80e84b4a2d9b5941a89ed640aabc6fddd1e320 SHA512 96883a598a6386b322e69497760cff606d95e354dd7a197b858060b41402641c9188bf6c77a9a249d04a8c3d59561ccb034581a43e1df3fd0806f3a2a521f3a0 DIST FreeImage3154.pdf 1007480 BLAKE2B 801d39c4b7eeab833c7225c2d53a3a0e8e9d2a91ea3f7173047705c8b750706f3a4a9ac60f7ba9d5e8150b548bd5add242e9e40f498c57ad9e5a623972bbb239 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28 DIST FreeImage3154.zip 5513923 BLAKE2B 376b00faaae2c10c9eb36f89726a022734e109ca7ca11951c9e6525f21d2a7ee305ec195be29a272ecb7935ba5d0b61f3d84f26a6aec5f7a9229d5e47cd665bb SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc -EBUILD freeimage-3.15.4-r1.ebuild 2961 BLAKE2B 0137dac8513a66b8c5cf1f0640d8d5979c209e1d8d2b30e943ce74a75e6e1f177fc932719804646bef9793d2bbb4ff948a0873dce03c36a785e219ca1f7604b6 SHA512 746d2c66294780d0b3b702b659f0c4217887474d954633bbc80b43e0333c2364e5f56c59e97bb3708160a5fc28a0ef78642befdef71fabc0b13f3ac340683ccc +EBUILD freeimage-3.15.4-r1.ebuild 3004 BLAKE2B 64f989b270e7dceec8d7d542fad6dcb5e7ce2c5a0e3193ca3df3fedbf4bb888322b7ec8fe3277aaa3cdb507f04bb0080dfd949744d9bb41c2e82dc4086ad8bc2 SHA512 cbd8f7e0efcbeb15a9ff258a718ef8b2d784824abe3b57df34e25fedbeeac7e4f3a4d6c982f3928afa914a83743ba3b197bede97a87506ba84141eef168f3c23 MISC metadata.xml 332 BLAKE2B e0048362683712cbd48296fa15c743d7ec86e71a7ab1c58f8abece77dd77b38e2f67b099efc2ece05294a9a39258ad81f5947162b66fa020d6fa639f8abb95a9 SHA512 060e17cbb418ebf7df3ee40bb1e99e12ce281101fc50e62e1a1d9cf0294fffbb2f475df1c25e954cb049bf065b316e155ccbf94dcae0bf49acf9e45e306144c5 diff --git a/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch b/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch new file mode 100644 index 000000000000..24eb9e010fca --- /dev/null +++ b/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch @@ -0,0 +1,45 @@ +Bug: https://bugs.gentoo.org/647422
+Upstream Patch: https://sourceforge.net/p/freeimage/patches/130/
+
+diff -Naur a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp +--- a/Source/FreeImage/PluginJPEG.cpp 2018-03-24 23:24:11.062695375 -0400 ++++ b/Source/FreeImage/PluginJPEG.cpp 2018-03-24 23:25:39.451124161 -0400 +@@ -1586,14 +1586,14 @@ + + // thumbnail support (JFIF 1.02 extension markers) + if(FreeImage_GetThumbnail(dib) != NULL) { +- cinfo.write_JFIF_header = 1; //<### force it, though when color is CMYK it will be incorrect ++ cinfo.write_JFIF_header = static_cast<boolean>(1); //<### force it, though when color is CMYK it will be incorrect + cinfo.JFIF_minor_version = 2; + } + + // baseline JPEG support + if ((flags & JPEG_BASELINE) == JPEG_BASELINE) { +- cinfo.write_JFIF_header = 0; // No marker for non-JFIF colorspaces +- cinfo.write_Adobe_marker = 0; // write no Adobe marker by default ++ cinfo.write_JFIF_header = static_cast<boolean>(0); // No marker for non-JFIF colorspaces ++ cinfo.write_Adobe_marker = static_cast<boolean>(0); // write no Adobe marker by default + } + + // set subsampling options if required +diff -Naur a/Source/FreeImage.h b/Source/FreeImage.h +--- a/Source/FreeImage.h 2018-03-24 23:24:11.066695395 -0400 ++++ b/Source/FreeImage.h 2018-03-24 23:26:35.945391182 -0400 +@@ -117,12 +117,17 @@ + #ifndef _WINDOWS_ + #define _WINDOWS_ + ++#if JPEG_LIB_VERSION < 90 ++ + #ifndef FALSE + #define FALSE 0 + #endif + #ifndef TRUE + #define TRUE 1 + #endif ++ ++#endif ++ + #ifndef NULL + #define NULL 0 + #endif diff --git a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild index 666fba9ba67b..d40deb296850 100644 --- a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild +++ b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.15.4-CVE-2016-5684-1.patch "${FILESDIR}"/${PN}-3.15.4-CVE-2016-5684-2.patch "${FILESDIR}"/${PN}-3.15.4-CVE-2015-0852.patch + "${FILESDIR}"/${PN}-3.15.4-libjpeg9.patch ) src_prepare() { diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest index 7992dd771207..e747ab2c6dd4 100644 --- a/media-libs/gd/Manifest +++ b/media-libs/gd/Manifest @@ -1,5 +1,5 @@ DIST libgd-2.2.4.tar.xz 2478528 BLAKE2B bec49fd50465549d13a403e6f2d487ef83633842ff313a44f45ea9bf50c66e70186f314da5a943cc4199185b992f8178334bfb14fb039fe51cdb296e80648cdc SHA512 07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b EBUILD gd-2.2.4.ebuild 2072 BLAKE2B 1acf2722c761a805ce0fa14a6301d04c7fb00bc4cfd2e9b21d8b92d7521154382cfcd56c7a0be3daadfe8420f38457038228bd88a8b4fba257eba720d5a6bd11 SHA512 016b8b4c88a5f50b931e903b1dab5f029da8892269eb3e2e16623936c0764b0ae0360a73b6ddc0cec5ed2587784bdf621e54a2d830a4efa866b14d551623fa54 -EBUILD gd-2.2.5.ebuild 2043 BLAKE2B d26a91f5c7658d216f282818208768a30fcfb9266999ce51b1ab5dd9689e73b46d2116e611736baf716ec0beb0996ede8d3c1ac4c53235f5d165e89eff092044 SHA512 62080ddfdac28fc39f1f5639212d5a11557baeb64ebcd145d5bfaab3a5e11a91bfc7984264001d0b94e6e1ca7b4f3114094a3827d0b479250c84d3c6ee0a02c3 +EBUILD gd-2.2.5.ebuild 2042 BLAKE2B 0efeb12e8c1371958a679eb129f28bb1e0c5e7b565d9e576f8ba7d003d3967a8a366edbaa9e88c8bb6c95a021c91f87cff231c148335744a15877decafc8e06b SHA512 b1540f099cb36229c9eb283deddf14d52d675e2aea076f7c8e315803d5820da51ad4e35d5a69f28f2761ce1ccda739f090d2311665a2560e6a7d932dfe6adb6f MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919 diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild index 7290fcb7551f..2d88f311453a 100644 --- a/media-libs/gd/gd-2.2.5.ebuild +++ b/media-libs/gd/gd-2.2.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" LICENSE="gd IJG HPND BSD" SLOT="2/3" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib" # fontconfig has prefixed font paths, details see bug #518970 diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest index 995553d89d20..e8ebcd510463 100644 --- a/media-libs/jasper/Manifest +++ b/media-libs/jasper/Manifest @@ -2,6 +2,6 @@ AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b0 DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940 EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1 -EBUILD jasper-2.0.14.ebuild 1919 BLAKE2B f2055e26f616313f6260d6c2662febb6c7a2bc4dfec03e59d03c2650bad1bd8ac3c4e5b21119bba0dc5dc426ecc7821e95d45d1fbb7b89647050b7bf572f520b SHA512 1a59ac2c42290c6d059c910f7fd06583d2fe56611429c79b24577b1069d5c9ccc2b061cff72fce73572d78d96498ad9b9e7aee908ae40d845faa19a06cab7ac6 +EBUILD jasper-2.0.14.ebuild 1918 BLAKE2B 5bef5f54eb0020bccb3b1ec8a6bf62d1bb9364aa94f8736dc3061cf1b7d6d412cc46f021ae196686bbbef6529f51420a8f476cd19e6ba24670d20f224be03fc3 SHA512 bf8f38e4a0cb40b90f00eb1d77ef530c6d26585dd30c447e6cdb30614b1eb92f6bd1771b6ca6b4522981e9ee73efea12635c3e20d754d445b695946ffadb95ce EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20 diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild index dc7e97111944..984bad859919 100644 --- a/media-libs/jasper/jasper-2.0.14.ebuild +++ b/media-libs/jasper/jasper-2.0.14.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else inherit vcs-snapshot SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi # We limit memory usage to 128 MiB by default, specified in bytes diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest index 036d6b1dd4ea..b9609be2c8c7 100644 --- a/media-libs/jpeg/Manifest +++ b/media-libs/jpeg/Manifest @@ -3,14 +3,10 @@ AUX jpeg-8d-CVE-2013-6629.patch 459 BLAKE2B 7657e4c2584d23e2997ec9d4ac8242b4d7ce DIST jpeg-6b-patchset-1.tar.xz 2592 BLAKE2B 6518fc5e94dcb4cecbb2d9f4edd2ad297d1f7b64f3da4f03ab54acc6eb9f11374091b7337b005a76f644c6795cdddc2ea032a9f41c9a9a3f5e06e0ba9f02f939 SHA512 6deb845a08f4ac6b88c47803b528842cedd145fb12295060d52553b8c803ba192478306496701a409c796c264ceaed0988575ae8f7717e2e7b24da5733bc9c2b DIST jpegsrc.v6b.tar.gz 613261 BLAKE2B d08406bebcbec9aa0197ef7854f163dc12d916e7e7df466e5408e715aa20738c047f0f709699311186e17da443af9afc208765f74bcc51a7bab2284c54351868 SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaad6bee06e9b95b803bf756beb6ad61abc76c889d53dfcd05139286ec870372d50d2b79bf28b32d0e8d50a2ab SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753 -DIST jpegsrc.v9a.tar.gz 1000034 BLAKE2B 24fffc050d30af27c52ace25f716858e882f88e6353c3a7369a9598a483a786b716b5c0dcab1e3582d2b23fe578b4bcd72ebc4434f6ca62a6593d53327613b6c SHA512 9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b -DIST jpegsrc.v9b.tar.gz 1022609 BLAKE2B 334b7d3df800ed2c3e1b5ee2fea40a350c0b4024f5a368efb488b9f782b3d006a691fc53574fa6ad4ff944b69c93478d2d7759635196277774f360511ecff3f9 SHA512 74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 EBUILD jpeg-6b-r12.ebuild 1253 BLAKE2B a9bfd0f21ae1f3f1b96b9effce1f731620f1b0da53138ac897c8cc67c2c5ac1d868a093cbc5624c58d7226813269457987a0dc01a9d6eb13d5c464ab87d37965 SHA512 cb3ec5945863b4bab44d32dbb14aaced20e3960ab64cfaf220cec225685d57ca617e01502364887d9f6925b60950bfd8f7e8dbe89e29d931aeb44ac918fa055b EBUILD jpeg-8d-r1.ebuild 2069 BLAKE2B 83224207c0bd3fb14947a3c7bc506fcd5c9d20f9c17fcbc89cdccadaf40318cd3f6e0f2da72fb21faa206640d76538a185f6a3a29d1bd662b877de083c049f31 SHA512 dea7fd89d094be0cb90e9b99d3f0e9353bca3045a2ca8a110b6eafdbdc27fd2fe5a01c3911697f065e474c1d7b58cdcd39a82552281200b8ed3870a914f549fe EBUILD jpeg-8d-r2.ebuild 1532 BLAKE2B 7cb616d69fbad57a538c50f08ecce6a4c76c455724b280d51bbff2dc6707329e8db15e040a1c7ca2bf607dabd1690045cc7ad5cacd66185b01da3abda9386e04 SHA512 66faaee06b6243bfaf5ac512ebc14042b6b41a5c24de53ea376f0fb8b8959ec135bf7789dba6935d96e367059e8d04abb8198a229a47892f4c7df0f94ed677b7 -EBUILD jpeg-9a.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b -EBUILD jpeg-9b.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b -EBUILD jpeg-9c.ebuild 2006 BLAKE2B 0a7e33926485fa5faaedd172f82e86a9db17c1472787839266c6018d31ca901c5f6e82fcdba1e11fc10af2183d9cc262c761b611518c36f3defdc2d57a3886a4 SHA512 4dccb83f9f985013c9528f63d9783d5cc0ce16fbe837fdf90ac8904132eec7179bdc4a18dca62678f88b2989815bc081ac720c456f4c6f93fe94f47c993d57a5 +EBUILD jpeg-9c.ebuild 2005 BLAKE2B ba19767d2300fd34fa597724f883afbff855e3033e4d3db709971908f2ae8efd92f31ec11d3aa79513a4a1975375a927fea76aea615b712ad4df04b7522c5633 SHA512 3c32c16e347953b8f8ef394e3046761d9d90e6002382ac332fefc3a1892563dabf206fb03f0aca0e15fcb70ec3234e80d63de45e781c0cc0f2d0e57d47521f30 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f diff --git a/media-libs/jpeg/jpeg-9a.ebuild b/media-libs/jpeg/jpeg-9a.ebuild deleted file mode 100644 index 098a4530dd5e..000000000000 --- a/media-libs/jpeg/jpeg-9a.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils libtool toolchain-funcs multilib-minimal - -DESCRIPTION="Library to load, handle and manipulate images in the JPEG format" -HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/" -SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz - mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz" - -LICENSE="IJG" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND="!media-libs/libjpeg-turbo:0 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch - elibtoolize -} - -multilib_src_configure() { - # Fix building against this library on eg. Solaris and DragonFly BSD, see: - # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html - local ldverscript= - [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script" - - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - --enable-maxmem=64 \ - ${ldverscript} -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi; then - # Build exifautotran and jpegexiforient - cd ../debian/extra - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - prune_libtool_files - - dodoc change.log example.c README *.txt - - # Install exifautotran and jpegexiforient - newdoc ../debian/changelog changelog.debian - cd ../debian/extra - emake \ - DESTDIR="${D}" prefix="${EPREFIX}"/usr \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install - # Remove +x bits from man pages. - find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die -} diff --git a/media-libs/jpeg/jpeg-9b.ebuild b/media-libs/jpeg/jpeg-9b.ebuild deleted file mode 100644 index 098a4530dd5e..000000000000 --- a/media-libs/jpeg/jpeg-9b.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils libtool toolchain-funcs multilib-minimal - -DESCRIPTION="Library to load, handle and manipulate images in the JPEG format" -HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/" -SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz - mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz" - -LICENSE="IJG" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND="!media-libs/libjpeg-turbo:0 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch - elibtoolize -} - -multilib_src_configure() { - # Fix building against this library on eg. Solaris and DragonFly BSD, see: - # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html - local ldverscript= - [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script" - - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - --enable-maxmem=64 \ - ${ldverscript} -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi; then - # Build exifautotran and jpegexiforient - cd ../debian/extra - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - prune_libtool_files - - dodoc change.log example.c README *.txt - - # Install exifautotran and jpegexiforient - newdoc ../debian/changelog changelog.debian - cd ../debian/extra - emake \ - DESTDIR="${D}" prefix="${EPREFIX}"/usr \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install - # Remove +x bits from man pages. - find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die -} diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild index 8f4c74e0f092..7e321582b75d 100644 --- a/media-libs/jpeg/jpeg-9c.ebuild +++ b/media-libs/jpeg/jpeg-9c.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz LICENSE="IJG" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" DEPEND="" diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest index 5f3bae10d1be..211e58952a84 100644 --- a/media-libs/kvazaar/Manifest +++ b/media-libs/kvazaar/Manifest @@ -5,7 +5,7 @@ DIST kvazaar-1.0.0.tar.gz 473495 BLAKE2B 7460dda4b791bd1d2a046350e8d88ce0ba3ef30 DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4 EBUILD kvazaar-1.0.0.ebuild 1452 BLAKE2B 35fad1c8f4de6d0d2501884ac9f4fbf82b803f2ce0a147f852366236e8fc9dd66edb9ba2877f278661940dcc8808c117e52340a119f437b768870ebcfc628adf SHA512 ab038716fe616b6ab9297b5629762c0800940876ec9ce338a59b8b61a2b8e5a4c350c8bd9e6bbf2e586fc5f5a2acb2c8798befc2e72556e25b1e2360304216d1 -EBUILD kvazaar-1.1.0.ebuild 1514 BLAKE2B 8ab5423e587fb59a2bb2929d804982fad64e697789162d097c14e90646724878c31e135bb31103f43d1989a9f05495fbf8cdc56fa633ecfe483b3576b67d21c0 SHA512 3a0c6719e10287e17e0b4b4963759cf25f8d5e9b19acf3fd3c5156735a9ee47a5c28a9bb43c4bd2200743fb3d3685f73c0856c336f8e65c96b1894a0a7268586 +EBUILD kvazaar-1.1.0.ebuild 1513 BLAKE2B 0aec0009f16e83992c602917b82ae12f1d963f8f699f78db03646aa9a95f434d69caf438086e549540bf3c744d19fed920451c8b83cddea9a14a0e1a192318a2 SHA512 1daa21219b874a74f5476c8649ea48c8cd7447df3abe99b0004108f5ff99be86c765eb857a04553bbae3d06cb34dfa0d291089e09bf957dc8ddfb8544cbbec63 EBUILD kvazaar-1.2.0.ebuild 1582 BLAKE2B ea2ffc2aa7e1638e5131af9b908dfb52c6fd8fbcef50cfcb3383e8f94097f17c082c44989ed6a2d4a1c1d78f9ae4ad735709d8856f06c835295ab2944ed272ac SHA512 02132db61e2af2e095f4a0f77558518fecaf4e4da910f7ddc5de2a2195f4d0270bfa7019b1912be0f7982c2cb61b06ef9b07d72ab2a106f738927a447a4ff459 EBUILD kvazaar-9999.ebuild 1575 BLAKE2B 94a121eda6db1010030dfd331eaae047fdc068f0e5fbbd387b54ac506f915b83ddb9f896843ef46b68e6305754e0334b744c5784886e778e8d15aeaa1b08e191 SHA512 4b67098e1a756008a83c645972392b0ea8cf102274b5f95fcc083ed6f11818d0ad1b5fe2401d9240a253c9bffd2679b16b142b3c32f459f79f7f64e8c55258f5 MISC metadata.xml 314 BLAKE2B 59244096c1566e9c0ea7eb52c8eb8eb63cc188febd8c1fba49006c31185669340c7f8d83e9b5d745dde96b43abefdb117c2c7d3b3c9177174aaf796b5f4ab9fb SHA512 3cf0527dc69a26ad9b7f33b2d5df536712fb19df9bac7cc0f067eac31d2b420ddf22dd744d643bf053caf27615f133478c1fd0d601e553546e73a0bd5e5897f2 diff --git a/media-libs/kvazaar/kvazaar-1.1.0.ebuild b/media-libs/kvazaar/kvazaar-1.1.0.ebuild index 60c27bf04dab..f03f828d47fa 100644 --- a/media-libs/kvazaar/kvazaar-1.1.0.ebuild +++ b/media-libs/kvazaar/kvazaar-1.1.0.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" if [ "${PV#9999}" = "${PV}" ] ; then SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86" fi LICENSE="LGPL-2.1" diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest index d38b61d0a63a..968c35b0f0d9 100644 --- a/media-libs/libmtp/Manifest +++ b/media-libs/libmtp/Manifest @@ -1,6 +1,8 @@ DIST libmtp-1.1.13.tar.gz 801519 BLAKE2B f0452515f83d001a4e7a32528265d46814898fbaff5afd9a66c1a1fd85d78dae1b9ed9c057030849fd8fc0acec5f2ad012c0f098323d3596f6c38d5b01a9603a SHA512 99d5a277806f29f1d27a64a478e344916e8bfc9949a41a807c16d37bd29ec99dc3f36d504cfc6e67f1e91ee932a7cf82f13d4c9fe14b7e34333d9b12b04fff77 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 1602 BLAKE2B 6db5bc42d265c8df8398c84b06409e2427ca1597df5d785e2291c4c7abce8dca342d1f2e54ecab81113a221b646ff07476643de2f2d533c7d956abe47fb69365 SHA512 7011222ca97526b0b9425b2a08dafe274b261bca00b50d569b389d626c8b3d2ba1e5feb9593670a5bfe18d53501263da91ed0e6e01fe275929f111ea2629c3b5 +EBUILD libmtp-1.1.14.ebuild 1601 BLAKE2B 7bfa3b1135a8c6abe41da472f54031e618c72a94317b63a24068d6ee54cab8fdabb4811c84ea0bd83111d57aabffe5e22e6c4d858608935784bf957e02d17b44 SHA512 a6c9481afae6ca56987013714a633b451a57aa235d55f19b627ff1676b3343a217358a2389106423f5a1a221b9ae49c8edab83dac784c6418927e1af3aed831d +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 079492dd3eff..13c0d5e7749b 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/libmtp/libmtp-1.1.15.ebuild b/media-libs/libmtp/libmtp-1.1.15.ebuild new file mode 100644 index 000000000000..abcb9e7c7fd3 --- /dev/null +++ b/media-libs/libmtp/libmtp-1.1.15.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils udev user + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" + inherit autotools git-r3 +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" +fi + +DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)" +HOMEPAGE="http://libmtp.sourceforge.net/" + +LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ? +SLOT="0/9" # Based on SONAME of libmtp shared library +IUSE="+crypt doc examples static-libs" + +RDEPEND="virtual/libusb:1 + crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +DOCS="AUTHORS README TODO" + +pkg_setup() { + enewgroup plugdev +} + +src_prepare() { + default + + # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011) + rm -f ChangeLog + + if [[ ${PV} == 9999* ]]; then + local crpthf=config.rpath + local crpthd=/usr/share/gettext/${crpthf} + if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then + cp "${crpthd}" . + else + touch ${crpthf} # This is from upstream autogen.sh + fi + eautoreconf + fi +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_enable doc doxygen) \ + $(use_enable crypt mtpz) \ + --with-udev="$(get_udevdir)" \ + --with-udev-group=plugdev \ + --with-udev-mode=0660 +} + +src_install() { + default + prune_libtool_files --all + + if use examples; then + docinto examples + dodoc examples/*.{c,h,sh} + fi +} diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest index 512dfd1b894a..fbaf2790ad5c 100644 --- a/media-libs/libraw/Manifest +++ b/media-libs/libraw/Manifest @@ -10,5 +10,5 @@ DIST LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz 39229 BLAKE2B d76134c4b53a1285c31e2 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500 EBUILD libraw-0.18.4.ebuild 1767 BLAKE2B 43fb2b1d139f58b2527ac44c8f7f12e279d034d99417a80320440a62d42a24719cb07c4a2ea1a98e096dcf0bbfd1676c7d4030e4b9cb1a5458e0a4531e20b0a3 SHA512 619eff65f7c99389b74e3c98aa28b5bd2857f05a1c55f6b5501cb532002dec21d5948f35b10210fc62c00fe710149e058b026e0adbe0fc3636f5f41a93da0ea3 EBUILD libraw-0.18.7.ebuild 1782 BLAKE2B 6f80711ee4b698a9bf6d050af58038aeaeacc3f05dc51fe373236a4430790bcb64452ace8e58f5e69198b9f8d93e8d5bf04936a07a2408e7dbb379155c30c8cf SHA512 00b51f5d9c58902dec9db49cd2159d78e619e5e9b2a7cf328473b2a4b3bf8290b480b4697a00bf1c769e40f3899821717dc0e45a84fd90c13ced715c3be3225d -EBUILD libraw-0.18.8.ebuild 1724 BLAKE2B 0ee8e541096ea18d807bd415b555787a1b05ed4de25da96532acff9c3c5dc66195ab55aa89122a0927b359d393ab6ad5a6a95ad152aff53c6bd78322874512b5 SHA512 4e6337c9558d007325a24aa839cb167fa68c3e18d3bd4d671d03d87f93bd9f012924145355f87e2543c4f0fbf67f0dc3424d17e502718c39da551a17b47f3636 +EBUILD libraw-0.18.8.ebuild 1721 BLAKE2B bd8859875907be3b1bdf69500211088380cbed126571bab33c288c678398e63cb07f1388e63f5d198d43b38300dad4e1e9432eb216f898c9f9f38fc08f53499a SHA512 b121fda4256479c5d250c05575e755011da3464548d133974a4bf686a6b924906c941f3da7f4bdfd32e502b623db6fecc21cf9f4cfa61f749499c9ddfbc012da MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388 diff --git a/media-libs/libraw/libraw-0.18.8.ebuild b/media-libs/libraw/libraw-0.18.8.ebuild index 4989fcd6c7fb..a0ef97c0ac8e 100644 --- a/media-libs/libraw/libraw-0.18.8.ebuild +++ b/media-libs/libraw/libraw-0.18.8.ebuild @@ -19,7 +19,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~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/libsfml/Manifest b/media-libs/libsfml/Manifest index 22c65f029a97..f2166ff574e8 100644 --- a/media-libs/libsfml/Manifest +++ b/media-libs/libsfml/Manifest @@ -1,6 +1,8 @@ AUX libsfml-2.2-no-docs.patch 432 BLAKE2B 617c83033c6cafc6455937f1a7a149b73e31e0c3b1430bb471743b04c4f89b604acd1ba67965a3a33e32dfdc2a15e1a374f4e08fd073c26443ca652719658877 SHA512 86c05d82af21ed440e313119d5296097c498030c9aca8f6516a2a47c4913d578064dab9bd1476735b84f00eacf009b21de378e41d1e59615c1098dfeb786b807 AUX libsfml-2.4.2-no-install-extlibs-mingw.patch 3417 BLAKE2B 4619083ec961ba9da52a3db4d77b157c4bdc1f2c08ccdd3c487e729b14551d0043fcbff3e5dad2d63b269b961f315e2930b082afd5f5c0c7aa372e60391a2bf0 SHA512 8239c021143d7e5ce9ae33d3a3c639b8568fceafe900f0b9d70221402a2f38ff7b5c3a297ffdf8aaaebef7d379b1733749d579f831efa3c85ea252b57721e8cf +AUX libsfml-2.4.2-pkg-config.patch 9244 BLAKE2B 7b5a2bb09d268ad5b5c9686874bb585bb33e11937b3467318fffa89391d1277d21e66d23ebbaf1690f46316fe0569e4b44f84e3d0e884ad2cfa2724e36852c6e SHA512 6937bcee330961ec578947791142012a9fd4147251a603ec0ee0de47e8dd23122fccc437ed191ccf65a81b385ce275e717c5a524003ad56137a8c787d9c91aab DIST libsfml-2.4.2.tar.gz 24576150 BLAKE2B 05d1c06cb360aae6ec8a53225666119168075ab61dd87fe86a105f2c104d21b5897c4b35e66f5c0dae7193697437d168a963c018e3d39bd7b8b6bed957a63d94 SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972 EBUILD libsfml-2.4.2-r1.ebuild 1634 BLAKE2B 408d034ee53e9af9fb7d8c7aa5c33e8128936a3b0f6bd8e7f817928859540394a742b0f5c6f8e68c2b779e049788fb76d814884931ca679c6c961b551926a11e SHA512 dd31edc609d736d771ce2a192942cbbb1aba37655eec6e2dc9de93e8d8f8c8c6e012420c7ed764ebe4b00b25907a03e4584d74bf438f228cfb47aca4bcfc5add +EBUILD libsfml-2.4.2-r2.ebuild 1678 BLAKE2B cff23c8ef3b13eca3cc957cdb0265ba80620e6a33530a2bd82d31dce14181ce6e8ec647c88053bdcdefb507faf0adab52a7f29c5af0fa3e90e8c65b8e54947ab SHA512 e12981574f9a6a9969052333854f00f9639ec76b5f13aaefbad7130d68d6f5f1563c4ecf7ce27eff392e84019d91b7706e549381624c34ce49ef502e28c55b7a EBUILD libsfml-2.4.2.ebuild 1488 BLAKE2B 7823ad6b11566f9b2587528851067098d504db7d7862d5efe8fb57018fb56ddfe551e5467b057f8f85f0778e700424379b7cf146d1c516f1528e6999df206c7a SHA512 250f27afd60470dc9667a504da415621a63cb9f71c23ec64557c7407f683871681e5e98b023984425ebca57b61583a405281cbbc343dae1210e33b02051c75ea MISC metadata.xml 732 BLAKE2B 598678c33da33373a1669f4b9048b95503d9c430730b571b985e4137e034e5104dc509cb0a6605834ef463c6d6438b25bd2bb06ec6ce41d7e1c52fbef7219e3d SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2 diff --git a/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch b/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch new file mode 100644 index 000000000000..a281d46c9ba2 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch @@ -0,0 +1,217 @@ +commit 5fe5e5d6d7792e37685a437551ffa8ed5161fcc1 +Author: Rafael Kitover <rkitover@gmail.com> +Date: Mon Dec 19 13:16:07 2016 -0800 + + packaging support improvements + + This grew out of my work creating an sfml port for macports, but should + be helpful for package maintainers of various distributions: + + * add an SFML_USE_SYSTEM_DEPS option to ignore everything in extlibs/ + except for headers/stb_image, and use the system versions + + * install pkg-config files if a pkg-config program is found + and either lib/pkgconfig or libdata/pkgconfig exists under the + INSTALL_PREFIX, or the SFML_INSTALL_PKGCONFIG_FILES flag is set + explicitly + + * install pkg-config files for static libs too, add the necessary + Requires.private and Libs.private entries to the .pc files to support + static linking + + * on OS X, honor all INSTALL_NAME and RPATH related cmake variables and + only set the INSTALL_NAME_DIR to "@rpath" if none of them is set, this + preserves the default behavior of using @rpath but also allows + overriding by the usual cmake mechanisms + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e7914ac9..419d56d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,6 +16,9 @@ sfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug + # Suppress Cygwin legacy warning + set(CMAKE_LEGACY_CYGWIN_WIN32 0) + ++# Suppress Mac OS X RPATH warnings and adopt new related behaviors ++cmake_policy(SET CMP0042 NEW) ++ + # set Android specific options + + # define the minimum API level to be used +@@ -130,6 +133,39 @@ if(NOT BUILD_SHARED_LIBS) + add_definitions(-DSFML_STATIC) + endif() + ++# allow not using bundled dependencies with a switch ++# (except for stb_image) ++# yes this is horrible, but GLOB_RECURSE sucks ++sfml_set_option(SFML_USE_SYSTEM_DEPS FALSE BOOL "TRUE to use system dependencies, FALSE to use the bundled ones.") ++if(SFML_USE_SYSTEM_DEPS) ++ if(SFML_INSTALL_XCODE_TEMPLATES) ++ message(FATAL_ERROR "XCode templates installation cannot be used with the SFML_USE_SYSTEM_DEPS option (the bundled frameworks are required.)") ++ endif() ++ ++ file(GLOB_RECURSE DEP_LIBS "${CMAKE_SOURCE_DIR}/extlibs/libs*/*") ++ file(GLOB_RECURSE DEP_BINS "${CMAKE_SOURCE_DIR}/extlibs/bin*/*") ++ file(GLOB_RECURSE DEP_HEADERS "${CMAKE_SOURCE_DIR}/extlibs/headers/*") ++ ++ foreach(DEP_FILE ${DEP_LIBS} ${DEP_BINS} ${DEP_HEADERS}) ++ get_filename_component(DEP_DIR ${DEP_FILE} PATH) ++ ++ if(NOT DEP_DIR MATCHES "/stb_image(/|$)") ++ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_DIR}) ++ endif() ++ ++ get_filename_component(DEP_PARENT_DIR ${DEP_DIR} PATH) ++ while(NOT DEP_PARENT_DIR STREQUAL "${CMAKE_SOURCE_DIR}/extlibs") ++ if(NOT DEP_DIR MATCHES "/stb_image(/|$)") ++ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_PARENT_DIR}) ++ endif() ++ ++ get_filename_component(DEP_PARENT_DIR ${DEP_PARENT_DIR} PATH) ++ endwhile() ++ endforeach() ++ ++ list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH) ++endif() ++ + # Visual C++: remove warnings regarding SL security and algorithms on pointers + if(SFML_COMPILER_MSVC) + # add an option to choose whether PDB debug symbols should be generated (defaults to true when possible) +@@ -202,30 +238,6 @@ if(SFML_OS_MACOSX) + set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)") + endif() + +-if(SFML_OS_LINUX OR SFML_OS_FREEBSD) +- set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig) +- if(SFML_OS_FREEBSD) +- set(PKGCONFIG_DIR libdata/pkgconfig) +- endif() +- if(BUILD_SHARED_LIBS) +- sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML") +- if(SFML_INSTALL_PKGCONFIG_FILES) +- foreach(sfml_module IN ITEMS all system window graphics audio network) +- CONFIGURE_FILE( +- "tools/pkg-config/sfml-${sfml_module}.pc.in" +- "tools/pkg-config/sfml-${sfml_module}.pc" +- @ONLY) +- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/${PKGCONFIG_DIR}") +- endforeach() +- endif() +- else() +- if(SFML_INSTALL_PKGCONFIG_FILES) +- message(WARNING "No pkg-config files are provided for the static SFML libraries (SFML_INSTALL_PKGCONFIG_FILES will be ignored).") +- endif() +- endif() +-endif() +- + # enable project folders + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake") +@@ -239,6 +251,19 @@ if(SFML_BUILD_DOC) + add_subdirectory(doc) + endif() + ++sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML") ++ ++if(SFML_OS_SUPPORTS_PKGCONFIG OR SFML_INSTALL_PKGCONFIG_FILES) ++ foreach(sfml_module IN ITEMS all system window graphics audio network) ++ CONFIGURE_FILE( ++ "tools/pkg-config/sfml-${sfml_module}.pc.in" ++ "tools/pkg-config/sfml-${sfml_module}.pc" ++ @ONLY) ++ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/${SFML_OS_PKGCONFIG_DIR}") ++ endforeach() ++endif() ++ + # setup the install rules + if(NOT SFML_BUILD_FRAMEWORKS) + install(DIRECTORY include +diff --git a/cmake/Config.cmake b/cmake/Config.cmake +index cff54d00..c447113a 100644 +--- a/cmake/Config.cmake ++++ b/cmake/Config.cmake +@@ -73,6 +73,19 @@ else() + return() + endif() + ++# check if OS or package system supports pkg-config ++# this could be e.g. macports on mac or msys2 on windows etc. ++find_package(PkgConfig QUIET) ++if(PKG_CONFIG_EXECUTABLE) ++ if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig") ++ set(SFML_OS_SUPPORTS_PKGCONFIG ON) ++ set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig") ++ elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") ++ set(SFML_OS_SUPPORTS_PKGCONFIG ON) ++ set(SFML_OS_PKGCONFIG_DIR "/libdata/pkgconfig") ++ endif() ++endif() ++ + # detect the compiler and its version + # Note: on some platforms (OS X), CMAKE_COMPILER_IS_GNUCXX is true + # even when CLANG is used, therefore the Clang test is done first +diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake +index cd2ca8fc..0f316034 100644 +--- a/cmake/Macros.cmake ++++ b/cmake/Macros.cmake +@@ -105,9 +105,17 @@ macro(sfml_add_library target) + endif() + + # adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle +- set_target_properties(${target} PROPERTIES +- BUILD_WITH_INSTALL_RPATH 1 +- INSTALL_NAME_DIR "@rpath") ++ # but only if cmake rpath options aren't set ++ if(NOT CMAKE_SKIP_RPATH AND NOT CMAKE_SKIP_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH AND NOT CMAKE_INSTALL_NAME_DIR) ++ if(CMAKE_SKIP_BUILD_RPATH) ++ set_target_properties(${target} PROPERTIES ++ INSTALL_NAME_DIR "@rpath") ++ else() ++ set_target_properties(${target} PROPERTIES ++ BUILD_WITH_INSTALL_RPATH 1 ++ INSTALL_NAME_DIR "@rpath") ++ endif() ++ endif() + endif() + + # enable automatic reference counting on iOS +diff --git a/tools/pkg-config/sfml-audio.pc.in b/tools/pkg-config/sfml-audio.pc.in +index 7456daaa..0d7a3ce1 100644 +--- a/tools/pkg-config/sfml-audio.pc.in ++++ b/tools/pkg-config/sfml-audio.pc.in +@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, audio module. + URL: http://www.sfml-dev.org + Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ + Requires: sfml-system ++Requires.private: openal, vorbisenc, vorbisfile, vorbis, ogg, flac + Libs: -L${libdir} -lsfml-audio ++# openal may be a system framework ++Libs.private: @OPENAL_LIBRARY@ + Cflags: -I${includedir} +diff --git a/tools/pkg-config/sfml-graphics.pc.in b/tools/pkg-config/sfml-graphics.pc.in +index d0a88a13..a96b72c9 100644 +--- a/tools/pkg-config/sfml-graphics.pc.in ++++ b/tools/pkg-config/sfml-graphics.pc.in +@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, graphics module. + URL: http://www.sfml-dev.org + Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ + Requires: sfml-window ++Requires.private: sfml-system, freetype2 + Libs: -L${libdir} -lsfml-graphics ++# gl and jpeg may not be in pkg-config ++Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@ @JPEG_LIBRARY@ + Cflags: -I${includedir} +diff --git a/tools/pkg-config/sfml-window.pc.in b/tools/pkg-config/sfml-window.pc.in +index b0266e67..93bf344c 100644 +--- a/tools/pkg-config/sfml-window.pc.in ++++ b/tools/pkg-config/sfml-window.pc.in +@@ -9,4 +9,6 @@ URL: http://www.sfml-dev.org + Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ + Requires: sfml-system + Libs: -L${libdir} -lsfml-window ++# gl may not be in pkg-config ++Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@ + Cflags: -I${includedir} diff --git a/media-libs/libsfml/libsfml-2.4.2-r2.ebuild b/media-libs/libsfml/libsfml-2.4.2-r2.ebuild new file mode 100644 index 000000000000..dda2accf7c68 --- /dev/null +++ b/media-libs/libsfml/libsfml-2.4.2-r2.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils versionator + +MY_P="SFML-${PV}" + +DESCRIPTION="Simple and Fast Multimedia Library (SFML)" +HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML" +SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0/$(get_version_component_range 1-2)" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc examples" + +RDEPEND=" + media-libs/flac + media-libs/freetype:2 + media-libs/libpng:0= + media-libs/libogg + media-libs/libvorbis + media-libs/openal + sys-libs/zlib + virtual/jpeg:0 + kernel_linux? ( + virtual/libudev:0 + ) + virtual/opengl + !kernel_Winnt? ( + x11-libs/libX11 + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/xcb-util-image + ) +" +DEPEND=" + ${RDEPEND} + doc? ( app-doc/doxygen ) +" + +DOCS=( changelog.txt readme.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.2-no-docs.patch + "${FILESDIR}"/${PN}-2.4.2-no-install-extlibs-mingw.patch + "${FILESDIR}"/${PN}-2.4.2-pkg-config.patch +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \ + doc/CMakeLists.txt || die + + find examples -name CMakeLists.txt -delete || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSFML_BUILD_DOC=$(usex doc) + -DSFML_INSTALL_PKGCONFIG_FILES=TRUE + ) + + if use kernel_Winnt; then + mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE ) + fi + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + insinto /usr/share/cmake/Modules + doins cmake/Modules/FindSFML.cmake + + if use examples ; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi +} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index c6e91e5ba5e5..38274b70f26e 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,15 +1,11 @@ AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5 DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75 SHA512 ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01 -DIST mesa-17.3.6.tar.xz 10679396 BLAKE2B 53b74401b9cb40018b3e2c921c4fd39b81809e8485b632c2fe40e7ebd55fbf3a10f4cb8fe2f1a3d6d181f609e8ac8f36d795eca9e0eda7fd5db96b08d2105094 SHA512 5164ed5a1d3d25031b712a9f443f0e467a29b2bca0a1aa11324ed5c10279411979c9c7482825053926a813e76c58b78a3439c7c81fcd51a7808f53977080828f DIST mesa-17.3.7.tar.xz 10654684 BLAKE2B 520b045f7ab4b60ab372960ca933e60229dc38075d28c9e0f144d0a2dc222d6c2830e4739962008319bed27fe9a83bae7c38609d0135c3d5918d35dff6c0381d SHA512 ec48565556aa4281056cee5dbef140553651fdfbb76ce32397de048db1cf65f5e18787c72b998de7da2de795d27e7040bde84651ade4726fc3a69a23b166ba4e -DIST mesa-18.0.0-rc4.tar.xz 11027596 BLAKE2B 96554acd69636b91d1b79e7fefa4ba6e3f701ef7ef6c16718493070d62ab41c7bbd66e2f4d4a97fac8c236ac4c9150b2ce41e4e57b865fff6122b3f60b047e25 SHA512 91dd0a4396715a7896fc47aabf38c4b486df3b50c9764795805550ef01724d2e2281ba9b000e82760ea0e199c58d8c9943dbc732b2adab46554ff5c2f9e2ece1 -DIST mesa-18.0.0-rc5.tar.xz 10970572 BLAKE2B 5415bf4a2b33d813c3987be2aa3648ffa0ec345a109f80c3f6d5af51d06104e3af1a8d8a0763af2c419a8e30ed46c316347449ce016293281c87484a678205bd SHA512 90c68c0bf9e689992626b593ad53d4f7fb402e556ac70672b618abd3a224e637fc6a26fb197bb3b692a8363117de09e01fd524f9de181359eba0879226e3e5a6 +DIST mesa-18.0.0.tar.xz 11056544 BLAKE2B 467c100bcbc0a60e3868e718331192255fd16394c21b08c128a054e066740cd071e0b272aba011873fe239821f53442e9a07ae860d94b425275bd68c3db3b7fc SHA512 1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396 EBUILD mesa-17.1.10.ebuild 13463 BLAKE2B 1770254368c5f58be3a6b7e24eebc083cfece5af94fe054739eb5985a5158c56633abafa9e8d9298b1a559618ada21a80341c38a8bea03d787f5270e6a9e5124 SHA512 ea34ae58ab59208f26398004905264229b2ae4d92efb2a9c779bd50b223873738d904df624a1ab652b55ac0a4b1156f36421cee2605f1910372b661d6e9708ca EBUILD mesa-17.2.8.ebuild 15022 BLAKE2B 8de43727d00f3ffb6136c59f42ee268a8f2b20cfa6a8784efda04e37ad606510f0f3b32e00ae24533f070f4a1d7a9cbc0a3986b7b1c646d8ccec8b38fc7fa50a SHA512 518068373eddd00746a67a832592cc61cd6faa24f79475722bf6edde13f2ff7f17a292294162985064feeb26ada07801f44385f35b209a725a41ee315980b94c -EBUILD mesa-17.3.6.ebuild 14916 BLAKE2B 8fab9305202dbf1c0382af065fd2042d87bf283c005a9fec16330109098804740aa0f696cb1ac68a00f57d889924e133d59b538f3f70525849b34bb9addc57e1 SHA512 920eee2bc626b2ff181f5e8d197090da2a3101ae7d398af4361b621fd7d64d2f91390050c358fa06dbcc7eef266dcc9900f0ace5ac69d224eeac23e9acd95f9f EBUILD mesa-17.3.7.ebuild 14916 BLAKE2B 6a0e29ec0ca3a10713c58d28c8c8b44c55ae254254dae1ee0e9d2b4495367af2fc464cc1e69d7e1a1c8596deb92d6c3331e0c0b107896155b6d456a2d7a0514e SHA512 fd75796a17acf72ddbe5c82a21eeb9a2c8ee301296ad0787aa0a56b857a6d7d02de4a6acb8cee20a597cc1fb8c7b87e861905f8f5549ef9f18b70d36664f218f -EBUILD mesa-18.0.0_rc4.ebuild 14959 BLAKE2B 568dc3b028ba4ff14aee9f01d70c176fa2ed87421a1810caf6cd89c12e48a53d418b9db1b6b38c9b3094e611b7a2ec32a360a92aef3e579b72fab59edef5187c SHA512 c2326f1f714aad3888a901f40dd11028782a3c1cbc6d0a6a2172d542b3488a8da7b80240812284e2ea79b5cbb07489e7ac718106f2943e3016b36311b1897980 -EBUILD mesa-18.0.0_rc5.ebuild 14959 BLAKE2B 568dc3b028ba4ff14aee9f01d70c176fa2ed87421a1810caf6cd89c12e48a53d418b9db1b6b38c9b3094e611b7a2ec32a360a92aef3e579b72fab59edef5187c SHA512 c2326f1f714aad3888a901f40dd11028782a3c1cbc6d0a6a2172d542b3488a8da7b80240812284e2ea79b5cbb07489e7ac718106f2943e3016b36311b1897980 +EBUILD mesa-18.0.0.ebuild 14959 BLAKE2B 568dc3b028ba4ff14aee9f01d70c176fa2ed87421a1810caf6cd89c12e48a53d418b9db1b6b38c9b3094e611b7a2ec32a360a92aef3e579b72fab59edef5187c SHA512 c2326f1f714aad3888a901f40dd11028782a3c1cbc6d0a6a2172d542b3488a8da7b80240812284e2ea79b5cbb07489e7ac718106f2943e3016b36311b1897980 EBUILD mesa-9999.ebuild 14997 BLAKE2B 16608004e2e4b89869537586d93b392b64f512b1408ec5b4837181dd42c722da6f7d85d9a7b05adfd1ea529ca7311b8484fa93711033878981e76479ff1dc4d2 SHA512 8e0faa63d96b23bb1d513792d353de24e58d584980a7d023b8ce947f4d02864ec225067eb0146b2ce53d0e2904f18583f4ed3668c8052a955616eafe540dbe6a MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705 diff --git a/media-libs/mesa/mesa-17.3.6.ebuild b/media-libs/mesa/mesa-17.3.6.ebuild deleted file mode 100644 index b0b6cdc11380..000000000000 --- a/media-libs/mesa/mesa-17.3.6.ebuild +++ /dev/null @@ -1,583 +0,0 @@ -# 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.85" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !<x11-base/xorg-server-1.7 - !<=x11-proto/xf86driproto-2.0.3 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) - classic? ( app-eselect/eselect-mesa ) - gallium? ( 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.9.3:=[${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_MAX_SLOT="5" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:5[${MULTILIB_USEDEP}] - sys-devel/llvm:4[${MULTILIB_USEDEP}] - >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] - ) - <sys-devel/llvm-6:=[${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-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] - 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() { - [[ ${PV} == 9999 ]] && eautoreconf - eapply_user -} - -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 \ - --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 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" - 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 - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -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} - - # 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} - 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-18.0.0_rc4.ebuild b/media-libs/mesa/mesa-18.0.0.ebuild index 4fb4344b03a6..4fb4344b03a6 100644 --- a/media-libs/mesa/mesa-18.0.0_rc4.ebuild +++ b/media-libs/mesa/mesa-18.0.0.ebuild diff --git a/media-libs/mesa/mesa-18.0.0_rc5.ebuild b/media-libs/mesa/mesa-18.0.0_rc5.ebuild deleted file mode 100644 index 4fb4344b03a6..000000000000 --- a/media-libs/mesa/mesa-18.0.0_rc5.ebuild +++ /dev/null @@ -1,584 +0,0 @@ -# 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.89" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !<x11-base/xorg-server-1.7 - !<=x11-proto/xf86driproto-2.0.3 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) - classic? ( app-eselect/eselect-mesa ) - gallium? ( 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.9.3:=[${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: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-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] - 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() { - [[ ${PV} == 9999 ]] && eautoreconf - eapply_user -} - -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 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" - 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 - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -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} - - # 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} - 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/openexr/Manifest b/media-libs/openexr/Manifest index 3a3b9653faf6..f39daae45863 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -14,6 +14,6 @@ EBUILD openexr-1.7.0.ebuild 1181 BLAKE2B 13e1628151f4bdb52e961338990b2fba921fd09 EBUILD openexr-2.0.1-r1.ebuild 1255 BLAKE2B 23d26effb4996d82e843a5811fbbf2e609ba93a5383eb3844e4c53253c9748a915a08df1cfcedfa4393d695e000ec201eb92cd022b9fe9d607f3b78ea993dfdf SHA512 e46119eb545d174f1565746600df038e0028340f59f7670e1c0975a9b7a4c4a266a80970dccba054041b0bad31a98763b8aa5d4b9db32f83e65679e3fb0bab83 EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd EBUILD openexr-2.2.0-r1.ebuild 1578 BLAKE2B fd0dc90294f80362a6575e445a6510efa7f218566b97869dbc9f12c6187e3b0be0cfb24aebb2460925b40bced9bdb42b058974a9789d4c775494a6257f16cc2f SHA512 830f0c476b53b59bec9e65e0859c1623425a0b3a5bdd5081c1cf62be9f274b452c373e8ed2e7b4d6b92d8a20c9f477bdac9a80f604d3d8866ccdfac3a924849c -EBUILD openexr-2.2.0-r2.ebuild 1768 BLAKE2B dc4bd8a5c3fcd9ea265938a59d0b510ad6811571d1856317c98bd702113adedb9e2b27836b0535260acd505177f830ad09711c9d8f42ff7e65c00794ac3fa541 SHA512 e3ccbb2afcd4e67d776036a0db519a89481aa1db4c3b9b0720ebdf81c6c3b47547c9117aef008f9b26fc3ca83722d330739b8eeb3e294d66917ea5d92b70864f +EBUILD openexr-2.2.0-r2.ebuild 1862 BLAKE2B 2ddcfb899e3213db76211cbacf9fe7afa597ac0fece9ec4655e390fd6501a5cb15f3553d374408d748c2a4364b519f15f71e82af7d93402736b9c1c245b50266 SHA512 028067478c69a1eade6bda177b734f6530de91e6350e9057aadef4028c0a5c3cc5ca8989186fe59c9b9075d9d17e119e7b53d3713acc29228af52100250a9fda EBUILD openexr-2.2.0.ebuild 1248 BLAKE2B e4926afffcbf1f64891ed5ebdae8d4ab5895ffde3d79e3a29eeef121d8214c4c1528ccaaef62e35830b09bd1f54d1ceafd0b62d3652cff76160d7ce155e26955 SHA512 1af7a2a6c95ddd32b1688495b65954982974fa5cb3c0374ee16d6f89f049191a14a7e79fd6fdbefc8cf25ba67e0450e684015798325f2258982528909ee2ed9d MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca diff --git a/media-libs/openexr/openexr-2.2.0-r2.ebuild b/media-libs/openexr/openexr-2.2.0-r2.ebuild index 4ae6430d82e6..8f9775ff2e70 100644 --- a/media-libs/openexr/openexr-2.2.0-r2.ebuild +++ b/media-libs/openexr/openexr-2.2.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools multilib-minimal +inherit autotools flag-o-matic multilib-minimal DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" HOMEPAGE="http://openexr.com/" @@ -43,6 +43,9 @@ src_prepare() { } multilib_src_configure() { + # Fails to build with lto, https://bugs.gentoo.org/650876 + filter-flags -flto* + ECONF_SOURCE="${S}" econf \ --enable-threading \ $(use_enable cpu_flags_x86_avx avx) \ diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest index 71c3240887ec..7acb6d693b9c 100644 --- a/media-libs/partio/Manifest +++ b/media-libs/partio/Manifest @@ -1,4 +1,4 @@ AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6 -EBUILD partio-1.1.0_p20170829.ebuild 1060 BLAKE2B e097b743240f8d2e1b81ef10e5f36264a97919df2bb331102fb983560e65aeb780bbd9a0fef29a1931d3febee4e08618cc3dfaf508589fcf219d77c1f90b6cac SHA512 799a7dcd0fa4a6d64a29a7cb13524ef09530225f4e78748605b20d779b3d5a89402e9379ddab7d063f34a5fbc918a88dd7df05338a3a50f0fe52af5074a58cdb +EBUILD partio-1.1.0_p20170829.ebuild 1061 BLAKE2B 48a32f2cca451507326932a9d74d2289f979e12ec1d93e071188efa22a463a92d930c25dded78ef3824b1bbb53e3a064f455943cbf5417a435988aa0dbba6a80 SHA512 6668eef825f0324012ce8de4d615b8068c69077a4f904912361e84b04335b73b982dc6ff1113863d7db77c5fe237e1b41dab07a11beee53bccc871321db886e4 MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0 diff --git a/media-libs/partio/partio-1.1.0_p20170829.ebuild b/media-libs/partio/partio-1.1.0_p20170829.ebuild index 0ca9c31c2662..00bb039c1b3b 100644 --- a/media-libs/partio/partio-1.1.0_p20170829.ebuild +++ b/media-libs/partio/partio-1.1.0_p20170829.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit cmake-utils vcs-snapshot python-single-r1 DESCRIPTION="A library for particle IO and manipulation" -HOMEPAGE="http://www.disneyanimation.com/technology/partio.html" +HOMEPAGE="https://www.disneyanimation.com/technology/partio.html" MY_GIT_COMMIT="2774ef3958da46d9f8a4230ebda9e04b1aa8f4e5" SRC_URI="https://github.com/wdas/${PN}/archive/${MY_GIT_COMMIT}.tar.gz -> ${P}.tar.gz" diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest index cc7676e6fb67..2a7cef393389 100644 --- a/media-libs/stk/Manifest +++ b/media-libs/stk/Manifest @@ -10,11 +10,9 @@ AUX stk-4.5.0/050_all_cxxflags.patch 425 BLAKE2B 2663594c1d0601dbb06fcdf0dc03a17 AUX stk-4.5.1/010_all_removeForcedFlags.patch 388 BLAKE2B e3e7d911fdc8e09ae936bbbe9896affc53057c0e6affdb7bbb538c47d1899d0c8ae3dea84a52c8f2b46983d48bf17c23627acf18ca812fd2d4c736025d4debd8 SHA512 85c5b5ce8e883257bf78840ac7c7cebf1c4860473b64a16d3363f7bca0749026e1e3dbbcdfe42d78c303ce81901628d627d5464acafac141448bda2c53cb34c8 AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1147 BLAKE2B c1a03b94746ee6ae9b69114bf6c0448c511f84ce2a9ceaa3a9384a999e8c730def9e418bfe528097173ec2a1fd00816dad1722529e864481497acf18d3d297f2 SHA512 ffdbd8a5b7eb7d87b7f2828937b7f4ef027da6ce26f050798c24249953d8dccf75a296e99c1fdc01110035c289cf6cc0cd105bbb5d676fb32ff470843cf7aa45 AUX stk-4.5.1/050_all_cxxflags.patch 425 BLAKE2B 2663594c1d0601dbb06fcdf0dc03a176ae04290893c46c79bd13c990a10cf8b36220bf639559e3b20eb9bea48c9cd56188f59b96fc8d527acb257a5f39d4db50 SHA512 67370a46ebd793a767e7d4ade623b98b9586409c59f7cf45d7b03a55cfc8d23e22755edac9cad8b606b5ad076eb50e96849c66de231fb16bcf0dfe3067070093 -DIST stk-4.4.4.tar.gz 6181713 BLAKE2B ffd0128b8875d4ed54a8fa8d31aa8a7b5602e5b4cde7f3017e4febd1f9c7fcfc63cc4153bccbabb612a6bff2aa3e80efeddad2a77f6e4288ec3722c5ced87634 SHA512 e36c43a20e95eb86ed0335ae17df23c1a672562656738496f9e2e5654a825292c4235e04774fcb0356d47a775b7d7af6b4fd63c9d151ab7f2f9195bb5f728e37 DIST stk-4.5.0.tar.gz 2466803 BLAKE2B 30e73179000a581c66a4e80fa00aaea481675b6779b18ec70619e7767884a23f0aa969c172c737cf2b24927d14c3bb91107750ae07b20e868177eb82c2ce3f9b SHA512 a8a19e171093735052d797ef29a6a287dc6753fa726e451865250364dfd22f43b190aa03498ec94b99f3dc137ef951aa85e2f2f3509c74cedada6eedb5a31785 DIST stk-4.5.1.tar.gz 2413113 BLAKE2B 5eedf936f26acd3e2f377a198b252ee36bcdbb642f0649c0db6c453beb670a1fc725c94af78ff3e075f50068ae6927b628de0174dba598191ed9f9d2f074c17c SHA512 c4c05edfb49b269d5d2518c06abad8e636c4f67a8598f5a03d406bbef04b8b3315d2592d35c8742ce9163b52215ac87b6349c0012e271a43707d109175b6d336 -EBUILD stk-4.4.4-r1.ebuild 1564 BLAKE2B d8ae6dfb0dd63b5594a570c791c8569cafd18b77e8dfa12cde5f50b9cab634575ad1302f2ee4d9ba6e2a5704b795ac4743c16e3758029923481090341ced77cf SHA512 cb3d4dd97904d88d99278bec5cf950df4e11638731e409b1d75d991841b9695aaa702002df9755a6f761d3e45f69f45c87f1c4e31850e9b2928948e4b3181156 -EBUILD stk-4.5.0.ebuild 1352 BLAKE2B dd2042f88f400b9a0a69f9acfde308870971d9c3efcd76603239dff77d42ffa8c151dc4e4414523394855ee0af2ab25300cc327398e93865e55361caca7ce53a SHA512 37d800c4abae1a39c754ae28b11dcbd1b1a4a30b59b4eac3bc468404d2bdacc930e66ef1333493aa3f3c933b5b2c9e8603ff05ad36b78f2ae4c15ea94ec9cbdb -EBUILD stk-4.5.1-r1.ebuild 1312 BLAKE2B 34551e5b40610675a28d851067b1b272c823fb47e3cf8d72a89d2dd36194d69c9e1bd4dc00e14a5dd45e47efa786803aed2329f2a9cf2346f31f6c58eaed96df SHA512 a195a28e90a2c1d7a21bce4b1eec45de6e986dff7a29a679aa0b94776c8353e6e700180955c2a46efbf5a6f60db794c6beb8405dfdd2e8b5c52e0113d75678c7 -EBUILD stk-4.5.1.ebuild 1323 BLAKE2B 06b0eff796356e5bd4a20bd02c99c154be49f007ac8f0371bceaaeeb0725939499cff9bc73c0228cd249646c45ca55b5b7caf8f75e823842ea48489719c5a276 SHA512 e64143c9947a35b939aaa964cd7c9510a0ed044eba803bc48a15870a5e94d5db1c8c6ebd534f61dbaef80fd00eb650de8e12fa50c5c916139787230ba1e84d6f +EBUILD stk-4.5.0.ebuild 1354 BLAKE2B 6d1631c21c35bcbf769daef9bce24cff9330cb0b6c93ce781e6184eb3d10665d9fd58cae8dd12420ddc675d5ef6cc5b9024a15fbf298dcbc6eda5f389c5b0e93 SHA512 48661d2f86451a0883158969f2281ca203d50608e26cc89791e58dde9d94e980430e161671a06179f1b3ed54e5928fd330567cb5e73a0a390e858c6dbb3bcee0 +EBUILD stk-4.5.1-r1.ebuild 1314 BLAKE2B 9ed1380d48460d32eed64bc06a55c985d13a10064e6fe4fa72f5512398903e0cd947a3943690bd0116533dcf5a90967d3a0bcf107a7188d45f45af6fb9e3b4bd SHA512 973015dd06991e2c7afde4e1e4401db27814ab1f26254b0a2b2d1569fdabd80d79437cb685c66ef4b9cc33377cb089db4ae58097a30b8a6bffea51bee65947de +EBUILD stk-4.5.1.ebuild 1325 BLAKE2B a1a859ca14d2145115020562817be8ad097cd7c32166ace05a363acaca35db1b67bb9a0f4392bb7aac85761cbd0f073727dcbe39beff412fb48dfac573d590cb SHA512 0374e7eee8533cd104f8da4f90c031b5c0362c55543c15c18cd840f26fdf74427849466f0bcc5dc74ad42056b79be0af71f5a5b8706ac5c5a7072f5b1beea51b MISC metadata.xml 365 BLAKE2B a10b2261fdb56826dfdeb96a89f678dbebd332f99fafe31a5be95ca0db2593b3a14f69b856cda7ca5b3b6edd93f45661118a0c1fa6d6fe2ad7e4c449c579bd9b SHA512 48da9b52d54138bf4d271d39390a78b38641a4accf4f9cff2a0ce4a3954b45805d3a834f5aab0cdd13710e12ec36b5421be6c8a54db8698ae7bcf665c6866012 diff --git a/media-libs/stk/stk-4.4.4-r1.ebuild b/media-libs/stk/stk-4.4.4-r1.ebuild deleted file mode 100644 index 0add9c2b6de9..000000000000 --- a/media-libs/stk/stk-4.4.4-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -inherit eutils autotools - -DESCRIPTION="Synthesis ToolKit in C++" -HOMEPAGE="http://ccrma.stanford.edu/software/stk/" -SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa debug doc jack oss" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - jack? ( media-sound/jack-audio-connection-kit )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-lang/perl" - -src_prepare() { - EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${P}" - eautoreconf -} - -src_configure() { - #breaks with --disable-foo...uses as --enable-foo - local myconf - if use debug; then - myconf="${myconf} --enable-debug" - fi - if use oss; then - myconf="${myconf} --with-oss" - fi - if use alsa; then - myconf="${myconf} --with-alsa" - fi - if use jack; then - myconf="${myconf} --with-jack" - fi - - econf ${myconf} \ - RAWWAVE_PATH=/usr/share/stk/rawwaves/ -} - -src_install() { - dodoc README || die "Failed to install README" - # install the lib - dolib src/libstk.* || die "Failed to install libstk.*" - # install headers - insinto /usr/include/stk || die "Failed to create header directory." - doins include/*.h include/*.msg include/*.tbl \ - || die "Failed to install msg, tbl and h files." - # install rawwaves - insinto /usr/share/stk/rawwaves || die "Failed to create rawwave directory." - doins rawwaves/*.raw || die "Failed to install rawwave files." - # install docs - if use doc; then - dohtml -r doc/html/* || die "Failed to install docs." - fi -} diff --git a/media-libs/stk/stk-4.5.0.ebuild b/media-libs/stk/stk-4.5.0.ebuild index 0645fb3db412..3a5a9c740d16 100644 --- a/media-libs/stk/stk-4.5.0.ebuild +++ b/media-libs/stk/stk-4.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,8 +6,8 @@ EAPI=5 inherit eutils autotools DESCRIPTION="Synthesis ToolKit in C++" -HOMEPAGE="http://ccrma.stanford.edu/software/stk/" -SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz" +HOMEPAGE="https://ccrma.stanford.edu/software/stk/" +SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/media-libs/stk/stk-4.5.1-r1.ebuild b/media-libs/stk/stk-4.5.1-r1.ebuild index 71f85aada4bb..8d6a4005c324 100644 --- a/media-libs/stk/stk-4.5.1-r1.ebuild +++ b/media-libs/stk/stk-4.5.1-r1.ebuild @@ -6,8 +6,8 @@ EAPI=6 inherit eutils autotools DESCRIPTION="Synthesis ToolKit in C++" -HOMEPAGE="http://ccrma.stanford.edu/software/stk/" -SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz" +HOMEPAGE="https://ccrma.stanford.edu/software/stk/" +SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/media-libs/stk/stk-4.5.1.ebuild b/media-libs/stk/stk-4.5.1.ebuild index 943ab4560da7..72482af91aa0 100644 --- a/media-libs/stk/stk-4.5.1.ebuild +++ b/media-libs/stk/stk-4.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,8 +6,8 @@ EAPI=5 inherit eutils autotools DESCRIPTION="Synthesis ToolKit in C++" -HOMEPAGE="http://ccrma.stanford.edu/software/stk/" -SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz" +HOMEPAGE="https://ccrma.stanford.edu/software/stk/" +SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index fd14875fa09b..ff2bde85d0c3 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -21,5 +21,5 @@ EBUILD tiff-3.9.7-r1.ebuild 2072 BLAKE2B 1a1fbd60077b9d98c591041006443f2074d78d8 EBUILD tiff-4.0.8.ebuild 2615 BLAKE2B 7cbfe610a0a6120946bcfcbbbbfdcd3de00d3355478900efe4206e95db378d60772f2e553a55719557d087669af653c7b151da93efc0afe0a287bf5d512a1bb3 SHA512 100bda64fb5f70919467585eac5d717d4cf7dfb6059c9a87482c370a3013eb566b73ad01160c0a9b5cab48e6b442182edbbe70d593293ce8984650032981c339 EBUILD tiff-4.0.9-r1.ebuild 2260 BLAKE2B 4bf6af1f52b2990ffe3ec4a6169ee8ac774f3bdb52bdfe46450a6b724b4ca0ac04d4d7f849e390125403e0aa8555465b32ce5a824d8344403688321a6708f2de SHA512 1b47e588d6578cc2d6d3c0b1264f896854f2279ee8f9dd07b377ed4f78d680306eefa3cd462e27e460af18289d8734fa69128b55d5d0352a0199ba93a4377e09 EBUILD tiff-4.0.9-r2.ebuild 2359 BLAKE2B 65b2f2e66992a1d926aacd94439afc0f1fa48e568473fb750bacfa30048c618b1bb4e75555d18f434a13ec0736be7292e8c00921a6e7c605082fba7f8f2432f5 SHA512 5fea44e4882feffea242270d23a464348aa086dec354349f09ed4be0ae26664e8522fbec177820fe8e1c9d94764746a493fb0b7e38b249300bf316243a3625f7 -EBUILD tiff-4.0.9-r3.ebuild 2405 BLAKE2B c138a53bf4fc66a565794aebd4172229bb635f1c47ea184f7690fecf32344017c6ebc7f0e7485dc8e6e68903b11a5fe7a7aa8cad76ee5133793e500caddd33fe SHA512 6bebdd0e902a5bf283af8d3ee88ea5a7b70204f08b31666f20ec51ae533bcbbb92351916d8540815174dab2fd53b1e8ae90878c7cc5b165a8e4ce69f5207b741 +EBUILD tiff-4.0.9-r3.ebuild 2404 BLAKE2B 75374f5fcd650a7fb79ef42a7c7e06c1fa1be5f8057992cec3e64bcd85f23794584acdc5005ab10ecd92040d6e5f95efe80c35debc65273b813c26805252a18e SHA512 c48d3172cdaafec871c2cf7005ee8d6ffe8aa235e8b56e181ef9c3375a724dca4484d9512a815fe88e38481ac389161195b62b9c186109970dd77ae56018f675 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild index e10f0ee92cc9..98ea3548a1f5 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/waffle/Manifest b/media-libs/waffle/Manifest index b82c1187774d..ef7cb45e8492 100644 --- a/media-libs/waffle/Manifest +++ b/media-libs/waffle/Manifest @@ -1,4 +1,4 @@ DIST waffle-1.5.2.tar.xz 179284 BLAKE2B 40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56 SHA512 04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62 -EBUILD waffle-1.5.2.ebuild 1579 BLAKE2B 19230a4339fdd1f9230ed7d5dcad165ccc8cc93384e77464c808260b77db4ed87f26ac5840c690611a3172b3e6d898b5ec8275e50333d9c36893007b8bb480cd SHA512 b6879f5d28967eeb748ee6750945375bfe6d3d9c5844af50670818379c15b7f79471dc1b8ab2ce292eb1a629d14ff395a46130258fc7db1c88d67889a5945314 +EBUILD waffle-1.5.2.ebuild 1589 BLAKE2B 807690d54c0a290d35c6dbb28bd47fbaae055543753bb1781d4688039bd5896bff76850aa072d84f19140ee37a25ba5039e815cbd7fb86982f4c9b898f7f1a24 SHA512 fffbf7a02e4f90fbf57b304e1126bc8d32c0273782814d56a1ac55255c4666a1dba43604f27f45d0eb2bc971f2bf57190441be704fbc8932f606a126e661ebe5 EBUILD waffle-9999.ebuild 1569 BLAKE2B df54503e3ddc18c15e1948dddab17acbb118b71e8308d4990378199773b9c42926fb57c3fec4261b3453a755b73ee5ae9faa6486dfe9885afede47efdcc328b2 SHA512 4b623a99b992a21b77a817811f70af3068c0d471aa459ad481732a634f935d76273238c7d6853d9cd36c81aab462803751c98391466d347e9a31a0a57f0ad586 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild index c5ae78b00350..140bb05b121d 100644 --- a/media-libs/waffle/waffle-1.5.2.ebuild +++ b/media-libs/waffle/waffle-1.5.2.ebuild @@ -15,10 +15,10 @@ DESCRIPTION="Library that allows selection of GL API and of window system at run HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/" if [[ $PV = 9999* ]]; then - KEYWORDS="~ppc64" + KEYWORDS="~ppc ~ppc64" else SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz" - KEYWORDS="amd64 arm ~ppc64 x86" + KEYWORDS="amd64 arm ~ppc ~ppc64 x86" fi LICENSE="BSD-2" |