Skip to contentSkip to conversation

package/libva: bump version to 2.2.0

PATCH New Bernd Kuhls 2 participants 5 messages Jul 14, 2018 – Jul 28, 2018

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/3 package/libva: bump version to 2.2.0

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

Upstream unconditionally added -fstack-protector to CFLAGS:
https://github.com/intel/libva/commit/b70a92e61c25ebc144f54a0086cf715757330782

This breaks the build when the buildroot config has no support for SSP, fix this be removing -fstack-protector in the non-SSP case. Please note that adding -fnostack-protector to CFLAGS via CONF_ENV is not enough because in some makefiles upstream did not include $(CFLAGS), like in the aforementioned commit.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libva/Config.in  |  2 +-
 package/libva/libva.hash |  6 +++---
 package/libva/libva.mk   | 12 ++++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)
package/libva/Config.in +1 -1
index 08eb16b487..e4e351f98a 100644
@@ -13,7 +13,7 @@ config BR2_PACKAGE_LIBVA
 	  prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263,
 	  MPEG-4 AVC/H.264, and VC-1/VMW3).
 
-	  https://01.org/linuxmedia/vaapi
+	  https://01.org/vaapi
 
 comment "libva needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/libva/libva.hash +3 -3
index ed707095f0..72347a4f2d 100644
@@ -1,5 +1,5 @@
-# From https://github.com/01org/libva/releases
-sha1 9ecde2b6c9deda16e895a0b00b8aef3a765acb4c  libva-2.1.0.tar.bz2
+# From https://github.com/intel/libva/releases
+sha1 5b19d2fbf532f14e24c3bedb4074238a1d7f1686  libva-2.2.0.tar.bz2
 # Locally computed
-sha256 f3fa953a11d3210c3a4ee79031abdbe0863d5ce13d9b3f93f315f1eec60a4b0f  libva-2.1.0.tar.bz2
+sha256 6f6ca04c785544d30d315ef130a6aeb9435b75f934d7fbe0e4e9ba6084ce4ef2  libva-2.2.0.tar.bz2
 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de  COPYING
package/libva/libva.mk +10 -2
index 79956a9d8e..2f4ec91ada 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBVA_VERSION = 2.1.0
+LIBVA_VERSION = 2.2.0
 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
-LIBVA_SITE = https://github.com/01org/libva/releases/download/$(LIBVA_VERSION)
+LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION)
 LIBVA_LICENSE = MIT
 LIBVA_LICENSE_FILES = COPYING
 LIBVA_INSTALL_STAGING = YES

@@ -17,6 +17,14 @@ LIBVA_CONF_OPTS = \
 	--enable-drm \
 	--with-drivers-path="/usr/lib/va"
 
+define LIBVA_DISABLE_STACK_PROTECTOR
+	$(SED) 's%-fstack-protector%%' $(@D)/va/Makefile
+endef
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
+LIBVA_POST_CONFIGURE_HOOKS += LIBVA_DISABLE_STACK_PROTECTOR
+endif
+
 ifeq ($(BR2_PACKAGE_XORG7),y)
 LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes
 LIBVA_CONF_OPTS += --enable-x11
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH 2/3 package/libva-intel-driver: bump version to 2.2.0

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

Upstream unconditionally added -fstack-protector to CFLAGS:
https://github.com/intel/intel-vaapi-driver/commit/d8c73243cf7680be01bba1017d1e760c0049bffa

This breaks the build when the buildroot config has no support for SSP, fix this be removing -fstack-protector in the non-SSP case. Please note that adding -fnostack-protector to CFLAGS via CONF_ENV is not enough because in some makefiles upstream did not include $(CFLAGS), like in the aforementioned commit.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libva-intel-driver/Config.in               |  2 +-
 package/libva-intel-driver/libva-intel-driver.hash |  6 +++---
 package/libva-intel-driver/libva-intel-driver.mk   | 12 ++++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)
package/libva-intel-driver/Config.in +1 -1
index 120f152c96..53c5b366c3 100644
@@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBVA_INTEL_DRIVER
 	help
 	  VA-API back-end driver for Intel graphics chips
 
-	  https://01.org/linuxmedia/vaapi
+	  https://01.org/vaapi
 
 comment "libva intel driver needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/libva-intel-driver/libva-intel-driver.hash +3 -3
index dbe5d67fb4..0509ff8d60 100644
@@ -1,5 +1,5 @@
-# From https://github.com/01org/intel-vaapi-driver/releases
-sha1 a40c6bd89b71b547986bf9f9fa2533bb50cf269e intel-vaapi-driver-2.1.0.tar.bz2
+# From https://github.com/intel/intel-vaapi-driver/releases
+sha1 0934f97ddcaf4e633f59d049226723239b645b33  intel-vaapi-driver-2.2.0.tar.bz2
 # Locally computed
-sha256 ecfaf2ccc4b9af7340e002d2ef807d1e33051d4992f1983f5f4d60e516f86bdf  intel-vaapi-driver-2.1.0.tar.bz2
+sha256 e8a5f54694eb76aad42653b591030b8a53b1513144c09a80defb3d8d8c875c18  intel-vaapi-driver-2.2.0.tar.bz2
 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de  COPYING
