summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/Manifest2
-rw-r--r--media-video/ffmpeg/ffmpeg-4.1.3.ebuild2
-rw-r--r--media-video/mkvtoolnix/Manifest4
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild4
-rw-r--r--media-video/motion/Manifest2
-rw-r--r--media-video/motion/metadata.xml8
-rw-r--r--media-video/mpv/Manifest6
-rw-r--r--media-video/mpv/metadata.xml6
-rw-r--r--media-video/mpv/mpv-0.29.1-r1.ebuild2
9 files changed, 23 insertions, 13 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 44e9c55d824d..cafbcb3758ad 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,7 +7,7 @@ DIST ffmpeg-4.1.4.tar.bz2 10691784 BLAKE2B 5f1f0b3c78cdd913e44bef448ff4d26fc5ea0
DIST ffmpeg-4.2.1.tar.bz2 10953293 BLAKE2B efc60a7e4a185d48a9ae7a5737fa930dea35ca19f1e2505fc4355815a8216f365134a018fb7a5eb7be8709989d27c2c0a56f7783e3f27eb12795e005fd6dc28d SHA512 5bd556546716ccb5292289c3092c11f216e573d0b09a015fdb568dee7544878d057d922a63758867f0343a09262d7b51023e862b70cefc529875f2319e716de4
DIST ffmpeg-4.2.tar.bz2 10954171 BLAKE2B 1c2dfeb000a0cc85ca23d255163336db132b5f16cb184a0f3363f68108f5bde0220050b351f9c50273ef6642f86f1a43832f4b831928d95dd991a908c7c25e2e SHA512 74d06a420af61e05d9e076f4f433e8316590c3b850ada96e74c1df39431db1595f74315bdef624153edb160b8bef8683a4e9f35d69714cde4b5ec72aeb1d28e1
EBUILD ffmpeg-3.4.6-r1.ebuild 15659 BLAKE2B d2dcdc4da728c0466d9cdd8c1e3f92253dbb4381d8f179a48761e631d79f727a95e6b4bff104189054e5a391786c1060ccdd257bf19b60df63df973c34883a77 SHA512 75460743011065d4f2e29e56029991c42f499bffdd66c3aa2ada3792c4449f193ac2a8a5dfcee234b170a9d4e5f9e889c24ec86fbf6713b853357e00d05e27e9
-EBUILD ffmpeg-4.1.3.ebuild 17095 BLAKE2B 396677e143c34c31554d759fbf62f93f67321cfca6e8dc75c1b4f8f0553952c71f2594354591023b704132219eb3af4366497a4c4394228d305e9258b3f31f99 SHA512 19afd60f0d0ebf64d0d9bc4a3760c52d825ca3ecba98f3fba5604e393514244acfb71049662bbf233cb3b2567fa7365f8c0a10ecfdfe0782900447baa1dfb495
+EBUILD ffmpeg-4.1.3.ebuild 17094 BLAKE2B 8cbd003eff1d0e4dce8fc96323119a65399da0b8249973d9c516ecc452b49c2c56dd74f9427a4d0ab66c12d5d21d05dbe11bac7c7dc0e0b1d1b91ae235f7b5c3 SHA512 15983c8e5444a2b470572aaf6958d809a7000bcd28bccb83c07a05b18c5cc84f1c7a166442b2f065fa727a9d84a2511d153a761a91b93049e0837cf5fff1d98a
EBUILD ffmpeg-4.1.4.ebuild 17099 BLAKE2B e58b016483c1c96996e020a1cf242df7fbeaa2d539e56eb519d454f337c1c7ca352d84f5b63bbd9b6c46d4d39d9e47d7082b78d1c3fdc9a774e930856926759f SHA512 f5686aa2e4c6302b29ff713bf7fab5542d94a15dcb646778d103c5282568a7cf1d3d871163f05ea68ea8bc22058fceb992308f969e6478386b2f67f75264b467
EBUILD ffmpeg-4.2.1.ebuild 17688 BLAKE2B df6b71d84b40f3455d1f4ab67387c371a8f6b02d6cd912c810662728750737ee6bd02d549feb9ea40beff1bd4fb68c6ca283454a8f7a0d7fb6d1d6c07928dd02 SHA512 1902f5fed8d047f3e0b50fbbc0d8b6173b72f408a1ba4dd8e2652c493ea5c9dc29e1d3513000c93563c141167d0901fcc3c9b5008c9472481b3e28cf118b3c19
EBUILD ffmpeg-4.2.ebuild 17688 BLAKE2B df6b71d84b40f3455d1f4ab67387c371a8f6b02d6cd912c810662728750737ee6bd02d549feb9ea40beff1bd4fb68c6ca283454a8f7a0d7fb6d1d6c07928dd02 SHA512 1902f5fed8d047f3e0b50fbbc0d8b6173b72f408a1ba4dd8e2652c493ea5c9dc29e1d3513000c93563c141167d0901fcc3c9b5008c9472481b3e28cf118b3c19
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index 3af4888bde3f..29ee8125994c 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -55,7 +55,7 @@ LICENSE="
samba? ( GPL-3 )
"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
# Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 8725c3994b33..0c50b9e05ea8 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,10 @@
DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
EBUILD mkvtoolnix-35.0.0.ebuild 2673 BLAKE2B 2e0f0339434a91911d6b09541c1e1ea0a33deb365e82c13cd97a976c0ffff08a340d2402bd5a6949d24a9565e2406c5403a684f582068eb505494938fda9a89e SHA512 55744b23a1f061e14601d157309615bed32a282a0d6c3b84aa2dd1212cdcaf264d6e6b28f345bfbef16759c01e3f88e20457ccb0de40ee2d9f86569dadbb5f06
+<<<<<<< HEAD
EBUILD mkvtoolnix-37.0.0.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563
+=======
+EBUILD mkvtoolnix-37.0.0.ebuild 2609 BLAKE2B 0b11227821e40722646ce98f05cc1c54ac5667672c8959e1174de4beeaa446a6bd4450c363ada5aa3dac00e96bffb1c045c73183c592d489412c2edbd26a0c6e SHA512 86748441100688abb58bfc748119a95cfb9f6ed9de1ebfc2f43d9233d0e88a5410cde46e9645d5a9c93995d6288e3d666346f324a888f1a78dd63b76a8e23424
+>>>>>>> next
EBUILD mkvtoolnix-9999.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563
MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
index 5fa946801729..ffdf966c2335 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
@@ -11,7 +11,11 @@ if [[ ${PV} == *9999 ]] ; then
inherit autotools git-r3
else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+<<<<<<< HEAD
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+=======
+ KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+>>>>>>> next
fi
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 6ca09a67f598..f3e65258a4b4 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -5,4 +5,4 @@ AUX motion.initd-r3 1163 BLAKE2B 1926b3468c1b49651377c2704fe8f5cb65c9eed5a4bd11e
AUX motion.service 356 BLAKE2B 089fa555b8de569824ff7c063961d13db811cb44cdf7dacee9638a72b95c5db047f93f1387b0067ee7e61816e9af29aec8215bc76e6838a2e12b404299817175 SHA512 03f875b1e0c7051496eaa28a0af50164b20c6f7646d40ec09e1a360e81747135299fe092c91e57a28464bac826a0ace54267ceecd9abf41e63fe505d58ecf7ed
DIST motion-release-4.1.1.tar.gz 447795 BLAKE2B 8c7dfdad89f49ba8ec39689d268b4bc95c6a8bd85d4bd333f66638b2e815b3c59b2e42dd93811601b2ee7870100a0a21eaa789633056f74a5cc9f39f4f92229f SHA512 3b08d464f9243ccfc4b53b16cfc2001d1e0d206bf0295d55d8914914bc14ad0248ce5ac622cb7eb89ed32e1913a9a10add1b56497c4094ba876f7f85d6ad4143
EBUILD motion-4.1.1-r1.ebuild 2201 BLAKE2B 4d13ce93172ccd468b3ecefcfb29b05c2bb269eae814f5f3b8fac49375c0b62b5ad17ae86f444e361f1325bdbf584427e3e4a398ee938f388c21ab477ee04915 SHA512 2cb06799e59e465feebb41ce49065521f6f02d0b4ac337ff58f55b965f3369095bd38ae105b6ec6b8c8fce831e62400a0570e1c09414903ea7f462b24a7a437d
-MISC metadata.xml 688 BLAKE2B 62d5d1fc2c9581ee8d66557903d17060627060d4cc76d745bee2bbb17980bc81337574986a7bb1b2d6f669041ba09b355fce68655f9961d388f3ae40a65d3fb2 SHA512 f69d8539a16d80a49c147a60f8e831a245814c4853383f9991f4c2762aa2d1b7f22b8993eb7184a49c6c783b75d23ef91a10b6293563aa7e29f561f40fad56d1
+MISC metadata.xml 450 BLAKE2B 39d7909c8d8dc5c691540bdbc0e1971e9e04131208ec74a9750dcf09e607a160d6b7beceaab9325c58ecf4c6e92da3ab3dc0ffb059d9b917bb4ccc87582a3ff7 SHA512 75ad87d6a0a305f87ac034413698fc33c3d564e580a76626d9a9867a5bc691180838e96d7198c330b75b209a014be8f836170a7cce668ab590b8ee3ceaff44e8
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index e02a13726c5e..b1389a2954b4 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>vilhelm.gray@gmail.com</email>
- <name>William Breathitt Gray</name>
- </maintainer>
<maintainer type="project">
<email>media-video@gentoo.org</email>
</maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<use>
<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
</use>
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 7767dd616c92..96ffd053d456 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -9,6 +9,10 @@ DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5a
DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
EBUILD mpv-0.27.2.ebuild 10639 BLAKE2B d5b64552973347ec3ac9423029dfec5448cb2c36e7cdfd293c2a61fa4d4fe9fb59837719eae234c5f46eb4396ef3f409669a2b1a5da62f59fc90712e912ecd72 SHA512 ebd5a47f15408583f1dfe1a9fefe40a2b0fcf968f6a71b5c603d5bd85187f51cee926f6f1cb6746050715b2aea64bddc4771ebccf307f1ec1d3f466e31e3658b
-EBUILD mpv-0.29.1-r1.ebuild 10289 BLAKE2B 7b83aa8a45ae5d2f6a92cff0574b42f5d591c2463e46546e53725f76baab2a4c78a19729fb6a9776052602b657757fcc67c3f1f65e51202066eb8291ff74b6fd SHA512 cb5cdd92402e1c445b4eb40986569fd061e197005c23cfff3ef7db9a0aea812116e3771c8738664c93d5d4d7bfb6611e2f8a825ff4f6be2bffd15b77015e43c5
+EBUILD mpv-0.29.1-r1.ebuild 10296 BLAKE2B e683008242a323ec31bbdcc73b823e65ad6b296687f1832e8d6f85a571c029b67780e4440ca52a12252edb6e5f7a0feb022ee742a187280002862a28e00f2f85 SHA512 5e03a94e4640b82b33a7099034450dc942dcdd9b2b9215172c8c426cfd0437b5f2e5ced09aea27593ead91694f8dd2913dbb396d8d25b0b5315320acfb0990aa
EBUILD mpv-9999.ebuild 10323 BLAKE2B fceb344df0fe5a8f600db00cabe4c64985de7db4b15c3eea31c492f9f41ede8cbf91d072e19bc5b323f0e71e13d1bcc633dbb59d8c689df8d39744eb0ea8ea9a SHA512 14ae91c3b6e08361fab33987998471d0dc9b6c9a3ddd5cc2fac0e66b6f55db78fe0ac0170b5b3544853194edb0dd2612505637c7b1682136e1129f175d54e10f
+<<<<<<< HEAD
MISC metadata.xml 2207 BLAKE2B 41d54819efc59037d5d086dec0f47f85d19d784c59db5dd54b30fe4334d2e58225a6a97dc5b71f257f95b36557268d2896a537f1ca7ac02c84fab52b90df502f SHA512 c64d32e92d343682154ad564a094bd045c22822272a32694aa37aed52b230fcf141013940e69fc8604b3f8a7a54b73d8b4c9b227365fa84cfb68a1680ba96767
+=======
+MISC metadata.xml 2195 BLAKE2B 2cb6ef92e3152efff57b7284f907512fe5ccccd38bff5ddbff746565780636478016312b9612dc817613e4bfc3b5818d4e919a16bb4ba12b85f8fce797dac1f7 SHA512 5d771852f9431e46301fe644a407c1c800c4cf1b9bc7a274d03822f999c5c3366b738e4678f400e05fb6ac5cffb8ad98007a7ac9c369889d08a7fece9ec72e16
+>>>>>>> next
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index e34fb5f41655..78824a7b5960 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<<<<<<< HEAD
<maintainer type="project">
<email>media-video@gentoo.org</email>
<name>Gentoo Video project</name>
+=======
+ <maintainer type="person">
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
+>>>>>>> next
</maintainer>
<use>
<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
diff --git a/media-video/mpv/mpv-0.29.1-r1.ebuild b/media-video/mpv/mpv-0.29.1-r1.ebuild
index 4521191d10fe..c8e08108c8f3 100644
--- a/media-video/mpv/mpv-0.29.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.29.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
DOCS=( RELEASE_NOTES )
else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 18:56:17 +0000