aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/kodi/APKBUILD17
-rw-r--r--main/kodi/kodi-14.0-gcc5.patch25
2 files changed, 36 insertions, 6 deletions
diff --git a/main/kodi/APKBUILD b/main/kodi/APKBUILD
index fd4dc6f69..94fcf6098 100644
--- a/main/kodi/APKBUILD
+++ b/main/kodi/APKBUILD
@@ -3,7 +3,7 @@
pkgname=kodi
pkgver=14.2
_realname=Helix
-pkgrel=3
+pkgrel=4
pkgdesc="A software media player and entertainment hub for digital media"
url="http://kodi.tv"
arch="x86 x86_64"
@@ -18,7 +18,7 @@ depends_dev="gettext-dev boost-dev mesa-dev glew-dev glu-dev mariadb-dev
lame-dev libmicrohttpd-dev libbluray-dev avahi-dev libxrandr-dev
libxt-dev libxmu-dev samba-dev gawk libssh-dev libva-dev libnfs-dev
yasm-dev libmpeg2-dev libmad-dev libsamplerate-dev rtmpdump-dev
- libjpeg-turbo-dev udev-dev libcap-dev udisks-dev faac-dev gnutls-dev
+ libjpeg-turbo-dev eudev-dev libcap-dev udisks-dev faac-dev gnutls-dev
libxslt-dev libplist-dev libshairport-dev ffmpeg-dev afpfs-ng-dev
libcec-dev x264-dev bsd-compat-headers curl-dev"
makedepends="$depends_dev automake autoconf m4 libtool swig findutils openjdk7-jre-base
@@ -36,7 +36,9 @@ source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.zip
remove-av_read_frame_flush.patch
remove-filewrap.patch
add-missing-includes.patch
- set-default-stacksize.patch"
+ set-default-stacksize.patch
+ kodi-14.0-gcc5.patch
+ "
_builddir="$srcdir/xbmc-$pkgver-$_realname"
@@ -86,7 +88,8 @@ a769a0018f58cb4f5ea865dcabbe2bed fortify-source-fix.patch
e87c3d8170ad5448a6cf19d1509ab415 remove-av_read_frame_flush.patch
cb116c5b55438222db308d4b6b7bc6ff remove-filewrap.patch
ed12b2515c259c87ea622e04df78dfe5 add-missing-includes.patch
-deff09ba18d3bc4674d1c195a40ea399 set-default-stacksize.patch"
+deff09ba18d3bc4674d1c195a40ea399 set-default-stacksize.patch
+39807cbc0f17d8a25b89c455c420719d kodi-14.0-gcc5.patch"
sha256sums="5573938e95c6f1ff44c212e30ad912121468bd5c4cdcc4f644b5b130fb5da354 14.2-Helix.zip
3c04c2cd6909cfb587b194e6c5a3025f1a3f03a0c5178ad70541ff7e69915935 no-snesapu.patch
c07906ae884919cce64abae77f9facbb1aa68ba214ae7ec3195c260ae1a15c27 fix-musl.patch
@@ -96,7 +99,8 @@ b5b6636e77dc11bd3a78d811e60cd98b6929e018b8f32ae2ee100a00e5535bea fortify-source
29f5c17585a0fc05e8e4d548c4deddefc9fc6b742d873658ce299bab9244eeed remove-av_read_frame_flush.patch
11f537c6d5a2089053c80600b4dc1d6530faaee2141eba1a7eb0b941385ba9f1 remove-filewrap.patch
0ea70141b3b80ac586e941c97806f819b562f1d5166d0fe045e28dff0b62d739 add-missing-includes.patch
-212cb3d9861b2b57d9929c2046917c5789d4bacf7849ec3f7c5a4740693349b2 set-default-stacksize.patch"
+212cb3d9861b2b57d9929c2046917c5789d4bacf7849ec3f7c5a4740693349b2 set-default-stacksize.patch
+598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777 kodi-14.0-gcc5.patch"
sha512sums="102c079a307ecdb5e9f6f9cd23df58c8c09b786d096b9d73edfd15c74c6dbf3c61dd1f8c6192758c4f5f5024e8fadcfba49ff7c8206fe8f26e0b3612b429f4cf 14.2-Helix.zip
8b2b3159b536719bad7c00f2eb51c4778f8e6c049cfe07e2555a530ad8587ca7b83623e1b5f40220d2e490e38442f893f87496620aa94da27d37a8bddc72f434 no-snesapu.patch
ddcd22512656607dd077135f95c7342081fbbeb9f78f8dc7e55e4a3a98b19d7c046faebb2925443c27dbd1cd7889e054a43a36e1efdbb8df2817997876c35513 fix-musl.patch
@@ -106,4 +110,5 @@ e1ed2e2e53c20b59f2ea926e9097e99438fdaed9b9d4c0133567bd1c8dc26b003961ad045ce4aaba
5e54cf4e77b3d12923a88c18f268b069f28cbf26069217d76ab4685e1ec67bddc1f374b60eaffa653caa8b7fd6916037f47df8547f012b46d6653c4d1debf5b4 remove-av_read_frame_flush.patch
cdac558134441633a83a346c2d5f5d69a1dea10276d5a46d18433d5c94937528610a662749db0909685e6bf42277e1318726409b572390f3b8ebea61209ee5c9 remove-filewrap.patch
378a0e8fd9676dd76cfb30d62085b953625dd0185e2673de2331fc7ae0802dae4f56d0b74e878e4d313942fda8831e9669bff284dbe974db5ad16fe07af884d6 add-missing-includes.patch
-3fd97e9fa22e59b3cd30fdad19474e177a9d062598765fa8ba4955f1da4e10581ff1463dd0794d3ee3cefebf753007a4d445b2bc47a257574d3927c1408b8876 set-default-stacksize.patch"
+3fd97e9fa22e59b3cd30fdad19474e177a9d062598765fa8ba4955f1da4e10581ff1463dd0794d3ee3cefebf753007a4d445b2bc47a257574d3927c1408b8876 set-default-stacksize.patch
+bef0f96849ba5bc1e31d310fce7a7a65ab5ece9222799607687d26044085affbc358f94e5c21db566dedc1e3c27623a79104fed3feb76da03b63528a5da24dcb kodi-14.0-gcc5.patch"
diff --git a/main/kodi/kodi-14.0-gcc5.patch b/main/kodi/kodi-14.0-gcc5.patch
new file mode 100644
index 000000000..e4c1e52f7
--- /dev/null
+++ b/main/kodi/kodi-14.0-gcc5.patch
@@ -0,0 +1,25 @@
+--- a/xbmc/screensavers/rsxs-0.9/lib/argp.h.orig 2015-03-26 13:25:20.000000000 -0500
++++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h 2015-05-19 16:05:20.992493851 -0500
+@@ -559,7 +559,7 @@
+ # endif
+
+ # ifndef ARGP_EI
+-# define ARGP_EI extern __inline__
++# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline))
+ # endif
+
+ ARGP_EI void
+--- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig 2015-03-26 13:25:20.000000000 -0500
++++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h 2015-05-19 16:02:25.775456866 -0500
+@@ -198,11 +198,7 @@
+ #endif
+
+ #ifndef ARGP_FS_EI
+-#ifdef __clang__
+ #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
+-#else
+-#define ARGP_FS_EI extern inline
+-#endif
+ #endif
+
+ ARGP_FS_EI size_t