[vlc-commits] [Git][videolan/vlc][3.0.x] 26 commits: Revert "package/win32: don't force windowsappcompat in contribs"
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri Jan 24 07:35:37 UTC 2025
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
a7056120 by Steve Lhomme at 2025-01-24T07:14:08+00:00
Revert "package/win32: don't force windowsappcompat in contribs"
This reverts commit 0fe8d0385a259993e731a95ceef813cd816d1e90.
This is still needed for 3.0 contribs.
- - - - -
077266d1 by Marvin Scholz at 2025-01-24T07:14:08+00:00
package/win32: Fix indentation
(cherry picked from commit 27f7dfcc5aa636b98a5d24f9c6e3ce754f8fe2e6)
- - - - -
9a37865b by Steve Lhomme at 2025-01-24T07:14:08+00:00
contrib: win32: always shows the list of know contribs before building
We also want to know about native tools that may or may not be there.
(cherry picked from commit aca4094634c01d8ec768df14a80d23e80cf00d9e)
- - - - -
e65c51c4 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: build.sh: build contribs locally if prebuilt failed
(cherry picked from commit 8998fca08bcd6662ee59b5cea3b7192245c31055) (edited)
edited:
- 3.0 doesn't have the tools target, it just builds .luac
- - - - -
c9a8fba4 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: avoid verbose errors when checking for clang
(cherry picked from commit 98f77b7ea18628e2ec2d35f570fa1e138d3bdf76)
- - - - -
8cbd74e7 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: use the proper triplet for uwp
The mingw-w64 LLVM packages use XXX-w64-mingw32uwp for UWP targets.
This will enable HAVE_WINSTORE in contribs.
(cherry picked from commit f0b8e4413c1ad898a7f0045fe5cf2e683f6fb932)
- - - - -
7b5b2e9b by Steve Lhomme at 2025-01-24T07:14:08+00:00
win32: build.sh: show the list of packages after the prebuilt is done
So we know the tools that need to be built from there.
(cherry picked from commit 41bbcde5ec71881f99d85c78df6839a3a7438b6b)
- - - - -
62e4fb06 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: use internal AR/RANLIB variables
For now we keep exporting the usual names
(cherry picked from commit 4290a69d913ac47c53c275be2e6c77e9ef67c3d7)
- - - - -
72c38b8e by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: don't export HAVE_WINSTORE
The contribs and VLC have their own way of detecting/unabling winstore builds.
(cherry picked from commit 7f7405c94dce140a885d41fc4bde2f1a1dbe178f) (rebased)
rebased:
- qt the code around is slightly different
- - - - -
5daf369d by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: use internal xxxFLAGS variables
For now we keep exporting the usual names
(cherry picked from commit 5e67a886d832097973ee3208fe3f2b1feb58b22e) (edited)
edited:
- 3.0 has winstorecompat library and define
- - - - -
849625f8 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: pass the xxxFLAGS without exporting them
(cherry picked from commit 9165d99ce980dac3432a1683792c7ed0f6325617) (edited)
edited:
- 3.0 builds .luac instead of tools
- 3.0 doesn't use SHORTARCH
- - - - -
73fd8ad9 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: pass the AR/RANLIB without exporting them
(cherry picked from commit 1a9fe27e756b6b0cf7d6e89281547d0e8ddfa236) (edited)
edited:
- 3.0 builds .luac instead of tools
- - - - -
93d0458e by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: use internal PKG_CONFIG/PKG_CONFIG_LIBDIR variables
For now we keep exporting the usual names
(cherry picked from commit 64297f36b4422c420403467582d713b22f7c784f) (rebased)
rebased:
- the code around is slightly different
- - - - -
479deb47 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: set PKG_CONFIG/PKG_CONFIG_LIBDIR variables before building contribs
(cherry picked from commit f341ca78edbed2c1c82d4b9f877b615c3108a970) (edited)
edited:
- in 3.0 it was placed after the configure message
- - - - -
6a72fcb7 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: pass the PKG_CONFIG/PKG_CONFIG_LIBDIR without exporting them
(cherry picked from commit 60a8da05dbef41eeaa4bfca777d353126f7eeb92) (edited)
edited:
- 3.0 builds .luac instead of tools
- - - - -
c2be5fa5 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: use config.mak to pass custom flags to contribs
(cherry picked from commit c272db053a3600f6bf05aa1f4b658faf49932d46) (edited)
edited:
- 3.0 builds .luac instead of tools
- - - - -
47882e7f by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: always use -gcodeview when using PDB
So it applies to autotools and meson builds.
It's currently forced in the configure script.
(cherry picked from commit e324c59cf4bfd4a51a61e09c3309f6ea35914d29)
- - - - -
0b9f605d by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: always export the pkg-config to use
We did the detection, we know what we should use.
(cherry picked from commit 55d616000698179ade1b9b534e5f9df4c4c15420)
- - - - -
75467401 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: build all C++ with the static (LLVM) runtime
Otherwise it may use the dynamic libunwind (as found in meson).
Don't emit errors if it's not using (when only compiling). Some contribs don't like that.
(cherry picked from commit 90488d3508de2571b3dd2942e295a616085bb482) (edited)
edited:
- 3.0 doesn't have meson support
- - - - -
1469c780 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: don't discard all unused args in UWP
Only ignore the options we add locally.
This is how it's done in the llvm-mingw wrappers.
(cherry picked from commit 1539eac31284dab504e4f9b8436924f9aef4843a) (rebased)
rebased:
- 3.0 has winstore compat below
- - - - -
9b387eb4 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: pass -lwindowsapp with -Wl in VLC_LDFLAGS
Only used in UWP builds.
(cherry picked from commit 619dff36e3da20c3f63acd52566191187a9cf2f1) (edited)
edited:
- 3.0 has winstorecompat library
- - - - -
d78d3247 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: don't issue a wanring when -gcodeview is not used
This may trigger some compiler detection in some contribs.
The warning is issued when linking through the compiler.
(cherry picked from commit 112d5c78615a507373bc649f2fed432c91f717e4)
- - - - -
f9091cb9 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: enable PDB for contrib binaries
This way it's enabled the same way for all the code we build.
(cherry picked from commit 2c2eb681922e4e2c5aba3f8cc77dfe83cd185563)
- - - - -
6fdf53a0 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: use "-n" instead of "! -z" tests
(cherry picked from commit d897981340cb55002a19c5d44b007d6ade2c53da) (edited)
edited:
- 3.0 had more/in different places
- - - - -
2fd25d46 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: favor the static version of winpthread with clang
Just like we favor the static version of libunwind.
We don't need any extra flags for the compiler. It's all handled in the linker.
Ref. #28903
(cherry picked from commit cd7e35c6f05d401268b72bf51077cf47295ae7f2)
- - - - -
33fb3b37 by Steve Lhomme at 2025-01-24T07:14:08+00:00
package/win32: only use start-no-unused-arguments with Clang14 and up
It generates compilation errors before as it's not supported.
(cherry picked from commit f9041c3467f0cd63fac456af5fe840d2137d1b68) (rebased)
rebased:
- 3.0 has winstore compat above
- - - - -
1 changed file:
- extras/package/win32/build.sh
Changes:
=====================================
extras/package/win32/build.sh
=====================================
@@ -134,7 +134,10 @@ TRIPLET=$ARCH-w64-mingw32
# Check if compiling with clang
CC=${CC:-$TRIPLET-gcc}
-if ! printf "#ifdef __clang__\n#error CLANG\n#endif" | $CC -E -; then
+if ! printf "#ifdef __clang__\n#error CLANG\n#endif" | $CC -E - 1>/dev/null 2>/dev/null; then
+ if ! printf "#if __clang_major__ >= 14\n#error CLANG\n#endif" | $CC -E - 1>/dev/null 2>/dev/null; then
+ COMPILING_WITH_CLANG14=1
+ fi
COMPILING_WITH_CLANG=1
else
COMPILING_WITH_CLANG=0
@@ -181,14 +184,14 @@ fi
cd ../../
CONTRIB_PREFIX=$TRIPLET
-if [ ! -z "$BUILD_UCRT" ]; then
+if [ -n "$BUILD_UCRT" ]; then
if [ ! "$COMPILING_WITH_UCRT" -gt 0 ]; then
echo "UCRT builds need a UCRT toolchain"
exit 1
fi
- if [ ! -z "$WINSTORE" ]; then
+ if [ -n "$WINSTORE" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --disable-disc --disable-srt --disable-sdl --disable-SDL_image --disable-caca"
# modplug uses GlobalAlloc/Free and lstrcpyA/wsprintfA/lstrcpynA
CONTRIBFLAGS="$CONTRIBFLAGS --disable-modplug"
@@ -229,13 +232,23 @@ else
fi
fi
-if [ ! -z "$BUILD_UCRT" ]; then
+VLC_CFLAGS="$CFLAGS"
+unset CFLAGS
+VLC_CXXFLAGS="$CXXFLAGS"
+unset CXXFLAGS
+VLC_CPPFLAGS="$CPPFLAGS"
+unset CPPFLAGS
+VLC_LDFLAGS="$LDFLAGS"
+unset LDFLAGS
+
+if [ -n "$BUILD_UCRT" ]; then
WIDL=${TRIPLET}-widl
- CPPFLAGS="$CPPFLAGS -D__MSVCRT_VERSION__=0xE00 -D_UCRT"
+ VLC_CPPFLAGS="$VLC_CPPFLAGS -D__MSVCRT_VERSION__=0xE00 -D_UCRT"
- if [ ! -z "$WINSTORE" ]; then
+ if [ -n "$WINSTORE" ]; then
SHORTARCH="$SHORTARCH-uwp"
- CPPFLAGS="$CPPFLAGS -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_UNICODE -DUNICODE"
+ TRIPLET=${TRIPLET}uwp
+ VLC_CPPFLAGS="$VLC_CPPFLAGS -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_UNICODE -DUNICODE"
if [ -z "$NTDDI" ]; then
WINVER=0x0A00
@@ -246,28 +259,36 @@ if [ ! -z "$BUILD_UCRT" ]; then
fi
fi
- LDFLAGS="$LDFLAGS -lwindowsapp"
- CFLAGS="$CFLAGS -Wl,-lwindowsapp"
- CXXFLAGS="$CXXFLAGS -Wl,-lwindowsapp"
- if [ "$COMPILING_WITH_CLANG" -gt 0 ]; then
- CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
- CXXFLAGS="$CXXFLAGS -Wno-unused-command-line-argument"
+ if [ "${COMPILING_WITH_CLANG14}" = "1" ]; then
+ VLC_LDFLAGS="$VLC_LDFLAGS --start-no-unused-arguments"
+ VLC_CFLAGS="$VLC_CFLAGS --start-no-unused-arguments"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS --start-no-unused-arguments"
+ fi
+ # WinstoreCompat: hopefully can go away someday
+ VLC_LDFLAGS="$VLC_LDFLAGS -Wl,-lwindowsapp -Wl,-lwindowsappcompat"
+ VLC_CFLAGS="$VLC_CFLAGS -Wl,-lwindowsapp,-lwindowsappcompat"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS -Wl,-lwindowsapp,-lwindowsappcompat"
+ VLC_CPPFLAGS="$VLC_CPPFLAGS -DWINSTORECOMPAT"
+ if [ "${COMPILING_WITH_CLANG14}" = "1" ]; then
+ VLC_LDFLAGS="$VLC_LDFLAGS --end-no-unused-arguments"
+ VLC_CFLAGS="$VLC_CFLAGS --end-no-unused-arguments"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS --end-no-unused-arguments"
fi
else
SHORTARCH="$SHORTARCH-ucrt"
WINVER=0x0601
fi
- LDFLAGS="$LDFLAGS -lucrt"
+ VLC_LDFLAGS="$VLC_LDFLAGS -lucrt"
if [ ! "$COMPILING_WITH_CLANG" -gt 0 ]; then
# assume gcc
NEWSPECFILE="$(pwd)/specfile-$SHORTARCH"
# tell gcc to replace msvcrt with ucrtbase+ucrt
$CC -dumpspecs | sed -e "s/-lmsvcrt/-lucrt/" > $NEWSPECFILE
- CFLAGS="$CFLAGS -specs=$NEWSPECFILE"
- CXXFLAGS="$CXXFLAGS -specs=$NEWSPECFILE"
+ VLC_CFLAGS="$VLC_CFLAGS -specs=$NEWSPECFILE"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS -specs=$NEWSPECFILE"
- if [ ! -z "$WINSTORE" ]; then
+ if [ -n "$WINSTORE" ]; then
# trick to provide these libraries instead of -ladvapi32 -lshell32 -luser32 -lkernel32
sed -i -e "s/-ladvapi32/-lwindowsapp -lwindowsappcompat/" $NEWSPECFILE
sed -i -e "s/-lshell32//" $NEWSPECFILE
@@ -275,83 +296,146 @@ if [ ! -z "$BUILD_UCRT" ]; then
sed -i -e "s/-lkernel32//" $NEWSPECFILE
fi
fi
-
- # the values are not passed to the makefiles/configures
- export LDFLAGS
else
# use the regular msvcrt
- CPPFLAGS="$CPPFLAGS -D__MSVCRT_VERSION__=0x700"
+ VLC_CPPFLAGS="$VLC_CPPFLAGS -D__MSVCRT_VERSION__=0x700"
fi
if [ -n "$NTDDI" ]; then
WINVER=$(echo ${NTDDI} |cut -c 1-6)
- CPPFLAGS="$CPPFLAGS -DNTDDI_VERSION=$NTDDI"
+ VLC_CPPFLAGS="$VLC_CPPFLAGS -DNTDDI_VERSION=$NTDDI"
fi
if [ -z "$WINVER" ]; then
# The current minimum for VLC 3.0 is Windows XP SP1
WINVER=0x0502
fi
-CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=${WINVER} -DWINVER=${WINVER}"
+VLC_CPPFLAGS="$VLC_CPPFLAGS -D_WIN32_WINNT=${WINVER} -DWINVER=${WINVER}"
-# the values are not passed to the makefiles/configures
-export CPPFLAGS
-
-CFLAGS="$CPPFLAGS $CFLAGS"
-CXXFLAGS="$CPPFLAGS $CXXFLAGS"
+VLC_CFLAGS="$VLC_CPPFLAGS $VLC_CFLAGS"
+VLC_CXXFLAGS="$VLC_CPPFLAGS $VLC_CXXFLAGS"
info "Building contribs"
echo $PATH
mkdir -p contrib/contrib-$SHORTARCH && cd contrib/contrib-$SHORTARCH
-if [ ! -z "$WITH_PDB" ]; then
+if [ -n "$WITH_PDB" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --enable-pdb"
- if [ ! -z "$PDB_MAP" ]; then
- CFLAGS="$CFLAGS -fdebug-prefix-map='$VLC_ROOT_PATH'='$PDB_MAP'"
- CXXFLAGS="$CXXFLAGS -fdebug-prefix-map='$VLC_ROOT_PATH'='$PDB_MAP'"
+ if [ "${COMPILING_WITH_CLANG14}" = "1" ]; then
+ VLC_CFLAGS="$VLC_CFLAGS --start-no-unused-arguments"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS --start-no-unused-arguments"
+ VLC_LDFLAGS="$VLC_LDFLAGS --start-no-unused-arguments"
+ fi
+ VLC_CFLAGS="$VLC_CFLAGS -g -gcodeview"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS -g -gcodeview"
+ VLC_LDFLAGS="$VLC_LDFLAGS -Wl,-pdb="
+ if [ -n "$PDB_MAP" ]; then
+ VLC_CFLAGS="$VLC_CFLAGS -fdebug-prefix-map='$VLC_ROOT_PATH'='$PDB_MAP'"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS -fdebug-prefix-map='$VLC_ROOT_PATH'='$PDB_MAP'"
+ fi
+ if [ "${COMPILING_WITH_CLANG14}" = "1" ]; then
+ VLC_CFLAGS="$VLC_CFLAGS --end-no-unused-arguments"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS --end-no-unused-arguments"
+ VLC_LDFLAGS="$VLC_LDFLAGS --end-no-unused-arguments"
fi
fi
-if [ ! -z "$BREAKPAD" ]; then
+if [ -n "$BREAKPAD" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --enable-breakpad"
fi
if [ "$RELEASE" != "yes" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --disable-optim"
fi
-if [ ! -z "$DISABLEGUI" ]; then
+if [ -n "$DISABLEGUI" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --disable-qt --disable-qtsvg --disable-qtdeclarative --disable-qtgraphicaleffects --disable-qtquickcontrols2"
fi
-if [ ! -z "$WINSTORE" ]; then
- # we don't use a special toolchain to trigger the detection in contribs so force it manually
- export HAVE_WINSTORE=1
-fi
if [ "$COMPILING_WITH_CLANG" -gt 0 ]; then
# avoid using gcc-ar with the clang toolchain, if both are installed
- AR="$TRIPLET-ar"
- export AR
+ VLC_AR="$TRIPLET-ar"
# avoid using gcc-ranlib with the clang toolchain, if both are installed
- RANLIB="$TRIPLET-ranlib"
- export RANLIB
+ VLC_RANLIB="$TRIPLET-ranlib"
+ # force linking with the static C++ runtime of LLVM
+ if [ "${COMPILING_WITH_CLANG14}" = "1" ]; then
+ VLC_CXXFLAGS="$VLC_CXXFLAGS --start-no-unused-arguments"
+ VLC_LDFLAGS="$VLC_LDFLAGS --start-no-unused-arguments"
+ fi
+ VLC_LDFLAGS="$VLC_LDFLAGS -Wl,-l:libunwind.a -Wl,-l:libpthread.a -static-libstdc++"
+ VLC_CXXFLAGS="$VLC_CXXFLAGS -Wl,-l:libunwind.a"
+ if [ "${COMPILING_WITH_CLANG14}" = "1" ]; then
+ VLC_CXXFLAGS="$VLC_CXXFLAGS --end-no-unused-arguments"
+ VLC_LDFLAGS="$VLC_LDFLAGS --end-no-unused-arguments"
+ fi
+fi
+
+if [ -z "$PKG_CONFIG" ]; then
+ if [ "$(unset PKG_CONFIG_LIBDIR; $TRIPLET-pkg-config --version 1>/dev/null 2>/dev/null || echo FAIL)" = "FAIL" ]; then
+ # $TRIPLET-pkg-config DOESNT WORK
+ # on Debian it pretends it works to autoconf
+ VLC_PKG_CONFIG="pkg-config"
+ if [ -z "$PKG_CONFIG_LIBDIR" ]; then
+ VLC_PKG_CONFIG_LIBDIR="/usr/$TRIPLET/lib/pkgconfig:/usr/lib/$TRIPLET/pkgconfig"
+ else
+ VLC_PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/$TRIPLET/lib/pkgconfig:/usr/lib/$TRIPLET/pkgconfig"
+ fi
+ else
+ VLC_PKG_CONFIG="$TRIPLET-pkg-config"
+ fi
+else
+ VLC_PKG_CONFIG="$PKG_CONFIG"
+fi
+
+# generate the config.mak for contribs
+test -e config.mak && unlink config.mak
+exec 3>config.mak || return $?
+
+printf '# This file was automatically generated!\n\n' >&3
+if [ -n "$VLC_CPPFLAGS" ]; then
+ printf '%s := %s\n' "CPPFLAGS" "${VLC_CPPFLAGS}" >&3
+fi
+if [ -n "$VLC_CFLAGS" ]; then
+ printf '%s := %s\n' "CFLAGS" "${VLC_CFLAGS}" >&3
+fi
+if [ -n "$VLC_CXXFLAGS" ]; then
+ printf '%s := %s\n' "CXXFLAGS" "${VLC_CXXFLAGS}" >&3
+fi
+if [ -n "$VLC_LDFLAGS" ]; then
+ printf '%s := %s\n' "LDFLAGS" "${VLC_LDFLAGS}" >&3
+fi
+if [ -n "$VLC_AR" ]; then
+ printf '%s := %s\n' "AR" "${VLC_AR}" >&3
+fi
+if [ -n "$VLC_RANLIB" ]; then
+ printf '%s := %s\n' "RANLIB" "${VLC_RANLIB}" >&3
+fi
+if [ -n "$VLC_PKG_CONFIG" ]; then
+ printf '%s := %s\n' "PKG_CONFIG" "${VLC_PKG_CONFIG}" >&3
+fi
+if [ -n "$VLC_PKG_CONFIG_LIBDIR" ]; then
+ printf '%s := %s\n' "PKG_CONFIG_LIBDIR" "${VLC_PKG_CONFIG_LIBDIR}" >&3
fi
-export CFLAGS
-export CXXFLAGS
${VLC_ROOT_PATH}/contrib/bootstrap --host=$TRIPLET --prefix=../$CONTRIB_PREFIX $CONTRIBFLAGS
# Rebuild the contribs or use the prebuilt ones
-if [ "$PREBUILT" != "yes" ]; then
+if [ "$PREBUILT" = "yes" ]; then
+ if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
+ make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL" || PREBUILT_FAILED=yes
+ else
+ make prebuilt || PREBUILT_FAILED=yes
+ fi
+ make .luac
+else
+ PREBUILT_FAILED=yes
+fi
make list
-make -j$JOBS fetch
-make -j$JOBS -k || make -j1
-if [ "$PACKAGE" = "yes" ]; then
-make package
-fi
-elif [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
-make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
-make .luac
+if [ -n "$PREBUILT_FAILED" ]; then
+ make -j$JOBS fetch
+ make -j$JOBS -k || make -j1
+ if [ "$PACKAGE" = "yes" ]; then
+ make package
+ fi
else
-make prebuilt
-make .luac
+ make .luac
fi
cd ../..
@@ -359,22 +443,33 @@ info "Bootstrapping"
${VLC_ROOT_PATH}/bootstrap
-info "Configuring VLC"
-if [ -z "$PKG_CONFIG" ]; then
- if [ `unset PKG_CONFIG_LIBDIR; $TRIPLET-pkg-config --version 1>/dev/null 2>/dev/null || echo FAIL` = "FAIL" ]; then
- # $TRIPLET-pkg-config DOESNT WORK
- # on Debian it pretends it works to autoconf
- export PKG_CONFIG="pkg-config"
- if [ -z "$PKG_CONFIG_LIBDIR" ]; then
- export PKG_CONFIG_LIBDIR="/usr/$TRIPLET/lib/pkgconfig:/usr/lib/$TRIPLET/pkgconfig"
- else
- export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/$TRIPLET/lib/pkgconfig:/usr/lib/$TRIPLET/pkgconfig"
- fi
- else
- # $TRIPLET-pkg-config WORKs
- export PKG_CONFIG="$TRIPLET-pkg-config"
- fi
+# set environment that will be kept in config.status
+if [ -n "$VLC_CPPFLAGS" ]; then
+ export CPPFLAGS="$VLC_CPPFLAGS"
+fi
+if [ -n "$VLC_CFLAGS" ]; then
+ export CFLAGS="$VLC_CFLAGS"
+fi
+if [ -n "$VLC_CXXFLAGS" ]; then
+ export CXXFLAGS="$VLC_CXXFLAGS"
+fi
+if [ -n "$VLC_LDFLAGS" ]; then
+ export LDFLAGS="$VLC_LDFLAGS"
fi
+if [ -n "$VLC_AR" ]; then
+ export AR="$VLC_AR"
+fi
+if [ -n "$VLC_RANLIB" ]; then
+ export RANLIB="$VLC_RANLIB"
+fi
+if [ -n "$VLC_PKG_CONFIG" ]; then
+ export PKG_CONFIG="$VLC_PKG_CONFIG"
+fi
+if [ -n "$VLC_PKG_CONFIG_LIBDIR" ]; then
+ export PKG_CONFIG_LIBDIR="$VLC_PKG_CONFIG_LIBDIR"
+fi
+
+info "Configuring VLC"
mkdir -p $SHORTARCH
cd $SHORTARCH
@@ -385,22 +480,22 @@ fi
if [ "$I18N" != "yes" ]; then
CONFIGFLAGS="$CONFIGFLAGS --disable-nls"
fi
-if [ ! -z "$BREAKPAD" ]; then
+if [ -n "$BREAKPAD" ]; then
CONFIGFLAGS="$CONFIGFLAGS --with-breakpad=$BREAKPAD"
fi
-if [ ! -z "$WITH_PDB" ]; then
+if [ -n "$WITH_PDB" ]; then
CONFIGFLAGS="$CONFIGFLAGS --enable-pdb"
fi
-if [ ! -z "$EXTRA_CHECKS" ]; then
+if [ -n "$EXTRA_CHECKS" ]; then
CFLAGS="$CFLAGS -Werror=incompatible-pointer-types -Werror=missing-field-initializers"
CXXFLAGS="$CXXFLAGS -Werror=missing-field-initializers"
fi
-if [ ! -z "$DISABLEGUI" ]; then
+if [ -n "$DISABLEGUI" ]; then
CONFIGFLAGS="$CONFIGFLAGS --disable-vlc --disable-qt --disable-skins2"
else
CONFIGFLAGS="$CONFIGFLAGS --enable-qt --enable-skins2"
fi
-if [ ! -z "$WINSTORE" ]; then
+if [ -n "$WINSTORE" ]; then
CONFIGFLAGS="$CONFIGFLAGS --enable-winstore-app"
# uses CreateFile to access files/drives outside of the app
CONFIGFLAGS="$CONFIGFLAGS --disable-vcd"
@@ -412,7 +507,7 @@ if [ ! -z "$WINSTORE" ]; then
else
CONFIGFLAGS="$CONFIGFLAGS --enable-dvdread --enable-caca"
fi
-if [ ! -z "$INSTALL_PATH" ]; then
+if [ -n "$INSTALL_PATH" ]; then
CONFIGFLAGS="$CONFIGFLAGS --prefix=$INSTALL_PATH"
fi
@@ -429,6 +524,6 @@ make package-win32
elif [ "$INSTALLER" = "u" ]; then
make package-win32-release
sha512sum vlc-*-release.7z
-elif [ ! -z "$INSTALL_PATH" ]; then
+elif [ -n "$INSTALL_PATH" ]; then
make package-win-install
fi
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7e988ea031c6f386cd733fa3117b1cf6d8c33ba2...33fb3b37d066d28db592ed683d6240346e4bae2e
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7e988ea031c6f386cd733fa3117b1cf6d8c33ba2...33fb3b37d066d28db592ed683d6240346e4bae2e
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list