[arch-commits] Commit in kdenlive/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Thu Jun 8 12:00:18 UTC 2017
Date: Thursday, June 8, 2017 @ 12:00:18
Author: arojas
Revision: 298314
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdenlive/repos/extra-i686/PKGBUILD
(from rev 298313, kdenlive/trunk/PKGBUILD)
kdenlive/repos/extra-i686/kdenlive-gcc7.patch
(from rev 298313, kdenlive/trunk/kdenlive-gcc7.patch)
kdenlive/repos/extra-x86_64/PKGBUILD
(from rev 298313, kdenlive/trunk/PKGBUILD)
kdenlive/repos/extra-x86_64/kdenlive-gcc7.patch
(from rev 298313, kdenlive/trunk/kdenlive-gcc7.patch)
Deleted:
kdenlive/repos/extra-i686/PKGBUILD
kdenlive/repos/extra-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 110 +++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 48 ----------------
extra-i686/kdenlive-gcc7.patch | 33 +++++++++++
extra-x86_64/PKGBUILD | 48 ----------------
extra-x86_64/kdenlive-gcc7.patch | 33 +++++++++++
5 files changed, 176 insertions(+), 96 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-06-08 12:00:00 UTC (rev 298313)
+++ extra-i686/PKGBUILD 2017-06-08 12:00:18 UTC (rev 298314)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Zuf <kontakt.zuf at gmail.com>
-# Contributor: Darwin Bautista <djclue917 at gmail.com>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-
-pkgname=kdenlive
-pkgver=17.04.1
-pkgrel=1
-pkgdesc="A non-linear video editor for Linux using the MLT video framework"
-arch=(i686 x86_64)
-url="https://www.kdenlive.org/"
-license=(GPL)
-groups=(kde-applications kdemultimedia)
-depends=(knewstuff knotifyconfig kded kfilemetadata qt5-webkit mlt glu sdl_image hicolor-icon-theme qt5-quickcontrols)
-makedepends=(extra-cmake-modules kdoctools v4l-utils python)
-optdepends=('ffmpeg: for FFmpeg plugin'
- 'cdrtools: for creation of DVD ISO images'
- 'dvdauthor: for creation of DVD'
- 'dvgrab: for firewire capture'
- 'libdv: for webcam capture (if FFmpeg is not installed)'
- 'recordmydesktop: for screen capture'
- 'xine-ui: for DVD preview'
- 'plasma-desktop: theme configuration')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/$pkgname-${pkgver}.tar.xz"{,.sig})
-sha256sums=('1b1c79d5d25f6bab52f8999572f5df5b5cbfd3297f6ca18e84af96c7bf4aed08'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- make -C build DESTDIR="${pkgdir}" install
-}
-
Copied: kdenlive/repos/extra-i686/PKGBUILD (from rev 298313, kdenlive/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-06-08 12:00:18 UTC (rev 298314)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Zuf <kontakt.zuf at gmail.com>
+# Contributor: Darwin Bautista <djclue917 at gmail.com>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+
+pkgname=kdenlive
+pkgver=17.04.2
+pkgrel=1
+pkgdesc="A non-linear video editor for Linux using the MLT video framework"
+arch=(i686 x86_64)
+url="https://www.kdenlive.org/"
+license=(GPL)
+groups=(kde-applications kdemultimedia)
+depends=(knewstuff knotifyconfig kded kfilemetadata qt5-webkit mlt glu sdl_image hicolor-icon-theme qt5-quickcontrols)
+makedepends=(extra-cmake-modules kdoctools v4l-utils python)
+optdepends=('ffmpeg: for FFmpeg plugin'
+ 'cdrtools: for creation of DVD ISO images'
+ 'dvdauthor: for creation of DVD'
+ 'dvgrab: for firewire capture'
+ 'libdv: for webcam capture (if FFmpeg is not installed)'
+ 'recordmydesktop: for screen capture'
+ 'xine-ui: for DVD preview'
+ 'vlc: for DVD preview'
+ 'plasma-desktop: theme configuration')
+source=("https://download.kde.org/stable/applications/${pkgver}/src/$pkgname-${pkgver}.tar.xz"{,.sig}
+ kdenlive-gcc7.patch)
+sha256sums=('29ce6a4b3b86e20b8eac5332a22067dc8fbde297d6bc144f722bcbb64856fccb'
+ 'SKIP'
+ '867f3e4fe5f8d7c5ab19bb1d0af321bc9012abb7099149653ba37a49cd76784f')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# Fix build with GCC 7 (rpmfusion)
+ patch -p1 -i ../kdenlive-gcc7.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ make -C build DESTDIR="${pkgdir}" install
+}
+
Copied: kdenlive/repos/extra-i686/kdenlive-gcc7.patch (from rev 298313, kdenlive/trunk/kdenlive-gcc7.patch)
===================================================================
--- extra-i686/kdenlive-gcc7.patch (rev 0)
+++ extra-i686/kdenlive-gcc7.patch 2017-06-08 12:00:18 UTC (rev 298314)
@@ -0,0 +1,33 @@
+diff --git a/src/profiles/tree/profiletreemodel.cpp b/src/profiles/tree/profiletreemodel.cpp
+index 47a580703..912279494 100644
+--- a/src/profiles/tree/profiletreemodel.cpp
++++ b/src/profiles/tree/profiletreemodel.cpp
+@@ -26,6 +26,7 @@
+ #include <vector>
+ #include <QVector>
+ #include <array>
++#include <functional>
+ #include <KLocalizedString>
+
+
+--- a/src/scopes/audioscopes/spectrogram.cpp
++++ b/src/scopes/audioscopes/spectrogram.cpp
+@@ -245,7 +245,7 @@
+ x = leftDist + (m_innerScopeRect.width() - 1) * ((float)hz) / m_freqMax;
+
+ // Hide text if it would overlap with the text drawn at the mouse position
+- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x - (leftDist + mouseX + 20)) < (int) minDistX + 16
++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs((int)(x - (leftDist + mouseX + 20))) < (int) minDistX + 16
+ && mouseX < m_innerScopeRect.width() && mouseX >= 0;
+
+ if (x <= rightBorder) {
+@@ -273,7 +273,7 @@
+ }
+ // Draw the line at the very right (maximum frequency)
+ x = leftDist + m_innerScopeRect.width() - 1;
+- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x - (leftDist + mouseX + 30)) < (int) minDistX
++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs((int)(x - (leftDist + mouseX + 30))) < (int) minDistX
+ && mouseX < m_innerScopeRect.width() && mouseX >= 0;
+ davinci.drawLine(x, topDist, x, topDist + m_innerScopeRect.height() + 6);
+ if (!hideText) {
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-06-08 12:00:00 UTC (rev 298313)
+++ extra-x86_64/PKGBUILD 2017-06-08 12:00:18 UTC (rev 298314)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Zuf <kontakt.zuf at gmail.com>
-# Contributor: Darwin Bautista <djclue917 at gmail.com>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-
-pkgname=kdenlive
-pkgver=17.04.1
-pkgrel=1
-pkgdesc="A non-linear video editor for Linux using the MLT video framework"
-arch=(i686 x86_64)
-url="https://www.kdenlive.org/"
-license=(GPL)
-groups=(kde-applications kdemultimedia)
-depends=(knewstuff knotifyconfig kded kfilemetadata qt5-webkit mlt glu sdl_image hicolor-icon-theme qt5-quickcontrols)
-makedepends=(extra-cmake-modules kdoctools v4l-utils python)
-optdepends=('ffmpeg: for FFmpeg plugin'
- 'cdrtools: for creation of DVD ISO images'
- 'dvdauthor: for creation of DVD'
- 'dvgrab: for firewire capture'
- 'libdv: for webcam capture (if FFmpeg is not installed)'
- 'recordmydesktop: for screen capture'
- 'xine-ui: for DVD preview'
- 'plasma-desktop: theme configuration')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/$pkgname-${pkgver}.tar.xz"{,.sig})
-sha256sums=('1b1c79d5d25f6bab52f8999572f5df5b5cbfd3297f6ca18e84af96c7bf4aed08'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- make -C build DESTDIR="${pkgdir}" install
-}
-
Copied: kdenlive/repos/extra-x86_64/PKGBUILD (from rev 298313, kdenlive/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-06-08 12:00:18 UTC (rev 298314)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Zuf <kontakt.zuf at gmail.com>
+# Contributor: Darwin Bautista <djclue917 at gmail.com>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+
+pkgname=kdenlive
+pkgver=17.04.2
+pkgrel=1
+pkgdesc="A non-linear video editor for Linux using the MLT video framework"
+arch=(i686 x86_64)
+url="https://www.kdenlive.org/"
+license=(GPL)
+groups=(kde-applications kdemultimedia)
+depends=(knewstuff knotifyconfig kded kfilemetadata qt5-webkit mlt glu sdl_image hicolor-icon-theme qt5-quickcontrols)
+makedepends=(extra-cmake-modules kdoctools v4l-utils python)
+optdepends=('ffmpeg: for FFmpeg plugin'
+ 'cdrtools: for creation of DVD ISO images'
+ 'dvdauthor: for creation of DVD'
+ 'dvgrab: for firewire capture'
+ 'libdv: for webcam capture (if FFmpeg is not installed)'
+ 'recordmydesktop: for screen capture'
+ 'xine-ui: for DVD preview'
+ 'vlc: for DVD preview'
+ 'plasma-desktop: theme configuration')
+source=("https://download.kde.org/stable/applications/${pkgver}/src/$pkgname-${pkgver}.tar.xz"{,.sig}
+ kdenlive-gcc7.patch)
+sha256sums=('29ce6a4b3b86e20b8eac5332a22067dc8fbde297d6bc144f722bcbb64856fccb'
+ 'SKIP'
+ '867f3e4fe5f8d7c5ab19bb1d0af321bc9012abb7099149653ba37a49cd76784f')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# Fix build with GCC 7 (rpmfusion)
+ patch -p1 -i ../kdenlive-gcc7.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ make -C build DESTDIR="${pkgdir}" install
+}
+
Copied: kdenlive/repos/extra-x86_64/kdenlive-gcc7.patch (from rev 298313, kdenlive/trunk/kdenlive-gcc7.patch)
===================================================================
--- extra-x86_64/kdenlive-gcc7.patch (rev 0)
+++ extra-x86_64/kdenlive-gcc7.patch 2017-06-08 12:00:18 UTC (rev 298314)
@@ -0,0 +1,33 @@
+diff --git a/src/profiles/tree/profiletreemodel.cpp b/src/profiles/tree/profiletreemodel.cpp
+index 47a580703..912279494 100644
+--- a/src/profiles/tree/profiletreemodel.cpp
++++ b/src/profiles/tree/profiletreemodel.cpp
+@@ -26,6 +26,7 @@
+ #include <vector>
+ #include <QVector>
+ #include <array>
++#include <functional>
+ #include <KLocalizedString>
+
+
+--- a/src/scopes/audioscopes/spectrogram.cpp
++++ b/src/scopes/audioscopes/spectrogram.cpp
+@@ -245,7 +245,7 @@
+ x = leftDist + (m_innerScopeRect.width() - 1) * ((float)hz) / m_freqMax;
+
+ // Hide text if it would overlap with the text drawn at the mouse position
+- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x - (leftDist + mouseX + 20)) < (int) minDistX + 16
++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs((int)(x - (leftDist + mouseX + 20))) < (int) minDistX + 16
+ && mouseX < m_innerScopeRect.width() && mouseX >= 0;
+
+ if (x <= rightBorder) {
+@@ -273,7 +273,7 @@
+ }
+ // Draw the line at the very right (maximum frequency)
+ x = leftDist + m_innerScopeRect.width() - 1;
+- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x - (leftDist + mouseX + 30)) < (int) minDistX
++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs((int)(x - (leftDist + mouseX + 30))) < (int) minDistX
+ && mouseX < m_innerScopeRect.width() && mouseX >= 0;
+ davinci.drawLine(x, topDist, x, topDist + m_innerScopeRect.height() + 6);
+ if (!hideText) {
+
More information about the arch-commits
mailing list