Skip to content

Commit

Permalink
Import patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@garbear
garbear committed Oct 28, 2016
1 parent c327c53 commit 52397eb
Show file tree
Hide file tree
Showing 29 changed files with 1,990 additions and 38 deletions.
16 changes: 13 additions & 3 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ case $host in
target_platform=target_linux
ARCH="arm"
use_arch="arm"
use_joystick=no
#use_joystick=no
use_neon=yes
use_gles=yes
use_gl=no
Expand Down Expand Up @@ -1267,7 +1267,7 @@ fi
AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"])
INCLUDES="$INCLUDES $SDL2_CFLAGS"; LIBS="$LIBS $SDL2_LIBS"; use_joystick="yes"],
[if test "$use_joystick" = "yes"; then
AC_MSG_ERROR($sdl_joystick_not_found)
AC_MSG_RESULT("SDL joystick enabled")
elif test "$use_joystick" != "no"; then
AC_MSG_NOTICE($sdl_joystick_not_found)
use_joystick="no"
Expand Down Expand Up @@ -1302,6 +1302,16 @@ else
AC_MSG_RESULT($alsa_disabled)
fi

# Steam Link
AC_CHECK_HEADERS([SLVideo.h SLAudio.h], steamlink_found=yes,)
if test "$steamlink_found" = "yes"; then
USE_STEAMLINK=1
use_pulse=no
AC_DEFINE([HAS_STEAMLINK], [], [Define if we are compiling with the Steam Link SDK])
LIBS="$LIBS -lSLVideo -lSLAudio"
fi
AC_SUBST(USE_STEAMLINK)

# PulseAudio
if test "x$use_pulse" != "xno"; then
if test "$host_vendor" = "apple" ; then
Expand Down Expand Up @@ -1711,7 +1721,7 @@ fi

if test "${USE_STATIC_FFMPEG}" = "1"; then
# get the libdir for static linking
FFMPEG_LIBDIR=${pkg_cfg_prefix}$(PKG_CONFIG_SYSROOT_DIR="" ${PKG_CONFIG} --static --variable=libdir libavcodec)
FFMPEG_LIBDIR=$(${PKG_CONFIG} --static --variable=libdir libavcodec)
GNUTLS_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls)
VORBISENC_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc)
DCADEC_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors dcadec)
Expand Down
330 changes: 330 additions & 0 deletions system/keymaps/joystick.Steam.Controller.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,330 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This file contains the mappings for a Steam Controller to actions within XBMC -->
<!-- The <global> section is a fall through - they will only be used if the button is not -->
<!-- used in the current window's section. Note that there is only handling -->
<!-- for a single action per button at this stage. -->

<!-- The format of a mapping is: -->
<!-- <device name="name"> -->
<!-- <button id="x">action</button> -->
<!-- <axis id="x" limit="y">action</axis> -->
<!-- <hat id="1" position="left">action</hat> -->
<!-- </device> -->

<!-- Note that the action can be a built-in function. -->
<!-- eg <button id="x">ActivateWindow(Home)</button> -->
<!-- would automatically go to Home on the press of button 'x'. -->

<!-- Joystick Name: Steam Controller
<!-- Button Mappings on Steam Link: -->
<!-- -->
<!-- ID Button -->
<!-- -->
<!-- 1 A -->
<!-- 2 B -->
<!-- 3 X -->
<!-- 4 Y -->
<!-- 5 Left Shoulder -->
<!-- 6 Right Shoulder -->
<!-- 7 Back -->
<!-- 8 Start -->
<!-- 9 Guide -->
<!-- 10 Left Stick Button -->
<!-- 11 Right Grip -->
<!-- 12 Left Grip -->

<!-- Axis Mappings: -->
<!-- -->
<!-- ID Button -->
<!-- -->
<!-- 1 Left Stick L/R -->
<!-- 2 Left Stick U/D -->
<!-- 3 Left Trigger -->
<!-- 4 Right Trigger -->

