From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=localhost) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SFLFx-0004Qw-9M for ptxdist@pengutronix.de; Wed, 04 Apr 2012 10:07:53 +0200 From: Juergen Beisert Date: Wed, 4 Apr 2012 10:07:30 +0200 MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201204041007.30577.jbe@pengutronix.de> Subject: [ptxdist] [PATCH] libmediastreamer: a multimedia streaming engine for linphone 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 Signed-off-by: Juergen Beisert diff --git a/patches/mediastreamer-2.8.0/add_floating_cap_guessed.diff b/patches/mediastreamer-2.8.0/add_floating_cap_guessed.diff new file mode 100644 index 0000000..e2d69b3 --- /dev/null +++ b/patches/mediastreamer-2.8.0/add_floating_cap_guessed.diff @@ -0,0 +1,55 @@ +From: Juergen Beisert +Subject: Read floating/fixed point arithemetics from the compiler + +The user can still force fixed or floating point usage. + +Signed-off-by: Juergen Beisert +--- + configure.ac | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) + +Index: mediastreamer-2.8.0/configure.ac +=================================================================== +--- mediastreamer-2.8.0.orig/configure.ac ++++ mediastreamer-2.8.0/configure.ac +@@ -224,21 +224,26 @@ AC_ARG_ENABLE(fixed_point, + esac],[fixed_point=guess]) + + if test "$fixed_point" = "guess" ; then +- AC_MSG_CHECKING([whether fixed point arithmetic is preferred]) +- case ${target_cpu}${host_cpu} in +- *bfin*) +- fixed_point=true +- ;; +- *arm*) +- fixed_point=true +- ;; +- *) +- fixed_point=false +- ;; +- esac +- AC_MSG_RESULT([$fixed_point]) ++# ++# If the compiler comes with software float support, we guess using ++# fixed point is more performant on this architecture ++# ++AC_MSG_CHECKING(for fix point arithmetics restriction) ++AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[ ++#define HARD_FP_SUPPORT 1 ++#if defined(__SOFTFP__) ++# undef HARD_FP_SUPPORT ++#endif ++int foo = HARD_FP_SUPPORT; ++ ]])], ++ [fixed_point=false], ++ [fixed_point=true], ++ [fixed point arithmetics]) ++AC_MSG_RESULT(${fixed_point}) ++ + fi +- + + if test x$fixed_point = xtrue ; then + MS_PUBLIC_CFLAGS="$MS_PUBLIC_CFLAGS -DMS_FIXED_POINT" diff --git a/patches/mediastreamer-2.8.0/autogen.sh b/patches/mediastreamer-2.8.0/autogen.sh new file mode 120000 index 0000000..9f8a4cb --- /dev/null +++ b/patches/mediastreamer-2.8.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/mediastreamer-2.8.0/series b/patches/mediastreamer-2.8.0/series new file mode 100644 index 0000000..2f2bc7e --- /dev/null +++ b/patches/mediastreamer-2.8.0/series @@ -0,0 +1 @@ +add_floating_cap_guessed.diff diff --git a/rules/libmediastreamer.in b/rules/libmediastreamer.in new file mode 100644 index 0000000..3aa990a --- /dev/null +++ b/rules/libmediastreamer.in @@ -0,0 +1,56 @@ +## SECTION=system_libraries + +menuconfig LIBMEDIASTREAMER + tristate + prompt "libmediastreamer " + select LIBORTP + select SPEEX if LIBMEDIASTREAMER_SPEEX + select ALSA_LIB if LIBMEDIASTREAMER_ALSA + select LIBC_PTHREAD + select LIBC_M + select LIBC_RT + select LIBC_DL + select GCCLIBS_GCC_S + select GCCLIBS_CXX +# this only to re-generate the configure.ac + select HOST_GETTEXT + select HOST_INTLTOOL + help + Multimedia streaming engine for linphone + +if LIBMEDIASTREAMER + +config LIBMEDIASTREAMER_DEBUG + bool + prompt "enable debug" + help + Make the library larger and more noisy. + +config LIBMEDIASTREAMER_ALSA + bool + default y + help + Only *with* ALSA tested yet. + +config LIBMEDIASTREAMER_OSS + bool + help + Only *without* OSS tested yet. + +config LIBMEDIASTREAMER_SPEEX + bool + default y + help + Only *with* SPEEX tested yet. + +config LIBMEDIASTREAMER_FFMPEG + bool + help + Only *without* ffmpeg tested yet. + +config LIBMEDIASTREAMER_FIXED_FPOINT + bool + help + Force using of fixed point arithmetic + +endif diff --git a/rules/libmediastreamer.make b/rules/libmediastreamer.make new file mode 100644 index 0000000..7cf9df8 --- /dev/null +++ b/rules/libmediastreamer.make @@ -0,0 +1,96 @@ +# -*-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_LIBMEDIASTREAMER) += libmediastreamer + +# +# Paths and names +# +LIBMEDIASTREAMER_VERSION:= 2.8.0 +LIBMEDIASTREAMER_MD5 := e5744a02f9d3788df4bde730bb00d832 +LIBMEDIASTREAMER := mediastreamer-$(LIBMEDIASTREAMER_VERSION) +LIBMEDIASTREAMER_SUFFIX := tgz +LIBMEDIASTREAMER_URL := http://download.savannah.gnu.org/releases/linphone/mediastreamer/$(LIBMEDIASTREAMER).$(LIBMEDIASTREAMER_SUFFIX) +LIBMEDIASTREAMER_SOURCE := $(SRCDIR)/$(LIBMEDIASTREAMER).$(LIBMEDIASTREAMER_SUFFIX) +LIBMEDIASTREAMER_DIR := $(BUILDDIR)/$(LIBMEDIASTREAMER) +LIBMEDIASTREAMER_LICENSE:= GPLv2 + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +# +# autoconf +# +LIBMEDIASTREAMER_CONF_TOOL := autoconf +LIBMEDIASTREAMER_CONF_OPT := $(CROSS_AUTOCONF_USR) \ + --disable-strict \ + $(GLOBAL_IPV6_OPTION) \ + --enable-shared \ + --disable-static \ + --$(call ptx/endis, PTXCONF_LIBMEDIASTREAMER_DEBUG)-debug \ + --disable-nls \ + --disable-rpath \ + --$(call ptx/endis, PTXCONF_LIBMEDIASTREAMER_OSS)-oss \ + --$(call ptx/endis, PTXCONF_LIBMEDIASTREAMER_ALSA)-alsa \ + --disable-artsc \ + --disable-portaudio \ + --disable-macsnd \ + --disable-macaqsnd \ + --disable-pulseaudio \ + --$(call ptx/endis, PTXCONF_LIBMEDIASTREAMER_SPEEX)-speex \ + --disable-gsm \ + --disable-spandsp \ + --disable-video \ + --$(call ptx/endis, PTXCONF_LIBMEDIASTREAMER_FFMPEG)-ffmpeg \ + --disable-sdl \ + --disable-x11 \ + --disable-xv \ + --disable-theora \ + --disable-vp8 \ + --enable-external-ortp \ + --disable-libv4l1 \ + --disable-libv4l2 \ + --disable-tests \ + ac_cv_path_DOXYGEN=false + +# force fixed point or let the configure guess it +# enable = force fixed point +# disable = force floating point +# "not given" = guess from compiler's settings +ifdef PTXCONF_LIBMEDIASTREAMER_FIXED_FPOINT +LIBMEDIASTREAMER_CONF_OPT += --enable-fixed-point +endif + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/libmediastreamer.targetinstall: + @$(call targetinfo) + + @$(call install_init, libmediastreamer) + @$(call install_fixup, libmediastreamer,PRIORITY,optional) + @$(call install_fixup, libmediastreamer,SECTION,base) + @$(call install_fixup, libmediastreamer,AUTHOR,"Juergen Beisert ") + @$(call install_fixup, libmediastreamer,DESCRIPTION,"multimedia streaming engine") + + @$(call install_copy, libmediastreamer, 0, 0, 0755, /usr/lib/mediastreamer) + @$(call install_copy, libmediastreamer, 0, 0, 0755, /usr/lib/mediastreamer/plugins) + @$(call install_lib, libmediastreamer, 0, 0, 0644, libmediastreamer) + + @$(call install_finish, libmediastreamer) + + @$(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