* [ptxdist] [PATCH v3] kmscube: version bump 2017-03-13-g803bac5 -> 2020-10-28-ge6386d1b
@ 2020-11-03 10:09 Lucas Stach
2020-11-20 7:56 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Lucas Stach @ 2020-11-03 10:09 UTC (permalink / raw)
To: ptxdist
- version bump
- add license file
- switch to meson build
- disable gstreamer dependency (keep it simple)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
v3: bump to most recent git version to fix multiplanar render buffers
and remove 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..8c3fb087470e 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
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] kmscube: version bump 2017-03-13-g803bac5 -> 2020-10-28-ge6386d1b
2020-11-03 10:09 [ptxdist] [PATCH v3] kmscube: version bump 2017-03-13-g803bac5 -> 2020-10-28-ge6386d1b Lucas Stach
@ 2020-11-20 7:56 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2020-11-20 7:56 UTC (permalink / raw)
To: ptxdist; +Cc: Lucas Stach
Thanks, applied as 04617e440e0d5cf281b517de6918eac18bfc3013.
Michael
[sent from post-receive hook]
On Fri, 20 Nov 2020 08:56:06 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> - 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>
>
> 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..8c3fb087470e 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-20 7:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-03 10:09 [ptxdist] [PATCH v3] kmscube: version bump 2017-03-13-g803bac5 -> 2020-10-28-ge6386d1b Lucas Stach
2020-11-20 7:56 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox