libart: update to 2.3.21

SVN-Revision: 21022

diff --git a/libs/libart/Makefile b/libs/libart/Makefile
index b029025061a533da192a862753381641078cf8ab..f6a73c9480d71f30f7f1e338f5135865af18d212 100644 (file)
--- a/libs/libart/Makefile
+++ b/libs/libart/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,20 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libart
-PKG_VERSION:=2.3.20
-PKG_RELEASE:=3
+PKG_VERSION:=2.3.21
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_lgpl-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)_lgpl/2.3
-PKG_MD5SUM:=d0ce67f2ebcef1e51a83136c69242a73
+PKG_MD5SUM:=08559ff3c67fd95d57b0c5e91a6b4302
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_lgpl-$(PKG_VERSION)
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-PKG_INSTALL=1
-
 define Package/libart
   SECTION:=libs
   CATEGORY:=Libraries
@@ -30,28 +30,21 @@ define Package/libart
 endef
 
 define Package/libart/description
-       A library of functions for 2D graphics supporting a superset of the 
-       PostScript imaging model, designed to be integrated with graphics, artwork, 
-       and illustration programs. It is written in optimized C, and is fully 
-       compatible with C++. With a small footprint of 10,000 lines of code, it is 
-       especially suitable for embedded applications.
+ A library of functions for 2D graphics supporting a superset of the
+ PostScript imaging model, designed to be integrated with graphics,
+ artwork, and illustration programs. It is written in optimized C, and
+ is fully compatible with C++. With a small footprint of 10,000 lines of
+ code, it is especially suitable for embedded applications.
 endef
 
-TARGET_CFLAGS += $(FPIC)
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) HOSTCC="$(HOSTCC)"
-endef
+TARGET_CFLAGS += $(FPIC)
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
+       $(INSTALL_DIR) $(2)/bin $(1)/usr/include $(1)/usr/lib/pkgconfig
        $(INSTALL_BIN) \
                $(PKG_INSTALL_DIR)/usr/bin/libart2-config \
                $(2)/bin/

diff --git a/libs/libart/patches/100-cross_compile_fix.patch b/libs/libart/patches/100-cross_compile_fix.patch
deleted file mode 100644 (file)
index dd1f359..0000000
--- a/libs/libart/patches/100-cross_compile_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN libart_lgpl-2.3.19/Makefile.in libart_lgpl-2.3.19.new/Makefile.in
---- libart_lgpl-2.3.19/Makefile.in     2007-02-28 14:00:24.000000000 +0100
-+++ libart_lgpl-2.3.19.new/Makefile.in 2007-12-29 02:01:55.000000000 +0100
-@@ -474,9 +474,9 @@
-         echo " rm -f $$p $$f"; \
-         rm -f $$p $$f ; \
-       done
--gen_art_config$(EXEEXT): $(gen_art_config_OBJECTS) $(gen_art_config_DEPENDENCIES) 
-+gen_art_config$(EXEEXT):
-       @rm -f gen_art_config$(EXEEXT)
--      $(LINK) $(gen_art_config_OBJECTS) $(gen_art_config_LDADD) $(LIBS)
-+      $(HOSTCC) -I. -DLIBART_COMPILATION -DHAVE_CONFIG_H -o $@ gen_art_config.c
- testart$(EXEEXT): $(testart_OBJECTS) $(testart_DEPENDENCIES) 
-       @rm -f testart$(EXEEXT)
-       $(testart_LINK) $(testart_OBJECTS) $(testart_LDADD) $(LIBS)