Attachment #2025 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




endif( )


# xrandr (kcontrol)
if( WITH_XRANDR )
  pkg_search_module( XRANDR xrandr )
  if( NOT XRANDR_FOUND )

  pkg_search_module( LIBCONFIG libconfig )
  if( LIBCONFIG_FOUND )
    set( HAVE_LIBCONFIG 1 )
	# TODO replace with functionality check
    if( LIBCONFIG_VERSION VERSION_LESS 1.4.0 )
      set( HAVE_LIBCONFIG_OLD_API 1 )
    endif( )
  else( LIBCONFIG_FOUND )

endif( )


# pcre (twin/compton-tde)
if( WITH_PCRE )
  pkg_search_module( LIBPCRE libpcre )
  if( NOT LIBPCRE_FOUND )
    tde_message_fatal( "pcre support is requested, but not found on your system" )
  endif( NOT LIBPCRE_FOUND )
endif( )


# xtest (kxkb)
if( WITH_XTEST )
  pkg_search_module( XTEST xtst )

endif( )


# openGL (kdesktop or kcontrol or tdescreensaver or twin/compot-tde )
if( WITH_OPENGL )
  pkg_search_module( GL gl )
  if( GL_FOUND )




# dbus (tdm, kdesktop, twin/compton-tde.c)
if( BUILD_TDM OR BUILD_KDESKTOP OR (BUILD_TWIN AND WITH_XCOMPOSITE) )

  pkg_search_module( DBUS dbus-1 )
  if( NOT DBUS_FOUND )




  tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XRANDR=ON to cmake arguments." )
elseif( NOT WITH_XFIXES )
  tde_message_fatal( "xfixes support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
elseif( NOT WITH_XINERAMA )
  tde_message_fatal( "xinerama support is needed to build compton-tde.\n Pass -DWITH_XINERAMA=ON to cmake arguments." )
elseif( NOT WITH_LIBCONFIG )
  tde_message_fatal( "libconfig support is needed to build compton-tde.\n Pass -DWITH_LIBCONFIG=ON to cmake arguments." )
endif( )


include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_CURRENT_BINARY_DIR}
  ${DBUS_INCLUDE_DIRS}
)

link_directories(
  ${TQT_LIBRARY_DIRS}
)


##### compton-tde (executable) ###################

# TDE to compton config option map
#  WITH_XINNERAMA         -> CONFIG_XINERAMA    
#  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL
#  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL_GLSL
#  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_DBUS              - always ON
#  CONFIG_C2                - always ON
#  CONFIG_XSYNC             - always ON (utilieses Xext)

# TODO: think about some configuration option for CONFIG_VSYNC_DRM

add_definitions("-std=c99")
if (CONFIG_LIBCONFIG)
	add_definitions("-DCONFIG_LIBCONFIG")
endif ()

set( compton_SRCS compton.c )
if (CONFIG_VSYNC_DRM)
	add_definitions("-DCONFIG_LIBCONFIG")
endif ()

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

if( WITH_LIBCONFIG )
  set( CONFIG_LIBCONFIG ${WITH_LIBCONFIG} )
  list( APPEND compton_LIBRARIES ${LIBCONFIG_LIBRARIES} )
endif( )

if( WITH_XINERAMA )
  set( CONFIG_XINERAMA ${WITH_XINERAMA} )
  list( APPEND compton_LIBRARIES ${XINERAMA_LIBRARIES} )
endif( )

if( WITH_PCRE )
  set( CONFIG_REGEX_PCRE        ${WITH_PCRE} )
  set( CONFIG_REGEX_PCRE_JIT    ${WITH_PCRE} )
  list( APPEND compton_LIBRARIES ${LIBPCRE_LIBRARIES} )
endif( )

configure_file( compton_config.h.cmake compton_config.h )
if (CONFIG_XINERAMA)
	add_definitions("-DCONFIG_XINERAMA")
endif ()

# permanently turn on some optional features: dbus c2
list( APPEND compton_SRCS dbus.c c2.c )
list( APPEND compton_LIBRARIES ${DBUS_LIBRARIES} )
	list(APPEND compton_SRCS src/c2.c)
endif ()

tde_add_executable( compton-tde
    SOURCES ${compton_SRCS}
  LINK m ${compton_LIBRARIES} ${XRENDER_LIBRARIES} 
    ${XRANDR_LIBRARIES} ${XFIXES_LIBRARIES} ${XDAMAGE_LIBRARIES} 
    ${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES}
  DESTINATION ${BIN_INSTALL_DIR}
)

Lines 12-18 Link Here

(-)a/twin/compton-tde/common.h (-1 / +1 lines)
12	#ifndef COMPTON_COMMON_H	12	#ifndef COMPTON_COMMON_H
13	#define COMPTON_COMMON_H	13	#define COMPTON_COMMON_H
14		14
15	#include "config.h"	15	#include "compton_config.h"
16		16
17	// === Options ===	17	// === Options ===
18		18




