diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 25 | ||||
| -rw-r--r-- | removestupidremarks.patch | 27 |
3 files changed, 21 insertions, 44 deletions
@@ -1,5 +1,5 @@ pkgbase = kodi-eggz - pkgver = 20.0a3 + pkgver = 21.0 pkgrel = 1 url = https://kodi.tv arch = x86_64 @@ -52,16 +52,17 @@ pkgbase = kodi-eggz makedepends = meson makedepends = gtest makedepends = fstrcmp - makedepends = spdlog + makedepends = flatbuffers + makedepends = ffmpeg + makedepends = jre8-openjdk depends = libcec depends = tinyxml depends = shairplay - source = git+https://github.com/xbmc/xbmc.git#tag=20.0a3-Nexus - source = git+https://github.com/xbmc/vfs.rar.git#tag=20.1.0-Nexus - source = removestupidremarks.patch + depends = libdisplay-info + source = git+https://github.com/xbmc/xbmc.git + source = git+https://github.com/xbmc/vfs.rar.git sha256sums = SKIP sha256sums = SKIP - sha256sums = 2b70aecae2fb11fef8f925baa8e272cacb17add58fc6fdbf791b30e7e4b2baed pkgname = kodi-eggz pkgdesc = Latest stable-ish kodi build with VFS automaticly installed @@ -1,13 +1,12 @@ pkgbase=kodi-eggz pkgname=kodi-eggz -pkgver=20.0a3 -gittag=20.0a3-Nexus -gittagvfs=20.1.0-Nexus +pkgver=21.0 +gittag=21.0-Omega pkgrel=1 arch=('x86_64') url="https://kodi.tv" license=('GPL2') -depends=('libcec' 'tinyxml' 'shairplay') +depends=('libcec' 'tinyxml' 'shairplay' 'libdisplay-info') makedepends=( 'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'glew' 'gperf' 'hicolor-icon-theme' 'java-runtime' 'libaacs' 'libass' @@ -17,19 +16,18 @@ makedepends=( 'python-pycryptodomex' 'python-pillow' 'python-pybluez' 'python-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig' 'upower' 'giflib' 'rapidjson' 'ghostscript' 'git' 'meson' 'gtest' - 'fstrcmp' 'spdlog' + 'fstrcmp' 'flatbuffers' 'ffmpeg' 'jre8-openjdk' ) source=( - "git+https://github.com/xbmc/xbmc.git#tag=$gittag" - "git+https://github.com/xbmc/vfs.rar.git#tag=$gittagvfs" - "removestupidremarks.patch" + #"git+https://github.com/xbmc/xbmc.git#tag=$gittag" + "git+https://github.com/xbmc/xbmc.git" + "git+https://github.com/xbmc/vfs.rar.git" ) sha256sums=( 'SKIP' 'SKIP' -'2b70aecae2fb11fef8f925baa8e272cacb17add58fc6fdbf791b30e7e4b2baed' ) pkgver() { @@ -53,8 +51,11 @@ prepare() { cd ${srcdir}/xbmc msg2 "Patching Kodisource" while read patch; do + if [ "$patch" == "" ]; then + continue + fi echo "Applying $patch" - git apply $patch || exit 2 + git apply $patch -v done <<< $(ls ../../*.patch) } @@ -62,11 +63,13 @@ build() { export PATH="$srcdir/path:$PATH" msg2 "pivot to kodi git dir" cd ${srcdir}/xbmc + msg2 "checkout working commit" + git checkout b35acf7bd3de2d5564d4d30c8800b3da7f9670f0 || exit 2 mkdir ${srcdir}/kodi-build cd ${srcdir}/kodi-build msg2 "cmake configure phase" export APP_RENDER_SYSTEM=gl - cmake ../xbmc -DCMAKE_INSTALL_PREFIX=/usr -DX11_RENDER_SYSTEM=gl -DENABLE_INTERNAL_FMT=on -DENABLE_INTERNAL_FFMPEG=ON -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FSTRCMP=ON -DENABLE_INTERNAL_FLATBUFFERS=ON -DENABLE_INTERNAL_SPDLOG=ON -DENABLE_MYSQLCLIENT=ON + cmake ../xbmc -DAPP_RENDER_SYSTEM=gl -DCMAKE_INSTALL_PREFIX=/usr -DX11_RENDER_SYSTEM=gl -DENABLE_INTERNAL_FMT=on -DENABLE_INTERNAL_FSTRCMP=ON -DENABLE_INTERNAL_SPDLOG=ON -DENABLE_MYSQLCLIENT=ON -DHAVE_EGLEXTANGLE=1 msg2 "cmake build phase" cmake --build . -- #VERBOSE=1 diff --git a/removestupidremarks.patch b/removestupidremarks.patch deleted file mode 100644 index 7553656be223..000000000000 --- a/removestupidremarks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 51c182c0de4ee3a8c7056975189d0ee4afbe487a Mon Sep 17 00:00:00 2001 -From: egnappahz <egnappah@gmail.com> -Date: Fri, 9 Sep 2022 09:25:02 +0200 -Subject: [PATCH] No. - -Signed-off-by: egnappahz <egnappah@gmail.com> ---- - cmake/scripts/common/Platform.cmake | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/cmake/scripts/common/Platform.cmake b/cmake/scripts/common/Platform.cmake -index 397d8d46e8..87852ef9fc 100644 ---- a/cmake/scripts/common/Platform.cmake -+++ b/cmake/scripts/common/Platform.cmake -@@ -8,7 +8,8 @@ if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd) - set(_DEFAULT_PLATFORM X11 WAYLAND GBM) - - if(NOT APP_RENDER_SYSTEM) -- message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering. Please set APP_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".") -+ # message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering. Please set APP_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".") -+ set(APP_RENDER_SYSTEM "gl") - endif() - else() - string(TOLOWER ${CORE_SYSTEM_NAME} _DEFAULT_PLATFORM) --- -2.37.3 - |