cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- switch for farsight2 to farstream. all patches taken from upstream repositories.

Browse Source 
ok aja@
This commit is contained in:
jasper 2012-04-05 16:08:55 +00:00
parent 45783b2cd3
commit 3021643236
19 changed files with 1253 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/amsn/Makefile
View File

@ -1,8 +1,9 @@
#$OpenBSD: Makefile,v 1.20 2011/09/23 20:57:16 sthen Exp $
#$OpenBSD: Makefile,v 1.21 2012/04/05 16:08:55 jasper Exp $
COMMENT= open source MSN Messenger clone
V= 0.98.4
REVISION= 0
DISTNAME= amsn-$V-src
PKGNAME= ${DISTNAME:S/-src//}
CATEGORIES= net
@ -22,11 +23,11 @@ EXTRACT_SUFX= .tar.bz2
WANTLIB= ICE SM X11 m stdc++ z glib-2.0 gmodule-2.0 gobject-2.0 \
gthread-2.0 gstbase-0.10 gstinterfaces-0.10 \
gstreamer-0.10 xml2 jpeg png gstfarsight-0.10
gstreamer-0.10 xml2 jpeg png farstream-0.1
LIB_DEPENDS= graphics/jpeg \
graphics/png \
net/farsight2
net/farstream
RUN_DEPENDS+= ${MODTK_RUN_DEPENDS} \
security/tcltls \
x11/bwidget \
@ -42,6 +43,7 @@ MODULES= devel/gettext \
USE_GMAKE= Yes
MAKE_FLAGS= verbose=yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--disable-libv4l \
--disable-upnp \

25
net/amsn/patches/patch-Compile_mk Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-Compile_mk,v 1.1 2012/04/05 16:08:55 jasper Exp $
Port from farsight2 to farstream, from Fedora's amsn-0.98.4-farstream.patch
--- Compile.mk.orig Thu Oct 15 10:39:25 2009
+++ Compile.mk Thu Apr 5 14:01:55 2012
@@ -22,15 +22,15 @@ compile_m = $(CC) $(CFLAGS) -ObjC -fobjc-gc -c -o $@
compile_cc = $(CXX) $(CXXFLAGS) -c -o $@ $<
ifeq ($(FOUND_OS),mac)
-compile_farsight = $(CC) $(CFLAGS) -ObjC -fobjc-gc $(GST_CFLAGS) $(FARSIGHT2_CFLAGS) -c -o $@ $<
+compile_farsight = $(CC) $(CFLAGS) -ObjC -fobjc-gc $(GST_CFLAGS) $(FARSTREAM_CFLAGS) -c -o $@ $<
SHARED := -dynamiclib -fno-common -Wl,-single_module -shared-libgcc
else
-compile_farsight = $(CC) $(CFLAGS) $(GST_CFLAGS) $(FARSIGHT2_CFLAGS) -c -o $@ $<
+compile_farsight = $(CC) $(CFLAGS) $(GST_CFLAGS) $(FARSTREAM_CFLAGS) -c -o $@ $<
SHARED := -shared
endif
link_app = $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
-link_farsight = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(GST_LIBS) $(FARSIGHT2_LIBS) $(SHARED) -o $@
+link_farsight = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(GST_LIBS) $(FARSTREAM_LIBS) $(SHARED) -o $@
link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(SHARED) -o $@
link_so_addlibs = $(link_so) $(ADDLIBS)
link_so_cpp = $(CXX) $(LDFLAGS) $^ $(LDLIBS) $(CXX_LIB) $(SHARED) -o $@

33
net/amsn/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.5 2011/07/07 13:14:29 jasper Exp $
$OpenBSD: patch-Makefile_in,v 1.6 2012/04/05 16:08:55 jasper Exp $
--- Makefile.in.orig Thu Mar 18 20:58:48 2010
+++ Makefile.in Tue Jun 21 11:02:26 2011
+++ Makefile.in Thu Apr 5 14:03:25 2012
@@ -11,10 +11,10 @@ STATIC := @STATIC@
doc_files := docs INSTALL CREDITS FAQ GNUGPL HELP README TODO AGREEMENT remote.help
@ -35,6 +35,26 @@ $OpenBSD: patch-Makefile_in,v 1.5 2011/07/07 13:14:29 jasper Exp $
else
CXXFLAGS += -g3 -DDEBUG
endif
@@ -127,8 +127,8 @@ endif
GST_LIBS := @GST_LIBS@ @GST_INTERFACES_LIBS@
GST_CFLAGS := @GST_CFLAGS@ @GST_INTERFACES_CFLAGS@
-FARSIGHT2_LIBS := @FARSIGHT2_LIBS@
-FARSIGHT2_CFLAGS := @FARSIGHT2_CFLAGS@
+FARSTREAM_LIBS := @FARSTREAM_LIBS@
+FARSTREAM_CFLAGS := @FARSTREAM_CFLAGS@
# for gcc3
@@ -169,7 +169,7 @@ ifeq (@HAVE_GUPNP@,yes)
FILES_TO_INSTALL += utils/gupnp/gupnp.$(SHLIB_EXTENSION) utils/gupnp/pkgIndex.tcl
endif
-ifeq (@HAVE_FARSIGHT@,yes)
+ifeq (@HAVE_FARSTREAM@,yes)
FILES_TO_INSTALL += utils/farsight/tcl_farsight.$(SHLIB_EXTENSION) utils/farsight/pkgIndex.tcl
endif
@@ -234,9 +234,9 @@ install:: $(FILES_TO_INSTALL)
rm -Rf $(DESTDIR)$(dstdir)/$(PACKAGE)/$$p; \
done
@ -48,3 +68,12 @@ $OpenBSD: patch-Makefile_in,v 1.5 2011/07/07 13:14:29 jasper Exp $
cp $(srcdir)/amsn.desktop $(DESTDIR)$(dstdir)/applications/
@@ -319,7 +319,7 @@ include $(tclISF_dir)/src/Rules.mk
include $(async_dir)/Rules.mk
include $(async_dir)/src/Rules.mk
-ifeq (@HAVE_FARSIGHT@,yes)
+ifeq (@HAVE_FARSTREAM@,yes)
include $(tcl_farsight_dir)/Rules.mk
include $(tcl_farsight_dir)/src/Rules.mk
endif

179
net/amsn/patches/patch-configure
View File

@ -1,6 +1,54 @@
$OpenBSD: patch-configure,v 1.5 2011/07/07 13:14:29 jasper Exp $
$OpenBSD: patch-configure,v 1.6 2012/04/05 16:08:55 jasper Exp $
Port from farsight2 to farstream, from Fedora's amsn-0.98.4-farstream.patch
--- configure.orig Sun Dec 5 04:23:14 2010
+++ configure Tue Jun 21 11:02:27 2011
+++ configure Thu Apr 5 14:18:17 2012
@@ -593,15 +593,15 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
-HAVE_FARSIGHT
+HAVE_FARSTREAM
HAVE_GUPNP
GUPNP_LIBS
GUPNP_CFLAGS
HAVE_LIBV4L
LIBV4L_LIBS
LIBV4L_CFLAGS
-FARSIGHT2_LIBS
-FARSIGHT2_CFLAGS
+FARSTREAM_LIBS
+FARSTREAM_CFLAGS
GST_INTERFACES_LIBS
GST_INTERFACES_CFLAGS
GST_LIBS
@@ -730,8 +730,8 @@ GST_CFLAGS
GST_LIBS
GST_INTERFACES_CFLAGS
GST_INTERFACES_LIBS
-FARSIGHT2_CFLAGS
-FARSIGHT2_LIBS
+FARSTREAM_CFLAGS
+FARSTREAM_LIBS
LIBV4L_CFLAGS
LIBV4L_LIBS
GUPNP_CFLAGS
@@ -1387,10 +1387,10 @@ Some influential environment variables:
C compiler flags for GST_INTERFACES, overriding pkg-config
GST_INTERFACES_LIBS
linker flags for GST_INTERFACES, overriding pkg-config
- FARSIGHT2_CFLAGS
- C compiler flags for FARSIGHT2, overriding pkg-config
- FARSIGHT2_LIBS
- linker flags for FARSIGHT2, overriding pkg-config
+ FARSTREAM_CFLAGS
+ C compiler flags for FARSTREAM, overriding pkg-config
+ FARSTREAM_LIBS
+ linker flags for FARSTREAM, overriding pkg-config
LIBV4L_CFLAGS
C compiler flags for LIBV4L, overriding pkg-config
LIBV4L_LIBS linker flags for LIBV4L, overriding pkg-config
@@ -2271,8 +2271,8 @@ case `uname -s` in
OpenBSD | FreeBSD | NetBSD)
# *BSD has important stuff (from ports)
@ -103,3 +151,130 @@ $OpenBSD: patch-configure,v 1.5 2011/07/07 13:14:29 jasper Exp $
fi
if test "$LIBPTHREAD" = ""; then
@@ -5115,10 +5098,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MMX" >&5
$as_echo "$USE_MMX" >&6; }
-HAVE_FARSIGHT=no
+HAVE_FARSTREAM=no
GST_REQUIRED=0.10.22
GST_MAJORMINOR=0.10
-FARSIGHT_REQUIRED=0.0.9
+FARSTREAM_REQUIRED=0.1
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -5518,41 +5501,41 @@ fi
if test "x$HAVE_GST" = "xyes"; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FARSIGHT2" >&5
-$as_echo_n "checking for FARSIGHT2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FARSTREAM" >&5
+$as_echo_n "checking for FARSTREAM... " >&6; }
-if test -n "$FARSIGHT2_CFLAGS"; then
- pkg_cv_FARSIGHT2_CFLAGS="$FARSIGHT2_CFLAGS"
+if test -n "$FARSTREAM_CFLAGS"; then
+ pkg_cv_FARSTREAM_CFLAGS="$FARSTREAM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
- farsight2-\$GST_MAJORMINOR >= \$FARSIGHT_REQUIRED\""; } >&5
+ farstream-\$FARSTREAM_REQUIRED >= \$FARSTREAM_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "\
- farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED") 2>&5
+ farstream-$FARSTREAM_REQUIRED >= $FARSTREAM_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_FARSIGHT2_CFLAGS=`$PKG_CONFIG --cflags "\
- farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED" 2>/dev/null`
+ pkg_cv_FARSTREAM_CFLAGS=`$PKG_CONFIG --cflags "\
+ farstream-$FARSTREAM_REQUIRED >= $FARSTREAM_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
-if test -n "$FARSIGHT2_LIBS"; then
- pkg_cv_FARSIGHT2_LIBS="$FARSIGHT2_LIBS"
+if test -n "$FARSTREAM_LIBS"; then
+ pkg_cv_FARSTREAM_LIBS="$FARSTREAM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
- farsight2-\$GST_MAJORMINOR >= \$FARSIGHT_REQUIRED\""; } >&5
+ farstream-\$FARSTREAM_REQUIRED >= \$FARSTREAM_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "\
- farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED") 2>&5
+ farstream-$FARSTREAM_REQUIRED >= $FARSTREAM_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_FARSIGHT2_LIBS=`$PKG_CONFIG --libs "\
- farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED" 2>/dev/null`
+ pkg_cv_FARSTREAM_LIBS=`$PKG_CONFIG --libs "\
+ farstream-$FARSTREAM_REQUIRED >= $FARSTREAM_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -5572,26 +5555,26 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FARSIGHT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
- farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED" 2>&1`
+ FARSTREAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
+ farstream-$FARSTREAM_REQUIRED >= $FARSTREAM_REQUIRED" 2>&1`
else
- FARSIGHT2_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
- farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED" 2>&1`
+ FARSTREAM_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
+ farstream-$FARSTREAM_REQUIRED >= $FARSTREAM_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$FARSIGHT2_PKG_ERRORS" >&5
+ echo "$FARSTREAM_PKG_ERRORS" >&5
- HAVE_FARSIGHT=no
+ HAVE_FARSTREAM=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_FARSIGHT=no
+ HAVE_FARSTREAM=no
else
- FARSIGHT2_CFLAGS=$pkg_cv_FARSIGHT2_CFLAGS
- FARSIGHT2_LIBS=$pkg_cv_FARSIGHT2_LIBS
+ FARSTREAM_CFLAGS=$pkg_cv_FARSTREAM_CFLAGS
+ FARSTREAM_LIBS=$pkg_cv_FARSTREAM_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_FARSIGHT=yes
+ HAVE_FARSTREAM=yes
fi
fi
fi
@@ -7069,16 +7052,16 @@ compile time options summary
TK : $TK_VERSION
DEBUG : $DEBUG
STATIC : $STATIC
- FARSIGHT : $HAVE_FARSIGHT
+ FARSTREAM : $HAVE_FARSTREAM
LIBV4L : $HAVE_LIBV4L
GUPNP-IGD : $HAVE_GUPNP
EOF
-if test x"$HAVE_FARSIGHT" = "xno"; then
- echo "*** You do not seem to have gstreamer and farsight2 installed."
+if test x"$HAVE_FARSTREAM" = "xno"; then
+ echo "*** You do not seem to have gstreamer and farstream installed."
echo "*** You will not be able to build the required component for audio conversations."
- echo "*** Read this for more information : http://amsn-project.net/wiki/Farsight"
+ echo "*** Read this for more information : http://amsn-project.net/wiki/Farstream"
fi
exit 0

