diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-14 01:05:40 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-14 01:05:40 +0100 |
| commit | 76cba73c47c8694e74377004634daca18f2d9c08 (patch) | |
| tree | 468603ebdc189bcfae77696162761b3be936baea /media-libs | |
| parent | 6957f5c65b02bba533954eabc0b62f5de36be206 (diff) | |
gentoo resync : 14.04.2018
Diffstat (limited to 'media-libs')
35 files changed, 526 insertions, 68 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 33ad7d1a703b..c362f5c795ef 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest index db727dd72860..641e19f0bcaa 100644 --- a/media-libs/clutter-gst/Manifest +++ b/media-libs/clutter-gst/Manifest @@ -1,5 +1,7 @@ DIST clutter-gst-2.0.18.tar.xz 358936 BLAKE2B 5a0b7edaa647651f790977d3f5edf6c996e43408dc1118a45d40b887df1a1827d8a5ecf9f0b42c291a38ada5519784069572c6d3e7126addea5d63f474fc3b0e SHA512 effc45929c201643d8a3e01ea199e426ab0927a9394dabf796b8edf1b7cf5e264f48a524966e31a86d4cf9fe99718464de0bad26ca7d64e05d64b7f0006676be DIST clutter-gst-3.0.24.tar.xz 417796 BLAKE2B d29bb356cd4f2dd9984a94cd2fa84676350730bb64d4a14010d464b8a1524b6ed743c4b6f1a445f5d1e58a9511af05af59bf3aef033239e9a44ee2cabcef8739 SHA512 5f5ae109a9e4b3d1ae0a4ad8a6a8dcc7adc18fdfbd99a762da6e34b7aae5a5fb4accad6bb460689f8da146a6964d04cb22ca6fb6ae0398ac3e88c8e287f2e414 +DIST clutter-gst-3.0.26.tar.xz 402976 BLAKE2B 41a8da175c7b99e9072e76cd0fe8c89050a3b8a11c6c3e7887c1fc466e57d9e9a4f3c2efbc030dc3da51eebc54d56ec1702298bb04081f0a6a169f4f94fbb01c SHA512 c1dca7b6fb7756dd1642e176b2d26f28330388283623c46350a8c979f3dd4af916a9807dfe4937ebd9f747f781a7dad4f0f8eea74ba8423c32bd92610eebcbc7 EBUILD clutter-gst-2.0.18.ebuild 2078 BLAKE2B d625b47bcc6bc3f723700dd51ceb202a9639923b46e7202df07f54c6783ea7c2e8ec26f11f29d02660591b82b519984184e20f4e7fa1bbe72b2f1ca84d586129 SHA512 6f8ef24b5e6a49a4d55a4d5ebc7e64ec32d071eb61b7e81e092e63ff5344808b89cf3ce3e15e7d1799627ccb00d873a50b93f2d6a8791529e3e6d0e56620f3b4 EBUILD clutter-gst-3.0.24.ebuild 1449 BLAKE2B eb1e92cc37002f80a5c4e89c227cfa3821cf2a6f61dc016c339ec453e4053647fdfa36b0142411608f2e30c271a856b78d6dab04e70c83e8291605b69b1fc7ff SHA512 6d84c897f361dfa21fc26152f2f403ff3457f299f7270c643c3b3bf108bfe7cb7d49b7662d06879f93652d6b8cc6685b5c6fb8db67f12550125509a80ff22821 +EBUILD clutter-gst-3.0.26.ebuild 1451 BLAKE2B e105a27cdf04f91ae4ae07c707a4d6c070b1226e615a0ee4008fdeb45faa1efcbbaf0cd73cad027c08b8c6372f6645eb224f17c562922ef5f1564dba98d9bf15 SHA512 797596a9d04e5fa3b6a873767e5f9eab2755a1334324f81eca341d485312cfb75ef2f7df31613f97fe32c291e8f2d352b613e4aec20ed109999bd0f7867698c6 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild new file mode 100644 index 000000000000..96359bc33783 --- /dev/null +++ b/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) + +inherit gnome2 python-any-r1 + +HOMEPAGE="https://blogs.gnome.org/clutter/" +DESCRIPTION="GStreamer integration library for Clutter" + +LICENSE="LGPL-2.1+" +SLOT="3.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="X debug examples +introspection udev" + +# >=cogl-1.18 provides cogl-2.0-experimental +COMMON_DEPEND=" + >=dev-libs/glib-2.20:2 + >=media-libs/clutter-1.20:1.0=[X=,introspection?] + >=media-libs/cogl-1.18:1.0=[introspection?] + >=media-libs/gstreamer-1.4:1.0[introspection?] + >=media-libs/gst-plugins-bad-1.4:1.0 + >=media-libs/gst-plugins-base-1.4:1.0[introspection?] + introspection? ( >=dev-libs/gobject-introspection-0.6.8:= ) + udev? ( virtual/libgudev ) +" +# uses goom from gst-plugins-good +RDEPEND="${COMMON_DEPEND} + >=media-libs/gst-plugins-good-1.4:1.0 + !udev? ( media-plugins/gst-plugins-v4l2 ) +" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + >=dev-util/gtk-doc-am-1.11 + virtual/pkgconfig +" + +src_configure() { + # --enable-gl-texture-upload is experimental + gnome2_src_configure \ + --disable-maintainer-flags \ + --enable-debug=$(usex debug yes minimum) \ + $(use_enable introspection) \ + $(use_enable udev) +} + +src_install() { + gnome2_src_install + + if use examples; then + insinto /usr/share/doc/"${PF}"/examples + doins examples/{*.c,*.png,README} + fi +} diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest index c49082e530f8..28f5fe87a587 100644 --- a/media-libs/exiftool/Manifest +++ b/media-libs/exiftool/Manifest @@ -3,9 +3,13 @@ DIST Image-ExifTool-10.87.tar.gz 4377842 BLAKE2B 49d94cb6389166562d653a2f8855e62 DIST Image-ExifTool-10.88.tar.gz 4379772 BLAKE2B d0d4c2fef52e314ef96d7bb117a5221f571004f3e1928db4f04ef1f43d9956915dc7b78550bb5a49508961de985600f728fdb4529bd0e5870b7369a4a4122628 SHA512 85ed7cf1564f92145673b08a6759c83576b40cfc5ec8f723fdbbf72375d0c9779fd90178db719664126e2cbb4b60208e1f8de9d3b94e814f53824d68ebb119dd DIST Image-ExifTool-10.89.tar.gz 4381960 BLAKE2B f64d2508b3ba8b428395e60331494880c31751dde418e198d0b68e5337939c8c8b30a8e14b494a35453d38901472fbba2d44bc35f0df718530663bf62c20c8cd SHA512 eabb79cbfd323154550816d2ed21ebfd69d6080352ddec3844435ce269a78e5816a3e85a4e05f64fbd19b925f490a7a8df8ffeac46481369b7094184eba06e7e DIST Image-ExifTool-10.90.tar.gz 4382245 BLAKE2B 94b699cf7bf793dd92ee95eb28b0296ed985370fef8be3ce4d5007d14a3aa641f38ddea4ade6369a7486c283b5f048de92f6b49ae8a5b67e32fe2dd3fa55dc0d SHA512 4b0eeb1a92dfa19414a8fe52b0741ee5efe09ca31a69ce8e542e2a5866bef01001d98e3577557906db43a2a51cb0b497edf4ad9ac7e93732d9f4d2ab00a37a9b +DIST Image-ExifTool-10.91.tar.gz 4383944 BLAKE2B a29f8b5ca16f172d3632fbcd49207f9cb05cf8ac26e61bff4f4512f66f7bf7ad906f3efb14f517997951fb3e9fb0b062bcbbe5d1f125d96043f83c10c564f25e SHA512 03720caa018faf4bf1a3e73abc37eba9116fe5faafd1f79641a24dd18dfc535e9d4b1d12f6a8f6b5b1adae1bb753e51df7aca1ac2b4fa00831448ef1b4b9bdf6 +DIST Image-ExifTool-10.92.tar.gz 4384854 BLAKE2B 26410f70d61363708d0fea8df34990c1f81ffea72daacdecf12ed01b491b6a0311d3809cb8cbe29cc707833aae9d2e51c20f2dfd7b281221177db2579f674a8a SHA512 093c41b7f74c74fbd7b82333f67ee0994563631d25003c662dc6ff938464902ced5a50d98606158a060bbe9ee719767f6bb1ccea619ec14abcbbb03e344ac5dc EBUILD exiftool-10.79.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62 EBUILD exiftool-10.87.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7 EBUILD exiftool-10.88.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7 EBUILD exiftool-10.89.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7 EBUILD exiftool-10.90.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7 +EBUILD exiftool-10.91.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7 +EBUILD exiftool-10.92.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484 diff --git a/media-libs/exiftool/exiftool-10.91.ebuild b/media-libs/exiftool/exiftool-10.91.ebuild new file mode 100644 index 000000000000..ec856d3619aa --- /dev/null +++ b/media-libs/exiftool/exiftool-10.91.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_NAME=Image-ExifTool +inherit perl-module + +DESCRIPTION="Read and write meta information in image, audio and video files" +HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}" +SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos" +IUSE="doc" + +SRC_TEST="do" + +src_install() { + perl-module_src_install + use doc && dodoc -r html/ +} diff --git a/media-libs/exiftool/exiftool-10.92.ebuild b/media-libs/exiftool/exiftool-10.92.ebuild new file mode 100644 index 000000000000..ec856d3619aa --- /dev/null +++ b/media-libs/exiftool/exiftool-10.92.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_NAME=Image-ExifTool +inherit perl-module + +DESCRIPTION="Read and write meta information in image, audio and video files" +HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}" +SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos" +IUSE="doc" + +SRC_TEST="do" + +src_install() { + perl-module_src_install + use doc && dodoc -r html/ +} diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index bf25985e6dd6..bc9d6a644e2b 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -1,6 +1,7 @@ AUX fontconfig-2.10.2-docbook.patch 648 BLAKE2B 70d66ae09a0729b667a4e5e57a7cf86926fb008285f89057bdf35f241bcd047dd8ad47d858d2fad26e67824c01e9f721877bb22afb2f8ffdd5538ed05694948c SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961 AUX fontconfig-2.12.2-gperf31.patch 2076 BLAKE2B 5691870b6f4ff9183403fd54b1a49e514806df92cf2c79f9f1c1c8bae9c71e66b72afc1209e01f1d905bb97707b0db8ce3bdc8934043f97b9094ea4e8e1685ce SHA512 0a88b0e2f7ca0cf934779c7612b87d9a476ab1396a512dafb2e89d26655657b333fb1b442773088ffc559c19782258128f366f5fc8a0e754288a7ea288506a6f AUX fontconfig-2.12.3-latin-update.patch 2049 BLAKE2B 5fdf036d307a09eaa3b475fc9b87d3c927e60f49deced429d41c46c9c677b5f90de12d7f82d55feadc003a8b841456c372084afe1ead3320cdf78d3e7bc474b1 SHA512 24520d40e7049d0fa5c05054dbe6d82149688d3e327b1818c6816bd3315de56969b040c88f8db0cbbf4f377d5ebf77199dbd3af5bc7bcae8bcaea69820d68ce6 +AUX fontconfig-2.13.0-add-missing-lintl.patch 1119 BLAKE2B 7b6b8deeb5b06ed3016add4e9e04c65ec7d8ef43223783950ea911c3544ec084c8ae78739be5eb79f4bcd91b91bdc943726d2d3d6dab46cabec69e2ce2b8338f SHA512 439470687be12c6cf3f9da21a5b0d1fac6c685296f740247aaf6cf1c1e22bf567ab2348408ed9fabe0c6f7b738e54b9813e562e9d762c861b61f70ee569ad754 AUX fontconfig-2.13.0-locale.patch 4096 BLAKE2B 8ebb0d8b72af07053a0fb7ee5550558d530b874051c7cfe8abde7f504c643a8b52bdaf265d39205d9c9fd5375f464ddaed858c9b599e633d04b92f94873bf65f SHA512 845b2db1783840070a27de2f28ce8f9cc6968b5e07c89c91110248261e9977bf15edc886b5ed9badb2fa14efc1868c82c4ab0ee45aec8a0cfbc74b5ae459c939 AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58b6fc7e1e1bc7b341d59bd1dcdfd818cd15071278fac69229e3f6b8b09d19a351390d76b7112ebf8d9749d2e1de29b8d SHA512 7c9bebf3eb76de05cfd1481e679715bebc5c429ea6976e96866c0e80b0021d3f00adae888e348897574193d7029e48409a0b73698dc2c8963e485992400192ad DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81 @@ -8,6 +9,6 @@ DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f78 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d EBUILD fontconfig-2.12.6.ebuild 4995 BLAKE2B d7843faaa1b48b4db2138ec08fe53f797d3ba02c05b4eb1c6b91cf261edee105e94ea9bc200f5b08f9b08fced53d9bef93719ed529f7aff53fe7c4e589211190 SHA512 a15943efca6a4a88cae289702f6bc29c8fc603473c3a7565f8bbab64260d5c041918f2f1a70ee531f312d2900278da33b7b1ad4f5c0a7bd5347877e2ca342961 -EBUILD fontconfig-2.13.0-r2.ebuild 4947 BLAKE2B 62b92c0841744a2528f30473d8afcbc2d355e9a3ff2e2bd2a17cd2400636d7e8bee386d436076f69ba308df873e2d8ac44b61fd4c335d6d9966ce9f6b8eb7f09 SHA512 8b92ab41698761dc735771dcdfe2d802f6221c374da04fe39019a84882eeaf7814a351b5e923dae381896fb64ed6dc8ca3180a8f4ca1d394c24a1b10a43b534f +EBUILD fontconfig-2.13.0-r3.ebuild 5000 BLAKE2B 9a5a37aca4c15007b12bb99986215ed5e6dae84d24ae39d835c4a6006998c7c2bdaae223e1fb93dd6c9ad4dd31ea62ce2d1c6f79b3e2580e15d6ffc1409c9172 SHA512 709847945001589047b828bd4fd9c02045fdd6615e3d58b4a59a8c7b4280de01974bd71ae6c0101786eefc6f9efbf5bd7fb2e970cbc6379731ec68cf324d61f0 EBUILD fontconfig-2.13.0.ebuild 4886 BLAKE2B 53afd9c7099bbca51d0b247b7af20ef985c373fe3a4217a58b22b1c27a26e111d171e2907759fb4f7101e319370cea32ab4ee24ed0c99851ed6a1089fffa7331 SHA512 8cddd384732d2115c4476f2d40fd6de6bc4616120fd484adb78e7d77aaaa9927e63b3cbac5e9364bc33870137a11e7c5e1f3ecb4b095903504d3db8757de8fe9 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190 diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch new file mode 100644 index 000000000000..6bea02b1fca8 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch @@ -0,0 +1,34 @@ +From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <akira@tagoh.org> +Date: Fri, 9 Mar 2018 11:55:43 +0900 +Subject: Fix the build issue again on MinGW with enabling nls + +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 1ff065b..2111ce0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -82,7 +82,7 @@ AM_CPPFLAGS = \ + -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ + -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \ + -DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"' +-LDADD = $(INTLLIBS) ++LDADD = $(LIBINTL) + + EXTRA_DIST += makealias + +@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la + libfontconfig_la_LDFLAGS = \ + -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols) + +-libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS) ++libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL) + + libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency) + +-- +cgit v1.1 + diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild index 12d1cab673b6..1e73daa19290 100644 --- a/media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild +++ b/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit autotools multilib-minimal readme.gentoo-r1 eapi7-ver DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" +HOMEPAGE="https://fontconfig.org/" SRC_URI="http://fontconfig.org/release/${P}.tar.bz2" LICENSE="MIT" @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default "${FILESDIR}"/${P}-locale.patch #650332 "${FILESDIR}"/${P}-names.patch #650370 + "${FILESDIR}"/${P}-add-missing-lintl.patch #652674 ) MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) ) diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest index 89acbad2b5ab..e81dc276c260 100644 --- a/media-libs/glew/Manifest +++ b/media-libs/glew/Manifest @@ -9,5 +9,5 @@ EBUILD glew-1.10.0-r2.ebuild 2383 BLAKE2B bcee911ca94615c4f78e2108210b2451b6ee3c EBUILD glew-1.13.0.ebuild 2434 BLAKE2B f032991fe90dac59e789cd2fba1f08a42308c8e9230f7ec253b755ee8a7621e1a18634ff3324c3a08f9ea239404bee3ba176b750c3adca3cdd09433aa90d57e1 SHA512 e001a5bbc743a291292e22d588bdf754753dc258b32a7ae9e8bcdd9ae0d49055b6f6e2bd189f5c722c98e6d53ec009872e8eb56a9da88a1f29bb44a9b9f3cccc EBUILD glew-1.6.0-r100.ebuild 1918 BLAKE2B f4e0743ba9f5e76e6a9b1a19411b59a6fd08f71a01443c61e819bd4d2ba4528a1f635826ce5c7359ea31d0a1f6045888b36f4833c15b88ab0c5265ad9839ff25 SHA512 2b862eac1583f939d416570776e48675aa307762c7a437c44dd07d212c60fee33cc7671b4a3b659d9d86e5fa7938ab8d9a09fc340d412c10080827378c598bbb EBUILD glew-2.0.0.ebuild 2552 BLAKE2B 2b9e63c2b52f21ad3997345dc8293aadbec6993c611cdedb74f00026f182a3347ad4d68f695085dd0c0a5dfd18eb3756a0c82776873843de85719756c2efd8b4 SHA512 f22c0fac87d9b64fc8a2eb0e5228d9c8598d02ca04c054d3b1a65f3295e94e697c3db2c6ee25dac07d9f6fc767ecbc0ad846681aac2ccdc80ed3986338011c5a -EBUILD glew-2.1.0.ebuild 2516 BLAKE2B c30210db3532b7fd705bafa549486849e2792a6673aed1e998c1ff6e8a1e09c7b46a1266b5f1b962e2c4c2bb43a4e9b18d549f17a06c1122493d6c5c3db8e6fb SHA512 e970704b4c82c2e3fd85dc89147df74e72709249bc138c147f23948a52bbc92ab6f55fc9cb43d122e66a540b98686e2299a8aba1bc6b5cd03f2a6b3f302e2217 +EBUILD glew-2.1.0.ebuild 2515 BLAKE2B a587394825a1f293438b9fe6717c6615c1660e90a3de5557fd55d69a8f55f1f0f996ae067286af28046929c1c03e1a1fc184205e1c3f190c1752de71408c9106 SHA512 dfac5f4981415696b7bedd9fe190c6617d6e99d04af2d3d04ea5d13438f1b869dbb6c09e8640a52c8d1256a55604cf75078eb67bd350c88f55ba70ac1b82a1c8 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d diff --git a/media-libs/glew/glew-2.1.0.ebuild b/media-libs/glew/glew-2.1.0.ebuild index da95b824c042..41fba1f27dd5 100644 --- a/media-libs/glew/glew-2.1.0.ebuild +++ b/media-libs/glew/glew-2.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD MIT" SLOT="0/$(get_version_component_range 1-2)" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs" DEPEND=" diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest index 201db7268e36..6f2fbfbd6880 100644 --- a/media-libs/glm/Manifest +++ b/media-libs/glm/Manifest @@ -1,3 +1,4 @@ +AUX glm-0.9.8.5-gcc7_tests.patch 2495 BLAKE2B afb4e8d64272497cd3e02ea73ba5536b660b3d73302fab4f2eff4fe87b3a2eae604a04fd5aa7ebc55dc860e419ea370a1c240a1b2d30fd6d522c9f37d3277c50 SHA512 c21859d4db606bd6420a889ae4ae3242b1e60a7f660cbe7aaee1583919a82c47b2f209d596378f8d919aa59c34ebb12beef05a06f969fd6941168b9bbe7e8467 AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5 DIST glm-0.9.6.1.zip 4232099 BLAKE2B ba8e9fc4a4401f9a78c46f6eebe5fdd6bd9af14f8c65bfcac7b61988b551ba27bf8d28f3a50f3f619dad5a10e11adb6988f9408227d10d738ea6d809d81db0bf SHA512 7f1468c5e60e65181f4685a2429fa8d70350a3576175a55b7c9e8597a03837cb84aeaeb88d311e1e1948c5bd90ad9cee9286433cb78fdee54b0fbe5313ce2f84 DIST glm-0.9.7.6.tar.gz 3457100 BLAKE2B f9c0e481dbac76fa8922d4f58f2d4d60f0735a44a249b1136aa519f7638c21fa193e8c618c784b8b3adbbcf3838e9dbd6ff6a22a2708483bfc39bbea5a24494a SHA512 d4e1e173405c11b5744df8dc12f0848cd84ab27b868434c0f8fc74f15110b78606564991f3063ccc97e68a0aa1c1cb4a1b40ba6ce7feffb0d1a23c3e5cff315a @@ -6,5 +7,5 @@ DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a8 EBUILD glm-0.9.6.1.ebuild 524 BLAKE2B 470804896aa3430cb812a7db1adc89c461ed7c2ef1428f63b92c88e6587c0e73f8730d32a454bbc6b63454506a18eabdaacb3a0ccf63dedca833efd3f2b40efe SHA512 c5c46d8dcad501804adbd4b75d852e3df36e93df2f453c862c0b344df5be9a9993dd9c938badb26cad1787ac70a70d33fb1f006d44d6b777f216dc10b4030a4c EBUILD glm-0.9.7.6.ebuild 884 BLAKE2B e916a774258380213b4beafd015105cc76592c512d373519d4a67c57d1ac8ceaf199189164270ab78a7d103d59b7c6ac7d60f9d416433cd3d08abf34cd98d660 SHA512 88038c4a32d943061db4879ea6d173b4a8ee8fc9a1574c18f7359ccf106704b70a5f532afc6f68e780ae3f94eebce08e802861b7d240a6ee87d5ba61a1d02ec5 EBUILD glm-0.9.8.4.ebuild 884 BLAKE2B dff985eff3489d2436afb02b3d3e65f06814e0b78c7690aeac19ec6028b60be37aa3209c8bf8bee0227bd46b9a9928ec959625bbf79e38cbe85ee1b6876c958a SHA512 4404107395ac1389e2c85757eb1c7aa60f75f7c4a4b57fcb9b0de816891d6675df9aa8269dac68008645e535814dda51401e68264741d159ba0602361f177541 -EBUILD glm-0.9.8.5-r1.ebuild 902 BLAKE2B 2330311f439fb6d7f6d24a279926ed79f7332720018ac2995fb13d6008ed3a417cc141925ea3e5e222bba60c68f37c1d9ef507d69ed5a5fcc8972a41355637df SHA512 c685f2175a2543675d5f074d189319a01ad473593cd3ed7ae123aea295471bbd7518a0880c5bb47069d7708767a35dff6b70ee5f07a97efe72091b9b7d49c521 +EBUILD glm-0.9.8.5-r1.ebuild 939 BLAKE2B 76ad40cb1aaae604f324f4c4a0e57a7b83c8527915ebf6bf6f200d9d9e7bf3abbee449c6aac11d9d81f1f752971b526c49ed6e1a55b8176be7a91c1e4a8e1341 SHA512 f1d55e62ecbb8f0b8a873c8418016d61cce1bd1f0e25c26eff4c2343e2c33ee9888d3aa243457c3fdfdcfc23588cfeb466809e6b39cd54e31006958b6e211bd0 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971 diff --git a/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch b/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch new file mode 100644 index 000000000000..d7744aed5551 --- /dev/null +++ b/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch @@ -0,0 +1,70 @@ +Bug: https://bugs.gentoo.org/638312 +Upstream commit: https://github.com/g-truc/glm/commit/e37cf6e47fa4305c82845103b17af58f6cfe23db + +From e37cf6e47fa4305c82845103b17af58f6cfe23db Mon Sep 17 00:00:00 2001 +From: Christophe Riccio <christophe.riccio@unity3d.com> +Date: Thu, 17 Aug 2017 00:08:37 +0200 +Subject: [PATCH] Fixed GCC 7.1.0 failing tests #666 + +--- + test/core/core_type_mat2x4.cpp | 4 +++- + test/core/core_type_mat3x4.cpp | 4 +++- + test/core/core_type_mat4x4.cpp | 3 ++- + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp +index 17afebf91..eea3e46f4 100644 +--- a/test/core/core_type_mat2x4.cpp ++++ b/test/core/core_type_mat2x4.cpp +@@ -1,3 +1,5 @@ ++#include <glm/gtc/epsilon.hpp> ++#include <glm/gtc/constants.hpp> + #include <glm/vector_relational.hpp> + #include <glm/mat2x2.hpp> + #include <glm/mat2x3.hpp> +@@ -83,7 +85,7 @@ namespace cast + glm::mat2x4 Identity(1.0f); + + for(glm::length_t i = 0, length = B.length(); i < length; ++i) +- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1; ++ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1; + + return Error; + } +diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp +index e3b78d31b..74a45d87a 100644 +--- a/test/core/core_type_mat3x4.cpp ++++ b/test/core/core_type_mat3x4.cpp +@@ -1,3 +1,5 @@ ++#include <glm/gtc/epsilon.hpp> ++#include <glm/gtc/constants.hpp> + #include <glm/vector_relational.hpp> + #include <glm/mat2x2.hpp> + #include <glm/mat2x3.hpp> +@@ -87,7 +89,7 @@ namespace cast + glm::mat3x4 Identity(1.0f); + + for(glm::length_t i = 0, length = B.length(); i < length; ++i) +- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1; ++ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1; + + return Error; + } +diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp +index 3966c2b7f..fd2aca8b4 100644 +--- a/test/core/core_type_mat4x4.cpp ++++ b/test/core/core_type_mat4x4.cpp +@@ -1,3 +1,4 @@ ++#include <glm/gtc/constants.hpp> + #include <glm/gtc/epsilon.hpp> + #include <glm/matrix.hpp> + #include <glm/mat2x2.hpp> +@@ -263,7 +264,7 @@ namespace cast + glm::mat4x4 Identity(1.0f); + + for(glm::length_t i = 0, length = B.length(); i < length; ++i) +- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1; ++ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1; + + return Error; + } diff --git a/media-libs/glm/glm-0.9.8.5-r1.ebuild b/media-libs/glm/glm-0.9.8.5-r1.ebuild index 073f3bee1e27..b30d2b1a0f8f 100644 --- a/media-libs/glm/glm-0.9.8.5-r1.ebuild +++ b/media-libs/glm/glm-0.9.8.5-r1.ebuild @@ -18,6 +18,7 @@ RDEPEND="virtual/opengl" PATCHES=( "${FILESDIR}/glm-gcc73.patch" + "${FILESDIR}/${P}-gcc7_tests.patch" ) src_configure() { diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index b628520fca46..fca00f1f59c4 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -4,4 +4,4 @@ DIST libmygpo-qt-1.0.9_p20180307.tar.gz 65245 BLAKE2B 16fe3a9659a53c907979156b14 EBUILD libmygpo-qt-1.0.9.ebuild 1670 BLAKE2B 5aaaa48f08ca84400c554b499499a817b3b7c4b11c9bc97db84b969db86193abf264239c1f33d3304033e451e7c4e1e40f025e7104a3c3bb3ca1831e36b7bfa3 SHA512 6d5c206312cd2cb1bce3e9fdc92ff85a5a7429b6e186032088fc58fde15042d8ba9d6c86e2b7a6f1feda430c95da4c656899a56ad4183acf098736e7bf48af8d EBUILD libmygpo-qt-1.0.9_p20180307.ebuild 828 BLAKE2B 93935fa5aa5b1d80341a5e5cc6c681ac1ee6622cdaba74d6fb4c7e28b4f0ba4ff7353fc082652ba0ea1cb849e2a2b8e050b560c790798bfa36e95271c52bf710 SHA512 9797da18e9ff508b1c01d777d572ca26494b4086cf947cf155531fdd91ed0f0ef36f1696f9807e7e5a80b333073123cf0c5cf09dfe1a13552bd18a47d6f3766d EBUILD libmygpo-qt-9999.ebuild 763 BLAKE2B f939dd1c0f26fb2a940b83d3a709dfac0c7e6ebf25c07c56175313015a4b109333dfbe3bea6c64184a7c3488f3d6faba8c53842a044c990c2daa2dcd75403990 SHA512 3e010b8c420eb3a605f2490cfea52d30e5147abcd5601575dff993743f3a459bdba7abcbe0e5c5371f6f4905f6d7ac5c70e34b9cfff7d71b06994c08d90c9a74 -MISC metadata.xml 587 BLAKE2B 9f2a6649f96e4dd1c463e9e4f9724b24a94c8ad5a387cf1048f4b6e958fcac7c15f645a03a0fdd1ea6dcac6d80518c95820486c35ac93d1633b2eeb51bba19c4 SHA512 083072ed5b0bc3c168a30ac3cb6870580e9a2fb01c61ae1efb6f74bba857a36f606c738236fb8a7057ee2a33c7faf2c4e4ddd9bac18adf5f4205d88057f80a7d +MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db diff --git a/media-libs/libmygpo-qt/metadata.xml b/media-libs/libmygpo-qt/metadata.xml index 116d49b1fbbe..18f9a0a6af14 100644 --- a/media-libs/libmygpo-qt/metadata.xml +++ b/media-libs/libmygpo-qt/metadata.xml @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>fatzer2@gmail.com</email> - <name>Alexander Golubev</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <maintainer type="project"> <email>sound@gentoo.org</email> <name>Gentoo Sound project</name> diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 50622b6f66e6..2843e583b10a 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -4,7 +4,7 @@ DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96 DIST mesa-17.3.7.tar.xz 10654684 BLAKE2B 520b045f7ab4b60ab372960ca933e60229dc38075d28c9e0f144d0a2dc222d6c2830e4739962008319bed27fe9a83bae7c38609d0135c3d5918d35dff6c0381d SHA512 ec48565556aa4281056cee5dbef140553651fdfbb76ce32397de048db1cf65f5e18787c72b998de7da2de795d27e7040bde84651ade4726fc3a69a23b166ba4e DIST mesa-17.3.8.tar.xz 10660896 BLAKE2B 432deefad4b0a42914efc24c558d5c766443f55ff8324317980a4f91a5e560207c3c142d9547868c6cd480ad751c2b11a76da06dea891a044016868b3dcdaaa2 SHA512 4a63b760d5c64425e2d4dddf6ab8167c1845020f173bd56ec1d2e483e3bf2afb9ca483fcf329d37cc0bce82ab5134ee43ea82a2e3a4ee9463de16a9f75bc6e16 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.1.10.ebuild 13300 BLAKE2B 68b30d3052f8f80d928542f3c8a30f82b2696a834e0e731a16d64ed2bbc19c55b382c4c4064fc74b458fbf1cf4e23aacefdaab53e6359d24c924ab81a4d522e8 SHA512 27d5256505853b4c209cb454589454f53d16dbdae32046c7e4d71a504d21879af8fef22c5d134081f0d23869c6cd75a42c33d3305702693c050f7bf1d932f215 EBUILD mesa-17.2.8.ebuild 15022 BLAKE2B 8de43727d00f3ffb6136c59f42ee268a8f2b20cfa6a8784efda04e37ad606510f0f3b32e00ae24533f070f4a1d7a9cbc0a3986b7b1c646d8ccec8b38fc7fa50a SHA512 518068373eddd00746a67a832592cc61cd6faa24f79475722bf6edde13f2ff7f17a292294162985064feeb26ada07801f44385f35b209a725a41ee315980b94c EBUILD mesa-17.3.7.ebuild 14916 BLAKE2B 6a0e29ec0ca3a10713c58d28c8c8b44c55ae254254dae1ee0e9d2b4495367af2fc464cc1e69d7e1a1c8596deb92d6c3331e0c0b107896155b6d456a2d7a0514e SHA512 fd75796a17acf72ddbe5c82a21eeb9a2c8ee301296ad0787aa0a56b857a6d7d02de4a6acb8cee20a597cc1fb8c7b87e861905f8f5549ef9f18b70d36664f218f EBUILD mesa-17.3.8.ebuild 14909 BLAKE2B ab043d7666b10ea22c0afed6b8ad0fde15136e66567127693579e1416233f5d6538fa9d922ab6c3f6506ab17f1861b26da1dcbcef82f22f9edd020a02efc4657 SHA512 ca0f40177b16de261482712aa65bb3341402f361b6d70006a2bc875162f613fcbb5a771dead4cd870a3529c725797a6268fb29382254a816f790d3b4eded2b46 diff --git a/media-libs/mesa/mesa-17.1.10.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild index 68cc4007b978..f2627965e4f6 100644 --- a/media-libs/mesa/mesa-17.1.10.ebuild +++ b/media-libs/mesa/mesa-17.1.10.ebuild @@ -25,7 +25,7 @@ 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" + KEYWORDS="arm" fi LICENSE="MIT" diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest index 35138781eda7..7d58627923fb 100644 --- a/media-libs/phonon-gstreamer/Manifest +++ b/media-libs/phonon-gstreamer/Manifest @@ -1,5 +1,6 @@ +AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe EBUILD phonon-gstreamer-4.9.0-r1.ebuild 1978 BLAKE2B ab48d3cd7486242e6eaedf43434f32d6f857a5ac3f6bf80b63bb41f28acf6b9dc52d900a0e6de6667f88dffd2aa174c59586f4d5837358b42c71267c8e88315d SHA512 062854f40de54080251b0490a359b9579941b8f3fd6300ecb505c500e1f373d8ec818fa477d18306463144211e5e1c80b49c896713b50fab201ace9f53aadf30 -EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1068 BLAKE2B 4020f4e10084180097d3331ee92a3e96e4f04c0219f20c9f2f18df6f7b932f7e6130e3e2fb0e43813dd48d2489095b3ebaea026093155d7cdc620c99d307e21e SHA512 7e38546e97e9dd2256891de73033357f26980423f61ee561842002f9f9358a764909f172e06b0232ddda94d5a8d6014ebe9df668d3b23ee847d9a49f389ba866 +EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1114 BLAKE2B 614c5ee2f4714ae5b26a5e54aa68460b19773208bb79d300db433d71e390d1742af9db72f681cec28775abb6c3971c37c52981fa55e4ec2504d3a61b57c8456e SHA512 f41fee2b740703e9f17a4a622cfcf60838c699d44fc849328106905a3fee992ccd44bd2d339e802a78eadd42de3f7655e9ed960efed9d470d9cce82538a1784a EBUILD phonon-gstreamer-9999.ebuild 1056 BLAKE2B aa1afd5ade889a59c5ec4218fe9cba15f50d863483e5b379077c5a832e35a9c57eecf9eddb307e04ccc5bf6882ef72f845749b54407fa57cdfb79bb230882e71 SHA512 17a27ab64a08f7be157a59106e3f8871b631533164d517130c37448fa6d2d26eb2ceb2056cd31c35cc4af15bbe821d0c2792e89ffe86a3d832aa4b10862d9efc MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch new file mode 100644 index 000000000000..1e500058cf38 --- /dev/null +++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-qt-5.11.patch @@ -0,0 +1,62 @@ +From 38532b45ea32d5355cc19ff32ef69c2f462cad5d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 13 Apr 2018 23:47:34 +0200 +Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +Also replace automoc4_add_library with add_library. +--- + gstreamer/CMakeLists.txt | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt +index cb01285c..4536d042 100644 +--- a/gstreamer/CMakeLists.txt ++++ b/gstreamer/CMakeLists.txt +@@ -104,18 +104,26 @@ if (BUILD_X11RENDERER) + add_definitions(-DBUILD_X11RENDERER) + endif() + +-automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS}) ++add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS}) + set_target_properties(phonon_gstreamer PROPERTIES + PREFIX "" + AUTOMOC_MOC_OPTIONS ${AUTOMOC_MOC_OPTIONS} + ) + +-qt5_use_modules(phonon_gstreamer Core Widgets) +- +-if(Qt5X11Extras_FOUND) +- qt5_use_modules(phonon_gstreamer X11Extras) +- target_link_libraries(phonon_gstreamer Qt5::X11Extras) +-endif(Qt5X11Extras_FOUND) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(phonon_gstreamer Qt5::Core Qt5::Widgets) ++ if(Qt5X11Extras_FOUND) ++ target_link_libraries(phonon_gstreamer Qt5::X11Extras) ++ endif() ++ if(OPENGL_FOUND) ++ target_link_libraries(phonon_gstreamer Qt5::OpenGL ${OPENGL_gl_LIBRARY}) ++ endif() ++else() ++ target_link_libraries(phonon_gstreamer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++ if(OPENGL_FOUND) ++ target_link_libraries(phonon_gstreamer ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) ++ endif() ++endif() + + target_link_libraries(phonon_gstreamer + ${PHONON_LIBRARY} +@@ -126,10 +134,6 @@ target_link_libraries(phonon_gstreamer + if(USE_INSTALL_PLUGIN) + target_link_libraries(phonon_gstreamer ${GSTREAMER_PLUGIN_PBUTILS_LIBRARIES}) + endif(USE_INSTALL_PLUGIN) +-if(OPENGL_FOUND) +- qt5_use_modules(phonon_gstreamer OpenGL) +- target_link_libraries(phonon_gstreamer ${OPENGL_gl_LIBRARY}) +-endif(OPENGL_FOUND) + + install(TARGETS phonon_gstreamer DESTINATION ${BACKEND_INSTALL_DIR}) + +-- +2.17.0 + diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild index cf14d133e9df..67c68221168a 100644 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild +++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild @@ -42,6 +42,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_configure() { local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON ) cmake-utils_src_configure diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest index c04076488d59..cff8a88e261d 100644 --- a/media-libs/phonon-vlc/Manifest +++ b/media-libs/phonon-vlc/Manifest @@ -1,6 +1,7 @@ +AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df DIST phonon-backend-vlc-0.9.1.tar.xz 59972 BLAKE2B 79c3b0d2cb21a04446cfe0a5b4bfed20f4c63cf6eb00037b0f0d8a67ff74fc9eab484d9a108a8d6694bb1ed97ac5618ad1813f7bbcd981bca9678b862bdc9eeb SHA512 104a29159541002d4064486b54d02183c32cf87931c205badf44333d9481b0c0e70e6eae7f9d3c558bef977de37f76cc203dc5c15120f4146d64d451992947aa -EBUILD phonon-vlc-0.10.1.ebuild 797 BLAKE2B 5dc25a00e545c408243ca77aacce55644aa42588fecc0000695a871311c102703294d98398c4c9eef4a7c0c0a13103961e945eaae9516956c6145615e7ebca3a SHA512 cfd63cb76e8dcb28646e25dc87ce814f1b2864bdf075e72478ef9729b9d20581dd79568b27eb73193c6b97e3b6c4c40e86bfbf2f75b330bb2291f6f19efcbd4e +EBUILD phonon-vlc-0.10.1.ebuild 843 BLAKE2B 2947e43fd6c016fd6d045b19e3ef2f89101bb633b5a6a11d8a57698f2ea8de67175d2922ea89c1ea71a524193016007101dcbb45a2543610767e1f424a27880a SHA512 8e23c6e1bae32abb1268905a5f77ba6a19c15b653dfd4e6b766ac4e36de1ef3da7b1acc75350295893f73272aeae8bad11e6d484dbbd455f0f1e3acfb23aa8f2 EBUILD phonon-vlc-0.9.1-r1.ebuild 1664 BLAKE2B 59522c485d8aaf0d37fb0e6a69605fbfa889d101e6975c11a97d1f93b459b1ed0d4bb32e6048189b6f2a431d5105ea33b474eb373ca74af44326e91861b3f8df SHA512 653af9c113b9de6c41cbd070a1f044c621f6505c5502c9e830e2a314850022834407c9720eae4da86e5b6b1886d7c922ffc6a44bf50e64ee3054a0293b85105a EBUILD phonon-vlc-9999.ebuild 797 BLAKE2B 5dc25a00e545c408243ca77aacce55644aa42588fecc0000695a871311c102703294d98398c4c9eef4a7c0c0a13103961e945eaae9516956c6145615e7ebca3a SHA512 cfd63cb76e8dcb28646e25dc87ce814f1b2864bdf075e72478ef9729b9d20581dd79568b27eb73193c6b97e3b6c4c40e86bfbf2f75b330bb2291f6f19efcbd4e MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch new file mode 100644 index 000000000000..b87a1e175777 --- /dev/null +++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch @@ -0,0 +1,32 @@ +From d053719a405ceaea58bffc2f08580875322e4158 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 13 Apr 2018 23:16:52 +0200 +Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +Also replace automoc4_add_library with add_library. +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 47427b2..f91975e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -80,8 +80,12 @@ if(APPLE) + video/mac/vlcmacwidget.mm) + endif(APPLE) + +-automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS}) +-qt5_use_modules(phonon_vlc Core Widgets) ++add_library(phonon_vlc MODULE ${phonon_vlc_SRCS}) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(phonon_vlc Qt5::Core Qt5::Widgets) ++else() ++ target_link_libraries(phonon_vlc ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++endif() + + set_target_properties(phonon_vlc PROPERTIES + PREFIX "" +-- +2.17.0 + diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild index 18a2f10173c6..9506df8aba4d 100644 --- a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild +++ b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild @@ -33,6 +33,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_configure() { local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON ) cmake-utils_src_configure diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index 3e055cb7da9b..f62495cb97f1 100644 --- a/media-libs/phonon/Manifest +++ b/media-libs/phonon/Manifest @@ -1,7 +1,8 @@ +AUX phonon-4.10.0-qt-5.11.patch 7953 BLAKE2B 980598938afe0f64c872f41dfaea13e44d25c50dcaedaf7540000c6dcf657b86560a0a63fdb86f954ed8323b167b4aa50f9918598cff908798c887b3db99c996 SHA512 1760c5f5adaead31ab6bd8f80cc7765ed26186337f4558e313b62a0ecda1065eae1d7dcd4eeeacc3c30c1c998ffffc2b7f8338acdbcf604e81fe3cecc2e9fd8d AUX phonon-4.7.0-plugin-install.patch 1252 BLAKE2B b9c0022007babf5f56d7f651e18bce5ef3c7b36a5bb6d2d042fd14639433faadd6a99f0f276751fc4849ab2845f265481d4c307a1d16af029f3c11c6b6104f7b SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2 DIST phonon-4.10.0.tar.xz 322072 BLAKE2B ba49893368fc13946e2e83a498787bf8fe605b2b3d8e2b1c28eacad5ec13d9679b8c9ddd2adc54c340bbc60a01c7c1143ccaca6f26b86be105cb7502de5f39fc SHA512 6074c7c33edcdfeed8a6199024f1faedebe09652cf5d01075f2d97146b54c4269924b69ca8298e2341c0cf6ca4d18f930a59a937697f6f282b6de8e976d097c4 DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728 -EBUILD phonon-4.10.0.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8 +EBUILD phonon-4.10.0.ebuild 1364 BLAKE2B 0e9d09cf4b7bcb75bfb626cabb4a1a184dfbc8b7f5b70edf42b60568a0c417c9e643bee145d524e87789feabf0830879fe26b45a810b3a5cb03573cdd2a56e8d SHA512 31fd8461c9be7fd99a9c73643edb871253de55e80d5847b8bded86ba771f126eb0670eba553597d2c1fb4dc6fd038815a7eb554e6a315117988ea1040af4e3c7 EBUILD phonon-4.9.1-r1.ebuild 3088 BLAKE2B 0d162cfad037d952af2b935999fb0634073103e727a7426101cb2cffb03b8bed18461687ec767e81a6a1d9728ff6cbd02793e8d60940b0ea56b2b7deca17118b SHA512 22ab58d17069ebbe15f0f7bce13026c4fd0accd32db2fdd6d158da489ac0399407c840b01195b22b2e5fa454443b9f71ff94f4cc24f31f0ef55eb87563c1d7ec EBUILD phonon-9999.ebuild 1306 BLAKE2B 0c124727d6c0052966c90042246023d3927ddd7a076b79c8e0f56e43e1c2727863ded2c0aedc2f6524b14e446365f04965e3ae1d579477726b50600a29f5101f SHA512 916fca63f9ddd17f207b1349507bd408c462551d14380a3428c783177eb2a68012bffb697882b52339442b39b253280af39808ee8e8bba9278d2e9fbade6aca4 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6 diff --git a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch b/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch new file mode 100644 index 000000000000..f8444b343a40 --- /dev/null +++ b/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch @@ -0,0 +1,190 @@ +From 2670e33c418acdf6c08fd0cf5d238a4d93cc12e6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 13 Apr 2018 22:35:30 +0200 +Subject: [PATCH] Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + declarative/CMakeLists.txt | 10 ++++----- + demos/metadatareader/CMakeLists.txt | 7 ++++-- + demos/phota/CMakeLists.txt | 7 ++++-- + demos/simplecapture/CMakeLists.txt | 7 ++++-- + demos/simpleplayer/CMakeLists.txt | 7 ++++-- + designer/CMakeLists.txt | 10 ++++----- + phonon/CMakeLists.txt | 33 +++++++++++++++++------------ + phonon/experimental/CMakeLists.txt | 9 ++++++-- + 9 files changed, 57 insertions(+), 58 deletions(-) + +diff --git a/declarative/CMakeLists.txt b/declarative/CMakeLists.txt +index da2d2eb9..cdc1b842 100644 +--- a/declarative/CMakeLists.txt ++++ b/declarative/CMakeLists.txt +@@ -19,11 +19,11 @@ set(declarative_SRCS + + phonon_add_declarative_plugin(phononqmlplugin ${declarative_SRCS}) + +-target_link_libraries(phononqmlplugin +- ${PHONON_LIBS} +-) +- +-qt5_use_modules(phononqmlplugin Core Gui Declarative) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(phononqmlplugin Qt5::Core Qt5::Gui Qt5::Declarative ${PHONON_LIBS}) ++else() ++ target_link_libraries(phononqmlplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${PHONON_LIBS}) ++endif() + + install(TARGETS phononqmlplugin DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon) + install(FILES ${phonon_QMLS} DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon) +diff --git a/demos/metadatareader/CMakeLists.txt b/demos/metadatareader/CMakeLists.txt +index a307c071..69e2b3a6 100644 +--- a/demos/metadatareader/CMakeLists.txt ++++ b/demos/metadatareader/CMakeLists.txt +@@ -13,5 +13,8 @@ set(metadatareader_SRCS + + phonon_add_executable(metadatareader ${metadatareader_SRCS}) + +-qt5_use_modules(metadatareader Core Widgets) +-target_link_libraries(metadatareader ${PHONON_LIBRARY}) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(metadatareader Qt5::Core Qt5::Widgets ${PHONON_LIBRARY}) ++else() ++ target_link_libraries(metadatareader ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY}) ++endif() +diff --git a/demos/phota/CMakeLists.txt b/demos/phota/CMakeLists.txt +index e9a4ee34..aa70cf39 100644 +--- a/demos/phota/CMakeLists.txt ++++ b/demos/phota/CMakeLists.txt +@@ -17,5 +17,8 @@ qt5_wrap_ui(phota_SRCS videoeffects.ui) + + phonon_add_executable(phota ${phota_SRCS}) + +-qt5_use_modules(phota Core Widgets) +-target_link_libraries(phota ${PHONON_LIBRARY}) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(phota Qt5::Core Qt5::Widgets ${PHONON_LIBRARY}) ++else() ++ target_link_libraries(phota ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY}) ++endif() +diff --git a/demos/simplecapture/CMakeLists.txt b/demos/simplecapture/CMakeLists.txt +index cd910707..811d29c6 100644 +--- a/demos/simplecapture/CMakeLists.txt ++++ b/demos/simplecapture/CMakeLists.txt +@@ -13,5 +13,8 @@ set(simplecapture_SRCS + + phonon_add_executable(simplecapture ${simplecapture_SRCS}) + +-qt5_use_modules(simplecapture Core Widgets) +-target_link_libraries(simplecapture ${PHONON_LIBRARY}) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(simplecapture Qt5::Core Qt5::Widgets ${PHONON_LIBRARY}) ++else() ++ target_link_libraries(simplecapture ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY}) ++endif() +diff --git a/demos/simpleplayer/CMakeLists.txt b/demos/simpleplayer/CMakeLists.txt +index 3d66c74e..f759224f 100644 +--- a/demos/simpleplayer/CMakeLists.txt ++++ b/demos/simpleplayer/CMakeLists.txt +@@ -13,5 +13,8 @@ set(simpleplayer_SRCS + + phonon_add_executable(simpleplayer ${simpleplayer_SRCS}) + +-qt5_use_modules(simpleplayer Core Widgets) +-target_link_libraries(simpleplayer ${PHONON_LIBRARY}) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(simpleplayer Qt5::Core Qt5::Widgets ${PHONON_LIBRARY}) ++else() ++ target_link_libraries(simpleplayer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY}) ++endif() +diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt +index 9d437547..e9d2e982 100644 +--- a/designer/CMakeLists.txt ++++ b/designer/CMakeLists.txt +@@ -11,10 +11,10 @@ set(phononwidgetsplugin_SRCS + + phonon_add_designer_plugin(phononwidgets phononwidgets.qrc ${phononwidgetsplugin_SRCS}) + +-qt5_use_modules(phononwidgets Core Gui Widgets Designer) +- +-target_link_libraries(phononwidgets +- ${PHONON_LIBS} +-) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(phononwidgets Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Designer ${PHONON_LIBS}) ++else() ++ target_link_libraries(phononwidgets ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${PHONON_LIBS}) ++endif() + + install(TARGETS phononwidgets DESTINATION ${PHONON_QT_PLUGIN_INSTALL_DIR}) +diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt +index f9ae09e5..b80c96d8 100644 +--- a/phonon/CMakeLists.txt ++++ b/phonon/CMakeLists.txt +@@ -137,25 +137,32 @@ add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_ + add_definitions(-DPHONON_BACKEND_DIR_SUFFIX="/${PHONON_LIB_SONAME}_backend/") + + add_library(${PHONON_LIB_SONAME} SHARED ${phonon_LIB_SRCS}) +-qt5_use_modules(${PHONON_LIB_SONAME} Core Widgets) + +-if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) +- qt5_use_modules(${PHONON_LIB_SONAME} DBus) +-endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(${PHONON_LIB_SONAME} Qt5::Core Qt5::Widgets) ++ if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) ++ target_link_libraries(${PHONON_LIB_SONAME} Qt5::DBus) ++ endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) ++ if(NOT PHONON_NO_GRAPHICSVIEW) ++ target_link_libraries(${PHONON_LIB_SONAME} Qt5::OpenGL ${OPENGL_gl_LIBRARY}) ++ endif() ++else() ++ target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++ if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) ++ target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTDBUS_LIBRARY}) ++ endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) ++ if(NOT PHONON_NO_GRAPHICSVIEW) ++ target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) ++ endif() ++ if (QZEITGEIST_FOUND) ++ target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY}) ++ endif(QZEITGEIST_FOUND) ++endif() + + if (PHONON_PULSESUPPORT) + target_link_libraries(${PHONON_LIB_SONAME} ${GOBJECT_LIBRARIES} ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY}) + endif (PHONON_PULSESUPPORT) + +-if(NOT PHONON_NO_GRAPHICSVIEW) +- qt5_use_modules(${PHONON_LIB_SONAME} OpenGL) +- target_link_libraries(${PHONON_LIB_SONAME} ${OPENGL_gl_LIBRARY}) +-endif() +- +-if (QZEITGEIST_FOUND) +- target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY}) +-endif(QZEITGEIST_FOUND) +- + if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + # We need to explicitly link libm to phonon in Solaris + target_link_libraries(${PHONON_LIB_SONAME} m) +diff --git a/phonon/experimental/CMakeLists.txt b/phonon/experimental/CMakeLists.txt +index e44cb7ac..13101ec9 100644 +--- a/phonon/experimental/CMakeLists.txt ++++ b/phonon/experimental/CMakeLists.txt +@@ -20,8 +20,13 @@ set(phononexperimental_LIB_SRCS + ../abstractvideooutput_p.cpp + ) + add_library(${PHONON_LIB_SONAME}experimental SHARED ${phononexperimental_LIB_SRCS}) +-qt5_use_modules(${PHONON_LIB_SONAME}experimental Core Widgets) +-target_link_libraries(${PHONON_LIB_SONAME}experimental ${PHONON_LIBS}) ++ ++if(PHONON_BUILD_PHONON4QT5) ++ target_link_libraries(${PHONON_LIB_SONAME}experimental Qt5::Core Qt5::Widgets ${PHONON_LIBS}) ++else() ++ target_link_libraries(${PHONON_LIB_SONAME}experimental ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBS}) ++endif() ++ + set_target_properties(${PHONON_LIB_SONAME}experimental PROPERTIES + VERSION ${PHONON_LIB_VERSION} + SOVERSION ${PHONON_LIB_SOVERSION} +-- +2.17.0 + diff --git a/media-libs/phonon/phonon-4.10.0.ebuild b/media-libs/phonon/phonon-4.10.0.ebuild index 478b0d3bb95d..5da7537646b2 100644 --- a/media-libs/phonon/phonon-4.10.0.ebuild +++ b/media-libs/phonon/phonon-4.10.0.ebuild @@ -41,6 +41,8 @@ PDEPEND=" vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] ) " +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_configure() { local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON diff --git a/media-libs/resid/Manifest b/media-libs/resid/Manifest index c58789b4055f..5e88e5383c45 100644 --- a/media-libs/resid/Manifest +++ b/media-libs/resid/Manifest @@ -1,4 +1,3 @@ DIST resid-0.16-p2.tgz 329919 BLAKE2B 00f93b13351ec6387579755ad2b6b44394d6a1d2f2c0a6077e581db01628e84c07e6707b7c8b580492989adc8b5a5f89de670792b38bf2d8037b4abb22f88c2d SHA512 f7e86e97ea6d17c3e75b7763974b1182b49b2498c5fd3c1b0665c026ea6473cda3f9fc70bc123ac1357034879e3caaf41279d2253a8122246dc7e1c70c063d09 -EBUILD resid-0.16_p2-r1.ebuild 946 BLAKE2B 59439c00ed08d5560ea5fbfc80d585149184e43d7278ab55113ab6bcab7f25260381adf21f4a39a5c23dcb88f5424d6981e056e809c4463be8111c9eb5db329e SHA512 914f3b2b5fea7e9814e13c4d6fc97df767f14eb7abfe94caddeff852b5318a9af947767f5bf4e8fc014b4e579e0cf4d37b297c55eb7d827e701dda6e96e092fd -EBUILD resid-0.16_p2.ebuild 917 BLAKE2B 29a24f61ba93fbe9fea9c0e2673e73167e9006816c357e5a10343fdac23dc227435e46b5e983345cfd9b4a97c23ca822d7593a0b3b517ef404c759e2c52edf7f SHA512 784a25236b9d5d37fe0c65c955296e556869307530d4856681ed2b8d6553bb5228db20e459df1e4693d7cf748a0d17782dfd633ba52d8bc19fec220f68498605 +EBUILD resid-0.16_p2-r1.ebuild 945 BLAKE2B 8f7f1a1124266fe2f48cc087af83255226c35088a13907bea61f257b12a47d78479918d4b6388644faf67a1e544b6e8848af88ad8f1bb7f586299fb8adfe3e8a SHA512 47f2aa96873dc1b57ace425482f9b49a9837321e6ebcec4e197d5e01302c03f305759c5b23e4c2ad9c62dc28bcdae4a806e60807c5956ec19890c114d46986eb MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8 diff --git a/media-libs/resid/resid-0.16_p2-r1.ebuild b/media-libs/resid/resid-0.16_p2-r1.ebuild index c1ad72df72cb..dfdd3c337a53 100644 --- a/media-libs/resid/resid-0.16_p2-r1.ebuild +++ b/media-libs/resid/resid-0.16_p2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${P/_p/-p}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~ppc sparc x86" +KEYWORDS="alpha amd64 ppc sparc x86" IUSE="static-libs" S=${WORKDIR}/${PN}-${MY_MAJ} diff --git a/media-libs/resid/resid-0.16_p2.ebuild b/media-libs/resid/resid-0.16_p2.ebuild deleted file mode 100644 index a4a9b8ff6fd2..000000000000 --- a/media-libs/resid/resid-0.16_p2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit autotools versionator - -MY_MAJ=$(get_version_component_range 1-2) - -DESCRIPTION="C++ library to emulate the C64 SID chip" -HOMEPAGE="http://sidplay2.sourceforge.net" -SRC_URI="mirror://sourceforge/sidplay2/${P/_p/-p}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ppc sparc x86" -IUSE="static-libs" - -RDEPEND="" -DEPEND="" - -S=${WORKDIR}/${PN}-${MY_MAJ} - -src_prepare() { - # This is required, otherwise the shared libraries get installed as - # libresid.0.0.0 instead of libresid.so.0.0.0. - eautoreconf -} - -src_configure() { - econf \ - --disable-dependency-tracking \ - --enable-shared \ - $(use_enable static-libs static) \ - --enable-resid-install -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO VC_CC_SUPPORT.txt -} diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index f70c63046b31..c733ca354088 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -1,6 +1,6 @@ DIST x264-snapshot-20160712-2245.tar.bz2 730644 BLAKE2B 3d80d831c5a13ab95f9a4ba269f959e36aa35f4f2914d435b9e9817fcbe40105f44881b0dbb92cad4b9c41e25536194ff2b7c35925bff9016ebca5e38b16c54e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f EBUILD x264-0.0.20160712.ebuild 1996 BLAKE2B 57431a358195c6c3a061603ceef6dac39c5e74f1ce6c71505a4e670a6f4ca1daa2a43234184d4721cc03142a86d462616fd43f5ba9d4aa7340c5a01767749d6f SHA512 086681d299da2130bd4362d20af2d7085297616a28b8b12bf540bb60bd8032dc934597d39437b5c12805d6e48bef6c6afc2cefd569291325ef597ae6c11d2599 -EBUILD x264-0.0.20170701.ebuild 1910 BLAKE2B d394e4141860e14bb1a0459c94fe934d1bdce070b50079cc9863468cd07d9fce5be7df2e36c8e07f69543ec26a41ec841c21e6bd069e7c5b9ca64f617fd84ee6 SHA512 b001c59128cc214d6f2a13d3de024ea0b3779d6536be68d61a20f92882df48d8f2de7afc8d34f903d445c6716d64c514af1139e4164c551e3a2e2b3dd9a53af9 -EBUILD x264-9999.ebuild 1872 BLAKE2B 11fd5c709aff1160cb47eeff901e5e767a62b78ae099dfd7004a88ad2f8409d0fa239cf838fcdd0c6c971cae08a9f1911602c43caf3fdffc715c0f86dfbcb915 SHA512 b45280bc7602ff5787f337a63e121356ac1f659209eeea8e9247fa17d540a7eadbe85ba67865340921e059d627749445bd93e3ed609fa87579628bdd2265aefe +EBUILD x264-0.0.20170701.ebuild 1909 BLAKE2B 6eb72230f695deaa28fcd12d6fe1ce12fcee3baa64c1e8da2d978703fd1e59b84cdf5986adf10fa4c0e7ea2ad726bf64ea6f0fc9b5afd3cc424122641368d30d SHA512 2c9eb26ab00db320ab064a3897281083a8bee24f40d4d6cc35100d6f7a2ad5fe14a8e8ef3fb50c52d8c61fdfb26d92d839261f9aa704d23bf0c5320009dac649 +EBUILD x264-9999.ebuild 1872 BLAKE2B 8910e4673e48bd4cd6c503436d28ca1f3f00bf96fa61193fa06761cffd928213c96f8bd21151669784083b29d80604eab4bf57fb9c0740f18d4f57684e7de247 SHA512 89201b028151be9f7758f317cae3bbf81d1f8a3f82dd8e3e20c01abfa97b27a836ec95d4855ec93d208ee4381f17da3bd94c1ec9291ca980ebed210b930119c2 MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e diff --git a/media-libs/x264/x264-0.0.20170701.ebuild b/media-libs/x264/x264-0.0.20170701.ebuild index 9c7051e4fa4b..b956be635d77 100644 --- a/media-libs/x264/x264-0.0.20170701.ebuild +++ b/media-libs/x264/x264-0.0.20170701.ebuild @@ -14,7 +14,7 @@ else inherit versionator MY_P="x264-snapshot-$(get_version_component_range 3)-2245" SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" - KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" S="${WORKDIR}/${MY_P}" fi diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index be9802ee557e..a9eca18e63e1 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -18,7 +18,7 @@ else S="${WORKDIR}/${MY_P}" fi -SONAME="152" +SONAME="155" SLOT="0/${SONAME}" LICENSE="GPL-2" diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest index b8639a899b36..feb0c2019a14 100644 --- a/media-libs/x265/Manifest +++ b/media-libs/x265/Manifest @@ -5,7 +5,7 @@ DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164 DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736 DIST x265_2.7.tar.gz 1282742 BLAKE2B 5f7290a71009f1ba177b2a653c48b62d8067930e8e53e4f9dd149037d3cbc69acbcae9c5364d46e6cc127f7d70e2acaaed2abf3ef065ecae303088132f341757 SHA512 58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094 EBUILD x265-2.2.ebuild 5675 BLAKE2B 23cf92f51a8a8fed656a17cf0a59893931d42df5be17357a2873dd0da46bcf12ffd0b6c46d62ccd396566a7f53e8bdca5fbfbfbe72d4ff7d3a6454f1a4272cec SHA512 546d1f76b40c33047ad947c91c698111e8dabccf84562742b8c0142a86ac6148ea1b3efe238952d414f0f27ec24b8f159b76c1d6c53db811e84953ea6cf64ffc -EBUILD x265-2.6.ebuild 5656 BLAKE2B 2cdb5b879627e4cec4739c8c71ae5421608e499108f6585df504ad36853537a5c28e796244ec7cf26835f7179ca4c0fa6b01246a2cb100bfb3d4aaa7ec360cd1 SHA512 04865733c3191edc05e36e29426ebf2885b395e1cf6777035c95519ba951b76de036da1f7676d07358faca517d36075578e5a033adb8e9eb033e7facaf0fd46b +EBUILD x265-2.6.ebuild 5655 BLAKE2B 14c7e2883c62df6520eb12c151991d10a444276f97eae187fe7fcdd2e95600d05341e8032c1715b8c39179f9d327b4e94b5fa2347c7b6fb1f4dd0f9c5f2eac04 SHA512 39fe223958ab599a669283120a46e140cd57bc63bbd60f52b3d3d74f4a95b99875349282e10bf898efb97aa2df36d43f2d52a6e8f51a5f820eb2ff10f32d2c47 EBUILD x265-2.7.ebuild 5661 BLAKE2B d8c795c3923982eb5a13a290d409c822abd8421b0d1e058202b34204fe79d743c3eee3d4ae579533497595214a7a2de71646ee6e81aec8b4830a287e4c2c1ec9 SHA512 4bad0afbb56a8659ed7ee2d213c59f3c76ffd2a8bc192f083609a53d72e7818c70926293886c9b509e56a11f64b5dc375397bb4feba333355ccd831ba1ef1c46 EBUILD x265-9999.ebuild 5661 BLAKE2B d8c795c3923982eb5a13a290d409c822abd8421b0d1e058202b34204fe79d743c3eee3d4ae579533497595214a7a2de71646ee6e81aec8b4830a287e4c2c1ec9 SHA512 4bad0afbb56a8659ed7ee2d213c59f3c76ffd2a8bc192f083609a53d72e7818c70926293886c9b509e56a11f64b5dc375397bb4feba333355ccd831ba1ef1c46 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6 diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild index d2dc1f9cdac4..23eefb2d499e 100644 --- a/media-libs/x265/x265-2.6.ebuild +++ b/media-libs/x265/x265-2.6.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" else SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" |