Cleanup pixman package.

SVN-Revision: 13250

diff --git a/Xorg/lib/pixman/Makefile b/Xorg/lib/pixman/Makefile
index 67a5170b86453ff4469a2be26e8675cbb5dad891..96d14adb06118a1734969a079f242b4aff721cda 100644 (file)
--- a/Xorg/lib/pixman/Makefile
+++ b/Xorg/lib/pixman/Makefile
@@ -1,51 +1,50 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # 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:=pixman
 PKG_NAME:=pixman
 include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=pixman
 PKG_NAME:=pixman

-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_VERSION:=0.12.0
 PKG_VERSION:=0.12.0

+

 PKG_SOURCE_URL:=http://cairographics.org/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://cairographics.org/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_MD5SUM:=09357cc74975b01714e00c5899ea1881
+PKG_FIXUP:=libtool

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+PKG_INSTALL:=1

 
 define Package/pixman
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
 
 define Package/pixman
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib

-  DEPENDS:=@DISPLAY_SUPPORT

   TITLE:=pixman
   TITLE:=pixman

-  URL:=http://xorg.freedesktop.org/
+  URL:=http://cairographics.org/

 endef
 
 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/Configure
+       $(call Build/Configure/Default, \
+               --disable-gtk \
+       )

 endef
 
 endef
 

-define Build/Configure
-       $(call Build/Configure/Default, --enable-malloc0returnsnull)
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 define Package/pixman/install
        $(INSTALL_DIR) $(1)/usr/lib
 endef
 
 define Package/pixman/install
        $(INSTALL_DIR) $(1)/usr/lib

-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,pixman))
 endef
 
 $(eval $(call BuildPackage,pixman))