From 88ebe56470c37b02a044e1091cad6b2df0f3be8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 May 2018 16:02:49 +0100 Subject: gentoo resync : 11.05.2018 --- kde-apps/kdenlive/Manifest | 5 +- .../kdenlive/files/kdenlive-18.04.0-qt-5.11.patch | 41 ----------- kde-apps/kdenlive/kdenlive-18.04.0-r1.ebuild | 80 ---------------------- kde-apps/kdenlive/kdenlive-18.04.1.ebuild | 78 +++++++++++++++++++++ 4 files changed, 80 insertions(+), 124 deletions(-) delete mode 100644 kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch delete mode 100644 kde-apps/kdenlive/kdenlive-18.04.0-r1.ebuild create mode 100644 kde-apps/kdenlive/kdenlive-18.04.1.ebuild (limited to 'kde-apps/kdenlive') diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest index 5da6cc865587..cc92708c1851 100644 --- a/kde-apps/kdenlive/Manifest +++ b/kde-apps/kdenlive/Manifest @@ -1,6 +1,5 @@ -AUX kdenlive-18.04.0-qt-5.11.patch 1473 BLAKE2B 359f9b56a1e34e9fcd8d092dfa9cf1ce5dd876c81ae64308117a514c19fe935116b424c35a1481d122eeb05856daea1c53cf9ca6c1b9de5f73e2bcd49675f27f SHA512 0ec21f86bb2298ac9f41600627bae3f972feb0bf85668201c311b82029fcb040486cd6e674eae32702252b4d575bc866b85e45992a32686093e8b84bcd94ff77 DIST kdenlive-17.12.3.tar.xz 9383532 BLAKE2B a348cfc3622735af5c37d60f43645062a0bb077e1b10fd780d91ede4d1c6298fe1cad3ce8d6964b33e4b60ad7074ca656199209c827deb2e67da5a71cd341593 SHA512 8142229d01c4c5108bd1482f6479dd7ef7ccb56e19152a74021a47939aedd5841f9161483994f2e8078099b4e3c65a501736938b1ea3233779498f0d8cf5272d -DIST kdenlive-18.04.0.tar.xz 9388972 BLAKE2B 8e3deb993c041be5803e29f7101a556d4867f3d763683adf1ad418fde7b2d1942f7dc45edf3eca91d0e2fcbd7011169c37ce2a68baacfb33000ddf848e960cc2 SHA512 5a3f2669eee7e850cc47950dfe9662b0185a962f3ee1a2a593e00862904b422903ccec39fe6c2837c01a4132773d24c7a17e1c13cb29e4e452e0bbb4adc03a6d +DIST kdenlive-18.04.1.tar.xz 9391408 BLAKE2B 73a2bfe21a275d39a97876ae69b22611f9552129b67d15f3255b3f2443c0fe324dbd2388bd8aa5d2693c9053ce21051a46d54ae8505dac2940894a089871bbc9 SHA512 0e9c12359c9a17475573fa15289d89313a12def4baaf44101c51057200b1e259f91663afad16cbd8b93fc27b46bac48a6f9fd3dd7f33c10f219bfacdb552cc0d EBUILD kdenlive-17.12.3.ebuild 2087 BLAKE2B c8ac625eb0726f290615cf273c6b55fa64e4ddd253531be75b0fbaf8e36e8807c17588a95ca005bf7d7f289b56caa834408fcc5ea459e2de0ecc9daace50517d SHA512 23b0d0a856ded3048f40ee67ddb581c5bd385b5d2aa671b3c6cc649d7377a9c234e98c1a3cf6491e9c42d55ef9126ccd9570fffd1733a14de348132c724cf7a0 -EBUILD kdenlive-18.04.0-r1.ebuild 2163 BLAKE2B 3c71d3bfcce48815583aa1711bdffb9eaa282c24613db1859dfdf4214fde65f9e5eba7ae7960a15c7c7fcf722c26d2ff2b46027e6482be7010313b8435162cbd SHA512 6b7382cf9aa6e5f19b895641e824add714bfe12347d6575e29ae219f5e4176ed5c172398b893e4655a2b9871e09844b6cc51c3937ff14da16fd48d9de96ce71c +EBUILD kdenlive-18.04.1.ebuild 2117 BLAKE2B c797fd67d793c1452dd7036657ce0cb83870a470da672275e3cda99f21e1f2c103f034ae02b21ba1f964f35b3746159d6436e175e56b1407066b4ad68ae975bf SHA512 30ddbb9448936f192b2852928bb86c73921b88caeaf8158f0220262e2faef5c87cacf345feeb20cf0db3ba5094da9536f2dd8ed9f071b2921278f20a38c405df MISC metadata.xml 531 BLAKE2B 2418fe9902d1e4253198b8ccb70ce23cee258143c0da3d99198328e02d2a1ce3ca1e327afd5beaa4ec3a41c04a5c5cd6c2b8d0943fa4b33599ddc3e9eaf59737 SHA512 f3658592c4023a1c101a2faff25018061f7514d5110794e137f72b31106021d581a5b9fbf85b460e55b541a2d11af77a074d702896cb6ab07c4e46740832fea6 diff --git a/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch b/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch deleted file mode 100644 index 9b65000a8cb5..000000000000 --- a/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -78,7 +78,7 @@ - check_include_files(malloc.h HAVE_MALLOC_H) - check_include_files(pthread.h HAVE_PTHREAD_H) - --find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick ) -+find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick Concurrent) - find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET) - - find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET) -diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt ---- a/renderer/CMakeLists.txt -+++ b/renderer/CMakeLists.txt -@@ -9,12 +9,6 @@ - add_executable(kdenlive_render ${kdenlive_render_SRCS}) - ecm_mark_nongui_executable(kdenlive_render) - --qt5_use_modules(kdenlive_render Widgets Concurrent DBus) -- --target_link_libraries(kdenlive_render -- ${QT_LIBRARIES} -- ${Qt5_LIBRARIES} --) -- -+target_link_libraries(kdenlive_render Qt5::Core Qt5::DBus) - - install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR}) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -299,7 +299,7 @@ - target_link_libraries(kdenlive KF5::Crash) - endif() - --qt5_use_modules( kdenlive Script Widgets Concurrent Qml Quick) -+target_link_libraries(kdenlive Qt5::Script Qt5::Widgets Qt5::Concurrent Qt5::Qml Qt5::Quick) - - if (Qt5WebKitWidgets_FOUND) - message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org credentials to download files") diff --git a/kde-apps/kdenlive/kdenlive-18.04.0-r1.ebuild b/kde-apps/kdenlive/kdenlive-18.04.0-r1.ebuild deleted file mode 100644 index 78915ae45c36..000000000000 --- a/kde-apps/kdenlive/kdenlive-18.04.0-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -inherit kde5 - -DESCRIPTION="Non-linear video editing suite by KDE" -HOMEPAGE="https://www.kdenlive.org/" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="freesound gles2 jogshuttle semantic-desktop v4l" - -RDEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui 'gles2=') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtquickcontrols) - $(add_qt_dep qtscript) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] - virtual/ffmpeg[encode,sdl,X] - virtual/opengl - freesound? ( $(add_qt_dep qtwebkit) ) - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) - v4l? ( media-libs/libv4l ) -" -DEPEND="${RDEPEND} - $(add_qt_dep qtconcurrent) - sys-devel/gettext -" - -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package freesound Qt5WebKitWidgets) - -DWITH_JogShuttle=$(usex jogshuttle) - $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) - $(cmake-utils_use_find_package v4l LibV4L2) - ) - - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - - # Gentoo bug 603168 - if ! has_version "media-libs/mlt[fftw]" ; then - elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled." - fi -} diff --git a/kde-apps/kdenlive/kdenlive-18.04.1.ebuild b/kde-apps/kdenlive/kdenlive-18.04.1.ebuild new file mode 100644 index 000000000000..898340cc812a --- /dev/null +++ b/kde-apps/kdenlive/kdenlive-18.04.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="optional" +inherit kde5 + +DESCRIPTION="Non-linear video editing suite by KDE" +HOMEPAGE="https://www.kdenlive.org/" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="freesound gles2 jogshuttle semantic-desktop v4l" + +RDEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui 'gles2=') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtquickcontrols) + $(add_qt_dep qtscript) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] + virtual/ffmpeg[encode,sdl,X] + virtual/opengl + freesound? ( $(add_qt_dep qtwebkit) ) + semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) + v4l? ( media-libs/libv4l ) +" +DEPEND="${RDEPEND} + $(add_qt_dep qtconcurrent) + sys-devel/gettext +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package freesound Qt5WebKitWidgets) + -DWITH_JogShuttle=$(usex jogshuttle) + $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) + $(cmake-utils_use_find_package v4l LibV4L2) + ) + + kde5_src_configure +} + +pkg_postinst() { + kde5_pkg_postinst + + # Gentoo bug 603168 + if ! has_version "media-libs/mlt[fftw]" ; then + elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled." + fi +} -- cgit v1.2.3