#include "config.h"

// Whether to enable PCRE regular expression support in blacklists, enabled
// by default
#cmakedefine CONFIG_REGEX_PCRE 1
// Whether to enable JIT support of libpcre. This may cause problems on PaX
// kernels.
#cmakedefine CONFIG_REGEX_PCRE_JIT 1
// Whether to enable parsing of configuration files using libconfig.
#cmakedefine CONFIG_LIBCONFIG 1
// Whether we are using a legacy version of libconfig (1.3.x).
#cmakedefine CONFIG_LIBCONFIG_LEGACY 1
// Whether to enable DRM VSync support
#cmakedefine CONFIG_VSYNC_DRM 1
// Whether to enable OpenGL support
#cmakedefine CONFIG_VSYNC_OPENGL 1
// Whether to enable GLX GLSL support
#cmakedefine CONFIG_VSYNC_OPENGL_GLSL 1
// Whether to enable GLX FBO support
#cmakedefine CONFIG_VSYNC_OPENGL_FBO 1
// Whether to enable DBus support with libdbus.
#define CONFIG_DBUS 1
// Whether to enable condition support.
#define CONFIG_C2 1
// Whether to enable X Sync support.
#define CONFIG_XSYNC 1
// Whether to enable GLX Sync support.
#cmakedefine CONFIG_GLX_XSYNC 1

Return to bug 2028

Lines 83-89 if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_K Link Here

(-)a/ConfigureChecks.cmake (-5 / +15 lines)
83	endif( )	83	endif( )
84		84
85		85
86	# xrender (kcontrol, twin)	86	# xrandr (kcontrol)
87	if( WITH_XRANDR )	87	if( WITH_XRANDR )
88	pkg_search_module( XRANDR xrandr )	88	pkg_search_module( XRANDR xrandr )
89	if( NOT XRANDR_FOUND )	89	if( NOT XRANDR_FOUND )
Lines 144-150 if( WITH_LIBCONFIG ) Link Here
144	pkg_search_module( LIBCONFIG libconfig )	144	pkg_search_module( LIBCONFIG libconfig )
145	if( LIBCONFIG_FOUND )	145	if( LIBCONFIG_FOUND )
146	set( HAVE_LIBCONFIG 1 )	146	set( HAVE_LIBCONFIG 1 )
147	if( LIBCONFIG_VERSION VERSION_LESS 1.5.0 )	147	# TODO replace with functionality check
		148	if( LIBCONFIG_VERSION VERSION_LESS 1.4.0 )
148	set( HAVE_LIBCONFIG_OLD_API 1 )	149	set( HAVE_LIBCONFIG_OLD_API 1 )
149	endif( )	150	endif( )
150	else( LIBCONFIG_FOUND )	151	else( LIBCONFIG_FOUND )
Lines 153-158 if( WITH_LIBCONFIG ) Link Here
153	endif( )	154	endif( )
154		155
155		156
		157	# pcre (twin/compton-tde)
		158	if( WITH_PCRE )
		159	pkg_search_module( LIBPCRE libpcre )
		160	if( NOT LIBPCRE_FOUND )
		161	tde_message_fatal( "pcre support is requested, but not found on your system" )
		162	endif( NOT LIBPCRE_FOUND )
		163	endif( )
		164
		165
156	# xtest (kxkb)	166	# xtest (kxkb)
157	if( WITH_XTEST )	167	if( WITH_XTEST )
158	pkg_search_module( XTEST xtst )	168	pkg_search_module( XTEST xtst )
Lines 196-202 if( WITH_XSCREENSAVER ) Link Here
196	endif( )	206	endif( )
197		207
198		208
199	# openGL (kdesktop or kcontrol or tdescreensaver )	209	# openGL (kdesktop or kcontrol or tdescreensaver or twin/compot-tde )
200	if( WITH_OPENGL )	210	if( WITH_OPENGL )
201	pkg_search_module( GL gl )	211	pkg_search_module( GL gl )
202	if( GL_FOUND )	212	if( GL_FOUND )
Lines 297-304 find_package( TDE ) Link Here
297		307
298		308
299		309
300	# dbus (tdm, kdesktop)	310	# dbus (tdm, kdesktop, twin/compton-tde.c)
301	if( BUILD_TDM OR BUILD_KDESKTOP )	311	if( BUILD_TDM OR BUILD_KDESKTOP OR (BUILD_TWIN AND WITH_XCOMPOSITE) )
302		312
303	pkg_search_module( DBUS dbus-1 )	313	pkg_search_module( DBUS dbus-1 )
304	if( NOT DBUS_FOUND )	314	if( NOT DBUS_FOUND )

