From patchwork Wed Oct 21 08:20:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1385429 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=n17I3+wS; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGNn62D8Yz9sRk for ; Wed, 21 Oct 2020 19:23:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D2CF286804; Wed, 21 Oct 2020 08:23:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eyLmimvhbuFb; Wed, 21 Oct 2020 08:23:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 479A986A6D; Wed, 21 Oct 2020 08:20:33 +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 E54961BF5A8 for ; Wed, 21 Oct 2020 08:20:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DED1387098 for ; Wed, 21 Oct 2020 08:20: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 cCoJKa-mlSq8 for ; Wed, 21 Oct 2020 08:20:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by hemlock.osuosl.org (Postfix) with ESMTPS id E8DA587248 for ; Wed, 21 Oct 2020 08:20:29 +0000 (UTC) Received: by mail-lf1-f43.google.com with SMTP id j30so2011742lfp.4 for ; Wed, 21 Oct 2020 01:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KG7zd3yc+uoyMp3mIe1qMdhpItG2NjbvGe9ymBxKreg=; b=n17I3+wSTPEW270jtOPv48E0L7Skn2RIxjf1S4PIQHvAEkZ1cY2REGY4UUoha8fgbe wX3O3lsQEHsLTkS1W1bX1w8pSz3A0X+wj9CPu9wHwjpGCymLY+ehEz6GM01boin3gnMr m0GBqSp2uySuJb+XnWn/JKnflu3UL2HzpQBO47xxAmETs+kMDVnkwS+OOY3PFTP0PoAo n+nwmo3VGxlsxmlr69zKIjDPmAXDO8Oh79QmAA/b3nz5kE8juhSUwAMZjFXuC88GDfl/ JHxuUEUsicCU300GGMNjKvvQE5vw5PNE+qSqTyPrkVQUWyvPoyNgDg7zKYoJ9m7SjIjt nQpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=KG7zd3yc+uoyMp3mIe1qMdhpItG2NjbvGe9ymBxKreg=; b=M1UrdyOD9SCRJPNRhN5WlV6qoSVxRTGWnpn2OfCyXxtgMH163O6+7SFHIkd37L7loH JopYADvTHrCBzJy1cKgC51xGQeYREJQoTbGA37OR/ARmgMl2P4gU0SeSNlCCP1W3JewE QSs762u2fcj+S5b5X/8bUqFNpOn2OczHQuNSGpb3Jd9U3gfttEsXiB1tvY2IdEKEPWRo bePhTGGBe5kKigKL+3Ytb6UkagHrGwh/qT4V6EcEe6bUSJq9XFTQfveyaz7hd8ZlTjoV DQGmpzJrQgPy4eG60lw69RTcOg/t/27QRaEU/0VRgHakwY3mG5S8qpOD4CYQWU+I4+sI a86Q== X-Gm-Message-State: AOAM5306nCXZLoOzzlxIKLPBljooIMXftQ3EVDPDVs96D+PPPv/MHN8u CCLoTtKGukhm9uzhzVEgQ8dRLUSlih+kIQ== X-Google-Smtp-Source: ABdhPJwg7azbg+twhyxIDbmcLGrQg6DnWsLxuhqz2q/RlnCk234n/ODMN9iJh1VkgT9yCouJ7yT29Q== X-Received: by 2002:a19:ca4a:: with SMTP id h10mr850651lfj.110.1603268427629; Wed, 21 Oct 2020 01:20:27 -0700 (PDT) Received: from deskari.lan (91-152-83-50.elisa-laajakaista.fi. [91.152.83.50]) by smtp.gmail.com with ESMTPSA id p5sm285708lfj.0.2020.10.21.01.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 01:20:27 -0700 (PDT) From: Tomi Valkeinen To: buildroot@buildroot.org Date: Wed, 21 Oct 2020 11:20:12 +0300 Message-Id: <20201021082012.1592809-1-tomi.valkeinen@iki.fi> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/1] package/kmsxx: bump to latest 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: Tomi Valkeinen Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" kms++ is moving to meson build system and there has been plenty of changes since the last version bump, so lets update the buildroot package. We can drop the "0001-fix-compiler-errors-with-gcc-10.patch" as that is no longer needed. The manual install stuff in kmsxx.mk goes away, as the meson build files handle them. kms++ has two git submodules, fmt and pybind11, so we need to change the site method to git:// to enable submodules. The python bindings can now also be enabled with a config option. Signed-off-by: Tomi Valkeinen --- Another try: * With config options for building the utilities and the python bindings * Fixed the site method ...0001-fix-compiler-errors-with-gcc-10.patch | 35 ----------- package/kmsxx/Config.in | 32 +++++++--- package/kmsxx/kmsxx.hash | 4 +- package/kmsxx/kmsxx.mk | 61 +++++-------------- 4 files changed, 39 insertions(+), 93 deletions(-) delete mode 100644 package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch diff --git a/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch b/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch deleted file mode 100644 index 6ec080af97..0000000000 --- a/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch +++ /dev/null @@ -1,35 +0,0 @@ -From aa54634ce7cbbfc844de945e73a9f34cdcb9bb12 Mon Sep 17 00:00:00 2001 -From: Peter Trompeter -Date: Fri, 15 May 2020 15:20:47 +0200 -Subject: [PATCH] fix compiler errors with gcc 10 - -[Retrieved from: -https://github.com/tomba/kmsxx/commit/aa54634ce7cbbfc844de945e73a9f34cdcb9bb12] -Signed-off-by: Fabrice Fontaine ---- - kms++/inc/kms++/pixelformats.h | 1 + - kms++util/src/opts.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/kms++/inc/kms++/pixelformats.h b/kms++/inc/kms++/pixelformats.h -index 784717d..4e73d5d 100644 ---- a/kms++/inc/kms++/pixelformats.h -+++ b/kms++/inc/kms++/pixelformats.h -@@ -2,6 +2,7 @@ - - #include - #include -+#include - - namespace kms - { -diff --git a/kms++util/src/opts.cpp b/kms++util/src/opts.cpp -index afef452..5a14b84 100644 ---- a/kms++util/src/opts.cpp -+++ b/kms++util/src/opts.cpp -@@ -1,4 +1,5 @@ - #include -+#include - - #include - #include diff --git a/package/kmsxx/Config.in b/package/kmsxx/Config.in index 1d174c18b1..0b3013a171 100644 --- a/package/kmsxx/Config.in +++ b/package/kmsxx/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_KMSXX bool "kms++" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm select BR2_PACKAGE_LIBDRM help - libkms++ is a C++11 library for kernel mode setting. + libkms++ is a C++17 library for kernel mode setting with Python + bindings. Also included are simple test tools for KMS. @@ -14,13 +15,26 @@ config BR2_PACKAGE_KMSXX if BR2_PACKAGE_KMSXX -config BR2_PACKAGE_KMSXX_INSTALL_TESTS - bool "Install test programs" +config BR2_PACKAGE_KMSXX_UTILS + bool "Install kms++utils library and utilities" + default y help - This option allows to install the kmsxx test programs. + This option installs the kms++ utilities. + +config BR2_PACKAGE_KMSXX_PYTHON + bool "Install kms++ python bindings" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 + depends on !BR2_PACKAGE_PYTHON # python3 + depends on BR2_USE_WCHAR # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on BR2_USE_MMU # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 + help + This option installs the kms++ python bindings. endif -comment "kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 3.8" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 +comment "kms++ needs a toolchain w/ threads, C++, gcc >= 5, headers >= 4.10" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 diff --git a/package/kmsxx/kmsxx.hash b/package/kmsxx/kmsxx.hash index b8d06ac478..4fd0bc8347 100644 --- a/package/kmsxx/kmsxx.hash +++ b/package/kmsxx/kmsxx.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 28892e50c1d1c83fddff9ec683e3bdbd465f5032d0014ceeab43563b813807e1 kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9.tar.gz -sha256 022b4d51da34a380d74dc24eea8e2c4e1a4c8776a52171f8d9e941cf56daf888 LICENSE +sha256 f3e036384ab559670e97ae79d1a504c752b9b3cea71a1d3528230ef9f5f36fee kmsxx-084ff3c55cce8bcba7099565b334fa4c88fd9df7.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/kmsxx/kmsxx.mk b/package/kmsxx/kmsxx.mk index 829beb1d68..d1feb7f370 100644 --- a/package/kmsxx/kmsxx.mk +++ b/package/kmsxx/kmsxx.mk @@ -4,62 +4,29 @@ # ################################################################################ -KMSXX_VERSION = cb0786049f960f2bd383617151b01318e02e9ff9 -KMSXX_SITE = $(call github,tomba,kmsxx,$(KMSXX_VERSION)) +KMSXX_VERSION = 084ff3c55cce8bcba7099565b334fa4c88fd9df7 +KMSXX_SITE = git://github.com/tomba/kmsxx.git +KMSXX_GIT_SUBMODULES=YES KMSXX_LICENSE = MPL-2.0 KMSXX_LICENSE_FILES = LICENSE KMSXX_INSTALL_STAGING = YES KMSXX_DEPENDENCIES = libdrm host-pkgconf -KMSXX_CONF_OPTS = -DKMSXX_ENABLE_PYTHON=OFF - -KMSXX_CXXFLAGS = $(TARGET_CXXFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) KMSXX_CXXFLAGS += -O0 endif -KMSXX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(KMSXX_CXXFLAGS)" - -ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y) -KMSXX_TESTS = \ - fbtest kmsblank kmscapture \ - kmsprint kmstest kmsview wbcap \ - wbm2m - -define KMSXX_INSTALL_TARGET_TESTS - $(foreach t,$(KMSXX_TESTS),\ - $(INSTALL) -D -m 0755 $(@D)/bin/$(t) \ - $(TARGET_DIR)/usr/bin/$(t) - ) -endef +ifeq ($(BR2_PACKAGE_KMSXX_UTILS),y) +KMSXX_CONF_OPTS += -Dutils=true +else +KMSXX_CONF_OPTS += -Dutils=false endif -KMSXX_LIBS = kms++ kms++util - -define KMSXX_INSTALL_TARGET_CMDS - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(foreach l,$(KMSXX_LIBS),\ - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ - $(TARGET_DIR)/usr/lib/lib$(l).so - ) - ) - $(KMSXX_INSTALL_TARGET_TESTS) -endef - -# kmsxx only builds shared or static libraries, so when -# BR2_SHARED_STATIC_LIBS=y, we don't have any static library to -# install -define KMSXX_INSTALL_STAGING_CMDS - $(foreach l,$(KMSXX_LIBS),\ - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ - $(STAGING_DIR)/usr/lib/lib$(l).so) - $(if $(BR2_STATIC_LIBS), - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).a \ - $(STAGING_DIR)/usr/lib/lib$(l).a) - mkdir -p $(STAGING_DIR)/usr/include/$(l) - cp -dpfr $(@D)/$(l)/inc/$(l)/* $(STAGING_DIR)/usr/include/$(l)/ - ) -endef +ifeq ($(BR2_PACKAGE_KMSXX_PYTHON),y) +KMSXX_CONF_OPTS += -Dpykms=enabled +KMSXX_DEPENDENCIES += python3 +else +KMSXX_CONF_OPTS += -Dpykms=disabled +endif -$(eval $(cmake-package)) +$(eval $(meson-package))