Attachment #1267 for bug #346

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

Lines 54-59 option( WITH_NJB "Enable njb support" OFF ) Link Here

(-)a/CMakeLists.txt (+1 lines)
54	option( WITH_MTP "Enable mtp support" OFF )	54	option( WITH_MTP "Enable mtp support" OFF )
55	option( WITH_RIOKARMA "Enable riokarma support" OFF )	55	option( WITH_RIOKARMA "Enable riokarma support" OFF )
56	option( WITH_DAAP "Enable daap support" OFF )	56	option( WITH_DAAP "Enable daap support" OFF )
		57	option( WITH_MP4V2 "Enable mp4v2 support" OFF )
57	option( WITH_INOTIFY "Enable inotify support" OFF )	58	option( WITH_INOTIFY "Enable inotify support" OFF )
58		59
59		60




    tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )
  endif( )
endif( )

##### check for mp4v2 ###########################

if( WITH_MP4V2 )
  check_include_file( "mp4v2/mp4v2.h" MP4V2_H_FOUND )
  if( MP4V2_H_FOUND )
    set( HAVE_MP4V2_H 1)
  else( MP4V2_H_FOUND )
    check_include_file( "mp4.h" MP4_H_FOUND )
    if( MP4_H_FOUND )
      set( HAVE_MP4_H 1)
    endif( MP4_H_FOUND )
  endif( MP4V2_H_FOUND )

  if( HAVE_MP4V2_H OR HAVE_MP4_H )
    set( HAVE_MP4V2 1 )
  else( )
    tde_message_fatal( "MP4V2 support was requested, but not found on your system" )
  endif( )
endif( )




#################################################

include_directories(
  ${CMAKE_BINARY_DIR}
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${TAGLIB_INCLUDE_DIRS}
)


##### tagm4a (static) ###########################

tde_add_library( tagm4a STATIC_PIC
  SOURCES
    taglib_mp4filetyperesolver.cpp mp4file.cpp mp4itunestag.cpp mp4isobox.cpp
    mp4isofullbox.cpp mp4skipbox.cpp mp4moovbox.cpp mp4mvhdbox.cpp




#################################################
#
#  (C) 2010-2013 Darrell Anderson
#  humanreadable (AT) yahoo.com
#
#  Improvements and feedback are welcome
#
#  This file is released under GPL >= 2
#
#################################################

include_directories(
  ${CMAKE_BINARY_DIR}
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${TAGLIB_INCLUDE_DIRS}
  ${MP4V2_INCLUDE_DIRS}
)

link_directories(
  ${MP4V2_LIBRARY_DIRS}
)


##### tagmp4 (static) ###########################

tde_add_library( tagmp4 STATIC_PIC
  SOURCES
    mp4file.cpp mp4file.h mp4properties.cpp mp4properties.h mp4tag.cpp mp4tag.h
    taglib_mp4filetyperesolver.cpp taglib_mp4filetyperesolver.h
)

Lines 12-19 Link Here

(-)a/config.h.cmake (-1 / +3 lines)
12	#cmakedefine HAVE_ITDB_MEDIATYPE 1	12	#cmakedefine HAVE_ITDB_MEDIATYPE 1
13	#cmakedefine HAVE_LIBGPOD_060 1	13	#cmakedefine HAVE_LIBGPOD_060 1
14	#cmakedefine HAVE_MP4V2 1	14	#cmakedefine HAVE_MP4V2 1
		15	#cmakedefine HAVE_MP4V2_h 1
		16	#cmakedefine HAVE_MP4_H 1
15	#cmakedefine HAVE_TUNEPIMP 1	17	#cmakedefine HAVE_TUNEPIMP 1
16		18
17	#cmakedefine TAGLIB_15 1	19	#cmakedefine TAGLIB_15 1
18	#cmakedefine HAVE_QGLWIDGET 1	20	#cmakedefine HAVE_QGLWIDGET 1
19	#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@	21	#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@

Return to bug 346

Lines 222-224 if( WITH_KONQSIDEBAR ) Link Here

(-)a/ConfigureChecks.cmake (+20 lines)
222	tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )	222	tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )
223	endif( )	223	endif( )
224	endif( )	224	endif( )
		225
		226	##### check for mp4v2 ###########################
		227
		228	if( WITH_MP4V2 )
		229	check_include_file( "mp4v2/mp4v2.h" MP4V2_H_FOUND )
		230	if( MP4V2_H_FOUND )
		231	set( HAVE_MP4V2_H 1)
		232	else( MP4V2_H_FOUND )
		233	check_include_file( "mp4.h" MP4_H_FOUND )
		234	if( MP4_H_FOUND )
		235	set( HAVE_MP4_H 1)
		236	endif( MP4_H_FOUND )
		237	endif( MP4V2_H_FOUND )
		238
		239	if( HAVE_MP4V2_H OR HAVE_MP4_H )
		240	set( HAVE_MP4V2 1 )
		241	else( )
		242	tde_message_fatal( "MP4V2 support was requested, but not found on your system" )
		243	endif( )
		244	endif( )

Lines 10-24 Link Here

(-)a/amarok/src/metadata/m4a/CMakeLists.txt (-2 / +3 lines)
10	#################################################	10	#################################################
11		11
12	include_directories(	12	include_directories(
		13	${CMAKE_BINARY_DIR}
13	${TDE_INCLUDE_DIR}	14	${TDE_INCLUDE_DIR}
14	${TQT_INCLUDE_DIRS}	15	${TQT_INCLUDE_DIRS}
15	${TAGLIB_INCLUDE_DIRS}	16	${TAGLIB_INCLUDE_DIRS}
16	)	17	)
17		18
18		19
19	##### tagmp4 (static) ###########################	20	##### tagm4a (static) ###########################
20		21
21	tde_add_library( tagmp4 STATIC_PIC	22	tde_add_library( tagm4a STATIC_PIC
22	SOURCES	23	SOURCES
23	taglib_mp4filetyperesolver.cpp mp4file.cpp mp4itunestag.cpp mp4isobox.cpp	24	taglib_mp4filetyperesolver.cpp mp4file.cpp mp4itunestag.cpp mp4isobox.cpp
24	mp4isofullbox.cpp mp4skipbox.cpp mp4moovbox.cpp mp4mvhdbox.cpp	25	mp4isofullbox.cpp mp4skipbox.cpp mp4moovbox.cpp mp4mvhdbox.cpp

Line 0 Link Here

(-)a/amarok/src/metadata/mp4/CMakeLists.txt (+31 lines)
	1	#################################################
	2	#
	3	# (C) 2010-2013 Darrell Anderson
	4	# humanreadable (AT) yahoo.com
	5	#
	6	# Improvements and feedback are welcome
	7	#
	8	# This file is released under GPL >= 2
	9	#
	10	#################################################
	11
	12	include_directories(
	13	${CMAKE_BINARY_DIR}
	14	${TDE_INCLUDE_DIR}
	15	${TQT_INCLUDE_DIRS}
	16	${TAGLIB_INCLUDE_DIRS}
	17	${MP4V2_INCLUDE_DIRS}
	18	)
	19
	20	link_directories(
	21	${MP4V2_LIBRARY_DIRS}
	22	)
	23
	24
	25	##### tagmp4 (static) ###########################
	26
	27	tde_add_library( tagmp4 STATIC_PIC
	28	SOURCES
	29	mp4file.cpp mp4file.h mp4properties.cpp mp4properties.h mp4tag.cpp mp4tag.h
	30	taglib_mp4filetyperesolver.cpp taglib_mp4filetyperesolver.h
	31	)