Commit 5f17c052 authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Update various packages to make X run

parent 7521f373

package/Makefile.autotools.in

+13 −2
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION) 
$(BUILD_DIR)/%/.stamp_patched:

	$(call MESSAGE,"Patching")

	$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))

	$(Q)(if test -d package/$($(PKG)_NAME) ; then \

	$(Q)(\

	if test -d package/$($(PKG)_NAME) ; then \

	  if test "$(wildcard package/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \

	    toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \

	  else \
@@ -156,7 +157,17 @@ $(BUILD_DIR)/%/.stamp_patched: 
	      toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \

	    fi; \

	  fi; \

	fi)

	else \

	  if test "$(wildcard package/x11r7/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \

	    toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \

	  else \

	    toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1 ; \

	    if test -d package/x11r7/$($(PKG)_NAME)/$(NAMEVER) ; then \

	      toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \

	    fi; \

	  fi; \

	fi; \

	)

ifeq ($(strip $(BR2_UPDATE_CONFIG)),y)

	$(Q)(for file in config.guess config.sub; do \

		for i in $$(find $(@D) -name $$file); do \

package/Makefile.in

+3 −0
Original line number Diff line number Diff line
@@ -237,6 +237,9 @@ endif 
ifeq ($(strip $(BR2_PACKAGE_XORG)),y)

XSERVER+=xorg

endif

ifeq ($(strip $(BR2_PACKAGE_XORG7)),y)

XSERVER+=xserver_xorg-server

endif

ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)

XSERVER+=xggi

endif

package/atk/atk.mk

+4 −2
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked 
		ac_use_included_regex=no \

		gl_cv_c_restrict=no \

		ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \

		ac_cv_prog_F77=no \

		ac_cv_prog_CXX=no \

		./configure \

		--target=$(GNU_TARGET_NAME) \

		--host=$(REAL_GNU_TARGET_NAME) \
@@ -101,8 +103,8 @@ $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked 
		--enable-shared \

		--enable-static \

		--with-x \

		--x-includes=$(STAGING_DIR)/usr/X11R6/include \

		--x-libraries=$(STAGING_DIR)/usr/X11R6/lib \

		--x-includes=$(STAGING_DIR)/usr/include/X11 \

		--x-libraries=$(STAGING_DIR)/usr/lib \

		--disable-glibtest \

		--enable-explicit-deps=no \

		--disable-debug \

package/cairo/Config.in

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ config BR2_PACKAGE_CAIRO 
	default n

	select BR2_PACKAGE_PKGCONFIG

	select BR2_PACKAGE_LIBPNG

	select BR2_PACKAGE_ZLIB

	select BR2_PACKAGE_FONTCONFIG

	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX

	help

	  Cairo is a 2D graphics library with support for multiple

package/cairo/cairo.mk

+3 −3
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked 
		--enable-shared \

		--enable-static \

		--with-x \

		--x-includes=$(STAGING_DIR)/usr/include \

		--x-libraries=$(STAGING_DIR)/lib \

		--x-includes=$(STAGING_DIR)/usr/include/X11 \

		--x-libraries=$(STAGING_DIR)/usr/lib \

		--enable-ps=yes \

		--enable-pdf=yes \

		--enable-svg=no \
@@ -128,7 +128,7 @@ $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY) 
	$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libcairo.so.2.*

	touch -c $(TARGET_DIR)/lib/libcairo.so.2.9.3



cairo: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3

cairo: uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3



cairo-clean:

	rm -f $(TARGET_DIR)/lib/$(CAIRO_BINARY)