Attachment #53247 for bug #76127

Lines 1-11 Link Here

(-)gyach.orig/src/Makefile.am (-6 / +36 lines)
1	## Process this file with automake to produce Makefile.in	1	## Process this file with automake to produce Makefile.in
2		2
		3	SUBDIRS = webcam
		4
3	INCLUDES = \	5	INCLUDES = \
4	@GTK_CFLAGS@	6	@GTHREAD_CFLAGS@ \
		7	@GTKHTML_CFLAGS@ \
		8	@ESOUND_CFLAGS@ \
		9	-DLOCALEDIR=\"$(localedir)\"
5		10
6	bin_PROGRAMS = gyach	11	bin_PROGRAMS = gyache
7		12
8	gyach_SOURCES = \	13	gyache_SOURCES = \
9	aliases.c aliases.h \	14	aliases.c aliases.h \
10	callbacks.c callbacks.h \	15	callbacks.c callbacks.h \
11	commands.c commands.h \	16	commands.c commands.h \
Lines 23-30 Link Here
23	roomlist.c roomlist.h \	28	roomlist.c roomlist.h \
24	users.c users.h \	29	users.c users.h \
25	util.c util.h \	30	util.c util.h \
26	yahoochat.c yahoochat.h	31	bootprevent.c bootprevent.h \
27		32	yahoochat.c yahoochat.h \
		33	ycht.c ycht.h \
		34	profname.c profname.h \
		35	packet_handler.c packet_handler.h \
		36	animations.c animations.h \
		37	conference.c conference.h \
		38	sounds.c sounds.h \
		39	fonts.c fonts.h \
		40	plugins.c plugins.h \
		41	prflang.c prflang.h \
		42	voice_chat.c \
		43	gytreeview.c gytreeview.h \
		44	webconnect.c webconnect.h \
		45	spamcheck.c spamchech.h \
		46	pmwindow.c \
		47	setupwindow2.c \
		48	fader.c \
		49	htmlrender.c \
		50	tuxvironments.c \
		51	yab.c \
		52	webcam.c webcam.h \
		53	trayicon.c trayicon.h \
		54	yahoo_sha.c yahoo_authenticate.h \
		55	sha.c sha.h \
		56	yahoo_fn.c yahoo_fn.h \
		57	roomui.c roomui.h
28		58
29	gyach_LDADD = @GTK_LIBS@	59	gyache_LDADD = @GTHREAD_LIBS@ @GTKHTML_LIBS@ @ESOUND_LIBS@ @LIBLTDL@
30		60

Line 0 Link Here

(-)gyach.orig/src/webcam/Makefile.am (+9 lines)
	1	bin_PROGRAMS = gyachewebcam gyacheupload
	2	gyachewebcam_SOURCES = main.c gyachewebcam.c gyacheupload.h
	3	gyacheupload_SOURCES = gyacheupload-main.c gyacheupload-v4l.c gyacheupload-ui.c ../gytreeview.c ../gytreeview.h
	4
	5	gyachewebcam_LDADD = @GTK_LIBS@ @JASPER_LIBS@
	6	gyacheupload_LDADD = @GTK_LIBS@ @JASPER_LIBS@
	7
	8	INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I../ @GTKHTML_CFLAGS@
	9	LIBS = $(DEPS_LIBS)




			launcher=malloc(256);
			if (!launcher) {return ;}

			snprintf(launcher,254, "%s", "/usr/bin/gyacheupload"); 
