diff options
Diffstat (limited to 'net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch')
| -rw-r--r-- | net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch b/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch new file mode 100644 index 000000000000..c7aae1725570 --- /dev/null +++ b/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch @@ -0,0 +1,41 @@ +liblinphone.la does not seem to properly add -L paths to libmediastreamer.la, +so force the issue to work around the link failure caused by the -rpath added +to /usr/lib/linphone/ and having an already installed older version of linphone + +--- console/Makefile.in ++++ console/Makefile.in +@@ -287,12 +287,12 @@ + @BUILD_CONSOLE_TRUE@ -I$(osip_prefix)/include + + @BUILD_CONSOLE_TRUE@linphonec_SOURCES = linphonec.c linphonec.h commands.c +-@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) $(OSIP_LIBS) ++@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(READLINE_LIBS) $(OSIP_LIBS) + @BUILD_CONSOLE_TRUE@sipomatic_SOURCES = \ + @BUILD_CONSOLE_TRUE@ sipomatic.c sipomatic.h + + @BUILD_CONSOLE_TRUE@sipomatic_LDADD = $(INTLLIBS) \ +-@BUILD_CONSOLE_TRUE@ $(top_builddir)/coreapi/liblinphone.la \ ++@BUILD_CONSOLE_TRUE@ $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ + @BUILD_CONSOLE_TRUE@ $(OSIP_LIBS) + + AM_CFLAGS = $(STRICT_OPTIONS) -DENABLE_TRACE -D_ORTP_SOURCE $(VIDEO_CFLAGS) $(READLINE_CFLAGS) $(OSIP_CFLAGS) +--- gtk/Makefile.in ++++ gtk/Makefile.in +@@ -335,7 +335,7 @@ + @BUILD_GTK_TRUE@ $(linphone_common_sources) + + @BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \ +-@BUILD_GTK_TRUE@ $(top_builddir)/coreapi/liblinphone.la ++@BUILD_GTK_TRUE@ $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la + + AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \ + $(ORTP_CFLAGS) $(OSIP_CFLAGS) +@@ -348,7 +348,7 @@ + @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) $(GNOME_APPLETS_CFLAGS) -DLINPHONE_APPLET + @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \ + @BUILD_GNOME_APPLET_TRUE@ $(GNOME_APPLETS_LIBS) \ +-@BUILD_GNOME_APPLET_TRUE@ $(top_builddir)/coreapi/liblinphone.la \ ++@BUILD_GNOME_APPLET_TRUE@ $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ + @BUILD_GNOME_APPLET_TRUE@ $(OSIP_LIBS) + + @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers |