[vlc-commits] [Git][videolan/vlc][master] 3 commits: win32: fix LGPL build

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
1531a7c0 by Martin Finkel at 2023-07-09T12:09:37+00:00
win32: fix LGPL build

- - - - -
03edb9f3 by Martin Finkel at 2023-07-09T12:09:37+00:00
only enable dvd in non-uwp gpl builds

- - - - -
54308a09 by Martin Finkel at 2023-07-09T12:09:37+00:00
add dca meson flag

- - - - -


2 changed files:

- extras/package/win32/build.sh
- extras/package/win32/configure.sh


Changes:

=====================================
extras/package/win32/build.sh
=====================================
@@ -240,7 +240,12 @@ case $LICENSE in
     ;;
     g|*)
         # GPL v3
-        CONFIGFLAGS="$CONFIGFLAGS --enable-live555"
+        CONFIGFLAGS="$CONFIGFLAGS --enable-live555 --enable-dca"
+        MCONFIGFLAGS="$MCONFIGFLAGS -Ddca=enabled"
+        if [ -z "$WINSTORE" ]; then
+            CONFIGFLAGS="$CONFIGFLAGS --enable-dvdread"
+            MCONFIGFLAGS="$MCONFIGFLAGS -Ddvdread=enabled"
+        fi
     ;;
 esac
 
@@ -436,8 +441,8 @@ if [ ! -z "$WINSTORE" ]; then
     # MCONFIGFLAGS="$MCONFIGFLAGS -Ddxva2=disabled"
 
 else
-    CONFIGFLAGS="$CONFIGFLAGS --enable-dvdread --enable-caca"
-    MCONFIGFLAGS="$MCONFIGFLAGS -Ddvdread=enabled -Dcaca=enabled"
+    CONFIGFLAGS="$CONFIGFLAGS --enable-caca"
+    MCONFIGFLAGS="$MCONFIGFLAGS -Dcaca=enabled"
 fi
 if [ ! -z "$INSTALL_PATH" ]; then
     CONFIGFLAGS="$CONFIGFLAGS --with-packagedir=$INSTALL_PATH"


=====================================
extras/package/win32/configure.sh
=====================================
@@ -6,7 +6,6 @@ OPTIONS="
       --enable-flac
       --enable-theora
       --enable-avcodec --enable-merge-ffmpeg
-      --enable-dca
       --enable-libass
       --enable-schroedinger
       --enable-shout



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6aaa02f4e8ccfe93ceef5c271081be0f397b2788...54308a09b1d12974d004612920c4396c034bae7a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6aaa02f4e8ccfe93ceef5c271081be0f397b2788...54308a09b1d12974d004612920c4396c034bae7a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance