jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: fix merge mess

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-09-14 23:42:00 +02:00
parent 3179840d0c
commit 88f0ba241b
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/mediacenter/xbmc/build
View File

@ -74,6 +74,7 @@ if [ "$AFP_SUPPORT" = yes ]; then
XBMC_AFP="--enable-afpclient" XBMC_AFP="--enable-afpclient"
else else
XBMC_AFP="--disable-afpclient" XBMC_AFP="--disable-afpclient"
fi
if [ "$SAMBA_CLIENT" = yes ]; then if [ "$SAMBA_CLIENT" = yes ]; then
XBMC_SAMBA="--enable-samba" XBMC_SAMBA="--enable-samba"
@ -198,16 +199,10 @@ cd $PKG_BUILD
$XBMC_NONFREE \ $XBMC_NONFREE \
--disable-asap-codec \ --disable-asap-codec \
$XBMC_WEBSERVER \ $XBMC_WEBSERVER \
<<<<<<< HEAD
--enable-optical-drive \ --enable-optical-drive \
--enable-libbluray \ $XBMC_BLURAY \
--enable-texturepacker \ --enable-texturepacker \
--disable-external-libraries \ --disable-external-libraries \
=======
--disable-libdts \
--disable-liba52 \
$XBMC_BLURAY \
>>>>>>> 8c05f3c4f8219cd1d7543041e180d64933df95fd
--disable-external-ffmpeg \ --disable-external-ffmpeg \
# setup default skin inside the sources # setup default skin inside the sources

6
packages/mediacenter/xbmc/meta
View File

@ -25,8 +25,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.xbmc.org" PKG_SITE="http://www.xbmc.org"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" 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 dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql alsa bc xbmc-addon-settings" 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 dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql" 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_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="mediacenter" PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc: XBMC Mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@ -75,6 +75,7 @@ fi
if [ "$AFP_SUPPORT" = yes ]; then if [ "$AFP_SUPPORT" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng"
PKG_DEPENDS="$PKG_DEPENDS afpfs-ng" PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
fi
if [ "$SAMBA_CLIENT" = yes ]; then if [ "$SAMBA_CLIENT" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba"
@ -113,3 +114,4 @@ fi
# some python stuff needed for various addons # some python stuff needed for various addons
PKG_DEPENDS="$PKG_DEPENDS Imaging" PKG_DEPENDS="$PKG_DEPENDS Imaging"
PKG_DEPENDS="$PKG_DEPENDS simplejson" PKG_DEPENDS="$PKG_DEPENDS simplejson"