summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/app-text/calibre/calibre-4.23.0-r1.exheres-0 (renamed from packages/app-text/calibre/calibre-4.23.0.exheres-0)0
-rw-r--r--packages/app-text/calibre/calibre4.exlib2
-rw-r--r--packages/app-text/gimagereader/files/gimagereader-3.3.1-quazip11.patch25
-rw-r--r--packages/app-text/gimagereader/gimagereader-3.3.1_p20210326.exheres-0 (renamed from packages/app-text/gimagereader/gimagereader-3.3.1_p20200427.exheres-0)5
-rw-r--r--packages/app-text/recoll/recoll-1.28.6.exheres-0 (renamed from packages/app-text/recoll/recoll-1.25.11.exheres-0)13
-rw-r--r--packages/app-text/tesseract/tesseract-4.1.1-r1.exheres-0 (renamed from packages/app-text/tesseract/tesseract-4.1.1.exheres-0)2
-rw-r--r--packages/media-gfx/darktable/darktable-3.4.0-r2.exheres-0 (renamed from packages/media-gfx/darktable/darktable-3.4.0-r1.exheres-0)0
-rw-r--r--packages/media-gfx/darktable/darktable.exlib2
-rw-r--r--packages/media-gfx/inkscape/files/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch68
-rw-r--r--packages/media-gfx/inkscape/files/inkscape-1.0.1-Add-missing-atomic-include.patch36
-rw-r--r--packages/media-gfx/inkscape/files/inkscape-1.0.2-Glib-TimeVal-deprecated-Glib-DateTime.patch107
-rw-r--r--packages/media-gfx/inkscape/inkscape-1.0.2.exheres-0 (renamed from packages/media-gfx/inkscape/inkscape-1.0.1.exheres-0)14
-rw-r--r--packages/media-gfx/sane-backends/sane-backends-1.0.32.exheres-0 (renamed from packages/media-gfx/sane-backends/sane-backends-1.0.31.exheres-0)3
-rw-r--r--packages/media-libs/SDL/SDL-1.2.15-r3.exheres-02
-rw-r--r--packages/media-libs/babl/babl-0.1.86.exheres-0 (renamed from packages/media-libs/babl/babl-0.1.84.exheres-0)0
-rw-r--r--packages/media-libs/faad2/faad2-2.10.0.exheres-0 (renamed from packages/media-libs/faad2/faad2-2.9.2.exheres-0)0
-rw-r--r--packages/media-libs/faudio/faudio-21.04.exheres-0 (renamed from packages/media-libs/faudio/faudio-21.02.exheres-0)0
-rw-r--r--packages/media-libs/libmpdclient/libmpdclient-2.19.exheres-0 (renamed from packages/media-libs/libmpdclient/libmpdclient-2.16-r1.exheres-0)0
-rw-r--r--packages/media-libs/libplacebo/libplacebo-3.104.0.exheres-0 (renamed from packages/media-libs/libplacebo/libplacebo-2.72.2.exheres-0)6
-rw-r--r--packages/media-libs/libudfread/libudfread-1.1.1.exheres-019
-rw-r--r--packages/media-libs/libvpx/libvpx-1.10.0.exheres-0 (renamed from packages/media-libs/libvpx/libvpx-1.9.0.exheres-0)4
-rw-r--r--packages/media-libs/libvpx/libvpx-1.7.0.exheres-04
-rw-r--r--packages/media-libs/libvpx/libvpx.exlib8
-rw-r--r--packages/media-libs/rnnoise/rnnoise-0.0_p20210122.exheres-0 (renamed from packages/media-libs/rnnoise/rnnoise-0.0_p20200604.exheres-0)4
-rw-r--r--packages/media-libs/rubberband/rubberband-1.9.0.exheres-049
-rw-r--r--packages/media-libs/rubberband/rubberband-1.9.1.exheres-040
-rw-r--r--packages/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.exheres-0 (renamed from packages/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.exheres-0)6
-rw-r--r--packages/media-libs/x264/x264-20210211.exheres-0 (renamed from packages/media-libs/x264/x264-20190827-r1.exheres-0)0
-rw-r--r--packages/media-libs/x264/x264.exlib24
-rw-r--r--packages/media-libs/x265/x265-3.5.exheres-0 (renamed from packages/media-libs/x265/x265-3.3.exheres-0)2
-rw-r--r--packages/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.7.exheres-0 (renamed from packages/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5.exheres-0)10
-rw-r--r--packages/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.exheres-0 (renamed from packages/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9.exheres-0)10
-rw-r--r--packages/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.2.4.exheres-0 (renamed from packages/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.21.exheres-0)8
-rw-r--r--packages/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.5.0.exheres-0 (renamed from packages/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.9.8.exheres-0)12
-rw-r--r--packages/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.2.exheres-0 (renamed from packages/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.4.exheres-0)11
-rw-r--r--packages/media-plugins/mopidy-iris/mopidy-iris-3.57.6.exheres-0 (renamed from packages/media-plugins/mopidy-iris/mopidy-iris-3.55.4.exheres-0)2
-rw-r--r--packages/media-sound/mopidy/mopidy-3.1.1-r1.exheres-0 (renamed from packages/media-sound/mopidy/mopidy-3.1.1.exheres-0)3
-rw-r--r--packages/media-sound/spotify/spotify-1.1.55.498-r1.exheres-0 (renamed from packages/media-sound/spotify/spotify-1.1.42.622.exheres-0)7
-rw-r--r--packages/media-sound/tomahawk/tomahawk-0.8.99_p20170808.exheres-012
-rw-r--r--packages/media-sound/tomahawk/tomahawk-scm.exheres-07
-rw-r--r--packages/media-sound/tomahawk/tomahawk.exlib68
-rw-r--r--packages/media-sound/upmpdcli/files/upmpdcli-systemd.patch16
-rw-r--r--packages/media-sound/upmpdcli/upmpdcli-1.5.9.exheres-061
-rw-r--r--packages/media-video/makemkv/makemkv-1.16.3.exheres-0 (renamed from packages/media-video/makemkv/makemkv-1.15.2.exheres-0)7
-rw-r--r--packages/media-video/obs-studio/obs-studio-26.1.2-r1.exheres-0 (renamed from packages/media-video/obs-studio/obs-studio-26.1.2.exheres-0)0
-rw-r--r--packages/media-video/obs-studio/obs-studio-scm.exheres-014
-rw-r--r--packages/media-video/obs-studio/obs-studio.exlib47
-rw-r--r--packages/media/ffmpeg/ffmpeg-4.3.2-r1.exheres-014
-rw-r--r--packages/media/ffmpeg/ffmpeg-4.4.exheres-0 (renamed from packages/media/ffmpeg/ffmpeg-4.3.1.exheres-0)1
-rw-r--r--packages/media/ffmpeg/ffmpeg.exlib68
-rw-r--r--packages/media/ffmpeg/files/4dab04622a6cf2a31da26a51dedb60ec44ac89a4.patch30
-rw-r--r--packages/media/ffmpeg/files/98ea1a662ee172961feaa374fe8d26078838d250.patch37
-rw-r--r--packages/media/ffmpeg/files/ffmpeg-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch55
-rw-r--r--packages/media/kodi/kodi-19.0.exheres-0 (renamed from packages/media/kodi/kodi-18.9.exheres-0)6
-rw-r--r--packages/media/kodi/kodi-scm.exheres-02
-rw-r--r--packages/media/kodi/kodi.exlib99
-rw-r--r--packages/media/mpv/files/09d7c75bfe9f6323260a19912e3f3ee7ed737455.patch153
-rw-r--r--packages/media/mpv/files/7c4465cefb27d4e0d07535d368febdf77b579566.patch87
-rw-r--r--packages/media/mpv/mpv-0.33.1.exheres-0 (renamed from packages/media/mpv/mpv-0.33.0.exheres-0)5
-rw-r--r--packages/media/mpv/mpv.exlib2
-rw-r--r--packages/media/vlc/files/vlc-adaptive-add-missing-limits-include.patch68
-rw-r--r--packages/media/vlc/files/vlc-hls-add-missing-limits-include.patch41
-rw-r--r--packages/media/vlc/vlc-3.0.12.exheres-02
-rw-r--r--packages/net-apps/snapcast/snapcast-0.24.0.exheres-0 (renamed from packages/net-apps/snapcast/snapcast-0.23.0.exheres-0)1
-rw-r--r--packages/net-misc/youtube-dl/youtube-dl-2021.04.07.exheres-0 (renamed from packages/net-misc/youtube-dl/youtube-dl-2021.02.04.1.exheres-0)7
65 files changed, 987 insertions, 431 deletions
diff --git a/packages/app-text/calibre/calibre-4.23.0.exheres-0 b/packages/app-text/calibre/calibre-4.23.0-r1.exheres-0
index c9a6beec..c9a6beec 100644
--- a/packages/app-text/calibre/calibre-4.23.0.exheres-0
+++ b/packages/app-text/calibre/calibre-4.23.0-r1.exheres-0
diff --git a/packages/app-text/calibre/calibre4.exlib b/packages/app-text/calibre/calibre4.exlib
index 03f87b4e..23b7ce98 100644
--- a/packages/app-text/calibre/calibre4.exlib
+++ b/packages/app-text/calibre/calibre4.exlib
@@ -83,7 +83,7 @@ DEPENDENCIES="
dev-python/PyQtWebEngine[>=5.14.0][python_abis:*(-)?]
dev-python/python-dateutil[>=2.8.0][python_abis:*(-)?]
dev-python/regex[>=2019.04.14][python_abis:*(-)?]
- dev-python/sip[>=4.19.19][python_abis:*(-)?]
+ dev-python/sip:4[>=4.19.19][python_abis:*(-)?]
dev-python/soupsieve[>=1.9.1][python_abis:*(-)?]
dev-python/six[>=1.12.0][python_abis:*(-)?]
dev-python/unrardll[>=0.1.3][python_abis:*(-)?]
diff --git a/packages/app-text/gimagereader/files/gimagereader-3.3.1-quazip11.patch b/packages/app-text/gimagereader/files/gimagereader-3.3.1-quazip11.patch
new file mode 100644
index 00000000..464c6d45
--- /dev/null
+++ b/packages/app-text/gimagereader/files/gimagereader-3.3.1-quazip11.patch
@@ -0,0 +1,25 @@
+Source/Upstream: Reported, https://github.com/manisandro/gImageReader/pull/511
+Reason: Fix build with quazip 1.1
+
+From e57e3fac128e3b0463e9394e226b70b400eb2b0c Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Tue, 13 Apr 2021 09:37:13 +0200
+Subject: [PATCH] Support quazip 1.1
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc187f38..78262477 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -168,7 +168,7 @@ ELSEIF("${INTERFACE_TYPE}" STREQUAL "qt5")
+ FIND_PACKAGE(Qt5PrintSupport REQUIRED)
+ FIND_PACKAGE(QuaZip5)
+ IF(NOT QUAZIP_FOUND)
+- FIND_PATH(QUAZIP_INCLUDE_DIR NAME quazipfile.h PATH_SUFFIXES quazip5 QuaZip-Qt5-1.0/quazip)
++ FIND_PATH(QUAZIP_INCLUDE_DIR NAME quazipfile.h PATH_SUFFIXES quazip5 QuaZip-Qt5-1.0/quazip QuaZip-Qt5-1.1/quazip)
+ FIND_LIBRARY(QUAZIP_LIBRARIES NAMES quazip5 quazip1-qt5)
+ IF(NOT QUAZIP_INCLUDE_DIR OR NOT QUAZIP_LIBRARIES)
+ MESSAGE(FATAL_ERROR "QuaZip5 is required but was not found")
diff --git a/packages/app-text/gimagereader/gimagereader-3.3.1_p20200427.exheres-0 b/packages/app-text/gimagereader/gimagereader-3.3.1_p20210326.exheres-0
index b062337e..fc8638fb 100644
--- a/packages/app-text/gimagereader/gimagereader-3.3.1_p20200427.exheres-0
+++ b/packages/app-text/gimagereader/gimagereader-3.3.1_p20210326.exheres-0
@@ -1,7 +1,7 @@
-# Copyright 2016-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2016-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require github [ user=manisandro pn=gImageReader tag=623622dd52758c49462a7f6d4154d4005679afbd ] \
+require github [ user=manisandro pn=gImageReader tag=9cc1733066fdcee86c321650703666da42074702 ] \
cmake \
freedesktop-desktop \
gtk-icon-cache
@@ -46,6 +46,7 @@ DEPENDENCIES="
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/${PN}-3.3.1-Use-CMAKE_INSTALL_FULL_DATAROOTDIR.patch
"${FILES}"/${PN}-3.2.3-fix-localesearch.patch
+ "${FILES}"/${PN}-3.3.1-quazip11.patch
)
CMAKE_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/app-text/recoll/recoll-1.25.11.exheres-0 b/packages/app-text/recoll/recoll-1.28.6.exheres-0
index ba95f877..b8cb65fe 100644
--- a/packages/app-text/recoll/recoll-1.25.11.exheres-0
+++ b/packages/app-text/recoll/recoll-1.28.6.exheres-0
@@ -18,8 +18,12 @@ MYOPTIONS="
"
DEPENDENCIES="
+ build:
+ virtual/pkg-config
build+run:
dev-db/xapian-core
+ dev-libs/libxml2:2.0
+ dev-libs/libxslt
qt5? (
x11-libs/qtbase:5[gui]
x11-libs/qtwebkit:5
@@ -47,7 +51,9 @@ DEPENDENCIES="
"
DEFAULT_SRC_CONFIGURE_PARAMS=(
+ --enable-idxthreads
--enable-recollq
+ --disable-python-chm
--disable-python-module
--disable-userdoc
--disable-xadump
@@ -64,6 +70,13 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
'spell aspell'
)
+src_prepare() {
+ # fix prefix for qtgui stuff
+ edo sed \
+ -e 's:$$PREFIX/share:/usr/share:g' \
+ -i qtgui/recoll.pro.in
+}
+
src_configure() {
export QMAKE=qmake-qt5
diff --git a/packages/app-text/tesseract/tesseract-4.1.1.exheres-0 b/packages/app-text/tesseract/tesseract-4.1.1-r1.exheres-0
index 7adfdf10..1e5a115c 100644
--- a/packages/app-text/tesseract/tesseract-4.1.1.exheres-0
+++ b/packages/app-text/tesseract/tesseract-4.1.1-r1.exheres-0
@@ -142,7 +142,7 @@ DEPENDENCIES="
build:
app-doc/asciidoc
build+run:
- sys-libs/libgomp
+ sys-libs/libgomp:=
"
DEFAULT_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/media-gfx/darktable/darktable-3.4.0-r1.exheres-0 b/packages/media-gfx/darktable/darktable-3.4.0-r2.exheres-0
index 138c9ddb..138c9ddb 100644
--- a/packages/media-gfx/darktable/darktable-3.4.0-r1.exheres-0
+++ b/packages/media-gfx/darktable/darktable-3.4.0-r2.exheres-0
diff --git a/packages/media-gfx/darktable/darktable.exlib b/packages/media-gfx/darktable/darktable.exlib
index 88da97d8..a0c69a7c 100644
--- a/packages/media-gfx/darktable/darktable.exlib
+++ b/packages/media-gfx/darktable/darktable.exlib
@@ -77,7 +77,7 @@ DEPENDENCIES="
x11-libs/pango
x11-libs/gdk-pixbuf:2.0
x11-libs/gtk+:3[>=3.22]
- avif? ( media-libs/libavif[>=0.8.2] )
+ avif? ( media-libs/libavif:=[>=0.8.2] )
camera? ( media-libs/libgphoto2 )
colord? (
sys-apps/colord[>=0.1.32]
diff --git a/packages/media-gfx/inkscape/files/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch b/packages/media-gfx/inkscape/files/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch
new file mode 100644
index 00000000..df6a7f10
--- /dev/null
+++ b/packages/media-gfx/inkscape/files/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch
@@ -0,0 +1,68 @@
+Source/Upstream: Yes, fixed in git master
+Reason: Fix build with glib 2.68
+
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+
+ #include <stdio.h>
+
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+ * Typedefs
+ * ===================================================================== */
+
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with. */
+ enum _at_polynomial_degree {
+ AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+ guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+--
+GitLab
+
diff --git a/packages/media-gfx/inkscape/files/inkscape-1.0.1-Add-missing-atomic-include.patch b/packages/media-gfx/inkscape/files/inkscape-1.0.1-Add-missing-atomic-include.patch
deleted file mode 100644
index da2f94c2..00000000
--- a/packages/media-gfx/inkscape/files/inkscape-1.0.1-Add-missing-atomic-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream: yes
-Reason: Fix build (with boost-1.74.0 probably)
-
-From a094366511c87a46916e2f0d2b7a1dc2f540e411 Mon Sep 17 00:00:00 2001
-From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-Date: Tue, 8 Sep 2020 23:18:58 +0200
-Subject: [PATCH] Add missing atomic include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was found while updating Inkscape to 1.0.1 on Flathub, see
-https://flathub.org/builds/#/builders/12/builds/3192/steps/6/logs/stdio
-
-I don’t know why it was working with the majority of compilers without
-this change, probably some transitive include which doesn’t happen in
-the Flatpak’s case.
----
- src/ui/tool/node.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
-index eef6e486b8..2da9bf74b1 100644
---- a/src/ui/tool/node.cpp
-+++ b/src/ui/tool/node.cpp
-@@ -7,6 +7,7 @@
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-+#include <atomic>
- #include <iostream>
- #include <stdexcept>
- #include <boost/utility.hpp>
---
-2.29.0.rc2
-
diff --git a/packages/media-gfx/inkscape/files/inkscape-1.0.2-Glib-TimeVal-deprecated-Glib-DateTime.patch b/packages/media-gfx/inkscape/files/inkscape-1.0.2-Glib-TimeVal-deprecated-Glib-DateTime.patch
new file mode 100644
index 00000000..3fb8d7f8
--- /dev/null
+++ b/packages/media-gfx/inkscape/files/inkscape-1.0.2-Glib-TimeVal-deprecated-Glib-DateTime.patch
@@ -0,0 +1,107 @@
+Upstream: yes
+Reason: Fixes the build
+
+From c719ad24d6a57681566e7751d74829bff19c025f Mon Sep 17 00:00:00 2001
+From: Thomas Holder <thomas@thomas-holder.de>
+Date: Tue, 17 Mar 2020 21:53:25 +0000
+Subject: [PATCH] Glib::TimeVal (deprecated) -> Glib::DateTime
+
+- replace usage of deprecated `TimeVal` with `DateTime`
+- Add `-DGLIBMM_DISABLE_DEPRECATED` for strict build mode
+---
+ CMakeLists.txt | 2 +-
+ src/extension/timer.cpp | 15 ++++++---------
+ src/extension/timer.h | 6 +++---
+ 3 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a7be55d729..eeaeb37d0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,7 +82,7 @@ endif()
+
+ # Define a very strict set of build flags that will prevent any use of deprecated symbols.
+ # This will almost certainly cause compilation failure and is intended only for developer use.
+-set(CMAKE_CXX_FLAGS_STRICT "${CMAKE_CXX_FLAGS_DEBUG} -Werror=deprecated-declarations -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED"
++set(CMAKE_CXX_FLAGS_STRICT "${CMAKE_CXX_FLAGS_DEBUG} -Werror=deprecated-declarations -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED -DGLIBMM_DISABLE_DEPRECATED"
+ CACHE STRING
+ "Flags used by C++ compiler during Strict builds"
+ FORCE)
+diff --git a/src/extension/timer.cpp b/src/extension/timer.cpp
+index 7ed856ec4e..4533b0d85b 100644
+--- a/src/extension/timer.cpp
++++ b/src/extension/timer.cpp
+@@ -47,8 +47,7 @@ ExpirationTimer::ExpirationTimer (Extension * in_extension):
+ timer_list->next = this;
+ }
+
+- expiration.assign_current_time();
+- expiration += timeout;
++ expiration = Glib::DateTime::create_now_utc().add_seconds(timeout);
+
+ if (!timer_started) {
+ Glib::signal_timeout().connect(sigc::ptr_fun(&timer_func), timeout * 1000 / TIMER_SCALE_VALUE);
+@@ -106,14 +105,13 @@ ExpirationTimer::~ExpirationTimer()
+ void
+ ExpirationTimer::touch ()
+ {
+- Glib::TimeVal current;
+- current.assign_current_time();
++ auto const current = Glib::DateTime::create_now_utc();
+
+- long time_left = (long)(expiration.as_double() - current.as_double());
++ auto time_left = expiration.difference(current);
+ if (time_left < 0) time_left = 0;
+ time_left /= 2;
+
+- expiration = current + timeout + time_left;
++ expiration = current.add(time_left).add_seconds(timeout);
+ return;
+ }
+
+@@ -126,9 +124,8 @@ ExpirationTimer::expired () const
+ {
+ if (locked > 0) return false;
+
+- Glib::TimeVal current;
+- current.assign_current_time();
+- return expiration < current;
++ auto const current = Glib::DateTime::create_now_utc();
++ return expiration.difference(current) < 0;
+ }
+
+ // int idle_cnt = 0;
+diff --git a/src/extension/timer.h b/src/extension/timer.h
+index a4f9bfea99..ce9c495571 100644
+--- a/src/extension/timer.h
++++ b/src/extension/timer.h
+@@ -16,7 +16,7 @@
+
+ #include <cstddef>
+ #include <sigc++/sigc++.h>
+-#include <glibmm/timeval.h>
++#include <glibmm/datetime.h>
+
+ namespace Inkscape {
+ namespace Extension {
+@@ -28,7 +28,7 @@ class ExpirationTimer {
+ static ExpirationTimer * timer_list;
+ /** \brief Which timer was on top when we started the idle loop */
+ static ExpirationTimer * idle_start;
+- /** \brief What the current timeout is */
++ /** \brief What the current timeout is (in seconds) */
+ static long timeout;
+ /** \brief Has the timer been started? */
+ static bool timer_started;
+@@ -38,7 +38,7 @@ class ExpirationTimer {
+ /** \brief Next entry in the list */
+ ExpirationTimer * next;
+ /** \brief When this timer expires */
+- Glib::TimeVal expiration;
++ Glib::DateTime expiration;
+ /** \brief What extension this function relates to */
+ Extension * extension;
+
+--
+2.31.0.rc2
+
diff --git a/packages/media-gfx/inkscape/inkscape-1.0.1.exheres-0 b/packages/media-gfx/inkscape/inkscape-1.0.2.exheres-0
index a9654e42..8c568604 100644
--- a/packages/media-gfx/inkscape/inkscape-1.0.1.exheres-0
+++ b/packages/media-gfx/inkscape/inkscape-1.0.2.exheres-0
@@ -2,8 +2,8 @@
# Copyright 2009 Michael Forney <michael@obberon.com>
# Distributed under the terms of the GNU General Public License v2
-DOWNLOAD_ID="21571"
-TARBALL_REV="2020-09-07_3bc2e813f5"
+DOWNLOAD_ID="23820"
+TARBALL_REV="2021-01-15_e86c870879"
require cmake
require freedesktop-desktop gtk-icon-cache
@@ -113,7 +113,8 @@ DEPENDENCIES="
CMAKE_SOURCE="${WORKBASE}"/${PNV}_${TARBALL_REV}
DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PNV}-Add-missing-atomic-include.patch
+ "${FILES}"/${PNV}-Glib-TimeVal-deprecated-Glib-DateTime.patch
+ "${FILES}"/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch
)
CMAKE_SRC_CONFIGURE_PARAMS=(
@@ -167,6 +168,13 @@ src_prepare() {
-i CMakeScripts/ConfigPaths.cmake
}
+src_install() {
+ cmake_src_install
+
+ # Remove empty dirs
+ edo find "${IMAGE}"/usr/share/inkscape/extensions -type d -empty -delete
+}
+
pkg_postinst() {
freedesktop-desktop_pkg_postinst
gtk-icon-cache_pkg_postinst
diff --git a/packages/media-gfx/sane-backends/sane-backends-1.0.31.exheres-0 b/packages/media-gfx/sane-backends/sane-backends-1.0.32.exheres-0
index 9176694d..908af964 100644
--- a/packages/media-gfx/sane-backends/sane-backends-1.0.31.exheres-0
+++ b/packages/media-gfx/sane-backends/sane-backends-1.0.32.exheres-0
@@ -10,7 +10,7 @@ SCM_TAG=${PV}
require scm-git \
systemd-service \
udev-rules \
- autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+ autotools [ supported_autoconf=[ 2.7 ] supported_automake=[ 1.16 ] ]
SUMMARY="Scanner Access Now Easy - Backends"
HOMEPAGE+=" http://www.sane-project.org"
@@ -35,6 +35,7 @@ RESTRICT="test"
# TODO: net-snmp
DEPENDENCIES="
build:
+ dev-lang/python:*
sys-devel/autoconf-archive
sys-devel/gettext[>=0.19.8]
sys-devel/libtool[>=2.4.6]
diff --git a/packages/media-libs/SDL/SDL-1.2.15-r3.exheres-0 b/packages/media-libs/SDL/SDL-1.2.15-r3.exheres-0
index 27639870..3bdbae3e 100644
--- a/packages/media-libs/SDL/SDL-1.2.15-r3.exheres-0
+++ b/packages/media-libs/SDL/SDL-1.2.15-r3.exheres-0
@@ -1,7 +1,7 @@
# Copyright 2008 Anders Ossowicki <arkanoid@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 ] ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 1.13 ] ]
SUMMARY="The Simple DirectMedia Layer library"
HOMEPAGE="http://libsdl.org"
diff --git a/packages/media-libs/babl/babl-0.1.84.exheres-0 b/packages/media-libs/babl/babl-0.1.86.exheres-0
index 2dffd9e6..2dffd9e6 100644
--- a/packages/media-libs/babl/babl-0.1.84.exheres-0
+++ b/packages/media-libs/babl/babl-0.1.86.exheres-0
diff --git a/packages/media-libs/faad2/faad2-2.9.2.exheres-0 b/packages/media-libs/faad2/faad2-2.10.0.exheres-0
index ff2101ec..ff2101ec 100644
--- a/packages/media-libs/faad2/faad2-2.9.2.exheres-0
+++ b/packages/media-libs/faad2/faad2-2.10.0.exheres-0
diff --git a/packages/media-libs/faudio/faudio-21.02.exheres-0 b/packages/media-libs/faudio/faudio-21.04.exheres-0
index 23a809d3..23a809d3 100644
--- a/packages/media-libs/faudio/faudio-21.02.exheres-0
+++ b/packages/media-libs/faudio/faudio-21.04.exheres-0
diff --git a/packages/media-libs/libmpdclient/libmpdclient-2.16-r1.exheres-0 b/packages/media-libs/libmpdclient/libmpdclient-2.19.exheres-0
index b7eedc28..b7eedc28 100644
--- a/packages/media-libs/libmpdclient/libmpdclient-2.16-r1.exheres-0
+++ b/packages/media-libs/libmpdclient/libmpdclient-2.19.exheres-0
diff --git a/packages/media-libs/libplacebo/libplacebo-2.72.2.exheres-0 b/packages/media-libs/libplacebo/libplacebo-3.104.0.exheres-0
index e877f9c9..143af55e 100644
--- a/packages/media-libs/libplacebo/libplacebo-2.72.2.exheres-0
+++ b/packages/media-libs/libplacebo/libplacebo-3.104.0.exheres-0
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
require gitlab [ prefix='https://code.videolan.org' user='videolan' tag=v${PV} suffix=tar.bz2 ]
+require python [ blacklist=2 multibuild=false ]
require meson
SUMMARY="the core rendering algorithms and ideas of mpv turned into a library"
@@ -18,6 +19,9 @@ MYOPTIONS="
"
DEPENDENCIES="
+ build:
+ dev-python/Mako[python_abis:*(-)?]
+ virtual/pkg-config
build+run:
sys-libs/vulkan-headers[>=1.0.42]
sys-libs/vulkan-loader[>=1.0.42]
@@ -30,6 +34,8 @@ DEPENDENCIES="
providers:glslang? (
dev-lang/glslang[>=7.8.2850] [[ note = [ PATCH_LEVEL 2763 ] ]]
)
+ test:
+ media/ffmpeg
"
MESON_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/media-libs/libudfread/libudfread-1.1.1.exheres-0 b/packages/media-libs/libudfread/libudfread-1.1.1.exheres-0
new file mode 100644
index 00000000..3930430c
--- /dev/null
+++ b/packages/media-libs/libudfread/libudfread-1.1.1.exheres-0
@@ -0,0 +1,19 @@
+# Copyright 2021 Timo Gurr <tgurr@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require gitlab [ prefix=https://code.videolan.org user=videolan tag=${PV} new_download_scheme=true ] \
+ autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+
+SUMMARY="UDF reader"
+
+LICENCES="LGPL-2.1"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES=""
+
+DEFAULT_SRC_CONFIGURE_PARAMS=(
+ --disable-static
+)
+
diff --git a/packages/media-libs/libvpx/libvpx-1.9.0.exheres-0 b/packages/media-libs/libvpx/libvpx-1.10.0.exheres-0
index d6736288..1149de70 100644
--- a/packages/media-libs/libvpx/libvpx-1.9.0.exheres-0
+++ b/packages/media-libs/libvpx/libvpx-1.10.0.exheres-0
@@ -3,12 +3,8 @@
require libvpx
-DOWNLOADS="https://chromium.googlesource.com/webm/${PN}/+archive/v${PV}.tar.gz"
-
PLATFORMS="~amd64 ~armv7 ~armv8 ~x86"
-WORK="${WORKBASE}"
-
# SO_VERSION_MAJOR in libs.mk
SLOT="6"
diff --git a/packages/media-libs/libvpx/libvpx-1.7.0.exheres-0 b/packages/media-libs/libvpx/libvpx-1.7.0.exheres-0
index cb50afd9..d4e23bac 100644
--- a/packages/media-libs/libvpx/libvpx-1.7.0.exheres-0
+++ b/packages/media-libs/libvpx/libvpx-1.7.0.exheres-0
@@ -3,11 +3,7 @@
require libvpx
-DOWNLOADS="https://chromium.googlesource.com/webm/${PN}/+archive/v${PV}.tar.gz"
-
PLATFORMS="~amd64 ~armv7 ~armv8 ~x86"
-WORK="${WORKBASE}"
-
SLOT="5"
diff --git a/packages/media-libs/libvpx/libvpx.exlib b/packages/media-libs/libvpx/libvpx.exlib
index 9ea9286d..79ac4d58 100644
--- a/packages/media-libs/libvpx/libvpx.exlib
+++ b/packages/media-libs/libvpx/libvpx.exlib
@@ -1,15 +1,13 @@
# Copyright 2010 Elias Pipping <pipping@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-MY_PNV=${PNV}
-
-require googlecode [ project=webm ] flag-o-matic alternatives
+require flag-o-matic alternatives
export_exlib_phases pkg_setup src_prepare src_configure src_install
SUMMARY="VP8/VP9 Codec SDK"
HOMEPAGE="https://www.webmproject.org"
-DOWNLOADS="http://downloads.webmproject.org/releases/webm/${MY_PNV}.tar.bz2"
+DOWNLOADS="https://chromium.googlesource.com/webm/${PN}/+archive/v${PV}.tar.gz -> ${PNV}.tar.gz"
LICENCES="BSD-3"
MYOPTIONS="
@@ -40,7 +38,7 @@ DEFAULT_SRC_COMPILE_PARAMS=( ${LIBVPX_MAKE_PARAMS[@]} )
DEFAULT_SRC_INSTALL_PARAMS=( ${LIBVPX_MAKE_PARAMS[*]} )
DEFAULT_SRC_INSTALL_EXCLUDE=( release.sh )
-WORK=${WORKBASE}/${MY_PNV}
+WORK="${WORKBASE}"
libvpx_pkg_setup() {
export AS=$(_libvpx_assembler)
diff --git a/packages/media-libs/rnnoise/rnnoise-0.0_p20200604.exheres-0 b/packages/media-libs/rnnoise/rnnoise-0.0_p20210122.exheres-0
index 8856cb81..bbd38bfc 100644
--- a/packages/media-libs/rnnoise/rnnoise-0.0_p20200604.exheres-0
+++ b/packages/media-libs/rnnoise/rnnoise-0.0_p20210122.exheres-0
@@ -1,7 +1,7 @@
-# Copyright 2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2020-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require github [ user=xiph tag=90ec41ef659fd82cfec2103e9bb7fc235e9ea66c ] \
+require github [ user=xiph tag=1cbdbcf1283499bbb2230a6b0f126eb9b236defd ] \
autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
SUMMARY="RNN-based noise suppression library"
diff --git a/packages/media-libs/rubberband/rubberband-1.9.0.exheres-0 b/packages/media-libs/rubberband/rubberband-1.9.0.exheres-0
deleted file mode 100644
index 4f889d87..00000000
--- a/packages/media-libs/rubberband/rubberband-1.9.0.exheres-0
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2010 Jonathan Dahan <jedahan@gmail.com>
-# Distributed under the terms of the GNU General Public License v2
-
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
-
-SUMMARY="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="https://breakfastquay.com/rubberband"
-DOWNLOADS="https://breakfastquay.com/files/releases/${PNV}.tar.bz2"
-
-LICENCES="GPL-2"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
- build:
- virtual/pkg-config[>=0.9.0]
- build+run:
- media-libs/ladspa-sdk [[ note = [ could be optional ] ]]
- media-libs/libsamplerate
- media-libs/libsndfile [[ note = [ could be optional ] ]]
- media-libs/vamp-plugin-sdk [[ note = [ could be optional ] ]]
- sci-libs/fftw
-"
-
-DEFAULT_SRC_CONFIGURE_PARAMS=(
- --enable-ladspa
- --enable-programs
- --enable-vamp
-)
-
-DEFAULT_SRC_COMPILE_PARAMS=( AR=${AR} )
-
-DEFAULT_SRC_INSTALL_PARAMS=(
- INSTALL_LIBDIR=/usr/$(exhost --target)/lib
- INSTALL_LADSPADIR=/usr/$(exhost --target)/lib/ladspa
- INSTALL_PKGDIR=/usr/$(exhost --target)/lib/pkgconfig
- INSTALL_VAMPDIR=/usr/$(exhost --target)/lib/vamp
- INSTALL_LRDFDIR=/usr/share/ladspa/rdf
-)
-
-src_prepare() {
- edo sed \
- -e '/cp -f.*JNI_TARGET/d' \
- -i Makefile.in
-
- autotools_src_prepare
-}
-
diff --git a/packages/media-libs/rubberband/rubberband-1.9.1.exheres-0 b/packages/media-libs/rubberband/rubberband-1.9.1.exheres-0
new file mode 100644
index 00000000..4b60ee86
--- /dev/null
+++ b/packages/media-libs/rubberband/rubberband-1.9.1.exheres-0
@@ -0,0 +1,40 @@
+# Copyright 2010 Jonathan Dahan <jedahan@gmail.com>
+# Distributed under the terms of the GNU General Public License v2
+
+require meson [ meson_minimum_version=0.53.0 ]
+
+SUMMARY="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://breakfastquay.com/rubberband"
+DOWNLOADS="https://breakfastquay.com/files/releases/${PNV}.tar.bz2"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES="
+ build:
+ virtual/pkg-config[>=0.9.0]
+ build+run:
+ media-libs/ladspa-sdk [[ note = [ could be optional ] ]]
+ media-libs/libsamplerate[>=0.1.8] [[ note = [ could be optional ] ]]
+ media-libs/libsndfile[>=1.0.16] [[ note = [ could be optional ] ]]
+ media-libs/vamp-plugin-sdk[>=2.9] [[ note = [ could be optional ] ]]
+ sci-libs/fftw[>=3.0.0]
+"
+
+MESON_SRC_CONFIGURE_PARAMS=(
+ -Dfft=fftw
+ -Dresampler=libsamplerate
+)
+
+src_prepare() {
+ meson_src_prepare
+
+ # Doesn't seem to detect jni.h from openjdk-bin, but err on the safe side
+ edo sed \
+ -e 's/\(have_jni = \).*/\1false/' \
+ -i meson.build
+
+}
+
diff --git a/packages/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.exheres-0 b/packages/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.exheres-0
index f9392aee..1382d781 100644
--- a/packages/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.exheres-0
+++ b/packages/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.exheres-0
@@ -3,7 +3,9 @@
SUMMARY="Audio processing plugin system for plugins that extract descriptive information from audio data"
HOMEPAGE="https://www.vamp-plugins.org"
-DOWNLOADS="https://code.soundsoftware.ac.uk/attachments/download/2206/${PNV}.tar.gz"
+# "ERROR: cannot verify code.soundsoftware.ac.uk's certificate"
+#DOWNLOADS="http://code.soundsoftware.ac.uk/attachments/download/2691/${PNV}.tar.gz"
+DOWNLOADS="https://github.com/c4dm/${PN}/archive/${PN}-v${PV}.tar.gz"
LICENCES="MIT"
SLOT="0"
@@ -25,6 +27,8 @@ src_prepare() {
default
}
+WORK="${WORKBASE}"/${PN}-${PN}-v${PV}
+
DEFAULT_SRC_CONFIGURE_PARAMS=( --enable-programs )
DEFAULT_SRC_COMPILE_PARAMS=( AR=${AR} RANLIB=${RANLIB} )
diff --git a/packages/media-libs/x264/x264-20190827-r1.exheres-0 b/packages/media-libs/x264/x264-20210211.exheres-0
index c2b50f0d..c2b50f0d 100644
--- a/packages/media-libs/x264/x264-20190827-r1.exheres-0
+++ b/packages/media-libs/x264/x264-20210211.exheres-0
diff --git a/packages/media-libs/x264/x264.exlib b/packages/media-libs/x264/x264.exlib
index 80011f6a..274fda0e 100644
--- a/packages/media-libs/x264/x264.exlib
+++ b/packages/media-libs/x264/x264.exlib
@@ -2,18 +2,13 @@
# Copyright 2014 Johannes Nixdorf <mixi@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-if ever is_scm ; then
- SCM_REPOSITORY="https://git.videolan.org/git/${PN}.git"
- require scm-git
-else
- MY_PNV="${PN}-snapshot-${PV}-2245-stable"
- DOWNLOADS="https://download.videolan.org/pub/videolan/${PN}/snapshots/${MY_PNV}.tar.bz2"
-fi
+require gitlab [ prefix='https://code.videolan.org' user='videolan' tag=b86ae3c66f51ac9eab5ab7ad09a9d62e67961b8a suffix=tar.bz2 ]
+require bash-completion
-export_exlib_phases src_configure src_test
+export_exlib_phases src_configure src_test src_install
SUMMARY="Library for encoding H264/AVC video streams"
-HOMEPAGE="https://www.videolan.org/developers/${PN}.html"
+HOMEPAGE+=" https://www.videolan.org/developers/${PN}.html"
LICENCES="GPL-2 GPL-3"
SLOT="0"
@@ -30,10 +25,6 @@ DEPENDENCIES="
visualisation? ( x11-libs/libX11 )
"
-if ! ever is_scm ; then
- WORK=${WORKBASE}/${MY_PNV}
-fi
-
_x264_assembler() {
case "$(exhost --target)" in
i686-*|x86_64-*)
@@ -53,6 +44,7 @@ x264_src_configure() {
--cross-prefix=$(exhost --tool-prefix)
--enable-shared
--disable-avs
+ --disable-bashcompletion
--disable-ffms
--disable-gpac
--disable-lavf
@@ -69,3 +61,9 @@ x264_src_test() {
:
}
+x264_src_install() {
+ default
+
+ dobashcompletion tools/bash-autocomplete.sh x264
+}
+
diff --git a/packages/media-libs/x265/x265-3.3.exheres-0 b/packages/media-libs/x265/x265-3.5.exheres-0
index ebabe85d..0598aed1 100644
--- a/packages/media-libs/x265/x265-3.3.exheres-0
+++ b/packages/media-libs/x265/x265-3.5.exheres-0
@@ -4,7 +4,7 @@
require x265
# set(X265_BUILD xyz) in source/CMakeLists.txt
-SLOT="188"
+SLOT="199"
PLATFORMS="~amd64 ~armv8"
diff --git a/packages/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5.exheres-0 b/packages/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.7.exheres-0
index a8a363ce..7a5e31d4 100644
--- a/packages/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5.exheres-0
+++ b/packages/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.7.exheres-0
@@ -1,10 +1,10 @@
-# Copyright 2019-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2019-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
MY_PN=inputstream.adaptive
-CODENAME=Leia
+CODENAME=Matrix
-require github [ user=peak3d pn=${MY_PN} tag=${PV}-${CODENAME} ] cmake
+require github [ user=xbmc pn=${MY_PN} tag=${PV}-${CODENAME} ] cmake
SUMMARY="Kodi addon InputStream Adaptive"
@@ -18,9 +18,7 @@ DEPENDENCIES="
virtual/pkg-config
build+run:
dev-libs/expat
- dev-libs/kodi-platform
- dev-libs/p8-platform
- media/kodi
+ media/kodi[>=19.0]
"
CMAKE_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9.exheres-0 b/packages/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.exheres-0
index 82062d87..8f753f0f 100644
--- a/packages/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9.exheres-0
+++ b/packages/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.exheres-0
@@ -1,8 +1,8 @@
-# Copyright 2019-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2019-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
MY_PN=inputstream.rtmp
-CODENAME=Leia
+CODENAME=Matrix
require github [ user=xbmc pn=${MY_PN} tag=${PV}-${CODENAME} ] cmake
@@ -19,12 +19,10 @@ DEPENDENCIES="
build:
virtual/pkg-config
build+run:
- dev-libs/kodi-platform
- dev-libs/p8-platform
- media/kodi
+ media/kodi[>=19.0]
media-video/rtmpdump
providers:libressl? ( dev-libs/libressl:= )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
sys-libs/zlib
"
diff --git a/packages/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.21.exheres-0 b/packages/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.2.4.exheres-0
index 499d6e96..748c40d0 100644
--- a/packages/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.21.exheres-0
+++ b/packages/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.2.4.exheres-0
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
MY_PN=pvr.hts
-CODENAME=Leia
+CODENAME=Matrix
require github [ user=kodi-pvr pn=${MY_PN} tag=${PV}-${CODENAME} ] cmake
@@ -14,12 +14,8 @@ PLATFORMS="~amd64"
MYOPTIONS=""
DEPENDENCIES="
- build:
- virtual/pkg-config
build+run:
- dev-libs/kodi-platform
- dev-libs/p8-platform
- media/kodi
+ media/kodi[>=19.0]
"
CMAKE_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.9.8.exheres-0 b/packages/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.5.0.exheres-0
index d299a27a..b4c9b2d0 100644
--- a/packages/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.9.8.exheres-0
+++ b/packages/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.5.0.exheres-0
@@ -1,8 +1,8 @@
-# Copyright 2016-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2016-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
MY_PN=pvr.iptvsimple
-CODENAME=Leia
+CODENAME=Matrix
require github [ user=kodi-pvr pn=${MY_PN} tag=${PV}-${CODENAME} ] cmake
@@ -14,13 +14,9 @@ PLATFORMS="~amd64"
MYOPTIONS=""
DEPENDENCIES="
- build:
- virtual/pkg-config
build+run:
- dev-libs/kodi-platform
- dev-libs/p8-platform
- dev-libs/rapidxml
- media/kodi
+ dev-libs/pugixml
+ media/kodi[>=19.0]
sys-libs/zlib
"
diff --git a/packages/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.4.exheres-0 b/packages/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.2.exheres-0
index 0c6d3b02..9a756373 100644
--- a/packages/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.4.exheres-0
+++ b/packages/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.2.exheres-0
@@ -1,8 +1,8 @@
-# Copyright 2015-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2015-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
MY_PN=pvr.vdr.vnsi
-CODENAME=Leia
+CODENAME=Matrix
require github [ user=kodi-pvr pn=${MY_PN} tag=${PV}-${CODENAME} ] cmake
@@ -14,12 +14,9 @@ PLATFORMS="~amd64"
MYOPTIONS=""
DEPENDENCIES="
- build:
- virtual/pkg-config
build+run:
- dev-libs/p8-platform
- media/kodi
- x11-dri/mesa
+ dev-libs/libglvnd
+ media/kodi[>=19.0]
"
CMAKE_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/media-plugins/mopidy-iris/mopidy-iris-3.55.4.exheres-0 b/packages/media-plugins/mopidy-iris/mopidy-iris-3.57.6.exheres-0
index 8185c771..cb09aeec 100644
--- a/packages/media-plugins/mopidy-iris/mopidy-iris-3.55.4.exheres-0
+++ b/packages/media-plugins/mopidy-iris/mopidy-iris-3.57.6.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2016-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
MY_PN=Mopidy-Iris
diff --git a/packages/media-sound/mopidy/mopidy-3.1.1.exheres-0 b/packages/media-sound/mopidy/mopidy-3.1.1-r1.exheres-0
index 603ae453..3c2ed40e 100644
--- a/packages/media-sound/mopidy/mopidy-3.1.1.exheres-0
+++ b/packages/media-sound/mopidy/mopidy-3.1.1-r1.exheres-0
@@ -58,6 +58,9 @@ DEPENDENCIES="
media-plugins/mopidy-spotify[>=4.0.0] [[
description = [ Mopidy extension for playing music from Spotify ]
]]
+ media-sound/upmpdcli [[
+ description = [ Allows to expose Mopidy as an UPnP MediaRenderer ]
+ ]]
net-apps/snapcast [[
description = [ Allows to turn Mopidy into a multi-room audio solution ]
]]
diff --git a/packages/media-sound/spotify/spotify-1.1.42.622.exheres-0 b/packages/media-sound/spotify/spotify-1.1.55.498-r1.exheres-0
index b73037ef..fe7b2b83 100644
--- a/packages/media-sound/spotify/spotify-1.1.42.622.exheres-0
+++ b/packages/media-sound/spotify/spotify-1.1.55.498-r1.exheres-0
@@ -4,7 +4,7 @@
MY_REPO="https://repository-origin.spotify.com/pool/non-free/s/spotify-client"
MY_PN="${PN}-client"
-MY_PV="${PV}.gbd112320-37"
+MY_PV="${PV}.gf9a83c60"
require gtk-icon-cache freedesktop-desktop
@@ -39,10 +39,9 @@ DEPENDENCIES="
dev-libs/glib:2[>=2.46.2]
dev-libs/nspr[>=4.0]
dev-libs/nss[>=3.0]
- dev-libs/openssl[>=0.9.8] [[
+ dev-libs/openssl:=[>=0.9.8] [[
description = [ Spotify wants 0.9.8 but runs with warnings with versions >1.0.0 ]
]]
- gnome-platform/GConf:2
media-libs/fontconfig[>=2.11]
media-libs/freetype:2[>=2.6]
net-misc/curl[>=7.43]
@@ -52,7 +51,7 @@ DEPENDENCIES="
x11-dri/mesa
x11-libs/cairo[>=1.14.2][X(+)]
x11-libs/gdk-pixbuf:2.0[>=2.32.3]
- x11-libs/gtk+:2
+ x11-libs/gtk+:3
x11-libs/libX11[>=1.6.3]
x11-libs/libXcomposite[>=0.4.4]
x11-libs/libXcursor[>=1.1.14]
diff --git a/packages/media-sound/tomahawk/tomahawk-0.8.99_p20170808.exheres-0 b/packages/media-sound/tomahawk/tomahawk-0.8.99_p20170808.exheres-0
deleted file mode 100644
index 5694c671..00000000
--- a/packages/media-sound/tomahawk/tomahawk-0.8.99_p20170808.exheres-0
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011-2016 Timo Gurr <tgurr@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require tomahawk
-
-PLATFORMS="~amd64"
-
-# https://github.com/meitar/git-archive-all.sh because git archive doesn't
-# handle submodules:
-# git-archive-all.sh --prefix tomahawk-0.8.99_p20170808/ tomahawk-0.8.99_p20170808.tar
-DOWNLOADS="http://dev.exherbo.org/distfiles/${PN}/${PNV}.tar.xz"
-
diff --git a/packages/media-sound/tomahawk/tomahawk-scm.exheres-0 b/packages/media-sound/tomahawk/tomahawk-scm.exheres-0
deleted file mode 100644
index 81031fa5..00000000
--- a/packages/media-sound/tomahawk/tomahawk-scm.exheres-0
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2011-2016 Timo Gurr <tgurr@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require tomahawk
-
-PLATFORMS="~amd64"
-
diff --git a/packages/media-sound/tomahawk/tomahawk.exlib b/packages/media-sound/tomahawk/tomahawk.exlib
deleted file mode 100644
index 5ddbe3b0..00000000
--- a/packages/media-sound/tomahawk/tomahawk.exlib
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2011-2016 Timo Gurr <tgurr@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-if ever is_scm ; then
- SCM_EXTERNAL_REFS="thirdparty/libcrashreporter-qt:"
-fi
-
-require github [ user=${PN}-player ]
-require cmake freedesktop-desktop gtk-icon-cache
-
-export_exlib_phases pkg_postinst pkg_postrm
-
-SUMMARY="The Social Music Player"
-HOMEPAGE="http://${PN}-player.org"
-
-LICENCES="GPL-3"
-SLOT="0"
-MYOPTIONS=""
-
-DEPENDENCIES="
- build:
- dev-cpp/sparsehash
- kde-frameworks/extra-cmake-modules[>=1.7.0]
- virtual/pkg-config
- build+run:
- app-arch/quazip[>=0.4.3][qt5(+)]
- app-crypt/qca:2[qt5(+)] [[ note = [ library and qca-ossl plugin ] ]]
- dev-cpp/lucene++[>=3.0.0]
- dev-libs/boost[>=1.3]
- dev-libs/gnutls
- kde-frameworks/attica:5[>=1.0.0]
- media/vlc[>=2.1.0]
- media-libs/liblastfm[>=1.0.0][qt5(+)]
- media-libs/phonon[>=4.5.0][qt5(+)]
- media-libs/taglib[>=1.9]
- net-im/telepathy-qt[>=0.9.3][qt5(+)]
- net-libs/jreen[>=1.1.1][qt5(+)]
- sys-auth/qtkeychain[>=0.1.0][qt5(+)]
- x11-libs/libX11
- x11-libs/qtbase:5[sql][sqlite] [[ note = [ Qt5Concurrent Qt5Core Qt5DBus Qt5Widgets Qt5Xml ] ]]
- x11-libs/qtsvg:5 [[ note = [ Qt5Svg ] ]]
- x11-libs/qttools:5 [[ note = [ Qt5LinguistTools Qt5UiTools ] ]]
- x11-libs/qtwebkit:5 [[ note = [ Qt5WebKitWidgets ] ]]
- x11-libs/qtx11extras:5 [[ note = [ Qt5X11Extras ] ]]
- run:
- sys-apps/upower
-"
-
-CMAKE_SRC_CONFIGURE_PARAMS+=(
- -DBUILD_GUI:BOOL=TRUE
- -DBUILD_HATCHET:BOOL=FALSE
- -DBUILD_WITH_QT4:BOOL=FALSE
- -DWITH_BINARY_ATTICA:BOOL=TRUE
- -DWITH_GNOMESHORTCUTHANDLER:BOOL=TRUE
- -DWITH_KDE4:BOOL=FALSE
- -DWITH_UPOWER:BOOL=TRUE
-)
-
-tomahawk_pkg_postinst() {
- freedesktop-desktop_pkg_postinst
- gtk-icon-cache_pkg_postinst
-}
-
-tomahawk_pkg_postrm() {
- freedesktop-desktop_pkg_postrm
- gtk-icon-cache_pkg_postrm
-}
-
diff --git a/packages/media-sound/upmpdcli/files/upmpdcli-systemd.patch b/packages/media-sound/upmpdcli/files/upmpdcli-systemd.patch
new file mode 100644
index 00000000..b04242b2
--- /dev/null
+++ b/packages/media-sound/upmpdcli/files/upmpdcli-systemd.patch
@@ -0,0 +1,16 @@
+Source: Timo Gurr <tgurr@exherbo.org>
+Upstream: No
+Reason: Run the upmpdcli service under a dedicated user
+
+diff -Naur upmpdcli-1.5.9/systemd/upmpdcli.service upmpdcli-1.5.9.new/systemd/upmpdcli.service
+--- upmpdcli-1.5.9/systemd/upmpdcli.service 2020-05-30 15:48:06.000000000 +0200
++++ upmpdcli-1.5.9.new/systemd/upmpdcli.service 2021-02-27 13:56:32.405943079 +0100
+@@ -5,6 +5,8 @@
+
+ [Service]
+ Type=simple
++User=upmpdcli
++Group=upmpdcli
+ # ExecStartPre=/bin/sleep 30
+ # Note: if start fails check with "systemctl status upmpdcli"
+ ExecStart=/usr/bin/upmpdcli -c /etc/upmpdcli.conf
diff --git a/packages/media-sound/upmpdcli/upmpdcli-1.5.9.exheres-0 b/packages/media-sound/upmpdcli/upmpdcli-1.5.9.exheres-0
new file mode 100644
index 00000000..39fc172e
--- /dev/null
+++ b/packages/media-sound/upmpdcli/upmpdcli-1.5.9.exheres-0
@@ -0,0 +1,61 @@
+# Copyright 2021 Timo Gurr <tgurr@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require systemd-service [ systemd_files=[ systemd/${PN}.service ] ]
+
+SUMMARY="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
+DOWNLOADS="${HOMEPAGE}/downloads/${PNV}.tar.gz"
+
+LICENCES="LGPL-2.1"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS=""
+
+# TODO: Python stuff extending uprcl local media server
+# recoll, sqlite3, mutagen, ...
+DEPENDENCIES="
+ build:
+ virtual/pkg-config
+ build+run:
+ group/${PN}
+ user/${PN}
+ dev-libs/jsoncpp:=
+ media-libs/libmpdclient
+ net-libs/libmicrohttpd
+ net-libs/libupnpp
+ net-misc/curl
+ run:
+ dev-lang/python:*[>=3]
+ suggestion:
+ media-libs/libspotify [[
+ description = [ Spotify support using libspotify ]
+ ]]
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PN}-systemd.patch
+)
+
+DEFAULT_SRC_CONFIGURE_PARAMS=(
+ --enable-spotify
+ --disable-confgui
+ --disable-staticlink
+)
+
+src_install() {
+ default
+
+ install_systemd_files
+
+ # set permissions
+ edo chown ${PN}:${PN} "${IMAGE}"/etc/${PN}.conf
+
+ # local media server cache
+ keepdir /var/cache/${PN}
+ edo chown ${PN}:${PN} "${IMAGE}"/var/cache/${PN}
+
+ # remove empty directory
+ edo rmdir "${IMAGE}"/usr/share/${PN}/src_scripts
+}
+
diff --git a/packages/media-video/makemkv/makemkv-1.15.2.exheres-0 b/packages/media-video/makemkv/makemkv-1.16.3.exheres-0
index a6cbcb0a..f7d22425 100644
--- a/packages/media-video/makemkv/makemkv-1.15.2.exheres-0
+++ b/packages/media-video/makemkv/makemkv-1.16.3.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2011-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
# Based in part upon 'makemkv-1.6.16.ebuild' from Gentoo, which is:
# Copyright 1999-2011 Gentoo Foundation
@@ -36,15 +36,12 @@ DEPENDENCIES="
media/ffmpeg[>=4.0][fdk-aac] [[ note = [ LIBAVCODEC_VERSION_MAJOR >= 58 ] ]]
sys-libs/zlib
qt5? ( x11-libs/qtbase:5[gui] )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
providers:libressl? ( dev-libs/libressl:= )
"
WORK=${WORKBASE}/${MY_PNV}
-DEFAULT_SRC_CONFIGURE_PARAMS=(
- --disable-qt4
-)
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'qt5 gui' )
src_prepare() {
diff --git a/packages/media-video/obs-studio/obs-studio-26.1.2.exheres-0 b/packages/media-video/obs-studio/obs-studio-26.1.2-r1.exheres-0
index 0b3d2219..0b3d2219 100644
--- a/packages/media-video/obs-studio/obs-studio-26.1.2.exheres-0
+++ b/packages/media-video/obs-studio/obs-studio-26.1.2-r1.exheres-0
diff --git a/packages/media-video/obs-studio/obs-studio-scm.exheres-0 b/packages/media-video/obs-studio/obs-studio-scm.exheres-0
deleted file mode 100644
index 689a6e59..00000000
--- a/packages/media-video/obs-studio/obs-studio-scm.exheres-0
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2015 Jonathan Dahan <jonathan@jonathan.is>
-# Distributed under the terms of the GNU General Public License v2
-
-SCM_EXTERNAL_REFS="
- plugins/win-dshow/libdshowcapture:
- plugins/mac-syphon/syphon-framework:
- plugins/obs-browser:
- plugins/enc-amf:
-"
-
-require obs-studio
-
-PLATFORMS="~amd64"
-
diff --git a/packages/media-video/obs-studio/obs-studio.exlib b/packages/media-video/obs-studio/obs-studio.exlib
index e8b8e02d..23c964d2 100644
--- a/packages/media-video/obs-studio/obs-studio.exlib
+++ b/packages/media-video/obs-studio/obs-studio.exlib
@@ -1,17 +1,28 @@
# Copyright 2015 Jonathan Dahan <jonathan@jonathan.is>
# Distributed under the terms of the GNU General Public License v2
+OBS_BROWSER_VERSION="53cfefe74a2347e9054212bb4c014766e53ee5f4"
+# https://github.com/obsproject/obs-studio/blob/master/.github/workflows/main.yml#L19
+LINUX_CEF_BUILD_VERSION="4280"
+
require github [ user=obsproject ] cmake freedesktop-desktop gtk-icon-cache
-export_exlib_phases pkg_postinst pkg_postrm
+export_exlib_phases src_prepare pkg_postinst pkg_postrm
SUMMARY="Open source broadcasting software for live streaming and recording"
HOMEPAGE+=" https://obsproject.com"
+DOWNLOADS+="
+ browser-plugin? (
+ https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_VERSION}.tar.gz -> obs-browser-${OBS_BROWSER_VERSION}.tar.gz
+ https://cdn-fastly.obsproject.com/downloads/cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64.tar.bz2
+ )
+"
LICENCES="GPL-2"
SLOT="0"
MYOPTIONS="
alsa
+ browser-plugin [[ description = [ Support for embedding websites, e.g. for stream alerts ] ]]
fdk-aac [[ description = [ Support for AAC encoding using the Frauenhofer AAC Codec Library ] ]]
jack
pulseaudio
@@ -44,6 +55,25 @@ DEPENDENCIES="
x11-libs/qtsvg:5
x11-libs/qtx11extras:5
alsa? ( sys-sound/alsa-lib )
+ browser-plugin? (
+ dev-libs/at-spi2-atk
+ dev-libs/at-spi2-core
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ net-print/cups
+ sys-sound/alsa-lib
+ x11-dri/libdrm
+ x11-dri/mesa
+ x11-libs/cairo
+ x11-libs/pango
+ x11-libs/libXext
+ x11-libs/libXdamage
+ x11-libs/libxkbcommon
+ x11-libs/libXrandr
+ )
fdk-aac? ( media-libs/fdk-aac )
jack? ( media-sound/jack-audio-connection-kit )
pulseaudio? ( media-sound/pulseaudio )
@@ -67,8 +97,8 @@ DEPENDENCIES="
"
CMAKE_SRC_CONFIGURE_PARAMS=(
- -DBROWSER_AVAILABLE_INTERNAL:BOOL=FALSE
- -DBUILD_BROWSER:BOOL=FALSE
+ -DBROWSER_AVAILABLE_INTERNAL:BOOL=TRUE
+ -DCEF_ROOT_DIR:PATH="${WORKBASE}"/cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64
-DCHECK_FOR_SERVICE_UPDATES:BOOL=FALSE
-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=TRUE
-DDEBUG_FFMPEG_MUX:BOOL=FALSE
@@ -86,6 +116,7 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
)
CMAKE_SRC_CONFIGURE_OPTIONS=(
+ 'browser-plugin BUILD_BROWSER'
'!scripting DISABLE_LUA'
'!scripting DISABLE_PYTHON'
'!speex DISABLE_SPEEXDSP'
@@ -113,6 +144,16 @@ CMAKE_SRC_CONFIGURE_TESTS=(
'-DBUILD_TESTS:BOOL=TRUE -DBUILD_TESTS:BOOL=FALSE'
)
+obs-studio_src_prepare() {
+ cmake_src_prepare
+
+ # obs-browser
+ if option browser-plugin ; then
+ edo rmdir "${CMAKE_SOURCE}"/plugins/obs-browser
+ edo ln -s "${WORKBASE}"/obs-browser-${OBS_BROWSER_VERSION} "${CMAKE_SOURCE}"/plugins/obs-browser
+ fi
+}
+
obs-studio_pkg_postinst() {
freedesktop-desktop_pkg_postinst
gtk-icon-cache_pkg_postinst
diff --git a/packages/media/ffmpeg/ffmpeg-4.3.2-r1.exheres-0 b/packages/media/ffmpeg/ffmpeg-4.3.2-r1.exheres-0
new file mode 100644
index 00000000..1081c0d4
--- /dev/null
+++ b/packages/media/ffmpeg/ffmpeg-4.3.2-r1.exheres-0
@@ -0,0 +1,14 @@
+# Copyright 2008 Kim Højgaard-Hansen <kimrhh@exherbo.org>
+# Copyright 2009 Bo Ørsted Andresen <zlin@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require ffmpeg
+
+PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/ffmpeg-4.3-disable-ssse3.patch
+ "${FILES}"/4dab04622a6cf2a31da26a51dedb60ec44ac89a4.patch
+ "${FILES}"/98ea1a662ee172961feaa374fe8d26078838d250.patch
+)
+
diff --git a/packages/media/ffmpeg/ffmpeg-4.3.1.exheres-0 b/packages/media/ffmpeg/ffmpeg-4.4.exheres-0
index 7dfe70f9..0e0b50ba 100644
--- a/packages/media/ffmpeg/ffmpeg-4.3.1.exheres-0
+++ b/packages/media/ffmpeg/ffmpeg-4.4.exheres-0
@@ -8,6 +8,5 @@ PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/ffmpeg-4.3-disable-ssse3.patch
- "${FILES}"/${PN}-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch
)
diff --git a/packages/media/ffmpeg/ffmpeg.exlib b/packages/media/ffmpeg/ffmpeg.exlib
index 4f685993..761e483b 100644
--- a/packages/media/ffmpeg/ffmpeg.exlib
+++ b/packages/media/ffmpeg/ffmpeg.exlib
@@ -3,8 +3,7 @@
# Copyright 2012 Ingmar Vanhassel <ingmar@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-OPTION_RENAMES=( 'v4l2 v4l' 'vp8 vpx' )
-ever at_least 4.3 && OPTION_RENAMES+=( 'av1 av1-decode' )
+OPTION_RENAMES=( 'av1 av1-decode' 'v4l2 v4l' 'vp8 vpx' )
require toolchain-funcs option-renames
@@ -74,6 +73,8 @@ SLOT="0"
MYOPTIONS="
alsa [[ description = [ Support sound recoding and playback using ALSA ] ]]
ass [[ description = [ Advanced SubStation Alpha (ASS) subtitles support ] ]]
+ av1-decode [[ description = [ AV1 decoding via libdav1d ] ]]
+ av1-encode [[ description = [ AV1 encoding via librav1e ] ]]
bidi [[ description = [ Enable support for text shaping in drawtext via libfribidi ] ]]
bluray [[ description = [ Support for reading Blu-ray discs ] ]]
bs2b [[ description = [ Enable support for libbs2b-based stereo-to-binaural audio filter ] ]]
@@ -89,6 +90,7 @@ MYOPTIONS="
fdk-aac [[ description = [ Support for AAC encoding using the Frauenhofer AAC Codec Library, makes the resulting binary non-redistributable ] ]]
fontconfig [[ description = [ Support for managing custom fonts via fontconfig ] ]]
frei0r [[ description = [ Video effects using frei0r-plugins ] ]]
+ glslang [[ description = [ Filters based on Vulkan ] ]]
gsm [[ description = [ Support for GSM codec (audio), mainly for telephony ] ]]
h264 [[ description = [ Enable H.264 encoding ] ]]
h264? ( ( providers:
@@ -134,6 +136,7 @@ MYOPTIONS="
vidstab [[ description = [ Analyze and perform video stabilization/deshaking ] ]]
vorbis [[ description = [ Additional OggVorbis audio de-/encoder plugin (ffmpeg's encoder is experimental) ] ]]
vpx [[ description = [ Enable support for VP7/VP8 and VP9 de/encoding via libvpx ] ]]
+ vulkan [[ description = [ Vulkan hardware acceleration support ] ]]
webp [[ description = [ WebP encoding via libwebp ] ]]
X [[ description = [ Enable support for X11 grabbing ] ]]
xavs [[ description = [ Support AVS, the Audio Video Standard of China ] ]]
@@ -169,12 +172,15 @@ DEPENDENCIES="
opencl? ( dev-libs/opencl-headers )
platform:amd64? ( dev-lang/nasm )
platform:x86? ( dev-lang/nasm )
+ vulkan? ( sys-libs/vulkan-headers[>=1.1.97] )
build+run:
app-arch/bzip2
app-arch/xz
sys-libs/zlib
alsa? ( sys-sound/alsa-lib )
ass? ( media-libs/libass )
+ av1-encode? ( media-video/rav1e[>=0.1.0] )
+ av1-decode? ( media-libs/dav1d[>=0.4.0] )
bidi? ( dev-libs/fribidi )
bluray? ( media-libs/libbluray )
bs2b? ( media-libs/libbs2b )
@@ -185,13 +191,14 @@ DEPENDENCIES="
fdk-aac? ( media-libs/fdk-aac )
fontconfig? ( media-libs/fontconfig )
frei0r? ( media-plugins/frei0r-plugins )
+ glslang? ( dev-lang/glslang[>=11.0.0] )
gsm? ( media-libs/gsm )
h264? (
providers:openh264? ( media-libs/openh264[>=1.3] )
providers:x264? ( media-libs/x264[>=20120104] )
)
hap? ( app-arch/snappy )
- hevc? ( media-libs/x265:=[>=1.8] )
+ hevc? ( media-libs/x265:=[>=1.9] )
ieee1394? (
media-libs/libdc1394:2
media-libs/libraw1394
@@ -216,7 +223,6 @@ DEPENDENCIES="
media-libs/vo-amrwbenc
)
opencv? ( media-libs/opencv )
- opengl? ( x11-dri/mesa )
opus? ( media-libs/opus )
providers:gnutls? (
dev-libs/gmp:=
@@ -224,7 +230,7 @@ DEPENDENCIES="
)
providers:libressl? ( dev-libs/libressl:= )
providers:mbedtls? ( dev-libs/mbedtls )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
pulseaudio? ( media-sound/pulseaudio )
rtmp? ( media-video/rtmpdump[>=2.2] )
rubberband? ( media-libs/rubberband[>=1.8.1] )
@@ -252,6 +258,7 @@ DEPENDENCIES="
media-libs/libvorbis
)
vpx? ( media-libs/libvpx:=[>=1.3.0] )
+ vulkan? ( sys-libs/vulkan-loader[>=1.1.97] )
webp? ( media-libs/libwebp:=[>=0.4.0] )
X? (
x11-libs/libX11
@@ -265,31 +272,17 @@ DEPENDENCIES="
!media/libav [[ description = [ Libav is a fork of ffmpeg and uses the same file names ] ]]
"
-if ever at_least 4.3; then
- MYOPTIONS+="
- av1-decode [[ description = [ AV1 decoding via libdav1d ] ]]
- av1-encode [[ description = [ AV1 encoding via librav1e ] ]]
-
- glslang [[ description = [ Filters based on Vulkan ] ]]
- vulkan [[ description = [ Vulkan hardware acceleration support ] ]]
- "
+if ever at_least 4.4; then
DEPENDENCIES+="
- build:
- vulkan? ( sys-libs/vulkan-headers[>=1.1.97] )
build+run:
- av1-encode? ( media-video/rav1e[>=0.1.0] )
- av1-decode? ( media-libs/dav1d[>=0.4.0] )
- glslang? ( dev-lang/glslang )
- hevc? ( media-libs/x265:=[>=1.9] )
- vulkan? ( sys-libs/vulkan-loader[>=1.1.97] )
+ av1-encode? ( media-video/rav1e[>=0.4.0] )
+ av1-decode? ( media-libs/dav1d[>=0.5.0] )
+ opengl? ( dev-libs/libglvnd )
"
else
- MYOPTIONS+="
- av1 [[ description = [ AV1 decoding via libdav1d ] ]]
- "
DEPENDENCIES+="
build+run:
- av1? ( media-libs/dav1d[>=0.2.1] )
+ opengl? ( x11-dri/mesa )
"
fi
@@ -428,6 +421,7 @@ ffmpeg_src_configure() {
--disable-dxva2
--disable-jni
--disable-mediacodec
+ --disable-mediafoundation
--disable-schannel
--disable-securetransport
--disable-videotoolbox
@@ -462,8 +456,8 @@ ffmpeg_src_configure() {
# not tested
--disable-chromaprint
+ --disable-librabbitmq
--disable-libtesseract
- --disable-libwavpack
--disable-libzmq
# libav compatibility (deprecated)
@@ -472,6 +466,8 @@ ffmpeg_src_configure() {
### OPTIONS
$(option_enable alsa)
$(option_enable ass libass)
+ $(option_enable av1-decode libdav1d)
+ $(option_enable av1-encode librav1e)
$(option_enable bidi libfribidi)
$(option_enable bluray libbluray)
$(option_enable bs2b libbs2b)
@@ -485,6 +481,7 @@ ffmpeg_src_configure() {
$(option_enable fontconfig)
$(option_enable fontconfig libfontconfig)
$(option_enable frei0r)
+ $(option_enable glslang libglslang)
$(option_enable gsm libgsm)
$(option_enable hap libsnappy)
$(option_enable hevc libx265)
@@ -532,6 +529,7 @@ ffmpeg_src_configure() {
$(option_enable vidstab libvidstab)
$(option_enable vorbis libvorbis)
$(option_enable vpx libvpx)
+ $(option_enable vulkan)
$(option_enable webp libwebp)
$(option_enable X libxcb)
$(option_enable X libxcb-shm)
@@ -582,22 +580,18 @@ ffmpeg_src_configure() {
myconf+=( --disable-openssl )
fi
- if ever at_least 4.3; then
+ if ever at_least 4.4; then
myconf+=(
- $(option_enable av1-decode libdav1d)
- $(option_enable av1-encode librav1e)
-
- # not tested
- --disable-librabbitmq
- # wrong platform, but disable autodetect
- --disable-mediafoundation
- ### OPTIONS
- $(option_enable glslang libglslang)
- $(option_enable vulkan)
+ # missing dependency
+ --disable-libopenvino
+ --disable-librist
+ --disable-libsvtav1
+ --disable-libuavs3d
)
else
myconf+=(
- $(option_enable av1 libdav1d)
+ # not tested
+ --disable-libwavpack
)
fi
diff --git a/packages/media/ffmpeg/files/4dab04622a6cf2a31da26a51dedb60ec44ac89a4.patch b/packages/media/ffmpeg/files/4dab04622a6cf2a31da26a51dedb60ec44ac89a4.patch
new file mode 100644
index 00000000..12b0e4d1
--- /dev/null
+++ b/packages/media/ffmpeg/files/4dab04622a6cf2a31da26a51dedb60ec44ac89a4.patch
@@ -0,0 +1,30 @@
+Source/Upstream: Yes, fixed in git master
+Reason: Fix build with recent glslang
+
+From 4dab04622a6cf2a31da26a51dedb60ec44ac89a4 Mon Sep 17 00:00:00 2001
+From: Ben Clayton <bclayton-at-google.com@ffmpeg.org>
+Date: Fri, 10 Jul 2020 16:53:12 +0100
+Subject: [PATCH] libavfilter/glslang: Remove unused header
+
+The <glslang/Include/revision.h> include was not used, and revision.h has
+been removed from glslang master.
+See: https://github.com/KhronosGroup/glslang/pull/2277
+---
+ libavfilter/glslang.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp
+index 497df6e..125eb5c 100644
+--- a/libavfilter/glslang.cpp
++++ b/libavfilter/glslang.cpp
+@@ -24,7 +24,6 @@ extern "C" {
+ }
+
+ #include <glslang/Include/ResourceLimits.h>
+-#include <glslang/Include/revision.h>
+ #include <glslang/Public/ShaderLang.h>
+ #include <glslang/SPIRV/GlslangToSpv.h>
+
+--
+2.7.4
+
diff --git a/packages/media/ffmpeg/files/98ea1a662ee172961feaa374fe8d26078838d250.patch b/packages/media/ffmpeg/files/98ea1a662ee172961feaa374fe8d26078838d250.patch
new file mode 100644
index 00000000..96fc5a44
--- /dev/null
+++ b/packages/media/ffmpeg/files/98ea1a662ee172961feaa374fe8d26078838d250.patch
@@ -0,0 +1,37 @@
+Source/Upstream: Yes, fixed in git master
+Reason: Fix build with recent glslang
+
+From 98ea1a662ee172961feaa374fe8d26078838d250 Mon Sep 17 00:00:00 2001
+From: Philip Langdale <philipl@overt.org>
+Date: Mon, 17 Aug 2020 16:19:39 -0700
+Subject: [PATCH] configure: Add additional glslang libraries to make linking
+ work
+
+The latest builds of glslang introduce new libraries that need to be
+linked for all symbols to be fully resolved.
+
+This change will break building against older installations of glslang
+and it's very hard to tell them apart as the library change upstream
+was not accompanied by any version bump and no official release has
+been made with this change it - just lots of people packaging up git
+snapshots. So, apologies in advance.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 9ff246b..f13d1a8 100755
+--- a/configure
++++ b/configure
+@@ -6347,7 +6347,7 @@ enabled fontconfig && enable libfontconfig
+ enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
+ enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
+ enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
+-enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
++enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
+ enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
+ require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
+ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+--
+2.7.4
+
diff --git a/packages/media/ffmpeg/files/ffmpeg-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch b/packages/media/ffmpeg/files/ffmpeg-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch
deleted file mode 100644
index 43cbca0a..00000000
--- a/packages/media/ffmpeg/files/ffmpeg-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Source/Upstream: Unknown, https://bugs.chromium.org/p/chromium/issues/detail?id=1095962
-Reason: Temporary fix for Chromium crashing
-
-From e783562c3c6001fa5e585698e9a37119d028da70 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <tgurr@exherbo.org>
-Date: Fri, 19 Jun 2020 23:10:56 +0200
-Subject: [PATCH] Revert "avutil/mem: Use max_alloc_size as-is"
-
-This reverts commit 731c77589841c02e014aa7f8285dcfc8b20f2ee5.
----
- libavutil/mem.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/libavutil/mem.c b/libavutil/mem.c
-index cfb6d8ab8f..a29c224264 100644
---- a/libavutil/mem.c
-+++ b/libavutil/mem.c
-@@ -78,7 +78,8 @@ void *av_malloc(size_t size)
- {
- void *ptr = NULL;
-
-- if (size > max_alloc_size)
-+ /* let's disallow possibly ambiguous cases */
-+ if (size > (max_alloc_size - 32))
- return NULL;
-
- #if HAVE_POSIX_MEMALIGN
-@@ -133,7 +134,8 @@ void *av_malloc(size_t size)
-
- void *av_realloc(void *ptr, size_t size)
- {
-- if (size > max_alloc_size)
-+ /* let's disallow possibly ambiguous cases */
-+ if (size > (max_alloc_size - 32))
- return NULL;
-
- #if HAVE_ALIGNED_MALLOC
-@@ -480,12 +482,12 @@ void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size)
- if (min_size <= *size)
- return ptr;
-
-- if (min_size > max_alloc_size) {
-+ if (min_size > max_alloc_size - 32) {
- *size = 0;
- return NULL;
- }
-
-- min_size = FFMIN(max_alloc_size, FFMAX(min_size + min_size / 16 + 32, min_size));
-+ min_size = FFMIN(max_alloc_size - 32, FFMAX(min_size + min_size / 16 + 32, min_size));
-
- ptr = av_realloc(ptr, min_size);
- /* we could set this to the unmodified min_size but this is safer
---
-2.27.0
-
diff --git a/packages/media/kodi/kodi-18.9.exheres-0 b/packages/media/kodi/kodi-19.0.exheres-0
index dd03bce9..408e0324 100644
--- a/packages/media/kodi/kodi-18.9.exheres-0
+++ b/packages/media/kodi/kodi-19.0.exheres-0
@@ -1,10 +1,10 @@
-# Copyright 2015-2019 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2015-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
# Based in part upon 'kodi-9999.ebuild' from Gentoo, which is:
# Copyright 1999-2015 Gentoo Foundation
-MY_PV=${PV/_beta/b}-Leia
-MY_PV=${PV/_rc/rc}-Leia
+MY_PV=${PV/_beta/b}-Matrix
+MY_PV=${PV/_rc/rc}-Matrix
# tools/depends/target/libdvd{css,nav,read}
LIBDVDCSS_REV="1.4.2-Leia-Beta-5"
diff --git a/packages/media/kodi/kodi-scm.exheres-0 b/packages/media/kodi/kodi-scm.exheres-0
index a042d532..081109ab 100644
--- a/packages/media/kodi/kodi-scm.exheres-0
+++ b/packages/media/kodi/kodi-scm.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2015-2019 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2015-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
# Based in part upon 'kodi-9999.ebuild' from Gentoo, which is:
# Copyright 1999-2015 Gentoo Foundation
diff --git a/packages/media/kodi/kodi.exlib b/packages/media/kodi/kodi.exlib
index d5cce398..9415257d 100644
--- a/packages/media/kodi/kodi.exlib
+++ b/packages/media/kodi/kodi.exlib
@@ -1,4 +1,4 @@
-# Copyright 2015-2019 Timo Gurr <tgurr@exherbo.org>
+# Copyright 2015-2021 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
# Based in part upon 'kodi-9999.ebuild' from Gentoo, which is:
# Copyright 1999-2015 Gentoo Foundation
@@ -8,11 +8,7 @@ require github [ user=xbmc pn=xbmc ] \
freedesktop-desktop \
gtk-icon-cache \
-if ever is_scm; then
- require python [ blacklist=2 multibuild=false has_bin=true python_opts=[sqlite] ]
-else
- require python [ blacklist=3 multibuild=false has_bin=true python_opts=[sqlite] ]
-fi
+require python [ blacklist=2 multibuild=false has_bin=true python_opts=[sqlite] ]
export_exlib_phases src_configure pkg_postinst pkg_postrm
@@ -49,14 +45,9 @@ MYOPTIONS="
( providers: libressl openssl ) [[ number-selected = exactly-one ]]
"
-if ever is_scm; then
- # Fails a bunch of tests:
- # 94% tests passed, 33 tests failed out of 577
- RESTRICT="test"
-else
- # Doesn't find the kodi-test executable
- RESTRICT="test"
-fi
+# fails a bunch of tests, last checked: 19.0
+# 93% tests passed, 41 tests failed out of 586
+RESTRICT="test"
DEPENDENCIES="
build:
@@ -72,24 +63,27 @@ DEPENDENCIES="
dev-libs/crossguid
dev-libs/expat
dev-libs/flatbuffers[>=1.9.0]
- dev-libs/fmt[>=3.0.1]
+ dev-libs/fmt[>=6.1.2]
dev-libs/fribidi
dev-libs/fstrcmp
- dev-libs/libcdio[>=0.78]
+ dev-libs/libcdio[>=2.1.0]
dev-libs/libxml2:2.0
dev-libs/libxslt
dev-libs/pcre
dev-libs/rapidjson[>=1.0.2]
+ dev-libs/spdlog[>=1.5.0]
dev-libs/tinyxml[>=2.6.2]
- dev-python/Pillow[>=3.0.0][python_abis:*(-)?]
+ dev-python/Pillow[>=7.1.2][python_abis:*(-)?]
fonts/dejavu
- media/ffmpeg[>=4.0.4][h264]
+ media/ffmpeg[>=4.3][h264]
+ media-libs/dav1d
media-libs/freetype:2
media-libs/giflib:=[>=4.1.6] [[ note = [ for TexturePacker ] ]]
media-libs/lcms2
media-libs/libass[>=0.9.8]
media-libs/libpng:= [[ note = [ for TexturePacker ] ]]
- media-libs/taglib[>=1.9]
+ media-libs/libudfread[>=1.0.0]
+ media-libs/taglib[>=1.9.0]
media-libs/tiff [[ note = [ for TexturePacker ] ]]
media-sound/lame
net-libs/libmicrohttpd[>=0.9.40]
@@ -99,7 +93,7 @@ DEPENDENCIES="
sys-libs/libcap
sys-libs/zlib
x11-dri/glu
- x11-dri/libdrm[>=2.4.82]
+ x11-dri/libdrm[>=2.4.95]
x11-dri/mesa[X?][wayland?] [[ note = [ provides GBM and GLX ] ]]
X? (
x11-libs/libX11
@@ -108,12 +102,12 @@ DEPENDENCIES="
x11-libs/libXrandr
x11-libs/libXt
)
- airplay? ( dev-libs/libplist )
+ airplay? ( dev-libs/libplist:2.0 )
alsa? ( sys-sound/alsa-lib[>=1.0.27] )
avahi? ( net-dns/avahi )
bluetooth? ( net-wireless/bluez )
nfs? ( net-fs/libnfs[>=2.0.0] )
- pulseaudio? ( media-sound/pulseaudio[>=2.0] )
+ pulseaudio? ( media-sound/pulseaudio[>=11.0.0] )
samba? ( net-fs/samba )
sync? ( virtual/mysql )
va? ( x11-libs/libva[>=0.39.0] )
@@ -127,13 +121,10 @@ DEPENDENCIES="
providers:ijg-jpeg? ( media-libs/jpeg:= )
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
providers:libressl? ( dev-libs/libressl:= )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:=[>=1.0.2] )
providers:systemd? ( sys-apps/systemd )
- run:
- !media/xbmc [[
- description = [ XBMC was renamed to Kodi upstream ]
- resolution = uninstall-blocked-after
- ]]
+ test:
+ dev-cpp/gtest[>=1.10.0]
suggestion:
media-plugins/kodi-pvr-hts [[
description = [ Kodi PVR client Tvheadend HTSP ]
@@ -150,24 +141,30 @@ DEPENDENCIES="
"
CMAKE_SRC_CONFIGURE_PARAMS=(
- -DCMAKE_INSTALL_DOCDIR:PATH=/usr/share/doc/${PNVR}
-
-DBUILD_SHARED_LIBS:BOOL=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=TRUE
- -DENABLE_AML:BOOL=FALSE
+ -DCMAKE_INSTALL_DOCDIR:PATH=/usr/share/doc/${PNVR}
-DENABLE_BLURAY:BOOL=FALSE
-DENABLE_CAP:BOOL=TRUE
-DENABLE_CCACHE:BOOL=FALSE
-DENABLE_CEC:BOOL=FALSE
+ -DENABLE_CLANGTIDY:BOOL=FALSE
+ -DENABLE_CPPCHECK:BOOL=FALSE
-DENABLE_DBUS:BOOL=TRUE
-DENABLE_DVDCSS:BOOL=TRUE
-DENABLE_EVENTCLIENTS:BOOL=FALSE
+ -DENABLE_INCLUDEWHATYOUUSE:BOOL=FALSE
-DENABLE_INTERNAL_CROSSGUID:BOOL=FALSE
+ -DENABLE_INTERNAL_DAV1D:BOOL=FALSE
-DENABLE_INTERNAL_FFMPEG:BOOL=FALSE
-DENABLE_INTERNAL_FLATBUFFERS:BOOL=FALSE
-DENABLE_INTERNAL_FMT:BOOL=FALSE
-DENABLE_INTERNAL_FSTRCMP:BOOL=FALSE
+ -DENABLE_INTERNAL_GTEST:BOOL=FALSE
-DENABLE_INTERNAL_RapidJSON:BOOL=FALSE
+ -DENABLE_INTERNAL_SPDLOG:BOOL=FALSE
+ -DENABLE_INTERNAL_UDFREAD:BOOL=FALSE
+ -DENABLE_ISO9660PP:BOOL=TRUE
-DENABLE_LCMS2:BOOL=TRUE
-DENABLE_LDGOLD:BOOL=FALSE
-DENABLE_LIRCCLIENT:BOOL=FALSE
@@ -199,29 +196,9 @@ CMAKE_SRC_CONFIGURE_OPTION_ENABLES=(
'va VAAPI'
'vdpau VDPAU'
)
-
-if ever is_scm; then
- DEPENDENCIES+="
- build+run:
- dev-libs/fmt[>=6.1.2]
- dev-libs/spdlog[>=1.5.0]
- media-libs/dav1d
- test:
- dev-cpp/gtest[>=1.10.0]
- "
-
- CMAKE_SRC_CONFIGURE_PARAMS+=(
- -DENABLE_INTERNAL_DAV1D:BOOL=FALSE
- -DENABLE_INTERNAL_GTEST:BOOL=FALSE
- -DENABLE_INTERNAL_SPDLOG:BOOL=FALSE
-
- # unpackaged
- -DENABLE_INTERNAL_UDFREAD:BOOL=TRUE
- )
- CMAKE_SRC_CONFIGURE_TESTS=( '-DENABLE_TESTING:BOOL=TRUE -DENABLE_TESTING:BOOL=FALSE' )
-else
- CMAKE_SRC_CONFIGURE_TESTS=( '-DBUILD_TESTING:BOOL=TRUE -DBUILD_TESTING:BOOL=FALSE' )
-fi
+CMAKE_SRC_CONFIGURE_TESTS=(
+ '-DENABLE_TESTING:BOOL=TRUE -DENABLE_TESTING:BOOL=FALSE'
+)
kodi_src_configure() {
local args=()
@@ -230,17 +207,19 @@ kodi_src_configure() {
if option wayland; then
args+=(
- -DCORE_PLATFORM_NAME=wayland
- -DWAYLAND_RENDER_SYSTEM=gl
+ -DCORE_PLATFORM_NAME:STRING=wayland
+ -DAPP_RENDER_SYSTEM:STRING=gl
)
elif option gbm; then
args+=(
- -DCORE_PLATFORM_NAME=gbm
- -DGBM_RENDER_SYSTEM=gles
+ -DCORE_PLATFORM_NAME:STRING=gbm
+ -DAPP_RENDER_SYSTEM:STRING=gles
)
else
- args+=( -DCORE_PLATFORM_NAME=x11 )
- ever is_scm && args+=( -DX11_RENDER_SYSTEM=gl )
+ args+=(
+ -DCORE_PLATFORM_NAME:STRING=x11
+ -DAPP_RENDER_SYSTEM:STRING=gl
+ )
fi
cmake_src_configure "${args[@]}"
diff --git a/packages/media/mpv/files/09d7c75bfe9f6323260a19912e3f3ee7ed737455.patch b/packages/media/mpv/files/09d7c75bfe9f6323260a19912e3f3ee7ed737455.patch
new file mode 100644
index 00000000..60344ecd
--- /dev/null
+++ b/packages/media/mpv/files/09d7c75bfe9f6323260a19912e3f3ee7ed737455.patch
@@ -0,0 +1,153 @@
+Source/Upstream: Yes, fixed in git master
+Reason: Fix build with recent libplacebo versions
+
+From 09d7c75bfe9f6323260a19912e3f3ee7ed737455 Mon Sep 17 00:00:00 2001
+From: Niklas Haas <git@haasn.xyz>
+Date: Tue, 16 Feb 2021 14:36:39 +0100
+Subject: [PATCH] vo_gpu: libplacebo: require v2.72.0
+
+It's about a year old, and packaged pretty much everywhere that bothers
+to package libplacebo at all. Older versions are only a thing on LTS,
+which will probably also use older mpv so it works out.
+
+Starting with v2.72.0, libplacebo validates all of its parameters
+internally and turns them into function failures. Doing it twice is
+awfully redundant, so we can drop the parameter validation.
+
+Also allows us to drop some preprocessor macros.
+---
+ video/out/placebo/ra_pl.c | 52 +--------------------------------------
+ wscript | 2 +-
+ 2 files changed, 2 insertions(+), 52 deletions(-)
+
+diff --git a/video/out/placebo/ra_pl.c b/video/out/placebo/ra_pl.c
+index 8244acff26..d8e8729ed3 100644
+--- a/video/out/placebo/ra_pl.c
++++ b/video/out/placebo/ra_pl.c
+@@ -22,9 +22,7 @@ const struct pl_gpu *ra_pl_get(const struct ra *ra)
+ return ra->fns == &ra_fns_pl ? get_gpu(ra) : NULL;
+ }
+
+-#if PL_API_VER >= 60
+ static struct pl_timer *get_active_timer(const struct ra *ra);
+-#endif
+
+ struct ra *ra_create_pl(const struct pl_gpu *gpu, struct mp_log *log)
+ {
+@@ -163,32 +161,6 @@ static struct ra_tex *tex_create_pl(struct ra *ra,
+ const struct ra_tex_params *params)
+ {
+ const struct pl_gpu *gpu = get_gpu(ra);
+-
+- // Check size limits
+- bool ok = false;
+- switch (params->dimensions) {
+- case 1:
+- ok = params->w <= gpu->limits.max_tex_1d_dim;
+- break;
+-
+- case 2:
+- ok = params->w <= gpu->limits.max_tex_2d_dim &&
+- params->h <= gpu->limits.max_tex_2d_dim;
+- break;
+-
+- case 3:
+- ok = params->w <= gpu->limits.max_tex_2d_dim &&
+- params->h <= gpu->limits.max_tex_2d_dim &&
+- params->d <= gpu->limits.max_tex_2d_dim;
+- break;
+- };
+-
+- if (!ok) {
+- MP_ERR(ra, "Texture size %dx%dx%d exceeds dimension limits!\n",
+- params->w, params->h, params->d);
+- return NULL;
+- }
+-
+ const struct pl_tex *pltex = pl_tex_create(gpu, &(struct pl_tex_params) {
+ .w = params->w,
+ .h = params->dimensions >= 2 ? params->h : 0,
+@@ -238,9 +210,7 @@ static bool tex_upload_pl(struct ra *ra, const struct ra_tex_upload_params *para
+ .buf = params->buf ? params->buf->priv : NULL,
+ .buf_offset = params->buf_offset,
+ .ptr = (void *) params->src,
+-#if PL_API_VER >= 60
+ .timer = get_active_timer(ra),
+-#endif
+ };
+
+ const struct pl_buf *staging = NULL;
+@@ -293,9 +263,7 @@ static bool tex_download_pl(struct ra *ra, struct ra_tex_download_params *params
+ .tex = tex,
+ .ptr = params->dst,
+ .stride_w = params->stride / texel_size,
+-#if PL_API_VER >= 60
+ .timer = get_active_timer(ra),
+-#endif
+ };
+
+ uint8_t *staging = NULL;
+@@ -328,19 +296,7 @@ static struct ra_buf *buf_create_pl(struct ra *ra,
+ [RA_BUF_TYPE_SHARED_MEMORY] = 0,
+ };
+
+- const struct pl_gpu *gpu = get_gpu(ra);
+- size_t max_size[] = {
+- [PL_BUF_TEX_TRANSFER] = gpu->limits.max_xfer_size,
+- [PL_BUF_UNIFORM] = gpu->limits.max_ubo_size,
+- [PL_BUF_STORAGE] = gpu->limits.max_ssbo_size,
+- };
+-
+- if (params->size > max_size[buf_type[params->type]]) {
+- MP_ERR(ra, "Buffer size %zu exceeds size limits!\n", params->size);
+- return NULL;
+- }
+-
+- const struct pl_buf *plbuf = pl_buf_create(gpu, &(struct pl_buf_params) {
++ const struct pl_buf *plbuf = pl_buf_create(get_gpu(ra), &(struct pl_buf_params) {
+ .type = buf_type[params->type],
+ .size = params->size,
+ .host_mapped = params->host_mapped,
+@@ -693,8 +649,6 @@ static void renderpass_run_pl(struct ra *ra,
+ pl_pass_run(get_gpu(ra), &pl_params);
+ }
+
+-#if PL_API_VER >= 60
+-
+ struct ra_timer_pl {
+ // Because libpplacebo only supports one operation per timer, we need
+ // to use multiple pl_timers to sum up multiple passes/transfers
+@@ -766,8 +720,6 @@ static struct pl_timer *get_active_timer(const struct ra *ra)
+ return t->timers[t->idx_timers++];
+ }
+
+-#endif // PL_API_VER >= 60
+-
+ static struct ra_fns ra_fns_pl = {
+ .destroy = destroy_ra_pl,
+ .tex_create = tex_create_pl,
+@@ -786,11 +738,9 @@ static struct ra_fns ra_fns_pl = {
+ .renderpass_create = renderpass_create_pl,
+ .renderpass_destroy = renderpass_destroy_pl,
+ .renderpass_run = renderpass_run_pl,
+-#if PL_API_VER >= 60
+ .timer_create = timer_create_pl,
+ .timer_destroy = timer_destroy_pl,
+ .timer_start = timer_start_pl,
+ .timer_stop = timer_stop_pl,
+-#endif
+ };
+
+diff --git a/wscript b/wscript
+index 86231b79b1..0ced76244a 100644
+--- a/wscript
++++ b/wscript
+@@ -725,7 +725,7 @@ video_output_features = [
+ }, {
+ 'name': '--libplacebo',
+ 'desc': 'libplacebo support',
+- 'func': check_pkg_config('libplacebo >= 1.18.0'),
++ 'func': check_pkg_config('libplacebo >= 2.72.0'),
+ }, {
+ 'name': '--vulkan',
+ 'desc': 'Vulkan context support',
diff --git a/packages/media/mpv/files/7c4465cefb27d4e0d07535d368febdf77b579566.patch b/packages/media/mpv/files/7c4465cefb27d4e0d07535d368febdf77b579566.patch
new file mode 100644
index 00000000..2d38ca6c
--- /dev/null
+++ b/packages/media/mpv/files/7c4465cefb27d4e0d07535d368febdf77b579566.patch
@@ -0,0 +1,87 @@
+Source/Upstream: Yes, fixed in git master
+Reason: Fix build with recent libplacebo versions
+
+From 7c4465cefb27d4e0d07535d368febdf77b579566 Mon Sep 17 00:00:00 2001
+From: Niklas Haas <git@haasn.xyz>
+Date: Thu, 3 Dec 2020 08:25:23 +0100
+Subject: [PATCH] vo_gpu: placebo: update for upstream API changes
+
+The concept of sample/address modes was moved from `pl_tex` to
+`pl_desc_binding`.
+
+The `pl_tex_blit()` function also underwent an API change.
+---
+ video/out/placebo/ra_pl.c | 31 +++++++++++++++++++++++++++++--
+ 1 file changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/video/out/placebo/ra_pl.c b/video/out/placebo/ra_pl.c
+index f8df590511..8244acff26 100644
+--- a/video/out/placebo/ra_pl.c
++++ b/video/out/placebo/ra_pl.c
+@@ -144,8 +144,14 @@ bool mppl_wrap_tex(struct ra *ra, const struct pl_tex *pltex,
+ .blit_dst = pltex->params.blit_dst,
+ .host_mutable = pltex->params.host_writable,
+ .downloadable = pltex->params.host_readable,
++#if PL_API_VER >= 103
++ // These don't exist upstream, so just pick something reasonable
++ .src_linear = pltex->params.format->caps & PL_FMT_CAP_LINEAR,
++ .src_repeat = false,
++#else
+ .src_linear = pltex->params.sample_mode == PL_TEX_SAMPLE_LINEAR,
+ .src_repeat = pltex->params.address_mode == PL_TEX_ADDRESS_REPEAT,
++#endif
+ },
+ .priv = (void *) pltex,
+ };
+@@ -195,10 +201,12 @@ static struct ra_tex *tex_create_pl(struct ra *ra,
+ .blit_dst = params->blit_dst || params->render_dst,
+ .host_writable = params->host_mutable,
+ .host_readable = params->downloadable,
++#if PL_API_VER < 103
+ .sample_mode = params->src_linear ? PL_TEX_SAMPLE_LINEAR
+ : PL_TEX_SAMPLE_NEAREST,
+ .address_mode = params->src_repeat ? PL_TEX_ADDRESS_REPEAT
+ : PL_TEX_ADDRESS_CLAMP,
++#endif
+ .initial_data = params->initial_data,
+ });
+
+@@ -399,7 +407,18 @@ static void blit_pl(struct ra *ra, struct ra_tex *dst, struct ra_tex *src,
+ pldst.y1 = MPMIN(MPMAX(dst_rc->y1, 0), dst->params.h);
+ }
+
++#if PL_API_VER >= 103
++ pl_tex_blit(get_gpu(ra), &(struct pl_tex_blit_params) {
++ .src = src->priv,
++ .dst = dst->priv,
++ .src_rc = plsrc,
++ .dst_rc = pldst,
++ .sample_mode = src->params.src_linear ? PL_TEX_SAMPLE_LINEAR
++ : PL_TEX_SAMPLE_NEAREST,
++ });
++#else
+ pl_tex_blit(get_gpu(ra), dst->priv, src->priv, pldst, plsrc);
++#endif
+ }
+
+ static const enum pl_var_type var_type[RA_VARTYPE_COUNT] = {
+@@ -627,9 +646,17 @@ static void renderpass_run_pl(struct ra *ra,
+ struct pl_desc_binding bind;
+ switch (inp->type) {
+ case RA_VARTYPE_TEX:
+- case RA_VARTYPE_IMG_W:
+- bind.object = (* (struct ra_tex **) val->data)->priv;
++ case RA_VARTYPE_IMG_W: {
++ struct ra_tex *tex = *((struct ra_tex **) val->data);
++ bind.object = tex->priv;
++#if PL_API_VER >= 103
++ bind.sample_mode = tex->params.src_linear ? PL_TEX_SAMPLE_LINEAR
++ : PL_TEX_SAMPLE_NEAREST;
++ bind.address_mode = tex->params.src_repeat ? PL_TEX_ADDRESS_REPEAT
++ : PL_TEX_ADDRESS_CLAMP;
++#endif
+ break;
++ }
+ case RA_VARTYPE_BUF_RO:
+ case RA_VARTYPE_BUF_RW:
+ bind.object = (* (struct ra_buf **) val->data)->priv;
diff --git a/packages/media/mpv/mpv-0.33.0.exheres-0 b/packages/media/mpv/mpv-0.33.1.exheres-0
index 2ccdb336..f3654b0f 100644
--- a/packages/media/mpv/mpv-0.33.0.exheres-0
+++ b/packages/media/mpv/mpv-0.33.1.exheres-0
@@ -5,3 +5,8 @@ require mpv
PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/7c4465cefb27d4e0d07535d368febdf77b579566.patch
+ "${FILES}"/09d7c75bfe9f6323260a19912e3f3ee7ed737455.patch
+)
+
diff --git a/packages/media/mpv/mpv.exlib b/packages/media/mpv/mpv.exlib
index e429159b..a78db1ec 100644
--- a/packages/media/mpv/mpv.exlib
+++ b/packages/media/mpv/mpv.exlib
@@ -88,7 +88,7 @@ DEPENDENCIES="
va? ( x11-libs/libva[>=2.1.0][X?][wayland?] )
vdpau? ( x11-libs/libvdpau[>=0.2] )
vulkan? (
- media-libs/libplacebo[>=1.18.0]
+ media-libs/libplacebo[>=2.72.0]
sys-libs/shaderc
sys-libs/vulkan-loader
)
diff --git a/packages/media/vlc/files/vlc-adaptive-add-missing-limits-include.patch b/packages/media/vlc/files/vlc-adaptive-add-missing-limits-include.patch
new file mode 100644
index 00000000..6572f937
--- /dev/null
+++ b/packages/media/vlc/files/vlc-adaptive-add-missing-limits-include.patch
@@ -0,0 +1,68 @@
+Upstream: yes, cherry-picked from e3de1b709b258d2b0e316d927f5c828bdb1a738a in
+ vlc.git
+
+From 1067281479354a7901d9fd25eedbffd9b4f4ad15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Tue, 14 Dec 2021 03:23:52 +0100
+Subject: [PATCH] adaptive: add missing <limits> include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Compilation would fail with:
+
+> error: 'numeric_limits' is not a member of 'std'
+
+without this include because of some hardening build
+flags mandated on Fedora Linux, with GCC 11.
+
+Refs #25325
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>
+---
+ modules/demux/adaptive/playlist/Inheritables.cpp | 2 ++
+ modules/demux/adaptive/playlist/SegmentInformation.cpp | 1 +
+ modules/demux/adaptive/playlist/SegmentTimeline.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/modules/demux/adaptive/playlist/Inheritables.cpp b/modules/demux/adaptive/playlist/Inheritables.cpp
+index 218160e84f..a8670141c0 100644
+--- a/modules/demux/adaptive/playlist/Inheritables.cpp
++++ b/modules/demux/adaptive/playlist/Inheritables.cpp
+@@ -24,6 +24,8 @@
+
+ #include "Inheritables.hpp"
+
++#include <limits>
++
+ using namespace adaptive::playlist;
+ using namespace adaptive;
+
+diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
+index 344e155c78..8eeb054397 100644
+--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
++++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
+@@ -34,6 +34,7 @@
+
+ #include <algorithm>
+ #include <cassert>
++#include <limits>
+
+ using namespace adaptive::playlist;
+
+diff --git a/modules/demux/adaptive/playlist/SegmentTimeline.cpp b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
+index 7daa517dde..3352f4e905 100644
+--- a/modules/demux/adaptive/playlist/SegmentTimeline.cpp
++++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
+@@ -27,6 +27,7 @@
+ #include "SegmentTimeline.h"
+
+ #include <algorithm>
++#include <limits>
+
+ using namespace adaptive::playlist;
+
+--
+2.31.1
+
diff --git a/packages/media/vlc/files/vlc-hls-add-missing-limits-include.patch b/packages/media/vlc/files/vlc-hls-add-missing-limits-include.patch
new file mode 100644
index 00000000..729f4dd7
--- /dev/null
+++ b/packages/media/vlc/files/vlc-hls-add-missing-limits-include.patch
@@ -0,0 +1,41 @@
+Upstream: yes, vlc.git
+Reason: Fix build with gcc11
+
+From 3aea33378b0b317b99fce2eeaca8b31bf7cc6aba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Mon, 14 Dec 2020 03:23:52 +0100
+Subject: [PATCH] hls: add missing <limits> include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Compilation would fail with:
+
+> error: 'numeric_limits' is not a member of 'std'
+
+without this include because of some hardening build
+flags mandated on Fedora Linux, with GCC 11.
+
+Refs #25325
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>
+---
+ modules/demux/hls/playlist/Parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp
+index e2e1aaefe4..5dc889d78f 100644
+--- a/modules/demux/hls/playlist/Parser.cpp
++++ b/modules/demux/hls/playlist/Parser.cpp
+@@ -42,6 +42,7 @@
+ #include <map>
+ #include <cctype>
+ #include <algorithm>
++#include <limits>
+
+ using namespace adaptive;
+ using namespace adaptive::playlist;
+--
+2.31.1
+
diff --git a/packages/media/vlc/vlc-3.0.12.exheres-0 b/packages/media/vlc/vlc-3.0.12.exheres-0
index f2646fe4..466c4d2c 100644
--- a/packages/media/vlc/vlc-3.0.12.exheres-0
+++ b/packages/media/vlc/vlc-3.0.12.exheres-0
@@ -7,5 +7,7 @@ PLATFORMS="~amd64 ~armv7 ~x86"
DEFAULT_SRC_PREPARE_PATCHES+=(
"${FILES}"/${PN}-Fix-build-with-opencv-3.4.9.patch
+ "${FILES}"/${PN}-adaptive-add-missing-limits-include.patch
+ "${FILES}"/${PN}-hls-add-missing-limits-include.patch
)
diff --git a/packages/net-apps/snapcast/snapcast-0.23.0.exheres-0 b/packages/net-apps/snapcast/snapcast-0.24.0.exheres-0
index 81658671..a6436c62 100644
--- a/packages/net-apps/snapcast/snapcast-0.23.0.exheres-0
+++ b/packages/net-apps/snapcast/snapcast-0.24.0.exheres-0
@@ -61,6 +61,7 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DBUILD_STATIC_LIBS:BOOL=FALSE
-DBUILD_WITH_EXPAT:BOOL=TRUE
-DBUILD_WITH_TREMOR:BOOL=FALSE
+ -DTIDY:BOOL=FALSE
-DTSAN:BOOL=FALSE
-DUBSAN:BOOL=FALSE
-DWERROR:BOOL=FALSE
diff --git a/packages/net-misc/youtube-dl/youtube-dl-2021.02.04.1.exheres-0 b/packages/net-misc/youtube-dl/youtube-dl-2021.04.07.exheres-0
index 29b90f7a..59f374f4 100644
--- a/packages/net-misc/youtube-dl/youtube-dl-2021.02.04.1.exheres-0
+++ b/packages/net-misc/youtube-dl/youtube-dl-2021.04.07.exheres-0
@@ -15,9 +15,14 @@ MYOPTIONS=""
# they need internet access
RESTRICT="test"
-DEPENDENCIES=""
# test:
# dev-python/nose
+DEPENDENCIES="
+ suggestion:
+ media/ffmpeg [[
+ description = [ Many extractors have FFmpeg as a requirement ]
+ ]]
+"
WORK=${WORKBASE}/${PN}