/*
			if ( stat( launcher, &sbuf ))  {
				char wmsg[304];
				snprintf(wmsg, 302, "%s:\n\n%s", _("The Gyach Enhanced external webcam broadcaster could not be found"), 	launcher);

				free(launcher); launcher=NULL;
				return; 
														}
*/		
			/* TODO: add friends list as last argument */
			if (!webcam_device) {webcam_device=strdup("/dev/video0");}


			launcher=malloc(10642);
			if (!launcher) { free(myfriends); return ;}

			snprintf(launcher,10640, "gyacheupload \"%s\" \"%s\" \"%s\"  \"%s\" &",
			get_default_profile_name(), key, webcam_device , myfriends
			); 

			my_system(launcher);


			/* C-based cam viewer */
		if (! launchertype) { 
		snprintf(launcher,250, "%s", "gyachewebcam"); 
									} else {   /* Python-based viewer */
		snprintf(launcher,250, "%s/webcam/pywebcam.py", PACKAGE_DATA_DIR); 
											  }
/*
		if ( stat( launcher, &sbuf ))  {
			char wmsg[304];
			snprintf(wmsg, 302, "%s:\n\n%s", _("The Gyach Enhanced external webcam viewer could not be found"), 	launcher);
			show_ok_dialog(wmsg);
			return; 
													}
*/

		if (! launchertype) {  /* C-based viewer */
		snprintf(launcher,382, "gyachewebcam \"%s\" \"%s\" \"%s\" &",
		lastcamwho, get_default_profile_name(), key
		); 
									} else { /* Python-based viewer */
		snprintf(launcher,382, "python %s/webcam/pywebcam.py \"%s\" \"%s\" \"%s\" &",




dnl Process this file with autoconf to produce a configure script.

AC_INIT
AC_CONFIG_SRCDIR([configure.in])
AM_INIT_AUTOMAKE(gyache, 1.0.6)
AM_CONFIG_HEADER(config.h)

AC_ISC_POSIX

AM_PROG_CC_STDC
AC_HEADER_STDC

dnl configure libtool. this is for adding the -lltdl linker flag.
AC_LIBLTDL_INSTALLABLE
AC_PROG_LIBTOOL
AC_SUBST(LIBLTDL)

dnl AC_ARG_ENABLE(gtk_v2,
dnl   [  --disable-gtk_v2        disable gtk v2.0.x support])
dnl AC_ARG_ENABLE(gdk-pixbuf,
dnl   [  --disable-gdk-pixbuf    disable use of gdk-pixbuf (with gtk v1.x)],
dnl    gdk_pixbuf=$enableval, gdk_pixbuf=yes)
dnl AC_ARG_ENABLE(pixmaps,
dnl   [  --disable-pixmaps       disable remote user status pixmaps])
AC_ARG_ENABLE(threads,
  [  --disable-threads       disable use of pthread_create])
AC_ARG_ENABLE(debug,
  [  --enable-debug=LEVEL    enable debug messages at specified level])
dnl AC_ARG_ENABLE(interface,
dnl   [  --enable-interface=type use "type" widget for main chat text [text/xtext/html]] )

dnl GTK_CFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0 libgtkhtml-2.0 2>/dev/null`
dnl ESD_LIBS=`esd-config --cflags`
dnl ESD_LIBS=`esd-config --libs`

AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS)

AC_DEFINE(USE_GTK2)
GTK_REQUIRED_VERSION=2.0
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)

GTHREAD_REQUIRED_VERSION=2.0
PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GTHREAD_REQUIRED_VERSION)
AC_SUBST(GHTREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS)

GTKHTML_REQUIRED_VERSION=2.0
PKG_CHECK_MODULES(GTKHTML, libgtkhtml-2.0 >= $GTKHTML_REQUIRED_VERSION)
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)

dnl I honsestly dont know what version is requred of esd
dnl or if it would be better to:
dnl ESOUND_LIBS=`esd-config --libs`
dnl AC_SUBST(ESOUND_LIBS)
ESOUND_REQUIRED_VERSION=0.2
PKG_CHECK_MODULES(ESOUND, esound >= $ESOUND_REQUIRED_VERSION)
AC_SUBST(ESOUND_CFLAGS)
AC_SUBST(ESOUND_LIBS)

dnl check for jasper here
JASPER_LIBS=-ljasper
AC_SUBST(JASPER_LIBS)

if test "$enable_threads" != "no"; then
	GTK_LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0 libgtkhtml-2.0  2>/dev/null`
	GTK_CFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0 2> /dev/null`
else
	GTK_CFLAGS=""
fi

if test "x${GTK_CFLAGS}" != "x"; then
	if test "x$enable_gtk_v2" != "xno"; then
		echo yes
	fi
	if test "$enable_threads" != "no"; then
		GTK_LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0 2> /dev/null`
	else
		GTK_LIBS=`pkg-config --libs gtk+-2.0 2> /dev/null`
	fi
	CFLAGS="${CFLAGS} ${GTK_CFLAGS}"
	LIBS="${LIBS} ${GTK_LIBS}"
	AC_DEFINE(USE_GTK2)
else
	if test "x$enable_gtk_v2" != "xno"; then
		echo no
	fi
	AM_PATH_GTK(1.2.0, ,
            AC_MSG_WARN(Cannot find GTK: Is gtk-config in path?),
			gthread)
dnl            AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?), gthread)

	if test "x${GTK_CFLAGS}" = 'x'; then
		echo "*** gtk-config not found, running scripts/my-gtk-config"
		CFLAGS="${CFLAGS} `scripts/my-gtk-config --cflags`"
		echo "***     CFLAGS now '${CFLAGS}'"
		LIBS="${LIBS} `scripts/my-gtk-config --libs`"
		echo "***     LIBS now '${LIBS}'"
	fi

	if test "$gdk_pixbuf" = yes; then
	  AC_PATH_PROG(gdkpixbufpath, gdk-pixbuf-config)
	  AC_MSG_CHECKING(for gdk-pixbuf >= 0.8)
	  GDK_PIXBUF_CFLAGS=`$gdkpixbufpath --cflags 2>/dev/null`
	  GDK_PIXBUF_LIBS=`$gdkpixbufpath --libs 2>/dev/null`
	  if test "_$GDK_PIXBUF_CFLAGS" = _; then
		AC_MSG_RESULT([not found, will attempt to use 'convert' for images])
	  else
		vers=`$gdkpixbufpath --version`
		case $vers
		in
		  gdk-pixbuf-0.[[01234567]]) gdk_pixbuf_ok=false ;;
		  *) gdk_pixbuf_ok=true ;;
		esac
		if $gdk_pixbuf_ok; then
		  AC_MSG_RESULT(found)
		  gdk_pixbuf=yes
		  AC_DEFINE(USE_GDK_PIXBUF)
		  LIBS="${LIBS} $GDK_PIXBUF_LIBS"
		  CFLAGS="${CFLAGS} $GDK_PIXBUF_CFLAGS"
		else
		  gdk_pixbuf=no
		  AC_MSG_RESULT([version too old, building without gdk-pixbuf])
		fi
	  fi
	fi