Lines 72-77 option( WITH_XFIXES "Enable xfixes support" ${WITH_ALL_OPTIONS} ) Link Here

(-)a/CMakeLists.txt (+3 lines)
72	option( WITH_XRANDR "Enable xrandr support" ${WITH_ALL_OPTIONS} )	72	option( WITH_XRANDR "Enable xrandr support" ${WITH_ALL_OPTIONS} )
73	option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} )	73	option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} )
74	option( WITH_LIBCONFIG "Enable libconfig support" ${WITH_ALL_OPTIONS} )	74	option( WITH_LIBCONFIG "Enable libconfig support" ${WITH_ALL_OPTIONS} )
		75	option( WITH_PCRE "Enable pcre regex support" ON )
75	option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )	76	option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
76	option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )	77	option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )
77	option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )	78	option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
Lines 124-129 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" Link Here
124	# WITH_PAM affects tdm kdesktop kcheckpass	125	# WITH_PAM affects tdm kdesktop kcheckpass
125	# WITH_SHADOW affects tdm kcheckpass	126	# WITH_SHADOW affects tdm kcheckpass
126	# WITH_UPOWER affects ksmserver	127	# WITH_UPOWER affects ksmserver
		128	# WITH_LIBCONFIG affects twin/compot-tde
		129	# WITH_PCRE affects twin/compot-tde
127	# WITH_SUDO_TDESU_BACKEND affects tdesu	130	# WITH_SUDO_TDESU_BACKEND affects tdesu
128	# WITH_SUDO_KONSOLE_SUPER_USER_COMMAND affects launching Konsole super user sessions	131	# WITH_SUDO_KONSOLE_SUPER_USER_COMMAND affects launching Konsole super user sessions
129		132

Lines 16-72 elseif( NOT WITH_XRANDR ) Link Here

