* [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT @ 2014-11-20 8:23 Markus Pargmann 2014-11-20 8:23 ` [ptxdist] [PATCH 2/7] xorg-lib-Xi: Missing dependency LIB_XFIXES Markus Pargmann ` (6 more replies) 0 siblings, 7 replies; 15+ messages in thread From: Markus Pargmann @ 2014-11-20 8:23 UTC (permalink / raw) To: ptxdist; +Cc: Markus Pargmann Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- rules/cairo.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/cairo.in b/rules/cairo.in index 89e9eb3e1f9f..a12ebbc4a2fa 100644 --- a/rules/cairo.in +++ b/rules/cairo.in @@ -3,6 +3,7 @@ menuconfig CAIRO tristate select GCCLIBS_GCC_S + select XORG_LIB_XEXT if CAIRO_XLIB select XORG_LIB_XT if CAIRO_XLIB && !GTK_TARGET_HOST_X11 select XORG_LIB_XRENDER if CAIRO_XLIB && !GTK_TARGET_HOST_X11 select ZLIB if CAIRO_PS || CAIRO_PDF -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 15+ messages in thread
* [ptxdist] [PATCH 2/7] xorg-lib-Xi: Missing dependency LIB_XFIXES 2014-11-20 8:23 [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Markus Pargmann @ 2014-11-20 8:23 ` Markus Pargmann 2014-11-21 14:10 ` Michael Olbrich 2014-11-20 8:23 ` [ptxdist] [PATCH 3/7] json-c: Install missing pkgconfig link Markus Pargmann ` (5 subsequent siblings) 6 siblings, 1 reply; 15+ messages in thread From: Markus Pargmann @ 2014-11-20 8:23 UTC (permalink / raw) To: ptxdist; +Cc: Markus Pargmann Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- rules/xorg-lib-Xi.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/xorg-lib-Xi.in b/rules/xorg-lib-Xi.in index ae48b717a628..12c70ba19cad 100644 --- a/rules/xorg-lib-Xi.in +++ b/rules/xorg-lib-Xi.in @@ -6,6 +6,7 @@ config XORG_LIB_XI select XORG_PROTO_X select XORG_LIB_X11 select XORG_LIB_XEXT + select XORG_LIB_XFIXES select XORG_PROTO_INPUT help libXi provides an X Window System client interface -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH 2/7] xorg-lib-Xi: Missing dependency LIB_XFIXES 2014-11-20 8:23 ` [ptxdist] [PATCH 2/7] xorg-lib-Xi: Missing dependency LIB_XFIXES Markus Pargmann @ 2014-11-21 14:10 ` Michael Olbrich 0 siblings, 0 replies; 15+ messages in thread From: Michael Olbrich @ 2014-11-21 14:10 UTC (permalink / raw) To: ptxdist On Thu, Nov 20, 2014 at 09:23:25AM +0100, Markus Pargmann wrote: > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Thanks, applied. Michael > --- > rules/xorg-lib-Xi.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/rules/xorg-lib-Xi.in b/rules/xorg-lib-Xi.in > index ae48b717a628..12c70ba19cad 100644 > --- a/rules/xorg-lib-Xi.in > +++ b/rules/xorg-lib-Xi.in > @@ -6,6 +6,7 @@ config XORG_LIB_XI > select XORG_PROTO_X > select XORG_LIB_X11 > select XORG_LIB_XEXT > + select XORG_LIB_XFIXES > select XORG_PROTO_INPUT > help > libXi provides an X Window System client interface > -- > 2.1.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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [ptxdist] [PATCH 3/7] json-c: Install missing pkgconfig link 2014-11-20 8:23 [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Markus Pargmann 2014-11-20 8:23 ` [ptxdist] [PATCH 2/7] xorg-lib-Xi: Missing dependency LIB_XFIXES Markus Pargmann @ 2014-11-20 8:23 ` Markus Pargmann 2014-11-20 9:00 ` Alexander Dahl 2014-11-20 8:23 ` [ptxdist] [PATCH 4/7] libltdl: Version bump 1.5 -> 2.4.3 Markus Pargmann ` (4 subsequent siblings) 6 siblings, 1 reply; 15+ messages in thread From: Markus Pargmann @ 2014-11-20 8:23 UTC (permalink / raw) To: ptxdist; +Cc: Markus Pargmann Some target builds depend on a 'json' library instead of json-c. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- rules/json-c.make | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rules/json-c.make b/rules/json-c.make index a9a81652a1cd..a7ea8707f6ea 100644 --- a/rules/json-c.make +++ b/rules/json-c.make @@ -42,6 +42,17 @@ JSON_C_CONF_OPT := \ --disable-static # ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/json-c.install: + @$(call targetinfo) + @$(call world/install, JSON_C) + @ln -sv json-c.pc $(JSON_C_PKGDIR)/usr/lib/pkgconfig/json.pc + @ln -sv json-c.so $(JSON_C_PKGDIR)/usr/lib/json.so + @$(call touch) + +# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH 3/7] json-c: Install missing pkgconfig link 2014-11-20 8:23 ` [ptxdist] [PATCH 3/7] json-c: Install missing pkgconfig link Markus Pargmann @ 2014-11-20 9:00 ` Alexander Dahl 0 siblings, 0 replies; 15+ messages in thread From: Alexander Dahl @ 2014-11-20 9:00 UTC (permalink / raw) To: ptxdist Hei hei, Am 2014-11-20 09:23, schrieb Markus Pargmann: > Some target builds depend on a 'json' library instead of json-c. Between json-c 0.10 and 0.11 the .so was renamed from libjson.so.0.1.0 to libjson-c.so.2.0.0, so those targets probably were not updated to work with the newer libjson-c? Which are those? Maybe an update of them could avoid this workaround? Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 15+ messages in thread
* [ptxdist] [PATCH 4/7] libltdl: Version bump 1.5 -> 2.4.3 2014-11-20 8:23 [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Markus Pargmann 2014-11-20 8:23 ` [ptxdist] [PATCH 2/7] xorg-lib-Xi: Missing dependency LIB_XFIXES Markus Pargmann 2014-11-20 8:23 ` [ptxdist] [PATCH 3/7] json-c: Install missing pkgconfig link Markus Pargmann @ 2014-11-20 8:23 ` Markus Pargmann 2014-11-21 14:11 ` Michael Olbrich 2014-11-20 8:23 ` [ptxdist] [PATCH 5/7] libexif: Initial, version 0.6.21 Markus Pargmann ` (3 subsequent siblings) 6 siblings, 1 reply; 15+ messages in thread From: Markus Pargmann @ 2014-11-20 8:23 UTC (permalink / raw) To: ptxdist; +Cc: Markus Pargmann To get this compiling without a help2man dependency, we have to use a NOOP binary for help2man instead. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- rules/libltdl.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/libltdl.make b/rules/libltdl.make index 46bfadd1ab9b..4570f6db450b 100644 --- a/rules/libltdl.make +++ b/rules/libltdl.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBLTDL) += libltdl # # Paths and names # -LIBLTDL_VERSION := 1.5.26 -LIBLTDL_MD5 := aa9c5107f3ec9ef4200eb6556f3b3c29 +LIBLTDL_VERSION := 2.4.3 +LIBLTDL_MD5 := ec4dabd3bc580dc188197d4d5eb95fe3 LIBLTDL := libtool-$(LIBLTDL_VERSION) LIBLTDL_SUFFIX := tar.gz LIBLTDL_URL := $(call ptx/mirror, GNU, libtool/$(LIBLTDL).$(LIBLTDL_SUFFIX)) @@ -30,7 +30,7 @@ LIBLTDL_LICENSE := LGPLv2+ (libltdl), GPLv2+ (libtool) # ---------------------------------------------------------------------------- LIBLTDL_PATH := PATH=$(CROSS_PATH) -LIBLTDL_ENV := $(CROSS_ENV) +LIBLTDL_ENV := $(CROSS_ENV) HELP2MAN=: # # autoconf -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH 4/7] libltdl: Version bump 1.5 -> 2.4.3 2014-11-20 8:23 ` [ptxdist] [PATCH 4/7] libltdl: Version bump 1.5 -> 2.4.3 Markus Pargmann @ 2014-11-21 14:11 ` Michael Olbrich 0 siblings, 0 replies; 15+ messages in thread From: Michael Olbrich @ 2014-11-21 14:11 UTC (permalink / raw) To: ptxdist On Thu, Nov 20, 2014 at 09:23:27AM +0100, Markus Pargmann wrote: > To get this compiling without a help2man dependency, we have to use a > NOOP binary for help2man instead. > Thanks, applied. Michael > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > --- > rules/libltdl.make | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/rules/libltdl.make b/rules/libltdl.make > index 46bfadd1ab9b..4570f6db450b 100644 > --- a/rules/libltdl.make > +++ b/rules/libltdl.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBLTDL) += libltdl > # > # Paths and names > # > -LIBLTDL_VERSION := 1.5.26 > -LIBLTDL_MD5 := aa9c5107f3ec9ef4200eb6556f3b3c29 > +LIBLTDL_VERSION := 2.4.3 > +LIBLTDL_MD5 := ec4dabd3bc580dc188197d4d5eb95fe3 > LIBLTDL := libtool-$(LIBLTDL_VERSION) > LIBLTDL_SUFFIX := tar.gz > LIBLTDL_URL := $(call ptx/mirror, GNU, libtool/$(LIBLTDL).$(LIBLTDL_SUFFIX)) > @@ -30,7 +30,7 @@ LIBLTDL_LICENSE := LGPLv2+ (libltdl), GPLv2+ (libtool) > # ---------------------------------------------------------------------------- > > LIBLTDL_PATH := PATH=$(CROSS_PATH) > -LIBLTDL_ENV := $(CROSS_ENV) > +LIBLTDL_ENV := $(CROSS_ENV) HELP2MAN=: > > # > # autoconf > -- > 2.1.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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [ptxdist] [PATCH 5/7] libexif: Initial, version 0.6.21 2014-11-20 8:23 [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Markus Pargmann ` (2 preceding siblings ...) 2014-11-20 8:23 ` [ptxdist] [PATCH 4/7] libltdl: Version bump 1.5 -> 2.4.3 Markus Pargmann @ 2014-11-20 8:23 ` Markus Pargmann 2014-11-21 14:08 ` Michael Olbrich 2014-11-20 8:23 ` [ptxdist] [PATCH 6/7] host-ninja: Ninja build tool Markus Pargmann ` (2 subsequent siblings) 6 siblings, 1 reply; 15+ messages in thread From: Markus Pargmann @ 2014-11-20 8:23 UTC (permalink / raw) To: ptxdist; +Cc: Markus Pargmann Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- rules/libexif.in | 7 +++++++ rules/libexif.make | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 rules/libexif.in create mode 100644 rules/libexif.make diff --git a/rules/libexif.in b/rules/libexif.in new file mode 100644 index 000000000000..a9259d8b45d4 --- /dev/null +++ b/rules/libexif.in @@ -0,0 +1,7 @@ +## SECTION=system_libraries + +config LIBEXIF + tristate + prompt "libexif" + help + libexif is a library to support reading and writing EXIF metainformation diff --git a/rules/libexif.make b/rules/libexif.make new file mode 100644 index 000000000000..daf4dad525ca --- /dev/null +++ b/rules/libexif.make @@ -0,0 +1,53 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de> +# +# 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_LIBEXIF) += libexif + +# +# Paths and names +# +LIBEXIF_VERSION := 0.6.21 +LIBEXIF_MD5 := 27339b89850f28c8f1c237f233e05b27 +LIBEXIF := libexif-$(LIBEXIF_VERSION) +LIBEXIF_SUFFIX := tar.bz2 +LIBEXIF_URL := http://sourceforge.net/projects/libexif/files/libexif/$(LIBEXIF_VERSION)/$(LIBEXIF).$(LIBEXIF_SUFFIX) +LIBEXIF_SOURCE := $(SRCDIR)/$(LIBEXIF).$(LIBEXIF_SUFFIX) +LIBEXIF_DIR := $(BUILDDIR)/$(LIBEXIF) +LIBEXIF_LICENSE := unknown + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +LIBEXIF_CONF_TOOL := autoconf + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/libexif.targetinstall: + @$(call targetinfo) + + @$(call install_init, libexif) + @$(call install_fixup, libexif,PRIORITY,optional) + @$(call install_fixup, libexif,SECTION,base) + @$(call install_fixup, libexif,AUTHOR,"Markus Pargmann <mpa@pengutronix.de>") + @$(call install_fixup, libexif,DESCRIPTION,missing) + + @$(call install_lib, libexif, 0, 0, 0644, libexif) + + @$(call install_finish, libexif) + + @$(call touch) + +# vim: syntax=make -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH 5/7] libexif: Initial, version 0.6.21 2014-11-20 8:23 ` [ptxdist] [PATCH 5/7] libexif: Initial, version 0.6.21 Markus Pargmann @ 2014-11-21 14:08 ` Michael Olbrich 0 siblings, 0 replies; 15+ messages in thread From: Michael Olbrich @ 2014-11-21 14:08 UTC (permalink / raw) To: ptxdist On Thu, Nov 20, 2014 at 09:23:28AM +0100, Markus Pargmann wrote: > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > --- > rules/libexif.in | 7 +++++++ > rules/libexif.make | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 60 insertions(+) > create mode 100644 rules/libexif.in > create mode 100644 rules/libexif.make > > diff --git a/rules/libexif.in b/rules/libexif.in > new file mode 100644 > index 000000000000..a9259d8b45d4 > --- /dev/null > +++ b/rules/libexif.in > @@ -0,0 +1,7 @@ > +## SECTION=system_libraries > + > +config LIBEXIF > + tristate > + prompt "libexif" > + help > + libexif is a library to support reading and writing EXIF metainformation > diff --git a/rules/libexif.make b/rules/libexif.make > new file mode 100644 > index 000000000000..daf4dad525ca > --- /dev/null > +++ b/rules/libexif.make > @@ -0,0 +1,53 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de> > +# > +# 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_LIBEXIF) += libexif > + > +# > +# Paths and names > +# > +LIBEXIF_VERSION := 0.6.21 > +LIBEXIF_MD5 := 27339b89850f28c8f1c237f233e05b27 > +LIBEXIF := libexif-$(LIBEXIF_VERSION) > +LIBEXIF_SUFFIX := tar.bz2 > +LIBEXIF_URL := http://sourceforge.net/projects/libexif/files/libexif/$(LIBEXIF_VERSION)/$(LIBEXIF).$(LIBEXIF_SUFFIX) > +LIBEXIF_SOURCE := $(SRCDIR)/$(LIBEXIF).$(LIBEXIF_SUFFIX) > +LIBEXIF_DIR := $(BUILDDIR)/$(LIBEXIF) > +LIBEXIF_LICENSE := unknown > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +LIBEXIF_CONF_TOOL := autoconf --disable-docs --disable-internal-docs --disable-nls --disable-rpath Michael > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/libexif.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, libexif) > + @$(call install_fixup, libexif,PRIORITY,optional) > + @$(call install_fixup, libexif,SECTION,base) > + @$(call install_fixup, libexif,AUTHOR,"Markus Pargmann <mpa@pengutronix.de>") > + @$(call install_fixup, libexif,DESCRIPTION,missing) > + > + @$(call install_lib, libexif, 0, 0, 0644, libexif) > + > + @$(call install_finish, libexif) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.1.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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [ptxdist] [PATCH 6/7] host-ninja: Ninja build tool 2014-11-20 8:23 [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Markus Pargmann ` (3 preceding siblings ...) 2014-11-20 8:23 ` [ptxdist] [PATCH 5/7] libexif: Initial, version 0.6.21 Markus Pargmann @ 2014-11-20 8:23 ` Markus Pargmann 2014-11-21 14:01 ` Michael Olbrich 2014-11-20 8:23 ` [ptxdist] [PATCH 7/7] gtk2: Reintegrate gtk2 Markus Pargmann 2014-11-21 14:10 ` [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Michael Olbrich 6 siblings, 1 reply; 15+ messages in thread From: Markus Pargmann @ 2014-11-20 8:23 UTC (permalink / raw) To: ptxdist; +Cc: Markus Pargmann Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- rules/host-ninja.in | 8 ++++++++ rules/host-ninja.make | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 rules/host-ninja.in create mode 100644 rules/host-ninja.make diff --git a/rules/host-ninja.in b/rules/host-ninja.in new file mode 100644 index 000000000000..563f48ea7072 --- /dev/null +++ b/rules/host-ninja.in @@ -0,0 +1,8 @@ +## SECTION=hosttools_noprompt + +config HOST_NINJA + tristate + prompt "ninja" + select HOST_PYTHON + help + Ninja build tool diff --git a/rules/host-ninja.make b/rules/host-ninja.make new file mode 100644 index 000000000000..32e6a604b881 --- /dev/null +++ b/rules/host-ninja.make @@ -0,0 +1,49 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de> +# +# 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 +# +HOST_PACKAGES-$(PTXCONF_HOST_NINJA) += host-ninja + +# +# Paths and names +# +HOST_NINJA_VERSION := 1.5.1 +HOST_NINJA_MD5 := 59f4f1cf5d9bb0d7877a6d5a5afd770a +HOST_NINJA := ninja-$(HOST_NINJA_VERSION) +HOST_NINJA_SUFFIX := tar.gz +HOST_NINJA_URL := https://github.com/martine/ninja/archive/v$(HOST_NINJA_VERSION).$(HOST_NINJA_SUFFIX) +HOST_NINJA_SOURCE := $(SRCDIR)/$(HOST_NINJA).$(HOST_NINJA_SUFFIX) +HOST_NINJA_DIR := $(HOST_BUILDDIR)/$(HOST_NINJA) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +HOST_NINJA_PATH := PATH=$(HOST_PATH) + +$(STATEDIR)/host-ninja.compile: + @$(call targetinfo) + cd $(HOST_NINJA_DIR) && \ + $(HOST_NINJA_PATH) \ + python bootstrap.py + @$(call touch) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/host-ninja.install: + @$(call targetinfo) + install -D -m755 $(HOST_NINJA_DIR)/ninja $(HOST_NINJA_PKGDIR)/bin/ninja + @$(call touch) + +# vim: syntax=make -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH 6/7] host-ninja: Ninja build tool 2014-11-20 8:23 ` [ptxdist] [PATCH 6/7] host-ninja: Ninja build tool Markus Pargmann @ 2014-11-21 14:01 ` Michael Olbrich 2014-11-21 14:09 ` Michael Olbrich 0 siblings, 1 reply; 15+ messages in thread From: Michael Olbrich @ 2014-11-21 14:01 UTC (permalink / raw) To: ptxdist On Thu, Nov 20, 2014 at 09:23:29AM +0100, Markus Pargmann wrote: > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > --- > rules/host-ninja.in | 8 ++++++++ > rules/host-ninja.make | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 57 insertions(+) > create mode 100644 rules/host-ninja.in > create mode 100644 rules/host-ninja.make > > diff --git a/rules/host-ninja.in b/rules/host-ninja.in > new file mode 100644 > index 000000000000..563f48ea7072 > --- /dev/null > +++ b/rules/host-ninja.in > @@ -0,0 +1,8 @@ > +## SECTION=hosttools_noprompt > + > +config HOST_NINJA > + tristate > + prompt "ninja" noprompt means no prompt :-) > + select HOST_PYTHON select HOST_SYSTEM_PYTHON HOST_PYTHON is only used if you need the exact same version as the target python. Michael > + help > + Ninja build tool > diff --git a/rules/host-ninja.make b/rules/host-ninja.make > new file mode 100644 > index 000000000000..32e6a604b881 > --- /dev/null > +++ b/rules/host-ninja.make > @@ -0,0 +1,49 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de> > +# > +# 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 > +# > +HOST_PACKAGES-$(PTXCONF_HOST_NINJA) += host-ninja > + > +# > +# Paths and names > +# > +HOST_NINJA_VERSION := 1.5.1 > +HOST_NINJA_MD5 := 59f4f1cf5d9bb0d7877a6d5a5afd770a > +HOST_NINJA := ninja-$(HOST_NINJA_VERSION) > +HOST_NINJA_SUFFIX := tar.gz > +HOST_NINJA_URL := https://github.com/martine/ninja/archive/v$(HOST_NINJA_VERSION).$(HOST_NINJA_SUFFIX) > +HOST_NINJA_SOURCE := $(SRCDIR)/$(HOST_NINJA).$(HOST_NINJA_SUFFIX) > +HOST_NINJA_DIR := $(HOST_BUILDDIR)/$(HOST_NINJA) > + > +# ---------------------------------------------------------------------------- > +# Compile > +# ---------------------------------------------------------------------------- > + > +HOST_NINJA_PATH := PATH=$(HOST_PATH) > + > +$(STATEDIR)/host-ninja.compile: > + @$(call targetinfo) > + cd $(HOST_NINJA_DIR) && \ > + $(HOST_NINJA_PATH) \ > + python bootstrap.py > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/host-ninja.install: > + @$(call targetinfo) > + install -D -m755 $(HOST_NINJA_DIR)/ninja $(HOST_NINJA_PKGDIR)/bin/ninja > + @$(call touch) > + > +# vim: syntax=make > -- > 2.1.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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH 6/7] host-ninja: Ninja build tool 2014-11-21 14:01 ` Michael Olbrich @ 2014-11-21 14:09 ` Michael Olbrich 0 siblings, 0 replies; 15+ messages in thread From: Michael Olbrich @ 2014-11-21 14:09 UTC (permalink / raw) To: ptxdist On Fri, Nov 21, 2014 at 03:01:36PM +0100, Michael Olbrich wrote: > On Thu, Nov 20, 2014 at 09:23:29AM +0100, Markus Pargmann wrote: > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > > --- > > rules/host-ninja.in | 8 ++++++++ > > rules/host-ninja.make | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 57 insertions(+) > > create mode 100644 rules/host-ninja.in > > create mode 100644 rules/host-ninja.make > > > > diff --git a/rules/host-ninja.in b/rules/host-ninja.in > > new file mode 100644 > > index 000000000000..563f48ea7072 > > --- /dev/null > > +++ b/rules/host-ninja.in > > @@ -0,0 +1,8 @@ > > +## SECTION=hosttools_noprompt > > + > > +config HOST_NINJA > > + tristate > > + prompt "ninja" > > noprompt means no prompt :-) instead add: default ALLYES Michael > > + select HOST_PYTHON > > select HOST_SYSTEM_PYTHON > > HOST_PYTHON is only used if you need the exact same version as the target > python. > > Michael > > > + help > > + Ninja build tool > > diff --git a/rules/host-ninja.make b/rules/host-ninja.make > > new file mode 100644 > > index 000000000000..32e6a604b881 > > --- /dev/null > > +++ b/rules/host-ninja.make > > @@ -0,0 +1,49 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de> > > +# > > +# 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 > > +# > > +HOST_PACKAGES-$(PTXCONF_HOST_NINJA) += host-ninja > > + > > +# > > +# Paths and names > > +# > > +HOST_NINJA_VERSION := 1.5.1 > > +HOST_NINJA_MD5 := 59f4f1cf5d9bb0d7877a6d5a5afd770a > > +HOST_NINJA := ninja-$(HOST_NINJA_VERSION) > > +HOST_NINJA_SUFFIX := tar.gz > > +HOST_NINJA_URL := https://github.com/martine/ninja/archive/v$(HOST_NINJA_VERSION).$(HOST_NINJA_SUFFIX) > > +HOST_NINJA_SOURCE := $(SRCDIR)/$(HOST_NINJA).$(HOST_NINJA_SUFFIX) > > +HOST_NINJA_DIR := $(HOST_BUILDDIR)/$(HOST_NINJA) > > + > > +# ---------------------------------------------------------------------------- > > +# Compile > > +# ---------------------------------------------------------------------------- > > + > > +HOST_NINJA_PATH := PATH=$(HOST_PATH) > > + > > +$(STATEDIR)/host-ninja.compile: > > + @$(call targetinfo) > > + cd $(HOST_NINJA_DIR) && \ > > + $(HOST_NINJA_PATH) \ > > + python bootstrap.py > > + @$(call touch) > > + > > +# ---------------------------------------------------------------------------- > > +# Install > > +# ---------------------------------------------------------------------------- > > + > > +$(STATEDIR)/host-ninja.install: > > + @$(call targetinfo) > > + install -D -m755 $(HOST_NINJA_DIR)/ninja $(HOST_NINJA_PKGDIR)/bin/ninja > > + @$(call touch) > > + > > +# vim: syntax=make -- 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [ptxdist] [PATCH 7/7] gtk2: Reintegrate gtk2 2014-11-20 8:23 [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Markus Pargmann ` (4 preceding siblings ...) 2014-11-20 8:23 ` [ptxdist] [PATCH 6/7] host-ninja: Ninja build tool Markus Pargmann @ 2014-11-20 8:23 ` Markus Pargmann 2014-11-21 14:22 ` Michael Olbrich 2014-11-21 14:10 ` [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Michael Olbrich 6 siblings, 1 reply; 15+ messages in thread From: Markus Pargmann @ 2014-11-20 8:23 UTC (permalink / raw) To: ptxdist; +Cc: Markus Pargmann Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- rules/gtk2.in | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ rules/gtk2.make | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+) create mode 100644 rules/gtk2.in create mode 100644 rules/gtk2.make diff --git a/rules/gtk2.in b/rules/gtk2.in new file mode 100644 index 000000000000..0871b9c90456 --- /dev/null +++ b/rules/gtk2.in @@ -0,0 +1,124 @@ +## SECTION=multimedia_gtk + +menuconfig GTK2CORE + tristate + prompt "gtk2+ " + +if GTK2CORE + +config GTK2 + tristate + default GTK2CORE + select GLIB + select ATK + select PANGO + select GDK_PIXBUF + + select CAIRO + select CAIRO_PDF + select CAIRO_SVG + + select LIBPNG if GTK2_LOADER_PNG + select LIBJPEG if GTK2_LOADER_JPEG + + select XORG_LIB_XEXT if GTK2_TARGET_X11 + select XORG_LIB_XINERAMA if GTK2_TARGET_X11_XINERAMA + select XORG_LIB_XRANDR if GTK2_TARGET_X11_XRANDR + + help + The GTK2+ is a multi-platform toolkit for creating graphical + user interfaces. Offering a complete set of widgets, the GTK2+ + is suitable for projects ranging from small one-off tools to complete + application suites. + +menu "graphic loaders " + +config GTK2_LOADER_PNG + bool + prompt "png" + default y + +config GTK2_LOADER_BMP + bool + prompt "bmp" + +config GTK2_LOADER_WBMP + bool + prompt "wbmp" + +config GTK2_LOADER_GIF + bool + prompt "gif" + +config GTK2_LOADER_ICO + bool + prompt "ico" + +config GTK2_LOADER_ANI + bool + prompt "ani" + +config GTK2_LOADER_JPEG + bool + prompt "jpeg" + +config GTK2_LOADER_PNM + bool + prompt "pnm" + +config GTK2_LOADER_RAS + bool + prompt "ras" + +config GTK2_LOADER_XPM + bool + prompt "xpm" + +config GTK2_LOADER_TGA + bool + prompt "tga" + +config GTK2_LOADER_PCX + bool + prompt "pcx" + +endmenu + +choice + prompt "gdk-target " + + config GTK2_TARGET_X11 + bool "X11 " + select CAIRO_XLIB + select CAIRO_PS + + config GTK2_TARGET_DIRECTFB + bool "directfb" + select CAIRO_DIRECTFB + select CAIRO_PS + + config GTK2_TARGET_HOST_X11 + bool "host X11" + select CAIRO_XLIB + select CAIRO_PS + +endchoice + +config GTK2_TARGET_X11_XINERAMA + bool + prompt "Xinerama support" + depends on GTK2_TARGET_X11 + +config GTK2_TARGET_X11_XRANDR + bool + prompt "Xrandr support" + depends on GTK2_TARGET_X11 + + +config GTK2_DEMO + bool + prompt "gtkdemo" + + +endif + diff --git a/rules/gtk2.make b/rules/gtk2.make new file mode 100644 index 000000000000..bfa02863ae83 --- /dev/null +++ b/rules/gtk2.make @@ -0,0 +1,110 @@ +# -*-makefile-*- +# +# Copyright (C) 2006-2008 by Marc Kleine-Budde <mkl@pengutronix.de> +# +# 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_GTK2) += gtk2 + +# +# Paths and names +# +GTK2_VERSION := 2.24.25 +GTK2_MD5 := 612350704dd3aacb95355a4981930c6f +GTK2 := gtk+-$(GTK2_VERSION) +GTK2_SUFFIX := tar.xz +GTK2_URL := ftp://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/$(GTK2).$(GTK2_SUFFIX) +GTK2_SOURCE := $(SRCDIR)/$(GTK2).$(GTK2_SUFFIX) +GTK2_DIR := $(BUILDDIR)/$(GTK2) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +GTK2_PATH := PATH=$(CROSS_PATH) + +# cups-config otherwhise picks up the host version +GTK2_ENV := \ + $(CROSS_ENV) \ + ac_cv_path_CUPS_CONFIG=no + +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_PNG) += png +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_BMP) += bmp +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_WBMP) += wbmp +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_GIF) += gif +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_ICO) += ico +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_ANI) += ani +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_JPEG) += jpeg +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_PNM) += pnm +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_RAS) += ras +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_XPM) += xpm +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_TGA) += tga +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_PCX) += pcx + +# +# autoconf +# +GTK2_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --enable-static \ + --enable-explicit-deps=yes \ + --disable-glibtest \ + --disable-modules + #--with-included-immodules=$(subst $(space),$(comma),$(GTK2_LOADER-y)) + +ifdef PTXCONF_GTK2_TARGET_X11 +GTK2_AUTOCONF += --with-gdktarget=x11 +endif + +ifdef PTXCONF_GTK2_TARGET_DIRECTFB +GTK2_AUTOCONF += --with-gdktarget=directfb +endif + +GTK2_VERSION_TUPLE := $(subst ., ,$(GTK2_VERSION)) +GTK2_LIBVERSION := 0.$(word 2,$(GTK2_VERSION_TUPLE))00.$(word 3,$(GTK2_VERSION_TUPLE)) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/gtk2.install: + @$(call targetinfo) + @$(call install, GTK2) + @install -m 755 -D $(GTK2_DIR)/tests/testgtk $(GTK2_PKGDIR)/usr/bin/ + @$(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/gtk2.targetinstall: + @$(call targetinfo) + + @$(call install_init, gtk2) + @$(call install_fixup, gtk2,PRIORITY,optional) + @$(call install_fixup, gtk2,SECTION,base) + @$(call install_fixup, gtk2,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") + @$(call install_fixup, gtk2,DESCRIPTION,missing) + +ifdef PTXCONF_GTK2_TARGET_DIRECTFB + @$(call install_lib, gtk2, 0, 0, 0644, libgdk-directfb-2.0) + @$(call install_lib, gtk2, 0, 0, 0644, libgtk-directfb-2.0) +endif + +ifdef PTXCONF_GTK2_TARGET_X11 + @$(call install_lib, gtk2, 0, 0, 0644, libgdk-x11-2.0) + @$(call install_lib, gtk2, 0, 0, 0644, libgtk-x11-2.0) +endif + + @$(call install_finish, gtk2) + + @$(call touch) + +# vim: syntax=make -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH 7/7] gtk2: Reintegrate gtk2 2014-11-20 8:23 ` [ptxdist] [PATCH 7/7] gtk2: Reintegrate gtk2 Markus Pargmann @ 2014-11-21 14:22 ` Michael Olbrich 0 siblings, 0 replies; 15+ messages in thread From: Michael Olbrich @ 2014-11-21 14:22 UTC (permalink / raw) To: ptxdist Hi, this needs some cleanup. On Thu, Nov 20, 2014 at 09:23:30AM +0100, Markus Pargmann wrote: > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > --- > rules/gtk2.in | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > rules/gtk2.make | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 234 insertions(+) > create mode 100644 rules/gtk2.in > create mode 100644 rules/gtk2.make > > diff --git a/rules/gtk2.in b/rules/gtk2.in > new file mode 100644 > index 000000000000..0871b9c90456 > --- /dev/null > +++ b/rules/gtk2.in > @@ -0,0 +1,124 @@ > +## SECTION=multimedia_gtk > + > +menuconfig GTK2CORE > + tristate > + prompt "gtk2+ " > + > +if GTK2CORE > + > +config GTK2 Remove GTK2CORE and make GTK2 the menu. This was some dependency workaround that is no longer needed. > + tristate > + default GTK2CORE > + select GLIB > + select ATK > + select PANGO > + select GDK_PIXBUF > + > + select CAIRO > + select CAIRO_PDF > + select CAIRO_SVG > + > + select LIBPNG if GTK2_LOADER_PNG > + select LIBJPEG if GTK2_LOADER_JPEG > + > + select XORG_LIB_XEXT if GTK2_TARGET_X11 > + select XORG_LIB_XINERAMA if GTK2_TARGET_X11_XINERAMA > + select XORG_LIB_XRANDR if GTK2_TARGET_X11_XRANDR > + > + help > + The GTK2+ is a multi-platform toolkit for creating graphical > + user interfaces. Offering a complete set of widgets, the GTK2+ > + is suitable for projects ranging from small one-off tools to complete > + application suites. > + > +menu "graphic loaders " > + > +config GTK2_LOADER_PNG > + bool > + prompt "png" > + default y > + > +config GTK2_LOADER_BMP > + bool > + prompt "bmp" > + > +config GTK2_LOADER_WBMP > + bool > + prompt "wbmp" > + > +config GTK2_LOADER_GIF > + bool > + prompt "gif" > + > +config GTK2_LOADER_ICO > + bool > + prompt "ico" > + > +config GTK2_LOADER_ANI > + bool > + prompt "ani" > + > +config GTK2_LOADER_JPEG > + bool > + prompt "jpeg" > + > +config GTK2_LOADER_PNM > + bool > + prompt "pnm" > + > +config GTK2_LOADER_RAS > + bool > + prompt "ras" > + > +config GTK2_LOADER_XPM > + bool > + prompt "xpm" > + > +config GTK2_LOADER_TGA > + bool > + prompt "tga" > + > +config GTK2_LOADER_PCX > + bool > + prompt "pcx" > + > +endmenu Just enable all loaders without external dependencies. > + > +choice > + prompt "gdk-target " > + > + config GTK2_TARGET_X11 > + bool "X11 " > + select CAIRO_XLIB > + select CAIRO_PS > + > + config GTK2_TARGET_DIRECTFB > + bool "directfb" > + select CAIRO_DIRECTFB > + select CAIRO_PS > + > + config GTK2_TARGET_HOST_X11 > + bool "host X11" > + select CAIRO_XLIB > + select CAIRO_PS I think we can just remove GTK2_TARGET_HOST_X11 unless you think it's needed for something? > + > +endchoice config GTK2_TARGET string default "x11" if GTK2_TARGET_X11 default "directfb" if GTK2_TARGET_DIRECTFB > + > +config GTK2_TARGET_X11_XINERAMA > + bool > + prompt "Xinerama support" > + depends on GTK2_TARGET_X11 > + > +config GTK2_TARGET_X11_XRANDR > + bool > + prompt "Xrandr support" > + depends on GTK2_TARGET_X11 > + > + > +config GTK2_DEMO > + bool > + prompt "gtkdemo" > + > + > +endif > + > diff --git a/rules/gtk2.make b/rules/gtk2.make > new file mode 100644 > index 000000000000..bfa02863ae83 > --- /dev/null > +++ b/rules/gtk2.make > @@ -0,0 +1,110 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2006-2008 by Marc Kleine-Budde <mkl@pengutronix.de> > +# > +# 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_GTK2) += gtk2 > + > +# > +# Paths and names > +# > +GTK2_VERSION := 2.24.25 > +GTK2_MD5 := 612350704dd3aacb95355a4981930c6f > +GTK2 := gtk+-$(GTK2_VERSION) > +GTK2_SUFFIX := tar.xz > +GTK2_URL := ftp://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/$(GTK2).$(GTK2_SUFFIX) > +GTK2_SOURCE := $(SRCDIR)/$(GTK2).$(GTK2_SUFFIX) > +GTK2_DIR := $(BUILDDIR)/$(GTK2) > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +GTK2_PATH := PATH=$(CROSS_PATH) drop this line. > + > +# cups-config otherwhise picks up the host version > +GTK2_ENV := \ GTK2_CONF_ENV > + $(CROSS_ENV) \ > + ac_cv_path_CUPS_CONFIG=no > + > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_PNG) += png > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_BMP) += bmp > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_WBMP) += wbmp > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_GIF) += gif > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_ICO) += ico > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_ANI) += ani > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_JPEG) += jpeg > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_PNM) += pnm > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_RAS) += ras > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_XPM) += xpm > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_TGA) += tga > +GTK2_LOADER-$(PTXCONF_GTK2_LOADER_PCX) += pcx > + > +# > +# autoconf > +# > +GTK2_AUTOCONF := \ GTK2_CONF_TOOL := autoconf GTK2_CONF_OPT := \ ... > + $(CROSS_AUTOCONF_USR) \ > + --enable-static \ > + --enable-explicit-deps=yes \ > + --disable-glibtest \ > + --disable-modules > + #--with-included-immodules=$(subst $(space),$(comma),$(GTK2_LOADER-y)) > + > +ifdef PTXCONF_GTK2_TARGET_X11 > +GTK2_AUTOCONF += --with-gdktarget=x11 > +endif > + > +ifdef PTXCONF_GTK2_TARGET_DIRECTFB > +GTK2_AUTOCONF += --with-gdktarget=directfb > +endif --with-gtktarget=$(PTXCONF_GTK2_TARGET) > + > +GTK2_VERSION_TUPLE := $(subst ., ,$(GTK2_VERSION)) > +GTK2_LIBVERSION := 0.$(word 2,$(GTK2_VERSION_TUPLE))00.$(word 3,$(GTK2_VERSION_TUPLE)) this is no longer used. > + > +# ---------------------------------------------------------------------------- > +# Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/gtk2.install: > + @$(call targetinfo) > + @$(call install, GTK2) > + @install -m 755 -D $(GTK2_DIR)/tests/testgtk $(GTK2_PKGDIR)/usr/bin/ > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/gtk2.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, gtk2) > + @$(call install_fixup, gtk2,PRIORITY,optional) > + @$(call install_fixup, gtk2,SECTION,base) > + @$(call install_fixup, gtk2,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") > + @$(call install_fixup, gtk2,DESCRIPTION,missing) > + > +ifdef PTXCONF_GTK2_TARGET_DIRECTFB > + @$(call install_lib, gtk2, 0, 0, 0644, libgdk-directfb-2.0) > + @$(call install_lib, gtk2, 0, 0, 0644, libgtk-directfb-2.0) > +endif > + > +ifdef PTXCONF_GTK2_TARGET_X11 > + @$(call install_lib, gtk2, 0, 0, 0644, libgdk-x11-2.0) > + @$(call install_lib, gtk2, 0, 0, 0644, libgtk-x11-2.0) > +endif @$(call install_lib, gtk2, 0, 0, 0644, libgdk-$(PTXCONF_GTK2_TARGET)-2.0) @$(call install_lib, gtk2, 0, 0, 0644, libgtk-$(PTXCONF_GTK2_TARGET)-2.0) Michael > + > + @$(call install_finish, gtk2) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.1.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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT 2014-11-20 8:23 [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Markus Pargmann ` (5 preceding siblings ...) 2014-11-20 8:23 ` [ptxdist] [PATCH 7/7] gtk2: Reintegrate gtk2 Markus Pargmann @ 2014-11-21 14:10 ` Michael Olbrich 6 siblings, 0 replies; 15+ messages in thread From: Michael Olbrich @ 2014-11-21 14:10 UTC (permalink / raw) To: ptxdist On Thu, Nov 20, 2014 at 09:23:24AM +0100, Markus Pargmann wrote: > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Thanks, applied. Michael > --- > rules/cairo.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/rules/cairo.in b/rules/cairo.in > index 89e9eb3e1f9f..a12ebbc4a2fa 100644 > --- a/rules/cairo.in > +++ b/rules/cairo.in > @@ -3,6 +3,7 @@ > menuconfig CAIRO > tristate > select GCCLIBS_GCC_S > + select XORG_LIB_XEXT if CAIRO_XLIB > select XORG_LIB_XT if CAIRO_XLIB && !GTK_TARGET_HOST_X11 > select XORG_LIB_XRENDER if CAIRO_XLIB && !GTK_TARGET_HOST_X11 > select ZLIB if CAIRO_PS || CAIRO_PDF > -- > 2.1.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 ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2014-11-21 14:22 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-11-20 8:23 [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Markus Pargmann 2014-11-20 8:23 ` [ptxdist] [PATCH 2/7] xorg-lib-Xi: Missing dependency LIB_XFIXES Markus Pargmann 2014-11-21 14:10 ` Michael Olbrich 2014-11-20 8:23 ` [ptxdist] [PATCH 3/7] json-c: Install missing pkgconfig link Markus Pargmann 2014-11-20 9:00 ` Alexander Dahl 2014-11-20 8:23 ` [ptxdist] [PATCH 4/7] libltdl: Version bump 1.5 -> 2.4.3 Markus Pargmann 2014-11-21 14:11 ` Michael Olbrich 2014-11-20 8:23 ` [ptxdist] [PATCH 5/7] libexif: Initial, version 0.6.21 Markus Pargmann 2014-11-21 14:08 ` Michael Olbrich 2014-11-20 8:23 ` [ptxdist] [PATCH 6/7] host-ninja: Ninja build tool Markus Pargmann 2014-11-21 14:01 ` Michael Olbrich 2014-11-21 14:09 ` Michael Olbrich 2014-11-20 8:23 ` [ptxdist] [PATCH 7/7] gtk2: Reintegrate gtk2 Markus Pargmann 2014-11-21 14:22 ` Michael Olbrich 2014-11-21 14:10 ` [ptxdist] [PATCH 1/7] cairo: Missing dependency XORG_LIB_XEXT Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox