- update to 0.98.9
from Azwaw OUSADOU (MAINTAINER)
This commit is contained in:
jasper
parent
5b9d1c7169
commit
c2d045892e
@ -1,9 +1,8 @@
|
||||
#$OpenBSD: Makefile,v 1.21 2012/04/05 16:08:55 jasper Exp $
|
||||
#$OpenBSD: Makefile,v 1.22 2012/08/12 17:33:04 jasper Exp $
|
||||
|
||||
COMMENT= open source MSN Messenger clone
|
||||
|
||||
V= 0.98.4
|
||||
REVISION= 0
|
||||
V= 0.98.9
|
||||
DISTNAME= amsn-$V-src
|
||||
PKGNAME= ${DISTNAME:S/-src//}
|
||||
CATEGORIES= net
|
||||
@ -22,8 +21,8 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=project/amsn/amsn/${V}/}
|
||||
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 farstream-0.1
|
||||
gthread-2.0 gstbase-0.10 gstreamer-0.10 xml2 jpeg png \
|
||||
farstream-0.1 gstinterfaces-0.10
|
||||
|
||||
LIB_DEPENDS= graphics/jpeg \
|
||||
graphics/png \
|
||||
@ -35,7 +34,6 @@ RUN_DEPENDS+= ${MODTK_RUN_DEPENDS} \
|
||||
BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} \
|
||||
security/tcltls \
|
||||
graphics/png:configure
|
||||
# CxImage requires access to internal png headers.
|
||||
|
||||
MODTK_THREADED= Yes
|
||||
MODULES= devel/gettext \
|
||||
@ -43,7 +41,6 @@ MODULES= devel/gettext \
|
||||
|
||||
USE_GMAKE= Yes
|
||||
MAKE_FLAGS= verbose=yes
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS+=--disable-libv4l \
|
||||
--disable-upnp \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (amsn-0.98.4-src.tar.bz2) = lv0g6HCc7URDQy0SWl4KWg==
|
||||
RMD160 (amsn-0.98.4-src.tar.bz2) = jgw73ekCVA/nWbAZeER8xg2PvrM=
|
||||
SHA1 (amsn-0.98.4-src.tar.bz2) = 4AdhyUWtR+C3FcafH58Y9aS/KHw=
|
||||
SHA256 (amsn-0.98.4-src.tar.bz2) = eqEacZm0zaXoFEk90WCRWrTE+WwE3iwf58L+I+6rqHE=
|
||||
SIZE (amsn-0.98.4-src.tar.bz2) = 13513233
|
||||
MD5 (amsn-0.98.9-src.tar.bz2) = E4hczJlysnIuM1UmAcWytA==
|
||||
RMD160 (amsn-0.98.9-src.tar.bz2) = ra5JMKzRPO+KhSF0DWOX70mas3s=
|
||||
SHA1 (amsn-0.98.9-src.tar.bz2) = PDidrLM9lrbnoO3yGDGfU4S2nuM=
|
||||
SHA256 (amsn-0.98.9-src.tar.bz2) = H9JiBInMNieoQXc6ec8op8nEOJecdtN/Ixp3Onnn8j4=
|
||||
SIZE (amsn-0.98.9-src.tar.bz2) = 13520050
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
$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 $@
|
||||
@ -1,7 +1,7 @@
|
||||
$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 Thu Apr 5 14:03:25 2012
|
||||
@@ -11,10 +11,10 @@ STATIC := @STATIC@
|
||||
$OpenBSD: patch-Makefile_in,v 1.7 2012/08/12 17:33:04 jasper Exp $
|
||||
--- Makefile.in.orig Fri May 18 21:28:05 2012
|
||||
+++ Makefile.in Sat Jul 14 19:55:28 2012
|
||||
@@ -16,10 +16,10 @@ STATIC := @STATIC@
|
||||
doc_files := docs INSTALL CREDITS FAQ GNUGPL HELP README TODO AGREEMENT remote.help
|
||||
|
||||
FILES_TO_INSTALL := *.tcl hotmlog.htm amsn amsn-remote amsn-remote-CLI amsn.desktop langlist
|
||||
@ -14,51 +14,35 @@ $OpenBSD: patch-Makefile_in,v 1.6 2012/04/05 16:08:55 jasper Exp $
|
||||
FILES_TO_INSTALL += plugins utils/sexytile
|
||||
FILES_TO_INSTALL += utils/log utils/uri utils/combobox utils/voipcontrols
|
||||
FILES_TO_INSTALL += utils/md4 utils/sasl ca-certs
|
||||
@@ -82,7 +82,7 @@ USE_MMX := @USE_MMX@
|
||||
@@ -88,9 +88,7 @@ HAVE_FARSTREAM := @HAVE_FARSTREAM@
|
||||
HAVE_FARSIGHT := @HAVE_FARSIGHT@
|
||||
|
||||
ADDITIONAL_FLAGS = $(WARN_FLAGS) $(LFS_FLAGS) ${TCL_INC_SPEC} ${TK_INC_SPEC}
|
||||
-ifeq (@DEBUG@,no)
|
||||
-ADDITIONAL_FLAGS += -O2
|
||||
-else
|
||||
+ifeq (@DEBUG@,yes)
|
||||
ADDITIONAL_FLAGS += -g3 -DDEBUG
|
||||
endif
|
||||
ADDITIONAL_FLAGS += -DPACKAGE='"$(PACKAGE)"'
|
||||
@@ -108,7 +106,7 @@ endif
|
||||
# build final cflags
|
||||
CFLAGS := @CFLAGS@
|
||||
ifeq (@DEBUG@,no)
|
||||
-CFLAGS += -O2
|
||||
+#CFLAGS += -O2
|
||||
else
|
||||
CFLAGS += -g3 -DDEBUG
|
||||
endif
|
||||
@@ -104,9 +104,9 @@ CFLAGS += -DPACKAGE='"$(PACKAGE)"'
|
||||
CFLAGS += -DVERSION='"$(VERSION)"'
|
||||
CFLAGS += -DLIBDIR='"$(LIBDIR)"'
|
||||
CFLAGS := @CFLAGS@ $(ADDITIONAL_FLAGS)
|
||||
|
||||
-CXXFLAGS := @CXXFLAGS@
|
||||
+CXXFLAGS := $(CFLAGS) @CXXFLAGS@
|
||||
ifeq (@DEBUG@,no)
|
||||
-CXXFLAGS += -O2
|
||||
+#CXXFLAGS += -O2
|
||||
else
|
||||
CXXFLAGS += -g3 -DDEBUG
|
||||
endif
|
||||
@@ -127,8 +127,8 @@ endif
|
||||
-CXXFLAGS := @CXXFLAGS@ $(ADDITIONAL_FLAGS)
|
||||
+CXXFLAGS := @CFLAGS@ @CXXFLAGS@ $(ADDITIONAL_FLAGS)
|
||||
|
||||
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; \
|
||||
ifeq ($(STATIC),yes)
|
||||
CXXFLAGS += -static-libgcc -L.
|
||||
@@ -249,11 +247,13 @@ install:: $(FILES_TO_INSTALL) | install_libs
|
||||
done
|
||||
|
||||
# This doesn't work if the libdir has quotes in it
|
||||
- sed -i -e 's#^set lib_path ""$$#set lib_path "$(libdir)/$(PACKAGE)"#' $(DESTDIR)$(dstdir)/$(PACKAGE)/amsn
|
||||
+ sed 's#^set lib_path ""$$#set lib_path "$(libdir)/$(PACKAGE)"#' $(DESTDIR)$(dstdir)/$(PACKAGE)/amsn > $(DESTDIR)$(dstdir)/$(PACKAGE)/amsn.patched
|
||||
+ mv $(DESTDIR)$(dstdir)/$(PACKAGE)/amsn.patched \
|
||||
+ $(DESTDIR)$(dstdir)/$(PACKAGE)/amsn && chmod +x $(DESTDIR)$(dstdir)/$(PACKAGE)/amsn
|
||||
|
||||
- ln -sf $(dstdir)/$(PACKAGE)/amsn $(DESTDIR)$(slnkdir)/amsn
|
||||
- ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(DESTDIR)$(slnkdir)/amsn-remote
|
||||
- ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(DESTDIR)$(slnkdir)/amsn-remote-CLI
|
||||
@ -68,12 +52,3 @@ $OpenBSD: patch-Makefile_in,v 1.6 2012/04/05 16:08:55 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
|
||||
|
||||
@ -1,55 +1,7 @@
|
||||
$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 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: patch-configure,v 1.7 2012/08/12 17:33:04 jasper Exp $
|
||||
--- configure.orig Wed May 23 22:28:25 2012
|
||||
+++ configure Sun Jul 8 18:18:32 2012
|
||||
@@ -2305,8 +2305,8 @@ case `uname -s` in
|
||||
OpenBSD | FreeBSD | NetBSD)
|
||||
# *BSD has important stuff (from ports)
|
||||
# in /usr/local ...
|
||||
@ -60,8 +12,8 @@ Port from farsight2 to farstream, from Fedora's amsn-0.98.4-farstream.patch
|
||||
FOUND_OS="bsd"
|
||||
;;
|
||||
Darwin)
|
||||
@@ -2395,7 +2395,7 @@ $as_echo X"$prefix" |
|
||||
fi
|
||||
@@ -2336,7 +2336,7 @@ $as_echo "maybe" >&6; }
|
||||
esac
|
||||
|
||||
|
||||
-TCLSH=`which tclsh`
|
||||
@ -69,63 +21,69 @@ Port from farsight2 to farstream, from Fedora's amsn-0.98.4-farstream.patch
|
||||
VERSION=`echo "puts $::tcl_version ; exit" | ${TCLSH}`
|
||||
# Check whether --enable-version-check was given.
|
||||
if test "${enable_version_check+set}" = set; then :
|
||||
@@ -3095,17 +3095,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
|
||||
@@ -3036,17 +3036,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
|
||||
if test "$ac_test_CFLAGS" = set; then
|
||||
CFLAGS=$ac_save_CFLAGS
|
||||
elif test $ac_cv_prog_cc_g = yes; then
|
||||
- if test "$GCC" = yes; then
|
||||
- CFLAGS="-g -O2"
|
||||
- else
|
||||
CFLAGS="-g"
|
||||
- CFLAGS="-g"
|
||||
- fi
|
||||
+ CFLAGS="-g"
|
||||
else
|
||||
- if test "$GCC" = yes; then
|
||||
- CFLAGS="-O2"
|
||||
- else
|
||||
CFLAGS=
|
||||
- CFLAGS=
|
||||
- fi
|
||||
+ CFLAGS=
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
||||
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
||||
@@ -3449,17 +3441,9 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
|
||||
@@ -3389,18 +3381,11 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
|
||||
if test "$ac_test_CXXFLAGS" = set; then
|
||||
CXXFLAGS=$ac_save_CXXFLAGS
|
||||
elif test $ac_cv_prog_cxx_g = yes; then
|
||||
- if test "$GXX" = yes; then
|
||||
- CXXFLAGS="-g -O2"
|
||||
- else
|
||||
CXXFLAGS="-g"
|
||||
- CXXFLAGS="-g"
|
||||
- fi
|
||||
+ CXXFLAGS="-g"
|
||||
else
|
||||
- if test "$GXX" = yes; then
|
||||
- CXXFLAGS="-O2"
|
||||
- else
|
||||
CXXFLAGS=
|
||||
- CXXFLAGS=
|
||||
- fi
|
||||
+ CXXFLAGS=
|
||||
fi
|
||||
+
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
@@ -3508,7 +3492,7 @@ $as_echo_n "checking tcl build dir... " >&6; }
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@@ -3445,8 +3430,7 @@ $as_echo_n "checking tcl build dir... " >&6; }
|
||||
/usr/local/lib64 \
|
||||
/usr/lib64 \
|
||||
/usr/lib64/tcl8.* \
|
||||
/usr/local/lib64/tcl8.* \
|
||||
- /usr/local/lib64/tcl8.* \
|
||||
- `locate tclConfig.sh`"
|
||||
+ "
|
||||
+ /usr/local/lib64/tcl8.*"
|
||||
|
||||
for i in $dirs ; do
|
||||
|
||||
@@ -3633,9 +3617,8 @@ $as_echo_n "checking tk build dir... " >&6; }
|
||||
@@ -3570,8 +3554,7 @@ $as_echo_n "checking tk build dir... " >&6; }
|
||||
/usr/local/lib64 \
|
||||
/usr/lib64 \
|
||||
/usr/lib64/tk8.* \
|
||||
/usr/local/lib64/tk8.* \
|
||||
- /usr/local/lib64/tk8.* \
|
||||
- `locate tkConfig.sh`"
|
||||
+ "
|
||||
+ /usr/local/lib64/tk8.*"
|
||||
|
||||
|
||||
-
|
||||
for i in $dirs ; do
|
||||
|
||||
if test -f "$i"; then
|
||||
@@ -5008,13 +4991,13 @@ fi
|
||||
@@ -4946,13 +4929,13 @@ fi
|
||||
done
|
||||
|
||||
|
||||
@ -133,7 +91,7 @@ Port from farsight2 to farstream, from Fedora's amsn-0.98.4-farstream.patch
|
||||
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
|
||||
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
|
||||
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
|
||||
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -142,139 +100,12 @@ Port from farsight2 to farstream, from Fedora's amsn-0.98.4-farstream.patch
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -5045,7 +5028,7 @@ fi
|
||||
@@ -4983,7 +4966,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
|
||||
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||
- LIBPTHREAD="-lpthread"
|
||||
+ LIBPTHREAD="-pthread"
|
||||
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
|
||||
|
||||
@ -1,32 +1,20 @@
|
||||
$OpenBSD: patch-utils_TkCximage_src_CxImage_ximapng_cpp,v 1.1 2011/07/08 20:38:00 naddy Exp $
|
||||
|
||||
Fix build with png-1.5.
|
||||
|
||||
--- utils/TkCximage/src/CxImage/ximapng.cpp.orig Thu Jul 7 15:24:08 2011
|
||||
+++ utils/TkCximage/src/CxImage/ximapng.cpp Thu Jul 7 15:42:35 2011
|
||||
$OpenBSD: patch-utils_TkCximage_src_CxImage_ximapng_cpp,v 1.2 2012/08/12 17:33:04 jasper Exp $
|
||||
--- utils/TkCximage/src/CxImage/ximapng.cpp.orig Tue May 15 22:28:38 2012
|
||||
+++ utils/TkCximage/src/CxImage/ximapng.cpp Sat Jul 14 14:59:06 2012
|
||||
@@ -15,7 +15,7 @@
|
||||
void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
|
||||
{
|
||||
strcpy(info.szLastError,message);
|
||||
- longjmp(png_ptr->jmpbuf, 1);
|
||||
- longjmp(png_jmpbuf(png_ptr), 1);
|
||||
+ png_longjmp(png_ptr, 1);
|
||||
}
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
#if CXIMAGE_SUPPORT_DECODE
|
||||
@@ -62,7 +62,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
|
||||
/* Set error handling if you are using the setjmp/longjmp method (this is
|
||||
* the normal method of doing things with libpng). REQUIRED unless you
|
||||
* set up your own error handlers in the png_create_read_struct() earlier. */
|
||||
- if (setjmp(png_ptr->jmpbuf)) {
|
||||
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
||||
/* Free all of the memory associated with the png_ptr and info_ptr */
|
||||
delete [] row_pointers;
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
||||
@@ -80,7 +80,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
|
||||
head.biWidth = info_ptr->width;
|
||||
head.biHeight= info_ptr->height;
|
||||
head.biWidth = png_get_image_width(png_ptr, info_ptr);
|
||||
head.biHeight= png_get_image_height(png_ptr, info_ptr);
|
||||
info.dwType = CXIMAGE_FORMAT_PNG;
|
||||
- longjmp(png_ptr->jmpbuf, 1);
|
||||
- longjmp(png_jmpbuf(png_ptr), 1);
|
||||
+ png_longjmp(png_ptr, 1);
|
||||
}
|
||||
|
||||
@ -35,44 +23,35 @@ Fix build with png-1.5.
|
||||
break;
|
||||
default:
|
||||
strcpy(info.szLastError,"unknown PNG color type");
|
||||
- longjmp(png_ptr->jmpbuf, 1);
|
||||
- longjmp(png_jmpbuf(png_ptr), 1);
|
||||
+ png_longjmp(png_ptr, 1);
|
||||
}
|
||||
|
||||
//find the right pixel depth used for cximage
|
||||
@@ -111,7 +111,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
|
||||
if (channels >= 3) pixel_depth=24;
|
||||
|
||||
if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
|
||||
- longjmp(png_ptr->jmpbuf, 1);
|
||||
@@ -114,7 +114,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
|
||||
if (!Create(png_get_image_width(png_ptr, info_ptr),
|
||||
png_get_image_height(png_ptr, info_ptr),
|
||||
pixel_depth, CXIMAGE_FORMAT_PNG)){
|
||||
- longjmp(png_jmpbuf(png_ptr), 1);
|
||||
+ png_longjmp(png_ptr, 1);
|
||||
}
|
||||
|
||||
/* get metrics */
|
||||
@@ -207,7 +207,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
|
||||
@@ -198,7 +198,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
|
||||
}
|
||||
|
||||
// <vho> - handle cancel
|
||||
- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
|
||||
- if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
|
||||
+ if (info.nEscape) png_longjmp(png_ptr, 1);
|
||||
|
||||
// row_bytes is the width x number of channels x (bit-depth / 8)
|
||||
row_pointers = new BYTE[info_ptr->rowbytes + 8];
|
||||
@@ -230,7 +230,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
|
||||
row_pointers = new BYTE[png_get_rowbytes(png_ptr,info_ptr) + 8];
|
||||
@@ -221,7 +221,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
|
||||
do {
|
||||
|
||||
// <vho> - handle cancel
|
||||
- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
|
||||
- if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
|
||||
+ if (info.nEscape) png_longjmp(png_ptr, 1);
|
||||
|
||||
#if CXIMAGE_SUPPORT_ALPHA // <vho>
|
||||
if (AlphaIsValid()) {
|
||||
@@ -362,7 +362,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
|
||||
/* Set error handling. REQUIRED if you aren't supplying your own
|
||||
* error hadnling functions in the png_create_write_struct() call.
|
||||
*/
|
||||
- if (setjmp(png_ptr->jmpbuf)){
|
||||
+ if (setjmp(png_jmpbuf(png_ptr))){
|
||||
/* If we get here, we had a problem reading the file */
|
||||
if (info_ptr->palette) free(info_ptr->palette);
|
||||
png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr);
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
$OpenBSD: patch-utils_TkCximage_src_CxImage_ximapng_h,v 1.1 2011/07/08 20:38:00 naddy Exp $
|
||||
|
||||
Fix build with png-1.5.
|
||||
|
||||
--- utils/TkCximage/src/CxImage/ximapng.h.orig Thu Jul 7 15:23:22 2011
|
||||
+++ utils/TkCximage/src/CxImage/ximapng.h Thu Jul 7 15:39:39 2011
|
||||
$OpenBSD: patch-utils_TkCximage_src_CxImage_ximapng_h,v 1.2 2012/08/12 17:33:04 jasper Exp $
|
||||
--- utils/TkCximage/src/CxImage/ximapng.h.orig Sat Jul 14 14:28:41 2012
|
||||
+++ utils/TkCximage/src/CxImage/ximapng.h Sat Jul 14 14:29:46 2012
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
extern "C" {
|
||||
@ -16,8 +13,8 @@ Fix build with png-1.5.
|
||||
@@ -65,7 +67,7 @@ class CxImagePNG: public CxImage (protected)
|
||||
static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
|
||||
{
|
||||
strncpy((char*)png_ptr->error_ptr,error_msg,255);
|
||||
- longjmp(png_ptr->jmpbuf, 1);
|
||||
strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
|
||||
- longjmp(png_jmpbuf(png_ptr), 1);
|
||||
+ png_longjmp(png_ptr, 1);
|
||||
}
|
||||
};
|
||||
|
||||
@ -1,187 +0,0 @@
|
||||
$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;
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2010/09/14 12:34:42 jasper Exp $
|
||||
share/amsn/utils/TkCximage/TkCximage.so
|
||||
share/amsn/utils/asyncresolver/libasyncresolver.so
|
||||
share/amsn/utils/farsight/tcl_farsight.so
|
||||
share/amsn/utils/linux/linflash/flash.so
|
||||
share/amsn/utils/linux/traydock/libtray.so
|
||||
share/amsn/utils/tclISF/tclISF.so
|
||||
share/amsn/utils/tcl_siren/tcl_siren.so
|
||||
share/amsn/utils/webcamsn/webcamsn.so
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.4 2012/08/12 17:33:04 jasper Exp $
|
||||
lib/amsn/utils/TkCximage/TkCximage.so
|
||||
lib/amsn/utils/asyncresolver/libasyncresolver.so
|
||||
lib/amsn/utils/farsight/tcl_farsight.so
|
||||
lib/amsn/utils/linux/linflash/flash.so
|
||||
lib/amsn/utils/linux/traydock/libtray.so
|
||||
lib/amsn/utils/tclISF/tclISF.so
|
||||
lib/amsn/utils/tcl_siren/tcl_siren.so
|
||||
lib/amsn/utils/webcamsn/webcamsn.so
|
||||
|
||||
@ -1,8 +1,28 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2011/07/07 13:14:29 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.9 2012/08/12 17:33:04 jasper Exp $
|
||||
%%SHARED%%
|
||||
bin/amsn
|
||||
bin/amsn-remote
|
||||
bin/amsn-remote-CLI
|
||||
lib/amsn/
|
||||
lib/amsn/utils/
|
||||
lib/amsn/utils/TkCximage/
|
||||
lib/amsn/utils/TkCximage/pkgIndex.tcl
|
||||
lib/amsn/utils/asyncresolver/
|
||||
lib/amsn/utils/asyncresolver/asyncresolver.tcl
|
||||
lib/amsn/utils/asyncresolver/pkgIndex.tcl
|
||||
lib/amsn/utils/farsight/
|
||||
lib/amsn/utils/farsight/pkgIndex.tcl
|
||||
lib/amsn/utils/linux/
|
||||
lib/amsn/utils/linux/linflash/
|
||||
lib/amsn/utils/linux/linflash/pkgIndex.tcl
|
||||
lib/amsn/utils/linux/traydock/
|
||||
lib/amsn/utils/linux/traydock/pkgIndex.tcl
|
||||
lib/amsn/utils/tclISF/
|
||||
lib/amsn/utils/tclISF/pkgIndex.tcl
|
||||
lib/amsn/utils/tcl_siren/
|
||||
lib/amsn/utils/tcl_siren/pkgIndex.tcl
|
||||
lib/amsn/utils/webcamsn/
|
||||
lib/amsn/utils/webcamsn/pkgIndex.tcl
|
||||
share/amsn/
|
||||
share/amsn/BWidget_mods.tcl
|
||||
share/amsn/abook.tcl
|
||||
@ -130,7 +150,27 @@ share/amsn/loging.tcl
|
||||
share/amsn/migmd5.tcl
|
||||
share/amsn/msncam.tcl
|
||||
share/amsn/msngames.tcl
|
||||
share/amsn/msnp2p/
|
||||
share/amsn/msnp2p.tcl
|
||||
share/amsn/msnp2p/constants.tcl
|
||||
share/amsn/msnp2p/filetransfer.tcl
|
||||
share/amsn/msnp2p/message.tcl
|
||||
share/amsn/msnp2p/msnobject.tcl
|
||||
share/amsn/msnp2p/p2p.tcl
|
||||
share/amsn/msnp2p/session.tcl
|
||||
share/amsn/msnp2p/session_manager.tcl
|
||||
share/amsn/msnp2p/slp.tcl
|
||||
share/amsn/msnp2p/sourcefiles.tcl
|
||||
share/amsn/msnp2p/transport/
|
||||
share/amsn/msnp2p/transport/TLP.tcl
|
||||
share/amsn/msnp2p/transport/TLPv1.tcl
|
||||
share/amsn/msnp2p/transport/TLPv2.tcl
|
||||
share/amsn/msnp2p/transport/base.tcl
|
||||
share/amsn/msnp2p/transport/constants.tcl
|
||||
share/amsn/msnp2p/transport/direct.tcl
|
||||
share/amsn/msnp2p/transport/switchboard.tcl
|
||||
share/amsn/msnp2p/transport/transport_manager.tcl
|
||||
share/amsn/msnp2p/webcam.tcl
|
||||
share/amsn/mutex.tcl
|
||||
share/amsn/pgu.tcl
|
||||
share/amsn/picture.tcl
|
||||
@ -2325,11 +2365,6 @@ share/amsn/spaces.tcl
|
||||
share/amsn/sxml.tcl
|
||||
share/amsn/trayicon.tcl
|
||||
share/amsn/utils/
|
||||
share/amsn/utils/TkCximage/
|
||||
share/amsn/utils/TkCximage/pkgIndex.tcl
|
||||
share/amsn/utils/asyncresolver/
|
||||
share/amsn/utils/asyncresolver/asyncresolver.tcl
|
||||
share/amsn/utils/asyncresolver/pkgIndex.tcl
|
||||
share/amsn/utils/base64/
|
||||
share/amsn/utils/base64/base64.tcl
|
||||
share/amsn/utils/base64/license.terms
|
||||
@ -2354,8 +2389,6 @@ share/amsn/utils/drawboard/
|
||||
share/amsn/utils/drawboard/drawboard.tcl
|
||||
share/amsn/utils/drawboard/grid.png
|
||||
share/amsn/utils/drawboard/pkgIndex.tcl
|
||||
share/amsn/utils/farsight/
|
||||
share/amsn/utils/farsight/pkgIndex.tcl
|
||||
share/amsn/utils/framec/
|
||||
share/amsn/utils/framec/framec.tcl
|
||||
share/amsn/utils/framec/pkgIndex.tcl
|
||||
@ -2363,11 +2396,6 @@ share/amsn/utils/http/
|
||||
share/amsn/utils/http/http.tcl
|
||||
share/amsn/utils/http/license.terms
|
||||
share/amsn/utils/http/pkgIndex.tcl
|
||||
share/amsn/utils/linux/
|
||||
share/amsn/utils/linux/linflash/
|
||||
share/amsn/utils/linux/linflash/pkgIndex.tcl
|
||||
share/amsn/utils/linux/traydock/
|
||||
share/amsn/utils/linux/traydock/pkgIndex.tcl
|
||||
share/amsn/utils/log/
|
||||
share/amsn/utils/log/license.terms
|
||||
share/amsn/utils/log/log.tcl
|
||||
@ -2471,10 +2499,6 @@ share/amsn/utils/snit/snit2.tcl
|
||||
share/amsn/utils/snit/snit83.tcl
|
||||
share/amsn/utils/snit/snit_tcl83_utils.tcl
|
||||
share/amsn/utils/snit/validate.tcl
|
||||
share/amsn/utils/tclISF/
|
||||
share/amsn/utils/tclISF/pkgIndex.tcl
|
||||
share/amsn/utils/tcl_siren/
|
||||
share/amsn/utils/tcl_siren/pkgIndex.tcl
|
||||
share/amsn/utils/uri/
|
||||
share/amsn/utils/uri/pkgIndex.tcl
|
||||
share/amsn/utils/uri/uri.tcl
|
||||
@ -2483,8 +2507,6 @@ share/amsn/utils/voipcontrols/
|
||||
share/amsn/utils/voipcontrols/pkgIndex.tcl
|
||||
share/amsn/utils/voipcontrols/test.tcl
|
||||
share/amsn/utils/voipcontrols/voipcontrols.tcl
|
||||
share/amsn/utils/webcamsn/
|
||||
share/amsn/utils/webcamsn/pkgIndex.tcl
|
||||
share/applications/amsn.desktop
|
||||
share/doc/amsn/
|
||||
share/doc/amsn/FAQ
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user