diff options
Diffstat (limited to 'media-video')
68 files changed, 747 insertions, 1482 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 3d193cbd5d78..314f290f7f0f 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest index 8415ab9aaa08..d3fdaf5489e3 100644 --- a/media-video/aravis/Manifest +++ b/media-video/aravis/Manifest @@ -1,4 +1,4 @@ -DIST aravis-0.6.4.tar.gz 2972111 BLAKE2B b7f1c4da08bb4e7d11faffcd4ef90b7215b803e5e74ba1730388e04304685b761024ffea49b082c94e3fddc9dc65201545167a277b1088ad7273d41d50fae5b0 SHA512 6090fd730ad9fe8e1641e48c52189e8961bf03a88cefb57135a2de985c2ca607c21b05d472a60586976aa1e05ba2121246b06b75179dd3241e1f703aad8dd7be -EBUILD aravis-0.6.4.ebuild 2397 BLAKE2B b26d7df8c73d19176ca75647b0fe86df3d75d65d2212a4b27c913cd38cb5acf4b9d98ddabbe952a64dcc5b44066b8b47fae067430c30d5bd060fd2d13ccf08d8 SHA512 c37c9fa700a320cc87b38cb3b019cd13870f7dc6206b07dfbdaefd6396dcda0e6f441888c2ce319549586cc319de4657f761846bc00cecf844edbe39cdc7acff -EBUILD aravis-9999.ebuild 2397 BLAKE2B b26d7df8c73d19176ca75647b0fe86df3d75d65d2212a4b27c913cd38cb5acf4b9d98ddabbe952a64dcc5b44066b8b47fae067430c30d5bd060fd2d13ccf08d8 SHA512 c37c9fa700a320cc87b38cb3b019cd13870f7dc6206b07dfbdaefd6396dcda0e6f441888c2ce319549586cc319de4657f761846bc00cecf844edbe39cdc7acff +DIST aravis-0.7.2.tar.gz 940928 BLAKE2B 67b6772aaf6195e393caf2f3fcf6d24acace9d7160023c801f93d479e9d488e4082dcd11d40a8db18dea6cd516e0b24cb78e46de09d455a3c822208d9f33af5b SHA512 5cc6c01f77462c595a87a5899df752a5018e72b4de108fc3bcebbb39542482fc535401a7f10732270d98998fe807c929ae9e7750cc7ac0ce089763d1eb148e2a +EBUILD aravis-0.7.2.ebuild 1583 BLAKE2B edd715fb9fdb9165a09220f99d56aa291c61aa9a0b712dd842f875a2c3141cd9d89c7506fa9eb4c1cfd8c81d76f70a76f9c3df8ed16d20c2628cbf870c6ed2ac SHA512 22684658e389605e30f2e23d7bcc2c9cb2f59955d84d51e915a65b97a1ee4a86dd3b887ac83350eeca19ce5bc99f5dff553eb13f907bb6d764ffb06154f09cc3 +EBUILD aravis-9999.ebuild 1583 BLAKE2B edd715fb9fdb9165a09220f99d56aa291c61aa9a0b712dd842f875a2c3141cd9d89c7506fa9eb4c1cfd8c81d76f70a76f9c3df8ed16d20c2628cbf870c6ed2ac SHA512 22684658e389605e30f2e23d7bcc2c9cb2f59955d84d51e915a65b97a1ee4a86dd3b887ac83350eeca19ce5bc99f5dff553eb13f907bb6d764ffb06154f09cc3 MISC metadata.xml 1034 BLAKE2B 61fbcc77a880be8ad08247941fd60fb7efcd04dda5b95928b15121d3e0343b570c95d617845afffd8cab943a0bdca8d598e2145686d7a6528c95b5336b2c4e7a SHA512 4c86b8bfc2c0c4f8da3be0f08cccf0d18c5897edd41c40939ea0a6f79881353991629d02a8e28d1b3cdb2da2d77d7275fd77bb23f7a394a82f4a2cfabe177004 diff --git a/media-video/aravis/aravis-0.6.4.ebuild b/media-video/aravis/aravis-0.7.2.ebuild index 5ffb500be0c2..f2dd9137fe00 100644 --- a/media-video/aravis/aravis-0.6.4.ebuild +++ b/media-video/aravis/aravis-0.7.2.ebuild @@ -36,7 +36,7 @@ BDEPEND=" introspection? ( dev-libs/gobject-introspection:= ) " DEPEND=" - >=dev-libs/glib-2.34:2 + dev-libs/glib:2[gtk-doc?] dev-libs/libxml2:2 sys-libs/zlib gstreamer? ( ${GST_DEPEND} ) @@ -44,7 +44,7 @@ DEPEND=" usb? ( virtual/libusb:1 ) viewer? ( ${GST_DEPEND} - >=x11-libs/gtk+-3.12:3 + x11-libs/gtk+:3 x11-libs/libnotify ) " @@ -66,23 +66,3 @@ src_configure() { ) meson_src_configure } - -src_install() { - meson_src_install - # Aravis appends the major and min versions (but not the patch) to it's - # binaries and it's folder in /usr/share. Things then end up like - # `arv-tool-0.6`. We use this little hack to find out the version of the - # current build in a way that works even for a -9999 ebuild. - local install_pv="$(ls ${ED}/usr/share | grep aravis- | cut -f 2 -d '-')" - local install_p="${PN}-${install_pv}" - - # Properly place icons - if use viewer; then - cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons" - fi - - # Symlink versioned binaries to non-versioned - dosym "arv-tool-${install_pv}" "usr/bin/arv-tool" - dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera" - use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" -} diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild index 5ffb500be0c2..f2dd9137fe00 100644 --- a/media-video/aravis/aravis-9999.ebuild +++ b/media-video/aravis/aravis-9999.ebuild @@ -36,7 +36,7 @@ BDEPEND=" introspection? ( dev-libs/gobject-introspection:= ) " DEPEND=" - >=dev-libs/glib-2.34:2 + dev-libs/glib:2[gtk-doc?] dev-libs/libxml2:2 sys-libs/zlib gstreamer? ( ${GST_DEPEND} ) @@ -44,7 +44,7 @@ DEPEND=" usb? ( virtual/libusb:1 ) viewer? ( ${GST_DEPEND} - >=x11-libs/gtk+-3.12:3 + x11-libs/gtk+:3 x11-libs/libnotify ) " @@ -66,23 +66,3 @@ src_configure() { ) meson_src_configure } - -src_install() { - meson_src_install - # Aravis appends the major and min versions (but not the patch) to it's - # binaries and it's folder in /usr/share. Things then end up like - # `arv-tool-0.6`. We use this little hack to find out the version of the - # current build in a way that works even for a -9999 ebuild. - local install_pv="$(ls ${ED}/usr/share | grep aravis- | cut -f 2 -d '-')" - local install_p="${PN}-${install_pv}" - - # Properly place icons - if use viewer; then - cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons" - fi - - # Symlink versioned binaries to non-versioned - dosym "arv-tool-${install_pv}" "usr/bin/arv-tool" - dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera" - use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" -} diff --git a/media-video/cpvts/Manifest b/media-video/cpvts/Manifest index 7c6e9e9aeb58..5b8f3bb84d18 100644 --- a/media-video/cpvts/Manifest +++ b/media-video/cpvts/Manifest @@ -1,4 +1,5 @@ AUX cpvts-1.2-dvdread.patch 315 BLAKE2B 285fc22c4680137b57f6f3be5121dc03aa2c363b66179290b31a14a5b026a643ecd376d2458db62def2e85aeb6036b4136d05114d21ac0e497fd7026e9189b88 SHA512 418166b513ddd766b125bf20ff0381c2915497b9946c00942f005ef96f95418eb524f0e9316b324b4635dbeaf03d6a8e55a0f77657748f5f002c696119d4dc00 DIST cpvts-1.2.tgz 4200 BLAKE2B 18a57a794b90d05d9bfb0694754609cc16f5e7647a75402a0a822cd4547d2da0843f846041377a60cc55c3a1f5b28a333bfa3d8a4f77b35d17b1873674b02c12 SHA512 59314f2b49e7f82d2994aa6725fcc8431ffb72aa2ae83d67cbef008d850890a61322756c1d644e28760e332bcbe17ce9ad8b05c10fe9f30fe997933281e2f06f +EBUILD cpvts-1.2-r1.ebuild 684 BLAKE2B b5c3207782ceb7523d26a249f9d32236e3ce97623aec994b12fb7d37bcd13ee7e9be878a4270b50421c8d302f4b9bc7474be3c69913ebd75c9b95593bef1396a SHA512 b284fb9e20d0346b98f4de80d561150cfb782b3b080e5a00ffa8c2cf8a76634d2425fbb313d214553e6f0ce675abdc5605cbf9f473ea8fe3ed87e4ef88890596 EBUILD cpvts-1.2.ebuild 739 BLAKE2B 74bc2b7d857db60db05e8f6df820dcf8688b98d0ba619c76de51b144afb1879c97e9d04d1821e0003af11b30727acfb49c3b6984d51a28394694294bc046ebe8 SHA512 38f5f1e96436f0bcbba6287ccd0e2fe38df9a217843a0207fc6cfc00de69ebbe78a4454f179478a8e2118e8d62c969d6fca1dbda88b93af00815e0da95e94109 MISC metadata.xml 227 BLAKE2B 129a977f3a470f0774cb25c7d9d67968f807b5bbba6b1d1b1d0155e288555355796826ce187abf95a06ee0a448e08e9c5ec34ee79d9895bf2718b47ff0d9bfe8 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5 diff --git a/media-video/cpvts/cpvts-1.2-r1.ebuild b/media-video/cpvts/cpvts-1.2-r1.ebuild new file mode 100644 index 000000000000..0138d6ee6d01 --- /dev/null +++ b/media-video/cpvts/cpvts-1.2-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils toolchain-funcs + +IUSE="" + +S="${WORKDIR}/${PN}" + +DESCRIPTION="raw copy title sets from a DVD to your harddisc" +SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz" +HOMEPAGE="http://www.lallafa.de/bp/cpvts.html" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND="media-libs/libdvdread" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-dvdread.patch" +) + +echodo() { + echo "$@" + "$@" || die "failed" +} + +src_compile () { + echodo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,-rpath,/usr/lib -o cpvts \ + cpvts.c -lm -ldvdread +} + +src_install () { + dobin ${PN} +} diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest index fc384e5f70af..a9817e94b41b 100644 --- a/media-video/devedeng/Manifest +++ b/media-video/devedeng/Manifest @@ -1,11 +1,7 @@ AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb -DIST devedeng-4.10.0.tar.gz 1884153 BLAKE2B 71b86ae206dfd8798d54304eb68b488fd7d5e6ca76d76691682bd106e28de7a75833fdf57499841d1aa970e35e336cf50d568fb5e3fc34a40eb685c8b503a561 SHA512 4230e0395b4add0b53921137c9d32ebcf7efb1d2e8e8298c57bc11e82e06783b9a4f4fdcec41b1bcfdb358a35d1ce03c14fa3448551ad7289684ad35ce76cbd2 -DIST devedeng-4.11.0.tar.gz 1884388 BLAKE2B 2871d3d8d094be0cd32007859ea65a6567884970b32d93ef3838ab7ad1c31e25fed8f8c1a6719e5ca0f685596b74551301ef9397ad2315d7563da6015546686c SHA512 3a6f5bc780e9f4b248ce731324462ec4df2982256b77c837b53e2de1fa4668c8df73af5471f3878af80c0feeff7ea2238d9d68b21915bd6cd4c70be9f61efa52 -DIST devedeng-4.14.0.tar.bz2 1759759 BLAKE2B 1ebdf68e41d1554b7a4d477616ab7700f5a48ed533f8662d4baf3e1b7ca98bdaf92ddbee438ab22ed6b431623bc4c54e1f1bd610806e0fb1676d58df6b73e436 SHA512 2afbc69b9bbfaaab2b2123319bacb87f023e789e118bc3025132cd6a71f91373c80e6a5a35d83291f085ee3af03cf776bbd8f513c557174413b269ecf3c220cf DIST devedeng-4.15.0.tar.bz2 1759602 BLAKE2B 31f08dec66623f68fba17bbaf657d5865796ca63b37f3e0a72213692ac1fa79fd14123d33112dc4713c42d682fb216fa61b971454efa4304ec7ce10015af4c99 SHA512 90a1dd5f2e7dfd78bff38fb682e021e6bb489a0ca16cc29b533926b242e4a3322372ad383acf61338dea7873448f649534fe9a2ac9e22294de490b95df55a4f0 -EBUILD devedeng-4.10.0.ebuild 913 BLAKE2B 94629aa65626217a623dfdb07210520e72e5ed0988e8894b18d0b03725b66391394f4939b64d4504c20f803c10d26a4b93642f4649999946d271f541038fc66e SHA512 665c2ea734cf3cf0f49d234afe1f75a50d8406b0dc4bbe3b66eec870d8fc567eb919676538b048430b166db0edab7a1ed0bdfac35d33131fadf2fa0ca14385ed -EBUILD devedeng-4.11.0.ebuild 928 BLAKE2B d6b0cc81b73626e4253f353e363d9b67350392c22ee46079c3dde0c07a55761c5414dd7a37e37e100cebfcea6cdde5d09b4f7608f6d4efaa381b84824f5afe6b SHA512 78dabd85ecb76dc7979c961c58ef0bf97341235f64fc28bdd28c249412c812fbeb2785ae05e6d569980ef22291eaab3efd83b8d1c1e9c185ef7348116461200e -EBUILD devedeng-4.14.0.ebuild 1259 BLAKE2B 71a900e3606cc4976afa01bd2349c33079ab5bb5830c1415cf13140cd4996105d64f5e9e6f047e46c8fd2f1e537023abe9135b31a8ed66605e1b14a8e54548f0 SHA512 e8b3f02f07e4f1646f15283dc967d351bd00092e6481f40dbd26544846f2c3804654f6c7d71e3ddb483b336566398a8067d75fc4de626fb0aab13eef580e147a +DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a EBUILD devedeng-4.15.0.ebuild 1267 BLAKE2B f2b046673112dbac5d91024cc98c41109c2a46cbdbee928ec55aa0f2fcf384e9b18b3d1d8fd86a6457892dbb0d23459351c743bbf8bfed12e8e9da19be308879 SHA512 592d029b4d9c2c4bb10d2d87b631876c977fb84dd907a8c4d28e8ed202af51aeafc467143bc453e087192fa25a5d8632c789a36b1818c8aeaae31eeaab90a3ab +EBUILD devedeng-4.16.0.ebuild 1267 BLAKE2B f2b046673112dbac5d91024cc98c41109c2a46cbdbee928ec55aa0f2fcf384e9b18b3d1d8fd86a6457892dbb0d23459351c743bbf8bfed12e8e9da19be308879 SHA512 592d029b4d9c2c4bb10d2d87b631876c977fb84dd907a8c4d28e8ed202af51aeafc467143bc453e087192fa25a5d8632c789a36b1818c8aeaae31eeaab90a3ab EBUILD devedeng-9999.ebuild 894 BLAKE2B a1e93a8d4cf4c013ca4bcf74677f231c9b528c91b8f3f8643f1a82d11fbd792b08c3f55a243cb2fec5c385b2d5df356d5b656338f5a12184d0e928df18b28bae SHA512 bf0af6a2b4f1b6cabb58d717039c4f7f473f6a7e1d881bc8fd3652b95fe028438b951477b53fa9c9fec9d57d403b096f8f537aca1a4ddebd6261048a109c8e4c MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545 diff --git a/media-video/devedeng/devedeng-4.10.0.ebuild b/media-video/devedeng/devedeng-4.10.0.ebuild deleted file mode 100644 index f6118daaf78f..000000000000 --- a/media-video/devedeng/devedeng-4.10.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 gnome2-utils - -DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)" -HOMEPAGE="http://www.rastersoft.com/programas/devede.html" -SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libav" - -RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3 - || ( media-video/vlc media-video/mpv media-video/mplayer ) - !libav? ( media-video/ffmpeg ) - libav? ( media-video/libav ) - media-video/dvdauthor - media-video/vcdimager - virtual/cdrtools - || ( app-cdr/brasero kde-apps/k3b )" - -DEPEND="${PYTHON_DEPS}" - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/media-video/devedeng/devedeng-4.11.0.ebuild b/media-video/devedeng/devedeng-4.11.0.ebuild deleted file mode 100644 index e793bf11b5e7..000000000000 --- a/media-video/devedeng/devedeng-4.11.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 gnome2-utils - -DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)" -HOMEPAGE="http://www.rastersoft.com/programas/devede.html" -SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libav" - -RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3 - || ( media-video/vlc media-video/mpv media-video/mplayer ) - !libav? ( media-video/ffmpeg ) - libav? ( media-video/libav ) - media-video/dvdauthor - media-video/vcdimager - virtual/cdrtools - || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )" - -DEPEND="${PYTHON_DEPS}" - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/media-video/devedeng/devedeng-4.14.0.ebuild b/media-video/devedeng/devedeng-4.16.0.ebuild index e45da828c863..29da18849893 100644 --- a/media-video/devedeng/devedeng-4.14.0.ebuild +++ b/media-video/devedeng/devedeng-4.16.0.ebuild @@ -29,7 +29,7 @@ RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}] DEPEND="${PYTHON_DEPS}" -PATCHES=( "${FILESDIR}"/${P}-no_compress_man.patch ) +PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch ) src_prepare() { default diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest index 9f9c8bf41e52..4d360f4d24c5 100644 --- a/media-video/gxine/Manifest +++ b/media-video/gxine/Manifest @@ -5,6 +5,6 @@ AUX gxine-0.5.907-glib-2.31.patch 636 BLAKE2B 08e3839aa025bb88c398b78e65bdc5e0a9 AUX gxine-0.5.907-underlinking.patch 781 BLAKE2B 14a02ab58d17507486e43bb803f60b395ee0f617bdfea6924701774b8fd33cbd26217f34c1a6011d9b66e94d45d609952513dbf4eda1bf84fb76d0c74e5e8f44 SHA512 47775e2c06116505644eaeb13c91fa58ca289d133380857eade90e2e7b7520b1d7801626772d537621358676132202ac83d31ac4e0871ad07e1ce68d2b7b7610 DIST gxine-0.5.907.tar.xz 910528 BLAKE2B 6c45e1b1d9819bdf9f51fbb3c8be5265144ae62f4e419eb4ab002b14c9705b48f943b28a67ff826a90e945679d487f16c9188ed45f26aa8fda0b0b45ddfe7657 SHA512 dd35c8a8810c233e81a28e9f10504645662d60dc9609451e7c49c5d516bb041b61a3b9c8f330021af1e527064cf3f62f37bde98402df7426f501d0c78c571045 DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215 -EBUILD gxine-0.5.907-r1.ebuild 2504 BLAKE2B 93b1b1ac3fec11f459b69b648751a50b09cbc8ca774942a252b23f2108cdd57925d1dbec73581a27f90888bc1a66ee5c4633f7a52603c71dadda53676339d7d9 SHA512 e18d406dceb14b977f3a17aca43e13fd314b7c5e5624b8baaf07201e3d4781eca2ee4f446f05356864253cec73e3598abf05d3a5db96ead9c927af3d1137bfca -EBUILD gxine-0.5.909.ebuild 2058 BLAKE2B 90853eae463c96fb6759dcb0c1ccb7b3a5097cfb3b1e2403e2a8267b1173241fdf0120e26ae7ef6e3f78ae15ce828dc08a974cd99909c8e542847d53be2ec0aa SHA512 0d51a0b4ff82ab0c0c5a246bb9792055c535e950443d489f43ce52e727971d01e799d9134c5edc71a138f135c0a4d71e53c7473d11aec3adf187248153525b8b +EBUILD gxine-0.5.907-r1.ebuild 2502 BLAKE2B 6cb7d5d4155e82094ca59db704105a9fb9e1367f21091f6f420c630bc395fa305e26f87ed81a51bf81b6ff6cb333e65d832112ba74def6bbf2982e498b3bfd93 SHA512 7796247639f723f8b15fb1001ecd8d80a131b93b165dca96aa5b4b7fbd0a1d8cf69d81a31556d5c2d54b3af4127bd8fd957ed88c123a599b65748c4498a25801 +EBUILD gxine-0.5.909.ebuild 2059 BLAKE2B 1590e16787454ce84d9fe26e07afec4634dba4ee0d1453c73cea7c0908235145dcbfcefd10ea1384cb3f2f347dcc635f6f874be13e0099f922ca88306d6db021 SHA512 26256a57f3529e8f01beca2a91b4fe506ca2278b95180a8f48e4893e7eb183df2a5cbe19eaba7f232f9848e2e49c28b408c30d7165e7fe04d950e93a6fdf4683 MISC metadata.xml 305 BLAKE2B 0704c2d6ae4a0e249d693a63f719b4ec470a08e1cf1b64342571dad7514fd2a14616bf0812aa8f6a0732049c702ee3e00ab005c5b650723577526413c8337ad5 SHA512 396865e52e9dc380cbf6d3dbf33deb69877495356dc6c6a09ba35ab3062608a93e7ab3d5d22564192070ddc186f3a5ff9ceea639911cc554ca6db5084a413587 diff --git a/media-video/gxine/gxine-0.5.907-r1.ebuild b/media-video/gxine/gxine-0.5.907-r1.ebuild index cb6ef3322c28..105163c36e4e 100644 --- a/media-video/gxine/gxine-0.5.907-r1.ebuild +++ b/media-video/gxine/gxine-0.5.907-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,7 +25,7 @@ COMMON_DEPEND=">=media-libs/xine-lib-1.1.20 nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) - udev? ( virtual/libgudev:= ) + udev? ( dev-libs/libgudev:= ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama )" DEPEND="${COMMON_DEPEND} diff --git a/media-video/gxine/gxine-0.5.909.ebuild b/media-video/gxine/gxine-0.5.909.ebuild index 832feba7de63..6dbccad0720b 100644 --- a/media-video/gxine/gxine-0.5.909.ebuild +++ b/media-video/gxine/gxine-0.5.909.ebuild @@ -25,7 +25,7 @@ COMMON_DEPEND=">=media-libs/xine-lib-1.1.20[gtk] nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) - udev? ( virtual/libgudev:= ) + udev? ( dev-libs/libgudev:= ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama )" DEPEND="${COMMON_DEPEND} diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 6dbec3aa92c9..7b98e5783274 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -7,9 +7,9 @@ DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B b2f892c57cd562124460ac2846949bd0ce DIST handbrake-1.1.1.tar.bz2 15319551 BLAKE2B d0569a796f3838f5696e3dcfed348a5111e063841cb594bbce7283568cdf868e6b751f3cd6086ebc83af5f2d6ad9e238717425f953677cca9e2908a9c0301aa9 SHA512 990035a5f850fafbc68c77dd61d7f7371c3eda2cc6e6ceb377f111c9016713523cf1685f519926ae8859446c99392c64b7ce91d72f9b5f9643a35a3d0326eef4 DIST handbrake-1.1.2.tar.bz2 15291003 BLAKE2B b502ba18139c3332b8614e831005b4a846c0fab9a31bce2c9f3481d6d41ba3f087ded30adb6bd58220b14002f230fb920db1cc45ec7baee4fda573148fddfc8e SHA512 360f7fe3e4571bb623f54a00e9478a78d655448ffb1b8d72b7d32636a230f2ae4dabbfe803f6f9491537064ea4f6e238700b3d29912ae34383fbb1922e18e9b8 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c -EBUILD handbrake-1.1.0-r1.ebuild 3597 BLAKE2B 3f3369bb7a0149a847267e92190a6462d552d1dc2b108f9ca044335fcccbab919a30cc05eed920b6ade90d45b4fc01872846babef77386f083059c2822411d09 SHA512 96942d20f0779f0b548d644a97e3ab3b34f5e2b25cd752507936f1c4c685728705bc2476c5c6d4c1ffeff43013031419767e4aed459d0807c3a8a5ddd11ffb63 -EBUILD handbrake-1.1.1.ebuild 3597 BLAKE2B 3f3369bb7a0149a847267e92190a6462d552d1dc2b108f9ca044335fcccbab919a30cc05eed920b6ade90d45b4fc01872846babef77386f083059c2822411d09 SHA512 96942d20f0779f0b548d644a97e3ab3b34f5e2b25cd752507936f1c4c685728705bc2476c5c6d4c1ffeff43013031419767e4aed459d0807c3a8a5ddd11ffb63 -EBUILD handbrake-1.1.2.ebuild 3594 BLAKE2B 1812d0d143e0c01306def7d293f333bb5e6f870a7cb296a78f80e48fbbf95b35bee6aa3ba487bd3f73d735bed90382b0ec47c33e594f86ddf900cf8ce8e2a4b5 SHA512 7a740e1e8434792dc71152e5c85d9c39a70c372d50a90531d07c158c03f21c67221fed043b12446c99c21a1779498ba9932ecd9990022310d32710b60a98d522 -EBUILD handbrake-1.2.2-r2.ebuild 4122 BLAKE2B 034d8fc9c48e6dfe649ef572b380439734b594e50adc70925bf052a7d9084eff4f4812efe35daf8bad39d664fdc77d758441597bbe973bf0becb390cd5be67ac SHA512 2b6c68a33767111f90d6897822db3beef7891d3a7085df56b51af0e1ee06378c2d70dd28f9040b850fa135dfdb44a8e91a84b6915e9e15a514de6700214379c9 -EBUILD handbrake-9999.ebuild 3597 BLAKE2B 5997effcfd06d412b66eb6d9cd305806c1e2f8a69c3d2fb6d123843a913c0fddbf399f35496f283507e43dd3ebbea3c2058af68d7207d7a428df605244e8225d SHA512 9cdbab17900c033bbb4b785c13828937cb0c0d8dd2e3d43af76170389ebe8d2b561f038055e1dad38259f92d723119c9f6db182266fecb36b2febd2c21d50966 +EBUILD handbrake-1.1.0-r1.ebuild 3595 BLAKE2B 2690c7d1583fa7acbdace1255196ef377613791dba04efddf8bc2b6d606d17b4ebafa8203277254ad48075e166eff39dcf9af52efc7612d5cff0491de77e4729 SHA512 e9f456bad7425d459bd35c733afc720045ddcf4622ffc371b0755a55bac288e3f101a8c60ef220be884653b3def6e4fe4d368d323d485242fd62f88ac81c4345 +EBUILD handbrake-1.1.1.ebuild 3595 BLAKE2B 2690c7d1583fa7acbdace1255196ef377613791dba04efddf8bc2b6d606d17b4ebafa8203277254ad48075e166eff39dcf9af52efc7612d5cff0491de77e4729 SHA512 e9f456bad7425d459bd35c733afc720045ddcf4622ffc371b0755a55bac288e3f101a8c60ef220be884653b3def6e4fe4d368d323d485242fd62f88ac81c4345 +EBUILD handbrake-1.1.2.ebuild 3595 BLAKE2B 2690c7d1583fa7acbdace1255196ef377613791dba04efddf8bc2b6d606d17b4ebafa8203277254ad48075e166eff39dcf9af52efc7612d5cff0491de77e4729 SHA512 e9f456bad7425d459bd35c733afc720045ddcf4622ffc371b0755a55bac288e3f101a8c60ef220be884653b3def6e4fe4d368d323d485242fd62f88ac81c4345 +EBUILD handbrake-1.2.2-r2.ebuild 4123 BLAKE2B 8195f875d49e0ec7f951e81fed5ab36b82dd989cbfe0845a6414abdd1bee9025f0d84a752b7400fe8d049b5fc64243ca8792cc58f5db88cfa47a293d2cee3adb SHA512 424866e13dff945b238f97686c1c48c42826823be3e924fb6989f1f74a330ed674c45a5e7bb4a0dd222a7b75d12035db37e73bfa8209abc38dc2fc0b98747e8c +EBUILD handbrake-9999.ebuild 3595 BLAKE2B 8c41499f2c49c66a20a64843cc43213c82bd263e45ef6c22ca726eb546eba7f398b7e406bbca1956a1393bf455c1ccb4e2aa9012d7073bcdb8b1367f8b036d5c SHA512 144cfe12b5cec8e8a3613b85e5b2d3ba42c6e02eebe2c97e120119824874aa3ac5dc5b710cd0c367a4887d83f1b2a0fe94276e3a10d9796934ad2dc909741c90 MISC metadata.xml 949 BLAKE2B fc4ffd4d804c1098614e24525ae50673620b16e4d9480594cfbf4fc28f4aaa6274a6881548b9dbbbf6e431a839bf1742900faaa1612d11a22ad92f325af22579 SHA512 da975f8436e71359f279b26a2f41b1813f3177bf5768cb848f4feafa352c31084c7f2ba350fc6491400df8e261d2dcb8f32473657ceca6bd18d2fcd67b343185 diff --git a/media-video/handbrake/handbrake-1.1.0-r1.ebuild b/media-video/handbrake/handbrake-1.1.0-r1.ebuild index cd52cd8ded29..5ab5c42c603c 100644 --- a/media-video/handbrake/handbrake-1.1.0-r1.ebuild +++ b/media-video/handbrake/handbrake-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -58,11 +58,11 @@ RDEPEND=" >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 + dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango - virtual/libgudev:= ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-1.7:0= ) diff --git a/media-video/handbrake/handbrake-1.1.1.ebuild b/media-video/handbrake/handbrake-1.1.1.ebuild index cd52cd8ded29..5ab5c42c603c 100644 --- a/media-video/handbrake/handbrake-1.1.1.ebuild +++ b/media-video/handbrake/handbrake-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -58,11 +58,11 @@ RDEPEND=" >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 + dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango - virtual/libgudev:= ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-1.7:0= ) diff --git a/media-video/handbrake/handbrake-1.1.2.ebuild b/media-video/handbrake/handbrake-1.1.2.ebuild index 6e3559d14f9a..5ab5c42c603c 100644 --- a/media-video/handbrake/handbrake-1.1.2.ebuild +++ b/media-video/handbrake/handbrake-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -58,11 +58,11 @@ RDEPEND=" >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 + dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango - virtual/libgudev:= ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-1.7:0= ) diff --git a/media-video/handbrake/handbrake-1.2.2-r2.ebuild b/media-video/handbrake/handbrake-1.2.2-r2.ebuild index d780a55c6e27..6d9379f30132 100644 --- a/media-video/handbrake/handbrake-1.2.2-r2.ebuild +++ b/media-video/handbrake/handbrake-1.2.2-r2.ebuild @@ -61,11 +61,11 @@ RDEPEND=" >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 + dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango - virtual/libgudev:= ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-2.9:0= ) diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index 2ba4dd148d21..26469e6268b5 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -58,11 +58,11 @@ RDEPEND=" >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 + dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango - virtual/libgudev:= ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-1.7:0= ) diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest index 5b4ac2f3e0bf..08f03847dedf 100644 --- a/media-video/mjpg-streamer/Manifest +++ b/media-video/mjpg-streamer/Manifest @@ -1,11 +1,7 @@ -AUX 0_pre20120421-make-var-instead-of-cmd.patch 3756 BLAKE2B a32ace02e77a0f8429daf5fe5bee74b38b912eef2a56450144888bee351e70ae2805421f23325a1b883843ffcedb4c43e5097efec68923ff429418c18d8d8984 SHA512 460afe3b80b15586862a9503811b3600116d40928399fd831a7b18e549b6bf76d31a632e9ac145c942c59d7c1976fbeadabed5cad5c82aa3a5459810506373f7 -AUX 0_pre20120621-make-var-instead-of-cmd.patch 3756 BLAKE2B a32ace02e77a0f8429daf5fe5bee74b38b912eef2a56450144888bee351e70ae2805421f23325a1b883843ffcedb4c43e5097efec68923ff429418c18d8d8984 SHA512 460afe3b80b15586862a9503811b3600116d40928399fd831a7b18e549b6bf76d31a632e9ac145c942c59d7c1976fbeadabed5cad5c82aa3a5459810506373f7 -AUX 0_pre20120621-to-work-with-kernel-3.18.patch 3420 BLAKE2B 80c35f07d3049f119565eb1ebd071e0499daebdaa8c95d93ee82822f2e044965e21a7d5a16a60323ba2055541ffb7bf9debf31c85e50df1710779abc5021d376 SHA512 6711ce428e2985a65b8041c09ec9f461615e7e55ccc061d520ece5196e4da5d95ea71b344e7d326bcf7e127f48846808b2903a03e33aec488652067675a8f2b2 +AUX make-var-instead-of-cmd.patch 3716 BLAKE2B 322c6ada49e976840e949ca781eca29e1008c781c6aa578586bb7ef522b6fe2227a9c6b6f60ac7d4d1c982ddf926e522798aa7ebde74d2a272e57b4d8c2c1cef SHA512 e585b6f2988020087ffd2dd33878e6392baeb94f6020471ade157d1f27df073f363f5fc05107ef1b21fad69aaacf0a53096e48ce5c8eeaf77a6a328780d64e9d AUX mjpg-streamer.confd 347 BLAKE2B f544307fca9e420d5a8edd3b8ea1834dc5d9125d2aba627361ef381329036831ee2d19925dff5f5cc7fb5b1d6623dcb33e74c68966d88749cd9b84325aa78f5c SHA512 15841b10f0caa136b58372e180bfc3a0198d323ef2df22ddd2b334c09d0d376cac78d799c327306105bc97648ee40a3d0c78ef013a421f9468be7f89278baa33 -AUX mjpg-streamer.initd 1243 BLAKE2B a9a5d7410aa777809790358cce6ddb457b9776b171131acdf9c8e0cddd85deff16460c69d3f588b32c935cb761c7ea5e3abec02f02bf07204a63e4fee1ebba30 SHA512 5430b14a8f712ee1c651ab080be5d52c42a388faa3f6b030366efaf8918c07d484aba3e33eda0d87b392b14dba21d0bfe3b996a7edbf0f3ca3f97ea097c74934 -DIST mjpg-streamer-0_pre20120421.tar.bz2 471104 BLAKE2B 56edc0e4aac616a546c52cd4c7ee69e93f8895de6443c1987a10bf186108d77ae6715ea376c3c1f193c25d5e1238fa05bd22ef8d5e1a888c4939b3f2bdfe2520 SHA512 bd9fa11c8a615cf33f84898f6acca6c61ead3614c848d50c22891922e7cb553b422f2f121377040f52d636dd719a2f300d3285cefc34759df8861cc84fdc2e82 +AUX mjpg-streamer.initd 1268 BLAKE2B cf516a21368667b3f88db2d5541f61dc30b0d524dd6c0601bf8f0fafb746452204c210798b87426e7d38b9d4d9fef6239730f4afcd959a8f261613fbc780696f SHA512 4a9d1fafd4fe31f8cece9295f67a6e53cb1d4a61a2c12283da61ca65aae1a9932f70ab4dd1a9f0d3bfe1c05bc00dc235481c2b751e6d0cd39535690e24fe473f +AUX to-work-with-kernel-3.18.patch 2832 BLAKE2B 157c3c5c30973cdc64d9bd0a5cadba238dd6e33d72b96b0776065f57bb34e14f47336e509e8dbf1fe6fbb8f715fd99837b42e9ecec6fcc4c5da1101300c1e900 SHA512 c619c788fd09118f309b081eabb7f80835690923e098368f16f26a7b4e6b63e494dd5f91a9fe73d83b3151b77dd6393263ab3756f7d8b3a6286ac3d52f1e89c8 DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332 -EBUILD mjpg-streamer-0_pre20120421.ebuild 1704 BLAKE2B 6a8d1fbc073e9f20459705e2076be3c92d5d6eb13f55c6ad928af2c613d0cd37402a75df67257b1d5fbae006cdf3dd60dff0f266fc4b57da9a345183830d54be SHA512 77f99c6d96626db155dda44e9247735d77c5e96c3ed98589b991d67752b7319eea35964231035eefcaf95ae3492707c7cc8d4fa256e1619b7ce7b3c594b54a42 -EBUILD mjpg-streamer-0_pre20120621-r1.ebuild 1843 BLAKE2B f0dc620a54a6418ab228b660035c5bb84593564cd414e8e2d3ae0072b47b5b7240e159f92bae7611670916b0b039154b07c72ea44daf326d49ba49fabb56586f SHA512 2f425ecc80f6dd244023252c282a5b0e2677cee9c1810fd1c63fc46345fa1486a048dfc57f99ffbe95dd351a8595d58bd8510a8f01c459a42a9d9a40860860b4 -EBUILD mjpg-streamer-0_pre20120621.ebuild 1784 BLAKE2B 03f3bade6ebfeb5611e9fae224aee84ef6d8e618d167d65f3745666e4606dfd3dab66d8f88625117019fb5b92e2d95cf0cf02902aa89f610b273d57bf5c5815d SHA512 58e6b743a6563d16ba0f7a979f86ab6737426bf2f41f54da444e787cc35509b04b3f26abde4e389f9ab856aeeee7722415af16481888c3d064fc2f2a21bc4c9b -MISC metadata.xml 1925 BLAKE2B 472f7acb0b1a740413bce8bfd1cf9903fa3b9d0632ee07a82a8a3125b68719319ceba84ecd946d389c59fa1761aac68e4cda05fd103886d526315b715174cf64 SHA512 11b6bd28a3384810de1b5b34a006684eeebccebdaf7a9d2fc93384d948dbd4b01da669ab3d8def823c2888423ba0de30bf557d25d202cc7d62577666292fac51 +EBUILD mjpg-streamer-0_pre20120621-r2.ebuild 1895 BLAKE2B f78c80d7b4b94b4d91082f7a332d11dde3f6b994f30d0c1f1d704a80d725f3231a4fe492f5e69a40baa71ee1b1de638d65d4fb73dd9d77b2ccfcd98db5d220ea SHA512 6ada19dc511b45b5a565cdbcc9651269e559b70007663062531e6892e8b3b08bd306b13e4b3b72506a609a985dfe10814d01f52a887feae833ebd996e55033cf +MISC metadata.xml 1824 BLAKE2B 7a6dca05ede2ae433285cc089eb5cdca27b60e160749186efc687499ba1a7f1c32b27e93667e2f13534aa0c860b3dbec782955676e90a11565faa2a6647f3201 SHA512 8921e69edf4bc474d345f0b0d5ca5d0ff7eecd9f690cffd6f29d5d172829c01785660f6f8221bd4d24c094a2c189b3b151200cda5094d584c7f3187fadb308bc diff --git a/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch b/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch deleted file mode 100644 index 98d89c555e04..000000000000 --- a/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch +++ /dev/null @@ -1,118 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile (revision 150) -+++ Makefile (working copy) -@@ -63,64 +63,64 @@ - chmod 755 $(APP_BINARY) - - output_autofocus.so: mjpg_streamer.h utils.h -- make -C plugins/output_autofocus all -+ $(MAKE) -C plugins/output_autofocus all - cp plugins/output_autofocus/output_autofocus.so . - - input_testpicture.so: mjpg_streamer.h utils.h -- make -C plugins/input_testpicture all -+ $(MAKE) -C plugins/input_testpicture all - cp plugins/input_testpicture/input_testpicture.so . - - - ifeq ($(USE_LIBV4L2),true) - input_uvc.so: mjpg_streamer.h utils.h -- make -C plugins/input_uvc USE_LIBV4L2=true all -+ $(MAKE) -C plugins/input_uvc USE_LIBV4L2=true all - cp plugins/input_uvc/input_uvc.so . - else - input_uvc.so: mjpg_streamer.h utils.h -- make -C plugins/input_uvc all -+ $(MAKE) -C plugins/input_uvc all - cp plugins/input_uvc/input_uvc.so . - endif - - input_control.so: mjpg_streamer.h utils.h -- make -C plugins/input_control all -+ $(MAKE) -C plugins/input_control all - cp plugins/input_control/input_control.so . - - output_file.so: mjpg_streamer.h utils.h -- make -C plugins/output_file all -+ $(MAKE) -C plugins/output_file all - cp plugins/output_file/output_file.so . - - ifeq ($(WXP_COMPAT),true) - output_http.so: mjpg_streamer.h utils.h -- make -C plugins/output_http -DWXP_COMPAT all -+ $(MAKE) -C plugins/output_http -DWXP_COMPAT all - cp plugins/output_http/output_http.so . - else - output_http.so: mjpg_streamer.h utils.h -- make -C plugins/output_http all -+ $(MAKE) -C plugins/output_http all - cp plugins/output_http/output_http.so . - endif - - output_udp.so: mjpg_streamer.h utils.h -- make -C plugins/output_udp all -+ $(MAKE) -C plugins/output_udp all - cp plugins/output_udp/output_udp.so . - - input_gspcav1.so: mjpg_streamer.h utils.h -- make -C plugins/input_gspcav1 all -+ $(MAKE) -C plugins/input_gspcav1 all - cp plugins/input_gspcav1/input_gspcav1.so . - - input_file.so: mjpg_streamer.h utils.h -- make -C plugins/input_file all -+ $(MAKE) -C plugins/input_file all - cp plugins/input_file/input_file.so . - - output_rtsp.so: mjpg_streamer.h utils.h -- make -C plugins/output_rtsp all -+ $(MAKE) -C plugins/output_rtsp all - cp plugins/output_rtsp/output_rtsp.so . - - output_ptp2.so: mjpg_streamer.h utils.h -- make -C plugins/input_ptp2 all -+ $(MAKE) -C plugins/input_ptp2 all - cp plugins/input_ptp2/input_ptp2.so . - - #input_http.so: mjpg_streamer.h utils.h --# make -C plugins/input_http all -+# $(MAKE) -C plugins/input_http all - # cp plugins/input_http/input_http.so . - - # The viewer plugin requires the SDL library for compilation -@@ -129,22 +129,22 @@ - # execute the following command: - # make output_viewer.so - output_viewer.so: mjpg_streamer.h utils.h -- make -C plugins/output_viewer all -+ $(MAKE) -C plugins/output_viewer all - cp plugins/output_viewer/output_viewer.so . - - # cleanup - clean: -- make -C plugins/input_uvc $@ -- make -C plugins/input_testpicture $@ -- make -C plugins/output_file $@ -- make -C plugins/output_http $@ -- make -C plugins/output_udp $@ -- make -C plugins/output_autofocus $@ -- make -C plugins/input_gspcav1 $@ -- make -C plugins/output_viewer $@ -- make -C plugins/input_control $@ -- make -C plugins/output_rtsp $@ --# make -C plugins/input_http $@ -+ $(MAKE) -C plugins/input_uvc $@ -+ $(MAKE) -C plugins/input_testpicture $@ -+ $(MAKE) -C plugins/output_file $@ -+ $(MAKE) -C plugins/output_http $@ -+ $(MAKE) -C plugins/output_udp $@ -+ $(MAKE) -C plugins/output_autofocus $@ -+ $(MAKE) -C plugins/input_gspcav1 $@ -+ $(MAKE) -C plugins/output_viewer $@ -+ $(MAKE) -C plugins/input_control $@ -+ $(MAKE) -C plugins/output_rtsp $@ -+# $(MAKE) -C plugins/input_http $@ - rm -f *.a *.o $(APP_BINARY) core *~ *.so *.lo - - # useful to make a backup "make tgz" diff --git a/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch b/media-video/mjpg-streamer/files/make-var-instead-of-cmd.patch index 98d89c555e04..b6f14da2139a 100644 --- a/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch +++ b/media-video/mjpg-streamer/files/make-var-instead-of-cmd.patch @@ -1,7 +1,7 @@ -Index: Makefile -=================================================================== ---- Makefile (revision 150) -+++ Makefile (working copy) +Index: diff --git a/Makefile b/Makefile +index c0b2d10..ef264e9 100644 +--- a/Makefile ++++ b/Makefile @@ -63,64 +63,64 @@ chmod 755 $(APP_BINARY) diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd b/media-video/mjpg-streamer/files/mjpg-streamer.initd index 53f046e7b1fe..9672a429887e 100644 --- a/media-video/mjpg-streamer/files/mjpg-streamer.initd +++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd @@ -7,6 +7,7 @@ MY_NAME=${SVCNAME//-/_} depend() { use logger + after modules } checkconfig() { @@ -34,8 +35,8 @@ start() { --user "${MJPG_STREAMER_USER}" \ --group "${MJPG_STREAMER_GROUP}" -w 100 -b -m \ --pidfile "${MJPG_STREAMER_PIDFILE}" \ - -- -i "/usr/lib/input_${INPUT_PLUGIN}.so ${INPUT_PLUGIN_OPTS}" \ - -o "/usr/lib/output_${OUTPUT_PLUGIN}.so ${OUTPUT_PLUGIN_OPTS}" + -- -i "/usr/@LIBDIR@/input_${INPUT_PLUGIN}.so ${INPUT_PLUGIN_OPTS}" \ + -o "/usr/@LIBDIR@/output_${OUTPUT_PLUGIN}.so ${OUTPUT_PLUGIN_OPTS}" eend $? "Check syslog to see why startup failed." } diff --git a/media-video/mjpg-streamer/files/0_pre20120621-to-work-with-kernel-3.18.patch b/media-video/mjpg-streamer/files/to-work-with-kernel-3.18.patch index 5f16f4ab3f45..a484a27217f4 100644 --- a/media-video/mjpg-streamer/files/0_pre20120621-to-work-with-kernel-3.18.patch +++ b/media-video/mjpg-streamer/files/to-work-with-kernel-3.18.patch @@ -1,19 +1,7 @@ -From 03796a1d930212aea460405b86cd41bea8fa5150 Mon Sep 17 00:00:00 2001 -From: Eric Lee <saintgimp@hotmail.com> -Date: Thu, 26 Feb 2015 19:31:41 -0800 -Subject: [PATCH] Fix mjpg-streamer to work with kernel 3.18 - -I didn't create this fix, it was originally posted to http://www.raspberrypi.org/forums/viewtopic.php?f=28&t=97983&p=681259. @koosvriezen tried to create a pull request #3 but made kind of a hash of it, so this is the same fix only a proper pull request. ---- - mjpg-streamer/plugins/input_uvc/input_uvc.c | 8 +++++--- - mjpg-streamer/plugins/input_uvc/v4l2uvc.c | 2 ++ - mjpg-streamer/plugins/input_uvc/v4l2uvc.h | 3 +++ - 3 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/mjpg-streamer/plugins/input_uvc/input_uvc.c b/mjpg-streamer/plugins/input_uvc/input_uvc.c +diff --git a/plugins/input_uvc/input_uvc.c b/plugins/input_uvc/input_uvc.c index c0b2d10..ef264e9 100644 ---- a/mjpg-streamer/plugins/input_uvc/input_uvc.c -+++ b/mjpg-streamer/plugins/input_uvc/input_uvc.c +--- a/plugins/input_uvc/input_uvc.c ++++ b/plugins/input_uvc/input_uvc.c @@ -405,9 +405,13 @@ void *cam_thread(void *arg) if(pcontext->videoIn->formatIn == V4L2_PIX_FMT_YUYV) { DBG("compressing frame from input: %d\n", (int)pcontext->id); @@ -38,10 +26,10 @@ index c0b2d10..ef264e9 100644 /* signal fresh_frame */ pthread_cond_broadcast(&pglobal->in[pcontext->id].db_update); -diff --git a/mjpg-streamer/plugins/input_uvc/v4l2uvc.c b/mjpg-streamer/plugins/input_uvc/v4l2uvc.c +diff --git a/plugins/input_uvc/v4l2uvc.c b/plugins/input_uvc/v4l2uvc.c index 48fd189..329233b 100644 ---- a/mjpg-streamer/plugins/input_uvc/v4l2uvc.c -+++ b/mjpg-streamer/plugins/input_uvc/v4l2uvc.c +--- a/plugins/input_uvc/v4l2uvc.c ++++ b/plugins/input_uvc/v4l2uvc.c @@ -450,6 +450,8 @@ int uvcGrab(struct vdIn *vd) */ @@ -51,10 +39,10 @@ index 48fd189..329233b 100644 if(debug) fprintf(stderr, "bytes in used %d \n", vd->buf.bytesused); -diff --git a/mjpg-streamer/plugins/input_uvc/v4l2uvc.h b/mjpg-streamer/plugins/input_uvc/v4l2uvc.h +diff --git a/plugins/input_uvc/v4l2uvc.h b/plugins/input_uvc/v4l2uvc.h index d5296fc..0e3f99f 100644 ---- a/mjpg-streamer/plugins/input_uvc/v4l2uvc.h -+++ b/mjpg-streamer/plugins/input_uvc/v4l2uvc.h +--- a/plugins/input_uvc/v4l2uvc.h ++++ b/plugins/input_uvc/v4l2uvc.h @@ -28,6 +28,7 @@ @@ -72,3 +60,17 @@ index d5296fc..0e3f99f 100644 }; /* context of each camera thread */ + +diff --git a/utils.c b/utils.c +index b494ca3..2792abe 100644 +--- ai/utils.c ++++ b/utils.c +@@ -29,7 +29,7 @@ + #include <wait.h> + #include <time.h> + #include <limits.h> +-#include <linux/stat.h> ++//#include <linux/stat.h> + #include <sys/stat.h> + + #include "utils.h" diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml index 492364ee19f4..27a772223ceb 100644 --- a/media-video/mjpg-streamer/metadata.xml +++ b/media-video/mjpg-streamer/metadata.xml @@ -20,26 +20,24 @@ streaming application with Pan/Tilt </longdescription> <use> - <flag name="input_testpicture">Plugin for sending compiled in, test + <flag name="input-testpicture">Plugin for sending compiled in, test pictures</flag> - <flag name="input_control">Plugin giving ability to control camera + <flag name="input-control">Plugin giving ability to control camera movement (only specific cameras)</flag> - <flag name="input_file">Plugin that watches given directory and send + <flag name="input-file">Plugin that watches given directory and send it's content</flag> - <flag name="input_uvc">Plugin that sends video stream from UVC + <flag name="input-uvc">Plugin that sends video stream from UVC compatible camera</flag> - <flag name="output_file">Plugin that saves received content under given + <flag name="output-file">Plugin that saves received content under given location</flag> - <flag name="output_udp">Plugin receiving content over UDP and storing to + <flag name="output-udp">Plugin receiving content over UDP and storing to a directory</flag> - <flag name="output_http">Small HTTP server plugin which sends WWW + <flag name="output-http">Small HTTP server plugin which sends WWW directory content and streams image content</flag> - <flag name="output_autofocus">Auto focusing plugin</flag> - <flag name="output_rtsp">Plugin which provides a mechanism to take + <flag name="output-autofocus">Auto focusing plugin</flag> + <flag name="output-rtsp">Plugin which provides a mechanism to take snapshots with a trigger from a UDP packet</flag> <flag name="www">Installs WWW content</flag> - <flag name="v4l">Uses <pkg>media-libs/libv4l</pkg> function mapping for - input_uvc plugin</flag> </use> <upstream> <remote-id type="sourceforge">mjpg-streamer</remote-id> diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild deleted file mode 100644 index 12a604613e80..000000000000 --- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils - -DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams" -HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer" -SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -INPUT_PLUGINS="input_testpicture input_control input_file input_uvc" -OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp" -IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS} +input_file +output_http" -IUSE="${IUSE_PLUGINS} www v4l" -REQUIRED_USE="|| ( ${INPUT_PLUGINS} ) - || ( ${OUTPUT_PLUGINS} ) - v4l? ( input_uvc )" - -RDEPEND="virtual/jpeg - v4l? ( input_uvc? ( media-libs/libv4l ) )" -DEPEND="${RDEPEND} - input_testpicture? ( media-gfx/imagemagick )" - -src_prepare() { - epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch" - - local flag switch - - for flag in ${IUSE_PLUGINS}; do - use ${flag} && switch='' || switch='#' - sed -i \ - -e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \ - Makefile - done -} - -src_compile() { - local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true') - emake ${v4l} -} - -src_install() { - into /usr - dobin ${PN//-/_} - dolib.so *.so - - if use www ; then - insinto /usr/share/${PN} - doins -r www - fi - - dodoc README TODO - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} - -pkg_postinst() { - elog "Remember to set an input and output plugin for mjpg-streamer." - - if use www ; then - echo - elog "An example webinterface has been installed into" - elog "/usr/share/mjpg-streamer/www for your usage." - fi -} diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild deleted file mode 100644 index e13ff04b0c33..000000000000 --- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils - -DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams" -HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer" -SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -INPUT_PLUGINS="input_testpicture input_control input_file input_uvc" -OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp" -IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}" -IUSE="input_testpicture input_control +input_file input_uvc output_file - output_udp +output_http output_autofocus output_rtsp - www v4l" -REQUIRED_USE="|| ( ${INPUT_PLUGINS} ) - || ( ${OUTPUT_PLUGINS} ) - v4l? ( input_uvc )" - -RDEPEND="virtual/jpeg - v4l? ( input_uvc? ( media-libs/libv4l ) )" -DEPEND="${RDEPEND} - input_testpicture? ( media-gfx/imagemagick )" - -src_prepare() { - epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch" - epatch "${FILESDIR}/${PV}-to-work-with-kernel-3.18.patch" - - local flag switch - - for flag in ${IUSE_PLUGINS}; do - use ${flag} && switch='' || switch='#' - sed -i \ - -e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \ - Makefile - done -} - -src_compile() { - local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true') - emake ${v4l} -} - -src_install() { - into /usr - dobin ${PN//-/_} - dolib.so *.so - - if use www ; then - insinto /usr/share/${PN} - doins -r www - fi - - dodoc README TODO - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} - -pkg_postinst() { - elog "Remember to set an input and output plugin for mjpg-streamer." - - if use www ; then - echo - elog "An example webinterface has been installed into" - elog "/usr/share/mjpg-streamer/www for your usage." - fi -} diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild index ca8898e4a9ee..0e44b70eb0ab 100644 --- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild +++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 inherit eutils @@ -13,28 +13,34 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -INPUT_PLUGINS="input_testpicture input_control input_file input_uvc" -OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp" +INPUT_PLUGINS="input-testpicture input-control input-file input-uvc" +OUTPUT_PLUGINS="output-file output-udp output-http output-autofocus output-rtsp" IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}" -IUSE="input_testpicture input_control +input_file input_uvc output_file - output_udp +output_http output_autofocus output_rtsp - www v4l" +IUSE="input-testpicture input-control +input-file input-uvc output-file + output-udp +output-http output-autofocus output-rtsp + www" REQUIRED_USE="|| ( ${INPUT_PLUGINS} ) - || ( ${OUTPUT_PLUGINS} ) - v4l? ( input_uvc )" + || ( ${OUTPUT_PLUGINS} )" RDEPEND="virtual/jpeg - v4l? ( input_uvc? ( media-libs/libv4l ) )" + input-uvc? ( media-libs/libv4l )" DEPEND="${RDEPEND} - input_testpicture? ( media-gfx/imagemagick )" + input-testpicture? ( media-gfx/imagemagick )" + +PATCHES=( + "${FILESDIR}/make-var-instead-of-cmd.patch" + "${FILESDIR}/to-work-with-kernel-3.18.patch" +) src_prepare() { - epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch" + default local flag switch for flag in ${IUSE_PLUGINS}; do use ${flag} && switch='' || switch='#' + flag=${flag/input-/input_} + flag=${flag/output-/output_} sed -i \ -e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \ Makefile @@ -42,7 +48,7 @@ src_prepare() { } src_compile() { - local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true') + local v4l=$(use input-uvc && echo 'USE_LIBV4L2=true') emake ${v4l} } @@ -58,7 +64,7 @@ src_install() { dodoc README TODO - newinitd "${FILESDIR}"/${PN}.initd ${PN} + sed -e "s|@LIBDIR@|$(get_libdir)|g" "${FILESDIR}/${PN}.initd" | newinitd - ${PN} newconfd "${FILESDIR}"/${PN}.confd ${PN} } diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 9d9aa64c5794..ed23f8783230 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,14 +1,9 @@ -AUX mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch 1456 BLAKE2B 0d360a6470830fd2c76cc75a1712976112bdfc8269d04ec42de054d1f63d3e028b9ee61adc7d49500479f0f14955a627a34d797b512a9a9f976bc6b45b1e47b6 SHA512 f4865f5ed364012f1cba98c7522f43050c158e36f0100350e87db18636913bdad0b668c62283362366aba10f58db13297d21b111596475200283471d7da058a6 -AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 BLAKE2B 655bf30240ac95f63385bd3bb3c5c9da264aedfb20c2e4abbf43d17dbdb9f5f7a79c6b8d056f6bec32144be87a23b88f0722d6193ad216771bd9e220ef7efa76 SHA512 15861e0f27598c626a5f39319b473483d5d1cec26ca2aad928f6cc751568d7c6eab9bac479665677da92c5c962a3060a8b7cc02899390702e7fed370c28d9a6e -AUX mpv-0.25.0-fix-float-comparisons-in-tests.patch 2096 BLAKE2B 88cfe962f3c9901e39837a8c890d0d07f362f3f5b2c1d9adc6cadffddb19bf38b918c76bdeb1d634a62ad09115c1d4adcfe218a3202843542d1d751e60e1d449 SHA512 46fdb40f0eafc9fdbf180d0334de5b57a3949b4479835750462414a996272da3ae816d62f58fc986f448045e4e8f8121cebbad19a0a031c589f5ed346a210875 -AUX mpv-0.27.0-add-missing-link-flags-for-rpi.patch 988 BLAKE2B 2dc3c70dbb0565db93fbaa9852e37afd1d953e896bb820095afdac8bc8d1bba52fca07173a63d306990e7c72611afb40e22a21d1bc8293b69691d4f5252c2753 SHA512 bb204c5910d927d3dd159fe17f8edecbbc80a9d36b60d83f08d10181e019fcb140a701d2b3d4c6436d08ef0ebe95fb81bb5d7467c2b63a1b098ba412defeea32 AUX mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch 1463 BLAKE2B 94343df8eb4b64462fdf5003bf3cfd028b44e1d5dbf43e2879dc371b0eb71e2569925d7d8b5a988ab38b22ed7ec9375b73d73b9ce7396793d3d96665a4469711 SHA512 7d82e578f9e8bd486f309abd3131cbd98e8f48ce7cc696105f860db032741621498a937b8bf887ee9fee0a4f36d5b476e1722a5c639a0d2842bf82712cd8de86 -DIST mpv-0.27.2-patches-r0.tar.xz 6564 BLAKE2B c02efea40e0b19d60eaa49520988464fbf4c9221108cbf19021934dc0cb0a975dab148ec1ea03753d81b8035173e3e5bd74b262ab5675d9fc5dce4a0f75ea37c SHA512 d1c955c32082338f5c7f1cd8268471ca0ac6dcd817c5fe39fb82f0e8bd3babf6f2f954d4ce52e9be786e5527df75cc6f4f3de8106a3517c8a1d8e39be1b4ebbd -DIST mpv-0.27.2.tar.gz 2957191 BLAKE2B 35e316e5a30869ae44ff229e99ae11a88e2f7d55b55946bfb752d5ed2d8212885c0c2abb59c9ff6d23a72daee47d80f44511313d67ee6fb265e6681ba4b89ee1 SHA512 bf74a150b3732b8c233362e0902c54f85fbea9ca1765a2a8f946a6eecd9b37a72ede36a36d0dd98a770539c4f81fe24c8ce26be9db7cd6eddd8514a8f82d9cda +AUX mpv-0.29.1-egl-bound.patch 1060 BLAKE2B 3e2c59c4e4c2929cce59735e37059fb3d6b42396287241bc0875fe14dbf2b415571c58af89e8328cb99ab5294e7ca0010ddc18581e36c999aef9f858dd05f0df SHA512 259c9711e33821103ed12c1e07c695d2b93e1d730499abf78352be395e72d870d3ce526504559cd3b69d5854e74acd995cf5a481383fa36e20927bf7a99c6213 DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5afd59bce4b423c7b4f3739b540f26a4de947cb3cf87a31a7d3ce03a11a6d1247158250afde596f490321a537 SHA512 ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086 -DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 +DIST mpv-0.30.0.tar.gz 3085141 BLAKE2B 314f6830f91e7dc11d3627688415c7535ef0ae462378d2c29cf036d5b851c55025ea5e9d5b0aa3f07ac6ec8c87350be65c882932bd908eab7c4f40b3840bf1a3 SHA512 2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66 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 10294 BLAKE2B ff462cb281cad580b53b92c728b0c40764abac864f8182896a1213feb1cd9ec520eaa06d17f9b492cbfe6c8e3ae986a61d8e599a706849e9f4ef709e02e97233 SHA512 4e65e14054e75644be877de94b6eb6096701971f95900bac5220e65f84793c109a00d376392a1d3eb63890bff31c01f67811a8081e79827212b1774a109da118 -EBUILD mpv-9999.ebuild 10323 BLAKE2B fceb344df0fe5a8f600db00cabe4c64985de7db4b15c3eea31c492f9f41ede8cbf91d072e19bc5b323f0e71e13d1bcc633dbb59d8c689df8d39744eb0ea8ea9a SHA512 14ae91c3b6e08361fab33987998471d0dc9b6c9a3ddd5cc2fac0e66b6f55db78fe0ac0170b5b3544853194edb0dd2612505637c7b1682136e1129f175d54e10f -MISC metadata.xml 2195 BLAKE2B 2cb6ef92e3152efff57b7284f907512fe5ccccd38bff5ddbff746565780636478016312b9612dc817613e4bfc3b5818d4e919a16bb4ba12b85f8fce797dac1f7 SHA512 5d771852f9431e46301fe644a407c1c800c4cf1b9bc7a274d03822f999c5c3366b738e4678f400e05fb6ac5cffb8ad98007a7ac9c369889d08a7fece9ec72e16 +EBUILD mpv-0.29.1-r1.ebuild 10339 BLAKE2B dcd76ab00d7cc9c54786ef25fb8b05fefdd8113620f30dd183005943343e54db7ac16e454885835e68e40043f43ff73908b004ec487c191aa613c6d750b4eaa4 SHA512 8b7b5452bd5e5f0b30a9037f3e675c9bb89b56bcdb8fe4a57f866372c7b87053cc3bf7bea9fbef6542fdba069a2f68af673d41e3825b88ac5760b33d40087211 +EBUILD mpv-0.30.0.ebuild 10046 BLAKE2B fe702a15cd11614126975d098a40b44759c38406e2603fffa382b1386c1b73250a46cdc2ffb8b8539bf70d68b744f9d4f6f2538080066ab91ec3c9e69b03a058 SHA512 d2395470a84c639a2102924e2169dddc72f799837282ae5e43675ca5164363cb7ecfe07c1bd764d679f67c536a2ed9e474bf227298e4d054228a0ebeaf960c7a +EBUILD mpv-9999.ebuild 10046 BLAKE2B fe702a15cd11614126975d098a40b44759c38406e2603fffa382b1386c1b73250a46cdc2ffb8b8539bf70d68b744f9d4f6f2538080066ab91ec3c9e69b03a058 SHA512 d2395470a84c639a2102924e2169dddc72f799837282ae5e43675ca5164363cb7ecfe07c1bd764d679f67c536a2ed9e474bf227298e4d054228a0ebeaf960c7a +MISC metadata.xml 2325 BLAKE2B ea9ce00b54f9aabf4f37dcbf20c94f6583e219638f6831e0f8f3292df0768d7e6c597a9072903604f8dbb7f88ef15cad87b2cbe57a41d22554e554cc6e9663b1 SHA512 84802287f2655571923a44c7383bac2f70838890b18222d0b060a371a79dbe5022bb7c186bb1ac6496b930c62dacafbc132178b60b0746bd2cce4eb08a5c6be7 diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch deleted file mode 100644 index 7c8d5b44c825..000000000000 --- a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch +++ /dev/null @@ -1,28 +0,0 @@ -player: make ffmpeg/libav version check non-fatal - -We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. - -diff --git a/player/main.c b/player/main.c -index 67dde3449..696d2e716 100644 ---- a/player/main.c -+++ b/player/main.c -@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) - if (!print_libav_versions(mp_null_log, 0)) { - // Using mismatched libraries can be legitimate, but even then it's - // a bad idea. We don't acknowledge its usefulness and stability. -- print_libav_versions(mpctx->log, MSGL_FATAL); -- MP_FATAL(mpctx, "\nmpv was compiled against a different version of " -- "FFmpeg/Libav than the shared\nlibrary it is linked against. " -- "This is most likely a broken build and could\nresult in " -- "misbehavior and crashes.\n\nmpv does not support this " -- "configuration and will not run - rebuild mpv instead.\n"); -- return -1; -+ print_libav_versions(mpctx->log, MSGL_WARN); -+ MP_WARN(mpctx, "\nmpv was compiled against a different version of " -+ "FFmpeg/Libav than the shared\nlibrary it is linked against. " -+ "This could result in misbehavior and crashes.\n\n" -+ "Upstream does not support this configuration.\n" -+ "Please rebuild mpv in case of any problems.\n"); - } - - if (opts->dump_stats && opts->dump_stats[0]) { diff --git a/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch b/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch deleted file mode 100644 index de70a4f5cf78..000000000000 --- a/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch +++ /dev/null @@ -1,20 +0,0 @@ -build: make libavdevice configure check accept libav-12 - -libav-12 is supported, but configure script expects -a higher libavdevice version than libav-12 provides. - -Gentoo-Bug: 603122 - -diff --git a/wscript b/wscript -index 94db7e296..7f61f54cc 100644 ---- a/wscript -+++ b/wscript -@@ -444,7 +444,7 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_ - }, { - 'name': '--libavdevice', - 'desc': 'libavdevice', -- 'func': check_pkg_config('libavdevice', '>= 57.0.0'), -+ 'func': check_pkg_config('libavdevice', '>= 56.1.0'), - }, { - 'name': 'avcodec-chroma-pos-api', - 'desc': 'libavcodec avcodec_enum_to_chroma_pos API', diff --git a/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch b/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch deleted file mode 100644 index 5498b99a3c76..000000000000 --- a/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit f4f24c105f9c132e84cba9a9707acc261033a816 -Author: Ilya Tumaykin <itumaykin@gmail.com> -Date: Thu Feb 1 14:05:06 2018 +0300 - -tests: stop comparing floats against DBL_EPSILON, use FLT_EPSILON - -Fixes #5253. - -diff --git a/test/gl_video.c b/test/gl_video.c -index a2d2577e25..6b5f3a7060 100644 ---- a/test/gl_video.c -+++ b/test/gl_video.c -@@ -4,22 +4,22 @@ - static void test_scale_ambient_lux_limits(void **state) { - float x; - x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 16.0); -- assert_double_equal(x, 2.40f); -+ assert_float_equal(x, 2.40f); - - x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 64.0); -- assert_double_equal(x, 1.961f); -+ assert_float_equal(x, 1.961f); - } - - static void test_scale_ambient_lux_sign(void **state) { - float x; - x = gl_video_scale_ambient_lux(16.0, 64.0, 1.961, 2.40, 64.0); -- assert_double_equal(x, 2.40f); -+ assert_float_equal(x, 2.40f); - } - - static void test_scale_ambient_lux_clamping(void **state) { - float x; - x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 0.0); -- assert_double_equal(x, 2.40f); -+ assert_float_equal(x, 2.40f); - } - - static void test_scale_ambient_lux_log10_midpoint(void **state) { -@@ -27,7 +27,7 @@ static void test_scale_ambient_lux_log10_midpoint(void **state) { - // 32 corresponds to the the midpoint after converting lux to the log10 scale - x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 32.0); - float mid_gamma = (2.40 - 1.961) / 2 + 1.961; -- assert_double_equal(x, mid_gamma); -+ assert_float_equal(x, mid_gamma); - } - - int main(void) { -diff --git a/test/test_helpers.h b/test/test_helpers.h -index 7a61da82ea..49328f623f 100644 ---- a/test/test_helpers.h -+++ b/test/test_helpers.h -@@ -10,6 +10,7 @@ - #include <math.h> - #include <float.h> - --#define assert_double_equal(a, b) assert_true(fabs(a - b) <= DBL_EPSILON) -+#define assert_double_equal(a, b) assert_true(fabs((a) - (b)) <= DBL_EPSILON * fmax(fabs(a), fabs(b))) -+#define assert_float_equal(a, b) assert_true(fabsf((a) - (b)) <= FLT_EPSILON * fmaxf(fabsf(a), fabsf(b))) - - #endif diff --git a/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch deleted file mode 100644 index 411573a66251..000000000000 --- a/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 48143b0cf52de37f93ae53a95261988d9b5ebff2 -Author: Ilya Tumaykin <itumaykin@gmail.com> -Date: Thu Jan 26 23:51:29 2017 +0300 - -build: rpi: add missing linker flags to fix build - -See https://www.raspberrypi.org/forums/viewtopic.php?f=67&t=20005&p=194090 -and https://github.com/raspberrypi/firmware/issues/110 - -Raspberry-pi upstream also adds '-lGLESv2' when EGL is used: -https://github.com/raspberrypi/userland/blob/master/pkgconfig/egl.pc.in - -diff --git a/wscript b/wscript -index 1880f631e5..741fe1e5a4 100644 ---- a/wscript -+++ b/wscript -@@ -772,7 +772,7 @@ video_output_features = [ - lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']), - # We still need all OpenGL symbols, because the vo_opengl code is - # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. -- check_cc(lib="EGL"), -+ check_cc(lib="EGL", linkflags="-lGLESv2"), - check_cc(lib="GLESv2"), - ), - } , { diff --git a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch b/media-video/mpv/files/mpv-0.29.1-egl-bound.patch new file mode 100644 index 000000000000..5a9be073fbfa --- /dev/null +++ b/media-video/mpv/files/mpv-0.29.1-egl-bound.patch @@ -0,0 +1,27 @@ +From f726b368da87024a0cfe82627e0730ffe4578716 Mon Sep 17 00:00:00 2001 +From: Marvin Schmidt <marv@exherbo.org> +Date: Wed, 18 Sep 2019 17:07:29 +0200 +Subject: [PATCH] build: lower version requirement for EGL + +`egl.pc` can be provided either by mesa or libglvnd. The latter doesn't +follow the same version scheme as mesa but instead uses the API version +that the library exposes, which is 1.5 for EGL[1] + +[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba#diff-b58a140c00ea99fb9a708e15afaade62R8 +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index 3569dbf060..97a4d9196b 100644 +--- a/wscript ++++ b/wscript +@@ -636,7 +636,7 @@ video_output_features = [ + 'deps': 'wayland', + 'groups': [ 'gl' ], + 'func': check_pkg_config('wayland-egl', '>= 9.0.0', +- 'egl', '>= 9.0.0') ++ 'egl', '>= 1.5') + } , { + 'name': '--gl-win32', + 'desc': 'OpenGL Win32 Backend', diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 61ab5a1fe43a..f3befa902794 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -13,6 +13,7 @@ <flag name="cuda">Enable hardware video decoding via Nvidia CUDA</flag> <flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag> <flag name="egl">Enable support for various EGL-based video outputs / backends</flag> + <flag name="gamepad">Enable gamepad input support</flag> <flag name="gbm">Enable Graphics Buffer Manager based EGL video backend</flag> <flag name="jpeg">Enable support for saving screenshots in JPEG format</flag> <flag name="libass">Enable OSD (On Screen Display) and subtitles support via <pkg>media-libs/libass</pkg></flag> @@ -27,6 +28,7 @@ <flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag> <flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag> <flag name="vulkan">Enable support for various Vulkan-based video backends</flag> + <flag name="zimg">Enable libzimg support (for vf_fingerprint)</flag> </use> <upstream> <remote-id type="github">mpv-player/mpv</remote-id> diff --git a/media-video/mpv/mpv-0.29.1-r1.ebuild b/media-video/mpv/mpv-0.29.1-r1.ebuild index a1e4fc1744a9..0022e823df76 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="~alpha 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" @@ -66,8 +66,8 @@ COMMON_DEPEND=" cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( - >=media-libs/libdvdnav-4.2.0 - >=media-libs/libdvdread-4.1.0 + >=media-libs/libdvdnav-4.2.0:= + >=media-libs/libdvdread-4.1.0:= ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( @@ -138,6 +138,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch" + "${FILESDIR}/${PN}-0.29.1-egl-bound.patch" ) src_prepare() { diff --git a/media-video/mpv/mpv-0.27.2.ebuild b/media-video/mpv/mpv-0.30.0.ebuild index f5997dc2747c..d4a50dfa75a3 100644 --- a/media-video/mpv/mpv-0.27.2.ebuild +++ b/media-video/mpv/mpv-0.30.0.ebuild @@ -3,22 +3,19 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE='threads(+)' -WAF_PV=1.9.8 +WAF_PV=2.0.9 inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils DESCRIPTION="Media player based on MPlayer and mplayer2" -HOMEPAGE="https://mpv.io/" +HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" if [[ ${PV} != *9999* ]]; then - SRC_URI=" - https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz - " - KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux" + SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + 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" @@ -31,17 +28,17 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb - dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca - libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband - samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib - zsh-completion" +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb + dvd +egl gamepad gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua + luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl + selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg" REQUIRED_USE=" || ( cli libmpv ) aqua? ( opengl ) - cuda? ( !libav opengl ) + cuda? ( opengl ) egl? ( || ( gbm X wayland ) ) + gamepad? ( sdl ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) @@ -50,30 +47,30 @@ REQUIRED_USE=" test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) - v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) + vulkan? ( || ( X wayland ) ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) - zsh-completion? ( cli ) ${PYTHON_REQUIRED_USE} " +RESTRICT="!test? ( test )" + COMMON_DEPEND=" - !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) - libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) + >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) - cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( - >=media-libs/libdvdnav-4.2.0 - >=media-libs/libdvdread-4.1.0 + >=media-libs/libdvdnav-4.2.0:= + >=media-libs/libdvdread-4.1.0:= ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) + gamepad? ( media-libs/libsdl2 ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) @@ -97,19 +94,15 @@ COMMON_DEPEND=" rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) - v4l? ( media-libs/libv4l ) - vaapi? ( - !libav? ( >=media-video/ffmpeg-3.3:0 ) - libav? ( >=media-video/libav-13_pre20171219:0 ) - x11-libs/libva:=[drm?,X?,wayland?] - ) - vdpau? ( - !libav? ( >=media-video/ffmpeg-3.3:0 ) - libav? ( >=media-video/libav-13_pre20171219:0 ) - x11-libs/libvdpau + vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) + vdpau? ( x11-libs/libvdpau ) + vulkan? ( + media-libs/libplacebo[vulkan] + media-libs/shaderc ) wayland? ( >=dev-libs/wayland-1.6.0 + >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( @@ -125,16 +118,16 @@ COMMON_DEPEND=" xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) + zimg? ( >=media-libs/zimg-2.9.2 ) " DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} - dev-python/docutils virtual/pkgconfig - doc? ( dev-python/rst2pdf ) + cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) + doc? ( dev-python/docutils + dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) - v4l? ( virtual/os-headers ) - zsh-completion? ( dev-lang/perl ) " RDEPEND="${COMMON_DEPEND} cuda? ( x11-drivers/nvidia-drivers[X] ) @@ -142,18 +135,10 @@ RDEPEND="${COMMON_DEPEND} tools? ( ${PYTHON_DEPS} ) " -PATCHES=( - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" - "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" - "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" - "${FILESDIR}/${PN}-0.27.0-add-missing-link-flags-for-rpi.patch" -) - src_prepare() { cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die chmod +x "${S}"/waf || die - eapply "${WORKDIR}/${PV}" - default_src_prepare + default } src_configure() { @@ -165,10 +150,6 @@ src_configure() { append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" fi - # Prevent access violations from zsh completion generation. - # See Gentoo bug 656086. - use zsh-completion && addpredict /dev/dri - local mywafargs=( --confdir="${EPREFIX}/etc/${PN}" --docdir="${EPREFIX}/usr/share/doc/${PF}" @@ -181,15 +162,14 @@ src_configure() { --disable-static-build # See deep down below for build-date. --disable-optimize # Don't add '-O2' to CFLAGS. - --disable-debug-build # Don't add '-g' to CFLAGS. - --enable-html-build + $(use_enable debug debug-build) + $(use_enable doc html-build) $(use_enable doc pdf-build) + $(use_enable doc manpage-build) $(use_enable cplugins) - $(use_enable zsh-completion zsh-comp) $(use_enable test) - --disable-android $(use_enable iconv) $(use_enable samba libsmbclient) $(use_enable lua) @@ -198,23 +178,19 @@ src_configure() { $(use_enable libass) $(use_enable libass libass-osd) $(use_enable zlib) - $(use_enable encode encoding) $(use_enable bluray libbluray) - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) $(use_enable cdda) $(use_enable uchardet) $(use_enable rubberband) $(use_enable lcms lcms2) --disable-vapoursynth # Only available in overlays. - --disable-vapoursynth-lazy $(use_enable archive libarchive) --enable-libavdevice # Audio outputs: $(use_enable sdl sdl2) # Listed under audio, but also includes video. - --disable-sdl1 $(use_enable oss oss-audio) --disable-rsound # Only available in overlays. --disable-sndio # Only available in overlays. @@ -229,6 +205,8 @@ src_configure() { $(use_enable aqua cocoa) $(use_enable drm) $(use_enable gbm) + $(use_enable wayland wayland-scanner) + $(use_enable wayland wayland-protocols) $(use_enable wayland) $(use_enable X x11) $(use_enable xv) @@ -245,35 +223,45 @@ src_configure() { $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') $(use_enable libcaca caca) $(use_enable jpeg) + $(use_enable vulkan shaderc) $(use_enable raspberry-pi rpi) $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - --disable-mali-fbdev # Only available in overlays. $(usex opengl '' '--disable-gl') + $(use_enable vulkan) + $(use_enable gamepad sdl2-gamepad) # HWaccels: # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable vaapi vaapi-hwaccel) - $(use_enable vdpau vdpau-hwaccel) $(use_enable cuda cuda-hwaccel) # TV features: - $(use_enable v4l tv) - $(use_enable v4l tv-v4l2) - $(use_enable v4l libv4l2) - $(use_enable v4l audio-input) $(use_enable dvb dvbin) # Miscellaneous features: - --disable-apple-remote # Needs testing first. See Gentoo bug 577332. + $(use_enable zimg) ) if use vaapi && use X; then mywafargs+=( - $(use_enable opengl vaapi-glx) $(use_enable egl vaapi-x-egl) ) fi + # Not for us + mywafargs+=( + --disable-android + --disable-egl-android + --disable-uwp + --disable-audiounit + --disable-wasapi + --disable-ios-gl + --disable-apple-remote + --disable-macos-touchbar + --disable-macos-cocoa-cb + --disable-tvos + --disable-egl-angle-win32 + ) + # Create reproducible non-live builds. [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) @@ -352,6 +340,8 @@ pkg_postinst() { elog "please rebuild app-shells/mpv-bash-completion." fi + elog "If you want URL support, please install net-misc/youtube-dl." + gnome2_icon_cache_update xdg_desktop_database_update } diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 48ba9636d056..d4a50dfa75a3 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -11,11 +11,11 @@ WAF_PV=2.0.9 inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils DESCRIPTION="Media player based on MPlayer and mplayer2" -HOMEPAGE="https://mpv.io/" +HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~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" @@ -28,17 +28,17 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb - dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb + dvd +egl gamepad gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl - selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib - zsh-completion" + selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg" REQUIRED_USE=" || ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm X wayland ) ) + gamepad? ( sdl ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) @@ -47,17 +47,17 @@ REQUIRED_USE=" test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) - v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) - zsh-completion? ( cli ) ${PYTHON_REQUIRED_USE} " +RESTRICT="!test? ( test )" + COMMON_DEPEND=" >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) @@ -66,10 +66,11 @@ COMMON_DEPEND=" cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( - >=media-libs/libdvdnav-4.2.0 - >=media-libs/libdvdread-4.1.0 + >=media-libs/libdvdnav-4.2.0:= + >=media-libs/libdvdread-4.1.0:= ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) + gamepad? ( media-libs/libsdl2 ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) @@ -93,13 +94,11 @@ COMMON_DEPEND=" rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) - v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( + media-libs/libplacebo[vulkan] media-libs/shaderc - media-libs/vulkan-loader[X?,wayland?] - >=media-libs/libplacebo-1.18.0[vulkan] ) wayland? ( >=dev-libs/wayland-1.6.0 @@ -119,17 +118,16 @@ COMMON_DEPEND=" xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) + zimg? ( >=media-libs/zimg-2.9.2 ) " DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} - dev-python/docutils virtual/pkgconfig cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) - doc? ( dev-python/rst2pdf ) + doc? ( dev-python/docutils + dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) - v4l? ( virtual/os-headers ) - zsh-completion? ( dev-lang/perl ) " RDEPEND="${COMMON_DEPEND} cuda? ( x11-drivers/nvidia-drivers[X] ) @@ -137,14 +135,10 @@ RDEPEND="${COMMON_DEPEND} tools? ( ${PYTHON_DEPS} ) " -PATCHES=( - "${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch" -) - src_prepare() { cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die chmod +x "${S}"/waf || die - default_src_prepare + default } src_configure() { @@ -156,10 +150,6 @@ src_configure() { append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" fi - # Prevent access violations from zsh completion generation. - # See Gentoo bug 656086. - use zsh-completion && addpredict /dev/dri - local mywafargs=( --confdir="${EPREFIX}/etc/${PN}" --docdir="${EPREFIX}/usr/share/doc/${PF}" @@ -172,15 +162,14 @@ src_configure() { --disable-static-build # See deep down below for build-date. --disable-optimize # Don't add '-O2' to CFLAGS. - --disable-debug-build # Don't add '-g' to CFLAGS. - --enable-html-build + $(use_enable debug debug-build) + $(use_enable doc html-build) $(use_enable doc pdf-build) + $(use_enable doc manpage-build) $(use_enable cplugins) - $(use_enable zsh-completion zsh-comp) $(use_enable test) - --disable-android $(use_enable iconv) $(use_enable samba libsmbclient) $(use_enable lua) @@ -190,14 +179,12 @@ src_configure() { $(use_enable libass libass-osd) $(use_enable zlib) $(use_enable bluray libbluray) - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) $(use_enable cdda) $(use_enable uchardet) $(use_enable rubberband) $(use_enable lcms lcms2) --disable-vapoursynth # Only available in overlays. - --disable-vapoursynth-lazy $(use_enable archive libarchive) --enable-libavdevice @@ -239,32 +226,42 @@ src_configure() { $(use_enable vulkan shaderc) $(use_enable raspberry-pi rpi) $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - --disable-mali-fbdev # Only available in overlays. $(usex opengl '' '--disable-gl') $(use_enable vulkan) + $(use_enable gamepad sdl2-gamepad) # HWaccels: # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. $(use_enable cuda cuda-hwaccel) # TV features: - $(use_enable v4l tv) - $(use_enable v4l tv-v4l2) - $(use_enable v4l libv4l2) - $(use_enable v4l audio-input) $(use_enable dvb dvbin) # Miscellaneous features: - --disable-apple-remote # Needs testing first. See Gentoo bug 577332. + $(use_enable zimg) ) if use vaapi && use X; then mywafargs+=( - $(use_enable opengl vaapi-glx) $(use_enable egl vaapi-x-egl) ) fi + # Not for us + mywafargs+=( + --disable-android + --disable-egl-android + --disable-uwp + --disable-audiounit + --disable-wasapi + --disable-ios-gl + --disable-apple-remote + --disable-macos-touchbar + --disable-macos-cocoa-cb + --disable-tvos + --disable-egl-angle-win32 + ) + # Create reproducible non-live builds. [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) diff --git a/media-video/orion/Manifest b/media-video/orion/Manifest index 79b866a58739..ce1fe980567a 100644 --- a/media-video/orion/Manifest +++ b/media-video/orion/Manifest @@ -1,6 +1,11 @@ AUX orion-1.6.1-fix_desktop.patch 491 BLAKE2B 70d44443f10c55023120f2ef9f53186e095306d149302e091ecdbb64076cad1d07413018bc4af4b90c5de32371ab609a641d81a34026ffb9a54991dcb03d203d SHA512 82b6a12d3fac7e0283154c961684bef1ae34490b8a1ec065ee1f1876bfeaa7eb9bc5d4e2c6d5b10291af80126c790c5bed1d8d796d81f98e112a419e449cd961 +AUX orion-1.6.6-fix_login.patch 999 BLAKE2B 43f37299be369aa56d612ec6393c4a240c06a65b37a9e22dd499b774497c22eb5fe342ecd6b030912cab2354ef4774d067b10c1fa0288f5a6c8554dea9aef1e3 SHA512 a5b45ca8dae9008bb21ca73a8fa57ccff56da46cdb0aa3f9cc03299ca9d864bfa311a622e7735505a52b4a6c7cc66399756f159fa3757ef17a0f00d7b4304792 +AUX orion-1.6.6-mpv_backwards.patch 4470 BLAKE2B 19ca0d4e5226038d5e8bc528856d2f145a6750a87d9f20591810165d513a1fd3067bda2e483088d3e2cf1a44a963ff7498e530d03099ddc6b6ef2a4661d4ac84 SHA512 79f421e95a97f22e91dda2e350c94e8612230123ee64a18f15926bc111c67a6965dc740def5d9624575024f6b0e11871dfa3c26ce0e4e7abb4e3d3c1811ddd9b +AUX orion-1.6.6-mpv_compilation.patch 1108 BLAKE2B 021660340ba3f6cf7f70fda13af65544ea26edafb50331b4f5bba0af0b1662840ec25a5993b1f19335c7c2ebb5129c04d487640fad975cb797a1a07bd400ca29 SHA512 ffff325f22eace89c0b2f59701e0f119c759ea3d2f2c5d2422b6e3f0eac74e08fa56e442502895ab78cc41be9fe2182f2a62d036ba872c3dfc9457ad61e324af DIST orion-1.6.1.tar.gz 614216 BLAKE2B 8fc0909c1dd433e72d4ed41046d38a861ec48cbe6e93e1a9cc48f31cb3ef381e1b5b998c501d20756883431464eef798859b9ba4d086b89575281dbc17afca69 SHA512 3db0b59a89d2364f2d0586c3f318fc793f73a17d767adb0f44b89830e397be6f24c2ab662b7c84e7d857bc42b952fdf7fa280090313f5e39e37205eb8fb6dc9e DIST orion-1.6.5.tar.gz 624005 BLAKE2B ca2c40a299ab3f1abc7f383f2a5f39ebbe1e6ce6737efc3da0acd8cbbc04753dab865f417bd8e39d7e42dd7db8de703dd3b251296b8820a9027ca3ad2cd5de1d SHA512 6add27b81bf2520354e1a8854c2be4caf81d1c7c161003cb86bb4911852965cff938381c0ea481c64dc91c36d45f5af44cfb6e9a6d1c379f8b3b3011bbe47c6f +DIST orion-1.6.6.tar.gz 629917 BLAKE2B 303af947533aeb26561fb3fc57d4ffbbd6d168e1e51ffe196a0de82fca3406599cfb84c1ae361c9b7b84c9c01b47bb6147b98f62cc5b1dec3d08d0588cbc7327 SHA512 88c7efe1796d1135f18bd53c83a25747df1bbf35163b27c625711ab5027e988425e3ba13ff6e3349d30cdc99d24cae0642d1d058e401a24b240d73c6b47a2aaf EBUILD orion-1.6.1.ebuild 972 BLAKE2B 475db2a56a07a0ec72a56e87c5f17f721e0a4dec0278847dde90b2374ce0e009d9f68e45128165d5dc64ea9582a77599a9e6f9f387014233bb1fdaf3c06941a3 SHA512 b6eb5de3734dbae9c8cbcb2f61cf0baf50f83a10b7f8bfa03a0cbabbd5c2985d628df544024e9c45dc282d1f2a5dd7e89b0f473dc8c6a1894032836b76108ffc EBUILD orion-1.6.5.ebuild 988 BLAKE2B 9703326fe52193570e84fc3428941167b12680cb40a891920fa4b2e45a0144110322dcf391146b939647b0aacb0a7de5c72641dec5ada927b741cb7393eb68da SHA512 81dd5dd6ef117820bcdfb63449271f31ffec5724e24df52532d53c07fb49be71ea7d5e520db43f863a0f12e22a9ec6963155c9c52500ebdc5031c7ba04866acc +EBUILD orion-1.6.6.ebuild 1246 BLAKE2B 9e411ef69e8d9ef745fb7b545d2467df0ab10973005b1cded89ebb059d9da36b6c27c7fd39208b88e3122d1f12ebf699c252dabb5615e1c09428a5279c422bbe SHA512 1787dc3362bc1b9e7e13a1cf7e31dac30b2d1d3b442d6bc54143778faf25b4306ad7679ddff691cb2c34034b16332995b0b2551e026721701475f627eaee0652 MISC metadata.xml 574 BLAKE2B de16e0fa5f9fbb443c5218a093048811e4ad9e633ec0e23cbd8b00e5322f7709af121ff3fa8cc4ef9cbc164f84d57cbf9ce9c542b7753195f09735e859fb5a55 SHA512 4ffbe221d97a40411dbaefc31fad97978f2ae823d14e1fbfef1aa9d84697c9ea06f7d58c7174ff1daa3b8f64863d62350dc469414e0b55917a227e2953b86bc9 diff --git a/media-video/orion/files/orion-1.6.6-fix_login.patch b/media-video/orion/files/orion-1.6.6-fix_login.patch new file mode 100644 index 000000000000..c6aced452ca7 --- /dev/null +++ b/media-video/orion/files/orion-1.6.6-fix_login.patch @@ -0,0 +1,32 @@ +From 69c58ba5af5f83903be70629b02f348fc3ad8757 Mon Sep 17 00:00:00 2001 +From: Andrew Tonner <rakslice@gmail.com> +Date: Tue, 26 Mar 2019 14:58:40 -0700 +Subject: [PATCH] Fix HTTP request socket output + +--- + src/network/httpserver.cpp | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/network/httpserver.cpp b/src/network/httpserver.cpp +index 235e073..b0368eb 100644 +--- a/src/network/httpserver.cpp ++++ b/src/network/httpserver.cpp +@@ -89,7 +89,6 @@ void HttpServer::onRead() { + + // Respond with 200 + QByteArray block; +- QDataStream out(&block, QIODevice::WriteOnly); + + // http payload message body + QByteArray content; +@@ -111,9 +110,7 @@ void HttpServer::onRead() { + response += "Content-Length: " + QString::number(content.length()) + "\n"; + response += "\n" + content; + +- out << response.toUtf8(); +- +- socket->write(block); ++ socket->write(response.toUtf8()); + socket->waitForBytesWritten(); + socket->disconnectFromHost(); + diff --git a/media-video/orion/files/orion-1.6.6-mpv_backwards.patch b/media-video/orion/files/orion-1.6.6-mpv_backwards.patch new file mode 100644 index 000000000000..4cd302cb3d1f --- /dev/null +++ b/media-video/orion/files/orion-1.6.6-mpv_backwards.patch @@ -0,0 +1,147 @@ +From 755fae82a31105808ec978855803f52affa01f87 Mon Sep 17 00:00:00 2001 +From: mrgreywater <mr.greywater@googlemail.com> +Date: Fri, 19 Oct 2018 22:21:07 +0200 +Subject: [PATCH] opengl-cb backward compatibility + +--- + src/player/mpvobject.cpp | 43 ++++++++++++++++++++++++++++++++++------ + src/player/mpvobject.h | 15 +++++++++++++- + 2 files changed, 51 insertions(+), 7 deletions(-) + +diff --git a/src/player/mpvobject.cpp b/src/player/mpvobject.cpp +index 2955063..31cdf73 100644 +--- a/src/player/mpvobject.cpp ++++ b/src/player/mpvobject.cpp +@@ -48,16 +48,25 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer + MpvRenderer(MpvObject *new_obj) + : obj{new_obj} + { +- ++#ifdef USE_OPENGL_CB ++ int r = mpv_opengl_cb_init_gl(obj->mpv_gl, nullptr, &get_proc_address_mpv, nullptr); ++ if (r < 0) ++ throw std::runtime_error("could not initialize OpenGL"); ++#endif + } + + virtual ~MpvRenderer() +- {} ++ { ++#ifdef USE_OPENGL_CB ++ mpv_opengl_cb_uninit_gl(obj->mpv_gl); ++#endif ++ } + + // This function is called when a new FBO is needed. + // This happens on the initial frame. + QOpenGLFramebufferObject * createFramebufferObject(const QSize &size) + { ++#ifndef USE_OPENGL_CB + // init mpv_gl: + if (!obj->mpv_gl) + { +@@ -72,15 +81,17 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer + throw std::runtime_error("failed to initialize mpv GL context"); + mpv_render_context_set_update_callback(obj->mpv_gl, on_mpv_redraw, obj); + } +- ++#endif + return QQuickFramebufferObject::Renderer::createFramebufferObject(size); + } + + void render() + { + obj->window()->resetOpenGLState(); +- + QOpenGLFramebufferObject *fbo = framebufferObject(); ++#ifdef USE_OPENGL_CB ++ mpv_opengl_cb_draw(obj->mpv_gl, fbo->handle(), fbo->width(), fbo->height()); ++#else + mpv_opengl_fbo mpfbo{static_cast<int>(fbo->handle()), fbo->width(), fbo->height(), 0}; + int flip_y{0}; + +@@ -97,7 +108,7 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer + // See render_gl.h on what OpenGL environment mpv expects, and + // other API details. + mpv_render_context_render(obj->mpv_gl, params); +- ++#endif + obj->window()->resetOpenGLState(); + } + }; +@@ -115,11 +126,27 @@ MpvObject::MpvObject(QQuickItem * parent) + mpv_set_option_string(mpv, "msg-level", "all=v"); + #endif + ++#ifdef USE_OPENGL_CB ++ mpv_set_option_string(mpv, "vo", "opengl-cb"); ++#endif ++ + if (mpv_initialize(mpv) < 0) + throw std::runtime_error("could not initialize mpv context"); + + // Request hw decoding, just for testing. +- mpv::qt::set_option_variant(mpv, "hwdec", "auto"); ++ mpv_set_option_string(mpv, "hwdec", "auto"); ++ ++#ifdef USE_OPENGL_CB ++ // Setup the callback that will make QtQuick update and redraw if there ++ // is a new video frame. Use a queued connection: this makes sure the ++ // doUpdate() function is run on the GUI thread. ++ mpv_gl = (mpv_opengl_cb_context *)mpv_get_sub_api(mpv, MPV_SUB_API_OPENGL_CB); ++ ++ if (!mpv_gl) ++ throw std::runtime_error("OpenGL not compiled in"); ++ ++ mpv_opengl_cb_set_update_callback(mpv_gl, MpvObject::on_update, (void *)this); ++#endif + + mpv_set_wakeup_callback(mpv, wakeup, this); + +@@ -130,7 +157,11 @@ MpvObject::~MpvObject() + { + if (mpv_gl) // only initialized if something got drawn + { ++#ifdef USE_OPENGL_CB ++ mpv_opengl_cb_set_update_callback(mpv_gl, nullptr, nullptr); ++#else + mpv_render_context_free(mpv_gl); ++#endif + } + + mpv_terminate_destroy(mpv); +diff --git a/src/player/mpvobject.h b/src/player/mpvobject.h +index 0ec0b7a..eeaa250 100644 +--- a/src/player/mpvobject.h ++++ b/src/player/mpvobject.h +@@ -6,8 +6,21 @@ + + #include <QtQuick/QQuickFramebufferObject> + ++ + #include <mpv/client.h> ++ ++#if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(1, 28) ++#define USE_OPENGL_CB ++#endif ++ ++#ifdef USE_OPENGL_CB ++#include <mpv/opengl_cb.h> ++typedef mpv_opengl_cb_context mpv_context; ++#else + #include <mpv/render_gl.h> ++typedef mpv_render_context mpv_context; ++#endif ++ + #include <mpv/qthelper.hpp> + + class MpvRenderer; +@@ -17,7 +30,7 @@ class MpvObject : public QQuickFramebufferObject + Q_OBJECT + + mpv_handle *mpv; +- mpv_render_context *mpv_gl; ++ mpv_context *mpv_gl; + std::vector<std::unique_ptr<QJSValue>> callbacks; + + friend class MpvRenderer; diff --git a/media-video/orion/files/orion-1.6.6-mpv_compilation.patch b/media-video/orion/files/orion-1.6.6-mpv_compilation.patch new file mode 100644 index 000000000000..c9163d3376c5 --- /dev/null +++ b/media-video/orion/files/orion-1.6.6-mpv_compilation.patch @@ -0,0 +1,39 @@ +index def79f5..7fd9d93 100644 +--- a/orion.pro ++++ b/orion.pro +@@ -8,7 +8,7 @@ QT += gui qml network widgets quickcontrols2 + + QMAKE_CXXFLAGS += -Wall -O2 + +-CONFIG += c++11 ++CONFIG += c++14 + #CONFIG += console + + TARGET = orion +@@ -86,8 +86,8 @@ android: { + android/src/com/orion/MainActivity.java + + ANDROID_EXTRA_LIBS = \ +- $$PWD/../openssl-1.0.2l/libcrypto.so \ +- $$PWD/../openssl-1.0.2l/libssl.so ++ $$PWD/libs/libcrypto.so \ ++ $$PWD/libs/libssl.so + } + + #Backend for player, uses mpv as default +diff --git a/src/player/mpvobject.cpp b/src/player/mpvobject.cpp +index 2c30462..2955063 100644 +--- a/src/player/mpvobject.cpp ++++ b/src/player/mpvobject.cpp +@@ -103,8 +103,10 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer + }; + + MpvObject::MpvObject(QQuickItem * parent) +- : QQuickFramebufferObject(parent), mpv{mpv_create()}, mpv_gl(nullptr) ++ : QQuickFramebufferObject(parent), mpv_gl(nullptr) + { ++ std::setlocale(LC_NUMERIC, "C"); ++ mpv = mpv_create(); + if (!mpv) + throw std::runtime_error("could not create mpv context"); + diff --git a/media-video/orion/orion-1.6.6.ebuild b/media-video/orion/orion-1.6.6.ebuild new file mode 100644 index 000000000000..7fe4e32bd5c9 --- /dev/null +++ b/media-video/orion/orion-1.6.6.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit desktop qmake-utils xdg-utils + +DESCRIPTION="Cross-platform Twitch client" +HOMEPAGE="https://alamminsalo.github.io/orion/" +SRC_URI="https://github.com/alamminsalo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+mpv qtav qtmedia" + +DEPEND=">=dev-qt/qtquickcontrols-5.8:5 + >=dev-qt/qtquickcontrols2-5.8:5 + >=dev-qt/qtsvg-5.8:5 + >=dev-qt/qtwebengine-5.8:5 + mpv? ( media-video/mpv[libmpv] ) + qtav? ( media-libs/qtav ) + qtmedia? ( >=dev-qt/qtmultimedia-5.8:5 )" +RDEPEND="${DEPEND} + !mpv? ( media-plugins/gst-plugins-hls )" + +REQUIRED_USE="^^ ( mpv qtav qtmedia )" + +PATCHES=( + "${FILESDIR}"/${P}-fix_login.patch + "${FILESDIR}"/${P}-mpv_compilation.patch + "${FILESDIR}"/${P}-mpv_backwards.patch +) + +src_configure() { + local PLAYER + if use mpv; then + PLAYER=mpv + elif use qtav; then + PLAYER=qtav + else + PLAYER=multimedia + fi + eqmake5 ${PN}.pro CONFIG+=${PLAYER} +} + +src_install() { + dobin ${PN} + domenu distfiles/*.desktop + + insinto /usr/share/icons/hicolor/scalable/apps + doins distfiles/${PN}.svg +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest index 11f516e68f79..a267c507453e 100644 --- a/media-video/parole/Manifest +++ b/media-video/parole/Manifest @@ -1,7 +1,3 @@ -DIST parole-1.0.2.tar.bz2 915511 BLAKE2B e6fa116cae5c015a90b4a1d04df70f006ad59dfdb5d849b8ae8c3fdc0665e48790739c82bdb7c35c70f34548b9bee3dcac62f29e28562663d46b10a3a080f13d SHA512 d7e989af7f9dab14080e62bd656a2858d8536a056ba82b5d5ac7d26a7d898f478b74c1ba4371779624691b7f42b695580ad53cfb15da0a4dc209d7570c12a66d -DIST parole-1.0.3.tar.bz2 963822 BLAKE2B 8f7131ea8e46541edab093514f7955ebe551549f1e6057186b87d2e5074a9760eb571b36c65cb7d33ff398432c2397fca3ffc764fb924967b50343eb4d7e93a9 SHA512 6163cd9d37b50093a44694af79aa421e9cd33ba92b2cf3e15640894fe9c51809ed7e93a31eccd274cfd9934fb34a63e6a21a161f5a0a96aeb20faac85ff65d16 DIST parole-1.0.4.tar.bz2 921020 BLAKE2B c81b5d8773a933e7f3b2d3816401e5e833db58964623b1c40747b47632f594e9aaabde87d89de3c6e87b01b43ef9aef01194ab5a40ce2e36fe8909acceac5c3e SHA512 5f67830e36b6ac41c85dbbb7d6b4e2dfbd037c9e8fe4f5ab5ef8c52ebe4c69b5a9bfdee298b174a85334a4ae9414ed3492994853896f745c489116359cc14969 -EBUILD parole-1.0.2.ebuild 1442 BLAKE2B db6d0f6f8ad020030448874f38d2e2d270fb2f7b5446e24f85792d1de574c368f0c6ce352bef0a0834d331089ac42052b8f5662599ed874d836e2b273dc68634 SHA512 985e7c0dcd1f792ee707e47fd34dd52dc4698fa474103a0565905212e55ef7c576bc99cf315664782dec3a4693ee928eb33c58efcaba10a47827c93c8175dde0 -EBUILD parole-1.0.3.ebuild 1444 BLAKE2B 928756a4fb9ad566657266178425bd2d92f983addea0ff360eba32d307514bba50410bf5471d3e3fa0b9fa6b5c33d9beb1a35638185f6955f9c888cd864992d1 SHA512 db929065e2c46e0a060c4e2647cf7b21674ffd42711f147fcc97db42f9edd0b41abf3737be08dc9fcb330c126241a9ccefa8488717129a3e4c4e7023dba49d4a EBUILD parole-1.0.4.ebuild 1418 BLAKE2B a1abef8e6c6ba9e38e2cda7e5ea376778266cd7018e6ac7f92290412294281e56e05f2f9591aac3f5224cf8aed6464e3aae9fdb29959ebe0ab49eadf41f7ab73 SHA512 e6783e3eae9679c806a3626451cde9f1ad9d34ee387e70838e47c2f78d6dbcd87602e743a0903652c69137a9bebcb253913a6e02297f4bf817ca509d6f014183 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8 diff --git a/media-video/parole/parole-1.0.2.ebuild b/media-video/parole/parole-1.0.2.ebuild deleted file mode 100644 index 8332b7952382..000000000000 --- a/media-video/parole/parole-1.0.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2-utils xdg-utils - -DESCRIPTION="A simple Xfce4 media player using GStreamer" -HOMEPAGE="https://docs.xfce.org/apps/parole/start" -SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~mips x86" -IUSE="libnotify taglib" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:= - >=dev-libs/glib-2.32:2= - media-libs/gstreamer:1.0= - media-libs/gst-plugins-base:1.0= - sys-apps/dbus:0= - >=x11-libs/gtk+-3.20:3= - x11-libs/libX11:0= - >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] - >=xfce-base/libxfce4util-4.11:0= - >=xfce-base/xfconf-4.10:0= - libnotify? ( >=x11-libs/libnotify-0.7:0= ) - taglib? ( >=media-libs/taglib-1.6:0= )" -RDEPEND="${COMMON_DEPEND} - media-plugins/gst-plugins-meta:1.0" -DEPEND="${COMMON_DEPEND} - dev-util/glib-utils - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -DOCS=( AUTHORS ChangeLog README THANKS TODO ) - -src_configure() { - local myconf=( - # clutter backend does not work with new GTK+3 versions - --disable-clutter - $(use_enable taglib) - $(use_enable libnotify notify-plugin) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-video/parole/parole-1.0.3.ebuild b/media-video/parole/parole-1.0.3.ebuild deleted file mode 100644 index f14dfea94f96..000000000000 --- a/media-video/parole/parole-1.0.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2-utils xdg-utils - -DESCRIPTION="A simple Xfce4 media player using GStreamer" -HOMEPAGE="https://docs.xfce.org/apps/parole/start" -SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" -IUSE="libnotify taglib" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:= - >=dev-libs/glib-2.32:2= - media-libs/gstreamer:1.0= - media-libs/gst-plugins-base:1.0= - sys-apps/dbus:0= - >=x11-libs/gtk+-3.20:3= - x11-libs/libX11:0= - >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] - >=xfce-base/libxfce4util-4.11:0= - >=xfce-base/xfconf-4.10:0= - libnotify? ( >=x11-libs/libnotify-0.7:0= ) - taglib? ( >=media-libs/taglib-1.6:0= )" -RDEPEND="${COMMON_DEPEND} - media-plugins/gst-plugins-meta:1.0" -DEPEND="${COMMON_DEPEND} - dev-util/glib-utils - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -DOCS=( AUTHORS ChangeLog README THANKS TODO ) - -src_configure() { - local myconf=( - # clutter backend does not work with new GTK+3 versions - --disable-clutter - $(use_enable taglib) - $(use_enable libnotify notify-plugin) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 4b3bf20a0cbe..0fc7ff6f12a5 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -1,9 +1,3 @@ -AUX pipewire-0.2.6-alsa-lib-1.1.9.patch 1909 BLAKE2B 4e6c1143dff1b48cd415068369d0a9f99b37002b1ecd083bcf39c7d060cd59b211f7ed585cafd6a8a980897ffa24fa68366346f3ff62cdc1ddddd2b327343633 SHA512 27aabf39e6615925ef21f2a1b4c2914204d4dd9f2de674912a76e049a30f685c036a78f4243e8005c1739acb9d698129f4e59ef78576acd5287a31dab22aca3c -AUX pipewire-0.2.6-fix-probing-without-starting.patch 2119 BLAKE2B f7180ad95f0f285a633059e8e1d0dee9f3d42ac04237ed47931da16813af2fc4f766720e2ee73442af102f856938caa1243b4c65584e9a79e5b5772718393727 SHA512 101762a2b468c280ee3f8010d3a8603f4a026b77659f34056821d9ba164bb4255a6c83a3fe30721c2092727bfed00f637bfe3d726f67a71eaf6e51050d928e04 -AUX pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch 5684 BLAKE2B 9ce85e2f15b18ef458d21a44b10c875b0cb456972a61dd1ff127ad62510604d35ea6dd70daa0191181a34d2fea613ac254ffd6fa4f0fa3bb6114191e3a62996e SHA512 ba194a678b1130a29b17f1831c1a94c24db6cb05ae1d2a0e825fd1099aa2a300200d7cbfd5e5b592c54aea33893c68e554edd4bdfd1ca6cc84739b12e33058f6 -AUX pipewire-0.2.6-revert-combine-all-perms.patch 1039 BLAKE2B 5fd1d82c92680b6097ac70367eb5f7fc8190d0589d4bb228dc93c6f673763a65a7c18a5fd3b242686ba86773d90078cc50a5d7c2277dc90edcdb341d5ecb9f23 SHA512 c9bab5e79b4a88f240d34702dfe5de2df4ab7c5158d5b95228647018cb5bb69ec124fb47405074aef91480d25d388df7cdbb7fa94396d228b6f573697b2f8333 -DIST pipewire-0.2.6.tar.gz 421137 BLAKE2B 155667d14fe5380e21f0b70accea72dc4478085916a9126185136f6d33bd7729d91b790c171dcf7b6aea2c52894462d16516f8821229ca0bf9f6cde15df524d9 SHA512 3d1db41f5beb42a0ee15ae7bc8afb89b54a37c3a6a414e88b5e33ceaf98ec6dda0d9a2d03ac47a8dfce48e9637e647291919e6670bb70589b0d1951fbcbd3ff8 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334 -EBUILD pipewire-0.2.6.ebuild 1860 BLAKE2B b9017a577f438bc060ffc67be21afa5a2deb86fa6f1a994f7d6d9b4b37a65aca3780dd19aa59324f4ea33929ec04bd36fb3c653460fc97353603f4af8de8f067 SHA512 c335d7b5a2c331804d722ceaec6fbefe9104f2ba1c89c8f7eda08409f29c66b0d50a669bfd353a520fb22efc53d7209a7041ab6a7fc8bb66c6ca1a8358436216 -EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B b17c8d5a96bded29ada3bdd753128fa55a9c4517420e67197cce724d8a61a9daf1e4df4a5c10504ed51f0594973721ae7c716d59fd9560a8d5c7bc67cc48a3e6 SHA512 8b958ddd4abe83277ce172a51099ba9e0631c65a2a9c2594162c9984a409c613c304ce171f2229967600969c25a63eccf2ad4f4bd71b8a2d1e5ba9cedad95cfd +EBUILD pipewire-0.2.7.ebuild 1655 BLAKE2B cfc3943f488b9b85d042cae663bc9edc9bb486bfcd9da5ae487889aef6229ee3cfa0b01f01c20ef991674b6bc1584426b376b0c7f3425ea7ef3dfe1e6d45e34f SHA512 a4e513569e19701349638055aff383344d4730adfd1c4668ab249864ed7c1c7b0ff93d908fb7e7ada313cac07ba3bf1ac715ae2f67133cece8c165af3f643fa9 MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c diff --git a/media-video/pipewire/files/pipewire-0.2.6-alsa-lib-1.1.9.patch b/media-video/pipewire/files/pipewire-0.2.6-alsa-lib-1.1.9.patch deleted file mode 100644 index 7b2b4c894da3..000000000000 --- a/media-video/pipewire/files/pipewire-0.2.6-alsa-lib-1.1.9.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 37613b67ba52b5ad4e81d7ea38adc04027d9f9e5 Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Thu, 23 May 2019 09:25:51 +0200 -Subject: [PATCH] alsa: handle alsa-lib 1.1.9 - -alsa-lib 1.1.9 removed /usr/include/alsa from the include path, we -must include <alsa/asoundlib.h> ---- - spa/plugins/alsa/alsa-monitor.c | 2 +- - spa/plugins/alsa/alsa-sink.c | 2 +- - spa/plugins/alsa/alsa-source.c | 2 +- - spa/plugins/alsa/alsa-utils.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/spa/plugins/alsa/alsa-monitor.c b/spa/plugins/alsa/alsa-monitor.c -index d8935cd7..16a01302 100644 ---- a/spa/plugins/alsa/alsa-monitor.c -+++ b/spa/plugins/alsa/alsa-monitor.c -@@ -25,7 +25,7 @@ - #include <poll.h> - - #include <libudev.h> --#include <asoundlib.h> -+#include <alsa/asoundlib.h> - - #include <spa/support/log.h> - #include <spa/support/type-map.h> -diff --git a/spa/plugins/alsa/alsa-sink.c b/spa/plugins/alsa/alsa-sink.c -index c31fe3e2..3c252fab 100644 ---- a/spa/plugins/alsa/alsa-sink.c -+++ b/spa/plugins/alsa/alsa-sink.c -@@ -19,7 +19,7 @@ - - #include <stddef.h> - --#include <asoundlib.h> -+#include <alsa/asoundlib.h> - - #include <spa/node/node.h> - #include <spa/param/audio/format.h> -diff --git a/spa/plugins/alsa/alsa-source.c b/spa/plugins/alsa/alsa-source.c -index 74bbb3c0..8efc8fde 100644 ---- a/spa/plugins/alsa/alsa-source.c -+++ b/spa/plugins/alsa/alsa-source.c -@@ -19,7 +19,7 @@ - - #include <stddef.h> - --#include <asoundlib.h> -+#include <alsa/asoundlib.h> - - #include <spa/node/node.h> - #include <spa/utils/list.h> -diff --git a/spa/plugins/alsa/alsa-utils.h b/spa/plugins/alsa/alsa-utils.h -index 5ba57bc5..3b590007 100644 ---- a/spa/plugins/alsa/alsa-utils.h -+++ b/spa/plugins/alsa/alsa-utils.h -@@ -26,7 +26,7 @@ extern "C" { - - #include <stddef.h> - --#include <asoundlib.h> -+#include <alsa/asoundlib.h> - - #include <spa/support/type-map.h> - #include <spa/support/loop.h> diff --git a/media-video/pipewire/files/pipewire-0.2.6-fix-probing-without-starting.patch b/media-video/pipewire/files/pipewire-0.2.6-fix-probing-without-starting.patch deleted file mode 100644 index 9b3aed33b961..000000000000 --- a/media-video/pipewire/files/pipewire-0.2.6-fix-probing-without-starting.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 37e66c9e55f556558088d9f6b2200d4341a37f04 Mon Sep 17 00:00:00 2001 -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Tue, 18 Jun 2019 09:53:12 +0200 -Subject: [PATCH] deviceprovider: fix probing without starting - -self->type is needed in registry_event_global() so it must be set in -gst_pipewire_device_provider_probe() as well. - -self->devices is initialized as NULL when probing is started. So it should -be just a simple GList* pointer. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/gst/gstpipewiredeviceprovider.c | 8 ++++++-- - src/gst/gstpipewiredeviceprovider.h | 2 +- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/gst/gstpipewiredeviceprovider.c b/src/gst/gstpipewiredeviceprovider.c -index b6472d96..02b38c2e 100644 ---- a/src/gst/gstpipewiredeviceprovider.c -+++ b/src/gst/gstpipewiredeviceprovider.c -@@ -265,7 +265,7 @@ static void do_add_node(void *data) - nd->dev = new_node (self, nd); - if (nd->dev) { - if(self->list_only) -- *self->devices = g_list_prepend (*self->devices, gst_object_ref_sink (nd->dev)); -+ self->devices = g_list_prepend (self->devices, gst_object_ref_sink (nd->dev)); - else - gst_device_provider_device_add (GST_DEVICE_PROVIDER (self), nd->dev); - } -@@ -555,6 +555,8 @@ gst_pipewire_device_provider_probe (GstDeviceProvider * provider) - - t = pw_core_get_type(c); - -+ self->type = pw_core_get_type (c); -+ - if (!(r = pw_remote_new (c, NULL, sizeof(*data)))) - goto failed; - -@@ -612,7 +614,9 @@ gst_pipewire_device_provider_probe (GstDeviceProvider * provider) - pw_core_destroy (c); - pw_loop_destroy (l); - -- return *self->devices; -+ self->type = NULL; -+ -+ return self->devices; - - failed: - pw_loop_destroy (l); -diff --git a/src/gst/gstpipewiredeviceprovider.h b/src/gst/gstpipewiredeviceprovider.h -index 81622605..3cf2d41b 100644 ---- a/src/gst/gstpipewiredeviceprovider.h -+++ b/src/gst/gstpipewiredeviceprovider.h -@@ -98,7 +98,7 @@ struct _GstPipeWireDeviceProvider { - - gboolean end; - gboolean list_only; -- GList **devices; -+ GList *devices; - }; - - struct _GstPipeWireDeviceProviderClass { diff --git a/media-video/pipewire/files/pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch b/media-video/pipewire/files/pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch deleted file mode 100644 index a1176d3e1b30..000000000000 --- a/media-video/pipewire/files/pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 151b2b266e1dae3679584f38b954e4357cf1e5cc Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Wed, 19 Jun 2019 10:49:28 +0200 -Subject: [PATCH] connection: add do_close flag to connect_fd - -Make pw_remote_connect_fd() not automatically close the provided -fd but let the caller take care of that. This allows us to reuse -the fd in pipewiresrc. - -Fixes #155 ---- - src/modules/module-protocol-native.c | 7 ++++--- - src/modules/module-protocol-native/local-socket.c | 2 +- - src/pipewire/protocol.h | 4 ++-- - src/pipewire/remote.c | 8 ++++---- - src/pipewire/remote.h | 3 ++- - 5 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c -index 131657f6..0e7b7e27 100644 ---- a/src/modules/module-protocol-native.c -+++ b/src/modules/module-protocol-native.c -@@ -619,7 +619,7 @@ static const struct pw_protocol_native_connection_events conn_events = { - .need_flush = on_need_flush, - }; - --static int impl_connect_fd(struct pw_protocol_client *client, int fd) -+static int impl_connect_fd(struct pw_protocol_client *client, int fd, bool do_close) - { - struct client *impl = SPA_CONTAINER_OF(client, struct client, this); - struct pw_remote *remote = client->remote; -@@ -638,14 +638,15 @@ static int impl_connect_fd(struct pw_protocol_client *client, int fd) - impl->source = pw_loop_add_io(remote->core->main_loop, - fd, - SPA_IO_IN | SPA_IO_HUP | SPA_IO_ERR, -- true, on_remote_data, impl); -+ do_close, on_remote_data, impl); - if (impl->source == NULL) - goto error_close; - - return 0; - - error_close: -- close(fd); -+ if (do_close) -+ close(fd); - return -ENOMEM; - } - -diff --git a/src/modules/module-protocol-native/local-socket.c b/src/modules/module-protocol-native/local-socket.c -index 5ab5a210..0e68eea9 100644 ---- a/src/modules/module-protocol-native/local-socket.c -+++ b/src/modules/module-protocol-native/local-socket.c -@@ -84,7 +84,7 @@ int pw_protocol_native_connect_local_socket(struct pw_protocol_client *client, - goto error_close; - } - -- res = pw_protocol_client_connect_fd(client, fd); -+ res = pw_protocol_client_connect_fd(client, fd, true); - - done_callback(data, res); - -diff --git a/src/pipewire/protocol.h b/src/pipewire/protocol.h -index 2b6592d1..4a0845fb 100644 ---- a/src/pipewire/protocol.h -+++ b/src/pipewire/protocol.h -@@ -44,14 +44,14 @@ struct pw_protocol_client { - int (*connect) (struct pw_protocol_client *client, - void (*done_callback) (void *data, int result), - void *data); -- int (*connect_fd) (struct pw_protocol_client *client, int fd); -+ int (*connect_fd) (struct pw_protocol_client *client, int fd, bool close); - int (*steal_fd) (struct pw_protocol_client *client); - void (*disconnect) (struct pw_protocol_client *client); - void (*destroy) (struct pw_protocol_client *client); - }; - - #define pw_protocol_client_connect(c,cb,d) ((c)->connect(c,cb,d)) --#define pw_protocol_client_connect_fd(c,fd) ((c)->connect_fd(c,fd)) -+#define pw_protocol_client_connect_fd(c,fd,cl) ((c)->connect_fd(c,fd,cl)) - #define pw_protocol_client_steal_fd(c) ((c)->steal_fd(c)) - #define pw_protocol_client_disconnect(c) ((c)->disconnect(c)) - #define pw_protocol_client_destroy(c) ((c)->destroy(c)) -diff --git a/src/pipewire/remote.c b/src/pipewire/remote.c -index f63a973a..472b2684 100644 ---- a/src/pipewire/remote.c -+++ b/src/pipewire/remote.c -@@ -305,7 +305,7 @@ void pw_remote_destroy(struct pw_remote *remote) - spa_list_consume(stream, &remote->stream_list, link) - pw_stream_destroy(stream); - -- pw_protocol_client_destroy (remote->conn); -+ pw_protocol_client_destroy(remote->conn); - - spa_list_remove(&remote->link); - -@@ -413,7 +413,7 @@ int pw_remote_connect(struct pw_remote *remote) - - pw_remote_update_state(remote, PW_REMOTE_STATE_CONNECTING, NULL); - -- if ((res = pw_protocol_client_connect (remote->conn, done_connect, remote)) < 0) { -+ if ((res = pw_protocol_client_connect(remote->conn, done_connect, remote)) < 0) { - pw_remote_update_state(remote, PW_REMOTE_STATE_ERROR, - "connect failed %s", spa_strerror(res)); - return res; -@@ -428,7 +428,7 @@ int pw_remote_connect_fd(struct pw_remote *remote, int fd) - - pw_remote_update_state(remote, PW_REMOTE_STATE_CONNECTING, NULL); - -- if ((res = pw_protocol_client_connect_fd (remote->conn, fd)) < 0) { -+ if ((res = pw_protocol_client_connect_fd(remote->conn, fd, false)) < 0) { - pw_remote_update_state(remote, PW_REMOTE_STATE_ERROR, - "connect_fd failed %s", spa_strerror(res)); - return res; -@@ -462,7 +462,7 @@ int pw_remote_disconnect(struct pw_remote *remote) - pw_proxy_destroy(proxy); - remote->core_proxy = NULL; - -- pw_protocol_client_disconnect (remote->conn); -+ pw_protocol_client_disconnect(remote->conn); - - pw_map_clear(&remote->objects); - pw_map_clear(&remote->types); -diff --git a/src/pipewire/remote.h b/src/pipewire/remote.h -index df0c496c..2974a04a 100644 ---- a/src/pipewire/remote.h -+++ b/src/pipewire/remote.h -@@ -177,7 +177,8 @@ void pw_remote_add_listener(struct pw_remote *remote, - int pw_remote_connect(struct pw_remote *remote); - - /** Connect to a remote PipeWire on the given socket \memberof pw_remote -- * \param fd the connected socket to use -+ * \param fd the connected socket to use, the socket will not be closed -+ * automatically on disconnect or error. - * \return 0 on success, < 0 on error */ - int pw_remote_connect_fd(struct pw_remote *remote, int fd); - diff --git a/media-video/pipewire/files/pipewire-0.2.6-revert-combine-all-perms.patch b/media-video/pipewire/files/pipewire-0.2.6-revert-combine-all-perms.patch deleted file mode 100644 index 57ada7d5fb47..000000000000 --- a/media-video/pipewire/files/pipewire-0.2.6-revert-combine-all-perms.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4350bd624f165de81de10293a8ec5a59e8b7ce64 Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Fri, 28 Jun 2019 12:22:33 +0200 -Subject: [PATCH] Revert "global: combine all permissions of the object tree" - -This reverts commit 83bc033837f7525d898f1de91119f669f9bf97f5. - -This needs some more work. ---- - src/pipewire/global.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/src/pipewire/global.c b/src/pipewire/global.c -index c963965e..00258ff8 100644 ---- a/src/pipewire/global.c -+++ b/src/pipewire/global.c -@@ -38,15 +38,9 @@ uint32_t pw_global_get_permissions(struct pw_global *global, struct pw_client *c - { - uint32_t perms = PW_PERM_RWX; - -- if (client->permission_func == NULL) -- return perms; -- -- perms = client->permission_func(global, client, client->permission_data); -- -- while (global != global->parent) { -- global = global->parent; -+ if (client->permission_func != NULL) - perms &= client->permission_func(global, client, client->permission_data); -- } -+ - return perms; - } - diff --git a/media-video/pipewire/pipewire-0.2.6.ebuild b/media-video/pipewire/pipewire-0.2.6.ebuild deleted file mode 100644 index dfd692811b8d..000000000000 --- a/media-video/pipewire/pipewire-0.2.6.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git" - inherit git-r3 -else - SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Multimedia processing graphs" -HOMEPAGE="https://pipewire.org/" - -LICENSE="LGPL-2.1+" -SLOT="0/0.2" -IUSE="bluetooth doc ffmpeg libav gstreamer sdl systemd vaapi X" - -BDEPEND=" - app-doc/xmltoman - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" -DEPEND=" - media-libs/alsa-lib - sys-apps/dbus - virtual/libudev - bluetooth? ( media-libs/sbc ) - ffmpeg? ( - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - sdl? ( media-libs/libsdl2 ) - systemd? ( sys-apps/systemd ) - vaapi? ( x11-libs/libva ) - X? ( x11-libs/libX11 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-alsa-lib-1.1.9.patch - "${FILESDIR}"/${P}-reuse-fd-in-pipewiresrc.patch - "${FILESDIR}"/${P}-fix-probing-without-starting.patch - "${FILESDIR}"/${P}-revert-combine-all-perms.patch -) - -src_prepare() { - spa_use() { - if ! use ${1}; then - sed -e "/.*dependency.*'${2-$1}'/s/'${2-$1}'/'${2-$1}-disabled-by-USE-no-${1}'/" \ - -i spa/meson.build || die - fi - } - - default - spa_use bluetooth sbc - spa_use ffmpeg libavcodec - spa_use ffmpeg libavformat - spa_use ffmpeg libavfilter - spa_use vaapi libva - spa_use sdl sdl2 - spa_use X x11 -} - -src_configure() { - local emesonargs=( - -Dman=true - $(meson_use doc docs) - $(meson_feature gstreamer) - $(meson_use systemd) - ) - meson_src_configure -} - -pkg_postinst() { - elog "Package has optional sys-auth/rtkit RUNTIME support that may be" - elog "disabled by setting DISABLE_RTKIT env var." -} diff --git a/media-video/pipewire/pipewire-0.2.7.ebuild b/media-video/pipewire/pipewire-0.2.7.ebuild index d26990a0d08a..7d2c690e1a0d 100644 --- a/media-video/pipewire/pipewire-0.2.7.ebuild +++ b/media-video/pipewire/pipewire-0.2.7.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="Multimedia processing graphs" diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 9eaff86f7f30..ec97b50d5896 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -3,10 +3,10 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6 AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54 +AUX smplayer-19.5.0-mpv-0.30.0.patch 969 BLAKE2B 3e2942b9e732418c14bb306492506dab0185fbb77f09856c40ca6035506ad8f2677611796478755ded1b1028d21304d7d6f78a4cc06fe832be6d8cb1acd0a3ce SHA512 d903010b237a7bdf0356ffb5068e802a7c96575f518c6a0f5862da8ae90ef117cee9dab36a7a05e909f1bbd39175fd4c829000fca1698d3c98c530a77200f1a8 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8 -DIST smplayer-19.1.0.tar.bz2 5169546 BLAKE2B fc15fd33522f137371442696b20ed695dbc4cfeb759ae504cdc688dc30de14fd35da81f6788b3dc2886119012416218f1d39ba64a7d747194dd777544a08d1e0 SHA512 aee009f0ff6dcfe8e5b0b80c99d44c41a02c34d7974c1a15b21235e3daaf3142f5c936adb043327804412309b88e0ff8f0ef440c1835541adb6bf703d486ff79 DIST smplayer-19.5.0.tar.bz2 5175017 BLAKE2B e7160ca7d404dd6a8d7c316df3c39b2e238410435960d714aec271d2034030f9e1b59997d11d758188e327117f0eb773cb8baccc1defc20cd071e40c87deb07c SHA512 ee19186b3f4eac94b06a1e389e42edb8c2b22f8182b679bdc40e3ae1569a6c69f168260abfee3b2827b71b10eb353e7a3821805798f37aae2600af3b73d25ca1 EBUILD smplayer-18.6.0.ebuild 3198 BLAKE2B 9308361b80dda582ba1894bed9e47e2fd66a48be962d21fb267fa5909f1b73cc523aac8cc87f4d2ecc43be9044a18c5585be0e54da2935cd57e0336be068754b SHA512 c9f8da664cc37fdb2e7ac780f15ed87d4b6089a6c4015ad747f36e3a9ae0b96e4fd66c2ace62a15cb9b42887cd81b6f7e83dafd59b215f71117ea90e77f714a2 -EBUILD smplayer-19.1.0-r1.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13 +EBUILD smplayer-19.5.0-r1.ebuild 3199 BLAKE2B d61dd1ebe3b0792c8436db40e857fb9724a9b3a990d8b9adfc1df8fdc89358211748a1275ee84339b042ff3a5874efbe6889a7a6b171fbbd1b6d3b0678a23cd8 SHA512 e63e5622eefb97d301a6847fa7b6396b7ee7018f9be93862be98179513a88b292c13ca72206e53ee3626076dd766701a60bef4f7f72cb33f6138d78118408afb EBUILD smplayer-19.5.0.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4 diff --git a/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch b/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch new file mode 100644 index 000000000000..fd2bdc8ed9cd --- /dev/null +++ b/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch @@ -0,0 +1,22 @@ +Index: smplayer/src/mpvprocess.cpp +=================================================================== +--- smplayer/src/mpvprocess.cpp (revision 9231) ++++ smplayer/src/mpvprocess.cpp (revision 9232) +@@ -122,7 +122,7 @@ + + void MPVProcess::initializeRX() { + #ifdef CUSTOM_STATUS +- rx_av.setPattern("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)"); ++ rx_av.setPattern("STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)"); + #else + rx_av.setPattern("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56 + #endif +@@ -197,7 +197,7 @@ + static double last_sec = -1; + + // Parse A: V: line +- //qDebug("MPVProcess::parseLine: %s", line.toUtf8().data()); ++ //qDebug() << "MPVProcess::parseLine:" << line; + if (rx_av.indexIn(line) > -1) { + #ifdef CUSTOM_STATUS + double sec = rx_av.cap(1).toDouble(); diff --git a/media-video/smplayer/smplayer-19.1.0-r1.ebuild b/media-video/smplayer/smplayer-19.5.0-r1.ebuild index 1863a883169d..28b157da0979 100644 --- a/media-video/smplayer/smplayer-19.1.0-r1.ebuild +++ b/media-video/smplayer/smplayer-19.5.0-r1.ebuild @@ -44,6 +44,7 @@ PATCHES=( "${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch" "${FILESDIR}/${PN}-18.2.0-jobserver.patch" "${FILESDIR}/${PN}-18.3.0-disable-werror.patch" + "${FILESDIR}/${P}-mpv-0.30.0.patch" #698738 ) src_prepare() { diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest index 1d592faa704a..8fc94982adb6 100644 --- a/media-video/streamdvd/Manifest +++ b/media-video/streamdvd/Manifest @@ -1,9 +1,9 @@ AUX streamdvd-0.4-gcc41.patch 463 BLAKE2B 253bdc64df9d3711a231c877b9b80ca6a922f01569c530f1e09ee20bc767da0d994089f7dd5256e1028563307dfae8462eec8bb24fe6e7d8b67e1bb322218129 SHA512 30a9bb075935f46d7d32293817937ea3c71145a30b7ce48d5a57ff105a27bd55ee19e7ee0ad4558fb571ae91c7bb24262d3b19cd87ff32211d2feea783f6e3db -AUX streamdvd-0.4-gcc43.patch 1249 BLAKE2B a7d0575379b4de10fd85fdcb2ef2ef268295f70698c1c3a321a6cca7bf1d57cf2bdf7fe1fff0fd3aa6b20814301502d4da511452f6181650ca9087831acad8fb SHA512 02a6c89829b8d41c52305bfef56e43a56db33b2b7f6396f73a3f1f688207fa225f266dd0841c4e5748f44bed4bfa3595b298751f45db22ea92f3a1ac2817847c +AUX streamdvd-0.4-gcc43.patch 1249 BLAKE2B 398e85a2ecc233e47e640d17c8bfba3ff0c49231ce44ecf569e01d6c1e61352e51b5f10ce493a428c17dd14f13549518d24264b7d55a18f15093c0382e83b6a1 SHA512 89acf39169294c090e69119f003aa0bbfe81695721b5db9101310be47b97d82b6eef311623552ecc3f23d40a609a44db0fc8de753b1a4ffd71cb4853c3e528cc AUX streamdvd-0.4-gcc44.patch 977 BLAKE2B 79db4d3a3526c5bb38106945635acded53e99a7e51b2fd34eaa3932f0172bf354cef0abd1d091cc99e40875b98498272442a7f7036bb8dca83144a66592c93e3 SHA512 1090361522dbbe58da3884a9bc7a44729a0f27e306a0c0ce5475c57ab0a8aa693b15caef33c28b1f7e8106db662e88616a05bd840999a54d0597cb230f4af95a AUX streamdvd-0.4-libdvdread.patch 1460 BLAKE2B 68577f49d3c837c9d2148838459e3e3bc2b78f195b7ea0db92be913e02d86b52b3cb78a35d50b37553b57ac10e0e4adfcd3f47ce8a6ffad0c3d521fd6437541c SHA512 79ed54fcb7b3b3ac4be7cc14978f126288a39428796a61954eb36fce89764561419ba32bd2a0de7819e9f3a72283fcf71691ac93922c2ab7df7a1e7658c4b0cf AUX streamdvd-0.4-makefile.patch 1378 BLAKE2B d8a244cb91f246eefa9da4f39a861f9f6bef84580a0b2faff3f01d0ad7c0c7ecc2f8a62711b4f5abca8c6e985a6d70934f49724bb052be8e284c506fe70d59c3 SHA512 5234433fd985ef561c43420a6f7a1ee30c4748ce5a4c04e3a6864e95f42fae1b97c8c0e1a6adb0c6c395500a7f007263621cab8779dc57535287a6ba81a32988 -AUX streamdvd-0.4.patch 787 BLAKE2B 61b1619e478e0200a0b4607a0375f37d60b6c111cbb355670e7edf2cdc93a21c84daf24e58fd00180ceb84e67470adc9d2a7d75e2a373684db80b8bdcaaa8897 SHA512 a70535c05292bba30f211a576f6e93a2408a5c2285ded0208da9757f9c4e88e605eb572e3cbe61f02752a198849ff805dd93dcd3457d78c0f9c9294a6de7bf53 +AUX streamdvd-0.4.patch 785 BLAKE2B 665bf98e78727abeba771b5dc84eaaccadc14fafe8978e21bde1480630d197a6dfa213e9f8d662d4813078d1ab66ffd4f33bc2513f99e6d93684cb3aa086eebb SHA512 81edce3f825c38a28aeafe25fcd1dad3b71413fdc22892fcbe5d0af32235b43f2256a6f38b3997dfea1306f492d2f4c96e0b85fe39802111502bea4af17013a7 DIST streamdvd-0.4.tar.gz 152669 BLAKE2B 700ce4f03eabf3e3531bac4ab7b618c55a96e636c459368740597124353f9639cfd7c6b00a5a4eacfd438c3a6a7966c0c8dd42dedd3ab877ad96317a8658aa1e SHA512 81e8fdaf028799be7269c239ec5717bd5da58254b7eeef35ee5d436c4408fb02f9badbc5ff8a661903d10ec43bbaca68d8792f729293f6330c2a9e92ee0c48a5 -EBUILD streamdvd-0.4-r1.ebuild 1523 BLAKE2B 6526bbe063750dee1e4143a5149b216e7509b8a161306a9811f803d8496acf6ec15d79c94081bf594f6f55f3f5b1de14b3299f08963a4622be0c6c6e4536050b SHA512 e3a12065c88e5c532c84dafd7c22322cb127acf1dbad6765c8eb4b153f127037ddd96d6f4abfb6aef83906368973b0bfb6006a6b85880058a6996fc012069502 +EBUILD streamdvd-0.4-r2.ebuild 1509 BLAKE2B a0c78477a3e6013ef698da81af49a3deeb7a72d1da7e866743065cb674e9550dbb01cc17867cbc076e0ee46ec11e3304dc8df740fe74bbe8ecf813804a72ece8 SHA512 1fb72131f1cc5b1ef74f56b648135179fdf06656c421c5964c75f1e80777a8102ba05d6e4337c4fc78d9012229daba8001ea9c283246d22d17f9edde25316e1f MISC metadata.xml 559 BLAKE2B d5dd932f55599c1f38b5c68472a7e635852dd846d3c4cb85bf99f783c861be56cf5f846da27fb81460e68b97666b2bcd229655e987380a84c74c352f20668516 SHA512 17ff5079ade1e6a7c74298fe8e6f5737cb3fd0822f3318b198c32af761043c218739bb90865c616229ffba5698711a970d48f83df02716e7f82ab819c3c8fa98 diff --git a/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch index 89e33f58db4b..5c52498af5c9 100644 --- a/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch +++ b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch @@ -1,6 +1,6 @@ -diff -aur mplex.old/inputstrm.cpp mplex/inputstrm.cpp ---- mplex.old/inputstrm.cpp 2004-03-08 23:10:53.000000000 +0100 -+++ mplex/inputstrm.cpp 2008-07-07 23:28:19.000000000 +0200 +diff -aur a/mplex/inputstrm.cpp b/mplex/inputstrm.cpp +--- a/mplex/inputstrm.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ b/mplex/inputstrm.cpp 2008-07-07 23:28:19.000000000 +0200 @@ -23,6 +23,7 @@ #include "config.h" @@ -9,9 +9,9 @@ diff -aur mplex.old/inputstrm.cpp mplex/inputstrm.cpp #include "mjpeg_types.h" #include "fastintfns.h" -diff -aur mplex.old/multiplexor.cpp mplex/multiplexor.cpp ---- mplex.old/multiplexor.cpp 2004-03-08 23:10:53.000000000 +0100 -+++ mplex/multiplexor.cpp 2008-07-07 23:28:19.000000000 +0200 +diff -aur a/mplex/multiplexor.cpp b/mplex/multiplexor.cpp +--- a/mplex/multiplexor.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ b/mplex/multiplexor.cpp 2008-07-07 23:28:19.000000000 +0200 @@ -22,6 +22,7 @@ #include "config.h" #include <math.h> @@ -20,9 +20,9 @@ diff -aur mplex.old/multiplexor.cpp mplex/multiplexor.cpp #include "mjpeg_types.h" #include "mjpeg_logging.h" -diff -aur mplex.old/padstrm.cpp mplex/padstrm.cpp ---- mplex.old/padstrm.cpp 2004-03-08 23:10:53.000000000 +0100 -+++ mplex/padstrm.cpp 2008-07-07 23:28:19.000000000 +0200 +diff -aur a/mplex/padstrm.cpp b/mplex/padstrm.cpp +--- a/mplex/padstrm.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ b/mplex/padstrm.cpp 2008-07-07 23:28:19.000000000 +0200 @@ -25,6 +25,7 @@ #endif @@ -31,9 +31,9 @@ diff -aur mplex.old/padstrm.cpp mplex/padstrm.cpp -diff -aur mplex.old/zalphastrm_in.cpp mplex/zalphastrm_in.cpp ---- mplex.old/zalphastrm_in.cpp 2004-03-08 23:10:53.000000000 +0100 -+++ mplex/zalphastrm_in.cpp 2008-07-07 23:28:19.000000000 +0200 +diff -aur a/mplex/zalphastrm_in.cpp b/mplex/zalphastrm_in.cpp +--- a/mplex/zalphastrm_in.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ b/mplex/zalphastrm_in.cpp 2008-07-07 23:28:19.000000000 +0200 @@ -23,6 +23,7 @@ #include "config.h" #include <math.h> diff --git a/media-video/streamdvd/files/streamdvd-0.4.patch b/media-video/streamdvd/files/streamdvd-0.4.patch index d078aa7059a3..693a4070f61f 100644 --- a/media-video/streamdvd/files/streamdvd-0.4.patch +++ b/media-video/streamdvd/files/streamdvd-0.4.patch @@ -1,5 +1,5 @@ ---- Gui/StreamDVD/Gui.pm.orig 2004-03-08 23:10:53.000000000 +0100 -+++ Gui/StreamDVD/Gui.pm 2004-05-30 13:24:38.342490078 +0200 +--- a/Gui/StreamDVD/Gui.pm 2004-03-08 23:10:53.000000000 +0100 ++++ b/Gui/StreamDVD/Gui.pm 2004-05-30 13:24:38.342490078 +0200 @@ -18,7 +18,7 @@ use Tk::BrowseEntry; use Tk::LabFrame; @@ -9,8 +9,8 @@ use StreamDVD::Defs; use StreamDVD::Calc; use strict; ---- Gui/StreamDVD/Config.pm.orig 2004-03-08 23:10:53.000000000 +0100 -+++ Gui/StreamDVD/Config.pm 2004-05-30 13:24:28.314195864 +0200 +--- a/Gui/StreamDVD/Config.pm 2004-03-08 23:10:53.000000000 +0100 ++++ b/Gui/StreamDVD/Config.pm 2004-05-30 13:24:28.314195864 +0200 @@ -284,7 +284,7 @@ $self->{MOUNT} = "/dvd"; $self->{TEMPDIR} = "/tmp"; diff --git a/media-video/streamdvd/streamdvd-0.4-r1.ebuild b/media-video/streamdvd/streamdvd-0.4-r2.ebuild index 531705d009b6..9c889d779a06 100644 --- a/media-video/streamdvd/streamdvd-0.4-r1.ebuild +++ b/media-video/streamdvd/streamdvd-0.4-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 inherit eutils toolchain-funcs @@ -23,22 +23,22 @@ DEPEND="media-libs/libdvdread >=media-video/dvdauthor-0.6.5 >=app-cdr/dvd+rw-tools-5.13.4.7.4 )" -S=${WORKDIR}/StreamDVD-${PV} +S="${WORKDIR}"/StreamDVD-${PV} -src_unpack() { - unpack ${A} - cd "${S}" - use X && epatch "${FILESDIR}"/${P}.patch +src_prepare() { + use X && eapply "${FILESDIR}"/${P}.patch - epatch "${FILESDIR}"/${P}-makefile.patch - epatch "${FILESDIR}"/${P}-gcc41.patch - epatch "${FILESDIR}"/${P}-libdvdread.patch - epatch "${FILESDIR}"/${P}-gcc43.patch - epatch "${FILESDIR}"/${P}-gcc44.patch + eapply "${FILESDIR}"/${P}-makefile.patch + eapply "${FILESDIR}"/${P}-gcc41.patch + eapply "${FILESDIR}"/${P}-libdvdread.patch + eapply "${FILESDIR}"/${P}-gcc43.patch + eapply "${FILESDIR}"/${P}-gcc44.patch + + eapply_user } src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all addon || die # compile also optional packages + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all addon # compile also optional packages } src_install() { @@ -48,8 +48,7 @@ src_install() { newdoc contrib/lsdvd/AUTHORS AUTHORS.lsdvd newdoc contrib/lsdvd/README README.lsdvd newdoc contrib/StreamAnalyze/README README.streamanalyze - if use X - then + if use X; then eval `perl '-V:installvendorlib'` insinto "$installvendorlib/StreamDVD" doins Gui/StreamDVD/*.pm diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest index 6e134a7d3fe6..fa84fcc06437 100644 --- a/media-video/unifi-video/Manifest +++ b/media-video/unifi-video/Manifest @@ -2,12 +2,8 @@ AUX commons-daemon-move.patch 337 BLAKE2B 79e847ce6e1c32c3cfbe192d8dce33175e2c0e AUX mongod-wrapper 101 BLAKE2B cc52f011b065322fb7ebec982c5d0b188f4c72859770dec98bf002d6bcc9c43d520e0845ceaf1458efc4ed07bbccfb5c723ece61298bf6f2bfdebd363bebe4e7 SHA512 5895a2113cc165275587e9683a2e3a7de20ac5db75fc26b00bf55a619bc8ff18ead3f5465cefe0a02bea996d2d178a4954cc7fba84df76e27ea699d2be9ecc96 AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2becd9569c8086b568e5c84508f2cc71c81605cc124bc17cd42c884d477b15181dba73544fc254610c1 SHA512 1cd4345daf09a27dcb8528abd076e920e30b6ff7a505acad74fdc291164c94569946cd493563331c5e52cb95c45e18522520aee47555db438fa87c46d07e35c5 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474 -DIST unifi-video.Ubuntu16.04_amd64.v3.10.1.deb 162379830 BLAKE2B 8183cf0ea37507059b87f5f51a377a12cb2f5fab31675eac720cffa2f9c60e46e6a8eb68279992703722ba40c3fbe7a9a723596ee20e31ccec0959841851325d SHA512 3ac83e3ff7beb8c765c8908b80c7747807da73e3a9e077a9f5a22aaf3e307c369258c7ea6651e18ca74b570d359fa65b6cbfce0017cb73cb916a2bc8614b374d -DIST unifi-video.Ubuntu16.04_amd64.v3.10.4.deb 161279504 BLAKE2B a9bac456218a1908e67bcebeadd06672ce6de4a24e62cd99dedc6de4e36774047531e8b00429e0dc8eb536e6ad77de236d89da83edfbaef8d7a7feb04df6c482 SHA512 d45f97905078ee6f9911bbea239d72432dda849c5fa16a11c2576e1dac78a0b612e420ae59f11ff7bdfec3c7eca9396a72d249d4fc90f93f9e92c57571f19093 DIST unifi-video.Ubuntu16.04_amd64.v3.10.5.deb 161280194 BLAKE2B ae326fe818261124fb8bd1939e55cc2dfa1bb8bfd3350bb5b94ec74fe9a7ec57853548dfbf8ddf33699e0281a5cb918926a6fb93b6de07339072bca51bab2a46 SHA512 4e431f72e5c51952bb7a1e97d6cab407e03d7a42cfaaed97cbf65dbc0b7ebec2a04675783bebed6d0a3d69b1ef5988f6af4770a9ce680258999c481ccefd0bd2 -DIST unifi-video.Ubuntu16.04_amd64.v3.9.12.deb 117448948 BLAKE2B 83769ec07fccbcd955115493510bcd58b88433b7d7204be29d6329674cf4d6dea7fe4b6aedd0e89f852d89ae9a298a9284386aeb4480f43a91dbe6ea958ab10b SHA512 0e2eaefdee74b6b6c5ae54870673591ce4e2d2e4c07e068987f609597c43a12308aebdce705e316555378e04eeb13aaa0c00b496097123960215773cbfa69348 -EBUILD unifi-video-3.10.1.ebuild 1905 BLAKE2B 616c32a1b7dba5b882a1cf4d6dc573a55e050a88e73d4b8da653b00be06ce700f7458d8a3417ce5fe24eefae1407d704784cba627de9ad386f04870b0da07534 SHA512 a1bfb97ea0f0a9244e6d654e352998cf602dce124c30b7669b971cd34a990d650f2ed2fcdfbaba2af8233bb521155bbbe9b06cdabc5bc2e826f5bb6fc137a73e -EBUILD unifi-video-3.10.4.ebuild 1897 BLAKE2B e182a17a1b8d00350eb48c384a926f56b705493cee74950a92ccac416540e4d5faf9efb2046f33bde5cd8b4ed2435e19f111c59824c5a2818a68e675415ab691 SHA512 7058a3267310542459a9675d9e0ce0793e6f46d2075f9ce4f860c1387d249d4a2736411afdd7062f4af677e49717a8a78be04731ca0e4b672227eddbf94748e9 +DIST unifi-video.Ubuntu18.04_amd64.v3.10.10.deb 162697298 BLAKE2B 6cf3d93916830f781ba075abf222402609c8e9935149fc5729767ff05333c61db22709762a992ff510d4898d9b4860f3d61bd50fe0e2d55522a7eb8be7fc378a SHA512 01927d893e7d258641d38daa3018670cb8913d371a984d8f7595322ea0bb7d1879d9ba16125c8dca927d0a274e52922a5a3d1df60f31f7fc3a09de0cc7cc3766 +EBUILD unifi-video-3.10.10.ebuild 2065 BLAKE2B 9d3cb1f004b187bb6ca76de8e163f94e1d0a84f23372ab2553b72d6877e88e172a567d782994a2e63fe9dcbf2698c7612d89d575b52fd0ff2ddbc9d83576e054 SHA512 b7c7efd2e4217dd5aa2db083b259be912eb42114011ceeff355719a33c82e473043c296e4e47d2058d1448a4c435cfc8f729516bdb08f032855ccb19a6c60fe0 EBUILD unifi-video-3.10.5.ebuild 1897 BLAKE2B e182a17a1b8d00350eb48c384a926f56b705493cee74950a92ccac416540e4d5faf9efb2046f33bde5cd8b4ed2435e19f111c59824c5a2818a68e675415ab691 SHA512 7058a3267310542459a9675d9e0ce0793e6f46d2075f9ce4f860c1387d249d4a2736411afdd7062f4af677e49717a8a78be04731ca0e4b672227eddbf94748e9 -EBUILD unifi-video-3.9.12.ebuild 1968 BLAKE2B 8d4f0bceb418e49bcb75cd63b9d1d9caa1f9cb8b90a44aba0646fc50ca72d68d741dda153f1ee20b2f540d0aee99c744933560319b103a55c61e008cb77a63e8 SHA512 d3c8d2208e22daf7fc2bb2ad5a28d88c08c624c3253e8ffc1d9317a74d4f6f3333b66b92ca7c0a5cb1ea3659b0cda68f1c92371b34bad13f4508af956a4ffdcb MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c diff --git a/media-video/unifi-video/unifi-video-3.10.1.ebuild b/media-video/unifi-video/unifi-video-3.10.1.ebuild deleted file mode 100644 index 5a297606ef6b..000000000000 --- a/media-video/unifi-video/unifi-video-3.10.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd user - -MY_PV="${PV/_beta/-beta.}" -DESCRIPTION="UniFi Video Server" -HOMEPAGE="https://www.ubnt.com/download/unifi-video/" -SRC_URI="https://dl.ubnt.com/firmwares/unifi-video/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RESTRICT="mirror" - -DEPEND="" -RDEPEND="dev-db/mongodb - dev-java/commons-daemon - sys-apps/lsb-release - sys-libs/libcap - virtual/jre:1.8" - -S=${WORKDIR} -QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*" - -pkg_setup() { - enewuser ${PN} - enewgroup ${PN} -} - -src_unpack() { - default - unpack "${WORKDIR}"/data.tar.gz -} - -src_prepare() { - eapply "${FILESDIR}"/commons-daemon-move.patch - sed -i usr/sbin/${PN} \ - -e '/require_root$/d' \ - -e '/update_limits$/d' \ - -e '/ulimit/d' \ - -e '/coredump_filter/d' || die - default -} - -src_install() { - static_dir="/usr/$(get_libdir)/${PN}" - #install static data - insinto ${static_dir} - doins -r usr/lib/${PN}/* - fperms -R +x ${static_dir}/bin - fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/ - - #prepare runtime-data dirs which live in /var but are symlinked from static - #data dir, and are writable by non-root user - dodir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - dosym ../../../var/log/${PN} ${static_dir}/logs - - dodir /var/lib/${PN}/work - fowners ${PN}:${PN} /var/lib/${PN}/work - dosym ../../../var/lib/${PN}/work ${static_dir}/work - - keepdir /var/lib/${PN}/data - fowners ${PN}:${PN} /var/lib/${PN}/data - dosym ../../../var/lib/${PN}/data ${static_dir}/data - - echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN} - doenvd "${T}"/99${PN} - - into /usr - dosbin usr/sbin/${PN} - dosym ../../../bin/mongod ${static_dir}/bin/mongod - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -} diff --git a/media-video/unifi-video/unifi-video-3.10.4.ebuild b/media-video/unifi-video/unifi-video-3.10.10.ebuild index c975418c3dcd..3bcb6327156f 100644 --- a/media-video/unifi-video/unifi-video-3.10.4.ebuild +++ b/media-video/unifi-video/unifi-video-3.10.10.ebuild @@ -8,7 +8,7 @@ inherit systemd user MY_PV="${PV/_beta/-beta.}" DESCRIPTION="UniFi Video Server" HOMEPAGE="https://www.ubnt.com/download/unifi-video/" -SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb" +SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb" LICENSE="GPL-3" SLOT="0" @@ -20,6 +20,7 @@ DEPEND="" RDEPEND="dev-db/mongodb dev-java/commons-daemon sys-apps/lsb-release + sys-apps/util-linux sys-libs/libcap virtual/jre:1.8" @@ -47,34 +48,46 @@ src_prepare() { } src_install() { - static_dir="/usr/$(get_libdir)/${PN}" - #install static data - insinto ${static_dir} - doins -r usr/lib/${PN}/* - fperms -R +x ${static_dir}/bin - fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/ - - #prepare runtime-data dirs which live in /var but are symlinked from static - #data dir, and are writable by non-root user - dodir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - dosym ../../../var/log/${PN} ${static_dir}/logs - - dodir /var/lib/${PN}/work - fowners ${PN}:${PN} /var/lib/${PN}/work - dosym ../../../var/lib/${PN}/work ${static_dir}/work - - keepdir /var/lib/${PN}/data - fowners ${PN}:${PN} /var/lib/${PN}/data - dosym ../../../var/lib/${PN}/data ${static_dir}/data - - echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN} - doenvd "${T}"/99${PN} + export CODEPATH=/usr/lib/${PN} + export DATAPATH=/var/lib/${PN} + LOGPATH=${DATAPATH}/logs + VARLOGPATH=/var/log/${PN} + + rm .${CODEPATH}/bin/ubnt.updater + rm .${CODEPATH}/tools/updater + insinto /usr/lib + doins -r .${CODEPATH} into /usr - dosbin usr/sbin/${PN} - dosym ../../../bin/mongod ${static_dir}/bin/mongod + dosbin usr/sbin/unifi-video + + dodir ${LOGPATH} + fowners -R ${PN}:${PN} ${DATAPATH} + dosym ${LOGPATH} ${VARLOGPATH} + dosym ${LOGPATH} ${CODEPATH}/logs + + dosym ${DATAPATH} ${CODEPATH}/data + + fperms 500 ${CODEPATH}/bin/ubnt.avtool + fperms 500 ${CODEPATH}/bin/evostreamms + fperms 500 /usr/sbin/${PN} + fperms 500 ${CODEPATH}/tools/ufvtools + fowners -R ${PN}:${PN} ${CODEPATH} + fperms -R 0400 ${CODEPATH}/lib/ + fperms 500 ${CODEPATH}/lib/ + + echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN} + doenvd "${T}"/99${PN} + + dosym /usr/bin/mongod ${CODEPATH}/bin/mongod newinitd "${FILESDIR}"/${PN}.initd ${PN} systemd_dounit "${FILESDIR}"/${PN}.service } + +pkg_postinst() { + if [[ ! -f ${DATAPATH}/system.properties ]]; then + cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties + echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties + fi +} diff --git a/media-video/unifi-video/unifi-video-3.9.12.ebuild b/media-video/unifi-video/unifi-video-3.9.12.ebuild deleted file mode 100644 index c90d0eb2957a..000000000000 --- a/media-video/unifi-video/unifi-video-3.9.12.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd user - -MY_PV="${PV/_beta/-beta.}" -DESCRIPTION="UniFi Video Server" -HOMEPAGE="https://www.ubnt.com/download/unifi-video/" -SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RESTRICT="mirror" - -DEPEND="" -RDEPEND="dev-db/mongodb - dev-java/commons-daemon - sys-apps/lsb-release - sys-libs/libcap - virtual/jre:1.8" - -S=${WORKDIR} -QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*" - -pkg_setup() { - enewuser ${PN} - enewgroup ${PN} -} - -src_unpack() { - default - unpack "${WORKDIR}"/data.tar.gz -} - -src_prepare() { - eapply "${FILESDIR}"/commons-daemon-move.patch - sed -i usr/sbin/${PN} \ - -e '/require_root$/d' \ - -e '/update_limits$/d' \ - -e '/ulimit/d' \ - -e '/coredump_filter/d' || die - default -} - -src_install() { - static_dir="/usr/$(get_libdir)/${PN}" - #install static data - insinto ${static_dir} - doins -r usr/lib/${PN}/* - fperms -R +x ${static_dir}/bin - fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/ - - #wrapper to work around mongodb-3.6 compat issue - exeinto ${static_dir}/bin/ - newexe "${FILESDIR}"/mongod-wrapper mongod - - #prepare runtime-data dirs which live in /var but are symlinked from static - #data dir, and are writable by non-root user - dodir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - dosym ../../../var/log/${PN} ${static_dir}/logs - - dodir /var/lib/${PN}/work - fowners ${PN}:${PN} /var/lib/${PN}/work - dosym ../../../var/lib/${PN}/work ${static_dir}/work - - keepdir /var/lib/${PN}/data - fowners ${PN}:${PN} /var/lib/${PN}/data - dosym ../../../var/lib/${PN}/data ${static_dir}/data - - echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN} - doenvd "${T}"/99${PN} - - into /usr - dosbin usr/sbin/${PN} - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -} diff --git a/media-video/vamps/Manifest b/media-video/vamps/Manifest index 84dcc223aecd..4b9a462d249b 100644 --- a/media-video/vamps/Manifest +++ b/media-video/vamps/Manifest @@ -1,5 +1,6 @@ AUX vamps-0.99.2-premature-eof.patch 1247 BLAKE2B bf59784ff369864d8110b7c65215b3cf5d2082e3b2deed4da617a2c554015e024711f29ccd039e059dc8644895e098358e0c0266b1b70e116ceb6b6f6acd9323 SHA512 9f6422a8583cfeaedf1f5fb97ccac44f9631af7498daccd172b85140b21705d2f80d1769fa994478e8353874a2a24ac9d26460adab1078b08465575460bcfb07 DIST vamps-0.99.2.tar.gz 47062 BLAKE2B cb42c5d10617db92b64d1f696f409e4c01521bf5adb3bc0c4aa14266124b987289deaad6b6c0b5cd6738ad6bcdb3ea3af0cfc0658350c017f73de094e00c651c SHA512 27d26a5b63982e3b68b69b6e4f739e93a8eff2ca2e433e07a1350cafe9733f0b6a684e6bc51bce97612bc85fef9d4bf4ea0e781e493b227896de4cce4cd4662b EBUILD vamps-0.99.2-r1.ebuild 712 BLAKE2B b0aef7070b9b44562f29552e851becf6c028b32e352ed074c774368cdfde61c3ca37342276af135efe6b306b957070f086928a0e09208646ac5c9eb378edf155 SHA512 1a3e7329e8debe286d05248c1a9895241b5de149705ad986aae3bf005fd58cd9d4438490042d5692ccd99e5b7a691ae2d488afae68b3d531cf8756335bf3caa8 +EBUILD vamps-0.99.2-r2.ebuild 636 BLAKE2B 77d6db1ac5294a176549bab7cc34b7cd98a3d16a880fa89acb31ddfe079eb610cc523edaf9f057b39c0f3f62cb6e29ba21fbedb7b0d4b1cc85e6226321b59aaf SHA512 7f93ec56dd44f44113412cf3d5439e2b7fb60567411a8c3aec76675d8e8d602ac63ddf3ed9c39d486a01daabf42d214e1404f587bac8269fe7105f1f2f57a73c EBUILD vamps-0.99.2.ebuild 637 BLAKE2B b15a8962795bfd510b705b2ddc791683b0bca2efe96b32a5f8ad51db03684d291b11d22cb4121910fe266ee3db48f652db604798142c55f2a2f3caa1c16e3cc8 SHA512 e157dd9c57171c13a29cb3aa6de97e23987760dc7a26edee0d6c3852dca497a3da44d4f3cbb4da2e9c54e33fbceacfd7a49e28f0b2c6f536983f8da276dbca82 MISC metadata.xml 298 BLAKE2B 4f796c67e45ac9091a92ef5f2b310ef89cd1dcd99bef5a62cb718c6fc3d752e1e1edd0508f4da5ec9d57e81b34f145ee18497d9dcfcda94fcf8569613d7feb01 SHA512 87cf92360391d9de17a06231e42001d4b7a9b4f866806855f108a7d43621ac72e7aad63acab0708c13cf1aedc64d8fa9a0e21761da5ec6ab7408ebffcb77fdc6 diff --git a/media-video/vamps/vamps-0.99.2-r2.ebuild b/media-video/vamps/vamps-0.99.2-r2.ebuild new file mode 100644 index 000000000000..7167705a559c --- /dev/null +++ b/media-video/vamps/vamps-0.99.2-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Very fast requantisizing tool for backup DVDs" +HOMEPAGE="http://vamps.sourceforge.net/" +SRC_URI="mirror://sourceforge/vamps/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND=">=media-libs/libdvdread-0.9.4" +RDEPEND="${DEPEND} + >=media-video/dvdauthor-0.6.10" + +PATCHES=( + "${FILESDIR}/${P}-premature-eof.patch" +) + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin vamps/vamps play_cell/play_cell +} diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest index 315406e431bd..e0afd78eee13 100644 --- a/media-video/yle-dl/Manifest +++ b/media-video/yle-dl/Manifest @@ -1,3 +1,5 @@ DIST yle-dl-20190614.tar.gz 83579 BLAKE2B 9117ab32d3e037f22cc209d3686e23d14802438f77203f08e102901d825c06e7c332d1f6ca33bce3af3d4042e9c543fec60e261153be8ab738b038cc1cf4069b SHA512 6a4bfdb93229f48580d8acf742e1e253aa3da79f84ecc3886c32757ddc46608795c58cd02cb0aaa2f7d42188456eac50a243b815baa3752ac6a1b12b9632109c +DIST yle-dl-20191022.tar.gz 84694 BLAKE2B bfeab9c5220931b8af5eae94b0f5377d21f6b6fb7b21c5f7bc5360a69e7185b8f1e052a584460187cfdd04d68295a20cb895e749af43c1de4ffd7fcd7bfc3875 SHA512 2d7c6d7f8e60cb8fd54fc04dcf73caf5022e3c65ab78f002c280950184fb2458f88f6934b62c0afaeaf30864b5cc47b1ef9c2a58d2855c5111a563cd195095be EBUILD yle-dl-20190614.ebuild 1750 BLAKE2B 992a1ac48b8554679e3266e9ad3c5d2c5f1e6b293e382fc4a63ae17c1f657a391da6a1e867bc4b8227335d895cd5016d05e0a11862abde2096fcd871287fb7b0 SHA512 73aba786351d47c70450f0b1f54c93727eee82eda4a062c0b58fc3d45e071312413afd34fbe5db975fb204c3e8e309b68043b83ae850db868f9bad562fc9d296 +EBUILD yle-dl-20191022.ebuild 1750 BLAKE2B 7bf27a0871eed096c6831a2e4bd28f1dc3155038b120c645bb8f0e1ae907b1a2c541e2ac5626a82a4c5e02a114c85ff823dd714523bf3f8ab82a0a4baf9edc52 SHA512 2828cb32d0e61a1a1b517d1f5facdeb31736c170ed14981f4418b0b132138d5b454039a917f166afd4aa63f6c8510294d63818699d1fecb5d71c178b8116caf0 MISC metadata.xml 415 BLAKE2B 3961cdbc02847f65011c6987b811207c31c49ae40c3bea44b481f35ac04e75dabfa8ceae74f6adc816f211129efb8faaa0ba63700d95eec569b3f51cfe64bd42 SHA512 96f1afba4a47f7b5dca75ba1d5300baf9815bdcf3eda12f5b6044aea7cfc09683c76db210a0b4965626aac050016fc39f44c4e5c63597894e0ae6457dc2aeb90 diff --git a/media-video/yle-dl/yle-dl-20191022.ebuild b/media-video/yle-dl/yle-dl-20191022.ebuild new file mode 100644 index 000000000000..281cc2da933d --- /dev/null +++ b/media-video/yle-dl/yle-dl-20191022.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{5..6} ) + +inherit distutils-r1 + +DESCRIPTION="Download media files from Yle Areena" +HOMEPAGE="http://aajanki.github.io/yle-dl/" +SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="libav php test +youtube-dl" + +# Requires an active internet connection during tests +RESTRICT="test" + +RDEPEND=" + !libav? ( media-video/ffmpeg ) + >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] + <=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] + >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/mini-amf[${PYTHON_USEDEP}] + dev-python/progress[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + net-misc/wget + php? ( + dev-lang/php:*[bcmath,cli,curl,simplexml] + >=dev-libs/openssl-1.0.2:0= + media-video/rtmpdump + ) + youtube-dl? ( net-misc/youtube-dl[${PYTHON_USEDEP}] ) +" +DEPEND=" + test? ( + ${RDEPEND} + dev-python/pytest-runner[${PYTHON_USEDEP}] + ) +" + +DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample ) + +src_prepare() { + default + + # Gentoo doesn't ship pycryptodomex with pycryptodome + sed -i 's/pycryptodomex/pycryptodome/g' setup.py || die +} + +python_test() { + # For tests to run succesfully, you need to disable network stricting + # feature first. + # FEATURES="-network-sandbox test" emerge -a yle-dl + esetup.py test +} + +pkg_postinst() { + einfo "Sample configuration file has been installed in " + einfo " /usr/share/doc/yle-dl-2.37/yledl.conf.sample.bz2" +} |