Changeset 30520


Ignore:
Timestamp:
2012-02-14T16:05:55+01:00 (6 years ago)
Author:
blogic
Message:

[pjsip] bump to 1.12, merge improved lantiq aud_dev driver

Location:
trunk/package/pjsip
Files:
2 added
3 deleted
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/pjsip/Makefile

    r28963 r30520  
    99 
    1010PKG_NAME:=pjsip 
    11 PKG_VERSION:=1.10 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=1.12 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/ 
    16 PKG_MD5SUM:=e215d0637d3422d49a63c2cde6673951 
     16PKG_MD5SUM:=1db8e5a5dd73b216409b15afa34651a4 
    1717 
    1818PKG_INSTALL:=1 
     
    7070endif 
    7171 
    72 Package/pjsip-oss=$(call Package/pjsip-template,oss,) 
     72Package/pjsip-oss=$(call Package/pjsip-template,oss,BROKEN) 
    7373Package/pjsip-ltq-tapi=$(call Package/pjsip-template,ltq-tapi,@TARGET_lantiq +TARGET_lantiq:kmod-ltq-tapi +TARGET_lantiq:kmod-ltq-vmmc) 
    7474 
     75USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1) 
     76ifneq ($(USE_LOCAL),) 
    7577define Build/Prepare 
    76         $(PKG_UNPACK) 
    77         $(Build/Patch) 
    78         $(CP) ./src/* $(PKG_BUILD_DIR) 
     78        $(CP) ./src/*  $(PKG_BUILD_DIR) 
    7979endef 
     80endif 
    8081 
    8182define Build/Configure 
  • trunk/package/pjsip/patches/0001-configure-fixup.patch

    r30519 r30520  
     1From 01108f66fd20dcdbb9fde0dd00924ee4e8c28a7c Mon Sep 17 00:00:00 2001 
     2From: John Crispin <blogic@openwrt.org> 
     3Date: Sat, 28 Jan 2012 21:41:18 +0100 
     4Subject: [PATCH 1/3] configure fixup 
     5 
     6--- 
     7 pjproject-1.12/aconfigure.ac                |   13 +++++++++++-- 
     8 pjproject-1.12/pjmedia/build/os-auto.mak.in |    9 ++++++++- 
     9 2 files changed, 19 insertions(+), 3 deletions(-) 
     10 
     11diff --git a/aconfigure.ac b/aconfigure.ac 
     12index 84295b5..e34fd32 100644 
    113--- a/aconfigure.ac 
    214+++ b/aconfigure.ac 
     
    1123+LD="${CROSS_COMPILE}gcc" 
    1224 AC_SUBST(LD) 
    13  if test "$LDOUT" = ""; then LDOUT="-o"; fi 
     25 if test "$LDOUT" = ""; then LDOUT="-o "; fi 
    1426 AC_SUBST(LDOUT) 
    15 @@ -597,6 +597,15 @@ AC_ARG_ENABLE(ext_sound, 
    16                 AC_MSG_RESULT([Checking if external sound is set... yes]) 
     27@@ -604,6 +604,15 @@ AC_ARG_ENABLE(ext_sound, 
    1728               fi] 
    1829              ) 
    19 + 
     30  
    2031+AC_ARG_ENABLE(ltq_tapi, 
    2132+             AC_HELP_STRING([--enable-ltq-tapi], 
     
    2637+              fi] 
    2738+             ) 
    28   
     39+ 
    2940 dnl # Include resampling small filter 
    3041 AC_SUBST(ac_no_small_filter) 
     42 AC_ARG_ENABLE(small-filter, 
     43diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in 
     44index 145f1d5..be38aeb 100644 
    3145--- a/pjmedia/build/os-auto.mak.in 
    3246+++ b/pjmedia/build/os-auto.mak.in 
    33 @@ -118,4 +118,11 @@ ifeq ($(AC_PJMEDIA_SND),external) 
     47@@ -125,4 +125,11 @@ ifeq ($(AC_PJMEDIA_SND),external) 
    3448 export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 
    3549 endif 
     
    4458+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_TAPI_DEVICE=1 
    4559+endif 
     60--  
     611.7.7.1 
     62 
Note: See TracChangeset for help on using the changeset viewer.