[FFmpeg-devel] [PATCH] lavd/sdl2: add sdl alias

[Carl Eugen Hoyos]

2016-09-25 14:59 GMT+02:00 Josh de Kock <josh at itanimul.li>:
>
>
> On 25/09/2016 13:57, Carl Eugen Hoyos wrote:
>>
>> 2016-09-25 14:51 GMT+02:00 Josh de Kock <josh at itanimul.li>:
>>>
>>> On 25/09/2016 13:45, Carl Eugen Hoyos wrote:
>>>>
>>>>
>>>> 2016-09-25 14:28 GMT+02:00 Josh de Kock <josh at itanimul.li>:
>>>>>
>>>>>
>>>>> Signed-off-by: Josh de Kock <josh at itanimul.li>
>>>>> ---
>>>>>
>>>>>  The --enable-sdl2 option is not being renamed because it's a fairly
>>>>>  big change and sdl2 is incompatible with sdl.
>>>>
>>>>
>>>>
>>>> How is (old) sdl in FFmpeg incompatible with the new sdl2 in FFmpeg?
>>>>
>>>> Please rename it.
>>>
>>>
>>> Do you have a way to rename the option but not the device?
>>
>>
>> I don't understand this question:
>> How is the name of a configure option disabling an external library
>> related to the name of a device in libavdevice?
>
> Sorry, I meant the external lib, not the device.
>
>>> Unless you're suggesting renaming the whole device, and then
>>> I'd like to know a way to have the check_pkg_config work with a
>>> different library name to what it searches for.
>>
>>
>> There is an option --disable-foo that you removed and instead
>> you added a new optoin --disable-foo2. Please rename
>> --disable-foo2 to --disable-foo.
>>
> Yes, I'm saying I don't know how to achieve this without renaming the ext
> lib name (which obviously can't change).


diff --git a/configure b/configure
index f593191..dbd16de 100755
--- a/configure
+++ b/configure
@@ -291,7 +291,7 @@ External library support:
                            if gnutls is not used [no]
   --disable-schannel       disable SChannel SSP, needed for TLS support on
                            Windows if openssl and gnutls are not used
[autodetect]
-  --disable-sdl2           disable sdl2 [autodetect]
+  --disable-sdl            disable sdl2 [autodetect]
   --disable-securetransport disable Secure Transport, needed for TLS support
                            on OSX if openssl and gnutls are not used
[autodetect]
   --enable-x11grab         enable X11 grabbing (legacy) [no]
@@ -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


An better and shorter alternative is "if ! disabled sdl; then"

Carl Eugen