From: Sebastian Kemper Date: Wed, 27 Dec 2017 21:18:22 +0000 (+0100) Subject: bcg729: fix 1.0.4 build X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F231%2Fhead;p=feed%2Ftelephony.git bcg729: fix 1.0.4 build - the Savannah source URI doesn't have the 1.0.4 release; switch it to linphone.org - even with the source available the build fails, as the source now defaults to cmake for building. So switch our build process from autotools to cmake as well. Signed-off-by: Sebastian Kemper --- diff --git a/libs/bcg729/Makefile b/libs/bcg729/Makefile index 7a7ccf8..57870e4 100644 --- a/libs/bcg729/Makefile +++ b/libs/bcg729/Makefile @@ -12,17 +12,18 @@ PKG_VERSION:=1.0.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SAVANNAH/linphone/plugins/sources +PKG_SOURCE_URL:=https://www.linphone.org/releases/sources/bcg729 PKG_HASH:=1a0fbf1ff91470037e83fa67976f940ebb601e4cc525859c754f4e7ffc24c307 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL:=1 +CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Alex Samorukov include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk define Package/bcg729 SUBMENU:=Telephony @@ -41,18 +42,19 @@ define Package/bcg729/description endef TARGET_CFLAGS += $(FPIC) -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static=no \ - --disable-msplugin + +CMAKE_OPTIONS += \ + -DENABLE_SHARED=YES \ + -DENABLE_STATIC=NO \ + -DENABLE_TESTS=NO define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) -R $(PKG_INSTALL_DIR)/usr/include/bcg729 $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/include/bcg729 + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/bcg729/*.h $(1)/usr/include/bcg729 $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbcg729.so* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libbcg729.pc $(1)/usr/lib/pkgconfig/ + $(INSTALL_DIR) $(1)/usr/lib/cmake/Bcg729 + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/Bcg729/cmake/*.cmake $(1)/usr/lib/cmake/Bcg729 endef define Package/bcg729/install