gentoo resync : 26.12.2017

3 files changed, 100 insertions, 4 deletions

diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
index 2bb8d8f0d0e2..3a1a48f4a531 100644
--- a/media-libs/libyami/Manifest
+++ b/media-libs/libyami/Manifest
@@ -1,8 +1,10 @@
 DIST libyami-1.0.1.tar.gz 480656 BLAKE2B 245c26dcfd396000eaf60d25bf437aad8dcd5255aac2b23ab0299bbf707e52268a914df61e2194dfb67a76d52eb1a8b792c07e777b77975d19ff11a2aa616397 SHA512 01c0716011682ff8b5e6d2c58479aa574bc2cfb5ffe932952e430302aff090d56e0efa4f784f9cdd36d94800c8454802e4500096b3bea162d04ee6253a134c81
 DIST libyami-1.1.0.tar.gz 491537 BLAKE2B fc3b948954ceda10894ff29f5f540a5817a962e2da6d549f0d0b4d89602577437778a244bcaff5fee4f3760d98472d8cd1c0ac07146e3b6ad34618c9f937eeec SHA512 04ef34a994d23f8f5182c17975d6a28048a311c8090393d8cd54dd1fc74ec8b76af4028e1d5506568fb698e15f14833a01d4eaeb4ccd2484801f806a05cc86fa
 DIST libyami-1.2.0.tar.gz 508386 BLAKE2B ed4892dddd66d03a5f37c4d28a449c18c722bd1a09aae6261d3b3a210fc4912f728f629a216efd7176c8a37de768a6fa2d1272ca223a387e5cfb8cb4e7cb284d SHA512 1d253d67e3aab7ff2a1add50f7a5ebd284518d12fa689e6160a2dadb3fd1c2a5ab1a1c5f66dfd3801d46d9666c73dabcd5302ca495b069f60671337c0d0bc539
+DIST libyami-1.3.0.tar.gz 820807 BLAKE2B 3764e591269f3c38e7b5f6f5c3dbfb59fe4cdb198cd80858a2c0150274be073c1b064b8c8482b87ba770a6ee3534430b00155b34fa70f6bab7ed537a85ba1ed1 SHA512 8858c7f8d0fa7ce4547f762484e4b82477e49a8cb893cde29d7a26ba0f39dfcabc530659722ee5b84dc6f95e65c3373057ef470c78b9c1d790907e7bd6c6fd75
 EBUILD libyami-1.0.1.ebuild 2050 BLAKE2B b666dbb77df924c06b73feb8da459190694606314f55cea4bfc7ca1ea5a885edb7e031819ca926bebc43305ba2d740c0c9644dec4fcc8c5650de9453bdacedac SHA512 d638f274ad45924231e7579ff860f7c1900ba5ffca6aaacc7c45db1251982639e24e9a7498122b8219825f32c627553dd8ae6c1bdc976da8ed0a4b1070931512
 EBUILD libyami-1.1.0.ebuild 2076 BLAKE2B 08bee3c7949783a42b9202911c9fec39b3765b721447223188791bc964a0e95b75637f0a3dea18819d40b64bf0f90d99cc482c5bf3317cdd390d4932e3198f54 SHA512 fe3b20beaa845d3edc83ff20330a9c2a486e5cb662fa6add675ccf87f8e2f73fa92b297aae232375b8e443464d1d337751de8bd0692c0ca91d5e26508d1e6356
 EBUILD libyami-1.2.0.ebuild 2110 BLAKE2B 5949d871b479b23dfe0636ac2e196c43e2686b60950e16b2ee0c435337f6bf142d3e0e266c12cd306c2de8feb851353f4b40bfe47f95b8665db33f72039ace85 SHA512 ba8452590a7ed51d79b0112d84432a11d7df43b7bdc7319e2d21f724488bbf61e66fd3cbdc91f2ac34718c15b6cca3677b9bf584f1b8657767c5eb7c147c78c1
