Preparation for 2.6.5, added libva and xvba support.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 27 insertions, 14 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 0658caf9fb8b..0881de54481d 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.222 2013/07/18 20:58:17 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.223 2013/08/31 11:01:26 tomwij Exp $
+
+  31 Aug 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-9999.ebuild,
+  metadata.xml:
+  Preparation for 2.6.5, added libva and xvba support.
 
   18 Jul 2013; Chris Reffett <creffett@gentoo.org> avidemux-2.5.6-r2.ebuild,
   avidemux-2.6.2-r1.ebuild, avidemux-2.6.3.ebuild:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 8369c9d31bac..170187eb85b9 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -11,15 +11,17 @@ EBUILD avidemux-2.5.6-r2.ebuild 4404 SHA256 1c98dbcbea05878eb4e82624fff39e607400
 EBUILD avidemux-2.6.2-r1.ebuild 4004 SHA256 a0c5a17895cbffcce82b01299f9961222a56efb1fa2f7e5c7906457297975c8a SHA512 1a140de1fe6514dca6695a95f9857c4a7397b83a3df75ce612d796db741010fe4397cee4fede23bb14ef3b40293638404d85728cb4b4d24f9a8b78be18ef35ae WHIRLPOOL fc8c7d58ddc74f64ea9557a94f40d36899f4a4085d112b9b38d676693ba8d3c0752ccd46be0aab3ec956f047eaa2cf1c7b9a6e2415be176d83802361cc02fb10
 EBUILD avidemux-2.6.3.ebuild 3457 SHA256 b4145eab3f0418753b34fbbb547f60578caa989eef1a1dd5c0524eea31073f58 SHA512 0957ebf23709ee13a87da59fad5122a2c796cafaf40de6911c8bf640bc33b351682fbdd3de84be2e23d0b85ada3d55be78502852da932ac738b399781e3b7cdb WHIRLPOOL 8f0882cc5640d2fae2528d9d64289cb5fb9a94ddce8dbe4efbdda8ccec55b4bf69ffaf0d8ac2f5860a54e4e6e37ea7b9c335962be19ee457b27916851a286a5d
 EBUILD avidemux-2.6.4.ebuild 3436 SHA256 372bdd216abdab5bc79a4aa36c4ec4d925e067dac8633f4e2396e4efb3efdba6 SHA512 d523f789bb652c8bd08a73ba5970c9ef00dfc6f5ebf1775c2bd8e9923f13d1775449e8d79d05c1a6eb136c5edee3890bffd8595e43e652dc811bb9ef624ebc5b WHIRLPOOL 89dda0fbd70e0b9ababdb27868bd6dd20d85f7f24cb99de4144d56c62f3ab49b6f88c66ec4c6a4a8ca33611ac6c5f6faa14628edfd6d898f1fd658df8d387858
