xbmc-pvr: update build script for xbmc-eden, dont depend on libmms and libXtst anymore

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-05-02 07:08:39 +02:00
parent b126e38188
commit 564fc9459f
3 changed files with 24 additions and 57 deletions

View File

@ -109,14 +109,20 @@ fi
cd $PKG_BUILD
do_autoreconf
do_autoreconf lib/cpluff
[ -d lib/libdvd/libdvdcss ] && do_autoreconf lib/libdvd/libdvdcss
do_autoreconf lib/libdvd/libdvdread
do_autoreconf lib/libdvd/libdvdnav
# adding fake Makefile for stripped skin
mkdir -p addons/skin.confluence/media
touch addons/skin.confluence/media/Makefile.in
# autoreconf
do_autoreconf
do_autoreconf lib/cpluff
# order matters with libdvd and friends
[ -d lib/libdvd/libdvdcss ] && do_autoreconf lib/libdvd/libdvdcss
do_autoreconf lib/libdvd/libdvdread
do_autoreconf lib/libdvd/libdvdnav
# Clean the generated files
find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \;
find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \;
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
@ -130,10 +136,14 @@ find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \;
--disable-debug \
--disable-optimizations \
--enable-gl \
--disable-gles \
$XBMC_VDPAU \
$XBMC_VAAPI \
$XBMC_CRYSTALHD \
--disable-vdadecoder \
--disable-vtbdecoder \
--disable-openmax \
--disable-tegra \
--disable-profiling \
--enable-joystick \
--enable-xrandr \
@ -142,22 +152,21 @@ find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \;
--disable-rsxs \
--disable-ccache \
$XBMC_PULSEAUDIO \
--enable-rtmp \
--enable-ffmpeg-libvorbis \
--disable-faac \
--enable-lame \
$XBMC_DVDCSS \
--disable-mid \
$XBMC_AVAHI \
--disable-hal \
$XBMC_AVAHI \
$XBMC_NONFREE \
--disable-asap-codec \
$XBMC_WEBSERVER \
--disable-libdts \
--disable-liba52 \
--enable-optical-drive \
--enable-libbluray \
--enable-texturepacker \
--disable-external-libraries \
--disable-external-ffmpeg \
--disable-external-liba52 \
--disable-external-libdts \
--enable-external-python \
# setup default skin inside the sources
sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h

View File

@ -25,8 +25,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.xbmc.org"
PKG_URL="$OPENELEC_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 libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba 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 libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings"
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc-pvr: XBMC Mediacenter"

View File

@ -1,42 +0,0 @@
diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
--- xbmc-pvr-3513480/configure.in 2011-04-25 03:24:35.056907267 +0200
+++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 04:31:28.068476385 +0200
@@ -1368,7 +1368,6 @@
OUTPUT_FILES="Makefile \
Makefile.include \
- addons/skin.confluence/media/Makefile \
xbmc/Makefile \
xbmc/cdrip/Makefile \
xbmc/cores/Makefile \
diff -Naur xbmc-pvr-3513480/Makefile.in xbmc-pvr-3513480.patch/Makefile.in
--- xbmc-pvr-3513480/Makefile.in 2011-04-25 03:15:20.988746910 +0200
+++ xbmc-pvr-3513480.patch/Makefile.in 2011-04-25 04:23:50.615799946 +0200
@@ -166,13 +166,8 @@
lib/addons/library.xbmc.pvr \
lib/addons/library.xbmc.gui \
-CONFLUENCE_MEDIA=addons/skin.confluence/media
-
-SKIN_DIRS=\
- $(CONFLUENCE_MEDIA)
-
DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
- $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(PVR_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS)
+ $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(PVR_DIRS) $(LIBADDON_DIRS)
LIBS=@LIBS@
CFLAGS=@CFLAGS@
@@ -209,12 +204,7 @@
@./bootstrap
# skin textures
-ifneq ($(findstring arm,@ARCH@), arm)
-skins: tools/TexturePacker/TexturePacker force
- $(MAKE) -C $(CONFLUENCE_MEDIA)
-else
skins:
-endif
xbmc/guilib/guilib.a: force