Commit 7cfe6d42 authored by Carlo Landmeter's avatar Carlo Landmeter

testing/kodi: new aport

parent 6539f002
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kodi
pkgver=14.2
_realname=Helix
pkgrel=0
pkgdesc="A software media player and entertainment hub for digital media"
url="http://kodi.tv"
arch="x86 x86_64"
license="GPL"
depends="python hicolor-icon-theme xdpyinfo unrar mesa-demos curl"
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
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
libxslt-dev libplist-dev libshairport-dev ffmpeg-dev afpfs-ng-dev
libcec-dev x264-dev bsd-compat-headers"
makedepends="$depends_dev automake autoconf m4 libtool swig findutils openjdk7-jre-base
boost-thread zip gperf cmake coreutils nasm tar pkgconfig"
subpackages="$pkgname-dev $pkgname-doc"
install=""
replaces="xbmc"
options="ldpath-recursive"
source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.zip
no-snesapu.patch
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"
_builddir="$srcdir/xbmc-$pkgver-$_realname"
prepare() {
local i
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
build() {
cd "$_builddir"
export MAKEFLAGS=""
./bootstrap || return 1
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
--disable-non-free \
--disable-debug \
--with-ffmpeg=shared \
--enable-static=no \
--enable-libbluray \
|| return 1
make || return 1
}
package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
rm -f "$pkgdir"/usr/lib/*.la
}
md5sums="b926659a946368ec983cbdfcb8289b0c 14.2-Helix.zip
5ad388f29ab8f4ca6bc9e2b73bf946ef no-snesapu.patch
9d61cf68c8d994d11d7c4c0ab9383098 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"
sha256sums="5573938e95c6f1ff44c212e30ad912121468bd5c4cdcc4f644b5b130fb5da354 14.2-Helix.zip
3c04c2cd6909cfb587b194e6c5a3025f1a3f03a0c5178ad70541ff7e69915935 no-snesapu.patch
c07906ae884919cce64abae77f9facbb1aa68ba214ae7ec3195c260ae1a15c27 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"
sha512sums="102c079a307ecdb5e9f6f9cd23df58c8c09b786d096b9d73edfd15c74c6dbf3c61dd1f8c6192758c4f5f5024e8fadcfba49ff7c8206fe8f26e0b3612b429f4cf 14.2-Helix.zip
8b2b3159b536719bad7c00f2eb51c4778f8e6c049cfe07e2555a530ad8587ca7b83623e1b5f40220d2e490e38442f893f87496620aa94da27d37a8bddc72f434 no-snesapu.patch
ddcd22512656607dd077135f95c7342081fbbeb9f78f8dc7e55e4a3a98b19d7c046faebb2925443c27dbd1cd7889e054a43a36e1efdbb8df2817997876c35513 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"
--- a/xbmc/filesystem/ZipManager.h.orig
+++ b/xbmc/filesystem/ZipManager.h
@@ -33,6 +33,7 @@
#include <string>
#include <vector>
#include <map>
+#include <stdint.h>
class CURL;
This diff is collapsed.
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
@@ -29,7 +29,9 @@
#include <time.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <sys/time.h>
#include <sys/socket.h>
+#include <sys/select.h>
#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
@@ -33,7 +33,7 @@
#include "Common.hpp"
#include "PCM.hpp"
-#include <cmath>
+#include "math.h"
#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 @@
#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0))
_syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount );
#else
-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
#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
@@ -23,11 +23,7 @@
#include <inttypes.h>
#include "guilib/XBTF.h"
#include "utils/EndianSwap.h"
-#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN)
#include <stdlib.h>
-#elif !defined(TARGET_DARWIN)
-#include <malloc.h>
-#endif
#include <memory.h>
#define WRITE_STR(str, size, file) fwrite(str, size, 1, file)
--- ./m4/xbmc_arch.m4.orig
+++ ./m4/xbmc_arch.m4
@@ -2,10 +2,10 @@
# host detection and setup
case $host in
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
+ i*86*-linux-gnu*|i*86*-*-linux-uclibc|*i*86*-linux-musl*)
AC_SUBST(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(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
i386-*-freebsd*)
--- xbmc-12.3-Frodo/xbmc/screensavers/rsxs-0.9/configure.ac 2014-04-15 10:22:51.025587069 +0000
+++ xbmc-12.3-Frodo/xbmc/screensavers/rsxs-0.9/configure.ac 2014-04-15 10:21:51.947852111 +0000
@@ -14,18 +14,13 @@
# Checks for programs.
LT_AC_PROG_SED
-AC_LANG(C++)
-AC_PROG_CXX
-#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
-AC_PROG_CXXCPP
-
-#if test x"$GXX" = x"yes"; then
-# CXXFLAGS=`echo $CXXFLAGS -Wall`
-#fi
AC_PROG_CC
AM_PROG_CC_C_O
gl_EARLY
+AC_PROG_CXX
+AC_PROG_CXXCPP
+
AC_PROG_RANLIB
# Cut-down version of AC_LIB_LTDL. We don't want the option to install
--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
+++ b/xbmc/cores/DllLoader/exports/wrapper.c
@@ -462,7 +462,7 @@
// are actually #defines which are inlined when compiled with -O. Those defines
// actally call __*chk (for example, __fread_chk). We need to bypass this whole
// thing to actually call our wrapped functions.
-#if _FORTIFY_SOURCE > 1
+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
{
diff --git a/Makefile.in b/Makefile.in
index 31826b1..2f468e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,7 +168,6 @@ PAPCODECS_DIRS= \
lib/timidity \
lib/libsidplay2 \
lib/stsound/StSoundLibrary \
- lib/snesapu/SNES/SNESAPU \
lib/vgmstream
ifeq (@USE_ASAP_CODEC@,1)
@@ -373,9 +372,6 @@ ifeq (@USE_ASAP_CODEC@,1)
endif
endif
$(MAKE) -C lib/stsound/StSoundLibrary
-ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@)),)
- $(MAKE) -C lib/snesapu/SNES/SNESAPU
-endif
imagelib: dllloader
$(MAKE) -C lib/cximage-6.0
diff --git a/configure.in b/configure.in
index 538d9af..3f04545 100644
--- a/configure.in
+++ b/configure.in
@@ -2348,7 +2348,6 @@ OUTPUT_FILES="Makefile \
lib/nosefart/Makefile \
lib/libsidplay2/Makefile \
lib/vgmstream/Makefile \
- lib/snesapu/SNES/SNESAPU/Makefile \
lib/stsound/StSoundLibrary/Makefile \
xbmc/cores/playercorefactory/Makefile \
xbmc/music/karaoke/Makefile \
diff --git a/xbmc/cores/paplayer/Makefile.in b/xbmc/cores/paplayer/Makefile.in
index 31cc8bd..a433e82 100644
--- a/xbmc/cores/paplayer/Makefile.in
+++ b/xbmc/cores/paplayer/Makefile.in
@@ -31,7 +31,6 @@ SRCS += ASAPCodec.cpp
endif
ifneq ($(ARCH), arm)
-CXXFLAGS += -DHAS_SPC_CODEC
SRCS += SPCCodec.cpp
endif
--- 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;
--- a/xbmc/utils/posix/PosixInterfaceForCLog.cpp.orig
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
@@ -28,10 +28,6 @@
#include "android/activity/XBMCApp.h"
#endif // TARGET_ANDROID
-struct FILEWRAP : public FILE
-{};
-
-
CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
m_file(NULL)
{ }
@@ -50,7 +46,7 @@
(void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
(void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
+ m_file = fopen(logFilename.c_str(), "wb");
if (!m_file)
return false; // error, can't open log file
--- a/xbmc/utils/posix/PosixInterfaceForCLog.h.orig
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.h
@@ -21,8 +21,6 @@
#include <string>
-struct FILEWRAP; // forward declaration, wrapper for FILE
-
class CPosixInterfaceForCLog
{
public:
@@ -34,5 +32,5 @@
void PrintDebugString(const std::string& debugString);
static void GetCurrentLocalTime(int& hour, int& minute, int& second);
private:
- FILEWRAP* m_file;
+ FILE * m_file;
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment