Attachment #236 for bug #747

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

Lines 43-48 Link Here

(-)arts.ORI/artsc/CMakeLists.txt (-1 / +2 lines)
43	include_directories(	43	include_directories(
44	${CMAKE_CURRENT_BINARY_DIR}	44	${CMAKE_CURRENT_BINARY_DIR}
45	${CMAKE_BINARY_DIR}	45	${CMAKE_BINARY_DIR}
		46	${CMAKE_SOURCE_DIR}/artsc
46	${CMAKE_BINARY_DIR}/mcop	47	${CMAKE_BINARY_DIR}/mcop
47	${CMAKE_SOURCE_DIR}/mcop	48	${CMAKE_SOURCE_DIR}/mcop
48	${CMAKE_BINARY_DIR}/flow	49	${CMAKE_BINARY_DIR}/flow
Lines 64-70 Link Here
64	tde_add_library( artsdsp SHARED	65	tde_add_library( artsdsp SHARED
65	SOURCES artsdsp.c	66	SOURCES artsdsp.c
66	VERSION 0.0.0	67	VERSION 0.0.0
67	LINK artsc-shared	68	LINK artsc-shared dl
68	DESTINATION ${LIB_INSTALL_DIR}	69	DESTINATION ${LIB_INSTALL_DIR}
69	)	70	)
70		71

Lines 33-38 Link Here

(-)arts.ORI/CMakeLists.txt (+18 lines)
33	option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON )	33	option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON )
34	option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )	34	option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
35	option( WITH_MAD "Enable MAD mp3 decoder support" ON )	35	option( WITH_MAD "Enable MAD mp3 decoder support" ON )
		36	option( WITH_ESOUND "Enable ESOUND support" OFF )
36		37
37		38
38	##### paths setup ###############################	39	##### paths setup ###############################
Lines 58-63 Link Here
58	check_include_file( "malloc.h" HAVE_MALLOC_H )	59	check_include_file( "malloc.h" HAVE_MALLOC_H )
59	check_include_file( "memory.h" HAVE_MEMORY_H )	60	check_include_file( "memory.h" HAVE_MEMORY_H )
60	check_include_file( "dlfcn.h" HAVE_DLFCN_H )	61	check_include_file( "dlfcn.h" HAVE_DLFCN_H )
		62	check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
		63	check_include_file( "pthread.h" HAVE_LIBPTHREAD )
61		64
62		65
63	##### check for system libraries ################	66	##### check for system libraries ################
Lines 145-150 Link Here
145	endif( WITH_ALSA )	148	endif( WITH_ALSA )
146		149
147		150
		151	##### check for esound #######################
		152
		153	set( HAVE_LIBESD 0 )
		154	if( WITH_ESOUND )
		155
		156	pkg_search_module( ESOUND esound )
		157	if( ESOUND_FOUND )
		158	set( HAVE_LIBESD 1 )
		159	else( ESOUND_FOUND )
		160	message(FATAL_ERROR "\nESOUND support is requested, but `libesd` not found" )
		161	endif( ESOUND_FOUND )
		162
		163	endif( WITH_ESOUND )
		164
		165
148	##### check for glib/gthread modules ############	166	##### check for glib/gthread modules ############
149		167
150	pkg_search_module( GLIB2 glib-2.0 )	168	pkg_search_module( GLIB2 glib-2.0 )

Lines 23-30 Link Here

(-)arts.ORI/config.h.cmake (+6 lines)
23		23
24	#cmakedefine HAVE_LIBAUDIOFILE 1	24	#cmakedefine HAVE_LIBAUDIOFILE 1
25		25
		26	#cmakedefine HAVE_LIBESD 1
		27
26	#cmakedefine HAVE_LIBASOUND2 1	28	#cmakedefine HAVE_LIBASOUND2 1
27	#cmakedefine HAVE_ALSA_ASOUNDLIB_H 1	29	#cmakedefine HAVE_ALSA_ASOUNDLIB_H 1
28	#cmakedefine HAVE_SND_PCM_RESUME 1	30	#cmakedefine HAVE_SND_PCM_RESUME 1
29	#cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1	31	#cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1
30	#cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1	32	#cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1
		33
		34	#cmakedefine HAVE_SYS_SOUNDCARD_H 1
		35	#cmakedefine HAVE_LIBPTHREAD 1
		36	#define HAVE_IOCTL_INT_ULONGINT_DOTS 3

Lines 15-20 Link Here

(-)arts.ORI/flow/CMakeLists.txt (+1 lines)
15		15
16	include_directories(	16	include_directories(
17	${CMAKE_BINARY_DIR}	17	${CMAKE_BINARY_DIR}
		18	${CMAKE_SOURCE_DIR}/artsc
18	${CMAKE_BINARY_DIR}/mcop	19	${CMAKE_BINARY_DIR}/mcop
19	${CMAKE_SOURCE_DIR}/mcop	20	${CMAKE_SOURCE_DIR}/mcop
20	${CMAKE_CURRENT_BINARY_DIR}	21	${CMAKE_CURRENT_BINARY_DIR}




configure_file( arts_export.h.in arts_export.h )

if( NOT EXTENSION_DIR )
  set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
endif( NOT EXTENSION_DIR )

if( NOT DTRADER_DIR )
  set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mcop )
endif( NOT DTRADER_DIR )

add_definitions(

tde_add_library( ${target} SHARED
  SOURCES ${${target}_SRCS}
  VERSION 1.0.0
  LINK ltdlc-static ${ESOUND_LIBRARIES}
  DESTINATION ${LIB_INSTALL_DIR}
)

Lines 11-16 Link Here

(-)arts.ORI/mcop_mt/CMakeLists.txt (-1 / +6 lines)
11		11
12	include_directories(	12	include_directories(
13	${CMAKE_BINARY_DIR}	13	${CMAKE_BINARY_DIR}
		14	${CMAKE_BINARY_DIR}/flow
		15	${CMAKE_BINARY_DIR}/mcop
		16	${CMAKE_SOURCE_DIR}/flow
		17	${CMAKE_SOURCE_DIR}/mcop
		18	${GLIB2_INCLUDE_DIRS}
14	)	19	)
15		20
16		21
Lines 19-24 Link Here
19	tde_add_library( mcop_mt SHARED	24	tde_add_library( mcop_mt SHARED
20	SOURCES threads_posix.cc	25	SOURCES threads_posix.cc
21	VERSION 1.0.0	26	VERSION 1.0.0
22	LINK artsflow-shared	27	LINK artsflow-shared pthread
23	DESTINATION ${LIB_INSTALL_DIR}	28	DESTINATION ${LIB_INSTALL_DIR}
24	)	29	)

Return to bug 747

Lines 12-22 Link Here

(-)arts.ORI/mcop/CMakeLists.txt (-3 / +3 lines)
12	configure_file( arts_export.h.in arts_export.h )	12	configure_file( arts_export.h.in arts_export.h )
13		13
14	if( NOT EXTENSION_DIR )	14	if( NOT EXTENSION_DIR )
15	set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib )	15	set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
16	endif( NOT EXTENSION_DIR )	16	endif( NOT EXTENSION_DIR )
17		17
18	if( NOT DTRADER_DIR )	18	if( NOT DTRADER_DIR )
19	set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib/mcop )	19	set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mcop )
20	endif( NOT DTRADER_DIR )	20	endif( NOT DTRADER_DIR )
21		21
22	add_definitions(	22	add_definitions(
Lines 66-71 Link Here
66	tde_add_library( ${target} SHARED	66	tde_add_library( ${target} SHARED
67	SOURCES ${${target}_SRCS}	67	SOURCES ${${target}_SRCS}
68	VERSION 1.0.0	68	VERSION 1.0.0
69	LINK ltdlc-static	69	LINK ltdlc-static ${ESOUND_LIBRARIES}
70	DESTINATION ${LIB_INSTALL_DIR}	70	DESTINATION ${LIB_INSTALL_DIR}
71	)	71	)