jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-03 00:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'various-bumps' of git://git.busybox.net/~tpetazzoni/git/buildroot

Browse Source
This commit is contained in:
Peter Korsgaard 2010-07-27 22:52:19 +02:00
commit 3fdf280568
42 changed files with 330 additions and 1310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/Config.in
View File

@ -267,6 +267,7 @@ source "package/gtk2-themes/Config.in"
source "package/jpeg/Config.in" source "package/jpeg/Config.in"
source "package/libart/Config.in" source "package/libart/Config.in"
source "package/libdrm/Config.in" source "package/libdrm/Config.in"
source "package/libgail/Config.in"
source "package/libglade/Config.in" source "package/libglade/Config.in"
source "package/libgtk12/Config.in" source "package/libgtk12/Config.in"
source "package/libgtk2/Config.in" source "package/libgtk2/Config.in"

6
package/atk/atk.mk
View File

@ -3,11 +3,13 @@
# atk # atk
# #
############################################################# #############################################################
ATK_VERSION = 1.22.0 ATK_VERSION_MAJOR = 1.30
ATK_VERSION = $(ATK_VERSION_MAJOR).0
ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2 ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2
ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/1.22/ ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
ATK_INSTALL_STAGING = YES ATK_INSTALL_STAGING = YES
ATK_INSTALL_TARGET = YES ATK_INSTALL_TARGET = YES
ATK_LIBTOOL_PATCH = NO
ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \

1012
package/cairo/cairo-1.6.4-directfb-all.patch
View File

File diff suppressed because it is too large Load Diff

39
package/cairo/cairo-1.8.10-directfb.patch Normal file
View File

@ -0,0 +1,39 @@
diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index bb02dbf..65f2d55 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void *abstract_surf
surface->dfbsurface->Blit (surface->dfbsurface,
buffer, NULL,
image_rect->x, image_rect->y));
+
+ surface->dfbsurface->ReleaseSource (surface->dfbsurface);
}
cairo_surface_destroy (&image->base);
@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t *dst,
cairo_surface_attributes_t *src_attr)
{
_cairo_pattern_release_surface (src_pattern, src, src_attr);
+
+ if (dst->dfbsurface)
+ dst->dfbsurface->ReleaseSource( dst->dfbsurface );
}
#endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
new_cache->dfbsurface->Blit (new_cache->dfbsurface,
cache->dfbsurface, NULL, 0, 0);
+ new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
_directfb_destroy_font_cache (cache);
scaled_font->surface_private = cache = new_cache;
@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void *abstract_dst,
RUN_CLIPPED (dst, NULL,
dst->dfbsurface->BatchBlit (dst->dfbsurface,
cache->dfbsurface, rects, points, num));
+ dst->dfbsurface->ReleaseSource (dst->dfbsurface);
return CAIRO_STATUS_SUCCESS;
}

3
package/cairo/cairo.mk
View File

@ -3,12 +3,13 @@
# cairo # cairo
# #
############################################################# #############################################################
CAIRO_VERSION = 1.6.4 CAIRO_VERSION = 1.8.10
CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
CAIRO_SITE = http://cairographics.org/releases CAIRO_SITE = http://cairographics.org/releases
CAIRO_AUTORECONF = NO CAIRO_AUTORECONF = NO
CAIRO_INSTALL_STAGING = YES CAIRO_INSTALL_STAGING = YES
CAIRO_INSTALL_TARGET = YES CAIRO_INSTALL_TARGET = YES
CAIRO_LIBTOOL_PATCH = NO
CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \ glib_cv_uscore=no ac_cv_func_strtod=yes \

2
package/icu/icu.mk
View File

