* [ptxdist] [PATCH v2 2/4] libexif: Initial, version 0.6.21
2014-11-26 7:22 [ptxdist] [PATCH v2 1/4] json-c: Install missing pkgconfig link Markus Pargmann
@ 2014-11-26 7:22 ` Markus Pargmann
2014-11-26 7:22 ` [ptxdist] [PATCH v2 3/4] host-ninja: Ninja build tool Markus Pargmann
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Markus Pargmann @ 2014-11-26 7:22 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Pargmann
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
rules/libexif.in | 7 +++++++
rules/libexif.make | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 66 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..5c038de4c7b1
--- /dev/null
+++ b/rules/libexif.make
@@ -0,0 +1,59 @@
+# -*-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
+LIBEXIF_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --disable-docs \
+ --disable-internal-docs \
+ --disable-nls \
+ --disable-rpath
+
+# ----------------------------------------------------------------------------
+# 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.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread* [ptxdist] [PATCH v2 4/4] gtk2: Reintegrate gtk2
2014-11-26 7:22 [ptxdist] [PATCH v2 1/4] json-c: Install missing pkgconfig link Markus Pargmann
2014-11-26 7:22 ` [ptxdist] [PATCH v2 2/4] libexif: Initial, version 0.6.21 Markus Pargmann
2014-11-26 7:22 ` [ptxdist] [PATCH v2 3/4] host-ninja: Ninja build tool Markus Pargmann
@ 2014-11-26 7:22 ` Markus Pargmann
2014-11-26 15:26 ` [ptxdist] [PATCH v2 1/4] json-c: Install missing pkgconfig link Michael Olbrich
3 siblings, 0 replies; 5+ messages in thread
From: Markus Pargmann @ 2014-11-26 7:22 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Pargmann
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
.../gtk+-2.24.25/0001-gtk-Do-not-build-demos.patch | 22 ++++++
.../0002-configure-Add-missing-conditionals.patch | 23 +++++++
...003-configure-Remove-introspection-checks.patch | 28 ++++++++
patches/gtk+-2.24.25/autogen.sh | 1 +
patches/gtk+-2.24.25/series | 6 ++
rules/gtk2.in | 62 +++++++++++++++++
rules/gtk2.make | 78 ++++++++++++++++++++++
7 files changed, 220 insertions(+)
create mode 100644 patches/gtk+-2.24.25/0001-gtk-Do-not-build-demos.patch
create mode 100644 patches/gtk+-2.24.25/0002-configure-Add-missing-conditionals.patch
create mode 100644 patches/gtk+-2.24.25/0003-configure-Remove-introspection-checks.patch
create mode 120000 patches/gtk+-2.24.25/autogen.sh
create mode 100644 patches/gtk+-2.24.25/series
create mode 100644 rules/gtk2.in
create mode 100644 rules/gtk2.make
diff --git a/patches/gtk+-2.24.25/0001-gtk-Do-not-build-demos.patch b/patches/gtk+-2.24.25/0001-gtk-Do-not-build-demos.patch
new file mode 100644
index 000000000000..820dc7f9e3f5
--- /dev/null
+++ b/patches/gtk+-2.24.25/0001-gtk-Do-not-build-demos.patch
@@ -0,0 +1,22 @@
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Thu, 13 Nov 2014 15:20:21 +0100
+Subject: [PATCH] gtk: Do not build demos
+
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8e3a2f1283e9..7288db20341f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Makefile.am for GTK+
+ include $(top_srcdir)/Makefile.decl
+
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules tests perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+
+ # require automake 1.4
diff --git a/patches/gtk+-2.24.25/0002-configure-Add-missing-conditionals.patch b/patches/gtk+-2.24.25/0002-configure-Add-missing-conditionals.patch
new file mode 100644
index 000000000000..8f2e84af67ac
--- /dev/null
+++ b/patches/gtk+-2.24.25/0002-configure-Add-missing-conditionals.patch
@@ -0,0 +1,23 @@
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Thu, 13 Nov 2014 15:34:56 +0100
+Subject: [PATCH] configure: Add missing conditionals
+
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 85f0454987f4..5acbcd193e61 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1622,6 +1622,9 @@ fi
+
+ AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+
++AM_CONDITIONAL(HAVE_INTROSPECTION, test x$have_introspection == xyes)
++AM_CONDITIONAL(HAVE_GTK_DOC, test x$have_gtk_doc == xyes)
++
+
+ ##################################################
+ # Output commands
diff --git a/patches/gtk+-2.24.25/0003-configure-Remove-introspection-checks.patch b/patches/gtk+-2.24.25/0003-configure-Remove-introspection-checks.patch
new file mode 100644
index 000000000000..9d0d0f1ca091
--- /dev/null
+++ b/patches/gtk+-2.24.25/0003-configure-Remove-introspection-checks.patch
@@ -0,0 +1,28 @@
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Mon, 17 Nov 2014 10:56:46 +0100
+Subject: [PATCH] configure: Remove introspection checks
+
+This patch is not for mainline. We just don't care about introspection.
+
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+---
+ configure.ac | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5acbcd193e61..3d5640126fa9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1585,12 +1585,6 @@ if test -n "$export_dynamic"; then
+ fi
+
+ ##################################################
+-# GObject introspection
+-##################################################
+-
+-GOBJECT_INTROSPECTION_CHECK([0.9.3])
+-
+-##################################################
+ # Checks for gtk-doc and docbook-tools
+ ##################################################
+
diff --git a/patches/gtk+-2.24.25/autogen.sh b/patches/gtk+-2.24.25/autogen.sh
new file mode 120000
index 000000000000..9f8a4cb7ddcb
--- /dev/null
+++ b/patches/gtk+-2.24.25/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/gtk+-2.24.25/series b/patches/gtk+-2.24.25/series
new file mode 100644
index 000000000000..59ba34201192
--- /dev/null
+++ b/patches/gtk+-2.24.25/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-gtk-Do-not-build-demos.patch
+0002-configure-Add-missing-conditionals.patch
+0003-configure-Remove-introspection-checks.patch
+# 653c1a97f174d7b8ce926df471764544 - git-ptx-patches magic
diff --git a/rules/gtk2.in b/rules/gtk2.in
new file mode 100644
index 000000000000..37a419586904
--- /dev/null
+++ b/rules/gtk2.in
@@ -0,0 +1,62 @@
+## SECTION=multimedia_gtk
+
+menuconfig GTK2
+ tristate
+ prompt "GTK+2"
+ 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.
+
+if GTK2
+
+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
+
+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
+
+endif
+
diff --git a/rules/gtk2.make b/rules/gtk2.make
new file mode 100644
index 000000000000..57cc38e3c9c4
--- /dev/null
+++ b/rules/gtk2.make
@@ -0,0 +1,78 @@
+# -*-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
+# ----------------------------------------------------------------------------
+
+# cups-config otherwhise picks up the host version
+GTK2_CONF_ENV := \
+ $(CROSS_ENV) \
+ ac_cv_path_CUPS_CONFIG=no
+
+#
+# autoconf
+#
+GTK2_CONF_TOOL := autoconf
+GTK2_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --enable-static \
+ --enable-explicit-deps=yes \
+ --disable-glibtest \
+ --disable-modules \
+ --with-gdktarget=$(PTXCONF_GTK2_TARGET)
+
+# ----------------------------------------------------------------------------
+# 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)
+
+ @$(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)
+
+ @$(call install_finish, gtk2)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.1.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH v2 1/4] json-c: Install missing pkgconfig link
2014-11-26 7:22 [ptxdist] [PATCH v2 1/4] json-c: Install missing pkgconfig link Markus Pargmann
` (2 preceding siblings ...)
2014-11-26 7:22 ` [ptxdist] [PATCH v2 4/4] gtk2: Reintegrate gtk2 Markus Pargmann
@ 2014-11-26 15:26 ` Michael Olbrich
3 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2014-11-26 15:26 UTC (permalink / raw)
To: ptxdist
On Wed, Nov 26, 2014 at 08:22:01AM +0100, Markus Pargmann wrote:
> Some target builds depend on a 'json' library instead of json-c.
Thanks, all 4 patches applied.
Michael
>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
> rules/json-c.make | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/rules/json-c.make b/rules/json-c.make
> index a9a81652a1cd..1ad07c6eacef 100644
> --- a/rules/json-c.make
> +++ b/rules/json-c.make
> @@ -42,6 +42,16 @@ 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
> + @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
>
> --
> 2.1.3
>
>
> --
> 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] 5+ messages in thread