xbmc-pvr: update to latest git version

This commit is contained in:
Gujs 2011-04-03 23:34:10 +02:00
parent 05a6d87bd0
commit cf7a171ae4
16 changed files with 19 additions and 28 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-pvr-theme-Confluence"
PKG_VERSION="master-2a1a563"
PKG_VERSION="master-05bd3ef"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -137,6 +137,7 @@ do_autoreconf lib/libid3tag/libid3tag
$XBMC_PULSEAUDIO \
--enable-ffmpeg-libvorbis \
--disable-faac \
--enable-lame \
$XBMC_DVDCSS \
--disable-mid \
$XBMC_AVAHI \

View File

@ -19,15 +19,15 @@
################################################################################
PKG_NAME="xbmc-pvr"
PKG_VERSION="master-2a1a563"
PKG_VERSION="master-05bd3ef"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.xbmc.org"
#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://gujs.openelec.tv/$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 libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms 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 libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms 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"
@ -74,4 +74,3 @@ fi
if [ "$PS3REMOTE_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS PyBluez"
fi

View File

@ -85,10 +85,10 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \
@@ -323,8 +325,10 @@
@@ -483,8 +485,10 @@
$(MAKE) -C xbmc/pvrclients/tvheadend
screensavers: exports
ifneq (arm, @ARCH@)
ifneq ($(findstring arm,@ARCH@), arm)
+ifneq (@BUILD_RSXS@,1)
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
endif

View File

@ -0,0 +1,12 @@
diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in
--- xbmc-10.0-Dharma/configure.in 2010-12-17 20:30:53.000000000 +0100
+++ xbmc-10.0-Dharma.patch/configure.in 2011-01-06 03:41:05.387941174 +0100
@@ -940,6 +938,8 @@
USE_EXTERNAL_PYTHON=1
AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.])
else
+ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
AC_MSG_NOTICE($external_python_disabled)
USE_EXTERNAL_PYTHON=0
fi

View File

@ -1,21 +0,0 @@
diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in
--- xbmc-10.0-Dharma/configure.in 2010-12-17 20:30:53.000000000 +0100
+++ xbmc-10.0-Dharma.patch/configure.in 2011-01-06 03:41:05.387941174 +0100
@@ -546,8 +546,6 @@
AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
-AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
-AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([wavpack], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
@@ -940,6 +938,8 @@
USE_EXTERNAL_PYTHON=1
AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.])
else
+ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
AC_MSG_NOTICE($external_python_disabled)
USE_EXTERNAL_PYTHON=0
fi