diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index f0cd08579c..7c58342f2a 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -2,58 +2,11 @@ . config/options $1 -$SCRIPTS/build toolchain -$SCRIPTS/build boost -$SCRIPTS/build Python -$SCRIPTS/build zlib -$SCRIPTS/build bzip2 -$SCRIPTS/build lzo -$SCRIPTS/build pcre - -$SCRIPTS/build alsa-lib -$SCRIPTS/build libass -$SCRIPTS/build enca #libass? -$SCRIPTS/build curl -$SCRIPTS/build libssh -$SCRIPTS/build rtmpdump - -$SCRIPTS/build dbus - -$SCRIPTS/build libXt -$SCRIPTS/build libXtst -$SCRIPTS/build libXmu -$SCRIPTS/build libXrandr - -$SCRIPTS/build Mesa -$SCRIPTS/build glew -$SCRIPTS/build fontconfig #libass? -$SCRIPTS/build fribidi - -$SCRIPTS/build $LIBJPEG -$SCRIPTS/build libpng -$SCRIPTS/build tiff -$SCRIPTS/build freetype #libass? -$SCRIPTS/build jasper - -$SCRIPTS/build libmad -$SCRIPTS/build libsamplerate -$SCRIPTS/build libogg -$SCRIPTS/build libvorbis -$SCRIPTS/build libcdio -$SCRIPTS/build libmms -$SCRIPTS/build libmodplug -$SCRIPTS/build faad2 -$SCRIPTS/build flac -$SCRIPTS/build wavpack -$SCRIPTS/build libmpeg2 - -$SCRIPTS/build SDL #? -$SCRIPTS/build SDL_mixer #? -$SCRIPTS/build SDL_image #? - -$SCRIPTS/build sqlite -$SCRIPTS/build mysql #lib #? -$SCRIPTS/build samba #lib +if [ "$PULSEAUDIO_SUPPORT" = yes ]; then + XBMC_PULSEAUDIO="--enable-pulse" +else + XBMC_PULSEAUDIO="--disable-pulse" +fi if [ "$NONFREE_SUPPORT" = yes ]; then XBMC_NONFREE="--enable-non-free" @@ -68,42 +21,36 @@ else fi if [ "$FAAC_SUPPORT" = yes ]; then - $SCRIPTS/build faac XBMC_FAAC="--enable-faac" else XBMC_FAAC="--disable-faac" fi if [ "$AVAHI_DAEMON" = yes ]; then - $SCRIPTS/build avahi XBMC_AVAHI="--enable-avahi" else XBMC_AVAHI="--disable-avahi" fi if [ "$WEBSERVER" = yes ]; then - $SCRIPTS/build libmicrohttpd XBMC_WEBSERVER="--enable-webserver" else XBMC_WEBSERVER="--disable-webserver" fi if [ "$VDPAU" = yes ]; then - $SCRIPTS/build libvdpau XBMC_VDPAU="--enable-vdpau" else XBMC_VDPAU="--disable-vdpau" fi if [ "$VAAPI" = yes ]; then - $SCRIPTS/build libva XBMC_VAAPI="--enable-vaapi" else XBMC_VAAPI="--disable-vaapi" fi if [ "$CRYSTALHD" = yes ]; then - $SCRIPTS/build crystalhd XBMC_CRYSTALHD="--enable-crystalhd" else XBMC_CRYSTALHD="--disable-crystalhd" @@ -113,6 +60,7 @@ fi CFLAGS=`echo $CFLAGS | sed -e "s|-Os|-O2|"` CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-Os|-O2|"` LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` + cd $PKG_BUILD ./bootstrap @@ -141,7 +89,7 @@ $AUTORECONF xbmc/lib/libid3tag/libid3tag --disable-xbmcprojectm \ --disable-rsxs \ --disable-ccache \ - --disable-pulse \ + $XBMC_PULSEAUDIO \ --enable-ffmpeg-libvorbis \ $XBMC_FAAC \ $XBMC_DVDCSS \ diff --git a/packages/mediacenter/xbmc/init.d/60_xbmc b/packages/mediacenter/xbmc/init.d/60_xbmc index 2ff73a1b1c..003f12ab78 100755 --- a/packages/mediacenter/xbmc/init.d/60_xbmc +++ b/packages/mediacenter/xbmc/init.d/60_xbmc @@ -33,6 +33,10 @@ progress "starting XBMC" # clean temp dir rm -rf $HOME/.xbmc/temp/* +# starting pulseaudio if avaible + [ -f /usr/bin/pulseaudio ] && /usr/bin/pulseaudio \ + --start --log-target=syslog --daemonize 2>&1 > /dev/null + # starting autoupdate [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate & diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index e5eb7084e4..152edf78d5 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -2,65 +2,6 @@ . config/options $1 -$SCRIPTS/install Python -$SCRIPTS/install boost -$SCRIPTS/install zlib -$SCRIPTS/install bzip2 -$SCRIPTS/install lzo -$SCRIPTS/install pcre - -$SCRIPTS/install alsa-lib -$SCRIPTS/install libass -$SCRIPTS/install enca #libass -$SCRIPTS/install curl -$SCRIPTS/install libssh - -$SCRIPTS/install dbus - -$SCRIPTS/install libXt -$SCRIPTS/install libXtst -$SCRIPTS/install libXmu -$SCRIPTS/install libXrandr - -$SCRIPTS/install Mesa -$SCRIPTS/install glew -$SCRIPTS/install fontconfig #libass? -$SCRIPTS/install fribidi - -$SCRIPTS/install $LIBJPEG -$SCRIPTS/install libpng -$SCRIPTS/install tiff -$SCRIPTS/install freetype #libass? -$SCRIPTS/install jasper - -# $SCRIPTS/install a52dec # static -$SCRIPTS/install libmad -$SCRIPTS/install libsamplerate -$SCRIPTS/install libogg -$SCRIPTS/install libvorbis -$SCRIPTS/install libcdio -$SCRIPTS/install libmms -$SCRIPTS/install libmodplug -$SCRIPTS/install faad2 -$SCRIPTS/install flac -$SCRIPTS/install wavpack -$SCRIPTS/install libmpeg2 - -$SCRIPTS/install SDL -$SCRIPTS/install SDL_mixer -$SCRIPTS/install SDL_image - -$SCRIPTS/install sqlite -$SCRIPTS/install mysql -$SCRIPTS/install samba - -[ "$FAAC_SUPPORT" = yes ] && $SCRIPTS/install faac -[ "$VDPAU" = yes ] && $SCRIPTS/install libvdpau -[ "$VAAPI" = yes ] && $SCRIPTS/install libva -[ "$CRYSTALHD" = yes ] && $SCRIPTS/install crystalhd -[ "$AVAHI_DAEMON" = yes ] && $SCRIPTS/install avahi -[ "$WEBSERVER" = yes ] && $SCRIPTS/install libmicrohttpd - PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`" mkdir -p $INSTALL/usr/bin @@ -106,6 +47,3 @@ mkdir -p $INSTALL/usr/share/xbmc/addons $SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml cp -R $PKG_DIR/config/repository.openelec.tv $INSTALL/usr/share/xbmc/addons $SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/xbmc/addons/repository.openelec.tv/addon.xml - -# other programs needed to run - $SCRIPTS/install alsa diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta new file mode 100644 index 0000000000..2d14dea231 --- /dev/null +++ b/packages/mediacenter/xbmc/meta @@ -0,0 +1,49 @@ +PKG_NAME="xbmc" +PKG_VERSION="32090" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.xbmc.org" +PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="boostPython 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 SDL SDL_mixer SDL_image sqlite mysql samba alsa" +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 SDL SDL_mixer SDL_image sqlite mysql samba" +PKG_PRIORITY="optional" +PKG_SECTION="mediacenter" +PKG_SHORTDESC="xbmc: XBMC Mediacenter" +PKG_LONGDESC="XBMC Media Center (which was formerly named Xbox Media Center) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." +PKG_IS_ADDON="no" + +if [ "$PULSEAUDIO_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio" + PKG_DEPENDS="$PKG_DEPENDS pulseaudio" +fi + +if [ "$FAAC_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS faac" + PKG_DEPENDS="$PKG_DEPENDS faac" +fi + +if [ "$AVAHI_DAEMON" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi" + PKG_DEPENDS="$PKG_DEPENDS avahi" +fi + +if [ "$WEBSERVER" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd" + PKG_DEPENDS="$PKG_DEPENDS libmicrohttpd" +fi + +if [ "$VDPAU" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau" + PKG_DEPENDS="$PKG_DEPENDS libvdpau" +fi + +if [ "$VAAPI" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva" + PKG_DEPENDS="$PKG_DEPENDS libva" +fi + +if [ "$CRYSTALHD" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS crystalhd" + PKG_DEPENDS="$PKG_DEPENDS crystalhd" +fi diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url deleted file mode 100644 index 2d6553b2f4..0000000000 --- a/packages/mediacenter/xbmc/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/xbmc-32090.tar.bz2