| Message ID | 20160925132950.10673-1-josh@itanimul.li |
|---|---|
| State | Accepted |
| Commit | 21344991c0d2a651d221dbdbb416031462a70d2c |
| Headers | show |
2016-09-25 15:29 GMT+02:00 Josh de Kock <josh@itanimul.li>: > This commit also adds an sdl alias for the configure script. > > Signed-off-by: Josh de Kock <josh@itanimul.li> > --- > configure | 2 ++ This is missing the important change to the help output. Carl Eugen
On 25/09/2016 14:38, Carl Eugen Hoyos wrote: > 2016-09-25 15:29 GMT+02:00 Josh de Kock <josh@itanimul.li>: >> This commit also adds an sdl alias for the configure script. >> >> Signed-off-by: Josh de Kock <josh@itanimul.li> >> --- >> configure | 2 ++ > > This is missing the important change to > the help output. > These changes are only to not break current scripts, users should use --disable-sdl2. -- Josh
2016-09-25 15:40 GMT+02:00 Josh de Kock <josh@itanimul.li>: > On 25/09/2016 14:38, Carl Eugen Hoyos wrote: >> This is missing the important change to >> the help output. >> > > These changes are only to not break current scripts, > users should use --disable-sdl2. Why? This makes no sense, we don't use version information for other libraries. Carl Eugen
On 25/09/2016 14:43, Carl Eugen Hoyos wrote: > 2016-09-25 15:40 GMT+02:00 Josh de Kock <josh@itanimul.li>: >> On 25/09/2016 14:38, Carl Eugen Hoyos wrote: > >>> This is missing the important change to >>> the help output. >>> >> >> These changes are only to not break current scripts, >> users should use --disable-sdl2. > > Why? > This makes no sense, we don't use version > information for other libraries. > Other libraries don't change their name, unfortunately SDL did, so we have to reflect that change. -- Josh
2016-09-25 15:48 GMT+02:00 Josh de Kock <josh@itanimul.li>: > On 25/09/2016 14:43, Carl Eugen Hoyos wrote: >> >> 2016-09-25 15:40 GMT+02:00 Josh de Kock <josh@itanimul.li>: >>> >>> On 25/09/2016 14:38, Carl Eugen Hoyos wrote: >> >>>> This is missing the important change to >>>> the help output. >>>> >>> These changes are only to not break current scripts, >>> users should use --disable-sdl2. >> >> Why? >> This makes no sense, we don't use version >> information for other libraries. >> > Other libraries don't change their name, unfortunately > SDL did, so we have to reflect that change. Isn't it much kinder to our users if the change is completely transparent for them? Carl Eugen
On 25/09/2016 14:50, Carl Eugen Hoyos wrote: > 2016-09-25 15:48 GMT+02:00 Josh de Kock <josh@itanimul.li>: >> On 25/09/2016 14:43, Carl Eugen Hoyos wrote: >>> >>> 2016-09-25 15:40 GMT+02:00 Josh de Kock <josh@itanimul.li>: >>>> >>>> On 25/09/2016 14:38, Carl Eugen Hoyos wrote: >>> >>>>> This is missing the important change to >>>>> the help output. >>>>> >>>> These changes are only to not break current scripts, >>>> users should use --disable-sdl2. >>> >>> Why? >>> This makes no sense, we don't use version >>> information for other libraries. >>> >> Other libraries don't change their name, unfortunately >> SDL did, so we have to reflect that change. > > Isn't it much kinder to our users if the change is > completely transparent for them? > For users, nothing will change. Everything will still work as it did. -- Josh
On 25/09/2016 14:51, Josh de Kock wrote: > On 25/09/2016 14:50, Carl Eugen Hoyos wrote: >> 2016-09-25 15:48 GMT+02:00 Josh de Kock <josh@itanimul.li>: >>> On 25/09/2016 14:43, Carl Eugen Hoyos wrote: >>>> >>>> 2016-09-25 15:40 GMT+02:00 Josh de Kock <josh@itanimul.li>: >>>>> >>>>> On 25/09/2016 14:38, Carl Eugen Hoyos wrote: >>>> >>>>>> This is missing the important change to >>>>>> the help output. >>>>>> >>>>> These changes are only to not break current scripts, >>>>> users should use --disable-sdl2. >>>> >>>> Why? >>>> This makes no sense, we don't use version >>>> information for other libraries. >>>> >>> Other libraries don't change their name, unfortunately >>> SDL did, so we have to reflect that change. >> >> Isn't it much kinder to our users if the change is >> completely transparent for them? >> > > For users, nothing will change. Everything will still work as it did. > Applied as-is.
diff --git a/configure b/configure index f593191..899057d 100755 --- a/configure +++ b/configure @@ -1547,6 +1547,7 @@ EXTERNAL_LIBRARY_LIST=" opengl openssl schannel + sdl sdl2 securetransport videotoolbox @@ -5846,6 +5847,7 @@ if enabled gcrypt; then fi fi +disabled sdl && disable sdl2 if ! disabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c index 217ccc0..5d9e91e 100644 --- a/libavdevice/sdl2.c +++ b/libavdevice/sdl2.c @@ -352,7 +352,7 @@ static const AVClass sdl2_class = { }; AVOutputFormat ff_sdl2_muxer = { - .name = "sdl2", + .name = "sdl,sdl2", .long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"), .priv_data_size = sizeof(SDLContext), .audio_codec = AV_CODEC_ID_NONE,
This commit also adds an sdl alias for the configure script. Signed-off-by: Josh de Kock <josh@itanimul.li> --- configure | 2 ++ libavdevice/sdl2.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)