- update amsn to 0.98.3
from Azwaw OUSADOU, with some tweaks by me
This commit is contained in:
jasper
parent
8bcc0b5372
commit
2af6c5dbb5
@ -1,9 +1,10 @@
|
||||
#$OpenBSD: Makefile,v 1.9 2010/07/12 22:07:37 sthen Exp $
|
||||
#$OpenBSD: Makefile,v 1.10 2010/09/14 12:34:42 jasper Exp $
|
||||
|
||||
COMMENT= open source MSN Messenger clone
|
||||
|
||||
DISTNAME= amsn-0.97.2
|
||||
REVISION= 3
|
||||
V= 0.98.3
|
||||
DISTNAME= amsn-$V-src
|
||||
PKGNAME= ${DISTNAME:S/-src//}
|
||||
CATEGORIES= net
|
||||
|
||||
HOMEPAGE= http://www.amsn-project.net/
|
||||
@ -14,13 +15,17 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amsn/}
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amsn/${V}/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
WANTLIB= ICE SM X11 m pthread-stubs stdc++ xcb z
|
||||
|
||||
WANTLIB= ICE SM X11 m stdc++ z glib-2.0 gmodule-2.0 gobject-2.0 \
|
||||
gthread-2.0 iconv intl gstbase-0.10 gstinterfaces-0.10 \
|
||||
gstreamer-0.10 xml2
|
||||
|
||||
LIB_DEPENDS= jpeg::graphics/jpeg \
|
||||
png::graphics/png
|
||||
png::graphics/png \
|
||||
gstfarsight-0.10::net/farsight2
|
||||
RUN_DEPENDS+= ${MODTK_RUN_DEPENDS} \
|
||||
::security/tcltls \
|
||||
::x11/bwidget \
|
||||
@ -28,21 +33,30 @@ RUN_DEPENDS+= ${MODTK_RUN_DEPENDS} \
|
||||
BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} \
|
||||
::security/tcltls
|
||||
|
||||
MODTK_THREADED= Yes
|
||||
MODULES= x11/tk
|
||||
|
||||
USE_GMAKE= Yes
|
||||
MAKE_FLAGS= verbose=yes
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= --with-tcl=${MODTCL_LIBDIR} \
|
||||
--with-tk=${MODTK_LIBDIR}
|
||||
--with-tk=${MODTK_LIBDIR} \
|
||||
--enable-debug \
|
||||
--disable-libv4l \
|
||||
--disable-upnp
|
||||
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
|
||||
LDFLAGS="-lm -L${LOCALBASE}/lib -fPIC" \
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
|
||||
LDFLAGS="-lm -L${LOCALBASE}/lib" \
|
||||
TK_INC_SPEC="${MODTK_INCDIR}/generic" \
|
||||
TCLSH="${MODTCL_BIN}"
|
||||
|
||||
WRKDIST= ${WRKDIR}/amsn-$V/
|
||||
|
||||
NO_REGRESS= Yes # Generic tcl/tk tests.
|
||||
|
||||
pre-configure:
|
||||
@${SUBST_CMD} ${WRKSRC}/amsn*
|
||||
@${MODTCL_WISH_ADJ} ${WRKSRC}/amsn
|
||||
|
||||
post-install:
|
||||
.for a in amsn amsn-remote amsn-remote-CLI
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (amsn-0.97.2.tar.bz2) = bElNl7WrgQ8bJl7xm/ZSsA==
|
||||
RMD160 (amsn-0.97.2.tar.bz2) = z8GVofNdJixxJl5kEt9mEQJ+zkU=
|
||||
SHA1 (amsn-0.97.2.tar.bz2) = IkUrtZc8n7OOb+s6N7jWRTxWYA4=
|
||||
SHA256 (amsn-0.97.2.tar.bz2) = ECa5mhEvhAwUswwWGJWsi2sbYTydlV7dsHxW1zi4uAs=
|
||||
SIZE (amsn-0.97.2.tar.bz2) = 3431430
|
||||
MD5 (amsn-0.98.3-src.tar.bz2) = zxhPTHhmdqGgtLbhQRuRkw==
|
||||
RMD160 (amsn-0.98.3-src.tar.bz2) = IPcHBi2kpasetr7sSdAd/SupCpk=
|
||||
SHA1 (amsn-0.98.3-src.tar.bz2) = qoODoRzmY1Ks7uJ/nCkcFBCzQD0=
|
||||
SHA256 (amsn-0.98.3-src.tar.bz2) = Q7dtqdiG/Szc+KfiHJhyFBIooq0d76yorVN3IqMuDYg=
|
||||
SIZE (amsn-0.98.3-src.tar.bz2) = 13275477
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.3 2008/08/31 17:16:22 steven Exp $
|
||||
--- Makefile.in.orig Thu May 29 00:46:00 2008
|
||||
+++ Makefile.in Sun Aug 31 11:41:07 2008
|
||||
$OpenBSD: patch-Makefile_in,v 1.4 2010/09/14 12:34:42 jasper Exp $
|
||||
--- Makefile.in.orig Mon Oct 19 20:52:33 2009
|
||||
+++ Makefile.in Sun Dec 27 22:50:18 2009
|
||||
@@ -11,10 +11,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
|
||||
-FILES_TO_INSTALL += $(doc_files)
|
||||
+FILES_TO_INSTALL += remote.help
|
||||
FILES_TO_INSTALL += desktop-icons lang skins utils/base64 utils/drawboard utils/framec utils/http2.4
|
||||
FILES_TO_INSTALL += desktop-icons lang skins utils/des utils/base64 utils/drawboard utils/framec utils/http
|
||||
FILES_TO_INSTALL += utils/pixmapscroll utils/pixmapmenu utils/contentmanager
|
||||
-FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/bwidget1.8.0 utils/dpbrowser
|
||||
-FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/BWidget-1.9.0 utils/dpbrowser
|
||||
+FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/dpbrowser
|
||||
FILES_TO_INSTALL += plugins utils/sexytile
|
||||
FILES_TO_INSTALL += utils/log utils/uri utils/combobox
|
||||
FILES_TO_INSTALL += utils/log utils/uri utils/combobox utils/voipcontrols
|
||||
|
||||
@@ -80,7 +80,7 @@ USE_MMX := @USE_MMX@
|
||||
@@ -81,7 +81,7 @@ USE_MMX := @USE_MMX@
|
||||
# build final cflags
|
||||
CFLAGS := @CFLAGS@
|
||||
ifeq (@DEBUG@,no)
|
||||
@ -23,86 +23,28 @@ $OpenBSD: patch-Makefile_in,v 1.3 2008/08/31 17:16:22 steven Exp $
|
||||
else
|
||||
CFLAGS += -g3 -DDEBUG
|
||||
endif
|
||||
@@ -133,18 +133,18 @@ ifeq ($(FOUND_OS),linux)
|
||||
FILES_TO_INSTALL += utils/webcamsn/webcamsn.so utils/webcamsn/pkgIndex.tcl utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/capture/capture.so utils/linux/capture/pkgIndex.tcl utils/linux/linflash/flash.so utils/linux/linflash/pkgIndex.tcl utils/linux/traydock/libtray.so utils/linux/traydock/pkgIndex.tcl utils/linux/capture/libng/plugins/drv0-v4l2.so utils/linux/capture/libng/plugins/drv1-v4l.so utils/linux/capture/libng/plugins/conv-mjpeg.so utils/linux/capture/libng/plugins/sn9c10x.so utils/tcl_siren/tcl_siren.so utils/tcl_siren/pkgIndex.tcl
|
||||
@@ -103,9 +103,9 @@ CFLAGS += -DPACKAGE='"$(PACKAGE)"'
|
||||
CFLAGS += -DVERSION='"$(VERSION)"'
|
||||
CFLAGS += -DLIBDIR='"$(LIBDIR)"'
|
||||
|
||||
FILES_TO_EXCLUDE += AppMain.tcl
|
||||
-else
|
||||
- ifeq ($(FOUND_OS),bsd)
|
||||
+endif
|
||||
+
|
||||
+ifeq ($(FOUND_OS),bsd)
|
||||
FILES_TO_INSTALL += utils/webcamsn/webcamsn.so utils/webcamsn/pkgIndex.tcl utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/linflash/flash.so utils/linux/linflash/pkgIndex.tcl utils/linux/traydock/libtray.so utils/linux/traydock/pkgIndex.tcl utils/tcl_siren/tcl_siren.so utils/tcl_siren/pkgIndex.tcl
|
||||
|
||||
FILES_TO_EXCLUDE += AppMain.tcl
|
||||
- else
|
||||
- ifeq ($(FOUND_OS),solaris)
|
||||
+endif
|
||||
+
|
||||
+ifeq ($(FOUND_OS),solaris)
|
||||
FILES_TO_INSTALL += utils/webcamsn/webcamsn.so utils/webcamsn/pkgIndex.tcl utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/capture/capture.so utils/linux/capture/pkgIndex.tcl utils/linux/linflash/flash.so utils/linux/linflash/pkgIndex.tcl utils/linux/traydock/libtray.so utils/linux/traydock/pkgIndex.tcl utils/linux/capture/libng/plugins/drv0-v4l2.so utils/linux/capture/libng/plugins/conv-mjpeg.so utils/tcl_siren/tcl_siren.so utils/tcl_siren/pkgIndex.tcl
|
||||
|
||||
FILES_TO_EXCLUDE += AppMain.tcl
|
||||
- endif
|
||||
- endif
|
||||
-CXXFLAGS := @CXXFLAGS@
|
||||
+CXXFLAGS := $(CFLAGS) @CXXFLAGS@
|
||||
ifeq (@DEBUG@,no)
|
||||
-CXXFLAGS += -O2
|
||||
+#CXXFLAGS += -O2
|
||||
else
|
||||
CXXFLAGS += -g3 -DDEBUG
|
||||
endif
|
||||
|
||||
CONFIGURE_ARGS := @CONFIGURE_ARGS@
|
||||
@@ -189,9 +189,9 @@ install:: $(FILES_TO_INSTALL)
|
||||
@@ -233,9 +233,9 @@ install:: $(FILES_TO_INSTALL)
|
||||
rm -Rf $(DESTDIR)$(dstdir)/$(PACKAGE)/$$p; \
|
||||
done
|
||||
|
||||
- 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
|
||||
+ #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
|
||||
+# 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
|
||||
|
||||
cp $(srcdir)/amsn.desktop $(DESTDIR)$(dstdir)/applications/
|
||||
|
||||
@@ -271,22 +271,29 @@ ifeq ($(FOUND_OS),linux)
|
||||
include $(tray_dir)/Rules.mk
|
||||
include $(linflash_dir)/Rules.mk
|
||||
endif
|
||||
-else
|
||||
- ifeq ($(FOUND_OS),mac)
|
||||
+endif
|
||||
+
|
||||
+ifeq ($(FOUND_OS),bsd)
|
||||
+ ifeq ($(FOUND_X11),yes)
|
||||
+ ADDLIBS += ${X_LIBS}
|
||||
+ include $(tray_dir)/Rules.mk
|
||||
+ endif
|
||||
+endif
|
||||
+ifeq ($(FOUND_OS),mac)
|
||||
include $(macosx_dir)/sndplay-src/Rules.mk
|
||||
include $(macosx_dir)/growl1.0/Rules.mk
|
||||
include $(macosx_dir)/growl1.0/src/Rules.mk
|
||||
include $(macosx_dir)/tclCarbon/Rules.mk
|
||||
include $(macosx_dir)/tclCarbon/src/Rules.mk
|
||||
- endif
|
||||
- ifeq ($(FOUND_OS),bsd)
|
||||
+endif
|
||||
+ifeq ($(FOUND_OS),bsd)
|
||||
ifeq ($(FOUND_X11),yes)
|
||||
ADDLIBS += ${X_LIBS}
|
||||
include $(tray_dir)/Rules.mk
|
||||
include $(linflash_dir)/Rules.mk
|
||||
endif
|
||||
- else
|
||||
- ifeq ($(FOUND_OS),solaris)
|
||||
+endif
|
||||
+ifeq ($(FOUND_OS),solaris)
|
||||
include $(capture_dir)/Rules.mk
|
||||
include $(capture_dir)/libng/Rules.mk
|
||||
include $(capture_dir)/libng/plugins/Rules.mk
|
||||
@@ -296,8 +303,6 @@ else
|
||||
include $(tray_dir)/Rules.mk
|
||||
include $(linflash_dir)/Rules.mk
|
||||
endif
|
||||
- endif
|
||||
- endif
|
||||
endif
|
||||
|
||||
#########################################################
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-amsn,v 1.3 2008/08/31 17:16:22 steven Exp $
|
||||
--- amsn.orig Sat Feb 2 22:12:58 2008
|
||||
+++ amsn Sat Feb 2 22:13:16 2008
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
# \
|
||||
-exec wish $0 $@
|
||||
+exec ${MODTK_BIN} $0 $@
|
||||
|
||||
###
|
||||
###
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.3 2008/08/31 17:16:22 steven Exp $
|
||||
--- configure.orig Fri Jul 25 16:47:03 2008
|
||||
+++ configure Sun Aug 31 11:37:29 2008
|
||||
@@ -1883,8 +1883,8 @@ case `uname -s` in
|
||||
$OpenBSD: patch-configure,v 1.4 2010/09/14 12:34:42 jasper Exp $
|
||||
--- configure.orig Tue Oct 20 14:08:22 2009
|
||||
+++ configure Sun Dec 27 22:59:35 2009
|
||||
@@ -2258,8 +2258,8 @@ case `uname -s` in
|
||||
OpenBSD | FreeBSD | NetBSD)
|
||||
# *BSD has important stuff (from ports)
|
||||
# in /usr/local ...
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.3 2008/08/31 17:16:22 steven Exp $
|
||||
FOUND_OS="bsd"
|
||||
;;
|
||||
Darwin)
|
||||
@@ -2008,7 +2008,7 @@ $as_echo X"$prefix" |
|
||||
@@ -2382,7 +2382,7 @@ $as_echo X"$prefix" |
|
||||
fi
|
||||
|
||||
|
||||
@ -20,22 +20,86 @@ $OpenBSD: patch-configure,v 1.3 2008/08/31 17:16:22 steven Exp $
|
||||
+#TCLSH=`which tclsh`
|
||||
VERSION=`echo "puts $::tcl_version ; exit" | ${TCLSH}`
|
||||
# Check whether --enable-version-check was given.
|
||||
if test "${enable_version_check+set}" = set; then
|
||||
@@ -3407,7 +3407,7 @@ $as_echo_n "checking tcl build dir... " >&6; }
|
||||
/usr/lib64/tcl8.5.* \
|
||||
/usr/local/lib64/tcl8.5 \
|
||||
/usr/local/lib64/tcl8.5.* \
|
||||
if test "${enable_version_check+set}" = set; then :
|
||||
@@ -3059,17 +3059,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"
|
||||
- fi
|
||||
else
|
||||
- if test "$GCC" = yes; then
|
||||
- CFLAGS="-O2"
|
||||
- else
|
||||
CFLAGS=
|
||||
- fi
|
||||
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; }
|
||||
@@ -3413,17 +3405,9 @@ $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"
|
||||
- fi
|
||||
else
|
||||
- if test "$GXX" = yes; then
|
||||
- CXXFLAGS="-O2"
|
||||
- else
|
||||
CXXFLAGS=
|
||||
- fi
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
@@ -3472,7 +3456,7 @@ $as_echo_n "checking tcl build dir... " >&6; }
|
||||
/usr/lib64 \
|
||||
/usr/lib64/tcl8.* \
|
||||
/usr/local/lib64/tcl8.* \
|
||||
- `locate tclConfig.sh`"
|
||||
+ "
|
||||
|
||||
for i in $dirs ; do
|
||||
|
||||
@@ -3556,7 +3556,7 @@ $as_echo_n "checking tk build dir... " >&6; }
|
||||
/usr/lib64/tk8.5.* \
|
||||
/usr/local/lib64/tk8.5 \
|
||||
/usr/local/lib64/tk8.5.* \
|
||||
@@ -3597,9 +3581,8 @@ $as_echo_n "checking tk build dir... " >&6; }
|
||||
/usr/lib64 \
|
||||
/usr/lib64/tk8.* \
|
||||
/usr/local/lib64/tk8.* \
|
||||
- `locate tkConfig.sh`"
|
||||
+ "
|
||||
|
||||
|
||||
-
|
||||
for i in $dirs ; do
|
||||
|
||||
if test -f "$i"; then
|
||||
@@ -4974,13 +4957,13 @@ fi
|
||||
done
|
||||
|
||||
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||
-$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 :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -5011,7 +4994,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 :
|
||||
- LIBPTHREAD="-lpthread"
|
||||
+ LIBPTHREAD="-pthread"
|
||||
fi
|
||||
|
||||
if test "$LIBPTHREAD" = ""; then
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-proxy_tcl,v 1.1 2009/02/11 20:22:45 pea Exp $
|
||||
--- proxy.tcl.orig Tue Jan 20 16:00:40 2009
|
||||
+++ proxy.tcl Tue Jan 20 16:00:50 2009
|
||||
@@ -9,7 +9,7 @@
|
||||
::Version::setSubversionId {$Id: patch-proxy_tcl,v 1.1 2009/02/11 20:22:45 pea Exp $}
|
||||
|
||||
package provide Proxy 0.1
|
||||
-package require http
|
||||
+package require -exact http 2.4.4
|
||||
|
||||
# This should be converted to a proper package, to use with package require
|
||||
source socks.tcl ;# SOCKS5 proxy support
|
||||
@ -1,114 +0,0 @@
|
||||
$OpenBSD: patch-utils_TkCximage_src_TkCximage_cpp,v 1.1 2009/02/11 20:22:45 pea Exp $
|
||||
--- utils/TkCximage/src/TkCximage.cpp.orig Fri Jan 4 17:08:26 2008
|
||||
+++ utils/TkCximage/src/TkCximage.cpp Thu Jan 22 11:17:16 2009
|
||||
@@ -13,6 +13,64 @@
|
||||
char currenttime[30];
|
||||
FILE * logfile;
|
||||
|
||||
+#define AVAILABLE_FORMATS 6
|
||||
+ Tk_PhotoImageFormat cximageFormats[] = {
|
||||
+ {
|
||||
+ "cximage",
|
||||
+ (Tk_ImageFileMatchProc *) ChanMatch,
|
||||
+ (Tk_ImageStringMatchProc *) ObjMatch,
|
||||
+ (Tk_ImageFileReadProc *) ChanRead,
|
||||
+ (Tk_ImageStringReadProc *) ObjRead,
|
||||
+ (Tk_ImageFileWriteProc *) ChanWrite,
|
||||
+ (Tk_ImageStringWriteProc *) StringWrite
|
||||
+ },
|
||||
+ {
|
||||
+ "cxgif",
|
||||
+ (Tk_ImageFileMatchProc *) ChanMatch,
|
||||
+ (Tk_ImageStringMatchProc *) ObjMatch,
|
||||
+ (Tk_ImageFileReadProc *) ChanRead,
|
||||
+ (Tk_ImageStringReadProc *) ObjRead,
|
||||
+ (Tk_ImageFileWriteProc *) ChanWrite,
|
||||
+ (Tk_ImageStringWriteProc *) StringWrite
|
||||
+ },
|
||||
+ {
|
||||
+ "cxpng",
|
||||
+ (Tk_ImageFileMatchProc *) ChanMatch,
|
||||
+ (Tk_ImageStringMatchProc *) ObjMatch,
|
||||
+ (Tk_ImageFileReadProc *) ChanRead,
|
||||
+ (Tk_ImageStringReadProc *) ObjRead,
|
||||
+ (Tk_ImageFileWriteProc *) ChanWrite,
|
||||
+ (Tk_ImageStringWriteProc *) StringWrite
|
||||
+ },
|
||||
+ {
|
||||
+ "cxjpg",
|
||||
+ (Tk_ImageFileMatchProc *) ChanMatch,
|
||||
+ (Tk_ImageStringMatchProc *) ObjMatch,
|
||||
+ (Tk_ImageFileReadProc *) ChanRead,
|
||||
+ (Tk_ImageStringReadProc *) ObjRead,
|
||||
+ (Tk_ImageFileWriteProc *) ChanWrite,
|
||||
+ (Tk_ImageStringWriteProc *) StringWrite
|
||||
+ },
|
||||
+ {
|
||||
+ "cxtga",
|
||||
+ (Tk_ImageFileMatchProc *) ChanMatch,
|
||||
+ (Tk_ImageStringMatchProc *) ObjMatch,
|
||||
+ (Tk_ImageFileReadProc *) ChanRead,
|
||||
+ (Tk_ImageStringReadProc *) ObjRead,
|
||||
+ (Tk_ImageFileWriteProc *) ChanWrite,
|
||||
+ (Tk_ImageStringWriteProc *) StringWrite
|
||||
+ },
|
||||
+ {
|
||||
+ "cxbmp",
|
||||
+ (Tk_ImageFileMatchProc *) ChanMatch,
|
||||
+ (Tk_ImageStringMatchProc *) ObjMatch,
|
||||
+ (Tk_ImageFileReadProc *) ChanRead,
|
||||
+ (Tk_ImageStringReadProc *) ObjRead,
|
||||
+ (Tk_ImageFileWriteProc *) ChanWrite,
|
||||
+ (Tk_ImageStringWriteProc *) StringWrite
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
int RGB2BGR(Tk_PhotoImageBlock *data, BYTE * pixelPtr) {
|
||||
int i;
|
||||
int size = data->height * data->width * data->pixelSize;
|
||||
@@ -254,10 +312,6 @@ int Tkcximage_Init (Tcl_Interp *interp ) {
|
||||
INITLOGS(); //
|
||||
LOG("---------------------------------"); //
|
||||
|
||||
-
|
||||
- int AvailableFromats = 6;
|
||||
- const char *KnownFormats[] = {"cximage", "cxgif", "cxpng", "cxjpg", "cxtga", "cxbmp"};
|
||||
-
|
||||
//Check Tcl version is 8.3 or higher
|
||||
if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
|
||||
return TCL_ERROR;
|
||||
@@ -271,16 +325,6 @@ int Tkcximage_Init (Tcl_Interp *interp ) {
|
||||
}
|
||||
|
||||
LOG("Tk stub initialized"); //
|
||||
-
|
||||
- Tk_PhotoImageFormat cximageFormats = {
|
||||
- NULL,
|
||||
- (Tk_ImageFileMatchProc *) ChanMatch,
|
||||
- (Tk_ImageStringMatchProc *) ObjMatch,
|
||||
- (Tk_ImageFileReadProc *) ChanRead,
|
||||
- (Tk_ImageStringReadProc *) ObjRead,
|
||||
- (Tk_ImageFileWriteProc *) ChanWrite,
|
||||
- (Tk_ImageStringWriteProc *) StringWrite
|
||||
- };
|
||||
|
||||
LOG("Creating commands"); //
|
||||
|
||||
@@ -310,14 +354,9 @@ int Tkcximage_Init (Tcl_Interp *interp ) {
|
||||
#endif
|
||||
|
||||
LOG("Adding format : "); //
|
||||
- for (i = 0; i < AvailableFromats; i++) {
|
||||
- delete cximageFormats.name;
|
||||
- cximageFormats.name = new char[strlen(KnownFormats[i]) + 1];
|
||||
- strcpy(cximageFormats.name, KnownFormats[i]);
|
||||
- Tk_CreatePhotoImageFormat(&cximageFormats);
|
||||
- APPENDLOG(cximageFormats.name); //
|
||||
- delete cximageFormats.name;
|
||||
- cximageFormats.name = NULL;
|
||||
+ for (i = 0; i < AVAILABLE_FORMATS; i++) {
|
||||
+ Tk_CreatePhotoImageFormat(&cximageFormats[i]);
|
||||
+ APPENDLOG(cximageFormats[i].name);
|
||||
}
|
||||
|
||||
// end of Initialisation
|
||||
@ -1,6 +1,9 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2008/02/02 21:17:50 steven Exp $
|
||||
@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
|
||||
|
||||
1796
net/amsn/pkg/PLIST
1796
net/amsn/pkg/PLIST
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user