From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 3 Jan 2010 21:47:00 +0000 (+0000)
Subject: [package] Upgrade libsoup to 2.28.2
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=34cc0d0dfd09c6b8c90b123540a18322075140a4;p=packages.git

[package] Upgrade libsoup to 2.28.2


git-svn-id: svn://svn.openwrt.org/openwrt/packages@19028 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile
index 2038311a5..46b2cc518 100644
--- a/libs/libsoup/Makefile
+++ b/libs/libsoup/Makefile
@@ -1,64 +1,68 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# This Makefile is a skeleton
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsoup
-PKG_VERSION:=2.26.3
+PKG_VERSION:=2.28.2
 PKG_RELEASE:=1
-PKG_INSTALL:=1
-PKG_SOURCE:=libsoup-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNOME/libsoup/2.26
-PKG_MD5SUM:=c893b5499c77b995244d968dbf4eeb51
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.28
+PKG_MD5SUM:=31d7ad416005eed4b78f07ac01b6b9f0
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS+=\
+	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
+	-I$(STAGING_DIR)/usr/lib/libiconv/include/
+
+TARGET_LDFLAGS+=\
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+
 define Package/libsoup
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+glib2 +libxml2
   TITLE:=libsoup
-  URL:=http://live.gnome.org/LibSoup/
-endef
-
-define Package/libsoup/decription
-  Libsoup is an HTTP library implementation in C
+  URL:=http://live.gnome.org/LibSoup
+  DEPENDS:=+glib2 +libxml2 +libgnutls
 endef
 
 define Build/Configure
 	$(call Build/Configure/Default, \
-	 	--without-gnome \
-	 )
+		--enable-ssl \
+		--disable-glibtest \
+		--without-apache-httpd \
+		--without-gnome \
+	)
+endef
+
+define package/libsoup/decription
+Libsoup is an HTTP library implementation in C
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/libsoup-2.4/ \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/libsoup-2.4/libsoup}
+
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+		$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.{so*,la,a} \
 		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
+
 	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
 		$(1)/usr/lib/pkgconfig/
+
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/libsoup-2.4/libsoup/*.h \
+		$(1)/usr/include/libsoup-2.4/libsoup/
 endef
 
 define Package/libsoup/install
-	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
+		$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.so* \
 		$(1)/usr/lib/
 endef