From 4836cecd44f6415d0a41c4fac50c64b4373fb3bd Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Fri, 25 May 2018 01:17:06 +0100
Subject: [PATCH 01/32] [skip-ci] qsynth: update to 0.5.1

---
 qsynth/PKGBUILD | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/qsynth/PKGBUILD b/qsynth/PKGBUILD
index 7c16a3544..29e8339d2 100644
--- a/qsynth/PKGBUILD
+++ b/qsynth/PKGBUILD
@@ -1,21 +1,15 @@
 pkgname=qsynth
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="Qt GUI for fluidsynth"
 arch=('x86_64')
 url="http://qsynth.sourceforge.net/qsynth-index.html"
 license=('GPL')
-depends=('fluidsynth' 'qt5-base' 'qt5-x11extras')
+depends=('fluidsynth' 'qt5-base' 'qt5-x11extras' 'hicolor-icon-theme')
 makedepends=('qt5-tools')
 categories=('multimedia')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('d24417f89851d53302658116cccb1bad79d6068e')
-
-prepare() {
-  cd $pkgname-$pkgver
-  # fix to make .configure recognize Qt>=5.1
-  export CXXFLAGS="${CXXFLAGS} -std=c++11" 
-}
+sha1sums=('a0a6ebd1d2bd2b72a11c28bd5a5e8bfa14725d62')
 
 build() {
   cd $pkgname-$pkgver
@@ -26,4 +20,6 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR=$pkgdir install
+  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
+    -vDm644 {AUTHORS,ChangeLog,README,TODO,TRANSLATORS}
 }  

From 90754d5a0e11a5fac5485a2532c426f900148888 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Fri, 25 May 2018 01:24:58 +0100
Subject: [PATCH 02/32] [skip-ci] qjackctl: update to 0.5.1

---
 qjackctl/PKGBUILD | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/qjackctl/PKGBUILD b/qjackctl/PKGBUILD
index 22e284d2c..7577be65c 100644
--- a/qjackctl/PKGBUILD
+++ b/qjackctl/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=qjackctl
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="A Qt front-end for the JACK low-latency audio server"
 url="http://qjackctl.sourceforge.net/"
@@ -10,23 +10,17 @@ makedepends=('qt5-tools')
 options=('!makeflags')
 categories=('multimedia')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('8133f9c5ef1953757440262cfa6a38fa5ebf5617')
-
-prepare() {
-  cd $pkgname-$pkgver
-  # fix to make .configure recognize Qt>=5.1
-  export CXXFLAGS="${CXXFLAGS} -std=c++11" 
-}
+sha1sums=('6d276d55865f00bea35738cd9ef0b6e5f3afd56f')
 
 build() {
   cd $pkgname-$pkgver
-
  ./configure --prefix=/usr
   make
 }
 
 package() {
   cd $pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
+  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
+    -vDm644 {AUTHORS,ChangeLog,README,TODO,TRANSLATORS}
 }

From 7941d4fb92d0685232945b8a7609f504d237a20b Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Fri, 25 May 2018 05:31:36 +0100
Subject: [PATCH 03/32] calibre: update to 3.24.0

---
 calibre/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/calibre/PKGBUILD b/calibre/PKGBUILD
