* [gentoo-commits] gentoo-x86 commit in net-voip/linphone/files: linphone-3.2.1-nls.patch linphone-3.2.1-external-mediastreamer.patch linphone-3.2.1-log-window-crash.patch
@ 2010-02-18 18:57 Peter Volkov (pva)
0 siblings, 0 replies; only message in thread
From: Peter Volkov (pva) @ 2010-02-18 18:57 UTC (permalink / raw
To: gentoo-commits
pva 10/02/18 18:57:40
Added: linphone-3.2.1-nls.patch
linphone-3.2.1-external-mediastreamer.patch
linphone-3.2.1-log-window-crash.patch
Log:
Version bump, fixes bug #285478.
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Revision Changes Path
1.1 net-voip/linphone/files/linphone-3.2.1-nls.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.2.1-nls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.2.1-nls.patch?rev=1.1&content-type=text/plain
Index: linphone-3.2.1-nls.patch
===================================================================
=== modified file 'configure.in'
--- configure.in 2010-02-11 15:13:22 +0000
+++ configure.in 2010-02-11 15:14:08 +0000
@@ -54,7 +54,10 @@
AC_SUBST(GUI_FLAGS)
dnl localization tools
-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
+AM_NLS
+if test "$USE_NLS" != "no"; then
+ ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
+fi
dnl Initialize libtool
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
1.1 net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch?rev=1.1&content-type=text/plain
Index: linphone-3.2.1-external-mediastreamer.patch
===================================================================
=== modified file 'configure.in'
--- configure.in 2010-02-11 15:15:20 +0000
+++ configure.in 2010-02-11 15:15:24 +0000
@@ -328,7 +328,26 @@
AC_SUBST(STRICT_OPTIONS)
-AC_CONFIG_SUBDIRS( mediastreamer2 )
+AC_ARG_ENABLE(external-mediastreamer,
+ [ --enable-external-mediastreamer Use external mediastreamer library],
+ [case "${enableval}" in
+ yes) external_mediastreamer=true ;;
+ no) external_mediastreamer=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;;
+ esac],[external_mediastreamer=false])
+
+if test "$external_mediastreamer" = 'true'; then
+ LP_CHECK_MSTREAMER
+else
+ AC_CONFIG_SUBDIRS( mediastreamer2 )
+ MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include"
+ MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la"
+fi
+
+AC_SUBST(MSTREAMER_CFLAGS)
+AC_SUBST(MSTREAMER_LIBS)
+
+AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true'])
dnl check for db2html (docbook) to generate html user manual
AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
=== modified file 'console/Makefile.am'
--- console/Makefile.am 2010-02-11 15:13:22 +0000
+++ console/Makefile.am 2010-02-11 15:16:28 +0000
@@ -9,7 +9,7 @@
-I$(top_srcdir)/coreapi\
$(ORTP_CFLAGS) \
-I$(top_srcdir)/exosip \
- -I$(top_srcdir)/mediastreamer2/include
+ $(MSTREAMER_CFLAGS)
@@ -22,7 +22,7 @@
linphonec_SOURCES = linphonec.c linphonec.h commands.c
linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS)
linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+ $(MSTREAMER_LIBS) \
$(ORTP_LIBS) \
$(SPEEX_LIBS) \
$(OSIP_LIBS)
@@ -41,7 +41,7 @@
sipomatic_LDADD= $(INTLLIBS) \
$(top_builddir)/coreapi/liblinphone.la \
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+ $(MSTREAMER_LIBS) \
$(ORTP_LIBS) \
$(SPEEX_LIBS) \
$(OSIP_LIBS)
=== modified file 'coreapi/Makefile.am'
--- coreapi/Makefile.am 2010-02-11 15:13:22 +0000
+++ coreapi/Makefile.am 2010-02-11 15:18:19 +0000
@@ -7,7 +7,7 @@
INCLUDES = \
-I$(top_srcdir)\
- -I$(top_srcdir)/mediastreamer2/include
+ $(MSTREAMER_CFLAGS)
lib_LTLIBRARIES=liblinphone.la
@@ -33,7 +33,7 @@
liblinphone_la_LIBADD= \
$(EXOSIP_LIBS) \
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+ $(MSTREAMER_LIBS) \
$(ORTP_LIBS)
if BUILD_WIN32
=== modified file 'gtk-glade/Makefile.am'
--- gtk-glade/Makefile.am 2010-02-11 15:13:22 +0000
+++ gtk-glade/Makefile.am 2010-02-11 15:16:28 +0000
@@ -47,8 +47,8 @@
loginframe.c \
linphone.h
-linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+linphone_3_LDADD=$(ORTP_LIBS) \
+ $(MSTREAMER_LIBS) \
$(top_builddir)/coreapi/liblinphone.la \
$(LIBGTK_LIBS) $(INTLLIBS) \
$(LIBGLADE_LIBS)
@@ -77,7 +77,7 @@
AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
- -I$(top_srcdir)/mediastreamer2/include/ \
+ $(MSTREAMER_CFLAGS) \
$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
$(ORTP_CFLAGS) $(OSIP_CFLAGS)
=== added file 'm4/mstreamer.m4'
--- m4/mstreamer.m4 1970-01-01 00:00:00 +0000
+++ m4/mstreamer.m4 2010-02-11 15:16:28 +0000
@@ -0,0 +1,11 @@
+AC_DEFUN([LP_CHECK_MSTREAMER],[
+
+PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true])
+
+if test "$ms_failed" = "true"; then
+ AC_MSG_ERROR("External mediastreamer library not found")
+fi
+
+AC_SUBST([MSTREAMER_LIBS])
+AC_SUBST([MSTREAMER_CFLAGS])
+])
1.1 net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch?rev=1.1&content-type=text/plain
Index: linphone-3.2.1-log-window-crash.patch
===================================================================
=== modified file 'gtk-glade/log.glade'
--- gtk-glade/log.glade 2010-02-12 09:04:09 +0000
+++ gtk-glade/log.glade 2010-02-12 09:04:42 +0000
@@ -13,6 +13,7 @@
<property name="deletable">False</property>
<property name="has_separator">False</property>
<signal name="response" handler="gtk_widget_hide"/>
+ <signal name="delete-event" handler="gtk_widget_hide"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-02-18 18:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-18 18:57 [gentoo-commits] gentoo-x86 commit in net-voip/linphone/files: linphone-3.2.1-nls.patch linphone-3.2.1-external-mediastreamer.patch linphone-3.2.1-log-window-crash.patch Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox