d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,747 Commits 5 Branches 36 Tags 33 MiB
Commit Graph

6747 Commits

Author SHA1 Message Date
Boris Nagaev deae4dc3c9 build-pkg: make sure checkout and merge succeed 2016-01-18 00:30:18 +03:00
Boris Nagaev e464f12cd0 build-pkg: merge "resolves" conflicts 
Result of build by previous commit:
https://gist.github.com/32309209c467853deedc

If a conflict happens, build-pkg should "resolve" it by selecting
one of versions. Git has a merge strategy "recursive" with an
option "ours" which does exactly what is needed but works only
for two heads. That is why multi-merge was replaced by multiple
merges of two heads.
 2016-01-18 00:30:18 +03:00
Boris Nagaev d31bdd48b5 build-pkg: make pkg without independent packages 
This is an implementation of detection of undeclared requiremenets
using Git branches.

See #1111
 2016-01-18 00:30:18 +03:00
Boris Nagaev 533f5da3fd build-pkg: check-requirements MXE_TARGETS=... 
check-requirements creates directories usr/<target> for all
targets. By default, MXE_TARGETS=i686-w64-mingw32.static, so
it creates a directory for i686-w64-mingw32.static only.

(Currently this doesn't affect history in usr/.git as git ignores
empty directories.)
 2016-01-18 00:30:18 +03:00
Boris Nagaev ffa25d96fe build-pkg: make sure usr/.git doesn't exist 2016-01-18 00:30:18 +03:00
Boris Nagaev 0d0be19c2a build-pkg: move git user config to var 2016-01-18 00:30:17 +03:00
Boris Nagaev b1e4eab1ad build-pkg: fix warnings of LuaCheck 
Warnings fixed: https://gist.github.com/b563dfd7708e1ef209b4
 2016-01-18 00:30:17 +03:00
Boris Nagaev 9d09e67443 qt5: add test that cmake works with QUiLoader 
See https://github.com/mxe/mxe/issues/1185
 2016-01-17 16:11:32 +03:00
Boris Nagaev eb43c1c0ad fix build with CMake + Qt5 (QUiLoader) 
Add the patch known to fix this issue in
https://github.com/Alexpux/MINGW-packages/issues/762
(cmake: Rearrange STATIC vs INTERFACE targets).

fix #1185
 2016-01-17 15:44:54 +03:00
Boris Nagaev 4d1ef34f85 qtbase: unify the patch 2016-01-17 13:37:08 +03:00
Tony Theodore 3a75348797 add gnu patch to native plugins 2016-01-17 13:14:05 +11:00
MXEBot as Travis CI 9c573f17c2 Update versions.json & build-matrix.html 2016-01-16 09:56:08 +00:00
Mark Brand dde3543ed2 libpng: update 2016-01-16 10:55:41 +01:00
mabrand 17a6659828 Merge pull request #1183 from tonytheodore/gnutls-libidn 
gnutls: add missing libidn dependency
 2016-01-15 16:28:42 +01:00
Tony Theodore d59e477086 gnutls: add missing libidn dependency 
fixes #1181
 2016-01-16 02:11:27 +11:00
MXEBot as Travis CI 6aed1e2bcf Update versions.json & build-matrix.html 2016-01-14 13:40:35 +00:00
Mark Brand f566d02792 sqlite: update 2016-01-14 14:39:31 +01:00
Boris Nagaev 4f2f9bf806 update luarocks from 2.2.2 to 2.3.0 2016-01-13 23:27:07 +03:00
Boris Nagaev cd9e79dc62 luarocks: unify the patch 2016-01-13 23:27:07 +03:00
Boris Nagaev 199f2e53b8 luarocks wrapper: exit with non-zero on failure 2016-01-13 23:27:07 +03:00
MXEBot as Travis CI 19e3cf15cb Update versions.json & build-matrix.html 2016-01-13 09:04:20 +00:00
Mark Brand 1c8e11dcc6 pcre: update 2016-01-13 10:01:40 +01:00
Boris Nagaev c9df66b164 Merge pull request #1149 from tonytheodore/hier 
mxe-conf: create basic non-empty directory hierarchy
 2016-01-13 02:16:14 +03:00
