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

6666 Commits

Author SHA1 Message Date
Tony Theodore 5dffb8ffe1 mxe-conf: fix for touchin readonly directory 2016-01-21 17:43:01 +11:00
MXEBot as Travis CI 6912ce18ee Update versions.json & build-matrix.html 2016-01-20 20:45:11 +00:00
Mark Brand 9bb3735baf sqlite: update 2016-01-20 21:40:30 +01:00
Tony Theodore 5618509c98 Merge pull request #1191 from LuaAndC/build-pkg-only-deps3 
build-pkg: detect undeclared dependencies
 2016-01-20 16:43:28 +11:00
MXEBot as Travis CI 49deddf241 Update versions.json & build-matrix.html 2016-01-20 05:37:15 +00:00
Tony Theodore 8760249ba7 devil: enable shared and x86_64 builds 
see also:
 * #295
 * https://github.com/DentonW/DevIL/issues/29

closes #1188
 2016-01-20 16:36:31 +11:00
MXEBot as Travis CI d68db8e06d Update versions.json & build-matrix.html 2016-01-20 03:11:53 +00:00
Timothy Gu 0f04c1f966 Merge pull request #1192 from colinbourassa/libcomm14cux_2.1.1_update 
Update libcomm14cux to 2.1.1
 2016-01-19 19:11:32 -08:00
Colin Bourassa 68e950be51 Update libcomm14cux to 2.1.1 2016-01-19 22:08:01 -05:00
MXEBot as Travis CI f4ec5d3ac9 Update versions.json & build-matrix.html 2016-01-17 21:36:20 +00:00
Mark Brand c6ae83c029 jpeg: update 2016-01-17 22:34:52 +01:00
Boris Nagaev c26dbd9aec build-pkg: ignore installed/.gitkeep file 
It produced the following erroneous warning:

> Item x86_64-unknown-linux-gnu~mxe-conf
> built item x86_64-unknown-linux-gnu~.gitkeep.
 2016-01-18 00:30:18 +03:00
Boris Nagaev 6b25bbb150 build-pkg: log and remove empty directories 2016-01-18 00:30:18 +03:00
Boris Nagaev 53d21fac61 build-pkg: touch usr/*/installed/* in build order 
See https://git.io/vuDJY
 2016-01-18 00:30:18 +03:00
Boris Nagaev 36086a980a build-pkg: refactor function makeItem2Index() 2016-01-18 00:30:18 +03:00
Boris Nagaev d08e5078b9 build-pkg: prevent accidental rebuilds 
touch all installed/* files after checkout.
 2016-01-18 00:30:18 +03:00
Boris Nagaev 53c384d4c5 build-pkg: resolve merge conflicts manually 
`git merge -s recursive -X ours` turned out to fail on binary
files. (I can't reproduce this behaviour in test repo, maybe
it is Git's bug.) So I switched to `checkout --ours`, which
worked in that case.
 2016-01-18 00:30:18 +03:00
Boris Nagaev 1840845795 build-pkg: reorder functions 
gitCheckout() will use gitCommit()
 2016-01-18 00:30:18 +03:00
Boris Nagaev 6706af72c4 build-pkg: check exit status of "git commit" 2016-01-18 00:30:18 +03:00
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