mirror of
https://bitbucket.org/smil3y/kde-extraapps.git
synced 2025-02-23 18:32:53 +00:00
thumbnailers: audio thumbnailer does not depend on FLAC++
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
eddd15b312
commit
89239a7ece
4 changed files with 26 additions and 16 deletions
|
@ -22,7 +22,7 @@ build_script:
|
|||
katana-workspace xorg-dev zlib1g-dev libgpgme-dev \
|
||||
libacl1-dev libattr1-dev libarchive-dev libasound2-dev libatasmart-dev \
|
||||
libavcodec-dev libavformat-dev libavutil-dev libblkid-dev libcups2-dev \
|
||||
libdjvulibre-dev libepub-dev libexiv2-dev libflac++-dev libfreetype6-dev \
|
||||
libdjvulibre-dev libepub-dev libexiv2-dev libfreetype6-dev \
|
||||
libgcrypt20-dev libgettextpo-dev libglib2.0-dev libgmp-dev libmms-dev \
|
||||
libhunspell-dev libjpeg-dev libpng-dev libparted-dev libqalculate-dev \
|
||||
libsane-dev libspectre-dev libspeechd-dev libswscale-dev libtag1-dev \
|
||||
|
|
|
@ -21,13 +21,6 @@ set_package_properties(Taglib PROPERTIES
|
|||
PURPOSE "Required to build the audio thumbnailer"
|
||||
)
|
||||
|
||||
macro_optional_find_package(FLAC++)
|
||||
set_package_properties(FLAC++ PROPERTIES
|
||||
DESCRIPTION "Free Lossless Audio Codec"
|
||||
URL "https://xiph.org/flac/"
|
||||
PURPOSE "Required to build the audio thumbnailer"
|
||||
)
|
||||
|
||||
macro_optional_find_package(FFmpegThumbnailer)
|
||||
set_package_properties(FFmpegThumbnailer PROPERTIES
|
||||
DESCRIPTION "Lightweight video thumbnailer that can be used by file managers to create thumbnails for video files"
|
||||
|
@ -43,7 +36,7 @@ add_feature_info(thumbnailer_gs
|
|||
|
||||
add_subdirectory(ps)
|
||||
|
||||
if(TAGLIB_FOUND AND FLAC++_FOUND)
|
||||
if(TAGLIB_FOUND)
|
||||
add_subdirectory(audio)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -40,8 +40,6 @@
|
|||
#include <taglib/oggfile.h>
|
||||
#include <taglib/vorbisfile.h>
|
||||
|
||||
#include <FLAC++/metadata.h>
|
||||
|
||||
#include <kmimetype.h>
|
||||
#include <kdemacros.h>
|
||||
|
||||
|
|
|
@ -1,14 +1,33 @@
|
|||
project(AudioThumbs)
|
||||
|
||||
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${TAGLIB_CFLAGS} -DHAVE_CONFIG_H=1 -DKDE_NO_COMPAT)
|
||||
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT_INCLUDES} ${FLAC_INCLUDES})
|
||||
add_definitions(
|
||||
${QT_DEFINITIONS}
|
||||
${KDE4_DEFINITIONS}
|
||||
${TAGLIB_CFLAGS}
|
||||
)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_BINARY_DIR}
|
||||
${KDE4_INCLUDES}
|
||||
${QT_INCLUDES}
|
||||
${TAGLIB_INCLUDES})
|
||||
|
||||
set(AudioThumbs_SRCS AudioThumbs.cpp)
|
||||
|
||||
kde4_add_plugin(AudioThumbs ${AudioThumbs_SRCS})
|
||||
|
||||
target_link_libraries(AudioThumbs ${KDE4_KIO_LIBS} ${TAGLIB_LIBRARIES} ${FLAC_LIBRARIES})
|
||||
target_link_libraries(AudioThumbs
|
||||
${KDE4_KIO_LIBS}
|
||||
${TAGLIB_LIBRARIES}
|
||||
)
|
||||
|
||||
install(TARGETS AudioThumbs DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
|
||||
install(
|
||||
TARGETS AudioThumbs
|
||||
DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
|
||||
)
|
||||
|
||||
install(FILES AudioThumbs.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
|
||||
install(
|
||||
FILES AudioThumbs.desktop
|
||||
DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
|
||||
)
|
||||
|
|
Loading…
Add table
Reference in a new issue