Attachment #2045 for bug #2028

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 2028
Collapse All | Expand All

Lines 136-141 if( WITH_XCOMPOSITE ) Link Here

(-)a/ConfigureChecks.cmake (+7 lines)
136	tde_message_fatal( "xext is required for xcomposite support, but was not found on your system" )	136	tde_message_fatal( "xext is required for xcomposite support, but was not found on your system" )
137	endif( )	137	endif( )
138		138
		139	# for (twin/compton)
		140	# older libXext (e.g.in debian-6.0) doesn't provide XSyncFence
		141	tde_save_and_set( CMAKE_EXTRA_INCLUDE_FILES "X11/Xlib.h;X11/extensions/sync.h" )
		142	tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${XEXT_INCLUDE_DIRS}" )
		143	check_type_size( "XSyncFence" HAVE_XEXT_XSYNCFENCE )
		144	tde_restore( CMAKE_REQUIRED_INCLUDES )
		145	tde_restore( CMAKE_EXTRA_INCLUDE_FILES )
139	endif( )	146	endif( )
140		147
141		148




# TDE to compton config option map
#  WITH_XINNERAMA         -> CONFIG_XINERAMA
#  WITH_XRANDR            -> CONFIG_XANDR
#  HAVE_XEXT_XSYNCFENCE   -> CONFIG_XSYNC
#  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL
#  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL_GLSL
#  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL_FBO
#  WITH_OPENGL            -> CONFIG_GLX_XSYNC
#  WITH_PCRE              -> CONFIG_REGEX_PCRE
#  WITH_PCRE              -> CONFIG_REGEX_PCRE_JIT
#  WITH_LIBCONFIG         -> CONFIG_LIBCONFIG
#
#  HAVE_LIBCONFIG_OLD_API -> CONFIG_LIBCONFIG_LEGACY (set up in compton_config.h)
#  CONFIG_XSYNC           -> CONFIG_GLX_SYNC
#
#  CONFIG_DBUS              - always ON
#  CONFIG_C2                - always ON
#  CONFIG_XSYNC             - always ON (utilieses Xext)

# TODO: think about some configuration option for CONFIG_VSYNC_DRM
# NOTE: HAVE__XEXT_XSYNCFENCE is an automatically detected feature that shows
#       that libXext provides coresponding feature.

add_definitions("-std=c99")

set( compton_SRCS compton.c )

set( CONFIG_XSYNC ${HAVE_XEXT_XSYNCFENCE} )

if( WITH_OPENGL )
  set( CONFIG_VSYNC_OPENGL      ${WITH_OPENGL} )
  set( CONFIG_VSYNC_OPENGL_GLSL ${WITH_OPENGL} )
  set( CONFIG_VSYNC_OPENGL_FBO  ${WITH_OPENGL} )
  set( CONFIG_GLX_SYNC          ${CONFIG_XSYNC} )
  list( APPEND compton_LIBRARIES ${GL_LIBRARIES})
  list( APPEND compton_SRCS opengl.c )
endif( )

Lines 61-67 Link Here

(-)a/twin/compton-tde/common.h (-1 / +1 lines)
61	// Whether to enable X Sync support.	61	// Whether to enable X Sync support.
62	// #define CONFIG_XSYNC 1	62	// #define CONFIG_XSYNC 1
63	// Whether to enable GLX Sync support.	63	// Whether to enable GLX Sync support.
64	// #define CONFIG_GLX_XSYNC 1	64	// #define CONFIG_GLX_SYNC 1
65		65
66	// TDE specific options	66	// TDE specific options
67	// #define USE_ENV_HOME 1	67	// #define USE_ENV_HOME 1

Lines 21-27 Link Here

(-)a/twin/compton-tde/compton_config.h.cmake (-3 / +2 lines)
21	#define CONFIG_C2 1	21	#define CONFIG_C2 1
22		22
23	// Whether to enable X Sync support.	23	// Whether to enable X Sync support.
24	#define CONFIG_XSYNC 1	24	#cmakedefine CONFIG_XSYNC 1
25		25
26	// Whether to enable OpenGL support	26	// Whether to enable OpenGL support
27	#cmakedefine CONFIG_VSYNC_OPENGL 1	27	#cmakedefine CONFIG_VSYNC_OPENGL 1
Lines 30-36 Link Here
30	// Whether to enable GLX FBO support	30	// Whether to enable GLX FBO support
31	#cmakedefine CONFIG_VSYNC_OPENGL_FBO 1	31	#cmakedefine CONFIG_VSYNC_OPENGL_FBO 1
32	// Whether to enable GLX Sync support.	32	// Whether to enable GLX Sync support.
33	#cmakedefine CONFIG_GLX_XSYNC 1	33	#cmakedefine CONFIG_GLX_SYNC 1
34		34
35	// Whether to enable Xranr support	35	// Whether to enable Xranr support
36	#cmakedefine CONFIG_XRANDR 1	36	#cmakedefine CONFIG_XRANDR 1
37	-