package/libva-intel-driver/libva-intel-driver.mk +10 -2
index dd1903024f..cffad28b9a 100644
@@ -4,14 +4,22 @@
 #
 ################################################################################
 
-LIBVA_INTEL_DRIVER_VERSION = 2.1.0
+LIBVA_INTEL_DRIVER_VERSION = 2.2.0
 LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2
 LIBVA_INTEL_DRIVER_SITE = \
-	https://github.com/01org/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION)
+	https://github.com/intel/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION)
 LIBVA_INTEL_DRIVER_LICENSE = MIT
 LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING
 LIBVA_INTEL_DRIVER_DEPENDENCIES = host-pkgconf libdrm libva
 
+define LIBVA_INTEL_DRIVER_DISABLE_STACK_PROTECTOR
+	$(SED) 's%-fstack-protector%%' $(@D)/src/Makefile
+endef
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
+LIBVA_INTEL_DRIVER_POST_CONFIGURE_HOOKS += LIBVA_INTEL_DRIVER_DISABLE_STACK_PROTECTOR
+endif
+
 ifeq ($(BR2_PACKAGE_XORG7),y)
 LIBVA_INTEL_DRIVER_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes
 LIBVA_INTEL_DRIVER_CONF_OPTS += --enable-x11
Signature · 1 line
2.18.0
author
#2 lore raw

PATCH 3/3 package/libva-utils: bump version to 2.2.0

In reply to Bernd Kuhls

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

Upstream unconditionally added -fstack-protector to CFLAGS:
https://github.com/intel/libva-utils/commit/1bea64e12144fce74363538232c1a94ee9c98446

This breaks the build when the buildroot config has no support for SSP, fix this be removing -fstack-protector in the non-SSP case. Please note that adding -fnostack-protector to CFLAGS via CONF_ENV is not enough because in some makefiles upstream includes $(CFLAGS) before adding -fstack-protector, like in vainfo/Makefile.am.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libva-utils/Config.in        |  2 +-
 package/libva-utils/libva-utils.hash |  6 +++---
 package/libva-utils/libva-utils.mk   | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)
package/libva-utils/Config.in +1 -1
index ad299234c3..597419f7de 100644
@@ -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 || \
package/libva-utils/libva-utils.hash +3 -3
index 46674a3675..e86cb6e09c 100644
@@ -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
package/libva-utils/libva-utils.mk +12 -2
index 85ee3083fd..454c8cef5b 100644
@@ -4,11 +4,21 @@
 #
 ################################################################################
 
-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
 LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva
 
+define LIBVA_UTILS_DISABLE_STACK_PROTECTOR
+	$(SED) 's%-fstack-protector%%' $(@D)/putsurface/Makefile
+	$(SED) 's%-fstack-protector%%' $(@D)/vainfo/Makefile
+endef
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
+LIBVA_UTILS_CONF_ENV = LIBVA_CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector"
+LIBVA_UTILS_POST_CONFIGURE_HOOKS += LIBVA_UTILS_DISABLE_STACK_PROTECTOR
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.18.0
#3 lore raw

PATCH 1/3 package/libva: bump version to 2.2.0

In reply to Bernd Kuhls

Hello,

package/libva/libva.mk LIBVA_CONF_OPTS = \ · line 26

Quoted 7 lines · Bernd Kuhls
package/libva/libva.mk +7 -0
+define LIBVA_DISABLE_STACK_PROTECTOR
+	$(SED) 's%-fstack-protector%%' $(@D)/va/Makefile
+endef
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
+LIBVA_POST_CONFIGURE_HOOKS += LIBVA_DISABLE_STACK_PROTECTOR
+endif

Please fix this properly, by adding an autoconf check testing if -fstack-protector is available and/or making sure CFLAGS passed in the environment are properly taken into account.

Here is an example that tests the availability of -fstack-protector in autoconf (taken from the rpm package) :

if test "$GCC" = yes; then
cflags_to_try="-fno-strict-aliasing -fstack-protector -Wempty-body"
AC_MSG_CHECKING([supported compiler flags])
old_cflags=$CFLAGS
echo
for flag in $cflags_to_try; do
CFLAGS="$CFLAGS $flag -Werror"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])],[
echo " $flag"
RPMCFLAGS="$RPMCFLAGS $flag"
],[])
CFLAGS=$old_cflags
done
CFLAGS="$CFLAGS -fPIC -DPIC -D_REENTRANT -Wall -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes $RPMCFLAGS"
fi

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
author
#4 lore raw

PATCH 1/3 package/libva: bump version to 2.2.0

Am Sat, 14 Jul 2018 22:11:02 +0200 schrieb Thomas Petazzoni:

Quoted 3 lines

Please fix this properly, by adding an autoconf check testing if -fstack-protector is available and/or making sure CFLAGS passed in the environment are properly taken into account.

Hi Thomas,

done (hopefully): https://github.com/intel/libva/pull/226
Now I will wait for their review and continue with the remaining va packages afterwards.

Regards, Bernd