-EBUILD libyami-9999.ebuild 2110 BLAKE2B 5949d871b479b23dfe0636ac2e196c43e2686b60950e16b2ee0c435337f6bf142d3e0e266c12cd306c2de8feb851353f4b40bfe47f95b8665db33f72039ace85 SHA512 ba8452590a7ed51d79b0112d84432a11d7df43b7bdc7319e2d21f724488bbf61e66fd3cbdc91f2ac34718c15b6cca3677b9bf584f1b8657767c5eb7c147c78c1
+EBUILD libyami-1.3.0.ebuild 2180 BLAKE2B 3d0cb7206b72b44f2c2c4cf40fde1183dc435fa9c4698aec2df409f9d0dcc3b01cafa844e9fbdad6e94a8df6aacca7cea7927a5ea2fe4b0ae6e1eb1b2882f0ce SHA512 38f4bf856c559f46b36281d1f4bc4c525522a84ca1726500fecbac49c679c5add2d4a3357faa1ad0bbd6d618de2cc5b54c5bae177c05aeae84b29afdff321dcc
+EBUILD libyami-9999.ebuild 2150 BLAKE2B a32aca3ad5fe2302ec78cde3ab6e00c0fc4b273060e7052eb5193f51565418d0e1316030a8f8d1557ade41def205f6e3a272425ddba51030111abf2f1f7f4626 SHA512 5dce12e388b7de296e26d3c471effa4829bc0f954173bc291438eb0b081ce2d71d89a6f1957401921fbbe440a2149ea65143f075721f299578d4535c9e38ba30
 MISC metadata.xml 564 BLAKE2B 5e0cdea946bb891106c1c04123df9ec34b6de1e92dc3ab8002ff0ae9d38eb580da6f7765efb99a299e073f5fa35f8d91c190aedb2040a6c8a95b71142c9495ea SHA512 db74b69f443e310f95f17b9c8112cb9f6ed5ba4600971b7eff65a1c98ccc2391d5d5a53f46efee8b4b6aa87a0becf8883a0a5dafb10e5d708dc8a8e584865008
diff --git a/media-libs/libyami/libyami-1.3.0.ebuild b/media-libs/libyami/libyami-1.3.0.ebuild
new file mode 100644
index 000000000000..4df453a98755
--- /dev/null
+++ b/media-libs/libyami/libyami-1.3.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM=git-r3
+	EGIT_REPO_URI="https://github.com/01org/libyami"
+fi
+
+inherit ${SCM} autotools multilib-minimal flag-o-matic
+
+DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
+HOMEPAGE="https://github.com/01org/libyami"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug egl dmabuf doc md5 v4l X test wayland"
+
+RDEPEND="
+	>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
+	v4l? (
+		>=virtual/opengl-7[${MULTILIB_USEDEP}]
+		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
+	)
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.7 )
+"
+
+src_prepare() {
+	sed -i -e 's/-Werror//' configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-cppflags -I"${S}/" -I"${BUILD_DIR}/interface"
+	append-cxxflags -fpermissive
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable egl) \
+		$(use_enable v4l v4l2) \
+		$(use_enable v4l v4l2-ops) \
+		$(use_enable X x11) \
+		$(use_enable dmabuf) \
+		$(use_enable md5) \
+		$(use_enable wayland) \
+		$(use_enable test gtest) \
+		$(multilib_native_use_enable doc docs) \
+		--enable-h265dec \
+		--enable-vc1dec \
+		--enable-h264dec \
+		--enable-jpegdec \
+		--enable-mpeg2dec \
+		--enable-vp8dec \
+		--enable-vp9dec \
+		--enable-h265enc \
+		--enable-h264enc \
+		--enable-jpegenc \
+		--enable-vp8enc \
+		--enable-vp9enc
+}
+
+multilib_src_compile() {
+	emake
+	multilib_is_native_abi && use doc && emake -C doc
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dohtml -r doc/html/*
+}
+
+src_install() {
+	multilib-minimal_src_install
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/libyami/libyami-9999.ebuild b/media-libs/libyami/libyami-9999.ebuild
index fd902dd2fd96..33937920eec0 100644
--- a/media-libs/libyami/libyami-9999.ebuild
+++ b/media-libs/libyami/libyami-9999.ebuild
@@ -19,7 +19,8 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/01org/libyami/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
 fi
 
 LICENSE="Apache-2.0"
@@ -27,7 +28,7 @@ SLOT="0"
 IUSE="debug egl dmabuf doc md5 v4l X test wayland"
 
 RDEPEND="
-	>=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
 	v4l? (
 		>=virtual/opengl-7[${MULTILIB_USEDEP}]
 		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
@@ -49,7 +50,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	append-cppflags -I"${S}/"
+	append-cppflags -I"${S}/" -I"${BUILD_DIR}/interface"
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable debug) \
 		$(use_enable egl) \