diff --git a/scripts.d/45-alsalib.sh b/scripts.d/45-alsalib.sh deleted file mode 100755 index 8dcc288..0000000 --- a/scripts.d/45-alsalib.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -ALSALIB_REPO="https://github.com/alsa-project/alsa-lib.git" -ALSALIB_COMMIT="1454b5f118a3b92663923fe105daecfeb7e20f1b" - -ffbuild_enabled() { - [[ $TARGET == linux* ]] || return 1 - return 0 -} - -ffbuild_dockerbuild() { - git-mini-clone "$ALSALIB_REPO" "$ALSALIB_COMMIT" alsalib - cd alsalib - - autoreconf -i - - local myconf=( - --prefix="$FFBUILD_PREFIX" - --with-configdir="/usr/share/alsa" - --disable-shared - --enable-static - --with-pic - --without-debug - --without-versioned - --disable-old-symbols - --disable-python - --disable-topology - --disable-alisp - ) - - if [[ $TARGET == linux* ]]; then - myconf+=( - --host="$FFBUILD_TOOLCHAIN" - ) - else - echo "Unknown target" - return -1 - fi - - ./configure "${myconf[@]}" - make -j$(nproc) - make install - - rm -rf "$FFBUILD_PREFIX"/{bin/aserver,share/alsa} -} - -ffbuild_configure() { - echo --enable-alsa -} - -ffbuild_unconfigure() { - echo --disable-alsa -} diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index 40d5120..5953207 100755 --- a/scripts.d/50-sdl.sh +++ b/scripts.d/50-sdl.sh @@ -26,11 +26,6 @@ ffbuild_dockerbuild() { -DSDL_X11_SHARED=OFF -DHAVE_XGENERICEVENT=TRUE -DSDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM=1 - - -DSDL_ALSA=ON - -DSDL_ALSA_SHARED=OFF - -DHAVE_ASOUNDLIB_H=TRUE - -DHAVE_LIBASOUND=TRUE ) fi @@ -42,9 +37,8 @@ ffbuild_dockerbuild() { if [[ $TARGET == linux* ]]; then sed -ri -e 's/\-Wl,\-\-no\-undefined.*//' \ -e 's/ \-l\/.+?\.a//g' \ - -e 's/ \-lasound//g' \ "$FFBUILD_PREFIX"/lib/pkgconfig/sdl2.pc - echo 'Requires: alsa xxf86vm xscrnsaver xrandr xfixes xi xinerama xcursor' >> "$FFBUILD_PREFIX"/lib/pkgconfig/sdl2.pc + echo 'Requires: xxf86vm xscrnsaver xrandr xfixes xi xinerama xcursor' >> "$FFBUILD_PREFIX"/lib/pkgconfig/sdl2.pc elif [[ $TARGET == win* ]]; then sed -ri -e 's/\-Wl,\-\-no\-undefined.*//' \ -e 's/ \-mwindows//g' \