summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2015-04-17 17:50:19 +0200
committerCarlo Landmeter <clandmeter@gmail.com>2015-04-17 17:50:59 +0200
commitc2b1d1d1c9563a464540ed7cfac49f42cca3ceb8 (patch)
tree1b7df28a33e61a9cab55963ae9ae8b3dbd01ae4d
parentdc2940a82c619d55cc5af1ee60efd737d2c65383 (diff)
downloadaports-c2b1d1d1c9563a464540ed7cfac49f42cca3ceb8.tar.bz2
aports-c2b1d1d1c9563a464540ed7cfac49f42cca3ceb8.tar.xz
main/kodi: move to main
-rw-r--r--main/kodi/APKBUILD (renamed from testing/kodi/APKBUILD)8
-rw-r--r--main/kodi/add-missing-includes.patch (renamed from testing/kodi/add-missing-includes.patch)0
-rw-r--r--main/kodi/fix-fileemu.patch (renamed from testing/kodi/fix-fileemu.patch)0
-rw-r--r--main/kodi/fix-musl.patch (renamed from testing/kodi/fix-musl.patch)0
-rw-r--r--main/kodi/fix-rsxs.patch (renamed from testing/kodi/fix-rsxs.patch)0
-rw-r--r--main/kodi/fortify-source-fix.patch (renamed from testing/kodi/fortify-source-fix.patch)0
-rw-r--r--main/kodi/no-snesapu.patch (renamed from testing/kodi/no-snesapu.patch)0
-rw-r--r--main/kodi/remove-av_read_frame_flush.patch (renamed from testing/kodi/remove-av_read_frame_flush.patch)0
-rw-r--r--main/kodi/remove-filewrap.patch (renamed from testing/kodi/remove-filewrap.patch)0
-rw-r--r--main/kodi/set-default-stacksize.patch (renamed from testing/kodi/set-default-stacksize.patch)0
10 files changed, 2 insertions, 6 deletions
diff --git a/testing/kodi/APKBUILD b/main/kodi/APKBUILD
index c4b853335..fd4dc6f69 100644
--- a/testing/kodi/APKBUILD
+++ b/main/kodi/APKBUILD
@@ -3,7 +3,7 @@
pkgname=kodi
pkgver=14.2
_realname=Helix
-pkgrel=2
+pkgrel=3
pkgdesc="A software media player and entertainment hub for digital media"
url="http://kodi.tv"
arch="x86 x86_64"
@@ -40,9 +40,6 @@ source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.zip
_builddir="$srcdir/xbmc-$pkgver-$_realname"
-# --disable-optimizations disables parallel builds
-_cpus=$(grep processor /proc/cpuinfo |wc -l)
-
prepare() {
local i
cd "$_builddir"
@@ -70,9 +67,8 @@ build() {
--with-ffmpeg=shared \
--enable-static=no \
--enable-libbluray \
- --disable-optimizations \
|| return 1
- make -j$_cpus || return 1
+ make || return 1
}
package() {
diff --git a/testing/kodi/add-missing-includes.patch b/main/kodi/add-missing-includes.patch
index 236bfa6fd..236bfa6fd 100644
--- a/testing/kodi/add-missing-includes.patch
+++ b/main/kodi/add-missing-includes.patch
diff --git a/testing/kodi/fix-fileemu.patch b/main/kodi/fix-fileemu.patch
index 59d0045ac..59d0045ac 100644
--- a/testing/kodi/fix-fileemu.patch
+++ b/main/kodi/fix-fileemu.patch
diff --git a/testing/kodi/fix-musl.patch b/main/kodi/fix-musl.patch
index 61b3571b0..61b3571b0 100644
--- a/testing/kodi/fix-musl.patch
+++ b/main/kodi/fix-musl.patch
diff --git a/testing/kodi/fix-rsxs.patch b/main/kodi/fix-rsxs.patch
index ccc7698c7..ccc7698c7 100644
--- a/testing/kodi/fix-rsxs.patch
+++ b/main/kodi/fix-rsxs.patch
diff --git a/testing/kodi/fortify-source-fix.patch b/main/kodi/fortify-source-fix.patch
index 5717746e0..5717746e0 100644
--- a/testing/kodi/fortify-source-fix.patch
+++ b/main/kodi/fortify-source-fix.patch
diff --git a/testing/kodi/no-snesapu.patch b/main/kodi/no-snesapu.patch
index d49b273ab..d49b273ab 100644
--- a/testing/kodi/no-snesapu.patch
+++ b/main/kodi/no-snesapu.patch
diff --git a/testing/kodi/remove-av_read_frame_flush.patch b/main/kodi/remove-av_read_frame_flush.patch
index f931aae58..f931aae58 100644
--- a/testing/kodi/remove-av_read_frame_flush.patch
+++ b/main/kodi/remove-av_read_frame_flush.patch
diff --git a/testing/kodi/remove-filewrap.patch b/main/kodi/remove-filewrap.patch
index 70145b0ba..70145b0ba 100644
--- a/testing/kodi/remove-filewrap.patch
+++ b/main/kodi/remove-filewrap.patch
diff --git a/testing/kodi/set-default-stacksize.patch b/main/kodi/set-default-stacksize.patch
index 8a79215f8..8a79215f8 100644
--- a/testing/kodi/set-default-stacksize.patch
+++ b/main/kodi/set-default-stacksize.patch