commit 7559ce8

hovercats  ·  2024-09-16 00:38:19 +0000 UTC
parent ec16b2d
repo/: remove pkg-config switch using pkg-config --exist. u-config doesnt have this option (currently anyway).
cmake should also be able to catch wether or not gst libraries being installed, and enable video/audio automatically.
remove openjpeg switch altogether and just disable it instead
2 files changed,  +2, -14
+1, -4
 1@@ -9,9 +9,6 @@ rm -rf subprojects/
 2 sed "/subdir('po')/d" meson.build > _
 3 mv -f _ meson.build
 4 
 5-# Enable gobject-introspection if it is installed.
 6-pkg-config --exists gobject-introspection-1.0 && gi=en
 7-
 8 # Needed to make the build succeed.
 9 export CFLAGS="$CFLAGS -w"
10 export CXXFLAGS="$CXXFLAGS -w"
11@@ -28,7 +25,7 @@ meson setup \
12     -Dbrotli=disabled \
13     -Dsysprof=disabled \
14     -Dpkcs11_tests=disabled \
15-    -Dintrospection="${gi:-dis}abled" \
16+    -Dintrospection=disabled \
17     output
18 
19 samu -C output
+1, -10
 1@@ -8,13 +8,6 @@ export CCACHE_SLOPPINESS=time_macros,include_file_mtime
 2 export CFLAGS="$CFLAGS -DNDEBUG"
 3 export CXXFLAGS="$CXXFLAGS -DNDEBUG -Wno-deprecated-declarations -Wno-deprecated-copy"
 4 
 5-# Enable streaming related options if gstreamer is installed.
 6-pkg-config --exists gstreamer-video-1.0 && video=ON
 7-pkg-config --exists gstreamer-audio-1.0 && audio=ON
 8-
 9-# Enable the use of openjpeg if the package is installed.
10-pkg-config --exists openjpeg2 && jpeg=ON
11-
12 # Use clang if installed, decreases compilation time by 25%.
13 if command -v clang; then
14 	export CC=clang 
15@@ -83,9 +76,7 @@ cmake -G Ninja -B build \
16     -DENABLE_PDFJS=OFF \
17     -DENABLE_SAMPLING_PROFILER=OFF \
18     -DENABLE_SPELLCHECK=OFF \
19-    -DENABLE_VIDEO="${video:-OFF}" \
20     -DENABLE_WAYLAND_TARGET=OFF \
21-    -DENABLE_WEB_AUDIO="${audio:-OFF}" \
22     -DUSE_AVIF=OFF \
23     -DUSE_GSTREAMER_GL=OFF \
24     -DUSE_GSTREAMER_TRANSCODER=OFF \
25@@ -96,7 +87,7 @@ cmake -G Ninja -B build \
26     -DUSE_LIBHYPHEN=OFF \
27     -DUSE_LIBNOTIFY=OFF \
28     -DUSE_LIBSECRET=OFF \
29-    -DUSE_OPENJPEG="${jpeg:-OFF}" \
30+    -DUSE_OPENJPEG=OFF \
31     -DUSE_SOUP2=OFF \
32     -DUSE_SYSTEMD=OFF \
33     -DUSE_WOFF2=OFF \