[Pkg-voip-commits] [linphone] 01/16: switch from autotools to cmake as upstream deprecated autotools

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch-guest pushed a commit to branch master
in repository linphone.

commit 08732b4791eec8b482e96f89a3eca5db7a351e01
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 19:08:41 2017 +0200

    switch from autotools to cmake as upstream deprecated autotools
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/rules     | 24 +++++-------------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52cc1ea..d4d27cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ linphone (3.11.1-1) UNRELEASED; urgency=low
     packages moved to their own source packages, respectively
   * upstream renamed README to README.md -> adapt debian/*.docs
   * add build dependency on libmbedtls-dev
+  * switch from autotools to cmake
 
  -- Felix Lechner <felix.lechner at gmail.com>  Fri, 03 Jul 2015 17:24:11 -0700
 
diff --git a/debian/control b/debian/control
index 952d827..e671afd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
 Build-Depends: debhelper (>= 9),
- dh-autoreconf, autoconf, automake, autotools-dev, libtool, pkg-config, intltool, doxygen,
+ cmake (>= 3.0), libtool, pkg-config, intltool, doxygen,
  libncurses5-dev, libreadline6-dev, libnotify-dev, libpango1.0-dev,
  sgmltools-lite, vim-common,
  libpcap-dev, libupnp-dev, libcunit1-ncurses-dev,
diff --git a/debian/rules b/debian/rules
index 94a30e3..6012b20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,33 +2,19 @@
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-  CONFIGURE_ARGS += --disable-alsa --disable-video
+  CONFIGURE_ARGS += -DENABLE_VIDEO=NO
 endif
 
 %:
-	dh $@ --parallel --with autoreconf
-
-override_dh_autoreconf:
-	dh_autoreconf ./autogen.sh
+	dh $@ --buildsystem=cmake
 
+# Upstream unconditionally sets CMAKE_INSTALL_RPATH. Make it ineffective by
+# setting CMAKE_SKIP_RPATH
 override_dh_auto_configure:
-	dh_auto_configure -- \
-		--enable-ipv6 \
-		--enable-ldap \
-		--disable-strict $(CONFIGURE_ARGS)
-
-override_dh_makeshlibs:
-	dh_makeshlibs -V
+	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON -DENABLE_LDAP=YES $(CONFIGURE_ARGS)
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
-#override_dh_auto_install:
-#      dh_auto_install --destdir=debian/tmp
-#      sed -i "/dependency_libs/ s/'.*'/''/" "$(CURDIR)"/debian/tmp/usr/lib/libortp.la
-#      sed -i "/dependency_libs/ s/'.*'/''/" "$(CURDIR)"/debian/tmp/usr/lib/liblinphone.la
-#      sed -i "/dependency_libs/ s/'.*'/''/" "$(CURDIR)"/debian/tmp/usr/lib/libmediastreamer_base.la
-#      sed -i "/dependency_libs/ s/'.*'/''/" "$(CURDIR)"/debian/tmp/usr/lib/libmediastreamer_voip.la
-
 override_dh_strip:
 	dh_strip --dbg-package=linphone-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/linphone.git