mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 22:47:51 +00:00
xbmc: update to xbmc-3669b6e
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
89e6248538
commit
27b860725d
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="dc3bee7"
|
||||
PKG_VERSION="3669b6e"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -64,6 +64,12 @@ else
|
||||
XBMC_NFS="--disable-nfs"
|
||||
fi
|
||||
|
||||
if [ "$AFP_SUPPORT" = yes ]; then
|
||||
XBMC_AFP="--enable-afpclient"
|
||||
else
|
||||
XBMC_AFP="--disable-afpclient"
|
||||
fi
|
||||
|
||||
if [ "$WEBSERVER" = yes ]; then
|
||||
XBMC_WEBSERVER="--enable-webserver"
|
||||
else
|
||||
@ -170,6 +176,7 @@ cd $PKG_BUILD
|
||||
$XBMC_PULSEAUDIO \
|
||||
--enable-rtmp \
|
||||
$XBMC_NFS \
|
||||
$XBMC_AFP \
|
||||
--enable-ffmpeg-libvorbis \
|
||||
--enable-lame \
|
||||
$XBMC_DVDCSS \
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="dc3bee7"
|
||||
PKG_VERSION="3669b6e"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
@ -67,6 +67,11 @@ if [ "$NFS_SUPPORT" = yes ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS libnfs"
|
||||
fi
|
||||
|
||||
if [ "$AFP_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng"
|
||||
PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
|
||||
fi
|
||||
|
||||
if [ "$WEBSERVER" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libmicrohttpd"
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
diff -Naur xbmc-f43dcfa/configure.in xbmc-f43dcfa.patch/configure.in
|
||||
--- xbmc-f43dcfa/configure.in 2011-09-10 02:31:22.000000000 +0200
|
||||
+++ xbmc-f43dcfa.patch/configure.in 2011-09-10 08:16:46.068320869 +0200
|
||||
@@ -963,7 +963,7 @@
|
||||
USE_LIBAFPCLIENT=0
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
if test "x$use_libafpclient" != "xno"; then
|
||||
- AC_CHECK_HEADERS([afp/libafpclient.h],,
|
||||
+ AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],,
|
||||
[if test "x$use_libafpclient" = "xyes"; then
|
||||
AC_MSG_ERROR($libafpclient_not_found)
|
||||
elif test "x$use_libafpclient" != "xno"; then
|
||||
diff -Naur xbmc-f43dcfa/xbmc/filesystem/DllLibAfp.h xbmc-f43dcfa.patch/xbmc/filesystem/DllLibAfp.h
|
||||
--- xbmc-f43dcfa/xbmc/filesystem/DllLibAfp.h 2011-09-10 02:31:05.000000000 +0200
|
||||
+++ xbmc-f43dcfa.patch/xbmc/filesystem/DllLibAfp.h 2011-09-10 08:17:55.057220975 +0200
|
||||
@@ -27,9 +27,9 @@
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
-#include <afp/libafpclient.h>
|
||||
-#include <afp/map_def.h>
|
||||
-#include <afp/midlevel.h>
|
||||
+#include <afpfs-ng/libafpclient.h>
|
||||
+#include <afpfs-ng/map_def.h>
|
||||
+#include <afpfs-ng/midlevel.h>
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
@ -0,0 +1,47 @@
|
||||
diff -Naur xbmc-f43dcfa/configure.in xbmc-f43dcfa.patch/configure.in
|
||||
--- xbmc-f43dcfa/configure.in 2011-09-10 08:23:01.971219535 +0200
|
||||
+++ xbmc-f43dcfa.patch/configure.in 2011-09-10 08:24:33.480411313 +0200
|
||||
@@ -958,29 +958,24 @@
|
||||
AC_MSG_NOTICE($libnfs_disabled)
|
||||
fi
|
||||
|
||||
-
|
||||
# libafpclient
|
||||
-USE_LIBAFPCLIENT=0
|
||||
-if test "$host_vendor" = "apple" ; then
|
||||
- if test "x$use_libafpclient" != "xno"; then
|
||||
- AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],,
|
||||
- [if test "x$use_libafpclient" = "xyes"; then
|
||||
- AC_MSG_ERROR($libafpclient_not_found)
|
||||
- elif test "x$use_libafpclient" != "xno"; then
|
||||
- AC_MSG_NOTICE($libafpclient_not_found)
|
||||
- use_libafpclient="no"
|
||||
- fi
|
||||
- ])
|
||||
- if test "x$use_libafpclient" != "xno"; then
|
||||
- XB_FIND_SONAME([AFPCLIENT], [afpclient], [use_libafpclient])
|
||||
- AC_DEFINE([HAVE_LIBAFPCLIENT], [1], [Whether to use libafpclient library.])
|
||||
- USE_LIBAFPCLIENT=1
|
||||
+if test "x$use_libafpclient" != "xno"; then
|
||||
+ AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],,
|
||||
+ [if test "x$use_libafpclient" = "xyes"; then
|
||||
+ AC_MSG_ERROR($libafpclient_not_found)
|
||||
+ elif test "x$use_libafpclient" != "xno"; then
|
||||
+ AC_MSG_NOTICE($libafpclient_not_found)
|
||||
+ use_libafpclient="no"
|
||||
fi
|
||||
- else
|
||||
- AC_MSG_NOTICE($libafpclient_disabled)
|
||||
+ ])
|
||||
+ if test "x$use_libafpclient" != "xno"; then
|
||||
+ XB_FIND_SONAME([AFPCLIENT], [afpclient], [use_libafpclient])
|
||||
+ AC_DEFINE([HAVE_LIBAFPCLIENT], [1], [Whether to use libafpclient library.])
|
||||
+ USE_LIBAFPCLIENT=1
|
||||
fi
|
||||
else
|
||||
- use_libafpclient="no"
|
||||
+ USE_LIBAFPCLIENT=0
|
||||
+ AC_MSG_NOTICE($libafpclient_disabled)
|
||||
fi
|
||||
|
||||
### External libraries checks
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur xbmc-dc3bee7/configure.in xbmc-dc3bee7.patch/configure.in
|
||||
--- xbmc-dc3bee7/configure.in 2011-09-09 01:27:11.000000000 +0200
|
||||
+++ xbmc-dc3bee7.patch/configure.in 2011-09-09 03:37:55.671676295 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
[
|
||||
if [[ "$host_vendor" != "apple" ]]; then
|
||||
AC_MSG_CHECKING([for lib$2 soname])
|
||||
- $1_FILENAME=$($LD $LDFLAGS -l$2 -M -o /dev/null 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
|
||||
+ $1_FILENAME=$($LD -l$2 -M -o /dev/null 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
|
||||
if [[ ! -z $$1_FILENAME ]]; then
|
||||
$1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user