From: Alexis Ballier Date: Thu, 5 Feb 2015 10:12:17 +0000 (+0000) Subject: grab more patches from upstream to build with latest toolchain, libva & ffmpeg, bug... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf9ffe3cf7ca63304a799d124ec2a6c5983ed097;p=gentoo.git grab more patches from upstream to build with latest toolchain, libva & ffmpeg, bug #538194. Add missing libX11 dep, bug #514306 Signed-off-by: aballier@gentoo.org Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A --- diff --git a/media-video/hwdecode-demos/ChangeLog b/media-video/hwdecode-demos/ChangeLog index 4f2b0011d324..d96992d460a0 100644 --- a/media-video/hwdecode-demos/ChangeLog +++ b/media-video/hwdecode-demos/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/hwdecode-demos -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/ChangeLog,v 1.10 2014/12/12 10:35:38 pinkbyte Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/ChangeLog,v 1.11 2015/02/05 10:12:13 aballier Exp $ + + 05 Feb 2015; Alexis Ballier + hwdecode-demos-0.9.5.ebuild, +files/avutil.patch, +files/dl.patch, + +files/vaapi.patch: + grab more patches from upstream to build with latest toolchain, libva & + ffmpeg, bug #538194. Add missing libX11 dep, bug #514306 12 Dec 2014; Sergey Popov metadata.xml: USE='vaapi' is now global, removing it's description from metadata diff --git a/media-video/hwdecode-demos/Manifest b/media-video/hwdecode-demos/Manifest index a3eb04870e3a..92559bdffa08 100644 --- a/media-video/hwdecode-demos/Manifest +++ b/media-video/hwdecode-demos/Manifest @@ -1,21 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX avutil.patch 804 SHA256 4b246683778de258c393a465843cce2896449a9cbf98cd55a49c6a1971a12822 SHA512 c42a87a4aee15dde21cb34d1c25f8aa3122a3fb416789dcdd0216cac687a69c48ac0310f4a61c1b07a1f0e61e6236e2a8a423c80c8e1b3940473f906bba76aee WHIRLPOOL 2048e5babc146b02de889b7e6b23a156cdf2a1ab993cdd1776de74f15b13080115e16e7a5ca174802f925b09a070a23100b168176391586b92c427d3dba54e87 +AUX dl.patch 1067 SHA256 38f3f661a2f256b852d6d10a44454f95d214bc42e247a0007f49543f1b633a29 SHA512 734a1950fdd9c64360c0434cdbb42f2ccf9cfc633a8e31230a04e2058f9e5ec76b63893271fd0f8679afda93c3cac172b12a502adcf82993e49e427a1742044d WHIRLPOOL 12781eb40be62c4d3724876da12c2bbf46b46e19afb1d660e3a45658c6f4eeef7f24ff075f04e33c2d94057a4b9a167f0ea71eb3bb6952db9fccd63b66c243ac AUX ffmpeg-1.patch 2195 SHA256 cf1bb61d83fea3cc3f41d4ee167857e58639c8ac7f914f1015b7acc7f4831f8e SHA512 a733adb59b8a1729de78516d2803e6a38d86d709dd09b8fd4c84a51dd5636adb4d5684ca952db6159d27076815119b016c5262cf8c0870856acfc869426dd8ca WHIRLPOOL 0235b3d6235278de9c8e8c77b956e67637c465adc2679d18abea879e7281458cc00dcf4a2369fde20366e05d7c94c76b5494bc3ebeb59ccd387e76e6117fb0d6 AUX ffmpeg.patch 1367 SHA256 0255db5d35bded209b7a8d1445a69a93c3cf5c485a0f10973b0fac4962a1be15 SHA512 befcaa4167dc7d0b966fb1075b38e91651c0d7082eda88e09db4af7ca21e80dcfceee6018a00fc2f23126a50bd6043224428353a6c9e9929fc9a4eff9caf62e8 WHIRLPOOL 3e8c20fdbd7cf178dee47524c892dc5f32e7c3d47adc6c6b5ec4991826b3045dcf009cea4328effa21492dd5b1e403310d2b660b6530c9e8c538a2cd57d9db0f AUX libav9.patch 1836 SHA256 962286908689fb9e088f7699f554e0220417263fc5bf379fa23b7c5eb80ab5b1 SHA512 218db0214ed368a9bb8f322f9d5e9fb5b37098893ed8379c38ca69777c4068f1bca254f495f6d3dd74763f90f68b21fe4863d63c02732bdee6065e24b6a422d2 WHIRLPOOL 2443745a55004da0b195a4066d440ceefdc1f7f406036a2b42fa8f5aff08332b6a2053ecb64133a78123d971efe5445e586dfd0a6fd464d84f588887f428e4ad +AUX vaapi.patch 1322 SHA256 1dc35ce36a858c063900f10fa143ae14a9daa8332a935ff95a89e51e53bcd5af SHA512 93abca341b5e57c321423b4769b4d2668c814645410caace9321f2a2648d889339b091f09c2c4815bd176cc54ccdf0ce2df29370abe3658e4590604e1aa14fda WHIRLPOOL 935dcdba7ea2c958bf74cfc6799356a29131c1a3b47c0a96b8075ea0d6e9d15aa2aeb36cddc2bd1331e7f2c6d99615c23347527c645e8ffde57b5d2991b16e18 DIST hwdecode-demos-0.9.5.tar.gz 642660 SHA256 35ef7bac5b95c61920ab6bae825060755051659c610c095739d9ae33b3d39d07 SHA512 2596949a6027c7d9a4053911501febaca319a4593cad23fc854d5f366e8be914fdbb7ecd08aac784fc9798dcf46147de249bf848a5a3fa513d06585c1f9f6748 WHIRLPOOL d494537d25dc17d0d8c4c058625898ea5be28522d2b7b8a30eea01662a053795fe0065d75db12a6babdeb081642689300123196d8a27ba9bb38d970cfbde614c -EBUILD hwdecode-demos-0.9.5.ebuild 1045 SHA256 fce6fa3409098151d3fbceeb136fd2924234ab98b78398aa398836e11feb55da SHA512 7623a87ec3515bed038f1f224c789eed4225227688c3ad18a71eb383eeb3bb29f91143e2c0e4d677b330f5ce7166c556287b609c2e3891d6c940d3444d3b20e0 WHIRLPOOL 1d4ca923ed647935e17e95ea98784603c956c4c397fa28ab262c30b4d0916f44b3a4b406fe771278753e1967e4693b9fab38d02a9b99453db7b6c97532f05dca -MISC ChangeLog 1704 SHA256 d9397bc7f8f6e789f913b1e9f2dc24a92ff44d0771f4ab5fcbc84b9d2b0ad733 SHA512 ba6575a797d3208c38f942026c8c552841db2f21de641a15c0f2f1c74d12b129d83c63958428c70c911fb5a8d7f0f2247f52d3460e89cf5e0ac47a55c9e941a5 WHIRLPOOL a2f08ce1008ea4e36c3a80456b1601f97221726af4bd2276eec24e0fe497f92999381d75b370300e7d1e07de31cb64ee82b030e46d48feab543d129d13c293f3 +EBUILD hwdecode-demos-0.9.5.ebuild 1200 SHA256 05c39048a584b50301406c0c92caac54eb87e9efbecdab13602db2c5989a9c50 SHA512 7053cd4539aa154f9ec8c4dafff28246fe9a2dfa21b1fdeac4e1558c558e91525d37e07f6bc14ff8077eeb6265b1029bf4bdd311e5016115a369aafa507b0465 WHIRLPOOL fd10fcff02caeea54812c07669c89e3adaaa6ad609b98bd394e3034d8a63dffda80754439ea587f548a8a40a9f7575d8b131a34621036bda39ba3213922cb3ba +MISC ChangeLog 1981 SHA256 ec9d47803f306f39cf605c1a97b8eb9eecb0b97707c607014d342986ab14f275 SHA512 991885bdda359cc40a4ee97b7571662de053813466f644d9e4a03c9d5ef20976b08f577d537f391027a071f6da2b7384f18f4728615af375d1e0a0f725cc57e7 WHIRLPOOL 72d61bc370cf396049172794d11a253f0215053a4936c26dabd995c3c71d06fdd23cd077d7a0f0c2a0d16659e5ea3bb493d9b1685330ae14fb67e4c53e5c285c MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUisT6AAoJECo/aRed9267g9cH/j4WHZj/hHQKP3/g1+C9TjZU -tkIvqVaM2Nrfkzh3iYgxhqR5/2MhVGsA+pIQChPPWK+jmSlk/jSwQQ5siiUwcvmQ -7nHgGm4CwkL5iRuI9c33oZGtTG+0YhCU/RMsmi8aVs1MvSiKU490ue8z2K96NUKG -f7ThY0PfxZtFmXpuJDwtOuiO61Aio62tBm1aBb8ub1fyYfY61lj340cIP4Z9Tork -SQ08LYvT3d4/WX4OtLg/D4zApVLaDWQ5Oa3KjR3A3rCPdbrlyRiir0B22gMwuCc6 -y729I7mREq0hlK9YJ2GA/DyxDrWMlM0Ml0WCN2aKY1q4oBIwwdipT/faORvqB6w= -=17QQ +iEYEAREIAAYFAlTTQf4ACgkQvFcC4BYPU0qGawCgqv/0pRFStoyIpbDRxfQVucB0 +m0AAn3uhg8+hmqR2C8yGsuNlxTbRhfEW +=r+YH -----END PGP SIGNATURE----- diff --git a/media-video/hwdecode-demos/files/avutil.patch b/media-video/hwdecode-demos/files/avutil.patch new file mode 100644 index 000000000000..6c518d9a2ef8 --- /dev/null +++ b/media-video/hwdecode-demos/files/avutil.patch @@ -0,0 +1,15 @@ +Index: hwdecode-demos-0.9.5/src/Makefile.am +=================================================================== +--- hwdecode-demos-0.9.5.orig/src/Makefile.am ++++ hwdecode-demos-0.9.5/src/Makefile.am +@@ -93,8 +93,8 @@ endif + if USE_FFMPEG + ffmpeg_PROGS = ffmpeg_h264 ffmpeg_vc1 ffmpeg_mpeg2 ffmpeg_mpeg4 + ffmpeg_source_c = ffmpeg.c ffmpeg_video.c +-ffmpeg_CFLAGS = -DUSE_FFMPEG $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS) +-ffmpeg_LIBS = $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS) ++ffmpeg_CFLAGS = -DUSE_FFMPEG $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS) $(LIBAVUTIL_CFLAGS) ++ffmpeg_LIBS = $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS) $(LIBAVUTIL_LIBS) + if USE_VAAPI + ffmpeg_source_c += $(vaapi_source_c) + ffmpeg_CFLAGS += $(vaapi_CFLAGS) diff --git a/media-video/hwdecode-demos/files/dl.patch b/media-video/hwdecode-demos/files/dl.patch new file mode 100644 index 000000000000..d46789452ec7 --- /dev/null +++ b/media-video/hwdecode-demos/files/dl.patch @@ -0,0 +1,31 @@ +From c00dd0bd93d961bc2dfaea3406c59b672741fd26 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= +Date: Fri, 1 Feb 2013 15:14:57 +0100 +Subject: [PATCH] Fix missing linking depenendency on -ldl + +Recent versions of GCC ship with a linker that doesn't add the deps of the +DSOs of the linking process. This behavior is also found in GNU gold. This +change fixes building with those linkers. + +Some references + +http://wiki.debian.org/ToolChain/DSOLinking +https://fedoraproject.org/wiki/UnderstandingDSOLinkChange +--- + configure.ac | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +Index: hwdecode-demos-0.9.5/configure.ac +=================================================================== +--- hwdecode-demos-0.9.5.orig/configure.ac ++++ hwdecode-demos-0.9.5/configure.ac +@@ -69,6 +69,9 @@ fi + dnl Checks for libraries. + AC_CHECK_LIB(rt, timer_create) + ++dnl Checks if dl() comes from the C library or -ldl ++AC_SEARCH_LIBS([dlopen], [dl]) ++ + dnl Checks for library functions. + AC_CHECK_FUNCS(clock_gettime) + diff --git a/media-video/hwdecode-demos/files/vaapi.patch b/media-video/hwdecode-demos/files/vaapi.patch new file mode 100644 index 000000000000..a6d3e902a9a8 --- /dev/null +++ b/media-video/hwdecode-demos/files/vaapi.patch @@ -0,0 +1,38 @@ +From 5afe6345d8ca1c673cbddcf8c7bc3af7709d5454 Mon Sep 17 00:00:00 2001 +From: Gwenole Beauchesne +Date: Tue, 10 Jul 2012 14:43:37 +0200 +Subject: [PATCH] vaapi: fix build with recent VA-API versions. + +--- + src/vaapi.c | 2 ++ + src/vaapi_compat.h | 5 +++++ + 2 files changed, 7 insertions(+), 0 deletions(-) + +Index: hwdecode-demos-0.9.5/src/vaapi.c +=================================================================== +--- hwdecode-demos-0.9.5.orig/src/vaapi.c ++++ hwdecode-demos-0.9.5/src/vaapi.c +@@ -92,7 +92,9 @@ static const char *string_of_VADisplayAt + TYPE(Hue); + TYPE(Saturation); + TYPE(BackgroundColor); ++#if !VA_CHECK_VERSION(0,34,0) + TYPE(DirectSurface); ++#endif + #undef TYPE + default: break; + } +Index: hwdecode-demos-0.9.5/src/vaapi_compat.h +=================================================================== +--- hwdecode-demos-0.9.5.orig/src/vaapi_compat.h ++++ hwdecode-demos-0.9.5/src/vaapi_compat.h +@@ -91,4 +91,9 @@ typedef struct _VASliceParameterBufferBa + (VA_MINOR_VERSION == 31 && \ + VA_MICRO_VERSION == 0 && VA_SDS_VERSION < 5))) + ++#if VA_CHECK_VERSION(0,34,0) ++/* New vaCreateSurfaces() API with surface attributes */ ++# include ++#endif ++ + #endif /* VAAPI_COMPAT_H */ diff --git a/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild b/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild index b24816e4fa65..924fb789802c 100644 --- a/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild +++ b/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild,v 1.5 2013/06/22 17:50:48 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild,v 1.6 2015/02/05 10:12:13 aballier Exp $ EAPI=2 -inherit base +inherit base autotools DESCRIPTION="Standalone programs showing off various HW acceleration APIs" HOMEPAGE="http://www.splitted-desktop.com/~gbeauchesne/hwdecode-demos/" @@ -16,6 +16,7 @@ KEYWORDS="~amd64" IUSE="opengl vaapi vdpau" RDEPEND="virtual/ffmpeg + x11-libs/libX11 opengl? ( virtual/opengl virtual/glu ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau )" @@ -26,8 +27,16 @@ PATCHES=( "${FILESDIR}/ffmpeg.patch" "${FILESDIR}/ffmpeg-1.patch" "${FILESDIR}/libav9.patch" + "${FILESDIR}/vaapi.patch" + "${FILESDIR}/dl.patch" + "${FILESDIR}/avutil.patch" ) +src_prepare() { + base_src_prepare + eautoreconf +} + src_configure() { econf \ --disable-crystalhd \