xbmc-pvr: rework OPENGL and DISPLAYSERVER options

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-01-30 15:44:43 +01:00
parent b6849dffbc
commit 1ff4f5ff87
3 changed files with 46 additions and 11 deletions

View File

@ -22,6 +22,24 @@
. config/options $1
if [ "$XORG_SUPPORT" = yes ]; then
XBMC_XORG="--enable-x11 --enable-xrandr"
else
XBMC_XORG="--enable-x11 --enable-xrandr"
fi
if [ "$OPENGL_SUPPORT" = yes ]; then
XBMC_OPENGL="--enable-gl"
else
XBMC_OPENGL="--disable-gl"
fi
if [ "$OPENGLES_SUPPORT" = yes ]; then
XBMC_OPENGLES="--enable-gles"
else
XBMC_OPENGLES="--disable-gles"
fi
if [ "$XBMC_SCR_RSXS" = yes ]; then
XBMC_RSXS="--enable-rsxs"
# fix build of RSXS Screensaver support if not using libiconv
@ -195,8 +213,8 @@ cd $PKG_BUILD
GIT_REV=`cat git.version` \
--disable-debug \
--disable-optimizations \
--enable-gl \
--disable-gles \
$XBMC_OPENGL \
$XBMC_OPENGLES \
$XBMC_VDPAU \
$XBMC_VAAPI \
$XBMC_CRYSTALHD \
@ -211,8 +229,7 @@ cd $PKG_BUILD
$XBMC_GOOM \
$XBMC_RSXS \
$XBMC_PROJECTM \
--enable-x11 \
--enable-xrandr \
$XBMC_XORG \
--disable-ccache \
$XBMC_PULSEAUDIO \
--enable-rtmp \
@ -241,4 +258,7 @@ cd $PKG_BUILD
make externals
make xbmc.bin
make xbmc-xrandr
if [ "$XORG_SUPPORT" = yes ]; then
make xbmc-xrandr
fi

View File

@ -31,7 +31,9 @@ mkdir -p $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib/xbmc
cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc
cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
if [ "$XORG_SUPPORT" = yes ]; then
cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
fi
cd $PKG_BUILD
find system addons \

View File

@ -25,9 +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_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi libjpeg-turbo 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 xbmc-addon-xvdr"
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi libjpeg-turbo 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 fontconfig fribidi libjpeg-turbo 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 xbmc-addon-xvdr"
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo 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"
@ -36,13 +35,27 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
# for libX11 support
if [ "$XORG_SUPPORT" = yes ]; then
# for libX11 support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
# for libXrandr support
# for libXrandr support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXrandr"
PKG_DEPENDS="$PKG_DEPENDS libXrandr"
fi
if [ "$OPENGL_SUPPORT" = yes ]; then
# for OpenGL (GLX) support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENGL glew"
PKG_DEPENDS="$PKG_DEPENDS $OPENGL glew"
fi
if [ "$OPENGLES_SUPPORT" = yes ]; then
# for OpenGL-ES support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS OpenGLES"
PKG_DEPENDS="$PKG_DEPENDS OpenGLES"
fi
# for dbus support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus"