Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
646
Issues
646
List
Boards
Labels
Service Desk
Milestones
Merge Requests
164
Merge Requests
164
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
f9916072
Commit
f9916072
authored
Oct 07, 2015
by
Carlo Landmeter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
community/kodi: upgrade to 15.1
parent
f999b98c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
78 additions
and
120 deletions
+78
-120
community/kodi/APKBUILD
community/kodi/APKBUILD
+17
-30
community/kodi/fix-musl.patch
community/kodi/fix-musl.patch
+59
-50
community/kodi/kodi-14.0-gcc5.patch
community/kodi/kodi-14.0-gcc5.patch
+0
-25
community/kodi/no-snesapu.patch
community/kodi/no-snesapu.patch
+2
-2
community/kodi/remove-av_read_frame_flush.patch
community/kodi/remove-av_read_frame_flush.patch
+0
-13
No files found.
community/kodi/APKBUILD
View file @
f9916072
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
kodi
pkgver
=
1
4.2
_realname
=
Helix
pkgrel
=
6
pkgver
=
1
5.1
_realname
=
Isengard
pkgrel
=
0
pkgdesc
=
"A software media player and entertainment hub for digital media"
url
=
"http://kodi.tv"
arch
=
"x86 x86_64"
...
...
@@ -14,30 +14,27 @@ depends_dev="gettext-dev boost-dev mesa-dev glew-dev glu-dev mariadb-dev
libass-dev libogg-dev libvorbis-dev libmodplug-dev curl-dev flac-dev
libgcrypt-dev bzip2-dev tiff-dev lzo-dev yajl-dev bluez-dev tinyxml-dev
fribidi-dev sqlite-dev libpng-dev libcdio-dev pcre-dev freetype-dev
taglib-dev jasper-dev alsa-lib-dev dbus-dev sdl-dev sdl_image-dev
taglib-dev jasper-dev alsa-lib-dev dbus-dev sdl-dev sdl_image-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 eudev-dev libcap-dev udisks-dev faac-dev gnutls-dev
libjpeg-turbo-dev eudev-dev libcap-dev udisks
2
-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 python-dev"
makedepends
=
"
$depends_dev
automake autoconf m4 libtool swig findutils openjdk
7
-jre-base
boost-thread zip gperf cmake coreutils nasm tar
pkgconfig
"
makedepends
=
"
$depends_dev
automake autoconf m4 libtool swig findutils openjdk
8
-jre-base
boost-thread zip gperf cmake coreutils nasm tar"
subpackages
=
"
$pkgname
-dev
$pkgname
-doc
$pkgname
-dbg"
install
=
""
replaces
=
"xbmc"
options
=
"ldpath-recursive"
source
=
"https://github.com/xbmc/xbmc/archive/
$pkgver
-
$_realname
.zip
no-snesapu.patch
source
=
"https://github.com/xbmc/xbmc/archive/
$pkgver
-
$_realname
.tar.gz
fix-musl.patch
fix-fileemu.patch
fix-rsxs.patch
fortify-source-fix.patch
remove-av_read_frame_flush.patch
remove-filewrap.patch
add-missing-includes.patch
set-default-stacksize.patch
kodi-14.0-gcc5.patch
"
_builddir
=
"
$srcdir
/xbmc-
$pkgver
-
$_realname
"
...
...
@@ -54,7 +51,6 @@ prepare() {
build
()
{
cd
"
$_builddir
"
export
MAKEFLAGS
=
""
./bootstrap
||
return
1
./configure
\
--build
=
$CBUILD
\
...
...
@@ -78,36 +74,27 @@ package() {
make
DESTDIR
=
"
$pkgdir
"
install
||
return
1
}
md5sums
=
"f9e035a6ad5f426246f9d30b17a214d3 14.2-Helix.zip
5ad388f29ab8f4ca6bc9e2b73bf946ef no-snesapu.patch
9d61cf68c8d994d11d7c4c0ab9383098 fix-musl.patch
md5sums
=
"d8acb0ef061b3e2fef88146cea1f4443 15.1-Isengard.tar.gz
7d642a5499a92a8ca9aeb2863bd2a81d fix-musl.patch
69049c53ffc4a403ccff3bba77e47793 fix-fileemu.patch
1c8cc1618f29613fe3521db3e4a99db5 fix-rsxs.patch
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
39807cbc0f17d8a25b89c455c420719d kodi-14.0-gcc5.patch"
sha256sums
=
"2fca08694314e8147a3a643fcd80953d5e818fcfb6af9612210f06a05f406ff3 14.2-Helix.zip
3c04c2cd6909cfb587b194e6c5a3025f1a3f03a0c5178ad70541ff7e69915935 no-snesapu.patch
c07906ae884919cce64abae77f9facbb1aa68ba214ae7ec3195c260ae1a15c27 fix-musl.patch
deff09ba18d3bc4674d1c195a40ea399 set-default-stacksize.patch"
sha256sums
=
"72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705 15.1-Isengard.tar.gz
1e3f70ac77172247c3bb67dc01ae59b22b7dfac1b427a253c1824c470e8c5f37 fix-musl.patch
cd566ae87c0ecc3e7cbeee9d80b042ae937d4f243413293616bd31f24efffec7 fix-fileemu.patch
e5de7cf5e781de9288f362c9d1c88d226297ba4aae3f75e5980f0a7cfc2258f0 fix-rsxs.patch
b5b6636e77dc11bd3a78d811e60cd98b6929e018b8f32ae2ee100a00e5535bea fortify-source-fix.patch
29f5c17585a0fc05e8e4d548c4deddefc9fc6b742d873658ce299bab9244eeed remove-av_read_frame_flush.patch
11f537c6d5a2089053c80600b4dc1d6530faaee2141eba1a7eb0b941385ba9f1 remove-filewrap.patch
0ea70141b3b80ac586e941c97806f819b562f1d5166d0fe045e28dff0b62d739 add-missing-includes.patch
212cb3d9861b2b57d9929c2046917c5789d4bacf7849ec3f7c5a4740693349b2 set-default-stacksize.patch
598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777 kodi-14.0-gcc5.patch"
sha512sums
=
"a01cd5e4b59943e800c8998a4f401fe04947f4c4e39cf10d4f791602f98115c615ec3a226a399359a6f06c0555d831f509f8b12b558ab35f842bef2f5e1ea4e3 14.2-Helix.zip
8b2b3159b536719bad7c00f2eb51c4778f8e6c049cfe07e2555a530ad8587ca7b83623e1b5f40220d2e490e38442f893f87496620aa94da27d37a8bddc72f434 no-snesapu.patch
ddcd22512656607dd077135f95c7342081fbbeb9f78f8dc7e55e4a3a98b19d7c046faebb2925443c27dbd1cd7889e054a43a36e1efdbb8df2817997876c35513 fix-musl.patch
212cb3d9861b2b57d9929c2046917c5789d4bacf7849ec3f7c5a4740693349b2 set-default-stacksize.patch"
sha512sums
=
"b597253aa51d3d446ecb85ffe163362b5e55717d6fee16eab81725b9cdf0a5a9e4a2291aa526b9e63fbb34ef206100df30c9368684e2ddedc49e35f140d604f0 15.1-Isengard.tar.gz
1cf662861a7325cf34dff912df17e0348934a8fb525aa2d1239bd0c7fc7e6223a227432f450b890c7c97fcbae055b9781c2b0628565bf4d57da986e0816ad52b fix-musl.patch
d2c284a7156a842e23a1089053cb28af1a825fddbeb5b5e8d4a8f2d8b37a7861a7082529e603cfe56eb2c7fd35c4ce1aa7e9f224690ab42689c9886d60dafbc7 fix-fileemu.patch
e1ed2e2e53c20b59f2ea926e9097e99438fdaed9b9d4c0133567bd1c8dc26b003961ad045ce4aaba62e9825e1a2d9651e72bd21bdb09dcc840c8e14d9602d109 fix-rsxs.patch
5e972e6f6ad13f5dc8ac5e9d593171988e0cc93879178aa7621af44d41b89b5b86429af4d0c2e6516b626d042f247bcf0b1f957f647138a03ce73c5c7b3311b9 fortify-source-fix.patch
5e54cf4e77b3d12923a88c18f268b069f28cbf26069217d76ab4685e1ec67bddc1f374b60eaffa653caa8b7fd6916037f47df8547f012b46d6653c4d1debf5b4 remove-av_read_frame_flush.patch
cdac558134441633a83a346c2d5f5d69a1dea10276d5a46d18433d5c94937528610a662749db0909685e6bf42277e1318726409b572390f3b8ebea61209ee5c9 remove-filewrap.patch
378a0e8fd9676dd76cfb30d62085b953625dd0185e2673de2331fc7ae0802dae4f56d0b74e878e4d313942fda8831e9669bff284dbe974db5ad16fe07af884d6 add-missing-includes.patch
3fd97e9fa22e59b3cd30fdad19474e177a9d062598765fa8ba4955f1da4e10581ff1463dd0794d3ee3cefebf753007a4d445b2bc47a257574d3927c1408b8876 set-default-stacksize.patch
bef0f96849ba5bc1e31d310fce7a7a65ab5ece9222799607687d26044085affbc358f94e5c21db566dedc1e3c27623a79104fed3feb76da03b63528a5da24dcb kodi-14.0-gcc5.patch"
3fd97e9fa22e59b3cd30fdad19474e177a9d062598765fa8ba4955f1da4e10581ff1463dd0794d3ee3cefebf753007a4d445b2bc47a257574d3927c1408b8876 set-default-stacksize.patch"
community/kodi/fix-musl.patch
View file @
f9916072
diff -ru xbmc-12.3-Frodo.orig/configure.in xbmc-12.3-Frodo/configure.in
diff -ru xbmc-12.3-Frodo.orig/lib/SlingboxLib/SlingboxLib.cpp xbmc-12.3-Frodo/lib/SlingboxLib/SlingboxLib.cpp
--- xbmc-12.3-Frodo.orig/lib/SlingboxLib/SlingboxLib.cpp 2013-12-12 21:47:49.000000000 +0000
+++ xbmc-12.3-Frodo/lib/SlingboxLib/SlingboxLib.cpp 2014-04-15 06:07:15.746789122 +0000
--- ./lib/SlingboxLib/SlingboxLib.cpp 2013-12-12 21:47:49.000000000 +0000
+++ ./lib/SlingboxLib/SlingboxLib.cpp 2014-04-15 06:07:15.746789122 +0000
@@ -29,7 +29,9 @@
#include <time.h>
#include <netinet/in.h>
...
...
@@ -12,21 +10,8 @@ diff -ru xbmc-12.3-Frodo.orig/lib/SlingboxLib/SlingboxLib.cpp xbmc-12.3-Frodo/li
#define INVALID_SOCKET (SOCKET)(~0)
#define SOCKET_ERROR (-1)
#endif
diff -ru xbmc-12.3-Frodo.orig/lib/libXDAAP/thread.h xbmc-12.3-Frodo/lib/libXDAAP/thread.h
--- xbmc-12.3-Frodo.orig/lib/libXDAAP/thread.h 2013-12-12 21:47:49.000000000 +0000
+++ xbmc-12.3-Frodo/lib/libXDAAP/thread.h 2014-04-15 06:11:09.940947997 +0000
@@ -37,7 +37,7 @@
#define ts_mutex pthread_mutex_t
#define ts_condition pthread_cond_t
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if !defined(PTHREAD_MUTEX_RECURSIVE_NP)
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
#endif
diff -ru xbmc-12.3-Frodo.orig/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp xbmc-12.3-Frodo/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp
--- xbmc-12.3-Frodo.orig/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:52:42.214313750 +0000
+++ xbmc-12.3-Frodo/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:49:51.921324165 +0000
--- ./xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:52:42.214313750 +0000
+++ ./xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:49:51.921324165 +0000
@@ -33,7 +33,7 @@
#include "Common.hpp"
...
...
@@ -36,35 +21,6 @@ diff -ru xbmc-12.3-Frodo.orig/xbmc/visualizations/XBMCProjectM/libprojectM/BeatD
#include "BeatDetect.hpp"
#ifdef _WIN32
--- ./configure.in.orig
+++ ./configure.in
@@ -628,7 +628,7 @@
use_x11=no
build_shared_lib=yes
;;
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*)
ARCH="i486-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
use_arch="x86"
@@ -636,7 +636,7 @@
fi
use_static_ffmpeg=yes
;;
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
ARCH="x86_64-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
use_arch="x86_64"
@@ -688,7 +688,7 @@
powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
ARCH="powerpc64-linux"
;;
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-muslgnu*)
ARCH="arm"
use_arch="arm"
ffmpeg_target_os=linux
--- ./xbmc/cores/DllLoader/ldt_keeper.c.orig
+++ ./xbmc/cores/DllLoader/ldt_keeper.c
@@ -48,7 +48,7 @@
...
...
@@ -76,8 +32,8 @@ diff -ru xbmc-12.3-Frodo.orig/xbmc/visualizations/XBMCProjectM/libprojectM/BeatD
#define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c);
#else
int modify_ldt(int func, void *ptr, unsigned long bytecount);
--- ./tools/
TexturePacker/XBTFWriter.cpp.orig
+++ ./tools/
TexturePacker
/XBTFWriter.cpp
--- ./tools/
depends/native/TexturePacker/src/XBTFWriter.cpp
+++ ./tools/
depends/native/TexturePacker/src
/XBTFWriter.cpp
@@ -23,11 +23,7 @@
#include <inttypes.h>
#include "guilib/XBTF.h"
...
...
@@ -105,3 +61,56 @@ diff -ru xbmc-12.3-Frodo.orig/xbmc/visualizations/XBMCProjectM/libprojectM/BeatD
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
i386-*-freebsd*)
--- ./configure.ac.orig
+++ ./configure.ac
@@ -604,7 +604,7 @@
use_x11=no
build_shared_lib=yes
;;
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*)
ARCH="i486-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
use_arch="x86"
@@ -625,7 +625,7 @@
fi
fi
;;
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
ARCH="x86_64-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
use_arch="x86_64"
@@ -681,7 +681,7 @@
powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
ARCH="powerpc64-linux"
;;
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-muslgnu*)
ARCH="arm"
use_arch="arm"
use_joystick=no
--- ./m4/xbmc_arch.m4.orig
+++ ./m4/xbmc_arch.m4
@@ -2,10 +2,10 @@
# build detection and setup - this is the native arch
case $build in
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*)
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
i386-*-freebsd*)
@@ -23,7 +23,7 @@
powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
;;
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-muslgnu*)
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
*)
community/kodi/kodi-14.0-gcc5.patch
deleted
100644 → 0
View file @
f999b98c
--- 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
community/kodi/no-snesapu.patch
View file @
f9916072
...
...
@@ -22,8 +22,8 @@ index 31826b1..2f468e7 100644
diff --git a/configure.in b/configure.in
index 538d9af..3f04545 100644
--- a/configure.
in
+++ b/configure.
in
--- a/configure.
ac
+++ b/configure.
ac
@@ -2348,7 +2348,6 @@
OUTPUT_FILES="Makefile \
lib/nosefart/Makefile \
lib/libsidplay2/Makefile \
...
...
community/kodi/remove-av_read_frame_flush.patch
deleted
100644 → 0
View file @
f999b98c
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -539,10 +539,6 @@
void CDVDDemuxFFmpeg::Flush()
{
- // naughty usage of an internal ffmpeg function
- if (m_pFormatContext)
- av_read_frame_flush(m_pFormatContext);
-
m_currentPts = DVD_NOPTS_VALUE;
m_pkt.result = -1;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment