From 7ed69370a4773055b32f64aee5e413ed3a0cdf02 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 6 May 2012 15:45:46 +0200 Subject: [PATCH] xbmc-rpi: add option to enable/disable LAME and VORBIS encoder support Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-rpi/build | 15 ++++++++++++++- packages/mediacenter/xbmc-rpi/meta | 14 ++++++++++++-- projects/ATV/options | 6 ++++++ projects/Fusion/options | 6 ++++++ projects/Generic/options | 6 ++++++ projects/Generic_OSS/options | 6 ++++++ projects/ION/options | 6 ++++++ projects/Intel/options | 6 ++++++ projects/RPi/options | 6 ++++++ projects/Ultra/options | 6 ++++++ projects/Virtual/options | 6 ++++++ 11 files changed, 80 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/xbmc-rpi/build b/packages/mediacenter/xbmc-rpi/build index cee702ece8..6d89227656 100755 --- a/packages/mediacenter/xbmc-rpi/build +++ b/packages/mediacenter/xbmc-rpi/build @@ -110,6 +110,18 @@ else XBMC_DVDCSS="--disable-dvdcss" fi +if [ "$ENCODER_LAME" = yes ]; then + XBMC_LAMEENC="--enable-libmp3lame" +else + XBMC_LAMEENC="--disable-libmp3lame" +fi + +if [ "$ENCODER_VORBIS" = yes ]; then + XBMC_VORBISENC="--enable-libvorbisenc" +else + XBMC_VORBISENC="--disable-libvorbisenc" +fi + if [ "$BLURAY_SUPPORT" = yes ]; then XBMC_BLURAY="--enable-libbluray" else @@ -254,8 +266,9 @@ cd $PKG_BUILD $XBMC_SAMBA \ $XBMC_NFS \ $XBMC_AFP \ + $XBMC_VORBISENC \ --enable-ffmpeg-libvorbis \ - --enable-lame \ + $XBMC_LAMEENC \ $XBMC_DVDCSS \ --disable-mid \ --disable-hal \ diff --git a/packages/mediacenter/xbmc-rpi/meta b/packages/mediacenter/xbmc-rpi/meta index e0850576eb..e0aead8af0 100644 --- a/packages/mediacenter/xbmc-rpi/meta +++ b/packages/mediacenter/xbmc-rpi/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.xz" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 yajl sqlite mysql bc xbmc-addon-settings" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 yajl sqlite mysql" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 yajl sqlite mysql bc xbmc-addon-settings" +PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" @@ -90,6 +90,16 @@ if [ "$FAAC_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS faac" fi +if [ "$ENCODER_LAME" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS lame" + PKG_DEPENDS="$PKG_DEPENDS lame" +fi + +if [ "$ENCODER_VORBIS" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvorbis" + PKG_DEPENDS="$PKG_DEPENDS libvorbis" +fi + if [ "$BLURAY_SUPPORT" = yes ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libbluray" PKG_DEPENDS="$PKG_DEPENDS libbluray" diff --git a/projects/ATV/options b/projects/ATV/options index ae223d5fbe..ed5d60e5db 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -150,6 +150,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index 78dd97eb0b..20e0223fef 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -149,6 +149,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 97120f7d2c..c8c9ce5d32 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -149,6 +149,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index c00f8aecaa..abee4397cf 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -149,6 +149,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/ION/options b/projects/ION/options index 58cfc432c4..2695f575bd 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -149,6 +149,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 7a5278e60d..6a9c9faaf8 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -149,6 +149,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/RPi/options b/projects/RPi/options index 40a6767883..103f28e069 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -153,6 +153,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Ultra/options b/projects/Ultra/options index 7070482287..0e6e401912 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -149,6 +149,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Virtual/options b/projects/Virtual/options index 0cde098327..d3b6e7e57e 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -144,6 +144,12 @@ # (DVD decryption support in XBMC) (yes / no) DVDCSS_SUPPORT="yes" +# build and install with LAME cdrip encoder support + ENCODER_LAME="yes" + +# build and install with VORBIS cdrip encoder support + ENCODER_VORBIS="yes" + # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes"