From patchwork Sat Jan 12 13:22:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1023905 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BpdxIPBU"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43cL4t60L8z9s9h for ; Sun, 13 Jan 2019 00:22:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 63C45821EF; Sat, 12 Jan 2019 13:22:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CrUTXlhHFUZY; Sat, 12 Jan 2019 13:22:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 21C3182226; Sat, 12 Jan 2019 13:22:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6EAB71BF2CA for ; Sat, 12 Jan 2019 13:22:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6B5EE821EF for ; Sat, 12 Jan 2019 13:22:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 34ge-P+iwlqK for ; Sat, 12 Jan 2019 13:22:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7FA17821E2 for ; Sat, 12 Jan 2019 13:22:28 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id l14so14315207ioj.5 for ; Sat, 12 Jan 2019 05:22:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+eARjyuWCFC/SABREdac+/vGf21JlH2LrlRX56MQ4s4=; b=BpdxIPBUXR6vzBxu5cA4Z4FKAZLe5kHiIyu8y4D4T7I0gm97gsgD/7ImuYiFU6XDKG WlEA5T11A7L785lhKvwLBNOCSxuyd3Sv7g1SbhL/alOYn3vp7W/iyClenfbgiRwVAxWO WADj7ZtJHo9kBRmxlJnVj5DXQnOXj7sMWEuTBBbwLkyAgJKnoIElSCmqWiqR+MiqhIn5 jeHcUCd3A3KjRpCpEok/msOMZcKXMf3fiuiQUrWdEBfrbHEduPh2B+LJcpvDclAnTBuD qaOpY7sohwqXO+alskuLU4tA1wPBbdt9d0rTyQEQ8Ta2uwb0WJW/jMuj16jiQyeEb2Pp ECXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+eARjyuWCFC/SABREdac+/vGf21JlH2LrlRX56MQ4s4=; b=TGsQF5npwsDGVUst3eoiSG5zd8CM9S4dCpLsJqA31hHWXl2ohi9ZWB5yI/1Krxymk/ F/AtPrZQ/8RC5/agNQpc680PC6s60TApAwIyrGWcXecnBlJc4LTabueF/vPVlEvSTTMa sO3nuu0f/tIWXsBqAM74vtpplwgjg2MaB6q0K1HV/Aea8pubrSXQYnO0o1x+3Pn8NzwC jYoPnXoaU5EDw/HMwCMpSFw+KYYVwJR2m0gYgTJmsHnBAC/ReS5jNvsCTdyYCpcCNpXW 2vrjxBaCvOYeZwKQa/k7TorhgO73yAK4vgegJmTFa/1s5afcUXwX7HyEvtWn6l8OIPdS Y3XA== X-Gm-Message-State: AJcUukdmcZ2x/jlC+D6n3g7VmH6CxRyerX+rswjB4bLuks81Gd2LkR28 zT+KCV1Nj5xl4bbgMl6Fqk0ayEhb X-Google-Smtp-Source: ALg8bN7ucWTLJKu99OHISuQyYaILzG1OG9rnccFqP8GTxX7xnZWCHiOenOcwx0lMoOAGtocgoZ9eqA== X-Received: by 2002:a6b:d919:: with SMTP id r25mr12784658ioc.160.1547299347428; Sat, 12 Jan 2019 05:22:27 -0800 (PST) Received: from dragon.Home (71-218-4-112.hlrn.qwest.net. [71.218.4.112]) by smtp.gmail.com with ESMTPSA id j8sm2585442itb.30.2019.01.12.05.22.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 Jan 2019 05:22:26 -0800 (PST) From: james.hilliard1@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Jan 2019 21:22:16 +0800 Message-Id: <1547299337-2266-2-git-send-email-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547299337-2266-1-git-send-email-james.hilliard1@gmail.com> References: <1547299337-2266-1-git-send-email-james.hilliard1@gmail.com> Subject: [Buildroot] [PATCH 2/3] package/libva-intel-driver: bump to version 2.3.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , James Hilliard MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: James Hilliard Remove patch to fix build without stack-protector support which is upstream. Add backported patch to fix libva-intel-driver when using wayland. Signed-off-by: James Hilliard --- ...0001-Check-the-interface-from-libva-first.patch | 71 ++++++++++++++++++++++ package/libva-intel-driver/0001-check-ssp.patch | 65 -------------------- package/libva-intel-driver/libva-intel-driver.hash | 4 +- package/libva-intel-driver/libva-intel-driver.mk | 4 +- 4 files changed, 74 insertions(+), 70 deletions(-) create mode 100644 package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch delete mode 100644 package/libva-intel-driver/0001-check-ssp.patch diff --git a/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch b/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch new file mode 100644 index 0000000..81591fb --- /dev/null +++ b/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch @@ -0,0 +1,71 @@ +From 3db0c4838fe30fcee5beb8b31ca67d5cf7d77fb3 Mon Sep 17 00:00:00 2001 +From: Haihao Xiang +Date: Fri, 7 Dec 2018 13:31:43 +0800 +Subject: [PATCH 1/1] Check the interface from libva first + +This fixes https://github.com/intel/intel-vaapi-driver/issues/419 + +Signed-off-by: Haihao Xiang +[james.hilliard1@gmail.com: backport from upstream commit +f139dafa59172d40543f2ec469a035d3de9fdc6a] +Signed-off-by: James Hilliard +--- + src/i965_output_wayland.c | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c +index 122db95..a637552 100644 +--- a/src/i965_output_wayland.c ++++ b/src/i965_output_wayland.c +@@ -397,6 +397,7 @@ i965_output_wayland_init(VADriverContextP ctx) + struct i965_driver_data * const i965 = i965_driver_data(ctx); + struct dso_handle *dso_handle; + struct wl_vtable *wl_vtable; ++ struct VADriverVTableWayland * const vtable = ctx->vtable_wayland; + + static const struct dso_symbol libegl_symbols[] = { + { +@@ -465,25 +466,29 @@ i965_output_wayland_init(VADriverContextP ctx) + if (!i965->wl_output) + goto error; + +- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); +- if (!i965->wl_output->libegl_handle) { +- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); +- if (!i965->wl_output->libegl_handle) ++ wl_vtable = &i965->wl_output->vtable; ++ ++ if (vtable->wl_interface) ++ wl_vtable->drm_interface = vtable->wl_interface; ++ else { ++ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); ++ if (!i965->wl_output->libegl_handle) { ++ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); ++ if (!i965->wl_output->libegl_handle) ++ goto error; ++ } ++ ++ dso_handle = i965->wl_output->libegl_handle; ++ if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), ++ libegl_symbols)) + goto error; + } + +- dso_handle = i965->wl_output->libegl_handle; +- wl_vtable = &i965->wl_output->vtable; +- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), +- libegl_symbols)) +- goto error; +- + i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME); + if (!i965->wl_output->libwl_client_handle) + goto error; + + dso_handle = i965->wl_output->libwl_client_handle; +- wl_vtable = &i965->wl_output->vtable; + if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), + libwl_client_symbols)) + goto error; +-- +2.7.4 + diff --git a/package/libva-intel-driver/0001-check-ssp.patch b/package/libva-intel-driver/0001-check-ssp.patch deleted file mode 100644 index c801ed3..0000000 --- a/package/libva-intel-driver/0001-check-ssp.patch +++ /dev/null @@ -1,65 +0,0 @@ -From bf08643583520b763150af9ed20166b7fe272fd5 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 29 Jul 2018 20:55:23 +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 408. - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 17 +++++++++++++++++ - src/Makefile.am | 5 ++++- - 2 files changed, 21 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c76060c7..5471aee7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -86,6 +86,23 @@ AC_SEARCH_LIBS([dlopen], [dl], [], [ - AC_MSG_ERROR([unable to find the dlopen() function]) - ]) - -+ -+# 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") -+ - dnl Check for recent enough DRM - LIBDRM_VERSION=libdrm_version - PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION libdrm_intel]) -diff --git a/src/Makefile.am b/src/Makefile.am -index c26293dd..5c52658a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -35,9 +35,12 @@ AM_CPPFLAGS = \ - driver_cflags = \ - -Wall \ - -fvisibility=hidden \ -- -fstack-protector \ - $(NULL) - -+if USE_SSP -+driver_cflags += -fstack-protector -+endif -+ - driver_ldflags = \ - -avoid-version \ - -no-undefined \ diff --git a/package/libva-intel-driver/libva-intel-driver.hash b/package/libva-intel-driver/libva-intel-driver.hash index 0509ff8..8c01271 100644 --- a/package/libva-intel-driver/libva-intel-driver.hash +++ b/package/libva-intel-driver/libva-intel-driver.hash @@ -1,5 +1,5 @@ # From https://github.com/intel/intel-vaapi-driver/releases -sha1 0934f97ddcaf4e633f59d049226723239b645b33 intel-vaapi-driver-2.2.0.tar.bz2 +sha1 89096f99da753ac5858304e6c17f5dd9e7581d5b intel-vaapi-driver-2.3.0.tar.bz2 # Locally computed -sha256 e8a5f54694eb76aad42653b591030b8a53b1513144c09a80defb3d8d8c875c18 intel-vaapi-driver-2.2.0.tar.bz2 +sha256 5c2e5deab024a0a6ae81dfe77ef455542a88d824eda7bfd07684337407ecdfe3 intel-vaapi-driver-2.3.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk index 48564ca..76cdfee 100644 --- a/package/libva-intel-driver/libva-intel-driver.mk +++ b/package/libva-intel-driver/libva-intel-driver.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBVA_INTEL_DRIVER_VERSION = 2.2.0 +LIBVA_INTEL_DRIVER_VERSION = 2.3.0 LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 LIBVA_INTEL_DRIVER_SITE = \ https://github.com/intel/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION) LIBVA_INTEL_DRIVER_LICENSE = MIT LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING -# 0001-check-ssp.patch -LIBVA_INTEL_DRIVER_AUTORECONF = YES LIBVA_INTEL_DRIVER_DEPENDENCIES = host-pkgconf libdrm libva ifeq ($(BR2_PACKAGE_XORG7),y)