adjust dependencies regarding previous name change "DirectFB" -> "directfb"

[openwrt/svn-archive/archive.git] / Xorg / lib / librsvg / Makefile

diff --git a/Xorg/lib/librsvg/Makefile b/Xorg/lib/librsvg/Makefile
index ca9346f9586cac8da99e7c0bd7ab2bdd10742d13..4c39ff3febecd779700a3a263de865fd7e8461d2 100644 (file)
--- a/Xorg/lib/librsvg/Makefile
+++ b/Xorg/lib/librsvg/Makefile
@@ -1,20 +1,19 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 12603 2008-09-13 17:54:20Z lars $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=librsvg
-PKG_VERSION:=2.22.2
-PKG_RELEASE:=1
+PKG_VERSION:=2.22.3
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22
-PKG_MD5SUM:=aae602677ce201b1a0ed6a0c18c207f2
+PKG_MD5SUM:=c4ec4fdb2b1842e221ca39127e85682d
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
@@ -25,12 +24,10 @@ EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
                -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
                -L$(STAGING_DIR)/usr/lib/libiconv/lib/
 
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libcroco-0.6
-
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_librsvg CONFIG_PACKAGE_librsvg-pixbuf-loader)
 
 define Package/librsvg
-  SECTION:=xorg-libs
+  SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
   TITLE:=SVG rendering library
@@ -39,7 +36,7 @@ define Package/librsvg
 endef
 
 define Package/librsvg-pixbuf-loader
-  SECTION:=xorg-libs
+  SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
   TITLE:=SVG rendering library
@@ -65,7 +62,7 @@ endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
        $(INSTALL_DIR) $(1)/usr/include/
@@ -74,13 +71,13 @@ endef
 
 define Package/librsvg/install
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
 endef
 
 define Package/librsvg-pixbuf-loader/install
        $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/loaders
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/loaders/*.{so*,a} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/loaders/*.so* \
                $(1)/usr/lib/gtk-2.0/2.10.0/loaders
 endef