Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (29)
......@@ -261,6 +261,21 @@ case "${host_os}" in
AC_DEFINE([_BSD_SOURCE], [1], [ISO C, POSIX, and 4.3BSD things.])
AC_DEFINE([_SVID_SOURCE], [1], [ISO C, POSIX, and SVID things.])
AC_ARG_WITH(packagedir,
AS_HELP_STRING([--with-packagedir=DIR],
[output the packaged VLC files in DIR (default vlc-$PACKAGE_VERSION)]))
AS_IF([test "${with_packagedir}" != ""], [
AS_IF([test -d "${with_packagedir}"], [
PACKAGE_DIR=`cd "${with_packagedir}" && pwd -P`
],[
dnl this should be an absolute path
PACKAGE_DIR="${with_packagedir}"
])
], [
PACKAGE_DIR=`pwd -P`"/vlc-${PACKAGE_VERSION}"
])
AC_SUBST([PACKAGE_DIR])
case "${host_os}" in
*mingw32*)
SYS=mingw32
......@@ -1248,6 +1263,43 @@ if test "${ac_cv_c_attribute_packed}" != "no"; then
AC_DEFINE(HAVE_ATTRIBUTE_PACKED, 1, Support for __attribute__((packed)) for structs)
fi
WIN32_PATH_CMD=
AS_IF([test "${SYS}" = "mingw32"], [
AC_MSG_CHECKING([how to transform windows pathes])
win32_path_cmd=no
for win_path in "cygpath" "wslpath" "wine winepath"
do
ac_try="$win_path -u c: >/dev/null"
(eval "$ac_try") 2>&5
ac_status=$?
if test $ac_status = 0; then
win32_path_cmd=$win_path
break
fi
done
AS_IF([test "${win32_path_cmd}" != "no"],[
WIN32_PATH_CMD=${win32_path_cmd}
AC_MSG_RESULT([using '${win32_path_cmd}'])
],[
AC_MSG_RESULT([not possible])
])
])
AC_SUBST([WIN32_PATH_CMD])
AC_ARG_WITH([wix],
AS_HELP_STRING([--with-wix=DIR], [location of WIX binary (default: contribs)])
)
AS_IF([test -z "${with_wix}"], [
AS_IF([test -n "${CONTRIB_DIR}"], [
with_wix="${CONTRIB_DIR}/bin"
])
])
AS_IF([test "${with_wix}" != "no"], [
WIXPATH="${with_wix}"
])
AC_SUBST([WIXPATH])
dnl
dnl Check the CPU
dnl
......
......@@ -368,7 +368,7 @@ UNPACK = $(RM) -R $@ \
$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar $(TAR_VERBOSE)xzfo $(f)) \
$(foreach f,$(filter %.tar.bz2,$^), && tar $(TAR_VERBOSE)xjfo $(f)) \
$(foreach f,$(filter %.tar.xz,$^), && tar $(TAR_VERBOSE)xJfo $(f)) \
$(foreach f,$(filter %.zip,$^), && unzip $(f))
$(foreach f,$(filter %.zip,$^), && unzip $(f) $(UNZIP_PARAMS))
UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
pkg_static = (cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-static.sh $(1))
......
ff58d224e545722eb794d413c541ad483ab834f9ce92e2528fe8aeb645717ab077db833ae783e1a31ad9e50803eb80fdc9efcda72535493a3f0faea4aa3ba36d wix3.14.1.8722.zip
WIX_VERSION=314
WIX_SUB_VERSION=1
WIX_FULL_VERSION=3.14.1.8722
WIX_URL := $(GITHUB)/wixtoolset/wix3/releases/download/wix$(WIX_VERSION)$(WIX_SUB_VERSION)rtm/wix$(WIX_VERSION)-binaries.zip
ifdef HAVE_WIN32
# this requires dotnet 4.0 to be installed when running wix
PKGS += wix
endif
.sum-wix: wix$(WIX_FULL_VERSION).zip
$(TARBALLS)/wix$(WIX_FULL_VERSION).zip:
$(call download_pkg,$(WIX_URL),wix)
wix: UNZIP_PARAMS=-d wix$(WIX_FULL_VERSION)
wix: wix$(WIX_FULL_VERSION).zip .sum-wix
$(UNPACK)
$(MOVE)
.wix: wix
install -d "$(PREFIX)/bin"
for f in $</*.exe $</*.dll ; do \
install $$f "$(PREFIX)/bin" ; \
done
touch $@
26b1d2a5b582fcaa31ffaaf289711854897f91e8e5002bd8ddee2e69c95a60f53c6e3375d38fba4519ddd4a68bcf402c36eaef5a8faa6f3a4b8b2bc011e8f05a wix3.5.2519.0.zip
WIX_LZX_VERSION=35
WIX_LZX_FULL_VERSION=3.5.2519.0
# 26b1d2a5b582fcaa31ffaaf289711854897f91e8e5002bd8ddee2e69c95a60f53c6e3375d38fba4519ddd4a68bcf402c36eaef5a8faa6f3a4b8b2bc011e8f05a wix3.5.2519.0.zip
# WIX_LZX_VERSION=36
# WIX_LZX_FULL_VERSION=3.6.3303.1
# WIX_LZX_FULL_VERSION=3.6.2221.0
# 0d5e44061d7d8f92dabf806893736f2c9a68db13e5b6540914f0f0a5299ae5a85abbd721d808c04052e27e82a126773b5bfcb6b929183180968a84985516ff98 wix3.6.3303.1.zip
# WIX_LZX_VERSION=37
# WIX_LZX_FULL_VERSION=3.7.1224.0
# d93a01321e04e923994c57576bfb8d7fb65e3024c03a2b1062a4a03fda7a4ce9ec7baab95f802a49e934672726f6b836f6cf8ea31077178319f5e147bbd59db1 wix3.7.1224.0.zip
# WIX_LZX_VERSION=38
# WIX_LZX_FULL_VERSION=3.8.1128.0
# b4170451b94fcc10486a8140d460092fddaab9b315043759b980e1ca67a84559ecb92706a552c05ee8de90711f5513926f393220a94155a70221547d72d9b72a wix3.8.1128.0.zip
# WIX_LZX_VERSION=39
# WIX_LZX_FULL_VERSION=3.9.1208.0
# 057ebcf2d9310584b075951f224ca55aae9e83714f59f1aeb9abb78ac5c5db8e230d0d57e9c7170e942e3317c0bfdf5a57b0fc3d0cdde3a85fab3648f4a688d3 wix3.9.1208.0.zip
# WIX_LZX_VERSION=310
# WIX_LZX_FULL_VERSION=3.10.4.4718
# fab360f98fe1a1d1a25433e90b7fa11478835ef41356647cbd6b9ef9fc1bfc3d7323b40784b9d07fa5d18566462a399753ab0939353a58fa06b6f80788413007 wix3.10.4.4718.zip
# WIX_LZX_VERSION=311
# WIX_LZX_FULL_VERSION=3.11.2.4516
# 6fd961c85e1e6adafb99ef50c9659e3eb83c84ecaf49f523e556788845b206e1857aba2c39409405d4cda1df9b30a552ce5aab808be5f8368a37a447d78d1a05 wix3.11.2.4516.zip
# WIX_LZX_VERSION=314
# WIX_LZX_FULL_VERSION=3.14.0.6526
# 9ff09b4e6c612ca742c763740fb89d99211bf1d0eace84e3693cb503deb6a85bd28c3754c34772a3220bb0c1e92a3013e7d99bcf106ff1b835c0fdc6aba8bbc6 wix3.14.0.6526.zip
WIX_LZX_URL := https://wixtoolset.org/downloads/v$(WIX_LZX_FULL_VERSION)/wix$(WIX_LZX_VERSION)-binaries.zip
ifdef HAVE_WIN32
# this requires dotnet 4.0 to be installed when running wix
PKGS += wixlzx
endif
DEPS_wixlzx := wix $(DEPS_wix)
.sum-wixlzx: wix$(WIX_LZX_FULL_VERSION).zip
$(TARBALLS)/wix$(WIX_LZX_FULL_VERSION).zip:
$(call download_pkg,$(WIX_LZX_URL),wixlzx)
wixlzx: UNZIP_PARAMS=-d wix$(WIX_LZX_FULL_VERSION)
wixlzx: wix$(WIX_LZX_FULL_VERSION).zip .sum-wixlzx
$(UNPACK)
$(MOVE)
.wixlzx: wixlzx
install -d "$(PREFIX)/bin"
# Overwrite newer DLLs with the ones that supports LZX compression in Wine
install $</winterop.dll "$(PREFIX)/bin"
touch $@
......@@ -30,9 +30,9 @@ npapi-vlc/configure: stamp-npapi
$(SHELL) ./autogen.sh
touch $@
if ENABLE_PDB
ENABLE_PDB_OPTION = --enable-pdb
endif
# if ENABLE_PDB
# ENABLE_PDB_OPTION = --enable-pdb
# endif
npapi-vlc/Makefile: npapi-vlc/configure
cd npapi-vlc && \
......
......@@ -43,10 +43,6 @@ ARCH="x86_64"
while getopts "hra:pcli:sb:dD:xS:uwzo:" OPTION
do
case $OPTION in
h)
usage
exit 1
;;
r)
RELEASE="yes"
INSTALLER="r"
......@@ -97,6 +93,10 @@ do
o)
INSTALL_PATH=$OPTARG
;;
h|*)
usage
exit 1
;;
esac
done
shift $(($OPTIND - 1))
......@@ -164,6 +164,20 @@ if [ "$INTERACTIVE" != "yes" ] || [ ! -f ./Makefile ]; then
NEEDED="$FORCED_TOOLS" ${VLC_ROOT_PATH}/extras/tools/bootstrap
fi
make -j$JOBS
# avoid installing wine on WSL
# wine is needed to build Qt with shaders
if test -z "$(command -v wine)"
then
if test -n "$(command -v wsl.exe)"
then
echo "Using wsl.exe to replace wine"
echo "#!/bin/sh" > build/bin/wine
echo "\"\$@\"" >> build/bin/wine
chmod +x build/bin/wine
fi
fi
cd ../../
CONTRIB_PREFIX=$TRIPLET
......@@ -226,7 +240,7 @@ if [ ! -z "$BUILD_UCRT" ]; then
if [ -z "$NTDDI" ]; then
WINVER=0x0A00
else
WINVER=`echo ${NTDDI} |cut -c 1-6`
WINVER=$(echo ${NTDDI} |cut -c 1-6)
if [ "$WINVER" != "0x0A00" ]; then
echo "Unsupported SDK/NTDDI version ${NTDDI} for Winstore"
fi
......@@ -247,7 +261,7 @@ if [ ! -z "$BUILD_UCRT" ]; then
LDFLAGS="$LDFLAGS -lucrt"
if [ ! "$COMPILING_WITH_CLANG" -gt 0 ]; then
# assume gcc
NEWSPECFILE="`pwd`/specfile-$SHORTARCH"
NEWSPECFILE="$(pwd)/specfile-$SHORTARCH"
# tell gcc to replace msvcrt with ucrtbase+ucrt
$CC -dumpspecs | sed -e "s/-lmsvcrt/-lucrt/" > $NEWSPECFILE
CFLAGS="$CFLAGS -specs=$NEWSPECFILE"
......@@ -270,7 +284,7 @@ else
fi
if [ -n "$NTDDI" ]; then
WINVER=`echo ${NTDDI} |cut -c 1-6`
WINVER=$(echo ${NTDDI} |cut -c 1-6)
CPPFLAGS="$CPPFLAGS -DNTDDI_VERSION=$NTDDI"
fi
if [ -z "$WINVER" ]; then
......@@ -408,7 +422,8 @@ info "Compiling"
make -j$JOBS
if [ "$INSTALLER" = "n" ]; then
make package-win32-debug package-win32 package-msi
make package-win32-debug-7zip
make -j$JOBS package-win32 package-msi
elif [ "$INSTALLER" = "r" ]; then
make package-win32
elif [ "$INSTALLER" = "u" ]; then
......
......@@ -3,38 +3,38 @@ BUILT_SOURCES_distclean += \
extras/package/win32/msi/config.wxi
endif
WIXPATH=`wine winepath -u 'C:\\Program Files (x86)\\Windows Installer XML v3.5\\bin'`
HEAT=wine "$(WIXPATH)/heat.exe"
CANDLE=wine "$(WIXPATH)/candle.exe"
LIGHT=wine "$(WIXPATH)/light.exe"
VLCDIR=`wine winepath -s \`wine winepath -w '$(abs_top_builddir)/vlc-$(VERSION)'\``
HEAT=$(MSIDIR)/msi-heat.py
CANDLE=wine "@WIXPATH@/candle.exe"
LIGHT=wine "@WIXPATH@/light.exe"
VLCDIR=@PACKAGE_DIR@
MSIDIR=$(abs_srcdir)/extras/package/win32/msi
W_MSIDIR=`wine winepath -w '$(MSIDIR)'`
W_MSIDIR=`$(WIN32_PATH_CMD) -w '$(MSIDIR)'`
MSIBUILDDIR=$(abs_top_builddir)/extras/package/win32/msi
W_MSIBUILDDIR=`wine winepath -w '$(MSIBUILDDIR)'`
W_MSIBUILDDIR=`$(WIN32_PATH_CMD) -w '$(MSIBUILDDIR)'`
if HAVE_WIN64
MSIOUTFILE=vlc-$(VERSION)-win64.msi
else
MSIOUTFILE=vlc-$(VERSION)-win32.msi
endif
WINE_C=`wine winepath c:`
heat: package-win-strip
$(HEAT) dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs
$(HEAT) dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Locale.fragment.wxs
$(HEAT) dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Lua.fragment.wxs
$(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Skins.fragment.wxs
$(HEAT) --dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Plugins.fragment.wxs
$(HEAT) --dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Locale.fragment.wxs
if BUILD_LUA
$(HEAT) --dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Lua.fragment.wxs
endif
if BUILD_SKINS
$(HEAT) --dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(MSIBUILDDIR)/Skins.fragment.wxs
endif
candle: heat
$(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)\\product.wxs $(W_MSIDIR)\\axvlc.wxs $(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs
$(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)/product.wxs $(W_MSIDIR)/axvlc.wxs $(W_MSIDIR)/extensions.wxs $(W_MSIBUILDDIR)/*.fragment.wxs
light: candle
test ! -d "$(WINE_C)/v" -o ! -f "$(WINE_C)/v"
ln -Tsf "$(abs_top_builddir)/vlc-$(VERSION)" "$(WINE_C)"/v
$(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b $(W_MSIDIR) -b C:/v/plugins -b C:/v/locale -b C:/v/lua -b C:/v/skins $(W_MSIBUILDDIR)\\product.wixobj $(W_MSIBUILDDIR)\\axvlc.wixobj $(W_MSIBUILDDIR)\\extensions.wixobj $(W_MSIBUILDDIR)\\*.fragment.wixobj -o $(MSIOUTFILE)
chmod 644 $(MSIOUTFILE)
$(MSIOUTFILE): candle
$(AM_V_GEN)cd vlc-@VERSION@ && $(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b $(W_MSIDIR) $(W_MSIBUILDDIR)/product.wixobj $(W_MSIBUILDDIR)/axvlc.wixobj $(W_MSIBUILDDIR)/extensions.wixobj $(W_MSIBUILDDIR)/*.fragment.wixobj -o ../$@
chmod 644 $@
package-msi: light
package-msi: $(MSIOUTFILE)
cleanmsi:
-rm -f $(MSIBUILDDIR)/*.wixobj
......@@ -44,4 +44,4 @@ cleanmsi:
distcleanmsi: cleanmsi
-rm -f $(MSIOUTFILE)
.PHONY: heat candle light cleanmsi distcleanmsi package-msi
.PHONY: heat candle cleanmsi distcleanmsi package-msi
......@@ -14,10 +14,7 @@
<?define Version = "$(var.VerMajor).$(var.VerMinor).$(var.VerPatch)" ?>
<?define VersionLong = "$(var.Version).$(var.VerExtra)" ?>
<?define SourceDir = "vlc-@VERSION@" ?>
<!--<?define PluginsPath = "$(var.BinPath)\plugins" ?>
<?define LocalePath = "$(var.BinPath)\locale" ?>
<?define SdkPath = "$(var.BinPath)\sdk" ?>-->
<?define SourceDir = "." ?>
<?define Platform= "@WINDOWS_ARCH@" ?>
......
#!/usr/bin/env python3
# Copyright © 2022 VideoLabs, VLC authors and VideoLAN
#
# Authors: Steve Lhomme <robux4@videolabs.io>
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
import argparse
import os
import pathlib
import hashlib
# Argument parsing
parser = argparse.ArgumentParser(description="Generate WIX compatible wxs listing")
parser.add_argument('-d', "--dir", type=pathlib.Path, help='directory with files to list')
parser.add_argument('-out', type=argparse.FileType('w', encoding='UTF-8'), help="output file")
parser.add_argument('-dr', "--directory-reference", help='directory reference')
parser.add_argument('-cg', "--component-group", help='component group')
args, remaining = parser.parse_known_args()
# print(args.out)
# print(args.dir)
def generate_id(prefix='', file=''):
joined = prefix + file
hash_object = hashlib.sha1(joined.encode('ascii'))
pbHash = hash_object.hexdigest()
return prefix + pbHash.upper()
args.out.write('<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n')
args.out.write('<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r\n')
args.out.write(' <Fragment>\r\n')
args.out.write(' <DirectoryRef Id="{}">\r\n'.format(args.directory_reference))
# args.out.write(' <Directory Id="{}" Name="{}">\r\n'.format(generate_id('dir', args.dir.name), args.dir.name))
fileIdList =[]
def outputDir(top, parent: str, dir: str):
cwd = top.joinpath(parent).joinpath(dir)
dirName = os.path.join(parent, dir)
if dir=='':
dir = top.name
dirId = generate_id('dir', os.path.join(top.name, dir))
else:
dirId = generate_id('dir', os.path.join(parent, dir))
args.out.write(' <Directory Id="{}" Name="{}">\r\n'.format(dirId, dir))
if cwd.is_dir():
# first list files
for file in cwd.iterdir():
if not file.is_dir():
# args.out.write(' file <{}>\r\n'.format(file))
if not file.name.endswith('.pdb'):
outname = os.path.join(top.name, str(file.relative_to(top)))
fileId = generate_id('cmp', outname)
args.out.write(' <Component Id="{}" Guid="*">\r\n'.format(fileId))
fileIdList.append(fileId)
args.out.write(' <File Id="{}" Name="{}" KeyPath="yes" Source="{}"/>\r\n'.format(generate_id('fil', outname), file.name, outname))
args.out.write(' </Component>\r\n')
# then sub directories
for file in cwd.iterdir():
if file.is_dir():
# args.out.write(' dir <{}>\r\n'.format(file))
outputDir(top, dirName, file.name)
args.out.write(' </Directory>\r\n')
print(args.dir.parent)
print(args.dir.name)
outputDir(args.dir, '', '')
# args.out.write(' </Directory>\r\n')
args.out.write(' </DirectoryRef>\r\n')
args.out.write(' </Fragment>\r\n')
args.out.write(' <Fragment>\r\n')
args.out.write(' <ComponentGroup Id="{}">\r\n'.format(args.component_group))
for name in fileIdList:
args.out.write(' <ComponentRef Id="{}"/>\r\n'.format(name))
args.out.write(' </ComponentGroup>\r\n')
args.out.write(' </Fragment>\r\n')
args.out.write('</Wix>\r\n')
......@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-->
<?include $(sys.CURRENTDIR)\config.wxi?>
<?include $(sys.CURRENTDIR)/config.wxi?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product
......
......@@ -3,7 +3,7 @@ BUILT_SOURCES_distclean += \
extras/package/win32/NSIS/vlc.win32.nsi extras/package/win32/NSIS/spad.nsi
endif
win32_destdir=$(top_builddir)/vlc-$(VERSION)
win32_destdir=@PACKAGE_DIR@
win32_debugdir=$(abs_top_builddir)/symbols-$(VERSION)
win32_xpi_destdir=$(abs_top_builddir)/vlc-plugin-$(VERSION)
......