[vlc-commits] [Git][videolan/vlc][master] 3 commits: package: wasm: replace tabulations
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Fri Oct 22 18:32:07 UTC 2021
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
86ce6288 by Alexandre Janniaux at 2021-10-22T17:02:59+00:00
package: wasm: replace tabulations
- - - - -
6a5415dc by Alexandre Janniaux at 2021-10-22T17:02:59+00:00
configure.ac: move ac_cv_ define for emscripten
Those defines are always needed and should be defined by configure.ac so
as to also be present when using ./configure directly.
- - - - -
8a01a37c by Alexandre Janniaux at 2021-10-22T17:02:59+00:00
wasm-emscripten: build.sh: use emnm instead of llvm-nm
emnm is a wrapper of llvm-nm and is actually located in the SDK binaries
path added in the PATH when the SDK environment is sourced
(/etc/profile.d/emscripten.sh) or when adding the compiler to the PATH
by sourcing emsdk_env.sh like in the CI configuration.
This avoid defining the EMSDK variable when emscripten is installed on
the system.
- - - - -
2 changed files:
- configure.ac
- extras/package/wasm-emscripten/build.sh
Changes:
=====================================
configure.ac
=====================================
@@ -393,6 +393,8 @@ __attribute__((visibility("default"))) int foo() { return my_array[0]; }
# tdestroy() is a GNU extension
CFLAGS="${CFLAGS} -pthread -D_GNU_SOURCE"
CXXFLAGS="${CXXFLAGS} -pthread"
+ ac_cv_func_if_nameindex=yes
+ ac_cv_header_sys_shm_h=no
;;
*)
SYS="${host_os}"
=====================================
extras/package/wasm-emscripten/build.sh
=====================================
@@ -15,10 +15,10 @@ usage()
echo "Usage: $0 [--mode=(default=1)]"
echo " --with-prebuilt-contribs | -c"
echo " --mode=1 build all "
- echo " --mode=0 incremental build (do not bootstrap and configure) "
+ echo " --mode=0 incremental build (do not bootstrap and configure) "
}
-NM="$EMSDK/upstream/bin/llvm-nm"
+NM="emnm"
get_symbol()
{
echo "$1" | grep vlc_entry_"$2" | cut -d " " -f 3
@@ -41,12 +41,12 @@ do
--mode=*)
BUILD_MODE="${1#--mode=}"
;;
- --with-prebuilt-contribs)
- VLC_USE_PREBUILT_CONTRIBS=1
- ;;
- --gen-contrib-archive|-c)
- GENERATE_ARCHIVE=1
- ;;
+ --with-prebuilt-contribs)
+ VLC_USE_PREBUILT_CONTRIBS=1
+ ;;
+ --gen-contrib-archive|-c)
+ GENERATE_ARCHIVE=1
+ ;;
*)
echo "Unrecognized options $1"
usage
@@ -87,7 +87,7 @@ echo "$VLC_SRCPATH";
diagnostic "vlc tools: bootstrap"
cd "$VLC_SRCPATH"/extras/tools
-./bootstrap
+./bootstrap
diagnostic "vlc tools: make"
make
@@ -113,24 +113,24 @@ cd "$VLC_SRCPATH"/contrib/contrib-emscripten
diagnostic "vlc contribs: bootstrap"
../bootstrap --disable-disc --disable-sout --disable-net \
- --disable-postproc --disable-gmp --disable-gcrypt --disable-ass \
- --disable-gpgerror --disable-harfbuzz --disable-fontconfig \
- --disable-asdcplib --disable-caca --disable-gettext \
- --disable-goom --disable-libplacebo \
- --disable-lua --disable-luac --disable-sqlite \
- --disable-medialibrary --disable-mpcdec --disable-schroedinger \
- --disable-orc --disable-protobuf --disable-sidplay2 \
- --disable-soxr --disable-spatialaudio --disable-speex \
- --disable-speexdsp --disable-taglib --disable-zvbi \
- --disable-rnnoise \
- --host=wasm32-unknown-emscripten
+ --disable-postproc --disable-gmp --disable-gcrypt --disable-ass \
+ --disable-gpgerror --disable-harfbuzz --disable-fontconfig \
+ --disable-asdcplib --disable-caca --disable-gettext \
+ --disable-goom --disable-libplacebo \
+ --disable-lua --disable-luac --disable-sqlite \
+ --disable-medialibrary --disable-mpcdec --disable-schroedinger \
+ --disable-orc --disable-protobuf --disable-sidplay2 \
+ --disable-soxr --disable-spatialaudio --disable-speex \
+ --disable-speexdsp --disable-taglib --disable-zvbi \
+ --disable-rnnoise \
+ --host=wasm32-unknown-emscripten
diagnostic "vlc contribs: make"
if [ "$VLC_USE_PREBUILT_CONTRIBS" -eq "0" ]; then
emmake make
if [ "$GENERATE_ARCHIVE" -eq "1" ]; then
- diagnostic "vlc contribs: generating package"
- emmake make package
+ diagnostic "vlc contribs: generating package"
+ emmake make package
fi
else
diagnostic "vlc contribs: using prebuilt contribs"
@@ -161,7 +161,6 @@ if [ $BUILD_MODE -eq 1 ]; then
--disable-sout --disable-vlm --disable-xcb --disable-lua \
--disable-addonmanagermodules --disable-ssp --disable-nls \
--enable-gles2 \
- ac_cv_func_if_nameindex=yes ac_cv_header_sys_shm_h=no \
--with-contrib="$VLC_SRCPATH"/contrib/wasm32-unknown-emscripten
fi
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fdbbae70af8005bcaa771ef63968a2d023da267e...8a01a37c61fa5bb8b5d085e36032a2a2fb7fbf17
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fdbbae70af8005bcaa771ef63968a2d023da267e...8a01a37c61fa5bb8b5d085e36032a2a2fb7fbf17
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list