From c0ab4fe418b73d56cb3483dbcc1fa7ddef0d52fe Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 19 Dec 2012 23:53:14 +0100 Subject: package qt5: replace monolothic package with module packages Qt 5 is designed to be modular. The big monolothic tarball is actually deprecated. --- index.html | 66 +++++++++++++++++++- src/qt5-1-cherrypicks.patch | 70 --------------------- src/qt5.mk | 64 -------------------- src/qtactiveqt.mk | 20 ++++++ src/qtbase-1.cherrypicks.patch | 107 +++++++++++++++++++++++++++++++++ src/qtbase.mk | 61 +++++++++++++++++++ src/qtdeclarative.mk | 20 ++++++ src/qtgraphicaleffects.mk | 20 ++++++ src/qtimageformats-1-cherrypicks.patch | 80 ++++++++++++++++++++++++ src/qtimageformats.mk | 20 ++++++ src/qtjsbackend.mk | 20 ++++++ src/qtmultimedia-1-cherrypicks.patch | 107 +++++++++++++++++++++++++++++++++ src/qtmultimedia.mk | 20 ++++++ src/qtquick1.mk | 20 ++++++ src/qtscript.mk | 20 ++++++ src/qtsvg.mk | 20 ++++++ src/qttools.mk | 20 ++++++ src/qttranslations.mk | 20 ++++++ src/qtxmlpatterns.mk | 20 ++++++ 19 files changed, 658 insertions(+), 137 deletions(-) delete mode 100644 src/qt5-1-cherrypicks.patch delete mode 100644 src/qt5.mk create mode 100644 src/qtactiveqt.mk create mode 100644 src/qtbase-1.cherrypicks.patch create mode 100644 src/qtbase.mk create mode 100644 src/qtdeclarative.mk create mode 100644 src/qtgraphicaleffects.mk create mode 100644 src/qtimageformats-1-cherrypicks.patch create mode 100644 src/qtimageformats.mk create mode 100644 src/qtjsbackend.mk create mode 100644 src/qtmultimedia-1-cherrypicks.patch create mode 100644 src/qtmultimedia.mk create mode 100644 src/qtquick1.mk create mode 100644 src/qtscript.mk create mode 100644 src/qtsvg.mk create mode 100644 src/qttools.mk create mode 100644 src/qttranslations.mk create mode 100644 src/qtxmlpatterns.mk diff --git a/index.html b/index.html index 27a269b..ce84032 100644 --- a/index.html +++ b/index.html @@ -1882,9 +1882,69 @@ USE_OSGPLUGIN(<plugin2>) Qt - qt5 - 5.0.0 - Qt + qtactiveqt + 5.0.0 + Qt + + + qtbase + 5.0.0 + Qt + + + qtdeclarative + 5.0.0 + Qt + + + qtgraphicaleffects + 5.0.0 + Qt + + + qtimageformats + 5.0.0 + Qt + + + qtjsbackend + 5.0.0 + Qt + + + qtmultimedia + 5.0.0 + Qt + + + qtquick1 + 5.0.0 + Qt + + + qtscript + 5.0.0 + Qt + + + qtsvg + 5.0.0 + Qt + + + qttools + 5.0.0 + Qt + + + qttranslations + 5.0.0 + Qt + + + qtxmlpatterns + 5.0.0 + Qt qwt diff --git a/src/qt5-1-cherrypicks.patch b/src/qt5-1-cherrypicks.patch deleted file mode 100644 index 637ba85..0000000 --- a/src/qt5-1-cherrypicks.patch +++ /dev/null @@ -1,70 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 7312016b182b5095f6e2c68b4e2d73319d8529ca Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Mon, 24 Sep 2012 19:53:55 +0200 -Subject: [PATCH] use pkg-config for freetype - -Change-Id: Id0b048b44bcebf066c21efeb89f9c1781023a593 - -diff --git a/qtbase/src/plugins/platforms/windows/windows.pro b/qtbase/src/plugins/platforms/windows/windows.pro -index 7f73465..1de1d74 100644 ---- a/qtbase/src/plugins/platforms/windows/windows.pro -+++ b/qtbase/src/plugins/platforms/windows/windows.pro -@@ -169,6 +169,10 @@ contains(QT_CONFIG, freetype) { - qwindowsfontdatabase_ft.h - SOURCES += \ - qwindowsfontdatabase_ft.cpp -+ static { -+ CONFIG += link_pkgconfig -+ PKGCONFIG += freetype2 -+ } - } - - OTHER_FILES += windows.json --- -1.7.10.4 - -From 10cb8389c6f4bddfd10c54b2a29bb3b7dd78a525 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Thu, 13 Dec 2012 20:23:48 +0100 -Subject: [PATCH] remove duplicate defs (mxe-specific) - - -diff --git a/qtmultimedia/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/qtmultimedia/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp -index 3c66d05..10e8037 100644 ---- a/qtmultimedia/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp -+++ b/qtmultimedia/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp -@@ -67,19 +67,19 @@ typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT; - #else - - extern GUID CLSID_AudioInputDeviceCategory; --extern GUID CLSID_AudioRendererCategory; --extern GUID IID_ICreateDevEnum; --extern GUID CLSID_SystemDeviceEnum; -+//extern GUID CLSID_AudioRendererCategory; -+//extern GUID IID_ICreateDevEnum; -+//extern GUID CLSID_SystemDeviceEnum; - - #ifndef __ICreateDevEnum_INTERFACE_DEFINED__ - #define __ICreateDevEnum_INTERFACE_DEFINED__ - --DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) --{ -- STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, -- IEnumMoniker **ppEnumMoniker, -- DWORD dwFlags) PURE; --}; -+//DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) -+//{ -+// STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, -+// IEnumMoniker **ppEnumMoniker, -+// DWORD dwFlags) PURE; -+//}; - - #endif // __ICreateDevEnum_INTERFACE_DEFINED__ - --- -1.7.10.4 - diff --git a/src/qt5.mk b/src/qt5.mk deleted file mode 100644 index 3c2d3cc..0000000 --- a/src/qt5.mk +++ /dev/null @@ -1,64 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := qt5 -$(PKG)_IGNORE := -$(PKG)_CHECKSUM := 24e7403f569796f3879b5c930ac4749363cc507b -$(PKG)_SUBDIR := qt-everywhere-opensource-src-$($(PKG)_VERSION) -$(PKG)_FILE := qt-everywhere-opensource-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/single/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus pcre fontconfig freetype - -define $(PKG)_UPDATE - echo 'Warning: Updates are temporarily disabled for package qt5.' >&2; -endef - -define $(PKG)_BUILD - cd '$(1)' && \ - OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ - PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \ - SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" \ - ./configure \ - -opensource \ - -confirm-license \ - -xplatform win32-g++ \ - -device-option CROSS_COMPILE=${TARGET}- \ - -device-option PKG_CONFIG='${TARGET}-pkg-config' \ - -force-pkg-config \ - -release \ - -static \ - -prefix '$(PREFIX)/$(TARGET)/qt5' \ - -opengl desktop \ - -no-glib \ - -accessibility \ - -no-reduce-exports \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -nomake tests \ - -qt-sql-sqlite \ - -qt-sql-odbc \ - -qt-sql-psql \ - -qt-sql-tds -D Q_USE_SYBASE \ - -system-zlib \ - -system-libpng \ - -system-libjpeg \ - -system-sqlite \ - -system-pcre \ - -openssl-linked \ - -dbus-linked \ - $(shell [ `uname` == 'Darwin' ] && echo -no-c++11) \ - -v - - $(MAKE) -C '$(1)' -j '$(JOBS)' - rm -rf '$(PREFIX)/$(TARGET)/qt5' - $(MAKE) -C '$(1)' -j 1 install - - # missing plugin description files - $(INSTALL) -m644 '$(1)/qtbase/mkspecs/modules/qt_plugin_'*'.pri' '$(PREFIX)/$(TARGET)/qt5/mkspecs/modules/' - - mkdir '$(1)/test-qt' - cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro' - $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' - $(INSTALL) -m755 '$(1)/test-qt/release/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' -endef diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk new file mode 100644 index 0000000..530f847 --- /dev/null +++ b/src/qtactiveqt.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtactiveqt +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 5f06d2267da6871bdf458d16fd99fcdc2680f1a2 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtactiveqt.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtbase-1.cherrypicks.patch b/src/qtbase-1.cherrypicks.patch new file mode 100644 index 0000000..3300914 --- /dev/null +++ b/src/qtbase-1.cherrypicks.patch @@ -0,0 +1,107 @@ +This file is part of MXE. +See index.html for further information. + +From 34475e6e4d05051ba80197846d932acb9492663b Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Mon, 24 Sep 2012 19:53:55 +0200 +Subject: [PATCH 1/3] use pkg-config for freetype + +Change-Id: Id0b048b44bcebf066c21efeb89f9c1781023a593 + +diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro +index 7f73465..1de1d74 100644 +--- a/src/plugins/platforms/windows/windows.pro ++++ b/src/plugins/platforms/windows/windows.pro +@@ -169,6 +169,10 @@ contains(QT_CONFIG, freetype) { + qwindowsfontdatabase_ft.h + SOURCES += \ + qwindowsfontdatabase_ft.cpp ++ static { ++ CONFIG += link_pkgconfig ++ PKGCONFIG += freetype2 ++ } + } + + OTHER_FILES += windows.json +-- +1.7.10.4 + + +From 6338d13b9ed413f68af28d112ca6d5c59e9df45d Mon Sep 17 00:00:00 2001 +From: Miikka Heikkinen +Date: Fri, 14 Dec 2012 11:51:28 +0200 +Subject: [PATCH 2/3] Fix installation of plugin module .pris in static Qt + builds + +When building Qt static, plugins get module .pri file, but those files +do not get installed in Windows. This is because both .pri generation +and install target statements are scoped with !build_pass, which means +Makefile.Debug and Makefile.Release do not get install_pritarget +target. + +Fixed by doing only the .pri generation in !build_pass scope. + +Task-number: QTBUG-28606 +Change-Id: If3f49b578af1d9171a8bce67793ecb3f902a6da8 +Reviewed-by: Oswald Buddenhagen +Reviewed-by: Mark Brand +(cherry picked from commit 4c5584f0a3c003106d07d0cf8b512108b9ff541a) + +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index f547e2d..6e5f27b 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -20,16 +20,18 @@ contains(QT_CONFIG, c++11):CONFIG += c++11 + contains(QT_CONFIG, static):CONFIG += static + else:CONFIG += shared + +-!build_pass:static { ++static { + isEmpty(MODULE): MODULE = $$basename(TARGET) + + MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_plugin_$${MODULE}.pri + +- MODULE_PRI_CONT = \ +- "QT_PLUGIN.$${MODULE}.TYPE = $$PLUGIN_TYPE" \ +- "QT_PLUGIN.$${MODULE}.CLASS_NAME = $$PLUGIN_CLASS_NAME" ++ !build_pass { ++ MODULE_PRI_CONT = \ ++ "QT_PLUGIN.$${MODULE}.TYPE = $$PLUGIN_TYPE" \ ++ "QT_PLUGIN.$${MODULE}.CLASS_NAME = $$PLUGIN_CLASS_NAME" + +- write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") ++ write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") ++ } + + pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules + pritarget.files = $$MODULE_PRI +-- +1.7.10.4 + + +From 6ed40cc9bb1fc9011cd1e97ba6ed1ec2263dc86b Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 19 Dec 2012 23:44:05 +0100 +Subject: [PATCH 3/3] fix QMAKE_MAKE for x-mingw + +Change-Id: I694c74046a307c2887af1c30cca36f95e242adc1 + +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +index ff52c6b..e567641 100644 +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -1,7 +1,9 @@ + equals(MAKEFILE_GENERATOR, UNIX): \ + QMAKE_MAKE = make +-else:equals(MAKEFILE_GENERATOR, MINGW): \ +- QMAKE_MAKE = mingw32-make ++else:equals(MAKEFILE_GENERATOR, MINGW) { ++ !isEmpty(CROSS_COMPILE):QMAKE_MAKE = make ++ else:QMAKE_MAKE = mingw32-make ++} + else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)): \ + QMAKE_MAKE = nmake + else: \ +-- +1.7.10.4 + diff --git a/src/qtbase.mk b/src/qtbase.mk new file mode 100644 index 0000000..0d4938d --- /dev/null +++ b/src/qtbase.mk @@ -0,0 +1,61 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtbase +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 3d553ed3fe4065b8453939831c007ec896ceb9ab +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtbase.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && \ + OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ + PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \ + SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" \ + ./configure \ + -opensource \ + -confirm-license \ + -xplatform win32-g++ \ + -device-option CROSS_COMPILE=${TARGET}- \ + -device-option PKG_CONFIG='${TARGET}-pkg-config' \ + -force-pkg-config \ + -release \ + -static \ + -prefix '$(PREFIX)/$(TARGET)/qt5' \ + -opengl desktop \ + -no-glib \ + -accessibility \ + -no-reduce-exports \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -nomake tests \ + -qt-sql-sqlite \ + -qt-sql-odbc \ + -qt-sql-psql \ + -qt-sql-tds -D Q_USE_SYBASE \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-sqlite \ + -system-pcre \ + -openssl-linked \ + -dbus-linked \ + $(shell [ `uname` == 'Darwin' ] && echo -no-c++11) \ + -v + + $(MAKE) -C '$(1)' -j '$(JOBS)' + rm -rf '$(PREFIX)/$(TARGET)/qt5' + $(MAKE) -C '$(1)' -j 1 install + + mkdir '$(1)/test-qt' + cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro' + $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' + $(INSTALL) -m755 '$(1)/test-qt/release/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' +endef diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk new file mode 100644 index 0000000..4f56430 --- /dev/null +++ b/src/qtdeclarative.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtdeclarative +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 44bd2d8005939e790df2a73c81763220feebfee7 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase qtjsbackend qtsvg qtxmlpatterns + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtdeclarative.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk new file mode 100644 index 0000000..63f08d9 --- /dev/null +++ b/src/qtgraphicaleffects.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtgraphicaleffects +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := fb071d130ae48839014c81ff9104bf8d72ab329b +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtgraphicaleffects.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtimageformats-1-cherrypicks.patch b/src/qtimageformats-1-cherrypicks.patch new file mode 100644 index 0000000..87b5d6e --- /dev/null +++ b/src/qtimageformats-1-cherrypicks.patch @@ -0,0 +1,80 @@ +This file is part of MXE. +See index.html for further information. + +From c75cecf3ceb1d174887ae0029b2c57bfe71f9463 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 3 Nov 2011 14:11:02 +0100 +Subject: [PATCH 1/2] add pkg-config support for libtiff-4 + +Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd + +diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro +index 60ba7d1..0544f55 100644 +--- a/config.tests/libtiff/libtiff.pro ++++ b/config.tests/libtiff/libtiff.pro +@@ -1,4 +1,7 @@ + SOURCES = libtiff.cpp + CONFIG -= qt dylib + mac:CONFIG -= app_bundle +-LIBS += -ltiff ++CONFIG += link_pkgconfig ++packagesExist(libtiff-4):PKGCONFIG += libtiff-4 ++else:if(unix|win32-g++*): LIBS += -ltiff ++else:win32: LIBS += libtiff.lib +diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro +index 66eea8c..8582740 100644 +--- a/src/plugins/imageformats/tiff/tiff.pro ++++ b/src/plugins/imageformats/tiff/tiff.pro +@@ -9,7 +9,9 @@ SOURCES += main.cpp qtiffhandler.cpp + OTHER_FILES += tiff.json + + config_libtiff { +- unix|win32-g++*: LIBS += -ltiff ++ CONFIG += link_pkgconfig ++ packagesExist(libtiff-4):PKGCONFIG += libtiff-4 ++ else:if(unix|win32-g++*): LIBS += -ltiff + else:win32: LIBS += libtiff.lib + } else { + include($$PWD/../../../3rdparty/libtiff.pri) +-- +1.7.10.4 + + +From b169f5342cb224b1afa16062f02f4303bab91122 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 19 Dec 2012 23:29:52 +0100 +Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) + +Change-Id: I1216f35a01a974321efa2463b687c121baa22667 + +diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro +index ee57ecd..4c2d305 100644 +--- a/config.tests/libmng/libmng.pro ++++ b/config.tests/libmng/libmng.pro +@@ -1,4 +1,7 @@ + SOURCES = libmng.cpp + CONFIG -= qt dylib + mac:CONFIG -= app_bundle +-LIBS += -lmng ++CONFIG += link_pkgconfig ++packagesExist(libmng):PKGCONFIG += libmng ++else:if(unix|win32-g++*): LIBS += -lmng ++else:win32: LIBS += libmng.lib +diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro +index 9890c11..7cfcff0 100644 +--- a/src/plugins/imageformats/mng/mng.pro ++++ b/src/plugins/imageformats/mng/mng.pro +@@ -8,7 +8,9 @@ HEADERS += qmnghandler_p.h + SOURCES += qmnghandler.cpp + OTHER_FILES += mng.json + config_libmng { +- unix|win32-g++*: LIBS += -lmng ++ CONFIG += link_pkgconfig ++ packagesExist(libmng):PKGCONFIG += libmng ++ else:if(unix|win32-g++*): LIBS += -lmng + else:win32: LIBS += libmng.lib + } else { + include($$PWD/../../../3rdparty/libmng.pri) +-- +1.7.10.4 + diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk new file mode 100644 index 0000000..2ec6e10 --- /dev/null +++ b/src/qtimageformats.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtimageformats +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 982ff8bd139db4d72ee42d5372d6e8520c693368 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase libmng tiff + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtimageformats.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtjsbackend.mk b/src/qtjsbackend.mk new file mode 100644 index 0000000..d63fe76 --- /dev/null +++ b/src/qtjsbackend.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtjsbackend +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 9f499e144080318fb6c40501b854db909f8ba3d2 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtjsbackend.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtmultimedia-1-cherrypicks.patch b/src/qtmultimedia-1-cherrypicks.patch new file mode 100644 index 0000000..4d37a25 --- /dev/null +++ b/src/qtmultimedia-1-cherrypicks.patch @@ -0,0 +1,107 @@ +This file is part of MXE. +See index.html for further information. + +From 1c8e01e0938fffc78fe074a4bfff6f287f521eb0 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 20 Dec 2012 01:20:49 +0100 +Subject: [PATCH 1/2] fix include statements + + +diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp +index 6d29741..fcbd1ef 100644 +--- a/src/plugins/directshow/camera/dscameraservice.cpp ++++ b/src/plugins/directshow/camera/dscameraservice.cpp +@@ -44,7 +44,7 @@ + + #if defined(HAVE_WIDGETS) + #include +-#include ++#include + #endif + + #include "dscameraservice.h" +diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp +index 4686569..7c33d13 100644 +--- a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp ++++ b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp +@@ -49,7 +49,7 @@ + #include + #include + #include +-#include ++#include + #include + + extern const CLSID CLSID_VideoInputDeviceCategory; +diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp +index 843719b..d7a913d 100644 +--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp ++++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp +@@ -42,7 +42,7 @@ + #include + #include + +-#include "DSVideoWidgetControl.h" ++#include "dsvideowidgetcontrol.h" + #include "dscamerasession.h" + + QT_BEGIN_NAMESPACE +diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h +index ac390c8..9249c31 100644 +--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h ++++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h +@@ -49,7 +49,7 @@ + #include + + #include +-#include "DsCameraControl.h" ++#include "dscameracontrol.h" + + QT_BEGIN_HEADER + +-- +1.7.10.4 + + +From 7bf0aafc591af9c2a0f6a600cbec03e78c8ed72a Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 13 Dec 2012 20:23:48 +0100 +Subject: [PATCH 2/2] remove duplicate defs (mxe-specific) + + +diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +index 3c66d05..10e8037 100644 +--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp ++++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +@@ -67,19 +67,19 @@ typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT; + #else + + extern GUID CLSID_AudioInputDeviceCategory; +-extern GUID CLSID_AudioRendererCategory; +-extern GUID IID_ICreateDevEnum; +-extern GUID CLSID_SystemDeviceEnum; ++//extern GUID CLSID_AudioRendererCategory; ++//extern GUID IID_ICreateDevEnum; ++//extern GUID CLSID_SystemDeviceEnum; + + #ifndef __ICreateDevEnum_INTERFACE_DEFINED__ + #define __ICreateDevEnum_INTERFACE_DEFINED__ + +-DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) +-{ +- STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, +- IEnumMoniker **ppEnumMoniker, +- DWORD dwFlags) PURE; +-}; ++//DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) ++//{ ++// STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, ++// IEnumMoniker **ppEnumMoniker, ++// DWORD dwFlags) PURE; ++//}; + + #endif // __ICreateDevEnum_INTERFACE_DEFINED__ + +-- +1.7.10.4 + diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk new file mode 100644 index 0000000..c8699d6 --- /dev/null +++ b/src/qtmultimedia.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtmultimedia +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 33fc39b177aeba6863a28c5d45cd2175b2faedc2 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtmultimedia.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtquick1.mk b/src/qtquick1.mk new file mode 100644 index 0000000..f26c45e --- /dev/null +++ b/src/qtquick1.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtquick1 +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 940e5a1a4921e688db003c7ebc4898d7b166577f +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase qtscript qtsvg qttools qtxmlpatterns + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtquick1.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtscript.mk b/src/qtscript.mk new file mode 100644 index 0000000..11e2159 --- /dev/null +++ b/src/qtscript.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtscript +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 32da5598e71b81e6b83d288adc3c90d9bd5bed37 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtscript.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtsvg.mk b/src/qtsvg.mk new file mode 100644 index 0000000..4ea00bf --- /dev/null +++ b/src/qtsvg.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtsvg +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 7c5ae70fa90e4e527741a585e83a31fa2948a971 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtsvg.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qttools.mk b/src/qttools.mk new file mode 100644 index 0000000..6d7179d --- /dev/null +++ b/src/qttools.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qttools +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 4f92847c15ba3292aef42ba395fce4e8dc78f97d +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase qtactiveqt qtdeclarative + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qttools.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qttranslations.mk b/src/qttranslations.mk new file mode 100644 index 0000000..9225588 --- /dev/null +++ b/src/qttranslations.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qttranslations +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 73b14d114da8a1a5eb7073eefda01d563e35bcb5 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase qttools + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qttranslations.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk new file mode 100644 index 0000000..9e68934 --- /dev/null +++ b/src/qtxmlpatterns.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtxmlpatterns +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := bc3af9ad83e2cd6d91b26352abb9f5c650593891 +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules_tar/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtxmlpatterns.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef -- cgit v0.12