-EBUILD avidemux-9999.ebuild 3471 SHA256 c866fd8780a4e36de19a6e51f92b81c8c85a24bf943b3349ccc101ddd1cf1421 SHA512 cdc62fb1671cc98aa520a42c9f7cdd9cef8ddac6892fcf3a245603790a05ad9fb4d01d129bdebfb5e81dfd235c314de00bb475bd6deb0bd2b2cd7760f7639cb4 WHIRLPOOL 4c3f98e5cd9e9793890534e20dd4c1ee6125f95ba36123406101074a179cf08bece86089ed978a6126e6c2cc6b4c88df53bdb454c4052bed371baf0a23eb1b5c
-MISC ChangeLog 41266 SHA256 2d0f30b2c9d45abd0c03082681bcc26fd18a6dd868e3dec92cc418fff3671bf4 SHA512 6e55c88e7fb39da76d1a67fff393d19f00c593d1f28b75be0285508b0723a209affaf361cf0f7b313b38a1de6f8f70e587677f19660e90e7e7e2a2a498838f88 WHIRLPOOL eb6c177de5297d7de1c0c8b8cad74eeff750e75403fd0e6c352a8a739c18a4063c9f62e22d4596e73339e4656633f5049319b2cf3532e4179510f02a64fd9a77
-MISC metadata.xml 543 SHA256 3725b23e8cf87b3bfd7539de98eacd624163f392c51655382d1b92c4bb09507d SHA512 16b3515b92d74a68b8db832e905f341b11100bcfd248a5bff148f1d407edf387609f07e468a5feb38d66b8866ea30e957f337a30c1090c2819dc12e0d0b58787 WHIRLPOOL 64fb8ff1e670253be50f817320d858e54d12bf1d9f558f0a5f229e1832fec11566aafafc3678ee3d2cdf967d14887c69177d4bbf8ac081c12853daac760d826a
+EBUILD avidemux-9999.ebuild 3676 SHA256 60239302d5f0e95c77d37ca45e013d5e37da43fef2a323ebe4aed780fe464101 SHA512 f3f1ee0c905160244e377513b4cc98d43e8f70a8ad78af609455cc50cb77f47e6a4e32fa618f78dc02a23be3eb63c64ea7ab943fbb84f49025c0558dfdfc840b WHIRLPOOL c0c62a5db4f1c52099575cc5811033a712488554abcd09cb3d740f79f246d919c4dfe218883ceb44c27f11ba3c38de5019dc7d1c0f61d702f3808da039ee2579
+MISC ChangeLog 41405 SHA256 da31fe0e81122f2ac401fb848b1c305ad773188d3b791fcd1c1b1b8d152e4d58 SHA512 ab69a2c1a787ba1227ce70fd266eddad9b559d5afbc1e9eba0248fbfb72740acfbe7063e968edbfbf25b7fbfb1fc52673aaf13a074e8445990fa2594d671542c WHIRLPOOL 2bac41039c38b64cf8ef8d09f456e72c35c4d57b24785c6f0493c9e41c61b6283363d2ae7026d95a153ce72b678563359d4a7f2528d01115ceef848b18d396cd
+MISC metadata.xml 634 SHA256 fef58b86001e86d77d04f7eb322ad41ecbff8ae509d8792248bc5cb745f53ab0 SHA512 92a54687f81eeb1043edc49d2119966d09e301623ef36199c2464a02e70891abd620a15615728e0d2def20ccb9914d13b83bb063fed6f34af72e13a0dd26c12d WHIRLPOOL 838c3413336a9edd431bdb6e6863fb061ecda0495f3fb4e0bd2a7bd92b36064df7e08b1686c55907c46b62ec0f2746f206ecef11a30ceeaa59d9c131cdd6fc75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iKYEAREIAGYFAlHoVuNfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1SyrQCeLWKNoMWjlXs8N+SkBhQZRajl
-zJYAn07whqcmhYCZBsbFyxRjbPirfGgx
-=o2Uk
+iQEcBAEBCAAGBQJSIc0LAAoJEJWyH81tNOV9T4sIAJ8BRJXir1RusAv7pw7eLHIS
+EbJqQLWGWxRv9YTloJ1ZtcZl+/scUm4GL1HRerOrjsmNjkR2iuKGP+S+H5snZjJx
+NAr3p5sdYUKPdiA8spNC4Sb/6/GbjX8lf2WUGxGFl+GlDCEHjPao8QwCe6wswldQ
+UxOIt+vT5Ki9hxCLDvKRpKDUJn0iCGxP83VCF09KsmxwZYNincbO6aFAcdIw61Q7
+kJw8NDIzkDVYh9w/rgHcFkzuHqypcclpHVVdcY5qAfX8qFFjZMLbt9E0dv8/hcQk
+Vv+W6m4XLQi0qPbrTahZNvh58yXxkS41pdF8U/QyDpEcuWRclGVFbQ5NV6Urm38=
+=ghUg
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index b2ffc7309a5c..ee0cd9ce182e 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.1 2013/07/17 00:31:34 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.2 2013/08/31 11:01:26 tomwij Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://fixounet.free.fr/${PN}"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug opengl nls qt4 sdl vdpau xv"
+IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
 KEYWORDS="~amd64 ~x86"
 
 if [[ ${PV} == *9999* ]] ; then
@@ -28,9 +28,13 @@ else
 	SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
 fi
 
-DEPEND="~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vdpau?,xv?]
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
 	opengl? ( virtual/opengl:0 )
-	qt4? ( >=dev-qt/qtgui-4.8.3:4 )"
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
+	vaapi? ( x11-libs/libva:0 )
+	video_cards_fglrx? ( x11-libs/xvba-video:0 )
+"
 RDEPEND="$DEPEND"
 PDEPEND="~media-libs/avidemux-plugins-${PV}"
 
@@ -65,7 +69,9 @@ src_configure() {
 		-DAVIDEMUX_SOURCE_DIR='${S}'
 		$(cmake-utils_use nls GETTEXT)
 		$(cmake-utils_use sdl SDL)
+		$(cmake-utils_use vaapi LIBVA)
 		$(cmake-utils_use vdpau VDPAU)
+		$(cmake-utils_use video_cards_fglrx XVBA)
 		$(cmake-utils_use xv XVIDEO)
 	"
 
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 16bd0c9004a7..43ce6b7ad33f 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -10,5 +10,6 @@
     <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
     <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg>.</flag>
+    <flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding.</flag>
   </use>
 </pkgmetadata>