X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=Xorg%2Fxorg%2Flib%2FlibXext%2FMakefile;h=6a1bebccd264512d748bba6e9ca4be68be00c98c;hb=96ecba3aed726661c955b2773d6c055a8c72f5af;hp=726b39705ca0684f57607e4cb7fa54fd68bc0494;hpb=a4aec035146f59d7fae62db3878b39e0a1810d4d;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/Xorg/xorg/lib/libXext/Makefile b/Xorg/xorg/lib/libXext/Makefile
index 726b39705c..6a1bebccd2 100644
--- a/Xorg/xorg/lib/libXext/Makefile
+++ b/Xorg/xorg/lib/libXext/Makefile
@@ -1,20 +1,23 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXext
 PKG_NAME:=libXext
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.4
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
+PKG_RELEASE:=1
+PKG_VERSION:=1.1.1
+
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=c417c0e8df39a067f90a2a2e7133637d
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto xextproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -22,28 +25,37 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libXext
   SECTION:=xorg-lib
   CATEGORY:=Xorg
-  SUBMENU:=lib
+  SUBMENU:=libraries
   DEPENDS:=+libX11 +libXau
   TITLE:=libXext
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+	$(call Build/Configure/Default, \
+		--enable-malloc0returnsnull \
+	)
+endef
 
-define Build/Compile
-	$(call $(PKG_NAME)/Compile)
-	make -C $(PKG_BUILD_DIR)
-	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+		$(1)/usr/lib/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+		$(1)/usr/lib/pkgconfig/
+	$(INSTALL_DIR) $(1)/usr/include/X11/extensions
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \
+		$(1)/usr/include/X11/extensions/
 endef
 
 define Package/libXext/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
+		$(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXext))