Remove alsa again. Statically linking it is broken.
This commit is contained in:
		
							parent
							
								
									5b6c9e28b3
								
							
						
					
					
						commit
						1466a4d8de
					
				
					 2 changed files with 1 additions and 60 deletions
				
			
		| 
						 | 
					@ -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
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -26,11 +26,6 @@ ffbuild_dockerbuild() {
 | 
				
			||||||
            -DSDL_X11_SHARED=OFF
 | 
					            -DSDL_X11_SHARED=OFF
 | 
				
			||||||
            -DHAVE_XGENERICEVENT=TRUE
 | 
					            -DHAVE_XGENERICEVENT=TRUE
 | 
				
			||||||
            -DSDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM=1
 | 
					            -DSDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM=1
 | 
				
			||||||
 | 
					 | 
				
			||||||
            -DSDL_ALSA=ON
 | 
					 | 
				
			||||||
            -DSDL_ALSA_SHARED=OFF
 | 
					 | 
				
			||||||
            -DHAVE_ASOUNDLIB_H=TRUE
 | 
					 | 
				
			||||||
            -DHAVE_LIBASOUND=TRUE
 | 
					 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -42,9 +37,8 @@ ffbuild_dockerbuild() {
 | 
				
			||||||
    if [[ $TARGET == linux* ]]; then
 | 
					    if [[ $TARGET == linux* ]]; then
 | 
				
			||||||
        sed -ri -e 's/\-Wl,\-\-no\-undefined.*//' \
 | 
					        sed -ri -e 's/\-Wl,\-\-no\-undefined.*//' \
 | 
				
			||||||
            -e 's/ \-l\/.+?\.a//g' \
 | 
					            -e 's/ \-l\/.+?\.a//g' \
 | 
				
			||||||
            -e 's/ \-lasound//g' \
 | 
					 | 
				
			||||||
            "$FFBUILD_PREFIX"/lib/pkgconfig/sdl2.pc
 | 
					            "$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
 | 
					    elif [[ $TARGET == win* ]]; then
 | 
				
			||||||
        sed -ri -e 's/\-Wl,\-\-no\-undefined.*//' \
 | 
					        sed -ri -e 's/\-Wl,\-\-no\-undefined.*//' \
 | 
				
			||||||
            -e 's/ \-mwindows//g' \
 | 
					            -e 's/ \-mwindows//g' \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue