Re: [ptxdist] [PATCH] libortp: a Real-time Transport Protocol (RTP, RFC3550) library

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Wed, Apr 04, 2012 at 04:15:04PM +0200, Juergen Beisert wrote:
> Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

Does not apply. Because of line breaks I think.

Michael

> diff --git a/patches/ortp-0.18.0/autogen.sh b/patches/ortp-0.18.0/autogen.sh
> new file mode 120000
> index 0000000..9f8a4cb
> --- /dev/null
> +++ b/patches/ortp-0.18.0/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> 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..be24774
> --- /dev/null
> +++ b/patches/ortp-0.18.0/fix_buildsystem.diff
> @@ -0,0 +1,24 @@
> +From: Juergen Beisert <jbe@pengutronix.de>
> +Subject: Fix build system
> +
> +Setting a variable to 'true' or 'false' and then checking for 'yes' never works
> +
> +Singed-off-by: Juergen Beisert <jbe@pengutronix.de>
> +
> +---
> + configure.ac |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +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
> 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 <jbe@pengutronix.de>
> +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 <jbe@pengutronix.de>
> +
> +---
> + 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/install_tests_on_demand.diff 
> b/patches/ortp-0.18.0/install_tests_on_demand.diff
> new file mode 100644
> index 0000000..1f575ad
> --- /dev/null
> +++ b/patches/ortp-0.18.0/install_tests_on_demand.diff
> @@ -0,0 +1,22 @@
> +From: Juergen Beisert <jbe@pengutronix.de>
> +Subject: If the tests are enabled, also install them
> +
> +Singed-off-by: Juergen Beisert <jbe@pengutronix.de>
> +
> +---
> + src/tests/Makefile.am |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +Index: ortp-0.18.0/src/tests/Makefile.am
> +===================================================================
> +--- ortp-0.18.0.orig/src/tests/Makefile.am
> ++++ ortp-0.18.0/src/tests/Makefile.am
> +@@ -2,7 +2,7 @@ SUBDIRS=win_receiver win_sender
> + 
> + if ENABLE_TESTS
> + 
> +-noinst_PROGRAMS= rtpsend rtprecv mrtpsend mrtprecv test_timer rtpmemtest tevrtpsend tevrtprecv 
> tevmrtprecv rtpsend_stupid
> ++bin_PROGRAMS= rtpsend rtprecv mrtpsend mrtprecv test_timer rtpmemtest tevrtpsend tevrtprecv 
> tevmrtprecv rtpsend_stupid
> + 
> + rtpsend_SOURCES= rtpsend.c
> + 
> diff --git a/patches/ortp-0.18.0/series b/patches/ortp-0.18.0/series
> new file mode 100644
> index 0000000..ea15611
> --- /dev/null
> +++ b/patches/ortp-0.18.0/series
> @@ -0,0 +1,3 @@
> +fix_warning.diff
> +fix_buildsystem.diff
> +install_tests_on_demand.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..bbc08e1
> --- /dev/null
> +++ b/rules/libortp.make
> @@ -0,0 +1,79 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2011 by Juergen Beisert <jbe@pengutronix.de>
> +#
> +# 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 \
> +	--with-srtp=$(call ptx/ifdef, PTXCONF_LIBORTP_SRTP,/usr,none) \
> +	ac_cv_path_DOXYGEN=false
> +
> +LIBORTP_TESTS := \
> +	mrtprecv rtpmemtest rtpsend test_timer tevrtprecv \
> +	mrtpsend rtprecv rtpsend_stupid tevmrtprecv tevrtpsend
> +
> +# ----------------------------------------------------------------------------
> +# 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 <jbe@pengutronix.de>")
> +	@$(call install_fixup, libortp,DESCRIPTION, "Real-time Transport Protocol library")
> +
> +	@$(call install_lib, libortp, 0, 0, 0644, libortp)
> +
> +ifdef PTXCONF_LIBORTP_TESTS
> +	@$(foreach test, $(LIBORTP_TESTS), \
> +		$(call install_copy, libortp, 0, 0, 0755, -, /usr/bin/$(test));)
> +endif
> +	@$(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