Re: [ptxdist] [PATCH 7/7] gtk2: Reintegrate gtk2

[Michael Olbrich <m.olbrich@pengutronix.de>]

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