diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 645fd71252..ddb1bf326a 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -46,6 +46,12 @@ else XBMC_DVDCSS="--disable-dvdcss" fi +if [ "$BLURAY_SUPPORT" = yes ]; then + XBMC_BLURAY="--enable-libbluray" +else + XBMC_BLURAY="--disable-libbluray" +fi + if [ "$AVAHI_DAEMON" = yes ]; then XBMC_AVAHI="--enable-avahi" else @@ -154,7 +160,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag $XBMC_WEBSERVER \ --disable-libdts \ --disable-liba52 \ - --enable-libbluray \ + $XBMC_BLURAY \ --disable-external-ffmpeg \ --disable-external-liba52 \ --disable-external-libdts \ diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 7e52dedca9..8c84fdd8c8 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -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.bz2" -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 libbluray SDL SDL_mixer SDL_image 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 libbluray SDL SDL_mixer SDL_image sqlite mysql" +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_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_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" @@ -40,6 +40,11 @@ if [ "$FAAC_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS faac" fi +if [ "$BLURAY_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libbluray" + PKG_DEPENDS="$PKG_DEPENDS libbluray" +fi + if [ "$AVAHI_DAEMON" = yes ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi" PKG_DEPENDS="$PKG_DEPENDS avahi" diff --git a/projects/ATV/options b/projects/ATV/options index 96d2b776d3..1d929429ad 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -131,6 +131,9 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with BluRay support (yes / no) + BLURAY_SUPPORT="yes" + # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, diff --git a/projects/Fusion/options b/projects/Fusion/options index 66d8106597..de9f5ff959 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -131,6 +131,9 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with BluRay support (yes / no) + BLURAY_SUPPORT="yes" + # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, diff --git a/projects/Generic/options b/projects/Generic/options index f0cdcc4b66..188f19e5bc 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -131,6 +131,9 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with BluRay support (yes / no) + BLURAY_SUPPORT="yes" + # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 0937025cfb..a83838fa05 100644 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -131,6 +131,9 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with BluRay support (yes / no) + BLURAY_SUPPORT="yes" + # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, diff --git a/projects/ION/options b/projects/ION/options index fb482ffbc1..b475b708f6 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -131,6 +131,9 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with BluRay support (yes / no) + BLURAY_SUPPORT="yes" + # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, diff --git a/projects/Intel/options b/projects/Intel/options index fc7b98766a..66fe18c6bb 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -131,6 +131,9 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with BluRay support (yes / no) + BLURAY_SUPPORT="yes" + # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, diff --git a/projects/Ultra/options b/projects/Ultra/options index 004327fb18..91c0da9129 100644 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -131,6 +131,9 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with BluRay support (yes / no) + BLURAY_SUPPORT="yes" + # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported,