From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SFPsH-0000xz-7P for ptxdist@pengutronix.de; Wed, 04 Apr 2012 15:03:45 +0200 Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72) (envelope-from ) id 1SFPsH-0005aq-3o for ptxdist@pengutronix.de; Wed, 04 Apr 2012 15:03:45 +0200 Date: Wed, 4 Apr 2012 15:03:45 +0200 From: Michael Olbrich Message-ID: <20120404130345.GR28453@pengutronix.de> References: <201204041006.31399.jbe@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201204041006.31399.jbe@pengutronix.de> Subject: Re: [ptxdist] libortp: a Real-time Transport Protocol (RTP, RFC3550) library Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Wed, Apr 04, 2012 at 10:06:31AM +0200, Juergen Beisert wrote: > Signed-off-by: Juergen Beisert > > diff --git a/patches/ortp-0.18.0/fix_buildsystem.diff b/patches/ortp-0.18.0/fix_buildsystem.diff > new file mode 100644 > index 0000000..2cbb058 > --- /dev/null > +++ b/patches/ortp-0.18.0/fix_buildsystem.diff > @@ -0,0 +1,38 @@ > +From: Juergen Beisert > +Subject: Fix build system > + > +Setting a variable to 'true' or 'false' and then checking for 'yes' never works > + > +Singed-off-by: Juergen Beisert > + > +--- > + configure | 2 +- > + configure.ac | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +Index: ortp-0.18.0/configure.ac > +=================================================================== > +--- ortp-0.18.0.orig/configure.ac > ++++ ortp-0.18.0/configure.ac > +@@ -329,7 +329,7 @@ AC_ARG_ENABLE(tests_enabled, > + no) tests_enabled=false ;; > + *) AC_MSG_ERROR(bad value ${enableval} for --disable-tests) ;; > + esac],[tests_enabled=false]) > +-AM_CONDITIONAL(ENABLE_TESTS, test x$tests_enabled = xyes) > ++AM_CONDITIONAL(ENABLE_TESTS, test x$tests_enabled = xtrue) > + > + dnl ################################################## > + dnl # Check for doxygen > +Index: ortp-0.18.0/configure > +=================================================================== > +--- ortp-0.18.0.orig/configure > ++++ ortp-0.18.0/configure > +@@ -12985,7 +12985,7 @@ else > + tests_enabled=false > + fi > + > +- if test x$tests_enabled = xyes; then > ++ if test x$tests_enabled = xtrue; then > + ENABLE_TESTS_TRUE= > + ENABLE_TESTS_FALSE='#' > + else > diff --git a/patches/ortp-0.18.0/fix_warning.diff b/patches/ortp-0.18.0/fix_warning.diff > new file mode 100644 > index 0000000..2ff2927 > --- /dev/null > +++ b/patches/ortp-0.18.0/fix_warning.diff > @@ -0,0 +1,24 @@ > +From: Juergen Beisert > +Subject: Fix a warning to avoid an error with ''-Werror' > + > +'--enable-debug=yes' adds Werror and this will fail otherwise > + > +Singed-off-by: Juergen Beisert > + > +--- > + src/scheduler.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +Index: ortp-0.18.0/src/scheduler.c > +=================================================================== > +--- ortp-0.18.0.orig/src/scheduler.c > ++++ ortp-0.18.0/src/scheduler.c > +@@ -116,7 +116,7 @@ void * rtp_scheduler_schedule(void * psc > + /* processing all scheduled rtp sessions */ > + while (current!=NULL) > + { > +- ortp_debug("scheduler: processing session=0x%x.\n",current); > ++ ortp_debug("scheduler: processing session=%p.\n",current); > + rtp_session_process(current,sched->time_,sched); > + current=current->next; > + } > diff --git a/patches/ortp-0.18.0/series b/patches/ortp-0.18.0/series > new file mode 100644 > index 0000000..ca84e0f > --- /dev/null > +++ b/patches/ortp-0.18.0/series > @@ -0,0 +1,2 @@ > +fix_warning.diff > +fix_buildsystem.diff > diff --git a/rules/libortp.in b/rules/libortp.in > new file mode 100644 > index 0000000..069c11e > --- /dev/null > +++ b/rules/libortp.in > @@ -0,0 +1,34 @@ > +## SECTION=system_libraries > + > +menuconfig LIBORTP > + tristate > + prompt "libortp " > + select LIBC_PTHREAD > + select LIBC_M > + select GCCLIBS_GCC_S > + select LIBSRTP if LIBORTP_SRTP > + help > + oRTP, a Real-time Transport Protocol (RTP,RFC3550) library > + > +if LIBORTP > + > +config LIBORTP_SRTP > + bool > + prompt "use libsrtp" > + help > + Use the 'Secure Real-time Transport Protocol' (SRTP) > + > +config LIBORTP_DEBUG > + bool > + prompt "enable debug" > + help > + Make the library more noisy > + > +config LIBORTP_TESTS > + bool > + prompt "install tests" > + help > + Install the tests from the package. Used for development and debugging > + purposes. > + > +endif > diff --git a/rules/libortp.make b/rules/libortp.make > new file mode 100644 > index 0000000..88701b6 > --- /dev/null > +++ b/rules/libortp.make > @@ -0,0 +1,99 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2011 by Juergen Beisert > +# > +# See CREDITS for details about who has contributed to this project. > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_LIBORTP) += libortp > + > +# > +# Paths and names > +# > +LIBORTP_VERSION := 0.18.0 > +LIBORTP_MD5 := 098e984f9325d9e2648bfd9863eed501 > +LIBORTP := ortp-$(LIBORTP_VERSION) > +LIBORTP_SUFFIX := tar.gz > +LIBORTP_URL := http://download.savannah.gnu.org/releases/linphone/libortp/sources/$(LIBORTP).$(LIBORTP_SUFFIX) > +LIBORTP_SOURCE := $(SRCDIR)/$(LIBORTP).$(LIBORTP_SUFFIX) > +LIBORTP_DIR := $(BUILDDIR)/$(LIBORTP) > +LIBORTP_LICENSE := LGPLv2.1 > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +# > +# autoconf > +# > +LIBORTP_CONF_TOOL := autoconf > +LIBORTP_CONF_OPT := $(CROSS_AUTOCONF_USR) \ > + --enable-shared \ > + --disable-static \ > + --disable-strict \ > + --$(call ptx/disen, PTXCONF_LIBORTP_DEBUG)-perf \ > + $(GLOBAL_IPV6_OPTION) \ > + --disable-mode64bit \ > + --$(call ptx/endis, PTXCONF_LIBORTP_DEBUG)-debug \ > + --disable-zrtp \ > + --disable-memcheck \ > + --disable-so-reuseaddr \ > + --disable-ssl-hmac \ > + --$(call ptx/endis, PTXCONF_LIBORTP_TESTS)-tests_enabled \ > + ac_cv_path_DOXYGEN=false > + > +ifdef PTXCONF_LIBORTP_SRTP > +LIBORTP_CONF_OPT += --with-srtp=/usr > +else > +LIBORTP_CONF_OPT += --with-srtp=none > +endif --with-srtp=$(call ptx/ifdef, PTXCONF_LIBORTP_SRTP,/usr,none) > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/libortp.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, libortp) > + @$(call install_fixup, libortp,PRIORITY,optional) > + @$(call install_fixup, libortp,SECTION,base) > + @$(call install_fixup, libortp,AUTHOR,"Juergen Beisert ") > + @$(call install_fixup, libortp,DESCRIPTION, "Real-time Transport Protocol library") > + > + @$(call install_lib, libortp, 0, 0, 0644, libortp) > + > +ifdef PTXCONF_LIBORTP_TESTS > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/mrtprecv, /usr/bin/mrtprecv) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/mrtpsend, /usr/bin/mrtpsend) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/rtpmemtest, /usr/bin/rtpmemtest) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/rtprecv, /usr/bin/rtprecv) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/rtpsend, /usr/bin/rtpsend) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/rtpsend_stupid, /usr/bin/rtpsend_stupid) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/test_timer, /usr/bin/test_timer) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/tevmrtprecv, /usr/bin/tevmrtprecv) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/tevrtprecv, /usr/bin/tevrtprecv) > + @$(call install_copy, libortp, 0, 0, 0755, \ > + $(LIBORTP_DIR)/src/tests/tevrtpsend, /usr/bin/tevrtpsend) > + > +endif This breaks dev packages. Take a look at connman.make for an example on how to handle tests like this. Michael > + @$(call install_finish, libortp) > + > + @$(call touch) > + > +# vim: syntax=make > > -- > Pengutronix e.K. | Juergen Beisert | > Linux Solutions for Science and Industry | http://www.pengutronix.de/ | > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de