187
net/amsn/patches/patch-utils_farsight_src_tcl_farsight_c Normal file
View File

@ -0,0 +1,187 @@
$OpenBSD: patch-utils_farsight_src_tcl_farsight_c,v 1.1 2012/04/05 16:08:55 jasper Exp $
Port from farsight2 to farstream, from Fedora's amsn-0.98.4-farstream.patch
--- utils/farsight/src/tcl_farsight.c.orig Mon Dec 14 21:21:11 2009
+++ utils/farsight/src/tcl_farsight.c Thu Apr 5 14:02:00 2012
@@ -14,12 +14,12 @@
#include <math.h>
#include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
-#include <gst/farsight/fs-stream-transmitter.h>
+#include <farstream/fs-conference.h>
+#include <farstream/fs-stream-transmitter.h>
#include <gst/interfaces/propertyprobe.h>
#include <gst/interfaces/xoverlay.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <farstream/fs-element-added-notifier.h>
#ifdef G_OS_WIN32
#include <winsock2.h>
@@ -1630,22 +1630,22 @@ static int Farsight_BusEventProc (Tcl_Event *evPtr, in
case GST_MESSAGE_ELEMENT:
{
const GstStructure *s = gst_message_get_structure (message);
- if (gst_structure_has_name (s, "farsight-error")) {
+ if (gst_structure_has_name (s, "farstream-error")) {
const GValue *errorvalue, *debugvalue, *error_no;
error_no = gst_structure_get_value (message->structure, "error-no");
errorvalue = gst_structure_get_value (message->structure, "error-msg");
debugvalue = gst_structure_get_value (message->structure, "debug-msg");
- if (g_value_get_enum (error_no) != FS_ERROR_UNKNOWN_CNAME) {
+ if (g_value_get_enum (error_no)) {
_notify_debug ("Error on BUS (%d) %s .. %s", g_value_get_enum (error_no),
g_value_get_string (errorvalue),
g_value_get_string (debugvalue));
}
- if (g_value_get_enum (error_no) != FS_ERROR_UNKNOWN_CNAME) {
- _notify_error ("Farsight error");
+ if (g_value_get_enum (error_no)) {
+ _notify_error ("Farstream error");
}
- } else if (gst_structure_has_name (s, "farsight-new-local-candidate")) {
+ } else if (gst_structure_has_name (s, "farstream-new-local-candidate")) {
FsStream *stream;
FsCandidate *candidate;
const GValue *value;
@@ -1658,7 +1658,7 @@ static int Farsight_BusEventProc (Tcl_Event *evPtr, in
_new_local_candidate (stream, candidate);
} else if (gst_structure_has_name (s,
- "farsight-local-candidates-prepared")) {
+ "farstream-local-candidates-prepared")) {
FsStream *stream;
const GValue *value;
@@ -1667,7 +1667,7 @@ static int Farsight_BusEventProc (Tcl_Event *evPtr, in
_local_candidates_prepared (stream);
- } else if (gst_structure_has_name (s, "farsight-codecs-changed")) {
+ } else if (gst_structure_has_name (s, "farstream-codecs-changed")) {
gboolean ready;
if (!audio_codecs_ready) {
@@ -1682,7 +1682,7 @@ static int Farsight_BusEventProc (Tcl_Event *evPtr, in
_codecs_ready (video_session);
}
}
- } else if (gst_structure_has_name (s, "farsight-new-active-candidate-pair")) {
+ } else if (gst_structure_has_name (s, "farstream-new-active-candidate-pair")) {
FsCandidate *local;
FsCandidate *remote;
FsStream *stream;
@@ -1856,16 +1856,16 @@ _bus_callback (GstBus *bus, GstMessage *message, gpoin
case GST_MESSAGE_ELEMENT:
{
const GstStructure *s = gst_message_get_structure (message);
- if (gst_structure_has_name (s, "farsight-error")) {
+ if (gst_structure_has_name (s, "farstream-error")) {
goto drop;
- } else if (gst_structure_has_name (s, "farsight-new-local-candidate")) {
+ } else if (gst_structure_has_name (s, "farstream-new-local-candidate")) {
goto drop;
} else if (gst_structure_has_name (s,
- "farsight-local-candidates-prepared")) {
+ "farstream-local-candidates-prepared")) {
goto drop;
- } else if (gst_structure_has_name (s, "farsight-codecs-changed")) {
+ } else if (gst_structure_has_name (s, "farstream-codecs-changed")) {
goto drop;
- } else if (gst_structure_has_name (s, "farsight-new-active-candidate-pair")) {
+ } else if (gst_structure_has_name (s, "farstream-new-active-candidate-pair")) {
goto drop;
} else if (gst_structure_has_name (s, "level")) {
goto drop;
@@ -2918,7 +2918,7 @@ int Farsight_Prepare _ANSI_ARGS_((ClientData clientDat
G_CALLBACK (_conference_element_added), NULL);
participant = fs_conference_new_participant (FS_CONFERENCE (conference),
- "", &error);
+ &error);
if (error) {
char temp[1000];
snprintf (temp, 1000, "Error while creating new participant (%d): %s",
@@ -3157,8 +3157,15 @@ int Farsight_Prepare _ANSI_ARGS_((ClientData clientDat
}
audio_stream = fs_session_new_stream (audio_session, participant, FS_DIRECTION_BOTH,
- "nice", total_params, transmitter_params, &error);
+ &error);
+ if(!fs_stream_set_transmitter(audio_stream, "nice",
+ transmitter_params, total_params, &error)) {
+ char temp[1000];
+ snprintf (temp, 1000, "Could not set transmitter \"nice\" (%d): %s.", error->code, error->message);
+ goto error;
+ }
+
if (error) {
char temp[1000];
snprintf (temp, 1000, "Error while creating new audio_stream (%d): %s",
@@ -3310,8 +3317,15 @@ int Farsight_Prepare _ANSI_ARGS_((ClientData clientDat
}
video_stream = fs_session_new_stream (video_session, participant,
- FS_DIRECTION_BOTH, "nice", total_params, transmitter_params, &error);
+ FS_DIRECTION_BOTH, &error);
+ if(!fs_stream_set_transmitter(video_stream, "nice",
+ transmitter_params, total_params, &error)) {
+ char temp[1000];
+ snprintf (temp, 1000, "Could not set transmitter \"nice\" (%d): %s.", error->code, error->message);
+ goto error;
+ }
+
if (error) {
char temp[1000];
snprintf (temp, 1000, "Error while creating new video_stream (%d): %s",
@@ -3391,7 +3405,7 @@ int Farsight_Start _ANSI_ARGS_((ClientData clientData,
if (pipeline == NULL) {
- Tcl_AppendResult (interp, "Farsight needs to be prepared first",
+ Tcl_AppendResult (interp, "Farstream needs to be prepared first",
(char *) NULL);
return TCL_ERROR;
}
@@ -3568,7 +3582,7 @@ static int _SetMute (GstElement *element, Tcl_Interp *
if (element) {
g_object_set (element, "mute", mute, NULL);
} else {
- Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
+ Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
return TCL_ERROR;
}
@@ -3602,7 +3616,7 @@ static int _GetMute (GstElement *element, Tcl_Interp *
g_object_get (element, "mute", &mute, NULL);
Tcl_SetObjResult(interp, Tcl_NewBooleanObj(mute));
} else {
- Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
+ Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
return TCL_ERROR;
}
@@ -3641,7 +3655,7 @@ static int _SetVolume (GstElement *element, Tcl_Interp
if (element) {
g_object_set (element, "volume", volume, NULL);
} else {
- Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
+ Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
return TCL_ERROR;
}
@@ -3676,7 +3690,7 @@ static int _GetVolume (GstElement *element, Tcl_Interp
g_object_get (element, "volume", &volume, NULL);
Tcl_SetObjResult(interp, Tcl_NewDoubleObj(volume));
} else {
- Tcl_AppendResult (interp, "Farsight isn't running", (char *) NULL);
+ Tcl_AppendResult (interp, "Farstream isn't running", (char *) NULL);
return TCL_ERROR;
}

5
net/gajim/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.51 2012/03/28 12:37:05 pea Exp $
# $OpenBSD: Makefile,v 1.52 2012/04/05 16:08:55 jasper Exp $
SHARED_ONLY= Yes
COMMENT= jabber client written in pygtk
DISTNAME= gajim-0.15
REVISION= 0
CATEGORIES= net x11
MASTER_SITES= ${HOMEPAGE}/downloads/0.15/
@ -41,7 +42,7 @@ RUN_DEPENDS= databases/py-sqlite2 \
security/py-crypto \
net/avahi,-gui,no_mono,no_qt3,no_qt4 \
textproc/gtkspell \
net/farsight2 \
net/farstream \
devel/py-notify \
x11/gtk+2,-guic

36
net/gajim/patches/patch-src_chat_control_py Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-src_chat_control_py,v 1.1 2012/04/05 16:08:56 jasper Exp $
port Gajim to use Farstream instead of Farsight2.
from upstream changeset dfd58bb1ad06.
--- src/chat_control.py.orig Thu Apr 5 11:31:15 2012
+++ src/chat_control.py Thu Apr 5 11:31:49 2012
@@ -1648,15 +1648,15 @@ class ChatControl(ChatControlBase):
self.restore_conversation()
self.msg_textview.grab_focus()
- # change tooltip text for audio and video buttons if python-farsight is
+ # change tooltip text for audio and video buttons if python-farstream is
# not installed
- if not gajim.HAVE_FARSIGHT:
+ if not gajim.HAVE_FARSTREAM:
tooltip_text = self._audio_button.get_tooltip_text()
self._audio_button.set_tooltip_text(
- '%s\n%s' % (tooltip_text, _('Requires python-farsight.')))
+ '%s\n%s' % (tooltip_text, _('Requires python-farstream.')))
tooltip_text = self._video_button.get_tooltip_text()
self._video_button.set_tooltip_text(
- '%s\n%s' % (tooltip_text, _('Requires python-farsight.')))
+ '%s\n%s' % (tooltip_text, _('Requires python-farstream.')))
gajim.ged.register_event_handler('pep-received', ged.GUI1,
self._nec_pep_received)
@@ -1704,7 +1704,7 @@ class ChatControl(ChatControlBase):
# Jingle detection
if self.contact.supports(NS_JINGLE_ICE_UDP) and \
- gajim.HAVE_FARSIGHT and self.contact.resource:
+ gajim.HAVE_FARSTREAM and self.contact.resource:
self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO)
self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO)
else:

34
net/gajim/patches/patch-src_common_gajim_py Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-src_common_gajim_py,v 1.1 2012/04/05 16:08:56 jasper Exp $
port Gajim to use Farstream instead of Farsight2.
from upstream changeset dfd58bb1ad06.
--- src/common/gajim.py.orig Thu Apr 5 11:37:48 2012
+++ src/common/gajim.py Thu Apr 5 11:38:13 2012
@@ -169,21 +169,21 @@ else:
# read.
HAVE_LATEX = False
-HAVE_FARSIGHT = True
+HAVE_FARSTREAM = True
try:
- farsight = __import__('farsight')
+ farstream = __import__('farstream')
import gst
import glib
try:
conference = gst.element_factory_make('fsrtpconference')
- session = conference.new_session(farsight.MEDIA_TYPE_AUDIO)
+ session = conference.new_session(farstream.MEDIA_TYPE_AUDIO)
del session
del conference
except glib.GError:
- HAVE_FARSIGHT = False
+ HAVE_FARSTREAM = False
except ImportError:
- HAVE_FARSIGHT = False
+ HAVE_FARSTREAM = False
HAVE_UPNP_IGD = True
try:

16
net/gajim/patches/patch-src_common_helpers_py Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_common_helpers_py,v 1.1 2012/04/05 16:08:56 jasper Exp $
port Gajim to use Farstream instead of Farsight2.
from upstream changeset dfd58bb1ad06.
--- src/common/helpers.py.orig Thu Apr 5 11:34:52 2012
+++ src/common/helpers.py Thu Apr 5 11:35:01 2012
@@ -1330,7 +1330,7 @@ def update_optional_features(account = None):
gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION)
if gajim.config.get_per('accounts', a, 'answer_receipts'):
gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS)
- if gajim.HAVE_FARSIGHT:
+ if gajim.HAVE_FARSTREAM:
gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE)
gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP)
gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_AUDIO)

16
net/gajim/patches/patch-src_common_jingle_py Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_common_jingle_py,v 1.1 2012/04/05 16:08:56 jasper Exp $
port Gajim to use Farstream instead of Farsight2.
from upstream changeset dfd58bb1ad06.
--- src/common/jingle.py.orig Thu Apr 5 11:35:16 2012
+++ src/common/jingle.py Thu Apr 5 11:35:26 2012
@@ -35,7 +35,7 @@ import helpers
import gajim
from jingle_session import JingleSession, JingleStates
-if gajim.HAVE_FARSIGHT:
+if gajim.HAVE_FARSTREAM:
from jingle_rtp import JingleAudio, JingleVideo

159
net/gajim/patches/patch-src_common_jingle_rtp_py Normal file
View File

@ -0,0 +1,159 @@
$OpenBSD: patch-src_common_jingle_rtp_py,v 1.1 2012/04/05 16:08:56 jasper Exp $
port Gajim to use Farstream instead of Farsight2.
from upstream changeset dfd58bb1ad06.
--- src/common/jingle_rtp.py.orig Thu Apr 5 11:35:38 2012
+++ src/common/jingle_rtp.py Thu Apr 5 11:36:08 2012
@@ -21,7 +21,7 @@ import gobject
import socket
import xmpp
-import farsight, gst
+import farstream, gst
from glib import GError
import gajim
@@ -42,8 +42,8 @@ class JingleRTPContent(JingleContent):
JingleContent.__init__(self, session, transport)
self.media = media
self._dtmf_running = False
- self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO,
- 'video': farsight.MEDIA_TYPE_VIDEO}[media]
+ self.farstream_media = {'audio': farstream.MEDIA_TYPE_AUDIO,
+ 'video': farstream.MEDIA_TYPE_VIDEO}[media]
self.pipeline = None
self.src_bin = None
@@ -72,7 +72,7 @@ class JingleRTPContent(JingleContent):
self.pipeline.add(self.conference)
self.funnel = None
- self.p2psession = self.conference.new_session(self.farsight_media)
+ self.p2psession = self.conference.new_session(self.farstream_media)
participant = self.conference.new_participant(self.session.peerjid)
# FIXME: Consider a workaround, here...
@@ -93,7 +93,7 @@ class JingleRTPContent(JingleContent):
params['stun-ip'] = ip
self.p2pstream = self.p2psession.new_stream(participant,
- farsight.DIRECTION_RECV, 'nice', params)
+ farstream.DIRECTION_RECV, 'nice', params)
def is_ready(self):
return (JingleContent.is_ready(self) and self.candidates_ready)
@@ -140,15 +140,15 @@ class JingleRTPContent(JingleContent):
def _start_dtmf(self, event):
if event in ('*', '#'):
- event = {'*': farsight.DTMF_EVENT_STAR,
- '#': farsight.DTMF_EVENT_POUND}[event]
+ event = {'*': farstream.DTMF_EVENT_STAR,
+ '#': farstream.DTMF_EVENT_POUND}[event]
else:
event = int(event)
self.p2psession.start_telephony_event(event, 2,
- farsight.DTMF_METHOD_RTP_RFC4733)
+ farstream.DTMF_METHOD_RTP_RFC4733)
def _stop_dtmf(self):
- self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733)
+ self.p2psession.stop_telephony_event(farstream.DTMF_METHOD_RTP_RFC4733)
def _fill_content(self, content):
content.addChild(xmpp.NS_JINGLE_RTP + ' description',
@@ -170,30 +170,30 @@ class JingleRTPContent(JingleContent):
if message.type == gst.MESSAGE_ELEMENT:
name = message.structure.get_name()
log.debug('gst element message: %s: %s' % (name, message))
- if name == 'farsight-new-active-candidate-pair':
+ if name == 'farstream-new-active-candidate-pair':
pass
- elif name == 'farsight-recv-codecs-changed':
+ elif name == 'farstream-recv-codecs-changed':
pass
- elif name == 'farsight-codecs-changed':
+ elif name == 'farstream-codecs-changed':
if self.sent and self.p2psession.get_property('codecs-ready'):
self.send_description_info()
- elif name == 'farsight-local-candidates-prepared':
+ elif name == 'farstream-local-candidates-prepared':
self.candidates_ready = True
if self.is_ready():
self.session.on_session_state_changed(self)
- elif name == 'farsight-new-local-candidate':
+ elif name == 'farstream-new-local-candidate':
candidate = message.structure['candidate']
self.transport.candidates.append(candidate)
if self.sent:
# FIXME: Is this case even possible?
self.send_candidate(candidate)
- elif name == 'farsight-component-state-changed':
+ elif name == 'farstream-component-state-changed':
state = message.structure['state']
- if state == farsight.STREAM_STATE_FAILED:
+ if state == farstream.STREAM_STATE_FAILED:
reason = xmpp.Node('reason')
reason.setTag('failed-transport')
self.session.remove_content(self.creator, self.name, reason)
- elif name == 'farsight-error':
+ elif name == 'farstream-error':
log.error('Farsight error #%d!\nMessage: %s\nDebug: %s' % (
message.structure['error-no'],
message.structure['error-msg'],
@@ -238,8 +238,8 @@ class JingleRTPContent(JingleContent):
if self.transport.remote_candidates:
self.p2pstream.set_remote_candidates(self.transport.remote_candidates)
self.transport.remote_candidates = []
- # TODO: farsight.DIRECTION_BOTH only if senders='both'
- self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH)
+ # TODO: farstream.DIRECTION_BOTH only if senders='both'
+ self.p2pstream.set_property('direction', farstream.DIRECTION_BOTH)
JingleContent.on_negotiated(self)
def __on_remote_codecs(self, stanza, content, error, action):
@@ -252,8 +252,8 @@ class JingleRTPContent(JingleContent):
if not codec['id'] or not codec['name'] or not codec['clockrate']:
# ignore invalid payload-types
continue
- c = farsight.Codec(int(codec['id']), codec['name'],
- self.farsight_media, int(codec['clockrate']))
+ c = farstream.Codec(int(codec['id']), codec['name'],
+ self.farstream_media, int(codec['clockrate']))
if 'channels' in codec:
c.channels = int(codec['channels'])
else:
@@ -326,10 +326,10 @@ class JingleAudio(JingleRTPContent):
# place 16kHz before 8kHz, as buggy psi versions will take in
# account only the first codec
- codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
- farsight.MEDIA_TYPE_AUDIO, 16000),
- farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
- farsight.MEDIA_TYPE_AUDIO, 8000)]
+ codecs = [farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX',
+ farstream.MEDIA_TYPE_AUDIO, 16000),
+ farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX',
+ farstream.MEDIA_TYPE_AUDIO, 8000)]
self.p2psession.set_codec_preferences(codecs)
# the local parts
@@ -350,7 +350,7 @@ class JingleAudio(JingleRTPContent):
'sink-pad'))
self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
- # The following is needed for farsight to process ICE requests:
+ # The following is needed for farstream to process ICE requests:
self.pipeline.set_state(gst.STATE_PLAYING)
@@ -397,7 +397,7 @@ class JingleVideo(JingleRTPContent):
'sink-pad'))
self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
- # The following is needed for farsight to process ICE requests:
+ # The following is needed for farstream to process ICE requests:
self.pipeline.set_state(gst.STATE_PLAYING)
def get_fallback_src(self):

81
net/gajim/patches/patch-src_common_jingle_transport_py Normal file
View File

@ -0,0 +1,81 @@
$OpenBSD: patch-src_common_jingle_transport_py,v 1.1 2012/04/05 16:08:56 jasper Exp $
port Gajim to use Farstream instead of Farsight2.
from upstream changeset dfd58bb1ad06.
--- src/common/jingle_transport.py.orig Thu Apr 5 11:36:35 2012
+++ src/common/jingle_transport.py Thu Apr 5 11:37:41 2012
@@ -73,7 +73,7 @@ class JingleTransport(object):
try:
- import farsight
+ import farstream
except Exception:
pass
@@ -82,11 +82,11 @@ class JingleTransportICEUDP(JingleTransport):
JingleTransport.__init__(self, TransportType.datagram)
def make_candidate(self, candidate):
- types = {farsight.CANDIDATE_TYPE_HOST: 'host',
- farsight.CANDIDATE_TYPE_SRFLX: 'srflx',
- farsight.CANDIDATE_TYPE_PRFLX: 'prflx',
- farsight.CANDIDATE_TYPE_RELAY: 'relay',
- farsight.CANDIDATE_TYPE_MULTICAST: 'multicast'}
+ types = {farstream.CANDIDATE_TYPE_HOST: 'host',
+ farstream.CANDIDATE_TYPE_SRFLX: 'srflx',
+ farstream.CANDIDATE_TYPE_PRFLX: 'prflx',
+ farstream.CANDIDATE_TYPE_RELAY: 'relay',
+ farstream.CANDIDATE_TYPE_MULTICAST: 'multicast'}
attrs = {
'component': candidate.component_id,
'foundation': '1', # hack
@@ -98,7 +98,7 @@ class JingleTransportICEUDP(JingleTransport):
}
if candidate.type in types:
attrs['type'] = types[candidate.type]
- if candidate.proto == farsight.NETWORK_PROTOCOL_UDP:
+ if candidate.proto == farstream.NETWORK_PROTOCOL_UDP:
attrs['protocol'] = 'udp'
else:
# we actually don't handle properly different tcp options in jingle
@@ -117,29 +117,29 @@ class JingleTransportICEUDP(JingleTransport):
def parse_transport_stanza(self, transport):
candidates = []
for candidate in transport.iterTags('candidate'):
- cand = farsight.Candidate()
+ cand = farstream.Candidate()
cand.component_id = int(candidate['component'])
cand.ip = str(candidate['ip'])
cand.port = int(candidate['port'])
cand.foundation = str(candidate['foundation'])
- #cand.type = farsight.CANDIDATE_TYPE_LOCAL
+ #cand.type = farstream.CANDIDATE_TYPE_LOCAL
cand.priority = int(candidate['priority'])
if candidate['protocol'] == 'udp':
- cand.proto = farsight.NETWORK_PROTOCOL_UDP
+ cand.proto = farstream.NETWORK_PROTOCOL_UDP
else:
# we actually don't handle properly different tcp options in jingle
- cand.proto = farsight.NETWORK_PROTOCOL_TCP
+ cand.proto = farstream.NETWORK_PROTOCOL_TCP
cand.username = str(transport['ufrag'])
cand.password = str(transport['pwd'])
#FIXME: huh?
- types = {'host': farsight.CANDIDATE_TYPE_HOST,
- 'srflx': farsight.CANDIDATE_TYPE_SRFLX,
- 'prflx': farsight.CANDIDATE_TYPE_PRFLX,
- 'relay': farsight.CANDIDATE_TYPE_RELAY,
- 'multicast': farsight.CANDIDATE_TYPE_MULTICAST}
+ types = {'host': farstream.CANDIDATE_TYPE_HOST,
+ 'srflx': farstream.CANDIDATE_TYPE_SRFLX,
+ 'prflx': farstream.CANDIDATE_TYPE_PRFLX,
+ 'relay': farstream.CANDIDATE_TYPE_RELAY,
+ 'multicast': farstream.CANDIDATE_TYPE_MULTICAST}
if 'type' in candidate and candidate['type'] in types:
cand.type = types[candidate['type']]
else:

30
net/gajim/patches/patch-src_features_window_py Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_features_window_py,v 1.1 2012/04/05 16:08:56 jasper Exp $
port Gajim to use Farstream instead of Farsight2.
from upstream changeset dfd58bb1ad06.
--- src/features_window.py.orig Thu Apr 5 11:31:20 2012
+++ src/features_window.py Thu Apr 5 11:32:17 2012
@@ -103,9 +103,9 @@ class FeaturesWindow:
_('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'),
_('Requires python-docutils.'),
_('Requires python-docutils.')),
- _('Audio / Video'): (self.farsight_available,
+ _('Audio / Video'): (self.farstream_available,
_('Ability to start audio and video chat.'),
- _('Requires python-farsight and gstreamer-plugins-bad.'),
+ _('Requires python-farstream and gstreamer-plugins-bad.'),
_('Feature not available under Windows.')),
_('UPnP-IGD'): (self.gupnp_igd_available,
_('Ability to request your router to forward port for file transfer.'),
@@ -258,8 +258,8 @@ class FeaturesWindow:
return False
return True
- def farsight_available(self):
- return gajim.HAVE_FARSIGHT
+ def farstream_available(self):
+ return gajim.HAVE_FARSTREAM
def gupnp_igd_available(self):
return gajim.HAVE_UPNP_IGD

15
x11/gnome/empathy/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.91 2012/04/04 14:34:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.92 2012/04/05 16:08:56 jasper Exp $
COMMENT= Telepathy based messenger for GNOME
GNOME_PROJECT= empathy
GNOME_VERSION= 3.2.2
REVISION= 3
REVISION= 4
CATEGORIES= net
@ -25,16 +25,16 @@ WANTLIB += freetype gailutil-3 gck-1 gconf-2 gcr-3 gcr-base-3
WANTLIB += gcrypt gdbm gdk-3 gdk_pixbuf-2.0 gee geoclue gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gmp gnome-keyring gnutls goa-1.0
WANTLIB += gobject-2.0 gpg-error gssapi gstapp-0.10 gstaudio-0.10
WANTLIB += gstbase-0.10 gstfarsight-0.10 gstfft-0.10 gstinterfaces-0.10
WANTLIB += gstbase-0.10 gstfft-0.10 gstinterfaces-0.10
WANTLIB += gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 gthread-2.0
WANTLIB += gtk-3 hogweed icudata icui18n icuuc javascriptcoregtk-3.0
WANTLIB += jpeg json krb5 ltdl m mission-control-plugins nettle
WANTLIB += notify nspr4 nss3 ogg orc-0.4 p11-kit pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += pulse pulse-mainloop-glib smime3 sndfile softokn3 soup-2.4
WANTLIB += sqlite3 ssl3 stdc++ tasn1 telepathy-farsight telepathy-glib
WANTLIB += sqlite3 ssl3 stdc++ tasn1 telepathy-farstream telepathy-glib
WANTLIB += telepathy-logger vorbis vorbisfile webkitgtk-3.0 xcb
WANTLIB += xcb-render xcb-shm xml2 xslt z
WANTLIB += xcb-render xcb-shm xml2 xslt z farstream-0.1
MODULES= devel/dconf \
devel/gettext \
@ -48,7 +48,7 @@ LIB_DEPENDS= audio/libcanberra,-gtk3 \
audio/pulseaudio \
geo/geoclue \
net/telepathy/folks \
net/telepathy/telepathy-farsight \
net/telepathy/telepathy-farstream \
net/telepathy/telepathy-logger \
textproc/enchant \
x11/gnome/gcr \
@ -65,6 +65,9 @@ MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
MODGNOME_TOOLS= yelp
AUTOCONF_VERSION= 2.67
CONFIGURE_STYLE= autoconf gnu
CONFIGURE_ARGS+= --enable-spell \
--enable-location \
--enable-goa \

29
x11/gnome/empathy/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-configure_ac,v 1.5 2012/04/05 16:08:56 jasper Exp $
From e35c34e3935d055c6cd5db1c0808f9906488627b Mon Sep 17 00:00:00 2001
From: Olivier Crete <olivier.crete@collabora.com>
Date: Thu, 01 Mar 2012 16:52:56 +0000
Subject: Port Empathy-av to Telepathy Farstream
--- configure.ac.orig Mon Nov 14 15:46:22 2011
+++ configure.ac Thu Apr 5 14:33:59 2012
@@ -43,7 +43,7 @@ KEYRING_REQUIRED=2.26.0
GCR_REQUIRED=2.91.4
LIBCANBERRA_GTK_REQUIRED=0.25
LIBNOTIFY_REQUIRED=0.7.0
-TELEPATHY_FARSIGHT_REQUIRED=0.0.14
+TELEPATHY_FARSTREAM_REQUIRED=0.2.1
TELEPATHY_GLIB_REQUIRED=0.16.0
TELEPATHY_LOGGER=0.2.10
WEBKIT_REQUIRED=1.3.13
@@ -203,8 +203,8 @@ PKG_CHECK_MODULES(YELL, [telepathy-yell])
PKG_CHECK_MODULES(EMPATHY_AV,
[
- farsight2-0.10
- telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
+ farstream-0.1
+ telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
])
# -----------------------------------------------------------

301
x11/gnome/empathy/patches/patch-src_empathy-streamed-media-handler_c Normal file
View File

@ -0,0 +1,301 @@
$OpenBSD: patch-src_empathy-streamed-media-handler_c,v 1.1 2012/04/05 16:08:56 jasper Exp $
From 57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 28 Feb 2012 12:05:43 +0000
Subject: Allow to build with empathy-av
From e35c34e3935d055c6cd5db1c0808f9906488627b Mon Sep 17 00:00:00 2001
From: Olivier Crete <olivier.crete@collabora.com>
Date: Thu, 01 Mar 2012 16:52:56 +0000
Subject: Port Empathy-av to Telepathy Farstream
--- src/empathy-streamed-media-handler.c.orig Mon Nov 14 15:41:42 2011
+++ src/empathy-streamed-media-handler.c Thu Apr 5 14:43:18 2012
@@ -26,8 +26,7 @@
#include <telepathy-glib/util.h>
#include <telepathy-glib/interfaces.h>
-#include <telepathy-farsight/channel.h>
-#include <telepathy-farsight/stream.h>
+#include <telepathy-farstream/telepathy-farstream.h>
#include <libempathy/empathy-utils.h>
@@ -46,7 +45,7 @@ enum {
CONFERENCE_ADDED,
SRC_PAD_ADDED,
SINK_PAD_ADDED,
- REQUEST_RESOURCE,
+ START_RECEIVING,
CLOSED,
STREAM_CLOSED,
CANDIDATES_CHANGED,
@@ -360,8 +359,8 @@ empathy_streamed_media_handler_class_init (EmpathyStre
G_TYPE_BOOLEAN,
2, GST_TYPE_PAD, G_TYPE_UINT);
- signals[REQUEST_RESOURCE] =
- g_signal_new ("request-resource", G_TYPE_FROM_CLASS (klass),
+ signals[START_RECEIVING] =
+ g_signal_new ("start-receiving", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0,
g_signal_accumulator_true_handled, NULL,
_src_marshal_BOOLEAN__UINT_UINT,
@@ -378,7 +377,7 @@ empathy_streamed_media_handler_class_init (EmpathyStre
g_signal_new ("stream-closed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, TF_TYPE_STREAM);
+ G_TYPE_NONE, 1, TF_TYPE_CONTENT);
signals[CANDIDATES_CHANGED] =
g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
@@ -540,7 +539,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStr
return;
if (s != NULL &&
- gst_structure_has_name (s, "farsight-send-codec-changed"))
+ gst_structure_has_name (s, "farstream-send-codec-changed"))
{
const GValue *val;
FsCodec *codec;
@@ -555,7 +554,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStr
update_sending_codec (handler, codec, session);
}
else if (s != NULL &&
- gst_structure_has_name (s, "farsight-recv-codecs-changed"))
+ gst_structure_has_name (s, "farstream-recv-codecs-changed"))
{
const GValue *val;
GList *codecs;
@@ -570,7 +569,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStr
update_receiving_codec (handler, codecs, stream);
}
else if (s != NULL &&
- gst_structure_has_name (s, "farsight-new-active-candidate-pair"))
+ gst_structure_has_name (s, "farstream-new-active-candidate-pair"))
{
const GValue *val;
FsCandidate *remote_candidate, *local_candidate;
@@ -592,8 +591,8 @@ empathy_streamed_media_handler_bus_message (EmpathyStr
}
static void
-empathy_streamed_media_handler_tf_channel_session_created_cb (TfChannel *tfchannel,
- FsConference *conference, FsParticipant *participant,
+empathy_streamed_media_handler_tf_channel_conference_added_cb (TfChannel *tfchannel,
+ FsConference *conference,
EmpathyStreamedMediaHandler *self)
{
g_signal_emit (G_OBJECT (self), signals[CONFERENCE_ADDED], 0,
@@ -603,86 +602,81 @@ empathy_streamed_media_handler_tf_channel_session_crea
static gboolean
src_pad_added_error_idle (gpointer data)
{
- TfStream *stream = data;
+ TfContent *content = data;
- tf_stream_error (stream, TP_MEDIA_STREAM_ERROR_MEDIA_ERROR,
- "Could not link sink");
- g_object_unref (stream);
+ tf_content_error_literal (content, "Could not link sink");
+ g_object_unref (content);
return FALSE;
}
static void
-empathy_streamed_media_handler_tf_stream_src_pad_added_cb (TfStream *stream,
+empathy_streamed_media_handler_tf_content_src_pad_added_cb (TfContent *content,
GstPad *pad, FsCodec *codec, EmpathyStreamedMediaHandler *handler)
{
guint media_type;
gboolean retval;
- g_object_get (stream, "media-type", &media_type, NULL);
+ g_object_get (content, "media-type", &media_type, NULL);
g_signal_emit (G_OBJECT (handler), signals[SRC_PAD_ADDED], 0,
pad, media_type, &retval);
if (!retval)
- g_idle_add (src_pad_added_error_idle, g_object_ref (stream));
+ g_idle_add (src_pad_added_error_idle, g_object_ref (content));
}
static gboolean
-empathy_streamed_media_handler_tf_stream_request_resource_cb (TfStream *stream,
- guint direction, EmpathyTpStreamedMedia *call)
+empathy_streamed_media_handler_tf_content_start_receiving_cb (TfContent *content,
+ guint *handles, guint handle_count, EmpathyTpStreamedMedia *call)
{
- gboolean ret;
+ gboolean ret = FALSE;
guint media_type;
- g_object_get (G_OBJECT (stream), "media-type", &media_type, NULL);
+ g_object_get (G_OBJECT (content), "media-type", &media_type, NULL);
g_signal_emit (G_OBJECT (call),
- signals[REQUEST_RESOURCE], 0, media_type, direction, &ret);
+ signals[START_RECEIVING], 0, media_type, &ret);
return ret;
}
static void
-empathy_streamed_media_handler_tf_stream_closed_cb (TfStream *stream,
- EmpathyStreamedMediaHandler *handler)
+empathy_streamed_media_handler_tf_content_removed_cb (TfChannel *channel,
+ TfContent *content, EmpathyStreamedMediaHandler *handler)
{
- g_signal_emit (handler, signals[STREAM_CLOSED], 0, stream);
+ g_signal_emit (handler, signals[STREAM_CLOSED], 0, content);
}
static void
-empathy_streamed_media_handler_tf_channel_stream_created_cb (TfChannel *tfchannel,
- TfStream *stream, EmpathyStreamedMediaHandler *handler)
+empathy_streamed_media_handler_tf_channel_content_added_cb (TfChannel *tfchannel,
+ TfContent *content, EmpathyStreamedMediaHandler *handler)
{
guint media_type;
GstPad *spad;
gboolean retval;
- FsStream *fs_stream;
- GList *codecs;
FsSession *session;
FsCodec *codec;
- g_signal_connect (stream, "src-pad-added",
- G_CALLBACK (empathy_streamed_media_handler_tf_stream_src_pad_added_cb), handler);
- g_signal_connect (stream, "request-resource",
- G_CALLBACK (empathy_streamed_media_handler_tf_stream_request_resource_cb),
+ g_signal_connect (content, "src-pad-added",
+ G_CALLBACK (empathy_streamed_media_handler_tf_content_src_pad_added_cb), handler);
+
+ g_signal_connect (content, "start-receiving",
+ G_CALLBACK (empathy_streamed_media_handler_tf_content_start_receiving_cb),
handler);
- g_signal_connect (stream, "closed",
- G_CALLBACK (empathy_streamed_media_handler_tf_stream_closed_cb), handler);
- g_object_get (stream, "media-type", &media_type,
+ g_object_get (content, "media-type", &media_type,
"sink-pad", &spad, NULL);
g_signal_emit (G_OBJECT (handler), signals[SINK_PAD_ADDED], 0,
spad, media_type, &retval);
if (!retval)
- tf_stream_error (stream, TP_MEDIA_STREAM_ERROR_MEDIA_ERROR,
- "Could not link source");
+ tf_content_error_literal (content, "Could not link source");
/* Get sending codec */
- g_object_get (stream, "farsight-session", &session, NULL);
+ g_object_get (content, "fs-session", &session, NULL);
g_object_get (session, "current-send-codec", &codec, NULL);
update_sending_codec (handler, codec, session);
@@ -690,15 +684,6 @@ empathy_streamed_media_handler_tf_channel_stream_creat
tp_clear_object (&session);
tp_clear_object (&codec);
- /* Get receiving codec */
- g_object_get (stream, "farsight-stream", &fs_stream, NULL);
- g_object_get (fs_stream, "current-recv-codecs", &codecs, NULL);
-
- update_receiving_codec (handler, codecs, fs_stream);
-
- fs_codec_list_destroy (codecs);
- tp_clear_object (&fs_stream);
-
gst_object_unref (spad);
}
@@ -731,28 +716,35 @@ empathy_streamed_media_handler_tf_channel_codec_config
}
static void
-empathy_streamed_media_handler_start_tpfs (EmpathyStreamedMediaHandler *self)
+empathy_streamed_media_handler_start_tpfs (GAsyncInitable *initable,
+ GAsyncResult *res, EmpathyStreamedMediaHandler *self)
{
EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
- TpChannel *channel;
+ GError *error = NULL;
- g_object_get (priv->call, "channel", &channel, NULL);
+ if (g_async_initable_init_finish (initable, res, &error))
+ {
+ /* Set up the telepathy farsight channel */
+ g_signal_connect (priv->tfchannel, "fs-conference-added",
+ G_CALLBACK (empathy_streamed_media_handler_tf_channel_conference_added_cb), self);
+ g_signal_connect (priv->tfchannel, "content-added",
+ G_CALLBACK (empathy_streamed_media_handler_tf_channel_content_added_cb), self);
+ g_signal_connect (priv->tfchannel, "content-removed",
+ G_CALLBACK (empathy_streamed_media_handler_tf_content_removed_cb),
+ self);
+ g_signal_connect (priv->tfchannel, "closed",
+ G_CALLBACK (empathy_streamed_media_handler_tf_channel_closed_cb), self);
- g_assert (channel != NULL);
- priv->tfchannel = tf_channel_new (channel);
-
- /* Set up the telepathy farsight channel */
- g_signal_connect (priv->tfchannel, "session-created",
- G_CALLBACK (empathy_streamed_media_handler_tf_channel_session_created_cb), self);
- g_signal_connect (priv->tfchannel, "stream-created",
- G_CALLBACK (empathy_streamed_media_handler_tf_channel_stream_created_cb), self);
- g_signal_connect (priv->tfchannel, "closed",
- G_CALLBACK (empathy_streamed_media_handler_tf_channel_closed_cb), self);
- g_signal_connect (priv->tfchannel, "stream-get-codec-config",
- G_CALLBACK (empathy_streamed_media_handler_tf_channel_codec_config_cb), self);
-
- g_object_unref (channel);
+ /* FIXME: In which condition do we call this ? */
+ empathy_tp_streamed_media_accept_incoming_call (priv->call);
+ }
+ else
+ {
+ g_warning ("Error creating tf channel");
+ g_clear_error (&error);
+ }
+ g_object_unref (self);
}
static void
@@ -782,8 +774,11 @@ empathy_streamed_media_handler_request_cb (GObject *so
g_object_notify (G_OBJECT (self), "tp-call");
- empathy_streamed_media_handler_start_tpfs (self);
+ tf_channel_new_async (channel,
+ (GAsyncReadyCallback) empathy_streamed_media_handler_start_tpfs,
+ g_object_ref (self));
+
g_object_unref (channel);
}
@@ -798,8 +793,14 @@ empathy_streamed_media_handler_start_call (EmpathyStre
if (priv->call != NULL)
{
- empathy_streamed_media_handler_start_tpfs (handler);
- empathy_tp_streamed_media_accept_incoming_call (priv->call);
+ TpChannel *channel;
+
+ g_object_get (priv->call, "channel", &channel, NULL);
+
+ tf_channel_new_async (channel,
+ (GAsyncReadyCallback) empathy_streamed_media_handler_start_tpfs,
+ g_object_ref (handler));
+ g_object_unref (channel);
return;
}

18
x11/gnome/empathy/patches/patch-src_empathy-streamed-media-handler_h Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_empathy-streamed-media-handler_h,v 1.1 2012/04/05 16:08:56 jasper Exp $
From 57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 28 Feb 2012 12:05:43 +0000
Subject: Allow to build with empathy-av
--- src/empathy-streamed-media-handler.h.orig Thu Apr 5 14:24:33 2012
+++ src/empathy-streamed-media-handler.h Thu Apr 5 14:24:46 2012
@@ -24,7 +24,7 @@
#include <glib-object.h>
#include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <farstream/fs-conference.h>
#include <libempathy/empathy-tp-streamed-media.h>
#include <libempathy/empathy-contact.h>

76
x11/gnome/empathy/patches/patch-src_empathy-streamed-media-window_c Normal file
View File

@ -0,0 +1,76 @@
$OpenBSD: patch-src_empathy-streamed-media-window_c,v 1.1 2012/04/05 16:08:56 jasper Exp $
From 57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 28 Feb 2012 12:05:43 +0000
Subject: Allow to build with empathy-av
From e35c34e3935d055c6cd5db1c0808f9906488627b Mon Sep 17 00:00:00 2001
From: Olivier Crete <olivier.crete@collabora.com>
Date: Thu, 01 Mar 2012 16:52:56 +0000
Subject: Port Empathy-av to Telepathy Farstream
--- src/empathy-streamed-media-window.c.orig Mon Nov 14 15:41:42 2011
+++ src/empathy-streamed-media-window.c Thu Apr 5 14:38:58 2012
@@ -31,10 +31,10 @@
#include <glib/gi18n.h>
#include <telepathy-glib/util.h>
-#include <telepathy-farsight/channel.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-farstream/telepathy-farstream.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <farstream/fs-element-added-notifier.h>
+#include <farstream/fs-utils.h>
#include <libempathy/empathy-tp-contact-factory.h>
#include <libempathy/empathy-utils.h>
@@ -1765,8 +1765,8 @@ empathy_streamed_media_window_conference_added_cb (Emp
}
static gboolean
-empathy_streamed_media_window_request_resource_cb (EmpathyStreamedMediaHandler *handler,
- FsMediaType type, FsStreamDirection direction, gpointer user_data)
+empathy_streamed_media_window_start_receiving_cb (EmpathyStreamedMediaHandler *handler,
+ FsMediaType type,gpointer user_data)
{
EmpathyStreamedMediaWindow *self = EMPATHY_STREAMED_MEDIA_WINDOW (user_data);
EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self);
@@ -1774,9 +1774,6 @@ empathy_streamed_media_window_request_resource_cb (Emp
if (type != FS_MEDIA_TYPE_VIDEO)
return TRUE;
- if (direction == FS_DIRECTION_RECV)
- return TRUE;
-
/* video and direction is send */
return priv->video_input != NULL;
}
@@ -1958,13 +1955,13 @@ empathy_streamed_media_window_channel_closed_cb (Empat
static void
empathy_streamed_media_window_channel_stream_closed_cb (EmpathyStreamedMediaHandler *handler,
- TfStream *stream, gpointer user_data)
+ TfContent *content, gpointer user_data)
{
EmpathyStreamedMediaWindow *self = EMPATHY_STREAMED_MEDIA_WINDOW (user_data);
EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self);
guint media_type;
- g_object_get (stream, "media-type", &media_type, NULL);
+ g_object_get (content, "media-type", &media_type, NULL);
/*
* This assumes that there is only one video stream per channel...
@@ -2725,8 +2722,8 @@ empathy_streamed_media_window_realized_cb (GtkWidget *
g_signal_connect (priv->handler, "conference-added",
G_CALLBACK (empathy_streamed_media_window_conference_added_cb), window);
- g_signal_connect (priv->handler, "request-resource",
- G_CALLBACK (empathy_streamed_media_window_request_resource_cb), window);
+ g_signal_connect (priv->handler, "start-receiving",
+ G_CALLBACK (empathy_streamed_media_window_start_receiving_cb), window);
g_signal_connect (priv->handler, "closed",
G_CALLBACK (empathy_streamed_media_window_channel_closed_cb), window);
g_signal_connect (priv->handler, "src-pad-added",

20
x11/gnome/empathy/patches/patch-src_empathy-video-widget_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_empathy-video-widget_c,v 1.1 2012/04/05 16:08:56 jasper Exp $
From 354671e1521cc3157d44701cbac56b3eb19fb35c Mon Sep 17 00:00:00 2001
From: Gert Kulyk <gkulyk@yahoo.de>
Date: Thu, 23 Feb 2012 08:38:16 +0000
Subject: Stop using Farsight2 headers
https://bugzilla.gnome.org/show_bug.cgi?id=670638
--- src/empathy-video-widget.c.orig Thu Apr 5 14:45:40 2012
+++ src/empathy-video-widget.c Thu Apr 5 14:45:51 2012
@@ -25,7 +25,7 @@
#include <gdk/gdkx.h>
#include <gst/interfaces/xoverlay.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <farstream/fs-element-added-notifier.h>
#include "empathy-video-widget.h"