It looks like the patch for sdl2 and sdl2-image got commingled.
After separating them out, they applied successfully and
everything seems to be OK.
I tested with games/manaplus, games/scummvm, and
emulators/retroarch and didn't see any regressions.
--
Bryan
On 2018-03-10 10:16:48, Thomas Frohwein <frohwein@ymail.com> wrote:
> Ping... and double-ping for the sdl2-image security fix
>
> On Thu, Mar 01, 2018 at 07:52:03PM -0800, Thomas Frohwein wrote:
> > Hi,
> >
> > Here the diff for updating both sdl2 and sdl2-image. Note that sdl2-image is a
> > security update for some buffer overflows and crashes by maliciously-crafted
> > data (see details below).
> >
> > The diff below updates sdl2 to 2.0.8. This includes the optional mapping of the
> > Gamecontroller API via the SDL_GAMECONTROLLERCONFIG env var. To recap, there
> > are 2 joystick/gamepad APIs in SDL2. The old joystick API was not an issue, but
> > the newer gamecontroller API did not work before the 2.0.7 update. The 2.0.7
> > updated included a workaround that mapped the gamecontroller API based on the
> > fallback part that was already there for Linux, but that was set at compile
> > time only. This update includes a slightly expanded workaround that checks for
> > the SDL_GAMECONTROLLERCONFIG env var and maps based on that if found.
> >
> > Also bump minor. Runs stone-soup, neverball, megaglest, and FNA games as
> > before on brief testing, including sound, graphics, and gamepad.
> >
> > The sdl2-image update to 2.0.3 was released today and contains a series of
> > security patches. Grab maintainer while at it.
> > NOTE: the sdl2-image update needs sdl2 version 2.0.8.
> > Also tested with above ports without issues.
> >
> > The official release notes:
> >
> > Thanks to all the people who contributed code and feedback, SDL 2.0.8 is now available!
> > http://www.libsdl.org/download-2.0.php
> > In addition to lots of bug fixes and build improvements, here are the major changes in this release:
> > General:
> > Added SDL_fmod() and SDL_log10()
> > Each of the SDL math functions now has the corresponding float version
> > Added SDL_SetYUVConversionMode() and SDL_GetYUVConversionMode() to control the formula used when converting to and from YUV colorspace. The options are JPEG, BT.601, and BT.709
> > Windows:
> > Implemented WASAPI support on Windows UWP and removed the deprecated XAudio2 implementation
> > Added resampling support on WASAPI on Windows 7 and above
> > Windows UWP:
> > Added SDL_WinRTGetDeviceFamily() to find out what type of device your application is running on
> > Mac OS X:
> > Added support for the Vulkan SDK for Mac:
> > https://www.lunarg.com/lunarg-releases-vulkan-sdk-1-0-69-0-for-mac/
> > Added support for OpenGL ES using ANGLE when it's available
> > Mac OS X / iOS / tvOS:
> > Added a Metal 2D render implementation
> > Added SDL_RenderGetMetalLayer() and SDL_RenderGetMetalCommandEncoder() to insert your own drawing into SDL rendering when using the Metal implementation
> > iOS:
> > Added the hint SDL_HINT_IOS_HIDE_HOME_INDICATOR to control whether the home indicator bar on iPhone X should be hidden. This defaults to dimming the indicator for fullscreen applications and showing the indicator for windowed applications.
> > iOS / Android:
> > Added the hint SDL_HINT_RETURN_KEY_HIDES_IME to control whether the return key on the software keyboard should hide the keyboard or send a key event (the default)
> > Android:
> > SDL now supports building with Android Studio and Gradle by default, and the old Ant project is available in android-project-ant
> > SDL now requires the API 19 SDK to build, but can still target devices down to API 14 (Android 4.0.1)
> > Added SDL_IsAndroidTV() to tell whether the application is running on Android TV
> > Android / tvOS:
> > Added the hint SDL_HINT_TV_REMOTE_AS_JOYSTICK to control whether TV remotes should be listed as joystick devices (the default) or send keyboard events.
> > Linux:
> > Added the hint SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR to control whether the X server should skip the compositor for the SDL application. This defaults to "1"
> > Added the hint SDL_HINT_VIDEO_DOUBLE_BUFFER to control whether the Raspberry Pi and KMSDRM video drivers should use double or triple buffering (the default)
> >
> > ----------------
> >
> > SDL_image 2.0.3 is now available:
> > http://www.libsdl.org/projects/SDL_image/
> >
> > This is a security update release, fixing the following security reports:
> > TALOS-2017-0488
> > TALOS-2017-0489
> > TALOS-2017-0490
> > TALOS-2017-0491
> > TALOS-2017-0497
> > TALOS-2017-0498
> > TALOS-2017-0499
> >
> > You'll need to get SDL 2.0.8 for this release of SDL_image.
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/sdl2/Makefile,v
> > retrieving revision 1.20
> > diff -u -p -r1.20 Makefile
> > --- Makefile 12 Jan 2018 19:32:54 -0000 1.20
> > +++ Makefile 2 Mar 2018 03:50:32 -0000
> > @@ -4,14 +4,13 @@ COMMENT= cross-platform multimedia libra
> > BROKEN-hppa= src/atomic/SDL_spinlock.c:101:2: error: \
> > #error Please implement for your platform.
> >
> > -V= 2.0.7
> > +V= 2.0.8
> > DISTNAME= SDL2-${V}
> > PKGNAME= sdl2-${V}
> > CATEGORIES= devel
> > MASTER_SITES= https://www.libsdl.org/release/
> > -REVISION= 0
> >
> > -SHARED_LIBS= SDL2 0.4 # 0.7
> > +SHARED_LIBS= SDL2 0.5 # 0.8
> >
> > HOMEPAGE= https://www.libsdl.org/
> >
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/devel/sdl2/distinfo,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 distinfo
> > --- distinfo 7 Jan 2018 22:56:46 -0000 1.6
> > +++ distinfo 2 Mar 2018 03:50:32 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (SDL2-2.0.7.tar.gz) = 7jXHTEMT4u2hBLFLG4b324SgTuq5Qw1W4AHOomi/TV4=
> > -SIZE (SDL2-2.0.7.tar.gz) = 4432499
> > +SHA256 (SDL2-2.0.8.tar.gz) = 7cd8VzCGYdV26EM0TYY44CWngYv/c/j7+rCcPF/Qkuw=
> > +SIZE (SDL2-2.0.8.tar.gz) = 4909017
> > Index: patches/patch-src_joystick_SDL_gamecontroller_c
> > ===================================================================
> > RCS file: /cvs/ports/devel/sdl2/patches/patch-src_joystick_SDL_gamecontroller_c,v
> > retrieving revision 1.1
> > diff -u -p -r1.1 patch-src_joystick_SDL_gamecontroller_c
> > --- patches/patch-src_joystick_SDL_gamecontroller_c 7 Jan 2018 22:56:46 -0000 1.1
> > +++ patches/patch-src_joystick_SDL_gamecontroller_c 2 Mar 2018 03:50:32 -0000
> > @@ -6,10 +6,12 @@ everything will be Xbox360 controller (w
> > - note: the actual Xbox360 controller has buttons and axes messed up on
> > openbsd with these mappings
> >
> > +EXPERIMENTAL: map to SDL_GAMECONTROLLERCONFIG envvar if available
> > +
> > Index: src/joystick/SDL_gamecontroller.c
> > --- src/joystick/SDL_gamecontroller.c.orig
> > +++ src/joystick/SDL_gamecontroller.c
> > -@@ -884,15 +884,15 @@ static ControllerMapping_t *SDL_PrivateGetControllerMa
> > +@@ -884,15 +884,21 @@ static ControllerMapping_t *SDL_PrivateGetControllerMa
> > #else
> > (void) s_pEmscriptenMapping; /* pacify ARMCC */
> >
No comments:
Post a Comment