Attachment #656 for bug #1027

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1027
Collapse All | Expand All

Lines 26-28 if ( HAVE_LIBV4L1_VIDEODEV_H ) Link Here

(-)a/kopete/ConfigureChecks.cmake (+7 lines)
26	endif ( )	26	endif ( )
27	# -- End libv4l1-videodev.h ----------------------------------------------	27	# -- End libv4l1-videodev.h ----------------------------------------------
28		28
		29	# -- Check for linux/videodev.h presence --------------------
		30	CHECK_INCLUDE_FILE ( "linux/videodev.h" HAVE_LINUX_VIDEODEV_H )
		31	if ( HAVE_LINUX_VIDEODEV_H )
		32	add_definitions( -DHAVE_LINUX_VIDEODEV_H )
		33	endif ( )
		34	# -- End linux-videodev.h ----------------------------------------------
		35

Lines 15-22 Link Here

(-)a/kopete/libkopete/avdevice/videocontrol.h (-2 lines)
15	*************************************************************************	15	*************************************************************************
16	*/	16	*/
17		17
18	#define ENABLE_AV
19
20	#ifndef KOPETE_AVVIDEOCONTROL_H	18	#ifndef KOPETE_AVVIDEOCONTROL_H
21	#define KOPETE_AVVIDEOCONTROL_H	19	#define KOPETE_AVVIDEOCONTROL_H
22		20

Lines 15-22 Link Here

(-)a/kopete/libkopete/avdevice/videodevice.cpp (-2 lines)
15	*************************************************************************	15	*************************************************************************
16	*/	16	*/
17		17
18	#define ENABLE_AV
19
20	#include <cstdlib>	18	#include <cstdlib>
21	#include <cerrno>	19	#include <cerrno>
22	#include <cstring>	20	#include <cstring>

Lines 15-25 Link Here

(-)a/kopete/libkopete/avdevice/videodevice.h (-3 / +7 lines)
15	*************************************************************************	15	*************************************************************************
16	*/	16	*/
17		17
18	#define ENABLE_AV
19
20	#ifndef KOPETE_AVVIDEODEVICELISTITEM_H	18	#ifndef KOPETE_AVVIDEODEVICELISTITEM_H
21	#define KOPETE_AVVIDEODEVICELISTITEM_H	19	#define KOPETE_AVVIDEODEVICELISTITEM_H
22		20
		21	#define ENABLE_AV
		22
23	#if defined HAVE_CONFIG_H	23	#if defined HAVE_CONFIG_H
24	#include <config.h>	24	#include <config.h>
25	#endif	25	#endif
Lines 54-61 Link Here
54	#include <linux/kernel.h>	54	#include <linux/kernel.h>
55	#if defined(HAVE_LIBV4L1_VIDEODEV_H)	55	#if defined(HAVE_LIBV4L1_VIDEODEV_H)
56	#include <libv4l1-videodev.h>	56	#include <libv4l1-videodev.h>
57	#else	57	#elif defined(HAVE_LINUX_VIDEODEV_H)
58	#include <linux/videodev.h>	58	#include <linux/videodev.h>
		59	#else
		60	#undef ENABLE_AV
59	#endif	61	#endif
60	#define VIDEO_MODE_PAL_Nc 3	62	#define VIDEO_MODE_PAL_Nc 3
61	#define VIDEO_MODE_PAL_M 4	63	#define VIDEO_MODE_PAL_M 4
Lines 293-300 public: Link Here
293	void enumerateMenu (void);	295	void enumerateMenu (void);
294		296
295	#endif	297	#endif
		298	#ifndef ENABLE_AV
296	struct video_capability V4L_capabilities;	299	struct video_capability V4L_capabilities;
297	struct video_buffer V4L_videobuffer;	300	struct video_buffer V4L_videobuffer;
		301	#endif
298	#endif	302	#endif
299	TQValueVector<Kopete::AV::VideoInput> m_input;	303	TQValueVector<Kopete::AV::VideoInput> m_input;
300	TQValueVector<Kopete::AV::VideoControl> m_control;	304	TQValueVector<Kopete::AV::VideoControl> m_control;

Lines 15-22 Link Here

(-)a/kopete/libkopete/avdevice/videodevicepool.cpp (-2 lines)
15	*************************************************************************	15	*************************************************************************
16	*/	16	*/
17		17
18	#define ENABLE_AV
19
20	#include <assert.h>	18	#include <assert.h>
21	#include <cstdlib>	19	#include <cstdlib>
22	#include <cerrno>	20	#include <cerrno>

Lines 15-22 Link Here

(-)a/kopete/libkopete/avdevice/videoinput.h (-3 lines)
15	*************************************************************************	15	*************************************************************************
16	*/	16	*/
17		17
18	#define ENABLE_AV
19
20	#ifndef KOPETE_AVVIDEOINPUT_H	18	#ifndef KOPETE_AVVIDEOINPUT_H
21	#define KOPETE_AVVIDEOINPUT_H	19	#define KOPETE_AVVIDEOINPUT_H
22		20
23	-

Return to bug 1027