xbmc: update to xbmc-dab646e

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-09-27 19:03:17 +02:00
parent f9ec9beb0d
commit f551cdae46
28 changed files with 75 additions and 51 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="cbdb5c3"
PKG_VERSION="dab646e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -46,6 +46,12 @@ else
XBMC_NONFREE="--disable-non-free"
fi
if [ "$AIRPLAY_SUPPORT" = yes ]; then
XBMC_AIRPLAY="--enable-airplay"
else
XBMC_AIRPLAY="--disable-airplay"
fi
if [ "$DVDCSS_SUPPORT" = yes ]; then
XBMC_DVDCSS="--enable-dvdcss"
else
@ -196,6 +202,7 @@ cd $PKG_BUILD
--disable-mid \
--disable-hal \
$XBMC_AVAHI \
$XBMC_AIRPLAY \
$XBMC_NONFREE \
--disable-asap-codec \
$XBMC_WEBSERVER \

View File

@ -19,14 +19,14 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="cbdb5c3"
PKG_VERSION="dab646e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.xbmc.org"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@ -67,6 +67,11 @@ if [ "$AVAHI_DAEMON" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS avahi"
fi
if [ "$AIRPLAY_SUPPORT" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libplist"
PKG_DEPENDS="$PKG_DEPENDS libplist"
fi
if [ "$NFS_SUPPORT" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libnfs"
PKG_DEPENDS="$PKG_DEPENDS libnfs"

View File

@ -1,47 +0,0 @@
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

View File

@ -0,0 +1,38 @@
diff -Naur xbmc-dab646e/configure.in xbmc-dab646e.patch/configure.in
--- xbmc-dab646e/configure.in 2011-09-27 15:56:42.000000000 +0200
+++ xbmc-dab646e.patch/configure.in 2011-09-27 17:31:10.639824226 +0200
@@ -987,27 +987,22 @@
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
+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
+ elif test "x$use_libafpclient" != "xno"; then
AC_MSG_NOTICE($libafpclient_not_found)
use_libafpclient="no"
- fi
- ])
+ 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
fi
- else
- AC_MSG_NOTICE($libafpclient_disabled)
- fi
else
- use_libafpclient="no"
+ AC_MSG_NOTICE($libafpclient_disabled)
fi
# libplist for airplay feature

View File

@ -152,6 +152,9 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
NFS_SUPPORT="yes"

View File

@ -152,6 +152,9 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
NFS_SUPPORT="yes"

View File

@ -152,6 +152,9 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
NFS_SUPPORT="yes"

View File

@ -152,6 +152,9 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
NFS_SUPPORT="yes"

View File

@ -152,6 +152,9 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
NFS_SUPPORT="yes"

View File

@ -152,6 +152,9 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
NFS_SUPPORT="yes"

View File

@ -152,6 +152,9 @@
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
# build and install with NFS mount support in XBMC (yes / no)
NFS_SUPPORT="yes"