Changeset 97397 in vbox for trunk/configure

Timestamp:

Nov 4, 2022 1:11:19 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154397

Message:

configure: Added support for using libogg and libvorbis system libraries, which are required for audio recording. Revamped the patch a bit, also removed Opus (libopus) depdendencies while at it. Thanks to locutusofborg@…! bugref:10275

File:

• trunk/configure (modified) (11 diffs)

trunk/configure

@@ -109 +109 @@
 WITH_DOCS=1
 WITH_LIBVPX=1
-WITH_LIBOPUS=1
+WITH_LIBOGG=0
+WITH_LIBVORBIS=0
 WITH_LIBTPMS=1
 BUILD_LIBXML2=
@@ -1726 +1727 @@
 
 #
-# Check for libopus
-#
-check_libopus()
-{
-  if [ -z "$BUILD_LIBOPUS" ]; then
-    test_header libopus
-    if which_wrapper pkg-config > /dev/null; then
-      libopus_ver=`pkg-config opus --modversion 2>> $LOG`
-      if [ $? -eq 0 ]; then
-        FLGOPUS=`pkg-config opus --cflags`
-        INCOPUS=`strip_I "$FLGOPUS"`
-        LIBOPUS=`pkg-config opus --libs`
-      fi
-      cat > $ODIR.tmp_src.cc << EOF
-#include <cstdio>
-#include <opus/opus.h>
-extern "C" int main(void)
-{
-  OpusEncoder *test;
-  printf("found, OK.\n");
-}
-EOF
-      [ -n "$INCOPUS" ] && I_INCOPUS=`prefix_I "$INCOPUS"`
-      if test_compile "$LIBOPUS $I_INCOPUS" opus opus; then
-        if test_execute; then
-          cnf_append "SDK_VBOX_OPUS_INCS" "$INCOPUS"
-          cnf_append "SDK_VBOX_OPUS_LIBS" "`strip_l "$LIBOPUS"`"
-          fi
-      fi
-    fi
-  fi
-}
-
-
-#
 # Check for libvpx
 #
@@ -1841 +1807 @@
         echo "not found -- building libtpms from in-tree code."
       fi