fi

ac_system=`uname -s | cut -c1-6`

fi
changequote([,])dnl

AC_CONFIG_FILES([
Makefile
src/Makefile
src/webcam/Makefile
])
AC_OUTPUT


Return to bug 76127

Lines 98-105 Link Here

(-)gyach.orig/src/webcam.c (-10 / +10 lines)
98	launcher=malloc(256);	98	launcher=malloc(256);
99	if (!launcher) {return ;}	99	if (!launcher) {return ;}
100		100
101	snprintf(launcher,254, "%s/webcam/gyache-upload", PACKAGE_DATA_DIR);	101	snprintf(launcher,254, "%s", "/usr/bin/gyacheupload");
102		102	/*
103	if ( stat( launcher, &sbuf )) {	103	if ( stat( launcher, &sbuf )) {
104	char wmsg[304];	104	char wmsg[304];
105	snprintf(wmsg, 302, "%s:\n\n%s", _("The Gyach Enhanced external webcam broadcaster could not be found"), launcher);	105	snprintf(wmsg, 302, "%s:\n\n%s", _("The Gyach Enhanced external webcam broadcaster could not be found"), launcher);
Lines 109-115 Link Here
109	free(launcher); launcher=NULL;	109	free(launcher); launcher=NULL;
110	return;	110	return;
111	}	111	}
112		112	*/
113	/* TODO: add friends list as last argument */	113	/* TODO: add friends list as last argument */
114	if (!webcam_device) {webcam_device=strdup("/dev/video0");}	114	if (!webcam_device) {webcam_device=strdup("/dev/video0");}
115		115
Lines 118-125 Link Here
118	launcher=malloc(10642);	118	launcher=malloc(10642);
119	if (!launcher) { free(myfriends); return ;}	119	if (!launcher) { free(myfriends); return ;}
120		120
121	snprintf(launcher,10640, "%s/webcam/gyache-upload \"%s\" \"%s\" \"%s\" \"%s\" &",	121	snprintf(launcher,10640, "gyacheupload \"%s\" \"%s\" \"%s\" \"%s\" &",
122	PACKAGE_DATA_DIR, get_default_profile_name(), key, webcam_device , myfriends	122	get_default_profile_name(), key, webcam_device , myfriends
123	);	123	);
124		124
125	my_system(launcher);	125	my_system(launcher);
Lines 143-164 Link Here
143		143
144	/* C-based cam viewer */	144	/* C-based cam viewer */
145	if (! launchertype) {	145	if (! launchertype) {
146	snprintf(launcher,250, "%s/webcam/gyache-webcam", PACKAGE_DATA_DIR);	146	snprintf(launcher,250, "%s", "gyachewebcam");
147	} else { /* Python-based viewer */	147	} else { /* Python-based viewer */
148	snprintf(launcher,250, "%s/webcam/pywebcam.py", PACKAGE_DATA_DIR);	148	snprintf(launcher,250, "%s/webcam/pywebcam.py", PACKAGE_DATA_DIR);
149	}	149	}
150		150	/*
151	if ( stat( launcher, &sbuf )) {	151	if ( stat( launcher, &sbuf )) {
152	char wmsg[304];	152	char wmsg[304];
153	snprintf(wmsg, 302, "%s:\n\n%s", _("The Gyach Enhanced external webcam viewer could not be found"), launcher);	153	snprintf(wmsg, 302, "%s:\n\n%s", _("The Gyach Enhanced external webcam viewer could not be found"), launcher);
154	show_ok_dialog(wmsg);	154	show_ok_dialog(wmsg);
155	return;	155	return;
156	}	156	}
157		157	*/
158		158
159	if (! launchertype) { /* C-based viewer */	159	if (! launchertype) { /* C-based viewer */
160	snprintf(launcher,382, "%s/webcam/gyache-webcam \"%s\" \"%s\" \"%s\" &",	160	snprintf(launcher,382, "gyachewebcam \"%s\" \"%s\" \"%s\" &",
161	PACKAGE_DATA_DIR, lastcamwho, get_default_profile_name(), key	161	lastcamwho, get_default_profile_name(), key
162	);	162	);
163	} else { /* Python-based viewer */	163	} else { /* Python-based viewer */
164	snprintf(launcher,382, "python %s/webcam/pywebcam.py \"%s\" \"%s\" \"%s\" &",	164	snprintf(launcher,382, "python %s/webcam/pywebcam.py \"%s\" \"%s\" \"%s\" &",

Lines 1-7 Link Here

(-)gyach.orig/configure.in (-74 / +55 lines)
1	dnl Process this file with autoconf to produce a configure script.	1	dnl Process this file with autoconf to produce a configure script.
2		2
3	AC_INIT(configure.in)	3	AC_INIT
4	AM_INIT_AUTOMAKE(gyach, 0.9.2)	4	AC_CONFIG_SRCDIR([configure.in])
		5	AM_INIT_AUTOMAKE(gyache, 1.0.6)
5	AM_CONFIG_HEADER(config.h)	6	AM_CONFIG_HEADER(config.h)
6		7
7	AC_ISC_POSIX	8	AC_ISC_POSIX
Lines 9-91 Link Here
9	AM_PROG_CC_STDC	10	AM_PROG_CC_STDC
10	AC_HEADER_STDC	11	AC_HEADER_STDC
11		12
12	AC_ARG_ENABLE(gtk_v2,	13	dnl configure libtool. this is for adding the -lltdl linker flag.
13	[ --disable-gtk_v2 disable gtk v2.0.x support])	14	AC_LIBLTDL_INSTALLABLE
14	AC_ARG_ENABLE(gdk-pixbuf,	15	AC_PROG_LIBTOOL
15	[ --disable-gdk-pixbuf disable use of gdk-pixbuf (with gtk v1.x)],	16	AC_SUBST(LIBLTDL)
16	gdk_pixbuf=$enableval, gdk_pixbuf=yes)	17
17	AC_ARG_ENABLE(pixmaps,	18	dnl AC_ARG_ENABLE(gtk_v2,
18	[ --disable-pixmaps disable remote user status pixmaps])	19	dnl [ --disable-gtk_v2 disable gtk v2.0.x support])
		20	dnl AC_ARG_ENABLE(gdk-pixbuf,
		21	dnl [ --disable-gdk-pixbuf disable use of gdk-pixbuf (with gtk v1.x)],
		22	dnl gdk_pixbuf=$enableval, gdk_pixbuf=yes)
		23	dnl AC_ARG_ENABLE(pixmaps,
		24	dnl [ --disable-pixmaps disable remote user status pixmaps])
19	AC_ARG_ENABLE(threads,	25	AC_ARG_ENABLE(threads,
20	[ --disable-threads disable use of pthread_create])	26	[ --disable-threads disable use of pthread_create])
21	AC_ARG_ENABLE(debug,	27	AC_ARG_ENABLE(debug,
22	[ --enable-debug=LEVEL enable debug messages at specified level])	28	[ --enable-debug=LEVEL enable debug messages at specified level])
23	dnl AC_ARG_ENABLE(interface,
24	dnl [ --enable-interface=type use "type" widget for main chat text [text/xtext/html]] )
25		29
		30	dnl GTK_CFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0 libgtkhtml-2.0 2>/dev/null`
		31	dnl ESD_LIBS=`esd-config --cflags`
		32	dnl ESD_LIBS=`esd-config --libs`
		33
		34	AC_SUBST(CFLAGS)
		35	AC_SUBST(LDFLAGS)
		36
		37	AC_DEFINE(USE_GTK2)
		38	GTK_REQUIRED_VERSION=2.0
		39	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
		40	AC_SUBST(GTK_CFLAGS)
		41	AC_SUBST(GTK_LIBS)
		42
		43	GTHREAD_REQUIRED_VERSION=2.0
		44	PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GTHREAD_REQUIRED_VERSION)
		45	AC_SUBST(GHTREAD_CFLAGS)
		46	AC_SUBST(GTHREAD_LIBS)
		47
		48	GTKHTML_REQUIRED_VERSION=2.0
		49	PKG_CHECK_MODULES(GTKHTML, libgtkhtml-2.0 >= $GTKHTML_REQUIRED_VERSION)
		50	AC_SUBST(GTKHTML_CFLAGS)
		51	AC_SUBST(GTKHTML_LIBS)
		52
		53	dnl I honsestly dont know what version is requred of esd
		54	dnl or if it would be better to:
		55	dnl ESOUND_LIBS=`esd-config --libs`
		56	dnl AC_SUBST(ESOUND_LIBS)
		57	ESOUND_REQUIRED_VERSION=0.2
		58	PKG_CHECK_MODULES(ESOUND, esound >= $ESOUND_REQUIRED_VERSION)
		59	AC_SUBST(ESOUND_CFLAGS)
		60	AC_SUBST(ESOUND_LIBS)
		61
		62	dnl check for jasper here
		63	JASPER_LIBS=-ljasper
		64	AC_SUBST(JASPER_LIBS)
26		65
27	if test "x$enable_gtk_v2" != "xno"; then	66	if test "$enable_threads" != "no"; then
28	printf "checking for GTK - version >= 2.0.0... "	67	GTK_LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0 libgtkhtml-2.0 2>/dev/null`
29	GTK_CFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0 2> /dev/null`
30	else
31	GTK_CFLAGS=""
32	fi
33
34	if test "x${GTK_CFLAGS}" != "x"; then
35	if test "x$enable_gtk_v2" != "xno"; then
36	echo yes
37	fi
38	if test "$enable_threads" != "no"; then
39	GTK_LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0 2> /dev/null`
40	else
41	GTK_LIBS=`pkg-config --libs gtk+-2.0 2> /dev/null`
42	fi
43	CFLAGS="${CFLAGS} ${GTK_CFLAGS}"
44	LIBS="${LIBS} ${GTK_LIBS}"
45	AC_DEFINE(USE_GTK2)
46	else
47	if test "x$enable_gtk_v2" != "xno"; then
48	echo no
49	fi
50	AM_PATH_GTK(1.2.0, ,
51	AC_MSG_WARN(Cannot find GTK: Is gtk-config in path?),
52	gthread)
53	dnl AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?), gthread)
54
55	if test "x${GTK_CFLAGS}" = 'x'; then
56	echo "*** gtk-config not found, running scripts/my-gtk-config"
57	CFLAGS="${CFLAGS} `scripts/my-gtk-config --cflags`"
58	echo "*** CFLAGS now '${CFLAGS}'"
59	LIBS="${LIBS} `scripts/my-gtk-config --libs`"
60	echo "*** LIBS now '${LIBS}'"
61	fi
62
63	if test "$gdk_pixbuf" = yes; then
64	AC_PATH_PROG(gdkpixbufpath, gdk-pixbuf-config)
65	AC_MSG_CHECKING(for gdk-pixbuf >= 0.8)
66	GDK_PIXBUF_CFLAGS=`$gdkpixbufpath --cflags 2>/dev/null`
67	GDK_PIXBUF_LIBS=`$gdkpixbufpath --libs 2>/dev/null`
68	if test "_$GDK_PIXBUF_CFLAGS" = _; then
69	AC_MSG_RESULT([not found, will attempt to use 'convert' for images])
70	else
71	vers=`$gdkpixbufpath --version`
72	case $vers
73	in
74	gdk-pixbuf-0.[[01234567]]) gdk_pixbuf_ok=false ;;
75	*) gdk_pixbuf_ok=true ;;
76	esac
77	if $gdk_pixbuf_ok; then
78	AC_MSG_RESULT(found)
79	gdk_pixbuf=yes
80	AC_DEFINE(USE_GDK_PIXBUF)
81	LIBS="${LIBS} $GDK_PIXBUF_LIBS"
82	CFLAGS="${CFLAGS} $GDK_PIXBUF_CFLAGS"
83	else
84	gdk_pixbuf=no
85	AC_MSG_RESULT([version too old, building without gdk-pixbuf])
86	fi
87	fi
88	fi
89	fi	68	fi
90		69
91	ac_system=`uname -s \| cut -c1-6`	70	ac_system=`uname -s \| cut -c1-6`
Lines 158-165 Link Here
158	fi	137	fi
159	changequote([,])dnl	138	changequote([,])dnl
160		139
161	AC_OUTPUT([	140	AC_CONFIG_FILES([
162	Makefile	141	Makefile
163	src/Makefile	142	src/Makefile
		143	src/webcam/Makefile
164	])	144	])
		145	AC_OUTPUT
165		146