Update imlib2 to 1.4.1.

SVN-Revision: 12903

diff --git a/XOrg/lib/imlib2/Makefile b/XOrg/lib/imlib2/Makefile
index 915d05114f8d9eb7546815f794d0902ac82f1dbc..bc256e53be610227eab97270ede9a6c49c1eaa2d 100644 (file)
--- a/XOrg/lib/imlib2/Makefile
+++ b/XOrg/lib/imlib2/Makefile
@@ -9,15 +9,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=imlib2
-PKG_VERSION:=1.2.2
-PKG_RELEASE:=1
+PKG_VERSION:=1.4.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/enlightenment
-PKG_FIXUP = libtool
+PKG_MD5SUM:=07b2a7745ddd3c7c4480b50cb916174c
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 define Package/imlib2
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
@@ -29,37 +32,42 @@ endef
 CONFIGURE_ARGS+=--disable-gtktest LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
 EXTRA_LDFLAGS+=-lnotimpl
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{include,lib/pkgconfig}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/* \
+               $(1)/usr/include/
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) install DESTDIR=$(PKG_INSTALL_DIR)
-endef
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{la,so*} \
+               $(1)/usr/lib/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
 
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-       $(CP) $(PKG_BUILD_DIR)/src/modules/loaders/.libs/*.so $(1)/usr/lib/imlib2/loaders/
        $(INSTALL_DIR) $(2)/bin
-       mv $(1)/usr/bin/imlib2-config $(2)/bin/
-       $(SED)  "s,prefix.*,prefix=$(STAGING_DIR)/usr,g" $(2)/bin/imlib2-config
-       $(SED)  "s,exec_prefix.*,exec_prefix=$(STAGING_DIR)/usr,g" $(2)/bin/imlib2-config
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/imlib2-config \
+               $(2)/bin/
+       $(SED) \
+               's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+               $(2)/bin/imlib2-config
 endef
 
 define Package/imlib2/install
-       $(INSTALL_DIR) $(1)/usr/lib/imlib2/loaders/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
-       $(CP) $(PKG_BUILD_DIR)/src/modules/loaders/.libs/*.so $(1)/usr/lib/imlib2/loaders/
+       $(INSTALL_DIR) $(1)/usr/lib/imlib2/{loaders,filters}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/imlib2/filters/*.so* \
+               $(1)/usr/lib/imlib2/filters
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/imlib2/loaders/*.so* \
+               $(1)/usr/lib/imlib2/loaders
 endef
 
 $(eval $(call BuildPackage,imlib2))