Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2014-02-05 20:22:18 +01:00
commit afce4e7245
10 changed files with 13 additions and 29 deletions

View File

@ -33,4 +33,4 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--with-ogg=$SYSROOT_PREFIX/usr"
PKG_CONFIGURE_OPTS_TARGET="--with-ogg=$SYSROOT_PREFIX/usr --disable-oggtest --disable-docs --disable-examples"

View File

@ -37,6 +37,8 @@ PKG_CONFIGURE_OPTS_HOST="--with-gnu-ld \
--with-libiconv=no \
--enable-debug=no \
--disable-man \
--disable-dtrace \
--disable-systemtap \
--disable-rebuilds \
--disable-gtk-doc"

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

@ -33,15 +33,19 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_CONFIGURE_OPTS_HOST="--disable-shared --without-readline"
PKG_CONFIGURE_OPTS_HOST="--disable-device-mapper \
--enable-static \
--disable-shared \
--without-readline \
--disable-rpath \
--with-gnu-ld"
PKG_CONFIGURE_OPTS_TARGET="--disable-device-mapper \
--disable-shared \
--without-readline \
--disable-rpath \
--with-gnu-ld"
PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET"
post_make_target() {
# dont build parallel
MAKEFLAGS=-j1

View File

@ -95,7 +95,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-gtk-doc \
--without-utempter \
--without-systemdsystemunitdir"
PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET"
PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET --enable-static --disable-shared"
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin

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"