From eff13c8afdbfc49325c52bc3ca58dd8665d602b5 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Sun, 27 Feb 2011 19:47:03 +0100
Subject: Packages: X11/libXrandr: convert to use generic macros

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 packages/x11/libxrandr/libxrandr.kconfig |  9 +++++
 packages/x11/libxrandr/libxrandr.mk      | 61 ++++----------------------------
 2 files changed, 16 insertions(+), 54 deletions(-)

(limited to 'packages')

diff --git a/packages/x11/libxrandr/libxrandr.kconfig b/packages/x11/libxrandr/libxrandr.kconfig
index 90eef41..983ed98 100644
--- a/packages/x11/libxrandr/libxrandr.kconfig
+++ b/packages/x11/libxrandr/libxrandr.kconfig
@@ -25,6 +25,7 @@
 
 config EMBTK_HAVE_LIBXRANDR
 	bool "Have libXrandr"
+	select EMBTK_LIBXRANDR_PKG_IS_TARBZ2
 	select EMBTK_HAVE_XPROTO
 	select EMBTK_HAVE_RANDRPROTO
 	help
@@ -46,3 +47,11 @@ config EMBTK_LIBXRANDR_VERSION_STRING
 	default "1.3.1"		if EMBTK_LIBXRANDR_VERSION_1_3_1
 	default "1.3.0"		if EMBTK_LIBXRANDR_VERSION_1_3_0
 
+config EMBTK_LIBXRANDR_NEED_PATCH
+	bool
+config EMBTK_LIBXRANDR_NEED_AUTORECONF
+	bool
+config EMBTK_LIBXRANDR_PKG_IS_TARGZ
+	bool
+config EMBTK_LIBXRANDR_PKG_IS_TARBZ2
+	bool
diff --git a/packages/x11/libxrandr/libxrandr.mk b/packages/x11/libxrandr/libxrandr.mk
index 9c14573..3daf312 100644
--- a/packages/x11/libxrandr/libxrandr.mk
+++ b/packages/x11/libxrandr/libxrandr.mk
@@ -23,9 +23,13 @@
 # \date         June 2010
 ################################################################################
 
+LIBXRANDR_NAME := libXrandr
 LIBXRANDR_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_LIBXRANDR_VERSION_STRING)))
 LIBXRANDR_SITE := http://xorg.freedesktop.org/archive/individual/lib
+LIBXRANDR_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXRANDR_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxrandr/$(LIBXRANDR_VERSION)
 LIBXRANDR_PACKAGE := libXrandr-$(LIBXRANDR_VERSION).tar.bz2
+LIBXRANDR_SRC_DIR := $(PACKAGES_BUILD)/libXrandr-$(LIBXRANDR_VERSION)
 LIBXRANDR_BUILD_DIR := $(PACKAGES_BUILD)/libXrandr-$(LIBXRANDR_VERSION)
 
 LIBXRANDR_BINS =
@@ -37,61 +41,10 @@ LIBXRANDR_PKGCONFIGS = xrandr.pc
 LIBXRANDR_DEPS = xproto_install randrproto_install
 
 libxrandr_install:
-	@test -e $(LIBXRANDR_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBXRANDR_BUILD_DIR)/.installed
-
-$(LIBXRANDR_BUILD_DIR)/.installed: $(LIBXRANDR_DEPS) download_libxrandr \
-	$(LIBXRANDR_BUILD_DIR)/.decompressed $(LIBXRANDR_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
-	libxrandr-$(LIBXRANDR_VERSION) in your root filesystem...")
-	$(call EMBTK_KILL_LT_RPATH,$(LIBXRANDR_BUILD_DIR))
-	$(Q)$(MAKE) -C $(LIBXRANDR_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBXRANDR_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
+	$(call EMBTK_INSTALL_PKG,LIBXRANDR)
 
 download_libxrandr:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(LIBXRANDR_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(LIBXRANDR_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(LIBXRANDR_PACKAGE) \
-	$(LIBXRANDR_SITE)/$(LIBXRANDR_PACKAGE)
-
-$(LIBXRANDR_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(LIBXRANDR_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(LIBXRANDR_PACKAGE)
-	@touch $@
-
-$(LIBXRANDR_BUILD_DIR)/.configured:
-	$(Q)cd $(LIBXRANDR_BUILD_DIR); \
-	CC=$(TARGETCC_CACHED) \
-	CXX=$(TARGETCXX_CACHED) \
-	AR=$(TARGETAR) \
-	RANLIB=$(TARGETRANLIB) \
-	AS=$(CROSS_COMPILE)as \
-	LD=$(TARGETLD) \
-	NM=$(TARGETNM) \
-	STRIP=$(TARGETSTRIP) \
-	OBJDUMP=$(TARGETOBJDUMP) \
-	OBJCOPY=$(TARGETOBJCOPY) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
-	CPPFLGAS="-I$(SYSROOT)/usr/include" \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) --prefix=/usr \
-	--disable-malloc0returnsnull
-	@touch $@
+	$(call EMBTK_DOWNLOAD_PKG,LIBXRANDR)
 
 libxrandr_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup libxrandr...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBXRANDR_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBXRANDR_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXRANDR_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXRANDR_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXRANDR_PKGCONFIGS)
-	$(Q)-rm -rf $(LIBXRANDR_BUILD_DIR)*
-
+	$(call EMBTK_CLEANUP_PKG,LIBXRANDR)
-- 
cgit v1.2.3