summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xpatches/wxGTK-2.8.10/autogen.sh4
-rw-r--r--patches/wxGTK-2.8.10/fix-cross-compiling.diff61
-rw-r--r--patches/wxGTK-2.8.10/fix-gsocket-name-clash.diff29
-rw-r--r--patches/wxGTK-2.8.10/series2
-rw-r--r--rules/wxwidgets.in44
-rw-r--r--rules/wxwidgets.make205
6 files changed, 345 insertions, 0 deletions
diff --git a/patches/wxGTK-2.8.10/autogen.sh b/patches/wxGTK-2.8.10/autogen.sh
new file mode 100755
index 000000000..69351724f
--- /dev/null
+++ b/patches/wxGTK-2.8.10/autogen.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+autoconf -I build/aclocal/
+
diff --git a/patches/wxGTK-2.8.10/fix-cross-compiling.diff b/patches/wxGTK-2.8.10/fix-cross-compiling.diff
new file mode 100644
index 000000000..e511f0729
--- /dev/null
+++ b/patches/wxGTK-2.8.10/fix-cross-compiling.diff
@@ -0,0 +1,61 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: fix cross compiling
+
+ - make sure to search in the right paths.
+ - don't call check for pkg-config multiple times
+ or configure hangs in an endless loop
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ configure.in | 20 ++++----------------
+ 1 file changed, 4 insertions(+), 16 deletions(-)
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -2738,14 +2740,12 @@ AC_MSG_RESULT($wx_cv_std_libpath)
+ SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
+
+ dnl Cross compiling with gcc?
+-if test "$build" != "$host" -a "$GCC" = yes; then
++if test "$build" != "$host"; then
+ dnl for gcc cross-compilers "$CC -print-prog-name=ld" prints the path to
+ dnl the linker. Stripping off the trailing '/bin/ld' gives us a candiate
+ dnl for a 'root' below which libraries and headers for the target system
+ dnl might be installed.
+- if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+- cross_root=`dirname $cross_root`
+- cross_root=`dirname $cross_root`
++ if cross_root="$SYSROOT/usr"; then
+
+ dnl substitute this candiate root for '^/usr' in the search lists,
+ dnl strip out any that don't start '^/usr'.
+@@ -3647,8 +3641,6 @@ libraries returned by 'pkg-config gtk+-2
+ fi
+
+ if test "$wxUSE_DFB" = 1; then
+- PKG_PROG_PKG_CONFIG()
+-
+ PKG_CHECK_MODULES(DIRECTFB,
+ [directfb >= 0.9.23],
+ [
+@@ -3725,8 +3717,6 @@ libraries returned by 'pkg-config gtk+-2
+ fi
+
+ if test "$wxUSE_UNICODE" = "yes"; then
+- PKG_PROG_PKG_CONFIG()
+-
+ PKG_CHECK_MODULES(PANGOX, pangox,
+ [
+ CFLAGS="$PANGOX_CFLAGS $CFLAGS"
+@@ -6154,8 +6144,6 @@ if test "$wxUSE_SOUND" = "yes"; then
+ fi
+
+ if test "$WXGTK20" = 1; then
+- PKG_PROG_PKG_CONFIG()
+-
+ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
+ if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
+
diff --git a/patches/wxGTK-2.8.10/fix-gsocket-name-clash.diff b/patches/wxGTK-2.8.10/fix-gsocket-name-clash.diff
new file mode 100644
index 000000000..ca645fb19
--- /dev/null
+++ b/patches/wxGTK-2.8.10/fix-gsocket-name-clash.diff
@@ -0,0 +1,29 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: avoid name clashes with GSocket from glib 2.21+
+
+taken from http://trac.wxwidgets.org/changeset/61009
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ src/gtk/gsockgtk.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: b/src/gtk/gsockgtk.cpp
+===================================================================
+--- a/src/gtk/gsockgtk.cpp
++++ b/src/gtk/gsockgtk.cpp
+@@ -15,8 +15,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/patches/wxGTK-2.8.10/series b/patches/wxGTK-2.8.10/series
new file mode 100644
index 000000000..58aeb4ec7
--- /dev/null
+++ b/patches/wxGTK-2.8.10/series
@@ -0,0 +1,2 @@
+fix-cross-compiling.diff
+fix-gsocket-name-clash.diff
diff --git a/rules/wxwidgets.in b/rules/wxwidgets.in
new file mode 100644
index 000000000..1d47a61c4
--- /dev/null
+++ b/rules/wxwidgets.in
@@ -0,0 +1,44 @@
+## SECTION=multimedia_libs
+
+menuconfig WXWIDGETS
+ tristate
+ prompt "wxwidgets "
+ select GTK
+ select GTK_TARGET_X11
+ select LIBPNG if WXWIDGETS_LIBPNG
+ select LIBJPEG if WXWIDGETS_LIBPNG
+ select SDL if WXWIDGETS_LIBPNG
+ select ZLIB if WXWIDGETS_LIBPNG
+ select EXPAT if WXWIDGETS_LIBPNG
+
+ help
+ FIXME
+
+if WXWIDGETS
+
+config WXWIDGETS_LIBPNG
+ bool
+ prompt "use libpng (PNG image format)"
+
+config WXWIDGETS_LIBJPEG
+ bool
+ prompt "use libjpeg (JPEG file format)"
+
+config WXWIDGETS_SDL
+ bool
+ prompt "use SDL for audio on Unix"
+
+config WXWIDGETS_OPENGL
+ bool
+ prompt "use OpenGL (or Mesa)"
+
+config WXWIDGETS_ZLIB
+ bool
+ prompt "use zlib for LZW compression"
+
+config WXWIDGETS_EXPAT
+ bool
+ prompt "enable XML support using expat parser"
+
+endif
+
diff --git a/rules/wxwidgets.make b/rules/wxwidgets.make
new file mode 100644
index 000000000..09a3036c3
--- /dev/null
+++ b/rules/wxwidgets.make
@@ -0,0 +1,205 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Michael Olbrich <m.olbrich@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_WXWIDGETS) += wxwidgets
+
+#
+# Paths and names
+#
+WXWIDGETS_VERSION := 2.8.10
+WXWIDGETS := wxGTK-$(WXWIDGETS_VERSION)
+WXWIDGETS_SUFFIX := tar.bz2
+WXWIDGETS_URL := $(PTXCONF_SETUP_SFMIRROR)/wxwindows/$(WXWIDGETS).$(WXWIDGETS_SUFFIX)
+WXWIDGETS_SOURCE := $(SRCDIR)/$(WXWIDGETS).$(WXWIDGETS_SUFFIX)
+WXWIDGETS_DIR := $(BUILDDIR)/$(WXWIDGETS)
+WXWIDGETS_LICENSE := unknown
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(WXWIDGETS_SOURCE):
+ @$(call targetinfo)
+ @$(call get, WXWIDGETS)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+WXWIDGETS_CONF_TOOL := autoconf
+WXWIDGETS_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --with-gtk \
+ --without-odbc \
+ --without-gnomeprint \
+ --without-gnomevfs \
+ --without-libtiff \
+ --without-libxpm \
+
+ifdef PTXCONF_WXWIDGETS_LIBPNG
+WXWIDGETS_CONF_OPT += --with-libpng
+else
+WXWIDGETS_CONF_OPT += --without-libpng
+endif
+ifdef PTXCONF_WXWIDGETS_LIBJPEG
+WXWIDGETS_CONF_OPT += --with-libjpeg
+else
+WXWIDGETS_CONF_OPT += --without-libjpeg
+endif
+ifdef PTXCONF_WXWIDGETS_SDL
+WXWIDGETS_CONF_OPT += --with-sdl --with-sdl-prefix=$(SYSROOT)/usr
+else
+WXWIDGETS_CONF_OPT += --without-sdl
+endif
+ifdef PTXCONF_WXWIDGETS_OPENGL
+WXWIDGETS_CONF_OPT += --with-opengl
+else
+WXWIDGETS_CONF_OPT += --without-opengl
+endif
+ifdef PTXCONF_WXWIDGETS_ZLIB
+WXWIDGETS_CONF_OPT += --with-zlib
+else
+WXWIDGETS_CONF_OPT += --without-zlib
+endif
+ifdef PTXCONF_WXWIDGETS_EXPAT
+WXWIDGETS_CONF_OPT += --with-expat
+else
+WXWIDGETS_CONF_OPT += --without-expat
+endif
+
+WXWIDGETS_MAKE_OPT := all samples
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/wxwidgets.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, wxwidgets)
+ @$(call install_fixup, wxwidgets,PACKAGE,wxwidgets)
+ @$(call install_fixup, wxwidgets,PRIORITY,optional)
+ @$(call install_fixup, wxwidgets,VERSION,$(WXWIDGETS_VERSION))
+ @$(call install_fixup, wxwidgets,SECTION,base)
+ @$(call install_fixup, wxwidgets,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
+ @$(call install_fixup, wxwidgets,DEPENDS,)
+ @$(call install_fixup, wxwidgets,DESCRIPTION,missing)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_base-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_base-2.8.so.0.6.0, \
+ /usr/lib/libwx_base-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_base-2.8.so.0.6.0, \
+ /usr/lib/libwx_base-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_base_net-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_base_net-2.8.so.0.6.0, \
+ /usr/lib/libwx_base_net-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_base_net-2.8.so.0.6.0, \
+ /usr/lib/libwx_base_net-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_base_xml-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_base_xml-2.8.so.0.6.0, \
+ /usr/lib/libwx_base_xml-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_base_xml-2.8.so.0.6.0, \
+ /usr/lib/libwx_base_xml-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_gtk2_adv-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_adv-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_adv-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_adv-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_adv-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_gtk2_aui-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_aui-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_aui-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_aui-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_aui-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_gtk2_core-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_core-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_core-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_core-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_core-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_gtk2_gl-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_gl-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_gl-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_gl-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_gl-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_gtk2_html-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_html-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_html-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_html-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_html-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_gtk2_qa-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_qa-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_qa-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_qa-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_qa-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_gtk2_richtext-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_richtext-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_richtext-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_richtext-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_richtext-2.8.so)
+
+ @$(call install_copy, wxwidgets, 0, 0, 0644, -, \
+ /usr/lib/libwx_gtk2_xrc-2.8.so.0.6.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_xrc-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_xrc-2.8.so.0)
+ @$(call install_link, wxwidgets, \
+ libwx_gtk2_xrc-2.8.so.0.6.0, \
+ /usr/lib/libwx_gtk2_xrc-2.8.so)
+
+
+ @$(call install_finish, wxwidgets)
+
+ @$(call touch)
+
+# vim: syntax=make
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 19:30:32 +0000