[packages_10.03.2] libosip2: merge r27886, r28099

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30054 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile
index 1f22ac0..d36a6a0 100644 (file)
--- a/libs/libosip2/Makefile
+++ b/libs/libosip2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libosip2
-PKG_VERSION:=3.1.0
-PKG_RELEASE:=2
+PKG_VERSION:=3.5.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
-PKG_MD5SUM:=7eb305608256ac2a7a27b66ce52627c8
+PKG_MD5SUM:=7691546f6b3349d10007fc1aaff0f4e0
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,7 +43,6 @@ define Build/Configure
                --disable-trace \
                --enable-pthread \
                --enable-semaphore \
-               --enable-ntimer \
        )
 endef
 

diff --git a/libs/libosip2/patches/001-automake-compat.patch b/libs/libosip2/patches/001-automake-compat.patch
index 1a6a0ec..9c0bc11 100644 (file)
--- a/libs/libosip2/patches/001-automake-compat.patch
+++ b/libs/libosip2/patches/001-automake-compat.patch
@@ -5,4 +5,4 @@
 +
  EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in
  
- SUBDIRS = include src scripts help platform debian
+ SUBDIRS = include src scripts help platform