summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2020-11-03 11:09:26 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-11-12 08:12:02 +0100
commit04617e440e0d5cf281b517de6918eac18bfc3013 (patch)
treecc0d4ca3c8fd7c4d2f95fd3e4f093380335405b9
parent94917886912fea75a40feebe0cb81e13ec49fe60 (diff)
downloadptxdist-04617e440e0d5cf281b517de6918eac18bfc3013.tar.gz
ptxdist-04617e440e0d5cf281b517de6918eac18bfc3013.tar.xz
kmscube: version bump 2017-03-13-g803bac5 -> 2020-10-28-ge6386d1b
- version bump - add license file - switch to meson build - disable gstreamer dependency (keep it simple) Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Message-Id: <20201103100926.6960-1-l.stach@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch25
l---------patches/kmscube-2017-03-13-g803bac5/autogen.sh1
-rw-r--r--patches/kmscube-2017-03-13-g803bac5/series4
-rw-r--r--rules/kmscube.in2
-rw-r--r--rules/kmscube.make14
5 files changed, 11 insertions, 35 deletions
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 bbf45a8f5..000000000
--- 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 9f8a4cb7d..000000000
--- 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 df1285347..000000000
--- 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 810f14691..1f8884576 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 5275a627c..8c3fb0874 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-10-28-ge6386d1b
KMSCUBE := kmscube-$(KMSCUBE_VERSION)
-KMSCUBE_MD5 := 781a59ab2d1d245e99a49df7c3dc1876
+KMSCUBE_MD5 := cd5fbb6e53545f29e22e20aea3309570
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