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 (17)
--- a/mkspecs/features/qml_plugin.prf 2020-09-02 12:15:07.000000000 +0200
+++ b/mkspecs/features/qml_plugin.prf 2022-08-31 10:58:10.110600024 +0200
@@ -13,6 +13,10 @@
TEMPLATE = lib
CONFIG += plugin
+qmlprefixpclib_replace.match = $$dirname(_QMAKE_CONF_)
+qmlprefixpclib_replace.replace = $$[QT_INSTALL_PREFIX]
+qmlprefixpclib_replace.CONFIG = path
+QMAKE_PKGCONFIG_INSTALL_REPLACE += qmlprefixpclib_replace
if(win32|mac):!macx-xcode {
qtConfig(debug_and_release): CONFIG += debug_and_release
--- a/mkspecs/features/qt_plugin.prf 2020-09-02 12:15:07.000000000 +0200
+++ b/mkspecs/features/qt_plugin.prf 2022-08-31 10:59:48.380662936 +0200
@@ -15,6 +15,10 @@
TEMPLATE = lib
CONFIG += plugin
+pluginpclib_replace.match = $$MODULE_BASE_OUTDIR/lib
+pluginpclib_replace.replace = $$[QT_INSTALL_LIBS]
+pluginpclib_replace.CONFIG = path
+QMAKE_PKGCONFIG_INSTALL_REPLACE += pluginpclib_replace
DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
win32:CONFIG(shared, static|shared) {
......@@ -56,7 +56,12 @@ endif
endif
$(APPLY) $(SRC)/qt/qt-fix-gcc11-build.patch
$(APPLY) $(SRC)/qt/qt-add-missing-header-darwin.patch
# force path replacement in pkg-config output files
$(APPLY) $(SRC)/qt/force-pkgconfg-replace.patch
# pass all files installed through our installer
$(APPLY) $(SRC)/qt/set-mkspecs-properties.patch
# fix missing QMAKE_PKGCONFIG_VERSION in Windows targets
$(APPLY) $(SRC)/qt/set-mkspecs-version.patch
# fix detection of our harfbuzz on macosx
sed -i.orig 's#"-lharfbuzz"#{ "libs": "-framework CoreText -framework CoreGraphics -framework CoreFoundation -lharfbuzz", "condition": "config.darwin" }, "-lharfbuzz"#' "$(UNPACK_DIR)/src/gui/configure.json"
# Let us decide the WINVER/_WIN32_WINNT
......@@ -107,7 +112,8 @@ QT_CONFIG := -static -opensource -confirm-license $(QT_OPENGL) -no-pkg-config \
-no-feature-concurrent -no-feature-itemmodeltester -no-feature-printer \
-no-feature-sqlmodel -no-feature-sql -no-feature-testlib -no-feature-xml \
-no-compile-examples -nomake examples -nomake tests \
-system-freetype -system-harfbuzz -system-libjpeg -system-libpng -system-zlib
-system-freetype -system-harfbuzz -system-libjpeg -system-libpng -system-zlib \
-no-syncqt
# For now, we only build Qt in release mode. In debug mode, startup is prevented by the internal ANGLE
# throwing an assertion in debug mode, but only when built with clang. See issue 27476.
......@@ -127,12 +133,15 @@ QT_QINSTALL="$(shell cd $(SRC)/qt/; pwd -P)/install_wrapper.sh"
qmake_toolchain = echo "!host_build {" > $(1)/.qmake.cache && \
echo " QMAKE_C = $(CC)" >> $(1)/.qmake.cache && \
echo " QMAKE_CXX = $(CXX)" >> $(1)/.qmake.cache && \
echo " QMAKE_STRIP = $(STRIP)" >> $(1)/.qmake.cache && \
echo " QMAKE_CFLAGS += -isystem $(PREFIX)/include $(CFLAGS)" >> $(1)/.qmake.cache && \
echo " QMAKE_CXXFLAGS += -isystem $(PREFIX)/include $(CXXFLAGS)" >> $(1)/.qmake.cache && \
echo " QMAKE_LFLAGS += $(LDFLAGS)" >> $(1)/.qmake.cache && \
echo " QMAKE_INSTALL_FILE = VLC_PREFIX=$(PREFIX) $(QT_QINSTALL)" >> $(1)/.qmake.cache && \
echo "} else {" >> $(1)/.qmake.cache && \
echo " QMAKE_C = $(BUILDCC)" >> $(1)/.qmake.cache && \
echo " QMAKE_CXX = $(BUILDCXX)" >> $(1)/.qmake.cache && \
echo " QMAKE_STRIP = $(BUILDSTRIP)" >> $(1)/.qmake.cache && \
echo " QMAKE_CFLAGS += $(BUILDCFLAGS)" >> $(1)/.qmake.cache && \
echo " QMAKE_CXXFLAGS += $(BUILDCXXFLAGS)" >> $(1)/.qmake.cache && \
echo " QMAKE_LFLAGS += $(BUILDLDFLAGS)" >> $(1)/.qmake.cache && \
......@@ -143,45 +152,16 @@ qmake_toolchain = echo "!host_build {" > $(1)/.qmake.cache && \
.qt: qt
$(call qmake_toolchain, $<)
# Configure qt, build and run qmake
+cd $< && $(QT_ENV_VARS) ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX) -hostprefix $(PREFIX)/lib/qt5 \
$(shell $(SRC)/qt/configure-env.py $(CPPFLAGS) $(LDFLAGS))
# Make && Install libraries
cd $< && $(QT_ENV_VARS) $(MAKE)
$(MAKE) -C $< -C src \
INSTALL_FILE=$(QT_QINSTALL) VLC_PREFIX="$(PREFIX)" \
sub-corelib-install_subtargets \
sub-gui-install_subtargets \
sub-widgets-install_subtargets \
sub-platformsupport-install_subtargets \
sub-bootstrap-install_subtargets \
sub-network-install_subtargets
# Install tools
$(MAKE) -C $< -C src \
sub-moc-install_subtargets \
sub-rcc-install_subtargets \
sub-uic-install_subtargets \
sub-qlalr-install_subtargets
# Install plugins
$(MAKE) -C $< -C src/plugins \
INSTALL_FILE=$(QT_QINSTALL) VLC_PREFIX="$(PREFIX)" \
sub-imageformats-install_subtargets \
sub-platforms-install_subtargets \
sub-styles-install_subtargets
# Build libraries, widgets, plugins, doc (empty)
$(MAKE) -C $<
# Install libraries, widgets, plugins, tools, doc (empty)
$(MAKE) -C $< install
ifdef HAVE_WIN32
# Add the ANGLE headers to our project
sed -i.orig -e 's#-I$${includedir}/QtGui#-I$${includedir}/QtGui -I$${includedir}/QtANGLE#' $(PREFIX)/lib/pkgconfig/Qt5Gui.pc
endif
#fix host tools headers to avoid collusion with target headers
#fix host tools headers to avoid collision with target headers
mkdir -p $(PREFIX)/lib/qt5/include
cp -R $(PREFIX)/include/QtCore $(PREFIX)/lib/qt5/include
sed -i.orig -e "s#\$\$QT_MODULE_INCLUDE_BASE#$(PREFIX)/lib/qt5/include#g" $(PREFIX)/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
# Install a qmake with correct paths set
$(MAKE) -C $< sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
ifdef HAVE_WIN32
# Install libqtmain for potentially other targets, eg. docs/ samples
$(MAKE) -C "$</src/winmain" all
$(MAKE) -C "$</src/winmain" install
endif
touch $@
--- a/mkspecs/features/qml_plugin.prf 2020-09-02 12:15:07.000000000 +0200
+++ b/mkspecs/features/qml_plugin.prf 2022-08-31 10:58:10.110600024 +0200
@@ -13,6 +13,10 @@
TEMPLATE = lib
CONFIG += plugin
+qmlprefixpclib_replace.match = $$dirname(_QMAKE_CONF_)
+qmlprefixpclib_replace.replace = $$[QT_INSTALL_PREFIX]
+qmlprefixpclib_replace.CONFIG = path
+QMAKE_PKGCONFIG_INSTALL_REPLACE += qmlprefixpclib_replace
if(win32|mac):!macx-xcode {
qtConfig(debug_and_release): CONFIG += debug_and_release
--- a/mkspecs/features/qt_plugin.prf 2020-09-02 12:15:07.000000000 +0200
+++ b/mkspecs/features/qt_plugin.prf 2022-08-31 10:59:48.380662936 +0200
@@ -15,6 +15,10 @@
TEMPLATE = lib
CONFIG += plugin
+pluginpclib_replace.match = $$MODULE_BASE_OUTDIR/lib
+pluginpclib_replace.replace = $$[QT_INSTALL_LIBS]
+pluginpclib_replace.CONFIG = path
+QMAKE_PKGCONFIG_INSTALL_REPLACE += pluginpclib_replace
DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
win32:CONFIG(shared, static|shared) {
--- a/mkspecs/features/qml_plugin.prf 2022-09-02 14:15:09.023765377 +0200
+++ b/mkspecs/features/qml_plugin.prf 2022-09-02 14:59:06.296938907 +0200
@@ -30,9 +30,9 @@
}
isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name)
+isEmpty(VERSION): VERSION = $$MODULE_VERSION
win32:CONFIG(shared, static|shared) {
# Embed a VERSIONINFO resource into the plugin's DLL.
- isEmpty(VERSION): VERSION = $$MODULE_VERSION
CONFIG += skip_target_version_ext
}
--- a/mkspecs/features/qt_plugin.prf 2022-09-02 14:15:04.593670115 +0200
+++ b/mkspecs/features/qt_plugin.prf 2022-09-02 14:59:06.296938907 +0200
@@ -17,9 +17,9 @@
CONFIG += plugin create_pc
DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
+isEmpty(VERSION): VERSION = $$QT_VERSION
win32:CONFIG(shared, static|shared) {
# Embed a VERSIONINFO resource into the plugin's DLL.
- isEmpty(VERSION): VERSION = $$QT_VERSION
CONFIG += skip_target_version_ext
}
--- a/qmake/generators/makefile.cpp 2020-09-02 12:15:07.000000000 +0200
+++ b/qmake/generators/makefile.cpp 2022-09-12 11:42:01.170411450 +0200
@@ -3431,11 +3431,18 @@
......
--- a/mkspecs/features/qml_plugin.prf 2022-09-02 14:15:09.023765377 +0200
+++ b/mkspecs/features/qml_plugin.prf 2022-09-02 14:59:06.296938907 +0200
@@ -30,9 +30,9 @@
}
isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name)
+isEmpty(VERSION): VERSION = $$MODULE_VERSION
win32:CONFIG(shared, static|shared) {
# Embed a VERSIONINFO resource into the plugin's DLL.
- isEmpty(VERSION): VERSION = $$MODULE_VERSION
CONFIG += skip_target_version_ext
}
--- a/mkspecs/features/qt_plugin.prf 2022-09-02 14:15:04.593670115 +0200
+++ b/mkspecs/features/qt_plugin.prf 2022-09-02 14:59:06.296938907 +0200
@@ -17,9 +17,9 @@
CONFIG += plugin create_pc
DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
+isEmpty(VERSION): VERSION = $$QT_VERSION
win32:CONFIG(shared, static|shared) {
# Embed a VERSIONINFO resource into the plugin's DLL.
- isEmpty(VERSION): VERSION = $$QT_VERSION
CONFIG += skip_target_version_ext
}
......@@ -22,42 +22,20 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
$(UNPACK)
$(APPLY) $(SRC)/qtdeclarative/fix-gcc11-build.patch
# do not build qml.exe and other useless tools
sed -i.orig 's,!wasm:!rtems ,!wasm:!rtems:!static ,' "$(UNPACK_DIR)/tools/tools.pro"
$(MOVE)
QT_DECLARATIVE_CONFIG := \
-no-feature-d3d12 \
-no-feature-qml-debug \
-no-feature-quick-designer
-no-feature-quick-designer \
-no-feature-quick-particles
.qtdeclarative: qtdeclarative
# Generate Makefile & src/Makefile
$(call qmake_toolchain, $<)
cd $< && $(PREFIX)/lib/qt5/bin/qmake -- $(QT_DECLARATIVE_CONFIG)
cd $</src && $(PREFIX)/lib/qt5/bin/qmake -o Makefile src.pro
# Build & install only what we require
# Invoke the build rules one at a time as some rule dependencies seem to be broken
$(MAKE) -C $< -C src \
INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \
sub-quick-make_first-ordered \
sub-qmlmodels-make_first-ordered \
sub-qmldevtools-make_first-ordered \
sub-qmlworkerscript-make_first-ordered
# We don't use particles, but the import target (which generates the qtquick2plugin.a) require
# the particle module to be built
$(MAKE) -C $< -C src \
INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \
sub-particles-make_first-ordered
$(MAKE) -C $< -C src \
INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \
sub-quick-install_subtargets \
sub-qml-install_subtargets \
sub-quickwidgets-install_subtargets \
sub-imports-install_subtargets \
sub-qmlmodels-install_subtargets \
sub-qmlworkerscript-install_subtargets \
sub-quickshapes-install_subtargets
cd $</tools && $(PREFIX)/lib/qt5/bin/qmake -o Makefile tools.pro
$(MAKE) -C $< -C tools \
INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \
sub-qmlcachegen-install_subtargets
$(MAKE) -C $<
$(MAKE) -C $< install
touch $@
......@@ -27,5 +27,5 @@ qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz .su
$(call qmake_toolchain, $<)
cd $< && $(PREFIX)/lib/qt5/bin/qmake
$(MAKE) -C $<
$(MAKE) -C $< install INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)"
$(MAKE) -C $< install
touch $@
......@@ -34,11 +34,10 @@ QUICK_CONTROL_CONFIG := \
$(call qmake_toolchain, $<)
cd $< && $(PREFIX)/lib/qt5/bin/qmake -- $(QUICK_CONTROL_CONFIG)
# Make && Install libraries
$(MAKE) -C $< sub-src-qmake_all
$(MAKE) -C $<
ifndef HAVE_CROSS_COMPILE
cd $<; for i in QtQuickControls2 QtQuickTemplates2; do \
sed -i -e 's,"../../../../../src,"../src,g' include/$$i/$(QTQC2_VERSION)/$$i/private/*.h; done
endif
$(MAKE) -C $< install_subtargets \
INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)"
$(MAKE) -C $< install
touch $@
......@@ -28,7 +28,5 @@ qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz .sum-qtsvg
cd $< && $(PREFIX)/lib/qt5/bin/qmake
# Make && Install libraries
$(MAKE) -C $<
$(MAKE) -C $< -C src sub-plugins-install_subtargets \
INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \
sub-svg-install_subtargets
$(MAKE) -C $< install
touch $@
......@@ -25,7 +25,5 @@ qtwayland: qtwayland-$(QTWAYLAND_VERSION).tar.xz .sum-qtwayland
cd $< && $(PREFIX)/lib/qt5/bin/qmake
# Make && Install libraries
$(MAKE) -C $<
$(MAKE) -C $< -C src \
INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \
sub-plugins-install_subtargets
$(MAKE) -C $< install
touch $@
......@@ -21,5 +21,5 @@ qtx11extras: qtx11extras-$(QTX11_VERSION).tar.xz .sum-qtx11extras
cd $< && $(PREFIX)/lib/qt5/bin/qmake
# Make && Install libraries
$(MAKE) -C $<
$(MAKE) -C $< install INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)"
$(MAKE) -C $< install
touch $@