Skip to content

Commit 96e6b77

Browse files
committed
Minor changes to build in Linux
1 parent f700884 commit 96e6b77

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

sources/jvxLibraries/third_party/git/vst/prepareModules.sh

100644100755
File mode changed.

sources/jvxPackages/ffmpeg/jvxLibraries/third_party/git/ffmpeg/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ elseif(${JVX_OS} MATCHES "linux")
171171
${JVX_FFMPEG_LIB_AVUTIL}
172172
${JVX_FFMPEG_LIB_SWRESAMPLE}
173173
${JVX_FFMPEG_LIB_SWSCALE}
174-
${JVX_FFMPEG_LIB_POSTPROC}
174+
# ${JVX_FFMPEG_LIB_POSTPROC}
175175
x264
176176
x265
177177
CACHE INTERNAL "ffmpeg libs (glnx)")

sources/jvxPackages/ffmpeg/jvxLibraries/third_party/git/ffmpeg/prepareModules-glnx.sh

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ if [ ! -d $folder ]; then
1818
echo git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
1919
git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
2020
cd ffmpeg
21-
git checkout 507a51fbe9732f0f6f12f43ce12431e8faa834b7
22-
23-
echo "PATCHING"
24-
echo "patch -p1 < ../ffmpeg-glnx-mathops.patch"
25-
patch -p1 < ../ffmpeg-glnx-mathops.patch
21+
# git checkout 507a51fbe9732f0f6f12f43ce12431e8faa834b7
22+
git checkout 17734f696752e996a37f80077c2bf116444ad340
23+
#echo "PATCHING"
24+
#echo "patch -p1 < ../ffmpeg-glnx-mathops.patch"
25+
#patch -p1 < ../ffmpeg-glnx-mathops.patch
2626
cd ..
2727

2828
mv ffmpeg $folder
@@ -65,6 +65,12 @@ if [ -d $folder ]; then
6565

6666
echo make install
6767
make install
68+
69+
echo make clean
70+
make clean
71+
72+
make V=1 fftools/resources/graph.html.o
73+
make V=1 fftools/resources/graph.css.o
6874
else
6975
echo "Subfolder lib already exists"
7076
fi

0 commit comments

Comments
 (0)