jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

projects/*/options: rename '$OPENMAX' to '$XBMCPLAYER_DRIVER', remove '$OPENMAX_SUPPORT'

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-05-23 13:52:42 +02:00
parent 8fe7967c3e
commit c8f343a298
18 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/functions
View File

@ -278,7 +278,7 @@ show_config() {
config_message="$config_message\n $dashes$dashes" config_message="$config_message\n $dashes$dashes"
config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD" config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
config_message="$config_message\n - OpenMAX Support (provider):\t\t $OPENMAX_SUPPORT ($OPENMAX)" config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI" config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU" config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
config_message="$config_message\n - XVBA Support:\t\t\t $XVBA" config_message="$config_message\n - XVBA Support:\t\t\t $XVBA"

6
config/graphic
View File

@ -20,12 +20,6 @@ if [ "$SDL_SUPPORT" = no ]; then
JOYSTICK_SUPPORT="no" JOYSTICK_SUPPORT="no"
fi fi
if [ "$OPENMAX" = no ]; then
OPENMAX_SUPPORT="no"
else
OPENMAX_SUPPORT="yes"
fi
if [ "$OPENGL_SUPPORT" = no ]; then if [ "$OPENGL_SUPPORT" = no ]; then
XBMC_SCR_RSXS="no" XBMC_SCR_RSXS="no"
XBMC_VIS_PROJECTM="no" XBMC_VIS_PROJECTM="no"

5
packages/devel/libcec/build
View File

@ -22,7 +22,7 @@
. config/options $1 . config/options $1
if [ "$OPENMAX" = "bcm2835-driver" ]; then if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
-I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
CFLAGS="$CFLAGS $BCM2835_INCLUDES" CFLAGS="$CFLAGS $BCM2835_INCLUDES"
@ -32,13 +32,12 @@ else
LIBCEC_RPI="--disable-rpi" LIBCEC_RPI="--disable-rpi"
fi fi
if [ "$OPENGLES" = "marvell-libgfx" ]; then if [ "$XBMCPLAYER_DRIVER" = "marvell-libgfx" ]; then
LIBCEC_TDA995X="--enable-cubox --with-tda995x-toolkit-path=$(kernel_path)/drivers/video/dovefb/nxp_hdmi" LIBCEC_TDA995X="--enable-cubox --with-tda995x-toolkit-path=$(kernel_path)/drivers/video/dovefb/nxp_hdmi"
else else
LIBCEC_TDA995X="--disable-cubox" LIBCEC_TDA995X="--disable-cubox"
fi fi
# dont use some optimizations because of build problems # dont use some optimizations because of build problems
LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`

2
packages/devel/libcec/meta
View File

@ -35,7 +35,7 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="yes" PKG_AUTORECONF="yes"
if [ "$OPENMAX" = "bcm2835-driver" ]; then if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
PKG_DEPENDS="$PKG_DEPENDS bcm2835-driver" PKG_DEPENDS="$PKG_DEPENDS bcm2835-driver"
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS bcm2835-driver" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS bcm2835-driver"
fi fi

2
packages/initramfs/devel/eglibc-initramfs/meta
View File

@ -35,6 +35,6 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
if [ "$OPENMAX" = "bcm2835-driver" ]; then if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
PKG_DEPENDS="$PKG_DEPENDS libcofi-initramfs" PKG_DEPENDS="$PKG_DEPENDS libcofi-initramfs"
fi fi

25
packages/mediacenter/xbmc/build
View File

@ -36,9 +36,6 @@ fi
if [ "$OPENGLES_SUPPORT" = yes ]; then if [ "$OPENGLES_SUPPORT" = yes ]; then
XBMC_OPENGLES="--enable-gles" XBMC_OPENGLES="--enable-gles"
if [ "$OPENGLES" = "marvell-libgfx" ]; then
XBMC_PLATFORM_SUPPORT="--with-platform=marvell-dove"
fi
else else
XBMC_OPENGLES="--disable-gles" XBMC_OPENGLES="--disable-gles"
fi fi
@ -191,16 +188,18 @@ else
XBMC_WEBSERVER="--disable-webserver" XBMC_WEBSERVER="--disable-webserver"
fi fi
if [ "$OPENMAX_SUPPORT" = yes ]; then if [ "$XBMCPLAYER_DRIVER" = bcm2835-driver ]; then
XBMC_OPENMAX="--enable-openmax" XBMC_OPENMAX="--enable-openmax"
if [ "$OPENMAX" = "bcm2835-driver" ]; then XBMC_PLAYER="--enable-player=omxplayer"
XBMC_PLATFORM_SUPPORT="--with-platform=raspberry-pi" XBMC_CODEC="--with-platform=raspberry-pi"
XBMC_PLAYER="--enable-player=omxplayer" BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
-I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" CFLAGS="$CFLAGS $BCM2835_INCLUDES"
CFLAGS="$CFLAGS $BCM2835_INCLUDES" CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES"
CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES" elif [ "$XBMCPLAYER_DRIVER" = "marvell-libgfx" ]; then
fi XBMC_OPENMAX="--disable-openmax"
XBMC_PLAYER="--with-platform=marvell-dove"
XBMC_CODEC=""
else else
XBMC_OPENMAX="--disable-openmax" XBMC_OPENMAX="--disable-openmax"
fi fi
@ -311,7 +310,7 @@ export gl_cv_func_gettimeofday_clobber=no
--enable-texturepacker --with-texturepacker-root="$ROOT/$TOOLCHAIN" \ --enable-texturepacker --with-texturepacker-root="$ROOT/$TOOLCHAIN" \
--disable-external-libraries \ --disable-external-libraries \
--enable-external-ffmpeg \ --enable-external-ffmpeg \
$XBMC_PLATFORM_SUPPORT \ $XBMC_CODEC \
$XBMC_PLAYER \ $XBMC_PLAYER \
# setup default skin inside the sources # setup default skin inside the sources

6
packages/mediacenter/xbmc/meta
View File

@ -172,9 +172,9 @@ if [ "$WEBSERVER" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd"
fi fi
if [ "$OPENMAX_SUPPORT" = yes ]; then if [ ! "$XBMCPLAYER_DRIVER" = default ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENMAX" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $XBMCPLAYER_DRIVER"
PKG_DEPENDS="$PKG_DEPENDS $OPENMAX" PKG_DEPENDS="$PKG_DEPENDS $XBMCPLAYER_DRIVER"
fi fi
if [ "$VDPAU" = yes ]; then if [ "$VDPAU" = yes ]; then

2
packages/toolchain/devel/eglibc/meta
View File

@ -35,6 +35,6 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
if [ "$OPENMAX" = "bcm2835-driver" ]; then if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
PKG_DEPENDS="$PKG_DEPENDS libcofi" PKG_DEPENDS="$PKG_DEPENDS libcofi"
fi fi

4
projects/ARCTIC_MC/options
View File

@ -259,8 +259,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="fglrx-legacy" GRAPHIC_DRIVERS="fglrx-legacy"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no" VDPAU="no"

4
projects/ATV/options
View File

@ -260,8 +260,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia-legacy" GRAPHIC_DRIVERS="nvidia-legacy"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no" VDPAU="no"

4
projects/Fusion/options
View File

@ -259,8 +259,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"
GRAPHIC_DRIVERS="fglrx" GRAPHIC_DRIVERS="fglrx"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no" VDPAU="no"

4
projects/Generic/options
View File

@ -259,8 +259,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
GRAPHIC_DRIVERS="fglrx fglrx-legacy i915 i965 nvidia" GRAPHIC_DRIVERS="fglrx fglrx-legacy i915 i965 nvidia"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="yes" VDPAU="yes"

4
projects/Generic_OSS/options
View File

@ -259,8 +259,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau" GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no" VDPAU="no"

4
projects/ION/options
View File

@ -259,8 +259,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia" GRAPHIC_DRIVERS="nvidia"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="yes" VDPAU="yes"

4
projects/Intel/options
View File

@ -259,8 +259,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="i915 i965" GRAPHIC_DRIVERS="i915 i965"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no" VDPAU="no"

4
projects/RPi/options
View File

@ -259,8 +259,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="" GRAPHIC_DRIVERS=""
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="bcm2835-driver" XBMCPLAYER_DRIVER="bcm2835-driver"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no" VDPAU="no"

4
projects/Ultra/options
View File

@ -259,8 +259,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia" GRAPHIC_DRIVERS="nvidia"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="yes" VDPAU="yes"

4
projects/Virtual/options
View File

@ -254,8 +254,8 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="vmware virtualbox" GRAPHIC_DRIVERS="vmware virtualbox"
# OpenMAX implementation to use (no / bcm2835-driver) # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
OPENMAX="no" XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card) # Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no" VDPAU="no"