Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 196d765

Browse files
TFSThiagoBR98TheOneric
TFSThiagoBR98
authored and
TheOneric
committedMar 21, 2022
Split Makefile and add build flags
This commit add support to build flags Currently is included: support for pthreads, LTO builds and Debug builds. Emscripten docker image is updated from 2.0.20 to 3.1.3. Split the Makefile into several files to build/m4. Changed from Autotools to Meson where its possible, to reduce the number of patches. Removed libass.cpp, this can be implemented in SubtitleOctopus.cpp Add zip task to make bundles
1 parent ab5d440 commit 196d765

28 files changed

+675
-688
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ node_modules/
3232
build/lib
3333
src/SubOctpInterface.cpp
3434
src/SubOctpInterface.js
35+
build/__pycache__/

‎Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM emscripten/emsdk:2.0.20
1+
FROM docker.io/emscripten/emsdk:3.1.3
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
build-essential \
@@ -10,6 +10,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
itstool \
1111
pkg-config \
1212
python3 \
13+
python3-pip \
14+
python3-setuptools \
15+
python3-wheel \
16+
ninja-build \
1317
python3-ply \
1418
gettext \
1519
autopoint \
@@ -18,7 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1822
m4 \
1923
gperf \
2024
licensecheck \
21-
&& rm -rf /var/lib/apt/lists/*
25+
&& rm -rf /var/lib/apt/lists/* \
26+
&& pip3 install meson
2227

2328
WORKDIR /code
2429
CMD ["make"]

‎Makefile

+199-344
Large diffs are not rendered by default.

‎build/get_version.sh

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g';

‎build/m4/brotli.mk

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#
2+
# Brotli
3+
#
4+
build/lib/brotli/js/decode.js: build/lib/brotli/configured
5+
build/lib/brotli/js/polyfill.js: build/lib/brotli/configured
6+
build/lib/brotli/configured: lib/brotli $(wildcard $(BASE_DIR)build/patches/brotli/*.patch)
7+
rm -rf build/lib/brotli
8+
cp -r lib/brotli build/lib/brotli
9+
$(foreach file, $(wildcard $(BASE_DIR)build/patches/brotli/*.patch), patch -d "$(BASE_DIR)build/lib/brotli" -Np1 -i $(file) && ) true
10+
touch build/lib/brotli/configured
11+
12+
build/lib/brotli/libbrotlidec.pc: build/lib/brotli/configured
13+
cd build/lib/brotli && \
14+
emcmake cmake \
15+
-DCMAKE_C_FLAGS=" \
16+
$(GLOBAL_CFLAGS) \
17+
" \
18+
-DCMAKE_CXX_FLAGS=" \
19+
$(GLOBAL_CFLAGS) \
20+
" \
21+
-DCMAKE_C_LINKER_FLAGS=" \
22+
$(GLOBAL_CFLAGS) \
23+
$(GLOBAL_LDFLAGS) \
24+
" \
25+
-DCMAKE_INSTALL_PREFIX=$(DIST_DIR) \
26+
. \
27+
&& \
28+
emmake make -j8 && \
29+
cp -r ./c/include $(DIST_DIR)
30+
31+
$(DIST_DIR)/lib/libbrotlicommon.a: build/lib/brotli/libbrotlidec.pc
32+
cd build/lib/brotli && \
33+
mkdir -p $(DIST_DIR)/lib/pkgconfig && \
34+
cp libbrotlicommon.pc $(DIST_DIR)/lib/pkgconfig && \
35+
cp libbrotlicommon-static.a $(DIST_DIR)/lib/libbrotlicommon.a
36+
37+
$(DIST_DIR)/lib/libbrotlidec.a: build/lib/brotli/libbrotlidec.pc $(DIST_DIR)/lib/libbrotlicommon.a
38+
cd build/lib/brotli && \
39+
mkdir -p $(DIST_DIR)/lib/pkgconfig && \
40+
cp libbrotlidec.pc $(DIST_DIR)/lib/pkgconfig && \
41+
cp libbrotlidec-static.a $(DIST_DIR)/lib/libbrotlidec.a
42+
43+
git-brotli:
44+
cd lib/brotli && \
45+
git reset --hard && \
46+
git clean -dfX && \
47+
git pull origin master

‎build/m4/expat.mk

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
# Expat
3+
#
4+
build/lib/expat/configured: lib/expat
5+
rm -rf build/lib/expat
6+
cp -r lib/expat build/lib/expat
7+
$(foreach file, $(wildcard $(BASE_DIR)build/patches/expat/*.patch), patch -d "$(BASE_DIR)build/lib/expat" -Np1 -i $(file) && ) true
8+
mkdir -p build/lib/expat
9+
touch build/lib/expat/configured
10+
11+
$(DIST_DIR)/lib/libexpat.a: build/lib/expat/configured
12+
cd build/lib/expat && \
13+
emcmake cmake \
14+
-DCMAKE_C_FLAGS=" \
15+
$(GLOBAL_CFLAGS) \
16+
" \
17+
-DCMAKE_CXX_FLAGS=" \
18+
$(GLOBAL_CFLAGS) \
19+
" \
20+
-DCMAKE_C_LINKER_FLAGS=" \
21+
$(GLOBAL_CFLAGS) \
22+
$(GLOBAL_LDFLAGS) \
23+
" \
24+
-DCMAKE_INSTALL_PREFIX=$(DIST_DIR) \
25+
-DEXPAT_BUILD_DOCS=off \
26+
-DEXPAT_SHARED_LIBS=off \
27+
-DEXPAT_BUILD_EXAMPLES=off \
28+
-DEXPAT_BUILD_FUZZERS=off \
29+
-DEXPAT_BUILD_TESTS=off \
30+
-DEXPAT_BUILD_TOOLS=off \
31+
$(BASE_DIR)lib/expat/expat \
32+
&& \
33+
emmake make -j8 && \
34+
emmake make install
35+
36+
git-expat:
37+
cd lib/expat && \
38+
git reset --hard && \
39+
git clean -dfX && \
40+
git pull origin master

‎build/m4/fontconfig.mk

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# Fontconfig
3+
#
4+
5+
ifneq ($(ENABLE_PTHREADS), true)
6+
FG_THREADS:=-D threads=disabled
7+
endif
8+
9+
$(DIST_DIR)/lib/libfontconfig.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libexpat.a $(DIST_DIR)/lib/libfribidi.a $(BASE_DIR)/build/lib/freetype/full $(BASE_DIR)/build/lib/created
10+
rm -rf build/lib/fontconfig
11+
cp -r lib/fontconfig build/lib/fontconfig
12+
$(foreach file, $(wildcard $(BASE_DIR)build/patches/fontconfig/*.patch), patch -d "$(BASE_DIR)build/lib/fontconfig" -Np1 -i $(file) && ) true
13+
cd build/lib/fontconfig && \
14+
EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig \
15+
meson \
16+
-D "c_args=$(GLOBAL_CFLAGS)" \
17+
-D "cpp_args=$(GLOBAL_CFLAGS)" \
18+
-D "c_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS)" \
19+
-D "cpp_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS)" \
20+
--pkg-config-path "$(DIST_DIR)/lib/pkgconfig" \
21+
--build.pkg-config-path "$(DIST_DIR)/lib/pkgconfig" \
22+
--prefix "$(DIST_DIR)" \
23+
--libexecdir lib \
24+
--sbindir bin \
25+
--buildtype plain \
26+
--wrap-mode nodownload \
27+
-D b_lto=true -D b_pie=true \
28+
\
29+
-D tests=disabled \
30+
-D tools=disabled \
31+
-D doc=disabled \
32+
-D nls=disabled \
33+
$(FG_THREADS) \
34+
\
35+
--default-library=static \
36+
--cross-file "$(BASE_DIR)build/wasm_cross.txt" \
37+
build_dir && \
38+
meson compile -C build_dir && \
39+
meson install -C build_dir
40+
41+
git-fontconfig:
42+
cd lib/fontconfig && \
43+
git reset --hard && \
44+
git clean -dfX && \
45+
git pull origin master

‎build/m4/freetype.mk

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#
2+
# Freetype with Harfbuzz
3+
#
4+
$(DIST_DIR)/lib/libfreetype.a: $(BASE_DIR)/build/lib/freetype/full
5+
$(BASE_DIR)/build/lib/freetype/full: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libbrotlidec.a $(BASE_DIR)/build/lib/created
6+
cd build/lib/freetype && \
7+
EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig meson \
8+
-D "c_args=$(GLOBAL_CFLAGS)" \
9+
-D "cpp_args=$(GLOBAL_CFLAGS)" \
10+
-D "c_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS)" \
11+
-D "cpp_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS)" \
12+
--pkg-config-path "$(DIST_DIR)/lib/pkgconfig" \
13+
--build.pkg-config-path "$(DIST_DIR)/lib/pkgconfig" \
14+
--prefix "$(DIST_DIR)" \
15+
--libexecdir lib \
16+
--sbindir bin \
17+
--buildtype plain \
18+
--wrap-mode nodownload \
19+
-D b_lto=true -D b_pie=true \
20+
\
21+
-D brotli=enabled \
22+
-D harfbuzz=enabled \
23+
-D png=disabled \
24+
-D tests=disabled \
25+
-D zlib=disabled \
26+
\
27+
--default-library=static \
28+
--cross-file "$(BASE_DIR)build/wasm_cross.txt" \
29+
build_dir && \
30+
meson compile -C build_dir && \
31+
meson install -C build_dir
32+
touch $(BASE_DIR)/build/lib/freetype/full
33+
34+
git-freetype:
35+
cd lib/freetype && \
36+
git reset --hard && \
37+
git clean -dfX && \
38+
git pull origin master

‎build/m4/freetype_bootstrap.mk

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# Freetype without Harfbuzz
3+
#
4+
$(BASE_DIR)/build/lib/freetype/bootstrap: $(DIST_DIR)/lib/libbrotlidec.a $(BASE_DIR)/build/lib/created
5+
rm -rf build/lib/freetype
6+
cp -r lib/freetype build/lib/freetype
7+
$(foreach file, $(wildcard $(BASE_DIR)build/patches/freetype/*.patch), patch -d "$(BASE_DIR)build/lib/freetype" -Np1 -i $(file) && ) true
8+
cd build/lib/freetype && \
9+
EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig meson \
10+
-D "c_args=$(GLOBAL_CFLAGS)" \
11+
-D "cpp_args=$(GLOBAL_CFLAGS)" \
12+
-D "c_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS)" \
13+
-D "cpp_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS)" \
14+
--pkg-config-path "$(DIST_DIR)/lib/pkgconfig" \
15+
--build.pkg-config-path "$(DIST_DIR)/lib/pkgconfig" \
16+
--prefix "$(DIST_DIR)" \
17+
--libexecdir lib \
18+
--sbindir bin \
19+
--buildtype plain \
20+
--wrap-mode nodownload \
21+
-D b_lto=true -D b_pie=true \
22+
\
23+
-D brotli=enabled \
24+
-D harfbuzz=disabled \
25+
-D png=disabled \
26+
-D tests=disabled \
27+
-D zlib=disabled \
28+
\
29+
--default-library=static \
30+
--cross-file "$(BASE_DIR)build/wasm_cross.txt" \
31+
build_bootstrap && \
32+
meson compile -C build_bootstrap && \
33+
meson install -C build_bootstrap && \
34+
touch $(BASE_DIR)/build/lib/freetype/bootstrap

‎build/m4/fribidi.mk

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#
2+
# Fribidi
3+
#
4+
$(DIST_DIR)/lib/libfribidi.a: lib/fribidi $(BASE_DIR)/build/lib/created
5+
rm -rf build/lib/fribidi
6+
cp -r lib/fribidi build/lib/fribidi
7+
$(foreach file, $(wildcard $(BASE_DIR)build/patches/fribidi/*.patch), patch -d "$(BASE_DIR)build/lib/fribidi" -Np1 -i $(file) && ) true
8+
cd build/lib/fribidi && \
9+
EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig meson \
10+
-D "c_args=$(GLOBAL_CFLAGS) -DFRIBIDI_ENTRY=extern" \
11+
-D "cpp_args=$(GLOBAL_CFLAGS) -DFRIBIDI_ENTRY=extern" \
12+
-D "c_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS) -DFRIBIDI_ENTRY=extern" \
13+
-D "cpp_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS) -DFRIBIDI_ENTRY=extern" \
14+
--pkg-config-path "$(DIST_DIR)/lib/pkgconfig" \
15+
--build.pkg-config-path "$(DIST_DIR)/lib/pkgconfig" \
16+
--prefix "$(DIST_DIR)" \
17+
--libexecdir lib \
18+
--sbindir bin \
19+
--buildtype plain \
20+
--wrap-mode nodownload \
21+
-D b_lto=true -D b_pie=true \
22+
\
23+
-D deprecated=false \
24+
-D docs=false \
25+
-D bin=false \
26+
-D tests=false \
27+
\
28+
--default-library=static \
29+
--cross-file "$(BASE_DIR)build/wasm_cross.txt" \
30+
build_dir && \
31+
meson compile -C build_dir && \
32+
meson install -C build_dir
33+
34+
git-fribidi:
35+
cd lib/fribidi && \
36+
git reset --hard && \
37+
git clean -dfX && \
38+
git pull origin master

‎build/m4/harfbuzz.mk

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#
2+
# Harfbuzz
3+
#
4+
5+
ifneq ($(ENABLE_PTHREADS), true)
6+
HB_NO_MT:=-DHB_NO_MT
7+
HB_THREADS:=-D threads=disabled
8+
endif
9+
10+
$(DIST_DIR)/lib/libharfbuzz.a: $(BASE_DIR)/build/lib/freetype/bootstrap $(BASE_DIR)/build/lib/created
11+
rm -rf build/lib/harfbuzz
12+
cp -r lib/harfbuzz build/lib/harfbuzz
13+
$(foreach file, $(wildcard $(BASE_DIR)build/patches/harfbuzz/*.patch), patch -d "$(BASE_DIR)build/lib/harfbuzz" -Np1 -i $(file) && ) true
14+
cd build/lib/harfbuzz && \
15+
EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig:$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
16+
meson \
17+
-D "c_args=$(GLOBAL_CFLAGS) $(HB_NO_MT)" \
18+
-D "cpp_args=$(GLOBAL_CFLAGS) $(HB_NO_MT)" \
19+
-D "c_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS) $(HB_NO_MT)" \
20+
-D "cpp_link_args=$(GLOBAL_CFLAGS) $(GLOBAL_LDFLAGS) $(HB_NO_MT)" \
21+
--pkg-config-path "$(DIST_DIR)/lib/pkgconfig:$(BASE_DIR)build/lib/freetype/build_dir/prefix/lib/pkgconfig" \
22+
--build.pkg-config-path "$(DIST_DIR)/lib/pkgconfig:$(BASE_DIR)build/lib/freetype/build_dir/prefix/lib/pkgconfig" \
23+
--prefix "$(DIST_DIR)" \
24+
--libexecdir lib \
25+
--sbindir bin \
26+
--buildtype plain \
27+
--wrap-mode nodownload \
28+
-D b_lto=true -D b_pie=true \
29+
\
30+
-D tests=disabled \
31+
-D introspection=disabled \
32+
-D docs=disabled \
33+
-D cairo=disabled \
34+
-D gobject=disabled \
35+
-D glib=disabled \
36+
-D icu=disabled \
37+
-D freetype=enabled \
38+
$(HB_THREADS) \
39+
\
40+
--default-library=static \
41+
--cross-file "$(BASE_DIR)build/wasm_cross.txt" \
42+
build_dir && \
43+
meson compile -C build_dir && \
44+
meson install -C build_dir
45+
46+
git-harfbuzz:
47+
cd lib/harfbuzz && \
48+
git reset --hard && \
49+
git clean -dfX && \
50+
git pull origin master

‎build/m4/libass.mk

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# libass
3+
#
4+
build/lib/libass/configured: lib/libass
5+
rm -rf build/lib/libass
6+
cd lib/libass && NOCONFIGURE=1 ./autogen.sh
7+
mkdir -p build/lib/libass
8+
touch build/lib/libass/configured
9+
10+
$(DIST_DIR)/lib/libass.a: $(DIST_DIR)/lib/libfontconfig.a $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libexpat.a $(DIST_DIR)/lib/libfribidi.a $(DIST_DIR)/lib/libfreetype.a $(DIST_DIR)/lib/libbrotlidec.a build/lib/libass/configured
11+
cd build/lib/libass && \
12+
EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig \
13+
emconfigure ../../../lib/libass/configure \
14+
CFLAGS=" \
15+
$(GLOBAL_CFLAGS) \
16+
" \
17+
--prefix="$(DIST_DIR)" \
18+
--host=x86-none-linux \
19+
--build=x86_64 \
20+
--disable-shared \
21+
--enable-static \
22+
--disable-asm \
23+
\
24+
--enable-harfbuzz \
25+
--enable-fontconfig \
26+
&& \
27+
emmake make -j8 && \
28+
emmake make install
29+
30+
git-libass:
31+
cd lib/libass && \
32+
git reset --hard && \
33+
git clean -dfX && \
34+
git pull origin master

‎build/patches/fontconfig/0001-fontconfig_add-emscripten-to-preprocess-list.patch

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/meson.build b/src/meson.build
2+
index 9a6ba20..713fa96 100644
3+
--- a/src/meson.build
4+
+++ b/src/meson.build
5+
@@ -37,6 +37,8 @@ elif cc.get_id() == 'msvc'
6+
cpp += ['/EP']
7+
elif cc.get_id() == 'clang'
8+
cpp += ['-E', '-P']
9+
+elif cc.get_id() == 'emscripten'
10+
+ cpp += ['-E', '-P']
11+
else
12+
error('FIXME: implement cc.preprocess')
13+
endif

‎build/patches/fontconfig/0002-disable-pthreads.patch

-29
This file was deleted.

‎build/patches/fontconfig/0002-fontconfig_add-option-to-disable-threads.patch

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/meson.build b/meson.build
2+
index 0ec3dc6..4c11be1 100644
3+
--- a/meson.build
4+
+++ b/meson.build
5+
@@ -213,9 +213,11 @@ else
6+
fc_fonts_path = ['/usr/share/fonts', '/usr/local/share/fonts']
7+
endif
8+
fc_cachedir = join_paths(prefix, get_option('localstatedir'), 'cache', meson.project_name())
9+
- thread_dep = dependency('threads')
10+
- conf.set('HAVE_PTHREAD', 1)
11+
- deps += [thread_dep]
12+
+ if not get_option('threads').disabled()
13+
+ thread_dep = dependency('threads')
14+
+ conf.set('HAVE_PTHREAD', 1)
15+
+ deps += [thread_dep]
16+
+ endif
17+
endif
18+
xml_path = ''
19+
escaped_xml_path = ''
20+
diff --git a/meson_options.txt b/meson_options.txt
21+
index d603049..52f21aa 100644
22+
--- a/meson_options.txt
23+
+++ b/meson_options.txt
24+
@@ -9,5 +9,7 @@ option('nls', type : 'feature', value : 'auto', yield: true,
25+
description : 'Enable native language support (translations)')
26+
option('tests', type : 'feature', value : 'auto', yield : true,
27+
description: 'Enable unit tests')
28+
+option('threads', type : 'feature', value : 'enabled', yield : true,
29+
+ description: 'Enable threads support')
30+
option('tools', type : 'feature', value : 'auto', yield : true,
31+
description: 'Build command-line tools (fc-list, fc-query, etc.)')

‎build/patches/fontconfig/0003-fix-fcstats-emscripten.patch

-46
This file was deleted.

‎build/patches/freetype/0001-disable-exports.patch

-26
This file was deleted.

‎build/patches/freetype/0002-disable-pthread.patch

-13
This file was deleted.

‎build/patches/harfbuzz/0001-force_disable_pthread.patch

-16
This file was deleted.

‎build/patches/harfbuzz/0001-harfbuzz_enable-add-option-to-disable-threads.patch

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff --git a/meson.build b/meson.build
2+
index a552a6039..de275caa8 100644
3+
--- a/meson.build
4+
+++ b/meson.build
5+
@@ -281,10 +281,12 @@ endif
6+
# threads
7+
thread_dep = null_dep
8+
if host_machine.system() != 'windows'
9+
- thread_dep = dependency('threads', required: false)
10+
+ if not get_option('threads').disabled()
11+
+ thread_dep = dependency('threads', required: false)
12+
13+
- if thread_dep.found()
14+
- conf.set('HAVE_PTHREAD', 1)
15+
+ if thread_dep.found()
16+
+ conf.set('HAVE_PTHREAD', 1)
17+
+ endif
18+
endif
19+
endif
20+
21+
diff --git a/meson_options.txt b/meson_options.txt
22+
index 602d053b7..0278a6eba 100644
23+
--- a/meson_options.txt
24+
+++ b/meson_options.txt
25+
@@ -21,6 +21,8 @@ option('coretext', type: 'feature', value: 'disabled',
26+
description: 'Enable CoreText shaper backend on macOS')
27+
28+
# Common feature options
29+
+option('threads', type: 'feature', value: 'enabled', yield: true,
30+
+ description: 'Enable threads support')
31+
option('tests', type: 'feature', value: 'enabled', yield: true,
32+
description: 'Enable or disable unit tests')
33+
option('introspection', type: 'feature', value: 'auto', yield: true,

‎build/patches/harfbuzz/0002-disable-dependency-build.patch

-10
This file was deleted.

‎build/wasm_cross.txt

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Crossplatform configuration for Emscripten
2+
3+
[binaries]
4+
c = 'emcc'
5+
cpp = 'em++'
6+
ar = 'emar'
7+
ranlib = 'emranlib'
8+
cmake = ['emcmake', 'cmake']
9+
pkgconfig = 'pkg-config'
10+
make = ['emmake', 'make']
11+
12+
[built-in options]
13+
c_args = []
14+
c_link_args = []
15+
cpp_args = []
16+
cpp_link_args = []
17+
18+
[host_machine]
19+
system = 'emscripten'
20+
cpu_family = 'wasm32'
21+
cpu = 'wasm32'
22+
endian = 'little'

‎src/Makefile.am

-8
This file was deleted.

‎src/SubtitleOctopus.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
#include <stdlib.h>
77
#include <stdarg.h>
88
#include <string.h>
9-
#include "../lib/libass/libass/ass.h"
10-
11-
#include "libass.cpp"
9+
#include <ass/ass.h>
1210

1311
#ifdef __EMSCRIPTEN__
1412
#include <emscripten.h>
@@ -355,5 +353,5 @@ class SubtitleOctopus {
355353
int main(int argc, char *argv[]) { return 0; }
356354

357355
#ifdef __EMSCRIPTEN__
358-
#include "./SubOctpInterface.cpp"
356+
#include <SubOctpInterface.cpp>
359357
#endif

‎src/SubtitleOctopus.idl

-41
Original file line numberDiff line numberDiff line change
@@ -113,47 +113,6 @@ interface ASS_ParserPriv {};
113113
[NoDelete]
114114
interface ASS_Renderer {};
115115

116-
[NoDelete]
117-
interface libass {
118-
void libass();
119-
long oct_library_version();
120-
ASS_Library oct_library_init();
121-
void oct_library_done(ASS_Library priv);
122-
void oct_set_fonts_dir(ASS_Library priv, [Const] DOMString fonts_dir);
123-
void oct_set_extract_fonts(ASS_Library priv, long extract);
124-
void oct_set_style_overrides(ASS_Library priv, DOMString[] list);
125-
void oct_process_force_style(ASS_Track track);
126-
ASS_Renderer oct_renderer_init(ASS_Library priv);
127-
void oct_renderer_done(ASS_Renderer priv);
128-
void oct_set_frame_size(ASS_Renderer priv, long w, long h);
129-
void oct_set_storage_size(ASS_Renderer priv, long w, long h);
130-
void oct_set_shaper(ASS_Renderer priv, ASS_ShapingLevel level);
131-
void oct_set_margins(ASS_Renderer priv, long t, long b, long l, long r);
132-
void oct_set_use_margins(ASS_Renderer priv, long use);
133-
void oct_set_pixel_aspect(ASS_Renderer priv, double par);
134-
void oct_set_aspect_ratio(ASS_Renderer priv, double dar, double sar);
135-
void oct_set_font_scale(ASS_Renderer priv, double font_scale);
136-
void oct_set_hinting(ASS_Renderer priv, ASS_Hinting ht);
137-
void oct_set_line_spacing(ASS_Renderer priv, double line_spacing);
138-
void oct_set_line_position(ASS_Renderer priv, double line_position);
139-
void oct_set_fonts(ASS_Renderer priv, DOMString default_font, DOMString default_family, long dfp, DOMString config, long update);
140-
void oct_set_selective_style_override_enabled(ASS_Renderer priv, long bits);
141-
void oct_set_selective_style_override(ASS_Renderer priv, ASS_Style style);
142-
void oct_set_cache_limits(ASS_Renderer priv, long glyph_max, long bitmap_max_size);
143-
ASS_Image oct_render_frame(ASS_Renderer priv, ASS_Track track, long long now, IntPtr detect_change);
144-
ASS_Track oct_new_track(ASS_Library priv);
145-
void oct_free_track(ASS_Track track);
146-
long oct_alloc_style(ASS_Track track);
147-
long oct_alloc_event(ASS_Track track);
148-
void oct_free_style(ASS_Track track, long sid);
149-
void oct_free_event(ASS_Track track, long eid);
150-
void oct_flush_events(ASS_Track track);
151-
ASS_Track oct_read_file(ASS_Library library, DOMString fname, DOMString codepage);
152-
void oct_add_font(ASS_Library library, DOMString name, DOMString data, long data_size);
153-
void oct_clear_fonts(ASS_Library library);
154-
long long oct_step_sub(ASS_Track track, long long now, long movement);
155-
};
156-
157116
[NoDelete]
158117
interface RenderBlendResult {
159118
attribute long changed;

‎src/configure.ac

-20
This file was deleted.

‎src/libass.cpp

-129
This file was deleted.

‎src/meson.build

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
project('SubtitleOctopus', 'cpp',
2+
version: '0.1',
3+
default_options: ['warning_level=3', 'cpp_std=c++14'])
4+
5+
pkgmod = import('pkgconfig')
6+
7+
libass = dependency('libass', version: '>=0.9.1')
8+
9+
#
10+
# WebIDL Generator
11+
#
12+
## FIXME: This crashes because the compiler start before webidl_binder runs
13+
# webidl_binder = find_program('webidl_binder.py', '../build/webidl_binder.py', required : true)
14+
15+
# SubOctpInterface = custom_target('SubOctpInterface',
16+
# depend_files: ['SubtitleOctopus.idl'],
17+
# input: ['SubtitleOctopus.idl'],
18+
# install: true,
19+
# output: ['SubOctpInterface.cpp', 'SubOctpInterface.js'],
20+
# command: ['python3', webidl_binder, '@INPUT@', 'SubOctpInterface'],
21+
# install_dir : [false, 'js'],
22+
# build_by_default: true)
23+
24+
worker_lib = static_library('subtitles-octopus',
25+
'SubtitleOctopus.cpp',
26+
dependencies: [
27+
libass,
28+
],
29+
link_args: ['-r', '-sLINKABLE=1', '-sMAIN_MODULE=1'],
30+
install: true,
31+
implicit_include_directories: true
32+
)
33+
34+
pkgmod.generate(worker_lib,
35+
description: 'Subtitle Render for Browsers',
36+
filebase: 'subtitleoctopus',
37+
name: 'SubtitleOctopus',
38+
requires: ['libass >=0.9.1'],
39+
version: '1.0.0',)

0 commit comments

Comments
 (0)
Please sign in to comment.