| 1 |
aballier 15/02/05 10:12:13 |
| 2 |
|
| 3 |
Added: avutil.patch vaapi.patch dl.patch |
| 4 |
Log: |
| 5 |
grab more patches from upstream to build with latest toolchain, libva & ffmpeg, bug #538194. Add missing libX11 dep, bug #514306 |
| 6 |
|
| 7 |
Signed-off-by: aballier@g.o |
| 8 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-video/hwdecode-demos/files/avutil.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/avutil.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/avutil.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: avutil.patch |
| 17 |
=================================================================== |
| 18 |
Index: hwdecode-demos-0.9.5/src/Makefile.am |
| 19 |
=================================================================== |
| 20 |
--- hwdecode-demos-0.9.5.orig/src/Makefile.am |
| 21 |
+++ hwdecode-demos-0.9.5/src/Makefile.am |
| 22 |
@@ -93,8 +93,8 @@ endif |
| 23 |
if USE_FFMPEG |
| 24 |
ffmpeg_PROGS = ffmpeg_h264 ffmpeg_vc1 ffmpeg_mpeg2 ffmpeg_mpeg4 |
| 25 |
ffmpeg_source_c = ffmpeg.c ffmpeg_video.c |
| 26 |
-ffmpeg_CFLAGS = -DUSE_FFMPEG $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS) |
| 27 |
-ffmpeg_LIBS = $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS) |
| 28 |
+ffmpeg_CFLAGS = -DUSE_FFMPEG $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS) $(LIBAVUTIL_CFLAGS) |
| 29 |
+ffmpeg_LIBS = $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS) $(LIBAVUTIL_LIBS) |
| 30 |
if USE_VAAPI |
| 31 |
ffmpeg_source_c += $(vaapi_source_c) |
| 32 |
ffmpeg_CFLAGS += $(vaapi_CFLAGS) |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.1 media-video/hwdecode-demos/files/vaapi.patch |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/vaapi.patch?rev=1.1&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/vaapi.patch?rev=1.1&content-type=text/plain |
| 40 |
|
| 41 |
Index: vaapi.patch |
| 42 |
=================================================================== |
| 43 |
From 5afe6345d8ca1c673cbddcf8c7bc3af7709d5454 Mon Sep 17 00:00:00 2001 |
| 44 |
From: Gwenole Beauchesne <gwenole.beauchesne@×××××.com> |
| 45 |
Date: Tue, 10 Jul 2012 14:43:37 +0200 |
| 46 |
Subject: [PATCH] vaapi: fix build with recent VA-API versions. |
| 47 |
|
| 48 |
--- |
| 49 |
src/vaapi.c | 2 ++ |
| 50 |
src/vaapi_compat.h | 5 +++++ |
| 51 |
2 files changed, 7 insertions(+), 0 deletions(-) |
| 52 |
|
| 53 |
Index: hwdecode-demos-0.9.5/src/vaapi.c |
| 54 |
=================================================================== |
| 55 |
--- hwdecode-demos-0.9.5.orig/src/vaapi.c |
| 56 |
+++ hwdecode-demos-0.9.5/src/vaapi.c |
| 57 |
@@ -92,7 +92,9 @@ static const char *string_of_VADisplayAt |
| 58 |
TYPE(Hue); |
| 59 |
TYPE(Saturation); |
| 60 |
TYPE(BackgroundColor); |
| 61 |
+#if !VA_CHECK_VERSION(0,34,0) |
| 62 |
TYPE(DirectSurface); |
| 63 |
+#endif |
| 64 |
#undef TYPE |
| 65 |
default: break; |
| 66 |
} |
| 67 |
Index: hwdecode-demos-0.9.5/src/vaapi_compat.h |
| 68 |
=================================================================== |
| 69 |
--- hwdecode-demos-0.9.5.orig/src/vaapi_compat.h |
| 70 |
+++ hwdecode-demos-0.9.5/src/vaapi_compat.h |
| 71 |
@@ -91,4 +91,9 @@ typedef struct _VASliceParameterBufferBa |
| 72 |
(VA_MINOR_VERSION == 31 && \ |
| 73 |
VA_MICRO_VERSION == 0 && VA_SDS_VERSION < 5))) |
| 74 |
|
| 75 |
+#if VA_CHECK_VERSION(0,34,0) |
| 76 |
+/* New vaCreateSurfaces() API with surface attributes */ |
| 77 |
+# include <va/va_compat.h> |
| 78 |
+#endif |
| 79 |
+ |
| 80 |
#endif /* VAAPI_COMPAT_H */ |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.1 media-video/hwdecode-demos/files/dl.patch |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/dl.patch?rev=1.1&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/hwdecode-demos/files/dl.patch?rev=1.1&content-type=text/plain |
| 88 |
|
| 89 |
Index: dl.patch |
| 90 |
=================================================================== |
| 91 |
From c00dd0bd93d961bc2dfaea3406c59b672741fd26 Mon Sep 17 00:00:00 2001 |
| 92 |
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= <vjaquez@××××××.com> |
| 93 |
Date: Fri, 1 Feb 2013 15:14:57 +0100 |
| 94 |
Subject: [PATCH] Fix missing linking depenendency on -ldl |
| 95 |
|
| 96 |
Recent versions of GCC ship with a linker that doesn't add the deps of the |
| 97 |
DSOs of the linking process. This behavior is also found in GNU gold. This |
| 98 |
change fixes building with those linkers. |
| 99 |
|
| 100 |
Some references |
| 101 |
|
| 102 |
http://wiki.debian.org/ToolChain/DSOLinking |
| 103 |
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange |
| 104 |
--- |
| 105 |
configure.ac | 3 +++ |
| 106 |
1 files changed, 3 insertions(+), 0 deletions(-) |
| 107 |
|
| 108 |
Index: hwdecode-demos-0.9.5/configure.ac |
| 109 |
=================================================================== |
| 110 |
--- hwdecode-demos-0.9.5.orig/configure.ac |
| 111 |
+++ hwdecode-demos-0.9.5/configure.ac |
| 112 |
@@ -69,6 +69,9 @@ fi |
| 113 |
dnl Checks for libraries. |
| 114 |
AC_CHECK_LIB(rt, timer_create) |
| 115 |
|
| 116 |
+dnl Checks if dl() comes from the C library or -ldl |
| 117 |
+AC_SEARCH_LIBS([dlopen], [dl]) |
| 118 |
+ |
| 119 |
dnl Checks for library functions. |
| 120 |
AC_CHECK_FUNCS(clock_gettime) |
Archives