index f5d9644fa..a7dbad9ed 100644
--- a/calibre/PKGBUILD
+++ b/calibre/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=calibre
-pkgver=3.23.0
+pkgver=3.24.0
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('x86_64')
@@ -20,7 +20,7 @@ optdepends=('ipython2: to use calibre-debug'
 screenshot=('https://lh5.googleusercontent.com/_lG58t3XWd3c/TcNwiXkAx_I/AAAAAAAAAEc/M34I4uY9UUY/s800/gui.jpeg')
 install=${pkgname}.install
 source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz")
-sha256sums=('c98564e6b5599a4838c68b8266559a487d15abfc04331ad850fcbe09db884337')
+sha256sums=('9b986d3df4491ce8331052c82df1075ff302c4f8820634bdf3f8711c4bf36016')
 
 prepare(){
   cd "${pkgname}-${pkgver}"

From dcc08a758f169bba9c76b52e947cb90ceba2b619 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Sat, 26 May 2018 07:14:36 +0200
Subject: [PATCH 04/32] rebuild package for qt5

---
 akonadi/PKGBUILD   | 2 +-
 calibre/PKGBUILD   | 2 +-
 fcitx-qt5/PKGBUILD | 6 +++---
 kdeapps.conf       | 2 +-
 skrooge/PKGBUILD   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/akonadi/PKGBUILD b/akonadi/PKGBUILD
index 98abb5f4c..45d8decff 100644
--- a/akonadi/PKGBUILD
+++ b/akonadi/PKGBUILD
@@ -3,7 +3,7 @@ source ../kdeapps.conf
 
 pkgname=akonadi
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('x86_64')
 url='http://community.kde.org/KDE_PIM/Akonadi'
diff --git a/calibre/PKGBUILD b/calibre/PKGBUILD
index a7dbad9ed..317c51054 100644
--- a/calibre/PKGBUILD
+++ b/calibre/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=calibre
 pkgver=3.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('x86_64')
 url="https://calibre-ebook.com/"
diff --git a/fcitx-qt5/PKGBUILD b/fcitx-qt5/PKGBUILD
index 3eb455682..744073a10 100644
--- a/fcitx-qt5/PKGBUILD
+++ b/fcitx-qt5/PKGBUILD
@@ -1,14 +1,14 @@
 pkgname=fcitx-qt5
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="QT5 IM Module for Fcitx"
 arch=('x86_64')
 url="https://github.com/fcitx/fcitx-qt5"
 license=('GPL')
-depends=('fcitx>=4.2.7' ''libxkbcommon'' 'qt5-base')
+depends=('fcitx>=4.2.7' 'libxkbcommon' 'qt5-base')
 makedepends=('cmake' 'extra-cmake-modules')
 source=(https://github.com/fcitx/fcitx-qt5/archive/${pkgver}.tar.gz)
-sha512sums=('5c1fd43d40513cf6f5a691bb9b1a2af9ea14b53cc05322481bc572d9e23a141ead1da99b427de995d4c70e1d08a0fe1a796f6a1e8d58011c7d9a3d1a012173c2')
+sha512sums=('73bdce2eb9bf1d7795cd4fa7ce2a327ccfe707d8e19f74edc60716185b03dd615a89a1d853f8d8724af0d2b48b4072453e7eac08c1d2dbd74fac127e95507b6e')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/kdeapps.conf b/kdeapps.conf
index 90fea3795..453808880 100644
--- a/kdeapps.conf
+++ b/kdeapps.conf
@@ -6,7 +6,7 @@
 # KDE settings
 _kdever="18.04.1"
 #_mirror="http://download.kde.org/stable/applications/${_kdever}/src"
-_mirror="http://download.kde.org/unstable/applications/${_kdever}/src"
+_mirror="http://download.kde.org/stable/applications/${_kdever}/src"
 _oldkdever="4.14.3"
 _workspace_ver="4.11.22"
 _libsver="4.14.38"
diff --git a/skrooge/PKGBUILD b/skrooge/PKGBUILD
index 8a7ff9879..85d230882 100644
--- a/skrooge/PKGBUILD
+++ b/skrooge/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=skrooge
 pkgver=2.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows you to manage your personal finances in KDE"
 arch=('x86_64')
 url="http://skrooge.org"

From 9499e6c5fea2d44d6cf37e96d2f391ff444cbf8c Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Sat, 26 May 2018 07:31:18 +0200
Subject: [PATCH 05/32] rebuild avidemux

---
 avidemux/PKGBUILD              | 73 +++++++++++++++++++++-------------
 avidemux/avidemux-qt5.11.patch | 23 +++++++++++
 2 files changed, 69 insertions(+), 27 deletions(-)
 create mode 100644 avidemux/avidemux-qt5.11.patch

diff --git a/avidemux/PKGBUILD b/avidemux/PKGBUILD
index 67f278b9f..7cbf3ed9b 100644
--- a/avidemux/PKGBUILD
+++ b/avidemux/PKGBUILD
@@ -1,59 +1,78 @@
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux')
 pkgver=2.7.0
-pkgrel=1
-pkgdesc='Simple video editor for cutting, filtering and encoding tasks.'
+pkgrel=2
+pkgdesc='Graphical tool to edit video (filter/re-encode/split)'
+url='http://fixounet.free.fr/avidemux/'
 arch=('x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-screenshot="http://upload.wikimedia.org/wikipedia/commons/7/77/Avidemux_Screenshot_Qt.png"
-makedepends=('cmake' 'libxslt' 'qt5-base' 'qt5-tools' 'qt5-script' 'qt5-multimedia' 'jack' 'libvorbis' 'sdl' 'libxv' 'alsa-lib' 'lame'
-             'faad2' 'faac' 'x264' 'x265' 'libsamplerate' 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'sqlite3' 'xvidcore'
-             'pulseaudio' 'libva' 'desktop-file-utils' 'libdca' 'fribidi' 'glu' 'aften' 'dcaenc' 'twolame' 'gettext')
-categories=('multimedia')
-options=("!makeflags")
-source=("http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz")
-sha256sums=('fe1d6b794c0d94922428ff84a931264a90c39a5ffe965e03ab7ae0ce71a2c4ad')
+license=('GPL2')
+makedepends=('cmake' 'libxslt' 'qt5-base' 'jack' 'libvorbis' 'libxv' 'opus' 'desktop-file-utils'
+             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libx264' 'x265' 'libsamplerate'
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' 'intltool' 'sqlite'
+             'libvdpau' 'libdca' 'fribidi' 'glu' 'qt5-tools' 'twolame' 'libfdk-aac' 'libass')
+options=('!emptydirs')
+source=(https://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz avidemux-qt5.11.patch)
+sha512sums=('7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015'
+            'ae8aeadab04e2467a2a8d744a5fb7db70b03711f6f1d749214d46339c3261d653f1a6b4818c14dc3aec2e72764e90c6478b80bde337cd830845ebb913e953423')
 
 prepare() {
   cd ${pkgbase}_${pkgver}
   sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash
+  sed -e 's|0.19|1.0|' -i avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
   cp avidemux2.desktop avidemux-qt.desktop
   sed -ri 's|(Name=).*|\1avidemux (Qt)|' avidemux-qt.desktop
   sed -ri 's|(Exec=).*|\1avidemux3_qt5|' avidemux-qt.desktop
+
+  # https://sourceforge.net/p/avidemux/bugs/77/
+  sed -e 's|pow10f|exp10f|g' -i avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
+  # fix build with Qt 5.11
+  patch -p1 -i ../avidemux-qt5.11.patch
 }
-         
+
 build() {
   cd ${pkgbase}_${pkgver}
   bash bootStrap.bash --with-core --with-cli --with-plugins
 }
 
 package_avidemux-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)- command line version"
-  depends=('faac' 'faad2' 'fontconfig' 'fribidi' 'jack' 'lame' 'libdca' 
-  'pulseaudio' 'libva' 'libxv' 'libvpx' 'libxml2' 'opencore-amr'  'xvidcore'
-  'sdl' 'sqlite3' 'x264' 'x265' 'aften' 'dcaenc' 'twolame')
-  optdepends=('avidemux: graphical interface')
+  depends=('libxml2' 'fontconfig' 'sqlite' 'libvpx' 'libva' 'libvdpau')
+  optdepends=('lame: for the corresponding audio encoder plugin'
+              'faac: for the corresponding audio encoder plugin'
+              'faad2: for the corresponding audio decoder plugin'
+              'opus: for the corresponding audio decoder plugin'
+              'opencore-amr: for the corresponding audio decoder plugin'
+              'jack: for the corresponding audio device plugin'
+              'libpulse: for the corresponding audio device plugin'
+              'x264: for the corresponding video encoder plugin'
+              'libx264: for the corresponding video encoder plugin'
+              'x265: for the corresponding video encoder plugin'
+              'xvidcore: for the corresponding video encoder plugin'
+              'qt5-base: for the QtScript scripting support'
+              'libdca: for the corresponding audio decoder plugin'
+              'libfdk-aac: for the corresponding audio decoder plugin'
+              'twolame: for the corresponding audio decoder plugin'
+              'libass: for the corresponding video filter plugin'
+              'fribidi: for the corresponding video filter plugin')
 
   cd ${pkgbase}_${pkgver}
   make -C buildCli DESTDIR="${pkgdir}" install
   make -C buildCore DESTDIR="${pkgdir}" install
   make -C buildPluginsCLI DESTDIR="${pkgdir}" install
   make -C buildPluginsCommon DESTDIR="${pkgdir}" install
-  
-  install -D -m644 "${srcdir}/${pkgbase}_${pkgver}/avidemux_icon.png" "${pkgdir}/usr/share/pixmaps/avidemux.png" 
-  install -D -m644 "${srcdir}/${pkgbase}_${pkgver}/man/avidemux.1" "${pkgdir}/usr/share/man/man1/avidemux.1" 
+
+  install -Dm 644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+  install -Dm 644 man/avidemux.1 -t "${pkgdir}/usr/share/man/man1"
 }
 
 package_avidemux() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=("avidemux-cli=$pkgver" 'qt5-base' 'mesa')
+  pkgdesc='Graphical tool to edit video (filter/re-encode/split) - Qt GUI'
+  depends=("avidemux-cli=${pkgver}" 'qt5-base' 'x264' 'x265' 'libx264' 'glu' 'libxv' 'desktop-file-utils')
+  replaces=('avidemux-gtk')
 
   cd ${pkgbase}_${pkgver}
   make -C buildQt5 DESTDIR="${pkgdir}" install
   make -C buildPluginsQt5 DESTDIR="${pkgdir}" install
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux.desktop"
-  sed -i 's|2_gtk|3_qt5|' "${pkgdir}/usr/share/applications/avidemux.desktop"
-  sed -i 's|avidemux2|avidemux3|' "${pkgdir}/usr/share/applications/avidemux.desktop"
+  install -Dm 644 avidemux-qt.desktop -t "${pkgdir}/usr/share/applications"
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/avidemux/avidemux-qt5.11.patch b/avidemux/avidemux-qt5.11.patch
new file mode 100644
index 000000000..7a74d7b9b
--- /dev/null
+++ b/avidemux/avidemux-qt5.11.patch
@@ -0,0 +1,23 @@
+diff -ru avidemux_2.7.0.orig/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp avidemux_2.7.0/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
+--- avidemux_2.7.0.orig/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp	2018-05-25 22:43:37.453349626 +0200
++++ avidemux_2.7.0/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp	2018-05-25 22:45:04.903345751 +0200
+@@ -17,6 +17,7 @@
+ #include "ADM_coreJobs.h"
+ #include "DIA_coreToolkit.h"
+ #include <QtCore/QDir>
++#include <QAction>
+ 
+ 
+ static QTableWidgetItem *fromText(const string &t,int id)
+diff -ru avidemux_2.7.0.orig/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp avidemux_2.7.0/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
+--- avidemux_2.7.0.orig/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp    2018-05-25 22:43:37.413349627 +0200
++++ avidemux_2.7.0/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp 2018-05-25 23:01:45.793301398 +0200
+@@ -17,6 +17,7 @@
+ #include "Q_eq2.h"
+ #include "ADM_toolkitQt.h"
+ #include <QSignalMapper>
++#include <QAction>
+ 
+ //
+ //     Video is in YV12 Colorspace
+

From c6230c4f8125829cb936135f559d921ba37fb102 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Sat, 26 May 2018 07:55:15 +0200
Subject: [PATCH 06/32] rebuild for libva

---
 kodi/PKGBUILD |  2 +-
 mpv/PKGBUILD  | 87 ++++++++++++++++++++++-----------------------------
 2 files changed, 38 insertions(+), 51 deletions(-)

diff --git a/kodi/PKGBUILD b/kodi/PKGBUILD
index 049e80c6d..d9ff9d15a 100644
--- a/kodi/PKGBUILD
+++ b/kodi/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=kodi
 pkgver=17.6
 _codename=Krypton
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="http://kodi.tv"
 license=('GPL2')
diff --git a/mpv/PKGBUILD b/mpv/PKGBUILD
index 288d7237e..9a2fb7a1d 100644
--- a/mpv/PKGBUILD
+++ b/mpv/PKGBUILD
@@ -1,69 +1,56 @@
 pkgname=mpv
-pkgver=0.27.0
-pkgrel=2
-pkgdesc="A movie player and encoder for linux, based on MPlayer/mplayer2"
+pkgver=0.28.2
+pkgrel=1
+_waf_version=1.9.8
+pkgdesc='a free, open source, and cross-platform media player'
 arch=('x86_64')
-license=('LGPL3')
-url="http://mpv.io"
-depends=('pulseaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libgl' 'libvdpau'
-         'libxinerama' 'libxv' 'libxkbcommon' 'libva'  'libass' 'uchardet' 
-	 'wayland' 'desktop-file-utils' 'hicolor-icon-theme' 'v4l-utils' 'openal'
-         'xdg-utils' 'lua52' 'libdvdnav' 'libcdio-paranoia' 'libbluray' 'libxss'
-         'enca' 'libguess' 'harfbuzz' 'libxrandr' 'rubberband' 'libarchive' 'libcaca')
-makedepends=('mesa' 'python3-docutils' 'ladspa' 'x264' 'jack' 'samba' 'waf')
+# We link against libraries that are licensed GPLv3 explicitly, libsmbclient
+# being one of these. So our package is GPLv3 only as well.
+license=('GPL3')
+url='https://mpv.io/'
+depends=('desktop-file-utils' 'ffmpeg' 'hicolor-icon-theme' 'jack' 'lcms2'
+         'libarchive' 'libcaca' 'libcdio-paranoia' 'libdvdnav' 'libgl' 'libva'
+         'libxinerama' 'libxkbcommon' 'libxrandr' 'libxss' 'libxv' 'lua52'
+         'rubberband' 'smbclient' 'uchardet' 'vulkan-icd-loader' 'wayland'
+         'xdg-utils')
+makedepends=('mesa' 'python3-docutils' 'ladspa' 'wayland-protocols'
+             'vulkan-headers')
+optdepends=('youtube-dl: for video-sharing websites playback')
 options=('!emptydirs')
-provides=('mplayer')
-install=${pkgname}.install
-source=("https://github.com/mpv-player/${pkgname}/archive/v${pkgver}.tar.gz"
-        '0001-opengl-backend-support-multiple-backends.patch')
-sha256sums=('341d8bf18b75c1f78d5b681480b5b7f5c8b87d97a0d4f53a5648ede9c219a49c'
-            '609e0530f1b0cdb910dcffb5f62bf55936540e24105ce1b2daf1bd6291a7d58a')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz"
+  "https://waf.io/waf-${_waf_version}")
+sha256sums=('aada14e025317b5b3e8e58ffaf7902e8b6e4ec347a93d25a7c10d3579426d795'
+  '167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf')
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
-  # --opengl-backend: support multiple backends (#4384) (FS#53962)
-  patch -Np1 < "${srcdir}"/0001-opengl-backend-support-multiple-backends.patch
+  install -m755 "${srcdir}"/waf-${_waf_version} waf
 }
- 
+
 build() {
   cd ${pkgname}-${pkgver}
- 
-  # disable SDL, since they are just legacy drivers
-  waf configure \
-    --prefix=/usr \
+
+  ./waf configure --prefix=/usr \
     --confdir=/etc/mpv \
-    --enable-libmpv-shared \
     --enable-cdda \
     --enable-dvb \
-    --enable-zsh-comp \
-    --enable-alsa \
-    --enable-pulse \
-    --enable-openal \
-    --enable-wayland \
-    --enable-gl-wayland \
-    --enable-egl-x11 \
-    --enable-libsmbclient \
-    --enable-dvdread \
-    --enable-vdpau \
-    --enable-encoding \
     --enable-dvdnav \
-    --enable-libarchive
-  waf build
+    --enable-encoding \
+    --enable-libarchive \
+    --enable-libmpv-shared \
+    --enable-libsmbclient \
+    --enable-tv \
+    --enable-zsh-comp
+
+  ./waf build
 }
- 
+
 package() {
   cd ${pkgname}-${pkgver}
- 
-  waf install --destdir="${pkgdir}" 
-  
-  install -d "${pkgdir}/usr/share/doc/mpv/examples"
- 
-  # some extra useful stuff "make install" doesn't install
-  install -m755 TOOLS/umpv \
-    "${pkgdir}"/usr/bin/umpv
-  install -m644 etc/input.conf \
-    "${pkgdir}"/usr/share/doc/mpv/examples
+
+  ./waf install --destdir="$pkgdir"
+
   install -m644 DOCS/{encoding.rst,tech-overview.txt} \
-    "${pkgdir}"/usr/share/doc/mpv
+    "$pkgdir"/usr/share/doc/mpv
 }

From 64c41ac81e58041791c9ce24d2f47173d57f61c8 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Sat, 26 May 2018 08:04:25 +0200
Subject: [PATCH 07/32] rebuild mythtv

---
 mythtv/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mythtv/PKGBUILD b/mythtv/PKGBUILD
index 838e0a355..f36a450e3 100644
--- a/mythtv/PKGBUILD
+++ b/mythtv/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mythtv
 pkgver=29.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Homebrew PVR project"
 arch=('x86_64')
 url="http://www.mythtv.org/"
@@ -21,7 +21,7 @@ install='mythtv.install'
 source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz"
 	'mythbackend.service'
         '99-mythbackend.rules')
