| 1 |
volkmar 09/04/26 02:48:18 |
| 2 |
|
| 3 |
Added: linphone-3.1.0-external-mstreamer.patch |
| 4 |
linphone-3.1.0-nls.patch |
| 5 |
linphone-3.1.0-novideo-preferences.patch |
| 6 |
Log: |
| 7 |
version bump to 3.1.0 and complete rewrite of the ebuild, bug 263420 |
| 8 |
(Portage version: 2.1.6.7/cvs/Linux ppc) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: linphone-3.1.0-external-mstreamer.patch |
| 17 |
=================================================================== |
| 18 |
--- configure.in.old 2009-04-23 18:32:59.000000000 -0400 |
| 19 |
+++ configure.in 2009-04-23 18:49:01.000000000 -0400 |
| 20 |
@@ -258,7 +258,26 @@ |
| 21 |
|
| 22 |
AC_SUBST(STRICT_OPTIONS) |
| 23 |
|
| 24 |
-AC_CONFIG_SUBDIRS( mediastreamer2 ) |
| 25 |
+AC_ARG_ENABLE(external-mediastreamer, |
| 26 |
+ [ --enable-external-mediastreamer Use external mediastreamer library], |
| 27 |
+ [case "${enableval}" in |
| 28 |
+ yes) external_mediastreamer=true ;; |
| 29 |
+ no) external_mediastreamer=false ;; |
| 30 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;; |
| 31 |
+ esac],[external_mediastreamer=false]) |
| 32 |
+ |
| 33 |
+if test "$external_mediastreamer" = 'true'; then |
| 34 |
+ LP_CHECK_MSTREAMER |
| 35 |
+else |
| 36 |
+ AC_CONFIG_SUBDIRS( mediastreamer2 ) |
| 37 |
+ MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include" |
| 38 |
+ MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la" |
| 39 |
+fi |
| 40 |
+ |
| 41 |
+AC_SUBST(MSTREAMER_CFLAGS) |
| 42 |
+AC_SUBST(MSTREAMER_LIBS) |
| 43 |
+ |
| 44 |
+AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true']) |
| 45 |
|
| 46 |
dnl check for db2html (docbook) to generate html user manual |
| 47 |
AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no) |
| 48 |
--- console/Makefile.am.old 2009-04-23 18:38:26.000000000 -0400 |
| 49 |
+++ console/Makefile.am 2009-04-23 18:38:56.000000000 -0400 |
| 50 |
@@ -7,7 +7,7 @@ |
| 51 |
-I$(top_srcdir)/coreapi\ |
| 52 |
$(ORTP_CFLAGS) \ |
| 53 |
-I$(top_srcdir)/exosip \ |
| 54 |
- -I$(top_srcdir)/mediastreamer2/include |
| 55 |
+ $(MSTREAMER_CFLAGS) |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
@@ -16,7 +16,7 @@ |
| 60 |
linphonec_SOURCES = linphonec.c linphonec.h commands.c |
| 61 |
|
| 62 |
linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \ |
| 63 |
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ |
| 64 |
+ $(MSTREAMER_LIBS) \ |
| 65 |
$(ORTP_LIBS) \ |
| 66 |
$(SPEEX_LIBS) \ |
| 67 |
$(OSIP_LIBS) |
| 68 |
@@ -26,7 +26,7 @@ |
| 69 |
|
| 70 |
sipomatic_LDADD= $(INTLLIBS) \ |
| 71 |
$(top_builddir)/coreapi/liblinphone.la \ |
| 72 |
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ |
| 73 |
+ $(MSTREAMER_LIBS) \ |
| 74 |
$(ORTP_LIBS) \ |
| 75 |
$(SPEEX_LIBS) \ |
| 76 |
$(OSIP_LIBS) |
| 77 |
--- coreapi/Makefile.am.old 2009-04-23 18:41:10.000000000 -0400 |
| 78 |
+++ coreapi/Makefile.am 2009-04-23 18:41:32.000000000 -0400 |
| 79 |
@@ -7,7 +7,7 @@ |
| 80 |
|
| 81 |
INCLUDES = \ |
| 82 |
-I$(top_srcdir)\ |
| 83 |
- -I$(top_srcdir)/mediastreamer2/include |
| 84 |
+ $(MSTREAMER_CFLAGS) |
| 85 |
|
| 86 |
|
| 87 |
lib_LTLIBRARIES=liblinphone.la |
| 88 |
@@ -32,7 +32,7 @@ |
| 89 |
|
| 90 |
liblinphone_la_LIBADD= \ |
| 91 |
$(EXOSIP_LIBS) \ |
| 92 |
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la |
| 93 |
+ $(MSTREAMER_LIBS) |
| 94 |
|
| 95 |
|
| 96 |
AM_CFLAGS=$(STRICT_OPTIONS) -DIN_LINPHONE \ |
| 97 |
--- gtk-glade/Makefile.am.old 2009-04-23 18:39:42.000000000 -0400 |
| 98 |
+++ gtk-glade/Makefile.am 2009-04-23 20:19:38.000000000 -0400 |
| 99 |
@@ -34,8 +34,8 @@ |
| 100 |
buddylookup.c \ |
| 101 |
linphone.h |
| 102 |
|
| 103 |
-linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \ |
| 104 |
- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ |
| 105 |
+linphone_3_LDADD=$(ORTP_LIBS) \ |
| 106 |
+ $(MSTREAMER_LIBS) \ |
| 107 |
$(top_builddir)/coreapi/liblinphone.la \ |
| 108 |
$(LIBGTK_LIBS) $(INTLLIBS) \ |
| 109 |
$(LIBGLADE_LIBS) |
| 110 |
@@ -54,7 +54,7 @@ |
| 111 |
|
| 112 |
|
| 113 |
AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \ |
| 114 |
- -I$(top_srcdir)/mediastreamer2/include/ \ |
| 115 |
+ $(MSTREAMER_CFLAGS) \ |
| 116 |
$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \ |
| 117 |
$(ORTP_CFLAGS) $(OSIP_CFLAGS) |
| 118 |
|
| 119 |
--- m4/mstreamer.m4.old 1969-12-31 19:00:00.000000000 -0500 |
| 120 |
+++ m4/mstreamer.m4 2009-04-23 19:36:12.000000000 -0400 |
| 121 |
@@ -0,0 +1,11 @@ |
| 122 |
+AC_DEFUN([LP_CHECK_MSTREAMER],[ |
| 123 |
+ |
| 124 |
+PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true]) |
| 125 |
+ |
| 126 |
+if test "$ms_failed" = "true"; then |
| 127 |
+ AC_MSG_ERROR("External mediastreamer library not found") |
| 128 |
+fi |
| 129 |
+ |
| 130 |
+AC_SUBST([MSTREAMER_LIBS]) |
| 131 |
+AC_SUBST([MSTREAMER_CFLAGS]) |
| 132 |
+]) |
| 133 |
|
| 134 |
|
| 135 |
|
| 136 |
1.1 net-voip/linphone/files/linphone-3.1.0-nls.patch |
| 137 |
|
| 138 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.1.0-nls.patch?rev=1.1&view=markup |
| 139 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.1.0-nls.patch?rev=1.1&content-type=text/plain |
| 140 |
|
| 141 |
Index: linphone-3.1.0-nls.patch |
| 142 |
=================================================================== |
| 143 |
Allow to disable localization. |
| 144 |
|
| 145 |
Patch by Arfrever Frehtes Taifersar Arahesis |
| 146 |
|
| 147 |
--- configure.in |
| 148 |
+++ configure.in |
| 149 |
@@ -30,7 +30,11 @@ |
| 150 |
AM_PROG_CC_STDC |
| 151 |
AC_HEADER_STDC |
| 152 |
dnl localization tools |
| 153 |
-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) |
| 154 |
+AM_NLS |
| 155 |
+if test "$USE_NLS" != "no"; then |
| 156 |
+ m4_pattern_allow([AC_PROG_INTLTOOL]) |
| 157 |
+ ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) |
| 158 |
+fi |
| 159 |
dnl Initialize libtool |
| 160 |
AC_PROG_LIBTOOL |
| 161 |
AM_PROG_LIBTOOL |
| 162 |
|
| 163 |
|
| 164 |
|
| 165 |
1.1 net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch |
| 166 |
|
| 167 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch?rev=1.1&view=markup |
| 168 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch?rev=1.1&content-type=text/plain |
| 169 |
|
| 170 |
Index: linphone-3.1.0-novideo-preferences.patch |
| 171 |
=================================================================== |
| 172 |
fix crash when compiled with --disable-video |
| 173 |
|
| 174 |
--- coreapi/linphonecore.c.old 2009-04-24 19:20:24.000000000 -0400 |
| 175 |
+++ coreapi/linphonecore.c 2009-04-24 19:21:10.000000000 -0400 |
| 176 |
@@ -2108,7 +2108,7 @@ |
| 177 |
if (olddev!=NULL && olddev!=lc->video_conf.device){ |
| 178 |
toggle_video_preview(lc,FALSE);/*restart the video local preview*/ |
| 179 |
} |
| 180 |
- if (lc->ready){ |
| 181 |
+ if (lc->ready && lc->video_conf.device){ |
| 182 |
vd=ms_web_cam_get_string_id(lc->video_conf.device); |
| 183 |
if (vd && strstr(vd,"Static picture")!=NULL){ |
| 184 |
vd=NULL; |
Archives