Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 55E0B781D63 for <~alpine/aports@lists.alpinelinux.org>; Sat, 10 Aug 2019 17:27:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 21BE427DA5 for <~alpine/aports@lists.alpinelinux.org>; Sat, 10 Aug 2019 19:27:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J5IRNhlQwy6v; Sat, 10 Aug 2019 19:26:58 +0200 (CEST) From: Bart Ribbers DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1565458016; bh=3XpnpeKNIUV/O4ggoCejHr/Neg+0sVucYQusl/gztpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jXy+ZKjSTbsJ0OQVhmJfbNyx0K910y3cC1Dq5CfhveukAxNsyotidIk/lwBQG5PYc bmZK4Sn2eCcgn7B1rZDfNsWF2v6SnhVdjYAiJqHecqh7I0wNFzI1VKB9ZM3wO2pB+0 mWesA3gleCNLBTyCwizfzWbj14J6x4xu8JAFC6kcVU4AuiWfQArrUkfLwCSSZovBU+ VNmOymAQr4/qo1eLKkeP5Q7Tz2gRwhgfgnaouCWxy7RzStxpoksR9mAmMVVTs5Mhjo gfXR3EPRNS9ddluCR8CZ9PX+LtqRna2vgl3wcPxSRfw+AHqnneYfwy44VF2/JraSDZ hVzByXfLqimHQ== To: ~alpine/aports@lists.alpinelinux.org Cc: Bart Ribbers Subject: [PATCH 4/4] community/kodi: add -wayland and -gbm subpackages Date: Sat, 10 Aug 2019 19:26:48 +0200 Message-Id: <20190810172648.15624-4-bribbers@disroot.org> In-Reply-To: <20190810172648.15624-1-bribbers@disroot.org> References: <20190810172648.15624-1-bribbers@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit All files required except for the display specific binaries are in "kodi". X11 is in "kodi-bin" and Wayland is in "kodi-wayland" and GBM in "kodi-gbm". Unless the user explicitely installs "kodi-wayland" or "kodi-gbm" first, "kodi-bin" (so X11) will be installed by default when installing "kodi". --- community/kodi/APKBUILD | 104 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 6 deletions(-) diff --git a/community/kodi/APKBUILD b/community/kodi/APKBUILD index e96d075706..7a6d168331 100644 --- a/community/kodi/APKBUILD +++ b/community/kodi/APKBUILD @@ -3,7 +3,7 @@ pkgname=kodi pkgver=18.2 _realname=Leia -pkgrel=0 +pkgrel=1 _libdvdcss_pkgver="1.4.2-Leia-Beta-5" _libdvdread_pkgver="6.0.0-Leia-Alpha-3" _libdvdnav_pkgver="6.0.0-Leia-Alpha-3" @@ -42,7 +42,21 @@ depends_dev="libass-dev mesa-dev glu-dev libjpeg-turbo-dev +" +# Required for Wayland +depends_dev="$depends_dev + waylandpp-dev + libxkbcommon-dev +" + +# Required for gbm +depends_dev="$depends_dev + libinput-dev +" + +# Optional for extra features +depends_dev="$depends_dev alsa-lib-dev avahi-dev bluez-dev @@ -71,8 +85,9 @@ makedepends="$depends_dev graphviz xz tar - openjdk8-jre-base" -subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" + openjdk8-jre-base + wayland-protocols" +subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-bin $pkgname-wayland $pkgname-gbm" replaces="xbmc" options="ldpath-recursive !check" # No testsuite source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz @@ -93,12 +108,16 @@ builddir="$srcdir/xbmc-$pkgver-$_realname" prepare() { default_prepare - mkdir "$builddir"/build + mkdir "$builddir"/build-x11 + mkdir "$builddir"/build-wayland + mkdir "$builddir"/build-gbm } build() { make -C tools/depends/target/crossguid PREFIX="$PWD"/usr - cd "$builddir"/build + + # X11 + cd "$builddir"/build-x11 cmake "$builddir" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -114,11 +133,84 @@ build() { -Dlibdvdnav_URL="$srcdir"/libdvdnav-$_libdvdnav_pkgver.tar.gz \ -DCROSSGUID_URL="$srcdir"/crossguid-$_crossguid_hash.tar.gz make + make preinstall + + # Wayland + cd "$builddir"/build-wayland + cmake "$builddir" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DENABLE_INTERNAL_CROSSGUID=ON \ + -DENABLE_INTERNAL_FFMPEG=OFF \ + -DENABLE_INTERNAL_RapidJSON=OFF \ + -DENABLE_INTERNAL_FMT=OFF \ + -DENABLE_INTERNAL_FSTRCMP=OFF \ + -DENABLE_INTERNAL_FLATBUFFERS=OFF \ + -Dlibdvdcss_URL="$srcdir"/libdvdcss-$_libdvdcss_pkgver.tar.gz \ + -Dlibdvdread_URL="$srcdir"/libdvdread-$_libdvdread_pkgver.tar.gz \ + -Dlibdvdnav_URL="$srcdir"/libdvdnav-$_libdvdnav_pkgver.tar.gz \ + -DCROSSGUID_URL="$srcdir"/crossguid-$_crossguid_hash.tar.gz \ + -DCORE_PLATFORM_NAME=wayland \ + -DWAYLAND_RENDER_SYSTEM=gl + make + make preinstall + + # GBM + cd "$builddir"/build-gbm + cmake "$builddir" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DENABLE_INTERNAL_CROSSGUID=ON \ + -DENABLE_INTERNAL_FFMPEG=OFF \ + -DENABLE_INTERNAL_RapidJSON=OFF \ + -DENABLE_INTERNAL_FMT=OFF \ + -DENABLE_INTERNAL_FSTRCMP=OFF \ + -DENABLE_INTERNAL_FLATBUFFERS=OFF \ + -Dlibdvdcss_URL="$srcdir"/libdvdcss-$_libdvdcss_pkgver.tar.gz \ + -Dlibdvdread_URL="$srcdir"/libdvdread-$_libdvdread_pkgver.tar.gz \ + -Dlibdvdnav_URL="$srcdir"/libdvdnav-$_libdvdnav_pkgver.tar.gz \ + -DCROSSGUID_URL="$srcdir"/crossguid-$_crossguid_hash.tar.gz \ + -DCORE_PLATFORM_NAME=gbm \ + -DGBM_RENDER_SYSTEM=gles + make + make preinstall } package() { - cd "$builddir"/build + depends="$pkgname-bin" + + cd "$builddir"/build-x11 make DESTDIR="$pkgdir" install + + rm \ + "$pkgdir"/usr/lib/kodi/kodi-x11 \ + "$pkgdir"/usr/lib/kodi/kodi-xrandr +} + +bin() { + pkgdesc="X11 Kodi binary" + + cd "$builddir"/build-x11 + install -Dm755 kodi-x11 "$subpkgdir"/usr/lib/kodi/kodi-x11 + install -Dm755 kodi-xrandr "$subpkgdir"/usr/lib/kodi/kodi-xrandr +} + +wayland() { + pkgdesc="Wayland Kodi binary" + provides="$pkgname-bin" + + cd "$builddir"/build-wayland + install -Dm755 kodi-wayland "$subpkgdir"/usr/lib/kodi/kodi-wayland +} + +gbm() { + pkgdesc="GBM Kodi binary" + provides="$pkgname-bin" + + cd "$builddir"/build-gbm + install -Dm755 kodi-gbm "$subpkgdir"/usr/lib/kodi/kodi-gbm } sha512sums="7b63dc9c082f538690d28dd6da10999888af2b9de2e532bca54420753f64238f42e1c2aa0f7481c823e544260a1e4d68e1ba50f84db53307d08f0749992dff2f 18.2-Leia.tar.gz -- 2.21.0