NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libva-utils: bump version to 2.2.0

Browse Source 
Upstream moved its github repo to github.com/intel/, updated URLs, for
reference see upstream PR 110. Also updated project URL.

Added patch to fix build without stack-protector support.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2018-07-29 21:25:28 +02:00 committed by Thomas Petazzoni
parent 9c50fdcbb1
commit 1f414d6489
4 changed files with 153 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
package/libva-utils/0001-check-ssp.patch Normal file
View File

@ -0,0 +1,145 @@
From bdcf4d90f618f497311c348f984e005924cb3def Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sun, 29 Jul 2018 20:58:06 +0200
Subject: [PATCH] Check for -fstack-protector
Not all toolchains provide support for -fstack-protector. This patch
provides a configure check to avoid build errors like
/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared
/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp
Patch sent upstream as PR 125.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
configure.ac | 16 ++++++++++++++++
decode/Makefile.am | 5 ++++-
encode/Makefile.am | 5 ++++-
putsurface/Makefile.am | 5 ++++-
vainfo/Makefile.am | 5 ++++-
videoprocess/Makefile.am | 5 ++++-
6 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index be2e00d..cfa508a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,22 @@ if test "$ac_cv_have_gnuc_visibility_attribute" = "yes"; then
[Defined to 1 if GCC visibility attribute is supported])
fi
+# Check for -fstack-protector
+ssp_cc=yes
+if test "X$CC-cc" != "X"; then
+ AC_MSG_CHECKING([whether ${CC-cc} accepts -fstack-protector])
+ ssp_old_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -fstack-protector"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])], [], [ssp_cc=no])
+ AC_MSG_RESULT([$ssp_cc])
+ if test "X$ssp_cc" = "Xno"; then
+ CFLAGS="$ssp_old_cflags"
+ else
+ AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+ fi
+fi
+AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes")
+
# Check for DRM (mandatory)
LIBDRM_VERSION=libdrm_version
PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
diff --git a/decode/Makefile.am b/decode/Makefile.am
index febc50d..8ea9252 100644
--- a/decode/Makefile.am
+++ b/decode/Makefile.am
@@ -24,11 +24,14 @@ bin_PROGRAMS = mpeg2vldemo loadjpeg
AM_CPPFLAGS = \
-Wall \
- -fstack-protector \
$(LIBVA_CFLAGS) \
-I$(top_srcdir)/common \
$(NULL)
+if USE_SSP
+AM_CPPFLAGS += -fstack-protector
+endif
+
TEST_LIBS = \
$(LIBVA_LIBS) \
$(top_builddir)/common/libva-display.la \
diff --git a/encode/Makefile.am b/encode/Makefile.am
index 8298b39..c107007 100644
--- a/encode/Makefile.am
+++ b/encode/Makefile.am
@@ -25,10 +25,13 @@ noinst_PROGRAMS = svctenc
AM_CPPFLAGS = \
-Wall \
- -fstack-protector \
$(LIBVA_CFLAGS) \
$(NULL)
+if USE_SSP
+AM_CPPFLAGS += -fstack-protector
+endif
+
h264encode_SOURCES = h264encode.c
h264encode_CFLAGS = -I$(top_srcdir)/common -g
h264encode_LDADD = \
diff --git a/putsurface/Makefile.am b/putsurface/Makefile.am
index e7b62a1..10ae63e 100644
--- a/putsurface/Makefile.am
+++ b/putsurface/Makefile.am
@@ -26,9 +26,12 @@ TEST_CFLAGS = \
$(LIBVA_CFLAGS) \
-I$(top_srcdir)/common \
-Wall \
- -fstack-protector \
$(NULL)
+if USE_SSP
+TEST_CFLAGS += -fstack-protector
+endif
+
TEST_LIBS = \
$(LIBVA_LIBS) \
$(top_builddir)/common/libva-display.la \
diff --git a/vainfo/Makefile.am b/vainfo/Makefile.am
index aff201f..e59f466 100644
--- a/vainfo/Makefile.am
+++ b/vainfo/Makefile.am
@@ -27,9 +27,12 @@ vainfo_cflags = \
$(LIBVA_CFLAGS) \
-DLIBVA_VERSION_S="\"$(LIBVA_VERSION)\"" \
-Wall \
- -fstack-protector \
$(NULL)
+if USE_SSP
+vainfo_cflags += -fstack-protector
+endif
+
vainfo_libs = \
$(LIBVA_LIBS) \
$(top_builddir)/common/libva-display.la \
diff --git a/videoprocess/Makefile.am b/videoprocess/Makefile.am
index eb79bc3..448da7d 100644
--- a/videoprocess/Makefile.am
+++ b/videoprocess/Makefile.am
@@ -24,11 +24,14 @@ bin_PROGRAMS = vavpp
AM_CPPFLAGS = \
-Wall \
- -fstack-protector \
$(LIBVA_CFLAGS) \
-I$(top_srcdir)/common \
$(NULL)
+if USE_SSP
+AM_CPPFLAGS += -fstack-protector
+endif
+
TEST_LIBS = \
$(LIBVA_LIBS) \
$(top_builddir)/common/libva-display.la \

2
package/libva-utils/Config.in
View File

@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBVA_UTILS
Libva-utils is a collection of tests for VA-API (Video
Acceleration API)
https://01.org/linuxmedia/vaapi
https://01.org/vaapi
comment "libva-utils needs a toolchain w/ C++, threads, dynamic library"
depends on !BR2_INSTALL_LIBSTDCPP || \

6
package/libva-utils/libva-utils.hash
View File

@ -1,5 +1,5 @@
# From https://github.com/01org/libva-utils/releases
sha1 9902eb944c3ace00be4fe95627708f156fc5ace7 libva-utils-2.1.0.tar.bz2
# From https://github.com/intel/libva-utils/releases
sha1 ef15d40d6bec847c74f21ee3431b7e7b06fec3b4 libva-utils-2.2.0.tar.bz2
# Locally computed
sha256 f6a7790c3dcc56537372c90a83036a3136194a8b397e84e97bf9cc9254fa2c51 libva-utils-2.1.0.tar.bz2
sha256 ed7a6ed1fab657df4e83ea11f90310efcf31c27828f32d65351a28ca3c404dc0 libva-utils-2.2.0.tar.bz2
sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING

6
package/libva-utils/libva-utils.mk
View File

@ -4,11 +4,13 @@
#
################################################################################
LIBVA_UTILS_VERSION = 2.1.0
LIBVA_UTILS_VERSION = 2.2.0
LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2
LIBVA_UTILS_SITE = https://github.com/01org/libva-utils/releases/download/$(LIBVA_UTILS_VERSION)
LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION)
LIBVA_UTILS_LICENSE = MIT
LIBVA_UTILS_LICENSE_FILES = COPYING
# 0001-check-ssp.patch
LIBVA_UTILS_AUTORECONF = YES
LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva
$(eval $(autotools-package))