[vlc-devel] [PATCH 3.0.x] macosx/build: disable contrib sdl and SDL_image

[Alexandre Janniaux]

Hi,

I'm fine with disabling sdl, but we usually disable the
autodetection/enabling it at the contrib/src/ level, like:

```
ifndef HAVE_DARWIN_OS
PKGS += SDL_image
endif

ifeq ($(call need_pkg,"SDL_image"),)
PKGS_FOUND += SDL_image
endif
```

Bootstrap is more for the enduser, though it's a bit confusing
with the additional buildscript we ship. Since it doesn't compile
by default (and even, is removed in VLC 4), it makes better sense
to just disable by default for darwin.

Regards,
--
Alexandre Janniaux
Videolabs

On Sat, Nov 14, 2020 at 10:27:20PM +0800, Zhao Zhili wrote:
> Fix #25006.
> ---
>  extras/package/macosx/build.sh | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
> index be5d449662..d02e1b615d 100755
> --- a/extras/package/macosx/build.sh
> +++ b/extras/package/macosx/build.sh
> @@ -225,7 +225,9 @@ export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk macosx$OS
>  info "Building contribs"
>  spushd "${vlcroot}/contrib"
>  mkdir -p contrib-$TRIPLET && cd contrib-$TRIPLET
> -../bootstrap --build=$TRIPLET --host=$TRIPLET > $out
> +../bootstrap --build=$TRIPLET --host=$TRIPLET \
> +    --disable-sdl --disable-SDL_image \
> +    > $out
>  if [ "$REBUILD" = "yes" ]; then
>      make clean
>  fi
> --
> 2.28.0
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel