Skip to content

Commit 34c449f

Browse files
committed
drop rapidjson headers from packages and use rapidjson from the system
1 parent f98d5ca commit 34c449f

13 files changed

+1552
-846
lines changed

.github/workflows/linux-build-scripts.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
shell: bash
3232
steps:
3333
- uses: actions/checkout@v2
34+
- name: prerequisites
35+
run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
3436
- name: run the build script
3537
run: ./linux.sh -d
3638
- name: print build logs
@@ -47,6 +49,8 @@ jobs:
4749
shell: bash
4850
steps:
4951
- uses: actions/checkout@v2
52+
- name: prerequisites
53+
run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
5054
- name: run the build script
5155
run: ./linux.sh -d --lts
5256
- name: print build logs
@@ -63,6 +67,8 @@ jobs:
6367
shell: bash
6468
steps:
6569
- uses: actions/checkout@v2
70+
- name: prerequisites
71+
run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
6672
- name: run the build script
6773
run: ./linux.sh -d
6874
- name: print build logs
@@ -79,6 +85,8 @@ jobs:
7985
shell: bash
8086
steps:
8187
- uses: actions/checkout@v2
88+
- name: prerequisites
89+
run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
8290
- name: run the build script
8391
run: ./linux.sh -d --lts
8492
- name: print build logs

linux.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,6 @@ echo -e "INFO: Downloading the source code of ffmpeg and external libraries.\n"
175175
# DOWNLOAD GNU CONFIG
176176
download_gnu_config
177177

178-
# DOWNLOAD RAPIDJSON
179-
download_rapidjson
180-
181178
# DOWNLOAD LIBRARY SOURCES
182179
downloaded_library_sources "${ENABLED_LIBRARIES[@]}"
183180

linux/Makefile.in

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ build_triplet = @build@
8989
host_triplet = @host@
9090
subdir = .
9191
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
92-
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
93-
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
94-
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
95-
$(top_srcdir)/configure.ac
92+
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
93+
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
94+
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
95+
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
9696
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9797
$(ACLOCAL_M4)
9898
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -233,6 +233,7 @@ EXEEXT = @EXEEXT@
233233
FFMPEG_LIBS = @FFMPEG_LIBS@
234234
FGREP = @FGREP@
235235
GREP = @GREP@
236+
HAVE_CXX11 = @HAVE_CXX11@
236237
INSTALL = @INSTALL@
237238
INSTALL_DATA = @INSTALL_DATA@
238239
INSTALL_PROGRAM = @INSTALL_PROGRAM@

linux/aclocal.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,7 @@ AC_SUBST([am__tar])
12291229
AC_SUBST([am__untar])
12301230
]) # _AM_PROG_TAR
12311231

1232+
m4_include([m4/ax_cxx_compile_stdcxx.m4])
12321233
m4_include([m4/libtool.m4])
12331234
m4_include([m4/ltoptions.m4])
12341235
m4_include([m4/ltsugar.m4])

0 commit comments

Comments
 (0)