mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 15:07:49 +00:00
xbmc:
- update to xbmc-30605 - simplyfing install script (match with make install from xbmc)
This commit is contained in:
parent
126a2d6bef
commit
9607330e98
@ -38,7 +38,6 @@ $SCRIPTS/install libpng
|
|||||||
$SCRIPTS/install tiff
|
$SCRIPTS/install tiff
|
||||||
$SCRIPTS/install freetype #libass?
|
$SCRIPTS/install freetype #libass?
|
||||||
$SCRIPTS/install jasper
|
$SCRIPTS/install jasper
|
||||||
# $SCRIPTS/install libass
|
|
||||||
|
|
||||||
# $SCRIPTS/install a52dec # static
|
# $SCRIPTS/install a52dec # static
|
||||||
$SCRIPTS/install libmad
|
$SCRIPTS/install libmad
|
||||||
@ -68,64 +67,37 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
|
|||||||
PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`"
|
PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`"
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp -P $PKG_BUILD/xbmc.bin $INSTALL/usr/bin/xbmc
|
cp $PKG_DIR/scripts/xbmc $INSTALL/usr/bin
|
||||||
# cp -P $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin
|
cp $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send
|
||||||
cp -P $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc
|
mkdir -p $INSTALL/usr/lib/xbmc
|
||||||
cp -P $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc
|
cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc
|
||||||
|
cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/language
|
cd $PKG_BUILD
|
||||||
cp -PR $PKG_BUILD/language/* $INSTALL/usr/share/xbmc/language
|
find system addons \
|
||||||
|
-regextype posix-extended -type f \
|
||||||
|
-not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" \
|
||||||
|
-iregex ".*-linux.*|.*\.vis|.*\.xbs" \
|
||||||
|
-exec install -D "{}" $ROOT/$INSTALL/usr/lib/xbmc/"{}" ";"
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
|
find addons language media scripts sounds userdata system \
|
||||||
cp -P $PKG_BUILD/media/Fonts/*.ttf $INSTALL/usr/share/xbmc/media/Fonts
|
-regextype posix-extended -type f \
|
||||||
|
-not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \
|
||||||
|
-exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";"
|
||||||
|
cd -
|
||||||
|
|
||||||
|
# overriding Splash image
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/media
|
mkdir -p $INSTALL/usr/share/xbmc/media
|
||||||
cp -P $PKG_BUILD/media/weather.zip $INSTALL/usr/share/xbmc/media/
|
rm -rf $INSTALL/usr/share/xbmc/media/Splash.png
|
||||||
cp -P $PKG_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/
|
cp $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/
|
||||||
cp -P $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/sounds
|
|
||||||
cp -PR $PKG_BUILD/sounds/* $INSTALL/usr/share/xbmc/sounds
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/system
|
|
||||||
cp -P $PKG_BUILD/system/*linux.so $INSTALL/usr/share/xbmc/system
|
|
||||||
cp -P $PKG_BUILD/system/*.xml $INSTALL/usr/share/xbmc/system
|
|
||||||
cp -P $PKG_BUILD/system/*.conf $INSTALL/usr/share/xbmc/system
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/system/keymaps
|
|
||||||
cp -PR $PKG_BUILD/system/keymaps/* $INSTALL/usr/share/xbmc/system/keymaps
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/system/players/dvdplayer
|
|
||||||
cp -P $PKG_BUILD/system/players/dvdplayer/*.so $INSTALL/usr/share/xbmc/system/players/dvdplayer
|
|
||||||
cp -PR $PKG_BUILD/system/players/dvdplayer/etc $INSTALL/usr/share/xbmc/system/players/dvdplayer
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/system/players/paplayer
|
|
||||||
cp -P $PKG_BUILD/system/players/paplayer/*.so $INSTALL/usr/share/xbmc/system/players/paplayer
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/system/python
|
|
||||||
cp -P $PKG_BUILD/system/python/*.so $INSTALL/usr/share/xbmc/system/python
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/system/scrapers
|
|
||||||
cp -PR $PKG_BUILD/system/scrapers/* $INSTALL/usr/share/xbmc/system/scrapers
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/system/shaders
|
|
||||||
cp -PR $PKG_BUILD/system/shaders/* $INSTALL/usr/share/xbmc/system/shaders
|
|
||||||
|
|
||||||
mkdir -p $PYTHON_LIBDIR/site-packages
|
mkdir -p $PYTHON_LIBDIR/site-packages
|
||||||
cp -PR $PKG_BUILD/tools/EventClients/lib/python/* $PYTHON_LIBDIR/site-packages
|
cp -R $PKG_BUILD/tools/EventClients/lib/python/* $PYTHON_LIBDIR/site-packages
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/userdata
|
|
||||||
cp -PR $PKG_BUILD/userdata/* $INSTALL/usr/share/xbmc/userdata
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/web
|
mkdir -p $INSTALL/usr/share/xbmc/web
|
||||||
cp -R $PKG_BUILD/web/poc_jsonrpc/* $INSTALL/usr/share/xbmc/web
|
cp -R $PKG_BUILD/web/poc_jsonrpc/* $INSTALL/usr/share/xbmc/web
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/xbmc/addons
|
|
||||||
cp -PR $PKG_BUILD/addons/* $INSTALL/usr/share/xbmc/addons
|
|
||||||
find $INSTALL/usr/share/xbmc/addons -name *.h -exec rm -rf {} ";"
|
|
||||||
|
|
||||||
# other programs needed to run
|
# other programs needed to run
|
||||||
$SCRIPTS/install alsa
|
$SCRIPTS/install alsa
|
||||||
$SCRIPTS/install remote
|
$SCRIPTS/install remote
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
|
||||||
--- xbmc-30122/configure.in 2010-05-13 13:16:42.000000000 +0200
|
--- xbmc-30587/configure.in 2010-05-26 12:00:33.000000000 +0200
|
||||||
+++ xbmc-30122.patch/configure.in 2010-05-13 13:44:00.985198286 +0200
|
+++ xbmc-30587.patch/configure.in 2010-05-26 12:23:05.551857623 +0200
|
||||||
@@ -23,6 +23,8 @@
|
@@ -23,6 +23,8 @@
|
||||||
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
|
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
|
||||||
goom_enabled="== GOOM enabled. =="
|
goom_enabled="== GOOM enabled. =="
|
||||||
@ -10,9 +10,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
||||||
pulse_disabled="== PulseAudio support manually disabled. =="
|
pulse_disabled="== PulseAudio support manually disabled. =="
|
||||||
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
||||||
@@ -170,6 +172,12 @@
|
@@ -156,6 +158,12 @@
|
||||||
[use_goom=$enableval],
|
[use_goom=$enableval],
|
||||||
[use_goom=no])
|
[use_goom=no])
|
||||||
|
|
||||||
+AC_ARG_ENABLE([xbmcprojectm],
|
+AC_ARG_ENABLE([xbmcprojectm],
|
||||||
+ [AS_HELP_STRING([--enable-xbmcprojectm],
|
+ [AS_HELP_STRING([--enable-xbmcprojectm],
|
||||||
@ -21,9 +21,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
+ [use_xbmcprojectm=yes])
|
+ [use_xbmcprojectm=yes])
|
||||||
+
|
+
|
||||||
AC_ARG_ENABLE([ccache],
|
AC_ARG_ENABLE([ccache],
|
||||||
[AS_HELP_STRING([--enable-ccache],
|
[AS_HELP_STRING([--enable-ccache],
|
||||||
[enable building with ccache feature (default is auto)])],
|
[enable building with ccache feature (default is auto)])],
|
||||||
@@ -608,6 +616,15 @@
|
@@ -669,6 +677,15 @@
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
### External libraries checks
|
### External libraries checks
|
||||||
# External FFmpeg
|
# External FFmpeg
|
||||||
if test "$use_external_ffmpeg" = "yes"; then
|
if test "$use_external_ffmpeg" = "yes"; then
|
||||||
@@ -992,6 +1009,12 @@
|
@@ -1080,6 +1097,12 @@
|
||||||
final_message="$final_message\n GOOM:\t\tNo"
|
final_message="$final_message\n GOOM:\t\tNo"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -52,7 +52,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
if test "$use_mid" = "yes"; then
|
if test "$use_mid" = "yes"; then
|
||||||
final_message="$final_message\n MID Support:\tYes"
|
final_message="$final_message\n MID Support:\tYes"
|
||||||
SDL_DEFINES="$SDL_DEFINES -DMID"
|
SDL_DEFINES="$SDL_DEFINES -DMID"
|
||||||
@@ -1245,6 +1268,7 @@
|
@@ -1333,6 +1356,7 @@
|
||||||
AC_SUBST(SDL_DEFINES)
|
AC_SUBST(SDL_DEFINES)
|
||||||
AC_SUBST(BUILD_DVDCSS)
|
AC_SUBST(BUILD_DVDCSS)
|
||||||
AC_SUBST(BUILD_GOOM)
|
AC_SUBST(BUILD_GOOM)
|
||||||
@ -60,7 +60,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||||
AC_SUBST(USE_EXTERNAL_LIBASS)
|
AC_SUBST(USE_EXTERNAL_LIBASS)
|
||||||
@@ -1626,7 +1650,7 @@
|
@@ -1715,7 +1739,7 @@
|
||||||
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
|
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
|
||||||
set +x
|
set +x
|
||||||
fi
|
fi
|
||||||
@ -69,9 +69,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
|
|
||||||
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
|
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
|
||||||
if test "$host_vendor" != "apple" ; then
|
if test "$host_vendor" != "apple" ; then
|
||||||
diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in
|
diff -Naur xbmc-30587/Makefile.in xbmc-30587.patch/Makefile.in
|
||||||
--- xbmc-30122/Makefile.in 2010-05-13 13:16:42.000000000 +0200
|
--- xbmc-30587/Makefile.in 2010-05-26 12:00:33.000000000 +0200
|
||||||
+++ xbmc-30122.patch/Makefile.in 2010-05-13 13:41:15.585324083 +0200
|
+++ xbmc-30587.patch/Makefile.in 2010-05-26 12:23:05.553857450 +0200
|
||||||
@@ -106,8 +106,10 @@
|
@@ -106,8 +106,10 @@
|
||||||
|
|
||||||
VIS_DIRS=\
|
VIS_DIRS=\
|
||||||
@ -86,7 +86,7 @@ diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in
|
|||||||
VIS_DIRS+=xbmc/visualizations/iTunes
|
VIS_DIRS+=xbmc/visualizations/iTunes
|
||||||
endif
|
endif
|
||||||
@@ -307,7 +309,9 @@
|
@@ -307,7 +309,9 @@
|
||||||
visualizations: exports
|
ifneq (arm, $(ARCH))
|
||||||
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
|
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
|
||||||
$(MAKE) -C xbmc/visualizations/WaveForm
|
$(MAKE) -C xbmc/visualizations/WaveForm
|
||||||
+ifneq (@BUILD_XBMCPROJECTM@,1)
|
+ifneq (@BUILD_XBMCPROJECTM@,1)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
|
||||||
--- xbmc-30122/configure.in 2010-05-13 13:44:56.876227997 +0200
|
--- xbmc-30587/configure.in 2010-05-26 12:59:31.798732689 +0200
|
||||||
+++ xbmc-30122.patch/configure.in 2010-05-13 13:47:12.173197721 +0200
|
+++ xbmc-30587.patch/configure.in 2010-05-26 13:00:28.957732474 +0200
|
||||||
@@ -25,6 +25,8 @@
|
@@ -25,6 +25,8 @@
|
||||||
goom_disabled="== GOOM disabled. =="
|
goom_disabled="== GOOM disabled. =="
|
||||||
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
|
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
|
||||||
@ -10,7 +10,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
||||||
pulse_disabled="== PulseAudio support manually disabled. =="
|
pulse_disabled="== PulseAudio support manually disabled. =="
|
||||||
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
||||||
@@ -178,6 +180,12 @@
|
@@ -164,6 +166,12 @@
|
||||||
[use_xbmcprojectm=$enableval],
|
[use_xbmcprojectm=$enableval],
|
||||||
[use_xbmcprojectm=yes])
|
[use_xbmcprojectm=yes])
|
||||||
|
|
||||||
@ -21,9 +21,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
+ [use_rsxs=yes])
|
+ [use_rsxs=yes])
|
||||||
+
|
+
|
||||||
AC_ARG_ENABLE([ccache],
|
AC_ARG_ENABLE([ccache],
|
||||||
[AS_HELP_STRING([--enable-ccache],
|
[AS_HELP_STRING([--enable-ccache],
|
||||||
[enable building with ccache feature (default is auto)])],
|
[enable building with ccache feature (default is auto)])],
|
||||||
@@ -625,6 +633,15 @@
|
@@ -686,6 +694,15 @@
|
||||||
BUILD_XBMCPROJECTM=1
|
BUILD_XBMCPROJECTM=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
### External libraries checks
|
### External libraries checks
|
||||||
# External FFmpeg
|
# External FFmpeg
|
||||||
if test "$use_external_ffmpeg" = "yes"; then
|
if test "$use_external_ffmpeg" = "yes"; then
|
||||||
@@ -1015,6 +1032,12 @@
|
@@ -1103,6 +1120,12 @@
|
||||||
final_message="$final_message\n XBMCProjectM:\tNo"
|
final_message="$final_message\n XBMCProjectM:\tNo"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -52,7 +52,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
if test "$use_mid" = "yes"; then
|
if test "$use_mid" = "yes"; then
|
||||||
final_message="$final_message\n MID Support:\tYes"
|
final_message="$final_message\n MID Support:\tYes"
|
||||||
SDL_DEFINES="$SDL_DEFINES -DMID"
|
SDL_DEFINES="$SDL_DEFINES -DMID"
|
||||||
@@ -1269,6 +1292,7 @@
|
@@ -1357,6 +1380,7 @@
|
||||||
AC_SUBST(BUILD_DVDCSS)
|
AC_SUBST(BUILD_DVDCSS)
|
||||||
AC_SUBST(BUILD_GOOM)
|
AC_SUBST(BUILD_GOOM)
|
||||||
AC_SUBST(BUILD_XBMCPROJECTM)
|
AC_SUBST(BUILD_XBMCPROJECTM)
|
||||||
@ -60,18 +60,18 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
|||||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||||
AC_SUBST(USE_EXTERNAL_LIBASS)
|
AC_SUBST(USE_EXTERNAL_LIBASS)
|
||||||
@@ -1704,7 +1728,7 @@
|
@@ -1795,7 +1819,7 @@
|
||||||
--disable-lattice \
|
|
||||||
--disable-skyrocket
|
--disable-skyrocket
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
-], [0])
|
-], [0])
|
||||||
+], [$BUILD_RSXS])
|
+], [$BUILD_RSXS])
|
||||||
|
|
||||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
|
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
|
||||||
if test "$host_vendor" = "apple" ; then
|
if test "$host_vendor" = "apple" ; then
|
||||||
diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in
|
diff -Naur xbmc-30587/Makefile.in xbmc-30587.patch/Makefile.in
|
||||||
--- xbmc-30122/Makefile.in 2010-05-13 13:44:56.877229584 +0200
|
--- xbmc-30587/Makefile.in 2010-05-26 12:59:31.799730855 +0200
|
||||||
+++ xbmc-30122.patch/Makefile.in 2010-05-13 13:45:16.444196472 +0200
|
+++ xbmc-30587.patch/Makefile.in 2010-05-26 12:59:41.162732822 +0200
|
||||||
@@ -101,8 +101,10 @@
|
@@ -101,8 +101,10 @@
|
||||||
lib/xbmc-dll-symbols \
|
lib/xbmc-dll-symbols \
|
||||||
lib/jsoncpp/jsoncpp/src/lib_json
|
lib/jsoncpp/jsoncpp/src/lib_json
|
||||||
@ -85,12 +85,13 @@ diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in
|
|||||||
|
|
||||||
VIS_DIRS=\
|
VIS_DIRS=\
|
||||||
xbmc/visualizations/OpenGLSpectrum \
|
xbmc/visualizations/OpenGLSpectrum \
|
||||||
@@ -321,7 +323,9 @@
|
@@ -323,8 +325,10 @@
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
screensavers: exports
|
screensavers: exports
|
||||||
|
ifneq (arm, $(ARCH))
|
||||||
+ifneq (@BUILD_RSXS@,1)
|
+ifneq (@BUILD_RSXS@,1)
|
||||||
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
|
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
|
||||||
|
endif
|
||||||
+endif
|
+endif
|
||||||
libpython: dllloader
|
libpython: dllloader
|
||||||
$(MAKE) -C xbmc/lib/libPython
|
$(MAKE) -C xbmc/lib/libPython
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
|
diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
|
||||||
--- xbmc-30122/configure.in 2010-05-13 13:58:23.276198942 +0200
|
--- xbmc-30587/configure.in 2010-05-26 12:27:28.620730606 +0200
|
||||||
+++ xbmc-30122.patch/configure.in 2010-05-13 13:58:49.323198531 +0200
|
+++ xbmc-30587.patch/configure.in 2010-05-26 12:29:17.460731872 +0200
|
||||||
@@ -489,9 +489,6 @@
|
@@ -531,9 +531,6 @@
|
||||||
PKG_CHECK_MODULES([XMU], [xmu],
|
PKG_CHECK_MODULES([XMU], [xmu],
|
||||||
[INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
|
[INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
|
||||||
AC_MSG_ERROR($missing_library))
|
AC_MSG_ERROR($missing_library))
|
||||||
- PKG_CHECK_MODULES([XINERAMA], [xinerama],
|
- PKG_CHECK_MODULES([XINERAMA],[xinerama],
|
||||||
- [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"],
|
- [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"],
|
||||||
- AC_MSG_ERROR($missing_library))
|
- AC_MSG_ERROR($missing_library))
|
||||||
PKG_CHECK_MODULES([CURL], [libcurl],
|
PKG_CHECK_MODULES([CURL], [libcurl],
|
||||||
[INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"],
|
[INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"],
|
||||||
AC_MSG_ERROR($missing_library))
|
AC_MSG_ERROR($missing_library))
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
|
diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
|
||||||
--- xbmc-28910/configure.in 2010-03-28 19:26:02.516628518 +0200
|
--- xbmc-30587/configure.in 2010-05-26 12:30:34.583732752 +0200
|
||||||
+++ xbmc-28910.patch/configure.in 2010-03-28 19:26:44.961754003 +0200
|
+++ xbmc-30587.patch/configure.in 2010-05-26 12:33:26.657731562 +0200
|
||||||
@@ -764,6 +764,7 @@
|
@@ -941,6 +941,7 @@
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -9,11 +9,13 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
|
|||||||
AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",)
|
AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",)
|
||||||
AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
|
AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
|
||||||
|
|
||||||
@@ -1318,6 +1319,7 @@
|
@@ -1569,7 +1570,8 @@
|
||||||
--enable-protocol=http \
|
--enable-protocol=http \
|
||||||
--enable-pthreads \
|
--enable-pthreads \
|
||||||
`if test "$host_cpu" = "powerpc" || test "$host_cpu" = "powerpc64"; then echo --enable-pic; fi` \
|
`case $host_cpu in powerpc*|arm*) echo --enable-pic ;; esac` \
|
||||||
+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
|
- --cc="$CC"
|
||||||
--cc="$CC"
|
+ --cc="$CC" \
|
||||||
|
+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi`
|
||||||
fi
|
fi
|
||||||
], [$USE_EXTERNAL_FFMPEG])
|
], [$USE_EXTERNAL_FFMPEG])
|
||||||
|
|
||||||
|
5
packages/mediacenter/xbmc/scripts/xbmc
Executable file
5
packages/mediacenter/xbmc/scripts/xbmc
Executable file
@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
LIBDIR=/usr/lib
|
||||||
|
|
||||||
|
$LIBDIR/xbmc/xbmc.bin $@
|
@ -1 +1 @@
|
|||||||
http://sources.openelec.tv/svn/xbmc-30122.tar.bz2
|
http://sources.openelec.tv/svn/xbmc-30605.tar.bz2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user