xbmc: drop ENCODER_VORBIS. make xbmc always depend on libvorbis

I dont think ENCODER_VORBIS=no ever worked as vorbis is a xbmc
hard requirment since 2009

later --enable-libvorbisenc may be removed if not needed, and vorbis compiled static

closes #2918
This commit is contained in:
Stefan Saraev 2014-02-05 19:07:25 +02:00
parent e158fa0079
commit 8bee51d51d
6 changed files with 2 additions and 24 deletions

View File

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.xbmc.org"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib libxml2 libxslt yajl sqlite"
PKG_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib libxml2 libxslt yajl sqlite libvorbis"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@ -178,13 +178,6 @@ else
XBMC_LAMEENC="--disable-libmp3lame"
fi
if [ "$ENCODER_VORBIS" = yes ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvorbis"
XBMC_VORBISENC="--enable-libvorbisenc"
else
XBMC_VORBISENC="--disable-libvorbisenc"
fi
if [ "$BLURAY_SUPPORT" = yes ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbluray"
XBMC_BLURAY="--enable-libbluray"
@ -349,7 +342,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \
$XBMC_SAMBA \
$XBMC_NFS \
$XBMC_AFP \
$XBMC_VORBISENC \
--enable-libvorbisenc \
--disable-libcap \
--enable-ffmpeg-libvorbis \
$XBMC_LAMEENC \

View File

@ -157,9 +157,6 @@
# 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"

View File

@ -158,9 +158,6 @@
# 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"

View File

@ -157,9 +157,6 @@
# 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"

View File

@ -158,9 +158,6 @@
# 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"

View File

@ -152,9 +152,6 @@
# 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"