projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c50fdc)
package/libva-utils: bump version to 2.2.0
authorBernd Kuhls <bernd.kuhls@t-online.de>
Sun, 29 Jul 2018 19:25:28 +0000 (21:25 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Thu, 9 Aug 2018 22:01:43 +0000 (00:01 +0200)
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>
package/libva-utils/0001-check-ssp.patch [new file with mode: 0644] patch | blob
package/libva-utils/Config.in patch | blob | history
package/libva-utils/libva-utils.hash patch | blob | history
package/libva-utils/libva-utils.mk patch | blob | history

diff --git a/package/libva-utils/0001-check-ssp.patch b/package/libva-utils/0001-check-ssp.patch
new file mode 100644 (file)
index 0000000..11c1ded
--- /dev/null
+++ b/package/libva-utils/0001-check-ssp.patch
@@ -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 \
diff --git a/package/libva-utils/Config.in b/package/libva-utils/Config.in
index ad299234c3e79d3a24ec10e98e824dd559bfb038..597419f7de204883e7f2531c4e07c60d565adf03 100644 (file)
--- a/package/libva-utils/Config.in
+++ b/package/libva-utils/Config.in
@@ -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 || \
diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash
index 46674a36757958d12256b29fe6cacc69a1ba5153..e86cb6e09c734e1d546917fe74d61f6542096ac2 100644 (file)
--- a/package/libva-utils/libva-utils.hash
+++ b/package/libva-utils/libva-utils.hash
@@ -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
diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk
index 85ee3083fd707303b5adfd2ba35457e696efea30..348d41974593b5a2e8e40f520d29979ea62f13a7 100644 (file)
--- a/package/libva-utils/libva-utils.mk
+++ b/package/libva-utils/libva-utils.mk
@@ -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))