gentoo resync : 11.01.2018

3 files changed, 88 insertions, 0 deletions

diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 9aa437d85946..2bea2302c7ce 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,8 +1,11 @@
 AUX 0.3.4-git-revision.patch 404 BLAKE2B 02f6fdc21f1a722623fb66013eba7af0a327e702444f1bedc61e52832575045938fbcd80b9bd8dc56e936d2b058b751a00eb5b147987cceab36fb2bc758cc8ed SHA512 617c5586d0948f9aa5acdef38cdceb29e98a07cb40a284e07e780d0344168408bf14fae612fb5d2baa648f6083b0d37820a70a002631abf6cdeb38a3948bd617
 AUX 0.3.5-cmake.patch 3049 BLAKE2B c6ee8f4d7647d2d216225fc35c6744cb4fadd4d8a958fe86196d250fefa38ad53e4c4ecdca43c84bd7aa1705ab74efd7b9d694d5457ee9fa2f4335921f4c8f79 SHA512 95d07febb1cf159bd22ba3551fd712ab04e26f2422a01940285a19648d570a92b0d399a48fad54eba6b7faecd00f51b98e117e5f5df4b7dd1238a73bbe46d353
+AUX 0.3.9-ioctl.patch 369 BLAKE2B 88dba5e3e0d49fc7f6f3c2b56a8e7888be48b88dc77c2613c48cdddfc6090772d8d18787bb0f0997246deb1ae07d588352c41becaa9f1767db20799519449b22 SHA512 6a1c32602ac889cd2de52beed3870d12c1815eba0eabe77a1de1380d5015fb21eb697be7f6ac9fa9efe8a0e74f71e741e3cde4b9dec775f4158905435af7bc16
 DIST freshplayerplugin-0.3.5.tar.gz 781003 BLAKE2B 9874f07905a277c95374a697397dc9b3661cdba40b39ee74702d4ec67a0447d13cc2a187c695b47be9f922177b37bdf5fff8ebb9dd57b709f884ffa3db0da54d SHA512 dd447db4cbfdb80b89ff42894099971c100023d19fe5fbad023d5ac1afa827fdc5a169a03f4702ffda3cf6e0dd9c63217b68d97d047ac43afc22f488020a0ba0
 DIST freshplayerplugin-0.3.7.tar.gz 789974 BLAKE2B 0217e3431164e9dfce4ec21f07331aea4b5841b963c51c258f10c68d8089b8f860364d58af533f3724f8759b8d6381cba950f174b2ca3f0a7b59c581192b5a47 SHA512 9ef534b873833d69caa86a5702ad6150e4aa2fe399159a550b6cb0ebad2754d25e185c54b6285f6f50913c5595c5b460ce3e0d21ac45f0d25793805463ce1d5d
+DIST freshplayerplugin-0.3.9.tar.gz 790261 BLAKE2B 88526c01e7a06c7b295e5a7652602eb661097f869b30c8fd0978a4e03adea9d1fa75d35e5e9c0751d786c04f0247fc292aa0c1857cf1fa575eb0b11499bec7fc SHA512 999d7c223dd493e43a0fa7874371c7b781fe5273b2661fc30f814832b4aafd23f297795b644f58553107ef962ca17ce58fb39a637d1ab7bdf470cd33e0b19cf8
 EBUILD freshplayerplugin-0.3.5-r2.ebuild 1851 BLAKE2B 7bcd5da8e281c5d584966035fa6ff27c7c279ec72e8e45ec40b3e94e07be6ab92b945ceed726e6fe2cf36a2819f8fbca4e6aab24db5652301942cee35222e981 SHA512 d8ebf65ac798abf5e1e00438b5c10e9140adf2b0d531a9bfc95e0dd1b1e3193b366e23fe2647846a87aba5ea491d72e0d377b2d7dae8d958cad92819b41be04c
 EBUILD freshplayerplugin-0.3.5-r3.ebuild 1873 BLAKE2B 910f1cd17fe94f0a81306ece58ec4424a82ebe6ac953abc8ff7bb0969127da47d85d8aada676f8c57c50fbadd3422f97cbf33bcf87ab9db692098b3c12f698dc SHA512 83d5544d6b36efbafbfa25f12cdacd3c5d4c0f246dce0a9a19f7f7ac82ee344ebc9f3f593bdeb32f7763ecb0149bef169e217b3632a69e61c8e7bdc893188bca
 EBUILD freshplayerplugin-0.3.7.ebuild 1834 BLAKE2B e3efe1e39d17332e71feb9d9a88d0cea86ce38f52859684fe53007f89ca95eca3ae8ad4ac87840e22368dd9d9356069670b8e768672389e82b56ad2a2865e0b7 SHA512 58797302082e763a98e7dc573246657020003c4b2f7ff1845c85755dd79300e74d8730698709fcc032873cd7f1bdf36b5557660469f1c01364099a05379ba5c8
