From: Lucas Stach <l.stach@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2] kmscube: version bump 2017-03-13-g803bac5 -> 2020-09-02-g26326be5
Date: Wed, 28 Oct 2020 10:08:06 +0100 [thread overview]
Message-ID: <20201028090806.26958-1-l.stach@pengutronix.de> (raw)
- version bump
- add license file
- switch to meson build
- disable gstreamer dependency (keep it simple)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
v2: get rid of obsolete patches
---
.../0001-force-autogen-to-look-for-stdc.patch | 25 -------------------
.../kmscube-2017-03-13-g803bac5/autogen.sh | 1 -
patches/kmscube-2017-03-13-g803bac5/series | 4 ---
rules/kmscube.in | 2 ++
rules/kmscube.make | 14 +++++++----
5 files changed, 11 insertions(+), 35 deletions(-)
delete mode 100644 patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch
delete mode 120000 patches/kmscube-2017-03-13-g803bac5/autogen.sh
delete mode 100644 patches/kmscube-2017-03-13-g803bac5/series
diff --git a/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch b/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch
deleted file mode 100644
index bbf45a8f5b9b..000000000000
--- a/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Markus Niebel <Markus.Niebel@tq-group.com>
-Date: Thu, 2 Mar 2017 17:17:20 +0100
-Subject: [PATCH] force autogen to look for stdc
-
-needed since sources using constructs needing stdc99
-
-Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 615488a79cde..9760f3763d0d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,6 +35,9 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
- # Enable quiet compiles on automake 1.11.
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-+AC_PROG_CC
-+AC_PROG_CC_STDC
-+
- # Initialize libtool
- AC_PROG_LIBTOOL
-
diff --git a/patches/kmscube-2017-03-13-g803bac5/autogen.sh b/patches/kmscube-2017-03-13-g803bac5/autogen.sh
deleted file mode 120000
index 9f8a4cb7ddcb..000000000000
--- a/patches/kmscube-2017-03-13-g803bac5/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/kmscube-2017-03-13-g803bac5/series b/patches/kmscube-2017-03-13-g803bac5/series
deleted file mode 100644
index df1285347ebd..000000000000
--- a/patches/kmscube-2017-03-13-g803bac5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-force-autogen-to-look-for-stdc.patch
-# b8b497a50680d889831e8240365dca2d - git-ptx-patches magic
diff --git a/rules/kmscube.in b/rules/kmscube.in
index 810f14691384..1f88845767e1 100644
--- a/rules/kmscube.in
+++ b/rules/kmscube.in
@@ -3,8 +3,10 @@
config KMSCUBE
bool
prompt "kmscube"
+ select HOST_MESON
select MESALIB
select MESALIB_GLES2
select LIBDRM
+ select LIBPNG
help
kmscube is an application to test kms/drm drivers.
diff --git a/rules/kmscube.make b/rules/kmscube.make
index 5275a627cf47..ab33e40ed3f4 100644
--- a/rules/kmscube.make
+++ b/rules/kmscube.make
@@ -15,24 +15,28 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube
# Paths and names
#
# No tags: use a fake descriptive commit-ish to include the date
-KMSCUBE_VERSION := 2017-03-13-g803bac5
+KMSCUBE_VERSION := 2020-09-02-g26326be5
KMSCUBE := kmscube-$(KMSCUBE_VERSION)
-KMSCUBE_MD5 := 781a59ab2d1d245e99a49df7c3dc1876
+KMSCUBE_MD5 := 30666e924097388e191afbfbb7cf487b
KMSCUBE_SUFFIX := tar.gz
KMSCUBE_URL := https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
KMSCUBE_SOURCE := $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
KMSCUBE_DIR := $(BUILDDIR)/$(KMSCUBE)
-
KMSCUBE_LICENSE := MIT
+KMSCUBE_LICENSE_FILES := \
+ file://COPYING;md5=2a12bf7a66f5f663d75186bf01eb607b
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
#
-# autoconf
+# meson
#
-KMSCUBE_CONF_TOOL := autoconf
+KMSCUBE_CONF_TOOL := meson
+KMSCUBE_CONF_OPT := \
+ $(CROSS_MESON_USR) \
+ -Dgstreamer=disabled
# ----------------------------------------------------------------------------
# Target-Install
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
reply other threads:[~2020-10-28 9:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201028090806.26958-1-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox