From f6883f107fb6abab9e3ca6a95354ac2f3b4d9238 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Thu, 11 Nov 2021 12:31:35 -0500 Subject: [PATCH] Clean up repo and use better names for files --- povray_wasm/Dockerfile | 3 - povray_wasm/Dockerfile.build | 26 -------- povray_wasm/Dockerfile.save | 22 ------- povray_wasm/{build_ubuntu.sh => build.sh} | 0 povray_wasm/build_old.sh | 73 ---------------------- povray_wasm/compile.sh | 2 +- povray_wasm/{build_docker.sh => docker.sh} | 0 7 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 povray_wasm/Dockerfile.build delete mode 100644 povray_wasm/Dockerfile.save rename povray_wasm/{build_ubuntu.sh => build.sh} (100%) delete mode 100644 povray_wasm/build_old.sh rename povray_wasm/{build_docker.sh => docker.sh} (100%) diff --git a/povray_wasm/Dockerfile b/povray_wasm/Dockerfile index 199a6cc..db927c6 100644 --- a/povray_wasm/Dockerfile +++ b/povray_wasm/Dockerfile @@ -15,9 +15,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt install -y bash \ RUN cd /opt && git clone https://github.com/boostorg/boost.git boost RUN cd /opt/boost && git submodule update --init --recursive -RUN mkdir -p /opt/libboost_build -RUN mkdir -p /opt/libboost - RUN cd /opt/boost && ./bootstrap.sh RUN cd /opt/boost && ./b2 -j4 toolset=emscripten \ diff --git a/povray_wasm/Dockerfile.build b/povray_wasm/Dockerfile.build deleted file mode 100644 index c0f64a7..0000000 --- a/povray_wasm/Dockerfile.build +++ /dev/null @@ -1,26 +0,0 @@ -FROM emscripten/emsdk:latest - -RUN DEBIAN_FRONTEND=noninteractive apt update - -RUN DEBIAN_FRONTEND=noninteractive apt install -y \ - bash \ - libz-dev \ - libpng-dev \ - libjpeg-dev \ - libtiff-dev \ - libopenexr-dev \ - autoconf \ - automake \ - make - -RUN cd /opt && git clone --recursive https://github.com/boostorg/boost.git - -RUN echo "using emscripten : : em++ ;" > ~/user-config.jam - -RUN mkdir -p /opt/libboost_build -RUN mkdir -p /opt/libboost - -RUN cd /opt/boost && ./bootstrap.sh --with-libraries=all --with-toolset=emscripten - -RUN cd /opt/boost && ./b2 -j4 toolset=emscripten --test-config=/opt/user-config.jam --prefix=/opt/libboost --build-dir=/opt/libboost_build link=static variant=release address-model=64 architecture=x86 - diff --git a/povray_wasm/Dockerfile.save b/povray_wasm/Dockerfile.save deleted file mode 100644 index 41e4b1c..0000000 --- a/povray_wasm/Dockerfile.save +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -FROM emscripten/emsdk:latest - -RUN DEBIAN_FRONTEND=noninteractive apt update - -RUN DEBIAN_FRONTEND=noninteractive apt install -y \ - bash \ - libz-dev \ - libpng-dev \ - libjpeg-dev \ - libtiff-dev \ - libopenexr-dev \ - autoconf \ - automake \ - make \ - libboost-all-dev - -WORKDIR /usr/src/ - -ENV POVRAY_VERSION=3.7-stable -RUN cd /usr/src/ && git clone --depth 1 --branch $POVRAY_VERSION https://github.com/POV-Ray/povray povray \ No newline at end of file diff --git a/povray_wasm/build_ubuntu.sh b/povray_wasm/build.sh similarity index 100% rename from povray_wasm/build_ubuntu.sh rename to povray_wasm/build.sh diff --git a/povray_wasm/build_old.sh b/povray_wasm/build_old.sh deleted file mode 100644 index 1ae8f57..0000000 --- a/povray_wasm/build_old.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -x - -EMAIL="himattmcwilliams@gmail.com" -NAME="Matt McWilliams" -BOOST_ROOT="/lib/x86_64-linux-gnu/" -#Build dir? -#BOOST_ROOT=/opt/libboost/lib - -# https://jeromewu.github.io/build-ffmpeg-webassembly-version-part-3-v0.1/ -# altered for povray - -# verify Emscripten version -emcc -v > build.log - -cd unix/ - -sh prebuild.sh - -# configure povray -CFLAGS="-pthread -DBOOST_THREAD_USE_LIB -s USE_BOOST_HEADERS=1" -LDFLAGS="$CFLAGS -s INITIAL_MEMORY=33554432" # 33554432 bytes = 32 MB -CONFIG_ARGS=( - --arch=x86_32 # use x86_32 to achieve minimal architectural optimization - --enable-cross-compile # enable cross compile - --disable-x86asm # disable x86 asm - --disable-inline-asm # disable inline asm - --disable-stripping # disable stripping - --disable-programs # disable programs build (incl. ffplay, ffprobe & ffmpeg) - --disable-doc # disable doc - --extra-cflags="$CFLAGS" - --extra-cxxflags="$CFLAGS" - --extra-ldflags="$LDFLAGS" - --nm="llvm-nm -g" - --ar=emar - --as=llvm-as - --ranlib=llvm-ranlib - --cc=emcc - --cxx=em++ - --objcc=emcc - --dep-cc=emcc -) - -ARGS=( - LIBS="-lboost_system -lboost_thread -lboost_date_time" - COMPILED_BY="$NAME <$EMAIL>" - CC=emcc - CXX=em++ - CFLAGS="$CFLAGS" - CXXFLAGS="$CFLAGS" - LDFLAGS="$LDFLAGS" - --host=wasm32 -) - -BOOST_ROOT=$BOOST_ROOT emconfigure ./configure "${ARGS[@]}" - -# build dependencies -emmake make -j2 - -exit - -# build ffmpeg.wasm -mkdir -p wasm/dist -ARGS=( - -I. -I./fftools - -Llibavcodec -Llibavdevice -Llibavfilter -Llibavformat -Llibavresample -Llibavutil -Llibpostproc -Llibswscale -Llibswresample - -Qunused-arguments - -o wasm/dist/ffmpeg.js fftools/ffmpeg_opt.c fftools/ffmpeg_filter.c fftools/ffmpeg_hw.c fftools/cmdutils.c fftools/ffmpeg.c - -lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -lm - -s USE_SDL=2 # use SDL2 - -s USE_PTHREADS=1 # enable pthreads support - -s INITIAL_MEMORY=33554432 # 33554432 bytes = 32 MB -) -emcc "${ARGS[@]}" \ No newline at end of file diff --git a/povray_wasm/compile.sh b/povray_wasm/compile.sh index 6721493..09b5a18 100644 --- a/povray_wasm/compile.sh +++ b/povray_wasm/compile.sh @@ -5,4 +5,4 @@ bash ./build_docker.sh sudo docker run \ -v $PWD:/usr/src/build \ povray_wasm \ - sh -c 'cd /usr/src/povray && cp ../build/build_ubuntu.sh build.sh && bash build.sh' \ No newline at end of file + sh -c 'cd /usr/src/povray && cp ../build/build.sh build.sh && bash build.sh' \ No newline at end of file diff --git a/povray_wasm/build_docker.sh b/povray_wasm/docker.sh similarity index 100% rename from povray_wasm/build_docker.sh rename to povray_wasm/docker.sh