commit: 3dc7547dfa9e9609c2904698c4867c3bb8885b4b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 9 09:25:16 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 9 09:25:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc7547d
media-libs/libyami: bump to 0.4.0 and update live ebuild
Package-Manager: portage-2.3.0_rc1
media-libs/libyami/Manifest | 1 +
.../{libyami-9999.ebuild => libyami-0.4.0.ebuild} | 45 ++++++++--------------
media-libs/libyami/libyami-9999.ebuild | 45 ++++++++--------------
3 files changed, 33 insertions(+), 58 deletions(-)
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
index 03208c8..2d13179 100644
--- a/media-libs/libyami/Manifest
+++ b/media-libs/libyami/Manifest
@@ -1,2 +1,3 @@
DIST libyami-0.3.0.tar.gz 484586 SHA256
67064558999d63185025a6d63d08458375003bb86369abca50aca97fd2c63acb SHA512
691cbe90840d8cb30da958bb6621434c9962ae6cbfc75b016454570c303a01e7a465baa8622368cf1ef1c670dbc861fb1d49e0c414d684feae04ea742e8e0599
WHIRLPOOL
d842f1ce57d40894b80f868934d687603014b6460bdbd274b64893d8f290f8a6a779239f931beb759a7fb8e5ed1649b90fb545391c1d9c8395bb05f6600218d2
DIST libyami-0.3.1.tar.gz 492223 SHA256
7ab680138a1d34eb306bc941198f0715631bc8e5b0ee5717b3171f6672ca3bcb SHA512
eb58a6925de8379e40b2482780340becdb8c9295041bba11bf439cc2ff19c25f10ce4b1fc2b6c421342855946ddd471745bdfb364a227499658867911325b375
WHIRLPOOL
ce44614aa04127c828761319dd96ee35956daea9cf7577e7631083e10db744c76596da7135f8f6c16952639c601ee065afe8c0097bf6d23829dc9893c4aa414f
+DIST libyami-0.4.0.tar.gz 445389 SHA256
b4a139fac81b6644828e8c9c377fe251128d2b4440ffd656f973c0bee14a2821 SHA512
b3c5394f1980e799717cfcb44d95dc93da10d6acb94eed106bc251ca3162194a55cedb111ac7023257b77c868807e9546df461c061ab3e1b02e3f2bbd30d3687
WHIRLPOOL
1a01901dd67d49bd26a74a00684e807e162986c9674a647e96ba5e1b573a25fca78835e377b83e348d275882c69611ce1008d01a74276468f5d475d369ba23e0
diff --git a/media-libs/libyami/libyami-9999.ebuild
b/media-libs/libyami/libyami-0.4.0.ebuild
similarity index 61%
copy from media-libs/libyami/libyami-9999.ebuild
copy to media-libs/libyami/libyami-0.4.0.ebuild
index 3951d2f..ad51770 100644
--- a/media-libs/libyami/libyami-9999.ebuild
+++ b/media-libs/libyami/libyami-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,36 +24,25 @@ else
S="${WORKDIR}/${PN}-${P}"
fi
-LICENSE="LGPL-2.1"
+LICENSE="Apache-2.0"
SLOT="0"
-IUSE="+capi debug dmabuf doc ffmpeg gles +glx libav md5 tools v4l X"
+IUSE="+capi debug dmabuf doc md5 v4l X test"
RDEPEND="
- >=x11-libs/libva-1.6[drm,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/libva-1.7[drm,X?,${MULTILIB_USEDEP}]
v4l? (
- glx? (
- >=x11-libs/libva-1.6[X,${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=virtual/opengl-7[${MULTILIB_USEDEP}]
- )
- !glx? ( >=media-libs/mesa-10[egl,${MULTILIB_USEDEP}] )
+ >=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}] )
- ffmpeg? (
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- libav? ( media-video/libav:=[${MULTILIB_USEDEP}] )
- )
md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
- tools? (
- gles? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] )
- v4l? ( !glx? (
>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] ) )
- )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )
+ test? ( >=dev-cpp/gtest-1.7 )
"
src_prepare() {
@@ -63,27 +52,25 @@ src_prepare() {
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable debug) \
- $(multilib_native_use_enable tools tests) \
- $(use gles && multilib_native_use_enable tools tests-gles) \
$(use_enable v4l v4l2) \
- $(usex v4l $(use_enable glx v4l2-glx) "--disable-v4l2-glx") \
+ $(use_enable v4l v4l2-ops) \
$(use_enable capi) \
$(use_enable X x11) \
$(use_enable dmabuf) \
- $(use_enable ffmpeg avformat) \
$(use_enable md5) \
+ $(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-jpegdec \
- --enable-h264dec \
- --disable-h265dec \
+ --enable-h265enc \
--enable-h264enc \
--enable-jpegenc \
- --enable-vp8enc \
- --enable-h265enc
-
- # h265 decoder doesnt build here with gcc 5.2
+ --enable-vp8enc
}
multilib_src_compile() {
diff --git a/media-libs/libyami/libyami-9999.ebuild
b/media-libs/libyami/libyami-9999.ebuild
index 3951d2f..ad51770 100644
--- a/media-libs/libyami/libyami-9999.ebuild
+++ b/media-libs/libyami/libyami-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,36 +24,25 @@ else
S="${WORKDIR}/${PN}-${P}"
fi
-LICENSE="LGPL-2.1"
+LICENSE="Apache-2.0"
SLOT="0"
-IUSE="+capi debug dmabuf doc ffmpeg gles +glx libav md5 tools v4l X"
+IUSE="+capi debug dmabuf doc md5 v4l X test"
RDEPEND="
- >=x11-libs/libva-1.6[drm,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/libva-1.7[drm,X?,${MULTILIB_USEDEP}]
v4l? (
- glx? (
- >=x11-libs/libva-1.6[X,${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=virtual/opengl-7[${MULTILIB_USEDEP}]
- )
- !glx? ( >=media-libs/mesa-10[egl,${MULTILIB_USEDEP}] )
+ >=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}] )
- ffmpeg? (
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- libav? ( media-video/libav:=[${MULTILIB_USEDEP}] )
- )
md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
- tools? (
- gles? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] )
- v4l? ( !glx? (
>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] ) )
- )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )
+ test? ( >=dev-cpp/gtest-1.7 )
"
src_prepare() {
@@ -63,27 +52,25 @@ src_prepare() {
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable debug) \
- $(multilib_native_use_enable tools tests) \
- $(use gles && multilib_native_use_enable tools tests-gles) \
$(use_enable v4l v4l2) \
- $(usex v4l $(use_enable glx v4l2-glx) "--disable-v4l2-glx") \
+ $(use_enable v4l v4l2-ops) \
$(use_enable capi) \
$(use_enable X x11) \
$(use_enable dmabuf) \
- $(use_enable ffmpeg avformat) \
$(use_enable md5) \
+ $(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-jpegdec \
- --enable-h264dec \
- --disable-h265dec \
+ --enable-h265enc \
--enable-h264enc \
--enable-jpegenc \
- --enable-vp8enc \
- --enable-h265enc
-
- # h265 decoder doesnt build here with gcc 5.2
+ --enable-vp8enc
}
multilib_src_compile() {
