pjproject: sort configure args, remove duplicates

[feed/telephony.git] / libs / pjproject / Makefile

diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile
index 9d8de1e0193b2c8d0f46afc27d6d9259aad7a723..64682fa5d5070d6549af9d58b5ee13bd164b8cf6 100644 (file)
--- a/libs/pjproject/Makefile
+++ b/libs/pjproject/Makefile
@@ -1,6 +1,7 @@
 #
-# Copyright (C) 2015 OpenWrt.org
-# Copyright (C) 2015 Cesnet, z.s.p.o.
+# Copyright (C) 2006-2017 OpenWrt.org
+# Copyright (C) 2016 Cesnet, z.s.p.o.
+# Copyright (C) 2017 Jiri Slachta <jiri@slachta.eu>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,18 +10,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pjproject
-PKG_VERSION:=2.3
-PKG_RELEASE:=1
+PKG_VERSION:=2.6
+PKG_RELEASE:=2
 
 PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/
-PKG_MD5SUM:=8440e43242c439ae5ec30b5b85005fce
+PKG_HASH:=2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -30,13 +31,13 @@ define Package/pjproject/Default
   SECTION:=lib
   CATEGORY:=Libraries
   SUBMENU:=Telephony
-  URL:=http://www.pjproject.org/
+  URL:=http://www.pjsip.org/
   DEPENDS:=+libuuid +libstdcpp +libpthread
 endef
 
 define Package/pjproject/install/lib
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/$(2).so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/$(2).so* $(1)/usr/lib/
 endef
 
 define PJSIPpackage
@@ -54,34 +55,33 @@ $(call Package/pjproject/install/lib,$$(1),$2)
 endef
 
 CONFIGURE_ARGS += \
-       --enable-shared \
+       --disable-ffmpeg \
        --disable-floating-point \
-       --enable-g711-codec \
-       --disable-l16-codec \
+       --disable-g711-codec \
        --disable-g722-codec \
        --disable-g7221-codec \
        --disable-gsm-codec \
+       --disable-ilbc-codec \
        --disable-ilbc-coder \
        --disable-ipp \
-       --disable-ssl \
+       --disable-l16-codec \
+       --disable-large-filter \
+       --disable-libwebrtc \
+       --disable-libyuv \
+       --disable-opus \
        --disable-oss \
-       --disable-sound \
-       --with-external-srtp="$(STAGING_DIR)/usr" \
-       --without-external-gsm \
+       --disable-resample-dll \
+       --disable-sdl \
        --disable-small-filter \
-       --disable-large-filter \
+       --disable-sound \
        --disable-speex-aec \
-       --disable-g711-codec \
-       --disable-l16-codec \
-       --disable-gsm-codec \
-       --disable-g722-codec \
-       --disable-g7221-codec \
        --disable-speex-codec \
-       --disable-ilbc-codec \
-       --disable-resample-dll \
-       --disable-sdl \
-       --disable-ffmpeg \
-       --disable-v4l2
+       --disable-ssl \
+       --disable-v4l2 \
+       --enable-g711-codec \
+       --enable-shared \
+       --with-external-srtp="$(STAGING_DIR)/usr" \
+       --without-external-gsm
 
 TARGET_LDFLAGS+=-lc $(LIBGCC) -lm
 TARGET_CFLAGS+=$(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)
@@ -91,8 +91,7 @@ define Build/Compile
 endef
 
 PJPROJECT_LIBS = \
-       libpj libpjlib-util libpjmedia-audiodev libpjmedia-codec \
-       libpjmedia-videodev libpjmedia libpjnath libpjsip-simple \
+       libpj libpjlib-util libpjmedia libpjnath libpjsip-simple \
        libpjsip-ua libpjsip libpjsua libpjsua2 libresample
 
 define Build/InstallDev