summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO52
-rw-r--r--PKGBUILD140
2 files changed, 35 insertions, 157 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9e310955142..e6258a3b792 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,7 @@
pkgbase = kodi-gb-git
- pkgver = 18.0.r48226.3837206eaa
- pkgrel = 2
+ pkgver = 18.0.r48337.dcdf336207
+ pkgrel = 1
url = http://kodi.tv
- arch = i686
arch = x86_64
license = GPL2
makedepends = afpfs-ng
@@ -53,7 +52,7 @@ pkgbase = kodi-gb-git
sha256sums = SKIP
pkgname = kodi-gb-git
- pkgdesc = A software media player and entertainment hub for digital media (retroplayer branch)
+ pkgdesc = A software media player and entertainment hub for digital media (retroplayer / garbear)
depends = bluez-libs
depends = desktop-file-utils
depends = ffmpeg
@@ -86,56 +85,37 @@ pkgname = kodi-gb-git
optdepends = unrar: Archives support
optdepends = unzip: Archives support
optdepends = upower: Display battery level
- provides = kodi
provides = xbmc
+ provides = kodi
+ provides = kodi-gb
+ conflicts = xbmc
conflicts = kodi
conflicts = kodi-git
- conflicts = xbmc
- replaces = xbmc-git
- replaces = xbmc-svn
+ conflicts = arm-mem-git
+ conflicts = shairplay-git
+ replaces = xbmc-rbp-git
pkgname = kodi-gb-eventclients-git
- pkgdesc = Kodi Event Clients (retroplayer branch)
+ pkgdesc = Kodi event clients (retroplayer / garbear)
depends = cwiid
+ provides = kodi-eventclients
conflicts = kodi-eventclients
conflicts = kodi-eventclients-git
pkgname = kodi-gb-tools-texturepacker-git
- pkgdesc = Kodi Texturepacker tool (retroplayer branch)
+ pkgdesc = Kodi texturepacker tool (retroplayer / garbear)
depends = giflib
depends = libjpeg-turbo
depends = libpng
depends = lzo
+ conflicts = kodi-tools-texturepacker
conflicts = kodi-tools-texturepacker-git
pkgname = kodi-gb-dev-git
- pkgdesc = Kodi dev files (retroplayer branch)
+ pkgdesc = Kodi dev files (retroplayer / garbear)
depends = kodi
provides = kodi-dev
+ provides = kodi-gb-dev
+ conflicts = kodi-dev
conflicts = kodi-dev-git
-pkgname = kodi-gb-addon-peripheral-joystick-git
- pkgdesc = Joystick support for Kodi
- groups = kodi-addons
- groups = kodi-addons-peripheral
- depends = kodi
-
-pkgname = kodi-gb-addon-game-libretro-git
- pkgdesc = libretro game addon for kodi
- groups = kodi-addons
- groups = kodi-addons-game
- depends = kodi
- provides = kodi-addon-game-libretro
-
-pkgname = kodi-gb-addon-game-libretro-snes9x2010-git
- pkgdesc = libretro game addon for kodi - Snes9x Next. (Super Nintendo Entertainment System)
- groups = kodi-addons
- groups = kodi-addons-game
- depends = kodi-addon-game-libretro
-
-pkgname = kodi-gb-addon-game-libretro-genplus-git
- pkgdesc = libretro game addon for kodi - Genesis Plus GX. (Sega Master System/Sega Game Gear/Sega Mega Drive/Sega Genesis/Sega CD)
- groups = kodi-addons
- groups = kodi-addons-game
- depends = kodi-addon-game-libretro
-
diff --git a/PKGBUILD b/PKGBUILD
index eaf1d3d78ae..bc807839adc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,13 +17,11 @@
# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD
pkgbase=kodi-gb-git
-pkgname=('kodi-gb-git' 'kodi-gb-eventclients-git' 'kodi-gb-tools-texturepacker-git' 'kodi-gb-dev-git'
- 'kodi-gb-addon-peripheral-joystick-git'
- 'kodi-gb-addon-game-libretro-git' 'kodi-gb-addon-game-libretro-snes9x2010-git' 'kodi-gb-addon-game-libretro-genplus-git')
+pkgname=('kodi-gb-git' 'kodi-gb-eventclients-git' 'kodi-gb-tools-texturepacker-git' 'kodi-gb-dev-git')
_gitname='xbmc'
-pkgver=18.0.r48226.3837206eaa
-pkgrel=2
-arch=('i686' 'x86_64')
+pkgver=18.0.r48337.dcdf336207
+pkgrel=1
+arch=('x86_64')
url="http://kodi.tv"
license=('GPL2')
makedepends=('afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'ffmpeg' 'glew'
@@ -46,12 +44,6 @@ pkgver() {
prepare() {
[[ -d kodi-build ]] && rm -rf kodi-build
mkdir kodi-build
-
- [[ -d kodi-addons-build ]] && rm -rf kodi-addons-build
- mkdir kodi-addons-build
-
- [[ -d kodi-addons-game-build ]] && rm -rf kodi-addons-game-build
- mkdir kodi-addons-game-build
}
build() {
@@ -67,49 +59,10 @@ build() {
"../$_gitname"
make
make preinstall
-
- # main addons
- _addons="peripheral.joystick"
-
- # - cleanup previous addons
- [[ -d "$srcdir/$_gitname/cmake/addons/addons/" ]] && rm -rf "$srcdir/$_gitname/cmake/addons/addons/"
-
- # - switch to xbmc bootstrap
- echo "binary-addons https://github.com/xbmc/repo-binary-addons.git master" > "$srcdir/$_gitname/cmake/addons/bootstrap/repositories/binary-addons.txt"
-
- # - build
- cd ../kodi-addons-build
- cmake \
- -DADDONS_TO_BUILD="$_addons" \
- -DCMAKE_INSTALL_PREFIX=addons/ \
- -DPACKAGE_ZIP=1 \
- "../$_gitname/cmake/addons"
- make
-
- # kodi-game addons
- _addons="game.libretro game.libretro.snes9x2010 game.libretro.genplus"
-
- # - cleanup previous addons
- [[ -d "$srcdir/$_gitname/cmake/addons/addons/" ]] && rm -rf "$srcdir/$_gitname/cmake/addons/addons/"
-
- # - switch to kodi-game bootstrap
- echo "binary-addons https://github.com/kodi-game/repo-binary-addons retroplayer" > "$srcdir/$_gitname/cmake/addons/bootstrap/repositories/binary-addons.txt"
-
- # - build
- cd ../kodi-addons-game-build
- cmake \
- -DADDONS_TO_BUILD="$_addons" \
- -DCMAKE_INSTALL_PREFIX=addons/ \
- -DPACKAGE_ZIP=1 \
- "../$_gitname/cmake/addons"
- make
}
-# kodi
-# components: kodi, kodi-bin
-
package_kodi-gb-git() {
- pkgdesc="A software media player and entertainment hub for digital media (retroplayer branch)"
+ pkgdesc="A software media player and entertainment hub for digital media (retroplayer / garbear)"
depends=('bluez-libs' 'desktop-file-utils' 'ffmpeg' 'glew' 'hicolor-icon-theme' 'libcdio'
'libmariadbclient' 'libmicrohttpd' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'python2-pillow'
'python2-simplejson' 'smbclient' 'taglib' 'tinyxml' 'xorg-xdpyinfo')
@@ -127,18 +80,18 @@ package_kodi-gb-git() {
'unrar: Archives support'
'unzip: Archives support'
'upower: Display battery level')
- provides=('kodi' 'xbmc')
- conflicts=('kodi' 'kodi-git' 'xbmc')
- replaces=('xbmc-git' 'xbmc-svn')
-
+ provides=('xbmc' 'kodi' 'kodi-gb')
+ conflicts=('xbmc' 'kodi' 'kodi-git' 'arm-mem-git' 'shairplay-git')
+ replaces=('xbmc-rbp-git')
+
_components=('kodi' 'kodi-bin')
cd kodi-build
# install eventclients
for _cmp in ${_components[@]}; do
- DESTDIR="$pkgdir" /usr/bin/cmake \
- -DCMAKE_INSTALL_COMPONENT="$_cmp" \
- -P cmake_install.cmake
+ DESTDIR="$pkgdir" /usr/bin/cmake \
+ -DCMAKE_INSTALL_COMPONENT="$_cmp" \
+ -P cmake_install.cmake
done
# Licenses
@@ -153,11 +106,9 @@ package_kodi-gb-git() {
grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
}
-# kodi-eventclients
-# components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-wiiremote kodi-eventclients-xbmc-send
-
package_kodi-gb-eventclients-git() {
- pkgdesc="Kodi Event Clients (retroplayer branch)"
+ pkgdesc="Kodi event clients (retroplayer / garbear)"
+ provides=('kodi-eventclients')
conflicts=('kodi-eventclients' 'kodi-eventclients-git')
depends=('cwiid')
@@ -177,12 +128,9 @@ package_kodi-gb-eventclients-git() {
grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
}
-# kodi-tools-texturepacker
-# components: kodi-tools-texturepacker
-
package_kodi-gb-tools-texturepacker-git() {
- pkgdesc="Kodi Texturepacker tool (retroplayer branch)"
- conflicts=('kodi-tools-texturepacker-git')
+ pkgdesc="Kodi texturepacker tool (retroplayer / garbear)"
+ conflicts=('kodi-tools-texturepacker' 'kodi-tools-texturepacker-git')
depends=('giflib' 'libjpeg-turbo' 'libpng' 'lzo')
_components=('kodi-tools-texturepacker')
@@ -196,14 +144,11 @@ package_kodi-gb-tools-texturepacker-git() {
done
}
-# kodi-dev
-# components: kodi-addon-dev kodi-audio-dev kodi-eventclients-dev kodi-game-dev kodi-inputstream-dev kodi-peripheral-dev kodi-pvr-dev kodi-screensaver-dev kodi-visualization-dev
-
package_kodi-gb-dev-git() {
- pkgdesc="Kodi dev files (retroplayer branch)"
- conflicts=('kodi-dev-git')
+ pkgdesc="Kodi dev files (retroplayer / garbear)"
+ conflicts=('kodi-dev' 'kodi-dev-git')
depends=('kodi')
- provides=('kodi-dev')
+ provides=('kodi-dev' 'kodi-gb-dev')
_components=('kodi-addon-dev' 'kodi-audio-dev' 'kodi-eventclients-dev' 'kodi-game-dev'
'kodi-inputstream-dev' 'kodi-peripheral-dev' 'kodi-pvr-dev' 'kodi-screensaver-dev'
@@ -221,50 +166,3 @@ package_kodi-gb-dev-git() {
cd "$pkgdir"
grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
}
-
-# kodi-gb-addon-peripheral-joystick-git
-package_kodi-gb-addon-peripheral-joystick-git() {
- pkgdesc="Joystick support for Kodi"
- depends=('kodi')
- groups=('kodi-addons' 'kodi-addons-peripheral')
-
- cd kodi-addons-build
- mkdir -p "$pkgdir/usr/share/kodi/addons"
-
- cp -r addons/peripheral.joystick "$pkgdir/usr/share/kodi/addons/"
-}
-
-# kodi-game
-package_kodi-gb-addon-game-libretro-git() {
- pkgdesc="libretro game addon for kodi"
- depends=('kodi')
- groups=('kodi-addons' 'kodi-addons-game')
- provides=('kodi-addon-game-libretro')
-
- cd kodi-addons-game-build
- mkdir -p "$pkgdir/usr/share/kodi/addons"
-
- cp -r addons/game.libretro "$pkgdir/usr/share/kodi/addons/"
-}
-
-package_kodi-gb-addon-game-libretro-snes9x2010-git() {
- pkgdesc="libretro game addon for kodi - Snes9x Next. (Super Nintendo Entertainment System)"
- depends=('kodi-addon-game-libretro')
- groups=('kodi-addons' 'kodi-addons-game')
-
- cd kodi-addons-game-build
- mkdir -p "$pkgdir/usr/share/kodi/addons"
-
- cp -r addons/game.libretro.snes9x2010 "$pkgdir/usr/share/kodi/addons/"
-}
-
-package_kodi-gb-addon-game-libretro-genplus-git() {
- pkgdesc="libretro game addon for kodi - Genesis Plus GX. (Sega Master System/Sega Game Gear/Sega Mega Drive/Sega Genesis/Sega CD)"
- depends=('kodi-addon-game-libretro')
- groups=('kodi-addons' 'kodi-addons-game')
-
- cd kodi-addons-game-build
- mkdir -p "$pkgdir/usr/share/kodi/addons"
-
- cp -r addons/game.libretro.genplus "$pkgdir/usr/share/kodi/addons/"
-}