Commit 3244ba1b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'x11r75' of git://gitorious.org/takeme-buildroot/takeme-buildroot

parents 73f244d5 3437f2be

package/libdrm/libdrm.mk

+9 −75
Original line number Diff line number Diff line
@@ -3,78 +3,12 @@ 
# libdrm

#

#############################################################

LIBDRM_VERSION:=2.3.0

LIBDRM_SOURCE:=libdrm-$(LIBDRM_VERSION).tar.bz2

LIBDRM_SITE:=http://dri.freedesktop.org/libdrm/

LIBDRM_CAT:=$(BZCAT)

LIBDRM_DIR:=$(BUILD_DIR)/libdrm-$(LIBDRM_VERSION)



$(DL_DIR)/$(LIBDRM_SOURCE):

	$(call DOWNLOAD,$(LIBDRM_SITE),$(LIBDRM_SOURCE))



libdrm-source: $(DL_DIR)/$(LIBDRM_SOURCE)



$(LIBDRM_DIR)/.unpacked: $(DL_DIR)/$(LIBDRM_SOURCE)

	$(LIBDRM_CAT) $(DL_DIR)/$(LIBDRM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	$(CONFIG_UPDATE) $(LIBDRM_DIR)

	touch $@



$(LIBDRM_DIR)/.configured: $(LIBDRM_DIR)/.unpacked

	(cd $(LIBDRM_DIR); rm -f config.cache; \

	$(TARGET_CONFIGURE_OPTS) \

	CFLAGS="$(TARGET_CFLAGS) " \

	LDFLAGS="$(TARGET_LDFLAGS)" \

	./configure $(QUIET) \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

		--exec-prefix=/usr \

		--bindir=/usr/bin \

		--sbindir=/usr/sbin \

		--libdir=/usr/lib \

		--libexecdir=/usr/lib \

		--sysconfdir=/etc \

		--datadir=/usr/share \

		--localstatedir=/var \

		--includedir=/usr/include \

		--mandir=/usr/man \

		--infodir=/usr/info \

	)

	touch $@



$(LIBDRM_DIR)/.compiled: $(LIBDRM_DIR)/.configured

	$(MAKE) CCexe="$(HOSTCC)" -C $(LIBDRM_DIR)

	touch $(LIBDRM_DIR)/.compiled



$(STAGING_DIR)/usr/lib/libdrm.so: $(LIBDRM_DIR)/.compiled

	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBDRM_DIR) install

	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdrm.la

	#$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \

	# -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \

	# -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \

	# -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \

	# $(STAGING_DIR)/usr/bin/libdrm-config

	touch -c $(STAGING_DIR)/usr/lib/libdrm.so



$(TARGET_DIR)/usr/lib/libdrm.so: $(STAGING_DIR)/usr/lib/libdrm.so

	cp -dpf $(STAGING_DIR)/usr/lib/libdrm.so* $(TARGET_DIR)/usr/lib/

	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdrm.so



libdrm: host-pkg-config $(TARGET_DIR)/usr/lib/libdrm.so



libdrm-clean:

	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIBDRM_DIR) uninstall

	-$(MAKE) -C $(LIBDRM_DIR) clean



libdrm-dirclean:

	rm -rf $(LIBDRM_DIR)



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_LIBDRM),y)

TARGETS+=libdrm

endif
 
LIBDRM_VERSION = 2.4.11

LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2

LIBDRM_SITE = http://dri.freedesktop.org/libdrm/

LIBDRM_AUTORECONF = NO

LIBDRM_LIBTOOL_PATCH = NO

LIBDRM_INSTALL_STAGING = YES

LIBDRM_INSTALL_TARGET = YES



$(eval $(call AUTOTARGETS,package,libdrm))

package/pixman/pixman.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# pixman

#

################################################################################

PIXMAN_VERSION = 0.10.0

PIXMAN_VERSION = 0.17.4

PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz

PIXMAN_SITE = http://cairographics.org/releases/

PIXMAN_AUTORECONF = NO

package/x11r7/Config.in

+2 −12
Original line number Diff line number Diff line 
menuconfig BR2_PACKAGE_XORG7

	bool "X.org X Window System, X11R7, release 7.4"

	bool "X.org X Window System, X11R7, release 7.5"

	select BR2_PACKAGE_ZLIB

	select BR2_PACKAGE_LIBPNG

	select BR2_PACKAGE_EXPAT
@@ -82,7 +82,6 @@ endmenu 
		source package/x11r7/xlib_libXxf86vm/Config.in

		source package/x11r7/xlib_libdmx/Config.in

		source package/x11r7/xlib_libfontenc/Config.in

		source package/x11r7/xlib_liblbxutil/Config.in

		source package/x11r7/xlib_liboldX/Config.in

		source package/x11r7/xlib_libxkbfile/Config.in

		source package/x11r7/xlib_libxkbui/Config.in
@@ -100,13 +99,11 @@ endmenu 
		source package/x11r7/xapp_fstobdf/Config.in

		source package/x11r7/xapp_iceauth/Config.in

		source package/x11r7/xapp_ico/Config.in

		source package/x11r7/xapp_lbxproxy/Config.in

		source package/x11r7/xapp_listres/Config.in

		source package/x11r7/xapp_luit/Config.in

		source package/x11r7/xapp_mkfontdir/Config.in

		source package/x11r7/xapp_mkfontscale/Config.in

		source package/x11r7/xapp_oclock/Config.in

		source package/x11r7/xapp_proxymngr/Config.in

		source package/x11r7/xapp_rgb/Config.in

		source package/x11r7/xapp_rstart/Config.in

		source package/x11r7/xapp_scripts/Config.in
