[Pkg-voip-commits] [mediastreamer2] 03/18: Switch from autotools to CMake (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 mediastreamer2.

commit 4b46c40ba0bcb19a38fc6e0702be84c961bd35f3
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 16:40:11 2017 +0200

    Switch from autotools to CMake (upstream deprecated autotools)
---
 debian/control                   |  3 +--
 debian/patches/install-pkgconfig | 18 ++++++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     | 20 ++++----------------
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 88bad18..f007cf5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ 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),
- autotools-dev,
- dh-autoreconf,
+ cmake (>= 3.0),
  pkg-config,
  libortp-dev (>= 1:1.0.0),
  libbzrtp-dev (>= 1.0.5),
diff --git a/debian/patches/install-pkgconfig b/debian/patches/install-pkgconfig
new file mode 100644
index 0000000..db7fd75
--- /dev/null
+++ b/debian/patches/install-pkgconfig
@@ -0,0 +1,18 @@
+Install pkgconfig files
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -613,6 +613,13 @@ if(ENABLE_TOOLS)
+ 	add_subdirectory(tools)
+ endif()
+ 
++set(prefix ${CMAKE_INSTALL_PREFIX})
++set(exec_prefix ${prefix}/bin)
++set(libdir ${prefix}/lib)
++set(includedir ${prefix}/include)
++
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mediastreamer.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ 
+ include(CMakePackageConfigHelpers)
+ write_basic_package_version_file(
diff --git a/debian/patches/series b/debian/patches/series
index b821440..978e1d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-spelling-errors.patch
 remove-call-to-gettext.patch
+install-pkgconfig
diff --git a/debian/rules b/debian/rules
index 76a4b5a..e812f6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,21 +8,9 @@
 #export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --parallel \
-		--with autotools-dev \
-		--with autoreconf \
-		--buildsystem=autoconf
-
-override_dh_autoreconf:
-	dh_autoreconf
-	intltoolize --automake --copy
+	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-static \
-		--enable-external-ortp \
-		--enable-pcap
-
-override_dh_strip:
-	dh_strip -plibmediastreamer-base4 --dbg-package=libmediastreamer-base4-dbg
-	dh_strip -plibmediastreamer-voip4 --dbg-package=libmediastreamer-voip4-dbg
+	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON

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