On Thu, Mar 09, 2017 at 12:45:47PM +0100, Markus Niebel wrote:
> From: Markus Niebel <markus.nie...@tq-group.com>
> 
> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com>
> ---
>  .../0001-force-autogen-to-look-for-stdc.patch      | 29 +++++++
>  .../0002-fix-headers.patch                         | 39 +++++++++
>  .../autogen.sh                                     | 18 +++++
>  .../series                                         |  2 +
>  rules/kmscube.in                                   |  9 +++
>  rules/kmscube.make                                 | 92 
> ++++++++++++++++++++++
>  6 files changed, 189 insertions(+)
>  create mode 100644 
> patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch
>  create mode 100644 
> patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch
>  create mode 100755 
> patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh
>  create mode 100644 
> patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series
>  create mode 100644 rules/kmscube.in
>  create mode 100644 rules/kmscube.make
> 
> diff --git 
> a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch
>  
> b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch
> new file mode 100644
> index 0000000..3aa1cb8
> --- /dev/null
> +++ 
> b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch
> @@ -0,0 +1,29 @@
> +From 3690585109ca98669a9faeadd0c5ecbe1e24dbe0 Mon Sep 17 00:00:00 2001
> +From: Markus Niebel <markus.nie...@tq-group.com>
> +Date: Thu, 2 Mar 2017 17:17:20 +0100
> +Subject: [PATCH 1/2] force autogen to look for stdc
> +
> +needed since sources using constructs needing stdc99
> +
> +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com>
> +---
> + configure.ac | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 4441d2d..2b456d4 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -36,6 +36,9 @@ AM_MAINTAINER_MODE
> + # 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
> + 
> +-- 
> +1.9.1
> +
> diff --git 
> a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch
>  
> b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch
> new file mode 100644
> index 0000000..cee67d9
> --- /dev/null
> +++ 
> b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch
> @@ -0,0 +1,39 @@
> +From 20877b1bc6c7bee69e2a13e7f8c69bc02f2e7405 Mon Sep 17 00:00:00 2001
> +From: Markus Niebel <markus.nie...@tq-group.com>
> +Date: Thu, 2 Mar 2017 17:18:53 +0100
> +Subject: [PATCH 2/2] fix headers
> +
> +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com>
> +---
> + drm-atomic.c | 1 +
> + drm-legacy.c | 2 ++
> + 2 files changed, 3 insertions(+)
> +
> +diff --git a/drm-atomic.c b/drm-atomic.c
> +index b4755e1..1c71840 100644
> +--- a/drm-atomic.c
> ++++ b/drm-atomic.c
> +@@ -25,6 +25,7 @@
> + #include <errno.h>
> + #include <stdio.h>
> + #include <string.h>
> ++#include <stdlib.h>
> + #include <unistd.h>
> + 
> + #include "common.h"
> +diff --git a/drm-legacy.c b/drm-legacy.c
> +index 29d5f3c..1029904 100644
> +--- a/drm-legacy.c
> ++++ b/drm-legacy.c
> +@@ -24,6 +24,8 @@
> + #include <errno.h>
> + #include <stdio.h>
> + #include <string.h>
> ++#include <unistd.h>
> ++#include <sys/select.h>
> + 
> + #include "common.h"
> + #include "drm.h"
> +-- 
> +1.9.1
> +
> diff --git 
> a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh 
> b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh
> new file mode 100755
> index 0000000..df78c38
> --- /dev/null
> +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh
> @@ -0,0 +1,18 @@
> +#!/bin/bash
> +
> +set -e
> +
> +aclocal $ACLOCAL_FLAGS
> +
> +libtoolize \
> +     --force \
> +     --copy
> +
> +autoreconf \
> +     --force \
> +     --install \
> +     --warnings=cross \
> +     --warnings=syntax \
> +     --warnings=obsolete \
> +     --warnings=unsupported
> +

This should be a symlink to ../autogen.sh instead.

> diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series 
> b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series
> new file mode 100644
> index 0000000..b2ac20a
> --- /dev/null
> +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series
> @@ -0,0 +1,2 @@
> +0001-force-autogen-to-look-for-stdc.patch
> +0002-fix-headers.patch
> diff --git a/rules/kmscube.in b/rules/kmscube.in
> new file mode 100644
> index 0000000..6f9034e
> --- /dev/null
> +++ b/rules/kmscube.in
> @@ -0,0 +1,9 @@
> +## SECTION=multimedia_libs
> +
> +config KMSCUBE
> +     bool
> +     prompt "kmscube"
> +     depends on MESALIB
> +     depends on LIBDRM
> +     help
> +       FIXME
> diff --git a/rules/kmscube.make b/rules/kmscube.make
> new file mode 100644
> index 0000000..91446cc
> --- /dev/null
> +++ b/rules/kmscube.make
> @@ -0,0 +1,92 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tq-group.com>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_KMSCUBE) += kmscube
> +
> +#
> +# Paths and names
> +#
> +KMSCUBE_VERSION      := 87e3ff5683ee54228b3e6e75f7d4de83901fadb0

I prefer a fake 'git describe' version: <date>-g<short-hash>


> +KMSCUBE              := kmscube-$(KMSCUBE_VERSION)
> +KMSCUBE_MD5  := 1a0b817a51705259ec1c19026dd25d49
> +KMSCUBE_URL  := 
> git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION)
> +KMSCUBE_SUFFIX       := tar.gz
> +KMSCUBE_SOURCE       := $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
> +KMSCUBE_DIR          := $(BUILDDIR)/$(KMSCUBE)
> +
> +KMSCUBE_LICENSE      := BSD
> +
> +# 
> ----------------------------------------------------------------------------
> +# Prepare
> +# 
> ----------------------------------------------------------------------------
> +
> +KMSCUBE_CONF_ENV     := \
> +     $(CROSS_ENV) \
> +     CPPFLAGS=-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS) \
> +
> +
> +
> +     CFLAGS=-std=c11 $(CROSS_CFLAGS)

This seems stramge in combination with the patch above. Which is correct?
c99 or c11? Also, use KMSCUBE_CFLAGS / KMSCUBE_CPPFLAGS instead of the
environment. And CROSS_CPPFLAGS / CROSS_CFLAGS should not be needed.

> +
> +#
> +# autoconf
> +#
> +KMSCUBE_CONF_TOOL    := autoconf
> +KMSCUBE_CONF_OPT     := $(CROSS_AUTOCONF_USR)

remove this line.

> +
> +$(STATEDIR)/kmscube.prepare:
> +     @$(call targetinfo)
> +     $(call world/prepare, KMSCUBE)
> +     @$(call touch)

remove

> +
> +# 
> ----------------------------------------------------------------------------
> +# Compile
> +# 
> ----------------------------------------------------------------------------
> +

remove

> +# 
> ----------------------------------------------------------------------------
> +# Install
> +# 
> ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/kmscube.install:
> +#    @$(call targetinfo)
> +#    @$(call world/install, KMSCUBE)
> +#    @$(call touch)
> +

remove

> +# 
> ----------------------------------------------------------------------------
> +# Target-Install
> +# 
> ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/kmscube.targetinstall:
> +     @$(call targetinfo)
> +
> +     @$(call install_init, kmscube)
> +     @$(call install_fixup, kmscube, PRIORITY, optional)
> +     @$(call install_fixup, kmscube, SECTION, base)
> +     @$(call install_fixup, kmscube, AUTHOR, "Markus Niebel 
> <markus.nie...@tq-group.com>")
> +     @$(call install_fixup, kmscube, DESCRIPTION, missing)
> +
> +     $(call install_copy, kmscube, 0, 0, 0755, -, /usr/bin/kmscube)
> +
> +     @$(call install_finish, kmscube)
> +
> +     @$(call touch)
> +
> +# 
> ----------------------------------------------------------------------------
> +# Clean
> +# 
> ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/kmscube.clean:
> +#    @$(call targetinfo)
> +#    @$(call clean_pkg, KMSCUBE)

remove

> +
> +# vim: syntax=make
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to