@@ -135,11 +132,9 @@ endmenu 
		source package/x11r7/xapp_xeyes/Config.in

		source package/x11r7/xapp_xf86dga/Config.in

		source package/x11r7/xapp_xfd/Config.in

		source package/x11r7/xapp_xfindproxy/Config.in

		source package/x11r7/xapp_xfontsel/Config.in

		source package/x11r7/xapp_xfs/Config.in

		source package/x11r7/xapp_xfsinfo/Config.in

		source package/x11r7/xapp_xfwp/Config.in

		source package/x11r7/xapp_xgamma/Config.in

		source package/x11r7/xapp_xgc/Config.in

		source package/x11r7/xapp_xhost/Config.in
@@ -161,7 +156,6 @@ endmenu 
		source package/x11r7/xapp_xmh/Config.in

		source package/x11r7/xapp_xmodmap/Config.in

		source package/x11r7/xapp_xmore/Config.in

		source package/x11r7/xapp_xphelloworld/Config.in

		source package/x11r7/xapp_xplsprinters/Config.in

		source package/x11r7/xapp_xpr/Config.in

		source package/x11r7/xapp_xprehashprinterlist/Config.in
@@ -169,7 +163,6 @@ endmenu 
		source package/x11r7/xapp_xrandr/Config.in

		source package/x11r7/xapp_xrdb/Config.in

		source package/x11r7/xapp_xrefresh/Config.in

		source package/x11r7/xapp_xrx/Config.in

		source package/x11r7/xapp_xset/Config.in

		source package/x11r7/xapp_xsetmode/Config.in

		source package/x11r7/xapp_xsetpointer/Config.in
@@ -207,7 +200,6 @@ endmenu 
		source package/x11r7/xdriver_xf86-video-glint/Config.in

		source package/x11r7/xdriver_xf86-video-i128/Config.in

		source package/x11r7/xdriver_xf86-video-i740/Config.in

		source package/x11r7/xdriver_xf86-video-impact/Config.in

		source package/x11r7/xdriver_xf86-video-intel/Config.in

		source package/x11r7/xdriver_xf86-video-mach64/Config.in

		source package/x11r7/xdriver_xf86-video-mga/Config.in
@@ -223,7 +215,6 @@ endmenu 
		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in

		source package/x11r7/xdriver_xf86-video-sis/Config.in

		source package/x11r7/xdriver_xf86-video-sisusb/Config.in

		source package/x11r7/xdriver_xf86-video-sunbw2/Config.in

		source package/x11r7/xdriver_xf86-video-suncg14/Config.in

		source package/x11r7/xdriver_xf86-video-suncg3/Config.in

		source package/x11r7/xdriver_xf86-video-suncg6/Config.in
@@ -235,7 +226,6 @@ endmenu 
		source package/x11r7/xdriver_xf86-video-trident/Config.in

		source package/x11r7/xdriver_xf86-video-tseng/Config.in

		source package/x11r7/xdriver_xf86-video-v4l/Config.in

		source package/x11r7/xdriver_xf86-video-vermilion/Config.in

		source package/x11r7/xdriver_xf86-video-vesa/Config.in

		source package/x11r7/xdriver_xf86-video-vmware/Config.in

		source package/x11r7/xdriver_xf86-video-voodoo/Config.in
@@ -291,6 +281,7 @@ endmenu 
		source package/x11r7/xproto_compositeproto/Config.in

		source package/x11r7/xproto_damageproto/Config.in

		source package/x11r7/xproto_dmxproto/Config.in

		source package/x11r7/xproto_dri2proto/Config.in

		source package/x11r7/xproto_evieext/Config.in

		source package/x11r7/xproto_fixesproto/Config.in

		source package/x11r7/xproto_fontcacheproto/Config.in
@@ -317,7 +308,6 @@ endmenu 
		source package/x11r7/xproto_xf86vidmodeproto/Config.in

		source package/x11r7/xproto_xineramaproto/Config.in

		source package/x11r7/xproto_xproto/Config.in

		source package/x11r7/xproto_xproxymanagementprotocol/Config.in

	endmenu

	menu "X11R7 Utilities"

		source package/x11r7/xutil_makedepend/Config.in

package/x11r7/libxcb/libxcb.mk

+3 −2
Original line number Diff line number Diff line
@@ -3,16 +3,17 @@ 
# libxcb

#

#############################################################

LIBXCB_VERSION = 1.1

LIBXCB_VERSION = 1.5

LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2

LIBXCB_SITE = http://xcb.freedesktop.org/dist/



LIBXCB_INSTALL_STAGING = YES



LIBXCB_AUTORECONF = NO

LIBXCB_LIBTOOL_PATCH = NO

LIBXCB_DEPENDENCIES = host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau

LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"

LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb

LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XCBPROTO_XCBPYTHONDIR=$(STAGING_DIR)/usr/lib/python2.6/site-packages



$(eval $(call AUTOTARGETS,package/x11r7,libxcb))

package/x11r7/xapp_bdftopcf/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ config BR2_PACKAGE_XAPP_BDFTOPCF 
	bool "bdftopcf"

	select BR2_PACKAGE_XLIB_LIBXFONT

	help

	  bdftopcf 1.0.0

	  bdftopcf 1.0.2

	  X.Org bdftopcf application