@ -33,7 +33,7 @@ $(ICU_DIR)/.configured: $(ICU_HOST_DIR)/.configured
(cd $(ICU_DIR); rm -rf config.cache; \ (cd $(ICU_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_ARGS) \
CXX=$(TARGET_CXX) \ CXX="$(TARGET_CXX)" \
./configure $(QUIET) \ ./configure $(QUIET) \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \

18
package/libgail/Config.in Normal file
View File

@ -0,0 +1,18 @@
config BR2_PACKAGE_LIBGAIL
bool "libgail"
depends on BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_PANGO
help
GAIL provides accessibility support for gtk+ and
libgnomecanvas by implementing AtkObjects for widgets in
gtk+ and libgnomecanvas.
The GAIL library is a GTK+ module. For example, if the
module is loaded in a program which calls
gtk_widget_get_accessible() for a GtkEntry an instance of
GailEntry is returned. This module is normally used with the
atk-bridge GTK+ module from at-spi to allow an assistive
technology, e.g a screenreader, to query or drive the
program.
http://developer.gnome.org/projects/gap

42
package/libgail/libgail-1.22.3-Relax-X11-dependencies.patch Normal file
View File

@ -0,0 +1,42 @@
From cca72c48b5643fa62e1d55b7b181e147f5ba7fe9 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <llandwerlin@gmail.com>
Date: Sun, 28 Mar 2010 21:47:38 +0200
Subject: [PATCH] Relax X11 dependency
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
configure.in | 4 +++-
gail/gailwindow.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index 3801655..abaf417 100644
--- a/configure.in
+++ b/configure.in
@@ -86,7 +86,9 @@ GTK_REQUIRED_VERSION=2.9.4
PKG_CHECK_MODULES(DEP, $ATK_PACKAGES >= $ATK_REQUIRED_VERSION \
$GTK_PACKAGES >= $GTK_REQUIRED_VERSION)
-if test "$gail_native_win32" != "yes"; then
+AC_ARG_ENABLE(x, [ --disable-x disable x11 backend ],x11_backend=no,x11_backend=yes)
+
+if test "$gail_native_win32" != "yes" -a "$x11_backend" != "no"; then
PKG_CHECK_MODULES(X, x11, :, [
# pkg-config modules not found (only present since X11R7 aka Xorg); use
diff --git a/gail/gailwindow.c b/gail/gailwindow.c
index 616b25e..add454b 100644
--- a/gail/gailwindow.c
+++ b/gail/gailwindow.c
@@ -1071,7 +1071,7 @@ gail_window_get_mdi_zorder (AtkComponent *component)
return get_window_zorder (widget->window);
}
-#elif defined (GDK_WINDOWING_WIN32)
+#elif defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_DIRECTFB)
static gint
gail_window_get_mdi_zorder (AtkComponent *component)
--
1.7.0.2

26
package/libgail/libgail.mk Normal file
View File

@ -0,0 +1,26 @@
#############################################################
#
# libgail
#
#############################################################
LIBGAIL_VERSION_MAJOR = 1.22
LIBGAIL_VERSION_MINOR = 3
LIBGAIL_VERSION = $(LIBGAIL_VERSION_MAJOR).$(LIBGAIL_VERSION_MINOR)
LIBGAIL_SOURCE = gail-$(LIBGAIL_VERSION).tar.bz2
LIBGAIL_SITE = http://ftp.gnome.org/pub/gnome/sources/gail/$(LIBGAIL_VERSION_MAJOR)
LIBGAIL_AUTORECONF = YES
LIBGAIL_LIBTOOL_PATCH = NO
LIBGAIL_INSTALL_STAGING = YES
LIBGAIL_INSTALL_TARGET = YES
LIBGAIL_CONF_OPT = --enable-shared \
--enable-static
ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
LIBGAIL_CONF_OPT += --disable-x
endif
LIBGAIL_DEPENDENCIES = host-pkg-config libgtk2 pango
$(eval $(call AUTOTARGETS,package,libgail))

1
package/libglib2/Config.in
View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_ZLIB
depends on BR2_USE_WCHAR # gettext depends on BR2_USE_WCHAR # gettext
help help
Low-level core library that forms the basis of GTK+ and GNOME. Low-level core library that forms the basis of GTK+ and GNOME.

8
package/libglib2/libglib2.mk
View File

@ -3,8 +3,8 @@
# libglib2 # libglib2
# #
############################################################# #############################################################
LIBGLIB2_VERSION_MAJOR = 2.22 LIBGLIB2_VERSION_MAJOR = 2.24
LIBGLIB2_VERSION_MINOR = 5 LIBGLIB2_VERSION_MINOR = 0
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
@ -55,9 +55,9 @@ HOST_LIBGLIB2_CONF_OPT = \
--disable-gtk-doc \ --disable-gtk-doc \
--enable-debug=no \ --enable-debug=no \
LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 $(if $(BR2_NEEDS_GETTEXT),gettext libintl) LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib
ifneq ($(BR2_ENABLE_LOCALE),y) ifneq ($(BR2_ENABLE_LOCALE),y)
LIBGLIB2_DEPENDENCIES+=libiconv LIBGLIB2_DEPENDENCIES+=libiconv

9
package/libsoup/libsoup.mk
View File

@ -4,13 +4,12 @@
# #
############################################################# #############################################################
LIBSOUP_MAJOR_VERSION:=2.26 LIBSOUP_MAJOR_VERSION:=2.31
LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2 LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2
LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2 LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2
LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION) LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
LIBSOUP_AUTORECONF = YES
LIBSOUP_INSTALL_STAGING = YES LIBSOUP_INSTALL_STAGING = YES
LIBSOUP_INSTALL_TARGET = YES LIBSOUP_LIBTOOL_PATCH = NO
LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
@ -23,8 +22,8 @@ LIBSOUP_CONF_OPT = \
--enable-static \ --enable-static \
--disable-explicit-deps \ --disable-explicit-deps \
--disable-glibtest \ --disable-glibtest \
--without-gnome \ --disable-ssl \
--disable-gtk-doc --without-gnome
LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2 LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2

7
package/midori/Config.in
View File

@ -2,8 +2,13 @@ config BR2_PACKAGE_MIDORI
bool "midori" bool "midori"
select BR2_PACKAGE_WEBKIT select BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_LIBSEXY select BR2_PACKAGE_LIBSEXY
depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBGTK2
depends on BR2_INSTALL_LIBSTDCPP # webkit
depends on BR2_USE_WCHAR # webkit
help help
Midori is a lightweight web browser based on WebKit Midori is a lightweight web browser based on WebKit
http://software.twotoasts.de/?page=midori http://software.twotoasts.de/?page=midori
comment "midori requires C++, WCHAR in toolchain and libgtk2"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2

67
package/midori/midori-0.0.18-webkit.patch
View File

@ -1,67 +0,0 @@
diff -rup midori-0.0.17-orig/configure.in midori-0.0.17/configure.in
--- midori-0.0.17-orig/configure.in 2008-01-23 21:47:18.000000000 -0500
+++ midori-0.0.17/configure.in 2008-02-11 14:11:08.000000000 -0500
@@ -53,13 +53,13 @@ GTK_VER=`pkg-config --modversion gtk+-2.
AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version])
# Checks for WebKitGtk
-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false)
+PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false)
if test "x${have_webkit}" = "xfalse" ; then
AC_MSG_ERROR([No WebKitGtk package information found])
fi
AC_SUBST(WEBKIT_CFLAGS)
AC_SUBST(WEBKIT_LIBS)
-WEBKIT_VER=`pkg-config --modversion WebKitGtk`
+WEBKIT_VER=`pkg-config --modversion webkit-1.0`
AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version])
# Checks for libsexy
diff -rup midori-0.0.17-orig/src/global.h midori-0.0.17/src/global.h
--- midori-0.0.17-orig/src/global.h 2008-01-22 21:13:40.000000000 -0500
+++ midori-0.0.17/src/global.h 2008-02-11 14:01:54.000000000 -0500
@@ -16,7 +16,7 @@
#include "../katze/katze.h"
#include <gtk/gtk.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
// -- globals
diff -rup midori-0.0.17-orig/src/helpers.c midori-0.0.17/src/helpers.c
--- midori-0.0.17-orig/src/helpers.c 2008-01-20 11:46:16.000000000 -0500
+++ midori-0.0.17/src/helpers.c 2008-02-11 14:03:57.000000000 -0500
@@ -16,7 +16,7 @@
#include "../katze/katze.h"
#include <string.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
GtkIconTheme* get_icon_theme(GtkWidget* widget)
{
diff -rup midori-0.0.17-orig/src/webSearch.h midori-0.0.17/src/webSearch.h
--- midori-0.0.17-orig/src/webSearch.h 2007-12-14 22:09:47.000000000 -0500
+++ midori-0.0.17/src/webSearch.h 2008-02-11 14:03:25.000000000 -0500
@@ -16,7 +16,7 @@
#include <gtk/gtk.h>
#include <libsexy/sexy.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
// -- Types
diff -rup midori-0.0.17-orig/src/webView.h midori-0.0.17/src/webView.h
--- midori-0.0.17-orig/src/webView.h 2008-01-04 02:46:44.000000000 -0500
+++ midori-0.0.17/src/webView.h 2008-02-11 14:02:49.000000000 -0500
@@ -16,7 +16,7 @@
#include "browser.h"
#include "debug.h"
-#include <webkit.h>
+#include <webkit/webkit.h>
WebKitNavigationResponse
on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame

27
package/midori/midori.mk
View File

@ -4,13 +4,28 @@
# #
############################################################# #############################################################
MIDORI_VERSION = 0.0.18 MIDORI_VERSION = 0.2.6
MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.gz MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
MIDORI_SITE = http://software.twotoasts.de/media/midori/ MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.2/
MIDORI_AUTORECONF = YES
MIDORI_INSTALL_STAGING = NO MIDORI_INSTALL_STAGING = NO
MIDORI_INSTALL_TARGET = YES MIDORI_INSTALL_TARGET = YES
MIDORI_DEPENDENCIES = host-pkg-config webkit libsexy xserver_xorg-server MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
$(eval $(call AUTOTARGETS,package,midori)) define MIDORI_CONFIGURE_CMDS
(cd $(@D); \
$(TARGET_CONFIGURE_OPTS) \
./waf configure \
--prefix=/usr \
)
endef
define MIDORI_BUILD_CMDS
(cd $(@D); ./waf build -j $(BR2_JLEVEL))
endef
define MIDORI_INSTALL_TARGET_CMDS
(cd $(@D); ./waf --destdir=$(TARGET_DIR) install)
endef
$(eval $(call GENTARGETS,package,midori))

7
package/pango/pango.mk
View File

@ -3,9 +3,12 @@
# pango # pango
# #
############################################################# #############################################################
PANGO_VERSION = 1.20.5 PANGO_VERSION_MAJOR = 1.28
PANGO_VERSION_MINOR = 0
PANGO_VERSION = $(PANGO_VERSION_MAJOR).$(PANGO_VERSION_MINOR)
PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2
PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/1.20 PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
PANGO_AUTORECONF = YES PANGO_AUTORECONF = YES
PANGO_INSTALL_STAGING = YES PANGO_INSTALL_STAGING = YES
PANGO_INSTALL_TARGET = YES PANGO_INSTALL_TARGET = YES

6
package/webkit/Config.in
View File

@ -11,6 +11,8 @@ config BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_ENCHANT select BR2_PACKAGE_ENCHANT
select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBSOUP
select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_CAIRO_PNG
select BR2_PACKAGE_LIBGAIL
select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7
help help
WebKit is an open source, standards compliant web browser engine. WebKit is an open source, standards compliant web browser engine.
@ -19,5 +21,5 @@ config BR2_PACKAGE_WEBKIT
http://webkit.org/ http://webkit.org/
comment "webkit requires a toolchain with C++ support and WCHAR enabled" comment "webkit requires C++, WCHAR in toolchain and libgtk2"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2

173
package/webkit/gtk-doc.make
View File

@ -1,173 +0,0 @@
# -*- mode: makefile -*-
####################################
# Everything below here is generic #
####################################
if GTK_DOC_USE_LIBTOOL
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
else
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
endif
# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
# whether a source that is a target of one rule is then
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \
$(content_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
$(DOC_MODULE).interfaces \
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
REPORT_FILES = \
$(DOC_MODULE)-undocumented.txt \
$(DOC_MODULE)-undeclared.txt \
$(DOC_MODULE)-unused.txt
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
if ENABLE_GTK_DOC
all-local: html-build.stamp
else
all-local:
endif
docs: html-build.stamp
#### scan ####
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@echo 'gtk-doc: Scanning header files'
@-chmod -R u+w $(srcdir)
cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
done \
fi
touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo 'gtk-doc: Rebuilding template files'
@-chmod -R u+w $(srcdir)
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
tmpl/*.sgml:
@true
#### xml ####
sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo 'gtk-doc: Building XML'
@-chmod -R u+w $(srcdir)
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo 'gtk-doc: Fixing cross-references'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
##############
clean-local:
rm -f *~ *.bak
rm -rf .libs
distclean-local:
cd $(srcdir) && \
rm -rf xml $(REPORT_FILES) \
$(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
maintainer-clean-local: clean
cd $(srcdir) && rm -rf xml html
install-data-local:
-installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
which gtkdoc-rebase >/dev/null && \
gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
fi
uninstall-local:
rm -f $(DESTDIR)$(TARGET_DIR)/*
#
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist"
@false
endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
cd $(distdir) && rm -f $(DISTCLEANFILES)
-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs

22
package/webkit/webkit-1.2.3-fix-build-issue-with-old-gtk.patch Normal file
View File

@ -0,0 +1,22 @@
The WebKit code conditionally calls getRootCoords() when the Gtk
version is old (i.e < 2.17.3), but fails to declare the prototype of
this function (which is implemented after its call site). This build
failure has probably been missed due to the fact that not many people
try to compile recent WebKit versions with old Gtk.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: webkit-1.2.3/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
===================================================================
--- webkit-1.2.3.orig/WebKitTools/DumpRenderTree/gtk/EventSender.cpp 2010-07-19 20:42:27.000000000 +0200
+++ webkit-1.2.3/WebKitTools/DumpRenderTree/gtk/EventSender.cpp 2010-07-19 20:42:57.000000000 +0200
@@ -86,6 +86,9 @@
static void sendOrQueueEvent(GdkEvent event);
static void dispatchEvent(GdkEvent event);
static guint getStateFlags();
+#if !GTK_CHECK_VERSION(2,17,3)
+static void getRootCoords(GtkWidget* view, int* rootX, int* rootY);
+#endif
static JSValueRef getDragModeCallback(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
{

79
package/webkit/webkit-1.2.3-pthread_getattr_np.patch Normal file
View File

@ -0,0 +1,79 @@
Patch WebKit because pthread_getattr_np is not implemented in uClibc
Define UCLIBC_USE_PROC_SELF_MAPS etc. as a workaround for uClibc. This
code was in the qtoipa webkit but appears to have been removed from
more recent versions of webkit.
See: http://bugreports.qt.nokia.com/browse/QTBUG-6551
Credit for fix: http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&p=545066#545066
Signed-off-by: Paul Jones <paul@pauljones.id.au>
Index: webkit-1.2.3/JavaScriptCore/runtime/Collector.cpp
===================================================================
--- webkit-1.2.3.orig/JavaScriptCore/runtime/Collector.cpp 2010-07-22 17:16:19.000000000 +0200
+++ webkit-1.2.3/JavaScriptCore/runtime/Collector.cpp 2010-07-22 17:25:02.000000000 +0200
@@ -75,6 +75,18 @@
#endif
#include <unistd.h>
+#if defined(__UCLIBC__)
+// versions of uClibc 0.9.31 and below do not have
+// pthread_getattr_np or pthread_attr_getstack.
+#if __UCLIBC_MAJOR__ == 0 && \
+ (__UCLIBC_MINOR__ < 9 || \
+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
+#define UCLIBC_USE_PROC_SELF_MAPS 1
+#include <stdio_ext.h>
+extern int *__libc_stack_end;
+#endif
+#endif
+
#if OS(SOLARIS)
#include <thread.h>
#else
@@ -610,6 +622,36 @@
get_thread_info(find_thread(NULL), &threadInfo);
return threadInfo.stack_end;
#elif OS(UNIX)
+#ifdef UCLIBC_USE_PROC_SELF_MAPS
+ // Read /proc/self/maps and locate the line whose address
+ // range contains __libc_stack_end.
+ FILE *file = fopen("/proc/self/maps", "r");
+ if (!file)
+ return 0;
+ __fsetlocking(file, FSETLOCKING_BYCALLER);
+ char *line = NULL;
+ size_t lineLen = 0;
+ while (!feof_unlocked(file)) {
+ if (getdelim(&line, &lineLen, '\n', file) <= 0)
+ break;
+ long from;
+ long to;
+ if (sscanf (line, "%lx-%lx", &from, &to) != 2)
+ continue;
+ if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) {
+ fclose(file);
+ free(line);
+#ifdef _STACK_GROWS_UP
+ return (void *)from;
+#else
+ return (void *)to;
+#endif
+ }
+ }
+ fclose(file);
+ free(line);
+ return 0;
+#else
static void* stackBase = 0;
static size_t stackSize = 0;
static pthread_t stackThread;
@@ -631,6 +673,7 @@
stackThread = thread;
}
return static_cast<char*>(stackBase) + stackSize;
+#endif
#elif OS(WINCE)
if (g_stackBase)
return g_stackBase;

11
package/webkit/webkit-r30267-trunc.patch
View File

@ -1,11 +0,0 @@
--- a/JavaScriptCore/wtf/MathExtras.h 2008-02-04 21:09:08.000000000 -0500
+++ b/JavaScriptCore/wtf/MathExtras.h 2008-02-11 13:31:28.000000000 -0500
@@ -75,6 +75,8 @@ inline bool signbit(double x) { return x
#endif
+inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); }
+
#if COMPILER(MSVC)
inline bool isinf(double num) { return !_finite(num) && !_isnan(num); }

22
package/webkit/webkit.mk
View File

@ -3,22 +3,21 @@
# webkit # webkit
# #
############################################################# #############################################################
WEBKIT_VERSION = r44552 WEBKIT_VERSION = 1.2.3
WEBKIT_SOURCE = WebKit-$(WEBKIT_VERSION).tar.bz2 WEBKIT_SOURCE = webkit-$(WEBKIT_VERSION).tar.gz
WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/ WEBKIT_SITE = http://www.webkitgtk.org
WEBKIT_INSTALL_STAGING = YES WEBKIT_INSTALL_STAGING = YES
WEBKIT_INSTALL_TARGET = YES
WEBKIT_LIBTOOL_PATCH = NO WEBKIT_LIBTOOL_PATCH = NO
WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \ WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \
libgtk2 sqlite enchant libsoup jpeg libgtk2 sqlite enchant libsoup jpeg libgail
WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config
ifeq ($(BR2_PACKAGE_XORG7),y) ifeq ($(BR2_PACKAGE_XORG7),y)
WEBKIT_CONF_OPT += --with-target=x11 WEBKIT_CONF_OPT += --with-target=x11
WEBKIT_DEPENDENCIES += xserver_xorg-server WEBKIT_DEPENDENCIES += xserver_xorg-server xlib_libXt
endif endif
ifeq ($(BR2_PACKAGE_DIRECTFB),y) ifeq ($(BR2_PACKAGE_DIRECTFB),y)
@ -28,15 +27,4 @@ endif
WEBKIT_CONF_OPT += --disable-video WEBKIT_CONF_OPT += --disable-video
define WEBKIT_AUTOGEN_PATCH
$(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh
$(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh
$(SED) 's/LIBTOOLIZE_FLAGS=.*/LIBTOOLIZE_FLAGS="--force --automake --copy"/' $(WEBKIT_DIR)/autogen.sh
cp package/webkit/gtk-doc.make $(WEBKIT_DIR)/
# Don't run the configure step yet
cd $(WEBKIT_DIR); $(HOST_CONFIGURE_OPTS) AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
endef
WEBKIT_POST_EXTRACT_HOOKS += WEBKIT_AUTOGEN_PATCH
$(eval $(call AUTOTARGETS,package,webkit)) $(eval $(call AUTOTARGETS,package,webkit))

5
package/x11r7/libxcb/libxcb.mk
View File

@ -16,5 +16,8 @@ LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
HOST_PYTHON_VERSION=$(shell python --version 2>&1 | sed 's/Python \([0-9]\.[^\.]\).*/\1/') HOST_PYTHON_VERSION=$(shell python --version 2>&1 | sed 's/Python \([0-9]\.[^\.]\).*/\1/')
LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XCBPROTO_XCBPYTHONDIR=$(STAGING_DIR)/usr/lib/python$(HOST_PYTHON_VERSION)/site-packages LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XCBPROTO_XCBPYTHONDIR=$(STAGING_DIR)/usr/lib/python$(HOST_PYTHON_VERSION)/site-packages
$(eval $(call AUTOTARGETS,package/x11r7,libxcb)) HOST_LIBXCB_DEPENDENCIES = host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp host-xlib_libXau
$(eval $(call AUTOTARGETS,package/x11r7,libxcb))
$(eval $(call AUTOTARGETS,package/x11r7,libxcb,host))

1
package/x11r7/pthread-stubs/pthread-stubs.mk
View File

@ -11,4 +11,5 @@ PTHREAD_STUBS_LIBTOOL_PATCH = NO
PTHREAD_STUBS_INSTALL_STAGING = YES PTHREAD_STUBS_INSTALL_STAGING = YES
$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs)) $(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs))
$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs,host))

2
package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
View File

@ -9,5 +9,7 @@ XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBCOMP_AUTORECONF = NO XAPP_XKBCOMP_AUTORECONF = NO
XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
HOST_XAPP_XKBCOMP_DEPENDENCIES = host-xlib_libX11 host-xlib_libxkbfile
$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp)) $(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp))
$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp,host))

1
package/x11r7/xcb-proto/xcb-proto.mk
View File

@ -10,4 +10,5 @@ XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/
XCB_PROTO_INSTALL_STAGING = YES XCB_PROTO_INSTALL_STAGING = YES
$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto)) $(eval $(call AUTOTARGETS,package/x11r7,xcb-proto))
$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto,host))

2
package/x11r7/xkeyboard-config/xkeyboard-config.mk
View File

@ -10,7 +10,7 @@ XKEYBOARD_CONFIG_AUTORECONF = NO
XKEYBOARD_CONFIG_INSTALL_STAGING = NO XKEYBOARD_CONFIG_INSTALL_STAGING = NO
XKEYBOARD_CONFIG_INSTALL_TARGET = YES XKEYBOARD_CONFIG_INSTALL_TARGET = YES
XKEYBOARD_CONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install XKEYBOARD_CONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt

3
package/x11r7/xlib_libX11/xlib_libX11.mk
View File

@ -18,7 +18,10 @@ XLIB_LIBX11_CONF_OPT = \
--with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \ --with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \
--disable-specs --disable-specs
HOST_XLIB_LIBX11_DEPENDENCIES = host-xproto_xextproto host-libxcb host-xutil_util-macros host-xlib_xtrans host-xlib_libXau host-xlib_libXdmcp host-xproto_kbproto host-xproto_xproto host-xproto_xextproto host-xproto_inputproto host-xproto_xf86bigfontproto xproto_bigreqsproto host-xproto_xcmiscproto
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11)) $(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11))
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11,host))
# src/util/makekeys is executed at build time to generate ks_tables.h, so # src/util/makekeys is executed at build time to generate ks_tables.h, so
# it should get compiled for the host. The libX11 makefile unfortunately # it should get compiled for the host. The libX11 makefile unfortunately

4
package/x11r7/xlib_libXau/xlib_libXau.mk
View File

@ -13,4 +13,8 @@ XLIB_LIBXAU_INSTALL_STAGING = YES
XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
HOST_XLIB_LIBXAU_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
HOST_XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau)) $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau,host))

4
package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
View File

@ -13,4 +13,8 @@ XLIB_LIBXDMCP_INSTALL_STAGING = YES
XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
HOST_XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp)) $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp))
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp,host))

4
package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
View File

@ -12,4 +12,8 @@ XLIB_LIBXKBFILE_INSTALL_STAGING = YES
XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static
HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xproto_kbproto
HOST_XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile)) $(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile))
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile,host))

1
package/x11r7/xproto_inputproto/xproto_inputproto.mk
View File

@ -12,3 +12,4 @@ XPROTO_INPUTPROTO_INSTALL_STAGING = YES
XPROTO_INPUTPROTO_INSTALL_TARGET = NO XPROTO_INPUTPROTO_INSTALL_TARGET = NO
$(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto)) $(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto))
$(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto,host))

1
package/x11r7/xproto_kbproto/xproto_kbproto.mk
View File

@ -12,3 +12,4 @@ XPROTO_KBPROTO_INSTALL_STAGING = YES
XPROTO_KBPROTO_INSTALL_TARGET = NO XPROTO_KBPROTO_INSTALL_TARGET = NO
$(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto)) $(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto))
$(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto,host))

1
package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
View File

@ -12,3 +12,4 @@ XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
XPROTO_XCMISCPROTO_INSTALL_TARGET = NO XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
$(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto)) $(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto))
$(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto,host))

1
package/x11r7/xproto_xextproto/xproto_xextproto.mk
View File

@ -12,3 +12,4 @@ XPROTO_XEXTPROTO_INSTALL_STAGING = YES
XPROTO_XEXTPROTO_INSTALL_TARGET = NO XPROTO_XEXTPROTO_INSTALL_TARGET = NO
$(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto)) $(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto))
$(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto,host))

1
package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
View File

@ -12,3 +12,4 @@ XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto)) $(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto))
$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto,host))

1
package/x11r7/xserver_xorg-server/Config.in
View File

@ -47,6 +47,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS select BR2_PACKAGE_XUTIL_UTIL_MACROS
select BR2_PACKAGE_XKEYBOARD_CONFIG
depends on !BR2_avr32 depends on !BR2_avr32
help help
xorg-server 1.7.5 xorg-server 1.7.5

4
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -53,6 +53,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_xf86rushproto \ xproto_xf86rushproto \
xproto_xf86vidmodeproto \ xproto_xf86vidmodeproto \
xproto_xproto \ xproto_xproto \
xkeyboard-config \
pixman \ pixman \
openssl \ openssl \
mcookie mcookie
@ -60,7 +61,8 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
--disable-xnest --disable-xephyr --disable-xvfb \ --disable-xnest --disable-xephyr --disable-xvfb \
--with-builder-addr=buildroot@uclibc.org \ --with-builder-addr=buildroot@uclibc.org \
CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" \
--with-fontdir=/usr/share/fonts/X11/
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y) ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx

1
package/x11r7/xutil_util-macros/xutil_util-macros.mk
View File

@ -12,3 +12,4 @@ XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
XUTIL_UTIL_MACROS_INSTALL_TARGET = NO XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
$(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros)) $(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros))
$(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros,host))

5
target/Config.in.arch
View File

@ -1,3 +1,6 @@
config BR2_ARCH_IS_64
bool
choice choice
prompt "Target Architecture" prompt "Target Architecture"
default BR2_i386 default BR2_i386
@ -38,8 +41,10 @@ config BR2_sparc
bool "sparc" bool "sparc"
config BR2_sparc64 config BR2_sparc64
bool "sparc64" bool "sparc64"
select BR2_ARCH_IS_64
config BR2_x86_64 config BR2_x86_64
bool "x86_64" bool "x86_64"
select BR2_ARCH_IS_64
config BR2_xtensa config BR2_xtensa
bool "xtensa" bool "xtensa"
endchoice endchoice

2
toolchain/external-toolchain/ext-tool.mk
View File

@ -306,7 +306,7 @@ endif # ! no threads
TARGET_CC_NO_SYSROOT=$(filter-out --sysroot=%,$(TARGET_CC)) TARGET_CC_NO_SYSROOT=$(filter-out --sysroot=%,$(TARGET_CC))
SYSROOT_DIR=$(shell $(TARGET_CC_NO_SYSROOT) -print-sysroot 2>/dev/null) SYSROOT_DIR=$(shell $(TARGET_CC_NO_SYSROOT) -print-sysroot 2>/dev/null)
ifeq ($(SYSROOT_DIR),) ifeq ($(SYSROOT_DIR),)
SYSROOT_DIR=$(shell readlink -f $$(LANG=C $(TARGET_CC_NO_SYSROOT) -print-file-name=libc.a |sed -r -e 's:usr/lib/libc\.a::;')) SYSROOT_DIR=$(shell readlink -f $$(LANG=C $(TARGET_CC_NO_SYSROOT) -print-file-name=libc.a) |sed -r -e 's:usr/lib/libc\.a::;')
endif endif
# Now, find if the toolchain specifies a sub-directory for the # Now, find if the toolchain specifies a sub-directory for the

8
toolchain/gcc/gcc-uclibc-4.x.mk
View File

@ -261,8 +261,11 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
mkdir -p $(GCC_BUILD_DIR2) mkdir -p $(GCC_BUILD_DIR2)
# Important! Required for limits.h to be fixed. # Important! Required for limits.h to be fixed.
ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
#-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib -rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
#ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib mkdir -p $(STAGING_DIR)/lib
ln -snf ../../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
$(if $(BR2_ARCH_IS_64),mkdir -p $(STAGING_DIR)/lib64)
$(if $(BR2_ARCH_IS_64),ln -snf ../../lib64 $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64)
(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \ (cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
$(HOST_CONFIGURE_OPTS) \ $(HOST_CONFIGURE_OPTS) \
$(GCC_SRC_DIR)/configure $(QUIET) \ $(GCC_SRC_DIR)/configure $(QUIET) \
@ -307,6 +310,7 @@ $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled
fi; \ fi; \
mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \ mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
rmdir "$(STAGING_DIR)/lib64"; \ rmdir "$(STAGING_DIR)/lib64"; \
rm "$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64";\
fi fi
# Strip the host binaries # Strip the host binaries
ifeq ($(GCC_STRIP_HOST_BINARIES),true) ifeq ($(GCC_STRIP_HOST_BINARIES),true)