diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /x11-libs | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libXvMC/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/libXvMC/libXvMC-1.0.12.ebuild | 5 | ||||
| -rw-r--r-- | x11-libs/libdlo/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/libdlo/libdlo-0.1.2-r1.ebuild | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest index 2cb349bacf03..3c59e5b80be6 100644 --- a/x11-libs/libXvMC/Manifest +++ b/x11-libs/libXvMC/Manifest @@ -1,5 +1,9 @@ DIST libXvMC-1.0.11.tar.bz2 303516 BLAKE2B df1a34ead982c9b88428143d1c6250ef7d4353a6fc4e151c587f62ab91195e3e2c3b320beb1817b5e0b8a6db485aa0b839084361ec60a798ac1476b684542af3 SHA512 4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476 DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 EBUILD libXvMC-1.0.11.ebuild 561 BLAKE2B c953baaf4ad3a58c66d04548d61cf43f2b4c21a78dcd326e08ef3784c8a860de9c2a80e9aaee205afaf6ce6a8910e7c4bbbcbe9392e1405e193afa86bdf8a366 SHA512 ceb481b9ed6f856150da175cebe9a1142279e0ee95faac19d0ab7485df090ee421a16a64e309b4ae16e1a1c830a9909ac9ce58619a5e0654c50b96687b90c148 +<<<<<<< HEAD EBUILD libXvMC-1.0.12.ebuild 572 BLAKE2B 55ea00c93304e27424d491951048c6b1f1ccdec48debef77f16f04e3bda4ec1a92df69f74339256acc0abe790b7dfc517675fcd6874c895c5835d12d00fa1c2d SHA512 6eb785778d93e81b398d207215a52a1159a589f91e79b591ef2068db5fbd42586d705eca7b7facf4ae9e6846216135fb5a57ff9128d0d8a7a51205ac1f8bf0ff +======= +EBUILD libXvMC-1.0.12.ebuild 602 BLAKE2B 69cc678431a16a42c4def165c4fdade82a46c5a96dcc4e93e2a6e7b9a7ed130c04a64c8dc99446c73cac5c65c0c363330f790abca1bbd6a944083ebec579d0b4 SHA512 7e769d6b7341c1bf300d7be28c0254ed8b09063b76d91f73eb6c220a8d045fbfc3c90d3c96cc36d64fd9659482d089213ecfefcf36157d6e5c4fedbf43320733 +>>>>>>> next MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild index bc60b8a91c31..d3db40e39822 100644 --- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild +++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild @@ -14,7 +14,12 @@ IUSE="" RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] +<<<<<<< HEAD >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]" +======= + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + !<x11-base/xorg-proto-2019.2" +>>>>>>> next DEPEND="${RDEPEND} x11-base/xorg-proto" PDEPEND="app-eselect/eselect-xvmc" diff --git a/x11-libs/libdlo/Manifest b/x11-libs/libdlo/Manifest index 1885ae51197a..98831f6e9fe3 100644 --- a/x11-libs/libdlo/Manifest +++ b/x11-libs/libdlo/Manifest @@ -1,4 +1,4 @@ AUX disable-testprogram.patch 832 BLAKE2B d0658618b0042f51e0f85efbff77933e62efc2acf571bbc539f908a771d290834d5b60f3840cac317d56f378f0c3b1c457fb966782df417d8d3af33c6dee88c5 SHA512 b07a0ddd5eca10f13e82039690c3d310981cdafebc38a9e632a55be38c5c8ff22b7dddffcf0ab0f9795e650e61f9079ff1d9c12b3ddaad8d018f060c377aecd3 DIST libdlo-0.1.2.tar.gz 476865 BLAKE2B b2391b58046e1f403b7e0d1eb915a46aa17c47e8ad804246f12f3b94f9ffb4dbc811e5d08aac29c2f4196b5d384e7244bddad3193adff5d5e890a7463a503fbb SHA512 6df69bebcf3142e0a87f66bb9d690fd78b96e08c2ae5d46fe0f3d91bc135364d5f5dd0c3a481705c3cd90c78a0a076757220fbcc3b0ad4343cdddb54501e3f2f -EBUILD libdlo-0.1.2-r1.ebuild 1157 BLAKE2B 3918cc2d81e944fecbd3f3e8e654d9ec330cf39e6695cd7bb0aa6f9fe40109a5d68d21f0f9f3167e7a01eb382c391dcf8ab12c49a5910b5bbff550a5e94fc625 SHA512 d89f090b004872757d638feee7b591571c02cffe97e7c25e43170aa9c04d1317359c2607a311f553af0ed5f0e3cc4fec37796aeb090b10e3f20a4ba65b00e930 +EBUILD libdlo-0.1.2-r1.ebuild 1156 BLAKE2B d84d3f58cae1d9a5c0b28bb1059b2d5b51915bd2b0c298241422131a13cdc863cd5737eeb970953a2d5572b1e0569b982949049e7278758c586696ad8da31eeb SHA512 782485349b3569dc7d7f33386080aeb2791befe5fb62dc401e791a526ca12530f12247568a992b93536c01867cde4f8c46d6672ad7e15aa927e496113eab5e77 MISC metadata.xml 807 BLAKE2B 84e05485afa5f0e78ea57310124a541c4f1855c36ae9b49568fa9a4d672484e6fe5d02b71e4325c3a07cf5edda074b02410c4b7b52a967840bb695b98e135546 SHA512 56c18fe35f8c672f9d694fc2c62ffd864774baeeeb9cfd8f75118cf7e51376ee7a4280933d53aa5ed5e85dd605ecca737a70a37c4b82b7293bc2963d250a4c96 diff --git a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild index 1b720a84b95b..77e257d710b5 100644 --- a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild +++ b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~berniet/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="static-libs test-program" RDEPEND="virtual/libusb:0=" |