diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,66 +1,121 @@ -cmake_minimum_required(VERSION 2.8.9) -project(PhononGStreamer) +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +project(PhononGStreamer VERSION 0.10.60) option(USE_INSTALL_PLUGIN "Use GStreamer codec installation API" TRUE) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +include(FeatureSummary) -set(PHONON_GST_MAJOR_VERSION "4") -set(PHONON_GST_MINOR_VERSION "9") -set(PHONON_GST_PATCH_VERSION "1") -set(PHONON_GST_VERSION "${PHONON_GST_MAJOR_VERSION}.${PHONON_GST_MINOR_VERSION}.${PHONON_GST_PATCH_VERSION}") +# ECM +find_package(ECM 5.60 NO_MODULE) +set_package_properties(ECM PROPERTIES + TYPE REQUIRED + DESCRIPTION "Extra CMake Modules" + URL "https://api.kde.org/frameworks/extra-cmake-modules/html/index.html") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + +include(KDEInstallDirs) +include(ECMPoQmTools) +include(KDECMakeSettings) +include(KDECompilerSettings) +include(ECMSetupVersion) +include(ECMInstallIcons) + +ecm_setup_version(PROJECT VARIABLE_PREFIX PHONON_GST) add_definitions(-DPHONON_GST_VERSION="${PHONON_GST_VERSION}") -find_package(Phonon REQUIRED) -macro_ensure_version("4.7.0" ${PHONON_VERSION} PHONON_FOUND) -macro_log_feature(PHONON_FOUND "Phonon" "Core Library" "git://anongit.kde.org/phonon.git" TRUE "4.7.0") +# Phonon +find_package(Phonon4Qt5 4.10.60 NO_MODULE) +set_package_properties(Phonon4Qt5 PROPERTIES + TYPE REQUIRED + DESCRIPTION "Phonon core library" + URL "https://api.kde.org/phonon/html/index.html") + +find_package(Phonon4Qt5Experimental 4.10.60 NO_MODULE) +set_package_properties(Phonon4Qt5Experimental PROPERTIES + TYPE OPTIONAL + DESCRIPTION "Phonon experimental library" + URL "https://api.kde.org/phonon/html/index.html") +if(Phonon4Qt5Experimental_FOUND) + set(PHONON_EXPERIMENTAL TRUE) +endif() find_package(OpenGL) -macro_log_feature(OPENGL_FOUND "OpenGL" "OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE) - -if(PHONON_BUILD_PHONON4QT5) - find_package(Qt5OpenGL) - macro_log_feature(Qt5OpenGL_FOUND "Qt5 OpenGL" "Qt5 OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE) - set(QT_QTOPENGL_FOUND Qt5OpenGL_FOUND) - - set(REQUIRED_QT_VERSION 5.2.0) - macro_optional_find_package(Qt5X11Extras ${REQUIRED_QT_VERSION}) - macro_log_feature(Qt5X11Extras_FOUND "Qt5X11Extras" "Qt5X11Extras is needed for the x11renderer" "http://doc.qt.io/qt-5/qtx11extras-index.html" FALSE "${REQUIRED_QT_VERSION}") - - if(ECM_FOUND) - include(ECMPoQmTools) - endif() -else () - macro_log_feature(QT_QTOPENGL_FOUND "Qt4 OpenGL" "Qt4 OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE) -endif() +set_package_properties(OpenGL PROPERTIES + TYPE OPTIONAL + PURPOSE "OpenGL support is required to compile the gstreamer backend for Phonon") + +find_package(Qt5OpenGL) +set_package_properties(Qt5OpenGL PROPERTIES + TYPE OPTIONAL + PURPOSE "Qt5 OpenGL support is required to compile the gstreamer backend for Phonon") +set(QT_QTOPENGL_FOUND Qt5OpenGL_FOUND) + +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5X11Extras ${REQUIRED_QT_VERSION}) +set_package_properties(Qt5OpenGL PROPERTIES + TYPE OPTIONAL + PURPOSE "Qt5X11Extras is needed for the x11renderer" + URL "http://doc.qt.io/qt-5/qtx11extras-index.html") + +include(ECMPoQmTools) if (NOT QT_QTOPENGL_FOUND) set(OPENGL_FOUND FALSE) endif () -add_definitions(${QT_DEFINITIONS}) -include_directories(${PHONON_INCLUDES} ${QT_INCLUDES}) - -find_package(GStreamer REQUIRED) -find_package(GStreamerPlugins REQUIRED) -macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 1.0 is required for the multimedia backend" "http://gstreamer.freedesktop.org/modules/" TRUE "1.0") -macro_log_feature(GSTREAMER_PLUGIN_VIDEO_FOUND "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 1.0) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" TRUE "1.0") -macro_log_feature(GSTREAMER_PLUGIN_AUDIO_FOUND "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 1.0) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" TRUE "1.0") -macro_log_feature(GSTREAMER_PLUGIN_PBUTILS_FOUND "GStreamer pbutils plugin" "The gstreamer pbutils plugin (part of gstreamer-plugins-base 1.0) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" TRUE "1.0") - -find_package(GLIB2 REQUIRED) -macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the gstreamer backend for Phonon" "http://www.gtk.org/download/" TRUE) +include_directories(${PHONON_INCLUDES}) + +find_package(GStreamer 1.0) +set_package_properties(GSTREAMER PROPERTIES + TYPE REQUIRED + DESCRIPTION "GStreamer" + PURPOSE "gstreamer 1.0 is required for the multimedia backend" + URL "http://gstreamer.freedesktop.org/modules/") +find_package(GStreamerPlugins QUIET 1.0) +# They way GStreamerPlugins works is super crappy form a cmake POV. To +# get it to play nice with FeatureSummary we'll look for a bunch of fake +# packages which are in fact set by GStreamerPlugins. +find_package(GSTREAMER_PLUGIN_VIDEO) +find_package(GSTREAMER_PLUGIN_AUDIO) +find_package(GSTREAMER_PLUGIN_PBUTILS) +set_package_properties(GSTREAMER_PLUGIN_VIDEO PROPERTIES + TYPE RUNTIME + DESCRIPTION "GStreamer video plugin" + PURPOSE "The gstreamer video plugin (part of gstreamer-plugins-base 1.0) is required for the multimedia gstreamer backend" + URL "http://gstreamer.freedesktop.org/modules/") +set_package_properties(GSTREAMER_PLUGIN_AUDIO PROPERTIES + TYPE RUNTIME + DESCRIPTION "GStreamer audio plugin" + PURPOSE "The gstreamer video plugin (part of gstreamer-plugins-base 1.0) is required for the multimedia gstreamer backend" + URL "http://gstreamer.freedesktop.org/modules/") +set_package_properties(GSTREAMER_PLUGIN_PBUTILS PROPERTIES + TYPE RUNTIME + DESCRIPTION "GStreamer pbutils plugin" + PURPOSE "The gstreamer pbutils plugin (part of gstreamer-plugins-base 1.0) is required for the multimedia gstreamer backend" + URL "http://gstreamer.freedesktop.org/modules/") + +find_package(GLIB2) +set_package_properties(GLIB2 PROPERTIES + TYPE REQUIRED + DESCRIPTION "GLib2" + PURPOSE "GLib 2 is required to compile the gstreamer backend for Phonon" + URL "http://www.gtk.org/download/") find_package(GObject REQUIRED) find_package(LibXml2 REQUIRED) -macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html" TRUE) +set_package_properties(LibXml2 PROPERTIES + TYPE REQUIRED + DESCRIPTION "LibXml2" + PURPOSE "LibXml2 is required to compile the gstreamer backend for Phonon" + URL "http://xmlsoft.org/downloads.html") add_subdirectory(gstreamer) -if(ECM_FOUND AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") +if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() -macro_display_feature_log() +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/cmake/FindGSTREAMER_PLUGIN_AUDIO.cmake b/cmake/FindGSTREAMER_PLUGIN_AUDIO.cmake new file mode 100644 --- /dev/null +++ b/cmake/FindGSTREAMER_PLUGIN_AUDIO.cmake @@ -0,0 +1 @@ +# Dud for find_package diff --git a/cmake/FindGSTREAMER_PLUGIN_PBUTILS.cmake b/cmake/FindGSTREAMER_PLUGIN_PBUTILS.cmake new file mode 100644 --- /dev/null +++ b/cmake/FindGSTREAMER_PLUGIN_PBUTILS.cmake @@ -0,0 +1 @@ +# Dud for find_package diff --git a/cmake/FindGSTREAMER_PLUGIN_VIDEO.cmake b/cmake/FindGSTREAMER_PLUGIN_VIDEO.cmake new file mode 100644 --- /dev/null +++ b/cmake/FindGSTREAMER_PLUGIN_VIDEO.cmake @@ -0,0 +1 @@ +# Dud for find_package diff --git a/cmake/FindPhonon.cmake b/cmake/FindPhonon.cmake deleted file mode 100644 --- a/cmake/FindPhonon.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Find Phonon - -# Copyright (c) 2010-2013, Harald Sitter -# Copyright (c) 2011, Alexander Neundorf -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -set(PKG UndefinedPhononPackage) -if(PHONON_BUILD_PHONON4QT5) - set(PKG Phonon4Qt5) -else() - set(PKG Phonon) -endif() - -find_package(${PKG} NO_MODULE) - -if(PHONON_BUILDSYSTEM_DIR) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR}) - # Prevent double-include of internals, and make sure they are included - # In Phonon <4.7 the internals were auto-included, in >=4.7 they are not. - if(NOT COMMAND phonon_add_executable) - include(${PHONON_BUILDSYSTEM_DIR}/FindPhononInternal.cmake ) - endif() -endif() - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(${PKG} DEFAULT_MSG ${PKG}_DIR ) diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt --- a/gstreamer/CMakeLists.txt +++ b/gstreamer/CMakeLists.txt @@ -104,51 +104,46 @@ add_definitions(-DBUILD_X11RENDERER) endif() -if(ECM_FOUND) - ecm_create_qm_loader(phonon_gstreamer_SRCS phonon_gstreamer_qt) -endif() +ecm_create_qm_loader(phonon_gstreamer_SRCS phonon_gstreamer_qt) -automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS}) +add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS}) set_target_properties(phonon_gstreamer PROPERTIES PREFIX "" AUTOMOC_MOC_OPTIONS ${AUTOMOC_MOC_OPTIONS} ) -qt5_use_modules(phonon_gstreamer Core Widgets) +target_link_libraries(phonon_gstreamer + Qt5::Core + Qt5::Widgets + Phonon::phonon4qt5 + ${PHONON_LIBRARY} + ${GSTREAMER_LIBRARIES} ${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_INTERFACE_LIBRARY} + ${GSTREAMER_PLUGIN_VIDEO_LIBRARY} ${GSTREAMER_PLUGIN_AUDIO_LIBRARY} ${GSTREAMER_PLUGIN_PBUTILS_LIBRARY} + ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_APP_LIBRARY} +) + +if(PHONON_FOUND_EXPERIMENTAL) + target_link_libraries(phonon_gstreamer Phonon::phonon4qt5experimental) +endif() if(Qt5X11Extras_FOUND) - qt5_use_modules(phonon_gstreamer X11Extras) target_link_libraries(phonon_gstreamer Qt5::X11Extras) endif(Qt5X11Extras_FOUND) -target_link_libraries(phonon_gstreamer - ${PHONON_LIBRARY} - ${GSTREAMER_LIBRARIES} ${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_INTERFACE_LIBRARY} - ${GSTREAMER_PLUGIN_VIDEO_LIBRARY} ${GSTREAMER_PLUGIN_AUDIO_LIBRARY} ${GSTREAMER_PLUGIN_PBUTILS_LIBRARY} - ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_APP_LIBRARY} -) if(USE_INSTALL_PLUGIN) target_link_libraries(phonon_gstreamer ${GSTREAMER_PLUGIN_PBUTILS_LIBRARIES}) endif(USE_INSTALL_PLUGIN) if(OPENGL_FOUND) - qt5_use_modules(phonon_gstreamer OpenGL) - target_link_libraries(phonon_gstreamer ${OPENGL_gl_LIBRARY}) + target_link_libraries(phonon_gstreamer ${OPENGL_gl_LIBRARY} Qt5::OpenGL) endif(OPENGL_FOUND) -install(TARGETS phonon_gstreamer DESTINATION ${BACKEND_INSTALL_DIR}) +install(TARGETS phonon_gstreamer DESTINATION ${PHONON_BACKEND_DIR}) -if(PHONON_BUILD_PHONON4QT5) - # Instead of desktop files we are embedding the information into the plugin itself. - # We have no KDE technology to help with finding the actual libraries anyway, so - # we need to have the library path anyway. - # Also see qtplugin/Q_PLUGIN_METADATA documentation. - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/phonon-gstreamer.json.in - ${CMAKE_CURRENT_BINARY_DIR}/phonon-gstreamer.json @ONLY) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gstreamer.desktop.cmake - ${CMAKE_CURRENT_BINARY_DIR}/gstreamer.desktop) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gstreamer.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/phononbackends) -endif() +# Instead of desktop files we are embedding the information into the plugin itself. +# We have no KDE technology to help with finding the actual libraries anyway, so +# we need to have the library path anyway. +# Also see qtplugin/Q_PLUGIN_METADATA documentation. +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/phonon-gstreamer.json.in + ${CMAKE_CURRENT_BINARY_DIR}/phonon-gstreamer.json @ONLY) add_subdirectory(icons) diff --git a/gstreamer/gstreamer.desktop.cmake b/gstreamer/gstreamer.desktop.cmake deleted file mode 100644 --- a/gstreamer/gstreamer.desktop.cmake +++ /dev/null @@ -1,125 +0,0 @@ -[Desktop Entry] -Type=Service -X-KDE-ServiceTypes=PhononBackend -MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;audio/x-mpegurl;audio/mp3;audio/x-ape; -X-KDE-Library=phonon_gstreamer -X-KDE-PhononBackendInfo-InterfaceVersion=1 -X-KDE-PhononBackendInfo-Version=@PHONON_GST_VERSION@ -X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/ -Icon=phonon-gstreamer -InitialPreference=15 - -Name=GStreamer -Name[ast]=GStreamer -Name[bg]=GStreamer -Name[bs]=Gstreamer -Name[ca]=GStreamer -Name[ca@valencia]=GStreamer -Name[cs]=GStreamer -Name[da]=GStreamer -Name[de]=GStreamer -Name[el]=GStreamer -Name[en_GB]=GStreamer -Name[es]=GStreamer -Name[et]=GStreamer -Name[eu]=GStreamer -Name[fa]=GStreamer -Name[fi]=GStreamer -Name[fr]=GStreamer -Name[ga]=GStreamer -Name[gl]=GStreamer -Name[hsb]=GStreamer -Name[hu]=GStreamer -Name[id]=GStreamer -Name[is]=GStreamer -Name[it]=GStreamer -Name[ja]=GStreamer -Name[kk]=GStreamer -Name[ko]=GStreamer -Name[ku]=GStreamer -Name[lt]=GStreamer -Name[lv]=GStreamer -Name[mai]=GStreamer -Name[mr]=जी-स्ट्रीमर -Name[nb]=GStreamer -Name[nds]=GStreamer -Name[nl]=GStreamer -Name[nn]=GStreamer -Name[pa]=ਜੀਸਟੀਰਮਰ -Name[pl]=GStreamer -Name[pt]=GStreamer -Name[pt_BR]=GStreamer -Name[ro]=GStreamer -Name[ru]=GStreamer -Name[se]=GStreamer -Name[sk]=GStreamer -Name[sl]=GStreamer -Name[sr]=Гстример -Name[sr@ijekavian]=Гстример -Name[sr@ijekavianlatin]=GStreamer -Name[sr@latin]=GStreamer -Name[sv]=Gstreamer -Name[th]=GStreamer -Name[tr]=GStreamer -Name[ug]=GStreamer -Name[uk]=GStreamer -Name[x-test]=xxGStreamerxx -Name[zh_CN]=GStreamer -Name[zh_TW]=GStreamer - -Comment=Phonon GStreamer backend -Comment[ast]=Backend de GStreamer pa Phonon -Comment[bg]=Phonon GStreamer -Comment[bs]=Gstreamer kao pozadina Phonona -Comment[ca]=Dorsal GStreamer del Phonon -Comment[ca@valencia]=Dorsal GStreamer del Phonon -Comment[cs]=Podpůrná vrstva GStreamer pro Phonon -Comment[da]=GStreamer-backend til Phonon -Comment[de]=Phonon-Treiber für GStreamer -Comment[el]=Σύστημα υποστήριξης GStreamer του Phonon -Comment[en_GB]=Phonon GStreamer backend -Comment[es]=Motor GStreamer para Phonon -Comment[et]=Phononi GStreameri taustaprogramm -Comment[eu]=Phonon GStreamer bizkarraldekoa -Comment[fa]=پسانه‌ی جی‌استریمر برای فنون (Phonon GStreamer backend) -Comment[fi]=Phonon GStreamer -taustajärjestelmä -Comment[fr]=Moteur GStreamer pour Phonon -Comment[ga]=Inneall GStreamer le haghaidh Phonon -Comment[gl]=Infraestrutura de GStreamer para Phonon -Comment[hsb]=Phonon GStreamer backend -Comment[hu]=Phonon GStreamer-modul -Comment[id]=Backend phonon GStreamer -Comment[is]=Phonon GStreamer bakendi -Comment[it]=Motore Gstreamer di Phonon -Comment[ja]=Phonon GStreamer バックエンド -Comment[kk]=Phonon GStreamer тетігі -Comment[ko]=Phonon GStreamer 백엔드 -Comment[ku]=Binesaza Phonon GStreamer -Comment[lt]=Phonon GStreamer galinė sąsaja -Comment[lv]=Phonon GStreamer aizmugure -Comment[mr]=फोनॉन जी-स्ट्रीमर बॅकएन्ड -Comment[nb]=Phonon-motor for GStreamer -Comment[nds]=GStreamer-Hülpprogramm för Phonon -Comment[nl]=GStreamer-backend (Phonon) -Comment[nn]=Phonon-motor for GStreamer -Comment[pa]=ਫੋਨੋਨ ਜਸਟੀਰਮਰ ਬੈਕਐਂਡ -Comment[pl]=Obsługa GStreamera przez Phonon -Comment[pt]=Infra-estrutura do GStreamer para o Phonon -Comment[pt_BR]=Infraestrutura do GStreamer para o Phonon -Comment[ro]=Suportul GStreamer pentru Phonon -Comment[ru]=Механизм GStreamer для Phonon -Comment[se]=Phonon GStreamer duogášmohtor -Comment[sk]=Phonon GStreamer backend -Comment[sl]=Zaledje GStreamer za Phonon -Comment[sr]=Гстример као позадина Фонона -Comment[sr@ijekavian]=Гстример као позадина Фонона -Comment[sr@ijekavianlatin]=GStreamer kao pozadina Phonona -Comment[sr@latin]=GStreamer kao pozadina Phonona -Comment[sv]=Phonon Gstreamer-gränssnitt -Comment[th]=โปรแกรมเบื้องหลัง GStreamer ของ Phonon -Comment[tr]=Phonon GStreamer arka ucu -Comment[ug]=Phonon GStreamer نىڭ ئارقائۇچى -Comment[uk]=Модуль використання GStreamer у Phonon -Comment[x-test]=xxPhonon GStreamer backendxx -Comment[zh_CN]=Phonon GStreamer 后端 -Comment[zh_TW]=Phonon GStreamer 後端介面 diff --git a/gstreamer/icons/hi128-apps-phonon-gstreamer.png b/gstreamer/icons/128-apps-phonon-gstreamer.png rename from gstreamer/icons/hi128-apps-phonon-gstreamer.png rename to gstreamer/icons/128-apps-phonon-gstreamer.png diff --git a/gstreamer/icons/hi16-apps-phonon-gstreamer.png b/gstreamer/icons/16-apps-phonon-gstreamer.png rename from gstreamer/icons/hi16-apps-phonon-gstreamer.png rename to gstreamer/icons/16-apps-phonon-gstreamer.png diff --git a/gstreamer/icons/hi22-apps-phonon-gstreamer.png b/gstreamer/icons/22-apps-phonon-gstreamer.png rename from gstreamer/icons/hi22-apps-phonon-gstreamer.png rename to gstreamer/icons/22-apps-phonon-gstreamer.png diff --git a/gstreamer/icons/hi48-apps-phonon-gstreamer.png b/gstreamer/icons/48-apps-phonon-gstreamer.png rename from gstreamer/icons/hi48-apps-phonon-gstreamer.png rename to gstreamer/icons/48-apps-phonon-gstreamer.png diff --git a/gstreamer/icons/hi64-apps-phonon-gstreamer.png b/gstreamer/icons/64-apps-phonon-gstreamer.png rename from gstreamer/icons/hi64-apps-phonon-gstreamer.png rename to gstreamer/icons/64-apps-phonon-gstreamer.png diff --git a/gstreamer/icons/CMakeLists.txt b/gstreamer/icons/CMakeLists.txt --- a/gstreamer/icons/CMakeLists.txt +++ b/gstreamer/icons/CMakeLists.txt @@ -1,2 +1,8 @@ -phonon_install_icons(${ICON_INSTALL_DIR}) -phonon_update_iconcache() +ecm_install_icons(ICONS + 128-apps-phonon-gstreamer.png + 16-apps-phonon-gstreamer.png + 22-apps-phonon-gstreamer.png + 48-apps-phonon-gstreamer.png + 64-apps-phonon-gstreamer.png + sc-apps-phonon-gstreamer.svg + DESTINATION ${ICON_INSTALL_DIR}) diff --git a/gstreamer/icons/hisc-apps-phonon-gstreamer.svgz b/gstreamer/icons/hisc-apps-phonon-gstreamer.svgz deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ + + +image/svg+xml + + + + + + + + + + + + + \ No newline at end of file