-sha256sums=('33710a392fb9d2ec869a3d0494f5ecc284b47b78970ceebd2eafe2579ec4ce54'
+sha256sums=('e40ec8111d39fd059a9ec741b10016683bcc66ee3b33c4cdaab93d60851f5d3e'
             '30a301d31e2396b08eee97188619b900a834081d9792a36ae274fb0dfa65a9dc'
             'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333')
 

From c9d6240037debfd41fea80c0d00c17e3fbc6e997 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Sat, 26 May 2018 13:17:29 +0100
Subject: [PATCH 08/32] [skip-ci] libindi: update to 1.7.2

---
 libindi/PKGBUILD | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libindi/PKGBUILD b/libindi/PKGBUILD
index f6e86e3bc..8d510a29d 100644
--- a/libindi/PKGBUILD
+++ b/libindi/PKGBUILD
@@ -1,24 +1,24 @@
 pkgname=libindi
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7.2
+pkgrel=1
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
 arch=('x86_64')
 depends=(libnova cfitsio libusb libjpeg gsl libtheora)
 makedepends=(cmake boost qt5-base)
-source=("https://github.com/indilib/indi/releases/download/v$pkgver/libindi_$pkgver.tar.gz")
-sha256sums=('58b4764806d53539f56c6e2c015ec4b270e9c350e2ca317c569076e3e3a0eb09')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/indilib/indi/archive/v$pkgver.tar.gz")
+sha256sums=('5ec9aea9e8b1a79ea440327c25a7c7cfde6f9145b066e42eaaec3e76f8e37b93')
 
 prepare() {
   mkdir -p build
   
-  sed -e 's|GROUP="plugdev", MODE="0666"|TAG+="uaccess"|' -i libindi/drivers/*/*.rules
+  sed -e 's|GROUP="plugdev", MODE="0666"|TAG+="uaccess"|' -i indi-$pkgver/libindi/drivers/*/*.rules
 }
 
 build() {
   cd build
-  cmake ../libindi \
+  cmake ../indi-$pkgver/libindi \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \

From 9b521fbb8ebf634d79dbb29ea2bc0274a2197b3f Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Sat, 26 May 2018 13:33:00 +0100
Subject: [PATCH 09/32] [skip-ci] kstars: update to 2.9.6

---
 kstars/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kstars/PKGBUILD b/kstars/PKGBUILD
index 54772a090..f56077e3d 100644
--- a/kstars/PKGBUILD
+++ b/kstars/PKGBUILD
@@ -3,7 +3,7 @@
 source ../kdeapps.conf
 
 pkgname=kstars
-pkgver=2.9.5
+pkgver=2.9.6
 pkgrel=1
 epoch=1
 pkgdesc="Desktop planetarium"
@@ -18,7 +18,7 @@ replaces=('kdeedu-kstars')
 conflicts=('kdeedu-kstars')
 options=('docs' 'debug')
 source=("https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('6c2ddf3cb04688fe4ff8cafb4c6a1e7e249ff8ae0c42650f0d491a706269a3b1'
+sha256sums=('a0c8065433ba0f4068274a388a07a3499dcfe1ff09eea314f82a4baa1048d9a6'
             'SKIP')
 validpgpkeys=(259D9FCEE9175351965633696D9CE2AEE028C4F3) # Jasem Mutlaq <mutlaqja@ikarustech.com>
 

From 6c7bad3ca838618e10515fc105817fa287647150 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Mon, 28 May 2018 07:45:06 +0100
Subject: [PATCH 10/32] [skip-ci] qbittorrent: update to 4.1.1

---
 qbittorrent/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qbittorrent/PKGBUILD b/qbittorrent/PKGBUILD
index 0e6f38798..b09990c25 100755
--- a/qbittorrent/PKGBUILD
+++ b/qbittorrent/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname=qbittorrent
-pkgver=4.1.0
+pkgver=4.1.1
 pkgrel=1
 pkgdesc="A bittorrent client written in C++ / Qt using the good libtorrent library"
 arch=('x86_64')
-url="http://www.qbittorrent.org/"
+url="https://www.qbittorrent.org/"
 license=('GPL')
 depends=('qt5-base' 'qt5-svg' 'hicolor-icon-theme' 'libtorrent-rasterbar' 'xdg-utils' 'boost-libs' 'python3' 'geoip-database')
 makedepends=('boost' 'geoip' 'qt5-tools')
@@ -11,7 +11,7 @@ categories=('network')
 screenshot=('http://sourceforge.net/projects/qbittorrent/screenshots/242189.jpg')
 install=qbittorrent.install
 source=("https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('fc9684b6246f1597fecf19a2d9bb64ec7618a87a7427b37410a487c13439b939')
+sha256sums=('8edc7a7fff8aa45e7bf763c91f30e064e1d7acd3f6efecb12fee420b75457ee7')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}

From fe1c14888de2cf80f78c1ee50f427d8bfb7c5da7 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Tue, 29 May 2018 22:59:37 +0100
Subject: [PATCH 11/32] [skip-ci] emacs-nox: update to 26.1

---
 emacs-nox/PKGBUILD | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/emacs-nox/PKGBUILD b/emacs-nox/PKGBUILD
index ca877e584..abb99c16b 100644
--- a/emacs-nox/PKGBUILD
+++ b/emacs-nox/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname=emacs-nox
-pkgver=25.3
+pkgver=26.1
 pkgrel=1
 pkgdesc='The Emacs Editor, without X11 support'
 arch=('x86_64')
-url="http://www.gnu.org/software/emacs/emacs.html"
+url="https://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('dbus' 'ncurses' 'perl' 'gnutls')
 provides=('emacs')
@@ -11,7 +11,7 @@ conflicts=('emacs' 'emacs-cvs')
 options=('docs')
 install=$pkgname.install
 source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.xz)
-md5sums=('05da38e18da75c98d48ad69b5ab74e71')
+md5sums=('649ec46965a8b842bdb2cbf7764c2a9a')
 
 build() {
   cd $srcdir/emacs-$pkgver
@@ -28,20 +28,9 @@ package() {
   #remove conflict with ctags package
   mv $pkgdir/usr/bin/{ctags,ctags.emacs}
   mv $pkgdir/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  
-  #fix all the 777 perms on directories
-  find $pkgdir/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \;
+
   #fix user/root permissions on usr/share files
   find $pkgdir/usr/share/emacs/$pkgver -exec chown root.root {} \;
   #remove .desktop file and icons
   rm -rf $pkgdir/usr/share/{applications,icons}
-
-  # fix perms on /var/games
-  chmod 775 $pkgdir/var/games
-  chmod 775 $pkgdir/var/games/emacs
-  chmod 664 $pkgdir/var/games/emacs/*
-  chown -R root:games $pkgdir/var/games
-
-  # fix conflict with texinfo
-  rm $pkgdir/usr/share/info/info.info.gz
 }

From a4f70526d8d2ca87507e8bd439a8a2c382597ac8 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Wed, 30 May 2018 01:55:36 +0100
Subject: [PATCH 12/32] [skip-ci] qtractor: update to 0.9.1

---
 qtractor/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qtractor/PKGBUILD b/qtractor/PKGBUILD
index 9b0863ece..d2052fec9 100644
--- a/qtractor/PKGBUILD
+++ b/qtractor/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=qtractor
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=1
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('x86_64')
@@ -11,7 +11,7 @@ depends=('qt5-base' 'qt5-x11extras' 'jack' 'libmad' 'libsamplerate' 'rubberband'
 makedepends=('ladspa' 'dssi' 'qt5-tools')
 categories=('multimedia')
 source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-sha256sums=('ca0e0167b66c3c68266018979d6e60bab18c0486cd9811f512568e794e10090d')
+sha256sums=('0b874f30bd441b948082b928cb69695603dee4b133a1872f90a1127c325e9a1d')
 
 build() {
   cd $pkgname-$pkgver

From 772b8168e9e9c72fab7065e36eabe4a5d40a51e8 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Wed, 30 May 2018 02:00:19 +0100
Subject: [PATCH 13/32] [skip-ci] focuswriter: update to 1.6.13

---
 focuswriter/PKGBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/focuswriter/PKGBUILD b/focuswriter/PKGBUILD
index 23b49fc19..fc82bab58 100644
--- a/focuswriter/PKGBUILD
+++ b/focuswriter/PKGBUILD
@@ -1,17 +1,17 @@
 pkgname=focuswriter
-pkgver=1.6.12
+pkgver=1.6.13
 pkgrel=1
 pkgdesc="A simple fullscreen word processor."
 arch=('x86_64')
-url="http://gottcode.org/$pkgname/"
-screenshot="http://gottcode.org/focuswriter/screenshots/focuswriter_image.png"
+url="https://gottcode.org/$pkgname/"
+screenshot="https://gottcode.org/focuswriter/screenshots/focuswriter_image.png"
 license=('GPL3')
 depends=('qt5-base' 'qt5-multimedia' 'hunspell')
 makedepends=('qt5-tools')
 categories=('office')
-screenshot=("http://gottcode.org/focuswriter/screenshots/focuswriter_stats.png")
+screenshot=("https://gottcode.org/focuswriter/screenshots/focuswriter_stats.png")
 source=("http://gottcode.org/$pkgname/$pkgname-$pkgver-src.tar.bz2")
-sha256sums=('12df7540b3ac9223fe62924bf11cc611013b0b3f9bce9148179a36ed604b996d')
+sha256sums=('d6b8b523fbc2443ead1474cb844e5a51d9e68430b959c4fd858a698472d949e3')
 
 build() {
   cd $pkgname-$pkgver

From 33b7aea52feb5a3d9d9ce892a7f8e8f52ec2b416 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Wed, 30 May 2018 02:04:02 +0100
Subject: [PATCH 14/32] [skip-ci] tanglet: update to 1.5.2

---
 tanglet/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tanglet/PKGBUILD b/tanglet/PKGBUILD
index 2042434bc..e2f76b48d 100644
--- a/tanglet/PKGBUILD
+++ b/tanglet/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=tanglet
-pkgver=1.5.0
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="A single player word finding game based on Boggle"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ makedepends=('qt5-tools')
 categories=('games')
 install=${pkgname}.install
 source=("http://gottcode.org/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2")
-sha256sums=('225aec0814b7c65070002093c2df86f8d1cc5ffcb83b26811f029a0f2a97040e')
+sha256sums=('3502d66446fc1bd5ca4b227b9df7a4ae3a4fd4dbfa97927eca240952df6391db')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

From 9e76b62acfec5c04e1328ae49a4b58bf8fd46eab Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Wed, 30 May 2018 02:08:38 +0100
Subject: [PATCH 15/32] [skip-ci] tetzle: update to 2.1.3

---
 tetzle/PKGBUILD | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tetzle/PKGBUILD b/tetzle/PKGBUILD
index 7891b2dd5..346ebd212 100755
--- a/tetzle/PKGBUILD
+++ b/tetzle/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=tetzle
-pkgver=2.1.1
+pkgver=2.1.3
 pkgrel=1
 pkgdesc="A jigsaw puzzle with tetrominoes for pieces."
 arch=('x86_64')
@@ -7,10 +7,9 @@ url="http://gottcode.org/${pkgname}/"
 license=('GPL3')
 depends=('qt5-base')
 makedepends=('qt5-tools')
-optdepends=('jhead: auto-orient images')
 install=${pkgname}.install
 source=(http://gottcode.org/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2)
-md5sums=('ea871fa6aab4e398998793f160a5f10a')
+md5sums=('df7a1a9174a3802b8738ddb3f423d0da')
 screenshot='http://gottcode.org/tetzle/screenshots/small.png'
 
 build() {

From 6934598e2423324b9064bca060a02c27fbac2253 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Wed, 30 May 2018 04:46:00 +0100
Subject: [PATCH 16/32] [skip-ci] inxi: update to 3.0.10

---
 inxi/PKGBUILD | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inxi/PKGBUILD b/inxi/PKGBUILD
index 6fd4fbf6f..0ad4938d1 100644
--- a/inxi/PKGBUILD
+++ b/inxi/PKGBUILD
@@ -1,7 +1,7 @@
 #Contributions from Arch: https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/inxi
 
 pkgname=inxi
-pkgver=2.3.56
+pkgver=3.0.10
 pkgrel=1
 pkgdesc="a full featured CLI system information tool"
 url="https://github.com/smxi/inxi"
@@ -23,11 +23,11 @@ optdepends=(
   "xorg-xprop: inxi -S desktop data"
   "xorg-xrandr: inxi -G single screen resolution"
 )
-source=(https://sources.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('8cde8559d31b82d478bc1a5788cc7bcd')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/smxi/inxi/archive/${pkgver}-1.tar.gz")
+md5sums=('7e92d778e5e7eb38a42cb45c18e1962d')
 
 package() {
-  cd "$srcdir"
-  install -D -m755 inxi "$pkgdir/usr/bin/inxi"
-  install -D -m755 inxi.1.gz "$pkgdir/usr/share/man/man1/inxi.1.gz"
+  cd ${pkgname}-${pkgver}-1
+  install -D -m755 $pkgname "${pkgdir}/usr/bin/$pkgname"
+  install -D -m755 $pkgname.1 "${pkgdir}/usr/share/man/man1/$pkgname.1"
 }

From ee38e6967f44c94e7dbfa5a7daf524a549fe443e Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Wed, 30 May 2018 05:07:16 +0100
Subject: [PATCH 17/32] [skip-ci] virtualbox: rebuild against new procps-ng

---
 virtualbox/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/virtualbox/PKGBUILD b/virtualbox/PKGBUILD
index 93887ad85..ba891e8d1 100644
--- a/virtualbox/PKGBUILD
+++ b/virtualbox/PKGBUILD
@@ -11,9 +11,9 @@ pkgname=('virtualbox'
          'virtualbox-ext-vnc'
          'virtualbox-ext-oracle')
 pkgver=5.2.12
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
-url='http://virtualbox.org'
+url='https://www.virtualbox.org'
 license=('GPL')
 makedepends=('alsa-lib'
              'bin86'

From 0291676a8ecbebbe1c10f8f3e5510738905fbf94 Mon Sep 17 00:00:00 2001
From: Francesco Marinucci <franzmari@chakralinux.org>
Date: Thu, 31 May 2018 09:55:39 +0100
Subject: [PATCH 18/32] [skip-ci] npm: update to 6.1.0

---
 npm/PKGBUILD | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/npm/PKGBUILD b/npm/PKGBUILD
index 761ed5999..58338e94e 100644
--- a/npm/PKGBUILD
+++ b/npm/PKGBUILD
@@ -1,28 +1,28 @@
 pkgname=npm
-pkgver=6.0.0
+pkgver=6.1.0
 pkgrel=1
 pkgdesc='A package manager for javascript'
-arch=('any')
+arch=('x86_64')
 url='https://www.npmjs.com/'
 license=('custom:Artistic')
 depends=('nodejs' 'node-gyp' 'semver')
 makedepends=('procps-ng' 'marked-man')
 options=('!emptydirs')
-source=("$pkgname-$pkgver::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('1ccf2d92f32afa66c2517b33eb97a8bf64022e89aa148112b8120cf4c249ca4f')
+source=("$pkgname-$pkgver::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('9d12500a4a1e0a112505b3766d98e0372ef546e05be52ab6bd4623051bf72e64')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   ln -sf /usr/bin/marked{,-man} node_modules/.bin/
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   make NPMOPTS="--prefix=\"$pkgdir/usr\"" install
 
   # Non-deterministic race in npm gives 777 permissions to random directories.

From 37e620f0212405262b7d26d4abac2c669790da8a Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Sat, 2 Jun 2018 03:56:40 +0100
Subject: [PATCH 19/32] [skip-ci] otter-browser: update to 0.9.99

---
 otter-browser/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/otter-browser/PKGBUILD b/otter-browser/PKGBUILD
index 66007fe82..4fdc40a55 100644
--- a/otter-browser/PKGBUILD
+++ b/otter-browser/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=otter-browser
-pkgver=0.9.98
+pkgver=0.9.99
 pkgrel=1
 pkgdesc="Browser aiming to recreate classic Opera (12.x) UI using Qt5."
 arch=('x86_64')
@@ -11,7 +11,7 @@ makedepends=('cmake' 'qt5-tools')
 conflicts=('otter-browser-git')
 install=otter.install
 source=($pkgname-$pkgver.tar.gz::https://github.com/OtterBrowser/$pkgname/archive/v$pkgver.tar.gz)
-sha1sums=('562ec22217b7ac14ab9e98a682ccb63933aa41c3')
+sha1sums=('f678b41ee1e50d38092b6f8e54cbb6aa3dfdc18f')
 
 prepare() {
   cd $pkgname-$pkgver

From 1d46bbba22a9b21769acc4442dd6a1b6ab0ff8cf Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Sat, 2 Jun 2018 04:11:35 +0100
Subject: [PATCH 20/32] [skip-ci] [staging] qmmp: update to 1.2.2 (build
 failed)

---
 qmmp/PKGBUILD | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/qmmp/PKGBUILD b/qmmp/PKGBUILD
index 5c615a0d5..bee67e58d 100644
--- a/qmmp/PKGBUILD
+++ b/qmmp/PKGBUILD
@@ -1,7 +1,7 @@
  ### Remember to check if qmmp-plugin-pack needs to update ### 
  
 pkgname=qmmp
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="Qt based audio-player"
 arch=('x86_64')
@@ -10,7 +10,8 @@ license=('GPL')
 depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt5-base' 'qt5-tools' 
 	 'qt5-x11extras' 'qt5-multimedia' 'taglib' 'xdg-utils')
 makedepends=('cmake'  'flac' 'jack' 'libmpcdec' 'ffmpeg' 'libsamplerate' 'libmodplug' 'libsndfile' 
-             'wavpack' 'libcdio' 'mesa' 'faad2' 'libgme' 'libcddb' 'libmms' 'wildmidi')
+             'wavpack' 'libcdio' 'mesa' 'faad2' 'libgme' 'libcddb' 'libmms' 'wildmidi' 'libcdio'
+             'libcdio-paranoia' 'opusfile')
 optdepends=('flac: native FLAC support'
             'jack: JACK sound output'
             'oss: OSS sound output'
@@ -18,23 +19,25 @@ optdepends=('flac: native FLAC support'
             'libmpcdec: Musepack support'
             'libmodplug: MOD playing library'
             'libsndfile: sampled sound support'
+            'libcdio-paranoia: Compact Disc input and control support'
             'libcdio: for audio CD playback support'
             'faad2: ADTS AAC support'
             'libgme: support for chiptunes from various platforms'
             'libcddb: CDDB server support'
             'libmms: MMS stream protocol support'
+            'opusfile: Opus support'
             'ffmpeg' 'libsamplerate' 'wavpack')
 categories=('multimedia')
 screenshot=('http://qmmp.ylsoftware.com/images/qmmp-0.3.0_full_1.png')
 install=$pkgname.install
 source=("$pkgname-$pkgver::http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2")
-sha256sums=('b9314126adf72534d3ba907246b075a45a997578e5fb86e52769e01602e4e8a9')
+sha256sums=('e9dc5723f7f2a04d36167585ce1b4223c09f36c6dad1215de877dc51d1f3d606')
 
 build() {
   cd $pkgname-$pkgver
 
   cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DLIB_DIR=lib \
+	  -DCMAKE_INSTALL_LIBDIR=/usr/lib \
 	  -DUSE_HAL:BOOL=FALSE
   make
 }

From 229665cd7fa699a4167f4eb37d3adf1d191f769f Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Sat, 2 Jun 2018 14:53:11 +0100
Subject: [PATCH 21/32] [skip-ci] nano: update to 2.9.8

---
 nano/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nano/PKGBUILD b/nano/PKGBUILD
index 5be9fa508..744f6873d 100644
--- a/nano/PKGBUILD
+++ b/nano/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=nano
-pkgver=2.9.7
+pkgver=2.9.8
 _mainver=2.9
 pkgrel=1
 pkgdesc="Pico editor clone with enhancements"
@@ -11,7 +11,7 @@ depends=('glibc' 'ncurses' 'sh')
 source=(http://www.nano-editor.org/dist/v${_mainver}/nano-${pkgver}.tar.gz)
 backup=(etc/nanorc)
 install=nano.install
-md5sums=('804a0e91cb11f2e8884aee7bfac2d18d')
+md5sums=('fd58e87c20abbf029e5c4b153c89232a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

From 6a8b3643a0dd6ea462ae1cf6b0f6aec36c5a02de Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Sun, 3 Jun 2018 23:32:17 +0100
Subject: [PATCH 22/32] [skip-ci] mc: update to 4.8.21

---
 mc/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mc/PKGBUILD b/mc/PKGBUILD
index 4b6473deb..a92035949 100644
--- a/mc/PKGBUILD
+++ b/mc/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname=mc
-pkgver=4.8.20
+pkgver=4.8.21
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
 arch=('x86_64')
-url="http://www.ibiblio.org/mc/"
+url="https://midnight-commander.org/"
 license=('GPL')
 depends=('e2fsprogs' 'glib2' 'pcre' 'gpm>=1.20.4' 'slang')
 makedepends=('libxt' 'libx11')
@@ -30,7 +30,7 @@ backup=('etc/mc/edit.indent.rc'
         'etc/mc/mc.menu'
         'etc/mc/sfs.ini')
 source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c')
+sha256sums=('8f37e546ac7c31c9c203a03b1c1d6cb2d2f623a300b86badfd367e5559fe148c')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}

From 768a4243f76869af662ddb46de5da504220d4042 Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 20:53:49 +0200
Subject: [PATCH 23/32] blender added patch to build against ffmpeg4 [testing]

---
 blender/PKGBUILD        |   8 ++-
 blender/ffmpeg4.0.patch | 114 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 blender/ffmpeg4.0.patch

diff --git a/blender/PKGBUILD b/blender/PKGBUILD
index 49876ec09..f5926b3b6 100644
--- a/blender/PKGBUILD
+++ b/blender/PKGBUILD
@@ -25,7 +25,8 @@ source=("git://git.blender.org/blender-addons.git"
         "git://git.blender.org/blender-addons-contrib.git"
         "git://git.blender.org/blender-translations.git"
         "git://git.blender.org/blender-dev-tools.git"
-        "git://git.blender.org/scons.git")
+        "git://git.blender.org/scons.git"
+        ffmpeg4.0.patch)
 if [[ -n $_gittag ]]; then
     source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
 else
@@ -36,6 +37,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
+            '7e72c2f9a743d6efd69ee989f426fe439094f414df6a8af260599b5f3905d438'
             'SKIP')
 
 prepare() {
@@ -48,6 +50,10 @@ prepare() {
   git config submodule."source/tools".url ${srcdir}/blender-dev-tools
   git config submodule."scons".url "${srcdir}/scons"
   git submodule update
+
+
+  # ffmpeg 4.0 fixes
+  patch -Np1 -i "${srcdir}"/ffmpeg4.0.patch
 }
 
 build() {
diff --git a/blender/ffmpeg4.0.patch b/blender/ffmpeg4.0.patch
new file mode 100644
index 000000000..e6d914b0f
--- /dev/null
+++ b/blender/ffmpeg4.0.patch
@@ -0,0 +1,114 @@
+diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+index e9eea195208..84aea330313 100644
+--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
++++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+@@ -264,9 +264,9 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr<AUD_Buffer> buffer) :
+ 		m_membuffer(buffer),
+ 		m_membufferpos(0)
+ {
+-	m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE));
++	m_membuf = reinterpret_cast<data_t*>(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE));
+ 
+-	m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0, this,
++	m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this,
+ 									   read_packet, NULL, seek_packet);
+ 
+ 	if(!m_aviocontext)
+diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+index 3f95ac7a4da..2c2f0916406 100644
+--- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
++++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+@@ -163,7 +163,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs,
+ 		try
+ 		{
+ 			if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER)
+-				m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++				m_codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+ 			AVCodec* codec = avcodec_find_encoder(m_codecCtx->codec_id);
+ 			if(!codec)
+@@ -185,11 +185,11 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs,
+ 			if(avcodec_open2(m_codecCtx, codec, NULL))
+ 				AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
+ 
+-			m_output_buffer.resize(FF_MIN_BUFFER_SIZE);
++			m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE);
+ 			int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs), AUD_DEVICE_SAMPLE_SIZE(m_specs));
+ 
+ 			if(m_codecCtx->frame_size <= 1) {
+-				m_input_size = FF_MIN_BUFFER_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
++				m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
+ 				m_input_buffer.resize(m_input_size * samplesize);
+ 			}
+ 			else
+diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
+index d7fcd896e11..9e82df17dce 100644
+--- a/source/blender/blenkernel/intern/writeffmpeg.c
++++ b/source/blender/blenkernel/intern/writeffmpeg.c
+@@ -619,8 +619,6 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
+ 	c->rc_buffer_aggressivity = 1.0;
+ #endif
+ 
+-	c->me_method = ME_EPZS;
+-	
+ 	codec = avcodec_find_encoder(c->codec_id);
+ 	if (!codec)
+ 		return NULL;
+@@ -682,14 +680,14 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
+ 	    )
+ 	{
+ 		PRINT("Using global header\n");
+-		c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++		c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 	}
+ 	
+ 	/* Determine whether we are encoding interlaced material or not */
+ 	if (rd->mode & R_FIELDS) {
+ 		PRINT("Encoding interlaced video\n");
+-		c->flags |= CODEC_FLAG_INTERLACED_DCT;
+-		c->flags |= CODEC_FLAG_INTERLACED_ME;
++		c->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
++		c->flags |= AV_CODEC_FLAG_INTERLACED_ME;
+ 	}
+ 
+ 	/* xasp & yasp got float lately... */
+@@ -779,7 +777,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int
+ 	}
+ 
+ 	if (of->oformat->flags & AVFMT_GLOBALHEADER) {
+-		c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++		c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 	}
+ 
+ 	set_ffmpeg_properties(rd, c, "audio", &opts);
+@@ -798,14 +796,14 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int
+ 	st->codec->time_base.den = st->codec->sample_rate;
+ 
+ #ifndef FFMPEG_HAVE_ENCODE_AUDIO2
+-	context->audio_outbuf_size = FF_MIN_BUFFER_SIZE;
++	context->audio_outbuf_size = AV_INPUT_BUFFER_MIN_SIZE;
+ #endif
+ 
+ 	if (c->frame_size == 0)
+ 		// used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD))
+ 		// not sure if that is needed anymore, so let's try out if there are any
+ 		// complaints regarding some ffmpeg versions users might have
+-		context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels;
++		context->audio_input_samples = AV_INPUT_BUFFER_MIN_SIZE * 8 / c->bits_per_coded_sample / c->channels;
+ 	else {
+ 		context->audio_input_samples = c->frame_size;
+ #ifndef FFMPEG_HAVE_ENCODE_AUDIO2
+diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
+index eaf4dfd84b4..9c2f42feb52 100644
+--- a/source/blender/imbuf/intern/indexer.c
++++ b/source/blender/imbuf/intern/indexer.c
+@@ -537,7 +537,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg(
+ 	av_opt_set_int(rv->c, "qmax", ffmpeg_quality, 0);
+ 
+ 	if (rv->of->flags & AVFMT_GLOBALHEADER) {
+-		rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++		rv->c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 	}
+ 
+ 	if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
+ 

From 792b1fdbd5e4d43dd896eed4556ff7fdddc02c1e Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:36:38 +0200
Subject: [PATCH 24/32] rebuild freerdp [testing]

---
 freerdp/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/freerdp/PKGBUILD b/freerdp/PKGBUILD
index 7364634e8..f3f6d21b2 100644
--- a/freerdp/PKGBUILD
+++ b/freerdp/PKGBUILD
@@ -4,7 +4,7 @@ pkgver=1.2.0_20170201
 _commit=6001cb710dc67eb8811362b7bf383754257a902b
 _pkgver=${pkgver/_/-}
 _pkgver=${_pkgver/+/-}
-pkgrel=1
+pkgrel=2
 pkgdesc="Free RDP client"
 arch=('x86_64')
 url="http://freerdp.sourceforge.net"

From e13577051f2f4a5f53e28d7fd2a4d255add46504 Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:37:08 +0200
Subject: [PATCH 25/32] rebuild kid3 against ffmpeg4

---
 kid3/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kid3/PKGBUILD b/kid3/PKGBUILD
index 4a6aff006..e8667a54e 100644
--- a/kid3/PKGBUILD
+++ b/kid3/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=kid3
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
 arch=('x86_64')
 url="https://kid3.sourceforge.io/"

From 6613bc5bd95cca27b92b37299b9225d17272622b Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:38:00 +0200
Subject: [PATCH 26/32] rebuild kid3 against ffmpeg4 [testing]

---
 kid3/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kid3/PKGBUILD b/kid3/PKGBUILD
index e8667a54e..e305c7ae2 100644
--- a/kid3/PKGBUILD
+++ b/kid3/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=kid3
 pkgver=3.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
 arch=('x86_64')
 url="https://kid3.sourceforge.io/"

From c7a9e85cb12ab5dc8527c1de5fce963dac5bbfc6 Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:38:44 +0200
Subject: [PATCH 27/32] rebuild kradio against ffmpeg4 [testing]

---
 kradio/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kradio/PKGBUILD b/kradio/PKGBUILD
index bb589f38b..2dd565b39 100644
--- a/kradio/PKGBUILD
+++ b/kradio/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=kradio
 _pkgname=kradio4
 pkgver=4.0.8
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 license=('GPL2')
 pkgdesc="KRadio is a comfortable KDE radio application."

From 05422f64676f0846e7d776537125ada2930e1e0e Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:39:14 +0200
Subject: [PATCH 28/32] rebuild libopenshot against ffmpeg4 [testing]

---
 libopenshot/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libopenshot/PKGBUILD b/libopenshot/PKGBUILD
index 67c1e6e20..d70957c05 100644
--- a/libopenshot/PKGBUILD
+++ b/libopenshot/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=libopenshot
 pkgver=0.1.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A high quality, open-source video editing, animation, and playback library for C++, Python, and Ruby."
 arch=('x86_64')
 url="http://openshot.org/"

From 948981232727c4050acd554bddeafd65a70f1d92 Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:39:46 +0200
Subject: [PATCH 29/32] rebuild mpd against ffmpeg4 [testing]

---
 mpd/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mpd/PKGBUILD b/mpd/PKGBUILD
index 1f588164d..48fb5f32a 100644
--- a/mpd/PKGBUILD
+++ b/mpd/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mpd
 pkgver=0.20.16
-pkgrel=1
+pkgrel=2
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='https://www.musicpd.org/'
 license=('GPL')

From c3b135030a239e2e5253a9a94db82e5818df89f9 Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:40:13 +0200
Subject: [PATCH 30/32] rebuild openimageio against ffmpeg4 [testing]

---
 openimageio/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openimageio/PKGBUILD b/openimageio/PKGBUILD
index 25eab2b65..014b4a545 100644
--- a/openimageio/PKGBUILD
+++ b/openimageio/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=openimageio
 pkgver=1.7.17
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
 arch=('x86_64')
 url="http://www.openimageio.org/"

From ddcd098a911759bda431bd011f283d70a1add12f Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:40:40 +0200
Subject: [PATCH 31/32] rebuild qtav against ffmpeg4 [testing]

---
 qtav/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtav/PKGBUILD b/qtav/PKGBUILD
index 644afc176..5a3357ff7 100644
--- a/qtav/PKGBUILD
+++ b/qtav/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=qtav
 pkgver=1.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform multimedia playback framework based on Qt and FFmpeg"
 arch=('x86_64')
 url="http://www.qtav.org/"

From 1255e4da1b56f93bd4100f401e1d9f2dc8dc593f Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Mon, 4 Jun 2018 21:42:25 +0200
Subject: [PATCH 32/32] fix syntax kid3 [testing]

---
 kid3/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kid3/PKGBUILD b/kid3/PKGBUILD
index e305c7ae2..3308f52c9 100644
--- a/kid3/PKGBUILD
+++ b/kid3/PKGBUILD
@@ -9,8 +9,8 @@ depends=('id3lib' 'libmp4v2' 'chromaprint' 'ffmpeg' 'qt5-multimedia' 'plasma-fra
 	 'phonon-qt5' 'taglib' 'kio' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('cmake' 'docbook-xsl' 'docbook-xml' 'qt5-tools' 'extra-cmake-modules' 'kdoctools')
 categories=('multimedia')
-conflicts='kid3-kf5'
-replaces='kid3-kf5'
+conflicts=('kid3-kf5')
+replaces=('kid3-kf5')
 screenshot=('http://pkgs.org/images/linux-software/kid3/kid3-screenshot.png')
 install=${pkgname}.install
 source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")