(-)a/twin/compton-tde/CMakeLists.txt (-36 / +49 lines)
16	tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XRANDR=ON to cmake arguments." )	16	tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XRANDR=ON to cmake arguments." )
17	elseif( NOT WITH_XFIXES )	17	elseif( NOT WITH_XFIXES )
18	tde_message_fatal( "xfixes support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." )	18	tde_message_fatal( "xfixes support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
19	elseif( NOT WITH_XINERAMA )
20	tde_message_fatal( "xinerama support is needed to build compton-tde.\n Pass -DWITH_XINERAMA=ON to cmake arguments." )
21	elseif( NOT WITH_LIBCONFIG )
22	tde_message_fatal( "libconfig support is needed to build compton-tde.\n Pass -DWITH_LIBCONFIG=ON to cmake arguments." )
23	endif( )	19	endif( )
24		20
25
26	include_directories(	21	include_directories(
27	${CMAKE_BINARY_DIR}	22	${CMAKE_BINARY_DIR}
28	${TDE_INCLUDE_DIR}	23	${CMAKE_CURRENT_BINARY_DIR}
29	${TQT_INCLUDE_DIRS}	24	${DBUS_INCLUDE_DIRS}
30	)
31
32	link_directories(
33	${TQT_LIBRARY_DIRS}
34	)	25	)
35		26
36		27
37	##### compton-tde (executable) ###################	28	##### compton-tde (executable) ###################
38		29
39	add_definitions("-Wall" "-std=c99")	30	# TDE to compton config option map
		31	# WITH_XINNERAMA -> CONFIG_XINERAMA
		32	# WITH_OPENGL -> CONFIG_VSYNC_OPENGL
		33	# WITH_OPENGL -> CONFIG_VSYNC_OPENGL_GLSL
		34	# WITH_PCRE -> CONFIG_REGEX_PCRE
		35	# WITH_PCRE -> CONFIG_REGEX_PCRE_JIT
		36	# WITH_LIBCONFIG -> CONFIG_LIBCONFIG
		37	#
		38	# HAVE_LIBCONFIG_OLD_API -> CONFIG_LIBCONFIG_LEGACY (set up in compton_config.h)
		39	#
		40	# CONFIG_DBUS - always ON
		41	# CONFIG_C2 - always ON
		42	# CONFIG_XSYNC - always ON (utilieses Xext)
		43
		44	# TODO: think about some configuration option for CONFIG_VSYNC_DRM
40		45
41	option(CONFIG_LIBCONFIG "Enable configuration file parsing using libconfig" ON)	46	add_definitions("-std=c99")
42	if (CONFIG_LIBCONFIG)
43	add_definitions("-DCONFIG_LIBCONFIG")
44	endif ()
45		47
46	option(CONFIG_VSYNC_DRM "Enable DRM VSync support" ON)	48	set( compton_SRCS compton.c )
47	if (CONFIG_VSYNC_DRM)
48	add_definitions("-DCONFIG_LIBCONFIG")
49	endif ()
50		49
51	option(CONFIG_VSYNC_OPENGL "Enable OpenGL support" ON)	50	if( WITH_OPENGL )
52	if (CONFIG_VSYNC_OPENGL)	51	set( CONFIG_VSYNC_OPENGL ${WITH_OPENGL} )
53	add_definitions("-DCONFIG_VSYNC_OPENGL")	52	set( CONFIG_VSYNC_OPENGL_GLSL ${WITH_OPENGL} )
54	list(APPEND compton_SRCS src/opengl.c)	53	list( APPEND compton_LIBRARIES ${GL_LIBRARIES})
55	endif ()	54	list( APPEND compton_SRCS opengl.c )
		55	endif( )
		56
		57	if( WITH_LIBCONFIG )
		58	set( CONFIG_LIBCONFIG ${WITH_LIBCONFIG} )
		59	list( APPEND compton_LIBRARIES ${LIBCONFIG_LIBRARIES} )
		60	endif( )
		61
		62	if( WITH_XINERAMA )
		63	set( CONFIG_XINERAMA ${WITH_XINERAMA} )
		64	list( APPEND compton_LIBRARIES ${XINERAMA_LIBRARIES} )
		65	endif( )
		66
		67	if( WITH_PCRE )
		68	set( CONFIG_REGEX_PCRE ${WITH_PCRE} )
		69	set( CONFIG_REGEX_PCRE_JIT ${WITH_PCRE} )
		70	list( APPEND compton_LIBRARIES ${LIBPCRE_LIBRARIES} )
		71	endif( )
56		72
57	option(CONFIG_XINERAMA "Enable additional Xinerama features" ON)	73	configure_file( compton_config.h.cmake compton_config.h )
58	if (CONFIG_XINERAMA)
59	add_definitions("-DCONFIG_XINERAMA")
60	endif ()
61		74
62	option(CONFIG_C2 "Enable matching system" ON)	75	# permanently turn on some optional features: dbus c2
63	if (CONFIG_C2)	76	list( APPEND compton_SRCS dbus.c c2.c )
64	add_definitions("-DCONFIG_C2")	77	list( APPEND compton_LIBRARIES ${DBUS_LIBRARIES} )
65	list(APPEND compton_SRCS src/c2.c)
66	endif ()
67		78
68	tde_add_executable( compton-tde	79	tde_add_executable( compton-tde
69	SOURCES c2.c compton.c opengl.c	80	SOURCES ${compton_SRCS}
70	LINK m GL Xinerama ${LIBCONFIG_LIBRARIES} ${XRENDER_LIBRARIES} ${XRANDR_LIBRARIES} ${XFIXES_LIBRARIES} ${XDAMAGE_LIBRARIES} ${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES}	81	LINK m ${compton_LIBRARIES} ${XRENDER_LIBRARIES}
		82	${XRANDR_LIBRARIES} ${XFIXES_LIBRARIES} ${XDAMAGE_LIBRARIES}
		83	${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES}
71	DESTINATION ${BIN_INSTALL_DIR}	84	DESTINATION ${BIN_INSTALL_DIR}
72	)	85	)

Line 0 Link Here

(-)a/twin/compton-tde/compton_config.h.cmake (-1 / +28 lines)
0	-	1	#include "config.h"
		2
		3	// Whether to enable PCRE regular expression support in blacklists, enabled
		4	// by default
		5	#cmakedefine CONFIG_REGEX_PCRE 1
		6	// Whether to enable JIT support of libpcre. This may cause problems on PaX
		7	// kernels.
		8	#cmakedefine CONFIG_REGEX_PCRE_JIT 1
		9	// Whether to enable parsing of configuration files using libconfig.
		10	#cmakedefine CONFIG_LIBCONFIG 1
		11	// Whether we are using a legacy version of libconfig (1.3.x).
		12	#cmakedefine CONFIG_LIBCONFIG_LEGACY 1
		13	// Whether to enable DRM VSync support
		14	#cmakedefine CONFIG_VSYNC_DRM 1
		15	// Whether to enable OpenGL support
		16	#cmakedefine CONFIG_VSYNC_OPENGL 1
		17	// Whether to enable GLX GLSL support
		18	#cmakedefine CONFIG_VSYNC_OPENGL_GLSL 1
		19	// Whether to enable GLX FBO support
		20	#cmakedefine CONFIG_VSYNC_OPENGL_FBO 1
		21	// Whether to enable DBus support with libdbus.
		22	#define CONFIG_DBUS 1
		23	// Whether to enable condition support.
		24	#define CONFIG_C2 1
		25	// Whether to enable X Sync support.
		26	#define CONFIG_XSYNC 1
		27	// Whether to enable GLX Sync support.
		28	#cmakedefine CONFIG_GLX_XSYNC 1