Go back to naming scheme: kodi-branch-git

1 files changed, 30 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index afa03ca19a87..177cb51390a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 # vim:set ts=2 sw=2 et:
-# Maintainer graysky <graysky AT archlinux DOT us>
+# Maintainer graysky <therealgraysky AT protonmail DOT com>
 # Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: DonVla <donvla@users.sourceforge.net>
@@ -22,7 +22,7 @@ _clangbuild=
 
 pkgbase=kodi-matrix-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r57338.dcec5f49743
+pkgver=r57747.813a194c4e8
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -41,6 +41,8 @@ makedepends=(
   # gbm
   'libinput'
 )
+options=(!lto)
+
 [[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm')
 
 _gitname='xbmc'
@@ -70,7 +72,7 @@ _flatbuffers_version="1.12.0"
 _libudfread_version="1.1.0"
 
 source=(
-  "git://github.com/xbmc/xbmc.git#branch=$_codename"
+  "git+https://github.com/xbmc/xbmc.git#branch=$_codename"
   "libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz"
   "libdvdnav-$_libdvdnav_version.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version.tar.gz"
   "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz"
@@ -81,7 +83,9 @@ source=(
   "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
-  'cheat-sse-build.patch'
+  cheat-sse-build.patch
+  build-fix-for-dav1d-1.0.0.patch
+  0001-add-dav1d-patch-to-build-system.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -106,7 +110,9 @@ b2sums=('SKIP'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         '441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6'
         'e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
+        '6928d0fb1f4cb2609dee87c7078e02cecc37ddef263485b47be0ae5c281be67b403b39c95ea370c6b6667e1eceb1c7e6fb83ec9b04acd0bdbe4abec17fb84385'
+        'f1769867f7bb998e9705cfe7709072436bc4824775ad6ccd151bb240798413a92c4a5c92452f5b781a439660a3d9a0846ebf6fefebdfa50b95f076ffdc6ff55e')
 
 pkgver() {
   cd "$_gitname"
@@ -119,7 +125,13 @@ prepare() {
 
   cd "$_gitname"
 
-  [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
+  # make build system patch ffmpeg for dav1d 1.0.0
+  patch -p1 -i ../0001-add-dav1d-patch-to-build-system.patch
+
+  # put patch in source tree so kodi build system can pick it up
+  cp ../build-fix-for-dav1d-1.0.0.patch tools/depends/target/ffmpeg
+
+  [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i ../cheat-sse-build.patch
 
   if [[ -n "$_clangbuild" ]]; then
     msg "Building with clang"
@@ -130,9 +142,9 @@ prepare() {
 build() {
   cd "$srcdir/kodi-build"
 
-  ### Optionally uncomment and setup to your liking
-  # export CFLAGS+=" -march=native"
-  # export CXXFLAGS="${CFLAGS}"
+  # fix build breakage introduced with gcc-12.1.0-1
+  export CFLAGS+=" -Wno-error"
+  export CXXFLAGS="${CFLAGS}"
 
   _args=(
     -DCMAKE_BUILD_TYPE=Release
@@ -142,6 +154,9 @@ build() {
     -DVERBOSE=ON
     -DENABLE_LDGOLD=OFF
     -DENABLE_EVENTCLIENTS=ON
+    -DENABLE_MYSQLCLIENT=ON
+    -DENABLE_VAAPI=ON
+    -DENABLE_VDPAU=ON
     -DENABLE_INTERNAL_FFMPEG=ON
     -DENABLE_INTERNAL_FMT=ON
     -DENABLE_INTERNAL_SPDLOG=ON
@@ -149,9 +164,6 @@ build() {
     -DENABLE_INTERNAL_FSTRCMP=ON
     -DENABLE_INTERNAL_FLATBUFFERS=ON
     -DENABLE_INTERNAL_UDFREAD=ON
-    -DENABLE_MYSQLCLIENT=ON
-    -DENABLE_VAAPI=ON
-    -DENABLE_VDPAU=ON
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz"
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz"
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz"
@@ -163,9 +175,11 @@ build() {
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz"
     -DUDFREAD_URL="$srcdir/libudfread-$_libudfread_version.tar.gz"
     -DAPP_RENDER_SYSTEM=gl
-    -DCORE_PLATFORM_NAME="x11 wayland gbm"
   )
 
+  # https://github.com/google/flatbuffers/issues/7404
+  CXXFLAGS+=' -Wno-error=restrict'
+
   echo "building kodi"
   cmake "${_args[@]}" ../"$_gitname"
   make
@@ -182,6 +196,7 @@ package_kodi-matrix-git() {
     'mesa' 'python-pillow' 'python-pycryptodomex' 'python-simplejson'
     'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml'
     'libxrandr' 'libxkbcommon' 'waylandpp' 'libinput'
+    'pcre'
   )
   [[ -n "$_clangbuild" ]] && depends+=('glu')
 
@@ -193,8 +208,8 @@ package_kodi-matrix-git() {
     'upower: Display battery level'
   )
   provides=("kodi=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
-  replaces=('kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
-  conflicts=('kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
+  replaces=('kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm' 'kodi-matrix-git')
+  conflicts=('kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm' 'kodi-matrix-git')
 
   _components=(
     'kodi'