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 (3)
......@@ -77,12 +77,12 @@ class QmlModuleChecker:
return ret
def getInstallInfo(self, qtpaths, qtconf):
qtpaths_cmd = [ qtpaths, "--query", "--query-format", "json" ]
def getInstallInfo(self, qmake, qtconf):
qmake_cmd = [ qmake, "-query" ]
if qtconf:
qtpaths_cmd += [ "--qtconf", qtconf ]
qmake_cmd += [ "-qtconf", qtconf ]
ret = subprocess.run(
qtpaths_cmd,
qmake_cmd,
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
encoding="utf8"
)
......@@ -91,22 +91,26 @@ class QmlModuleChecker:
print(ret.stderr.strip())
return False
# Qt 6.6 outputs invalid json, try to fix it
qpaths_json = str(ret.stdout)
if ',\n}' in qpaths_json:
qpaths_json = qpaths_json.replace(',\n}', '\n}')
elif ',\r\n}' in qpaths_json:
qpaths_json = qpaths_json.replace(',\r\n}', '\r\n}')
qtjson = json.loads(qpaths_json)
binpath = qtjson["QT_HOST_BINS"]
libexec = qtjson["QT_HOST_LIBEXECS"]
self.qmlpath = qtjson["QT_INSTALL_QML"]
qmlversion = qtjson["QT_VERSION"]
if qmlversion:
qtmajor = qmlversion.split(".")[0]
else:
qtmajor = ""
binpath_host = None
libexec_host = None
binpath_install = None
libexec_install = None
qtmajor = ""
for l in ret.stdout.splitlines():
l.strip()
if l.startswith("QT_HOST_BINS:"):
binpath_host = l.split(":", 1)[1]
elif l.startswith("QT_HOST_LIBEXECS:"):
libexec_host = l.split(":", 1)[1]
elif l.startswith("QT_INSTALL_BINS:"):
binpath_install = l.split(":", 1)[1]
elif l.startswith("QT_INSTALL_LIBEXECS:"):
libexec_install = l.split(":", 1)[1]
elif l.startswith("QT_INSTALL_QML:"):
self.qmlpath = l.split(":", 1)[1]
elif l.startswith("QT_VERSION:"):
qmlversion = l.split(":", 1)[1]
qtmajor = qmlversion.split(".")[0]
if qtmajor == "6":
self.qt5 = False
......@@ -115,12 +119,21 @@ class QmlModuleChecker:
print("Qml path {} not found".format(self.qmlpath))
return False
self.qmlimportscanner = findProgram(binpath, "qmlimportscanner")
self.qmlimportscanner = findProgram(binpath_install, "qmlimportscanner")
if self.qmlimportscanner is not None:
return True
#Qt6 may place qmlimportscanner in libexec
self.qmlimportscanner = findProgram(libexec, "qmlimportscanner")
#Qt6 may place qmlimportscanner in libexec_host
self.qmlimportscanner = findProgram(libexec_install, "qmlimportscanner")
if self.qmlimportscanner is not None:
return True
self.qmlimportscanner = findProgram(binpath_host, "qmlimportscanner")
if self.qmlimportscanner is not None:
return True
#Qt6 may place qmlimportscanner in libexec_host
self.qmlimportscanner = findProgram(libexec_host, "qmlimportscanner")
if self.qmlimportscanner is not None:
return True
......@@ -140,12 +153,12 @@ class KeyValue(argparse.Action):
def main():
parser = argparse.ArgumentParser("check for qml runtime dependencies")
parser.add_argument(
"--qtpaths", type=str, required=True,
help="native qtpaths path")
"--qmake", type=str, required=True,
help="native qmake path")
parser.add_argument(
"--qtconf", type=str, required=False,
help="qtpaths qtconf path")
help="qmake qtconf path")
parser.add_argument(
"--modules", nargs="+", action=KeyValue, required=True,
......@@ -154,7 +167,7 @@ def main():
args = parser.parse_args()
moduleChecker = QmlModuleChecker()
if not moduleChecker.getInstallInfo(args.qtpaths, args.qtconf):
if not moduleChecker.getInstallInfo(args.qmake, args.qtconf):
exit(-1)
with NamedTemporaryFile(mode="w+", suffix=".qml") as f:
......
......@@ -3983,7 +3983,7 @@ have_qt_core_private="no"
have_fxc="no"
AS_IF([test "${enable_qt}" != "no"], [
have_qt="yes"
AC_PATH_PROGS(QTPATHS6, [qtpaths6], qtpaths6, ["$PATH:${CONTRIB_DIR}/../bin"])
AC_PATH_PROGS(QMAKE6, [qmake6], qmake6, ["$PATH:${CONTRIB_DIR}/../bin"])
AC_ARG_WITH([qtconf],
AS_HELP_STRING([--with-qtconf=PATH], [location of Qt6 qt.conf file (auto)])
......@@ -3998,14 +3998,14 @@ AS_IF([test "${enable_qt}" != "no"], [
])
])
QT_PATHS=${QTPATHS6}
QT_PATHS=${QMAKE6}
AS_IF([test -n "${with_qtconf}"], [
QT_PATHS="${QT_PATHS} --qtconf ${with_qtconf}"
QT_PATHS="${QMAKE6} -qtconf ${with_qtconf}"
])
QT_MINIMUM_VERSION=6.2
AC_MSG_CHECKING([Qt is at least ${QT_MINIMUM_VERSION}])
QT_VERSION_CORE="$(${QT_PATHS} --query QT_VERSION 2>/dev/null)"
QT_VERSION_CORE="$(${QT_PATHS} -query QT_VERSION 2>/dev/null)"
QT_MINIMUM_MAJ=$(echo ${QT_MINIMUM_VERSION} | cut -d "." -f -1)
QT_MINIMUM_MIN=$(echo ${QT_MINIMUM_VERSION} | cut -d "." -f 2-2)
QT_VERSION_MAJ=$(echo ${QT_VERSION_CORE} | cut -d "." -f -1)
......@@ -4016,11 +4016,8 @@ AS_IF([test "${enable_qt}" != "no"], [
],[
AC_MSG_RESULT([(${QT_VERSION_CORE}) yes])
QT_BIN_DIRECTORY="$(${QT_PATHS} --query QT_HOST_BINS 2>/dev/null)"
QMAKE="${QT_BIN_DIRECTORY}/qmake"
AS_IF([test -n "${with_qtconf}"],[
QMAKE="${QMAKE} -qtconf ${with_qtconf}"
])
QT_BIN_DIRECTORY="$(${QT_PATHS} -query QT_HOST_BINS 2>/dev/null)"
QMAKE="${QT_PATHS}"
AC_MSG_NOTICE([using ${QMAKE}])
AC_MSG_CHECKING([for Qt libraries])
......@@ -4070,7 +4067,7 @@ AS_IF([test "${enable_qt}" != "no"], [
])
rm -f ${ac_pwd}/modules/gui/qt/qmake-wayland
QT_LIBEXEC_DIRECTORY="$(${QT_PATHS} --query QT_HOST_LIBEXECS 2>/dev/null)"
QT_LIBEXEC_DIRECTORY="$(${QT_PATHS} -query QT_HOST_LIBEXECS 2>/dev/null)"
QT_QML_LIBEXEC_DIRECTORY=${QT_LIBEXEC_DIRECTORY}
QT_SHADERTOOLS_BIN_DIRECTORY=${QT_BIN_DIRECTORY}
......@@ -4085,9 +4082,9 @@ AS_IF([test "${enable_qt}" != "no"], [
])
AC_CHECK_PROGS(PYTHON3, [python3], [no])
AC_MSG_CHECKING([if required Qt plugins are installed with ${QTPATHS6} and conf ${with_qtconf}])
AC_MSG_CHECKING([if required Qt plugins are installed with ${QMAKE6} and conf ${with_qtconf}])
AS_IF([test "$PYTHON3" != "no" && ${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
--qtpaths "${QTPATHS6}" \
--qmake "${QMAKE6}" \
--qtconf "${with_qtconf}" \
--modules \
QtQml.Models="" \
......@@ -4109,7 +4106,7 @@ AS_IF([test "${enable_qt}" != "no"], [
ac_status=$?
AS_IF([test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-quicktest],[
AS_IF([test "$PYTHON3" != "no" && ${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
--qtpaths "${QTPATHS6}" \
--qmake "${QMAKE6}" \
--qtconf "${with_qtconf}" \
--modules QtTest="" \
>&AS_MESSAGE_FD ], [
......