Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

depends: remove libsdl_image and libsdl2 #11881

Merged
merged 5 commits into from Mar 22, 2017
Merged

Conversation

@stefansaraev
Copy link
Contributor

stefansaraev commented Mar 20, 2017

libsdl_image is an orphan dependency, not used for very long
libsdl2 seems unused

Description

Motivation and Context

How Has This Been Tested?

not tested at all.

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the Code guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the CONTRIBUTING document
  • I have added tests to cover my change
  • All new and existing tests passed
#include <SDL/SDL_stdinc.h>
#elif HAVE_SDL_VERSION == 2
#include <SDL2/SDL_stdinc.h>
#else

This comment has been minimized.

Copy link
@Rechi

Rechi Mar 20, 2017

Member

maybe keep the SDL version and only remove SDL2 from here

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Mar 20, 2017

Member

why should we keep SDL related code?

This comment has been minimized.

Copy link
@Rechi

Rechi Mar 20, 2017

Member

no need to keep it but sdl doesn't get removed, only sdl2 will be removed by this PR

This comment has been minimized.

Copy link
@stefansaraev

stefansaraev Mar 20, 2017

Author Contributor

btw, here https://www.libsdl.org/release/SDL-1.2.15/include/SDL_stdinc.h SDL_memcpy4 and SDL_memset4 are defined exacly the same. so I too dont see reason to keep using SDL_stdinc here. I've added a commit that does. can remove it later if you want me to

This comment has been minimized.

Copy link
@Rechi

Rechi Mar 20, 2017

Member

ok if it is the exact same remove all sdl includes used only for SDL_memcpy4.

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Mar 20, 2017

Member

great.
maybe we can drop SDL_memcpy/memset completely on a next step. I would guess that replacing it is not too hard.

@stefansaraev stefansaraev force-pushed the stefansaraev:sdl-cleanup branch from c33030b to b87db49 Mar 20, 2017
@Rechi

This comment has been minimized.

Copy link
Member

Rechi commented Mar 20, 2017

maybe Rechi@a795424 also isn't needed anymore

@stefansaraev

This comment has been minimized.

Copy link
Contributor Author

stefansaraev commented Mar 20, 2017

yep. added. thanks

@wsnipex

This comment has been minimized.

Copy link
Member

wsnipex commented Mar 20, 2017

looks good to me. I wonder if OSX will ever get rid of it.

@Rechi

This comment has been minimized.

Copy link
Member

Rechi commented Mar 20, 2017

jenkins build this please

@Rechi

This comment has been minimized.

Copy link
Member

Rechi commented Mar 22, 2017

jenkins build and merge

@Rechi Rechi added this to the L 18.0-alpha1 milestone Mar 22, 2017
@jenkins4kodi jenkins4kodi merged commit 537227d into xbmc:master Mar 22, 2017
2 of 3 checks passed
2 of 3 checks passed
jenkins4kodi I've found some spare time so building this now
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@stefansaraev stefansaraev deleted the stefansaraev:sdl-cleanup branch Mar 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.