1 |
pva 10/02/18 18:57:40 |
2 |
|
3 |
Added: linphone-3.2.1-nls.patch |
4 |
linphone-3.2.1-external-mediastreamer.patch |
5 |
linphone-3.2.1-log-window-crash.patch |
6 |
Log: |
7 |
Version bump, fixes bug #285478. |
8 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 net-voip/linphone/files/linphone-3.2.1-nls.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.2.1-nls.patch?rev=1.1&view=markup |
14 |
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 |
15 |
|
16 |
Index: linphone-3.2.1-nls.patch |
17 |
=================================================================== |
18 |
=== modified file 'configure.in' |
19 |
--- configure.in 2010-02-11 15:13:22 +0000 |
20 |
+++ configure.in 2010-02-11 15:14:08 +0000 |
21 |
@@ -54,7 +54,10 @@ |
22 |
AC_SUBST(GUI_FLAGS) |
23 |
|
24 |
dnl localization tools |
25 |
-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) |
26 |
+AM_NLS |
27 |
+if test "$USE_NLS" != "no"; then |
28 |
+ ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) |
29 |
+fi |
30 |
dnl Initialize libtool |
31 |
AC_LIBTOOL_WIN32_DLL |
32 |
AC_PROG_LIBTOOL |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.1 net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch |
38 |
|
39 |
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 |
40 |
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 |
41 |
|
42 |
Index: linphone-3.2.1-external-mediastreamer.patch |
43 |
=================================================================== |
44 |
=== modified file 'configure.in' |
45 |
--- configure.in 2010-02-11 15:15:20 +0000 |
46 |
+++ configure.in 2010-02-11 15:15:24 +0000 |
47 |
@@ -328,7 +328,26 @@ |
48 |
|
49 |
AC_SUBST(STRICT_OPTIONS) |
50 |
|
51 |
-AC_CONFIG_SUBDIRS( mediastreamer2 ) |
52 |
+AC_ARG_ENABLE(external-mediastreamer, |
53 |
+ [ --enable-external-mediastreamer Use external mediastreamer library], |
54 |
+ [case "${enableval}" in |
55 |
+ yes) external_mediastreamer=true ;; |
56 |
+ no) external_mediastreamer=false ;; |
57 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;; |
58 |
+ esac],[external_mediastreamer=false]) |
59 |
+ |
60 |
+if test "$external_mediastreamer" = 'true'; then |
61 |
+ LP_CHECK_MSTREAMER |
62 |
+else |
63 |
+ AC_CONFIG_SUBDIRS( mediastreamer2 ) |
64 |
+ MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include" |
65 |
+ MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la" |
66 |
+fi |
67 |
+ |
68 |
+AC_SUBST(MSTREAMER_CFLAGS) |
69 |
+AC_SUBST(MSTREAMER_LIBS) |
70 |
+ |
71 |
+AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true']) |
72 |
|
73 |
dnl check for db2html (docbook) to generate html user manual |
74 |
AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no) |
75 |
|
76 |
=== modified file 'console/Makefile.am' |
77 |
--- console/Makefile.am 2010-02-11 15:13:22 +0000 |
78 |
+++ console/Makefile.am 2010-02-11 15:16:28 +0000 |
79 |
@@ -9,7 +9,7 @@ |
80 |
-I$(top_srcdir)/coreapi\ |
81 |
$(ORTP_CFLAGS) \ |
82 |
-I$(top_srcdir)/exosip \ |
83 |
- -I$(top_srcdir)/mediastreamer2/include |
84 |
+ $(MSTREAMER_CFLAGS) |
85 |
|
86 |
|
87 |
|
88 |
@@ -22,7 +22,7 @@ |
89 |
linphonec_SOURCES = linphonec.c linphonec.h commands.c |
90 |
linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS) |
91 |
linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \ |
92 |
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ |
93 |
+ $(MSTREAMER_LIBS) \ |
94 |
$(ORTP_LIBS) \ |
95 |
$(SPEEX_LIBS) \ |
96 |
$(OSIP_LIBS) |
97 |
@@ -41,7 +41,7 @@ |
98 |
|
99 |
sipomatic_LDADD= $(INTLLIBS) \ |
100 |
$(top_builddir)/coreapi/liblinphone.la \ |
101 |
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ |
102 |
+ $(MSTREAMER_LIBS) \ |
103 |
$(ORTP_LIBS) \ |
104 |
$(SPEEX_LIBS) \ |
105 |
$(OSIP_LIBS) |
106 |
|
107 |
=== modified file 'coreapi/Makefile.am' |
108 |
--- coreapi/Makefile.am 2010-02-11 15:13:22 +0000 |
109 |
+++ coreapi/Makefile.am 2010-02-11 15:18:19 +0000 |
110 |
@@ -7,7 +7,7 @@ |
111 |
|
112 |
INCLUDES = \ |
113 |
-I$(top_srcdir)\ |
114 |
- -I$(top_srcdir)/mediastreamer2/include |
115 |
+ $(MSTREAMER_CFLAGS) |
116 |
|
117 |
|
118 |
lib_LTLIBRARIES=liblinphone.la |
119 |
@@ -33,7 +33,7 @@ |
120 |
|
121 |
liblinphone_la_LIBADD= \ |
122 |
$(EXOSIP_LIBS) \ |
123 |
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ |
124 |
+ $(MSTREAMER_LIBS) \ |
125 |
$(ORTP_LIBS) |
126 |
|
127 |
if BUILD_WIN32 |
128 |
|
129 |
=== modified file 'gtk-glade/Makefile.am' |
130 |
--- gtk-glade/Makefile.am 2010-02-11 15:13:22 +0000 |
131 |
+++ gtk-glade/Makefile.am 2010-02-11 15:16:28 +0000 |
132 |
@@ -47,8 +47,8 @@ |
133 |
loginframe.c \ |
134 |
linphone.h |
135 |
|
136 |
-linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \ |
137 |
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ |
138 |
+linphone_3_LDADD=$(ORTP_LIBS) \ |
139 |
+ $(MSTREAMER_LIBS) \ |
140 |
$(top_builddir)/coreapi/liblinphone.la \ |
141 |
$(LIBGTK_LIBS) $(INTLLIBS) \ |
142 |
$(LIBGLADE_LIBS) |
143 |
@@ -77,7 +77,7 @@ |
144 |
|
145 |
|
146 |
AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \ |
147 |
- -I$(top_srcdir)/mediastreamer2/include/ \ |
148 |
+ $(MSTREAMER_CFLAGS) \ |
149 |
$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \ |
150 |
$(ORTP_CFLAGS) $(OSIP_CFLAGS) |
151 |
|
152 |
|
153 |
=== added file 'm4/mstreamer.m4' |
154 |
--- m4/mstreamer.m4 1970-01-01 00:00:00 +0000 |
155 |
+++ m4/mstreamer.m4 2010-02-11 15:16:28 +0000 |
156 |
@@ -0,0 +1,11 @@ |
157 |
+AC_DEFUN([LP_CHECK_MSTREAMER],[ |
158 |
+ |
159 |
+PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true]) |
160 |
+ |
161 |
+if test "$ms_failed" = "true"; then |
162 |
+ AC_MSG_ERROR("External mediastreamer library not found") |
163 |
+fi |
164 |
+ |
165 |
+AC_SUBST([MSTREAMER_LIBS]) |
166 |
+AC_SUBST([MSTREAMER_CFLAGS]) |
167 |
+]) |
168 |
|
169 |
|
170 |
|
171 |
|
172 |
1.1 net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch |
173 |
|
174 |
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 |
175 |
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 |
176 |
|
177 |
Index: linphone-3.2.1-log-window-crash.patch |
178 |
=================================================================== |
179 |
=== modified file 'gtk-glade/log.glade' |
180 |
--- gtk-glade/log.glade 2010-02-12 09:04:09 +0000 |
181 |
+++ gtk-glade/log.glade 2010-02-12 09:04:42 +0000 |
182 |
@@ -13,6 +13,7 @@ |
183 |
<property name="deletable">False</property> |
184 |
<property name="has_separator">False</property> |
185 |
<signal name="response" handler="gtk_widget_hide"/> |
186 |
+ <signal name="delete-event" handler="gtk_widget_hide"/> |
187 |
<child internal-child="vbox"> |
188 |
<widget class="GtkVBox" id="dialog-vbox1"> |
189 |
<property name="visible">True</property> |