+    fi
+  fi
+}
+
+
+#
+# Check for libvorbis
+#
+check_libvorbis()
+{
+  test_header libvorbis
+  if which_wrapper pkg-config > /dev/null; then
+    libvorbis_ver=`pkg-config vorbis --modversion 2>> $LOG`
+    if [ $? -eq 0 ]; then
+      FLGVRB=`pkg-config vorbis --cflags`
+      INCVRB=`strip_I "$FLGVRB"`
+      LIBVRB=`pkg-config vorbis --libs`
+    fi
+    cat > $ODIR.tmp_src.cc << EOF
+#include <cstdio>
+#include <vorbis/vorbisenc.h>
+extern "C" int main(void)
+{
+  vorbis_info v;
+  vorbis_info_init(&v);
+  printf("found, OK.\n");
+  return 0;
+}
+EOF
+    [ -n "$INCVRB" ] && I_INCVRB=`prefix_I "$INCVRB"`
+    if test_compile "$LIBVRB $I_INCVRB" vorbis vorbis nofatal; then
+      if test_execute; then
+        cnf_append "SDK_VBOX_VORBIS_INCS" "$INCVRB"
+        cnf_append "SDK_VBOX_VORBIS_LIBS" "`strip_l "$LIBVRB"`"
+      fi
+    else
+      echo "not found -- building libvorbis from in-tree code."
+    fi
+  fi
+}
+
+
+#
+# Check for libogg
+#
+check_libogg()
+{
+  test_header libogg
+  if which_wrapper pkg-config > /dev/null; then
+    libogg_ver=`pkg-config ogg --modversion 2>> $LOG`
+    if [ $? -eq 0 ]; then
+      FLGOGG=`pkg-config ogg --cflags`
+      INCOGG=`strip_I "$FLGOGG"`
+      LIBOGG=`pkg-config ogg --libs`
+    fi
+    cat > $ODIR.tmp_src.cc << EOF
+#include <cstdio>
+#include <ogg/ogg.h>
+extern "C" int main(void)
+{
+  oggpack_buffer o;
+  oggpack_get_buffer(&o);
+  printf("found, OK.\n");
+  return 0;
+}
+EOF
+    [ -n "$INCOGG" ] && I_INCVRB=`prefix_I "$INCOGG"`
+    if test_compile "$LIBOGG $I_INCOGG" ogg ogg nofatal; then
+      if test_execute; then
+        cnf_append "SDK_VBOX_OGG_INCS" "$INCOGG"
+        cnf_append "SDK_VBOX_OGG_LIBS" "`strip_l "$LIBOGG"`"
+      fi
+    else
+      echo "not found -- building libogg from in-tree code."
     fi
   fi
@@ -2436 +2476 @@
 [ $WITH_DOCS    -eq 1 ] && echo "  --disable-docs           don't build the documentation"
 [ $WITH_LIBVPX  -eq 1 ] && echo "  --disable-libvpx         don't use libvpx for video capturing"
-[ $WITH_LIBOPUS -eq 1 ] && echo "  --disable-libopus        don't use libopus for audio capturing"
+[ $WITH_LIBVORBIS -eq 0 ] && echo "  --enable-libvorbis       enable system libvorbis"
+[ $WITH_LIBOGG -eq 0 ]  && echo "  --enable-libogg          enable system libogg"
 [ $WITH_LIBTPMS -eq 1 ] && echo "  --disable-libtpms        don't use libtpms for TPM emulation"
 [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
@@ -2512 +2553 @@
   [ $OSE -eq 1 ] || BUILD_LIBCURL=1
   [ $OSE -eq 1 ] && WITH_LIBVPX=0
-  [ $OSE -eq 1 ] && WITH_LIBOPUS=0
+  [ $OSE -eq 1 ] && WITH_LIBOGG=0
+  [ $OSE -eq 1 ] && WITH_LIBVORBIS=0
   WITH_XCODE_DIR=""
 elif [ "$OS" = "haiku" ]; then
@@ -2527 +2569 @@
   BUILD_LIBXML2=1
   WITH_LIBVPX=0
-  WITH_LIBOPUS=0
-  # it is part of libroot, which is linked by default,
+  WITH_LIBOGG=0
+  WITH_LIBVORBIS=0
   # but the script wants something
   LIBPTHREAD="-lroot"
@@ -2535 +2577 @@
 elif [ "$OS" = "solaris" ]; then
   [ $OSE -eq 1 ] && WITH_LIBVPX=0
-  [ $OSE -eq 1 ] && WITH_LIBOPUS=0
+  [ $OSE -eq 1 ] && WITH_LIBOGG=0
+  [ $OSE -eq 1 ] && WITH_LIBVORBIS=0
 fi
 
@@ -2668 +2711 @@
       WITH_HARDENING=2
       ;;
-    --build-libopus)
-      BUILD_LIBOPUS=1
-      ;;
     --disable-udptunnel)
       WITH_UDPTUNNEL=0
@@ -2683 +2723 @@
       WITH_LIBVPX=0
       ;;
-    --disable-libopus)
-      WITH_LIBOPUS=0
-      ;;
     --disable-libtpms)
       WITH_LIBTPMS=0
+      ;;
+    --enable-libogg)
+      WITH_LIBOGG=1
+      ;;
+    --enable-libvorbis)
+      WITH_LIBVORBIS=1
       ;;
     --disable-sdl)
@@ -2881 +2924 @@
   cnf_append "VBOX_WITH_RECORDING" ""
 fi
-if [ $WITH_LIBOPUS -eq 0 ]; then
-  cnf_append "VBOX_WITH_LIBOPUS" ""
+if [ $WITH_LIBOGG -eq 0 -o $WITH_LIBVORBIS -eq 0 ]; then
+  cnf_append "VBOX_WITH_LIBOGG" ""
+  cnf_append "VBOX_WITH_LIBVORBIS" ""
   cnf_append "VBOX_WITH_AUDIO_RECORDING" ""
 fi
@@ -2908 +2952 @@
   check_curl
   [ $WITH_LIBVPX -eq 1 ] && check_vpx
-  [ $WITH_LIBOPUS -eq 1 ] && check_libopus
+  [ $WITH_LIBOGG -eq 1 ] && check_libogg
+  [ $WITH_LIBVORBIS -eq 1 ] && check_libvorbis
   [ $WITH_LIBTPMS -eq 1 ] && check_libtpms
   [ "$OS" != "darwin"  ] && check_png