Return to bug 2028

Lines 28-58 include_directories( Link Here

(-)a/twin/compton-tde/CMakeLists.txt (-3 / +7 lines)
28	# TDE to compton config option map	28	# TDE to compton config option map
29	# WITH_XINNERAMA -> CONFIG_XINERAMA	29	# WITH_XINNERAMA -> CONFIG_XINERAMA
30	# WITH_XRANDR -> CONFIG_XANDR	30	# WITH_XRANDR -> CONFIG_XANDR
		31	# HAVE_XEXT_XSYNCFENCE -> CONFIG_XSYNC
31	# WITH_OPENGL -> CONFIG_VSYNC_OPENGL	32	# WITH_OPENGL -> CONFIG_VSYNC_OPENGL
32	# WITH_OPENGL -> CONFIG_VSYNC_OPENGL_GLSL	33	# WITH_OPENGL -> CONFIG_VSYNC_OPENGL_GLSL
33	# WITH_OPENGL -> CONFIG_VSYNC_OPENGL_FBO	34	# WITH_OPENGL -> CONFIG_VSYNC_OPENGL_FBO
34	# WITH_OPENGL -> CONFIG_GLX_XSYNC
35	# WITH_PCRE -> CONFIG_REGEX_PCRE	35	# WITH_PCRE -> CONFIG_REGEX_PCRE
36	# WITH_PCRE -> CONFIG_REGEX_PCRE_JIT	36	# WITH_PCRE -> CONFIG_REGEX_PCRE_JIT
37	# WITH_LIBCONFIG -> CONFIG_LIBCONFIG	37	# WITH_LIBCONFIG -> CONFIG_LIBCONFIG
38	#	38	#
39	# HAVE_LIBCONFIG_OLD_API -> CONFIG_LIBCONFIG_LEGACY (set up in compton_config.h)	39	# HAVE_LIBCONFIG_OLD_API -> CONFIG_LIBCONFIG_LEGACY (set up in compton_config.h)
		40	# CONFIG_XSYNC -> CONFIG_GLX_SYNC
40	#	41	#
41	# CONFIG_DBUS - always ON	42	# CONFIG_DBUS - always ON
42	# CONFIG_C2 - always ON	43	# CONFIG_C2 - always ON
43	# CONFIG_XSYNC - always ON (utilieses Xext)
44		44
45	# TODO: think about some configuration option for CONFIG_VSYNC_DRM	45	# TODO: think about some configuration option for CONFIG_VSYNC_DRM
		46	# NOTE: HAVE__XEXT_XSYNCFENCE is an automatically detected feature that shows
		47	# that libXext provides coresponding feature.
46		48
47	add_definitions("-std=c99")	49	add_definitions("-std=c99")
48		50
49	set( compton_SRCS compton.c )	51	set( compton_SRCS compton.c )
50		52
		53	set( CONFIG_XSYNC ${HAVE_XEXT_XSYNCFENCE} )
		54
51	if( WITH_OPENGL )	55	if( WITH_OPENGL )
52	set( CONFIG_VSYNC_OPENGL ${WITH_OPENGL} )	56	set( CONFIG_VSYNC_OPENGL ${WITH_OPENGL} )
53	set( CONFIG_VSYNC_OPENGL_GLSL ${WITH_OPENGL} )	57	set( CONFIG_VSYNC_OPENGL_GLSL ${WITH_OPENGL} )
54	set( CONFIG_VSYNC_OPENGL_FBO ${WITH_OPENGL} )	58	set( CONFIG_VSYNC_OPENGL_FBO ${WITH_OPENGL} )
55	set( CONFIG_GLX_XSYNC ${WITH_OPENGL} )	59	set( CONFIG_GLX_SYNC ${CONFIG_XSYNC} )
56	list( APPEND compton_LIBRARIES ${GL_LIBRARIES})	60	list( APPEND compton_LIBRARIES ${GL_LIBRARIES})
57	list( APPEND compton_SRCS opengl.c )	61	list( APPEND compton_SRCS opengl.c )
58	endif( )	62	endif( )