+EBUILD freshplayerplugin-0.3.9.ebuild 1776 BLAKE2B 3380edf72199d1ff89b2852b61fec4839b607638611e2e4f1eb0b6b4c164c13497e8f24865179665a59087ca3e30872fed0f5f6fcc769d785eff5c993fe59464 SHA512 b389ea1ca36286ce5e65767f3c4acb6bcb2435f1ac26f5f7d6003a9002bb50cb8ffa0f460505fa3191961fa8a4af6bac2ded9776a90762045ab9d9b07e83a41c
 MISC metadata.xml 574 BLAKE2B cf3f2b659df90486a1187c2afe59cd5e1e3941b03bc407e0444a2d3938c71de2e8bd06957bb59aead5e85f31f7d6ce09ec225a7fee71b84574925c9f7669e485 SHA512 97da2e0c03c499e76f400cf6d690e6a0f19779ff1dee966c72b109cd114dae905f044c6ef0a58bc9e15ac648474d05aa770c060150c824c54da25ac1d7bede60
diff --git a/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch b/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch
new file mode 100644
index 000000000000..112b839016f9
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch
@@ -0,0 +1,11 @@
+diff -aurN a/src/ppb_video_capture.c b/src/ppb_video_capture.c
+--- a/src/ppb_video_capture.c	2017-12-23 09:34:01.000000000 -0500
++++ b/src/ppb_video_capture.c	2018-01-10 20:03:05.498415644 -0500
+@@ -75,6 +75,7 @@
+ 
+ #if !HAVE_LIBV4L2
+ // define simple wrappers, if libv4l2 is not used
++#include <sys/ioctl.h>
+ static
+ ssize_t
+ v4l2_read(int fd, void *buffer, size_t n)
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
new file mode 100644
index 000000000000..4348e877cbfe
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+LICENSE="MIT"
+HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
+DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT=0
+IUSE="gles2 jack libav libressl pulseaudio v4l vaapi vdpau"
+
+KEYWORDS="~amd64"
+
+HWDEC_DEPEND="
+	libav? ( media-video/libav:0=[vaapi?,vdpau?] )
+	!libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
+	x11-libs/libva:=
+	x11-libs/libvdpau
+"
+
+COMMON_DEPEND="
+	dev-libs/glib:2=
+	dev-libs/icu:0=
+	dev-libs/libevent:=[threads]
+	media-libs/alsa-lib:=
+	media-libs/freetype:2=
+	media-libs/mesa:=[egl,gles2?]
+	x11-libs/cairo:=[X]
+	x11-libs/libXcursor:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libdrm:=
+	x11-libs/pango:=[X]
+	jack? (
+		media-sound/jack-audio-connection-kit
+		media-libs/soxr
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	v4l? ( media-libs/libv4l:0= )
+	vaapi? ( ${HWDEC_DEPEND} )
+	vdpau? ( ${HWDEC_DEPEND} )
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/ragel
+	virtual/pkgconfig
+	"
+RDEPEND="${COMMON_DEPEND}
+	www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
+	"
+
+PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" "${FILESDIR}/0.3.9-ioctl.patch" )
+DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_JACK=$(usex jack)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_GLES2=$(usex gles2)
+		-DWITH_LIBV4L2=$(usex v4l)
+		-DCMAKE_SKIP_RPATH=1
+	)
+	if use vaapi || use vdpau ; then
+		mycmakeargs+=( -DWITH_HWDEC=1 )
+	else
+		mycmakeargs+=( -DWITH_HWDEC=0 )
+	fi
+	cmake-utils_src_configure
+}