MXEBot as Travis CI 1555116931 Update versions.json & build-matrix.html 2016-01-12 22:12:44 +00:00
Mark Brand fe062e7fe8 wget: update 
To avoid trouble with static linking to gnutls_free,
defined GNUTLS_INTERNAL_BUILD to prevent defining _SYM_EXPORT.
 2016-01-12 23:09:59 +01:00
MXEBot as Travis CI 0651b6cb61 Update versions.json & build-matrix.html 2016-01-12 08:44:34 +00:00
Tony Theodore 98952806e7 Merge pull request #1157 from tonytheodore/gst-plugins 
gstreamer updates and shared builds
 2016-01-12 19:44:07 +11:00
Tony Theodore b4b195321c openal: really disable examples 2016-01-12 19:41:41 +11:00
Tony Theodore a3124bf7a7 openthreads: build standalone and fix static build 2016-01-12 19:41:41 +11:00
Tony Theodore f50c9c5263 openthreads: convert patch 2016-01-12 19:41:41 +11:00
Tony Theodore 121d251ddf openscenegraph: add missing gstreamer dep and fix detection on mingw 2016-01-12 19:41:41 +11:00
Tony Theodore 578e797904 openscenegraph: consolidate patches 2016-01-12 19:41:41 +11:00
Tony Theodore 3d05f1d602 gtkimageview: fix using deprecated gdk-pixbuf declarations 2016-01-12 19:41:41 +11:00
Tony Theodore 03bc07914d pixman: update 0.31.2 --> 0.33.6 2016-01-12 19:41:41 +11:00
Tony Theodore 08a63fdb4b lzo: update 2.08 --> 2.09 2016-01-12 19:41:41 +11:00
Tony Theodore 34cf58c18f libpng: update 1.6.19 --> 1.6.20 2016-01-12 19:41:40 +11:00
Tony Theodore 43ec871a39 icu4c: update 54.1 --> 56.1 2016-01-12 19:41:40 +11:00
Tony Theodore f2024506a4 gettext: update 0.19.5.1 --> 0.19.7 2016-01-12 19:41:40 +11:00
Tony Theodore ec62f3c7cd gdk-pixbuf: update 2.30.8 --> 2.32.3 2016-01-12 19:41:40 +11:00
Tony Theodore e0e2ae59a9 dbus: update 1.10.6 --> 1.11.0 2016-01-12 19:41:40 +11:00
Tony Theodore 719e7e0c30 cairo: update 1.14.2 --> 1.14.6 2016-01-12 19:41:40 +11:00
Tony Theodore cc102cf94b gstreamer and plugins: update 1.4.5 --> 1.6.2 and enable shared 2016-01-12 19:41:40 +11:00
Tony Theodore dbe0a606e1 libshout: update 2.3.1 --> 2.4.1 2016-01-12 19:41:40 +11:00
Tony Theodore f5414c6002 liboil: enable shared and x86_64-w64-mingw32 build 2016-01-12 19:41:40 +11:00
Tony Theodore dfec326366 Makefile and mxe-conf: create basic non-empty directory hierarchy 
https://github.com/mxe/mxe/pull/1061/files#r49049496
https://github.com/mxe/mxe/issues/1111#issuecomment-169280181
 2016-01-12 15:17:21 +11:00
Boris Nagaev 01dc8941ec mxe-conf: create .gitkeep in CMAKE_TOOLCHAIN_DIR 
It is needed for build-pkg and #1111, Git doesn't see empty directories.
 2016-01-12 15:16:03 +11:00
Tony Theodore a449841274 docs: link to build-matrix.html and note libgomp and pthreads availability 2016-01-12 12:03:11 +11:00
Tony Theodore ccfeb1e8ed Merge pull request #1171 from LuaAndC/no-renaming-patches 
fix libieee1284 on Wheezy and prevent patch-tool-mxe from using rename
 2016-01-12 10:45:54 +11:00
Boris Nagaev 64b0d70492 libieee1284 patch: do not rename 
import/export the patch

fix #1170
 2016-01-12 02:15:53 +03:00
Boris Nagaev bff9b400f5 patch-tool-mxe: remove "-M9" from git format-patch 
> patch < 2.7 (Wheezy has 2.6.1) can't handle the rename done in the patch.

See https://github.com/mxe/mxe/issues/1170#issuecomment-170701741
 2016-01-12 02:12:42 +03:00