aballier 15/02/05 10:12:13 Added: avutil.patch vaapi.patch dl.patch Log: grab more patches from upstream to build with latest toolchain, libva & ffmpeg, bug #538194. Add missing libX11 dep, bug #514306 Signed-off-by: aball...@gentoo.org (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.1 media-video/hwdecode-demos/files/avutil.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/avutil.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/avutil.patch?rev=1.1&content-type=text/plain Index: avutil.patch =================================================================== 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) 1.1 media-video/hwdecode-demos/files/vaapi.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/vaapi.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/vaapi.patch?rev=1.1&content-type=text/plain Index: vaapi.patch =================================================================== >From 5afe6345d8ca1c673cbddcf8c7bc3af7709d5454 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne <gwenole.beauche...@intel.com> 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 <va/va_compat.h> +#endif + #endif /* VAAPI_COMPAT_H */ 1.1 media-video/hwdecode-demos/files/dl.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/dl.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/dl.patch?rev=1.1&content-type=text/plain Index: dl.patch =================================================================== >From c00dd0bd93d961bc2dfaea3406c59b672741fd26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= <vjaq...@igalia.com> 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)