<keymap>
<joystickFamily name="Steam Controller">
<name>Steam Controller</name>
</joystickFamily>
<global>
<joystick family="Steam Controller">
<button id="1">Select</button>
<button id="2">Back</button>
<button id="3">ContextMenu</button>
<button id="4">FullScreen</button>
<button id="5">Queue</button>
<button id="6">Playlist</button>
<button id="7">PreviousMenu</button>
<button id="8">ActivateWindow(Home)</button>
<button id="9">ActivateWindow(Home)</button>
<button id="10">ActivateWindow(ShutdownMenu)</button>
<button id="11">VolumeUp</button>
<button id="12">VolumeDown</button>
<axis id="1" limit="-1">AnalogSeekBack</axis>
<axis id="1" limit="+1">AnalogSeekForward</axis>
<axis id="3" limit="+1">ScrollUp</axis>
<axis id="4" limit="+1">ScrollDown</axis>
<hat id="1" position="up">Up</hat>
<hat id="1" position="down">Down</hat>
<hat id="1" position="left">Left</hat>
<hat id="1" position="right">Right</hat>
</joystick>
</global>
<Home>
<joystick family="Steam Controller">
<button id="8">Skin.ToggleSetting(HomeViewToggle)</button>
</joystick>
</Home>
<MyFiles>
<joystick family="Steam Controller">
<button id="6">Highlight</button>
</joystick>
</MyFiles>
<MyMusicPlaylist>
<joystick family="Steam Controller">
<button id="5">Delete</button>
</joystick>
</MyMusicPlaylist>
<MyMusicFiles>
</MyMusicFiles>
<MyMusicLibrary>
</MyMusicLibrary>
<FullscreenVideo>
<joystick family="Steam Controller">
<button id="1">Pause</button>
<button id="2">Stop</button>
<button id="3">OSD</button>
<button id="5">AspectRatio</button>
<button id="6">ShowSubtitles</button>
<button id="7">Seek(-7)</button><!-- Replaces smallstepback -->
<button id="8">Info</button>
<button id="9">ActivateWindow(Home)</button> <!-- guide -->
<button id="10">ActivateWindow(ShutdownMenu)</button> <!-- left stick -->
<axis id="3" limit="+1">AnalogRewind</axis>
<axis id="4" limit="+1">AnalogFastForward</axis>
<hat id="1" position="up">ChapterOrBigStepForward</hat>
<hat id="1" position="down">ChapterOrBigStepBack</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
</FullscreenVideo>
<FullscreenLiveTV>
<joystick family="Steam Controller">
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
</FullscreenLiveTV>
<FullscreenRadio>
<joystick family="Steam Controller">
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
</FullscreenRadio>
<FullscreenInfo>
<joystick family="Steam Controller">
<button id="2">Close</button>
<button id="3">OSD</button>
<button id="8">Close</button>
<axis id="3" limit="+1">AnalogRewind</axis>
<axis id="4" limit="+1">AnalogFastForward</axis>
</joystick>
</FullscreenInfo>
<PlayerControls>
<joystick family="Steam Controller">
<button id="3">Close</button>
<button id="10">Close</button>
</joystick>
</PlayerControls>
<Visualisation>
<joystick family="Steam Controller">
<button id="1">Pause</button>
<button id="2">Stop</button>
<button id="3">ActivateWindow(MusicOSD)</button>
<button id="5">ActivateWindow(VisualisationPresetList)</button>
<button id="6">Info</button>
<axis id="3" limit="+1">AnalogRewind</axis>
<axis id="4" limit="+1">AnalogFastForward</axis>
<hat id="1" position="up">SkipNext</hat>
<hat id="1" position="down">SkipPrevious</hat>
<hat id="1" position="left">PreviousPreset</hat>
<hat id="1" position="right">NextPreset</hat>
</joystick>
</Visualisation>
<MusicOSD>
<joystick family="Steam Controller">
<button id="3">Close</button>
<button id="6">Info</button>
</joystick>
</MusicOSD>
<VisualisationSettings>
<joystick family="Steam Controller">
<button id="2">Close</button>
</joystick>
</VisualisationSettings>
<VisualisationPresetList>
<joystick family="Steam Controller">
<button id="2">Close</button>
</joystick>
</VisualisationPresetList>
<SlideShow>
<joystick family="Steam Controller">
<button id="1">Pause</button>
<button id="2">Stop</button>
<button id="4">ZoomNormal</button>
<button id="5">Rotate</button>
<button id="6">CodecInfo</button>
<axis id="1">AnalogMoveX</axis>
<axis id="2">AnalogMoveY</axis>
<axis id="3" limit="+1">ZoomOut</axis>
<axis id="4" limit="+1">ZoomIn</axis>
<hat id="1" position="up">ZoomIn</hat>
<hat id="1" position="down">ZoomOut</hat>
<hat id="1" position="left">PreviousPicture</hat>
<hat id="1" position="right">NextPicture</hat>
</joystick>
</SlideShow>
<ScreenCalibration>
<joystick family="Steam Controller">
<button id="3">ResetCalibration</button>
<button id="5">NextResolution</button>
<button id="6">NextCalibration</button>
</joystick>
</ScreenCalibration>
<GUICalibration>
<joystick family="Steam Controller">
<button id="3">ResetCalibration</button>
<button id="5">NextResolution</button>
<button id="6">NextCalibration</button>
</joystick>
</GUICalibration>
<VideoOSD>
<joystick family="Steam Controller">
<button id="3">Close</button>
</joystick>
</VideoOSD>
<VideoMenu>
<joystick family="Steam Controller">
<button id="2">Stop</button>
<button id="3">OSD</button>
<button id="5">AspectRatio</button>
<button id="8">Info</button>
</joystick>
</VideoMenu>
<OSDVideoSettings>
<joystick family="Steam Controller">
<button id="5">AspectRatio</button>
<button id="3">Close</button>
</joystick>
</OSDVideoSettings>
<OSDAudioSettings>
<joystick family="Steam Controller">
<button id="5">AspectRatio</button>
<button id="3">Close</button>
</joystick>
</OSDAudioSettings>
<VideoBookmarks>
<joystick family="Steam Controller">
<button id="5">Delete</button>
</joystick>
</VideoBookmarks>
<MyVideoLibrary>
</MyVideoLibrary>
<MyVideoFiles>
</MyVideoFiles>
<MyVideoPlaylist>
<joystick family="Steam Controller">
<button id="5">Delete</button>
</joystick>
</MyVideoPlaylist>
<VirtualKeyboard>
<joystick family="Steam Controller">
<button id="2">BackSpace</button>
<button id="4">Symbols</button>
<button id="5">Shift</button>
<button id="10">Enter</button>
<axis id="3" limit="+1">CursorLeft</axis>
<axis id="4" limit="+1">CursorRight</axis>
</joystick>
</VirtualKeyboard>
<ContextMenu>
<joystick family="Steam Controller">
<button id="2">Close</button>
<button id="3">Close</button>
</joystick>
</ContextMenu>
<Scripts>
<joystick family="Steam Controller">
<button id="3">ContextMenu</button>
</joystick>
</Scripts>
<Settings>
<joystick family="Steam Controller">
<button id="2">PreviousMenu</button>
</joystick>
</Settings>
<AddonInformation>
<joystick family="Steam Controller">
<button id="2">Close</button>
</joystick>
</AddonInformation>
<AddonSettings>
<joystick family="Steam Controller">
<button id="2">Close</button>
</joystick>
</AddonSettings>
<TextViewer>
<joystick family="Steam Controller">
<button id="2">Close</button>
</joystick>
</TextViewer>
<shutdownmenu>
<joystick family="Steam Controller">
<button id="2">PreviousMenu</button>
<button id="10">PreviousMenu</button>
</joystick>
</shutdownmenu>
<submenu>
<joystick family="Steam Controller">
<button id="2">PreviousMenu</button>
</joystick>
</submenu>
<MusicInformation>
<joystick family="Steam Controller">
<button id="2">Close</button>
</joystick>
</MusicInformation>
<MovieInformation>
<joystick family="Steam Controller">
<button id="2">Close</button>
</joystick>
</MovieInformation>
<NumericInput>
<joystick family="Steam Controller">
<button id="2">BackSpace</button>
<button id="10">Enter</button>
</joystick>
</NumericInput>
<GamepadInput>
<joystick family="Steam Controller">
<button id="10">Stop</button>
</joystick>
</GamepadInput>
<LockSettings>
<joystick family="Steam Controller">
<button id="2">PreviousMenu</button>
<button id="10">Close</button>
</joystick>
</LockSettings>
<ProfileSettings>
<joystick family="Steam Controller">
<button id="2">PreviousMenu</button>
<button id="10">Close</button>
</joystick>
</ProfileSettings>
</keymap>
</keymap>
2 changes: 1 addition & 1 deletion tools/depends/native/liblzo2-native/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DEPS= ../../Makefile.include.in Makefile

# lib name, version
LIBNAME=lzo
VERSION=2.03
VERSION=2.09
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz

Expand Down
Loading

0 comments on commit 52397eb

Please sign in to comment.