mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 22:47:51 +00:00
xbmc: update to xbmc-32416, remove external zlib patch, remove irtrans lircmap patch (already included)
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
e0d756127c
commit
fa1c2cafc7
@ -105,7 +105,6 @@ $AUTORECONF xbmc/lib/libid3tag/libid3tag
|
||||
--disable-external-ffmpeg \
|
||||
--disable-external-liba52 \
|
||||
--disable-external-libdts \
|
||||
--enable-external-libz \
|
||||
--enable-external-python \
|
||||
|
||||
make externals
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="32342"
|
||||
PKG_VERSION="32416"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
--- xbmc-31903/configure.in 2010-07-17 16:48:30.812376923 +0200
|
||||
+++ xbmc-31903.patch/configure.in 2010-07-17 16:49:06.305376455 +0200
|
||||
@@ -61,6 +61,8 @@
|
||||
external_liba52_disabled="== Use of external liba52 disabled. =="
|
||||
external_libdts_enabled="== Use of external libdts enabled. =="
|
||||
external_libdts_disabled="== Use of external libdts disabled. =="
|
||||
+external_libz_enabled="== Use of external libz enabled. =="
|
||||
+external_libz_disabled="== Use of external libz disabled. =="
|
||||
external_python_enabled="== Use of external python enabled. =="
|
||||
external_python_disabled="== Use of external python disabled. =="
|
||||
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
|
||||
@@ -287,6 +289,12 @@
|
||||
[use_external_libdts=$enableval],
|
||||
[use_external_libdts=$use_external_libraries])
|
||||
|
||||
+AC_ARG_ENABLE([external-libz],
|
||||
+ [AS_HELP_STRING([--enable-external-libz],
|
||||
+ [enable use of external libz library (default is no)])],
|
||||
+ [use_external_libz=$enableval],
|
||||
+ [use_external_libz=no])
|
||||
+
|
||||
AC_ARG_ENABLE([external-python],
|
||||
[AS_HELP_STRING([--enable-external-python],
|
||||
[enable use of external python library (default is no) 'Linux only'])],
|
||||
@@ -848,6 +856,18 @@
|
||||
USE_EXTERNAL_LIBDTS=0
|
||||
fi
|
||||
|
||||
+# External libz
|
||||
+if test "$use_external_libraries" = "yes" || test "$use_external_libz" = "yes"; then
|
||||
+ AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
|
||||
+ AC_CHECK_HEADERS([zlib.h],, AC_MSG_ERROR([$missing_headers]))
|
||||
+ AC_MSG_NOTICE($external_libz_enabled)
|
||||
+ USE_EXTERNAL_LIBZ=1
|
||||
+ AC_DEFINE([USE_EXTERNAL_LIBZ], [1], [Whether to use external libz library/zlib.])
|
||||
+else
|
||||
+ AC_MSG_NOTICE($external_libz_disabled)
|
||||
+ USE_EXTERNAL_LIBZ=0
|
||||
+fi
|
||||
+
|
||||
# External Python
|
||||
if test "$use_external_python" = "yes"; then
|
||||
AC_CHECK_LIB([python2.6], [main],
|
||||
@@ -1353,6 +1373,11 @@
|
||||
final_message="$final_message\n External libdts:\tNo"
|
||||
fi
|
||||
fi
|
||||
+if test "$use_external_libz" = "yes"; then
|
||||
+ final_message="$final_message\n External zlib:\tYes"
|
||||
+else
|
||||
+ final_message="$final_message\n External zlib:\tNo"
|
||||
+fi
|
||||
if test "$use_external_python" = "yes"; then
|
||||
final_message="$final_message\n External Python:\tYes"
|
||||
else
|
||||
@@ -1791,7 +1816,7 @@
|
||||
CFLAGS="$CFLAGS -fno-common" \
|
||||
./configure
|
||||
fi
|
||||
-], [0])
|
||||
+], [$USE_EXTERNAL_LIBZ])
|
||||
|
||||
XB_CONFIG_MODULE([lib/libass], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
@ -1,52 +0,0 @@
|
||||
diff -Naur xbmc-29490/system/Lircmap.xml xbmc-29490.patch/system/Lircmap.xml
|
||||
--- xbmc-29490/system/Lircmap.xml 2010-04-24 22:45:26.000000000 +0200
|
||||
+++ xbmc-29490.patch/system/Lircmap.xml 2010-04-28 22:00:13.734656322 +0200
|
||||
@@ -362,4 +362,48 @@
|
||||
<recordedtv>recordlist</recordedtv>
|
||||
<title>teletext</title>
|
||||
</remote>
|
||||
+ <remote device="mediacenter">
|
||||
+ <pause>pause</pause>
|
||||
+ <stop>stop</stop>
|
||||
+ <forward>fwd</forward>
|
||||
+ <reverse>rew</reverse>
|
||||
+ <left>left</left>
|
||||
+ <right>right</right>
|
||||
+ <up>up</up>
|
||||
+ <down>down</down>
|
||||
+ <select>ok</select>
|
||||
+ <pageplus>ch+</pageplus>
|
||||
+ <pageminus>ch-</pageminus>
|
||||
+ <back>back</back>
|
||||
+ <menu>clear</menu>
|
||||
+ <title>play</title>
|
||||
+ <info>info</info>
|
||||
+ <skipplus>next</skipplus>
|
||||
+ <skipminus>prev</skipminus>
|
||||
+ <display>teletext</display>
|
||||
+ <start>ehome</start>
|
||||
+ <record>rec</record>
|
||||
+ <volumeplus>vol+</volumeplus>
|
||||
+ <volumeminus>vol-</volumeminus>
|
||||
+ <mute>mute</mute>
|
||||
+ <power>power</power>
|
||||
+ <myvideo>video</myvideo>
|
||||
+ <mymusic>music</mymusic>
|
||||
+ <mypictures>pictures</mypictures>
|
||||
+ <mytv>tv</mytv>
|
||||
+ <one>1</one>
|
||||
+ <two>2</two>
|
||||
+ <three>3</three>
|
||||
+ <four>4</four>
|
||||
+ <five>5</five>
|
||||
+ <six>6</six>
|
||||
+ <seven>7</seven>
|
||||
+ <eight>8</eight>
|
||||
+ <nine>9</nine>
|
||||
+ <zero>0</zero>
|
||||
+ <mytv>red</mytv>
|
||||
+ <mymusic>green</mymusic>
|
||||
+ <mypictures>yellow</mypictures>
|
||||
+ <myvideo>blue</myvideo>
|
||||
+ </remote>
|
||||
</lircmap>
|
||||
Loading…
x
Reference in New Issue
Block a user