Merge branch 'openelec-eden' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr

This commit is contained in:
Stephan Raue 2011-09-02 18:22:56 +02:00
commit 6eadc98c53
9 changed files with 48 additions and 3 deletions

View File

@ -22,6 +22,12 @@
. config/options $1
if [ "$XBMC_SCR_RSXS" = yes ]; then
XBMC_RSXS="--enable-rsxs"
else
XBMC_RSXS="--disable-rsxs"
fi
if [ "$XBMC_VIS_PROJECTM" = yes ]; then
XBMC_PROJECTM="--enable-xbmcprojectm"
else
@ -157,8 +163,9 @@ cd $PKG_BUILD
--enable-joystick \
--enable-xrandr \
--disable-goom \
$XBMC_RSXS \
$XBMC_PROJECTM \
--disable-rsxs \
--enable-x11 \
--disable-ccache \
$XBMC_PULSEAUDIO \
--enable-rtmp \

View File

@ -25,8 +25,8 @@ 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 dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings"
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
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 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba 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 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@ -35,6 +35,23 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
# for libX11 support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
# for libXrandr support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXrandr"
PKG_DEPENDS="$PKG_DEPENDS libXrandr"
# for dbus support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus"
PKG_DEPENDS="$PKG_DEPENDS dbus"
if [ "$XBMC_SCR_RSXS" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXt libXmu"
PKG_DEPENDS="$PKG_DEPENDS libXt libXmu"
fi
if [ "$FAAC_SUPPORT" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS faac"
PKG_DEPENDS="$PKG_DEPENDS faac"

View File

@ -120,6 +120,9 @@
# e.g. XBMC_PLUGINS="SABnzbd"
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
XBMC_SCR_RSXS="no"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"

View File

@ -120,6 +120,9 @@
# e.g. XBMC_PLUGINS="SABnzbd"
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
XBMC_SCR_RSXS="no"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"

View File

@ -120,6 +120,9 @@
# e.g. XBMC_PLUGINS="SABnzbd"
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
XBMC_SCR_RSXS="no"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"

View File

@ -120,6 +120,9 @@
# e.g. XBMC_PLUGINS="SABnzbd"
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
XBMC_SCR_RSXS="no"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"

View File

@ -120,6 +120,9 @@
# e.g. XBMC_PLUGINS="SABnzbd"
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
XBMC_SCR_RSXS="no"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"

View File

@ -123,6 +123,9 @@
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
# build and install 'RSXS' Screensaver (yes / no)
XBMC_SCR_RSXS="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -120,6 +120,9 @@
# e.g. XBMC_PLUGINS="SABnzbd"
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
XBMC_SCR_RSXS="no"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"